From 0710ba0a89db1cb9be6e523b93734620088fd2cc Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:50:02 +0300 Subject: [PATCH 01/51] upgrade: sdk version to 0.47.5 --- .github/dependabot.yml | 2 +- Makefile | 41 +- app/app.go | 25 +- app/app_test.go | 8 +- app/export.go | 6 +- app/export_test.go | 2 +- app/keepers/keepers.go | 144 +++-- app/keepers/keys.go | 26 +- app/modules.go | 50 +- app/prefix.go | 18 +- app/sim_test.go | 43 +- app/upgrades/v1/consts.go | 2 +- app/upgrades/v1/upgrades.go | 2 +- buf.gen.yaml | 8 + buf.work.yaml | 3 + cmd/sged/cmd/root.go | 40 +- go.mod | 150 +++-- go.sum | 291 +++++---- proposal.json | 12 - proto/buf.gen.gogo.yaml | 2 +- proto/buf.lock | 15 +- proto/{ => sgenetwork}/sge/bet/bet.proto | 2 +- proto/{ => sgenetwork}/sge/bet/bet_odds.proto | 0 .../sge/bet/constraints.proto | 0 proto/{ => sgenetwork}/sge/bet/genesis.proto | 6 +- .../{ => sgenetwork}/sge/bet/odds_type.proto | 0 proto/{ => sgenetwork}/sge/bet/params.proto | 2 +- proto/{ => sgenetwork}/sge/bet/query.proto | 6 +- proto/{ => sgenetwork}/sge/bet/stats.proto | 0 proto/{ => sgenetwork}/sge/bet/ticket.proto | 6 +- proto/{ => sgenetwork}/sge/bet/tx.proto | 2 +- proto/{ => sgenetwork}/sge/bet/wager.proto | 0 proto/{ => sgenetwork}/sge/house/authz.proto | 0 .../{ => sgenetwork}/sge/house/deposit.proto | 0 .../{ => sgenetwork}/sge/house/genesis.proto | 6 +- proto/{ => sgenetwork}/sge/house/params.proto | 0 proto/{ => sgenetwork}/sge/house/query.proto | 6 +- proto/{ => sgenetwork}/sge/house/ticket.proto | 2 +- proto/{ => sgenetwork}/sge/house/tx.proto | 2 +- .../{ => sgenetwork}/sge/house/withdraw.proto | 0 .../{ => sgenetwork}/sge/market/genesis.proto | 6 +- .../{ => sgenetwork}/sge/market/market.proto | 2 +- proto/{ => sgenetwork}/sge/market/odds.proto | 0 .../{ => sgenetwork}/sge/market/params.proto | 0 proto/{ => sgenetwork}/sge/market/query.proto | 4 +- proto/{ => sgenetwork}/sge/market/stats.proto | 0 .../{ => sgenetwork}/sge/market/ticket.proto | 4 +- proto/{ => sgenetwork}/sge/market/tx.proto | 2 +- proto/{ => sgenetwork}/sge/mint/genesis.proto | 4 +- proto/{ => sgenetwork}/sge/mint/minter.proto | 0 proto/{ => sgenetwork}/sge/mint/params.proto | 2 +- proto/{ => sgenetwork}/sge/mint/phase.proto | 0 proto/{ => sgenetwork}/sge/mint/query.proto | 2 +- proto/sgenetwork/sge/mint/tx.proto | 44 ++ .../sge/orderbook/exposure.proto | 0 .../sge/orderbook/genesis.proto | 10 +- .../sge/orderbook/orderbook.proto | 0 .../sge/orderbook/params.proto | 0 .../sge/orderbook/participation.proto | 0 .../sge/orderbook/query.proto | 8 +- .../sge/orderbook/stats.proto | 0 proto/{ => sgenetwork}/sge/ovm/genesis.proto | 8 +- .../{ => sgenetwork}/sge/ovm/key_vault.proto | 0 proto/{ => sgenetwork}/sge/ovm/params.proto | 0 proto/{ => sgenetwork}/sge/ovm/proposal.proto | 4 +- proto/{ => sgenetwork}/sge/ovm/query.proto | 4 +- proto/{ => sgenetwork}/sge/ovm/stats.proto | 0 proto/{ => sgenetwork}/sge/ovm/ticket.proto | 2 +- proto/{ => sgenetwork}/sge/ovm/tx.proto | 0 proto/{ => sgenetwork}/sge/ovm/vote.proto | 0 proto/{ => sgenetwork}/sge/type/kyc.proto | 0 scripts/protocgen.sh | 25 +- testutil/network/network.go | 19 +- testutil/simapp/params.go | 2 +- testutil/simapp/simapp.go | 30 +- tools/tools.go | 11 + types/kyc.pb.go | 40 +- x/bet/client/cli/query_bet_test.go | 2 +- x/bet/client/cli/tx_bet_test.go | 2 +- x/bet/keeper/keeper.go | 2 +- x/bet/module.go | 8 +- x/bet/module_simulation.go | 6 +- x/bet/simulation/bet.go | 2 +- x/bet/simulation/params.go | 12 +- x/bet/types/bet.pb.go | 136 ++-- x/bet/types/bet_odds.pb.go | 56 +- x/bet/types/codec.go | 3 +- x/bet/types/constraints.pb.go | 44 +- x/bet/types/genesis.pb.go | 54 +- x/bet/types/odds_type.pb.go | 42 +- x/bet/types/params.pb.go | 50 +- x/bet/types/query.pb.go | 156 ++--- x/bet/types/query.pb.gw.go | 2 +- x/bet/types/stats.pb.go | 32 +- x/bet/types/ticket.pb.go | 54 +- x/bet/types/tx.pb.go | 48 +- x/bet/types/wager.pb.go | 44 +- x/house/client/cli/query_deposit_test.go | 2 +- x/house/client/cli/query_withdrawal_test.go | 2 +- x/house/client/cli/tx_deposit_test.go | 2 +- x/house/client/cli/tx_withdraw_test.go | 2 +- x/house/module.go | 12 +- x/house/module_simulation.go | 6 +- x/house/simulation/params.go | 6 +- x/house/types/authz.pb.go | 44 +- x/house/types/codec.go | 3 +- x/house/types/deposit.pb.go | 70 ++- x/house/types/genesis.pb.go | 48 +- x/house/types/params.pb.go | 46 +- x/house/types/query.pb.go | 130 ++-- x/house/types/query.pb.gw.go | 2 +- x/house/types/ticket.pb.go | 50 +- x/house/types/tx.pb.go | 86 +-- x/house/types/withdraw.pb.go | 78 +-- x/market/client/cli/query_market_test.go | 2 +- x/market/keeper/keeper.go | 2 +- x/market/module.go | 12 +- x/market/module_simulation.go | 6 +- x/market/simulation/params.go | 4 +- x/market/types/codec.go | 3 +- x/market/types/genesis.pb.go | 46 +- x/market/types/market.pb.go | 79 +-- x/market/types/odds.pb.go | 37 +- x/market/types/params.pb.go | 34 +- x/market/types/query.pb.go | 106 ++-- x/market/types/query.pb.gw.go | 2 +- x/market/types/stats.pb.go | 34 +- x/market/types/ticket.pb.go | 75 +-- x/market/types/tx.pb.go | 73 +-- x/mint/keeper/keeper.go | 2 +- x/mint/module.go | 8 +- x/mint/module_simulation.go | 6 +- x/mint/simulation/params.go | 6 +- x/mint/types/codec.go | 3 +- x/mint/types/genesis.pb.go | 38 +- x/mint/types/minter.pb.go | 48 +- x/mint/types/msgs.go | 32 + x/mint/types/params.pb.go | 56 +- x/mint/types/phase.pb.go | 46 +- x/mint/types/query.pb.go | 110 ++-- x/mint/types/query.pb.gw.go | 2 +- x/mint/types/tx.pb.go | 589 +++++++++++++++++- x/orderbook/client/cli/query_bet_test.go | 2 +- .../client/cli/query_exposure_odds_test.go | 2 +- .../cli/query_exposure_participation_test.go | 2 +- .../client/cli/query_orderbook_test.go | 2 +- .../client/cli/query_participation_test.go | 2 +- x/orderbook/keeper/keeper.go | 2 +- x/orderbook/module.go | 10 +- x/orderbook/module_simulation.go | 6 +- x/orderbook/simulation/params.go | 10 +- x/orderbook/types/codec.go | 3 +- x/orderbook/types/exposure.pb.go | 76 +-- x/orderbook/types/genesis.pb.go | 72 +-- x/orderbook/types/orderbook.pb.go | 66 +- x/orderbook/types/params.pb.go | 52 +- x/orderbook/types/participation.pb.go | 108 ++-- x/orderbook/types/query.pb.go | 206 +++--- x/orderbook/types/query.pb.gw.go | 2 +- x/orderbook/types/stats.pb.go | 38 +- x/ovm/client/cli/query_proposal_test.go | 2 +- x/ovm/client/cli/query_pub_keys_test.go | 2 +- x/ovm/client/cli/tx_pubkeys_proposal_test.go | 2 +- x/ovm/keeper/keeper.go | 2 +- x/ovm/module.go | 8 +- x/ovm/module_simulation.go | 8 +- x/ovm/types/codec.go | 3 +- x/ovm/types/genesis.pb.go | 55 +- x/ovm/types/key_vault.pb.go | 36 +- x/ovm/types/params.pb.go | 32 +- x/ovm/types/proposal.pb.go | 86 +-- x/ovm/types/query.pb.go | 106 ++-- x/ovm/types/query.pb.gw.go | 2 +- x/ovm/types/stats.pb.go | 36 +- x/ovm/types/ticket.pb.go | 50 +- x/ovm/types/ticket_jwt.go | 2 +- x/ovm/types/tx.pb.go | 64 +- x/ovm/types/vote.pb.go | 44 +- 178 files changed, 2941 insertions(+), 2228 deletions(-) create mode 100644 buf.gen.yaml create mode 100644 buf.work.yaml delete mode 100644 proposal.json rename proto/{ => sgenetwork}/sge/bet/bet.proto (99%) rename proto/{ => sgenetwork}/sge/bet/bet_odds.proto (100%) rename proto/{ => sgenetwork}/sge/bet/constraints.proto (100%) rename proto/{ => sgenetwork}/sge/bet/genesis.proto (88%) rename proto/{ => sgenetwork}/sge/bet/odds_type.proto (100%) rename proto/{ => sgenetwork}/sge/bet/params.proto (93%) rename proto/{ => sgenetwork}/sge/bet/query.proto (97%) rename proto/{ => sgenetwork}/sge/bet/stats.proto (100%) rename proto/{ => sgenetwork}/sge/bet/ticket.proto (84%) rename proto/{ => sgenetwork}/sge/bet/tx.proto (93%) rename proto/{ => sgenetwork}/sge/bet/wager.proto (100%) rename proto/{ => sgenetwork}/sge/house/authz.proto (100%) rename proto/{ => sgenetwork}/sge/house/deposit.proto (100%) rename proto/{ => sgenetwork}/sge/house/genesis.proto (82%) rename proto/{ => sgenetwork}/sge/house/params.proto (100%) rename proto/{ => sgenetwork}/sge/house/query.proto (97%) rename proto/{ => sgenetwork}/sge/house/ticket.proto (95%) rename proto/{ => sgenetwork}/sge/house/tx.proto (98%) rename proto/{ => sgenetwork}/sge/house/withdraw.proto (100%) rename proto/{ => sgenetwork}/sge/market/genesis.proto (81%) rename proto/{ => sgenetwork}/sge/market/market.proto (98%) rename proto/{ => sgenetwork}/sge/market/odds.proto (100%) rename proto/{ => sgenetwork}/sge/market/params.proto (100%) rename proto/{ => sgenetwork}/sge/market/query.proto (96%) rename proto/{ => sgenetwork}/sge/market/stats.proto (100%) rename proto/{ => sgenetwork}/sge/market/ticket.proto (96%) rename proto/{ => sgenetwork}/sge/market/tx.proto (97%) rename proto/{ => sgenetwork}/sge/mint/genesis.proto (83%) rename proto/{ => sgenetwork}/sge/mint/minter.proto (100%) rename proto/{ => sgenetwork}/sge/mint/params.proto (95%) rename proto/{ => sgenetwork}/sge/mint/phase.proto (100%) rename proto/{ => sgenetwork}/sge/mint/query.proto (98%) create mode 100644 proto/sgenetwork/sge/mint/tx.proto rename proto/{ => sgenetwork}/sge/orderbook/exposure.proto (100%) rename proto/{ => sgenetwork}/sge/orderbook/genesis.proto (88%) rename proto/{ => sgenetwork}/sge/orderbook/orderbook.proto (100%) rename proto/{ => sgenetwork}/sge/orderbook/params.proto (100%) rename proto/{ => sgenetwork}/sge/orderbook/participation.proto (100%) rename proto/{ => sgenetwork}/sge/orderbook/query.proto (98%) rename proto/{ => sgenetwork}/sge/orderbook/stats.proto (100%) rename proto/{ => sgenetwork}/sge/ovm/genesis.proto (81%) rename proto/{ => sgenetwork}/sge/ovm/key_vault.proto (100%) rename proto/{ => sgenetwork}/sge/ovm/params.proto (100%) rename proto/{ => sgenetwork}/sge/ovm/proposal.proto (95%) rename proto/{ => sgenetwork}/sge/ovm/query.proto (97%) rename proto/{ => sgenetwork}/sge/ovm/stats.proto (100%) rename proto/{ => sgenetwork}/sge/ovm/ticket.proto (94%) rename proto/{ => sgenetwork}/sge/ovm/tx.proto (100%) rename proto/{ => sgenetwork}/sge/ovm/vote.proto (100%) rename proto/{ => sgenetwork}/sge/type/kyc.proto (100%) create mode 100644 tools/tools.go create mode 100644 x/mint/types/msgs.go diff --git a/.github/dependabot.yml b/.github/dependabot.yml index be93eebf..d73a483a 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,6 +5,6 @@ updates: schedule: interval: weekly ignore: - - dependency-name: "github.com/tendermint/tendermint" + - dependency-name: "github.com/cometbft/cometbft" update-types: ["version-update:semver-major", "version-update:semver-minor"] open-pull-requests-limit: 10 diff --git a/Makefile b/Makefile index 31f35250..1bf4d3fc 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ endif PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation') LEDGER_ENABLED ?= true SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed 's/ /\@/g') -TM_VERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::') # grab everything after the space in "github.com/tendermint/tendermint v0.34.7" +TM_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::') # grab everything after the space in "github.com/cometbft/cometbft v0.34.7" HTTPS_GIT := https://github.com/sge-network/sge.git DOCKER := $(shell which docker) DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR)/proto:/workspace --workdir /workspace bufbuild/buf @@ -72,7 +72,7 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sge \ -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/tendermint/tendermint/version.TMCoreSemVer=$(TM_VERSION) + -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(TM_VERSION) # DB backend selection ifeq (cleveldb,$(findstring cleveldb,$(SGE_BUILD_OPTIONS))) @@ -114,8 +114,8 @@ endif ############################################################################### check_version: -ifneq ($(GO_MINOR_VERSION),19) - @echo "ERROR: Go version 1.19 is required for this version of SGE. Go 1.19 has changes that are believed to break consensus." +ifneq ($(GO_MINOR_VERSION),20) + @echo "ERROR: Go version 1.20 is required for this version of SGE. Go 1.20 has changes that are believed to break consensus." exit 1 endif @@ -157,7 +157,7 @@ distclean: clean ### Proto ### ############################################################################### -proto-all: proto-format proto-gen +proto-all: proto-format proto-lint proto-gen docs: @echo @@ -177,36 +177,33 @@ docs: @echo .PHONY: docs -protoVer=v0.8 -protoImageName=sgenetwork/sge-proto-gen:$(protoVer) -containerProtoGen=cosmos-sdk-proto-gen-$(protoVer) -containerProtoFmt=cosmos-sdk-proto-fmt-$(protoVer) - -# this can be used to regenrate the proto image -proto-image: - cd proto; docker build -t $(protoImageName) -f Dockerfile . +protoVer=0.13.1 +protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) +protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) +# containerProtoGen=cosmos-sdk-proto-gen-$(protoVer) +# containerProtoFmt=cosmos-sdk-proto-fmt-$(protoVer) proto-gen: @echo "Generating Protobuf files" - @if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoGen}$$"; then docker start -a $(containerProtoGen); else docker run --name $(containerProtoGen) -v $(CURDIR):/workspace --workdir /workspace $(protoImageName) \ - sh ./scripts/protocgen.sh; fi + @$(protoImage) sh ./scripts/protocgen.sh + +proto-swagger-gen: + @echo "Generating Protobuf Swagger" + @$(protoImage) sh ./scripts/protoc-swagger-gen.sh + $(MAKE) update-swagger-docs proto-format: @echo "Formatting Protobuf files" - @if docker ps -a --format '{{.Names}}' | grep -Eq "^${containerProtoFmt}$$"; then docker start -a $(containerProtoFmt); else docker run --name $(containerProtoFmt) -v $(CURDIR):/workspace --workdir /workspace tendermintdev/docker-build-proto \ - find ./ -not -path "./third_party/*" -name "*.proto" -exec clang-format -i {} \; ; fi + @$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \; proto-image-build: @DOCKER_BUILDKIT=1 docker build -t $(protoImageName) -f ./proto/Dockerfile ./proto -proto-image-push: - docker push $(protoImageName) - proto-lint: - @$(DOCKER_BUF) lint --error-format=json + @$(protoImage) buf lint --error-format=json proto-check-breaking: - @$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=master + @$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=master ############################################################################### diff --git a/app/app.go b/app/app.go index c1ca54fd..a516bf04 100644 --- a/app/app.go +++ b/app/app.go @@ -7,16 +7,21 @@ import ( "os" "path/filepath" + 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" "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/codec" "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" - sdksimapp "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" @@ -24,13 +29,12 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/crisis" - distrclient "github.com/cosmos/cosmos-sdk/x/distribution/client" govclient "github.com/cosmos/cosmos-sdk/x/gov/client" paramsclient "github.com/cosmos/cosmos-sdk/x/params/client" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ibcclientHandler "github.com/cosmos/ibc-go/v5/modules/core/02-client/client" + ibcclientHandler "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" "github.com/gorilla/mux" "github.com/rakyll/statik/fs" "github.com/sge-network/sge/app/keepers" @@ -38,11 +42,6 @@ import ( "github.com/sge-network/sge/app/upgrades" v1 "github.com/sge-network/sge/app/upgrades/v1" "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" - dbm "github.com/tendermint/tm-db" // unnamed import of statik for swagger UI support _ "github.com/cosmos/cosmos-sdk/client/docs/statik" @@ -53,7 +52,6 @@ func getGovProposalHandlers() []govclient.ProposalHandler { govProposalHandlers = append(govProposalHandlers, paramsclient.ProposalHandler, - distrclient.ProposalHandler, upgradeclient.LegacyProposalHandler, upgradeclient.LegacyCancelProposalHandler, ibcclientHandler.UpdateClientProposalHandler, @@ -70,7 +68,7 @@ var ( ) var ( - _ sdksimapp.App = (*SgeApp)(nil) + _ runtime.AppI = (*SgeApp)(nil) _ servertypes.Application = (*SgeApp)(nil) ) @@ -175,8 +173,7 @@ func NewSgeApp( // can do so safely. app.mm.SetOrderInitGenesis(orderInitBlockers()...) - app.mm.RegisterInvariants(&app.CrisisKeeper) - app.mm.RegisterRoutes(app.Router(), app.QueryRouter(), encodingConfig.Amino) + app.mm.RegisterInvariants(app.CrisisKeeper) app.configurator = module.NewConfigurator( app.appCodec, @@ -347,6 +344,10 @@ func (app *SgeApp) RegisterTendermintService(clientCtx client.Context) { tmservice.RegisterTendermintService(clientCtx, app.BaseApp.GRPCQueryRouter(), app.interfaceRegistry, app.Query) } +func (app *SgeApp) RegisterNodeService(clientCtx client.Context) { + nodeservice.RegisterNodeService(clientCtx, app.GRPCQueryRouter()) +} + // configure store loader that checks if version == upgradeHeight and applies store upgrades func (app *SgeApp) setupUpgradeStoreLoaders() { upgradeInfo, err := app.UpgradeKeeper.ReadUpgradeInfoFromDisk() diff --git a/app/app_test.go b/app/app_test.go index 941f665d..34e8609c 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -3,11 +3,11 @@ package app_test import ( "testing" - sdksimapp "github.com/cosmos/cosmos-sdk/simapp" + tmdb "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" "github.com/sge-network/sge/app" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmdb "github.com/tendermint/tm-db" ) func TestApp(t *testing.T) { @@ -23,7 +23,7 @@ func TestApp(t *testing.T) { "", 0, encCdc, - sdksimapp.EmptyAppOptions{}, + simtestutil.EmptyAppOptions{}, ) } require.NotPanics(t, panicFunc) diff --git a/app/export.go b/app/export.go index 49414402..4b81b539 100644 --- a/app/export.go +++ b/app/export.go @@ -5,18 +5,18 @@ import ( "fmt" "log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/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" "github.com/cosmos/cosmos-sdk/x/staking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) // ExportAppStateAndValidators exports the state of the application for a genesis // file. func (app *SgeApp) 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()}) @@ -29,7 +29,7 @@ func (app *SgeApp) 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/export_test.go b/app/export_test.go index 41d5756e..1a87184b 100644 --- a/app/export_test.go +++ b/app/export_test.go @@ -31,7 +31,7 @@ func TestExport(t *testing.T) { require.NoError(t, err) tApp.Commit() - _, err = tApp.ExportAppStateAndValidators(tc.forZeroHeight, []string{}) + _, err = tApp.ExportAppStateAndValidators(tc.forZeroHeight, []string{}, []string{}) require.NoError(t, err, "ExportAppStateAndValidators should not have an error") }) } diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 173e9124..9e495864 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -5,7 +5,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" servertypes "github.com/cosmos/cosmos-sdk/server/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" @@ -13,9 +12,10 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" + consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" - distr "github.com/cosmos/cosmos-sdk/x/distribution" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" evidencekeeper "github.com/cosmos/cosmos-sdk/x/evidence/keeper" @@ -39,28 +39,28 @@ 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" - icahost "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host" - ibc "github.com/cosmos/ibc-go/v5/modules/core" + icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host" + ibc "github.com/cosmos/ibc-go/v7/modules/core" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" // ibc-go - ica "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts" - icacontroller "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller" - icacontrollerkeeper "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/keeper" - icacontrollertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types" - icahostkeeper "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/keeper" - icahosttypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types" - ibcfee "github.com/cosmos/ibc-go/v5/modules/apps/29-fee" - ibcfeekeeper "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/keeper" - ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types" - "github.com/cosmos/ibc-go/v5/modules/apps/transfer" - ibctransferkeeper "github.com/cosmos/ibc-go/v5/modules/apps/transfer/keeper" - ibctransfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" - ibcclient "github.com/cosmos/ibc-go/v5/modules/core/02-client" - ibcclienttypes "github.com/cosmos/ibc-go/v5/modules/core/02-client/types" - ibcporttypes "github.com/cosmos/ibc-go/v5/modules/core/05-port/types" - ibchost "github.com/cosmos/ibc-go/v5/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v5/modules/core/keeper" + 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" + 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" + ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" + ibcfeekeeper "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/keeper" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" + ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcporttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" mintkeeper "github.com/sge-network/sge/x/mint/keeper" minttypes "github.com/sge-network/sge/x/mint/types" @@ -97,21 +97,22 @@ type AppKeepers struct { memKeys map[string]*storetypes.MemoryStoreKey // SDK keepers - AccountKeeper authkeeper.AccountKeeper - BankKeeper bankkeeper.Keeper - CapabilityKeeper *capabilitykeeper.Keeper - StakingKeeper stakingkeeper.Keeper - SlashingKeeper slashingkeeper.Keeper - DistrKeeper distrkeeper.Keeper - GovKeeper govkeeper.Keeper - CrisisKeeper crisiskeeper.Keeper - UpgradeKeeper upgradekeeper.Keeper - ParamsKeeper paramskeeper.Keeper - EvidenceKeeper evidencekeeper.Keeper - TransferKeeper ibctransferkeeper.Keeper - FeeGrantKeeper feegrantkeeper.Keeper - AuthzKeeper authzkeeper.Keeper - GroupKeeper groupkeeper.Keeper + AccountKeeper authkeeper.AccountKeeper + BankKeeper bankkeeper.Keeper + CapabilityKeeper *capabilitykeeper.Keeper + StakingKeeper *stakingkeeper.Keeper + SlashingKeeper slashingkeeper.Keeper + DistrKeeper distrkeeper.Keeper + GovKeeper *govkeeper.Keeper + CrisisKeeper *crisiskeeper.Keeper + UpgradeKeeper *upgradekeeper.Keeper + ParamsKeeper paramskeeper.Keeper + EvidenceKeeper evidencekeeper.Keeper + TransferKeeper ibctransferkeeper.Keeper + FeeGrantKeeper feegrantkeeper.Keeper + AuthzKeeper authzkeeper.Keeper + GroupKeeper groupkeeper.Keeper + ConsensusParamsKeeper consensusparamkeeper.Keeper //// SGE keepers \\\\ BetKeeper *betmodulekeeper.Keeper @@ -170,11 +171,11 @@ func NewAppKeeper( appKeepers.tkeys[paramstypes.TStoreKey], ) + govModAddress := authtypes.NewModuleAddress(govtypes.ModuleName).String() + // set the BaseApp's parameter store - bApp.SetParamStore( - appKeepers.ParamsKeeper.Subspace(baseapp.Paramspace). - WithKeyTable(paramstypes.ConsensusParamsKeyTable()), - ) + appKeepers.ConsensusParamsKeeper = consensusparamkeeper.NewKeeper(appCodec, appKeepers.keys[consensusparamtypes.StoreKey], govModAddress) + bApp.SetParamStore(&appKeepers.ConsensusParamsKeeper) // add capability keeper and ScopeToModule for ibc module appKeepers.CapabilityKeeper = capabilitykeeper.NewKeeper( @@ -184,7 +185,7 @@ func NewAppKeeper( ) // grant capabilities for the ibc and ibc-transfer modules - appKeepers.ScopedIBCKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibchost.ModuleName) + appKeepers.ScopedIBCKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName) appKeepers.ScopedTransferKeeper = appKeepers.CapabilityKeeper.ScopeToModule( ibctransfertypes.ModuleName, ) @@ -199,26 +200,28 @@ func NewAppKeeper( // add keepers appKeepers.CrisisKeeper = crisiskeeper.NewKeeper( - appKeepers.GetSubspace(crisistypes.ModuleName), + appCodec, + appKeepers.keys[crisistypes.StoreKey], invCheckPeriod, appKeepers.BankKeeper, authtypes.FeeCollectorName, + govModAddress, ) appKeepers.AccountKeeper = authkeeper.NewAccountKeeper( appCodec, appKeepers.keys[authtypes.StoreKey], - appKeepers.GetSubspace(authtypes.ModuleName), authtypes.ProtoBaseAccount, maccPerms, - sdk.GetConfig().GetBech32AccountAddrPrefix(), + AccountAddressPrefix, + govModAddress, ) appKeepers.BankKeeper = bankkeeper.NewBaseKeeper( appCodec, appKeepers.keys[banktypes.StoreKey], appKeepers.AccountKeeper, - appKeepers.GetSubspace(banktypes.ModuleName), - moduleAccAddress, + BlockedAddresses(maccPerms), + govModAddress, ) appKeepers.AuthzKeeper = authzkeeper.NewKeeper( appKeepers.keys[authzkeeper.StoreKey], @@ -246,7 +249,7 @@ func NewAppKeeper( appKeepers.keys[stakingtypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BankKeeper, - appKeepers.GetSubspace(stakingtypes.ModuleName), + govModAddress, ) appKeepers.MintKeeper = *mintkeeper.NewKeeper( @@ -264,22 +267,23 @@ func NewAppKeeper( appKeepers.DistrKeeper = distrkeeper.NewKeeper( appCodec, appKeepers.keys[distrtypes.StoreKey], - appKeepers.GetSubspace(distrtypes.ModuleName), appKeepers.AccountKeeper, appKeepers.BankKeeper, appKeepers.StakingKeeper, authtypes.FeeCollectorName, + govModAddress, ) appKeepers.SlashingKeeper = slashingkeeper.NewKeeper( appCodec, + cdc, appKeepers.keys[slashingtypes.StoreKey], appKeepers.StakingKeeper, - appKeepers.GetSubspace(slashingtypes.ModuleName), + govModAddress, ) // register the staking hooks // NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks - appKeepers.StakingKeeper = *appKeepers.StakingKeeper.SetHooks( + appKeepers.StakingKeeper.SetHooks( stakingtypes.NewMultiStakingHooks( appKeepers.DistrKeeper.Hooks(), appKeepers.SlashingKeeper.Hooks(), @@ -299,8 +303,8 @@ func NewAppKeeper( // Create IBC Keeper appKeepers.IBCKeeper = ibckeeper.NewKeeper( appCodec, - appKeepers.keys[ibchost.StoreKey], - appKeepers.GetSubspace(ibchost.ModuleName), + appKeepers.keys[ibcexported.StoreKey], + appKeepers.GetSubspace(ibcexported.ModuleName), appKeepers.StakingKeeper, appKeepers.UpgradeKeeper, appKeepers.ScopedIBCKeeper, @@ -311,7 +315,6 @@ func NewAppKeeper( govRouter. AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(appKeepers.ParamsKeeper)). - AddRoute(distrtypes.RouterKey, distr.NewCommunityPoolSpendProposalHandler(appKeepers.DistrKeeper)). AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(appKeepers.UpgradeKeeper)). AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(appKeepers.IBCKeeper.ClientKeeper)) @@ -320,23 +323,23 @@ func NewAppKeeper( appKeepers.GovKeeper = govkeeper.NewKeeper( appCodec, appKeepers.keys[govtypes.StoreKey], - appKeepers.GetSubspace(govtypes.ModuleName), appKeepers.AccountKeeper, appKeepers.BankKeeper, appKeepers.StakingKeeper, - govRouter, bApp.MsgServiceRouter(), govConfig, + govModAddress, ) // IBC Fee Module keeper appKeepers.IBCFeeKeeper = ibcfeekeeper.NewKeeper( appCodec, appKeepers.keys[ibcfeetypes.StoreKey], - appKeepers.GetSubspace(ibcfeetypes.ModuleName), appKeepers.IBCKeeper.ChannelKeeper, // more middlewares can be added in future appKeepers.IBCKeeper.ChannelKeeper, - &appKeepers.IBCKeeper.PortKeeper, appKeepers.AccountKeeper, appKeepers.BankKeeper, + &appKeepers.IBCKeeper.PortKeeper, + appKeepers.AccountKeeper, + appKeepers.BankKeeper, ) appKeepers.TransferKeeper = ibctransferkeeper.NewKeeper( @@ -377,7 +380,7 @@ func NewAppKeeper( appKeepers.EvidenceKeeper = *evidencekeeper.NewKeeper( appCodec, appKeepers.keys[evidencetypes.StoreKey], - &appKeepers.StakingKeeper, + appKeepers.StakingKeeper, appKeepers.SlashingKeeper, ) @@ -522,7 +525,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) - paramsKeeper.Subspace(ibchost.ModuleName) + paramsKeeper.Subspace(ibcexported.ModuleName) paramsKeeper.Subspace(icacontrollertypes.SubModuleName) paramsKeeper.Subspace(icahosttypes.SubModuleName) paramsKeeper.Subspace(betmoduletypes.ModuleName) @@ -533,3 +536,26 @@ func initParamsKeeper(appCodec codec.BinaryCodec, return paramsKeeper } + +// BlockedAddresses returns all the app's blocked account addresses. +func BlockedAddresses(maccPerms map[string][]string) map[string]bool { + modAccAddrs := make(map[string]bool) + for acc := range GetMaccPerms(maccPerms) { + modAccAddrs[authtypes.NewModuleAddress(acc).String()] = true + } + + // allow the following addresses to receive funds + delete(modAccAddrs, authtypes.NewModuleAddress(govtypes.ModuleName).String()) + + return modAccAddrs +} + +// GetMaccPerms returns a copy of the module account permissions +func GetMaccPerms(maccPerms map[string][]string) map[string][]string { + dupMaccPerms := make(map[string][]string) + for k, v := range maccPerms { + dupMaccPerms[k] = v + } + + return dupMaccPerms +} diff --git a/app/keepers/keys.go b/app/keepers/keys.go index aa207d4e..e212a716 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -7,6 +7,8 @@ import ( authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" "github.com/cosmos/cosmos-sdk/x/feegrant" @@ -16,11 +18,11 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - icacontrollertypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/controller/types" - icahosttypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/host/types" - ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types" - ibctransfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" - ibchost "github.com/cosmos/ibc-go/v5/modules/core/24-host" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" + icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" betmoduletypes "github.com/sge-network/sge/x/bet/types" ovmmoduletypes "github.com/sge-network/sge/x/ovm/types" @@ -34,16 +36,20 @@ import ( _ "github.com/cosmos/cosmos-sdk/client/docs/statik" ) +const ( + // AccountAddressPrefix prefix used for generating account address + AccountAddressPrefix = "sge" +) + func (appKeepers *AppKeepers) GenerateKeys() { // Define what keys will be used in the cosmos-sdk key/value store. // Cosmos-SDK modules each have a "key" that allows the application to reference what they've stored on the chain. appKeepers.keys = sdk.NewKVStoreKeys( - authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey, + authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey, crisistypes.StoreKey, minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey, - govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, - evidencetypes.StoreKey, ibctransfertypes.StoreKey, - capabilitytypes.StoreKey, feegrant.StoreKey, authzkeeper.StoreKey, group.StoreKey, - ibcfeetypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, + govtypes.StoreKey, paramstypes.StoreKey, consensusparamtypes.StoreKey, upgradetypes.StoreKey, + feegrant.StoreKey, evidencetypes.StoreKey, capabilitytypes.StoreKey, authzkeeper.StoreKey, group.StoreKey, + ibcexported.StoreKey, ibctransfertypes.StoreKey, ibcfeetypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, orderbookmoduletypes.StoreKey, betmoduletypes.StoreKey, marketmoduletypes.StoreKey, diff --git a/app/modules.go b/app/modules.go index 29d285fc..11a0f59b 100644 --- a/app/modules.go +++ b/app/modules.go @@ -35,14 +35,14 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/cosmos-sdk/x/upgrade" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ica "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts" - icatypes "github.com/cosmos/ibc-go/v5/modules/apps/27-interchain-accounts/types" - ibcfee "github.com/cosmos/ibc-go/v5/modules/apps/29-fee" - ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types" - "github.com/cosmos/ibc-go/v5/modules/apps/transfer" - ibctransfertypes "github.com/cosmos/ibc-go/v5/modules/apps/transfer/types" - ibc "github.com/cosmos/ibc-go/v5/modules/core" - ibchost "github.com/cosmos/ibc-go/v5/modules/core/24-host" + ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" + icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" + ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" + "github.com/cosmos/ibc-go/v7/modules/apps/transfer" + ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + ibc "github.com/cosmos/ibc-go/v7/modules/core" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" sgeappparams "github.com/sge-network/sge/app/params" "github.com/sge-network/sge/x/mint" minttypes "github.com/sge-network/sge/x/mint/types" @@ -91,7 +91,7 @@ var mAccPerms = map[string][]string{ // and genesis verification. var ModuleBasics = module.NewBasicManager( auth.AppModuleBasic{}, - genutil.AppModuleBasic{}, + genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator), bank.AppModuleBasic{}, capability.AppModuleBasic{}, staking.AppModuleBasic{}, @@ -134,12 +134,12 @@ func appModules( app.BaseApp.DeliverTx, encodingConfig.TxConfig, ), - auth.NewAppModule(appCodec, app.AccountKeeper, nil), + auth.NewAppModule(appCodec, app.AccountKeeper, nil, app.GetSubspace(authtypes.ModuleName)), vesting.NewAppModule(app.AccountKeeper, app.BankKeeper), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), - crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), - gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + capability.NewAppModule(appCodec, *app.CapabilityKeeper, false), + crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), + gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)), mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, app.BankKeeper), slashing.NewAppModule( appCodec, @@ -147,6 +147,7 @@ func appModules( app.AccountKeeper, app.BankKeeper, app.StakingKeeper, + app.GetSubspace(slashingtypes.ModuleName), ), distr.NewAppModule( appCodec, @@ -154,8 +155,9 @@ func appModules( app.AccountKeeper, app.BankKeeper, app.StakingKeeper, + app.GetSubspace(distrtypes.ModuleName), ), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), upgrade.NewAppModule(app.UpgradeKeeper), evidence.NewAppModule(app.EvidenceKeeper), feegrantmodule.NewAppModule( @@ -203,9 +205,9 @@ func simulationModules( appCodec := encodingConfig.Marshaler return []module.AppModuleSimulation{ - auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), + auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts, app.GetSubspace(authtypes.ModuleName)), + bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper, app.GetSubspace(banktypes.ModuleName)), + capability.NewAppModule(appCodec, *app.CapabilityKeeper, false), feegrantmodule.NewAppModule( appCodec, app.AccountKeeper, @@ -213,15 +215,16 @@ func simulationModules( app.FeeGrantKeeper, app.interfaceRegistry, ), - gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), + gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)), mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), distr.NewAppModule( appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper, + app.GetSubspace(distrtypes.ModuleName), ), slashing.NewAppModule( appCodec, @@ -229,6 +232,7 @@ func simulationModules( app.AccountKeeper, app.BankKeeper, app.StakingKeeper, + app.GetSubspace(stakingtypes.ModuleName), ), params.NewAppModule(app.ParamsKeeper), evidence.NewAppModule(app.EvidenceKeeper), @@ -267,7 +271,7 @@ func orderBeginBlockers() []string { evidencetypes.ModuleName, stakingtypes.ModuleName, ibctransfertypes.ModuleName, - ibchost.ModuleName, + ibcexported.ModuleName, authtypes.ModuleName, banktypes.ModuleName, govtypes.ModuleName, @@ -293,7 +297,7 @@ func orderEndBlockers() []string { crisistypes.ModuleName, govtypes.ModuleName, stakingtypes.ModuleName, - ibchost.ModuleName, + ibcexported.ModuleName, ibctransfertypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, @@ -329,7 +333,7 @@ func orderInitBlockers() []string { slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, - ibchost.ModuleName, + ibcexported.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, diff --git a/app/prefix.go b/app/prefix.go index 8e896ff9..caed132a 100644 --- a/app/prefix.go +++ b/app/prefix.go @@ -2,31 +2,27 @@ package app import ( sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/sge-network/sge/app/keepers" "github.com/sge-network/sge/app/params" ) -const ( - // AccountAddressPrefix prefix used for generating account address - AccountAddressPrefix = "sge" -) - var ( // AccountPubKeyPrefix used for generating public key - AccountPubKeyPrefix = AccountAddressPrefix + "pub" + AccountPubKeyPrefix = keepers.AccountAddressPrefix + "pub" // ValidatorAddressPrefix used for generating validator address - ValidatorAddressPrefix = AccountAddressPrefix + "valoper" + ValidatorAddressPrefix = keepers.AccountAddressPrefix + "valoper" // ValidatorPubKeyPrefix used for generating validator public key - ValidatorPubKeyPrefix = AccountAddressPrefix + "valoperpub" + ValidatorPubKeyPrefix = keepers.AccountAddressPrefix + "valoperpub" // ConsNodeAddressPrefix used for generating consensus node address - ConsNodeAddressPrefix = AccountAddressPrefix + "valcons" + ConsNodeAddressPrefix = keepers.AccountAddressPrefix + "valcons" // ConsNodePubKeyPrefix used for generating consensus node public key - ConsNodePubKeyPrefix = AccountAddressPrefix + "valconspub" + ConsNodePubKeyPrefix = keepers.AccountAddressPrefix + "valconspub" ) // SetConfig sets prefixes configuration func SetConfig() { config := sdk.GetConfig() - config.SetBech32PrefixForAccount(AccountAddressPrefix, AccountPubKeyPrefix) + config.SetBech32PrefixForAccount(keepers.AccountAddressPrefix, AccountPubKeyPrefix) config.SetBech32PrefixForValidator(ValidatorAddressPrefix, ValidatorPubKeyPrefix) config.SetBech32PrefixForConsensusNode(ConsNodeAddressPrefix, ConsNodePubKeyPrefix) diff --git a/app/sim_test.go b/app/sim_test.go index fb26dcd8..fe522de7 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -6,17 +6,18 @@ import ( "os" "testing" + sdksimapp "cosmossdk.io/simapp" + dbm "github.com/cometbft/cometbft-db" + "github.com/cometbft/cometbft/libs/log" + "github.com/cometbft/cometbft/libs/rand" "github.com/cosmos/cosmos-sdk/baseapp" - sdksimapp "github.com/cosmos/cosmos-sdk/simapp" - "github.com/cosmos/cosmos-sdk/simapp/helpers" "github.com/cosmos/cosmos-sdk/store" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" simulation2 "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" + simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" "github.com/sge-network/sge/app" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/libs/rand" - dbm "github.com/tendermint/tm-db" ) // SimAppChainID hardcoded chainID for simulation @@ -25,13 +26,13 @@ const ( ) func init() { - sdksimapp.GetSimulatorFlags() + simcli.GetSimulatorFlags() } // Profile with: // /usr/local/go/bin/go test -benchmem -run=^$ github.com/cosmos/cosmos-sdk/SgeApp -bench ^BenchmarkFullAppSimulation$ -Commit=true -cpuprofile cpu.out func BenchmarkFullAppSimulation(b *testing.B) { - config, db, dir, logger, _, err := sdksimapp.SetupSimulation("goleveldb-app-sim", "Simulation") + config, db, dir, logger, _, err := simtestutil.SetupSimulation("goleveldb-app-sim", "Simulation") if err != nil { b.Fatalf("simulation setup failed: %s", err.Error()) } @@ -51,9 +52,9 @@ func BenchmarkFullAppSimulation(b *testing.B) { true, map[int64]bool{}, app.DefaultNodeHome, - sdksimapp.FlagPeriodValue, + simcli.FlagPeriodValue, app.MakeEncodingConfig(), - sdksimapp.EmptyAppOptions{}, + simtestutil.EmptyAppOptions{}, interBlockCacheOpt(), ) @@ -62,16 +63,16 @@ func BenchmarkFullAppSimulation(b *testing.B) { b, os.Stdout, app.BaseApp, - sdksimapp.AppStateFn(app.AppCodec(), app.SimulationManager()), + simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager()), simulation2.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - sdksimapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), ) // export state and simParams before the simulation error is checked - if err = sdksimapp.CheckExportSimulation(app, config, simParams); err != nil { + if err = simtestutil.CheckExportSimulation(app, config, simParams); err != nil { b.Fatal(err) } @@ -80,7 +81,7 @@ func BenchmarkFullAppSimulation(b *testing.B) { } if config.Commit { - sdksimapp.PrintStats(db) + simtestutil.PrintStats(db) } } @@ -91,7 +92,7 @@ func interBlockCacheOpt() func(*baseapp.BaseApp) { } func TestAppStateDeterminism(t *testing.T) { - if !sdksimapp.FlagEnabledValue { + if !simcli.FlagEnabledValue { t.Skip("skipping application simulation") } @@ -100,7 +101,7 @@ func TestAppStateDeterminism(t *testing.T) { config.ExportParamsPath = "" config.OnOperation = false config.AllInvariants = false - config.ChainID = helpers.SimAppChainID + config.ChainID = sdksimapp.SimAppChainID numSeeds := 3 numTimesToRunPerSeed := 5 @@ -111,7 +112,7 @@ func TestAppStateDeterminism(t *testing.T) { for j := 0; j < numTimesToRunPerSeed; j++ { var logger log.Logger - if sdksimapp.FlagVerboseValue { + if simcli.FlagVerboseValue { logger = log.TestingLogger() } else { logger = log.NewNopLogger() @@ -125,9 +126,9 @@ func TestAppStateDeterminism(t *testing.T) { true, map[int64]bool{}, app.DefaultNodeHome, - sdksimapp.FlagPeriodValue, + simcli.FlagPeriodValue, app.MakeEncodingConfig(), - sdksimapp.EmptyAppOptions{}, + simtestutil.EmptyAppOptions{}, interBlockCacheOpt(), ) @@ -140,9 +141,9 @@ func TestAppStateDeterminism(t *testing.T) { t, os.Stdout, app.BaseApp, - sdksimapp.AppStateFn(app.AppCodec(), app.SimulationManager()), + simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager()), simulation2.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - sdksimapp.SimulationOperations(app, app.AppCodec(), config), + simtestutil.SimulationOperations(app, app.AppCodec(), config), app.ModuleAccountAddrs(), config, app.AppCodec(), @@ -150,7 +151,7 @@ func TestAppStateDeterminism(t *testing.T) { require.NoError(t, err) if config.Commit { - sdksimapp.PrintStats(db) + simtestutil.PrintStats(db) } appHash := app.LastCommitID().Hash diff --git a/app/upgrades/v1/consts.go b/app/upgrades/v1/consts.go index b39ad681..edc284ae 100644 --- a/app/upgrades/v1/consts.go +++ b/app/upgrades/v1/consts.go @@ -4,7 +4,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/x/group" - ibcfeetypes "github.com/cosmos/ibc-go/v5/modules/apps/29-fee/types" + ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" "github.com/sge-network/sge/app/upgrades" ) diff --git a/app/upgrades/v1/upgrades.go b/app/upgrades/v1/upgrades.go index 30cfff98..527444c3 100644 --- a/app/upgrades/v1/upgrades.go +++ b/app/upgrades/v1/upgrades.go @@ -39,7 +39,7 @@ func CreateUpgradeHandler( keepers *keepers.AppKeepers, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - setCommissionRate(&keepers.StakingKeeper, ctx) + setCommissionRate(keepers.StakingKeeper, ctx) return mm.RunMigrations(ctx, configurator, fromVM) } diff --git a/buf.gen.yaml b/buf.gen.yaml new file mode 100644 index 00000000..aaa7db84 --- /dev/null +++ b/buf.gen.yaml @@ -0,0 +1,8 @@ +version: v1 +plugins: + - name: gocosmos + out: . + opt: plugins=interfacetype+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/buf.work.yaml b/buf.work.yaml new file mode 100644 index 00000000..7a18eb02 --- /dev/null +++ b/buf.work.yaml @@ -0,0 +1,3 @@ +version: v1 +directories: + - proto \ No newline at end of file diff --git a/cmd/sged/cmd/root.go b/cmd/sged/cmd/root.go index 3767e21c..763651e3 100644 --- a/cmd/sged/cmd/root.go +++ b/cmd/sged/cmd/root.go @@ -5,6 +5,15 @@ import ( "os" "path/filepath" + "github.com/spf13/cast" + "github.com/spf13/cobra" + + 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" @@ -23,15 +32,12 @@ import ( "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/sge-network/sge/app" "github.com/sge-network/sge/app/params" - "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" ) // NewRootCmd creates a new root command for simd. It is called once in the @@ -82,9 +88,11 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { cfg := sdk.GetConfig() cfg.Seal() + 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, @@ -187,6 +195,18 @@ func newApp( panic(err) } + homeDir := cast.ToString(appOpts.Get(flags.FlagHome)) + 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 + } + snapshotDir := filepath.Join(cast.ToString(appOpts.Get(flags.FlagHome)), "data", "snapshots") snapshotDB, err := dbm.NewGoLevelDB("metadata", snapshotDir) if err != nil { @@ -219,6 +239,9 @@ func newApp( Interval: cast.ToUint64(appOpts.Get(server.FlagStateSyncSnapshotInterval)), KeepRecent: cast.ToUint32(appOpts.Get(server.FlagStateSyncSnapshotKeepRecent)), }), + baseapp.SetIAVLCacheSize(cast.ToInt(appOpts.Get(server.FlagIAVLCacheSize))), + baseapp.SetIAVLDisableFastNode(cast.ToBool(appOpts.Get(server.FlagDisableIAVLFastNode))), + baseapp.SetChainID(chainID), ) } @@ -230,6 +253,7 @@ func createSimappAndExport( forZeroHeight bool, jailAllowedAddrs []string, appOpts servertypes.AppOptions, + modulesToExport []string, ) (servertypes.ExportedApp, error) { encCfg := app.MakeEncodingConfig() // Ideally, we would reuse the one created by NewRootCmd. encCfg.Marshaler = codec.NewProtoCodec(encCfg.InterfaceRegistry) @@ -254,5 +278,5 @@ func createSimappAndExport( sgeApp = app.NewSgeApp(logger, db, traceStore, true, map[int64]bool{}, "", cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), encCfg, appOpts) } - return sgeApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs) + return sgeApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) } diff --git a/go.mod b/go.mod index c0b06a12..adaf6edc 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,16 @@ module github.com/sge-network/sge -go 1.19 +go 1.20 require ( cosmossdk.io/math v1.1.2 - github.com/cosmos/cosmos-sdk v0.46.14 - github.com/cosmos/gogoproto v1.4.11 - github.com/cosmos/ibc-go/v5 v5.3.1 - github.com/gogo/protobuf v1.3.3 + cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 + github.com/cometbft/cometbft v0.37.2 + github.com/cometbft/cometbft-db v0.8.0 + github.com/cosmos/cosmos-proto v1.0.0-beta.2 + github.com/cosmos/cosmos-sdk v0.47.5 + github.com/cosmos/gogoproto v1.4.10 + github.com/cosmos/ibc-go/v7 v7.3.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/protobuf v1.5.3 @@ -15,15 +18,14 @@ require ( github.com/google/uuid v1.3.1 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/mrz1836/go-sanitize v1.3.1 github.com/rakyll/statik v0.1.7 github.com/spf13/cast v1.5.1 - github.com/spf13/cobra v1.6.1 + github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 - github.com/tendermint/tendermint v0.34.29 - github.com/tendermint/tm-db v0.6.7 - google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e - google.golang.org/grpc v1.57.0 + google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d + google.golang.org/grpc v1.58.1 gopkg.in/yaml.v2 v2.4.0 mvdan.cc/gofumpt v0.4.0 ) @@ -33,25 +35,24 @@ require ( github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect github.com/alingse/asasalint v0.0.11 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/iavl v0.19.6 // indirect - github.com/creachadair/taskgroup v0.3.2 // indirect + github.com/cosmos/iavl v0.20.0 // indirect + github.com/creachadair/taskgroup v0.4.2 // indirect github.com/curioswitch/go-reassign v0.2.0 // indirect - github.com/felixge/httpsnoop v1.0.1 // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect github.com/google/btree v1.1.2 // indirect github.com/kkHAIKE/contextcheck v1.1.3 // indirect github.com/maratori/testableexamples v1.0.0 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/regen-network/cosmos-proto v0.3.1 // indirect github.com/sashamelentyev/interfacebloat v1.1.0 // indirect github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect github.com/sivchari/nosnakecase v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.14.0 // indirect + github.com/spf13/viper v1.16.0 // indirect github.com/timonwong/loggercheck v0.9.3 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect - golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb // indirect + golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect ) require ( @@ -61,23 +62,27 @@ require ( 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 - cosmossdk.io/errors v1.0.0-beta.7 // indirect - filippo.io/edwards25519 v1.0.0-rc.1 // indirect + cosmossdk.io/api v0.3.1 // indirect + cosmossdk.io/core v0.5.1 // indirect + cosmossdk.io/depinject v1.0.0-alpha.4 // indirect + cosmossdk.io/errors v1.0.0 // indirect + cosmossdk.io/log v1.2.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/Antonboom/errname v0.1.7 // indirect github.com/Antonboom/nilnil v0.1.1 // indirect github.com/BurntSushi/toml v1.2.1 // indirect - github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect + github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/OpenPeeDeeP/depguard v1.1.1 // indirect - github.com/Workiva/go-datastructures v1.0.53 // indirect github.com/alexkohler/prealloc v1.0.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/ashanbrown/forbidigo v1.3.0 // indirect github.com/ashanbrown/makezero v1.1.1 // indirect - github.com/aws/aws-sdk-go v1.44.122 // 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 @@ -93,15 +98,18 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/charithe/durationcheck v0.0.9 // indirect github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect - github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // 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/cometbft/cometbft-db v0.7.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect - github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect - github.com/cosmos/gorocksdb v1.2.0 // indirect + github.com/cosmos/gogogateway v1.2.0 // indirect + github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect + github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect github.com/daixiang0/gci v0.8.1 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -109,9 +117,9 @@ require ( github.com/denis-tingaikin/go-header v0.4.3 // 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/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/esimonov/ifshort v1.0.4 // indirect github.com/ettle/strcase v0.1.1 // indirect @@ -120,11 +128,12 @@ require ( github.com/firefart/nonamedreturns v1.0.4 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect - github.com/gin-gonic/gin v1.8.1 // indirect + github.com/getsentry/sentry-go v0.23.0 // indirect + github.com/ghodss/yaml v1.0.0 // indirect github.com/go-critic/go-critic v0.6.5 // 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-toolsmith/astcast v1.0.0 // indirect github.com/go-toolsmith/astcopy v1.0.2 // indirect github.com/go-toolsmith/astequal v1.0.3 // indirect @@ -136,9 +145,11 @@ require ( github.com/gobwas/glob v0.2.3 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gofrs/flock v0.8.1 // indirect - github.com/gogo/gateway v1.1.0 // indirect + github.com/gogo/googleapis v1.4.1 // indirect + github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/glog v1.1.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect @@ -150,7 +161,6 @@ require ( github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // 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.4 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect @@ -168,17 +178,18 @@ require ( github.com/gtank/ristretto255 v0.1.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-getter v1.7.0 // indirect + github.com/hashicorp/go-getter v1.7.1 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-multierror v1.1.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/hexops/gotextdiff v1.0.3 // indirect + github.com/huandu/skiplist v1.2.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jgautheron/goconst v1.5.1 // indirect github.com/jingyugao/rowserrcheck v1.1.1 // indirect github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect @@ -187,7 +198,9 @@ require ( github.com/julz/importas v0.1.0 // indirect github.com/kisielk/errcheck v1.6.2 // indirect github.com/kisielk/gotool v1.0.0 // indirect - github.com/klauspost/compress v1.16.0 // indirect + github.com/klauspost/compress v1.16.3 // indirect + github.com/kr/pretty v0.3.1 // indirect + github.com/kr/text v0.2.0 // indirect github.com/kulti/thelper v0.6.3 // indirect github.com/kunwardeep/paralleltest v1.0.6 // indirect github.com/kyoh86/exportloopref v0.1.8 // indirect @@ -196,13 +209,14 @@ require ( github.com/leonklingele/grouper v1.1.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.7.16 // indirect github.com/lufeee/execinquery v1.2.1 // indirect - github.com/magiconair/properties v1.8.6 // indirect + github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/maratori/testpackage v1.1.0 // indirect github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/mattn/go-runewidth v0.0.10 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mbilski/exhaustivestruct v1.2.0 // indirect @@ -219,8 +233,7 @@ require ( github.com/nishanths/exhaustive v0.8.3 // indirect github.com/nishanths/predeclared v0.2.2 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.7 // indirect + github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -235,8 +248,9 @@ require ( github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rivo/uniseg v0.2.0 // indirect - github.com/rs/cors v1.8.2 // indirect - github.com/rs/zerolog v1.29.1 // indirect + github.com/rogpeppe/go-internal v1.11.0 // indirect + github.com/rs/cors v1.8.3 // indirect + github.com/rs/zerolog v1.30.0 // indirect github.com/ryancurrah/gomodguard v1.2.4 // indirect github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect @@ -248,22 +262,21 @@ require ( github.com/sivchari/tenv v1.7.0 // indirect github.com/sonatard/noctx v0.0.1 // indirect github.com/sourcegraph/go-diff v0.6.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/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect github.com/stretchr/objx v0.5.0 // indirect - github.com/subosito/gotenv v1.4.1 // indirect + github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tdakkota/asciicheck v0.1.1 // indirect - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tetafro/godot v1.4.11 // indirect - github.com/tidwall/btree v1.5.0 // indirect + github.com/tidwall/btree v1.6.0 // indirect github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect github.com/tomarrell/wrapcheck/v2 v2.7.0 // indirect github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect - github.com/ulikunitz/xz v0.5.10 // indirect + github.com/ulikunitz/xz v0.5.11 // indirect github.com/ultraware/funlen v0.0.3 // indirect github.com/ultraware/whitespace v0.0.5 // indirect github.com/uudashr/gocognit v1.0.6 // indirect @@ -272,23 +285,23 @@ require ( github.com/zondax/hid v0.9.1 // indirect github.com/zondax/ledger-go v0.14.1 // indirect gitlab.com/bosi/decorder v0.2.3 // indirect - go.etcd.io/bbolt v1.3.6 // 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.14.0 // indirect golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect - golang.org/x/mod v0.11.0 // indirect - golang.org/x/net v0.14.0 // indirect - golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sync v0.2.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/tools v0.6.0 // indirect + golang.org/x/mod v0.13.0 // indirect + golang.org/x/net v0.16.0 // indirect + golang.org/x/oauth2 v0.12.0 // indirect + golang.org/x/sync v0.4.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/tools v0.14.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-20230803162519-f966b187b2e5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // 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 @@ -297,19 +310,28 @@ require ( mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect nhooyr.io/websocket v1.8.7 // indirect + pgregory.net/rapid v0.5.5 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) replace ( - // use cosmos fork of keyring + // cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 + + // support concurrency for iavl + github.com/cosmos/iavl => github.com/cosmos/iavl v0.20.1 + + // dgrijalva/jwt-go is deprecated and doesn't receive security updates. + // TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 + + // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. + // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 - // use cosmos-compatible protobufs - github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - github.com/jhump/protoreflect => github.com/jhump/protoreflect v1.9.0 - // replace broken goleveldb. + + // github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 + + // https://github.com/cosmos/cosmos-sdk/issues/14949 + // pin the version of goleveldb to v1.0.1-0.20210819022825-2ae1ddf74ef7 required by SDK v47 upgrade guide. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 - // use cometbft - github.com/tendermint/tendermint => github.com/cometbft/cometbft v0.34.29 ) diff --git a/go.sum b/go.sum index 8e57bd85..c4ec9fc0 100644 --- a/go.sum +++ b/go.sum @@ -193,13 +193,26 @@ 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= -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/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.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.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/simapp v0.0.0-20230831152633-2e9e5d6eea24 h1:A+LHM41uss8WNJ+qZCdvCjtiG6UiIN7ZqmPZz6R25wc= +cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24/go.mod h1:1kVkzonF2p6SYsSMXXURz/kx50QWArqazCk1Myulu8g= +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= -filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU= 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/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= 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= @@ -218,8 +231,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 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/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= -github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= +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/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= @@ -242,8 +255,6 @@ github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrU 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 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/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= @@ -277,8 +288,9 @@ github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5Fc 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.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.44.122 h1:p6mw01WBaNpbdP2xrisz5tIkcNwzj/HysobNoaAHjgo= 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/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= @@ -335,6 +347,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/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/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= @@ -364,12 +377,15 @@ github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXH github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= -github.com/chzyer/logex v1.1.10 h1:Swpa1K6QvQznwJRcfTfQJmTE72DqScAa40E+fbHEXEE= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e h1:fY5BOSpyZCqRo5OhCuC+XN+r/bBCmeuuJtjz+bCNIf8= +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/test v0.0.0-20180213035817-a1ea475d72b1 h1:q763qf9huN11kDQavWsoZXJNW3xEE4JJyHa5Q25/sd8= +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/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/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= @@ -387,14 +403,20 @@ github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWH 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/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= github.com/coinbase/rosetta-sdk-go v0.7.9/go.mod h1:0/knutI7XGVqXmmH4OQD8OckFrbQ8yMsUZTG7FXCR2M= -github.com/cometbft/cometbft v0.34.29 h1:Q4FqMevP9du2pOgryZJHpDV2eA6jg/kMYxBj9ZTY6VQ= -github.com/cometbft/cometbft v0.34.29/go.mod h1:L9shMfbkZ8B+7JlwANEr+NZbBcn+hBpwdbeYvA5rLCw= -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/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= @@ -410,30 +432,35 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/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.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= -github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= -github.com/cosmos/cosmos-sdk v0.46.14 h1:xlrUaMZT6QACdtWputs+ZxbAMWGYktWK+zlc8J4tKoE= -github.com/cosmos/cosmos-sdk v0.46.14/go.mod h1:9MRixWsgoJ2UmVsCRRePtENFPP3cM+gTC5azEpxgllo= +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.5 h1:n1+WjP/VM/gAEOx3TqU2/Ny734rj/MX1kpUnn7zVJP8= +github.com/cosmos/cosmos-sdk v0.47.5/go.mod h1:EHwCeN9IXonsjKcjpS12MqeStdZvIdxt3VYXhus3G3c= 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.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g= -github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y= -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.19.6 h1:XY78yEeNPrEYyNCKlqr9chrwoeSDJ0bV2VjocTk//OU= -github.com/cosmos/iavl v0.19.6/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= -github.com/cosmos/ibc-go/v5 v5.3.1 h1:zuaIWMEoXM9egWmmAqzBPYLvEjYgB6xy6wZoc8xsZ5U= -github.com/cosmos/ibc-go/v5 v5.3.1/go.mod h1:Q2W1rjtwR738fqFQhE66dZ0frsLlr+Wiezlwei0TMGo= +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.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= +github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +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/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.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= +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/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/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/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cristalhq/acmd v0.8.1/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= @@ -466,8 +493,8 @@ github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdw 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/dgraph-io/ristretto v0.1.1 h1:6CWw5tJNgpegArSHpNHJKldNeq03FQCwYvfMVWajOK8= +github.com/dgraph-io/ristretto v0.1.1/go.mod h1:S1GPSBCYCIhmVNfcth17y2zZtQT6wzkzgwUve0VDWWA= 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= @@ -483,8 +510,8 @@ github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRP 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-0.20200219035652-afde56e7acac h1:opbrjaN/L8gg6Xh5D04Tem+8xVcz6ajZlGCs49mQgyg= -github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac/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 v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= @@ -508,16 +535,14 @@ github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcH 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-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= -github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= 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 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= 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-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -535,6 +560,9 @@ github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlya 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.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= @@ -545,6 +573,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-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.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= @@ -559,8 +588,8 @@ github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBj 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-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-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -611,9 +640,16 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x 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/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/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= @@ -711,7 +747,6 @@ github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSN 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= 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/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -799,10 +834,11 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaD 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-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.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= @@ -820,8 +856,8 @@ github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtng 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-getter v1.7.0 h1:bzrYP+qu/gMrL1au7/aDvkoOVGUJpeKBgbqRHACAFDY= -github.com/hashicorp/go-getter v1.7.0/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +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-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= @@ -853,13 +889,17 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -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/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/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= +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/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= @@ -868,8 +908,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: 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 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -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/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= 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= @@ -888,7 +928,7 @@ github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M 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/protoreflect v1.9.0 h1:npqHz788dryJiR/l6K/RUQAyh2SwV91+d1dnh4RjO9w= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= 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= @@ -923,6 +963,8 @@ github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSX 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/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= 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= @@ -936,8 +978,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.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4= -github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= +github.com/klauspost/compress v1.16.3/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/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= @@ -952,6 +994,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN 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/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= @@ -981,13 +1024,15 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6 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= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/linxGnu/grocksdb v1.7.16 h1:Q2co1xrpdkr5Hx3Fp+f+f7fRGhQFQhvi/+226dtLmA8= +github.com/linxGnu/grocksdb v1.7.16/go.mod h1:JkS7pl5qWpGpuVb3bPqTz8nC12X3YtPZT+Xq7+QfQo4= 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-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.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -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= @@ -1017,8 +1062,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky 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= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +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= @@ -1095,8 +1140,8 @@ github.com/nishanths/exhaustive v0.8.3 h1:pw5O09vwg8ZaditDp/nQRqVnrMczSJDxRDJMow github.com/nishanths/exhaustive v0.8.3/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/2Wk7fGTfCHmg= 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 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= @@ -1106,8 +1151,8 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6 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.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= 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= @@ -1141,11 +1186,9 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= 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.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.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= -github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= -github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +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/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= @@ -1155,10 +1198,9 @@ github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7c 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/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/diff v0.0.0-20210226163009-20ebb0f2a09e h1:aoZm08cpOy4WuID//EZDgcC4zIxODThtZNPirFr42+A= +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= @@ -1231,10 +1273,6 @@ github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Ung 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/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/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= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= @@ -1245,13 +1283,15 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L 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.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= -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/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.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= -github.com/rs/cors v1.8.2/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/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.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= @@ -1306,15 +1346,15 @@ 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.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.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.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -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= @@ -1323,8 +1363,8 @@ 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.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/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= @@ -1349,28 +1389,25 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= -github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= +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/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/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/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 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA= github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= 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/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.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= @@ -1381,7 +1418,6 @@ github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiff 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/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1389,7 +1425,6 @@ github.com/tomarrell/wrapcheck/v2 v2.7.0 h1:J/F8DbSKJC83bAvC6FoZaRjZiZ/iKoueSdrE github.com/tomarrell/wrapcheck/v2 v2.7.0/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg= 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/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/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= @@ -1398,8 +1433,9 @@ github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8= 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.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= @@ -1437,8 +1473,8 @@ github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2f 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.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -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/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= @@ -1493,11 +1529,11 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/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-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -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.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= @@ -1512,8 +1548,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-20230811145659-89c5cff77bcb h1:mIKbk8weKhSeLH2GmUTrvx8CjkyJmnU1wFmg59CUjFA= -golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +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/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= 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= @@ -1546,8 +1582,8 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 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.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= +golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= 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= @@ -1617,8 +1653,8 @@ golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= 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.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= -golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= +golang.org/x/net v0.16.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= @@ -1644,8 +1680,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.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= @@ -1660,8 +1696,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.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= +golang.org/x/sync v0.4.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= @@ -1716,7 +1752,6 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w 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-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= @@ -1757,6 +1792,8 @@ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBc 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-20220328115105-d36c6a25d886/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= @@ -1771,20 +1808,21 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc 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-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +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.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/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.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.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.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.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= @@ -1798,17 +1836,19 @@ 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.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.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= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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/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-20181030221726-6c7e314b6563/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= @@ -1876,7 +1916,6 @@ 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-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -1898,8 +1937,8 @@ 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/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.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= +golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= 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= @@ -1999,7 +2038,6 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200324203455-a04cca1dde73/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -2051,6 +2089,7 @@ google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20220314164441-57ef72a4c106/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= @@ -2087,13 +2126,12 @@ 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/googleapis/api v0.0.0-20230726155614-23370e0ffb3e h1:z3vDksarJxsAKM5dmEGv0GHwE2hKJ096wZra71Vs4sw= -google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e/go.mod h1:rsr7RhLuwsDKL7RmgDDCUc6yaGr1iqceVb5Wv6f6YvQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 h1:lv6/DhyiFFGsmzxbsUUTOkN29II+zeWHxvT8Lpdxsv0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +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.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= @@ -2133,8 +2171,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.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= -google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= +google.golang.org/grpc v1.58.1/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= @@ -2189,7 +2227,9 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/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.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= @@ -2212,7 +2252,8 @@ mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2Yj 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.5.3 h1:163N50IHFqr1phZens4FQOdPgfJscR7a562mjQqeo4M= +pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= +pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= diff --git a/proposal.json b/proposal.json deleted file mode 100644 index 420eae3a..00000000 --- a/proposal.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "title": "Modify Max Gas", - "description": "Update max gaas to 100000000", - "changes": [ - { - "subspace": "baseapp", - "key": "BlockParams", - "value": {"max_bytes": "22020096","max_gas": "100000000","time_iota_ms": "1000"} - } - ], - "deposit": "512000001usge" -} \ No newline at end of file diff --git a/proto/buf.gen.gogo.yaml b/proto/buf.gen.gogo.yaml index 4e8fb72d..32b6adda 100644 --- a/proto/buf.gen.gogo.yaml +++ b/proto/buf.gen.gogo.yaml @@ -2,7 +2,7 @@ version: v1 plugins: - name: gocosmos out: .. - opt: plugins=grpc,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/struct.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types,Mcosmos/orm/v1alpha1/orm.proto=github.com/cosmos/cosmos-sdk/api/cosmos/orm/v1alpha1 + opt: plugins=plugins=interfacetype+grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types - name: grpc-gateway out: .. opt: logtostderr=true,allow_colon_final_segments=true diff --git a/proto/buf.lock b/proto/buf.lock index d830ce9c..d0eb5fa5 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -5,15 +5,24 @@ deps: owner: cosmos repository: cosmos-proto commit: 1935555c206d4afb9e94615dfd0fad31 + digest: shake256:c74d91a3ac7ae07d579e90eee33abf9b29664047ac8816500cf22c081fec0d72d62c89ce0bebafc1f6fec7aa5315be72606717740ca95007248425102c365377 - remote: buf.build owner: cosmos repository: cosmos-sdk - commit: fc2c3eab27454e97b2ae099d0da69611 + commit: 570f5487244a4b4f8eda1313192cb924 + digest: shake256:40169e4bd7401410f7d054a703adadb33a4675f8494e84172a156ac4e696eb053cff5b0ecbd2d62bc7f5c9cd9f63cf767e27bc59b7c2c0544ec4866f77ebbb3c - remote: buf.build owner: cosmos repository: gogo-proto - commit: 34d970b699f84aa382f3c29773a60836 + commit: 5e5b9fdd01804356895f8f79a6f1ddc1 + digest: shake256:0b85da49e2e5f9ebc4806eae058e2f56096ff3b1c59d1fb7c190413dd15f45dd456f0b69ced9059341c80795d2b6c943de15b120a9e0308b499e43e4b5fc2952 - remote: buf.build owner: googleapis repository: googleapis - commit: 75b4300737fb4efca0831636be94e517 + commit: 28151c0d0a1641bf938a7672c500e01d + digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de + - remote: buf.build + owner: protocolbuffers + repository: wellknowntypes + commit: 657250e6a39648cbb169d079a60bd9ba + digest: shake256:00de25001b8dd2e29d85fc4bcc3ede7aed886d76d67f5e0f7a9b320b90f871d3eb73507d50818d823a0512f3f8db77a11c043685528403e31ff3fef18323a9fb diff --git a/proto/sge/bet/bet.proto b/proto/sgenetwork/sge/bet/bet.proto similarity index 99% rename from proto/sge/bet/bet.proto rename to proto/sgenetwork/sge/bet/bet.proto index a5036f32..d7116a8e 100644 --- a/proto/sge/bet/bet.proto +++ b/proto/sgenetwork/sge/bet/bet.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package sgenetwork.sge.bet; import "gogoproto/gogo.proto"; -import "sge/bet/odds_type.proto"; +import "sgenetwork/sge/bet/odds_type.proto"; option go_package = "github.com/sge-network/sge/x/bet/types"; diff --git a/proto/sge/bet/bet_odds.proto b/proto/sgenetwork/sge/bet/bet_odds.proto similarity index 100% rename from proto/sge/bet/bet_odds.proto rename to proto/sgenetwork/sge/bet/bet_odds.proto diff --git a/proto/sge/bet/constraints.proto b/proto/sgenetwork/sge/bet/constraints.proto similarity index 100% rename from proto/sge/bet/constraints.proto rename to proto/sgenetwork/sge/bet/constraints.proto diff --git a/proto/sge/bet/genesis.proto b/proto/sgenetwork/sge/bet/genesis.proto similarity index 88% rename from proto/sge/bet/genesis.proto rename to proto/sgenetwork/sge/bet/genesis.proto index 9620082e..47b5468f 100644 --- a/proto/sge/bet/genesis.proto +++ b/proto/sgenetwork/sge/bet/genesis.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package sgenetwork.sge.bet; import "gogoproto/gogo.proto"; -import "sge/bet/params.proto"; -import "sge/bet/bet.proto"; -import "sge/bet/stats.proto"; +import "sgenetwork/sge/bet/params.proto"; +import "sgenetwork/sge/bet/bet.proto"; +import "sgenetwork/sge/bet/stats.proto"; option go_package = "github.com/sge-network/sge/x/bet/types"; diff --git a/proto/sge/bet/odds_type.proto b/proto/sgenetwork/sge/bet/odds_type.proto similarity index 100% rename from proto/sge/bet/odds_type.proto rename to proto/sgenetwork/sge/bet/odds_type.proto diff --git a/proto/sge/bet/params.proto b/proto/sgenetwork/sge/bet/params.proto similarity index 93% rename from proto/sge/bet/params.proto rename to proto/sgenetwork/sge/bet/params.proto index 34139ba3..dc203ece 100644 --- a/proto/sge/bet/params.proto +++ b/proto/sgenetwork/sge/bet/params.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package sgenetwork.sge.bet; import "gogoproto/gogo.proto"; -import "sge/bet/constraints.proto"; +import "sgenetwork/sge/bet/constraints.proto"; option go_package = "github.com/sge-network/sge/x/bet/types"; diff --git a/proto/sge/bet/query.proto b/proto/sgenetwork/sge/bet/query.proto similarity index 97% rename from proto/sge/bet/query.proto rename to proto/sgenetwork/sge/bet/query.proto index cfe838ca..0b533627 100644 --- a/proto/sge/bet/query.proto +++ b/proto/sgenetwork/sge/bet/query.proto @@ -4,9 +4,9 @@ package sgenetwork.sge.bet; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "sge/bet/params.proto"; -import "sge/bet/bet.proto"; -import "sge/market/market.proto"; +import "sgenetwork/sge/bet/params.proto"; +import "sgenetwork/sge/bet/bet.proto"; +import "sgenetwork/sge/market/market.proto"; option go_package = "github.com/sge-network/sge/x/bet/types"; diff --git a/proto/sge/bet/stats.proto b/proto/sgenetwork/sge/bet/stats.proto similarity index 100% rename from proto/sge/bet/stats.proto rename to proto/sgenetwork/sge/bet/stats.proto diff --git a/proto/sge/bet/ticket.proto b/proto/sgenetwork/sge/bet/ticket.proto similarity index 84% rename from proto/sge/bet/ticket.proto rename to proto/sgenetwork/sge/bet/ticket.proto index 8d2519de..7886e399 100644 --- a/proto/sge/bet/ticket.proto +++ b/proto/sgenetwork/sge/bet/ticket.proto @@ -3,9 +3,9 @@ syntax = "proto3"; package sgenetwork.sge.bet; import "gogoproto/gogo.proto"; -import "sge/type/kyc.proto"; -import "sge/bet/bet_odds.proto"; -import "sge/bet/odds_type.proto"; +import "sgenetwork/sge/type/kyc.proto"; +import "sgenetwork/sge/bet/bet_odds.proto"; +import "sgenetwork/sge/bet/odds_type.proto"; option go_package = "github.com/sge-network/sge/x/bet/types"; diff --git a/proto/sge/bet/tx.proto b/proto/sgenetwork/sge/bet/tx.proto similarity index 93% rename from proto/sge/bet/tx.proto rename to proto/sgenetwork/sge/bet/tx.proto index 7e50f848..ec52db9f 100644 --- a/proto/sge/bet/tx.proto +++ b/proto/sgenetwork/sge/bet/tx.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package sgenetwork.sge.bet; -import "sge/bet/wager.proto"; +import "sgenetwork/sge/bet/wager.proto"; option go_package = "github.com/sge-network/sge/x/bet/types"; diff --git a/proto/sge/bet/wager.proto b/proto/sgenetwork/sge/bet/wager.proto similarity index 100% rename from proto/sge/bet/wager.proto rename to proto/sgenetwork/sge/bet/wager.proto diff --git a/proto/sge/house/authz.proto b/proto/sgenetwork/sge/house/authz.proto similarity index 100% rename from proto/sge/house/authz.proto rename to proto/sgenetwork/sge/house/authz.proto diff --git a/proto/sge/house/deposit.proto b/proto/sgenetwork/sge/house/deposit.proto similarity index 100% rename from proto/sge/house/deposit.proto rename to proto/sgenetwork/sge/house/deposit.proto diff --git a/proto/sge/house/genesis.proto b/proto/sgenetwork/sge/house/genesis.proto similarity index 82% rename from proto/sge/house/genesis.proto rename to proto/sgenetwork/sge/house/genesis.proto index eeba59dd..385ce69b 100644 --- a/proto/sge/house/genesis.proto +++ b/proto/sgenetwork/sge/house/genesis.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package sgenetwork.sge.house; import "gogoproto/gogo.proto"; -import "sge/house/deposit.proto"; -import "sge/house/withdraw.proto"; -import "sge/house/params.proto"; +import "sgenetwork/sge/house/deposit.proto"; +import "sgenetwork/sge/house/withdraw.proto"; +import "sgenetwork/sge/house/params.proto"; option go_package = "github.com/sge-network/sge/x/house/types"; diff --git a/proto/sge/house/params.proto b/proto/sgenetwork/sge/house/params.proto similarity index 100% rename from proto/sge/house/params.proto rename to proto/sgenetwork/sge/house/params.proto diff --git a/proto/sge/house/query.proto b/proto/sgenetwork/sge/house/query.proto similarity index 97% rename from proto/sge/house/query.proto rename to proto/sgenetwork/sge/house/query.proto index d0c8b5a4..edfb5ccd 100644 --- a/proto/sge/house/query.proto +++ b/proto/sgenetwork/sge/house/query.proto @@ -4,9 +4,9 @@ package sgenetwork.sge.house; import "cosmos/base/query/v1beta1/pagination.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "sge/house/params.proto"; -import "sge/house/deposit.proto"; -import "sge/house/withdraw.proto"; +import "sgenetwork/sge/house/params.proto"; +import "sgenetwork/sge/house/deposit.proto"; +import "sgenetwork/sge/house/withdraw.proto"; option go_package = "github.com/sge-network/sge/x/house/types"; diff --git a/proto/sge/house/ticket.proto b/proto/sgenetwork/sge/house/ticket.proto similarity index 95% rename from proto/sge/house/ticket.proto rename to proto/sgenetwork/sge/house/ticket.proto index 03789d2e..f833cfc9 100644 --- a/proto/sge/house/ticket.proto +++ b/proto/sgenetwork/sge/house/ticket.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package sgenetwork.sge.house; import "gogoproto/gogo.proto"; -import "sge/type/kyc.proto"; +import "sgenetwork/sge/type/kyc.proto"; option go_package = "github.com/sge-network/sge/x/house/types"; diff --git a/proto/sge/house/tx.proto b/proto/sgenetwork/sge/house/tx.proto similarity index 98% rename from proto/sge/house/tx.proto rename to proto/sgenetwork/sge/house/tx.proto index 9f5cb9d7..5c9ba5d1 100644 --- a/proto/sge/house/tx.proto +++ b/proto/sgenetwork/sge/house/tx.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package sgenetwork.sge.house; import "gogoproto/gogo.proto"; -import "sge/house/withdraw.proto"; +import "sgenetwork/sge/house/withdraw.proto"; option go_package = "github.com/sge-network/sge/x/house/types"; diff --git a/proto/sge/house/withdraw.proto b/proto/sgenetwork/sge/house/withdraw.proto similarity index 100% rename from proto/sge/house/withdraw.proto rename to proto/sgenetwork/sge/house/withdraw.proto diff --git a/proto/sge/market/genesis.proto b/proto/sgenetwork/sge/market/genesis.proto similarity index 81% rename from proto/sge/market/genesis.proto rename to proto/sgenetwork/sge/market/genesis.proto index 95968d13..039316a6 100644 --- a/proto/sge/market/genesis.proto +++ b/proto/sgenetwork/sge/market/genesis.proto @@ -2,9 +2,9 @@ syntax = "proto3"; package sgenetwork.sge.market; import "gogoproto/gogo.proto"; -import "sge/market/params.proto"; -import "sge/market/market.proto"; -import "sge/market/stats.proto"; +import "sgenetwork/sge/market/params.proto"; +import "sgenetwork/sge/market/market.proto"; +import "sgenetwork/sge/market/stats.proto"; option go_package = "github.com/sge-network/sge/x/market/types"; diff --git a/proto/sge/market/market.proto b/proto/sgenetwork/sge/market/market.proto similarity index 98% rename from proto/sge/market/market.proto rename to proto/sgenetwork/sge/market/market.proto index 4f22436e..22b34539 100644 --- a/proto/sge/market/market.proto +++ b/proto/sgenetwork/sge/market/market.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package sgenetwork.sge.market; import "gogoproto/gogo.proto"; -import "sge/market/odds.proto"; +import "sgenetwork/sge/market/odds.proto"; option go_package = "github.com/sge-network/sge/x/market/types"; diff --git a/proto/sge/market/odds.proto b/proto/sgenetwork/sge/market/odds.proto similarity index 100% rename from proto/sge/market/odds.proto rename to proto/sgenetwork/sge/market/odds.proto diff --git a/proto/sge/market/params.proto b/proto/sgenetwork/sge/market/params.proto similarity index 100% rename from proto/sge/market/params.proto rename to proto/sgenetwork/sge/market/params.proto diff --git a/proto/sge/market/query.proto b/proto/sgenetwork/sge/market/query.proto similarity index 96% rename from proto/sge/market/query.proto rename to proto/sgenetwork/sge/market/query.proto index 0abb5e64..07c86fd7 100644 --- a/proto/sge/market/query.proto +++ b/proto/sgenetwork/sge/market/query.proto @@ -4,8 +4,8 @@ package sgenetwork.sge.market; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "sge/market/params.proto"; -import "sge/market/market.proto"; +import "sgenetwork/sge/market/params.proto"; +import "sgenetwork/sge/market/market.proto"; option go_package = "github.com/sge-network/sge/x/market/types"; diff --git a/proto/sge/market/stats.proto b/proto/sgenetwork/sge/market/stats.proto similarity index 100% rename from proto/sge/market/stats.proto rename to proto/sgenetwork/sge/market/stats.proto diff --git a/proto/sge/market/ticket.proto b/proto/sgenetwork/sge/market/ticket.proto similarity index 96% rename from proto/sge/market/ticket.proto rename to proto/sgenetwork/sge/market/ticket.proto index a3dfa109..e44f0242 100644 --- a/proto/sge/market/ticket.proto +++ b/proto/sgenetwork/sge/market/ticket.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package sgenetwork.sge.market; -import "sge/market/market.proto"; -import "sge/market/odds.proto"; +import "sgenetwork/sge/market/market.proto"; +import "sgenetwork/sge/market/odds.proto"; import "gogoproto/gogo.proto"; option go_package = "github.com/sge-network/sge/x/market/types"; diff --git a/proto/sge/market/tx.proto b/proto/sgenetwork/sge/market/tx.proto similarity index 97% rename from proto/sge/market/tx.proto rename to proto/sgenetwork/sge/market/tx.proto index bb2e7c2b..7ed2d7c2 100644 --- a/proto/sge/market/tx.proto +++ b/proto/sgenetwork/sge/market/tx.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package sgenetwork.sge.market; import "gogoproto/gogo.proto"; -import "sge/market/market.proto"; +import "sgenetwork/sge/market/market.proto"; option go_package = "github.com/sge-network/sge/x/market/types"; diff --git a/proto/sge/mint/genesis.proto b/proto/sgenetwork/sge/mint/genesis.proto similarity index 83% rename from proto/sge/mint/genesis.proto rename to proto/sgenetwork/sge/mint/genesis.proto index 44b04ef0..c9412faa 100644 --- a/proto/sge/mint/genesis.proto +++ b/proto/sgenetwork/sge/mint/genesis.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package sgenetwork.sge.mint; import "gogoproto/gogo.proto"; -import "sge/mint/params.proto"; -import "sge/mint/minter.proto"; +import "sgenetwork/sge/mint/params.proto"; +import "sgenetwork/sge/mint/minter.proto"; option go_package = "github.com/sge-network/sge/x/mint/types"; diff --git a/proto/sge/mint/minter.proto b/proto/sgenetwork/sge/mint/minter.proto similarity index 100% rename from proto/sge/mint/minter.proto rename to proto/sgenetwork/sge/mint/minter.proto diff --git a/proto/sge/mint/params.proto b/proto/sgenetwork/sge/mint/params.proto similarity index 95% rename from proto/sge/mint/params.proto rename to proto/sgenetwork/sge/mint/params.proto index d19a4d9d..ce6277d1 100644 --- a/proto/sge/mint/params.proto +++ b/proto/sgenetwork/sge/mint/params.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package sgenetwork.sge.mint; import "gogoproto/gogo.proto"; -import "sge/mint/phase.proto"; +import "sgenetwork/sge/mint/phase.proto"; option go_package = "github.com/sge-network/sge/x/mint/types"; diff --git a/proto/sge/mint/phase.proto b/proto/sgenetwork/sge/mint/phase.proto similarity index 100% rename from proto/sge/mint/phase.proto rename to proto/sgenetwork/sge/mint/phase.proto diff --git a/proto/sge/mint/query.proto b/proto/sgenetwork/sge/mint/query.proto similarity index 98% rename from proto/sge/mint/query.proto rename to proto/sgenetwork/sge/mint/query.proto index bb8fac98..182c5b84 100644 --- a/proto/sge/mint/query.proto +++ b/proto/sgenetwork/sge/mint/query.proto @@ -3,7 +3,7 @@ package sgenetwork.sge.mint; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "sge/mint/params.proto"; +import "sgenetwork/sge/mint/params.proto"; option go_package = "github.com/sge-network/sge/x/mint/types"; diff --git a/proto/sgenetwork/sge/mint/tx.proto b/proto/sgenetwork/sge/mint/tx.proto new file mode 100644 index 00000000..dd422c8a --- /dev/null +++ b/proto/sgenetwork/sge/mint/tx.proto @@ -0,0 +1,44 @@ +syntax = "proto3"; +package sgenetwork.sge.mint; + +option go_package = "github.com/sge-network/sge/x/mint/types"; + +import "cosmos/msg/v1/msg.proto"; +import "amino/amino.proto"; +import "gogoproto/gogo.proto"; +import "cosmos_proto/cosmos.proto"; +import "sgenetwork/sge/mint/minter.proto"; +import "sgenetwork/sge/mint/params.proto"; + +// Msg defines the x/mint Msg service. +service Msg { + option (cosmos.msg.v1.service) = true; + + // UpdateParams defines a governance operation for updating the x/mint module + // parameters. The authority is defaults to the x/gov module account. + // + // Since: cosmos-sdk 0.47 + rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); +} + +// MsgUpdateParams is the Msg/UpdateParams request type. +// +// Since: cosmos-sdk 0.47 +message MsgUpdateParams { + option (cosmos.msg.v1.signer) = "authority"; + option (amino.name) = "sge/x/mint/MsgUpdateParams"; + + // authority is the address that controls the module (defaults to x/gov unless overwritten). + string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + + // params defines the x/mint 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: cosmos-sdk 0.47 +message MsgUpdateParamsResponse {} diff --git a/proto/sge/orderbook/exposure.proto b/proto/sgenetwork/sge/orderbook/exposure.proto similarity index 100% rename from proto/sge/orderbook/exposure.proto rename to proto/sgenetwork/sge/orderbook/exposure.proto diff --git a/proto/sge/orderbook/genesis.proto b/proto/sgenetwork/sge/orderbook/genesis.proto similarity index 88% rename from proto/sge/orderbook/genesis.proto rename to proto/sgenetwork/sge/orderbook/genesis.proto index d7a54a05..830687d2 100644 --- a/proto/sge/orderbook/genesis.proto +++ b/proto/sgenetwork/sge/orderbook/genesis.proto @@ -2,11 +2,11 @@ syntax = "proto3"; package sgenetwork.sge.orderbook; import "gogoproto/gogo.proto"; -import "sge/orderbook/params.proto"; -import "sge/orderbook/orderbook.proto"; -import "sge/orderbook/participation.proto"; -import "sge/orderbook/stats.proto"; -import "sge/orderbook/exposure.proto"; +import "sgenetwork/sge/orderbook/params.proto"; +import "sgenetwork/sge/orderbook/orderbook.proto"; +import "sgenetwork/sge/orderbook/participation.proto"; +import "sgenetwork/sge/orderbook/stats.proto"; +import "sgenetwork/sge/orderbook/exposure.proto"; option go_package = "github.com/sge-network/sge/x/orderbook/types"; diff --git a/proto/sge/orderbook/orderbook.proto b/proto/sgenetwork/sge/orderbook/orderbook.proto similarity index 100% rename from proto/sge/orderbook/orderbook.proto rename to proto/sgenetwork/sge/orderbook/orderbook.proto diff --git a/proto/sge/orderbook/params.proto b/proto/sgenetwork/sge/orderbook/params.proto similarity index 100% rename from proto/sge/orderbook/params.proto rename to proto/sgenetwork/sge/orderbook/params.proto diff --git a/proto/sge/orderbook/participation.proto b/proto/sgenetwork/sge/orderbook/participation.proto similarity index 100% rename from proto/sge/orderbook/participation.proto rename to proto/sgenetwork/sge/orderbook/participation.proto diff --git a/proto/sge/orderbook/query.proto b/proto/sgenetwork/sge/orderbook/query.proto similarity index 98% rename from proto/sge/orderbook/query.proto rename to proto/sgenetwork/sge/orderbook/query.proto index 24f4ed42..5832c5f1 100644 --- a/proto/sge/orderbook/query.proto +++ b/proto/sgenetwork/sge/orderbook/query.proto @@ -4,10 +4,10 @@ package sgenetwork.sge.orderbook; import "cosmos/base/query/v1beta1/pagination.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "sge/orderbook/params.proto"; -import "sge/orderbook/orderbook.proto"; -import "sge/orderbook/participation.proto"; -import "sge/orderbook/exposure.proto"; +import "sgenetwork/sge/orderbook/params.proto"; +import "sgenetwork/sge/orderbook/orderbook.proto"; +import "sgenetwork/sge/orderbook/participation.proto"; +import "sgenetwork/sge/orderbook/exposure.proto"; option go_package = "github.com/sge-network/sge/x/orderbook/types"; diff --git a/proto/sge/orderbook/stats.proto b/proto/sgenetwork/sge/orderbook/stats.proto similarity index 100% rename from proto/sge/orderbook/stats.proto rename to proto/sgenetwork/sge/orderbook/stats.proto diff --git a/proto/sge/ovm/genesis.proto b/proto/sgenetwork/sge/ovm/genesis.proto similarity index 81% rename from proto/sge/ovm/genesis.proto rename to proto/sgenetwork/sge/ovm/genesis.proto index eee7c585..dd1af1de 100644 --- a/proto/sge/ovm/genesis.proto +++ b/proto/sgenetwork/sge/ovm/genesis.proto @@ -2,10 +2,10 @@ syntax = "proto3"; package sgenetwork.sge.ovm; import "gogoproto/gogo.proto"; -import "sge/ovm/params.proto"; -import "sge/ovm/key_vault.proto"; -import "sge/ovm/proposal.proto"; -import "sge/ovm/stats.proto"; +import "sgenetwork/sge/ovm/params.proto"; +import "sgenetwork/sge/ovm/key_vault.proto"; +import "sgenetwork/sge/ovm/proposal.proto"; +import "sgenetwork/sge/ovm/stats.proto"; option go_package = "github.com/sge-network/sge/x/ovm/types"; diff --git a/proto/sge/ovm/key_vault.proto b/proto/sgenetwork/sge/ovm/key_vault.proto similarity index 100% rename from proto/sge/ovm/key_vault.proto rename to proto/sgenetwork/sge/ovm/key_vault.proto diff --git a/proto/sge/ovm/params.proto b/proto/sgenetwork/sge/ovm/params.proto similarity index 100% rename from proto/sge/ovm/params.proto rename to proto/sgenetwork/sge/ovm/params.proto diff --git a/proto/sge/ovm/proposal.proto b/proto/sgenetwork/sge/ovm/proposal.proto similarity index 95% rename from proto/sge/ovm/proposal.proto rename to proto/sgenetwork/sge/ovm/proposal.proto index d608797c..da6d7400 100644 --- a/proto/sge/ovm/proposal.proto +++ b/proto/sgenetwork/sge/ovm/proposal.proto @@ -2,8 +2,8 @@ syntax = "proto3"; package sgenetwork.sge.ovm; import "gogoproto/gogo.proto"; -import "sge/ovm/ticket.proto"; -import "sge/ovm/vote.proto"; +import "sgenetwork/sge/ovm/ticket.proto"; +import "sgenetwork/sge/ovm/vote.proto"; option go_package = "github.com/sge-network/sge/x/ovm/types"; diff --git a/proto/sge/ovm/query.proto b/proto/sgenetwork/sge/ovm/query.proto similarity index 97% rename from proto/sge/ovm/query.proto rename to proto/sgenetwork/sge/ovm/query.proto index 1c7c003a..96e91b26 100644 --- a/proto/sge/ovm/query.proto +++ b/proto/sgenetwork/sge/ovm/query.proto @@ -4,8 +4,8 @@ package sgenetwork.sge.ovm; import "gogoproto/gogo.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "google/api/annotations.proto"; -import "sge/ovm/params.proto"; -import "sge/ovm/proposal.proto"; +import "sgenetwork/sge/ovm/params.proto"; +import "sgenetwork/sge/ovm/proposal.proto"; option go_package = "github.com/sge-network/sge/x/ovm/types"; diff --git a/proto/sge/ovm/stats.proto b/proto/sgenetwork/sge/ovm/stats.proto similarity index 100% rename from proto/sge/ovm/stats.proto rename to proto/sgenetwork/sge/ovm/stats.proto diff --git a/proto/sge/ovm/ticket.proto b/proto/sgenetwork/sge/ovm/ticket.proto similarity index 94% rename from proto/sge/ovm/ticket.proto rename to proto/sgenetwork/sge/ovm/ticket.proto index b7d4f9e4..17026555 100644 --- a/proto/sge/ovm/ticket.proto +++ b/proto/sgenetwork/sge/ovm/ticket.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package sgenetwork.sge.ovm; -import "sge/ovm/vote.proto"; +import "sgenetwork/sge/ovm/vote.proto"; option go_package = "github.com/sge-network/sge/x/ovm/types"; diff --git a/proto/sge/ovm/tx.proto b/proto/sgenetwork/sge/ovm/tx.proto similarity index 100% rename from proto/sge/ovm/tx.proto rename to proto/sgenetwork/sge/ovm/tx.proto diff --git a/proto/sge/ovm/vote.proto b/proto/sgenetwork/sge/ovm/vote.proto similarity index 100% rename from proto/sge/ovm/vote.proto rename to proto/sgenetwork/sge/ovm/vote.proto diff --git a/proto/sge/type/kyc.proto b/proto/sgenetwork/sge/type/kyc.proto similarity index 100% rename from proto/sge/type/kyc.proto rename to proto/sgenetwork/sge/type/kyc.proto diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 4bb1d5d4..ff5ed462 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -2,29 +2,14 @@ set -eo pipefail -# get protoc executions -go get github.com/cosmos/gogoproto@v1.4.11 2>/dev/null - -# get cosmos sdk from github -go get github.com/cosmos/cosmos-sdk@v0.46.14 2>/dev/null - echo "Generating gogo proto code" cd proto -proto_dirs=$(find ./sge -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 - if grep go_package $file &>/dev/null; then - buf generate --template buf.gen.gogo.yaml $file - fi - done -done - +buf mod update cd .. +buf generate # move proto files to the right places -# -# Note: Proto files are suffixed with the current binary version. -cp -r github.com/sge-network/sge/* ./ -rm -rf github.com +cp -r ./github.com/sge-network/sge/x/* x/ +cp -r ./github.com/sge-network/sge/types/* types/ -go mod tidy -compat=1.19 +rm -rf ./github.com \ No newline at end of file diff --git a/testutil/network/network.go b/testutil/network/network.go index 5785c66a..ff1db16a 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -5,18 +5,19 @@ import ( "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" - pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" - sdksimapp "github.com/cosmos/cosmos-sdk/simapp" + pruningtypes "github.com/cosmos/cosmos-sdk/store/pruning/types" "github.com/cosmos/cosmos-sdk/testutil/network" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + "github.com/sge-network/sge/app" - tmrand "github.com/tendermint/tendermint/libs/rand" - tmdb "github.com/tendermint/tm-db" ) type ( @@ -58,13 +59,13 @@ func DefaultConfig() network.Config { LegacyAmino: encoding.Amino, InterfaceRegistry: encoding.InterfaceRegistry, AccountRetriever: authtypes.AccountRetriever{}, - AppConstructor: func(val network.Validator) servertypes.Application { + AppConstructor: func(val network.ValidatorI) servertypes.Application { return app.NewSgeApp( - 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, - sdksimapp.EmptyAppOptions{}, - baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.AppConfig.Pruning)), - baseapp.SetMinGasPrices(val.AppConfig.MinGasPrices), + simtestutil.EmptyAppOptions{}, + baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), + baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices), ) }, GenesisState: app.ModuleBasics.DefaultGenesis(encoding.Marshaler), diff --git a/testutil/simapp/params.go b/testutil/simapp/params.go index a05820f4..41bc5db6 100644 --- a/testutil/simapp/params.go +++ b/testutil/simapp/params.go @@ -4,9 +4,9 @@ import ( "crypto/ed25519" sdkmath "cosmossdk.io/math" + "github.com/cometbft/cometbft/crypto/secp256k1" "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/tendermint/tendermint/crypto/secp256k1" ) const ( diff --git a/testutil/simapp/simapp.go b/testutil/simapp/simapp.go index ce77ab75..3b34e5b4 100644 --- a/testutil/simapp/simapp.go +++ b/testutil/simapp/simapp.go @@ -8,14 +8,20 @@ import ( "testing" "time" + tmdb "github.com/cometbft/cometbft-db" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/crypto/secp256k1" + "github.com/cometbft/cometbft/libs/log" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - sdksimapp "github.com/cosmos/cosmos-sdk/simapp" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/cosmos/cosmos-sdk/x/staking/teststaking" + stakingtestutil "github.com/cosmos/cosmos-sdk/x/staking/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/sge-network/sge/app" "github.com/sge-network/sge/app/params" @@ -23,12 +29,6 @@ import ( mintmoduletypes "github.com/sge-network/sge/x/mint/types" ovmtypes "github.com/sge-network/sge/x/ovm/types" "github.com/spf13/cast" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/secp256k1" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" - tmdb "github.com/tendermint/tm-db" ) // TestApp is used as a container of the sge app @@ -54,7 +54,7 @@ func setup(withGenesis bool, invCheckPeriod uint) (*TestApp, app.GenesisState) { "", invCheckPeriod, encCdc, - sdksimapp.EmptyAppOptions{}, + simtestutil.EmptyAppOptions{}, ) if withGenesis { return &TestApp{SgeApp: *appInstance}, app.NewDefaultGenesisState() @@ -94,6 +94,7 @@ func SetupWithGenesisAccounts( balances, totalSupply, []banktypes.Metadata{}, + []banktypes.SendEnabled{}, ) genesisState[banktypes.ModuleName] = appInstance.AppCodec().MustMarshalJSON(bankGenesis) @@ -115,6 +116,7 @@ func SetupWithGenesisAccounts( appInstance.InitChain( abci.RequestInitChain{ + ChainId: "test-sge", Validators: validatorUpdates, ConsensusParams: DefaultConsensusParams, AppStateBytes: stateBytes, @@ -244,8 +246,8 @@ func SetModuleAccountCoins( } // DefaultConsensusParams parameters for tendermint consensus -var DefaultConsensusParams = &abci.ConsensusParams{ - Block: &abci.BlockParams{ +var DefaultConsensusParams = &tmproto.ConsensusParams{ + Block: &tmproto.BlockParams{ MaxBytes: 200000, MaxGas: 2000000, }, @@ -273,7 +275,7 @@ func stakingDefaultTestGenesis( p1 := int64(8) p2 := int64(2) - pks := sdksimapp.CreateTestPubKeys(2) + pks := simtestutil.CreateTestPubKeys(2) valConsPk1 := pks[0] valConsPk2 := pks[1] @@ -368,8 +370,8 @@ func stakingDefaultTestGenesis( } // NewStakingHelper creates staking Handler wrapper for tests -func NewStakingHelper(t *testing.T, ctx sdk.Context, k stakingKeeper.Keeper) *teststaking.Helper { - helper := teststaking.NewHelper(t, ctx, k) +func NewStakingHelper(t *testing.T, ctx sdk.Context, k stakingKeeper.Keeper) *stakingtestutil.Helper { + helper := stakingtestutil.NewHelper(t, ctx, &k) helper.Commission = validatorDefaultCommission() helper.Denom = params.DefaultBondDenom return helper diff --git a/tools/tools.go b/tools/tools.go new file mode 100644 index 00000000..6e7a12d4 --- /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/types/kyc.pb.go b/types/kyc.pb.go index 3bb5e3e7..c9d0d437 100644 --- a/types/kyc.pb.go +++ b/types/kyc.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/type/kyc.proto +// source: sgenetwork/sge/type/kyc.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -37,7 +37,7 @@ func (m *KycDataPayload) Reset() { *m = KycDataPayload{} } func (m *KycDataPayload) String() string { return proto.CompactTextString(m) } func (*KycDataPayload) ProtoMessage() {} func (*KycDataPayload) Descriptor() ([]byte, []int) { - return fileDescriptor_aefa821fa9aaec33, []int{0} + return fileDescriptor_2be32303a1d48b19, []int{0} } func (m *KycDataPayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -91,24 +91,24 @@ func init() { proto.RegisterType((*KycDataPayload)(nil), "sgenetwork.sge.type.KycDataPayload") } -func init() { proto.RegisterFile("sge/type/kyc.proto", fileDescriptor_aefa821fa9aaec33) } +func init() { proto.RegisterFile("sgenetwork/sge/type/kyc.proto", fileDescriptor_2be32303a1d48b19) } -var fileDescriptor_aefa821fa9aaec33 = []byte{ - // 217 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2a, 0x4e, 0x4f, 0xd5, - 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0xcf, 0xae, 0x4c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, - 0x2e, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x4e, 0x4f, 0xd5, 0x03, - 0x49, 0x4b, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0xe5, 0xf5, 0x41, 0x2c, 0x88, 0x52, 0xa5, 0x24, - 0x2e, 0x3e, 0xef, 0xca, 0x64, 0x97, 0xc4, 0x92, 0xc4, 0x80, 0xc4, 0xca, 0x9c, 0xfc, 0xc4, 0x14, - 0x21, 0x31, 0x2e, 0xb6, 0xcc, 0xf4, 0xbc, 0xfc, 0xa2, 0x54, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x8e, - 0x20, 0x28, 0x4f, 0x48, 0x8a, 0x8b, 0x23, 0xb1, 0xa0, 0xa0, 0x28, 0xbf, 0x2c, 0x35, 0x45, 0x82, - 0x09, 0x2c, 0x03, 0xe7, 0x0b, 0xc9, 0x70, 0x31, 0x65, 0xa6, 0x48, 0x30, 0x2b, 0x30, 0x6a, 0x70, - 0x3a, 0xf1, 0x3c, 0xba, 0x27, 0xcf, 0xe4, 0xe9, 0xf2, 0xea, 0x9e, 0x3c, 0x53, 0x66, 0x4a, 0x10, - 0x53, 0x66, 0x8a, 0x93, 0xd5, 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, 0x29, - 0xa4, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x17, 0xa7, 0xa7, 0xea, 0x42, - 0x1d, 0xad, 0x0f, 0xf3, 0x53, 0x71, 0x12, 0x1b, 0xd8, 0x99, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, - 0xff, 0x34, 0x51, 0xd7, 0x69, 0xe7, 0x00, 0x00, 0x00, +var fileDescriptor_2be32303a1d48b19 = []byte{ + // 215 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, + 0xcf, 0xae, 0x4c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x46, 0x48, 0xeb, 0x15, 0xa7, + 0xa7, 0xea, 0x81, 0xa4, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xf2, 0xfa, 0x20, 0x16, 0x44, + 0xa9, 0x52, 0x12, 0x17, 0x9f, 0x77, 0x65, 0xb2, 0x4b, 0x62, 0x49, 0x62, 0x40, 0x62, 0x65, 0x4e, + 0x7e, 0x62, 0x8a, 0x90, 0x18, 0x17, 0x5b, 0x66, 0x7a, 0x5e, 0x7e, 0x51, 0xaa, 0x04, 0xa3, 0x02, + 0xa3, 0x06, 0x47, 0x10, 0x94, 0x27, 0x24, 0xc5, 0xc5, 0x91, 0x58, 0x50, 0x50, 0x94, 0x5f, 0x96, + 0x9a, 0x22, 0xc1, 0x04, 0x96, 0x81, 0xf3, 0x85, 0x64, 0xb8, 0x98, 0x32, 0x53, 0x24, 0x98, 0x15, + 0x18, 0x35, 0x38, 0x9d, 0x78, 0x1e, 0xdd, 0x93, 0x67, 0xf2, 0x74, 0x79, 0x75, 0x4f, 0x9e, 0x29, + 0x33, 0x25, 0x88, 0x29, 0x33, 0xc5, 0xc9, 0xea, 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, 0x14, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0x41, 0xfe, 0xd0, + 0x45, 0xf7, 0x53, 0x71, 0x12, 0x1b, 0xd8, 0x99, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfc, + 0x12, 0x37, 0x59, 0xf2, 0x00, 0x00, 0x00, } func (m *KycDataPayload) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/client/cli/query_bet_test.go b/x/bet/client/cli/query_bet_test.go index dce6997f..65c6edcc 100644 --- a/x/bet/client/cli/query_bet_test.go +++ b/x/bet/client/cli/query_bet_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/google/uuid" "github.com/spf13/cast" "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/bet/client/cli/tx_bet_test.go b/x/bet/client/cli/tx_bet_test.go index e5cf85f0..204c39ae 100644 --- a/x/bet/client/cli/tx_bet_test.go +++ b/x/bet/client/cli/tx_bet_test.go @@ -21,7 +21,7 @@ func TestTXBetCLI(t *testing.T) { commonArgs := []string{ fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), - fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), + fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf( "--%s=%s", flags.FlagFees, diff --git a/x/bet/keeper/keeper.go b/x/bet/keeper/keeper.go index d0981b16..6b73a4ca 100644 --- a/x/bet/keeper/keeper.go +++ b/x/bet/keeper/keeper.go @@ -3,12 +3,12 @@ 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/sge-network/sge/x/bet/types" - "github.com/tendermint/tendermint/libs/log" ) // Keeper is the type for module properties diff --git a/x/bet/module.go b/x/bet/module.go index 420b2ef4..faae9e9b 100644 --- a/x/bet/module.go +++ b/x/bet/module.go @@ -9,7 +9,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" @@ -125,15 +125,9 @@ func NewAppModule( // Name returns the module's name. func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Route returns the module's message routing key. -func (am AppModule) Route() sdk.Route { return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) } - // QuerierRoute returns the module's query routing key. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the module's Querier. -func (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/bet/module_simulation.go b/x/bet/module_simulation.go index 80ead42a..5adf8f14 100644 --- a/x/bet/module_simulation.go +++ b/x/bet/module_simulation.go @@ -5,7 +5,7 @@ import ( "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "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 +19,7 @@ import ( var ( _ = sample.AccAddress _ = betsimulation.FindAccount - _ = simappparams.StakePerAccount + _ = simtestutil.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -42,7 +42,7 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP } // RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return betsimulation.ParamChanges(r) } diff --git a/x/bet/simulation/bet.go b/x/bet/simulation/bet.go index 13c04fc0..3435a0d6 100644 --- a/x/bet/simulation/bet.go +++ b/x/bet/simulation/bet.go @@ -4,8 +4,8 @@ import ( //#nosec "math/rand" + simappparams "cosmossdk.io/simapp/params" "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" diff --git a/x/bet/simulation/params.go b/x/bet/simulation/params.go index 0112bde1..95d15ef3 100644 --- a/x/bet/simulation/params.go +++ b/x/bet/simulation/params.go @@ -22,24 +22,24 @@ const ( // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{ - simulation.NewSimParamChange(types.ModuleName, keyBatchSettlementCount, +func ParamChanges(_ *rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{ + simulation.NewSimLegacyParamChange(types.ModuleName, keyBatchSettlementCount, func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenBatchSettlementCount(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, keyMaxBetByUIDQueryCount, + simulation.NewSimLegacyParamChange(types.ModuleName, keyMaxBetByUIDQueryCount, func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenMaxBetByUIDQueryCount(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, keyMinAmount, + simulation.NewSimLegacyParamChange(types.ModuleName, keyMinAmount, func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenMinAmount(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, keyMinFee, + simulation.NewSimLegacyParamChange(types.ModuleName, keyMinFee, func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenFee(r)) }, diff --git a/x/bet/types/bet.pb.go b/x/bet/types/bet.pb.go index 32f77381..89d119e4 100644 --- a/x/bet/types/bet.pb.go +++ b/x/bet/types/bet.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/bet.proto +// source: sgenetwork/sge/bet/bet.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -69,7 +69,7 @@ func (x Bet_Status) String() string { } func (Bet_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_9bc076bb1a4d9f6e, []int{0, 0} + return fileDescriptor_7e3a1b484a8c9a09, []int{0, 0} } // Result of the bet. @@ -109,7 +109,7 @@ func (x Bet_Result) String() string { } func (Bet_Result) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_9bc076bb1a4d9f6e, []int{0, 1} + return fileDescriptor_7e3a1b484a8c9a09, []int{0, 1} } // Bet is the transaction order placed by a bettor on a specific event and odd @@ -151,7 +151,7 @@ func (m *Bet) Reset() { *m = Bet{} } func (m *Bet) String() string { return proto.CompactTextString(m) } func (*Bet) ProtoMessage() {} func (*Bet) Descriptor() ([]byte, []int) { - return fileDescriptor_9bc076bb1a4d9f6e, []int{0} + return fileDescriptor_7e3a1b484a8c9a09, []int{0} } func (m *Bet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -269,7 +269,7 @@ func (m *UID2ID) Reset() { *m = UID2ID{} } func (m *UID2ID) String() string { return proto.CompactTextString(m) } func (*UID2ID) ProtoMessage() {} func (*UID2ID) Descriptor() ([]byte, []int) { - return fileDescriptor_9bc076bb1a4d9f6e, []int{1} + return fileDescriptor_7e3a1b484a8c9a09, []int{1} } func (m *UID2ID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -324,7 +324,7 @@ func (m *PendingBet) Reset() { *m = PendingBet{} } func (m *PendingBet) String() string { return proto.CompactTextString(m) } func (*PendingBet) ProtoMessage() {} func (*PendingBet) Descriptor() ([]byte, []int) { - return fileDescriptor_9bc076bb1a4d9f6e, []int{2} + return fileDescriptor_7e3a1b484a8c9a09, []int{2} } func (m *PendingBet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -379,7 +379,7 @@ func (m *SettledBet) Reset() { *m = SettledBet{} } func (m *SettledBet) String() string { return proto.CompactTextString(m) } func (*SettledBet) ProtoMessage() {} func (*SettledBet) Descriptor() ([]byte, []int) { - return fileDescriptor_9bc076bb1a4d9f6e, []int{3} + return fileDescriptor_7e3a1b484a8c9a09, []int{3} } func (m *SettledBet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -443,7 +443,7 @@ func (m *BetFulfillment) Reset() { *m = BetFulfillment{} } func (m *BetFulfillment) String() string { return proto.CompactTextString(m) } func (*BetFulfillment) ProtoMessage() {} func (*BetFulfillment) Descriptor() ([]byte, []int) { - return fileDescriptor_9bc076bb1a4d9f6e, []int{4} + return fileDescriptor_7e3a1b484a8c9a09, []int{4} } func (m *BetFulfillment) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -496,65 +496,65 @@ func init() { proto.RegisterType((*BetFulfillment)(nil), "sgenetwork.sge.bet.BetFulfillment") } -func init() { proto.RegisterFile("sge/bet/bet.proto", fileDescriptor_9bc076bb1a4d9f6e) } - -var fileDescriptor_9bc076bb1a4d9f6e = []byte{ - // 879 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0x4f, 0x6f, 0xe2, 0x46, - 0x14, 0x8f, 0x71, 0x96, 0x84, 0x97, 0x84, 0x98, 0xc9, 0x6a, 0xd7, 0x4a, 0xb7, 0x80, 0x2c, 0xb5, - 0x8a, 0x54, 0x2d, 0x48, 0x59, 0xa9, 0x52, 0xdb, 0xcb, 0x02, 0x36, 0x0d, 0x2a, 0x0b, 0x68, 0x80, - 0x56, 0xea, 0xa1, 0x96, 0xc1, 0x13, 0xe2, 0xc6, 0x7f, 0x90, 0x67, 0xdc, 0x26, 0xe7, 0x7e, 0x80, - 0xf6, 0x23, 0xf4, 0xe3, 0xec, 0x71, 0x8f, 0x55, 0x0f, 0x56, 0x45, 0x6e, 0x3d, 0xee, 0x27, 0xa8, - 0x66, 0x3c, 0x21, 0x46, 0x4d, 0xab, 0x64, 0x0f, 0xc0, 0x9b, 0xdf, 0xfc, 0x7e, 0xbf, 0x37, 0xf3, - 0xfc, 0x78, 0x86, 0x0a, 0x5d, 0x90, 0xe6, 0x8c, 0x30, 0xfe, 0x69, 0x2c, 0xe3, 0x88, 0x45, 0x08, - 0xd1, 0x05, 0x09, 0x09, 0xfb, 0x39, 0x8a, 0x2f, 0x1b, 0x74, 0x41, 0x1a, 0x33, 0xc2, 0x8e, 0x9f, - 0x2e, 0xa2, 0x45, 0x24, 0xb6, 0x9b, 0x3c, 0xca, 0x98, 0xc7, 0xcf, 0x6f, 0xc5, 0x91, 0xeb, 0x52, - 0x9b, 0x5d, 0x2f, 0x49, 0xb6, 0x61, 0xfc, 0xba, 0x0b, 0x6a, 0x9b, 0x30, 0x54, 0x07, 0x35, 0xf1, - 0x5c, 0x5d, 0xa9, 0x2b, 0x27, 0xa5, 0x76, 0x79, 0x95, 0xd6, 0xd4, 0x69, 0xcf, 0xfc, 0x3b, 0xad, - 0x71, 0x14, 0xf3, 0x2f, 0xf4, 0x15, 0x40, 0xe0, 0xc4, 0x97, 0x84, 0xd9, 0x9c, 0x58, 0x10, 0xc4, - 0x8f, 0x56, 0x69, 0xad, 0xf4, 0x46, 0xa0, 0x19, 0x3d, 0x47, 0xc1, 0xb9, 0x18, 0xbd, 0x82, 0x5d, - 0x91, 0x99, 0x4b, 0x55, 0x21, 0x7d, 0xbe, 0x4a, 0x6b, 0x3b, 0x43, 0xd7, 0xa5, 0x99, 0x70, 0xbd, - 0x8d, 0xd7, 0x11, 0xfa, 0x02, 0x4a, 0xeb, 0xe3, 0xea, 0xdb, 0x75, 0xe5, 0xa4, 0x7c, 0xfa, 0xa2, - 0xf1, 0xef, 0x2b, 0x37, 0xb8, 0xcb, 0xe4, 0x7a, 0x49, 0x32, 0x29, 0x8f, 0xd0, 0xc7, 0x00, 0x42, - 0xfa, 0x93, 0xe3, 0x27, 0x44, 0x7f, 0xc2, 0x33, 0x62, 0x61, 0xf6, 0x2d, 0x07, 0x50, 0x17, 0x8a, - 0x4e, 0x10, 0x25, 0x21, 0xd3, 0x8b, 0xe2, 0x30, 0x8d, 0xb7, 0x69, 0x6d, 0xeb, 0xcf, 0xb4, 0xf6, - 0xe9, 0xc2, 0x63, 0x17, 0xc9, 0xac, 0x31, 0x8f, 0x82, 0xe6, 0x3c, 0xa2, 0x41, 0x44, 0xe5, 0xcf, - 0x4b, 0xea, 0x5e, 0x36, 0xf9, 0x39, 0x68, 0xa3, 0x17, 0x32, 0x2c, 0xd5, 0xe8, 0x35, 0xa8, 0xe7, - 0x84, 0xe8, 0x3b, 0x1f, 0x64, 0xc2, 0xa5, 0xe8, 0x73, 0x28, 0x52, 0xe6, 0xb0, 0x84, 0xea, 0xbb, - 0xe2, 0x82, 0xd5, 0xfb, 0x2e, 0xd8, 0x26, 0xac, 0x31, 0x16, 0x2c, 0x2c, 0xd9, 0x5c, 0x17, 0x13, - 0x9a, 0xf8, 0x4c, 0x2f, 0xfd, 0xbf, 0x0e, 0x0b, 0x16, 0x96, 0x6c, 0xa4, 0xc3, 0xce, 0x3c, 0x26, - 0x0e, 0x8b, 0x62, 0x1d, 0x44, 0x55, 0x6e, 0x97, 0xbc, 0x64, 0x22, 0x24, 0xae, 0xed, 0x30, 0x7d, - 0xaf, 0xae, 0x9c, 0xa8, 0xb8, 0x24, 0x91, 0x16, 0x43, 0x9f, 0x41, 0x85, 0x12, 0xc6, 0x7c, 0x12, - 0x90, 0x90, 0xd9, 0x17, 0xc4, 0x5b, 0x5c, 0x30, 0x7d, 0x5f, 0xb0, 0xb4, 0xbb, 0x8d, 0x33, 0x81, - 0xa3, 0x1f, 0xe0, 0x28, 0x70, 0xae, 0x6c, 0x3f, 0xa2, 0xd4, 0x0e, 0x12, 0x9f, 0x79, 0x4b, 0xdf, - 0x23, 0xb1, 0x7e, 0xf0, 0xe8, 0x3a, 0x99, 0x64, 0x8e, 0x2b, 0x81, 0x73, 0xd5, 0x8f, 0x28, 0x7d, - 0xb3, 0x36, 0x42, 0xdf, 0xc0, 0xe1, 0x8c, 0x30, 0xfb, 0x3c, 0xf1, 0xcf, 0x3d, 0xdf, 0xe7, 0x89, - 0xf5, 0x72, 0x5d, 0x3d, 0xd9, 0x3b, 0x35, 0xfe, 0xa3, 0x0c, 0xdd, 0x3b, 0x26, 0x2e, 0xcf, 0x36, - 0xd6, 0xc6, 0xef, 0x0a, 0x14, 0xb3, 0xea, 0xa2, 0x67, 0x80, 0xc6, 0x93, 0xd6, 0x64, 0x3a, 0xb6, - 0xa7, 0x83, 0xf1, 0xc8, 0xea, 0xf4, 0xba, 0x3d, 0xcb, 0xd4, 0xb6, 0x50, 0x05, 0x0e, 0x24, 0x3e, - 0xea, 0xb7, 0x3a, 0x96, 0xa9, 0x29, 0xe8, 0x08, 0x0e, 0x25, 0xd4, 0x69, 0x0d, 0x3a, 0x56, 0xdf, - 0x32, 0xb5, 0x02, 0x42, 0x50, 0x96, 0x60, 0xab, 0x3d, 0xc4, 0x13, 0xcb, 0xd4, 0xd4, 0x1c, 0x36, - 0xb2, 0x06, 0x66, 0x6f, 0xf0, 0xb5, 0xb6, 0x8d, 0x8e, 0xe1, 0x99, 0xc4, 0xb0, 0x35, 0x9e, 0xf6, - 0x27, 0xb6, 0x69, 0x75, 0xfa, 0x2d, 0x6c, 0x99, 0xda, 0x93, 0x1c, 0x7f, 0x6c, 0x4d, 0x26, 0xdc, - 0xb7, 0x68, 0xfc, 0x08, 0xc5, 0xec, 0x39, 0xf2, 0x13, 0x4a, 0xc9, 0xe6, 0x09, 0x11, 0x94, 0x25, - 0x7e, 0x9b, 0x45, 0x41, 0x65, 0x00, 0x89, 0x7d, 0x37, 0x1c, 0x68, 0x05, 0x74, 0x08, 0x7b, 0x72, - 0xdd, 0x1f, 0x8e, 0x27, 0x9a, 0xca, 0xef, 0x20, 0x01, 0x6c, 0x75, 0xa7, 0x03, 0xd3, 0x32, 0xb5, - 0x6d, 0xe3, 0x0c, 0x8a, 0xd3, 0x9e, 0x79, 0xda, 0x33, 0x1f, 0x30, 0x13, 0x5e, 0x40, 0x41, 0xce, - 0x82, 0xed, 0xf6, 0xfe, 0x2a, 0xad, 0x15, 0xc4, 0x7e, 0xc1, 0x73, 0x71, 0xc1, 0x73, 0x8d, 0x33, - 0x80, 0x11, 0x09, 0x5d, 0x2f, 0x5c, 0x3c, 0x6c, 0xc2, 0xe4, 0x7a, 0xb3, 0xb0, 0xd1, 0x9b, 0xc6, - 0x14, 0x60, 0x2c, 0x7a, 0xcc, 0x7d, 0x98, 0xd3, 0x27, 0xc0, 0x1f, 0x32, 0x8b, 0x62, 0xdb, 0x71, - 0xdd, 0x98, 0x50, 0x2a, 0x0d, 0x0f, 0x32, 0xb4, 0x95, 0x81, 0xc6, 0x2f, 0x2a, 0x94, 0x37, 0x9b, - 0x03, 0x0d, 0xe1, 0x68, 0xe9, 0xc4, 0xcc, 0x9b, 0x7b, 0x4b, 0x27, 0x64, 0x6b, 0x79, 0x96, 0xab, - 0xfa, 0x3e, 0xad, 0x1d, 0x5f, 0x3b, 0x81, 0xff, 0xa5, 0x71, 0x0f, 0xc9, 0xc0, 0x28, 0x87, 0xca, - 0x1c, 0x1b, 0x86, 0xcc, 0x8b, 0x42, 0xdb, 0x0b, 0x5d, 0x72, 0x25, 0x6b, 0x76, 0x9f, 0xe1, 0x1d, - 0x29, 0x6f, 0xc8, 0xd1, 0x1e, 0x07, 0xd1, 0x0c, 0x80, 0xf7, 0xbe, 0x9c, 0x5f, 0xd9, 0x30, 0xed, - 0x3c, 0x6e, 0xf4, 0xbc, 0x4f, 0x6b, 0x95, 0x2c, 0xeb, 0x9d, 0x93, 0x81, 0x4b, 0x33, 0xc2, 0x5a, - 0xd9, 0x5c, 0xbb, 0x84, 0x83, 0xa5, 0x73, 0x1d, 0x25, 0xcc, 0x5e, 0xc6, 0xd1, 0xb9, 0xc7, 0xc4, - 0xf4, 0x2d, 0xb5, 0xbb, 0x8f, 0x4e, 0xf3, 0xf4, 0xf6, 0x72, 0x39, 0x33, 0x03, 0xef, 0x67, 0xeb, - 0x91, 0x58, 0xb6, 0x5f, 0xbf, 0x5d, 0x55, 0x95, 0x77, 0xab, 0xaa, 0xf2, 0xd7, 0xaa, 0xaa, 0xfc, - 0x76, 0x53, 0xdd, 0x7a, 0x77, 0x53, 0xdd, 0xfa, 0xe3, 0xa6, 0xba, 0xf5, 0x7d, 0x3e, 0x0f, 0x5d, - 0x90, 0x97, 0xf2, 0x8f, 0xcd, 0xe3, 0xe6, 0x95, 0x78, 0x9d, 0x89, 0x5c, 0xb3, 0xa2, 0x78, 0x97, - 0xbd, 0xfa, 0x27, 0x00, 0x00, 0xff, 0xff, 0xfa, 0xa0, 0x08, 0x67, 0x23, 0x07, 0x00, 0x00, +func init() { proto.RegisterFile("sgenetwork/sge/bet/bet.proto", fileDescriptor_7e3a1b484a8c9a09) } + +var fileDescriptor_7e3a1b484a8c9a09 = []byte{ + // 878 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcf, 0x6e, 0xe3, 0x44, + 0x18, 0xaf, 0xe3, 0x6e, 0xda, 0x7c, 0x6d, 0x53, 0x77, 0xba, 0x5a, 0xac, 0x52, 0x92, 0xc8, 0x12, + 0xa8, 0x12, 0xda, 0x44, 0xea, 0x4a, 0x48, 0xc0, 0x65, 0x93, 0xd8, 0xa1, 0x11, 0xd9, 0x24, 0x9a, + 0x24, 0x20, 0x71, 0xc0, 0x72, 0xe2, 0x69, 0x6a, 0xea, 0x3f, 0x91, 0x67, 0x0c, 0xed, 0x99, 0x07, + 0x80, 0x47, 0xe0, 0x71, 0xf6, 0xb8, 0x47, 0xc4, 0xc1, 0x42, 0xe9, 0x8d, 0xe3, 0x3e, 0x01, 0x9a, + 0xf1, 0x34, 0x71, 0x44, 0x41, 0x2d, 0x87, 0x36, 0x33, 0xbf, 0xf9, 0xfd, 0x99, 0xf9, 0x3c, 0xfa, + 0x06, 0x4e, 0xe9, 0x9c, 0x84, 0x84, 0xfd, 0x14, 0xc5, 0xd7, 0x0d, 0x3a, 0x27, 0x8d, 0x29, 0x61, + 0xfc, 0xaf, 0xbe, 0x88, 0x23, 0x16, 0x21, 0xb4, 0x5e, 0xad, 0xd3, 0x39, 0xa9, 0x4f, 0x09, 0x3b, + 0x79, 0x3e, 0x8f, 0xe6, 0x91, 0x58, 0x6e, 0xf0, 0x51, 0xc6, 0x3c, 0x31, 0x1e, 0xf0, 0x89, 0x5c, + 0x97, 0xda, 0xec, 0x76, 0x41, 0x32, 0x8e, 0xf1, 0xcb, 0x2e, 0xa8, 0x2d, 0xc2, 0x50, 0x0d, 0xd4, + 0xc4, 0x73, 0x75, 0xa5, 0xa6, 0x9c, 0x95, 0x5a, 0xe5, 0x65, 0x5a, 0x55, 0x27, 0x5d, 0xf3, 0xaf, + 0xb4, 0xca, 0x51, 0xcc, 0xff, 0xa1, 0x2f, 0x01, 0x02, 0x27, 0xbe, 0x26, 0xcc, 0xe6, 0xc4, 0x82, + 0x20, 0x7e, 0xb8, 0x4c, 0xab, 0xa5, 0x37, 0x02, 0xcd, 0xe8, 0x39, 0x0a, 0xce, 0x8d, 0xd1, 0x2b, + 0xd8, 0x15, 0xc9, 0x5c, 0xaa, 0x0a, 0xe9, 0x07, 0xcb, 0xb4, 0xba, 0x33, 0x70, 0x5d, 0x9a, 0x09, + 0x57, 0xcb, 0x78, 0x35, 0x42, 0x9f, 0x43, 0x69, 0xb5, 0x5d, 0x7d, 0xbb, 0xa6, 0x9c, 0x95, 0xcf, + 0x4f, 0xeb, 0xff, 0x3c, 0x7d, 0x9d, 0xbb, 0x8c, 0x6f, 0x17, 0x24, 0x93, 0xf2, 0x11, 0xfa, 0x08, + 0x40, 0x48, 0x7f, 0x74, 0xfc, 0x84, 0xe8, 0xcf, 0x78, 0x22, 0x16, 0x66, 0xdf, 0x70, 0x00, 0x75, + 0xa0, 0xe8, 0x04, 0x51, 0x12, 0x32, 0xbd, 0x28, 0x36, 0x53, 0x7f, 0x9b, 0x56, 0xb7, 0xfe, 0x48, + 0xab, 0x9f, 0xcc, 0x3d, 0x76, 0x95, 0x4c, 0xeb, 0xb3, 0x28, 0x68, 0xcc, 0x22, 0x1a, 0x44, 0x54, + 0xfe, 0xbc, 0xa4, 0xee, 0x75, 0x83, 0xef, 0x83, 0xd6, 0xbb, 0x21, 0xc3, 0x52, 0x8d, 0x5e, 0x83, + 0x7a, 0x49, 0x88, 0xbe, 0xf3, 0xbf, 0x4c, 0xb8, 0x14, 0x7d, 0x06, 0x45, 0xca, 0x1c, 0x96, 0x50, + 0x7d, 0x57, 0x1c, 0xb0, 0xf2, 0xd0, 0x01, 0x5b, 0x84, 0xd5, 0x47, 0x82, 0x85, 0x25, 0x9b, 0xeb, + 0x62, 0x42, 0x13, 0x9f, 0xe9, 0xa5, 0xff, 0xd6, 0x61, 0xc1, 0xc2, 0x92, 0x8d, 0x74, 0xd8, 0x99, + 0xc5, 0xc4, 0x61, 0x51, 0xac, 0x83, 0xa8, 0xca, 0xfd, 0x94, 0x97, 0x4c, 0x0c, 0x89, 0x6b, 0x3b, + 0x4c, 0xdf, 0xab, 0x29, 0x67, 0x2a, 0x2e, 0x49, 0xa4, 0xc9, 0xd0, 0xa7, 0x70, 0x44, 0x09, 0x63, + 0x3e, 0x09, 0x48, 0xc8, 0xec, 0x2b, 0xe2, 0xcd, 0xaf, 0x98, 0xbe, 0x2f, 0x58, 0xda, 0x7a, 0xe1, + 0x42, 0xe0, 0xe8, 0x7b, 0x38, 0x0e, 0x9c, 0x1b, 0xdb, 0x8f, 0x28, 0xb5, 0x83, 0xc4, 0x67, 0xde, + 0xc2, 0xf7, 0x48, 0xac, 0x1f, 0x3c, 0xb9, 0x4e, 0x26, 0x99, 0xe1, 0xa3, 0xc0, 0xb9, 0xe9, 0x45, + 0x94, 0xbe, 0x59, 0x19, 0xa1, 0xaf, 0xe1, 0x70, 0x4a, 0x98, 0x7d, 0x99, 0xf8, 0x97, 0x9e, 0xef, + 0xf3, 0x60, 0xbd, 0x5c, 0x53, 0xcf, 0xf6, 0xce, 0x8d, 0x7f, 0x29, 0x43, 0x67, 0xcd, 0xc4, 0xe5, + 0xe9, 0xc6, 0xdc, 0xf8, 0x4d, 0x81, 0x62, 0x56, 0x5d, 0xf4, 0x02, 0xd0, 0x68, 0xdc, 0x1c, 0x4f, + 0x46, 0xf6, 0xa4, 0x3f, 0x1a, 0x5a, 0xed, 0x6e, 0xa7, 0x6b, 0x99, 0xda, 0x16, 0x3a, 0x82, 0x03, + 0x89, 0x0f, 0x7b, 0xcd, 0xb6, 0x65, 0x6a, 0x0a, 0x3a, 0x86, 0x43, 0x09, 0xb5, 0x9b, 0xfd, 0xb6, + 0xd5, 0xb3, 0x4c, 0xad, 0x80, 0x10, 0x94, 0x25, 0xd8, 0x6c, 0x0d, 0xf0, 0xd8, 0x32, 0x35, 0x35, + 0x87, 0x0d, 0xad, 0xbe, 0xd9, 0xed, 0x7f, 0xa5, 0x6d, 0xa3, 0x13, 0x78, 0x21, 0x31, 0x6c, 0x8d, + 0x26, 0xbd, 0xb1, 0x6d, 0x5a, 0xed, 0x5e, 0x13, 0x5b, 0xa6, 0xf6, 0x2c, 0xc7, 0x1f, 0x59, 0xe3, + 0x31, 0xf7, 0x2d, 0x1a, 0x3f, 0x40, 0x31, 0xfb, 0x8e, 0x7c, 0x87, 0x52, 0xb2, 0xb9, 0x43, 0x04, + 0x65, 0x89, 0xdf, 0xa7, 0x28, 0xa8, 0x0c, 0x20, 0xb1, 0x6f, 0x07, 0x7d, 0xad, 0x80, 0x0e, 0x61, + 0x4f, 0xce, 0x7b, 0x83, 0xd1, 0x58, 0x53, 0xf9, 0x19, 0x24, 0x80, 0xad, 0xce, 0xa4, 0x6f, 0x5a, + 0xa6, 0xb6, 0x6d, 0x5c, 0x40, 0x71, 0xd2, 0x35, 0xcf, 0xbb, 0xe6, 0x23, 0x7a, 0xc2, 0x29, 0x14, + 0x64, 0x2f, 0xd8, 0x6e, 0xed, 0x2f, 0xd3, 0x6a, 0x41, 0xac, 0x17, 0x3c, 0x17, 0x17, 0x3c, 0xd7, + 0xb8, 0x00, 0x18, 0x92, 0xd0, 0xf5, 0xc2, 0xf9, 0xe3, 0x3a, 0x4c, 0xee, 0x6e, 0x16, 0x36, 0xee, + 0xa6, 0x31, 0x01, 0x18, 0x89, 0x3b, 0xe6, 0x3e, 0xce, 0xe9, 0x63, 0xe0, 0x1f, 0x99, 0x45, 0xb1, + 0xed, 0xb8, 0x6e, 0x4c, 0x28, 0x95, 0x86, 0x07, 0x19, 0xda, 0xcc, 0x40, 0xe3, 0x67, 0x15, 0xca, + 0x9b, 0x97, 0x03, 0x0d, 0xe0, 0x78, 0xe1, 0xc4, 0xcc, 0x9b, 0x79, 0x0b, 0x27, 0x64, 0x2b, 0x79, + 0x96, 0x55, 0x79, 0x9f, 0x56, 0x4f, 0x6e, 0x9d, 0xc0, 0xff, 0xc2, 0x78, 0x80, 0x64, 0x60, 0x94, + 0x43, 0x65, 0xc6, 0x86, 0x21, 0xf3, 0xa2, 0xd0, 0xf6, 0x42, 0x97, 0xdc, 0xc8, 0x9a, 0x3d, 0x64, + 0xb8, 0x26, 0xe5, 0x0d, 0x39, 0xda, 0xe5, 0x20, 0x9a, 0x02, 0xf0, 0xbb, 0x2f, 0xfb, 0x57, 0xd6, + 0x4c, 0xdb, 0x4f, 0x6b, 0x3d, 0xef, 0xd3, 0xea, 0x51, 0x96, 0xba, 0x76, 0x32, 0x70, 0x69, 0x4a, + 0x58, 0x33, 0xeb, 0x6b, 0xd7, 0x70, 0xb0, 0x70, 0x6e, 0xa3, 0x84, 0xd9, 0x8b, 0x38, 0xba, 0xf4, + 0x98, 0xe8, 0xbe, 0xa5, 0x56, 0xe7, 0xc9, 0x31, 0xcf, 0xef, 0x0f, 0x97, 0x33, 0x33, 0xf0, 0x7e, + 0x36, 0x1f, 0x8a, 0x69, 0xeb, 0xf5, 0xdb, 0x65, 0x45, 0x79, 0xb7, 0xac, 0x28, 0x7f, 0x2e, 0x2b, + 0xca, 0xaf, 0x77, 0x95, 0xad, 0x77, 0x77, 0x95, 0xad, 0xdf, 0xef, 0x2a, 0x5b, 0xdf, 0xe5, 0x73, + 0xe8, 0x9c, 0xbc, 0xcc, 0x3f, 0x66, 0x37, 0xe2, 0x39, 0x13, 0x59, 0xd3, 0xa2, 0x78, 0xcb, 0x5e, + 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xba, 0x0d, 0x24, 0xdf, 0x39, 0x07, 0x00, 0x00, } func (m *Bet) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/bet_odds.pb.go b/x/bet/types/bet_odds.pb.go index 1be00361..813e089b 100644 --- a/x/bet/types/bet_odds.pb.go +++ b/x/bet/types/bet_odds.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/bet_odds.proto +// source: sgenetwork/sge/bet/bet_odds.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -43,7 +43,7 @@ func (m *BetOdds) Reset() { *m = BetOdds{} } func (m *BetOdds) String() string { return proto.CompactTextString(m) } func (*BetOdds) ProtoMessage() {} func (*BetOdds) Descriptor() ([]byte, []int) { - return fileDescriptor_2629a03d0a23fb04, []int{0} + return fileDescriptor_cabb5a887005fe34, []int{0} } func (m *BetOdds) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -106,7 +106,7 @@ func (m *BetOddsCompact) Reset() { *m = BetOddsCompact{} } func (m *BetOddsCompact) String() string { return proto.CompactTextString(m) } func (*BetOddsCompact) ProtoMessage() {} func (*BetOddsCompact) Descriptor() ([]byte, []int) { - return fileDescriptor_2629a03d0a23fb04, []int{1} + return fileDescriptor_cabb5a887005fe34, []int{1} } func (m *BetOddsCompact) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -147,31 +147,31 @@ func init() { proto.RegisterType((*BetOddsCompact)(nil), "sgenetwork.sge.bet.BetOddsCompact") } -func init() { proto.RegisterFile("sge/bet/bet_odds.proto", fileDescriptor_2629a03d0a23fb04) } +func init() { proto.RegisterFile("sgenetwork/sge/bet/bet_odds.proto", fileDescriptor_cabb5a887005fe34) } -var fileDescriptor_2629a03d0a23fb04 = []byte{ - // 335 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x52, 0x3d, 0x4b, 0xfb, 0x40, - 0x1c, 0xce, 0xb5, 0xff, 0x17, 0x7a, 0x43, 0xc1, 0x58, 0xa4, 0x28, 0xe4, 0x4a, 0x07, 0x71, 0x69, - 0x32, 0x38, 0xba, 0x48, 0xed, 0x22, 0x58, 0x84, 0x80, 0x4b, 0x97, 0x90, 0x97, 0x1f, 0x67, 0x68, - 0xe2, 0x85, 0xfc, 0x2e, 0x5a, 0xbf, 0x83, 0x82, 0x5f, 0xc9, 0xad, 0x63, 0x47, 0x71, 0x38, 0x24, - 0xdd, 0xfa, 0x29, 0xe4, 0xae, 0x45, 0x3a, 0x54, 0x70, 0x73, 0xb8, 0xbb, 0xe7, 0x9e, 0x7b, 0xee, - 0xf7, 0xc6, 0x43, 0x0f, 0x90, 0x83, 0x17, 0x81, 0xd4, 0x2b, 0x10, 0x49, 0x82, 0x6e, 0x51, 0x0a, - 0x29, 0x6c, 0x1b, 0x39, 0xdc, 0x81, 0x7c, 0x10, 0xe5, 0xd4, 0x45, 0x0e, 0x6e, 0x04, 0xf2, 0xb0, - 0xc3, 0x05, 0x17, 0xe6, 0xd9, 0xd3, 0x68, 0xad, 0xec, 0x3f, 0x37, 0xe8, 0xff, 0x21, 0xc8, 0xeb, - 0x24, 0x41, 0xbb, 0x47, 0x9b, 0x55, 0x9a, 0x74, 0x49, 0x8f, 0x9c, 0xb4, 0x86, 0xed, 0x5a, 0xb1, - 0xe6, 0xcd, 0xe5, 0x68, 0xa5, 0x98, 0x66, 0x7d, 0xbd, 0xd9, 0x67, 0x94, 0xe6, 0x61, 0x39, 0x05, - 0x19, 0x68, 0x61, 0xc3, 0x08, 0x8f, 0x6a, 0xc5, 0x5a, 0x63, 0xc3, 0xae, 0xe5, 0x5b, 0x12, 0x7f, - 0x0b, 0xdb, 0x1d, 0xfa, 0xf7, 0x3e, 0xcc, 0x2a, 0xe8, 0x36, 0xf5, 0x3f, 0x7f, 0x7d, 0xb1, 0x9f, - 0x08, 0xdd, 0xcf, 0xc3, 0x59, 0x90, 0x09, 0xc4, 0x20, 0xaf, 0x32, 0x99, 0x16, 0x59, 0x0a, 0x65, - 0xf7, 0x8f, 0x09, 0x3e, 0x99, 0x2b, 0x66, 0xbd, 0x2b, 0x76, 0xcc, 0x53, 0x79, 0x5b, 0x45, 0x6e, - 0x2c, 0x72, 0x2f, 0x16, 0x98, 0x0b, 0xdc, 0x1c, 0x03, 0x4c, 0xa6, 0x9e, 0x7c, 0x2c, 0x00, 0xdd, - 0x11, 0xc4, 0xb5, 0x62, 0x7b, 0xe3, 0x70, 0x76, 0x25, 0x10, 0xc7, 0x5f, 0xa1, 0x56, 0x8a, 0xed, - 0xca, 0xe0, 0xef, 0x22, 0xfb, 0xaf, 0x84, 0xb6, 0x37, 0xf3, 0xb8, 0x10, 0x79, 0x11, 0xc6, 0xf2, - 0x07, 0x63, 0xf9, 0xae, 0x87, 0xc6, 0xaf, 0xf4, 0x30, 0x3c, 0x9f, 0xd7, 0x0e, 0x59, 0xd4, 0x0e, - 0xf9, 0xa8, 0x1d, 0xf2, 0xb2, 0x74, 0xac, 0xc5, 0xd2, 0xb1, 0xde, 0x96, 0x8e, 0x35, 0xd9, 0x2e, - 0x01, 0x39, 0x0c, 0x36, 0x1e, 0xd1, 0xd8, 0x9b, 0x19, 0x23, 0x99, 0x32, 0xa2, 0x7f, 0xc6, 0x1c, - 0xa7, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x2d, 0x7f, 0x8e, 0x60, 0x02, 0x00, 0x00, +var fileDescriptor_cabb5a887005fe34 = []byte{ + // 336 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0x4f, 0x4a, 0x2d, 0x01, 0xe1, + 0xf8, 0xfc, 0x94, 0x94, 0x62, 0xbd, 0x82, 0xa2, 0xfc, 0x92, 0x7c, 0x21, 0x21, 0x84, 0x12, 0xbd, + 0xe2, 0xf4, 0x54, 0xbd, 0xa4, 0xd4, 0x12, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0xb4, 0x3e, + 0x88, 0x05, 0x51, 0xa9, 0xd4, 0xcb, 0xc4, 0xc5, 0xee, 0x94, 0x5a, 0xe2, 0x9f, 0x92, 0x52, 0x2c, + 0xa4, 0xc0, 0xc5, 0x5c, 0x9a, 0x99, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe9, 0xc4, 0xf7, 0xe8, + 0x9e, 0x3c, 0x73, 0xa8, 0xa7, 0xcb, 0xab, 0x7b, 0xf2, 0x20, 0xd1, 0x20, 0x10, 0x21, 0x64, 0xcd, + 0xc5, 0x95, 0x9b, 0x58, 0x94, 0x9d, 0x5a, 0x12, 0x0f, 0x52, 0xc8, 0x04, 0x56, 0x28, 0xfd, 0xe8, + 0x9e, 0x3c, 0xa7, 0x2f, 0x58, 0x14, 0xa2, 0x1c, 0x49, 0x49, 0x10, 0x12, 0x5b, 0x48, 0x84, 0x8b, + 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x19, 0xa4, 0x2f, 0x08, 0xc2, 0x11, 0xea, 0x61, 0xe4, + 0x12, 0xce, 0x4d, 0xac, 0x88, 0xcf, 0xc9, 0x2f, 0x2e, 0x8e, 0xcf, 0x2d, 0xcd, 0x29, 0xc9, 0x2c, + 0xc8, 0xc9, 0x4c, 0x2d, 0x92, 0x60, 0x01, 0x1b, 0x1e, 0x75, 0xe2, 0x9e, 0x3c, 0xc3, 0xad, 0x7b, + 0xf2, 0x6a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xc9, 0xf9, 0xc5, + 0xb9, 0xf9, 0xc5, 0x50, 0x4a, 0xb7, 0x38, 0x25, 0x5b, 0xbf, 0xa4, 0xb2, 0x20, 0xb5, 0x58, 0xcf, + 0x25, 0x35, 0xf9, 0xd1, 0x3d, 0x79, 0x41, 0xdf, 0xc4, 0x0a, 0x9f, 0xfc, 0xe2, 0x62, 0x5f, 0xb8, + 0x51, 0xaf, 0xee, 0xc9, 0x63, 0xb3, 0x21, 0x08, 0x9b, 0xa0, 0xd2, 0x41, 0x46, 0x2e, 0x3e, 0x68, + 0x78, 0x38, 0xe7, 0xe7, 0x16, 0x24, 0x26, 0x97, 0x10, 0x11, 0x2c, 0xb8, 0xfc, 0xc0, 0x34, 0x20, + 0x7e, 0x70, 0x72, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, + 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x64, 0x27, + 0x14, 0xa7, 0xa7, 0xea, 0x22, 0x27, 0xa3, 0x0a, 0x70, 0x42, 0x02, 0x3b, 0x23, 0x89, 0x0d, 0x9c, + 0x38, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x68, 0x38, 0xa4, 0xb5, 0x6b, 0x02, 0x00, 0x00, } func (m *BetOdds) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/codec.go b/x/bet/types/codec.go index 41bd2245..9ad1acc7 100644 --- a/x/bet/types/codec.go +++ b/x/bet/types/codec.go @@ -4,7 +4,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" - cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" @@ -34,6 +33,6 @@ var ( func init() { RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) + // cryptocodec.RegisterCrypto(amino) sdk.RegisterLegacyAminoCodec(amino) } diff --git a/x/bet/types/constraints.pb.go b/x/bet/types/constraints.pb.go index 553b6b33..b989d79f 100644 --- a/x/bet/types/constraints.pb.go +++ b/x/bet/types/constraints.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/constraints.proto +// source: sgenetwork/sge/bet/constraints.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -36,7 +36,7 @@ func (m *Constraints) Reset() { *m = Constraints{} } func (m *Constraints) String() string { return proto.CompactTextString(m) } func (*Constraints) ProtoMessage() {} func (*Constraints) Descriptor() ([]byte, []int) { - return fileDescriptor_902ec3e683a9aac6, []int{0} + return fileDescriptor_1cb99da0ccbae1b1, []int{0} } func (m *Constraints) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -69,25 +69,27 @@ func init() { proto.RegisterType((*Constraints)(nil), "sgenetwork.sge.bet.Constraints") } -func init() { proto.RegisterFile("sge/bet/constraints.proto", fileDescriptor_902ec3e683a9aac6) } +func init() { + proto.RegisterFile("sgenetwork/sge/bet/constraints.proto", fileDescriptor_1cb99da0ccbae1b1) +} -var fileDescriptor_902ec3e683a9aac6 = []byte{ - // 227 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x4e, 0x4f, 0xd5, - 0x4f, 0x4a, 0x2d, 0xd1, 0x4f, 0xce, 0xcf, 0x2b, 0x2e, 0x29, 0x4a, 0xcc, 0xcc, 0x2b, 0x29, 0xd6, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2a, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, - 0xca, 0xd6, 0x2b, 0x4e, 0x4f, 0xd5, 0x4b, 0x4a, 0x2d, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, - 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, 0x4a, 0xf3, 0x18, 0xb9, 0xb8, 0x9d, 0x11, 0xfa, 0x85, 0x7c, - 0xb9, 0xb8, 0x72, 0x33, 0xf3, 0xe2, 0x13, 0x73, 0xf3, 0x4b, 0xf3, 0x4a, 0x24, 0x18, 0x15, 0x18, - 0x35, 0x38, 0x9d, 0xf4, 0x4e, 0xdc, 0x93, 0x67, 0xb8, 0x75, 0x4f, 0x5e, 0x2d, 0x3d, 0xb3, 0x24, - 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, - 0x16, 0xa7, 0x64, 0xeb, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0x79, 0xe6, 0x95, 0x04, 0x71, 0xe6, - 0x66, 0xe6, 0x39, 0x82, 0x0d, 0x10, 0x72, 0xe0, 0x62, 0x4e, 0x4b, 0x4d, 0x95, 0x60, 0x22, 0xcb, - 0x1c, 0x90, 0x56, 0x27, 0x87, 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, 0x42, - 0x36, 0xa6, 0x38, 0x3d, 0x55, 0x17, 0xea, 0x61, 0x10, 0x5b, 0xbf, 0x02, 0x1c, 0x30, 0x60, 0xa3, - 0x92, 0xd8, 0xc0, 0x3e, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x30, 0xdb, 0xa2, 0x4c, 0x30, - 0x01, 0x00, 0x00, +var fileDescriptor_1cb99da0ccbae1b1 = []byte{ + // 228 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x29, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0x4f, 0x4a, 0x2d, 0xd1, 0x4f, + 0xce, 0xcf, 0x2b, 0x2e, 0x29, 0x4a, 0xcc, 0xcc, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, + 0x17, 0x12, 0x42, 0xa8, 0xd2, 0x2b, 0x4e, 0x4f, 0xd5, 0x4b, 0x4a, 0x2d, 0x91, 0x12, 0x49, 0xcf, + 0x4f, 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, 0x4a, 0xf3, 0x18, 0xb9, 0xb8, 0x9d, 0x11, + 0xfa, 0x85, 0x7c, 0xb9, 0xb8, 0x72, 0x33, 0xf3, 0xe2, 0x13, 0x73, 0xf3, 0x4b, 0xf3, 0x4a, 0x24, + 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0xf4, 0x4e, 0xdc, 0x93, 0x67, 0xb8, 0x75, 0x4f, 0x5e, 0x2d, + 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, + 0x18, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0x79, 0xe6, 0x95, + 0x04, 0x71, 0xe6, 0x66, 0xe6, 0x39, 0x82, 0x0d, 0x10, 0x72, 0xe0, 0x62, 0x4e, 0x4b, 0x4d, 0x95, + 0x60, 0x22, 0xcb, 0x1c, 0x90, 0x56, 0x27, 0x87, 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, 0x42, 0x36, 0xa6, 0x38, 0x3d, 0x55, 0x17, 0x39, 0x58, 0x2a, 0xc0, 0x01, 0x03, 0x36, + 0x2a, 0x89, 0x0d, 0xec, 0x53, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x48, 0xa0, 0xc7, 0x02, + 0x3b, 0x01, 0x00, 0x00, } func (m *Constraints) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/genesis.pb.go b/x/bet/types/genesis.pb.go index 3a8a5ad6..9296794c 100644 --- a/x/bet/types/genesis.pb.go +++ b/x/bet/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/genesis.proto +// source: sgenetwork/sge/bet/genesis.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -43,7 +43,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_6c49ebc0f2678a09, []int{0} + return fileDescriptor_a21c537e364bf87c, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,32 +118,32 @@ func init() { proto.RegisterType((*GenesisState)(nil), "sgenetwork.sge.bet.GenesisState") } -func init() { proto.RegisterFile("sge/bet/genesis.proto", fileDescriptor_6c49ebc0f2678a09) } +func init() { proto.RegisterFile("sgenetwork/sge/bet/genesis.proto", fileDescriptor_a21c537e364bf87c) } -var fileDescriptor_6c49ebc0f2678a09 = []byte{ +var fileDescriptor_a21c537e364bf87c = []byte{ // 344 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcf, 0x4a, 0xf3, 0x40, - 0x14, 0xc5, 0x93, 0xaf, 0x7f, 0x3e, 0x99, 0x8a, 0x68, 0xac, 0x58, 0x82, 0x8c, 0xc5, 0x85, 0x74, - 0x63, 0x02, 0x71, 0xd3, 0xa5, 0x96, 0x82, 0x14, 0x44, 0xc4, 0xe2, 0xc6, 0x4d, 0xc9, 0x98, 0xcb, - 0x38, 0xd8, 0x76, 0x42, 0xe7, 0x16, 0xf5, 0x2d, 0x7c, 0x03, 0x5f, 0xa7, 0xcb, 0x2e, 0x5d, 0x89, - 0xb4, 0x2f, 0x22, 0x99, 0x99, 0xb4, 0x82, 0xe9, 0xee, 0xe6, 0xe4, 0x9c, 0xdf, 0x1d, 0xce, 0x25, - 0x07, 0x8a, 0x43, 0xc8, 0x00, 0x43, 0x0e, 0x63, 0x50, 0x42, 0x05, 0xe9, 0x44, 0xa2, 0xf4, 0x3c, - 0x95, 0x7d, 0xe3, 0x8b, 0x9c, 0x3c, 0x07, 0x8a, 0x43, 0xc0, 0x00, 0xfd, 0x3a, 0x97, 0x5c, 0xea, - 0xdf, 0x61, 0x36, 0x19, 0xa7, 0x5f, 0xcf, 0x01, 0x69, 0x3c, 0x89, 0x47, 0x36, 0xef, 0xef, 0xe5, - 0x2a, 0x03, 0xb4, 0xd2, 0x7e, 0x2e, 0x29, 0x8c, 0xd1, 0xfa, 0x4e, 0x3e, 0x4a, 0x64, 0xfb, 0xca, - 0x6c, 0xee, 0x63, 0x8c, 0xe0, 0xb5, 0x49, 0xd5, 0x80, 0x1a, 0x6e, 0xd3, 0x6d, 0xd5, 0x22, 0x3f, - 0xf8, 0xfb, 0x92, 0xe0, 0x56, 0x3b, 0x3a, 0xe5, 0xd9, 0xd7, 0xb1, 0x73, 0x67, 0xfd, 0x5e, 0x9b, - 0x6c, 0x31, 0xc0, 0xc1, 0x50, 0x28, 0x6c, 0xfc, 0x6b, 0x96, 0x5a, 0xb5, 0xe8, 0xb0, 0x28, 0xdb, - 0x01, 0xb4, 0xc1, 0xff, 0x0c, 0xf0, 0x5a, 0x28, 0xf4, 0x6e, 0xc8, 0x6e, 0x0a, 0xe3, 0x44, 0x8c, - 0xf9, 0x60, 0x45, 0x28, 0x69, 0x02, 0x2d, 0xdc, 0x6e, 0xbc, 0x6b, 0xd0, 0x4e, 0xba, 0x52, 0x72, - 0x9e, 0x02, 0xc4, 0x21, 0x24, 0x6b, 0x5e, 0x79, 0x33, 0xaf, 0x6f, 0xbc, 0xbf, 0x78, 0x6a, 0xa5, - 0x68, 0xde, 0x25, 0xa9, 0x4d, 0x45, 0x12, 0x89, 0xc4, 0xa0, 0x2a, 0x1a, 0x55, 0x58, 0xcc, 0x7d, - 0xaf, 0x1b, 0xf5, 0xba, 0x16, 0x43, 0x4c, 0x48, 0x23, 0xda, 0xa4, 0xa2, 0x6b, 0x6f, 0x54, 0x75, - 0xab, 0x47, 0x1b, 0x9a, 0xc9, 0x6e, 0x90, 0xf7, 0x6a, 0x02, 0x9d, 0x8b, 0xd9, 0x82, 0xba, 0xf3, - 0x05, 0x75, 0xbf, 0x17, 0xd4, 0x7d, 0x5f, 0x52, 0x67, 0xbe, 0xa4, 0xce, 0xe7, 0x92, 0x3a, 0x0f, - 0xa7, 0x5c, 0xe0, 0xd3, 0x94, 0x05, 0x8f, 0x72, 0x14, 0x2a, 0x0e, 0x67, 0x96, 0x97, 0xcd, 0xe1, - 0xab, 0xbe, 0x34, 0xbe, 0xa5, 0xa0, 0x58, 0x55, 0x9f, 0xfa, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, - 0xe5, 0xda, 0xaa, 0x89, 0x6b, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xcd, 0x4a, 0xc3, 0x40, + 0x14, 0x85, 0x13, 0xfb, 0xa3, 0x4c, 0x45, 0x24, 0x08, 0x96, 0x50, 0xa6, 0xc5, 0x85, 0x74, 0x63, + 0x02, 0x71, 0xd3, 0xa5, 0x96, 0x82, 0x14, 0x44, 0xc4, 0xe2, 0xc6, 0x4d, 0xc9, 0x98, 0xcb, 0x38, + 0xd8, 0x36, 0xa1, 0x73, 0x8b, 0xfa, 0x16, 0xbe, 0x81, 0xaf, 0xd3, 0x65, 0x97, 0xae, 0x44, 0xda, + 0x17, 0x91, 0xcc, 0x4c, 0x9b, 0x82, 0xd3, 0xdd, 0x70, 0xef, 0x39, 0xdf, 0x5c, 0xce, 0x21, 0x2d, + 0xc9, 0x61, 0x02, 0xf8, 0x96, 0x4e, 0x5f, 0x43, 0xc9, 0x21, 0x64, 0x80, 0x61, 0x3e, 0x91, 0x42, + 0x06, 0xd9, 0x34, 0xc5, 0xd4, 0xf3, 0x0a, 0x45, 0x20, 0x39, 0x04, 0x0c, 0xd0, 0x3f, 0xe1, 0x29, + 0x4f, 0xd5, 0x3a, 0xcc, 0x5f, 0x5a, 0xe9, 0x37, 0x2d, 0xac, 0x2c, 0x9e, 0xc6, 0x63, 0x83, 0xf2, + 0x1b, 0x16, 0x01, 0x03, 0x34, 0x5b, 0x6a, 0xd9, 0x4a, 0x8c, 0xd1, 0xb8, 0xcf, 0xbe, 0x4a, 0xe4, + 0xf0, 0x46, 0x9f, 0x36, 0xc0, 0x18, 0xc1, 0xeb, 0x90, 0xaa, 0xc6, 0xd7, 0xdd, 0x96, 0xdb, 0xae, + 0x45, 0x7e, 0xf0, 0xff, 0xd4, 0xe0, 0x5e, 0x29, 0xba, 0xe5, 0xf9, 0x4f, 0xd3, 0x79, 0x30, 0x7a, + 0xaf, 0x43, 0x0e, 0x18, 0xe0, 0x70, 0x24, 0x24, 0xd6, 0xf7, 0x5a, 0xa5, 0x76, 0x2d, 0x3a, 0xb5, + 0x79, 0xbb, 0x80, 0xc6, 0xb8, 0xcf, 0x00, 0x6f, 0x85, 0x44, 0xef, 0x8e, 0x1c, 0x67, 0x30, 0x49, + 0xc4, 0x84, 0x0f, 0x37, 0x84, 0x92, 0x22, 0x50, 0xeb, 0xef, 0x5a, 0x5b, 0x80, 0x8e, 0xb2, 0xcd, + 0x64, 0xcd, 0x93, 0x80, 0x38, 0x82, 0xa4, 0xe0, 0x95, 0x77, 0xf3, 0x06, 0x5a, 0xbb, 0xc5, 0x93, + 0x9b, 0x89, 0xe2, 0x5d, 0x93, 0xda, 0x4c, 0x24, 0x91, 0x48, 0x34, 0xaa, 0xa2, 0x50, 0xd6, 0x60, + 0x1e, 0xfb, 0xbd, 0xa8, 0xdf, 0x33, 0x18, 0xa2, 0x4d, 0x0a, 0xd1, 0x21, 0x15, 0x15, 0x7b, 0xbd, + 0xaa, 0x52, 0x6d, 0xec, 0x48, 0x26, 0xef, 0x60, 0x9d, 0xab, 0x36, 0x74, 0xaf, 0xe6, 0x4b, 0xea, + 0x2e, 0x96, 0xd4, 0xfd, 0x5d, 0x52, 0xf7, 0x73, 0x45, 0x9d, 0xc5, 0x8a, 0x3a, 0xdf, 0x2b, 0xea, + 0x3c, 0x9d, 0x73, 0x81, 0x2f, 0x33, 0x16, 0x3c, 0xa7, 0xe3, 0xbc, 0xdb, 0x8b, 0xed, 0x9e, 0xdf, + 0x55, 0xd3, 0xf8, 0x91, 0x81, 0x64, 0x55, 0x55, 0xf5, 0xe5, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xad, 0xf5, 0xa2, 0xce, 0x97, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/odds_type.pb.go b/x/bet/types/odds_type.pb.go index 1bac8cb4..a168cf0b 100644 --- a/x/bet/types/odds_type.pb.go +++ b/x/bet/types/odds_type.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/odds_type.proto +// source: sgenetwork/sge/bet/odds_type.proto package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" math "math" ) @@ -53,29 +53,31 @@ func (x OddsType) String() string { } func (OddsType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_9054da535c81741c, []int{0} + return fileDescriptor_8499746baf6d0fd2, []int{0} } func init() { proto.RegisterEnum("sgenetwork.sge.bet.OddsType", OddsType_name, OddsType_value) } -func init() { proto.RegisterFile("sge/bet/odds_type.proto", fileDescriptor_9054da535c81741c) } +func init() { + proto.RegisterFile("sgenetwork/sge/bet/odds_type.proto", fileDescriptor_8499746baf6d0fd2) +} -var fileDescriptor_9054da535c81741c = []byte{ - // 219 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x4e, 0x4f, 0xd5, - 0x4f, 0x4a, 0x2d, 0xd1, 0xcf, 0x4f, 0x49, 0x29, 0x8e, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2a, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, - 0x2b, 0x4e, 0x4f, 0xd5, 0x4b, 0x4a, 0x2d, 0xd1, 0xca, 0xe7, 0xe2, 0xf0, 0x4f, 0x49, 0x29, 0x0e, - 0xa9, 0x2c, 0x48, 0x15, 0x92, 0xe4, 0x12, 0xf5, 0x77, 0x71, 0x09, 0x8e, 0x0f, 0x89, 0x0c, 0x70, - 0x8d, 0x0f, 0xf5, 0x0b, 0x0e, 0x70, 0x75, 0xf6, 0x74, 0xf3, 0x74, 0x75, 0x11, 0x60, 0x10, 0x12, - 0xe5, 0x12, 0x44, 0x48, 0xb9, 0xb8, 0x3a, 0x7b, 0xfa, 0x3a, 0xfa, 0x08, 0x30, 0x0a, 0x49, 0x70, - 0x89, 0x20, 0x84, 0xdd, 0x82, 0x1c, 0x9d, 0x43, 0x3c, 0xfd, 0xfd, 0x1c, 0x7d, 0x04, 0x98, 0x84, - 0xc4, 0xb9, 0x84, 0x11, 0x32, 0xbe, 0xfe, 0x7e, 0xae, 0x91, 0x3e, 0x9e, 0x7e, 0xae, 0x02, 0xcc, - 0x4e, 0x0e, 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, 0xa5, 0x96, 0x9e, 0x59, - 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x5f, 0x9c, 0x9e, 0xaa, 0x0b, 0x75, 0x2a, 0x88, - 0xad, 0x5f, 0x01, 0xf6, 0x10, 0xc8, 0x2f, 0xc5, 0x49, 0x6c, 0x60, 0xdf, 0x18, 0x03, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x93, 0x6e, 0x4e, 0x56, 0xe8, 0x00, 0x00, 0x00, +var fileDescriptor_8499746baf6d0fd2 = []byte{ + // 218 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2a, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0x4f, 0x4a, 0x2d, 0xd1, 0xcf, + 0x4f, 0x49, 0x29, 0x8e, 0x2f, 0xa9, 0x2c, 0x48, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, + 0x42, 0xa8, 0xd1, 0x2b, 0x4e, 0x4f, 0xd5, 0x4b, 0x4a, 0x2d, 0xd1, 0xca, 0xe7, 0xe2, 0xf0, 0x4f, + 0x49, 0x29, 0x0e, 0xa9, 0x2c, 0x48, 0x15, 0x92, 0xe4, 0x12, 0xf5, 0x77, 0x71, 0x09, 0x8e, 0x0f, + 0x89, 0x0c, 0x70, 0x8d, 0x0f, 0xf5, 0x0b, 0x0e, 0x70, 0x75, 0xf6, 0x74, 0xf3, 0x74, 0x75, 0x11, + 0x60, 0x10, 0x12, 0xe5, 0x12, 0x44, 0x48, 0xb9, 0xb8, 0x3a, 0x7b, 0xfa, 0x3a, 0xfa, 0x08, 0x30, + 0x0a, 0x49, 0x70, 0x89, 0x20, 0x84, 0xdd, 0x82, 0x1c, 0x9d, 0x43, 0x3c, 0xfd, 0xfd, 0x1c, 0x7d, + 0x04, 0x98, 0x84, 0xc4, 0xb9, 0x84, 0x11, 0x32, 0xbe, 0xfe, 0x7e, 0xae, 0x91, 0x3e, 0x9e, 0x7e, + 0xae, 0x02, 0xcc, 0x4e, 0x0e, 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, 0xa5, + 0x96, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0xf2, 0x82, 0x2e, 0xb2, 0x77, + 0x2a, 0xc0, 0x1e, 0x02, 0xf9, 0xa5, 0x38, 0x89, 0x0d, 0xec, 0x1b, 0x63, 0x40, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x6c, 0x31, 0xec, 0xd9, 0xf3, 0x00, 0x00, 0x00, } diff --git a/x/bet/types/params.pb.go b/x/bet/types/params.pb.go index a67d1717..ac55edbf 100644 --- a/x/bet/types/params.pb.go +++ b/x/bet/types/params.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/params.proto +// source: sgenetwork/sge/bet/params.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -36,7 +36,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_4216d2638a14c9d3, []int{0} + return fileDescriptor_f6bea002c4bbd0b9, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,29 +90,29 @@ func init() { proto.RegisterType((*Params)(nil), "sgenetwork.sge.bet.Params") } -func init() { proto.RegisterFile("sge/bet/params.proto", fileDescriptor_4216d2638a14c9d3) } +func init() { proto.RegisterFile("sgenetwork/sge/bet/params.proto", fileDescriptor_f6bea002c4bbd0b9) } -var fileDescriptor_4216d2638a14c9d3 = []byte{ - // 301 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x31, 0x4e, 0xc3, 0x30, - 0x14, 0x86, 0x63, 0x40, 0x1d, 0x52, 0xb1, 0x44, 0x05, 0x95, 0x0c, 0x4e, 0xd5, 0x01, 0x75, 0xc1, - 0x91, 0x80, 0x85, 0x4e, 0x28, 0xbd, 0x00, 0x14, 0xb1, 0x20, 0x21, 0xcb, 0x4e, 0x9f, 0xdc, 0x88, - 0x3a, 0x2e, 0xf1, 0x8b, 0x68, 0x6e, 0xc1, 0xc8, 0xc8, 0x71, 0x3a, 0x76, 0x64, 0xaa, 0x50, 0x7b, - 0x03, 0x4e, 0x80, 0xe2, 0x16, 0xa8, 0xc4, 0xf6, 0xa4, 0xef, 0xfd, 0x9f, 0xfd, 0x7e, 0xbf, 0x65, - 0x15, 0xc4, 0x12, 0x30, 0x9e, 0x8a, 0x42, 0x68, 0xcb, 0xa6, 0x85, 0x41, 0x13, 0x04, 0x56, 0x41, - 0x0e, 0xf8, 0x62, 0x8a, 0x27, 0x66, 0x15, 0x30, 0x09, 0x18, 0xb6, 0x94, 0x51, 0xc6, 0xe1, 0xb8, - 0x9e, 0x36, 0x9b, 0xe1, 0xc9, 0x4f, 0x3e, 0x35, 0xb9, 0xc5, 0x42, 0x64, 0x39, 0x6e, 0x25, 0xdd, - 0x25, 0xf1, 0x1b, 0x37, 0xce, 0x1a, 0x5c, 0xfa, 0xc7, 0x52, 0x60, 0x3a, 0xe6, 0x16, 0x10, 0x27, - 0xa0, 0x21, 0x47, 0x9e, 0x9a, 0x32, 0xc7, 0x36, 0xe9, 0x90, 0xde, 0xe1, 0xb0, 0xe5, 0xe8, 0xdd, - 0x2f, 0x1c, 0xd4, 0x2c, 0xb8, 0xf2, 0x43, 0x2d, 0x66, 0x5c, 0x02, 0x72, 0x59, 0xf1, 0x32, 0x1b, - 0xf1, 0xe7, 0x12, 0x8a, 0x6a, 0x9b, 0xdc, 0x73, 0xc9, 0x23, 0x2d, 0x66, 0x09, 0x60, 0x52, 0xdd, - 0x67, 0xa3, 0xdb, 0x9a, 0x6e, 0xa2, 0x8f, 0x7e, 0x73, 0xe7, 0x43, 0xed, 0xfd, 0x0e, 0xe9, 0x35, - 0xcf, 0x23, 0xf6, 0xff, 0x2c, 0x36, 0xf8, 0x5b, 0x4b, 0xc2, 0xf9, 0x32, 0xf2, 0xbe, 0x96, 0x51, - 0x50, 0x09, 0x3d, 0xe9, 0x77, 0x77, 0x0c, 0xdd, 0xe1, 0xae, 0xaf, 0x7f, 0xf0, 0xf6, 0x1e, 0x79, - 0xc9, 0xf5, 0x7c, 0x45, 0xc9, 0x62, 0x45, 0xc9, 0xe7, 0x8a, 0x92, 0xd7, 0x35, 0xf5, 0x16, 0x6b, - 0xea, 0x7d, 0xac, 0xa9, 0xf7, 0x70, 0xaa, 0x32, 0x1c, 0x97, 0x92, 0xa5, 0x46, 0xc7, 0x56, 0xc1, - 0xd9, 0xf6, 0xd1, 0x7a, 0x8e, 0x67, 0xae, 0x2e, 0xac, 0xa6, 0x60, 0x65, 0xc3, 0x35, 0x75, 0xf1, - 0x1d, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x66, 0x52, 0x67, 0x86, 0x01, 0x00, 0x00, +var fileDescriptor_f6bea002c4bbd0b9 = []byte{ + // 303 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0x4f, 0x4a, 0x2d, 0xd1, 0x2f, + 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0x28, 0xd0, + 0x2b, 0x4e, 0x4f, 0xd5, 0x4b, 0x4a, 0x2d, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xeb, + 0x83, 0x58, 0x10, 0x95, 0x52, 0x2a, 0x58, 0x8c, 0x4a, 0xce, 0xcf, 0x2b, 0x2e, 0x29, 0x4a, 0xcc, + 0xcc, 0x2b, 0x81, 0x9a, 0xa7, 0x74, 0x8f, 0x91, 0x8b, 0x2d, 0x00, 0x6c, 0x81, 0x90, 0x09, 0x97, + 0x58, 0x52, 0x62, 0x49, 0x72, 0x46, 0x7c, 0x71, 0x6a, 0x49, 0x49, 0x4e, 0x6a, 0x6e, 0x6a, 0x5e, + 0x49, 0x7c, 0x72, 0x7e, 0x69, 0x5e, 0x89, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x6f, 0x90, 0x08, 0x58, + 0x36, 0x18, 0x2e, 0xe9, 0x0c, 0x92, 0x13, 0xb2, 0xe4, 0x92, 0xca, 0x4d, 0xac, 0x88, 0x4f, 0x4a, + 0x2d, 0x89, 0x4f, 0xaa, 0x8c, 0x2f, 0xcd, 0x4c, 0x89, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0x84, 0xea, + 0x64, 0x02, 0xeb, 0x14, 0xcd, 0x4d, 0xac, 0x70, 0x4a, 0x2d, 0x71, 0xaa, 0x0c, 0xcd, 0x4c, 0x09, + 0x04, 0xc9, 0x42, 0xb4, 0xc6, 0x72, 0x71, 0x23, 0x39, 0x48, 0x82, 0x59, 0x81, 0x51, 0x83, 0xdb, + 0x48, 0x5e, 0x0f, 0xd3, 0x87, 0x7a, 0xce, 0x08, 0x65, 0x4e, 0x52, 0x27, 0xee, 0xc9, 0x33, 0x7c, + 0xba, 0x27, 0x2f, 0x54, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0x64, 0x82, 0x52, 0x10, 0xb2, 0x79, + 0x56, 0x2c, 0x33, 0x16, 0xc8, 0x33, 0x38, 0x39, 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, 0x5a, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0x2e, 0x28, 0x80, + 0x74, 0x91, 0x03, 0xab, 0x02, 0x1c, 0x5c, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x90, + 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x9c, 0x75, 0x93, 0x9c, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/query.pb.go b/x/bet/types/query.pb.go index de11c8e2..ea31ce88 100644 --- a/x/bet/types/query.pb.go +++ b/x/bet/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/query.proto +// source: sgenetwork/sge/bet/query.proto package types @@ -8,8 +8,8 @@ import ( fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" - 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/sge-network/sge/x/market/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" @@ -40,7 +40,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_9b93ca36013f0806, []int{0} + return fileDescriptor_5d73c4d56d215257, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -80,7 +80,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_9b93ca36013f0806, []int{1} + return fileDescriptor_5d73c4d56d215257, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -127,7 +127,7 @@ func (m *QueryBetRequest) Reset() { *m = QueryBetRequest{} } func (m *QueryBetRequest) String() string { return proto.CompactTextString(m) } func (*QueryBetRequest) ProtoMessage() {} func (*QueryBetRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{2} + return fileDescriptor_5d73c4d56d215257, []int{2} } func (m *QueryBetRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -181,7 +181,7 @@ func (m *QueryBetResponse) Reset() { *m = QueryBetResponse{} } func (m *QueryBetResponse) String() string { return proto.CompactTextString(m) } func (*QueryBetResponse) ProtoMessage() {} func (*QueryBetResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{3} + return fileDescriptor_5d73c4d56d215257, []int{3} } func (m *QueryBetResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -234,7 +234,7 @@ func (m *QueryBetsRequest) Reset() { *m = QueryBetsRequest{} } func (m *QueryBetsRequest) String() string { return proto.CompactTextString(m) } func (*QueryBetsRequest) ProtoMessage() {} func (*QueryBetsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{4} + return fileDescriptor_5d73c4d56d215257, []int{4} } func (m *QueryBetsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -281,7 +281,7 @@ func (m *QueryBetsResponse) Reset() { *m = QueryBetsResponse{} } func (m *QueryBetsResponse) String() string { return proto.CompactTextString(m) } func (*QueryBetsResponse) ProtoMessage() {} func (*QueryBetsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{5} + return fileDescriptor_5d73c4d56d215257, []int{5} } func (m *QueryBetsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -335,7 +335,7 @@ func (m *QueryBetsByCreatorRequest) Reset() { *m = QueryBetsByCreatorReq func (m *QueryBetsByCreatorRequest) String() string { return proto.CompactTextString(m) } func (*QueryBetsByCreatorRequest) ProtoMessage() {} func (*QueryBetsByCreatorRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{6} + return fileDescriptor_5d73c4d56d215257, []int{6} } func (m *QueryBetsByCreatorRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -389,7 +389,7 @@ func (m *QueryBetsByCreatorResponse) Reset() { *m = QueryBetsByCreatorRe func (m *QueryBetsByCreatorResponse) String() string { return proto.CompactTextString(m) } func (*QueryBetsByCreatorResponse) ProtoMessage() {} func (*QueryBetsByCreatorResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{7} + return fileDescriptor_5d73c4d56d215257, []int{7} } func (m *QueryBetsByCreatorResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -442,7 +442,7 @@ func (m *QueryBetsByUIDsRequest) Reset() { *m = QueryBetsByUIDsRequest{} func (m *QueryBetsByUIDsRequest) String() string { return proto.CompactTextString(m) } func (*QueryBetsByUIDsRequest) ProtoMessage() {} func (*QueryBetsByUIDsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{8} + return fileDescriptor_5d73c4d56d215257, []int{8} } func (m *QueryBetsByUIDsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -489,7 +489,7 @@ func (m *QueryBetsByUIDsResponse) Reset() { *m = QueryBetsByUIDsResponse func (m *QueryBetsByUIDsResponse) String() string { return proto.CompactTextString(m) } func (*QueryBetsByUIDsResponse) ProtoMessage() {} func (*QueryBetsByUIDsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{9} + return fileDescriptor_5d73c4d56d215257, []int{9} } func (m *QueryBetsByUIDsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -544,7 +544,7 @@ func (m *QueryPendingBetsRequest) Reset() { *m = QueryPendingBetsRequest func (m *QueryPendingBetsRequest) String() string { return proto.CompactTextString(m) } func (*QueryPendingBetsRequest) ProtoMessage() {} func (*QueryPendingBetsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{10} + return fileDescriptor_5d73c4d56d215257, []int{10} } func (m *QueryPendingBetsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -598,7 +598,7 @@ func (m *QueryPendingBetsResponse) Reset() { *m = QueryPendingBetsRespon func (m *QueryPendingBetsResponse) String() string { return proto.CompactTextString(m) } func (*QueryPendingBetsResponse) ProtoMessage() {} func (*QueryPendingBetsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{11} + return fileDescriptor_5d73c4d56d215257, []int{11} } func (m *QueryPendingBetsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -653,7 +653,7 @@ func (m *QuerySettledBetsOfHeightRequest) Reset() { *m = QuerySettledBet func (m *QuerySettledBetsOfHeightRequest) String() string { return proto.CompactTextString(m) } func (*QuerySettledBetsOfHeightRequest) ProtoMessage() {} func (*QuerySettledBetsOfHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{12} + return fileDescriptor_5d73c4d56d215257, []int{12} } func (m *QuerySettledBetsOfHeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -707,7 +707,7 @@ func (m *QuerySettledBetsOfHeightResponse) Reset() { *m = QuerySettledBe func (m *QuerySettledBetsOfHeightResponse) String() string { return proto.CompactTextString(m) } func (*QuerySettledBetsOfHeightResponse) ProtoMessage() {} func (*QuerySettledBetsOfHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9b93ca36013f0806, []int{13} + return fileDescriptor_5d73c4d56d215257, []int{13} } func (m *QuerySettledBetsOfHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -767,66 +767,66 @@ func init() { proto.RegisterType((*QuerySettledBetsOfHeightResponse)(nil), "sgenetwork.sge.bet.QuerySettledBetsOfHeightResponse") } -func init() { proto.RegisterFile("sge/bet/query.proto", fileDescriptor_9b93ca36013f0806) } - -var fileDescriptor_9b93ca36013f0806 = []byte{ - // 887 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x96, 0x41, 0x6f, 0xe3, 0x44, - 0x14, 0xc7, 0xe3, 0xa4, 0x9b, 0x2a, 0x2f, 0xac, 0x42, 0xa7, 0x85, 0x64, 0x2d, 0x9a, 0x74, 0x4d, - 0x37, 0x5d, 0xb5, 0x1b, 0x8f, 0xda, 0xe5, 0x00, 0xe2, 0x82, 0x0c, 0x2a, 0x70, 0x40, 0x5b, 0x8c, - 0x7a, 0xd9, 0x4b, 0x64, 0x27, 0x53, 0xd7, 0xb4, 0xf1, 0xa4, 0x9e, 0x09, 0x10, 0x45, 0x91, 0x10, - 0xe7, 0x22, 0x21, 0x51, 0xc1, 0x85, 0xcf, 0xc0, 0xe7, 0xe8, 0x81, 0x43, 0x25, 0x2e, 0x9c, 0x2a, - 0xd4, 0x72, 0xea, 0xa7, 0x40, 0x9e, 0x99, 0x24, 0x76, 0x93, 0x34, 0x41, 0x2a, 0xea, 0xa5, 0x6e, - 0x9e, 0xdf, 0xbc, 0xff, 0xef, 0xbd, 0x99, 0xf7, 0xc6, 0xb0, 0xcc, 0x3c, 0x82, 0x5d, 0xc2, 0xf1, - 0x49, 0x87, 0x84, 0x5d, 0xb3, 0x1d, 0x52, 0x4e, 0x11, 0x62, 0x1e, 0x09, 0x08, 0xff, 0x96, 0x86, - 0x47, 0x26, 0xf3, 0x88, 0xe9, 0x12, 0xae, 0xaf, 0x78, 0xd4, 0xa3, 0xe2, 0x35, 0x8e, 0xfe, 0x93, - 0x9e, 0xfa, 0x3b, 0x1e, 0xa5, 0xde, 0x31, 0xc1, 0x4e, 0xdb, 0xc7, 0x4e, 0x10, 0x50, 0xee, 0x70, - 0x9f, 0x06, 0x4c, 0xbd, 0xdd, 0x6c, 0x50, 0xd6, 0xa2, 0x0c, 0xbb, 0x0e, 0x23, 0x52, 0x00, 0x7f, - 0xb3, 0xed, 0x12, 0xee, 0x6c, 0xe3, 0xb6, 0xe3, 0xf9, 0x81, 0x70, 0x56, 0xbe, 0x2b, 0x03, 0x90, - 0xb6, 0x13, 0x3a, 0xad, 0x41, 0x84, 0xa5, 0x81, 0xd5, 0x25, 0x5c, 0x99, 0x8a, 0x91, 0xa9, 0xe5, - 0x84, 0x47, 0x84, 0xab, 0x87, 0x7c, 0x61, 0xac, 0x00, 0xfa, 0x32, 0xd2, 0xd8, 0x13, 0x01, 0x6c, - 0x72, 0xd2, 0x21, 0x8c, 0x1b, 0xaf, 0x60, 0x39, 0x61, 0x65, 0x6d, 0x1a, 0x30, 0x82, 0xde, 0x87, - 0xac, 0x14, 0x2a, 0x69, 0x6b, 0xda, 0xf3, 0xfc, 0x8e, 0x6e, 0x8e, 0xe7, 0x6c, 0xca, 0x35, 0xd6, - 0xc2, 0xf9, 0x65, 0x25, 0x65, 0x2b, 0x7f, 0x63, 0x17, 0x0a, 0x22, 0xa0, 0x45, 0xb8, 0xd2, 0x40, - 0x25, 0x58, 0x6c, 0x84, 0xc4, 0xe1, 0x34, 0x14, 0xd1, 0x72, 0xf6, 0xe0, 0x27, 0x7a, 0x02, 0x99, - 0x8e, 0xdf, 0x2c, 0xa5, 0x23, 0xab, 0xb5, 0x78, 0x73, 0x59, 0x89, 0x7e, 0xda, 0xd1, 0x1f, 0xe3, - 0x7b, 0x0d, 0xde, 0x1c, 0x05, 0x52, 0x58, 0x18, 0x32, 0x2e, 0xe1, 0x8a, 0xa9, 0x38, 0x89, 0xc9, - 0x22, 0x5c, 0x01, 0x45, 0x9e, 0xe8, 0x43, 0xc8, 0xca, 0x22, 0x08, 0x8d, 0xfc, 0xce, 0xea, 0xed, - 0x35, 0xaa, 0x44, 0x5f, 0x88, 0xc7, 0x20, 0x15, 0x69, 0x34, 0x5e, 0x8f, 0x08, 0x06, 0xf5, 0x42, - 0xbb, 0x00, 0xa3, 0xbd, 0x51, 0x20, 0x55, 0x53, 0x6e, 0xa4, 0x19, 0x6d, 0xa4, 0x29, 0x4f, 0x8a, - 0xda, 0x48, 0x73, 0xcf, 0xf1, 0x88, 0x5a, 0x6b, 0xc7, 0x56, 0x1a, 0x3f, 0x6a, 0xb0, 0x14, 0x0b, - 0x7e, 0x3b, 0xbf, 0xcc, 0x9c, 0xf9, 0x7d, 0x9a, 0xc0, 0x91, 0x39, 0x6e, 0xcc, 0xc4, 0x91, 0x6a, - 0x09, 0x9e, 0x3e, 0x3c, 0x19, 0xe2, 0x58, 0xdd, 0x8f, 0xe5, 0xfe, 0xdc, 0x73, 0xd2, 0xf1, 0x83, - 0x90, 0x4e, 0x1c, 0x04, 0xe3, 0x17, 0x0d, 0xf4, 0x49, 0xfa, 0x0f, 0x5e, 0x97, 0x0f, 0xe0, 0xed, - 0x18, 0xd7, 0xfe, 0xe7, 0x9f, 0x0c, 0x4f, 0x42, 0x05, 0x1e, 0xf9, 0x9c, 0x88, 0x0e, 0xc9, 0x3c, - 0xcf, 0x59, 0xb9, 0x9b, 0xcb, 0x8a, 0x34, 0xd8, 0xf2, 0x61, 0x74, 0xa1, 0x38, 0xb6, 0x54, 0xe5, - 0xb3, 0x0d, 0x0b, 0x2e, 0xe1, 0x6c, 0xbe, 0x84, 0x84, 0x2b, 0xda, 0x02, 0x14, 0x50, 0x5e, 0x3f, - 0xa0, 0x9d, 0xa0, 0x59, 0x77, 0x09, 0xaf, 0x77, 0xfc, 0x26, 0x2b, 0xa5, 0x23, 0x6d, 0xbb, 0x10, - 0x50, 0xbe, 0x1b, 0xbd, 0xb0, 0x08, 0xdf, 0xf7, 0x9b, 0x2c, 0x6a, 0x1e, 0xa9, 0xbd, 0x47, 0x82, - 0xa6, 0x1f, 0x78, 0xff, 0xc3, 0x09, 0x46, 0xab, 0x00, 0xb2, 0x4f, 0xea, 0xc3, 0x16, 0xb6, 0x73, - 0xd2, 0xb2, 0xef, 0x37, 0x8d, 0x33, 0x0d, 0x4a, 0xe3, 0x08, 0x0f, 0xbe, 0x9f, 0xa7, 0x1a, 0x54, - 0x04, 0xd6, 0x57, 0x84, 0xf3, 0x63, 0x12, 0x55, 0x8c, 0xbd, 0x3a, 0xf8, 0x8c, 0xf8, 0xde, 0x21, - 0xbf, 0xef, 0x0a, 0x3d, 0x85, 0x37, 0xdc, 0x63, 0xda, 0x38, 0xaa, 0x1f, 0x8a, 0xf0, 0x02, 0x3b, - 0x63, 0xe7, 0x85, 0x4d, 0x2a, 0x1a, 0xbf, 0x69, 0xb0, 0x36, 0x1d, 0xe7, 0xa1, 0xab, 0xb5, 0xf3, - 0xc7, 0x22, 0x3c, 0x12, 0x78, 0x28, 0x84, 0xac, 0x1c, 0xf7, 0xa8, 0x3a, 0x09, 0x60, 0xfc, 0x66, - 0xd1, 0x37, 0x66, 0xfa, 0x49, 0x41, 0xa3, 0xf8, 0xc3, 0x9f, 0xff, 0xfc, 0x9c, 0x5e, 0x42, 0x05, - 0x9c, 0xbc, 0xe3, 0x50, 0x08, 0x19, 0x8b, 0x70, 0xf4, 0xee, 0xd4, 0x40, 0xa3, 0x3b, 0x46, 0x5f, - 0xbf, 0xdb, 0x49, 0x49, 0xad, 0x09, 0x29, 0x1d, 0x95, 0x86, 0x52, 0x3d, 0x35, 0x81, 0xfa, 0xb8, - 0xd7, 0xf1, 0x9b, 0x7d, 0xf4, 0xab, 0x06, 0x8f, 0x13, 0x33, 0x08, 0xd5, 0xee, 0x8a, 0x3c, 0x36, - 0x2b, 0x75, 0x73, 0x5e, 0x77, 0x85, 0xb4, 0x21, 0x90, 0x9e, 0xa2, 0xca, 0x10, 0x49, 0x11, 0xc5, - 0xd0, 0xc4, 0x00, 0xf8, 0x1a, 0x16, 0xa2, 0x08, 0xe8, 0xce, 0x4c, 0x87, 0xd5, 0x7f, 0x36, 0xc3, - 0x4b, 0xa9, 0xbf, 0x25, 0xd4, 0x0b, 0xe8, 0x31, 0x8e, 0x7d, 0x49, 0x30, 0x74, 0xa6, 0x41, 0x3e, - 0xd6, 0xb7, 0x68, 0x6b, 0xfa, 0x5e, 0x8e, 0x0d, 0x18, 0xfd, 0xc5, 0x7c, 0xce, 0x8a, 0x60, 0x53, - 0x10, 0xac, 0x23, 0x23, 0x41, 0x80, 0xdb, 0xd2, 0x15, 0xf7, 0x46, 0x33, 0xa6, 0x8f, 0x7e, 0xd7, - 0x60, 0x79, 0x42, 0xa3, 0xa0, 0x97, 0x53, 0x15, 0xa7, 0x77, 0xb9, 0xfe, 0xde, 0x7f, 0x5b, 0xa4, - 0x70, 0x5f, 0x08, 0xdc, 0x2a, 0x5a, 0x4f, 0xe2, 0x32, 0xb9, 0x04, 0xf7, 0xe2, 0x0d, 0xdf, 0x47, - 0xa7, 0x1a, 0xc0, 0x68, 0xfc, 0xa3, 0xcd, 0x19, 0x67, 0x23, 0x76, 0xbd, 0xe8, 0x5b, 0x73, 0xf9, - 0x2a, 0xaa, 0x67, 0x82, 0xaa, 0x82, 0x56, 0x13, 0x54, 0x35, 0xb7, 0x5b, 0x8b, 0x6e, 0x09, 0xdc, - 0x13, 0x17, 0x52, 0xdf, 0xfa, 0xe8, 0xfc, 0xaa, 0xac, 0x5d, 0x5c, 0x95, 0xb5, 0xbf, 0xaf, 0xca, - 0xda, 0x4f, 0xd7, 0xe5, 0xd4, 0xc5, 0x75, 0x39, 0xf5, 0xd7, 0x75, 0x39, 0xf5, 0xba, 0xea, 0xf9, - 0xfc, 0xb0, 0xe3, 0x9a, 0x0d, 0xda, 0x8a, 0x42, 0xd4, 0x94, 0xb0, 0x08, 0xf7, 0x9d, 0x08, 0xc8, - 0xbb, 0x6d, 0xc2, 0xdc, 0xac, 0xf8, 0x96, 0x7c, 0xf9, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x28, - 0x56, 0x0d, 0x0a, 0x18, 0x0b, 0x00, 0x00, +func init() { proto.RegisterFile("sgenetwork/sge/bet/query.proto", fileDescriptor_5d73c4d56d215257) } + +var fileDescriptor_5d73c4d56d215257 = []byte{ + // 889 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x96, 0xcf, 0x6f, 0xe3, 0x44, + 0x14, 0xc7, 0xe3, 0xa4, 0x9b, 0x2a, 0x2f, 0xac, 0xc2, 0xce, 0x2e, 0x34, 0x6b, 0x6d, 0xe3, 0xae, + 0x69, 0xd3, 0xaa, 0x6d, 0x6c, 0xb5, 0xe5, 0x00, 0xe2, 0x82, 0x0c, 0x2a, 0x70, 0x40, 0x2d, 0x46, + 0xbd, 0xf4, 0x12, 0xd9, 0xc9, 0xd4, 0x35, 0x6d, 0x3c, 0xa9, 0x67, 0x02, 0x44, 0x51, 0x24, 0xc4, + 0xb9, 0x48, 0x48, 0x54, 0x70, 0xe1, 0x6f, 0xe0, 0xef, 0xe8, 0x81, 0x43, 0x25, 0x2e, 0x9c, 0x2a, + 0xd4, 0x72, 0xea, 0x5f, 0x81, 0x3c, 0x33, 0x49, 0xec, 0xfc, 0x68, 0x82, 0xd4, 0x55, 0x2f, 0x71, + 0x3c, 0xf3, 0xe6, 0x7d, 0x3f, 0xef, 0xcd, 0xbc, 0x37, 0x86, 0x12, 0xf5, 0x70, 0x80, 0xd9, 0x77, + 0x24, 0x3c, 0x31, 0xa9, 0x87, 0x4d, 0x17, 0x33, 0xf3, 0xac, 0x85, 0xc3, 0xb6, 0xd1, 0x0c, 0x09, + 0x23, 0x08, 0x0d, 0xe6, 0x0d, 0xea, 0x61, 0xc3, 0xc5, 0x4c, 0x7d, 0xe1, 0x11, 0x8f, 0xf0, 0x69, + 0x33, 0xfa, 0x27, 0x2c, 0xd5, 0x57, 0x1e, 0x21, 0xde, 0x29, 0x36, 0x9d, 0xa6, 0x6f, 0x3a, 0x41, + 0x40, 0x98, 0xc3, 0x7c, 0x12, 0x50, 0x39, 0xbb, 0x5e, 0x23, 0xb4, 0x41, 0xa8, 0xe9, 0x3a, 0x14, + 0x0b, 0x01, 0xf3, 0xdb, 0x2d, 0x17, 0x33, 0x67, 0xcb, 0x6c, 0x3a, 0x9e, 0x1f, 0x70, 0x63, 0x69, + 0xab, 0x8d, 0x61, 0x6a, 0x3a, 0xa1, 0xd3, 0xe8, 0x39, 0x7b, 0x35, 0xc6, 0xc0, 0xc5, 0x4c, 0xce, + 0xea, 0x43, 0xb3, 0x0d, 0x27, 0x3c, 0xc1, 0x4c, 0x3e, 0x84, 0x8d, 0xfe, 0x02, 0xd0, 0x57, 0x11, + 0xc4, 0x3e, 0x77, 0x6b, 0xe3, 0xb3, 0x16, 0xa6, 0x4c, 0xdf, 0x83, 0xe7, 0x89, 0x51, 0xda, 0x24, + 0x01, 0xc5, 0xe8, 0x03, 0xc8, 0x0a, 0xf9, 0xa2, 0xb2, 0xa4, 0xac, 0xe5, 0xb7, 0x55, 0x63, 0x34, + 0x29, 0x86, 0x58, 0x63, 0xcd, 0x5d, 0x5e, 0x6b, 0x29, 0x5b, 0xda, 0xeb, 0xbb, 0x50, 0xe0, 0x0e, + 0x2d, 0xcc, 0xa4, 0x06, 0x2a, 0xc2, 0x7c, 0x2d, 0xc4, 0x0e, 0x23, 0x21, 0xf7, 0x96, 0xb3, 0x7b, + 0xaf, 0xe8, 0x25, 0x64, 0x5a, 0x7e, 0xbd, 0x98, 0x8e, 0x46, 0xad, 0xf9, 0xbb, 0x6b, 0x2d, 0x7a, + 0xb5, 0xa3, 0x1f, 0xfd, 0x07, 0x05, 0xde, 0x1e, 0x38, 0x92, 0x58, 0x26, 0x64, 0x5c, 0xcc, 0x24, + 0xd3, 0xc2, 0x38, 0x26, 0x0b, 0x33, 0x09, 0x14, 0x59, 0xa2, 0x8f, 0x20, 0x2b, 0x92, 0xc0, 0x35, + 0xf2, 0xdb, 0x8b, 0xc3, 0x6b, 0x64, 0x8a, 0xbe, 0xe4, 0x8f, 0x5e, 0x28, 0x62, 0x50, 0x3f, 0x1c, + 0x10, 0xf4, 0xf2, 0x85, 0x76, 0x01, 0x06, 0x9b, 0x27, 0x41, 0xca, 0x86, 0xd8, 0x69, 0x23, 0xda, + 0x69, 0x43, 0x1c, 0x25, 0xb9, 0xd3, 0xc6, 0xbe, 0xe3, 0x61, 0xb9, 0xd6, 0x8e, 0xad, 0xd4, 0x7f, + 0x52, 0xe0, 0x59, 0xcc, 0xf9, 0x70, 0x7c, 0x99, 0x19, 0xe3, 0xfb, 0x2c, 0x81, 0x23, 0x62, 0x5c, + 0x9d, 0x8a, 0x23, 0xd4, 0x12, 0x3c, 0x5d, 0x78, 0xd9, 0xc7, 0xb1, 0xda, 0x9f, 0x88, 0xfd, 0x79, + 0xe0, 0xa0, 0xe3, 0x07, 0x21, 0x9d, 0x38, 0x08, 0xfa, 0xaf, 0x0a, 0xa8, 0xe3, 0xf4, 0x1f, 0x3d, + 0x2f, 0x1f, 0xc2, 0xbb, 0x31, 0xae, 0x83, 0x2f, 0x3e, 0xed, 0x9f, 0x04, 0x0d, 0x9e, 0xf8, 0x0c, + 0xf3, 0x0a, 0xc9, 0xac, 0xe5, 0xac, 0xdc, 0xdd, 0xb5, 0x26, 0x06, 0x6c, 0xf1, 0xd0, 0xdb, 0xb0, + 0x30, 0xb2, 0x54, 0xc6, 0xb3, 0x05, 0x73, 0x2e, 0x66, 0x74, 0xb6, 0x80, 0xb8, 0x29, 0xda, 0x00, + 0x14, 0x10, 0x56, 0x3d, 0x22, 0xad, 0xa0, 0x5e, 0x75, 0x31, 0xab, 0xb6, 0xfc, 0x3a, 0x2d, 0xa6, + 0x23, 0x6d, 0xbb, 0x10, 0x10, 0xb6, 0x1b, 0x4d, 0x58, 0x98, 0x1d, 0xf8, 0x75, 0x1a, 0x15, 0x8f, + 0xd0, 0xde, 0xc7, 0x41, 0xdd, 0x0f, 0xbc, 0x37, 0x70, 0x82, 0xd1, 0x22, 0x80, 0xa8, 0x93, 0x6a, + 0xbf, 0x84, 0xed, 0x9c, 0x18, 0x39, 0xf0, 0xeb, 0xfa, 0x85, 0x02, 0xc5, 0x51, 0x84, 0x47, 0xdf, + 0xcf, 0x73, 0x05, 0x34, 0x8e, 0xf5, 0x35, 0x66, 0xec, 0x14, 0x47, 0x19, 0xa3, 0x7b, 0x47, 0x9f, + 0x63, 0xdf, 0x3b, 0x66, 0x0f, 0x9d, 0xa1, 0xd7, 0xf0, 0x96, 0x7b, 0x4a, 0x6a, 0x27, 0xd5, 0x63, + 0xee, 0x9e, 0x63, 0x67, 0xec, 0x3c, 0x1f, 0x13, 0x8a, 0xfa, 0xef, 0x0a, 0x2c, 0x4d, 0xc6, 0x79, + 0xec, 0x6c, 0x6d, 0xff, 0x39, 0x0f, 0x4f, 0x38, 0x1e, 0x0a, 0x21, 0x2b, 0xda, 0x3d, 0x2a, 0x8f, + 0x03, 0x18, 0xbd, 0x59, 0xd4, 0xd5, 0xa9, 0x76, 0x42, 0x50, 0x5f, 0xf8, 0xf1, 0xaf, 0x7f, 0x7f, + 0x49, 0x3f, 0x43, 0x85, 0xa1, 0x9b, 0x0f, 0x85, 0x90, 0xb1, 0x30, 0x43, 0xef, 0x4d, 0x74, 0x34, + 0xb8, 0x63, 0xd4, 0xe5, 0xfb, 0x8d, 0xa4, 0xd4, 0x12, 0x97, 0x52, 0x51, 0xb1, 0x2f, 0xd5, 0x91, + 0x1d, 0xa8, 0x6b, 0x76, 0x5a, 0x7e, 0xbd, 0x8b, 0x7e, 0x53, 0xe0, 0x69, 0xa2, 0x07, 0xa1, 0xca, + 0x7d, 0x9e, 0x47, 0x7a, 0xa5, 0x6a, 0xcc, 0x6a, 0x2e, 0x91, 0x56, 0x39, 0xd2, 0x6b, 0xa4, 0xf5, + 0x91, 0x24, 0x51, 0x0c, 0x8d, 0x37, 0x80, 0x6f, 0x60, 0x2e, 0xf2, 0x80, 0xee, 0x8d, 0xb4, 0x9f, + 0xfd, 0x95, 0x29, 0x56, 0x52, 0xfd, 0x1d, 0xae, 0x5e, 0x40, 0x4f, 0xe3, 0x1f, 0x15, 0x14, 0x5d, + 0x28, 0x90, 0x8f, 0xd5, 0x2d, 0xda, 0x98, 0xbc, 0x97, 0x23, 0x0d, 0x46, 0xdd, 0x9c, 0xcd, 0x58, + 0x12, 0xac, 0x73, 0x82, 0x65, 0xa4, 0x27, 0x08, 0xcc, 0xa6, 0x30, 0x35, 0x3b, 0x83, 0x1e, 0xd3, + 0x45, 0x7f, 0x28, 0xf0, 0x7c, 0x4c, 0xa1, 0xa0, 0x9d, 0x89, 0x8a, 0x93, 0xab, 0x5c, 0x7d, 0xff, + 0xff, 0x2d, 0x92, 0xb8, 0x9b, 0x1c, 0xb7, 0x8c, 0x96, 0x93, 0xb8, 0x54, 0x2c, 0x31, 0x3b, 0xf1, + 0x82, 0xef, 0xa2, 0x73, 0x05, 0x60, 0xd0, 0xfe, 0xd1, 0xfa, 0x94, 0xb3, 0x11, 0xbb, 0x5e, 0xd4, + 0x8d, 0x99, 0x6c, 0x25, 0xd5, 0x0a, 0xa7, 0xd2, 0xd0, 0x62, 0x82, 0xaa, 0xe2, 0xb6, 0x2b, 0xd1, + 0x2d, 0x61, 0x76, 0xf8, 0x85, 0xd4, 0xb5, 0x3e, 0xbe, 0xbc, 0x29, 0x29, 0x57, 0x37, 0x25, 0xe5, + 0x9f, 0x9b, 0x92, 0xf2, 0xf3, 0x6d, 0x29, 0x75, 0x75, 0x5b, 0x4a, 0xfd, 0x7d, 0x5b, 0x4a, 0x1d, + 0x96, 0x3d, 0x9f, 0x1d, 0xb7, 0x5c, 0xa3, 0x46, 0x1a, 0x91, 0x8b, 0x4a, 0xfc, 0x63, 0xf2, 0x7b, + 0xee, 0x90, 0xb5, 0x9b, 0x98, 0xba, 0x59, 0xfe, 0x2d, 0xb9, 0xf3, 0x5f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x82, 0x66, 0xa2, 0x41, 0x44, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1136,7 +1136,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/bet/query.proto", + Metadata: "sgenetwork/sge/bet/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/query.pb.gw.go b/x/bet/types/query.pb.gw.go index 42f323cf..370e2a1c 100644 --- a/x/bet/types/query.pb.gw.go +++ b/x/bet/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: sge/bet/query.proto +// source: sgenetwork/sge/bet/query.proto /* Package types is a reverse proxy. diff --git a/x/bet/types/stats.pb.go b/x/bet/types/stats.pb.go index 9b4fca44..e34d45ca 100644 --- a/x/bet/types/stats.pb.go +++ b/x/bet/types/stats.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/stats.proto +// source: sgenetwork/sge/bet/stats.proto package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -32,7 +32,7 @@ func (m *BetStats) Reset() { *m = BetStats{} } func (m *BetStats) String() string { return proto.CompactTextString(m) } func (*BetStats) ProtoMessage() {} func (*BetStats) Descriptor() ([]byte, []int) { - return fileDescriptor_e7bd589ff6fa2d86, []int{0} + return fileDescriptor_d4b91f5cccbf55c0, []int{0} } func (m *BetStats) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -72,20 +72,20 @@ func init() { proto.RegisterType((*BetStats)(nil), "sgenetwork.sge.bet.BetStats") } -func init() { proto.RegisterFile("sge/bet/stats.proto", fileDescriptor_e7bd589ff6fa2d86) } +func init() { proto.RegisterFile("sgenetwork/sge/bet/stats.proto", fileDescriptor_d4b91f5cccbf55c0) } -var fileDescriptor_e7bd589ff6fa2d86 = []byte{ - // 155 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x4e, 0x4f, 0xd5, - 0x4f, 0x4a, 0x2d, 0xd1, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, - 0x12, 0x2a, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x4e, 0x4f, 0xd5, - 0x4b, 0x4a, 0x2d, 0x51, 0x52, 0xe0, 0xe2, 0x70, 0x4a, 0x2d, 0x09, 0x06, 0xa9, 0x12, 0x12, 0xe1, - 0x62, 0x4d, 0xce, 0x2f, 0xcd, 0x2b, 0x91, 0x60, 0x54, 0x60, 0xd4, 0x60, 0x09, 0x82, 0x70, 0x9c, - 0x1c, 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, 0x2d, 0x3d, 0xb3, 0x24, - 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0xbf, 0x38, 0x3d, 0x55, 0x17, 0x6a, 0x36, 0x88, 0xad, - 0x5f, 0x01, 0xb6, 0xbd, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x6c, 0xbd, 0x31, 0x20, 0x00, - 0x00, 0xff, 0xff, 0xe8, 0xa1, 0x55, 0x2b, 0x95, 0x00, 0x00, 0x00, +var fileDescriptor_d4b91f5cccbf55c0 = []byte{ + // 154 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0x4f, 0x4a, 0x2d, 0xd1, 0x2f, + 0x2e, 0x49, 0x2c, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x15, + 0xa7, 0xa7, 0xea, 0x25, 0xa5, 0x96, 0x28, 0x29, 0x70, 0x71, 0x38, 0xa5, 0x96, 0x04, 0x83, 0x54, + 0x09, 0x89, 0x70, 0xb1, 0x26, 0xe7, 0x97, 0xe6, 0x95, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0xb0, 0x04, + 0x41, 0x38, 0x4e, 0x0e, 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, 0xa5, 0x96, + 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0xb2, 0x4f, 0x17, 0xd9, 0xee, 0x0a, + 0xb0, 0xed, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xeb, 0x8d, 0x01, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x99, 0x1c, 0x2c, 0x12, 0xa0, 0x00, 0x00, 0x00, } func (m *BetStats) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/ticket.pb.go b/x/bet/types/ticket.pb.go index 1cde4404..cdea43b1 100644 --- a/x/bet/types/ticket.pb.go +++ b/x/bet/types/ticket.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/ticket.proto +// source: sgenetwork/sge/bet/ticket.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" types "github.com/sge-network/sge/types" io "io" math "math" @@ -41,7 +41,7 @@ func (m *WagerTicketPayload) Reset() { *m = WagerTicketPayload{} } func (m *WagerTicketPayload) String() string { return proto.CompactTextString(m) } func (*WagerTicketPayload) ProtoMessage() {} func (*WagerTicketPayload) Descriptor() ([]byte, []int) { - return fileDescriptor_cf6959e7db451613, []int{0} + return fileDescriptor_5c3f88574fd82596, []int{0} } func (m *WagerTicketPayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -102,31 +102,31 @@ func init() { proto.RegisterType((*WagerTicketPayload)(nil), "sgenetwork.sge.bet.WagerTicketPayload") } -func init() { proto.RegisterFile("sge/bet/ticket.proto", fileDescriptor_cf6959e7db451613) } +func init() { proto.RegisterFile("sgenetwork/sge/bet/ticket.proto", fileDescriptor_5c3f88574fd82596) } -var fileDescriptor_cf6959e7db451613 = []byte{ - // 331 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xbf, 0x4a, 0x03, 0x41, - 0x10, 0xc6, 0xef, 0x92, 0x60, 0xe2, 0x45, 0x2d, 0x96, 0xa0, 0x21, 0xca, 0x19, 0x22, 0x48, 0x1a, - 0x6f, 0x21, 0x56, 0x16, 0x42, 0x88, 0xe9, 0x2c, 0x94, 0x23, 0x20, 0xd8, 0x84, 0xbd, 0xdd, 0x61, - 0x0d, 0x77, 0x71, 0x8f, 0xec, 0x88, 0xee, 0x5b, 0x58, 0xf9, 0x4c, 0x29, 0x53, 0x5a, 0x89, 0x24, - 0x2f, 0x22, 0x7b, 0x7f, 0x2c, 0x54, 0xec, 0x66, 0xbe, 0x99, 0xef, 0x9b, 0x1f, 0xbb, 0x5e, 0x4b, - 0x4b, 0xa0, 0x11, 0x20, 0xc5, 0x19, 0x8f, 0x01, 0x83, 0x74, 0xa1, 0x50, 0x11, 0xa2, 0x25, 0x3c, - 0x02, 0x3e, 0xab, 0x45, 0x1c, 0x68, 0x09, 0x41, 0x04, 0xd8, 0x69, 0x49, 0x25, 0x55, 0x36, 0xa6, - 0xb6, 0xca, 0x37, 0x3b, 0x76, 0x93, 0xa2, 0x49, 0x81, 0xc6, 0x86, 0x17, 0xda, 0x7e, 0x99, 0x19, - 0x01, 0x4e, 0x95, 0x10, 0xba, 0xd0, 0x0f, 0x4a, 0xdd, 0x6a, 0x53, 0x6b, 0xca, 0x07, 0xbd, 0xb7, - 0x8a, 0x47, 0xee, 0x98, 0x84, 0xc5, 0x24, 0x83, 0xb8, 0x65, 0x26, 0x51, 0x4c, 0x90, 0xa1, 0xb7, - 0xab, 0x21, 0x01, 0x8e, 0x20, 0xb2, 0x98, 0xb6, 0xdb, 0x75, 0xfb, 0xcd, 0xc1, 0x61, 0xf0, 0x9b, - 0x2e, 0x18, 0x01, 0xde, 0x08, 0xa1, 0xc3, 0x9d, 0xd2, 0x61, 0x3b, 0x32, 0xf6, 0x1a, 0xb1, 0xe1, - 0x53, 0xc1, 0x90, 0xb5, 0x2b, 0x99, 0xf9, 0xe4, 0xa7, 0x39, 0xc3, 0xb8, 0x36, 0x7c, 0xcc, 0x90, - 0x15, 0x87, 0x47, 0xb5, 0xe5, 0xc7, 0xb1, 0x13, 0xd6, 0xe3, 0x5c, 0x25, 0x17, 0xde, 0xf6, 0x37, - 0x71, 0xbb, 0xda, 0x75, 0xfb, 0x7b, 0x83, 0xa3, 0xbf, 0x18, 0xec, 0xc9, 0x89, 0x49, 0x21, 0x6c, - 0xa8, 0xa2, 0x22, 0x97, 0x5e, 0x83, 0x25, 0x49, 0x4e, 0x5f, 0xeb, 0x56, 0xfb, 0xcd, 0x41, 0xef, - 0x1f, 0xfa, 0x2b, 0x35, 0x4f, 0x19, 0xc7, 0xb0, 0xce, 0x92, 0xc4, 0xf6, 0xa3, 0xe1, 0x72, 0xed, - 0xbb, 0xab, 0xb5, 0xef, 0x7e, 0xae, 0x7d, 0xf7, 0x75, 0xe3, 0x3b, 0xab, 0x8d, 0xef, 0xbc, 0x6f, - 0x7c, 0xe7, 0xfe, 0x54, 0xce, 0xf0, 0xe1, 0x29, 0x0a, 0xb8, 0x9a, 0x53, 0x2d, 0xe1, 0xac, 0x48, - 0xb4, 0x35, 0x7d, 0xc9, 0x3f, 0xd4, 0xa4, 0xa0, 0xa3, 0xad, 0xec, 0x85, 0xcf, 0xbf, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x2c, 0x82, 0x98, 0x8e, 0xe8, 0x01, 0x00, 0x00, +var fileDescriptor_5c3f88574fd82596 = []byte{ + // 336 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x3f, 0x4b, 0x33, 0x41, + 0x10, 0xc6, 0xef, 0x92, 0xf0, 0x26, 0xef, 0x45, 0x2d, 0x16, 0x8b, 0x10, 0xf5, 0x12, 0x23, 0x48, + 0x1a, 0xef, 0x20, 0x56, 0x16, 0x42, 0x88, 0xe9, 0x2c, 0x94, 0x23, 0x20, 0xd8, 0x84, 0xbd, 0xdd, + 0x61, 0x0d, 0x77, 0x71, 0x8f, 0xec, 0x88, 0xee, 0xb7, 0xb0, 0xf2, 0x33, 0xa5, 0x4c, 0x69, 0x25, + 0x92, 0x7c, 0x11, 0xd9, 0xbd, 0xf3, 0x0f, 0x31, 0xd8, 0xcd, 0xec, 0x3c, 0x33, 0xcf, 0x8f, 0x67, + 0xbd, 0x96, 0x12, 0x70, 0x0f, 0xf8, 0x28, 0x67, 0x49, 0xa8, 0x04, 0x84, 0x31, 0x60, 0x88, 0x13, + 0x96, 0x00, 0x06, 0xd9, 0x4c, 0xa2, 0x24, 0xe4, 0x5b, 0x10, 0x28, 0x01, 0x41, 0x0c, 0xd8, 0xdc, + 0x15, 0x52, 0x48, 0x3b, 0x0e, 0x4d, 0x95, 0x2b, 0x9b, 0x07, 0x6b, 0xa7, 0x50, 0x67, 0x10, 0x26, + 0x9a, 0x15, 0xe3, 0xc3, 0x0d, 0x4e, 0x31, 0xe0, 0x58, 0x72, 0xae, 0x0a, 0x49, 0x67, 0x83, 0xc4, + 0x8c, 0xc7, 0xe6, 0x54, 0xae, 0xe9, 0xbc, 0x94, 0x3c, 0x72, 0x43, 0x05, 0xcc, 0x46, 0x96, 0xf2, + 0x9a, 0xea, 0x54, 0x52, 0x4e, 0xfa, 0xde, 0xb6, 0x82, 0x14, 0x18, 0x02, 0xb7, 0x17, 0x1b, 0x6e, + 0xdb, 0xed, 0xd6, 0x7b, 0x7b, 0xc1, 0x6f, 0xfc, 0x60, 0x00, 0x78, 0xc5, 0xb9, 0x8a, 0xb6, 0x3e, + 0x37, 0x4c, 0x47, 0x86, 0x5e, 0x2d, 0xd1, 0x6c, 0xcc, 0x29, 0xd2, 0x46, 0xc9, 0x2e, 0x1f, 0xad, + 0x2f, 0x5b, 0x8c, 0x4b, 0xcd, 0x86, 0x14, 0x69, 0x61, 0x3c, 0xa8, 0xcc, 0xdf, 0x5a, 0x4e, 0x54, + 0x4d, 0xf2, 0x57, 0x72, 0xe6, 0xfd, 0xff, 0x22, 0x6e, 0x94, 0xdb, 0x6e, 0x77, 0xa7, 0xb7, 0xbf, + 0x89, 0xc1, 0x58, 0x8e, 0x74, 0x06, 0x51, 0x4d, 0x16, 0x15, 0x39, 0xf7, 0x6a, 0x34, 0x4d, 0x73, + 0xfa, 0x4a, 0xbb, 0xdc, 0xad, 0xf7, 0x3a, 0x7f, 0xd0, 0x5f, 0xc8, 0x69, 0x46, 0x19, 0x46, 0x55, + 0x9a, 0xa6, 0xa6, 0x1f, 0xf4, 0xe7, 0x4b, 0xdf, 0x5d, 0x2c, 0x7d, 0xf7, 0x7d, 0xe9, 0xbb, 0xcf, + 0x2b, 0xdf, 0x59, 0xac, 0x7c, 0xe7, 0x75, 0xe5, 0x3b, 0xb7, 0xc7, 0x62, 0x82, 0x77, 0x0f, 0x71, + 0xc0, 0xe4, 0xd4, 0xc4, 0x7a, 0xf2, 0x33, 0xe2, 0xa7, 0xfc, 0xc7, 0x75, 0x06, 0x2a, 0xfe, 0x67, + 0x13, 0x3e, 0xfd, 0x08, 0x00, 0x00, 0xff, 0xff, 0xea, 0x9d, 0x85, 0xfc, 0x14, 0x02, 0x00, 0x00, } func (m *WagerTicketPayload) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/tx.pb.go b/x/bet/types/tx.pb.go index bba6e06b..41b3a93d 100644 --- a/x/bet/types/tx.pb.go +++ b/x/bet/types/tx.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/tx.proto +// source: sgenetwork/sge/bet/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" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -39,7 +39,7 @@ func (m *MsgWager) Reset() { *m = MsgWager{} } func (m *MsgWager) String() string { return proto.CompactTextString(m) } func (*MsgWager) ProtoMessage() {} func (*MsgWager) Descriptor() ([]byte, []int) { - return fileDescriptor_38b4167f68c2a7f8, []int{0} + return fileDescriptor_3fc41486184bd76d, []int{0} } func (m *MsgWager) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -92,7 +92,7 @@ func (m *MsgWagerResponse) Reset() { *m = MsgWagerResponse{} } func (m *MsgWagerResponse) String() string { return proto.CompactTextString(m) } func (*MsgWagerResponse) ProtoMessage() {} func (*MsgWagerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_38b4167f68c2a7f8, []int{1} + return fileDescriptor_3fc41486184bd76d, []int{1} } func (m *MsgWagerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -133,25 +133,25 @@ func init() { proto.RegisterType((*MsgWagerResponse)(nil), "sgenetwork.sge.bet.MsgWagerResponse") } -func init() { proto.RegisterFile("sge/bet/tx.proto", fileDescriptor_38b4167f68c2a7f8) } +func init() { proto.RegisterFile("sgenetwork/sge/bet/tx.proto", fileDescriptor_3fc41486184bd76d) } -var fileDescriptor_38b4167f68c2a7f8 = []byte{ - // 239 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x28, 0x4e, 0x4f, 0xd5, - 0x4f, 0x4a, 0x2d, 0xd1, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2a, 0x4e, - 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x4e, 0x4f, 0xd5, 0x4b, 0x4a, 0x2d, - 0x91, 0x12, 0x86, 0xa9, 0x2a, 0x4f, 0x4c, 0x4f, 0x2d, 0x82, 0x28, 0x54, 0x8a, 0xe2, 0xe2, 0xf0, - 0x2d, 0x4e, 0x0f, 0x07, 0x89, 0x08, 0x49, 0x70, 0xb1, 0x27, 0x17, 0xa5, 0x26, 0x96, 0xe4, 0x17, - 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0xc1, 0xb8, 0x42, 0x26, 0x5c, 0xac, 0x05, 0x45, 0xf9, - 0x05, 0xc5, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xdc, 0x46, 0x72, 0x7a, 0x98, 0xc6, 0xeb, 0x81, 0xcd, - 0x08, 0x00, 0xa9, 0x0a, 0x82, 0x28, 0x56, 0xf2, 0xe0, 0x12, 0x80, 0x99, 0x1d, 0x94, 0x5a, 0x5c, - 0x90, 0x9f, 0x57, 0x9c, 0x8a, 0x30, 0x89, 0x91, 0x04, 0x93, 0x8c, 0x82, 0xb8, 0x98, 0x7d, 0x8b, - 0xd3, 0x85, 0xbc, 0xb9, 0x58, 0x21, 0x2e, 0x95, 0xc1, 0xa6, 0x0d, 0x66, 0x97, 0x94, 0x0a, 0x3e, - 0x59, 0x98, 0x4b, 0x9c, 0x1c, 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, - 0x2d, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0xbf, 0x38, 0x3d, 0x55, 0x17, - 0x6a, 0x14, 0x88, 0xad, 0x5f, 0x01, 0x09, 0xe7, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x10, - 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x41, 0x9b, 0xc2, 0x84, 0x7f, 0x01, 0x00, 0x00, +var fileDescriptor_3fc41486184bd76d = []byte{ + // 238 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2e, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0x4f, 0x4a, 0x2d, 0xd1, 0x2f, + 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0x48, 0xea, 0x15, 0xa7, 0xa7, 0xea, + 0x25, 0xa5, 0x96, 0x48, 0xc9, 0x61, 0xd1, 0x50, 0x9e, 0x98, 0x9e, 0x5a, 0x04, 0xd1, 0xa3, 0x14, + 0xc5, 0xc5, 0xe1, 0x5b, 0x9c, 0x1e, 0x0e, 0x12, 0x11, 0x92, 0xe0, 0x62, 0x4f, 0x2e, 0x4a, 0x4d, + 0x2c, 0xc9, 0x2f, 0x92, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0c, 0x82, 0x71, 0x85, 0x4c, 0xb8, 0x58, + 0x0b, 0x8a, 0xf2, 0x0b, 0x8a, 0x25, 0x98, 0x14, 0x18, 0x35, 0xb8, 0x8d, 0xe4, 0xf4, 0x30, 0x6d, + 0xd2, 0x03, 0x9b, 0x11, 0x00, 0x52, 0x15, 0x04, 0x51, 0xac, 0xe4, 0xc1, 0x25, 0x00, 0x33, 0x3b, + 0x28, 0xb5, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0x15, 0x61, 0x12, 0x23, 0x09, 0x26, 0x19, 0x05, 0x71, + 0x31, 0xfb, 0x16, 0xa7, 0x0b, 0x79, 0x73, 0xb1, 0x42, 0x5c, 0x2a, 0x83, 0x4d, 0x1b, 0xcc, 0x2e, + 0x29, 0x15, 0x7c, 0xb2, 0x30, 0x97, 0x38, 0x39, 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, 0x5a, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0x2e, 0x28, 0xcc, + 0x74, 0x91, 0xc3, 0xaf, 0x02, 0x12, 0xe4, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x20, 0x34, + 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xbd, 0xa6, 0x56, 0x07, 0x95, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -233,7 +233,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/bet/tx.proto", + Metadata: "sgenetwork/sge/bet/tx.proto", } func (m *MsgWager) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/wager.pb.go b/x/bet/types/wager.pb.go index 2123470c..77696f0c 100644 --- a/x/bet/types/wager.pb.go +++ b/x/bet/types/wager.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/bet/wager.proto +// source: sgenetwork/sge/bet/wager.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -38,7 +38,7 @@ func (m *WagerProps) Reset() { *m = WagerProps{} } func (m *WagerProps) String() string { return proto.CompactTextString(m) } func (*WagerProps) ProtoMessage() {} func (*WagerProps) Descriptor() ([]byte, []int) { - return fileDescriptor_b14a4fe747361920, []int{0} + return fileDescriptor_d31f188015e12e07, []int{0} } func (m *WagerProps) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -85,26 +85,26 @@ func init() { proto.RegisterType((*WagerProps)(nil), "sgenetwork.sge.bet.WagerProps") } -func init() { proto.RegisterFile("sge/bet/wager.proto", fileDescriptor_b14a4fe747361920) } +func init() { proto.RegisterFile("sgenetwork/sge/bet/wager.proto", fileDescriptor_d31f188015e12e07) } -var fileDescriptor_b14a4fe747361920 = []byte{ - // 247 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x4e, 0x4f, 0xd5, - 0x4f, 0x4a, 0x2d, 0xd1, 0x2f, 0x4f, 0x4c, 0x4f, 0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, - 0x12, 0x2a, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x4e, 0x4f, 0xd5, - 0x4b, 0x4a, 0x2d, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, 0x95, - 0x4a, 0x7d, 0x8c, 0x5c, 0x5c, 0xe1, 0x20, 0x9d, 0x01, 0x45, 0xf9, 0x05, 0xc5, 0x42, 0x0a, 0x5c, - 0xcc, 0xa5, 0x99, 0x29, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x4e, 0x7c, 0x8f, 0xee, 0xc9, 0x33, - 0x87, 0x7a, 0xba, 0xbc, 0xba, 0x27, 0x0f, 0x12, 0x0d, 0x02, 0x11, 0x42, 0x6e, 0x5c, 0x6c, 0x89, - 0xb9, 0xf9, 0xa5, 0x79, 0x25, 0x12, 0x4c, 0x60, 0x45, 0x7a, 0x27, 0xee, 0xc9, 0x33, 0xdc, 0xba, - 0x27, 0xaf, 0x96, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, 0x9c, 0x5f, - 0x9c, 0x9b, 0x5f, 0x0c, 0xa5, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0xf5, - 0x3c, 0xf3, 0x4a, 0x82, 0xa0, 0xba, 0x85, 0xc4, 0xb8, 0xd8, 0x4a, 0x32, 0x93, 0xb3, 0x53, 0x4b, - 0x24, 0x98, 0x41, 0xe6, 0x04, 0x41, 0x79, 0x4e, 0x0e, 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, 0x85, 0x6c, 0x43, 0x71, 0x7a, 0xaa, 0x2e, 0xd4, 0x83, 0x20, 0xb6, 0x7e, 0x05, - 0x38, 0x08, 0xc0, 0xb6, 0x24, 0xb1, 0x81, 0x7d, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x5d, - 0x87, 0x3f, 0x36, 0x1a, 0x01, 0x00, 0x00, +var fileDescriptor_d31f188015e12e07 = []byte{ + // 248 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0x4f, 0x4a, 0x2d, 0xd1, 0x2f, + 0x4f, 0x4c, 0x4f, 0x2d, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x15, + 0xa7, 0xa7, 0xea, 0x25, 0xa5, 0x96, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0xa5, 0xf5, 0x41, + 0x2c, 0x88, 0x4a, 0xa5, 0x3e, 0x46, 0x2e, 0xae, 0x70, 0x90, 0xce, 0x80, 0xa2, 0xfc, 0x82, 0x62, + 0x21, 0x05, 0x2e, 0xe6, 0xd2, 0xcc, 0x14, 0x09, 0x46, 0x05, 0x46, 0x0d, 0x4e, 0x27, 0xbe, 0x47, + 0xf7, 0xe4, 0x99, 0x43, 0x3d, 0x5d, 0x5e, 0xdd, 0x93, 0x07, 0x89, 0x06, 0x81, 0x08, 0x21, 0x37, + 0x2e, 0xb6, 0xc4, 0xdc, 0xfc, 0xd2, 0xbc, 0x12, 0x09, 0x26, 0xb0, 0x22, 0xbd, 0x13, 0xf7, 0xe4, + 0x19, 0x6e, 0xdd, 0x93, 0x57, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, + 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0x86, 0x52, 0xba, 0xc5, 0x29, 0xd9, 0xfa, 0x25, 0x95, 0x05, + 0xa9, 0xc5, 0x7a, 0x9e, 0x79, 0x25, 0x41, 0x50, 0xdd, 0x42, 0x62, 0x5c, 0x6c, 0x25, 0x99, 0xc9, + 0xd9, 0xa9, 0x25, 0x12, 0xcc, 0x20, 0x73, 0x82, 0xa0, 0x3c, 0x27, 0x87, 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, 0x42, 0xb6, 0xa1, 0x38, 0x3d, 0x55, 0x17, 0x39, 0x00, 0x2a, + 0xc0, 0x41, 0x00, 0xb6, 0x25, 0x89, 0x0d, 0xec, 0x33, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x5a, 0x75, 0xeb, 0x1e, 0x25, 0x01, 0x00, 0x00, } func (m *WagerProps) Marshal() (dAtA []byte, err error) { diff --git a/x/house/client/cli/query_deposit_test.go b/x/house/client/cli/query_deposit_test.go index bb5ec45d..31b4fe43 100644 --- a/x/house/client/cli/query_deposit_test.go +++ b/x/house/client/cli/query_deposit_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" @@ -16,7 +17,6 @@ import ( markettypes "github.com/sge-network/sge/x/market/types" "github.com/spf13/cast" "github.com/stretchr/testify/require" - tmcli "github.com/tendermint/tendermint/libs/cli" ) const testMarketUID = "5db09053-2901-4110-8fb5-c14e21f8d555" diff --git a/x/house/client/cli/query_withdrawal_test.go b/x/house/client/cli/query_withdrawal_test.go index d734b8ae..6c62e953 100644 --- a/x/house/client/cli/query_withdrawal_test.go +++ b/x/house/client/cli/query_withdrawal_test.go @@ -4,13 +4,13 @@ import ( "fmt" "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/sge-network/sge/testutil/nullify" "github.com/sge-network/sge/x/house/client/cli" "github.com/sge-network/sge/x/house/types" "github.com/stretchr/testify/require" - tmcli "github.com/tendermint/tendermint/libs/cli" ) func TestQueryWithdraw(t *testing.T) { diff --git a/x/house/client/cli/tx_deposit_test.go b/x/house/client/cli/tx_deposit_test.go index 5a99bc52..5695cdbf 100644 --- a/x/house/client/cli/tx_deposit_test.go +++ b/x/house/client/cli/tx_deposit_test.go @@ -20,7 +20,7 @@ func TestTXDepositCLI(t *testing.T) { commonArgs := []string{ fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), - fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), + fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf( "--%s=%s", flags.FlagFees, diff --git a/x/house/client/cli/tx_withdraw_test.go b/x/house/client/cli/tx_withdraw_test.go index 83c7eae8..a90d9798 100644 --- a/x/house/client/cli/tx_withdraw_test.go +++ b/x/house/client/cli/tx_withdraw_test.go @@ -21,7 +21,7 @@ func TestTXWithdrawCLI(t *testing.T) { commonArgs := []string{ fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), - fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), + fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf( "--%s=%s", flags.FlagFees, diff --git a/x/house/module.go b/x/house/module.go index 3a2c5330..6b81420d 100644 --- a/x/house/module.go +++ b/x/house/module.go @@ -5,6 +5,7 @@ import ( "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 +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/sge-network/sge/x/house/client/cli" "github.com/sge-network/sge/x/house/keeper" @@ -98,19 +98,9 @@ func NewAppModule(cdc codec.Codec, keeper keeper.Keeper) AppModule { // RegisterInvariants registers the house module invariants. func (AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} -// Route returns the message routing key for the house module. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) -} - // QuerierRoute returns the house module's querier route name. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the house module sdk.Querier. -func (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) { types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) diff --git a/x/house/module_simulation.go b/x/house/module_simulation.go index 60ddb63f..85f59c86 100644 --- a/x/house/module_simulation.go +++ b/x/house/module_simulation.go @@ -5,7 +5,7 @@ import ( "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "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 +19,7 @@ import ( var ( _ = sample.AccAddress _ = housesimulation.FindAccount - _ = simappparams.StakePerAccount + _ = simtestutil.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -35,7 +35,7 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP } // RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return housesimulation.ParamChanges(r) } diff --git a/x/house/simulation/params.go b/x/house/simulation/params.go index d8b6ee04..8de079bd 100644 --- a/x/house/simulation/params.go +++ b/x/house/simulation/params.go @@ -19,9 +19,9 @@ const ( // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{ - simulation.NewSimParamChange(types.ModuleName, keyMinDeposit, +func ParamChanges(_ *rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{ + simulation.NewSimLegacyParamChange(types.ModuleName, keyMinDeposit, func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenMinDeposit(r)) }, diff --git a/x/house/types/authz.pb.go b/x/house/types/authz.pb.go index 4455a49f..2176f722 100644 --- a/x/house/types/authz.pb.go +++ b/x/house/types/authz.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/house/authz.proto +// source: sgenetwork/sge/house/authz.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -34,7 +34,7 @@ func (m *DepositAuthorization) Reset() { *m = DepositAuthorization{} } func (m *DepositAuthorization) String() string { return proto.CompactTextString(m) } func (*DepositAuthorization) ProtoMessage() {} func (*DepositAuthorization) Descriptor() ([]byte, []int) { - return fileDescriptor_65362c36d170cdf0, []int{0} + return fileDescriptor_ad67f0a0dd6cd8ca, []int{0} } func (m *DepositAuthorization) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -73,7 +73,7 @@ func (m *WithdrawAuthorization) Reset() { *m = WithdrawAuthorization{} } func (m *WithdrawAuthorization) String() string { return proto.CompactTextString(m) } func (*WithdrawAuthorization) ProtoMessage() {} func (*WithdrawAuthorization) Descriptor() ([]byte, []int) { - return fileDescriptor_65362c36d170cdf0, []int{1} + return fileDescriptor_ad67f0a0dd6cd8ca, []int{1} } func (m *WithdrawAuthorization) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -107,26 +107,26 @@ func init() { proto.RegisterType((*WithdrawAuthorization)(nil), "sgenetwork.sge.house.WithdrawAuthorization") } -func init() { proto.RegisterFile("sge/house/authz.proto", fileDescriptor_65362c36d170cdf0) } +func init() { proto.RegisterFile("sgenetwork/sge/house/authz.proto", fileDescriptor_ad67f0a0dd6cd8ca) } -var fileDescriptor_65362c36d170cdf0 = []byte{ +var fileDescriptor_ad67f0a0dd6cd8ca = []byte{ // 254 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x4e, 0x4f, 0xd5, - 0xcf, 0xc8, 0x2f, 0x2d, 0x4e, 0xd5, 0x4f, 0x2c, 0x2d, 0xc9, 0xa8, 0xd2, 0x2b, 0x28, 0xca, 0x2f, - 0xc9, 0x17, 0x12, 0x29, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x4e, - 0x4f, 0xd5, 0x03, 0xab, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd0, 0x07, 0xb1, 0x20, - 0x6a, 0x95, 0xd2, 0xb9, 0x44, 0x5c, 0x52, 0x0b, 0xf2, 0x8b, 0x33, 0x4b, 0x1c, 0x4b, 0x4b, 0x32, - 0xf2, 0x8b, 0x32, 0xab, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x84, 0xfc, 0xb9, 0xb8, 0x8b, 0x0b, 0x52, - 0xf3, 0x52, 0xe2, 0x73, 0x32, 0x73, 0x33, 0x4b, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0xf4, - 0x4e, 0xdc, 0x93, 0x67, 0xb8, 0x75, 0x4f, 0x5e, 0x2d, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, - 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, - 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0x79, 0xe6, 0x95, 0x04, 0x71, 0x81, 0x8d, 0xf0, 0x01, 0x99, - 0xa0, 0x94, 0xc7, 0x25, 0x1a, 0x9e, 0x59, 0x92, 0x91, 0x52, 0x94, 0x58, 0x8e, 0x6a, 0x53, 0x28, - 0x17, 0x5f, 0x39, 0x54, 0x82, 0x22, 0xcb, 0x78, 0x61, 0xa6, 0x80, 0xed, 0x73, 0x72, 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, 0x0d, 0x24, 0x03, 0x8b, 0xd3, 0x53, 0x75, - 0xa1, 0x41, 0x05, 0x62, 0xeb, 0x57, 0x40, 0x83, 0x13, 0x6c, 0x6c, 0x12, 0x1b, 0x38, 0x8c, 0x8c, - 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x64, 0xe1, 0x49, 0xb6, 0x68, 0x01, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xc8, 0x2f, 0x2d, 0x4e, + 0xd5, 0x4f, 0x2c, 0x2d, 0xc9, 0xa8, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x41, 0xa8, + 0xd0, 0x2b, 0x4e, 0x4f, 0xd5, 0x03, 0xab, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd0, + 0x07, 0xb1, 0x20, 0x6a, 0x95, 0xd2, 0xb9, 0x44, 0x5c, 0x52, 0x0b, 0xf2, 0x8b, 0x33, 0x4b, 0x1c, + 0x4b, 0x4b, 0x32, 0xf2, 0x8b, 0x32, 0xab, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x84, 0xfc, 0xb9, 0xb8, + 0x8b, 0x0b, 0x52, 0xf3, 0x52, 0xe2, 0x73, 0x32, 0x73, 0x33, 0x4b, 0x24, 0x18, 0x15, 0x18, 0x35, + 0x38, 0x9d, 0xf4, 0x4e, 0xdc, 0x93, 0x67, 0xb8, 0x75, 0x4f, 0x5e, 0x2d, 0x3d, 0xb3, 0x24, 0xa3, + 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, 0x16, + 0xa7, 0x64, 0xeb, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0x79, 0xe6, 0x95, 0x04, 0x71, 0x81, 0x8d, + 0xf0, 0x01, 0x99, 0xa0, 0x94, 0xc7, 0x25, 0x1a, 0x9e, 0x59, 0x92, 0x91, 0x52, 0x94, 0x58, 0x8e, + 0x6a, 0x53, 0x28, 0x17, 0x5f, 0x39, 0x54, 0x82, 0x22, 0xcb, 0x78, 0x61, 0xa6, 0x80, 0xed, 0x73, + 0x72, 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, 0x0d, 0x24, 0x03, 0x8b, + 0xd3, 0x53, 0x75, 0x91, 0x03, 0xb3, 0x02, 0x1a, 0x9c, 0x60, 0x63, 0x93, 0xd8, 0xc0, 0x61, 0x64, + 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xb5, 0xce, 0xe4, 0x34, 0x73, 0x01, 0x00, 0x00, } func (m *DepositAuthorization) Marshal() (dAtA []byte, err error) { diff --git a/x/house/types/codec.go b/x/house/types/codec.go index d986bdc5..c3f98ca1 100644 --- a/x/house/types/codec.go +++ b/x/house/types/codec.go @@ -4,7 +4,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" - cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/authz" @@ -42,6 +41,6 @@ var ( func init() { RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) + // cryptocodec.RegisterCrypto(amino) sdk.RegisterLegacyAminoCodec(amino) } diff --git a/x/house/types/deposit.pb.go b/x/house/types/deposit.pb.go index c6d672de..9ea557c8 100644 --- a/x/house/types/deposit.pb.go +++ b/x/house/types/deposit.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/house/deposit.proto +// source: sgenetwork/sge/house/deposit.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -48,7 +48,7 @@ type Deposit struct { func (m *Deposit) Reset() { *m = Deposit{} } func (*Deposit) ProtoMessage() {} func (*Deposit) Descriptor() ([]byte, []int) { - return fileDescriptor_c6f2840908fc45a1, []int{0} + return fileDescriptor_723fb8b8b0b44700, []int{0} } func (m *Deposit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -81,38 +81,40 @@ func init() { proto.RegisterType((*Deposit)(nil), "sgenetwork.sge.house.Deposit") } -func init() { proto.RegisterFile("sge/house/deposit.proto", fileDescriptor_c6f2840908fc45a1) } +func init() { + proto.RegisterFile("sgenetwork/sge/house/deposit.proto", fileDescriptor_723fb8b8b0b44700) +} -var fileDescriptor_c6f2840908fc45a1 = []byte{ - // 446 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x3f, 0x6f, 0xd4, 0x30, - 0x18, 0xc6, 0x13, 0x38, 0xee, 0x54, 0x8b, 0x3f, 0xc5, 0x14, 0x1a, 0x15, 0x64, 0x57, 0x1e, 0xd0, - 0x0d, 0x34, 0x19, 0xd8, 0xca, 0x80, 0xee, 0xe8, 0x72, 0x03, 0x02, 0x45, 0x42, 0x95, 0x58, 0x22, - 0x37, 0xb1, 0x72, 0xd6, 0x5d, 0xe2, 0xc8, 0xf6, 0xe9, 0xda, 0x6f, 0xd0, 0x91, 0x91, 0xf1, 0xbe, - 0x0c, 0x52, 0xc7, 0x8e, 0x88, 0xc1, 0x42, 0xb9, 0x05, 0x31, 0xe6, 0x13, 0xa0, 0xb3, 0x43, 0x1b, - 0x04, 0x0c, 0x9d, 0xfc, 0xfa, 0x79, 0x9f, 0xf7, 0x79, 0x7f, 0xc3, 0x0b, 0x76, 0x55, 0xce, 0xa2, - 0xa9, 0x58, 0x28, 0x16, 0x65, 0xac, 0x12, 0x8a, 0xeb, 0xb0, 0x92, 0x42, 0x0b, 0xb8, 0xa3, 0x72, - 0x56, 0x32, 0xbd, 0x14, 0x72, 0x16, 0xaa, 0x9c, 0x85, 0xd6, 0xb3, 0xb7, 0x93, 0x8b, 0x5c, 0x58, - 0x43, 0xb4, 0xa9, 0x9c, 0x97, 0x7c, 0xe9, 0x81, 0xc1, 0x91, 0x9b, 0x86, 0x2f, 0xc0, 0x20, 0x95, - 0x8c, 0x6a, 0x21, 0x03, 0x7f, 0xdf, 0x1f, 0x6e, 0x8d, 0x61, 0x63, 0xf0, 0xfd, 0x33, 0x5a, 0xcc, - 0x0f, 0x49, 0xdb, 0x20, 0xf1, 0x6f, 0x0b, 0x9c, 0x80, 0x87, 0xed, 0x5a, 0x21, 0x13, 0x9a, 0x65, - 0x92, 0x29, 0x15, 0xdc, 0xb2, 0x73, 0xcf, 0x1a, 0x83, 0x03, 0x37, 0xf7, 0x97, 0x85, 0xc4, 0xdb, - 0x57, 0xda, 0xc8, 0x49, 0xf0, 0x15, 0x00, 0x05, 0x95, 0x33, 0xa6, 0x93, 0x05, 0xcf, 0x82, 0xdb, - 0x36, 0xe3, 0x69, 0x6d, 0xf0, 0xd6, 0x5b, 0xab, 0x7e, 0x98, 0x1c, 0xfd, 0x34, 0xb8, 0x63, 0x89, - 0x3b, 0x35, 0x7c, 0x07, 0x1e, 0x55, 0x54, 0x6a, 0x9e, 0xf2, 0x8a, 0x6a, 0x2e, 0xca, 0x84, 0x97, - 0x19, 0x3b, 0x0d, 0x7a, 0xfb, 0xfe, 0xb0, 0x37, 0x46, 0x8d, 0xc1, 0x7b, 0x8e, 0xe4, 0x1f, 0x26, - 0x12, 0xc3, 0x3f, 0xd4, 0xc9, 0x46, 0x84, 0xc7, 0xa0, 0x4f, 0x0b, 0xb1, 0x28, 0x75, 0x70, 0xc7, - 0x92, 0xbc, 0xbe, 0x30, 0xd8, 0xfb, 0x66, 0xf0, 0xf3, 0x9c, 0xeb, 0xe9, 0xe2, 0x24, 0x4c, 0x45, - 0x11, 0xa5, 0x42, 0x15, 0x42, 0xb5, 0xcf, 0x81, 0xca, 0x66, 0x91, 0x3e, 0xab, 0x98, 0x0a, 0x27, - 0xa5, 0x6e, 0x0c, 0xbe, 0xe7, 0x36, 0xba, 0x14, 0x12, 0xb7, 0x71, 0x70, 0x04, 0xb6, 0x97, 0x5c, - 0x4f, 0x33, 0x49, 0x97, 0x74, 0x9e, 0xa4, 0x76, 0x45, 0xdf, 0x62, 0x3e, 0x69, 0x0c, 0x86, 0x6e, - 0xe8, 0xda, 0xa1, 0x48, 0xfc, 0xe0, 0xfa, 0xf7, 0xc6, 0x46, 0x9c, 0xfb, 0x60, 0x57, 0x0b, 0x4d, - 0xe7, 0x49, 0x27, 0xa9, 0xa5, 0x1d, 0x58, 0xda, 0xf7, 0x37, 0xa6, 0x45, 0x6e, 0xf1, 0x7f, 0x62, - 0x49, 0xfc, 0xd8, 0x76, 0x8e, 0xaf, 0x1a, 0x23, 0xab, 0x1f, 0xde, 0x3d, 0x5f, 0x61, 0xef, 0xf3, - 0x0a, 0x7b, 0x3f, 0x56, 0xd8, 0x1b, 0x8f, 0x2f, 0x6a, 0xe4, 0x5f, 0xd6, 0xc8, 0xff, 0x5e, 0x23, - 0xff, 0xd3, 0x1a, 0x79, 0x97, 0x6b, 0xe4, 0x7d, 0x5d, 0x23, 0xef, 0xe3, 0xb0, 0x03, 0xa2, 0x72, - 0x76, 0xd0, 0x5e, 0xe6, 0xa6, 0x8e, 0x4e, 0xdb, 0xfb, 0xb5, 0x38, 0x27, 0x7d, 0x7b, 0x92, 0x2f, - 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x7b, 0x52, 0xf4, 0xc7, 0xd9, 0x02, 0x00, 0x00, +var fileDescriptor_723fb8b8b0b44700 = []byte{ + // 445 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0x6d, 0x08, 0x89, 0x7a, 0xe2, 0x4f, 0x39, 0x0a, 0x58, 0x05, 0xdd, 0x55, 0x37, 0xa0, + 0x0c, 0xd4, 0x1e, 0xd8, 0xca, 0x80, 0x12, 0xba, 0x64, 0x40, 0x20, 0x4b, 0xa8, 0x12, 0x8b, 0x75, + 0xb5, 0x4f, 0xce, 0x29, 0xb1, 0xcf, 0xba, 0xbb, 0x28, 0xed, 0x37, 0xe8, 0xc8, 0xc8, 0x98, 0x2f, + 0x83, 0xd4, 0xb1, 0x23, 0x62, 0x38, 0x21, 0x67, 0x41, 0x8c, 0xfe, 0x04, 0xa8, 0x77, 0x26, 0x31, + 0x02, 0x06, 0x26, 0x9f, 0x9f, 0xf7, 0xf7, 0x3e, 0xcf, 0x33, 0xbc, 0x80, 0xa8, 0x9c, 0x95, 0x4c, + 0x2f, 0x85, 0x9c, 0x45, 0x2a, 0x67, 0xd1, 0x54, 0x2c, 0x14, 0x8b, 0x32, 0x56, 0x09, 0xc5, 0x75, + 0x58, 0x49, 0xa1, 0x05, 0xdc, 0xdb, 0x32, 0xa1, 0xca, 0x59, 0x68, 0x99, 0xfd, 0xbd, 0x5c, 0xe4, + 0xc2, 0x02, 0xd1, 0xf5, 0xcb, 0xb1, 0xe4, 0x73, 0x0f, 0x0c, 0x8e, 0xdd, 0x36, 0x7c, 0x0e, 0x06, + 0xa9, 0x64, 0x54, 0x0b, 0x19, 0xf8, 0x07, 0xfe, 0x70, 0x67, 0x0c, 0x1b, 0x83, 0xef, 0x9e, 0xd3, + 0x62, 0x7e, 0x44, 0xda, 0x01, 0x89, 0x7f, 0x21, 0x70, 0x02, 0xee, 0xb7, 0xb1, 0x42, 0x26, 0x34, + 0xcb, 0x24, 0x53, 0x2a, 0xb8, 0x61, 0xf7, 0x9e, 0x36, 0x06, 0x07, 0x6e, 0xef, 0x0f, 0x84, 0xc4, + 0xbb, 0x1b, 0x6d, 0xe4, 0x24, 0xf8, 0x12, 0x80, 0x82, 0xca, 0x19, 0xd3, 0xc9, 0x82, 0x67, 0xc1, + 0x4d, 0xeb, 0xf1, 0xa4, 0x36, 0x78, 0xe7, 0x8d, 0x55, 0xdf, 0x4f, 0x8e, 0x7f, 0x18, 0xdc, 0x41, + 0xe2, 0xce, 0x1b, 0xbe, 0x05, 0x0f, 0x2a, 0x2a, 0x35, 0x4f, 0x79, 0x45, 0x35, 0x17, 0x65, 0xc2, + 0xcb, 0x8c, 0x9d, 0x05, 0xbd, 0x03, 0x7f, 0xd8, 0x1b, 0xa3, 0xc6, 0xe0, 0x7d, 0xd7, 0xe4, 0x2f, + 0x10, 0x89, 0xe1, 0x6f, 0xea, 0xe4, 0x5a, 0x84, 0x27, 0xa0, 0x4f, 0x0b, 0xb1, 0x28, 0x75, 0x70, + 0xcb, 0x36, 0x79, 0x75, 0x69, 0xb0, 0xf7, 0xd5, 0xe0, 0x67, 0x39, 0xd7, 0xd3, 0xc5, 0x69, 0x98, + 0x8a, 0x22, 0x4a, 0x85, 0x2a, 0x84, 0x6a, 0x3f, 0x87, 0x2a, 0x9b, 0x45, 0xfa, 0xbc, 0x62, 0x2a, + 0x9c, 0x94, 0xba, 0x31, 0xf8, 0x8e, 0x4b, 0x74, 0x2e, 0x24, 0x6e, 0xed, 0xe0, 0x08, 0xec, 0x2e, + 0xb9, 0x9e, 0x66, 0x92, 0x2e, 0xe9, 0x3c, 0x49, 0x6d, 0x44, 0xdf, 0xd6, 0x7c, 0xd4, 0x18, 0x0c, + 0xdd, 0xd2, 0x96, 0x50, 0x24, 0xbe, 0xb7, 0xfd, 0x7b, 0x6d, 0x2d, 0x2e, 0x7c, 0xf0, 0x58, 0x0b, + 0x4d, 0xe7, 0x49, 0xc7, 0xa9, 0x6d, 0x3b, 0xb0, 0x6d, 0xdf, 0xfd, 0x77, 0x5b, 0xe4, 0x82, 0xff, + 0x61, 0x4b, 0xe2, 0x87, 0x76, 0x72, 0xb2, 0x19, 0x8c, 0xac, 0x7e, 0x74, 0xfb, 0x62, 0x85, 0xbd, + 0x4f, 0x2b, 0xec, 0x7d, 0x5f, 0x61, 0x6f, 0x3c, 0xbe, 0xac, 0x91, 0x7f, 0x55, 0x23, 0xff, 0x5b, + 0x8d, 0xfc, 0x8f, 0x6b, 0xe4, 0x5d, 0xad, 0x91, 0xf7, 0x65, 0x8d, 0xbc, 0x0f, 0xc3, 0x4e, 0x11, + 0x95, 0xb3, 0xc3, 0xee, 0xf5, 0x9e, 0xb5, 0xf7, 0x6b, 0xeb, 0x9c, 0xf6, 0xed, 0x49, 0xbe, 0xf8, + 0x19, 0x00, 0x00, 0xff, 0xff, 0x53, 0x9d, 0x8d, 0xf8, 0xe4, 0x02, 0x00, 0x00, } func (m *Deposit) Marshal() (dAtA []byte, err error) { diff --git a/x/house/types/genesis.pb.go b/x/house/types/genesis.pb.go index 4b7450d5..bc365ff4 100644 --- a/x/house/types/genesis.pb.go +++ b/x/house/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/house/genesis.proto +// source: sgenetwork/sge/house/genesis.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -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_aa4dcd3bb98435db, []int{0} + return fileDescriptor_02191d749ca2ced3, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -91,28 +91,30 @@ func init() { proto.RegisterType((*GenesisState)(nil), "sgenetwork.sge.house.GenesisState") } -func init() { proto.RegisterFile("sge/house/genesis.proto", fileDescriptor_aa4dcd3bb98435db) } +func init() { + proto.RegisterFile("sgenetwork/sge/house/genesis.proto", fileDescriptor_02191d749ca2ced3) +} -var fileDescriptor_aa4dcd3bb98435db = []byte{ - // 281 bytes of a gzipped FileDescriptorProto +var fileDescriptor_02191d749ca2ced3 = []byte{ + // 282 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x31, 0x4b, 0xc3, 0x40, - 0x14, 0xc7, 0x73, 0x56, 0x3a, 0x24, 0x45, 0x21, 0x14, 0x0d, 0x45, 0xcf, 0xe0, 0x94, 0xc5, 0x0b, - 0xd4, 0xcd, 0x31, 0x88, 0x2e, 0x82, 0xa2, 0x83, 0xe0, 0x22, 0xa9, 0x3d, 0x2e, 0x87, 0xad, 0x17, - 0xf2, 0x5e, 0x89, 0x7e, 0x0b, 0x3f, 0x56, 0xc7, 0x8e, 0x4e, 0x22, 0xc9, 0x17, 0x91, 0xe4, 0x9e, - 0xa6, 0x43, 0xb6, 0x77, 0xfc, 0x7f, 0xef, 0x77, 0x7f, 0x9e, 0x7b, 0x08, 0x4a, 0xc6, 0x99, 0x59, - 0x81, 0x8c, 0x95, 0x7c, 0x93, 0xa0, 0x41, 0xe4, 0x85, 0x41, 0xe3, 0x8f, 0xa1, 0x79, 0x63, 0x69, - 0x8a, 0x57, 0x01, 0x4a, 0x8a, 0x96, 0x99, 0x8c, 0x95, 0x51, 0xa6, 0x05, 0xe2, 0x66, 0xb2, 0xec, - 0x64, 0x4b, 0x32, 0x97, 0xb9, 0x01, 0x8d, 0x14, 0x04, 0x5d, 0x50, 0x6a, 0xcc, 0xe6, 0x45, 0x5a, - 0x52, 0x72, 0xd0, 0x25, 0x79, 0x5a, 0xa4, 0x4b, 0xfa, 0xf6, 0xb4, 0x66, 0xee, 0xe8, 0xda, 0x16, - 0x79, 0xc0, 0x14, 0xa5, 0x7f, 0xe1, 0x0e, 0x2d, 0x10, 0xb0, 0x90, 0x45, 0xde, 0xf4, 0x48, 0xf4, - 0x15, 0x13, 0x77, 0x2d, 0x93, 0xec, 0xae, 0xbf, 0x4f, 0x9c, 0x7b, 0xda, 0xf0, 0xaf, 0xdc, 0x11, - 0xf5, 0x79, 0x5e, 0x68, 0xc0, 0x60, 0x27, 0x1c, 0x44, 0xde, 0xf4, 0xb8, 0xdf, 0x70, 0x69, 0x49, - 0x52, 0x78, 0xb4, 0x78, 0xa3, 0x01, 0xfd, 0x5b, 0x77, 0xff, 0xaf, 0x7e, 0xba, 0xb0, 0xaa, 0x41, - 0xab, 0x0a, 0xfb, 0x55, 0x8f, 0xff, 0x30, 0xd9, 0xf6, 0xba, 0xf5, 0x46, 0x98, 0x24, 0xeb, 0x8a, - 0xb3, 0x4d, 0xc5, 0xd9, 0x4f, 0xc5, 0xd9, 0x67, 0xcd, 0x9d, 0x4d, 0xcd, 0x9d, 0xaf, 0x9a, 0x3b, - 0x4f, 0x91, 0xd2, 0x98, 0xad, 0x66, 0xe2, 0xc5, 0x2c, 0x63, 0x50, 0xf2, 0x8c, 0xe4, 0xcd, 0x1c, - 0xbf, 0xd3, 0xc1, 0xf0, 0x23, 0x97, 0x30, 0x1b, 0xb6, 0x07, 0x3b, 0xff, 0x0d, 0x00, 0x00, 0xff, - 0xff, 0x4b, 0x16, 0x65, 0x27, 0xc2, 0x01, 0x00, 0x00, + 0x18, 0x86, 0x73, 0x56, 0x3a, 0x24, 0x45, 0x21, 0x74, 0x28, 0x45, 0xcf, 0x58, 0x97, 0x2c, 0x5e, + 0xa0, 0x6e, 0x8e, 0x41, 0x74, 0x11, 0x14, 0x1d, 0x04, 0x17, 0xb9, 0xda, 0xe3, 0x72, 0xd8, 0x7a, + 0x21, 0xdf, 0x57, 0xa2, 0xff, 0xc2, 0x9f, 0xd5, 0xb1, 0xa3, 0x93, 0x48, 0xf2, 0x47, 0x24, 0x77, + 0xa7, 0x75, 0xb8, 0xed, 0x38, 0x9e, 0xf7, 0xe1, 0xfd, 0xde, 0x70, 0x02, 0x52, 0xbc, 0x0a, 0xac, + 0x75, 0xf5, 0x92, 0x81, 0x14, 0x59, 0xa1, 0x57, 0x20, 0xb2, 0xee, 0x0f, 0x14, 0xb0, 0xb2, 0xd2, + 0xa8, 0xe3, 0xe1, 0x96, 0x61, 0x20, 0x05, 0x33, 0xcc, 0x78, 0x28, 0xb5, 0xd4, 0x06, 0xc8, 0xba, + 0x97, 0x65, 0xc7, 0x7e, 0xdf, 0x5c, 0x94, 0x1a, 0x14, 0x3a, 0xe6, 0xc4, 0xcb, 0xd4, 0x0a, 0x8b, + 0x79, 0xc5, 0x6b, 0x07, 0x1d, 0x7b, 0xa1, 0x92, 0x57, 0x7c, 0xe9, 0x7a, 0x4d, 0x5a, 0x12, 0x0e, + 0xae, 0x6c, 0xd3, 0x7b, 0xe4, 0x28, 0xe2, 0xf3, 0xb0, 0x6f, 0x81, 0x11, 0x49, 0x48, 0x1a, 0x4d, + 0x0f, 0x98, 0xaf, 0x39, 0xbb, 0x35, 0x4c, 0xbe, 0xbb, 0xfe, 0x3a, 0x0a, 0xee, 0x5c, 0x22, 0xbe, + 0x0c, 0x07, 0xae, 0xe5, 0xd3, 0x42, 0x01, 0x8e, 0x76, 0x92, 0x5e, 0x1a, 0x4d, 0x0f, 0xfd, 0x86, + 0x0b, 0x4b, 0x3a, 0x45, 0xe4, 0x82, 0xd7, 0x0a, 0x30, 0xbe, 0x09, 0xf7, 0x7f, 0x2f, 0xe1, 0x0b, + 0xab, 0xea, 0x19, 0x55, 0xe2, 0x57, 0x3d, 0xfc, 0xc1, 0xce, 0xb6, 0xb7, 0x8d, 0x77, 0xc2, 0x3c, + 0x5f, 0x37, 0x94, 0x6c, 0x1a, 0x4a, 0xbe, 0x1b, 0x4a, 0x3e, 0x5a, 0x1a, 0x6c, 0x5a, 0x1a, 0x7c, + 0xb6, 0x34, 0x78, 0x4c, 0xa5, 0xc2, 0x62, 0x35, 0x63, 0xcf, 0x7a, 0xd9, 0x4d, 0x74, 0xfa, 0x7f, + 0xae, 0x37, 0x37, 0x18, 0xbe, 0x97, 0x02, 0x66, 0x7d, 0x33, 0xd8, 0xd9, 0x4f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xbc, 0x0a, 0x1b, 0xf6, 0xee, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/house/types/params.pb.go b/x/house/types/params.pb.go index a001ac4f..780ef97a 100644 --- a/x/house/types/params.pb.go +++ b/x/house/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/house/params.proto +// source: sgenetwork/sge/house/params.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -36,7 +36,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_632fcdf2e68e6d32, []int{0} + return fileDescriptor_a973c755b8200942, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -69,28 +69,28 @@ func init() { proto.RegisterType((*Params)(nil), "sgenetwork.sge.house.Params") } -func init() { proto.RegisterFile("sge/house/params.proto", fileDescriptor_632fcdf2e68e6d32) } +func init() { proto.RegisterFile("sgenetwork/sge/house/params.proto", fileDescriptor_a973c755b8200942) } -var fileDescriptor_632fcdf2e68e6d32 = []byte{ +var fileDescriptor_a973c755b8200942 = []byte{ // 277 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2b, 0x4e, 0x4f, 0xd5, - 0xcf, 0xc8, 0x2f, 0x2d, 0x4e, 0xd5, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x12, 0x29, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, - 0x4e, 0x4f, 0xd5, 0x03, 0x2b, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd0, 0x07, 0xb1, - 0x20, 0x6a, 0x95, 0xee, 0x32, 0x72, 0xb1, 0x05, 0x80, 0x35, 0x0b, 0xa5, 0x72, 0x71, 0xe7, 0x66, - 0xe6, 0xc5, 0xa7, 0xa4, 0x16, 0xe4, 0x17, 0x67, 0x96, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x3a, - 0xb9, 0x9c, 0xb8, 0x27, 0xcf, 0x70, 0xeb, 0x9e, 0xbc, 0x5a, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, - 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x72, 0x7e, 0x71, 0x6e, 0x7e, 0x31, 0x94, 0xd2, 0x2d, 0x4e, 0xc9, - 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0xf3, 0xcc, 0x2b, 0xf9, 0x74, 0x4f, 0x5e, 0xa8, 0x32, - 0x31, 0x37, 0xc7, 0x4a, 0x09, 0xc9, 0x28, 0xa5, 0x20, 0xae, 0xdc, 0xcc, 0x3c, 0x17, 0x08, 0x47, - 0x28, 0x8d, 0x4b, 0x1c, 0xec, 0xa0, 0xf8, 0x82, 0xc4, 0xa2, 0x92, 0xcc, 0xe4, 0xcc, 0x82, 0xc4, - 0x92, 0xcc, 0xfc, 0xbc, 0xf8, 0xb4, 0xd4, 0x54, 0x09, 0x26, 0xb0, 0x95, 0x7a, 0x24, 0x58, 0xe9, - 0x92, 0x9a, 0x1c, 0x24, 0x0a, 0x36, 0x2e, 0x00, 0xd9, 0x34, 0xb7, 0xd4, 0x54, 0x2b, 0x96, 0x19, - 0x0b, 0xe4, 0x19, 0x9c, 0x9c, 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, - 0x03, 0xc9, 0xf8, 0xe2, 0xf4, 0x54, 0x5d, 0x68, 0x88, 0x81, 0xd8, 0xfa, 0x15, 0xd0, 0x60, 0x05, - 0x5b, 0x92, 0xc4, 0x06, 0x0e, 0x2a, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x9e, 0x0a, - 0x2d, 0x70, 0x01, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xc8, 0x2f, 0x2d, 0x4e, + 0xd5, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x41, + 0x28, 0xd1, 0x2b, 0x4e, 0x4f, 0xd5, 0x03, 0x2b, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, + 0xd0, 0x07, 0xb1, 0x20, 0x6a, 0x95, 0xee, 0x32, 0x72, 0xb1, 0x05, 0x80, 0x35, 0x0b, 0xa5, 0x72, + 0x71, 0xe7, 0x66, 0xe6, 0xc5, 0xa7, 0xa4, 0x16, 0xe4, 0x17, 0x67, 0x96, 0x48, 0x30, 0x2a, 0x30, + 0x6a, 0x70, 0x3a, 0xb9, 0x9c, 0xb8, 0x27, 0xcf, 0x70, 0xeb, 0x9e, 0xbc, 0x5a, 0x7a, 0x66, 0x49, + 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x72, 0x7e, 0x71, 0x6e, 0x7e, 0x31, 0x94, 0xd2, + 0x2d, 0x4e, 0xc9, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0xf3, 0xcc, 0x2b, 0xf9, 0x74, 0x4f, + 0x5e, 0xa8, 0x32, 0x31, 0x37, 0xc7, 0x4a, 0x09, 0xc9, 0x28, 0xa5, 0x20, 0xae, 0xdc, 0xcc, 0x3c, + 0x17, 0x08, 0x47, 0x28, 0x8d, 0x4b, 0x1c, 0xec, 0xa0, 0xf8, 0x82, 0xc4, 0xa2, 0x92, 0xcc, 0xe4, + 0xcc, 0x82, 0xc4, 0x92, 0xcc, 0xfc, 0xbc, 0xf8, 0xb4, 0xd4, 0x54, 0x09, 0x26, 0xb0, 0x95, 0x7a, + 0x24, 0x58, 0xe9, 0x92, 0x9a, 0x1c, 0x24, 0x0a, 0x36, 0x2e, 0x00, 0xd9, 0x34, 0xb7, 0xd4, 0x54, + 0x2b, 0x96, 0x19, 0x0b, 0xe4, 0x19, 0x9c, 0x9c, 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, 0x03, 0xc9, 0xf8, 0xe2, 0xf4, 0x54, 0x5d, 0xe4, 0x40, 0xad, 0x80, 0x06, 0x2b, + 0xd8, 0x92, 0x24, 0x36, 0x70, 0x50, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x83, 0x39, 0x5e, + 0xdb, 0x7b, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/house/types/query.pb.go b/x/house/types/query.pb.go index 7d5ba59e..d9f24cd9 100644 --- a/x/house/types/query.pb.go +++ b/x/house/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/house/query.proto +// source: sgenetwork/sge/house/query.proto package types @@ -8,8 +8,8 @@ import ( fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + 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" @@ -39,7 +39,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_436b89bf9285a4cb, []int{0} + return fileDescriptor_5ca530dfff23b318, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -79,7 +79,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_436b89bf9285a4cb, []int{1} + return fileDescriptor_5ca530dfff23b318, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -125,7 +125,7 @@ func (m *QueryDepositsRequest) Reset() { *m = QueryDepositsRequest{} } func (m *QueryDepositsRequest) String() string { return proto.CompactTextString(m) } func (*QueryDepositsRequest) ProtoMessage() {} func (*QueryDepositsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_436b89bf9285a4cb, []int{2} + return fileDescriptor_5ca530dfff23b318, []int{2} } func (m *QueryDepositsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -173,7 +173,7 @@ func (m *QueryDepositsResponse) Reset() { *m = QueryDepositsResponse{} } func (m *QueryDepositsResponse) String() string { return proto.CompactTextString(m) } func (*QueryDepositsResponse) ProtoMessage() {} func (*QueryDepositsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_436b89bf9285a4cb, []int{3} + return fileDescriptor_5ca530dfff23b318, []int{3} } func (m *QueryDepositsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -230,7 +230,7 @@ func (m *QueryDepositsByAccountRequest) Reset() { *m = QueryDepositsByAc func (m *QueryDepositsByAccountRequest) String() string { return proto.CompactTextString(m) } func (*QueryDepositsByAccountRequest) ProtoMessage() {} func (*QueryDepositsByAccountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_436b89bf9285a4cb, []int{4} + return fileDescriptor_5ca530dfff23b318, []int{4} } func (m *QueryDepositsByAccountRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -286,7 +286,7 @@ func (m *QueryDepositsByAccountResponse) Reset() { *m = QueryDepositsByA func (m *QueryDepositsByAccountResponse) String() string { return proto.CompactTextString(m) } func (*QueryDepositsByAccountResponse) ProtoMessage() {} func (*QueryDepositsByAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_436b89bf9285a4cb, []int{5} + return fileDescriptor_5ca530dfff23b318, []int{5} } func (m *QueryDepositsByAccountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -343,7 +343,7 @@ func (m *QueryWithdrawalsByAccountRequest) Reset() { *m = QueryWithdrawa func (m *QueryWithdrawalsByAccountRequest) String() string { return proto.CompactTextString(m) } func (*QueryWithdrawalsByAccountRequest) ProtoMessage() {} func (*QueryWithdrawalsByAccountRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_436b89bf9285a4cb, []int{6} + return fileDescriptor_5ca530dfff23b318, []int{6} } func (m *QueryWithdrawalsByAccountRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -399,7 +399,7 @@ func (m *QueryWithdrawalsByAccountResponse) Reset() { *m = QueryWithdraw func (m *QueryWithdrawalsByAccountResponse) String() string { return proto.CompactTextString(m) } func (*QueryWithdrawalsByAccountResponse) ProtoMessage() {} func (*QueryWithdrawalsByAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_436b89bf9285a4cb, []int{7} + return fileDescriptor_5ca530dfff23b318, []int{7} } func (m *QueryWithdrawalsByAccountResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -458,7 +458,7 @@ func (m *QueryWithdrawalRequest) Reset() { *m = QueryWithdrawalRequest{} func (m *QueryWithdrawalRequest) String() string { return proto.CompactTextString(m) } func (*QueryWithdrawalRequest) ProtoMessage() {} func (*QueryWithdrawalRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_436b89bf9285a4cb, []int{8} + return fileDescriptor_5ca530dfff23b318, []int{8} } func (m *QueryWithdrawalRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -526,7 +526,7 @@ func (m *QueryWithdrawalResponse) Reset() { *m = QueryWithdrawalResponse func (m *QueryWithdrawalResponse) String() string { return proto.CompactTextString(m) } func (*QueryWithdrawalResponse) ProtoMessage() {} func (*QueryWithdrawalResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_436b89bf9285a4cb, []int{9} + return fileDescriptor_5ca530dfff23b318, []int{9} } func (m *QueryWithdrawalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -575,57 +575,57 @@ func init() { proto.RegisterType((*QueryWithdrawalResponse)(nil), "sgenetwork.sge.house.QueryWithdrawalResponse") } -func init() { proto.RegisterFile("sge/house/query.proto", fileDescriptor_436b89bf9285a4cb) } - -var fileDescriptor_436b89bf9285a4cb = []byte{ - // 749 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0x4f, 0x4f, 0x13, 0x5b, - 0x14, 0xc0, 0x7b, 0x0b, 0xaf, 0x0f, 0x0e, 0xc9, 0xcb, 0xe3, 0xb6, 0x40, 0x5f, 0x1f, 0x2d, 0xb5, - 0x89, 0x5a, 0x41, 0xe6, 0x06, 0x30, 0x9a, 0xb8, 0x31, 0x34, 0x06, 0x35, 0xc6, 0x04, 0x6a, 0x8c, - 0x89, 0x0b, 0xc9, 0x6d, 0xe7, 0x66, 0xb8, 0x81, 0xce, 0x1d, 0xe6, 0x4e, 0x2d, 0xa4, 0x69, 0xa2, - 0xc6, 0x0f, 0x60, 0xe2, 0x27, 0x60, 0xc1, 0xc6, 0x9d, 0x1b, 0x97, 0xae, 0x59, 0x92, 0xb8, 0x71, - 0x65, 0x0c, 0xf8, 0x41, 0x4c, 0xef, 0xdc, 0x61, 0xfa, 0x67, 0xac, 0xc5, 0x98, 0xe8, 0x6e, 0xb8, - 0xe7, 0x9e, 0x73, 0x7e, 0xfc, 0x98, 0x73, 0x06, 0x98, 0x92, 0x16, 0x23, 0x5b, 0xa2, 0x2e, 0x19, - 0xd9, 0xad, 0x33, 0x77, 0xdf, 0x70, 0x5c, 0xe1, 0x09, 0x9c, 0x92, 0x16, 0xb3, 0x99, 0xd7, 0x10, - 0xee, 0xb6, 0x21, 0x2d, 0x66, 0xa8, 0x1b, 0x99, 0xf9, 0xaa, 0x90, 0x35, 0x21, 0x49, 0x85, 0x06, - 0xd7, 0xc9, 0xb3, 0xa5, 0x0a, 0xf3, 0xe8, 0x12, 0x71, 0xa8, 0xc5, 0x6d, 0xea, 0x71, 0x61, 0xfb, - 0x15, 0x32, 0x29, 0x4b, 0x58, 0x42, 0x3d, 0x92, 0xf6, 0x93, 0x3e, 0x9d, 0xb5, 0x84, 0xb0, 0x76, - 0x18, 0xa1, 0x0e, 0x27, 0xd4, 0xb6, 0x85, 0xa7, 0x52, 0xa4, 0x8e, 0x4e, 0x87, 0x30, 0x0e, 0x75, - 0x69, 0x2d, 0x38, 0x9f, 0x09, 0xcf, 0x4d, 0xe6, 0x08, 0xc9, 0x3d, 0x1d, 0x48, 0x87, 0x81, 0x06, - 0xf7, 0xb6, 0x4c, 0x97, 0x36, 0xfc, 0x48, 0x21, 0x05, 0x78, 0xa3, 0x0d, 0xb8, 0xae, 0xea, 0x94, - 0xd9, 0x6e, 0x9d, 0x49, 0xaf, 0xb0, 0x01, 0xc9, 0xae, 0x53, 0xe9, 0x08, 0x5b, 0x32, 0x7c, 0x13, - 0x12, 0x7e, 0xbf, 0x34, 0xca, 0xa3, 0xe2, 0xc4, 0xf2, 0xac, 0x11, 0xf5, 0xeb, 0x1b, 0x7e, 0x56, - 0x69, 0xf4, 0xe8, 0xf3, 0x5c, 0xac, 0xac, 0x33, 0x0a, 0x4f, 0x21, 0xa5, 0x4a, 0xde, 0xf6, 0xc1, - 0x82, 0x56, 0x78, 0x0d, 0x20, 0x74, 0xa2, 0xeb, 0x5e, 0x32, 0x7c, 0x81, 0x46, 0x5b, 0xa0, 0xe1, - 0xfb, 0xd6, 0x02, 0x8d, 0x75, 0x6a, 0x31, 0x9d, 0x5b, 0xee, 0xc8, 0x2c, 0x1c, 0x20, 0x98, 0xea, - 0x69, 0xa0, 0xa9, 0x6f, 0xc1, 0x98, 0xb6, 0xd1, 0xe6, 0x1e, 0x29, 0x4e, 0x2c, 0x67, 0xa3, 0xb9, - 0x75, 0xa6, 0x06, 0x3f, 0x4b, 0xc2, 0x77, 0xba, 0x10, 0xe3, 0x0a, 0xf1, 0xf2, 0x0f, 0x11, 0xfd, - 0xee, 0x5d, 0x8c, 0x2f, 0x10, 0x64, 0xbb, 0x18, 0x4b, 0xfb, 0xab, 0xd5, 0xaa, 0xa8, 0xdb, 0x5e, - 0x60, 0x23, 0x0d, 0x7f, 0x53, 0xd3, 0x74, 0x99, 0xf4, 0x15, 0x8f, 0x97, 0x83, 0x1f, 0x7b, 0x3c, - 0xc5, 0x7f, 0xda, 0xd3, 0x5b, 0x04, 0xb9, 0xef, 0x31, 0xfc, 0x71, 0xc2, 0x5e, 0x21, 0xc8, 0x2b, - 0xd8, 0xc7, 0xfa, 0xad, 0xa5, 0x3b, 0xbf, 0xc3, 0xd9, 0x7b, 0x04, 0x17, 0x06, 0x60, 0x68, 0x6d, - 0x77, 0x61, 0xa2, 0x11, 0xc6, 0xb5, 0xb9, 0x7c, 0xb4, 0xb9, 0xb0, 0x90, 0x96, 0xd7, 0x99, 0xfa, - 0xeb, 0xfc, 0x1d, 0x22, 0x98, 0xee, 0x01, 0x0f, 0xac, 0x2d, 0xc0, 0xa4, 0xfe, 0x7b, 0x09, 0x77, - 0xb3, 0xdb, 0xdf, 0xbf, 0x67, 0x81, 0x55, 0x2d, 0x32, 0x0b, 0x50, 0xa3, 0xee, 0x36, 0xf3, 0x36, - 0xeb, 0xdc, 0x54, 0x40, 0xe3, 0xe5, 0x71, 0xff, 0xe4, 0x11, 0x37, 0x31, 0x81, 0xa4, 0x43, 0x5d, - 0x8f, 0x57, 0xb9, 0xa3, 0xfa, 0x6e, 0x72, 0xdb, 0x64, 0x7b, 0xe9, 0x91, 0x3c, 0x2a, 0x8e, 0x96, - 0x71, 0x57, 0xe8, 0x5e, 0x3b, 0x82, 0xff, 0x81, 0x38, 0x37, 0xd3, 0xa3, 0x2a, 0x1e, 0xe7, 0x66, - 0x81, 0xc2, 0x4c, 0x1f, 0xa6, 0xb6, 0xba, 0x06, 0x10, 0xaa, 0xd1, 0xfb, 0x61, 0x58, 0xa9, 0x1d, - 0x99, 0xcb, 0x07, 0x09, 0xf8, 0x4b, 0xf5, 0xc0, 0x7b, 0x90, 0xf0, 0x37, 0x14, 0x2e, 0x46, 0xd7, - 0xe9, 0x5f, 0x88, 0x99, 0x2b, 0x43, 0xdc, 0xf4, 0x81, 0x0b, 0xff, 0xbd, 0xfc, 0xf8, 0xf5, 0x4d, - 0x3c, 0x89, 0x27, 0x49, 0xef, 0x96, 0xc6, 0xcf, 0x11, 0x8c, 0x05, 0x63, 0x87, 0xe7, 0x07, 0x94, - 0xec, 0x59, 0x92, 0x99, 0x85, 0xa1, 0xee, 0x6a, 0x80, 0xff, 0x15, 0xc0, 0x14, 0x4e, 0x92, 0xbe, - 0xcf, 0x81, 0xc4, 0x87, 0x08, 0x26, 0xfb, 0x26, 0x1f, 0xaf, 0x0c, 0x51, 0xbf, 0x77, 0xee, 0x32, - 0xd7, 0xce, 0x97, 0xa4, 0xe9, 0x2e, 0x2a, 0xba, 0x39, 0x9c, 0x8d, 0xa0, 0x23, 0x4d, 0xfd, 0x22, - 0xb6, 0xf0, 0x3b, 0x04, 0xa9, 0xa8, 0x69, 0xc3, 0xd7, 0x07, 0x74, 0x1d, 0xb0, 0x25, 0x32, 0x37, - 0xce, 0x9d, 0xa7, 0x81, 0x8b, 0x0a, 0xb8, 0x80, 0xf3, 0xa4, 0xff, 0x23, 0x4a, 0x77, 0x3a, 0x99, - 0x3f, 0x20, 0x80, 0xb0, 0x14, 0xbe, 0x3a, 0x54, 0xc7, 0x80, 0x6f, 0x71, 0xc8, 0xdb, 0x9a, 0xea, - 0xa1, 0xa2, 0x7a, 0x80, 0xef, 0x2b, 0xaa, 0x90, 0x87, 0x34, 0xfb, 0xa6, 0xba, 0x45, 0x9a, 0xe1, - 0xf0, 0xb6, 0x48, 0x33, 0x62, 0x54, 0x5b, 0xa4, 0xc9, 0xcd, 0x56, 0xa9, 0x74, 0x74, 0x92, 0x43, - 0xc7, 0x27, 0x39, 0xf4, 0xe5, 0x24, 0x87, 0x5e, 0x9f, 0xe6, 0x62, 0xc7, 0xa7, 0xb9, 0xd8, 0xa7, - 0xd3, 0x5c, 0xec, 0x49, 0xd1, 0xe2, 0xde, 0x56, 0xbd, 0x62, 0x54, 0x45, 0xad, 0xdd, 0x70, 0x51, - 0x83, 0xaa, 0xe6, 0x7b, 0x5a, 0x8a, 0xb7, 0xef, 0x30, 0x59, 0x49, 0xa8, 0xff, 0x2b, 0x56, 0xbe, - 0x05, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x04, 0x93, 0xbd, 0x31, 0x09, 0x00, 0x00, +func init() { proto.RegisterFile("sgenetwork/sge/house/query.proto", fileDescriptor_5ca530dfff23b318) } + +var fileDescriptor_5ca530dfff23b318 = []byte{ + // 750 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x96, 0xcf, 0x6b, 0x13, 0x4b, + 0x1c, 0xc0, 0x33, 0x69, 0x5f, 0x5e, 0xfb, 0x2d, 0x3c, 0x5e, 0x27, 0xe9, 0x7b, 0x31, 0x36, 0xdb, + 0x74, 0x45, 0x8d, 0xad, 0xdd, 0xa1, 0xad, 0x28, 0x78, 0x91, 0x06, 0xa9, 0x8a, 0x08, 0x6d, 0x44, + 0x04, 0x0f, 0x96, 0x49, 0x76, 0xd8, 0x2e, 0x6d, 0x76, 0xb6, 0x3b, 0x1b, 0xd3, 0x12, 0x02, 0x2a, + 0xfe, 0x01, 0x82, 0x7f, 0x41, 0x0f, 0xbd, 0x78, 0xf3, 0xe2, 0xd1, 0x73, 0x8f, 0x05, 0x2f, 0x9e, + 0x44, 0x5a, 0xff, 0x10, 0xc9, 0xec, 0x6c, 0x37, 0x3f, 0xd6, 0x98, 0x8a, 0xa0, 0xb7, 0xcd, 0xcc, + 0xf7, 0xc7, 0x27, 0x9f, 0xdd, 0xef, 0xec, 0x42, 0x41, 0x58, 0xcc, 0x61, 0x7e, 0x83, 0x7b, 0x5b, + 0x44, 0x58, 0x8c, 0x6c, 0xf2, 0xba, 0x60, 0x64, 0xa7, 0xce, 0xbc, 0x3d, 0xc3, 0xf5, 0xb8, 0xcf, + 0x71, 0x26, 0x8a, 0x30, 0x84, 0xc5, 0x0c, 0x19, 0x91, 0x9b, 0xab, 0x72, 0x51, 0xe3, 0x82, 0x54, + 0x68, 0x18, 0x4e, 0x9e, 0x2d, 0x56, 0x98, 0x4f, 0x17, 0x89, 0x4b, 0x2d, 0xdb, 0xa1, 0xbe, 0xcd, + 0x9d, 0xa0, 0x42, 0x2e, 0x63, 0x71, 0x8b, 0xcb, 0x4b, 0xd2, 0xbe, 0x52, 0xab, 0xd3, 0x16, 0xe7, + 0xd6, 0x36, 0x23, 0xd4, 0xb5, 0x09, 0x75, 0x1c, 0xee, 0xcb, 0x14, 0xa1, 0x76, 0x67, 0x63, 0xb9, + 0x5c, 0xea, 0xd1, 0x5a, 0x18, 0xa2, 0xc7, 0x86, 0x98, 0xcc, 0xe5, 0xc2, 0xf6, 0x55, 0xcc, 0x85, + 0xd8, 0x98, 0x86, 0xed, 0x6f, 0x9a, 0x1e, 0x6d, 0x04, 0x41, 0x7a, 0x06, 0xf0, 0x7a, 0xfb, 0x1f, + 0xac, 0xc9, 0xea, 0x65, 0xb6, 0x53, 0x67, 0xc2, 0xd7, 0xd7, 0x21, 0xdd, 0xb5, 0x2a, 0x5c, 0xee, + 0x08, 0x86, 0x6f, 0x42, 0x2a, 0xa0, 0xc8, 0xa2, 0x02, 0x2a, 0x4e, 0x2c, 0x4d, 0x1b, 0x71, 0x7e, + 0x8c, 0x20, 0xab, 0x34, 0x7a, 0xf8, 0x79, 0x26, 0x51, 0x56, 0x19, 0xfa, 0x53, 0xc8, 0xc8, 0x92, + 0xb7, 0x03, 0xc6, 0xb0, 0x15, 0x5e, 0x05, 0x88, 0xa4, 0xa9, 0xba, 0x97, 0x8c, 0xc0, 0xb0, 0xd1, + 0x36, 0x6c, 0x04, 0x37, 0x44, 0x19, 0x36, 0xd6, 0xa8, 0xc5, 0x54, 0x6e, 0xb9, 0x23, 0x53, 0xdf, + 0x47, 0x30, 0xd5, 0xd3, 0x40, 0x51, 0xdf, 0x82, 0x31, 0x25, 0xa6, 0xcd, 0x3d, 0x52, 0x9c, 0x58, + 0xca, 0xc7, 0x73, 0xab, 0x4c, 0x05, 0x7e, 0x9a, 0x84, 0xef, 0x74, 0x21, 0x26, 0x25, 0xe2, 0xe5, + 0x1f, 0x22, 0x06, 0xdd, 0xbb, 0x18, 0x5f, 0x20, 0xc8, 0x77, 0x31, 0x96, 0xf6, 0x56, 0xaa, 0x55, + 0x5e, 0x77, 0xfc, 0xd0, 0x46, 0x16, 0xfe, 0xa6, 0xa6, 0xe9, 0x31, 0x11, 0x28, 0x1e, 0x2f, 0x87, + 0x3f, 0x7b, 0x3c, 0x25, 0x7f, 0xda, 0xd3, 0x5b, 0x04, 0xda, 0xf7, 0x18, 0xfe, 0x38, 0x61, 0xaf, + 0x10, 0x14, 0x24, 0xec, 0x63, 0xf5, 0xd4, 0xd2, 0xed, 0xdf, 0xe1, 0xec, 0x3d, 0x82, 0xd9, 0x01, + 0x18, 0x4a, 0xdb, 0x5d, 0x98, 0x68, 0x44, 0xfb, 0xca, 0x5c, 0x21, 0xde, 0x5c, 0x54, 0x48, 0xc9, + 0xeb, 0x4c, 0xfd, 0x75, 0xfe, 0x0e, 0x10, 0xfc, 0xd7, 0x03, 0x1e, 0x5a, 0x9b, 0x87, 0x49, 0x75, + 0xbf, 0xb8, 0xb7, 0xd1, 0xed, 0xef, 0xdf, 0xd3, 0x8d, 0x15, 0x25, 0x32, 0x0f, 0x50, 0xa3, 0xde, + 0x16, 0xf3, 0x37, 0xea, 0xb6, 0x29, 0x81, 0xc6, 0xcb, 0xe3, 0xc1, 0xca, 0x23, 0xdb, 0xc4, 0x04, + 0xd2, 0x2e, 0xf5, 0x7c, 0xbb, 0x6a, 0xbb, 0xb2, 0xef, 0x86, 0xed, 0x98, 0x6c, 0x37, 0x3b, 0x52, + 0x40, 0xc5, 0xd1, 0x32, 0xee, 0xda, 0xba, 0xd7, 0xde, 0xc1, 0xff, 0x40, 0xd2, 0x36, 0xb3, 0xa3, + 0x72, 0x3f, 0x69, 0x9b, 0x3a, 0x85, 0xff, 0xfb, 0x30, 0x95, 0xd5, 0x55, 0x80, 0x48, 0x8d, 0x3a, + 0x1f, 0x86, 0x95, 0xda, 0x91, 0xb9, 0xb4, 0x9f, 0x82, 0xbf, 0x64, 0x0f, 0xbc, 0x0b, 0xa9, 0xe0, + 0x84, 0xc2, 0xc5, 0xf8, 0x3a, 0xfd, 0x07, 0x62, 0xee, 0xca, 0x10, 0x91, 0x01, 0xb0, 0x7e, 0xee, + 0xe5, 0xc7, 0xaf, 0x6f, 0x92, 0x69, 0x3c, 0xd9, 0x77, 0x76, 0xe3, 0xe7, 0x08, 0xc6, 0xc2, 0xb1, + 0xc3, 0x73, 0x03, 0x4a, 0xf6, 0x1c, 0x92, 0xb9, 0xf9, 0xa1, 0x62, 0x15, 0xc0, 0x79, 0x09, 0x30, + 0x85, 0xd3, 0xfd, 0x6f, 0x06, 0x81, 0x0f, 0x10, 0x4c, 0xf6, 0x4d, 0x3e, 0x5e, 0x1e, 0xa2, 0x7e, + 0xef, 0xdc, 0xe5, 0xae, 0x9d, 0x2d, 0x49, 0xd1, 0x5d, 0x94, 0x74, 0x33, 0x38, 0x1f, 0x43, 0x47, + 0x9a, 0xea, 0x41, 0x6c, 0xe1, 0x77, 0x08, 0x32, 0x71, 0xd3, 0x86, 0xaf, 0x0f, 0xe8, 0x3a, 0xe0, + 0x94, 0xc8, 0xdd, 0x38, 0x73, 0x9e, 0x02, 0x2e, 0x4a, 0x60, 0x1d, 0x17, 0x62, 0x5e, 0xa2, 0x74, + 0xbb, 0x93, 0xf9, 0x03, 0x02, 0x88, 0x4a, 0xe1, 0xab, 0x43, 0x75, 0x0c, 0xf9, 0x16, 0x86, 0x8c, + 0x56, 0x54, 0x0f, 0x25, 0xd5, 0x03, 0x7c, 0x5f, 0x52, 0x45, 0x3c, 0xa4, 0xd9, 0x37, 0xd5, 0x2d, + 0xd2, 0x8c, 0x86, 0xb7, 0x45, 0x9a, 0x31, 0xa3, 0xda, 0x22, 0x4d, 0xdb, 0x6c, 0x95, 0x4a, 0x87, + 0xc7, 0x1a, 0x3a, 0x3a, 0xd6, 0xd0, 0x97, 0x63, 0x0d, 0xbd, 0x3e, 0xd1, 0x12, 0x47, 0x27, 0x5a, + 0xe2, 0xd3, 0x89, 0x96, 0x78, 0x52, 0xb4, 0x6c, 0x7f, 0xb3, 0x5e, 0x31, 0xaa, 0xbc, 0xd6, 0x6e, + 0xb8, 0xd0, 0xf9, 0x5d, 0xb1, 0xab, 0xa4, 0xf8, 0x7b, 0x2e, 0x13, 0x95, 0x94, 0xfc, 0xae, 0x58, + 0xfe, 0x16, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xb6, 0xf3, 0x8e, 0x5d, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -859,7 +859,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/house/query.proto", + Metadata: "sgenetwork/sge/house/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/house/types/query.pb.gw.go b/x/house/types/query.pb.gw.go index 52ca0b2b..c17d43cd 100644 --- a/x/house/types/query.pb.gw.go +++ b/x/house/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: sge/house/query.proto +// source: sgenetwork/sge/house/query.proto /* Package types is a reverse proxy. diff --git a/x/house/types/ticket.pb.go b/x/house/types/ticket.pb.go index 15e2fe33..d55170b6 100644 --- a/x/house/types/ticket.pb.go +++ b/x/house/types/ticket.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/house/ticket.proto +// source: sgenetwork/sge/house/ticket.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" types "github.com/sge-network/sge/types" io "io" math "math" @@ -36,7 +36,7 @@ func (m *DepositTicketPayload) Reset() { *m = DepositTicketPayload{} } func (m *DepositTicketPayload) String() string { return proto.CompactTextString(m) } func (*DepositTicketPayload) ProtoMessage() {} func (*DepositTicketPayload) Descriptor() ([]byte, []int) { - return fileDescriptor_1f686c28436675f2, []int{0} + return fileDescriptor_240713aaceffb197, []int{0} } func (m *DepositTicketPayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -91,7 +91,7 @@ func (m *WithdrawTicketPayload) Reset() { *m = WithdrawTicketPayload{} } func (m *WithdrawTicketPayload) String() string { return proto.CompactTextString(m) } func (*WithdrawTicketPayload) ProtoMessage() {} func (*WithdrawTicketPayload) Descriptor() ([]byte, []int) { - return fileDescriptor_1f686c28436675f2, []int{1} + return fileDescriptor_240713aaceffb197, []int{1} } func (m *WithdrawTicketPayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -139,28 +139,28 @@ func init() { proto.RegisterType((*WithdrawTicketPayload)(nil), "sgenetwork.sge.house.WithdrawTicketPayload") } -func init() { proto.RegisterFile("sge/house/ticket.proto", fileDescriptor_1f686c28436675f2) } +func init() { proto.RegisterFile("sgenetwork/sge/house/ticket.proto", fileDescriptor_240713aaceffb197) } -var fileDescriptor_1f686c28436675f2 = []byte{ - // 285 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2b, 0x4e, 0x4f, 0xd5, - 0xcf, 0xc8, 0x2f, 0x2d, 0x4e, 0xd5, 0x2f, 0xc9, 0x4c, 0xce, 0x4e, 0x2d, 0xd1, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x12, 0x29, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, - 0x4e, 0x4f, 0xd5, 0x03, 0x2b, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd0, 0x07, 0xb1, - 0x20, 0x6a, 0xa5, 0x84, 0x40, 0x66, 0x94, 0x54, 0x16, 0xa4, 0xea, 0x67, 0x57, 0x26, 0x43, 0xc4, - 0x94, 0x96, 0x33, 0x72, 0x89, 0xb8, 0xa4, 0x16, 0xe4, 0x17, 0x67, 0x96, 0x84, 0x80, 0xcd, 0x0d, - 0x48, 0xac, 0xcc, 0xc9, 0x4f, 0x4c, 0x11, 0x72, 0xe1, 0xe2, 0xc8, 0xae, 0x4c, 0x8e, 0x4f, 0x49, - 0x2c, 0x49, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x52, 0xd6, 0x43, 0xb3, 0x0b, 0x64, 0x94, - 0x9e, 0x77, 0x65, 0xb2, 0x4b, 0x62, 0x49, 0x22, 0x54, 0x9b, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, - 0x41, 0xec, 0xd9, 0x10, 0x51, 0x21, 0x4f, 0x2e, 0xc1, 0x14, 0x88, 0xe9, 0xf9, 0x45, 0xf1, 0x89, - 0x29, 0x29, 0x45, 0xa9, 0xc5, 0xc5, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x9c, 0x4e, 0x32, 0x9f, 0xee, - 0xc9, 0x4b, 0x54, 0x26, 0xe6, 0xe6, 0x58, 0x29, 0x61, 0x28, 0x51, 0x0a, 0x12, 0x80, 0x8b, 0x39, - 0x42, 0x85, 0x56, 0x30, 0x72, 0x89, 0x86, 0x67, 0x96, 0x64, 0xa4, 0x14, 0x25, 0x96, 0x0f, 0x6e, - 0xa7, 0x3a, 0x39, 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, 0x46, 0x7a, - 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x71, 0x7a, 0xaa, 0x2e, 0xd4, 0x8d, - 0x20, 0xb6, 0x7e, 0x05, 0x2c, 0x7e, 0x2b, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xf1, 0x63, 0x0c, - 0x08, 0x00, 0x00, 0xff, 0xff, 0x12, 0xb9, 0xd1, 0x7a, 0xf9, 0x01, 0x00, 0x00, +var fileDescriptor_240713aaceffb197 = []byte{ + // 284 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xc8, 0x2f, 0x2d, 0x4e, + 0xd5, 0x2f, 0xc9, 0x4c, 0xce, 0x4e, 0x2d, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x41, + 0x28, 0xd1, 0x2b, 0x4e, 0x4f, 0xd5, 0x03, 0x2b, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, + 0xd0, 0x07, 0xb1, 0x20, 0x6a, 0xa5, 0x64, 0xd1, 0x8c, 0x2b, 0xa9, 0x2c, 0x48, 0xd5, 0xcf, 0xae, + 0x4c, 0x86, 0x48, 0x2b, 0x2d, 0x67, 0xe4, 0x12, 0x71, 0x49, 0x2d, 0xc8, 0x2f, 0xce, 0x2c, 0x09, + 0x01, 0x5b, 0x11, 0x90, 0x58, 0x99, 0x93, 0x9f, 0x98, 0x22, 0xe4, 0xc2, 0xc5, 0x91, 0x5d, 0x99, + 0x1c, 0x9f, 0x92, 0x58, 0x92, 0x28, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0xa4, 0xac, 0x87, 0x66, + 0x2d, 0xc8, 0x28, 0x3d, 0xef, 0xca, 0x64, 0x97, 0xc4, 0x92, 0x44, 0xa8, 0x36, 0x27, 0x96, 0x13, + 0xf7, 0xe4, 0x19, 0x82, 0xd8, 0xb3, 0x21, 0xa2, 0x42, 0x9e, 0x5c, 0x82, 0x29, 0x10, 0xd3, 0xf3, + 0x8b, 0xe2, 0x13, 0x53, 0x52, 0x8a, 0x52, 0x8b, 0x8b, 0x25, 0x98, 0x14, 0x18, 0x35, 0x38, 0x9d, + 0x64, 0x3e, 0xdd, 0x93, 0x97, 0xa8, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0xc2, 0x50, 0xa2, 0x14, 0x24, + 0x00, 0x17, 0x73, 0x84, 0x0a, 0xad, 0x60, 0xe4, 0x12, 0x0d, 0xcf, 0x2c, 0xc9, 0x48, 0x29, 0x4a, + 0x2c, 0x1f, 0xdc, 0x4e, 0x75, 0x72, 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, 0x8d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x50, 0x6c, 0xe8, 0x22, + 0xc7, 0x4c, 0x05, 0x2c, 0xaa, 0x2b, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xf1, 0x63, 0x0c, 0x08, + 0x00, 0x00, 0xff, 0xff, 0xef, 0xcf, 0xb0, 0x22, 0x0f, 0x02, 0x00, 0x00, } func (m *DepositTicketPayload) Marshal() (dAtA []byte, err error) { diff --git a/x/house/types/tx.pb.go b/x/house/types/tx.pb.go index f7e28712..452d204c 100644 --- a/x/house/types/tx.pb.go +++ b/x/house/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/house/tx.proto +// source: sgenetwork/sge/house/tx.proto package types @@ -8,8 +8,8 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - 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" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -47,7 +47,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_d3891d05e499977f, []int{0} + return fileDescriptor_0764ff859f434eaf, []int{0} } func (m *MsgDeposit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,7 +90,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_d3891d05e499977f, []int{1} + return fileDescriptor_0764ff859f434eaf, []int{1} } func (m *MsgDepositResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -153,7 +153,7 @@ func (m *MsgWithdraw) Reset() { *m = MsgWithdraw{} } func (m *MsgWithdraw) String() string { return proto.CompactTextString(m) } func (*MsgWithdraw) ProtoMessage() {} func (*MsgWithdraw) Descriptor() ([]byte, []int) { - return fileDescriptor_d3891d05e499977f, []int{2} + return fileDescriptor_0764ff859f434eaf, []int{2} } func (m *MsgWithdraw) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -197,7 +197,7 @@ func (m *MsgWithdrawResponse) Reset() { *m = MsgWithdrawResponse{} } func (m *MsgWithdrawResponse) String() string { return proto.CompactTextString(m) } func (*MsgWithdrawResponse) ProtoMessage() {} func (*MsgWithdrawResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d3891d05e499977f, []int{3} + return fileDescriptor_0764ff859f434eaf, []int{3} } func (m *MsgWithdrawResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -254,43 +254,43 @@ func init() { proto.RegisterType((*MsgWithdrawResponse)(nil), "sgenetwork.sge.house.MsgWithdrawResponse") } -func init() { proto.RegisterFile("sge/house/tx.proto", fileDescriptor_d3891d05e499977f) } +func init() { proto.RegisterFile("sgenetwork/sge/house/tx.proto", fileDescriptor_0764ff859f434eaf) } -var fileDescriptor_d3891d05e499977f = []byte{ - // 525 bytes of a gzipped FileDescriptorProto +var fileDescriptor_0764ff859f434eaf = []byte{ + // 528 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x41, 0x6b, 0xd4, 0x40, - 0x14, 0xce, 0xa4, 0xeb, 0xb6, 0x3b, 0x85, 0x0a, 0xd3, 0x22, 0xeb, 0x0a, 0x99, 0x1a, 0x44, 0xb6, - 0x60, 0x13, 0xa8, 0xb7, 0x7a, 0x0b, 0x45, 0xd8, 0x43, 0x10, 0x02, 0x45, 0xf1, 0x52, 0xd2, 0x64, - 0x98, 0x1d, 0xb6, 0xc9, 0x84, 0xcc, 0x2c, 0xbb, 0xfd, 0x07, 0x1e, 0xfd, 0x09, 0xc5, 0x1f, 0xe1, - 0x6f, 0xe8, 0x49, 0x7a, 0x14, 0x0f, 0x41, 0xb3, 0x17, 0xf1, 0xb8, 0x3f, 0x40, 0x24, 0x93, 0x64, - 0x37, 0xca, 0x2e, 0x45, 0x11, 0xf1, 0xb4, 0xb3, 0xef, 0x7d, 0xdf, 0xcb, 0x7b, 0xef, 0xfb, 0x66, - 0x20, 0x12, 0x94, 0xd8, 0x43, 0x3e, 0x16, 0xc4, 0x96, 0x53, 0x2b, 0x49, 0xb9, 0xe4, 0x68, 0x4f, - 0x50, 0x12, 0x13, 0x39, 0xe1, 0xe9, 0xc8, 0x12, 0x94, 0x58, 0x2a, 0xdd, 0xdb, 0xa3, 0x9c, 0x72, - 0x05, 0xb0, 0x8b, 0x53, 0x89, 0xed, 0x75, 0x97, 0xfc, 0x09, 0x93, 0xc3, 0x30, 0xf5, 0x27, 0x65, - 0xc6, 0xfc, 0x02, 0x20, 0x74, 0x05, 0x3d, 0x21, 0x09, 0x17, 0x4c, 0xa2, 0x27, 0x70, 0x33, 0x48, - 0x89, 0x2f, 0x79, 0xda, 0x05, 0xfb, 0xa0, 0xdf, 0x71, 0xd0, 0x3c, 0xc3, 0x3b, 0x97, 0x7e, 0x74, - 0x71, 0x6c, 0x56, 0x09, 0xd3, 0xab, 0x21, 0xe8, 0x19, 0x84, 0x91, 0x9f, 0x8e, 0x88, 0x3c, 0x1b, - 0xb3, 0xb0, 0xab, 0x2b, 0xc2, 0x83, 0x3c, 0xc3, 0x1d, 0x57, 0x45, 0x4f, 0x07, 0x27, 0xdf, 0x32, - 0xdc, 0x80, 0x78, 0x8d, 0x33, 0x7a, 0x0e, 0xdb, 0x7e, 0xc4, 0xc7, 0xb1, 0xec, 0x6e, 0x28, 0xa2, - 0x75, 0x9d, 0x61, 0xed, 0x53, 0x86, 0x1f, 0x53, 0x26, 0x87, 0xe3, 0x73, 0x2b, 0xe0, 0x91, 0x1d, - 0x70, 0x11, 0x71, 0x51, 0xfd, 0x1c, 0x8a, 0x70, 0x64, 0xcb, 0xcb, 0x84, 0x08, 0x6b, 0x10, 0x4b, - 0xaf, 0x62, 0xa3, 0x7b, 0xb0, 0x2d, 0x59, 0x30, 0x22, 0xb2, 0xdb, 0x2a, 0xea, 0x78, 0xd5, 0xbf, - 0xe3, 0xad, 0x37, 0x57, 0x58, 0xfb, 0x7a, 0x85, 0x35, 0xf3, 0x1d, 0x80, 0x68, 0x39, 0xa3, 0x47, - 0x44, 0xc2, 0x63, 0x41, 0x7e, 0xe9, 0x1e, 0xfc, 0x5e, 0xf7, 0x2f, 0xe0, 0x6e, 0xe2, 0xa7, 0x92, - 0x05, 0x2c, 0xf1, 0x25, 0xe3, 0xf1, 0x19, 0x8b, 0x43, 0x32, 0x55, 0x3b, 0x68, 0x39, 0xc6, 0x3c, - 0xc3, 0xbd, 0x72, 0x69, 0x2b, 0x40, 0xa6, 0x87, 0x7e, 0x8a, 0x0e, 0x54, 0xf0, 0xbb, 0x0e, 0xb7, - 0x5d, 0x41, 0x5f, 0x56, 0xf2, 0xfc, 0x4b, 0x25, 0xd6, 0xcc, 0xb2, 0xf1, 0xa7, 0xb3, 0xa0, 0x01, - 0x6c, 0x45, 0x3c, 0x24, 0x4a, 0x90, 0x9d, 0xa3, 0x47, 0xd6, 0x2a, 0xa7, 0x5a, 0xf5, 0xa4, 0xfe, - 0x85, 0xcb, 0x43, 0xe2, 0xdc, 0x9d, 0x67, 0x78, 0xbb, 0xfc, 0x4e, 0xc1, 0x35, 0x3d, 0x55, 0xa2, - 0xe1, 0x92, 0x3b, 0x7f, 0xc9, 0x25, 0xed, 0x35, 0x2e, 0xf9, 0x00, 0xe0, 0x6e, 0x43, 0x80, 0x85, - 0x4d, 0x0e, 0xa0, 0x5e, 0xd9, 0xa3, 0xe5, 0xdc, 0xcf, 0x33, 0xac, 0xab, 0x5d, 0xea, 0x2c, 0x9c, - 0x67, 0xb8, 0x53, 0x36, 0xcc, 0x42, 0xd3, 0xd3, 0x59, 0xf8, 0x7f, 0xa9, 0x70, 0xf4, 0x1e, 0xc0, - 0x0d, 0x57, 0x50, 0x74, 0x0a, 0x37, 0xeb, 0xeb, 0xbd, 0xbf, 0x5a, 0x8a, 0xe5, 0xe5, 0xe8, 0xf5, - 0x6f, 0x43, 0x2c, 0xf6, 0xf2, 0x0a, 0x6e, 0x2d, 0xcc, 0xfa, 0x70, 0x2d, 0xab, 0x86, 0xf4, 0x0e, - 0x6e, 0x85, 0xd4, 0x95, 0x1d, 0xe7, 0x3a, 0x37, 0xc0, 0x4d, 0x6e, 0x80, 0xcf, 0xb9, 0x01, 0xde, - 0xce, 0x0c, 0xed, 0x66, 0x66, 0x68, 0x1f, 0x67, 0x86, 0xf6, 0xba, 0xdf, 0x50, 0x5d, 0x50, 0x72, - 0x58, 0xd5, 0x2b, 0xce, 0xf6, 0xb4, 0x7e, 0x20, 0x0b, 0xed, 0xcf, 0xdb, 0xea, 0x79, 0x7b, 0xfa, - 0x23, 0x00, 0x00, 0xff, 0xff, 0x08, 0x13, 0x20, 0xef, 0x3a, 0x05, 0x00, 0x00, + 0x14, 0xce, 0x64, 0xd7, 0x6d, 0x77, 0x0a, 0x15, 0xa6, 0x45, 0xd6, 0x15, 0x33, 0x35, 0x8a, 0x6c, + 0xc1, 0x26, 0x50, 0x6f, 0xf5, 0x16, 0x8a, 0xb0, 0x87, 0x20, 0x04, 0x8a, 0xe2, 0xa5, 0xa4, 0xc9, + 0x30, 0x3b, 0x6c, 0x93, 0x09, 0x99, 0x59, 0x76, 0xfb, 0x0f, 0x3c, 0xfa, 0x13, 0x8a, 0x3f, 0xc2, + 0xdf, 0xd0, 0x93, 0xf4, 0x28, 0x1e, 0x82, 0x66, 0x2f, 0xe2, 0x71, 0x7f, 0x80, 0xc8, 0x4e, 0x92, + 0xdd, 0x28, 0xbb, 0x14, 0x45, 0xc4, 0x53, 0x26, 0xef, 0x7d, 0xef, 0xcd, 0x7b, 0xef, 0xfb, 0xe6, + 0xc1, 0xfb, 0x82, 0x92, 0x98, 0xc8, 0x31, 0x4f, 0x87, 0xb6, 0xa0, 0xc4, 0x1e, 0xf0, 0x91, 0x20, + 0xb6, 0x9c, 0x58, 0x49, 0xca, 0x25, 0x47, 0xbb, 0x4b, 0xb7, 0x25, 0x28, 0xb1, 0x94, 0xbb, 0xbb, + 0x4b, 0x39, 0xe5, 0x0a, 0x60, 0xcf, 0x4f, 0x05, 0xb6, 0xfb, 0x70, 0x65, 0xaa, 0x31, 0x93, 0x83, + 0x30, 0xf5, 0xc7, 0x05, 0xc8, 0xfc, 0x02, 0x20, 0x74, 0x05, 0x3d, 0x26, 0x09, 0x17, 0x4c, 0xa2, + 0x27, 0x70, 0x23, 0x48, 0x89, 0x2f, 0x79, 0xda, 0x01, 0x7b, 0xa0, 0xd7, 0x76, 0xd0, 0x2c, 0xc3, + 0xdb, 0x17, 0x7e, 0x74, 0x7e, 0x64, 0x96, 0x0e, 0xd3, 0xab, 0x20, 0xe8, 0x19, 0x84, 0x91, 0x9f, + 0x0e, 0x89, 0x3c, 0x1d, 0xb1, 0xb0, 0xa3, 0xab, 0x80, 0x7b, 0x79, 0x86, 0xdb, 0xae, 0xb2, 0x9e, + 0xf4, 0x8f, 0xbf, 0x65, 0xb8, 0x06, 0xf1, 0x6a, 0x67, 0xf4, 0x1c, 0xb6, 0xfc, 0x88, 0x8f, 0x62, + 0xd9, 0x69, 0xa8, 0x40, 0xeb, 0x2a, 0xc3, 0xda, 0xa7, 0x0c, 0x3f, 0xa6, 0x4c, 0x0e, 0x46, 0x67, + 0x56, 0xc0, 0x23, 0x3b, 0xe0, 0x22, 0xe2, 0xa2, 0xfc, 0x1c, 0x88, 0x70, 0x68, 0xcb, 0x8b, 0x84, + 0x08, 0xab, 0x1f, 0x4b, 0xaf, 0x8c, 0x46, 0x77, 0x60, 0x4b, 0xb2, 0x60, 0x48, 0x64, 0xa7, 0x39, + 0xcf, 0xe3, 0x95, 0x7f, 0x47, 0x9b, 0x6f, 0x2e, 0xb1, 0xf6, 0xf5, 0x12, 0x6b, 0xe6, 0x3b, 0x00, + 0xd1, 0xb2, 0x47, 0x8f, 0x88, 0x84, 0xc7, 0x82, 0xfc, 0x52, 0x3d, 0xf8, 0xbd, 0xea, 0x5f, 0xc0, + 0x9d, 0xc4, 0x4f, 0x25, 0x0b, 0x58, 0xe2, 0x4b, 0xc6, 0xe3, 0x53, 0x16, 0x87, 0x64, 0xa2, 0x66, + 0xd0, 0x74, 0x8c, 0x59, 0x86, 0xbb, 0xc5, 0xd0, 0x56, 0x80, 0x4c, 0x0f, 0xfd, 0x64, 0xed, 0x2b, + 0xe3, 0x77, 0x1d, 0x6e, 0xb9, 0x82, 0xbe, 0x2c, 0xe9, 0xf9, 0x97, 0x4c, 0xac, 0xe9, 0xa5, 0xf1, + 0xa7, 0xbd, 0xa0, 0x3e, 0x6c, 0x46, 0x3c, 0x24, 0x8a, 0x90, 0xed, 0xc3, 0x47, 0xd6, 0x2a, 0xd1, + 0x5a, 0x55, 0xa7, 0xfe, 0xb9, 0xcb, 0x43, 0xe2, 0xdc, 0x9e, 0x65, 0x78, 0xab, 0xb8, 0x67, 0x1e, + 0x6b, 0x7a, 0x2a, 0x45, 0x4d, 0x25, 0xb7, 0xfe, 0x92, 0x4a, 0x5a, 0x6b, 0x54, 0xf2, 0x01, 0xc0, + 0x9d, 0x1a, 0x01, 0x0b, 0x99, 0xec, 0x43, 0xbd, 0x94, 0x47, 0xd3, 0xb9, 0x9b, 0x67, 0x58, 0x57, + 0xb3, 0xd4, 0x59, 0x38, 0xcb, 0x70, 0xbb, 0x28, 0x98, 0x85, 0xa6, 0xa7, 0xb3, 0xf0, 0xff, 0x62, + 0xe1, 0xf0, 0x3d, 0x80, 0x0d, 0x57, 0x50, 0x74, 0x02, 0x37, 0xaa, 0xe7, 0xbd, 0xb7, 0x9a, 0x8a, + 0xe5, 0xe3, 0xe8, 0xf6, 0x6e, 0x42, 0x2c, 0xe6, 0xf2, 0x0a, 0x6e, 0x2e, 0xc4, 0xfa, 0x60, 0x6d, + 0x54, 0x05, 0xe9, 0xee, 0xdf, 0x08, 0xa9, 0x32, 0x3b, 0xce, 0x55, 0x6e, 0x80, 0xeb, 0xdc, 0x00, + 0x9f, 0x73, 0x03, 0xbc, 0x9d, 0x1a, 0xda, 0xf5, 0xd4, 0xd0, 0x3e, 0x4e, 0x0d, 0xed, 0x75, 0xaf, + 0xc6, 0xba, 0xa0, 0xe4, 0xa0, 0xbe, 0xde, 0x26, 0xd5, 0xae, 0x9c, 0x73, 0x7f, 0xd6, 0x52, 0xeb, + 0xed, 0xe9, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x87, 0xff, 0x89, 0x35, 0x50, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -416,7 +416,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/house/tx.proto", + Metadata: "sgenetwork/sge/house/tx.proto", } func (m *MsgDeposit) Marshal() (dAtA []byte, err error) { diff --git a/x/house/types/withdraw.pb.go b/x/house/types/withdraw.pb.go index c5c9c735..b4dc5a2d 100644 --- a/x/house/types/withdraw.pb.go +++ b/x/house/types/withdraw.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/house/withdraw.proto +// source: sgenetwork/sge/house/withdraw.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -53,7 +53,7 @@ func (x WithdrawalMode) String() string { } func (WithdrawalMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_9ca852402ebf549d, []int{0} + return fileDescriptor_bc9c262f4256300e, []int{0} } // Withdrawal represents the withdrawal against a deposit. @@ -78,7 +78,7 @@ type Withdrawal struct { func (m *Withdrawal) Reset() { *m = Withdrawal{} } func (*Withdrawal) ProtoMessage() {} func (*Withdrawal) Descriptor() ([]byte, []int) { - return fileDescriptor_9ca852402ebf549d, []int{0} + return fileDescriptor_bc9c262f4256300e, []int{0} } func (m *Withdrawal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -112,41 +112,43 @@ func init() { proto.RegisterType((*Withdrawal)(nil), "sgenetwork.sge.house.Withdrawal") } -func init() { proto.RegisterFile("sge/house/withdraw.proto", fileDescriptor_9ca852402ebf549d) } +func init() { + proto.RegisterFile("sgenetwork/sge/house/withdraw.proto", fileDescriptor_bc9c262f4256300e) +} -var fileDescriptor_9ca852402ebf549d = []byte{ - // 493 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xc1, 0x6a, 0xdb, 0x4c, - 0x10, 0xc7, 0x25, 0xc5, 0x9f, 0x83, 0xf7, 0x6b, 0x5d, 0xb3, 0x35, 0x54, 0x8d, 0x41, 0x6b, 0x44, - 0x29, 0x6e, 0x69, 0x24, 0x68, 0x6f, 0xe9, 0xa1, 0xd8, 0xb5, 0x43, 0x05, 0x76, 0x13, 0xd4, 0x18, - 0x43, 0x2f, 0x46, 0xf1, 0x2e, 0xf2, 0xe2, 0x48, 0x6b, 0xb4, 0x6b, 0x9c, 0xbc, 0x41, 0x8f, 0x3d, - 0xf6, 0xe8, 0xc7, 0xc9, 0x31, 0xd0, 0x4b, 0xe9, 0x61, 0x29, 0xf2, 0xa5, 0xf4, 0xa8, 0x27, 0x28, - 0x5a, 0x2b, 0xd4, 0x31, 0x39, 0xed, 0x30, 0xf3, 0x9b, 0xff, 0xec, 0xfc, 0x19, 0x60, 0xf2, 0x90, - 0xb8, 0x53, 0xb6, 0xe0, 0xc4, 0x5d, 0x52, 0x31, 0xc5, 0x49, 0xb0, 0x74, 0xe6, 0x09, 0x13, 0x0c, - 0xd6, 0x79, 0x48, 0x62, 0x22, 0x96, 0x2c, 0x99, 0x39, 0x3c, 0x24, 0x8e, 0x82, 0x0e, 0xea, 0x21, - 0x0b, 0x99, 0x02, 0xdc, 0x3c, 0xda, 0xb0, 0xf6, 0xf7, 0x3d, 0x00, 0x46, 0x45, 0x7b, 0x70, 0x01, - 0x5f, 0x81, 0xfd, 0x49, 0x42, 0x02, 0xc1, 0x12, 0x53, 0x6f, 0xea, 0xad, 0x4a, 0x07, 0x66, 0x12, - 0x55, 0xaf, 0x82, 0xe8, 0xe2, 0xc8, 0x2e, 0x0a, 0xb6, 0x7f, 0x8b, 0xc0, 0x17, 0xc0, 0xa0, 0xd8, - 0x34, 0x9a, 0x7a, 0xab, 0xd4, 0x79, 0x9a, 0x4a, 0x64, 0x78, 0xdd, 0x3f, 0x12, 0x19, 0x14, 0x67, - 0x12, 0x55, 0x36, 0x4d, 0x14, 0xdb, 0xbe, 0x41, 0x71, 0x2e, 0x1c, 0x60, 0x9c, 0x10, 0xce, 0xcd, - 0xbd, 0x5d, 0xe1, 0xa2, 0x60, 0xfb, 0xb7, 0x08, 0x7c, 0x0b, 0x40, 0x14, 0x24, 0x33, 0x22, 0xc6, - 0x0b, 0x8a, 0xcd, 0x92, 0x6a, 0x68, 0xa4, 0x12, 0x55, 0x06, 0x2a, 0x3b, 0x54, 0x73, 0xb6, 0x10, - 0x7f, 0x2b, 0x86, 0x27, 0xe0, 0xf1, 0x3c, 0x48, 0x04, 0x9d, 0xd0, 0x79, 0x20, 0x28, 0x8b, 0xc7, - 0x34, 0xc6, 0xe4, 0xd2, 0xfc, 0x4f, 0x7d, 0xd3, 0xca, 0x24, 0x3a, 0xd8, 0x8c, 0xbd, 0x07, 0xb2, - 0x7d, 0x78, 0x27, 0xeb, 0xe5, 0x49, 0xe8, 0x81, 0x52, 0xc4, 0x30, 0x31, 0xcb, 0x4d, 0xbd, 0x55, - 0x7d, 0xfd, 0xcc, 0xb9, 0xcf, 0x5e, 0xe7, 0x9f, 0x89, 0x03, 0x86, 0x49, 0xe7, 0x51, 0x26, 0xd1, - 0xff, 0x9b, 0x39, 0x79, 0xaf, 0xed, 0x2b, 0x09, 0x38, 0x02, 0xe5, 0x20, 0x62, 0x8b, 0x58, 0x98, - 0xfb, 0x6a, 0xa9, 0x77, 0xd7, 0x12, 0x69, 0x3f, 0x25, 0x7a, 0x1e, 0x52, 0x31, 0x5d, 0x9c, 0x3b, - 0x13, 0x16, 0xb9, 0x13, 0xc6, 0x23, 0xc6, 0x8b, 0xe7, 0x90, 0xe3, 0x99, 0x2b, 0xae, 0xe6, 0x84, - 0x3b, 0x5e, 0x2c, 0x32, 0x89, 0x1e, 0x16, 0x9e, 0x29, 0x15, 0xdb, 0x2f, 0xe4, 0x8e, 0x1e, 0x7c, - 0x59, 0x21, 0xed, 0xdb, 0x0a, 0x69, 0xbf, 0x57, 0x48, 0x7b, 0x39, 0x05, 0xd5, 0xbb, 0xff, 0x81, - 0x08, 0x34, 0x46, 0xde, 0xd9, 0x87, 0xae, 0xdf, 0x1e, 0xb5, 0xfb, 0xe3, 0xc1, 0x49, 0xb7, 0x37, - 0x1e, 0x7e, 0xfc, 0x74, 0xda, 0x7b, 0xef, 0x1d, 0x7b, 0xbd, 0x6e, 0x4d, 0x83, 0x26, 0xa8, 0xef, - 0x02, 0xc7, 0xc3, 0x7e, 0xbf, 0xa6, 0xc3, 0x06, 0x78, 0xb2, 0x5b, 0x39, 0x6d, 0xfb, 0x67, 0x5e, - 0xbb, 0x5f, 0x33, 0x3a, 0x9d, 0xeb, 0xd4, 0xd2, 0x6f, 0x52, 0x4b, 0xff, 0x95, 0x5a, 0xfa, 0xd7, - 0xb5, 0xa5, 0xdd, 0xac, 0x2d, 0xed, 0xc7, 0xda, 0xd2, 0x3e, 0xb7, 0xb6, 0x56, 0xe2, 0x21, 0x39, - 0x2c, 0x2c, 0xcb, 0x63, 0xf7, 0xb2, 0x38, 0x5c, 0xb5, 0xd8, 0x79, 0x59, 0x9d, 0xe2, 0x9b, 0xbf, - 0x01, 0x00, 0x00, 0xff, 0xff, 0xf3, 0x82, 0xd0, 0x4f, 0xd2, 0x02, 0x00, 0x00, +var fileDescriptor_bc9c262f4256300e = []byte{ + // 492 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0x4f, 0x6b, 0x13, 0x41, + 0x18, 0xc6, 0x77, 0xb7, 0x31, 0x25, 0xa3, 0xc6, 0x30, 0x06, 0x5c, 0x1b, 0xd8, 0x09, 0xab, 0x48, + 0x14, 0xbb, 0x0b, 0x7a, 0xab, 0x07, 0x49, 0x4c, 0x8a, 0x0b, 0x89, 0x2d, 0x6b, 0x43, 0xc0, 0x4b, + 0xd8, 0x66, 0x86, 0xcd, 0x90, 0xee, 0x4e, 0xd8, 0x99, 0x90, 0xf6, 0x1b, 0x78, 0xf4, 0xe8, 0x31, + 0x1f, 0xa7, 0xc7, 0x82, 0x17, 0xf1, 0x30, 0xc8, 0xe6, 0x22, 0x1e, 0xf7, 0x13, 0x94, 0x4c, 0xb6, + 0x34, 0x0d, 0x3d, 0xcd, 0xf0, 0xbe, 0xbf, 0xe7, 0x79, 0xff, 0xf0, 0x82, 0x17, 0x3c, 0x24, 0x31, + 0x11, 0x73, 0x96, 0x4c, 0x5c, 0x1e, 0x12, 0x77, 0xcc, 0x66, 0x9c, 0xb8, 0x73, 0x2a, 0xc6, 0x38, + 0x09, 0xe6, 0xce, 0x34, 0x61, 0x82, 0xc1, 0xea, 0x2d, 0xe4, 0xf0, 0x90, 0x38, 0x0a, 0xda, 0xab, + 0x86, 0x2c, 0x64, 0x0a, 0x70, 0x57, 0xbf, 0x35, 0x6b, 0xff, 0xda, 0x01, 0x60, 0x90, 0xcb, 0x83, + 0x33, 0xf8, 0x16, 0xec, 0x8e, 0x12, 0x12, 0x08, 0x96, 0x98, 0x7a, 0x5d, 0x6f, 0x94, 0x5a, 0x30, + 0x93, 0xa8, 0x7c, 0x11, 0x44, 0x67, 0x07, 0x76, 0x9e, 0xb0, 0xfd, 0x1b, 0x04, 0xbe, 0x06, 0x06, + 0xc5, 0xa6, 0x51, 0xd7, 0x1b, 0x85, 0xd6, 0xf3, 0x54, 0x22, 0xc3, 0x6b, 0xff, 0x97, 0xc8, 0xa0, + 0x38, 0x93, 0xa8, 0xb4, 0x16, 0x51, 0x6c, 0xfb, 0x06, 0xc5, 0x2b, 0xe3, 0x00, 0xe3, 0x84, 0x70, + 0x6e, 0xee, 0x6c, 0x1b, 0xe7, 0x09, 0xdb, 0xbf, 0x41, 0xe0, 0x07, 0x00, 0xa2, 0x20, 0x99, 0x10, + 0x31, 0x9c, 0x51, 0x6c, 0x16, 0x94, 0xa0, 0x96, 0x4a, 0x54, 0xea, 0xa9, 0x68, 0x5f, 0xd5, 0xd9, + 0x40, 0xfc, 0x8d, 0x3f, 0x3c, 0x02, 0x4f, 0xa7, 0x41, 0x22, 0xe8, 0x88, 0x4e, 0x03, 0x41, 0x59, + 0x3c, 0xa4, 0x31, 0x26, 0xe7, 0xe6, 0x03, 0xd5, 0xa6, 0x95, 0x49, 0xb4, 0xb7, 0x2e, 0x7b, 0x0f, + 0x64, 0xfb, 0xf0, 0x4e, 0xd4, 0x5b, 0x05, 0xa1, 0x07, 0x0a, 0x11, 0xc3, 0xc4, 0x2c, 0xd6, 0xf5, + 0x46, 0xf9, 0xdd, 0x4b, 0xe7, 0xbe, 0xf5, 0x3a, 0xb7, 0x4b, 0xec, 0x31, 0x4c, 0x5a, 0x4f, 0x32, + 0x89, 0x1e, 0xae, 0xeb, 0xac, 0xb4, 0xb6, 0xaf, 0x2c, 0xe0, 0x00, 0x14, 0x83, 0x88, 0xcd, 0x62, + 0x61, 0xee, 0xaa, 0xa1, 0x3e, 0x5e, 0x4a, 0xa4, 0xfd, 0x91, 0xe8, 0x55, 0x48, 0xc5, 0x78, 0x76, + 0xea, 0x8c, 0x58, 0xe4, 0x8e, 0x18, 0x8f, 0x18, 0xcf, 0x9f, 0x7d, 0x8e, 0x27, 0xae, 0xb8, 0x98, + 0x12, 0xee, 0x78, 0xb1, 0xc8, 0x24, 0x7a, 0x9c, 0xef, 0x4c, 0xb9, 0xd8, 0x7e, 0x6e, 0x77, 0xf0, + 0xe8, 0xfb, 0x02, 0x69, 0x3f, 0x17, 0x48, 0xfb, 0xb7, 0x40, 0xda, 0x9b, 0x31, 0x28, 0xdf, 0xed, + 0x07, 0x22, 0x50, 0x1b, 0x78, 0x27, 0x9f, 0xdb, 0x7e, 0x73, 0xd0, 0xec, 0x0e, 0x7b, 0x47, 0xed, + 0xce, 0xb0, 0xff, 0xe5, 0xeb, 0x71, 0xe7, 0x93, 0x77, 0xe8, 0x75, 0xda, 0x15, 0x0d, 0x9a, 0xa0, + 0xba, 0x0d, 0x1c, 0xf6, 0xbb, 0xdd, 0x8a, 0x0e, 0x6b, 0xe0, 0xd9, 0x76, 0xe6, 0xb8, 0xe9, 0x9f, + 0x78, 0xcd, 0x6e, 0xc5, 0x68, 0xb5, 0x2e, 0x53, 0x4b, 0xbf, 0x4a, 0x2d, 0xfd, 0x6f, 0x6a, 0xe9, + 0x3f, 0x96, 0x96, 0x76, 0xb5, 0xb4, 0xb4, 0xdf, 0x4b, 0x4b, 0xfb, 0xd6, 0xd8, 0x18, 0x89, 0x87, + 0x64, 0x7f, 0xf3, 0x6c, 0xcf, 0xf3, 0xc3, 0x55, 0x83, 0x9d, 0x16, 0xd5, 0x29, 0xbe, 0xbf, 0x0e, + 0x00, 0x00, 0xff, 0xff, 0x94, 0xc5, 0xe5, 0x74, 0xdd, 0x02, 0x00, 0x00, } func (m *Withdrawal) Marshal() (dAtA []byte, err error) { diff --git a/x/market/client/cli/query_market_test.go b/x/market/client/cli/query_market_test.go index 5b38cd58..cd30b0e9 100644 --- a/x/market/client/cli/query_market_test.go +++ b/x/market/client/cli/query_market_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" + tmcli "github.com/cometbft/cometbft/libs/cli" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/spf13/cast" "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/market/keeper/keeper.go b/x/market/keeper/keeper.go index 3aa518ae..f54be4c8 100644 --- a/x/market/keeper/keeper.go +++ b/x/market/keeper/keeper.go @@ -5,7 +5,7 @@ import ( 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" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/market/module.go b/x/market/module.go index e6f273e9..8ee3fc48 100644 --- a/x/market/module.go +++ b/x/market/module.go @@ -9,7 +9,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" @@ -130,19 +130,9 @@ func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Route returns the module's message routing key. -func (am AppModule) Route() sdk.Route { - return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) -} - // QuerierRoute returns the module's query routing key. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the module's Querier. -func (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/market/module_simulation.go b/x/market/module_simulation.go index b6e1bbc7..360cfaa8 100644 --- a/x/market/module_simulation.go +++ b/x/market/module_simulation.go @@ -5,7 +5,7 @@ import ( "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "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 +19,7 @@ import ( var ( _ = sample.AccAddress _ = marketsimulation.FindAccount - _ = simappparams.StakePerAccount + _ = simtestutil.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -49,7 +49,7 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP } // RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return marketsimulation.ParamChanges(r) } diff --git a/x/market/simulation/params.go b/x/market/simulation/params.go index 30ad6642..e3f6ec71 100644 --- a/x/market/simulation/params.go +++ b/x/market/simulation/params.go @@ -12,6 +12,6 @@ import ( // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{} +func ParamChanges(_ *rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{} } diff --git a/x/market/types/codec.go b/x/market/types/codec.go index 85b30c9e..1ddcd0a7 100644 --- a/x/market/types/codec.go +++ b/x/market/types/codec.go @@ -4,7 +4,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" - cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" @@ -43,6 +42,6 @@ var ( func init() { RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) + // cryptocodec.RegisterCrypto(amino) sdk.RegisterLegacyAminoCodec(amino) } diff --git a/x/market/types/genesis.pb.go b/x/market/types/genesis.pb.go index deb9a0d0..96234406 100644 --- a/x/market/types/genesis.pb.go +++ b/x/market/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/market/genesis.proto +// source: sgenetwork/sge/market/genesis.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -38,7 +38,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_e4ffd0e85fa3c489, []int{0} + return fileDescriptor_eb5c3fab001b4377, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -92,27 +92,29 @@ func init() { proto.RegisterType((*GenesisState)(nil), "sgenetwork.sge.market.GenesisState") } -func init() { proto.RegisterFile("sge/market/genesis.proto", fileDescriptor_e4ffd0e85fa3c489) } +func init() { + proto.RegisterFile("sgenetwork/sge/market/genesis.proto", fileDescriptor_eb5c3fab001b4377) +} -var fileDescriptor_e4ffd0e85fa3c489 = []byte{ +var fileDescriptor_eb5c3fab001b4377 = []byte{ // 261 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x4e, 0x4f, 0xd5, - 0xcf, 0x4d, 0x2c, 0xca, 0x4e, 0x2d, 0xd1, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, - 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2d, 0x06, 0xf1, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0xf5, 0x8a, - 0xd3, 0x53, 0xf5, 0x20, 0x8a, 0xa4, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x2a, 0xf4, 0x41, 0x2c, - 0x88, 0x62, 0x29, 0x71, 0x24, 0x63, 0x0a, 0x12, 0x8b, 0x12, 0x73, 0x8b, 0xb1, 0x48, 0x40, 0x28, - 0xa8, 0x84, 0x18, 0x92, 0x44, 0x71, 0x49, 0x62, 0x09, 0x54, 0x83, 0xd2, 0x45, 0x46, 0x2e, 0x1e, - 0x77, 0x88, 0x43, 0x82, 0x4b, 0x12, 0x4b, 0x52, 0x85, 0xac, 0xb9, 0xd8, 0x20, 0x26, 0x4a, 0x30, - 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0xc9, 0xea, 0x61, 0x75, 0x98, 0x5e, 0x00, 0x58, 0x91, 0x13, 0xcb, - 0x89, 0x7b, 0xf2, 0x0c, 0x41, 0x50, 0x2d, 0x42, 0x2e, 0x5c, 0xdc, 0x10, 0xe9, 0xf8, 0x9c, 0xcc, - 0xe2, 0x12, 0x09, 0x26, 0x05, 0x66, 0x3c, 0x26, 0xf8, 0x82, 0x29, 0xa8, 0x09, 0x5c, 0x10, 0x41, - 0x9f, 0xcc, 0xe2, 0x12, 0x21, 0x3b, 0x2e, 0x56, 0xb0, 0x13, 0x25, 0x98, 0xc1, 0x2e, 0x50, 0xc2, - 0xab, 0x1f, 0xe4, 0x6a, 0x98, 0x33, 0x20, 0xda, 0x9c, 0x9c, 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, 0x33, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, - 0xbf, 0x38, 0x3d, 0x55, 0x17, 0x6a, 0x2a, 0x88, 0xad, 0x5f, 0x01, 0x0b, 0x9e, 0x92, 0xca, 0x82, - 0xd4, 0xe2, 0x24, 0x36, 0x70, 0xf8, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x25, 0x6c, 0xab, - 0xfc, 0xb2, 0x01, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2e, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x4d, 0x2c, 0xca, 0x4e, + 0x2d, 0xd1, 0x07, 0x09, 0x16, 0x67, 0x16, 0xeb, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x89, 0x22, + 0x14, 0xe9, 0x15, 0xa7, 0xa7, 0xea, 0x41, 0x14, 0x49, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x55, + 0xe8, 0x83, 0x58, 0x10, 0xc5, 0x52, 0x4a, 0xd8, 0x4d, 0x2c, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xc6, + 0xaf, 0x06, 0x42, 0x41, 0xd5, 0x28, 0x62, 0x57, 0x53, 0x5c, 0x92, 0x58, 0x02, 0x35, 0x46, 0xe9, + 0x22, 0x23, 0x17, 0x8f, 0x3b, 0xc4, 0xa5, 0xc1, 0x25, 0x89, 0x25, 0xa9, 0x42, 0xd6, 0x5c, 0x6c, + 0x10, 0x7b, 0x24, 0x18, 0x15, 0x18, 0x35, 0xb8, 0x8d, 0x64, 0xf5, 0xb0, 0xba, 0x5c, 0x2f, 0x00, + 0xac, 0xc8, 0x89, 0xe5, 0xc4, 0x3d, 0x79, 0x86, 0x20, 0xa8, 0x16, 0x21, 0x17, 0x2e, 0x6e, 0x88, + 0x74, 0x7c, 0x4e, 0x66, 0x71, 0x89, 0x04, 0x93, 0x02, 0x33, 0x1e, 0x13, 0x7c, 0xc1, 0x14, 0xd4, + 0x04, 0x2e, 0x88, 0xa0, 0x4f, 0x66, 0x71, 0x89, 0x90, 0x1d, 0x17, 0x2b, 0xd8, 0x89, 0x12, 0xcc, + 0x60, 0x17, 0x28, 0xe1, 0xd5, 0x0f, 0x72, 0x35, 0xcc, 0x19, 0x10, 0x6d, 0x4e, 0xce, 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, 0xa5, 0x99, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, + 0x97, 0x9c, 0x9f, 0x0b, 0x0a, 0x10, 0x5d, 0xe4, 0xc0, 0xa9, 0x80, 0x05, 0x4f, 0x49, 0x65, 0x41, + 0x6a, 0x71, 0x12, 0x1b, 0x38, 0x7c, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x85, 0xde, 0x12, + 0x51, 0xde, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/market/types/market.pb.go b/x/market/types/market.pb.go index a1df2459..ffad7af2 100644 --- a/x/market/types/market.pb.go +++ b/x/market/types/market.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/market/market.proto +// source: sgenetwork/sge/market/market.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -64,7 +64,7 @@ func (x MarketStatus) String() string { } func (MarketStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_935a8ad1d6bee065, []int{0} + return fileDescriptor_14e36a254c493254, []int{0} } // Market is the representation of the market to be stored in @@ -96,7 +96,7 @@ func (m *Market) Reset() { *m = Market{} } func (m *Market) String() string { return proto.CompactTextString(m) } func (*Market) ProtoMessage() {} func (*Market) Descriptor() ([]byte, []int) { - return fileDescriptor_935a8ad1d6bee065, []int{0} + return fileDescriptor_14e36a254c493254, []int{0} } func (m *Market) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -200,43 +200,46 @@ func init() { proto.RegisterType((*Market)(nil), "sgenetwork.sge.market.Market") } -func init() { proto.RegisterFile("sge/market/market.proto", fileDescriptor_935a8ad1d6bee065) } +func init() { + proto.RegisterFile("sgenetwork/sge/market/market.proto", fileDescriptor_14e36a254c493254) +} -var fileDescriptor_935a8ad1d6bee065 = []byte{ - // 528 bytes of a gzipped FileDescriptorProto +var fileDescriptor_14e36a254c493254 = []byte{ + // 529 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0x41, 0x6f, 0xd3, 0x30, - 0x18, 0x86, 0x9b, 0xa5, 0x6b, 0x57, 0x33, 0xaa, 0xc8, 0xac, 0x2c, 0x2b, 0x5a, 0x92, 0x81, 0x84, + 0x14, 0xc7, 0x9b, 0xa5, 0x6b, 0x57, 0x33, 0xaa, 0xc8, 0x6c, 0x90, 0x15, 0x2d, 0xc9, 0x86, 0x84, 0x0a, 0x88, 0x54, 0xda, 0x8e, 0x9c, 0x9a, 0xc4, 0xa0, 0x88, 0xae, 0x43, 0x4e, 0x0a, 0x12, 0x97, - 0xa8, 0x5d, 0xac, 0x50, 0x95, 0xc6, 0x53, 0xec, 0x6a, 0xf0, 0x2f, 0xf8, 0x43, 0xdc, 0x39, 0xee, - 0xc8, 0x29, 0x42, 0xe9, 0xad, 0x3f, 0x81, 0x13, 0xb2, 0x9b, 0x55, 0x2b, 0x85, 0x4b, 0xfc, 0xf9, - 0x7b, 0xde, 0xcf, 0xf2, 0x9b, 0x57, 0x06, 0x87, 0x2c, 0x21, 0xdd, 0xd9, 0x28, 0x9b, 0x12, 0x5e, - 0x2e, 0xf6, 0x55, 0x46, 0x39, 0x85, 0x2d, 0x96, 0x90, 0x94, 0xf0, 0x6b, 0x9a, 0x4d, 0x6d, 0x96, - 0x10, 0x7b, 0x05, 0xdb, 0x07, 0x09, 0x4d, 0xa8, 0x54, 0x74, 0x45, 0xb5, 0x12, 0xb7, 0x5b, 0x77, - 0x4e, 0xa1, 0x71, 0xcc, 0x56, 0xed, 0xc7, 0xbf, 0x55, 0x50, 0x3b, 0x97, 0x5d, 0x68, 0x01, 0x75, - 0x3e, 0x89, 0x75, 0xc5, 0x52, 0x3a, 0x0d, 0xa7, 0x59, 0xe4, 0xa6, 0x3a, 0xf4, 0xbd, 0x65, 0x6e, - 0x8a, 0x2e, 0x16, 0x1f, 0x78, 0x06, 0xf6, 0x18, 0x1f, 0x65, 0x3c, 0xe2, 0x4c, 0xdf, 0xb1, 0x94, - 0x4e, 0xd5, 0x39, 0x2c, 0x72, 0xb3, 0x1e, 0x88, 0x5e, 0x18, 0x2c, 0x73, 0x73, 0x8d, 0xf1, 0xba, - 0x82, 0x2f, 0x40, 0x8d, 0xa4, 0xb1, 0x18, 0x51, 0xe5, 0xc8, 0x83, 0x22, 0x37, 0x77, 0x51, 0x1a, - 0xcb, 0x81, 0x12, 0xe1, 0x72, 0x85, 0x5d, 0x50, 0x15, 0x97, 0xd3, 0xab, 0x96, 0xda, 0xb9, 0x77, - 0xfa, 0xc8, 0xfe, 0xa7, 0x43, 0xfb, 0x22, 0x8e, 0x19, 0x96, 0x42, 0x88, 0x81, 0x76, 0x3d, 0x49, - 0x53, 0x92, 0x45, 0x62, 0x1b, 0xcd, 0x27, 0x31, 0xd3, 0x77, 0x2d, 0xb5, 0xd3, 0x70, 0x9e, 0x16, - 0xb9, 0xd9, 0xfc, 0x20, 0x99, 0xd0, 0x0f, 0x7d, 0x8f, 0x2d, 0x73, 0x73, 0x4b, 0x8d, 0xb7, 0x3a, - 0xf0, 0x15, 0xa8, 0x31, 0x3e, 0xe2, 0x73, 0xa6, 0xd7, 0x2c, 0xa5, 0xd3, 0x3c, 0x7d, 0xf2, 0x9f, - 0x6b, 0xac, 0xfe, 0x5b, 0x20, 0xa5, 0xb8, 0x1c, 0x81, 0x6f, 0xc0, 0xfd, 0x8c, 0x30, 0xfa, 0x79, - 0xce, 0x27, 0x34, 0x15, 0xae, 0xeb, 0xd2, 0xf5, 0x49, 0x91, 0x9b, 0xfb, 0x78, 0x0d, 0xa4, 0xf9, - 0x4d, 0x21, 0xde, 0xdc, 0x42, 0x1d, 0xd4, 0x2f, 0x33, 0x32, 0xe2, 0x34, 0xd3, 0xf7, 0x44, 0x24, - 0xf8, 0x76, 0x0b, 0x21, 0xa8, 0xce, 0x08, 0x1f, 0xe9, 0x0d, 0xd9, 0x96, 0xb5, 0x88, 0x66, 0x4c, - 0xe9, 0x54, 0x18, 0xd0, 0x81, 0x4c, 0x50, 0x46, 0xe3, 0x50, 0x3a, 0x5d, 0xa5, 0xb8, 0xc6, 0x78, - 0x5d, 0x3d, 0xff, 0xae, 0x80, 0xfd, 0xbb, 0x26, 0xe0, 0x31, 0x38, 0x3a, 0xef, 0xe1, 0xb7, 0x28, - 0x8c, 0x82, 0xb0, 0x17, 0x0e, 0x83, 0x68, 0x38, 0x08, 0xde, 0x21, 0xd7, 0x7f, 0xed, 0x23, 0x4f, - 0xab, 0x40, 0x1d, 0x1c, 0x6c, 0xe2, 0x9e, 0x1b, 0xfa, 0xef, 0x91, 0xa6, 0xc0, 0x36, 0x78, 0xb8, - 0x49, 0xfc, 0x41, 0xc9, 0x76, 0xb6, 0x99, 0xdb, 0x1b, 0xb8, 0xa8, 0x8f, 0x3c, 0x4d, 0x85, 0x47, - 0xa0, 0xf5, 0xd7, 0x89, 0xce, 0x05, 0x0e, 0x91, 0xa7, 0x55, 0xe1, 0x09, 0x38, 0xde, 0x44, 0x18, - 0x05, 0xc3, 0x7e, 0x18, 0x79, 0xc8, 0xed, 0xf7, 0x30, 0xf2, 0xb4, 0x5d, 0xc7, 0xfd, 0x51, 0x18, - 0xca, 0x4d, 0x61, 0x28, 0xbf, 0x0a, 0x43, 0xf9, 0xb6, 0x30, 0x2a, 0x37, 0x0b, 0xa3, 0xf2, 0x73, - 0x61, 0x54, 0x3e, 0x3e, 0x4b, 0x26, 0xfc, 0xd3, 0x7c, 0x6c, 0x5f, 0xd2, 0x59, 0x97, 0x25, 0xe4, - 0x65, 0x99, 0x9e, 0xa8, 0xbb, 0x5f, 0x6e, 0x9f, 0x01, 0xff, 0x7a, 0x45, 0xd8, 0xb8, 0x26, 0x1f, - 0xc2, 0xd9, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6e, 0x72, 0x74, 0xdd, 0x67, 0x03, 0x00, 0x00, + 0xa8, 0x5d, 0xac, 0x50, 0x95, 0xc6, 0x53, 0xec, 0x6a, 0xf0, 0x2d, 0xf8, 0x42, 0xdc, 0x39, 0xee, + 0xc8, 0x29, 0x42, 0xe9, 0xad, 0x1f, 0x81, 0x13, 0xb2, 0xdb, 0x95, 0x85, 0x8e, 0x4b, 0xfd, 0xde, + 0xfb, 0xfd, 0x9f, 0xe5, 0x7f, 0x5f, 0x1e, 0x38, 0x66, 0x09, 0x49, 0x09, 0xbf, 0xa2, 0xd9, 0xa4, + 0xc3, 0x12, 0xd2, 0x99, 0x0e, 0xb3, 0x09, 0xe1, 0xab, 0xc3, 0xbe, 0xcc, 0x28, 0xa7, 0x70, 0xff, + 0xaf, 0xc6, 0x66, 0x09, 0xb1, 0x97, 0xb0, 0xb5, 0x97, 0xd0, 0x84, 0x4a, 0x45, 0x47, 0x44, 0x4b, + 0x71, 0xcb, 0xba, 0xfb, 0x42, 0x1a, 0xc7, 0x6c, 0xa9, 0x38, 0xfe, 0xad, 0x82, 0xda, 0x99, 0xac, + 0x42, 0x0b, 0xa8, 0xb3, 0x71, 0xac, 0x2b, 0x96, 0xd2, 0x6e, 0x38, 0xcd, 0x22, 0x37, 0xd5, 0x81, + 0xef, 0x2d, 0x72, 0x53, 0x54, 0xb1, 0xf8, 0x81, 0xa7, 0x60, 0x87, 0xf1, 0x61, 0xc6, 0x23, 0xce, + 0xf4, 0x2d, 0x4b, 0x69, 0x57, 0x9d, 0x47, 0x45, 0x6e, 0xd6, 0x03, 0x51, 0x0b, 0x83, 0x45, 0x6e, + 0xae, 0x31, 0x5e, 0x47, 0xf0, 0x05, 0xa8, 0x91, 0x34, 0x16, 0x2d, 0xaa, 0x6c, 0x79, 0x50, 0xe4, + 0xe6, 0x36, 0x4a, 0x63, 0xd9, 0xb0, 0x42, 0x78, 0x75, 0xc2, 0x0e, 0xa8, 0x8a, 0xc7, 0xe9, 0x55, + 0x4b, 0x6d, 0xdf, 0x3b, 0x79, 0x6c, 0xdf, 0x69, 0xd6, 0x3e, 0x8f, 0x63, 0x86, 0xa5, 0x10, 0x62, + 0xa0, 0x5d, 0x8d, 0xd3, 0x94, 0x64, 0x91, 0x48, 0xa3, 0xd9, 0x38, 0x66, 0xfa, 0xb6, 0xa5, 0xb6, + 0x1b, 0xce, 0xd3, 0x22, 0x37, 0x9b, 0x1f, 0x24, 0x13, 0xfa, 0x81, 0xef, 0xb1, 0x45, 0x6e, 0x6e, + 0xa8, 0xf1, 0x46, 0x05, 0xbe, 0x02, 0x35, 0xc6, 0x87, 0x7c, 0xc6, 0xf4, 0x9a, 0xa5, 0xb4, 0x9b, + 0x27, 0x4f, 0xfe, 0xf3, 0x8c, 0xe5, 0xff, 0x16, 0x48, 0x29, 0x5e, 0xb5, 0xc0, 0x37, 0xe0, 0x7e, + 0x46, 0x18, 0xfd, 0x3c, 0xe3, 0x63, 0x9a, 0x0a, 0xd7, 0x75, 0xe9, 0xfa, 0xa8, 0xc8, 0xcd, 0x5d, + 0xbc, 0x06, 0xd2, 0x7c, 0x59, 0x88, 0xcb, 0x29, 0xd4, 0x41, 0xfd, 0x22, 0x23, 0x43, 0x4e, 0x33, + 0x7d, 0x47, 0x8c, 0x04, 0xdf, 0xa4, 0x10, 0x82, 0xea, 0x94, 0xf0, 0xa1, 0xde, 0x90, 0x65, 0x19, + 0x8b, 0xd1, 0x8c, 0x28, 0x9d, 0x08, 0x03, 0x3a, 0x90, 0x13, 0x94, 0xa3, 0x71, 0x28, 0x9d, 0x2c, + 0xa7, 0xb8, 0xc6, 0x78, 0x1d, 0x3d, 0xff, 0xae, 0x80, 0xdd, 0xdb, 0x26, 0xe0, 0x21, 0x38, 0x38, + 0xeb, 0xe2, 0xb7, 0x28, 0x8c, 0x82, 0xb0, 0x1b, 0x0e, 0x82, 0x68, 0xd0, 0x0f, 0xde, 0x21, 0xd7, + 0x7f, 0xed, 0x23, 0x4f, 0xab, 0x40, 0x1d, 0xec, 0x95, 0x71, 0xd7, 0x0d, 0xfd, 0xf7, 0x48, 0x53, + 0x60, 0x0b, 0x3c, 0x2c, 0x13, 0xbf, 0xbf, 0x62, 0x5b, 0x9b, 0xcc, 0xed, 0xf6, 0x5d, 0xd4, 0x43, + 0x9e, 0xa6, 0xc2, 0x03, 0xb0, 0xff, 0xcf, 0x8d, 0xce, 0x39, 0x0e, 0x91, 0xa7, 0x55, 0xe1, 0x11, + 0x38, 0x2c, 0x23, 0x8c, 0x82, 0x41, 0x2f, 0x8c, 0x3c, 0xe4, 0xf6, 0xba, 0x18, 0x79, 0xda, 0xb6, + 0xe3, 0xfe, 0x28, 0x0c, 0xe5, 0xba, 0x30, 0x94, 0x5f, 0x85, 0xa1, 0x7c, 0x9b, 0x1b, 0x95, 0xeb, + 0xb9, 0x51, 0xf9, 0x39, 0x37, 0x2a, 0x1f, 0x9f, 0x25, 0x63, 0xfe, 0x69, 0x36, 0xb2, 0x2f, 0xe8, + 0x54, 0x7c, 0xf8, 0x2f, 0x6f, 0x2f, 0xc1, 0x97, 0x9b, 0x35, 0xe0, 0x5f, 0x2f, 0x09, 0x1b, 0xd5, + 0xe4, 0x22, 0x9c, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xa0, 0x17, 0x1a, 0x7d, 0x03, 0x00, + 0x00, } func (m *Market) Marshal() (dAtA []byte, err error) { diff --git a/x/market/types/odds.pb.go b/x/market/types/odds.pb.go index 13713231..abddb199 100644 --- a/x/market/types/odds.pb.go +++ b/x/market/types/odds.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/market/odds.proto +// source: sgenetwork/sge/market/odds.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -35,7 +35,7 @@ func (m *Odds) Reset() { *m = Odds{} } func (m *Odds) String() string { return proto.CompactTextString(m) } func (*Odds) ProtoMessage() {} func (*Odds) Descriptor() ([]byte, []int) { - return fileDescriptor_cf7f1000ed50889d, []int{0} + return fileDescriptor_3606fe4744ae3444, []int{0} } func (m *Odds) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -82,22 +82,23 @@ func init() { proto.RegisterType((*Odds)(nil), "sgenetwork.sge.market.Odds") } -func init() { proto.RegisterFile("sge/market/odds.proto", fileDescriptor_cf7f1000ed50889d) } +func init() { proto.RegisterFile("sgenetwork/sge/market/odds.proto", fileDescriptor_3606fe4744ae3444) } -var fileDescriptor_cf7f1000ed50889d = []byte{ - // 192 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x4e, 0x4f, 0xd5, - 0xcf, 0x4d, 0x2c, 0xca, 0x4e, 0x2d, 0xd1, 0xcf, 0x4f, 0x49, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, - 0xc9, 0x17, 0x02, 0x09, 0xe7, 0xa5, 0x96, 0x94, 0xe7, 0x17, 0x65, 0xeb, 0x15, 0xa7, 0xa7, 0xea, - 0x41, 0x54, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x55, 0xe8, 0x83, 0x58, 0x10, 0xc5, 0x4a, - 0x36, 0x5c, 0x2c, 0xfe, 0x29, 0x29, 0xc5, 0x42, 0x0a, 0x5c, 0xcc, 0xa5, 0x99, 0x29, 0x12, 0x8c, - 0x0a, 0x8c, 0x1a, 0x9c, 0x4e, 0x7c, 0x8f, 0xee, 0xc9, 0x33, 0x87, 0x7a, 0xba, 0xbc, 0xba, 0x27, - 0x0f, 0x12, 0x0d, 0x02, 0x11, 0x42, 0x42, 0x5c, 0x2c, 0xb9, 0xa9, 0x25, 0x89, 0x12, 0x4c, 0x20, - 0x25, 0x41, 0x60, 0xb6, 0x93, 0xf3, 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, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x17, 0xa7, 0xa7, 0xea, - 0x42, 0x1d, 0x04, 0x62, 0xeb, 0x57, 0xc0, 0x1c, 0x5d, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, - 0x76, 0x89, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xe3, 0x61, 0x97, 0xcf, 0x00, 0x00, 0x00, +var fileDescriptor_3606fe4744ae3444 = []byte{ + // 193 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x4d, 0x2c, 0xca, 0x4e, + 0x2d, 0xd1, 0xcf, 0x4f, 0x49, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x45, 0xa8, + 0xd0, 0x2b, 0x4e, 0x4f, 0xd5, 0x83, 0xa8, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd0, + 0x07, 0xb1, 0x20, 0x8a, 0x95, 0x6c, 0xb8, 0x58, 0xfc, 0x53, 0x52, 0x8a, 0x85, 0x14, 0xb8, 0x98, + 0x4b, 0x33, 0x53, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0xf8, 0x1e, 0xdd, 0x93, 0x67, 0x0e, + 0xf5, 0x74, 0x79, 0x75, 0x4f, 0x1e, 0x24, 0x1a, 0x04, 0x22, 0x84, 0x84, 0xb8, 0x58, 0x72, 0x53, + 0x4b, 0x12, 0x25, 0x98, 0x40, 0x4a, 0x82, 0xc0, 0x6c, 0x27, 0xe7, 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, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, + 0x05, 0x39, 0x53, 0x17, 0xd9, 0xc9, 0x15, 0x30, 0x47, 0x97, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, + 0x81, 0x5d, 0x62, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xc3, 0x95, 0x51, 0xda, 0x00, 0x00, + 0x00, } func (m *Odds) Marshal() (dAtA []byte, err error) { diff --git a/x/market/types/params.pb.go b/x/market/types/params.pb.go index b8afdd91..c597c27a 100644 --- a/x/market/types/params.pb.go +++ b/x/market/types/params.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/market/params.proto +// source: sgenetwork/sge/market/params.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + 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_e166b9eeb42fd7f6, []int{0} + return fileDescriptor_30c8b635732b997c, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -64,20 +64,22 @@ func init() { proto.RegisterType((*Params)(nil), "sgenetwork.sge.market.Params") } -func init() { proto.RegisterFile("sge/market/params.proto", fileDescriptor_e166b9eeb42fd7f6) } +func init() { + proto.RegisterFile("sgenetwork/sge/market/params.proto", fileDescriptor_30c8b635732b997c) +} -var fileDescriptor_e166b9eeb42fd7f6 = []byte{ - // 157 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x4e, 0x4f, 0xd5, - 0xcf, 0x4d, 0x2c, 0xca, 0x4e, 0x2d, 0xd1, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2d, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, - 0x2b, 0x4e, 0x4f, 0xd5, 0x83, 0xa8, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd0, 0x07, - 0xb1, 0x20, 0x8a, 0x95, 0xf8, 0xb8, 0xd8, 0x02, 0xc0, 0x9a, 0xad, 0x58, 0x66, 0x2c, 0x90, 0x67, - 0x70, 0x72, 0x3e, 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, 0xcd, 0xf4, 0xcc, - 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0xe2, 0xf4, 0x54, 0x5d, 0xa8, 0x15, 0x20, - 0xb6, 0x7e, 0x05, 0xcc, 0x21, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0xb3, 0x8d, 0x01, - 0x01, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xaa, 0x61, 0xb6, 0xa3, 0x00, 0x00, 0x00, +var fileDescriptor_30c8b635732b997c = []byte{ + // 155 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2a, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x4d, 0x2c, 0xca, 0x4e, + 0x2d, 0xd1, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, + 0x45, 0xa8, 0xd1, 0x2b, 0x4e, 0x4f, 0xd5, 0x83, 0xa8, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, + 0xab, 0xd0, 0x07, 0xb1, 0x20, 0x8a, 0x95, 0xf8, 0xb8, 0xd8, 0x02, 0xc0, 0x9a, 0xad, 0x58, 0x66, + 0x2c, 0x90, 0x67, 0x70, 0x72, 0x3e, 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, + 0xcd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x90, 0xd5, 0xba, 0xc8, 0xce, + 0xa8, 0x80, 0x39, 0xa4, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x6c, 0xb6, 0x31, 0x20, 0x00, + 0x00, 0xff, 0xff, 0xa3, 0xb3, 0x9c, 0x25, 0xae, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/market/types/query.pb.go b/x/market/types/query.pb.go index 9e954c53..fbc6e11b 100644 --- a/x/market/types/query.pb.go +++ b/x/market/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/market/query.proto +// source: sgenetwork/sge/market/query.proto package types @@ -8,8 +8,8 @@ import ( fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + 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" @@ -39,7 +39,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_a0102cd07774feff, []int{0} + return fileDescriptor_bfd151c101859bd3, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -79,7 +79,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_a0102cd07774feff, []int{1} + return fileDescriptor_bfd151c101859bd3, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -125,7 +125,7 @@ func (m *QueryMarketRequest) Reset() { *m = QueryMarketRequest{} } func (m *QueryMarketRequest) String() string { return proto.CompactTextString(m) } func (*QueryMarketRequest) ProtoMessage() {} func (*QueryMarketRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a0102cd07774feff, []int{2} + return fileDescriptor_bfd151c101859bd3, []int{2} } func (m *QueryMarketRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -171,7 +171,7 @@ func (m *QueryMarketResponse) Reset() { *m = QueryMarketResponse{} } func (m *QueryMarketResponse) String() string { return proto.CompactTextString(m) } func (*QueryMarketResponse) ProtoMessage() {} func (*QueryMarketResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a0102cd07774feff, []int{3} + return fileDescriptor_bfd151c101859bd3, []int{3} } func (m *QueryMarketResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -218,7 +218,7 @@ func (m *QueryMarketsRequest) Reset() { *m = QueryMarketsRequest{} } func (m *QueryMarketsRequest) String() string { return proto.CompactTextString(m) } func (*QueryMarketsRequest) ProtoMessage() {} func (*QueryMarketsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a0102cd07774feff, []int{4} + return fileDescriptor_bfd151c101859bd3, []int{4} } func (m *QueryMarketsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -266,7 +266,7 @@ func (m *QueryMarketsResponse) Reset() { *m = QueryMarketsResponse{} } func (m *QueryMarketsResponse) String() string { return proto.CompactTextString(m) } func (*QueryMarketsResponse) ProtoMessage() {} func (*QueryMarketsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a0102cd07774feff, []int{5} + return fileDescriptor_bfd151c101859bd3, []int{5} } func (m *QueryMarketsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -319,7 +319,7 @@ func (m *QueryMarketsByUIDsRequest) Reset() { *m = QueryMarketsByUIDsReq func (m *QueryMarketsByUIDsRequest) String() string { return proto.CompactTextString(m) } func (*QueryMarketsByUIDsRequest) ProtoMessage() {} func (*QueryMarketsByUIDsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a0102cd07774feff, []int{6} + return fileDescriptor_bfd151c101859bd3, []int{6} } func (m *QueryMarketsByUIDsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -366,7 +366,7 @@ func (m *QueryMarketsByUIDsResponse) Reset() { *m = QueryMarketsByUIDsRe func (m *QueryMarketsByUIDsResponse) String() string { return proto.CompactTextString(m) } func (*QueryMarketsByUIDsResponse) ProtoMessage() {} func (*QueryMarketsByUIDsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a0102cd07774feff, []int{7} + return fileDescriptor_bfd151c101859bd3, []int{7} } func (m *QueryMarketsByUIDsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -420,47 +420,47 @@ func init() { proto.RegisterType((*QueryMarketsByUIDsResponse)(nil), "sgenetwork.sge.market.QueryMarketsByUIDsResponse") } -func init() { proto.RegisterFile("sge/market/query.proto", fileDescriptor_a0102cd07774feff) } - -var fileDescriptor_a0102cd07774feff = []byte{ - // 579 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x41, 0x6b, 0x13, 0x41, - 0x14, 0xc7, 0xb3, 0x6d, 0x4c, 0xed, 0x48, 0x45, 0x5f, 0x52, 0xb5, 0x6b, 0xdd, 0xca, 0xa2, 0xd5, - 0x46, 0x9c, 0x31, 0xf5, 0x24, 0xe2, 0x25, 0x8a, 0xe2, 0x41, 0xa8, 0x0b, 0x5e, 0x04, 0x09, 0x93, - 0x66, 0x1c, 0x97, 0x36, 0x3b, 0xdb, 0x9d, 0x5d, 0x35, 0x96, 0x22, 0xf4, 0x13, 0x08, 0x5e, 0x3d, - 0x78, 0xf0, 0xc3, 0xf4, 0x58, 0xf0, 0xe2, 0xa9, 0x48, 0xe2, 0xc9, 0x4f, 0x21, 0x3b, 0x33, 0x9b, - 0x66, 0xc9, 0xda, 0x26, 0x97, 0x76, 0x33, 0xf3, 0x7f, 0xff, 0xff, 0xef, 0xbd, 0xbc, 0x2c, 0xba, - 0x24, 0x39, 0x23, 0x5d, 0x1a, 0x6d, 0xb1, 0x98, 0xec, 0x24, 0x2c, 0xea, 0xe1, 0x30, 0x12, 0xb1, - 0x80, 0x45, 0xc9, 0x59, 0xc0, 0xe2, 0x0f, 0x22, 0xda, 0xc2, 0x92, 0x33, 0xac, 0x25, 0x76, 0x8d, - 0x0b, 0x2e, 0x94, 0x82, 0xa4, 0x4f, 0x5a, 0x6c, 0x2f, 0x73, 0x21, 0xf8, 0x36, 0x23, 0x34, 0xf4, - 0x09, 0x0d, 0x02, 0x11, 0xd3, 0xd8, 0x17, 0x81, 0x34, 0xb7, 0xf5, 0x4d, 0x21, 0xbb, 0x42, 0x92, - 0x36, 0x95, 0x4c, 0x67, 0x90, 0xf7, 0x8d, 0x36, 0x8b, 0x69, 0x83, 0x84, 0x94, 0xfb, 0x81, 0x12, - 0x1b, 0xed, 0xe5, 0x11, 0x9c, 0x90, 0x46, 0xb4, 0x2b, 0x0b, 0x2e, 0xf4, 0x3f, 0x7d, 0xe1, 0xd6, - 0x10, 0xbc, 0x4c, 0x3d, 0x37, 0x94, 0xda, 0x63, 0x3b, 0x09, 0x93, 0xb1, 0xeb, 0xa1, 0x6a, 0xee, - 0x54, 0x86, 0x22, 0x90, 0x0c, 0x1e, 0xa2, 0x8a, 0x76, 0xbd, 0x62, 0x5d, 0xb7, 0x6e, 0x9f, 0x5b, - 0xbf, 0x86, 0x0b, 0xdb, 0xc4, 0xba, 0xac, 0x59, 0x3e, 0x38, 0x5a, 0x29, 0x79, 0xa6, 0xc4, 0x5d, - 0x35, 0x49, 0x2f, 0x94, 0xc6, 0x24, 0xc1, 0x05, 0x34, 0x9b, 0xf8, 0x1d, 0xe5, 0x37, 0xef, 0xa5, - 0x8f, 0xc3, 0xec, 0x4c, 0x77, 0x9c, 0xad, 0xdd, 0x4f, 0xc9, 0xd6, 0x65, 0x59, 0xb6, 0x3e, 0x74, - 0xdf, 0xe4, 0x3c, 0xb3, 0x36, 0xe1, 0x29, 0x42, 0xc7, 0x23, 0x34, 0xbe, 0xab, 0x58, 0xcf, 0x1b, - 0xa7, 0xf3, 0xc6, 0xfa, 0x3b, 0x35, 0xf3, 0xc6, 0x1b, 0x94, 0x33, 0x53, 0xeb, 0x8d, 0x54, 0xba, - 0xdf, 0x2c, 0x54, 0xcb, 0xfb, 0x17, 0x40, 0xcf, 0x4e, 0x09, 0x0d, 0xcf, 0x72, 0x74, 0x33, 0x8a, - 0xee, 0xd6, 0xa9, 0x74, 0x3a, 0x39, 0x87, 0xf7, 0x00, 0x2d, 0x8d, 0xd2, 0x35, 0x7b, 0xaf, 0x9e, - 0x3f, 0x19, 0xce, 0x60, 0x19, 0x95, 0x13, 0xbf, 0x23, 0x15, 0xe0, 0x7c, 0xf3, 0xec, 0xdf, 0xa3, - 0x15, 0xf5, 0xd9, 0x53, 0x7f, 0xdd, 0x7d, 0x0b, 0xd9, 0x45, 0xb5, 0xa6, 0xbf, 0x47, 0x68, 0x4e, - 0xc3, 0xca, 0x69, 0x1a, 0xcc, 0x6a, 0xe0, 0x26, 0x3a, 0xff, 0x96, 0xfa, 0xdb, 0xac, 0xd3, 0xca, - 0x5c, 0x66, 0x52, 0x0a, 0x6f, 0x41, 0x9f, 0x9a, 0xcc, 0xf5, 0x1f, 0x65, 0x74, 0x46, 0x41, 0xc0, - 0x2e, 0xaa, 0xe8, 0xdd, 0x82, 0xb5, 0xff, 0x04, 0x8d, 0x2f, 0xb3, 0x5d, 0x9f, 0x44, 0xaa, 0x1b, - 0x72, 0xed, 0xfd, 0x9f, 0x7f, 0xbe, 0xce, 0xd4, 0x00, 0xc8, 0xd8, 0x2f, 0x09, 0x3e, 0xa1, 0x8a, - 0x26, 0x3a, 0x39, 0x3c, 0xb7, 0xdf, 0x27, 0x87, 0xe7, 0x57, 0xdc, 0x5d, 0x52, 0xe1, 0x55, 0xb8, - 0x38, 0x1a, 0xbe, 0x9b, 0xf8, 0x9d, 0x3d, 0xf8, 0x8c, 0xe6, 0xcc, 0x34, 0x60, 0x02, 0xc7, 0x61, - 0xeb, 0x77, 0x26, 0xd2, 0x9a, 0xf8, 0xab, 0x2a, 0x7e, 0x11, 0xaa, 0x64, 0xec, 0x65, 0x21, 0xe1, - 0xbb, 0x85, 0x16, 0x72, 0x3b, 0x00, 0xf7, 0x26, 0xf0, 0xce, 0xad, 0x9a, 0xdd, 0x98, 0xa2, 0xc2, - 0x30, 0xd5, 0x15, 0xd3, 0x0d, 0x70, 0x0b, 0x98, 0x5a, 0xed, 0x5e, 0x2b, 0x5d, 0x52, 0x35, 0x22, - 0xb9, 0xd7, 0x7c, 0x7c, 0xd0, 0x77, 0xac, 0xc3, 0xbe, 0x63, 0xfd, 0xee, 0x3b, 0xd6, 0x97, 0x81, - 0x53, 0x3a, 0x1c, 0x38, 0xa5, 0x5f, 0x03, 0xa7, 0xf4, 0x7a, 0x8d, 0xfb, 0xf1, 0xbb, 0xa4, 0x8d, - 0x37, 0x45, 0x37, 0xf5, 0xb9, 0x6b, 0x18, 0x94, 0xe7, 0xc7, 0xcc, 0x35, 0xee, 0x85, 0x4c, 0xb6, - 0x2b, 0xea, 0xb5, 0x78, 0xff, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xba, 0x42, 0xd2, 0xd9, - 0x05, 0x00, 0x00, +func init() { proto.RegisterFile("sgenetwork/sge/market/query.proto", fileDescriptor_bfd151c101859bd3) } + +var fileDescriptor_bfd151c101859bd3 = []byte{ + // 580 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x41, 0x6b, 0x13, 0x4f, + 0x18, 0xc6, 0xb3, 0x69, 0xfe, 0xe9, 0xbf, 0x23, 0x15, 0x7d, 0x93, 0x82, 0x5d, 0xeb, 0x56, 0x07, + 0xad, 0x36, 0xe2, 0xac, 0xa9, 0x27, 0x11, 0x2f, 0x51, 0x14, 0x0f, 0x42, 0x5d, 0xf0, 0x22, 0x48, + 0x98, 0x34, 0xe3, 0xb8, 0xb4, 0xd9, 0xd9, 0x66, 0x76, 0xd5, 0x58, 0x8a, 0xd0, 0x4f, 0x20, 0x78, + 0xf5, 0xe0, 0xc1, 0x0f, 0xd3, 0x63, 0xc1, 0x8b, 0xa7, 0x22, 0x89, 0x27, 0x3f, 0x85, 0xec, 0xcc, + 0x6c, 0x92, 0x25, 0x6b, 0x9a, 0x5c, 0x92, 0xcd, 0xe4, 0x79, 0x9f, 0xdf, 0xf3, 0xce, 0xbc, 0x3b, + 0xe8, 0x9a, 0xe4, 0x2c, 0x60, 0xd1, 0x7b, 0xd1, 0xdd, 0x75, 0x25, 0x67, 0x6e, 0x87, 0x76, 0x77, + 0x59, 0xe4, 0xee, 0xc7, 0xac, 0xdb, 0x23, 0x61, 0x57, 0x44, 0x02, 0x56, 0x46, 0x12, 0x22, 0x39, + 0x23, 0x5a, 0x62, 0x57, 0xb9, 0xe0, 0x42, 0x29, 0xdc, 0xe4, 0x49, 0x8b, 0xed, 0x35, 0x2e, 0x04, + 0xdf, 0x63, 0x2e, 0x0d, 0x7d, 0x97, 0x06, 0x81, 0x88, 0x68, 0xe4, 0x8b, 0x40, 0x9a, 0x7f, 0x6b, + 0x3b, 0x42, 0x76, 0x84, 0x74, 0x5b, 0x54, 0x32, 0xcd, 0x70, 0xdf, 0xd5, 0x5b, 0x2c, 0xa2, 0x75, + 0x37, 0xa4, 0xdc, 0x0f, 0x94, 0xd8, 0x68, 0x71, 0x7e, 0xb2, 0x90, 0x76, 0x69, 0x47, 0x4e, 0xd7, + 0xe8, 0x2f, 0xad, 0xc1, 0x55, 0x04, 0x2f, 0x12, 0xd2, 0xb6, 0x2a, 0xf4, 0xd8, 0x7e, 0xcc, 0x64, + 0x84, 0x3d, 0x54, 0xc9, 0xac, 0xca, 0x50, 0x04, 0x92, 0xc1, 0x03, 0x54, 0xd6, 0x80, 0x4b, 0xd6, + 0x55, 0xeb, 0xd6, 0xb9, 0xad, 0x2b, 0x24, 0xb7, 0x79, 0xa2, 0xcb, 0x1a, 0xa5, 0xe3, 0xd3, 0xf5, + 0x82, 0x67, 0x4a, 0xf0, 0x86, 0x21, 0x3d, 0x57, 0x1a, 0x43, 0x82, 0x0b, 0x68, 0x21, 0xf6, 0xdb, + 0xca, 0x6f, 0xc9, 0x4b, 0x1e, 0x87, 0xec, 0x54, 0x37, 0x62, 0x6b, 0xf7, 0x33, 0xd8, 0xba, 0x2c, + 0x65, 0xeb, 0x45, 0xfc, 0x3a, 0xe3, 0x99, 0xb6, 0x09, 0x4f, 0x10, 0x1a, 0x6d, 0xac, 0xf1, 0xdd, + 0x20, 0xfa, 0x14, 0x48, 0x72, 0x0a, 0x44, 0x9f, 0xb4, 0x39, 0x05, 0xb2, 0x4d, 0x39, 0x33, 0xb5, + 0xde, 0x58, 0x25, 0xfe, 0x6a, 0xa1, 0x6a, 0xd6, 0x3f, 0x27, 0xf4, 0xc2, 0x9c, 0xa1, 0xe1, 0x69, + 0x26, 0x5d, 0x51, 0xa5, 0xbb, 0x79, 0x66, 0x3a, 0x4d, 0xce, 0xc4, 0xbb, 0x8f, 0x56, 0xc7, 0xd3, + 0x35, 0x7a, 0x2f, 0x9f, 0x3d, 0x1e, 0xee, 0xc1, 0x1a, 0x2a, 0xc5, 0x7e, 0x5b, 0xaa, 0x80, 0x4b, + 0x8d, 0xff, 0xff, 0x9c, 0xae, 0xab, 0xdf, 0x9e, 0xfa, 0xc4, 0x47, 0x16, 0xb2, 0xf3, 0x6a, 0x4d, + 0x7f, 0x0f, 0xd1, 0xa2, 0x0e, 0x2b, 0xe7, 0x69, 0x30, 0xad, 0x81, 0x1b, 0xe8, 0xfc, 0x1b, 0xea, + 0xef, 0xb1, 0x76, 0x33, 0x75, 0x29, 0x26, 0x29, 0xbc, 0x65, 0xbd, 0x6a, 0x98, 0x5b, 0xdf, 0x4b, + 0xe8, 0x3f, 0x15, 0x02, 0x0e, 0x50, 0x59, 0xcf, 0x16, 0x6c, 0xfe, 0x03, 0x34, 0x39, 0xcc, 0x76, + 0x6d, 0x16, 0xa9, 0x6e, 0x08, 0xdb, 0x47, 0x3f, 0x7e, 0x7f, 0x29, 0x56, 0x01, 0x26, 0x5f, 0x2a, + 0xf8, 0x88, 0xca, 0x3a, 0xd1, 0x74, 0x78, 0x66, 0xbe, 0xa7, 0xc3, 0xb3, 0x23, 0x8e, 0x57, 0x15, + 0xbc, 0x02, 0x17, 0xc7, 0xe1, 0x07, 0xb1, 0xdf, 0x3e, 0x84, 0x4f, 0x68, 0xd1, 0xec, 0x06, 0xcc, + 0xe0, 0x38, 0x6c, 0xfd, 0xf6, 0x4c, 0x5a, 0x83, 0xbf, 0xac, 0xf0, 0x2b, 0x50, 0x99, 0xbc, 0x2c, + 0x24, 0x7c, 0xb3, 0xd0, 0x72, 0x66, 0x06, 0xe0, 0xee, 0x0c, 0xde, 0x99, 0x51, 0xb3, 0xeb, 0x73, + 0x54, 0x98, 0x4c, 0x35, 0x95, 0xe9, 0x3a, 0xe0, 0x9c, 0x4c, 0xcd, 0x56, 0xaf, 0x99, 0x0c, 0xa9, + 0xda, 0x22, 0x79, 0xd8, 0x78, 0x74, 0xdc, 0x77, 0xac, 0x93, 0xbe, 0x63, 0xfd, 0xea, 0x3b, 0xd6, + 0xe7, 0x81, 0x53, 0x38, 0x19, 0x38, 0x85, 0x9f, 0x03, 0xa7, 0xf0, 0x6a, 0x93, 0xfb, 0xd1, 0xdb, + 0xb8, 0x45, 0x76, 0x44, 0x27, 0xf1, 0xb9, 0x33, 0x7e, 0x29, 0x7e, 0x48, 0x5d, 0xa3, 0x5e, 0xc8, + 0x64, 0xab, 0xac, 0xae, 0xc5, 0x7b, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb3, 0x69, 0x41, 0xfc, + 0xfa, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -656,7 +656,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/market/query.proto", + Metadata: "sgenetwork/sge/market/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/market/types/query.pb.gw.go b/x/market/types/query.pb.gw.go index be2302a8..c64b2270 100644 --- a/x/market/types/query.pb.gw.go +++ b/x/market/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: sge/market/query.proto +// source: sgenetwork/sge/market/query.proto /* Package types is a reverse proxy. diff --git a/x/market/types/stats.pb.go b/x/market/types/stats.pb.go index 09dbfefe..ef9b35f2 100644 --- a/x/market/types/stats.pb.go +++ b/x/market/types/stats.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/market/stats.proto +// source: sgenetwork/sge/market/stats.proto package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -33,7 +33,7 @@ func (m *MarketStats) Reset() { *m = MarketStats{} } func (m *MarketStats) String() string { return proto.CompactTextString(m) } func (*MarketStats) ProtoMessage() {} func (*MarketStats) Descriptor() ([]byte, []int) { - return fileDescriptor_ee763120d9ee1c76, []int{0} + return fileDescriptor_b89d96b591dbbbbd, []int{0} } func (m *MarketStats) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -73,21 +73,21 @@ func init() { proto.RegisterType((*MarketStats)(nil), "sgenetwork.sge.market.MarketStats") } -func init() { proto.RegisterFile("sge/market/stats.proto", fileDescriptor_ee763120d9ee1c76) } +func init() { proto.RegisterFile("sgenetwork/sge/market/stats.proto", fileDescriptor_b89d96b591dbbbbd) } -var fileDescriptor_ee763120d9ee1c76 = []byte{ - // 174 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2b, 0x4e, 0x4f, 0xd5, - 0xcf, 0x4d, 0x2c, 0xca, 0x4e, 0x2d, 0xd1, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0xd6, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x12, 0x2d, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, - 0x4e, 0x4f, 0xd5, 0x83, 0x28, 0x51, 0xb2, 0xe1, 0xe2, 0xf6, 0x05, 0xb3, 0x82, 0x41, 0x6a, 0x85, - 0x74, 0xb9, 0x84, 0x8a, 0x52, 0x8b, 0xf3, 0x73, 0xca, 0x52, 0x53, 0xe2, 0x4b, 0xf3, 0x8a, 0x53, - 0x4b, 0x4a, 0x72, 0x52, 0x53, 0x24, 0x18, 0x15, 0x98, 0x35, 0x38, 0x83, 0x04, 0x61, 0x32, 0xa1, - 0x30, 0x09, 0x27, 0xe7, 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, 0x4c, - 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x2f, 0x4e, 0x4f, 0xd5, 0x85, 0x5a, - 0x0d, 0x62, 0xeb, 0x57, 0xc0, 0xdc, 0x57, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, 0xa0, - 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x84, 0xfb, 0x10, 0xc3, 0xba, 0x00, 0x00, 0x00, +var fileDescriptor_b89d96b591dbbbbd = []byte{ + // 173 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x4d, 0x2c, 0xca, 0x4e, + 0x2d, 0xd1, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x45, + 0x28, 0xd1, 0x2b, 0x4e, 0x4f, 0xd5, 0x83, 0x28, 0x51, 0xb2, 0xe1, 0xe2, 0xf6, 0x05, 0xb3, 0x82, + 0x41, 0x6a, 0x85, 0x74, 0xb9, 0x84, 0x8a, 0x52, 0x8b, 0xf3, 0x73, 0xca, 0x52, 0x53, 0xe2, 0x4b, + 0xf3, 0x8a, 0x53, 0x4b, 0x4a, 0x72, 0x52, 0x53, 0x24, 0x18, 0x15, 0x98, 0x35, 0x38, 0x83, 0x04, + 0x61, 0x32, 0xa1, 0x30, 0x09, 0x27, 0xe7, 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, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0x05, 0xb9, 0x48, 0x17, + 0xd9, 0x75, 0x15, 0x30, 0xf7, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x1d, 0x68, 0x0c, + 0x08, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x0d, 0x49, 0x10, 0xc5, 0x00, 0x00, 0x00, } func (m *MarketStats) Marshal() (dAtA []byte, err error) { diff --git a/x/market/types/ticket.pb.go b/x/market/types/ticket.pb.go index 7c0e3bc1..7e1b1ccf 100644 --- a/x/market/types/ticket.pb.go +++ b/x/market/types/ticket.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/market/ticket.proto +// source: sgenetwork/sge/market/ticket.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -43,7 +43,7 @@ func (m *MarketAddTicketPayload) Reset() { *m = MarketAddTicketPayload{} func (m *MarketAddTicketPayload) String() string { return proto.CompactTextString(m) } func (*MarketAddTicketPayload) ProtoMessage() {} func (*MarketAddTicketPayload) Descriptor() ([]byte, []int) { - return fileDescriptor_1dc46cd902954700, []int{0} + return fileDescriptor_a35459e041976d97, []int{0} } func (m *MarketAddTicketPayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -130,7 +130,7 @@ func (m *MarketUpdateTicketPayload) Reset() { *m = MarketUpdateTicketPay func (m *MarketUpdateTicketPayload) String() string { return proto.CompactTextString(m) } func (*MarketUpdateTicketPayload) ProtoMessage() {} func (*MarketUpdateTicketPayload) Descriptor() ([]byte, []int) { - return fileDescriptor_1dc46cd902954700, []int{1} + return fileDescriptor_a35459e041976d97, []int{1} } func (m *MarketUpdateTicketPayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -205,7 +205,7 @@ func (m *MarketResolutionTicketPayload) Reset() { *m = MarketResolutionT func (m *MarketResolutionTicketPayload) String() string { return proto.CompactTextString(m) } func (*MarketResolutionTicketPayload) ProtoMessage() {} func (*MarketResolutionTicketPayload) Descriptor() ([]byte, []int) { - return fileDescriptor_1dc46cd902954700, []int{2} + return fileDescriptor_a35459e041976d97, []int{2} } func (m *MarketResolutionTicketPayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -268,38 +268,41 @@ func init() { proto.RegisterType((*MarketResolutionTicketPayload)(nil), "sgenetwork.sge.market.MarketResolutionTicketPayload") } -func init() { proto.RegisterFile("sge/market/ticket.proto", fileDescriptor_1dc46cd902954700) } +func init() { + proto.RegisterFile("sgenetwork/sge/market/ticket.proto", fileDescriptor_a35459e041976d97) +} -var fileDescriptor_1dc46cd902954700 = []byte{ - // 446 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x53, 0xcf, 0x6a, 0xd4, 0x40, - 0x1c, 0xde, 0xd9, 0xa4, 0xd1, 0x8e, 0xba, 0xc8, 0x68, 0x6d, 0xac, 0x98, 0x89, 0x2b, 0x48, 0x44, - 0x4c, 0xa0, 0x3d, 0x7a, 0x32, 0x56, 0xa4, 0x07, 0x51, 0x66, 0xbb, 0x08, 0x5e, 0x96, 0xb4, 0x33, - 0xc4, 0xb0, 0xdd, 0xcc, 0x92, 0x99, 0x50, 0xfb, 0x16, 0xde, 0x05, 0x9f, 0xc7, 0x63, 0x8f, 0x1e, - 0x64, 0x90, 0xd9, 0xdb, 0x3e, 0x85, 0xcc, 0x24, 0xa4, 0x5b, 0xaa, 0x87, 0xc5, 0x8b, 0x97, 0xcc, - 0x97, 0xef, 0xcf, 0x24, 0xdf, 0x6f, 0x18, 0xb8, 0x2d, 0x72, 0x96, 0xcc, 0xb2, 0x6a, 0xca, 0x64, - 0x22, 0x8b, 0xe3, 0x29, 0x93, 0xf1, 0xbc, 0xe2, 0x92, 0xa3, 0x2d, 0x91, 0xb3, 0x92, 0xc9, 0x53, - 0x5e, 0x4d, 0x63, 0x91, 0xb3, 0xb8, 0xf1, 0xec, 0xac, 0xfa, 0x9b, 0xa5, 0xf1, 0xef, 0x6c, 0xad, - 0x08, 0x9c, 0x52, 0xd1, 0xd2, 0x77, 0x73, 0x9e, 0x73, 0x0b, 0x13, 0x83, 0x1a, 0x76, 0xf8, 0xad, - 0x0f, 0xef, 0xbd, 0xb5, 0xde, 0x97, 0x94, 0x1e, 0xda, 0xcf, 0xbe, 0xcf, 0xce, 0x4e, 0x78, 0x46, - 0x51, 0x08, 0x9d, 0xba, 0xa0, 0x3e, 0x08, 0x41, 0xb4, 0x99, 0x0e, 0xb4, 0xc2, 0xce, 0xf8, 0x60, - 0x7f, 0xa9, 0xb0, 0x61, 0x89, 0x79, 0xa0, 0x3d, 0x78, 0x5d, 0xc8, 0xac, 0x92, 0x13, 0x29, 0xfc, - 0x7e, 0x08, 0x22, 0x37, 0xdd, 0xd6, 0x0a, 0x5f, 0x1b, 0x19, 0xee, 0x70, 0xb4, 0x54, 0xb8, 0x93, - 0x49, 0x87, 0xd0, 0x33, 0xe8, 0xb1, 0x92, 0x9a, 0x88, 0x63, 0x23, 0x77, 0xb4, 0xc2, 0x1b, 0xaf, - 0x4b, 0x6a, 0x03, 0xad, 0x44, 0xda, 0x15, 0x25, 0xd0, 0x35, 0x15, 0x7c, 0x37, 0x74, 0xa2, 0x1b, - 0xbb, 0x0f, 0xe2, 0x3f, 0x8e, 0x22, 0x7e, 0x47, 0xa9, 0x20, 0xd6, 0x88, 0x5e, 0x40, 0x4f, 0xc8, - 0x4c, 0xd6, 0xc2, 0xdf, 0x08, 0x41, 0x34, 0xd8, 0x7d, 0xfc, 0x97, 0x48, 0xd3, 0x79, 0x64, 0xad, - 0xa4, 0x8d, 0x20, 0x04, 0xdd, 0x19, 0x93, 0x99, 0xef, 0x99, 0xca, 0xc4, 0xe2, 0xe1, 0x4f, 0x00, - 0xef, 0x37, 0xe6, 0xf1, 0x9c, 0x66, 0x92, 0xfd, 0x7f, 0x33, 0xba, 0xa8, 0xec, 0xae, 0x5d, 0x79, - 0xf8, 0xb5, 0x0f, 0x1f, 0x36, 0x02, 0x61, 0x82, 0x9f, 0xd4, 0xb2, 0xe0, 0xe5, 0xba, 0x15, 0xdf, - 0xc0, 0x5b, 0x55, 0x17, 0xbe, 0xe8, 0xf9, 0x48, 0x2b, 0x7c, 0x73, 0x65, 0x57, 0xf3, 0xef, 0x97, - 0x8d, 0xe4, 0xf2, 0x2b, 0x22, 0xf0, 0xf6, 0x69, 0x51, 0x96, 0xac, 0x9a, 0x98, 0xb3, 0x9c, 0xd4, - 0x05, 0x35, 0x03, 0x70, 0xa2, 0xcd, 0xf4, 0x89, 0x56, 0x78, 0xf0, 0xc1, 0x6a, 0xe6, 0xb0, 0xc7, - 0x07, 0xfb, 0x62, 0xa9, 0xf0, 0x15, 0x37, 0xb9, 0xc2, 0xfc, 0xd3, 0x74, 0xd2, 0x57, 0xdf, 0x75, - 0x00, 0xce, 0x75, 0x00, 0x7e, 0xe9, 0x00, 0x7c, 0x59, 0x04, 0xbd, 0xf3, 0x45, 0xd0, 0xfb, 0xb1, - 0x08, 0x7a, 0x1f, 0x9f, 0xe6, 0x85, 0xfc, 0x54, 0x1f, 0xc5, 0xc7, 0x7c, 0x96, 0x88, 0x9c, 0x3d, - 0x6f, 0x77, 0x34, 0x38, 0xf9, 0xdc, 0x5d, 0xe3, 0xb3, 0x39, 0x13, 0x47, 0x9e, 0xbd, 0x69, 0x7b, - 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x0d, 0xd8, 0x54, 0xce, 0xe1, 0x03, 0x00, 0x00, +var fileDescriptor_a35459e041976d97 = []byte{ + // 449 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x93, 0xcf, 0x6b, 0xd4, 0x40, + 0x14, 0xc7, 0x77, 0x36, 0xe9, 0x6a, 0x47, 0x5d, 0x64, 0xfc, 0x15, 0x2b, 0x66, 0x62, 0x04, 0x89, + 0x88, 0x09, 0xb4, 0x47, 0x4f, 0xc6, 0x8a, 0xf4, 0x20, 0xca, 0x6c, 0x17, 0xc1, 0xcb, 0x92, 0x76, + 0x86, 0x18, 0xb6, 0x9b, 0x59, 0x32, 0x13, 0x6a, 0xff, 0x0b, 0xef, 0x82, 0x7f, 0x8f, 0xc7, 0x1e, + 0x3d, 0xc8, 0x20, 0xb3, 0xb7, 0xfd, 0x2b, 0x64, 0x26, 0x21, 0xdb, 0xd2, 0xf6, 0xb0, 0x78, 0xf1, + 0x92, 0x79, 0x79, 0xef, 0xf3, 0x1d, 0xe6, 0xfb, 0x1e, 0x0f, 0x86, 0x22, 0x67, 0x25, 0x93, 0xc7, + 0xbc, 0x9a, 0x26, 0x22, 0x67, 0xc9, 0x2c, 0xab, 0xa6, 0x4c, 0x26, 0xb2, 0x38, 0x9c, 0x32, 0x19, + 0xcf, 0x2b, 0x2e, 0x39, 0xba, 0xb7, 0x62, 0x62, 0x91, 0xb3, 0xb8, 0x61, 0xb6, 0xae, 0x90, 0x36, + 0x47, 0x23, 0xdd, 0x0a, 0x2e, 0x67, 0x38, 0xa5, 0xa2, 0x25, 0xee, 0xe6, 0x3c, 0xe7, 0x36, 0x4c, + 0x4c, 0xd4, 0x64, 0xc3, 0x1f, 0x7d, 0x78, 0xff, 0xbd, 0x65, 0x5f, 0x53, 0xba, 0x6f, 0x1f, 0xf3, + 0x31, 0x3b, 0x39, 0xe2, 0x19, 0x45, 0x01, 0x74, 0xea, 0x82, 0x7a, 0x20, 0x00, 0xd1, 0x66, 0x3a, + 0xd4, 0x0a, 0x3b, 0xe3, 0xbd, 0xdd, 0xa5, 0xc2, 0x26, 0x4b, 0xcc, 0x07, 0xed, 0xc0, 0xeb, 0x42, + 0x66, 0x95, 0x9c, 0x48, 0xe1, 0xf5, 0x03, 0x10, 0xb9, 0xe9, 0x03, 0xad, 0xf0, 0xb5, 0x91, 0xc9, + 0xed, 0x8f, 0x96, 0x0a, 0x77, 0x65, 0xd2, 0x45, 0xe8, 0x05, 0x1c, 0xb0, 0x92, 0x1a, 0x89, 0x63, + 0x25, 0x77, 0xb4, 0xc2, 0x1b, 0x6f, 0x4b, 0x6a, 0x05, 0x6d, 0x89, 0xb4, 0x27, 0x4a, 0xa0, 0x6b, + 0x2c, 0x78, 0x6e, 0xe0, 0x44, 0x37, 0xb6, 0x1f, 0xc5, 0x97, 0x36, 0x28, 0xfe, 0x40, 0xa9, 0x20, + 0x16, 0x44, 0xaf, 0xe0, 0x40, 0xc8, 0x4c, 0xd6, 0xc2, 0xdb, 0x08, 0x40, 0x34, 0xdc, 0x7e, 0x7a, + 0x85, 0xa4, 0xf1, 0x3c, 0xb2, 0x28, 0x69, 0x25, 0x08, 0x41, 0x77, 0xc6, 0x64, 0xe6, 0x0d, 0x8c, + 0x65, 0x62, 0xe3, 0xf0, 0x37, 0x80, 0x0f, 0x1b, 0x78, 0x3c, 0xa7, 0x99, 0x64, 0xff, 0x5f, 0x8f, + 0x56, 0x96, 0xdd, 0xb5, 0x2d, 0x87, 0xdf, 0xfb, 0xf0, 0x71, 0x53, 0x20, 0x4c, 0xf0, 0xa3, 0x5a, + 0x16, 0xbc, 0x5c, 0xd7, 0xe2, 0x3b, 0x78, 0xab, 0xea, 0xc4, 0x2b, 0x9f, 0x4f, 0xb4, 0xc2, 0x37, + 0xcf, 0xdc, 0x6a, 0xde, 0x7e, 0x1e, 0x24, 0xe7, 0x7f, 0x11, 0x81, 0xb7, 0x8f, 0x8b, 0xb2, 0x64, + 0xd5, 0xc4, 0xcc, 0x72, 0x52, 0x17, 0xd4, 0x34, 0xc0, 0x89, 0x36, 0xd3, 0x67, 0x5a, 0xe1, 0xe1, + 0x27, 0x5b, 0x33, 0xc3, 0x1e, 0xef, 0xed, 0x8a, 0xa5, 0xc2, 0x17, 0x68, 0x72, 0x21, 0xf3, 0x4f, + 0xdd, 0x49, 0xdf, 0xfc, 0xd4, 0x3e, 0x38, 0xd5, 0x3e, 0xf8, 0xa3, 0x7d, 0xf0, 0x6d, 0xe1, 0xf7, + 0x4e, 0x17, 0x7e, 0xef, 0xd7, 0xc2, 0xef, 0x7d, 0x7e, 0x9e, 0x17, 0xf2, 0x4b, 0x7d, 0x10, 0x1f, + 0xf2, 0x99, 0xd9, 0xb7, 0x97, 0x67, 0x77, 0xef, 0x6b, 0xb7, 0xdc, 0x27, 0x73, 0x26, 0x0e, 0x06, + 0x76, 0xd3, 0x76, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xd7, 0xcf, 0xf7, 0x80, 0x02, 0x04, 0x00, + 0x00, } func (m *MarketAddTicketPayload) Marshal() (dAtA []byte, err error) { diff --git a/x/market/types/tx.pb.go b/x/market/types/tx.pb.go index 4417dde6..b84f75d8 100644 --- a/x/market/types/tx.pb.go +++ b/x/market/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/market/tx.proto +// source: sgenetwork/sge/market/tx.proto package types @@ -7,8 +7,8 @@ import ( context "context" fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - 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" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -41,7 +41,7 @@ func (m *MsgAdd) Reset() { *m = MsgAdd{} } func (m *MsgAdd) String() string { return proto.CompactTextString(m) } func (*MsgAdd) ProtoMessage() {} func (*MsgAdd) Descriptor() ([]byte, []int) { - return fileDescriptor_d0e875658c4f19fd, []int{0} + return fileDescriptor_cb37002f2abdafc2, []int{0} } func (m *MsgAdd) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -96,7 +96,7 @@ func (m *MsgAddResponse) Reset() { *m = MsgAddResponse{} } func (m *MsgAddResponse) String() string { return proto.CompactTextString(m) } func (*MsgAddResponse) ProtoMessage() {} func (*MsgAddResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d0e875658c4f19fd, []int{1} + return fileDescriptor_cb37002f2abdafc2, []int{1} } func (m *MsgAddResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -151,7 +151,7 @@ func (m *MsgResolve) Reset() { *m = MsgResolve{} } func (m *MsgResolve) String() string { return proto.CompactTextString(m) } func (*MsgResolve) ProtoMessage() {} func (*MsgResolve) Descriptor() ([]byte, []int) { - return fileDescriptor_d0e875658c4f19fd, []int{2} + return fileDescriptor_cb37002f2abdafc2, []int{2} } func (m *MsgResolve) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -206,7 +206,7 @@ func (m *MsgResolveResponse) Reset() { *m = MsgResolveResponse{} } func (m *MsgResolveResponse) String() string { return proto.CompactTextString(m) } func (*MsgResolveResponse) ProtoMessage() {} func (*MsgResolveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d0e875658c4f19fd, []int{3} + return fileDescriptor_cb37002f2abdafc2, []int{3} } func (m *MsgResolveResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -262,7 +262,7 @@ func (m *MsgUpdate) Reset() { *m = MsgUpdate{} } func (m *MsgUpdate) String() string { return proto.CompactTextString(m) } func (*MsgUpdate) ProtoMessage() {} func (*MsgUpdate) Descriptor() ([]byte, []int) { - return fileDescriptor_d0e875658c4f19fd, []int{4} + return fileDescriptor_cb37002f2abdafc2, []int{4} } func (m *MsgUpdate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -317,7 +317,7 @@ func (m *MsgUpdateResponse) Reset() { *m = MsgUpdateResponse{} } func (m *MsgUpdateResponse) String() string { return proto.CompactTextString(m) } func (*MsgUpdateResponse) ProtoMessage() {} func (*MsgUpdateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_d0e875658c4f19fd, []int{5} + return fileDescriptor_cb37002f2abdafc2, []int{5} } func (m *MsgUpdateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -369,32 +369,33 @@ func init() { proto.RegisterType((*MsgUpdateResponse)(nil), "sgenetwork.sge.market.MsgUpdateResponse") } -func init() { proto.RegisterFile("sge/market/tx.proto", fileDescriptor_d0e875658c4f19fd) } - -var fileDescriptor_d0e875658c4f19fd = []byte{ - // 352 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0xcf, 0x4a, 0xf3, 0x40, - 0x14, 0xc5, 0x9b, 0xb6, 0x5f, 0x4a, 0xef, 0x07, 0x82, 0xe3, 0xbf, 0x12, 0x30, 0xd6, 0x82, 0xd0, - 0x2e, 0x9c, 0x40, 0x5d, 0x08, 0x82, 0x82, 0x75, 0x29, 0xd9, 0x04, 0x45, 0x70, 0x97, 0x36, 0x97, - 0x69, 0xa9, 0xed, 0x84, 0x99, 0x51, 0xeb, 0xd2, 0x37, 0xf0, 0xb1, 0xba, 0xec, 0xd2, 0x95, 0x48, - 0xfb, 0x22, 0xd2, 0x99, 0x24, 0xba, 0xb0, 0x16, 0x0a, 0x5d, 0xcd, 0x4c, 0xce, 0xf9, 0x1d, 0x0e, - 0xb9, 0x5c, 0xd8, 0x92, 0x0c, 0xbd, 0x41, 0x28, 0xfa, 0xa8, 0x3c, 0x35, 0xa2, 0xb1, 0xe0, 0x8a, - 0x93, 0x1d, 0xc9, 0x70, 0x88, 0xea, 0x99, 0x8b, 0x3e, 0x95, 0x0c, 0xa9, 0xd1, 0x9d, 0x6d, 0xc6, - 0x19, 0xd7, 0x0e, 0x6f, 0x7e, 0x33, 0x66, 0x67, 0xef, 0x47, 0x82, 0x39, 0x8c, 0x50, 0x3b, 0x03, - 0xdb, 0x97, 0xec, 0x32, 0x8a, 0x48, 0x05, 0x4a, 0x1d, 0x81, 0xa1, 0xe2, 0xa2, 0x62, 0x55, 0xad, - 0x7a, 0x39, 0x48, 0x9f, 0x64, 0x17, 0x6c, 0xd5, 0xeb, 0xf4, 0x51, 0x55, 0xf2, 0x5a, 0x48, 0x5e, - 0x35, 0x84, 0x0d, 0xc3, 0x06, 0x28, 0x63, 0x3e, 0x94, 0x48, 0x1c, 0xf8, 0x87, 0x42, 0xa4, 0x09, - 0xad, 0xe2, 0xf8, 0xe3, 0xc0, 0x0a, 0xcc, 0x27, 0x72, 0x0a, 0xc5, 0x28, 0x54, 0xa1, 0xce, 0xf8, - 0xdf, 0xdc, 0xa7, 0xbf, 0xd6, 0xa7, 0xbe, 0x3e, 0x12, 0x52, 0x03, 0xb5, 0x0b, 0x00, 0x5f, 0xb2, - 0x00, 0x25, 0x7f, 0x78, 0xc2, 0x15, 0x6a, 0xf6, 0x80, 0x7c, 0xf3, 0xeb, 0xad, 0x7a, 0x0e, 0x65, - 0x5f, 0xb2, 0xdb, 0x38, 0x0a, 0xd5, 0x2a, 0x4d, 0xbb, 0xb0, 0x99, 0xe1, 0x6b, 0x2d, 0xda, 0x7c, - 0xcd, 0x43, 0xc1, 0x97, 0x8c, 0x5c, 0x43, 0x61, 0x3e, 0xfb, 0x85, 0xa4, 0x1e, 0xaf, 0x73, 0xf4, - 0xa7, 0x9c, 0x35, 0xbd, 0x83, 0x52, 0x3a, 0xa5, 0xc3, 0xc5, 0x44, 0x62, 0x71, 0x1a, 0x4b, 0x2d, - 0x59, 0xf0, 0x0d, 0xd8, 0xc9, 0x3f, 0xad, 0x2e, 0x86, 0x8c, 0xc3, 0xa9, 0x2f, 0x73, 0xa4, 0xa9, - 0xad, 0xab, 0xf1, 0xd4, 0xb5, 0x26, 0x53, 0xd7, 0xfa, 0x9c, 0xba, 0xd6, 0xdb, 0xcc, 0xcd, 0x4d, - 0x66, 0x6e, 0xee, 0x7d, 0xe6, 0xe6, 0xee, 0x1b, 0xac, 0xa7, 0xba, 0x8f, 0x6d, 0xda, 0xe1, 0x03, - 0x4f, 0x32, 0x3c, 0x4e, 0xe2, 0xe6, 0x77, 0x6f, 0x94, 0x2d, 0xe2, 0x4b, 0x8c, 0xb2, 0x6d, 0xeb, - 0x35, 0x3a, 0xf9, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x86, 0xc7, 0x1d, 0xcf, 0xa3, 0x03, 0x00, 0x00, +func init() { proto.RegisterFile("sgenetwork/sge/market/tx.proto", fileDescriptor_cb37002f2abdafc2) } + +var fileDescriptor_cb37002f2abdafc2 = []byte{ + // 353 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x4d, 0x2c, 0xca, 0x4e, + 0x2d, 0xd1, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x45, 0xc8, 0xeb, 0x15, + 0xa7, 0xa7, 0xea, 0x41, 0xe4, 0xa5, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0x2a, 0xf4, 0x41, 0x2c, + 0x88, 0x62, 0x29, 0x25, 0xec, 0x86, 0x41, 0x28, 0x88, 0x1a, 0x25, 0x2b, 0x2e, 0x36, 0xdf, 0xe2, + 0x74, 0xc7, 0x94, 0x14, 0x21, 0x09, 0x2e, 0xf6, 0xe4, 0xa2, 0xd4, 0xc4, 0x92, 0xfc, 0x22, 0x09, + 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x18, 0x57, 0x48, 0x8c, 0x8b, 0xad, 0x24, 0x33, 0x39, 0x3b, + 0xb5, 0x44, 0x82, 0x09, 0x2c, 0x01, 0xe5, 0x29, 0xa5, 0x72, 0xf1, 0x41, 0xf4, 0x06, 0xa5, 0x16, + 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x0a, 0x49, 0x71, 0xb1, 0xa6, 0x16, 0x15, 0xc1, 0x4c, 0x70, 0x62, + 0x39, 0x71, 0x4f, 0x9e, 0x31, 0x08, 0x22, 0x24, 0x64, 0xce, 0xc5, 0x92, 0x92, 0x58, 0x92, 0x08, + 0x36, 0x83, 0xdb, 0x48, 0x56, 0x0f, 0xab, 0x4f, 0xf4, 0x7c, 0xc1, 0x14, 0x54, 0x27, 0x58, 0x83, + 0x92, 0x1d, 0x17, 0x97, 0x6f, 0x71, 0x7a, 0x50, 0x6a, 0x71, 0x7e, 0x4e, 0x59, 0x2a, 0x19, 0xce, + 0xcc, 0xe4, 0x12, 0x42, 0xe8, 0xa7, 0xad, 0x53, 0x6d, 0xb9, 0x38, 0x7d, 0x8b, 0xd3, 0x43, 0x0b, + 0x52, 0x12, 0x4b, 0xc8, 0x71, 0x69, 0x06, 0x97, 0x20, 0x5c, 0x3b, 0x4d, 0x1d, 0x6a, 0xd4, 0xc8, + 0xc4, 0xc5, 0xec, 0x5b, 0x9c, 0x2e, 0xe4, 0xcd, 0xc5, 0x0c, 0x8a, 0x7b, 0x9c, 0x3a, 0xc1, 0xd1, + 0x2b, 0xa5, 0x8a, 0x57, 0x1a, 0xee, 0xd2, 0x70, 0x2e, 0x76, 0x58, 0x2c, 0x29, 0xe2, 0xd6, 0x01, + 0x55, 0x22, 0xa5, 0x49, 0x50, 0x09, 0xdc, 0xe0, 0x10, 0x2e, 0x36, 0x68, 0x98, 0x2a, 0xe0, 0xd6, + 0x04, 0x51, 0x21, 0xa5, 0x41, 0x48, 0x05, 0xcc, 0x54, 0x27, 0xe7, 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, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, + 0x05, 0x65, 0x1c, 0x5d, 0xe4, 0x4c, 0x54, 0x01, 0xcf, 0x93, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, + 0xe0, 0x6c, 0x64, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x8c, 0x3f, 0xf3, 0xb9, 0x03, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -552,7 +553,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/market/tx.proto", + Metadata: "sgenetwork/sge/market/tx.proto", } func (m *MsgAdd) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 4bdf16b3..4af8826d 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -3,13 +3,13 @@ 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/sge-network/sge/consts" "github.com/sge-network/sge/x/mint/types" - "github.com/tendermint/tendermint/libs/log" ) // Keeper is the type for module properties diff --git a/x/mint/module.go b/x/mint/module.go index 1791116e..598c0982 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -9,7 +9,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" @@ -120,15 +120,9 @@ func NewAppModule( // Name returns the module's name. func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Route returns the module's message routing key. -func (AppModule) Route() sdk.Route { return sdk.Route{} } - // QuerierRoute returns the module's query routing key. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the module's Querier. -func (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/mint/module_simulation.go b/x/mint/module_simulation.go index d2291a23..883b5d4c 100644 --- a/x/mint/module_simulation.go +++ b/x/mint/module_simulation.go @@ -5,7 +5,7 @@ import ( "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "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 +19,7 @@ import ( var ( _ = sample.AccAddress _ = mintsimulation.FindAccount - _ = simappparams.StakePerAccount + _ = simtestutil.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -35,7 +35,7 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP } // RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return mintsimulation.ParamChanges(r) } diff --git a/x/mint/simulation/params.go b/x/mint/simulation/params.go index ead32943..87f100c7 100644 --- a/x/mint/simulation/params.go +++ b/x/mint/simulation/params.go @@ -19,9 +19,9 @@ const ( // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{ - simulation.NewSimParamChange(types.ModuleName, keyBlocksPerYear, +func ParamChanges(_ *rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{ + simulation.NewSimLegacyParamChange(types.ModuleName, keyBlocksPerYear, func(r *rand.Rand) string { return fmt.Sprintf("\"%s\"", GenBlocksPerYear(r)) }, diff --git a/x/mint/types/codec.go b/x/mint/types/codec.go index e0313e08..c1dcfe68 100644 --- a/x/mint/types/codec.go +++ b/x/mint/types/codec.go @@ -3,7 +3,6 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" - cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -28,6 +27,6 @@ var ( func init() { RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) + // cryptocodec.RegisterCrypto(amino) sdk.RegisterLegacyAminoCodec(amino) } diff --git a/x/mint/types/genesis.pb.go b/x/mint/types/genesis.pb.go index d48ba8d1..b9548291 100644 --- a/x/mint/types/genesis.pb.go +++ b/x/mint/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/mint/genesis.proto +// source: sgenetwork/sge/mint/genesis.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -35,7 +35,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_5f482053ea27dcec, []int{0} + return fileDescriptor_77c6a42e62252e0d, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -82,24 +82,24 @@ func init() { proto.RegisterType((*GenesisState)(nil), "sgenetwork.sge.mint.GenesisState") } -func init() { proto.RegisterFile("sge/mint/genesis.proto", fileDescriptor_5f482053ea27dcec) } +func init() { proto.RegisterFile("sgenetwork/sge/mint/genesis.proto", fileDescriptor_77c6a42e62252e0d) } -var fileDescriptor_5f482053ea27dcec = []byte{ +var fileDescriptor_77c6a42e62252e0d = []byte{ // 217 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2b, 0x4e, 0x4f, 0xd5, - 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x12, 0x2e, 0x06, 0xf1, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0xf5, 0x8a, 0xd3, 0x53, - 0xf5, 0x40, 0x4a, 0xa4, 0x44, 0xd2, 0xf3, 0xd3, 0xf3, 0xc1, 0xf2, 0xfa, 0x20, 0x16, 0x44, 0xa9, - 0x94, 0x28, 0xdc, 0x88, 0x82, 0xc4, 0xa2, 0xc4, 0xdc, 0x62, 0x0c, 0x61, 0x10, 0x91, 0x5a, 0x04, - 0x11, 0x56, 0x6a, 0x61, 0xe4, 0xe2, 0x71, 0x87, 0x58, 0x15, 0x5c, 0x92, 0x58, 0x92, 0x2a, 0x64, - 0xc9, 0xc5, 0x06, 0x51, 0x20, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xad, 0x87, 0xc5, 0x6a, - 0x3d, 0x5f, 0xb0, 0x12, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0x1a, 0x40, 0x5a, 0x21, - 0x56, 0x4a, 0x30, 0xe1, 0xd1, 0x1a, 0x00, 0x56, 0x02, 0xd3, 0x0a, 0xd1, 0xe0, 0xe4, 0x78, 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, 0xea, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, - 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xc5, 0xe9, 0xa9, 0xba, 0x50, 0xf3, 0x40, 0x6c, 0xfd, 0x0a, 0x88, - 0x87, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x1e, 0x32, 0x06, 0x04, 0x00, 0x00, 0xff, - 0xff, 0x0f, 0x5a, 0xf5, 0x8f, 0x43, 0x01, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, + 0x07, 0x09, 0x15, 0x67, 0x16, 0xeb, 0x15, 0x14, 0xe5, 0x97, 0xe4, 0x0b, 0x09, 0x23, 0x94, 0xe8, + 0x15, 0xa7, 0xa7, 0xea, 0x81, 0x94, 0x48, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0xe5, 0xf5, 0x41, + 0x2c, 0x88, 0x52, 0x29, 0x05, 0x6c, 0xa6, 0x15, 0x24, 0x16, 0x25, 0xe6, 0x16, 0xe3, 0x53, 0x01, + 0x22, 0x52, 0x8b, 0x20, 0x2a, 0x94, 0x5a, 0x18, 0xb9, 0x78, 0xdc, 0x21, 0x0e, 0x08, 0x2e, 0x49, + 0x2c, 0x49, 0x15, 0xb2, 0xe4, 0x62, 0x83, 0x28, 0x90, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x92, + 0xd6, 0xc3, 0xe2, 0x20, 0x3d, 0x5f, 0xb0, 0x12, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, + 0x1a, 0x40, 0x5a, 0x21, 0xb6, 0x4b, 0x30, 0xe1, 0xd1, 0x1a, 0x00, 0x56, 0x02, 0xd3, 0x0a, 0xd1, + 0xe0, 0xe4, 0x78, 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, 0xea, 0xe9, 0x99, + 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0x20, 0x2f, 0xe8, 0x22, 0x7b, 0xa7, 0x02, 0xe2, + 0xa1, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x87, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x94, 0x31, 0x50, 0x21, 0x64, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/minter.pb.go b/x/mint/types/minter.pb.go index 96d27e8b..a8a40c58 100644 --- a/x/mint/types/minter.pb.go +++ b/x/mint/types/minter.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/mint/minter.proto +// source: sgenetwork/sge/mint/minter.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -41,7 +41,7 @@ func (m *Minter) Reset() { *m = Minter{} } func (m *Minter) String() string { return proto.CompactTextString(m) } func (*Minter) ProtoMessage() {} func (*Minter) Descriptor() ([]byte, []int) { - return fileDescriptor_d31ed0ee2430eeec, []int{0} + return fileDescriptor_a969bd1a18aad64f, []int{0} } func (m *Minter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -81,29 +81,29 @@ func init() { proto.RegisterType((*Minter)(nil), "sgenetwork.sge.mint.Minter") } -func init() { proto.RegisterFile("sge/mint/minter.proto", fileDescriptor_d31ed0ee2430eeec) } +func init() { proto.RegisterFile("sgenetwork/sge/mint/minter.proto", fileDescriptor_a969bd1a18aad64f) } -var fileDescriptor_d31ed0ee2430eeec = []byte{ +var fileDescriptor_a969bd1a18aad64f = []byte{ // 303 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x4e, 0x4f, 0xd5, - 0xcf, 0xcd, 0xcc, 0x2b, 0x01, 0x13, 0xa9, 0x45, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xc2, - 0xc5, 0xe9, 0xa9, 0x79, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x7a, 0xc5, 0xe9, 0xa9, 0x7a, 0x20, - 0x49, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0xbc, 0x3e, 0x88, 0x05, 0x51, 0xaa, 0x74, 0x8c, - 0x89, 0x8b, 0xcd, 0x17, 0xac, 0x57, 0xc8, 0x87, 0x8b, 0x33, 0x33, 0x2f, 0x2d, 0x27, 0xb1, 0x24, - 0x33, 0x3f, 0x4f, 0x82, 0x51, 0x81, 0x51, 0x83, 0xd3, 0x49, 0xef, 0xc4, 0x3d, 0x79, 0x86, 0x5b, - 0xf7, 0xe4, 0xd5, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x93, 0xf3, - 0x8b, 0x73, 0xf3, 0x8b, 0xa1, 0x94, 0x6e, 0x71, 0x4a, 0xb6, 0x7e, 0x49, 0x65, 0x41, 0x6a, 0xb1, - 0x9e, 0x4b, 0x6a, 0x72, 0x10, 0xc2, 0x00, 0x21, 0x59, 0x2e, 0xae, 0x82, 0x8c, 0xc4, 0xe2, 0xd4, - 0xf8, 0xe2, 0x92, 0xd4, 0x02, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xd6, 0x20, 0x4e, 0xb0, 0x48, 0x70, - 0x49, 0x6a, 0x81, 0x50, 0x09, 0x97, 0x00, 0x44, 0xba, 0xa0, 0x28, 0xbf, 0x2c, 0xb3, 0x38, 0x33, - 0x3f, 0xaf, 0x58, 0x82, 0x19, 0x6c, 0xa7, 0x27, 0x69, 0x76, 0x7e, 0xba, 0x27, 0x2f, 0x5e, 0x99, - 0x98, 0x9b, 0x63, 0xa5, 0x84, 0x6e, 0x9e, 0x52, 0x10, 0x3f, 0x58, 0x28, 0x00, 0x2e, 0x22, 0x14, - 0xc9, 0x25, 0x50, 0x52, 0x54, 0x9a, 0x97, 0x9c, 0x58, 0x92, 0x9a, 0x12, 0x5f, 0x92, 0x9f, 0x9d, - 0x9a, 0x57, 0x2c, 0xc1, 0x42, 0x96, 0x4f, 0xf9, 0xe1, 0xe6, 0x84, 0x80, 0x8d, 0x71, 0x72, 0x3c, - 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, - 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x75, 0x24, 0x23, 0x8b, 0xd3, 0x53, - 0x75, 0xa1, 0x31, 0x03, 0x62, 0xeb, 0x57, 0x40, 0x62, 0x0f, 0x6c, 0x6e, 0x12, 0x1b, 0x38, 0x4a, - 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x9f, 0xc2, 0x1b, 0xc1, 0xd6, 0x01, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xcd, 0xcc, 0x2b, 0x01, + 0x13, 0xa9, 0x45, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xc2, 0x08, 0x15, 0x7a, 0xc5, 0xe9, + 0xa9, 0x7a, 0x20, 0x49, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0xbc, 0x3e, 0x88, 0x05, 0x51, + 0xaa, 0x74, 0x8c, 0x89, 0x8b, 0xcd, 0x17, 0xac, 0x57, 0xc8, 0x87, 0x8b, 0x33, 0x33, 0x2f, 0x2d, + 0x27, 0xb1, 0x24, 0x33, 0x3f, 0x4f, 0x82, 0x51, 0x81, 0x51, 0x83, 0xd3, 0x49, 0xef, 0xc4, 0x3d, + 0x79, 0x86, 0x5b, 0xf7, 0xe4, 0xd5, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, + 0xf5, 0x93, 0xf3, 0x8b, 0x73, 0xf3, 0x8b, 0xa1, 0x94, 0x6e, 0x71, 0x4a, 0xb6, 0x7e, 0x49, 0x65, + 0x41, 0x6a, 0xb1, 0x9e, 0x4b, 0x6a, 0x72, 0x10, 0xc2, 0x00, 0x21, 0x59, 0x2e, 0xae, 0x82, 0x8c, + 0xc4, 0xe2, 0xd4, 0xf8, 0xe2, 0x92, 0xd4, 0x02, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xd6, 0x20, 0x4e, + 0xb0, 0x48, 0x70, 0x49, 0x6a, 0x81, 0x50, 0x09, 0x97, 0x00, 0x44, 0xba, 0xa0, 0x28, 0xbf, 0x2c, + 0xb3, 0x38, 0x33, 0x3f, 0xaf, 0x58, 0x82, 0x19, 0x6c, 0xa7, 0x27, 0x69, 0x76, 0x7e, 0xba, 0x27, + 0x2f, 0x5e, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0x6e, 0x9e, 0x52, 0x10, 0x3f, 0x58, 0x28, 0x00, + 0x2e, 0x22, 0x14, 0xc9, 0x25, 0x50, 0x52, 0x54, 0x9a, 0x97, 0x9c, 0x58, 0x92, 0x9a, 0x12, 0x5f, + 0x92, 0x9f, 0x9d, 0x9a, 0x57, 0x2c, 0xc1, 0x42, 0x96, 0x4f, 0xf9, 0xe1, 0xe6, 0x84, 0x80, 0x8d, + 0x71, 0x72, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, + 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x75, 0x24, 0x23, + 0x8b, 0xd3, 0x53, 0x75, 0x91, 0xe3, 0xae, 0x02, 0x12, 0x7b, 0x60, 0x73, 0x93, 0xd8, 0xc0, 0x51, + 0x62, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x77, 0x77, 0xbd, 0x3f, 0xe1, 0x01, 0x00, 0x00, } func (m *Minter) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/msgs.go b/x/mint/types/msgs.go new file mode 100644 index 00000000..a08186ef --- /dev/null +++ b/x/mint/types/msgs.go @@ -0,0 +1,32 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" +) + +var _ sdk.Msg = &MsgUpdateParams{} + +// GetSignBytes implements the LegacyMsg interface. +func (m MsgUpdateParams) GetSignBytes() []byte { + return sdk.MustSortJSON(ModuleCdc.MustMarshalJSON(&m)) +} + +// GetSigners returns the expected signers for a MsgUpdateParams message. +func (m *MsgUpdateParams) GetSigners() []sdk.AccAddress { + addr, _ := sdk.AccAddressFromBech32(m.Authority) + return []sdk.AccAddress{addr} +} + +// ValidateBasic does a sanity check on the provided data. +func (m *MsgUpdateParams) ValidateBasic() error { + if _, err := sdk.AccAddressFromBech32(m.Authority); err != nil { + return sdkerrors.Wrap(err, "invalid authority address") + } + + if err := m.Params.Validate(); err != nil { + return err + } + + return nil +} diff --git a/x/mint/types/params.pb.go b/x/mint/types/params.pb.go index 41a365ae..4c8991b8 100644 --- a/x/mint/types/params.pb.go +++ b/x/mint/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/mint/params.proto +// source: sgenetwork/sge/mint/params.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -39,7 +39,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_a4bb1a108a109550, []int{0} + return fileDescriptor_1a26370164e410ff, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -93,32 +93,32 @@ func init() { proto.RegisterType((*Params)(nil), "sgenetwork.sge.mint.Params") } -func init() { proto.RegisterFile("sge/mint/params.proto", fileDescriptor_a4bb1a108a109550) } +func init() { proto.RegisterFile("sgenetwork/sge/mint/params.proto", fileDescriptor_1a26370164e410ff) } -var fileDescriptor_a4bb1a108a109550 = []byte{ - // 349 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcf, 0x6a, 0xea, 0x40, - 0x14, 0xc6, 0x13, 0x15, 0xc1, 0x5c, 0xbc, 0x17, 0x72, 0xb5, 0x84, 0x40, 0x13, 0xc9, 0xa2, 0x75, - 0xe3, 0x04, 0xda, 0x9d, 0x3b, 0x43, 0xa1, 0xb8, 0x93, 0xec, 0xda, 0x4d, 0x18, 0xe3, 0x61, 0x14, - 0x9d, 0x4c, 0x98, 0x19, 0xa9, 0xbe, 0x45, 0x97, 0x5d, 0xf6, 0x01, 0xfa, 0x20, 0x2e, 0x5d, 0x96, - 0x2e, 0x42, 0xd1, 0x37, 0xf0, 0x09, 0xca, 0x64, 0x02, 0xfd, 0x43, 0x57, 0x39, 0xf9, 0xce, 0x77, - 0x7e, 0xdf, 0x99, 0x63, 0x75, 0x05, 0x81, 0x90, 0x2e, 0x32, 0x19, 0xe6, 0x98, 0x63, 0x2a, 0x50, - 0xce, 0x99, 0x64, 0xf6, 0x7f, 0x41, 0x20, 0x03, 0xf9, 0xc0, 0xf8, 0x12, 0x09, 0x02, 0x48, 0x39, - 0xdc, 0x0e, 0x61, 0x84, 0x95, 0xfd, 0x50, 0x55, 0xda, 0xea, 0x76, 0x3e, 0x09, 0x73, 0x2c, 0x40, - 0xab, 0xc1, 0x4b, 0xcd, 0x6a, 0x4e, 0x4a, 0xa2, 0x7d, 0x6e, 0x59, 0xaa, 0x9d, 0xcc, 0x20, 0x63, - 0xd4, 0x31, 0x7b, 0x66, 0xbf, 0x15, 0xb7, 0x94, 0x72, 0xa3, 0x04, 0x3b, 0xb2, 0xfe, 0x4d, 0x57, - 0x2c, 0x5d, 0x8a, 0x24, 0x07, 0x9e, 0x6c, 0x01, 0x73, 0xa7, 0xd6, 0x33, 0xfb, 0xf5, 0xc8, 0x3d, - 0x15, 0xfe, 0xd9, 0x16, 0xd3, 0xd5, 0x30, 0xf8, 0x61, 0x08, 0xe2, 0xb6, 0x56, 0x26, 0xc0, 0xef, - 0x00, 0x73, 0x7b, 0x6c, 0x35, 0xcb, 0x70, 0xe1, 0xd4, 0x7b, 0xf5, 0xfe, 0x9f, 0x2b, 0x17, 0xfd, - 0xb2, 0x3f, 0x9a, 0x28, 0x4b, 0xd4, 0xdd, 0x15, 0xbe, 0x71, 0x2a, 0xfc, 0xb6, 0x46, 0xeb, 0xb9, - 0x20, 0xae, 0x00, 0x76, 0x66, 0xfd, 0x85, 0x4d, 0xba, 0x5a, 0xcf, 0x20, 0xc1, 0x94, 0xad, 0x33, - 0xe9, 0x34, 0xd4, 0xc6, 0xd1, 0xad, 0x1a, 0x7b, 0x2b, 0xfc, 0x0b, 0xb2, 0x90, 0xf3, 0xf5, 0x14, - 0xa5, 0x8c, 0x86, 0x29, 0x13, 0x94, 0x89, 0xea, 0x33, 0x10, 0xb3, 0x65, 0x28, 0xb7, 0x39, 0x08, - 0x34, 0xce, 0xe4, 0xa9, 0xf0, 0xbb, 0x3a, 0xe0, 0x3b, 0x2d, 0x88, 0xdb, 0x95, 0x30, 0x2a, 0xff, - 0x87, 0x8d, 0xa7, 0x67, 0xdf, 0x88, 0x46, 0xbb, 0x83, 0x67, 0xee, 0x0f, 0x9e, 0xf9, 0x7e, 0xf0, - 0xcc, 0xc7, 0xa3, 0x67, 0xec, 0x8f, 0x9e, 0xf1, 0x7a, 0xf4, 0x8c, 0xfb, 0xcb, 0x2f, 0x79, 0x82, - 0xc0, 0xa0, 0x7a, 0x95, 0xaa, 0xc3, 0x8d, 0xbe, 0x7b, 0x19, 0x3a, 0x6d, 0x96, 0x87, 0xbf, 0xfe, - 0x08, 0x00, 0x00, 0xff, 0xff, 0x46, 0xeb, 0x51, 0xa7, 0xd2, 0x01, 0x00, 0x00, +var fileDescriptor_1a26370164e410ff = []byte{ + // 350 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xc1, 0x6a, 0xea, 0x40, + 0x18, 0x85, 0x13, 0x15, 0xc1, 0x5c, 0xbc, 0x17, 0x72, 0xaf, 0x97, 0x10, 0x68, 0x12, 0xb2, 0x68, + 0xdd, 0x38, 0x81, 0x76, 0xe7, 0xce, 0x50, 0x28, 0xee, 0x24, 0xbb, 0x76, 0x13, 0xc6, 0xf8, 0x33, + 0x8a, 0x4e, 0x26, 0xcc, 0x8c, 0x54, 0xdf, 0xa2, 0xcb, 0x2e, 0xfb, 0x00, 0x7d, 0x10, 0x97, 0x2e, + 0x4b, 0x17, 0xa1, 0xe8, 0x1b, 0xf8, 0x04, 0x65, 0x32, 0x42, 0x6d, 0x71, 0x95, 0xcc, 0xf9, 0xbf, + 0xff, 0x9c, 0x99, 0x63, 0x05, 0x82, 0x40, 0x0e, 0xf2, 0x91, 0xf1, 0x79, 0x24, 0x08, 0x44, 0x74, + 0x96, 0xcb, 0xa8, 0xc0, 0x1c, 0x53, 0x81, 0x0a, 0xce, 0x24, 0xb3, 0xff, 0x7e, 0x11, 0x48, 0x10, + 0x40, 0x8a, 0x70, 0xff, 0x11, 0x46, 0x58, 0x35, 0x8f, 0xd4, 0x9f, 0x46, 0x5d, 0xff, 0xac, 0xd9, + 0x14, 0x0b, 0xd0, 0x40, 0xf8, 0x5a, 0xb3, 0x9a, 0xa3, 0xca, 0xdc, 0xbe, 0xb0, 0x2c, 0x35, 0x4e, + 0x27, 0x90, 0x33, 0xea, 0x98, 0x81, 0xd9, 0x6d, 0x25, 0x2d, 0xa5, 0xdc, 0x2a, 0xc1, 0x8e, 0xad, + 0x3f, 0xe3, 0x05, 0xcb, 0xe6, 0x22, 0x2d, 0x80, 0xa7, 0x6b, 0xc0, 0xdc, 0xa9, 0x05, 0x66, 0xb7, + 0x1e, 0xbb, 0x87, 0xd2, 0xff, 0xbf, 0xc6, 0x74, 0xd1, 0x0f, 0x7f, 0x00, 0x61, 0xd2, 0xd6, 0xca, + 0x08, 0xf8, 0x3d, 0x60, 0x6e, 0x0f, 0xad, 0x66, 0x15, 0x2e, 0x9c, 0x7a, 0x50, 0xef, 0xfe, 0xba, + 0x76, 0xd1, 0x99, 0xa7, 0xa0, 0x91, 0x42, 0xe2, 0xce, 0xa6, 0xf4, 0x8d, 0x43, 0xe9, 0xb7, 0xb5, + 0xb5, 0xde, 0x0b, 0x93, 0xa3, 0x81, 0x9d, 0x5b, 0xbf, 0x61, 0x95, 0x2d, 0x96, 0x13, 0x48, 0x31, + 0x65, 0xcb, 0x5c, 0x3a, 0x0d, 0x75, 0xe3, 0xf8, 0x4e, 0xad, 0xbd, 0x97, 0xfe, 0x25, 0x99, 0xc9, + 0xe9, 0x72, 0x8c, 0x32, 0x46, 0xa3, 0x8c, 0x09, 0xca, 0xc4, 0xf1, 0xd3, 0x13, 0x93, 0x79, 0x24, + 0xd7, 0x05, 0x08, 0x34, 0xcc, 0xe5, 0xa1, 0xf4, 0x3b, 0x3a, 0xe0, 0xbb, 0x5b, 0x98, 0xb4, 0x8f, + 0xc2, 0xa0, 0x3a, 0xf7, 0x1b, 0xcf, 0x2f, 0xbe, 0x11, 0x0f, 0x36, 0x3b, 0xcf, 0xdc, 0xee, 0x3c, + 0xf3, 0x63, 0xe7, 0x99, 0x4f, 0x7b, 0xcf, 0xd8, 0xee, 0x3d, 0xe3, 0x6d, 0xef, 0x19, 0x0f, 0x57, + 0x27, 0x79, 0x82, 0x40, 0xef, 0xb4, 0xf5, 0x95, 0xee, 0xbd, 0x0a, 0x1d, 0x37, 0xab, 0xe2, 0x6f, + 0x3e, 0x03, 0x00, 0x00, 0xff, 0xff, 0x01, 0x60, 0xa6, 0xf8, 0xe8, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/phase.pb.go b/x/mint/types/phase.pb.go index 151c38f3..cbd4beae 100644 --- a/x/mint/types/phase.pb.go +++ b/x/mint/types/phase.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/mint/phase.proto +// source: sgenetwork/sge/mint/phase.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -35,7 +35,7 @@ type Phase struct { func (m *Phase) Reset() { *m = Phase{} } func (*Phase) ProtoMessage() {} func (*Phase) Descriptor() ([]byte, []int) { - return fileDescriptor_7fc2241b526dba74, []int{0} + return fileDescriptor_a4ef2371d48b7ae6, []int{0} } func (m *Phase) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -68,27 +68,27 @@ func init() { proto.RegisterType((*Phase)(nil), "sgenetwork.sge.mint.Phase") } -func init() { proto.RegisterFile("sge/mint/phase.proto", fileDescriptor_7fc2241b526dba74) } +func init() { proto.RegisterFile("sgenetwork/sge/mint/phase.proto", fileDescriptor_a4ef2371d48b7ae6) } -var fileDescriptor_7fc2241b526dba74 = []byte{ - // 263 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x29, 0x4e, 0x4f, 0xd5, - 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xc8, 0x48, 0x2c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x12, 0x2e, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x4e, 0x4f, - 0xd5, 0x03, 0x29, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xeb, 0x83, 0x58, 0x10, 0xa5, - 0x4a, 0x4f, 0x19, 0xb9, 0x58, 0x03, 0x40, 0x5a, 0x85, 0x12, 0xb8, 0x38, 0x33, 0xf3, 0xd2, 0x72, - 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0x9c, 0x4e, 0xdc, 0x93, - 0x67, 0xb8, 0x75, 0x4f, 0x5e, 0x2d, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, - 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, 0x97, 0x54, 0x16, - 0xa4, 0x16, 0xeb, 0xb9, 0xa4, 0x26, 0x7f, 0xba, 0x27, 0x2f, 0x50, 0x99, 0x98, 0x9b, 0x63, 0xa5, - 0x04, 0x37, 0x48, 0x29, 0x08, 0x61, 0xa8, 0x50, 0x09, 0x97, 0x40, 0x65, 0x6a, 0x62, 0x51, 0x7c, - 0x72, 0x7e, 0x6a, 0x5a, 0x5a, 0x66, 0x72, 0x66, 0x6a, 0x5e, 0x89, 0x04, 0x13, 0xd8, 0x22, 0x4f, - 0x92, 0x2d, 0x12, 0x87, 0x58, 0x84, 0x6e, 0x9e, 0x52, 0x10, 0x3f, 0x48, 0xc8, 0x19, 0x21, 0x62, - 0xc5, 0x32, 0x63, 0x81, 0x3c, 0x83, 0x93, 0xe3, 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, 0xa9, 0x23, 0xd9, 0x59, 0x9c, 0x9e, 0xaa, 0x0b, 0x0d, 0x38, 0x10, 0x5b, 0xbf, 0x02, - 0x12, 0xb6, 0x60, 0x8b, 0x93, 0xd8, 0xc0, 0x21, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x78, - 0xe0, 0xa9, 0xf5, 0x74, 0x01, 0x00, 0x00, +var fileDescriptor_a4ef2371d48b7ae6 = []byte{ + // 264 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, + 0x2f, 0xc8, 0x48, 0x2c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x46, 0x28, 0xd0, + 0x2b, 0x4e, 0x4f, 0xd5, 0x03, 0x29, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xeb, 0x83, + 0x58, 0x10, 0xa5, 0x4a, 0x4f, 0x19, 0xb9, 0x58, 0x03, 0x40, 0x5a, 0x85, 0x12, 0xb8, 0x38, 0x33, + 0xf3, 0xd2, 0x72, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0x9c, + 0x4e, 0xdc, 0x93, 0x67, 0xb8, 0x75, 0x4f, 0x5e, 0x2d, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, + 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, + 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xb9, 0xa4, 0x26, 0x7f, 0xba, 0x27, 0x2f, 0x50, 0x99, 0x98, + 0x9b, 0x63, 0xa5, 0x04, 0x37, 0x48, 0x29, 0x08, 0x61, 0xa8, 0x50, 0x09, 0x97, 0x40, 0x65, 0x6a, + 0x62, 0x51, 0x7c, 0x72, 0x7e, 0x6a, 0x5a, 0x5a, 0x66, 0x72, 0x66, 0x6a, 0x5e, 0x89, 0x04, 0x13, + 0xd8, 0x22, 0x4f, 0x92, 0x2d, 0x12, 0x87, 0x58, 0x84, 0x6e, 0x9e, 0x52, 0x10, 0x3f, 0x48, 0xc8, + 0x19, 0x21, 0x62, 0xc5, 0x32, 0x63, 0x81, 0x3c, 0x83, 0x93, 0xe3, 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, 0xa9, 0x23, 0xd9, 0x59, 0x9c, 0x9e, 0xaa, 0x8b, 0x1c, 0xb2, 0x15, + 0x90, 0xb0, 0x05, 0x5b, 0x9c, 0xc4, 0x06, 0x0e, 0x31, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xad, 0x61, 0x84, 0x39, 0x7f, 0x01, 0x00, 0x00, } func (m *Phase) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go index d5b8ca5e..7b0505e5 100644 --- a/x/mint/types/query.pb.go +++ b/x/mint/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/mint/query.proto +// source: sgenetwork/sge/mint/query.proto package types @@ -8,8 +8,8 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + 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" @@ -39,7 +39,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_448e6714a1bb8862, []int{0} + return fileDescriptor_ee35ae03c8ab12c8, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -79,7 +79,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_448e6714a1bb8862, []int{1} + return fileDescriptor_ee35ae03c8ab12c8, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -124,7 +124,7 @@ func (m *QueryInflationRequest) Reset() { *m = QueryInflationRequest{} } func (m *QueryInflationRequest) String() string { return proto.CompactTextString(m) } func (*QueryInflationRequest) ProtoMessage() {} func (*QueryInflationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_448e6714a1bb8862, []int{2} + return fileDescriptor_ee35ae03c8ab12c8, []int{2} } func (m *QueryInflationRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -165,7 +165,7 @@ func (m *QueryInflationResponse) Reset() { *m = QueryInflationResponse{} func (m *QueryInflationResponse) String() string { return proto.CompactTextString(m) } func (*QueryInflationResponse) ProtoMessage() {} func (*QueryInflationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_448e6714a1bb8862, []int{3} + return fileDescriptor_ee35ae03c8ab12c8, []int{3} } func (m *QueryInflationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -203,7 +203,7 @@ func (m *QueryPhaseStepRequest) Reset() { *m = QueryPhaseStepRequest{} } func (m *QueryPhaseStepRequest) String() string { return proto.CompactTextString(m) } func (*QueryPhaseStepRequest) ProtoMessage() {} func (*QueryPhaseStepRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_448e6714a1bb8862, []int{4} + return fileDescriptor_ee35ae03c8ab12c8, []int{4} } func (m *QueryPhaseStepRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -244,7 +244,7 @@ func (m *QueryPhaseStepResponse) Reset() { *m = QueryPhaseStepResponse{} func (m *QueryPhaseStepResponse) String() string { return proto.CompactTextString(m) } func (*QueryPhaseStepResponse) ProtoMessage() {} func (*QueryPhaseStepResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_448e6714a1bb8862, []int{5} + return fileDescriptor_ee35ae03c8ab12c8, []int{5} } func (m *QueryPhaseStepResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -289,7 +289,7 @@ func (m *QueryPhaseProvisionsRequest) Reset() { *m = QueryPhaseProvision func (m *QueryPhaseProvisionsRequest) String() string { return proto.CompactTextString(m) } func (*QueryPhaseProvisionsRequest) ProtoMessage() {} func (*QueryPhaseProvisionsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_448e6714a1bb8862, []int{6} + return fileDescriptor_ee35ae03c8ab12c8, []int{6} } func (m *QueryPhaseProvisionsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -329,7 +329,7 @@ func (m *QueryPhaseProvisionsResponse) Reset() { *m = QueryPhaseProvisio func (m *QueryPhaseProvisionsResponse) String() string { return proto.CompactTextString(m) } func (*QueryPhaseProvisionsResponse) ProtoMessage() {} func (*QueryPhaseProvisionsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_448e6714a1bb8862, []int{7} + return fileDescriptor_ee35ae03c8ab12c8, []int{7} } func (m *QueryPhaseProvisionsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -368,7 +368,7 @@ func (m *QueryEndPhaseStatusRequest) Reset() { *m = QueryEndPhaseStatusR func (m *QueryEndPhaseStatusRequest) String() string { return proto.CompactTextString(m) } func (*QueryEndPhaseStatusRequest) ProtoMessage() {} func (*QueryEndPhaseStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_448e6714a1bb8862, []int{8} + return fileDescriptor_ee35ae03c8ab12c8, []int{8} } func (m *QueryEndPhaseStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -410,7 +410,7 @@ func (m *QueryEndPhaseStatusResponse) Reset() { *m = QueryEndPhaseStatus func (m *QueryEndPhaseStatusResponse) String() string { return proto.CompactTextString(m) } func (*QueryEndPhaseStatusResponse) ProtoMessage() {} func (*QueryEndPhaseStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_448e6714a1bb8862, []int{9} + return fileDescriptor_ee35ae03c8ab12c8, []int{9} } func (m *QueryEndPhaseStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -459,47 +459,47 @@ func init() { proto.RegisterType((*QueryEndPhaseStatusResponse)(nil), "sgenetwork.sge.mint.QueryEndPhaseStatusResponse") } -func init() { proto.RegisterFile("sge/mint/query.proto", fileDescriptor_448e6714a1bb8862) } - -var fileDescriptor_448e6714a1bb8862 = []byte{ - // 579 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x4f, 0x6f, 0x12, 0x41, - 0x18, 0xc6, 0x59, 0x23, 0x44, 0xc6, 0x46, 0x9a, 0x29, 0xd5, 0x66, 0x4b, 0xb7, 0xcd, 0xc6, 0x42, - 0xa3, 0xb2, 0x53, 0xea, 0xc1, 0x78, 0x94, 0xd4, 0x43, 0x13, 0x0f, 0x88, 0x27, 0xbd, 0x90, 0x05, - 0xa6, 0xdb, 0x4d, 0xcb, 0xcc, 0x94, 0x19, 0xaa, 0x5c, 0x3d, 0x7b, 0x30, 0xf1, 0x13, 0x78, 0xf0, - 0xbb, 0xf4, 0xd8, 0xc4, 0x8b, 0xf1, 0xd0, 0x18, 0xf0, 0xe0, 0xc7, 0x30, 0xfb, 0xee, 0xec, 0x16, - 0x96, 0xa5, 0x54, 0x4f, 0x90, 0xf7, 0xcf, 0xf3, 0xfc, 0x86, 0x79, 0x06, 0x54, 0x94, 0x1e, 0x25, - 0x3d, 0x9f, 0x29, 0x72, 0x3a, 0xa0, 0xfd, 0xa1, 0x23, 0xfa, 0x5c, 0x71, 0xbc, 0x22, 0x3d, 0xca, - 0xa8, 0x7a, 0xcf, 0xfb, 0xc7, 0x8e, 0xf4, 0xa8, 0x13, 0x0c, 0x98, 0x45, 0x8f, 0x7b, 0x1c, 0xfa, - 0x24, 0xf8, 0x16, 0x8e, 0x9a, 0x25, 0x8f, 0x73, 0xef, 0x84, 0x12, 0x57, 0xf8, 0xc4, 0x65, 0x8c, - 0x2b, 0x57, 0xf9, 0x9c, 0x49, 0xdd, 0x5d, 0x8d, 0xe5, 0x85, 0xdb, 0x77, 0x7b, 0xba, 0x6c, 0x17, - 0x11, 0x7e, 0x1d, 0xd8, 0x35, 0xa0, 0xd8, 0xa4, 0xa7, 0x03, 0x2a, 0x95, 0xdd, 0x40, 0x2b, 0x53, - 0x55, 0x29, 0x38, 0x93, 0x14, 0x3f, 0x47, 0xb9, 0x70, 0x79, 0xcd, 0xd8, 0x32, 0x76, 0xee, 0xee, - 0xad, 0x3b, 0x29, 0x74, 0x4e, 0xb8, 0x54, 0xbf, 0x7d, 0x7e, 0xb9, 0x99, 0x69, 0xea, 0x05, 0xfb, - 0x01, 0x5a, 0x05, 0xc5, 0x03, 0x76, 0x78, 0x02, 0x5c, 0x91, 0xd5, 0x21, 0xba, 0x9f, 0x6c, 0x68, - 0xb7, 0x57, 0x28, 0xef, 0x47, 0x45, 0x30, 0x5c, 0xaa, 0x3b, 0x81, 0xe6, 0xcf, 0xcb, 0xcd, 0xb2, - 0xe7, 0xab, 0xa3, 0x41, 0xdb, 0xe9, 0xf0, 0x1e, 0xe9, 0x70, 0xd9, 0xe3, 0x52, 0x7f, 0x54, 0x65, - 0xf7, 0x98, 0xa8, 0xa1, 0xa0, 0xd2, 0xd9, 0xa7, 0x9d, 0xe6, 0x95, 0x40, 0x0c, 0xd0, 0x38, 0x72, - 0x25, 0x7d, 0xa3, 0xa8, 0x88, 0x00, 0x9e, 0x69, 0x80, 0x89, 0x86, 0x06, 0xd8, 0x40, 0x48, 0x04, - 0xc5, 0x96, 0x54, 0x54, 0x00, 0x41, 0xb6, 0x99, 0x17, 0xd1, 0x98, 0xbd, 0x81, 0xd6, 0xaf, 0x16, - 0x1b, 0x7d, 0x7e, 0xe6, 0xcb, 0xe0, 0xf7, 0x8e, 0x74, 0x87, 0xa8, 0x94, 0xde, 0xd6, 0xea, 0x6f, - 0xd1, 0x72, 0xa8, 0x2e, 0xe2, 0xde, 0x7f, 0x9e, 0xb2, 0x20, 0xa6, 0x2d, 0xec, 0x12, 0x32, 0xc1, - 0xfa, 0x25, 0xeb, 0xea, 0x53, 0xb9, 0x6a, 0x10, 0x83, 0xed, 0x6b, 0xee, 0x64, 0x57, 0x73, 0x6d, - 0xa3, 0x82, 0x2f, 0x5b, 0x3e, 0x6b, 0x51, 0xd6, 0x6d, 0x81, 0x32, 0x60, 0xdd, 0x69, 0x2e, 0xf9, - 0xf2, 0x80, 0x45, 0x4b, 0x7b, 0x7f, 0xb2, 0x28, 0x0b, 0x32, 0x78, 0x80, 0x72, 0xe1, 0x95, 0xe3, - 0x4a, 0x6a, 0x1e, 0x66, 0xf3, 0x65, 0xee, 0x2c, 0x1e, 0x0c, 0x69, 0xec, 0xb5, 0x8f, 0xdf, 0x7f, - 0x7f, 0xb9, 0x85, 0xf1, 0x32, 0x49, 0xe4, 0x17, 0x7f, 0x32, 0x50, 0x3e, 0x0e, 0x0d, 0x7e, 0x34, - 0x5f, 0x31, 0x19, 0x39, 0xf3, 0xf1, 0x8d, 0x66, 0x35, 0x40, 0x19, 0x00, 0xb6, 0xb0, 0x15, 0x5d, - 0x01, 0x30, 0x9c, 0xd5, 0xda, 0x54, 0xb9, 0x35, 0x12, 0xe7, 0x0b, 0x70, 0xe2, 0x08, 0x5d, 0x87, - 0x93, 0x0c, 0xe0, 0x75, 0x38, 0x33, 0x99, 0x5c, 0x80, 0x03, 0xd7, 0x15, 0xa4, 0x15, 0x7f, 0x33, - 0x50, 0x21, 0x91, 0x3c, 0xbc, 0xbb, 0xc0, 0x68, 0x26, 0xc3, 0x66, 0xed, 0x1f, 0x36, 0x34, 0x60, - 0x15, 0x00, 0x2b, 0x78, 0x7b, 0x3e, 0xe0, 0x44, 0xe2, 0xf1, 0x57, 0x03, 0xdd, 0x9b, 0x0e, 0x22, - 0x26, 0xf3, 0x4d, 0x53, 0x03, 0x6d, 0xee, 0xde, 0x7c, 0x41, 0x43, 0x3e, 0x01, 0xc8, 0x32, 0x7e, - 0x98, 0x0a, 0x49, 0x59, 0x37, 0x7a, 0xf7, 0xc1, 0x56, 0xfd, 0xc5, 0xf9, 0xc8, 0x32, 0x2e, 0x46, - 0x96, 0xf1, 0x6b, 0x64, 0x19, 0x9f, 0xc7, 0x56, 0xe6, 0x62, 0x6c, 0x65, 0x7e, 0x8c, 0xad, 0xcc, - 0xbb, 0xca, 0xc4, 0x0b, 0x95, 0x1e, 0xad, 0x6a, 0x08, 0xc8, 0xea, 0x87, 0x50, 0x14, 0x9e, 0x69, - 0x3b, 0x07, 0xff, 0xb6, 0x4f, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x1c, 0x23, 0x9a, 0xe5, - 0x05, 0x00, 0x00, +func init() { proto.RegisterFile("sgenetwork/sge/mint/query.proto", fileDescriptor_ee35ae03c8ab12c8) } + +var fileDescriptor_ee35ae03c8ab12c8 = []byte{ + // 581 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x3d, 0x6f, 0xd3, 0x40, + 0x1c, 0xc6, 0x63, 0x44, 0x22, 0x72, 0x54, 0xa4, 0xba, 0x16, 0xa8, 0xdc, 0xd4, 0x89, 0x2c, 0x9a, + 0x54, 0x40, 0x7c, 0x4d, 0x19, 0x10, 0x23, 0x51, 0x19, 0x2a, 0x31, 0x04, 0x33, 0xc1, 0x12, 0x39, + 0xc9, 0xd5, 0xb5, 0xda, 0xdc, 0x5d, 0x7d, 0xe7, 0x42, 0x56, 0x66, 0x06, 0x24, 0x3e, 0x01, 0x03, + 0xdf, 0xa5, 0x63, 0x25, 0x16, 0xc4, 0x50, 0xa1, 0x84, 0x81, 0x8f, 0x81, 0x7c, 0x3e, 0x3b, 0x89, + 0xe3, 0x34, 0xa5, 0x53, 0xa2, 0xff, 0xcb, 0xf3, 0xfc, 0xec, 0x7b, 0xce, 0xa0, 0xc2, 0x5d, 0x4c, + 0xb0, 0xf8, 0x40, 0xfd, 0x63, 0xc4, 0x5d, 0x8c, 0x06, 0x1e, 0x11, 0xe8, 0x34, 0xc0, 0xfe, 0xd0, + 0x62, 0x3e, 0x15, 0x14, 0xae, 0x4d, 0x06, 0x2c, 0xee, 0x62, 0x2b, 0x1c, 0xd0, 0xd7, 0x5d, 0xea, + 0x52, 0xd9, 0x47, 0xe1, 0xbf, 0x68, 0x54, 0x2f, 0xbb, 0x94, 0xba, 0x27, 0x18, 0x39, 0xcc, 0x43, + 0x0e, 0x21, 0x54, 0x38, 0xc2, 0xa3, 0x84, 0xab, 0x6e, 0x35, 0xcb, 0x89, 0x39, 0xbe, 0x33, 0x50, + 0x13, 0xe6, 0x3a, 0x80, 0x6f, 0x42, 0xe7, 0xb6, 0x2c, 0xda, 0xf8, 0x34, 0xc0, 0x5c, 0x98, 0x6d, + 0xb0, 0x36, 0x53, 0xe5, 0x8c, 0x12, 0x8e, 0xe1, 0x0b, 0x50, 0x88, 0x96, 0x37, 0xb4, 0xaa, 0xb6, + 0x73, 0x77, 0x6f, 0xd3, 0xca, 0x00, 0xb5, 0xa2, 0xa5, 0xd6, 0xed, 0xf3, 0xcb, 0x4a, 0xce, 0x56, + 0x0b, 0xe6, 0x43, 0x70, 0x5f, 0x2a, 0x1e, 0x90, 0xc3, 0x13, 0x89, 0x18, 0x5b, 0x1d, 0x82, 0x07, + 0xe9, 0x86, 0x72, 0x7b, 0x0d, 0x8a, 0x5e, 0x5c, 0x94, 0x86, 0x2b, 0x2d, 0x2b, 0xd4, 0xfc, 0x75, + 0x59, 0xa9, 0xb9, 0x9e, 0x38, 0x0a, 0xba, 0x56, 0x8f, 0x0e, 0x50, 0x8f, 0xf2, 0x01, 0xe5, 0xea, + 0xa7, 0xc1, 0xfb, 0xc7, 0x48, 0x0c, 0x19, 0xe6, 0xd6, 0x3e, 0xee, 0xd9, 0x13, 0x81, 0x04, 0xa0, + 0x7d, 0xe4, 0x70, 0xfc, 0x56, 0x60, 0x16, 0x03, 0x3c, 0x57, 0x00, 0x53, 0x0d, 0x05, 0xb0, 0x05, + 0x00, 0x0b, 0x8b, 0x1d, 0x2e, 0x30, 0x93, 0x04, 0x79, 0xbb, 0xc8, 0xe2, 0x31, 0x73, 0x0b, 0x6c, + 0x4e, 0x16, 0xdb, 0x3e, 0x3d, 0xf3, 0x78, 0xf8, 0xea, 0x63, 0xdd, 0x21, 0x28, 0x67, 0xb7, 0x95, + 0xfa, 0x3b, 0xb0, 0x1a, 0xa9, 0xb3, 0xa4, 0x77, 0xc3, 0xa7, 0x2c, 0xb1, 0x59, 0x0b, 0xb3, 0x0c, + 0x74, 0x69, 0xfd, 0x8a, 0xf4, 0xd5, 0x53, 0x39, 0x22, 0x48, 0xc0, 0xf6, 0x15, 0x77, 0xba, 0xab, + 0xb8, 0xb6, 0x41, 0xc9, 0xe3, 0x1d, 0x8f, 0x74, 0x30, 0xe9, 0x77, 0xa4, 0xb2, 0xc4, 0xba, 0x63, + 0xaf, 0x78, 0xfc, 0x80, 0xc4, 0x4b, 0x7b, 0x7f, 0xf3, 0x20, 0x2f, 0x65, 0x60, 0x00, 0x0a, 0xd1, + 0x91, 0xc3, 0x7a, 0x66, 0x1e, 0xe6, 0xf3, 0xa5, 0xef, 0x2c, 0x1f, 0x8c, 0x68, 0xcc, 0x8d, 0x4f, + 0x3f, 0xfe, 0x7c, 0xbd, 0x05, 0xe1, 0x6a, 0x3a, 0xbf, 0xf0, 0xb3, 0x06, 0x8a, 0x49, 0x68, 0xe0, + 0xe3, 0xc5, 0x8a, 0xe9, 0xc8, 0xe9, 0x4f, 0xae, 0x35, 0xab, 0x00, 0x6a, 0x12, 0xa0, 0x0a, 0x8d, + 0xf8, 0x08, 0x24, 0xc3, 0x59, 0xb3, 0x8b, 0x85, 0xd3, 0x44, 0x49, 0xbe, 0x24, 0x4e, 0x12, 0xa1, + 0xab, 0x70, 0xd2, 0x01, 0xbc, 0x0a, 0x67, 0x2e, 0x93, 0x4b, 0x70, 0xe4, 0x71, 0x85, 0x69, 0x85, + 0xdf, 0x35, 0x50, 0x4a, 0x25, 0x0f, 0xee, 0x2e, 0x31, 0x9a, 0xcb, 0xb0, 0xde, 0xfc, 0x8f, 0x0d, + 0x05, 0xd8, 0x90, 0x80, 0x75, 0xb8, 0xbd, 0x18, 0x70, 0x2a, 0xf1, 0xf0, 0x9b, 0x06, 0xee, 0xcd, + 0x06, 0x11, 0xa2, 0xc5, 0xa6, 0x99, 0x81, 0xd6, 0x77, 0xaf, 0xbf, 0xa0, 0x20, 0x9f, 0x4a, 0xc8, + 0x1a, 0x7c, 0x94, 0x09, 0x89, 0x49, 0x3f, 0xbe, 0xf7, 0xe1, 0x56, 0xeb, 0xe5, 0xf9, 0xc8, 0xd0, + 0x2e, 0x46, 0x86, 0xf6, 0x7b, 0x64, 0x68, 0x5f, 0xc6, 0x46, 0xee, 0x62, 0x6c, 0xe4, 0x7e, 0x8e, + 0x8d, 0xdc, 0xfb, 0xfa, 0xd4, 0x0d, 0xe5, 0x2e, 0x6e, 0x4c, 0x7f, 0x6b, 0x3f, 0x46, 0xa2, 0xf2, + 0x9a, 0x76, 0x0b, 0xf2, 0x6b, 0xfb, 0xec, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x96, 0x9d, 0xe6, + 0x23, 0xfb, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -733,7 +733,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/mint/query.proto", + Metadata: "sgenetwork/sge/mint/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/query.pb.gw.go b/x/mint/types/query.pb.gw.go index ce3ff122..33bc62a8 100644 --- a/x/mint/types/query.pb.gw.go +++ b/x/mint/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: sge/mint/query.proto +// source: sgenetwork/sge/mint/query.proto /* Package types is a reverse proxy. diff --git a/x/mint/types/tx.pb.go b/x/mint/types/tx.pb.go index b9a9d907..eab8c977 100644 --- a/x/mint/types/tx.pb.go +++ b/x/mint/types/tx.pb.go @@ -1,24 +1,29 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/mint/tx.proto +// source: sgenetwork/sge/mint/tx.proto package types import ( context "context" fmt "fmt" - math "math" - - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + _ "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 - _ = fmt.Errorf - _ = math.Inf -) +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. @@ -26,25 +31,142 @@ var ( // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -func init() { proto.RegisterFile("sge/mint/tx.proto", fileDescriptor_099d347a2b7c5fa8) } +// MsgUpdateParams is the Msg/UpdateParams request type. +// +// Since: cosmos-sdk 0.47 +type MsgUpdateParams struct { + // authority is the address that controls the module (defaults to x/gov unless overwritten). + Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` + // params defines the x/mint 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_e427455b4e24bcf3, []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: cosmos-sdk 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_e427455b4e24bcf3, []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 -var fileDescriptor_099d347a2b7c5fa8 = []byte{ - // 126 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x4e, 0x4c, 0x4c, - 0x4f, 0xd5, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, - 0x12, 0x01, 0x0b, 0x96, 0xa4, 0x26, 0x67, 0xe8, 0x81, 0x59, 0x7a, 0x20, 0x69, 0x23, 0x56, 0x2e, - 0x66, 0xdf, 0xe2, 0x74, 0x27, 0xa7, 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, 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x07, 0xeb, 0xd3, 0x05, - 0x19, 0x01, 0x61, 0xea, 0x57, 0x40, 0xed, 0xa8, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0xdb, 0x63, - 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x33, 0x8f, 0xe3, 0x7e, 0x00, 0x00, 0x00, +func init() { + proto.RegisterType((*MsgUpdateParams)(nil), "sgenetwork.sge.mint.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "sgenetwork.sge.mint.MsgUpdateParamsResponse") +} + +func init() { proto.RegisterFile("sgenetwork/sge/mint/tx.proto", fileDescriptor_e427455b4e24bcf3) } + +var fileDescriptor_e427455b4e24bcf3 = []byte{ + // 353 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, + 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x46, 0xc8, 0xea, 0x15, 0xa7, 0xa7, + 0xea, 0x81, 0x64, 0xa5, 0xc4, 0x93, 0xf3, 0x8b, 0x73, 0xf3, 0x8b, 0xf5, 0x73, 0x8b, 0xd3, 0xf5, + 0xcb, 0x0c, 0x41, 0x14, 0x44, 0xb5, 0x94, 0x60, 0x62, 0x6e, 0x66, 0x5e, 0xbe, 0x3e, 0x98, 0x84, + 0x0a, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, 0x16, 0x54, 0x54, 0x12, 0x62, 0x42, + 0x3c, 0x44, 0x02, 0xc2, 0x81, 0x4a, 0x29, 0x60, 0x73, 0x0f, 0x88, 0x48, 0x2d, 0xc2, 0xa7, 0xa2, + 0x20, 0xb1, 0x28, 0x31, 0x17, 0x6a, 0x86, 0xd2, 0x0e, 0x46, 0x2e, 0x7e, 0xdf, 0xe2, 0xf4, 0xd0, + 0x82, 0x94, 0xc4, 0x92, 0xd4, 0x00, 0xb0, 0x8c, 0x90, 0x19, 0x17, 0x67, 0x62, 0x69, 0x49, 0x46, + 0x7e, 0x51, 0x66, 0x49, 0xa5, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xc4, 0xa5, 0x2d, 0xba, + 0x22, 0x50, 0xcb, 0x1d, 0x53, 0x52, 0x8a, 0x52, 0x8b, 0x8b, 0x83, 0x4b, 0x8a, 0x32, 0xf3, 0xd2, + 0x83, 0x10, 0x4a, 0x85, 0xec, 0xb8, 0xd8, 0x20, 0x66, 0x4b, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x1b, + 0x49, 0xeb, 0x61, 0x09, 0x12, 0x3d, 0x88, 0x25, 0x4e, 0x9c, 0x27, 0xee, 0xc9, 0x33, 0xac, 0x78, + 0xbe, 0x41, 0x8b, 0x31, 0x08, 0xaa, 0xcb, 0x4a, 0xb7, 0xe9, 0xf9, 0x06, 0x2d, 0x84, 0x79, 0x5d, + 0xcf, 0x37, 0x68, 0x49, 0x81, 0x5c, 0x5d, 0x01, 0x71, 0x37, 0x9a, 0x33, 0x95, 0x24, 0xb9, 0xc4, + 0xd1, 0x84, 0x82, 0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x8d, 0x0a, 0xb8, 0x98, 0x7d, 0x8b, + 0xd3, 0x85, 0x92, 0xb8, 0x78, 0x50, 0x3c, 0xa6, 0x82, 0xd5, 0x41, 0x68, 0x86, 0x48, 0xe9, 0x10, + 0xa3, 0x0a, 0x66, 0x95, 0x14, 0x6b, 0x03, 0xc8, 0x0f, 0x4e, 0x8e, 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, 0xa5, 0x9e, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, + 0x0b, 0x8a, 0x03, 0x5d, 0xe4, 0xf8, 0x80, 0xfa, 0xac, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, + 0x1c, 0x23, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x34, 0x84, 0xdc, 0x2c, 0x67, 0x02, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. -var ( - _ context.Context - _ grpc.ClientConn -) +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. @@ -53,7 +175,13 @@ 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 interface { + // UpdateParams defines a governance operation for updating the x/mint module + // parameters. The authority is defaults to the x/gov module account. + // + // Since: cosmos-sdk 0.47 + UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) +} type msgClient struct { cc grpc1.ClientConn @@ -63,20 +191,417 @@ 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, "/sgenetwork.sge.mint.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{} +type MsgServer interface { + // UpdateParams defines a governance operation for updating the x/mint module + // parameters. The authority is defaults to the x/gov module account. + // + // Since: cosmos-sdk 0.47 + UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) +} // UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct{} +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: "/sgenetwork.sge.mint.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: "sgetech.sge.mint.Msg", + ServiceName: "sgenetwork.sge.mint.Msg", HandlerType: (*MsgServer)(nil), - Methods: []grpc.MethodDesc{}, - Streams: []grpc.StreamDesc{}, - Metadata: "sge/mint/tx.proto", + Methods: []grpc.MethodDesc{ + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "sgenetwork/sge/mint/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/orderbook/client/cli/query_bet_test.go b/x/orderbook/client/cli/query_bet_test.go index 8b27dcb5..e7bee7ea 100644 --- a/x/orderbook/client/cli/query_bet_test.go +++ b/x/orderbook/client/cli/query_bet_test.go @@ -4,6 +4,7 @@ import ( "fmt" "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/google/uuid" @@ -15,7 +16,6 @@ import ( "github.com/sge-network/sge/x/orderbook/types" "github.com/spf13/cast" "github.com/stretchr/testify/require" - tmcli "github.com/tendermint/tendermint/libs/cli" ) func networkWithParticipationBetObjects(t *testing.T, n int) (*network.Network, []types.ParticipationBetPair) { diff --git a/x/orderbook/client/cli/query_exposure_odds_test.go b/x/orderbook/client/cli/query_exposure_odds_test.go index 59508277..4609f4ff 100644 --- a/x/orderbook/client/cli/query_exposure_odds_test.go +++ b/x/orderbook/client/cli/query_exposure_odds_test.go @@ -4,6 +4,7 @@ import ( "fmt" "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/google/uuid" @@ -13,7 +14,6 @@ import ( "github.com/sge-network/sge/x/orderbook/types" "github.com/spf13/cast" "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/orderbook/client/cli/query_exposure_participation_test.go b/x/orderbook/client/cli/query_exposure_participation_test.go index 3cd0fc79..374aa600 100644 --- a/x/orderbook/client/cli/query_exposure_participation_test.go +++ b/x/orderbook/client/cli/query_exposure_participation_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" @@ -14,7 +15,6 @@ import ( "github.com/sge-network/sge/x/orderbook/types" "github.com/spf13/cast" "github.com/stretchr/testify/require" - tmcli "github.com/tendermint/tendermint/libs/cli" ) func networkWithParticipationExposureObjects(t *testing.T, n int) (*network.Network, []types.ParticipationExposure) { diff --git a/x/orderbook/client/cli/query_orderbook_test.go b/x/orderbook/client/cli/query_orderbook_test.go index feafbb4a..b563775b 100644 --- a/x/orderbook/client/cli/query_orderbook_test.go +++ b/x/orderbook/client/cli/query_orderbook_test.go @@ -4,6 +4,7 @@ import ( "fmt" "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/google/uuid" @@ -13,7 +14,6 @@ import ( "github.com/sge-network/sge/x/orderbook/types" "github.com/spf13/cast" "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/orderbook/client/cli/query_participation_test.go b/x/orderbook/client/cli/query_participation_test.go index ffdea63b..2db543e4 100644 --- a/x/orderbook/client/cli/query_participation_test.go +++ b/x/orderbook/client/cli/query_participation_test.go @@ -4,6 +4,7 @@ import ( "fmt" "testing" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" sdk "github.com/cosmos/cosmos-sdk/types" @@ -13,7 +14,6 @@ import ( "github.com/sge-network/sge/x/orderbook/types" "github.com/spf13/cast" "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/orderbook/keeper/keeper.go b/x/orderbook/keeper/keeper.go index 0945bca0..3e87eadd 100644 --- a/x/orderbook/keeper/keeper.go +++ b/x/orderbook/keeper/keeper.go @@ -5,10 +5,10 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" + "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/tendermint/tendermint/libs/log" "github.com/sge-network/sge/x/orderbook/types" ) diff --git a/x/orderbook/module.go b/x/orderbook/module.go index 4c8324f6..6431c695 100644 --- a/x/orderbook/module.go +++ b/x/orderbook/module.go @@ -5,6 +5,7 @@ import ( "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 +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/sge-network/sge/x/orderbook/client/cli" "github.com/sge-network/sge/x/orderbook/keeper" @@ -103,17 +103,9 @@ func NewAppModule(cdc codec.Codec, keeper keeper.Keeper) AppModule { // RegisterInvariants registers the orderbook module invariants. func (AppModule) RegisterInvariants(_ sdk.InvariantRegistry) {} -// Route returns the message routing key for the orderbook module. -func (AppModule) Route() sdk.Route { return sdk.Route{} } - // QuerierRoute returns the orderbook module's querier route name. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the orderbook module sdk.Querier. -func (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) { types.RegisterQueryServer(cfg.QueryServer(), am.keeper) diff --git a/x/orderbook/module_simulation.go b/x/orderbook/module_simulation.go index be771e5f..46bca310 100644 --- a/x/orderbook/module_simulation.go +++ b/x/orderbook/module_simulation.go @@ -5,7 +5,7 @@ import ( "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "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 +19,7 @@ import ( var ( _ = sample.AccAddress _ = orderbooksimulation.FindAccount - _ = simappparams.StakePerAccount + _ = simtestutil.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -41,7 +41,7 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP } // RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.ParamChange { +func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { return orderbooksimulation.ParamChanges(r) } diff --git a/x/orderbook/simulation/params.go b/x/orderbook/simulation/params.go index 78dc96a0..085859e6 100644 --- a/x/orderbook/simulation/params.go +++ b/x/orderbook/simulation/params.go @@ -21,19 +21,19 @@ const ( // ParamChanges defines the parameters that can be modified by param change proposals // on the simulation -func ParamChanges(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{ - simulation.NewSimParamChange(types.ModuleName, keyBatchSettlementCount, +func ParamChanges(_ *rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{ + simulation.NewSimLegacyParamChange(types.ModuleName, keyBatchSettlementCount, func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenBatchSettlementCount(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, keyMaxOrderBookParticipations, + simulation.NewSimLegacyParamChange(types.ModuleName, keyMaxOrderBookParticipations, func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenMaxOrderBookParticipations(r)) }, ), - simulation.NewSimParamChange(types.ModuleName, keyRequeueThreshold, + simulation.NewSimLegacyParamChange(types.ModuleName, keyRequeueThreshold, func(r *rand.Rand) string { return fmt.Sprintf("\"%d\"", GenRequeueThreshold(r)) }, diff --git a/x/orderbook/types/codec.go b/x/orderbook/types/codec.go index 5fb3ee9f..23721c39 100644 --- a/x/orderbook/types/codec.go +++ b/x/orderbook/types/codec.go @@ -3,7 +3,6 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" - cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -27,6 +26,6 @@ var ( func init() { RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) + // cryptocodec.RegisterCrypto(amino) sdk.RegisterLegacyAminoCodec(amino) } diff --git a/x/orderbook/types/exposure.pb.go b/x/orderbook/types/exposure.pb.go index 9b8f8885..8e160850 100644 --- a/x/orderbook/types/exposure.pb.go +++ b/x/orderbook/types/exposure.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/orderbook/exposure.proto +// source: sgenetwork/sge/orderbook/exposure.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -39,7 +39,7 @@ type OrderBookOddsExposure struct { func (m *OrderBookOddsExposure) Reset() { *m = OrderBookOddsExposure{} } func (*OrderBookOddsExposure) ProtoMessage() {} func (*OrderBookOddsExposure) Descriptor() ([]byte, []int) { - return fileDescriptor_3aa5f8fec7488c62, []int{0} + return fileDescriptor_59a6191091f0874f, []int{0} } func (m *OrderBookOddsExposure) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -92,7 +92,7 @@ type ParticipationExposure struct { func (m *ParticipationExposure) Reset() { *m = ParticipationExposure{} } func (*ParticipationExposure) ProtoMessage() {} func (*ParticipationExposure) Descriptor() ([]byte, []int) { - return fileDescriptor_3aa5f8fec7488c62, []int{1} + return fileDescriptor_59a6191091f0874f, []int{1} } func (m *ParticipationExposure) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -126,41 +126,43 @@ func init() { proto.RegisterType((*ParticipationExposure)(nil), "sgenetwork.sge.orderbook.ParticipationExposure") } -func init() { proto.RegisterFile("sge/orderbook/exposure.proto", fileDescriptor_3aa5f8fec7488c62) } +func init() { + proto.RegisterFile("sgenetwork/sge/orderbook/exposure.proto", fileDescriptor_59a6191091f0874f) +} -var fileDescriptor_3aa5f8fec7488c62 = []byte{ - // 492 bytes of a gzipped FileDescriptorProto +var fileDescriptor_59a6191091f0874f = []byte{ + // 493 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x53, 0x3f, 0x6f, 0xd3, 0x40, - 0x14, 0xb7, 0x49, 0xda, 0xa6, 0x47, 0x04, 0xad, 0x4b, 0x55, 0xab, 0xaa, 0x7c, 0xd1, 0x0d, 0x55, - 0x06, 0x6a, 0x0f, 0xdd, 0xb2, 0xd5, 0x40, 0xa5, 0xb0, 0x04, 0x2c, 0xb1, 0x20, 0x21, 0x2b, 0xce, - 0x5d, 0xcd, 0x29, 0xb1, 0xcf, 0xf8, 0xce, 0x22, 0xfd, 0x06, 0x8c, 0x8c, 0x4c, 0x28, 0x1f, 0xa7, - 0x63, 0x47, 0xc4, 0x70, 0x42, 0xce, 0x82, 0xd8, 0xf0, 0x27, 0x40, 0x3e, 0x27, 0xc6, 0x0d, 0x2c, - 0x6c, 0x4c, 0x79, 0xf7, 0x7b, 0xbf, 0x3f, 0xf7, 0xe2, 0x7b, 0xe0, 0x84, 0x87, 0xc4, 0x61, 0x29, - 0x26, 0x69, 0xc0, 0xd8, 0xd4, 0x21, 0xf3, 0x84, 0xf1, 0x2c, 0x25, 0x76, 0x92, 0x32, 0xc1, 0x0c, - 0x93, 0x87, 0x24, 0x26, 0xe2, 0x3d, 0x4b, 0xa7, 0x36, 0x0f, 0x89, 0x5d, 0x13, 0x8f, 0x1f, 0x85, - 0x2c, 0x64, 0x8a, 0xe4, 0x94, 0x55, 0xc5, 0x47, 0x3f, 0x75, 0x70, 0x38, 0x2a, 0x39, 0x2e, 0x63, - 0xd3, 0x11, 0xc6, 0xfc, 0xd9, 0xca, 0xcf, 0x78, 0x0e, 0x1e, 0x28, 0xb1, 0x5f, 0xaa, 0xfd, 0x8c, - 0x62, 0x53, 0xef, 0xe9, 0xfd, 0x5d, 0x17, 0xe5, 0x12, 0x76, 0x6b, 0xc9, 0xab, 0xe1, 0xd3, 0x1f, - 0x12, 0x6e, 0x30, 0xbd, 0x8d, 0xb3, 0x71, 0x0e, 0x3a, 0x0c, 0x63, 0xae, 0x5c, 0xee, 0x29, 0x97, - 0xa3, 0x5c, 0xc2, 0x9d, 0x32, 0xaf, 0x32, 0xa8, 0xdb, 0x5e, 0x5d, 0x19, 0x43, 0xb0, 0x7f, 0x95, - 0xcd, 0xae, 0xe8, 0x6c, 0x16, 0x91, 0x58, 0xf8, 0xef, 0x32, 0x92, 0x11, 0xb3, 0xd5, 0x6b, 0xf5, - 0xdb, 0xee, 0x49, 0x21, 0xa1, 0x79, 0x3d, 0x8e, 0x66, 0x03, 0xf4, 0x07, 0x05, 0x79, 0x7b, 0x0d, - 0xec, 0x65, 0x09, 0x0d, 0xba, 0x1f, 0x16, 0x50, 0xfb, 0xb4, 0x80, 0xda, 0xf7, 0x05, 0xd4, 0xd0, - 0xe7, 0x36, 0x38, 0x7c, 0x31, 0x4e, 0x05, 0x9d, 0xd0, 0x64, 0x2c, 0x28, 0x8b, 0xff, 0x9f, 0x99, - 0x47, 0xe0, 0x20, 0x69, 0xde, 0xcc, 0xa7, 0x31, 0x26, 0x73, 0xb3, 0xd5, 0xd3, 0xfb, 0x6d, 0xd7, - 0x2a, 0x24, 0x3c, 0xae, 0xa6, 0xfe, 0x0b, 0x09, 0x79, 0xc6, 0x1d, 0x74, 0x58, 0x82, 0xc6, 0x1b, - 0xd0, 0x59, 0xbf, 0x10, 0xb3, 0xad, 0x6e, 0x71, 0x71, 0x23, 0xa1, 0xf6, 0x55, 0xc2, 0xd3, 0x90, - 0x8a, 0xb7, 0x59, 0x60, 0x4f, 0x58, 0xe4, 0x4c, 0x18, 0x8f, 0x18, 0x5f, 0xfd, 0x9c, 0x71, 0x3c, - 0x75, 0xc4, 0x75, 0x42, 0xb8, 0x3d, 0x8c, 0x45, 0x21, 0xe1, 0xc3, 0x2a, 0x73, 0xed, 0x83, 0xbc, - 0xda, 0xd2, 0x08, 0x00, 0x08, 0x88, 0xf0, 0xc7, 0x11, 0xcb, 0x62, 0x61, 0x6e, 0xa9, 0x80, 0x27, - 0xff, 0x1c, 0xb0, 0x5f, 0x05, 0xfc, 0x76, 0x42, 0xde, 0x6e, 0x40, 0xc4, 0x85, 0xaa, 0x8d, 0x01, - 0xe8, 0x52, 0xee, 0xaf, 0xbe, 0x29, 0xc1, 0xe6, 0x76, 0x4f, 0xef, 0x77, 0xdc, 0xa3, 0x42, 0xc2, - 0x83, 0x4a, 0xd7, 0xec, 0x22, 0xef, 0x3e, 0xe5, 0x97, 0xeb, 0x93, 0x71, 0x0a, 0xb6, 0x52, 0x96, - 0xc5, 0xd8, 0xdc, 0x51, 0xff, 0xe0, 0x5e, 0x21, 0x61, 0xb7, 0x12, 0x29, 0x18, 0x79, 0x55, 0xfb, - 0xee, 0x03, 0x71, 0x2f, 0x6f, 0x72, 0x4b, 0xbf, 0xcd, 0x2d, 0xfd, 0x5b, 0x6e, 0xe9, 0x1f, 0x97, - 0x96, 0x76, 0xbb, 0xb4, 0xb4, 0x2f, 0x4b, 0x4b, 0x7b, 0xfd, 0xb8, 0x31, 0x13, 0x0f, 0xc9, 0xd9, - 0x6a, 0xd5, 0xca, 0xda, 0x99, 0x37, 0xb6, 0x52, 0x4d, 0x17, 0x6c, 0xab, 0x1d, 0x3b, 0xff, 0x15, - 0x00, 0x00, 0xff, 0xff, 0xb7, 0x6c, 0xd1, 0xe8, 0xb3, 0x03, 0x00, 0x00, + 0x14, 0xb7, 0x49, 0xda, 0xa6, 0x47, 0x04, 0xad, 0x4b, 0x55, 0xab, 0x42, 0xbe, 0xe8, 0x86, 0x92, + 0x81, 0xda, 0x43, 0xb7, 0x6c, 0x35, 0x50, 0x29, 0x2c, 0x01, 0x4b, 0x2c, 0x48, 0xc8, 0x8a, 0x73, + 0x57, 0x73, 0x4a, 0xec, 0x33, 0xbe, 0xb3, 0x48, 0xbf, 0x01, 0x23, 0x23, 0x13, 0xca, 0xc7, 0xe9, + 0xd8, 0x11, 0x31, 0x9c, 0x90, 0xb3, 0x20, 0x36, 0xfc, 0x09, 0x90, 0xcf, 0x89, 0xeb, 0x16, 0x16, + 0xb6, 0x4e, 0x79, 0xf7, 0x7b, 0xbf, 0x3f, 0xf7, 0xe2, 0x7b, 0xe0, 0x09, 0x0f, 0x49, 0x4c, 0xc4, + 0x47, 0x96, 0x4e, 0x1d, 0x1e, 0x12, 0x87, 0xa5, 0x98, 0xa4, 0x01, 0x63, 0x53, 0x87, 0xcc, 0x13, + 0xc6, 0xb3, 0x94, 0xd8, 0x49, 0xca, 0x04, 0x33, 0xcc, 0x6b, 0xa2, 0xcd, 0x43, 0x62, 0xd7, 0xc4, + 0xc3, 0x47, 0x21, 0x0b, 0x99, 0x22, 0x39, 0x65, 0x55, 0xf1, 0xd1, 0x6f, 0x1d, 0xec, 0x8f, 0x4a, + 0x8e, 0xcb, 0xd8, 0x74, 0x84, 0x31, 0x7f, 0xb1, 0xf2, 0x33, 0x5e, 0x82, 0x07, 0x4a, 0xec, 0x97, + 0x6a, 0x3f, 0xa3, 0xd8, 0xd4, 0x7b, 0x7a, 0x7f, 0xdb, 0x45, 0xb9, 0x84, 0xdd, 0x5a, 0xf2, 0x66, + 0xf8, 0xfc, 0x97, 0x84, 0xb7, 0x98, 0xde, 0xad, 0xb3, 0x71, 0x02, 0x3a, 0x0c, 0x63, 0xae, 0x5c, + 0xee, 0x29, 0x97, 0x83, 0x5c, 0xc2, 0xad, 0x32, 0xaf, 0x32, 0xa8, 0xdb, 0x5e, 0x5d, 0x19, 0x43, + 0xb0, 0x7b, 0x9e, 0xcd, 0xce, 0xe9, 0x6c, 0x16, 0x91, 0x58, 0xf8, 0x1f, 0x32, 0x92, 0x11, 0xb3, + 0xd5, 0x6b, 0xf5, 0xdb, 0xee, 0xe3, 0x42, 0x42, 0xf3, 0x62, 0x1c, 0xcd, 0x06, 0xe8, 0x2f, 0x0a, + 0xf2, 0x76, 0x1a, 0xd8, 0xeb, 0x12, 0x1a, 0x74, 0x3f, 0x2d, 0xa0, 0xf6, 0x65, 0x01, 0xb5, 0x9f, + 0x0b, 0xa8, 0xa1, 0xaf, 0x6d, 0xb0, 0xff, 0x6a, 0x9c, 0x0a, 0x3a, 0xa1, 0xc9, 0x58, 0x50, 0x16, + 0xdf, 0x9d, 0x99, 0x47, 0x60, 0x2f, 0x69, 0xde, 0xcc, 0xa7, 0x31, 0x26, 0x73, 0xb3, 0xd5, 0xd3, + 0xfb, 0x6d, 0xd7, 0x2a, 0x24, 0x3c, 0xac, 0xa6, 0xfe, 0x07, 0x09, 0x79, 0xc6, 0x0d, 0x74, 0x58, + 0x82, 0xc6, 0x3b, 0xd0, 0x59, 0xbf, 0x10, 0xb3, 0xad, 0x6e, 0x71, 0x7a, 0x29, 0xa1, 0xf6, 0x5d, + 0xc2, 0xa3, 0x90, 0x8a, 0xf7, 0x59, 0x60, 0x4f, 0x58, 0xe4, 0x4c, 0x18, 0x8f, 0x18, 0x5f, 0xfd, + 0x1c, 0x73, 0x3c, 0x75, 0xc4, 0x45, 0x42, 0xb8, 0x3d, 0x8c, 0x45, 0x21, 0xe1, 0xc3, 0x2a, 0x73, + 0xed, 0x83, 0xbc, 0xda, 0xd2, 0x08, 0x00, 0x08, 0x88, 0xf0, 0xc7, 0x11, 0xcb, 0x62, 0x61, 0x6e, + 0xa8, 0x80, 0x67, 0xff, 0x1d, 0xb0, 0x5b, 0x05, 0x5c, 0x3b, 0x21, 0x6f, 0x3b, 0x20, 0xe2, 0x54, + 0xd5, 0xc6, 0x00, 0x74, 0x29, 0xf7, 0x57, 0xdf, 0x94, 0x60, 0x73, 0xb3, 0xa7, 0xf7, 0x3b, 0xee, + 0x41, 0x21, 0xe1, 0x5e, 0xa5, 0x6b, 0x76, 0x91, 0x77, 0x9f, 0xf2, 0xb3, 0xf5, 0xc9, 0x38, 0x02, + 0x1b, 0x29, 0xcb, 0x62, 0x6c, 0x6e, 0xa9, 0x7f, 0x70, 0xa7, 0x90, 0xb0, 0x5b, 0x89, 0x14, 0x8c, + 0xbc, 0xaa, 0x7d, 0xf3, 0x81, 0xb8, 0x67, 0x97, 0xb9, 0xa5, 0x5f, 0xe5, 0x96, 0xfe, 0x23, 0xb7, + 0xf4, 0xcf, 0x4b, 0x4b, 0xbb, 0x5a, 0x5a, 0xda, 0xb7, 0xa5, 0xa5, 0xbd, 0x7d, 0xda, 0x98, 0x89, + 0x87, 0xe4, 0xb8, 0xb9, 0x93, 0xf3, 0xc6, 0x56, 0xaa, 0xe9, 0x82, 0x4d, 0xb5, 0x63, 0x27, 0x7f, + 0x02, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x47, 0x96, 0xa5, 0xbe, 0x03, 0x00, 0x00, } func (m *OrderBookOddsExposure) Marshal() (dAtA []byte, err error) { diff --git a/x/orderbook/types/genesis.pb.go b/x/orderbook/types/genesis.pb.go index 192e9abb..7c5dfe68 100644 --- a/x/orderbook/types/genesis.pb.go +++ b/x/orderbook/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/orderbook/genesis.proto +// source: sgenetwork/sge/orderbook/genesis.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -55,7 +55,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_b54e9379cfb7d94d, []int{0} + return fileDescriptor_4a689324a065c0a7, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -151,40 +151,42 @@ func init() { proto.RegisterType((*GenesisState)(nil), "sgenetwork.sge.orderbook.GenesisState") } -func init() { proto.RegisterFile("sge/orderbook/genesis.proto", fileDescriptor_b54e9379cfb7d94d) } +func init() { + proto.RegisterFile("sgenetwork/sge/orderbook/genesis.proto", fileDescriptor_4a689324a065c0a7) +} -var fileDescriptor_b54e9379cfb7d94d = []byte{ - // 473 bytes of a gzipped FileDescriptorProto +var fileDescriptor_4a689324a065c0a7 = []byte{ + // 475 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xcf, 0x6b, 0xd4, 0x40, - 0x14, 0xc7, 0x37, 0xb6, 0xdd, 0xea, 0x54, 0x11, 0x82, 0x42, 0x9a, 0xda, 0x18, 0xad, 0xc8, 0x1e, - 0x34, 0x91, 0x7a, 0xf7, 0x10, 0xfc, 0x81, 0x20, 0x34, 0xea, 0xcd, 0x4b, 0x98, 0x6c, 0x86, 0x74, - 0xd8, 0x36, 0x2f, 0xcc, 0xcc, 0xe2, 0xe6, 0xae, 0x17, 0x4f, 0xfe, 0x59, 0x3d, 0xf6, 0xe8, 0x49, - 0x64, 0x17, 0xff, 0x0f, 0xc9, 0xcc, 0x64, 0xcd, 0xb4, 0x89, 0x06, 0x7a, 0x9b, 0xdd, 0xf7, 0x7d, - 0xdf, 0xcf, 0xf7, 0x3d, 0x32, 0x83, 0xf6, 0x78, 0x4e, 0x42, 0x60, 0x19, 0x61, 0x29, 0xc0, 0x2c, - 0xcc, 0x49, 0x41, 0x38, 0xe5, 0x41, 0xc9, 0x40, 0x80, 0xed, 0xf0, 0xfa, 0xb7, 0xf8, 0x0c, 0x6c, - 0x16, 0xf0, 0x9c, 0x04, 0x6b, 0x9d, 0x7b, 0x27, 0x87, 0x1c, 0xa4, 0x28, 0xac, 0x4f, 0x4a, 0xef, - 0xba, 0xa6, 0x59, 0x89, 0x19, 0x3e, 0xd5, 0x5e, 0xee, 0xbe, 0x59, 0x5b, 0x9f, 0x74, 0xf9, 0xc1, - 0xa5, 0x56, 0x41, 0xa7, 0xb4, 0xc4, 0x82, 0x42, 0xa1, 0x25, 0xbb, 0xa6, 0x84, 0x0b, 0x2c, 0x1a, - 0xf3, 0x7b, 0x66, 0x89, 0x2c, 0x4a, 0xe0, 0x73, 0x46, 0x54, 0xf5, 0xe1, 0xef, 0x6d, 0x74, 0xf3, - 0x8d, 0x1a, 0xec, 0xa3, 0xc0, 0x82, 0xd8, 0x2f, 0xd0, 0x58, 0x65, 0x73, 0x2c, 0xdf, 0x9a, 0xec, - 0x1c, 0xfa, 0x41, 0xdf, 0xa0, 0x41, 0x2c, 0x75, 0xd1, 0xe6, 0xd9, 0xcf, 0xfb, 0xa3, 0x0f, 0xba, - 0xcb, 0x7e, 0x8f, 0x6e, 0x4b, 0x45, 0x52, 0x4b, 0x92, 0x13, 0xca, 0x85, 0x73, 0xcd, 0xdf, 0x98, - 0xec, 0x1c, 0x1e, 0xf4, 0x1b, 0x1d, 0xd5, 0xa7, 0x08, 0x60, 0xa6, 0xbd, 0x6e, 0x41, 0xf3, 0xc7, - 0x3b, 0xca, 0x85, 0x5d, 0xa1, 0xfd, 0x96, 0xa5, 0x31, 0xbe, 0x02, 0x6c, 0x48, 0xc0, 0xb3, 0x01, - 0x80, 0xb8, 0xdd, 0xac, 0x69, 0x2e, 0x74, 0x56, 0x25, 0xba, 0x40, 0x4e, 0x0b, 0xdd, 0xec, 0x4e, - 0x51, 0x37, 0x25, 0x35, 0x1c, 0x40, 0x3d, 0xca, 0x32, 0xfe, 0x4a, 0xf7, 0x6a, 0xe8, 0xdd, 0x35, - 0xb4, 0x29, 0x48, 0xde, 0x1c, 0xed, 0x99, 0xf3, 0x99, 0xc8, 0xad, 0xff, 0x21, 0x8d, 0x09, 0x2e, - 0x20, 0x77, 0xcb, 0xae, 0xa2, 0xc4, 0x7e, 0xb5, 0xd0, 0xa3, 0x1e, 0x6e, 0x5a, 0x25, 0xb4, 0xc8, - 0xc8, 0x42, 0x05, 0x18, 0x5f, 0x25, 0x80, 0xdf, 0x19, 0x20, 0xaa, 0xde, 0xd6, 0xfe, 0x32, 0xc7, - 0x37, 0x0b, 0x3d, 0x3e, 0xa6, 0x5c, 0x00, 0xa3, 0x53, 0x7c, 0x92, 0xfc, 0x6b, 0x15, 0xdb, 0x57, - 0x49, 0x72, 0xf0, 0x17, 0x12, 0xf7, 0x2e, 0xe5, 0xcb, 0xa5, 0xa5, 0xa4, 0x44, 0x24, 0x25, 0xa6, - 0xec, 0x42, 0x94, 0xeb, 0x32, 0x4a, 0x30, 0x30, 0x4a, 0x44, 0x44, 0x8c, 0x29, 0xeb, 0xdc, 0x89, - 0xae, 0x19, 0x31, 0x5e, 0xa2, 0x2d, 0x79, 0x9d, 0x9d, 0x1b, 0xf2, 0x3e, 0x4e, 0x06, 0x7c, 0x6f, - 0xf5, 0x4d, 0x6e, 0xee, 0xa5, 0x6a, 0x8e, 0x5e, 0x9f, 0x2d, 0x3d, 0xeb, 0x7c, 0xe9, 0x59, 0xbf, - 0x96, 0x9e, 0xf5, 0x7d, 0xe5, 0x8d, 0xce, 0x57, 0xde, 0xe8, 0xc7, 0xca, 0x1b, 0x7d, 0x7a, 0x92, - 0x53, 0x71, 0x3c, 0x4f, 0x83, 0x29, 0x9c, 0x86, 0x3c, 0x27, 0x4f, 0xb5, 0x77, 0x7d, 0x0e, 0x17, - 0xad, 0x87, 0x43, 0x54, 0x25, 0xe1, 0xe9, 0x58, 0x3e, 0x1b, 0xcf, 0xff, 0x04, 0x00, 0x00, 0xff, - 0xff, 0xe8, 0x80, 0x96, 0xed, 0x1c, 0x05, 0x00, 0x00, + 0x14, 0xc7, 0x37, 0xb6, 0xdd, 0xea, 0x54, 0x11, 0x16, 0x85, 0xb8, 0x62, 0x0c, 0xb6, 0xd6, 0x1c, + 0x6a, 0x22, 0xf5, 0xee, 0x21, 0xf8, 0x03, 0x41, 0x68, 0xd4, 0x9b, 0x97, 0x30, 0xd9, 0x0c, 0xe9, + 0xb0, 0x6d, 0x5e, 0x98, 0x99, 0xc5, 0xcd, 0x5d, 0x2f, 0x9e, 0xfc, 0xb3, 0x7a, 0xec, 0xd1, 0x93, + 0xc8, 0x2e, 0xfe, 0x1f, 0x92, 0x99, 0xc9, 0x36, 0xa9, 0x99, 0x36, 0xb0, 0xb7, 0x21, 0xf3, 0x7d, + 0xef, 0xf3, 0x9d, 0x2f, 0x79, 0x0f, 0xed, 0xf3, 0x8c, 0xe4, 0x44, 0x7c, 0x05, 0x36, 0x0d, 0x78, + 0x46, 0x02, 0x60, 0x29, 0x61, 0x09, 0xc0, 0x34, 0xa8, 0xbe, 0x73, 0xca, 0xfd, 0x82, 0x81, 0x80, + 0x91, 0x7d, 0xa1, 0xf3, 0x79, 0x46, 0xfc, 0x95, 0x6e, 0x7c, 0x2f, 0x83, 0x0c, 0xa4, 0x28, 0xa8, + 0x4e, 0x4a, 0x3f, 0x7e, 0x6a, 0xec, 0x5b, 0x60, 0x86, 0x4f, 0x75, 0xdb, 0xb1, 0x67, 0x94, 0xad, + 0x4e, 0x5a, 0x79, 0x70, 0x55, 0x43, 0x41, 0x27, 0xb4, 0xc0, 0x82, 0x42, 0xae, 0xd5, 0x7b, 0x46, + 0x35, 0x17, 0x58, 0xd4, 0xf4, 0x67, 0x46, 0x15, 0x99, 0x17, 0xc0, 0x67, 0x8c, 0x28, 0xe1, 0x93, + 0xbf, 0xdb, 0xe8, 0xf6, 0x3b, 0x95, 0xc7, 0x67, 0x81, 0x05, 0x19, 0xbd, 0x42, 0x43, 0xf5, 0x0e, + 0xdb, 0x72, 0x2d, 0x6f, 0xe7, 0xd0, 0xf5, 0x4d, 0xf9, 0xf8, 0x91, 0xd4, 0x85, 0x9b, 0x67, 0xbf, + 0x1f, 0x0f, 0x3e, 0xe9, 0xaa, 0xd1, 0x47, 0x74, 0x57, 0x2a, 0xe2, 0x4a, 0x12, 0x9f, 0x50, 0x2e, + 0xec, 0x1b, 0xee, 0x86, 0xb7, 0x73, 0xb8, 0x6b, 0x6e, 0x74, 0x54, 0x9d, 0x42, 0x80, 0xa9, 0xee, + 0x75, 0x07, 0xea, 0x0f, 0x1f, 0x28, 0x17, 0xa3, 0x12, 0x3d, 0x6a, 0xb4, 0x6c, 0x85, 0xa2, 0x00, + 0x1b, 0x12, 0xf0, 0xa2, 0x07, 0x20, 0x6a, 0x16, 0x6b, 0xda, 0x18, 0x3a, 0x6f, 0x25, 0x3a, 0x47, + 0x76, 0x03, 0x5d, 0x67, 0xa7, 0xa8, 0x9b, 0x92, 0x1a, 0xf4, 0xa0, 0x1e, 0xa5, 0x29, 0x7f, 0xa3, + 0x6b, 0x35, 0xf4, 0xfe, 0x0a, 0x5a, 0x5f, 0x48, 0xde, 0x0c, 0x3d, 0x6c, 0xbf, 0xaf, 0x8d, 0xdc, + 0xba, 0x0e, 0xd9, 0x7a, 0xc1, 0x25, 0xe4, 0x83, 0xa2, 0xeb, 0x52, 0x62, 0xbf, 0x5b, 0x68, 0xcf, + 0xc0, 0x4d, 0xca, 0x98, 0xe6, 0x29, 0x99, 0x2b, 0x03, 0xc3, 0x75, 0x0c, 0xb8, 0x9d, 0x06, 0xc2, + 0xf2, 0x7d, 0xd5, 0x5f, 0xfa, 0xf8, 0x61, 0xa1, 0xfd, 0x63, 0xca, 0x05, 0x30, 0x3a, 0xc1, 0x27, + 0xf1, 0x55, 0x51, 0x6c, 0xaf, 0xe3, 0x64, 0xf7, 0x02, 0x12, 0x19, 0x43, 0xf9, 0xf6, 0x5f, 0x28, + 0x09, 0x11, 0x71, 0x81, 0x29, 0xbb, 0x64, 0xe5, 0xa6, 0xb4, 0xe2, 0xf7, 0xb4, 0x12, 0x12, 0x11, + 0x61, 0xca, 0x3a, 0x33, 0xd1, 0x77, 0x2d, 0x1b, 0xaf, 0xd1, 0x96, 0x9c, 0x6c, 0xfb, 0x96, 0x9c, + 0x47, 0xaf, 0xc7, 0xff, 0x56, 0x4d, 0x72, 0x3d, 0x97, 0xaa, 0x38, 0x7c, 0x7b, 0xb6, 0x70, 0xac, + 0xf3, 0x85, 0x63, 0xfd, 0x59, 0x38, 0xd6, 0xcf, 0xa5, 0x33, 0x38, 0x5f, 0x3a, 0x83, 0x5f, 0x4b, + 0x67, 0xf0, 0xe5, 0x20, 0xa3, 0xe2, 0x78, 0x96, 0xf8, 0x13, 0x38, 0xad, 0x56, 0xc5, 0xf3, 0xe6, + 0xda, 0x98, 0x37, 0x16, 0x87, 0x28, 0x0b, 0xc2, 0x93, 0xa1, 0x5c, 0x1b, 0x2f, 0xff, 0x05, 0x00, + 0x00, 0xff, 0xff, 0x7b, 0x59, 0x46, 0x26, 0x5e, 0x05, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/orderbook/types/orderbook.pb.go b/x/orderbook/types/orderbook.pb.go index 2915dc3a..bbdcf716 100644 --- a/x/orderbook/types/orderbook.pb.go +++ b/x/orderbook/types/orderbook.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/orderbook/orderbook.proto +// source: sgenetwork/sge/orderbook/orderbook.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -56,7 +56,7 @@ func (x OrderBookStatus) String() string { } func (OrderBookStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_7247ccc164993ca5, []int{0} + return fileDescriptor_99b9fb43f10754c7, []int{0} } // OrderBook represents the order book maintained against a market. @@ -74,7 +74,7 @@ type OrderBook struct { func (m *OrderBook) Reset() { *m = OrderBook{} } func (*OrderBook) ProtoMessage() {} func (*OrderBook) Descriptor() ([]byte, []int) { - return fileDescriptor_7247ccc164993ca5, []int{0} + return fileDescriptor_99b9fb43f10754c7, []int{0} } func (m *OrderBook) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -108,35 +108,37 @@ func init() { proto.RegisterType((*OrderBook)(nil), "sgenetwork.sge.orderbook.OrderBook") } -func init() { proto.RegisterFile("sge/orderbook/orderbook.proto", fileDescriptor_7247ccc164993ca5) } +func init() { + proto.RegisterFile("sgenetwork/sge/orderbook/orderbook.proto", fileDescriptor_99b9fb43f10754c7) +} -var fileDescriptor_7247ccc164993ca5 = []byte{ - // 399 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x4e, 0x4f, 0xd5, - 0xcf, 0x2f, 0x4a, 0x49, 0x2d, 0x4a, 0xca, 0xcf, 0xcf, 0x46, 0xb0, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, - 0xf2, 0x85, 0x24, 0x8a, 0xd3, 0x53, 0xf3, 0x52, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0xf5, 0x8a, 0xd3, - 0x53, 0xf5, 0xe0, 0xf2, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0x45, 0xfa, 0x20, 0x16, 0x44, - 0xbd, 0x52, 0x2b, 0x13, 0x17, 0xa7, 0x3f, 0x48, 0x8d, 0x53, 0x7e, 0x7e, 0xb6, 0x90, 0x02, 0x17, - 0x73, 0x69, 0x66, 0x8a, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x13, 0xdf, 0xa3, 0x7b, 0xf2, 0xcc, - 0xa1, 0x9e, 0x2e, 0xaf, 0xee, 0xc9, 0x83, 0x44, 0x83, 0x40, 0x84, 0x90, 0x3f, 0x97, 0x70, 0x41, - 0x62, 0x51, 0x49, 0x66, 0x72, 0x66, 0x41, 0x62, 0x49, 0x66, 0x7e, 0x5e, 0x7c, 0x72, 0x7e, 0x69, - 0x5e, 0x89, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x8b, 0x93, 0xdc, 0xa7, 0x7b, 0xf2, 0x52, 0x95, 0x89, - 0xb9, 0x39, 0x56, 0x4a, 0x58, 0x14, 0x29, 0x05, 0x09, 0xa1, 0x88, 0x3a, 0x83, 0x04, 0x85, 0x4c, - 0xb8, 0xb8, 0xf2, 0x53, 0x52, 0x8a, 0xa1, 0xe6, 0x30, 0x83, 0xcd, 0x11, 0xfd, 0x74, 0x4f, 0x5e, - 0x10, 0x62, 0x0e, 0x42, 0x4e, 0x29, 0x88, 0x13, 0xc4, 0x81, 0xe8, 0x72, 0xe4, 0x62, 0x2b, 0x2e, - 0x49, 0x2c, 0x29, 0x2d, 0x96, 0x60, 0x51, 0x60, 0xd4, 0xe0, 0x33, 0xd2, 0xd4, 0xc3, 0xe5, 0x6f, - 0x3d, 0xb8, 0xef, 0x82, 0xc1, 0x1a, 0x82, 0xa0, 0x1a, 0xad, 0x78, 0x3a, 0x16, 0xc8, 0x33, 0xcc, - 0x58, 0x20, 0xcf, 0xf0, 0x62, 0x81, 0x3c, 0x83, 0xd6, 0x32, 0x46, 0x2e, 0x7e, 0x34, 0x95, 0x42, - 0x8a, 0x5c, 0xb2, 0xfe, 0x41, 0x2e, 0xae, 0x41, 0xf1, 0x4e, 0xfe, 0xfe, 0xde, 0xf1, 0xc1, 0x21, - 0x8e, 0x21, 0xa1, 0xc1, 0xf1, 0xa1, 0x7e, 0xc1, 0x01, 0xae, 0xce, 0x9e, 0x6e, 0x9e, 0xae, 0x2e, - 0x02, 0x0c, 0x42, 0xca, 0x5c, 0xf2, 0x98, 0x4a, 0xa0, 0x94, 0xa3, 0x73, 0x88, 0x67, 0x98, 0xab, - 0x00, 0xa3, 0x90, 0x2a, 0x97, 0x22, 0x4e, 0x45, 0x41, 0xae, 0xc1, 0xfe, 0x3e, 0x61, 0xae, 0x2e, - 0x02, 0x4c, 0x42, 0x2a, 0x5c, 0x0a, 0x38, 0x95, 0x05, 0xbb, 0x86, 0x84, 0xf8, 0xb8, 0xba, 0x08, - 0x30, 0x3b, 0xb9, 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, 0x4e, 0x7a, - 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x71, 0x7a, 0xaa, 0x2e, 0x34, 0x38, - 0x40, 0x6c, 0xfd, 0x0a, 0xa4, 0x24, 0x53, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x8e, 0x7f, - 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x78, 0x55, 0x09, 0x50, 0x02, 0x00, 0x00, +var fileDescriptor_99b9fb43f10754c7 = []byte{ + // 398 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x28, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x2f, 0x4a, 0x49, 0x2d, + 0x4a, 0xca, 0xcf, 0xcf, 0x46, 0xb0, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x24, 0x10, 0x2a, + 0xf5, 0x8a, 0xd3, 0x53, 0xf5, 0xe0, 0xf2, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0x45, 0xfa, + 0x20, 0x16, 0x44, 0xbd, 0x52, 0x2b, 0x13, 0x17, 0xa7, 0x3f, 0x48, 0x8d, 0x53, 0x7e, 0x7e, 0xb6, + 0x90, 0x02, 0x17, 0x73, 0x69, 0x66, 0x8a, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x13, 0xdf, 0xa3, + 0x7b, 0xf2, 0xcc, 0xa1, 0x9e, 0x2e, 0xaf, 0xee, 0xc9, 0x83, 0x44, 0x83, 0x40, 0x84, 0x90, 0x3f, + 0x97, 0x70, 0x41, 0x62, 0x51, 0x49, 0x66, 0x72, 0x66, 0x41, 0x62, 0x49, 0x66, 0x7e, 0x5e, 0x7c, + 0x72, 0x7e, 0x69, 0x5e, 0x89, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x8b, 0x93, 0xdc, 0xa7, 0x7b, 0xf2, + 0x52, 0x95, 0x89, 0xb9, 0x39, 0x56, 0x4a, 0x58, 0x14, 0x29, 0x05, 0x09, 0xa1, 0x88, 0x3a, 0x83, + 0x04, 0x85, 0x4c, 0xb8, 0xb8, 0xf2, 0x53, 0x52, 0x8a, 0xa1, 0xe6, 0x30, 0x83, 0xcd, 0x11, 0xfd, + 0x74, 0x4f, 0x5e, 0x10, 0x62, 0x0e, 0x42, 0x4e, 0x29, 0x88, 0x13, 0xc4, 0x81, 0xe8, 0x72, 0xe4, + 0x62, 0x2b, 0x2e, 0x49, 0x2c, 0x29, 0x2d, 0x96, 0x60, 0x51, 0x60, 0xd4, 0xe0, 0x33, 0xd2, 0xd4, + 0xc3, 0xe5, 0x6f, 0x3d, 0xb8, 0xef, 0x82, 0xc1, 0x1a, 0x82, 0xa0, 0x1a, 0xad, 0x78, 0x3a, 0x16, + 0xc8, 0x33, 0xcc, 0x58, 0x20, 0xcf, 0xf0, 0x62, 0x81, 0x3c, 0x83, 0xd6, 0x32, 0x46, 0x2e, 0x7e, + 0x34, 0x95, 0x42, 0x8a, 0x5c, 0xb2, 0xfe, 0x41, 0x2e, 0xae, 0x41, 0xf1, 0x4e, 0xfe, 0xfe, 0xde, + 0xf1, 0xc1, 0x21, 0x8e, 0x21, 0xa1, 0xc1, 0xf1, 0xa1, 0x7e, 0xc1, 0x01, 0xae, 0xce, 0x9e, 0x6e, + 0x9e, 0xae, 0x2e, 0x02, 0x0c, 0x42, 0xca, 0x5c, 0xf2, 0x98, 0x4a, 0xa0, 0x94, 0xa3, 0x73, 0x88, + 0x67, 0x98, 0xab, 0x00, 0xa3, 0x90, 0x2a, 0x97, 0x22, 0x4e, 0x45, 0x41, 0xae, 0xc1, 0xfe, 0x3e, + 0x61, 0xae, 0x2e, 0x02, 0x4c, 0x42, 0x2a, 0x5c, 0x0a, 0x38, 0x95, 0x05, 0xbb, 0x86, 0x84, 0xf8, + 0xb8, 0xba, 0x08, 0x30, 0x3b, 0xb9, 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, 0x4e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0x2e, 0x28, 0x91, 0xe8, 0x22, + 0x27, 0x98, 0x0a, 0xa4, 0x24, 0x53, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x8e, 0x7f, 0x63, + 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbb, 0x00, 0x56, 0x95, 0x5b, 0x02, 0x00, 0x00, } func (m *OrderBook) Marshal() (dAtA []byte, err error) { diff --git a/x/orderbook/types/params.pb.go b/x/orderbook/types/params.pb.go index e8d4d430..d49f9449 100644 --- a/x/orderbook/types/params.pb.go +++ b/x/orderbook/types/params.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/orderbook/params.proto +// source: sgenetwork/sge/orderbook/params.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -38,7 +38,7 @@ type Params struct { func (m *Params) Reset() { *m = Params{} } func (*Params) ProtoMessage() {} func (*Params) Descriptor() ([]byte, []int) { - return fileDescriptor_3c3d2056747df0cc, []int{0} + return fileDescriptor_c4a36fa63136acd4, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -92,30 +92,32 @@ func init() { proto.RegisterType((*Params)(nil), "sgenetwork.sge.orderbook.Params") } -func init() { proto.RegisterFile("sge/orderbook/params.proto", fileDescriptor_3c3d2056747df0cc) } +func init() { + proto.RegisterFile("sgenetwork/sge/orderbook/params.proto", fileDescriptor_c4a36fa63136acd4) +} -var fileDescriptor_3c3d2056747df0cc = []byte{ +var fileDescriptor_c4a36fa63136acd4 = []byte{ // 322 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x31, 0x4b, 0xfb, 0x50, - 0x14, 0xc5, 0x93, 0xfe, 0xff, 0x14, 0xc9, 0xa4, 0xa1, 0x48, 0x28, 0x36, 0xd1, 0xe0, 0xd0, 0x41, - 0x93, 0xc1, 0xad, 0x63, 0x05, 0xc1, 0xc9, 0x52, 0x05, 0xc1, 0x25, 0xbc, 0xa4, 0x97, 0x97, 0x90, - 0x26, 0x37, 0xbe, 0x77, 0x83, 0xed, 0xb7, 0x70, 0x74, 0x2c, 0xf8, 0x65, 0x1c, 0x3b, 0x3a, 0x15, - 0x69, 0x17, 0xe7, 0x7e, 0x02, 0xc9, 0x4b, 0x2d, 0x8a, 0xe2, 0x76, 0x39, 0xe7, 0x77, 0xcf, 0x85, - 0x73, 0x8d, 0xb6, 0xe4, 0xe0, 0xa3, 0x18, 0x81, 0x08, 0x11, 0x53, 0xbf, 0x60, 0x82, 0x65, 0xd2, - 0x2b, 0x04, 0x12, 0x9a, 0x96, 0xe4, 0x90, 0x03, 0x3d, 0xa0, 0x48, 0x3d, 0xc9, 0xc1, 0xdb, 0x62, - 0xed, 0x16, 0x47, 0x8e, 0x0a, 0xf2, 0xab, 0xa9, 0xe6, 0xdd, 0xe7, 0x86, 0xd1, 0x1c, 0xa8, 0x00, - 0x33, 0x35, 0x3a, 0x19, 0x9b, 0x04, 0x6a, 0x23, 0xa8, 0x56, 0x82, 0x82, 0x09, 0x4a, 0xa2, 0xa4, - 0x60, 0x94, 0x60, 0x2e, 0x2d, 0xfd, 0x50, 0xef, 0xfe, 0xef, 0x77, 0xd7, 0x0b, 0xe7, 0x78, 0xca, - 0xb2, 0x71, 0xcf, 0xfd, 0x13, 0x77, 0x87, 0xed, 0x8c, 0x4d, 0xae, 0x2a, 0xbb, 0x8f, 0x98, 0x0e, - 0xbe, 0x99, 0xe6, 0xad, 0xb1, 0x1f, 0x32, 0x8a, 0xe2, 0x40, 0x02, 0xd1, 0x18, 0x32, 0xc8, 0x29, - 0x88, 0xb0, 0xcc, 0xc9, 0x6a, 0xa8, 0x2b, 0x47, 0xeb, 0x85, 0xd3, 0xa9, 0xaf, 0xfc, 0xce, 0xb9, - 0xc3, 0x96, 0x32, 0xae, 0xb7, 0xfa, 0x79, 0x25, 0x9b, 0x97, 0xc6, 0x9e, 0x80, 0xfb, 0x12, 0x4a, - 0x08, 0x28, 0x16, 0x20, 0x63, 0x1c, 0x8f, 0xac, 0x7f, 0x2a, 0xf3, 0x60, 0xbd, 0x70, 0xac, 0x3a, - 0xf3, 0x07, 0xe2, 0x0e, 0x77, 0x37, 0xda, 0xcd, 0xa7, 0xd4, 0xdb, 0x79, 0x9a, 0x39, 0xda, 0xfb, - 0xcc, 0xd1, 0xfb, 0x17, 0x2f, 0x4b, 0x5b, 0x9f, 0x2f, 0x6d, 0xfd, 0x6d, 0x69, 0xeb, 0x8f, 0x2b, - 0x5b, 0x9b, 0xaf, 0x6c, 0xed, 0x75, 0x65, 0x6b, 0x77, 0x27, 0x3c, 0xa1, 0xb8, 0x0c, 0xbd, 0x08, - 0x33, 0x5f, 0x72, 0x38, 0xdd, 0x74, 0x5f, 0xcd, 0xfe, 0xe4, 0xcb, 0x93, 0x68, 0x5a, 0x80, 0x0c, - 0x9b, 0xaa, 0xf4, 0xb3, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x56, 0xfa, 0x6d, 0xc2, 0x01, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2d, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x2f, 0x4a, 0x49, 0x2d, + 0x4a, 0xca, 0xcf, 0xcf, 0xd6, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, + 0xc9, 0x17, 0x92, 0x40, 0x28, 0xd3, 0x2b, 0x4e, 0x4f, 0xd5, 0x83, 0x2b, 0x93, 0x12, 0x49, 0xcf, + 0x4f, 0xcf, 0x07, 0x2b, 0xd2, 0x07, 0xb1, 0x20, 0xea, 0x95, 0x16, 0x33, 0x71, 0xb1, 0x05, 0x80, + 0x0d, 0x10, 0xca, 0xe6, 0x92, 0xcd, 0x4d, 0xac, 0x88, 0x07, 0xeb, 0x88, 0x07, 0x69, 0x89, 0x2f, + 0x48, 0x2c, 0x2a, 0xc9, 0x4c, 0xce, 0x2c, 0x48, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0x96, 0x60, 0x54, + 0x60, 0xd4, 0x60, 0x71, 0xd2, 0xf8, 0x74, 0x4f, 0x5e, 0xa5, 0x32, 0x31, 0x37, 0xc7, 0x4a, 0x09, + 0xaf, 0x72, 0xa5, 0x20, 0xa9, 0xdc, 0xc4, 0x0a, 0x7f, 0x90, 0xb4, 0x53, 0x7e, 0x7e, 0x76, 0x00, + 0x8a, 0xa4, 0x50, 0x38, 0x97, 0x58, 0x52, 0x62, 0x49, 0x72, 0x46, 0x7c, 0x71, 0x6a, 0x49, 0x49, + 0x4e, 0x6a, 0x6e, 0x6a, 0x5e, 0x49, 0x7c, 0x72, 0x7e, 0x69, 0x5e, 0x89, 0x04, 0x13, 0xd8, 0x16, + 0xc5, 0x4f, 0xf7, 0xe4, 0x65, 0x21, 0xb6, 0x60, 0x57, 0xa7, 0x14, 0x24, 0x02, 0x96, 0x08, 0x86, + 0x8b, 0x3b, 0x83, 0x84, 0x85, 0x3c, 0xb9, 0x04, 0x8b, 0x52, 0x0b, 0x4b, 0x53, 0x4b, 0x53, 0xe3, + 0x4b, 0x32, 0x8a, 0x52, 0x8b, 0x33, 0xf2, 0x73, 0x52, 0x24, 0x98, 0xc1, 0x66, 0xca, 0x7c, 0xba, + 0x27, 0x2f, 0x01, 0x31, 0x13, 0x43, 0x89, 0x52, 0x90, 0x00, 0x54, 0x2c, 0x04, 0x26, 0x64, 0xc5, + 0x31, 0x63, 0x81, 0x3c, 0xc3, 0x8b, 0x05, 0xf2, 0x8c, 0x4e, 0x6e, 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, 0xa5, 0x93, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, + 0x0b, 0x8a, 0x16, 0x5d, 0xe4, 0x28, 0xaa, 0x40, 0x8a, 0xa4, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, + 0x36, 0x70, 0xa0, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x51, 0x34, 0x7e, 0xcd, 0x01, 0x00, 0x00, } diff --git a/x/orderbook/types/participation.pb.go b/x/orderbook/types/participation.pb.go index a453156c..7f86e175 100644 --- a/x/orderbook/types/participation.pb.go +++ b/x/orderbook/types/participation.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/orderbook/participation.proto +// source: sgenetwork/sge/orderbook/participation.proto package types @@ -7,7 +7,7 @@ import ( fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -62,7 +62,7 @@ type OrderBookParticipation struct { func (m *OrderBookParticipation) Reset() { *m = OrderBookParticipation{} } func (*OrderBookParticipation) ProtoMessage() {} func (*OrderBookParticipation) Descriptor() ([]byte, []int) { - return fileDescriptor_2962bcb47b63c36a, []int{0} + return fileDescriptor_325ee5284c02991d, []int{0} } func (m *OrderBookParticipation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -107,7 +107,7 @@ func (m *ParticipationBetPair) Reset() { *m = ParticipationBetPair{} } func (m *ParticipationBetPair) String() string { return proto.CompactTextString(m) } func (*ParticipationBetPair) ProtoMessage() {} func (*ParticipationBetPair) Descriptor() ([]byte, []int) { - return fileDescriptor_2962bcb47b63c36a, []int{1} + return fileDescriptor_325ee5284c02991d, []int{1} } func (m *ParticipationBetPair) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -162,57 +162,59 @@ func init() { proto.RegisterType((*ParticipationBetPair)(nil), "sgenetwork.sge.orderbook.ParticipationBetPair") } -func init() { proto.RegisterFile("sge/orderbook/participation.proto", fileDescriptor_2962bcb47b63c36a) } +func init() { + proto.RegisterFile("sgenetwork/sge/orderbook/participation.proto", fileDescriptor_325ee5284c02991d) +} -var fileDescriptor_2962bcb47b63c36a = []byte{ +var fileDescriptor_325ee5284c02991d = []byte{ // 747 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x4f, 0x6f, 0xd3, 0x3e, - 0x18, 0x6e, 0xf6, 0xbf, 0x5e, 0xb7, 0xdf, 0x7e, 0x59, 0xb7, 0x45, 0x45, 0xc4, 0xc3, 0x12, 0xd3, - 0x0e, 0xac, 0x3d, 0xc0, 0x69, 0xe2, 0xb2, 0x80, 0x26, 0x15, 0x8d, 0xb5, 0x18, 0x10, 0x12, 0x42, - 0x32, 0x69, 0xe3, 0x16, 0xab, 0x6d, 0x5c, 0x62, 0x47, 0x74, 0x77, 0x0e, 0x3b, 0x72, 0x44, 0xe2, - 0xb2, 0x2f, 0xc1, 0x77, 0xd8, 0x09, 0xed, 0x88, 0x38, 0x44, 0xa8, 0xe3, 0x80, 0x38, 0xf6, 0x13, - 0xa0, 0xd8, 0x5d, 0xda, 0x6e, 0x85, 0xa9, 0x12, 0xa7, 0xda, 0xaf, 0x9f, 0x3e, 0xcf, 0xf3, 0x3a, - 0xc9, 0xf3, 0x82, 0x5b, 0xa2, 0x4e, 0x0b, 0x3c, 0xf0, 0x68, 0x50, 0xe1, 0xbc, 0x51, 0x68, 0xbb, - 0x81, 0x64, 0x55, 0xd6, 0x76, 0x25, 0xe3, 0x7e, 0xbe, 0x1d, 0x70, 0xc9, 0x4d, 0x4b, 0xd4, 0xa9, - 0x4f, 0xe5, 0x3b, 0x1e, 0x34, 0xf2, 0xa2, 0x4e, 0xf3, 0x09, 0x3a, 0x97, 0xad, 0xf3, 0x3a, 0x57, - 0xa0, 0x42, 0xbc, 0xd2, 0x78, 0xf4, 0x65, 0x11, 0xac, 0x97, 0x62, 0x8c, 0xc3, 0x79, 0xa3, 0x3c, - 0x4c, 0x68, 0x6e, 0x81, 0x59, 0xe6, 0x7b, 0xb4, 0x63, 0x19, 0x9b, 0xc6, 0xf6, 0x8c, 0xb3, 0xd2, - 0x8b, 0x60, 0xe6, 0xc8, 0x6d, 0x35, 0x77, 0x91, 0x2a, 0x23, 0xac, 0x8f, 0xcd, 0x47, 0x60, 0x59, - 0xa9, 0x90, 0x58, 0x86, 0x84, 0xcc, 0xb3, 0xa6, 0x36, 0x8d, 0xed, 0xb4, 0x83, 0xba, 0x11, 0xcc, - 0x24, 0xdc, 0xcf, 0x8b, 0x0f, 0x7f, 0x45, 0xf0, 0x12, 0x12, 0x5f, 0xda, 0x9b, 0x25, 0xb0, 0x9a, - 0x74, 0xe5, 0x4b, 0xe2, 0x7a, 0x5e, 0x40, 0x85, 0xb0, 0xa6, 0x15, 0xa1, 0xdd, 0x8b, 0x60, 0x4e, - 0x3b, 0x18, 0x03, 0x42, 0xd8, 0x1c, 0xaa, 0xee, 0xe9, 0xa2, 0xf9, 0x1a, 0xa4, 0x9b, 0xec, 0x6d, - 0xc8, 0x3c, 0x26, 0x8f, 0xac, 0x19, 0x45, 0xe3, 0x9c, 0x46, 0x30, 0xf5, 0x2d, 0x82, 0x5b, 0x75, - 0x26, 0xdf, 0x84, 0x95, 0x7c, 0x95, 0xb7, 0x0a, 0x55, 0x2e, 0x5a, 0x5c, 0xf4, 0x7f, 0x76, 0x84, - 0xd7, 0x28, 0xc8, 0xa3, 0x36, 0x15, 0xf9, 0xa2, 0x2f, 0x7b, 0x11, 0x5c, 0xd1, 0xa2, 0x09, 0x11, - 0xc2, 0x03, 0x52, 0xf3, 0x10, 0x4c, 0xd7, 0x28, 0xb5, 0x66, 0x15, 0xf7, 0xfd, 0x89, 0xb9, 0x81, - 0xe6, 0xae, 0x51, 0x8a, 0x70, 0x4c, 0x64, 0x1e, 0x1b, 0x60, 0xa3, 0x1a, 0x06, 0x01, 0xf5, 0x25, - 0x09, 0x78, 0xe8, 0x7b, 0x64, 0xd0, 0xc0, 0x9c, 0x12, 0x29, 0x4f, 0x2c, 0x62, 0x6b, 0x91, 0x3f, - 0xd0, 0x22, 0xbc, 0xd6, 0x3f, 0xc1, 0xf1, 0xc1, 0x41, 0xd2, 0xda, 0x13, 0x90, 0xa5, 0x9d, 0x36, - 0x17, 0x61, 0x40, 0x05, 0xf1, 0xb9, 0x24, 0x35, 0xd6, 0x6c, 0x52, 0xcf, 0x9a, 0x57, 0x2f, 0x04, - 0xec, 0x45, 0xf0, 0x86, 0x26, 0x1e, 0x87, 0x42, 0xd8, 0x4c, 0xca, 0x87, 0x5c, 0xee, 0xab, 0xa2, - 0x29, 0xc0, 0x8a, 0xe4, 0xd2, 0x6d, 0x92, 0x0a, 0x95, 0xc4, 0x6d, 0xf1, 0xd0, 0x97, 0xd6, 0x82, - 0xea, 0xaa, 0x38, 0x71, 0x57, 0x1b, 0x5a, 0xfc, 0x32, 0x1f, 0xc2, 0xcb, 0xaa, 0xe4, 0x50, 0xb9, - 0xa7, 0x0a, 0xe6, 0x27, 0x03, 0xd8, 0xa3, 0xbd, 0x5f, 0xf1, 0x90, 0x56, 0x1e, 0x5e, 0x4c, 0xec, - 0xe1, 0xf6, 0xb8, 0x9b, 0xbd, 0xea, 0x28, 0x37, 0x7c, 0xc1, 0xcf, 0x46, 0xdd, 0xbd, 0x02, 0x0b, - 0x2d, 0xb7, 0x43, 0x9a, 0x5c, 0x08, 0x0b, 0x28, 0x1b, 0x7b, 0x13, 0xdb, 0xf8, 0x4f, 0xdb, 0xb8, - 0xe0, 0x41, 0x78, 0xbe, 0xe5, 0x76, 0x0e, 0xb8, 0x10, 0xe6, 0x7b, 0x03, 0xac, 0x8f, 0xba, 0x4b, - 0xc4, 0x16, 0x95, 0x58, 0x69, 0x62, 0xb1, 0x9b, 0xe3, 0x7a, 0x1e, 0x48, 0xaf, 0x0e, 0xf7, 0xfa, - 0xb8, 0x6f, 0xe3, 0xb3, 0x01, 0xe0, 0xf8, 0x3f, 0x10, 0xee, 0x79, 0x42, 0xc5, 0x46, 0x46, 0xf9, - 0x69, 0x74, 0x23, 0x98, 0x7b, 0x70, 0x95, 0xa2, 0xe4, 0x79, 0x42, 0x87, 0xc8, 0x75, 0x44, 0xbd, - 0x08, 0x6e, 0xfd, 0xcd, 0x62, 0x02, 0x44, 0xf8, 0x3a, 0x2a, 0xb3, 0x01, 0x96, 0xdc, 0xaa, 0x0c, - 0xdd, 0x26, 0x69, 0x07, 0xbc, 0xc6, 0xa4, 0xb5, 0xa4, 0x4c, 0xee, 0x4f, 0x7c, 0x69, 0x59, 0xed, - 0x68, 0x84, 0x0c, 0xe1, 0x8c, 0xde, 0x97, 0xd5, 0xd6, 0xbc, 0x07, 0x00, 0x13, 0x44, 0x50, 0x29, - 0xe3, 0xaf, 0x6c, 0x79, 0xd3, 0xd8, 0x5e, 0x70, 0xd6, 0x7a, 0x11, 0xfc, 0xbf, 0x1f, 0xbb, 0xc9, - 0x19, 0xc2, 0x69, 0x26, 0x9e, 0xea, 0xf5, 0x6e, 0xe6, 0xf8, 0x04, 0xa6, 0x3e, 0x9e, 0xc0, 0xd4, - 0xcf, 0x13, 0x98, 0x42, 0x3f, 0x0c, 0x90, 0x1d, 0xc9, 0x71, 0x87, 0xca, 0xb2, 0xcb, 0x82, 0x31, - 0x31, 0x6d, 0xfc, 0x93, 0x98, 0x8e, 0x35, 0x88, 0x1e, 0x14, 0x53, 0x2a, 0x17, 0xc6, 0xc5, 0xf4, - 0x00, 0x34, 0x1c, 0xd3, 0x71, 0xb5, 0xa8, 0x66, 0x48, 0x01, 0xcc, 0xc7, 0x9f, 0x4b, 0xec, 0x4a, - 0x67, 0xfd, 0x5a, 0x37, 0x82, 0x73, 0x0e, 0x95, 0xda, 0xcf, 0xc5, 0x21, 0xbe, 0x58, 0x38, 0xfb, - 0xa7, 0x5d, 0xdb, 0x38, 0xeb, 0xda, 0xc6, 0xf7, 0xae, 0x6d, 0x7c, 0x38, 0xb7, 0x53, 0x67, 0xe7, - 0x76, 0xea, 0xeb, 0xb9, 0x9d, 0x7a, 0x79, 0x67, 0xe8, 0x91, 0x88, 0x3a, 0xdd, 0xe9, 0x4f, 0xc3, - 0x78, 0x5d, 0xe8, 0x0c, 0x4d, 0x4f, 0xf5, 0x70, 0x2a, 0x73, 0x6a, 0x0c, 0xde, 0xfd, 0x1d, 0x00, - 0x00, 0xff, 0xff, 0x32, 0xe0, 0x24, 0x5d, 0x5b, 0x07, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0x3f, 0x6f, 0xd3, 0x4e, + 0x18, 0x8e, 0xfb, 0x3f, 0xd7, 0xb4, 0xbf, 0xfe, 0xdc, 0xb4, 0xb5, 0x82, 0xf0, 0x55, 0x27, 0x51, + 0x75, 0x68, 0x93, 0x01, 0xa6, 0x8a, 0xa5, 0x06, 0x55, 0x0a, 0x2a, 0x4d, 0x30, 0x20, 0x24, 0x84, + 0x74, 0x38, 0xf1, 0x25, 0x9c, 0x92, 0xf8, 0x82, 0xef, 0x2c, 0xd2, 0x9d, 0xa1, 0x23, 0x23, 0x12, + 0x4b, 0xbf, 0x04, 0xdf, 0xa1, 0x13, 0xea, 0x88, 0x18, 0x2c, 0x94, 0x32, 0x20, 0xc6, 0x7c, 0x02, + 0xe4, 0xbb, 0xd4, 0x71, 0xda, 0x40, 0x65, 0x89, 0x29, 0x77, 0xef, 0x3d, 0x79, 0x9e, 0xe7, 0x3d, + 0xdb, 0xcf, 0x0b, 0x76, 0x78, 0x93, 0x78, 0x44, 0xbc, 0x63, 0x7e, 0xab, 0xc4, 0x9b, 0xa4, 0xc4, + 0x7c, 0x97, 0xf8, 0x35, 0xc6, 0x5a, 0xa5, 0xae, 0xe3, 0x0b, 0x5a, 0xa7, 0x5d, 0x47, 0x50, 0xe6, + 0x15, 0xbb, 0x3e, 0x13, 0x4c, 0x37, 0x46, 0xe8, 0x22, 0x6f, 0x92, 0x62, 0x8c, 0x2e, 0xe4, 0x9b, + 0xac, 0xc9, 0x24, 0xa8, 0x14, 0xad, 0x14, 0x1e, 0x7d, 0x59, 0x04, 0xeb, 0x95, 0x08, 0x63, 0x31, + 0xd6, 0xaa, 0x26, 0x09, 0xf5, 0x2d, 0x30, 0x4b, 0x3d, 0x97, 0xf4, 0x0c, 0x6d, 0x53, 0xdb, 0x9e, + 0xb1, 0x56, 0x06, 0x21, 0xcc, 0x1d, 0x3b, 0x9d, 0xf6, 0x1e, 0x92, 0x65, 0x64, 0xab, 0x63, 0xfd, + 0x11, 0x58, 0x96, 0x2a, 0x38, 0x92, 0xc1, 0x01, 0x75, 0x8d, 0xa9, 0x4d, 0x6d, 0x3b, 0x6b, 0xa1, + 0x7e, 0x08, 0x73, 0x31, 0xf7, 0xf3, 0xf2, 0xc3, 0x5f, 0x21, 0xbc, 0x82, 0xb4, 0xaf, 0xec, 0xf5, + 0x0a, 0x58, 0x8d, 0xbb, 0xf2, 0x04, 0x76, 0x5c, 0xd7, 0x27, 0x9c, 0x1b, 0xd3, 0x92, 0xd0, 0x1c, + 0x84, 0xb0, 0xa0, 0x1c, 0x4c, 0x00, 0x21, 0x5b, 0x4f, 0x54, 0xf7, 0x55, 0x51, 0x7f, 0x0d, 0xb2, + 0x6d, 0xfa, 0x36, 0xa0, 0x2e, 0x15, 0xc7, 0xc6, 0x8c, 0xa4, 0xb1, 0xce, 0x42, 0x98, 0xf9, 0x16, + 0xc2, 0xad, 0x26, 0x15, 0x6f, 0x82, 0x5a, 0xb1, 0xce, 0x3a, 0xa5, 0x3a, 0xe3, 0x1d, 0xc6, 0x87, + 0x3f, 0xbb, 0xdc, 0x6d, 0x95, 0xc4, 0x71, 0x97, 0xf0, 0x62, 0xd9, 0x13, 0x83, 0x10, 0xae, 0x28, + 0xd1, 0x98, 0x08, 0xd9, 0x23, 0x52, 0xfd, 0x08, 0x4c, 0x37, 0x08, 0x31, 0x66, 0x25, 0xf7, 0xfd, + 0xd4, 0xdc, 0x40, 0x71, 0x37, 0x08, 0x41, 0x76, 0x44, 0xa4, 0x9f, 0x68, 0x60, 0xa3, 0x1e, 0xf8, + 0x3e, 0xf1, 0x04, 0xf6, 0x59, 0xe0, 0xb9, 0x78, 0xd4, 0xc0, 0x9c, 0x14, 0xa9, 0xa6, 0x16, 0x31, + 0x95, 0xc8, 0x1f, 0x68, 0x91, 0xbd, 0x36, 0x3c, 0xb1, 0xa3, 0x83, 0xc3, 0xb8, 0xb5, 0x27, 0x20, + 0x4f, 0x7a, 0x5d, 0xc6, 0x03, 0x9f, 0x70, 0xec, 0x31, 0x81, 0x1b, 0xb4, 0xdd, 0x26, 0xae, 0x31, + 0x2f, 0x5f, 0x08, 0x38, 0x08, 0xe1, 0x2d, 0x45, 0x3c, 0x09, 0x85, 0x6c, 0x3d, 0x2e, 0x1f, 0x31, + 0x71, 0x20, 0x8b, 0x3a, 0x07, 0x2b, 0x82, 0x09, 0xa7, 0x8d, 0x6b, 0x44, 0x60, 0xa7, 0xc3, 0x02, + 0x4f, 0x18, 0x0b, 0xb2, 0xab, 0x72, 0xea, 0xae, 0x36, 0x94, 0xf8, 0x55, 0x3e, 0x64, 0x2f, 0xcb, + 0x92, 0x45, 0xc4, 0xbe, 0x2c, 0xe8, 0x9f, 0x34, 0x60, 0x8e, 0xf7, 0x7e, 0xcd, 0x43, 0x56, 0x7a, + 0x78, 0x91, 0xda, 0xc3, 0x9d, 0x49, 0x37, 0x7b, 0xdd, 0x51, 0x21, 0x79, 0xc1, 0xcf, 0xc6, 0xdd, + 0xbd, 0x02, 0x0b, 0x1d, 0xa7, 0x87, 0xdb, 0x8c, 0x73, 0x03, 0x48, 0x1b, 0xfb, 0xa9, 0x6d, 0xfc, + 0xa7, 0x6c, 0x5c, 0xf2, 0x20, 0x7b, 0xbe, 0xe3, 0xf4, 0x0e, 0x19, 0xe7, 0xfa, 0x7b, 0x0d, 0xac, + 0x8f, 0xbb, 0x8b, 0xc5, 0x16, 0xa5, 0x58, 0x25, 0xb5, 0xd8, 0xed, 0x49, 0x3d, 0x8f, 0xa4, 0x57, + 0x93, 0xbd, 0x3e, 0x1e, 0xda, 0xf8, 0xac, 0x01, 0x38, 0xf9, 0x0f, 0x98, 0xb9, 0x2e, 0x97, 0xb1, + 0x91, 0x93, 0x7e, 0x5a, 0xfd, 0x10, 0x16, 0x1e, 0x5c, 0xa7, 0xa8, 0xb8, 0x2e, 0x57, 0x21, 0x72, + 0x13, 0xd1, 0x20, 0x84, 0x5b, 0x7f, 0xb3, 0x18, 0x03, 0x91, 0x7d, 0x13, 0x95, 0xde, 0x02, 0x4b, + 0x4e, 0x5d, 0x04, 0x4e, 0x1b, 0x77, 0x7d, 0xd6, 0xa0, 0xc2, 0x58, 0x92, 0x26, 0x0f, 0x52, 0x5f, + 0x5a, 0x5e, 0x39, 0x1a, 0x23, 0x43, 0x76, 0x4e, 0xed, 0xab, 0x72, 0xab, 0xdf, 0x03, 0x80, 0x72, + 0xcc, 0x89, 0x10, 0xd1, 0x57, 0xb6, 0xbc, 0xa9, 0x6d, 0x2f, 0x58, 0x6b, 0x83, 0x10, 0xfe, 0x3f, + 0x8c, 0xdd, 0xf8, 0x0c, 0xd9, 0x59, 0xca, 0x9f, 0xaa, 0xf5, 0x5e, 0xee, 0xe4, 0x14, 0x66, 0x3e, + 0x9e, 0xc2, 0xcc, 0xcf, 0x53, 0x98, 0x41, 0x3f, 0x34, 0x90, 0x1f, 0xcb, 0x71, 0x8b, 0x88, 0xaa, + 0x43, 0xfd, 0x09, 0x31, 0xad, 0xfd, 0x93, 0x98, 0x8e, 0x34, 0xb0, 0x1a, 0x14, 0x53, 0x32, 0x17, + 0x26, 0xc5, 0xf4, 0x08, 0x94, 0x8c, 0xe9, 0xa8, 0x5a, 0x96, 0x33, 0xa4, 0x04, 0xe6, 0xa3, 0xcf, + 0x25, 0x72, 0xa5, 0xb2, 0x7e, 0xad, 0x1f, 0xc2, 0x39, 0x8b, 0x08, 0xe5, 0xe7, 0xf2, 0xd0, 0xbe, + 0x5c, 0x58, 0x07, 0x67, 0x7d, 0x53, 0x3b, 0xef, 0x9b, 0xda, 0xf7, 0xbe, 0xa9, 0x7d, 0xb8, 0x30, + 0x33, 0xe7, 0x17, 0x66, 0xe6, 0xeb, 0x85, 0x99, 0x79, 0xb9, 0x93, 0x78, 0x24, 0xbc, 0x49, 0x76, + 0x93, 0xb3, 0xb3, 0x97, 0x98, 0x9e, 0xf2, 0xe1, 0xd4, 0xe6, 0xe4, 0x18, 0xbc, 0xfb, 0x3b, 0x00, + 0x00, 0xff, 0xff, 0x6e, 0x85, 0x89, 0x44, 0x66, 0x07, 0x00, 0x00, } func (m *OrderBookParticipation) Marshal() (dAtA []byte, err error) { diff --git a/x/orderbook/types/query.pb.go b/x/orderbook/types/query.pb.go index 55bf6e8d..4888cafa 100644 --- a/x/orderbook/types/query.pb.go +++ b/x/orderbook/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/orderbook/query.proto +// source: sgenetwork/sge/orderbook/query.proto package types @@ -8,8 +8,8 @@ import ( fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + 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" @@ -39,7 +39,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_8b016841afa49a45, []int{0} + return fileDescriptor_ed7e5b0ca5b647cb, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -79,7 +79,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_8b016841afa49a45, []int{1} + return fileDescriptor_ed7e5b0ca5b647cb, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -128,7 +128,7 @@ func (m *QueryOrderBooksRequest) Reset() { *m = QueryOrderBooksRequest{} func (m *QueryOrderBooksRequest) String() string { return proto.CompactTextString(m) } func (*QueryOrderBooksRequest) ProtoMessage() {} func (*QueryOrderBooksRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{2} + return fileDescriptor_ed7e5b0ca5b647cb, []int{2} } func (m *QueryOrderBooksRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -184,7 +184,7 @@ func (m *QueryOrderBooksResponse) Reset() { *m = QueryOrderBooksResponse func (m *QueryOrderBooksResponse) String() string { return proto.CompactTextString(m) } func (*QueryOrderBooksResponse) ProtoMessage() {} func (*QueryOrderBooksResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{3} + return fileDescriptor_ed7e5b0ca5b647cb, []int{3} } func (m *QueryOrderBooksResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -237,7 +237,7 @@ func (m *QueryOrderBookRequest) Reset() { *m = QueryOrderBookRequest{} } func (m *QueryOrderBookRequest) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookRequest) ProtoMessage() {} func (*QueryOrderBookRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{4} + return fileDescriptor_ed7e5b0ca5b647cb, []int{4} } func (m *QueryOrderBookRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -284,7 +284,7 @@ func (m *QueryOrderBookResponse) Reset() { *m = QueryOrderBookResponse{} func (m *QueryOrderBookResponse) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookResponse) ProtoMessage() {} func (*QueryOrderBookResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{5} + return fileDescriptor_ed7e5b0ca5b647cb, []int{5} } func (m *QueryOrderBookResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -334,7 +334,7 @@ func (m *QueryOrderBookParticipationsRequest) Reset() { *m = QueryOrderB func (m *QueryOrderBookParticipationsRequest) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookParticipationsRequest) ProtoMessage() {} func (*QueryOrderBookParticipationsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{6} + return fileDescriptor_ed7e5b0ca5b647cb, []int{6} } func (m *QueryOrderBookParticipationsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -389,7 +389,7 @@ func (m *QueryOrderBookParticipationsResponse) Reset() { *m = QueryOrder func (m *QueryOrderBookParticipationsResponse) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookParticipationsResponse) ProtoMessage() {} func (*QueryOrderBookParticipationsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{7} + return fileDescriptor_ed7e5b0ca5b647cb, []int{7} } func (m *QueryOrderBookParticipationsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -446,7 +446,7 @@ func (m *QueryOrderBookParticipationRequest) Reset() { *m = QueryOrderBo func (m *QueryOrderBookParticipationRequest) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookParticipationRequest) ProtoMessage() {} func (*QueryOrderBookParticipationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{8} + return fileDescriptor_ed7e5b0ca5b647cb, []int{8} } func (m *QueryOrderBookParticipationRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -500,7 +500,7 @@ func (m *QueryOrderBookParticipationResponse) Reset() { *m = QueryOrderB func (m *QueryOrderBookParticipationResponse) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookParticipationResponse) ProtoMessage() {} func (*QueryOrderBookParticipationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{9} + return fileDescriptor_ed7e5b0ca5b647cb, []int{9} } func (m *QueryOrderBookParticipationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -549,7 +549,7 @@ func (m *QueryOrderBookExposuresRequest) Reset() { *m = QueryOrderBookEx func (m *QueryOrderBookExposuresRequest) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookExposuresRequest) ProtoMessage() {} func (*QueryOrderBookExposuresRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{10} + return fileDescriptor_ed7e5b0ca5b647cb, []int{10} } func (m *QueryOrderBookExposuresRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -604,7 +604,7 @@ func (m *QueryOrderBookExposuresResponse) Reset() { *m = QueryOrderBookE func (m *QueryOrderBookExposuresResponse) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookExposuresResponse) ProtoMessage() {} func (*QueryOrderBookExposuresResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{11} + return fileDescriptor_ed7e5b0ca5b647cb, []int{11} } func (m *QueryOrderBookExposuresResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -660,7 +660,7 @@ func (m *QueryOrderBookExposureRequest) Reset() { *m = QueryOrderBookExp func (m *QueryOrderBookExposureRequest) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookExposureRequest) ProtoMessage() {} func (*QueryOrderBookExposureRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{12} + return fileDescriptor_ed7e5b0ca5b647cb, []int{12} } func (m *QueryOrderBookExposureRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -714,7 +714,7 @@ func (m *QueryOrderBookExposureResponse) Reset() { *m = QueryOrderBookEx func (m *QueryOrderBookExposureResponse) String() string { return proto.CompactTextString(m) } func (*QueryOrderBookExposureResponse) ProtoMessage() {} func (*QueryOrderBookExposureResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{13} + return fileDescriptor_ed7e5b0ca5b647cb, []int{13} } func (m *QueryOrderBookExposureResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -767,7 +767,7 @@ func (m *QueryOrderBookParticipationExposuresRequest) String() string { } func (*QueryOrderBookParticipationExposuresRequest) ProtoMessage() {} func (*QueryOrderBookParticipationExposuresRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{14} + return fileDescriptor_ed7e5b0ca5b647cb, []int{14} } func (m *QueryOrderBookParticipationExposuresRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -826,7 +826,7 @@ func (m *QueryOrderBookParticipationExposuresResponse) String() string { } func (*QueryOrderBookParticipationExposuresResponse) ProtoMessage() {} func (*QueryOrderBookParticipationExposuresResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{15} + return fileDescriptor_ed7e5b0ca5b647cb, []int{15} } func (m *QueryOrderBookParticipationExposuresResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -884,7 +884,7 @@ func (m *QueryParticipationExposuresRequest) Reset() { *m = QueryPartici func (m *QueryParticipationExposuresRequest) String() string { return proto.CompactTextString(m) } func (*QueryParticipationExposuresRequest) ProtoMessage() {} func (*QueryParticipationExposuresRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{16} + return fileDescriptor_ed7e5b0ca5b647cb, []int{16} } func (m *QueryParticipationExposuresRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -947,7 +947,7 @@ func (m *QueryParticipationExposuresResponse) Reset() { *m = QueryPartic func (m *QueryParticipationExposuresResponse) String() string { return proto.CompactTextString(m) } func (*QueryParticipationExposuresResponse) ProtoMessage() {} func (*QueryParticipationExposuresResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{17} + return fileDescriptor_ed7e5b0ca5b647cb, []int{17} } func (m *QueryParticipationExposuresResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1007,7 +1007,7 @@ func (m *QueryHistoricalParticipationExposuresRequest) String() string { } func (*QueryHistoricalParticipationExposuresRequest) ProtoMessage() {} func (*QueryHistoricalParticipationExposuresRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{18} + return fileDescriptor_ed7e5b0ca5b647cb, []int{18} } func (m *QueryHistoricalParticipationExposuresRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1066,7 +1066,7 @@ func (m *QueryHistoricalParticipationExposuresResponse) String() string { } func (*QueryHistoricalParticipationExposuresResponse) ProtoMessage() {} func (*QueryHistoricalParticipationExposuresResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{19} + return fileDescriptor_ed7e5b0ca5b647cb, []int{19} } func (m *QueryHistoricalParticipationExposuresResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1126,7 +1126,7 @@ func (m *QueryParticipationFulfilledBetsRequest) Reset() { func (m *QueryParticipationFulfilledBetsRequest) String() string { return proto.CompactTextString(m) } func (*QueryParticipationFulfilledBetsRequest) ProtoMessage() {} func (*QueryParticipationFulfilledBetsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{20} + return fileDescriptor_ed7e5b0ca5b647cb, []int{20} } func (m *QueryParticipationFulfilledBetsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1191,7 +1191,7 @@ func (m *QueryParticipationFulfilledBetsResponse) Reset() { func (m *QueryParticipationFulfilledBetsResponse) String() string { return proto.CompactTextString(m) } func (*QueryParticipationFulfilledBetsResponse) ProtoMessage() {} func (*QueryParticipationFulfilledBetsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_8b016841afa49a45, []int{21} + return fileDescriptor_ed7e5b0ca5b647cb, []int{21} } func (m *QueryParticipationFulfilledBetsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1259,82 +1259,84 @@ func init() { proto.RegisterType((*QueryParticipationFulfilledBetsResponse)(nil), "sgenetwork.sge.orderbook.QueryParticipationFulfilledBetsResponse") } -func init() { proto.RegisterFile("sge/orderbook/query.proto", fileDescriptor_8b016841afa49a45) } - -var fileDescriptor_8b016841afa49a45 = []byte{ - // 1139 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4f, 0x6f, 0xdc, 0x44, - 0x14, 0xcf, 0xa4, 0x25, 0x90, 0x57, 0x84, 0x94, 0x97, 0x34, 0x9b, 0x58, 0xcd, 0x26, 0x75, 0xab, - 0xa6, 0xd0, 0xc4, 0x4e, 0x02, 0xea, 0x1f, 0x29, 0x29, 0xb0, 0x6a, 0xd3, 0x16, 0x81, 0x12, 0x82, - 0x72, 0x81, 0x43, 0xf0, 0xee, 0x4e, 0x5d, 0x2b, 0x9b, 0x1d, 0xd7, 0xf6, 0x42, 0xaa, 0x28, 0x17, - 0x84, 0xc4, 0x0d, 0x21, 0x7a, 0xe8, 0x01, 0xbe, 0x02, 0xdf, 0x80, 0x1b, 0x48, 0xf4, 0x18, 0xa9, - 0x07, 0x38, 0x55, 0x28, 0x8b, 0x04, 0x07, 0x2e, 0x7c, 0x01, 0x40, 0x1e, 0x8f, 0x9d, 0xf5, 0xda, - 0x5e, 0xff, 0xc9, 0x4a, 0xa5, 0xdc, 0x76, 0xf7, 0xf9, 0xbd, 0xf7, 0xfb, 0xf3, 0x66, 0x3c, 0xb3, - 0x30, 0x69, 0xeb, 0x54, 0x65, 0x56, 0x9d, 0x5a, 0x55, 0xc6, 0xb6, 0xd5, 0xfb, 0x2d, 0x6a, 0x3d, - 0x50, 0x4c, 0x8b, 0x39, 0x0c, 0x27, 0x6c, 0x9d, 0x36, 0xa9, 0xf3, 0x29, 0xb3, 0xb6, 0x15, 0x5b, - 0xa7, 0x4a, 0xf0, 0x94, 0xf4, 0x5a, 0x8d, 0xd9, 0x3b, 0xcc, 0x56, 0xab, 0x9a, 0x4d, 0xbd, 0x14, - 0xf5, 0x93, 0xc5, 0x2a, 0x75, 0xb4, 0x45, 0xd5, 0xd4, 0x74, 0xa3, 0xa9, 0x39, 0x06, 0x6b, 0x7a, - 0x55, 0xa4, 0x31, 0x9d, 0xe9, 0x8c, 0x7f, 0x54, 0xdd, 0x4f, 0xe2, 0xd7, 0x33, 0x3a, 0x63, 0x7a, - 0x83, 0xaa, 0x9a, 0x69, 0xa8, 0x5a, 0xb3, 0xc9, 0x1c, 0x9e, 0x62, 0x8b, 0xa8, 0x14, 0x06, 0x65, - 0x6a, 0x96, 0xb6, 0xe3, 0xc7, 0xa6, 0xc2, 0xb1, 0xe0, 0x93, 0x08, 0x9f, 0x8d, 0xa4, 0x3a, 0x46, - 0xcd, 0x30, 0x3b, 0x11, 0x9d, 0x09, 0x3f, 0x42, 0x77, 0x4d, 0x66, 0xb7, 0x2c, 0xea, 0x45, 0xe5, - 0x31, 0xc0, 0xf7, 0x5d, 0x46, 0xeb, 0xbc, 0xe9, 0x06, 0xbd, 0xdf, 0xa2, 0xb6, 0x23, 0x6f, 0xc2, - 0x68, 0xe8, 0x57, 0xdb, 0x64, 0x4d, 0x9b, 0xe2, 0x75, 0x18, 0xf2, 0xc0, 0x4d, 0x90, 0x19, 0x72, - 0xf1, 0xd4, 0xd2, 0x8c, 0x92, 0xa4, 0x99, 0xe2, 0x65, 0x56, 0x4e, 0x3e, 0x7e, 0x3a, 0x3d, 0xb0, - 0x21, 0xb2, 0xe4, 0x5d, 0x18, 0xe7, 0x65, 0xd7, 0xdc, 0xc7, 0x2a, 0x8c, 0x6d, 0xfb, 0x0d, 0x71, - 0x1c, 0x86, 0x6c, 0x47, 0x73, 0x5a, 0x5e, 0xe5, 0xe1, 0x0d, 0xf1, 0x0d, 0x57, 0x01, 0x8e, 0x24, - 0x9e, 0x18, 0xe4, 0x5d, 0x2f, 0x28, 0x9e, 0x1f, 0x8a, 0xeb, 0x87, 0xe2, 0x59, 0x28, 0xfc, 0x50, - 0xd6, 0x35, 0x9d, 0x8a, 0x9a, 0x1b, 0x1d, 0x99, 0xf2, 0x77, 0x04, 0x4a, 0x91, 0xd6, 0x82, 0xd5, - 0x1d, 0x80, 0x00, 0xb7, 0xdb, 0xff, 0xc4, 0xc5, 0x53, 0x4b, 0xe7, 0x92, 0x99, 0x05, 0x15, 0x04, - 0xb9, 0x8e, 0x64, 0xbc, 0x15, 0x03, 0x77, 0x36, 0x15, 0xae, 0x87, 0x23, 0x84, 0x77, 0x05, 0x4e, - 0x87, 0xe1, 0xfa, 0x42, 0x9d, 0x87, 0x57, 0x78, 0xbf, 0x2d, 0xb7, 0xe1, 0x56, 0xcb, 0xa8, 0x0b, - 0xc1, 0x5e, 0x66, 0xfe, 0x93, 0x9b, 0x46, 0x5d, 0xae, 0x76, 0x0b, 0x1d, 0x90, 0xbd, 0x2d, 0xc8, - 0xf2, 0x7c, 0x61, 0x63, 0x0e, 0xb2, 0xc3, 0x41, 0x1b, 0xf9, 0x21, 0x81, 0x73, 0xe1, 0x26, 0xeb, - 0x9d, 0xd3, 0x67, 0xe7, 0x42, 0xdc, 0x37, 0xa3, 0xdb, 0x04, 0xce, 0xf7, 0x46, 0x25, 0x84, 0xb0, - 0x60, 0xb2, 0x03, 0x56, 0x68, 0xe1, 0xf8, 0x43, 0xb0, 0x90, 0x41, 0x97, 0x50, 0x75, 0x21, 0x52, - 0x89, 0xc5, 0xf7, 0xee, 0xdf, 0x78, 0xec, 0x81, 0xdc, 0x83, 0x64, 0x3e, 0xe5, 0x55, 0x18, 0x0d, - 0xb1, 0xdf, 0x32, 0x9a, 0x75, 0xba, 0xcb, 0xd1, 0x9d, 0xdc, 0xc0, 0x50, 0xe8, 0x8e, 0x1b, 0x91, - 0x1f, 0xf5, 0x36, 0x3e, 0x50, 0xd8, 0x84, 0x89, 0x24, 0x85, 0xc5, 0xe0, 0x15, 0x15, 0x78, 0x3c, - 0x5e, 0x60, 0xf9, 0x4b, 0x02, 0xe5, 0x30, 0xb2, 0x9b, 0x62, 0xb7, 0x7b, 0x46, 0xd3, 0xf8, 0x84, - 0xc0, 0x74, 0x22, 0x20, 0x21, 0x93, 0x0e, 0x63, 0x1d, 0x88, 0xfc, 0xed, 0xd9, 0x9f, 0x41, 0x35, - 0x83, 0x44, 0x6b, 0xf5, 0xba, 0xed, 0xd7, 0x15, 0x0a, 0x21, 0x8b, 0x34, 0xec, 0xdf, 0xf4, 0x7d, - 0x0c, 0x53, 0xf1, 0xa4, 0xf2, 0x89, 0x3c, 0x09, 0x2f, 0xb1, 0x7a, 0xdd, 0xe6, 0xf1, 0x41, 0x1e, - 0x7f, 0xd1, 0xfd, 0xee, 0xee, 0x5f, 0x5f, 0x24, 0x1a, 0x19, 0xc8, 0x46, 0x61, 0x34, 0x46, 0x36, - 0x31, 0x58, 0x05, 0x55, 0x1b, 0x89, 0xa8, 0x26, 0x7f, 0x43, 0xe0, 0x52, 0x8f, 0x61, 0x7f, 0xc6, - 0xf3, 0xf5, 0x3b, 0x81, 0xb9, 0x6c, 0xe8, 0x84, 0x6a, 0x4d, 0x28, 0x85, 0x17, 0x7b, 0x8e, 0x79, - 0x8b, 0x2d, 0xed, 0xaf, 0x48, 0x33, 0xb6, 0x6f, 0xff, 0x66, 0xee, 0x07, 0x22, 0xb6, 0xbc, 0x7e, - 0xc8, 0x9f, 0x77, 0xcb, 0xeb, 0xf2, 0xeb, 0x44, 0x61, 0xbf, 0x9e, 0xfa, 0x5b, 0xe7, 0xff, 0xd5, - 0xa6, 0x6f, 0xfd, 0x81, 0xbc, 0x6d, 0xd8, 0x0e, 0xb3, 0x8c, 0x9a, 0xd6, 0xf8, 0x2f, 0xad, 0x97, - 0x3f, 0x08, 0xcc, 0x67, 0x84, 0xf7, 0xbc, 0x3b, 0xf1, 0x13, 0x81, 0x0b, 0xd1, 0x51, 0x5b, 0x6d, - 0x35, 0xee, 0x1a, 0x8d, 0x06, 0xad, 0x57, 0xa8, 0xf3, 0xbc, 0x2c, 0x9a, 0x9f, 0x09, 0xcc, 0xa6, - 0x32, 0x11, 0x76, 0xd5, 0x20, 0x8c, 0x64, 0xab, 0x4a, 0x1d, 0xdf, 0x29, 0x25, 0xa3, 0x53, 0x15, - 0xea, 0xac, 0x6b, 0x86, 0xe5, 0xbf, 0x13, 0xcc, 0xae, 0x58, 0xff, 0x3c, 0x5a, 0x3a, 0x1c, 0x81, - 0x17, 0x38, 0x33, 0xfc, 0x9c, 0xc0, 0x90, 0x77, 0x65, 0xc2, 0xb9, 0x64, 0x98, 0xd1, 0x9b, 0x9a, - 0x34, 0x9f, 0xf1, 0x69, 0xaf, 0xbb, 0x3c, 0xf5, 0xd9, 0x93, 0xdf, 0x1e, 0x0e, 0x96, 0xf0, 0xb4, - 0x1a, 0x77, 0xe7, 0xc4, 0xaf, 0x09, 0xc0, 0xd1, 0x0d, 0x09, 0x17, 0x52, 0x8a, 0x47, 0xee, 0x71, - 0xd2, 0x62, 0x8e, 0x0c, 0x01, 0x69, 0x9a, 0x43, 0x9a, 0xc4, 0x52, 0x17, 0xa4, 0x3d, 0xef, 0x0a, - 0xb8, 0x8f, 0x8f, 0x08, 0x0c, 0x07, 0x79, 0xa8, 0x66, 0xed, 0xe0, 0x43, 0x5a, 0xc8, 0x9e, 0x20, - 0x10, 0xcd, 0x72, 0x44, 0x67, 0x71, 0xba, 0x1b, 0x51, 0x78, 0x95, 0xec, 0xe3, 0x01, 0x81, 0x52, - 0xc2, 0x3d, 0x03, 0x57, 0xb2, 0xb6, 0x8d, 0xbd, 0x35, 0x49, 0xd7, 0x8b, 0xa6, 0x0b, 0x0e, 0x97, - 0x39, 0x87, 0x05, 0x54, 0x52, 0x38, 0x84, 0xff, 0x32, 0xb0, 0xb1, 0x4d, 0x60, 0x3c, 0xbe, 0x36, - 0x2e, 0x17, 0x82, 0xe4, 0x13, 0x5a, 0x29, 0x98, 0x2d, 0xf8, 0xbc, 0xcb, 0xf9, 0xac, 0xe2, 0x8d, - 0x7c, 0x7c, 0xd4, 0xbd, 0x98, 0x3d, 0x6b, 0x1f, 0xbf, 0x27, 0x80, 0xd1, 0x23, 0x39, 0x5e, 0xcd, - 0x8a, 0xb1, 0xfb, 0x35, 0x26, 0x5d, 0x2b, 0x90, 0x29, 0x98, 0x2d, 0x72, 0x66, 0x97, 0xf0, 0xd5, - 0x34, 0x66, 0xc1, 0x9b, 0x07, 0x7f, 0x24, 0x30, 0x12, 0xa9, 0x88, 0x57, 0xf2, 0x62, 0xf0, 0xc1, - 0x5f, 0xcd, 0x9f, 0x28, 0xb0, 0x2f, 0x73, 0xec, 0x97, 0xf1, 0x8d, 0xcc, 0xd8, 0xd5, 0x3d, 0xff, - 0xcc, 0xbf, 0x8f, 0x7f, 0x11, 0x98, 0x4e, 0x39, 0xb8, 0xe2, 0xcd, 0x42, 0x63, 0x13, 0xf1, 0x67, - 0xf5, 0xb8, 0x65, 0x04, 0xe1, 0x37, 0x39, 0xe1, 0x6b, 0x78, 0x25, 0xd7, 0x18, 0xce, 0x1f, 0x59, - 0xf7, 0x27, 0x81, 0xf1, 0x04, 0xaa, 0xcb, 0xe9, 0x5b, 0x79, 0x0f, 0x86, 0x2b, 0x05, 0xb3, 0x05, - 0xb1, 0x4d, 0x4e, 0x6c, 0x0d, 0xdf, 0x2b, 0x48, 0x2c, 0x61, 0xa1, 0xfd, 0x43, 0x60, 0x26, 0xed, - 0xac, 0x85, 0x69, 0xe6, 0x64, 0x3c, 0x4b, 0x4a, 0xb7, 0x8e, 0x5d, 0x47, 0x88, 0xf1, 0x0e, 0x17, - 0xe3, 0x06, 0x56, 0xd2, 0xc4, 0xb8, 0x17, 0x54, 0x9c, 0x4f, 0x32, 0xfc, 0x6f, 0x02, 0x52, 0xf2, - 0xc1, 0x05, 0xdf, 0xca, 0x63, 0x5b, 0xdc, 0xe9, 0x4d, 0x7a, 0xfb, 0x18, 0x15, 0x04, 0xdf, 0x8f, - 0x38, 0xdf, 0x4d, 0xfc, 0xa0, 0x1f, 0x9b, 0xab, 0x7a, 0xd7, 0xef, 0xc1, 0x0f, 0x5f, 0x95, 0xd5, - 0xc7, 0x87, 0x65, 0x72, 0x70, 0x58, 0x26, 0xbf, 0x1e, 0x96, 0xc9, 0x57, 0xed, 0xf2, 0xc0, 0x41, - 0xbb, 0x3c, 0xf0, 0x4b, 0xbb, 0x3c, 0xf0, 0xe1, 0x9c, 0x6e, 0x38, 0xf7, 0x5a, 0x55, 0xa5, 0xc6, - 0x76, 0xdc, 0xc6, 0xf3, 0x82, 0x04, 0x07, 0xb1, 0xdb, 0x01, 0xc3, 0x79, 0x60, 0x52, 0xbb, 0x3a, - 0xc4, 0xff, 0xb0, 0x7e, 0xfd, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x89, 0x3e, 0x08, 0xc3, - 0x17, 0x00, 0x00, +func init() { + proto.RegisterFile("sgenetwork/sge/orderbook/query.proto", fileDescriptor_ed7e5b0ca5b647cb) +} + +var fileDescriptor_ed7e5b0ca5b647cb = []byte{ + // 1144 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xcf, 0xa4, 0xfd, 0xe6, 0x4b, 0x5e, 0x11, 0x52, 0x5e, 0xd2, 0x38, 0xb1, 0xa8, 0x1d, 0xb6, + 0xa1, 0x09, 0x34, 0xde, 0x4d, 0x02, 0xea, 0x0f, 0x29, 0x29, 0x60, 0xb5, 0x6e, 0x8b, 0x40, 0x09, + 0x46, 0xb9, 0xc0, 0x21, 0xac, 0xed, 0xe9, 0x76, 0x15, 0xc7, 0xb3, 0xdd, 0x5d, 0x43, 0xaa, 0x28, + 0x17, 0x84, 0xc4, 0x0d, 0x21, 0x7a, 0xe8, 0x01, 0xfe, 0x05, 0xfe, 0x03, 0x6e, 0x20, 0xd1, 0x63, + 0xa4, 0x1e, 0xe0, 0x54, 0xa1, 0x18, 0x09, 0x0e, 0x5c, 0xf8, 0x07, 0x00, 0xed, 0xec, 0xec, 0xc6, + 0x6b, 0xef, 0x7a, 0x7f, 0xc4, 0x52, 0x29, 0xb7, 0xb5, 0x67, 0xde, 0x7b, 0x9f, 0x1f, 0x6f, 0x66, + 0x67, 0x16, 0xe6, 0x2d, 0x8d, 0xb6, 0xa8, 0xfd, 0x09, 0x33, 0x77, 0x14, 0x4b, 0xa3, 0x0a, 0x33, + 0x1b, 0xd4, 0xac, 0x31, 0xb6, 0xa3, 0xdc, 0x6b, 0x53, 0xf3, 0xbe, 0x6c, 0x98, 0xcc, 0x66, 0x38, + 0x73, 0x3c, 0x4b, 0xb6, 0x34, 0x2a, 0xfb, 0xb3, 0xf2, 0xaf, 0xd6, 0x99, 0xb5, 0xcb, 0x2c, 0xa5, + 0xa6, 0x5a, 0xd4, 0x0d, 0x51, 0x3e, 0x5e, 0xa9, 0x51, 0x5b, 0x5d, 0x51, 0x0c, 0x55, 0xd3, 0x5b, + 0xaa, 0xad, 0xb3, 0x96, 0x9b, 0x25, 0x3f, 0xa5, 0x31, 0x8d, 0xf1, 0x47, 0xc5, 0x79, 0x12, 0xff, + 0xbe, 0xa8, 0x31, 0xa6, 0x35, 0xa9, 0xa2, 0x1a, 0xba, 0xa2, 0xb6, 0x5a, 0xcc, 0xe6, 0x21, 0x96, + 0x18, 0x7d, 0x39, 0x12, 0x9f, 0xa1, 0x9a, 0xea, 0xae, 0x37, 0x6d, 0x31, 0x72, 0x9a, 0xff, 0x24, + 0x66, 0x2e, 0x0d, 0x4a, 0x68, 0xeb, 0x75, 0xdd, 0xe8, 0x86, 0xbc, 0x10, 0x39, 0x9b, 0xee, 0x19, + 0xcc, 0x6a, 0x9b, 0xd4, 0x9d, 0x28, 0x4d, 0x01, 0xbe, 0xe7, 0xb0, 0xdf, 0xe4, 0xa8, 0xaa, 0xf4, + 0x5e, 0x9b, 0x5a, 0xb6, 0xb4, 0x05, 0x93, 0x81, 0x7f, 0x2d, 0x83, 0xb5, 0x2c, 0x8a, 0xd7, 0x60, + 0xcc, 0x45, 0x3f, 0x43, 0xe6, 0xc8, 0xe2, 0x99, 0xd5, 0x39, 0x39, 0x4a, 0x5f, 0xd9, 0x8d, 0x2c, + 0x9f, 0x7e, 0xf4, 0xa4, 0x38, 0x52, 0x15, 0x51, 0xd2, 0x1e, 0x4c, 0xf3, 0xb4, 0x1b, 0xce, 0xb4, + 0x32, 0x63, 0x3b, 0x5e, 0x41, 0x9c, 0x86, 0x31, 0xcb, 0x56, 0xed, 0xb6, 0x9b, 0x79, 0xbc, 0x2a, + 0x7e, 0x61, 0x05, 0xe0, 0xd8, 0x8e, 0x99, 0x51, 0x5e, 0xf5, 0x82, 0xec, 0x7a, 0x27, 0x3b, 0xde, + 0xc9, 0xae, 0xdd, 0xc2, 0x3b, 0x79, 0x53, 0xd5, 0xa8, 0xc8, 0x59, 0xed, 0x8a, 0x94, 0xbe, 0x25, + 0x90, 0xeb, 0x2b, 0x2d, 0x58, 0xdd, 0x06, 0xf0, 0x71, 0x3b, 0xf5, 0x4f, 0x2d, 0x9e, 0x59, 0x3d, + 0x1f, 0xcd, 0xcc, 0xcf, 0x20, 0xc8, 0x75, 0x05, 0xe3, 0xcd, 0x10, 0xb8, 0x0b, 0xb1, 0x70, 0x5d, + 0x1c, 0x01, 0xbc, 0xeb, 0x70, 0x36, 0x08, 0xd7, 0x13, 0x6a, 0x1e, 0x5e, 0xe0, 0xf5, 0xb6, 0x9d, + 0x82, 0xdb, 0x6d, 0xbd, 0x21, 0x04, 0x7b, 0x9e, 0x79, 0x33, 0xb7, 0xf4, 0x86, 0x54, 0xeb, 0x15, + 0xda, 0x27, 0x7b, 0x4b, 0x90, 0xe5, 0xf1, 0xc2, 0xc6, 0x14, 0x64, 0xc7, 0xfd, 0x32, 0xd2, 0x03, + 0x02, 0xe7, 0x83, 0x45, 0x36, 0xbb, 0x1b, 0xd1, 0x4a, 0x85, 0x78, 0x68, 0x46, 0x77, 0x08, 0xcc, + 0x0f, 0x46, 0x25, 0x84, 0x30, 0x61, 0xb6, 0x0b, 0x56, 0x60, 0x0d, 0x79, 0x4d, 0xb0, 0x9c, 0x40, + 0x97, 0x40, 0x76, 0x21, 0x52, 0x8e, 0x85, 0xd7, 0x1e, 0x5e, 0x7b, 0xec, 0x83, 0x34, 0x80, 0x64, + 0x3a, 0xe5, 0x15, 0x98, 0x0c, 0xb0, 0xdf, 0xd6, 0x5b, 0x0d, 0xba, 0xc7, 0xd1, 0x9d, 0xae, 0x62, + 0x60, 0xe8, 0xb6, 0x33, 0x22, 0x3d, 0x1c, 0x6c, 0xbc, 0xaf, 0xb0, 0x01, 0x33, 0x51, 0x0a, 0x8b, + 0xc6, 0xcb, 0x2a, 0xf0, 0x74, 0xb8, 0xc0, 0xd2, 0x17, 0x04, 0x0a, 0x41, 0x64, 0x37, 0xc4, 0x6e, + 0xf7, 0x94, 0xba, 0xf1, 0x31, 0x81, 0x62, 0x24, 0x20, 0x21, 0x93, 0x06, 0x53, 0x5d, 0x88, 0xbc, + 0xed, 0xd9, 0xeb, 0x41, 0x25, 0x81, 0x44, 0x1b, 0x8d, 0x86, 0xe5, 0xe5, 0x15, 0x0a, 0x21, 0xeb, + 0x2b, 0x38, 0xbc, 0xee, 0xfb, 0x08, 0xce, 0x85, 0x93, 0x4a, 0x27, 0xf2, 0x2c, 0x3c, 0xc7, 0x1a, + 0x0d, 0x8b, 0x8f, 0x8f, 0xf2, 0xf1, 0xff, 0x3b, 0xbf, 0x9d, 0xfd, 0xeb, 0xf3, 0x48, 0x23, 0x7d, + 0xd9, 0x28, 0x4c, 0x86, 0xc8, 0x26, 0x1a, 0x2b, 0xa3, 0x6a, 0x13, 0x7d, 0xaa, 0x49, 0x5f, 0x13, + 0xb8, 0x38, 0xa0, 0xd9, 0x9f, 0x72, 0x7f, 0xfd, 0x46, 0x60, 0x29, 0x19, 0x3a, 0xa1, 0x5a, 0x0b, + 0x72, 0xc1, 0xc5, 0x9e, 0xa2, 0xdf, 0x42, 0x53, 0x7b, 0x2b, 0xd2, 0x08, 0xad, 0x3b, 0xbc, 0x9e, + 0xfb, 0x9e, 0x88, 0x2d, 0x6f, 0x18, 0xf2, 0xa7, 0xdd, 0xf2, 0x7a, 0xfc, 0x3a, 0x95, 0xd9, 0xaf, + 0x27, 0xde, 0xd6, 0xf9, 0x5f, 0xb5, 0xe9, 0x1b, 0xaf, 0x21, 0x6f, 0xe9, 0x96, 0xcd, 0x4c, 0xbd, + 0xae, 0x36, 0xff, 0x4d, 0xeb, 0xe5, 0x77, 0x02, 0xa5, 0x84, 0xf0, 0x9e, 0x75, 0x27, 0x7e, 0x24, + 0x70, 0xa1, 0xbf, 0xd5, 0x2a, 0xed, 0xe6, 0x1d, 0xbd, 0xd9, 0xa4, 0x8d, 0x32, 0xb5, 0x9f, 0x95, + 0x45, 0xf3, 0x13, 0x81, 0x85, 0x58, 0x26, 0xc2, 0xae, 0x3a, 0x04, 0x91, 0x6c, 0xd7, 0xa8, 0xed, + 0x39, 0x25, 0x27, 0x74, 0xaa, 0x4c, 0xed, 0x4d, 0x55, 0x37, 0xbd, 0x77, 0x82, 0xd1, 0x33, 0x36, + 0x3c, 0x8f, 0x56, 0x8f, 0x26, 0xe0, 0x7f, 0x9c, 0x19, 0x7e, 0x46, 0x60, 0xcc, 0xbd, 0x32, 0xe1, + 0x52, 0x34, 0xcc, 0xfe, 0x9b, 0x5a, 0xbe, 0x94, 0x70, 0xb6, 0x5b, 0x5d, 0x3a, 0xf7, 0xe9, 0xe3, + 0x5f, 0x1f, 0x8c, 0xe6, 0xf0, 0x6c, 0xe8, 0xa5, 0x14, 0xbf, 0x22, 0x00, 0xc7, 0x37, 0x24, 0x5c, + 0x8e, 0x49, 0xde, 0x77, 0x8f, 0xcb, 0xaf, 0xa4, 0x88, 0x10, 0x90, 0x8a, 0x1c, 0xd2, 0x2c, 0xe6, + 0x7a, 0x20, 0xed, 0xbb, 0x57, 0xc0, 0x03, 0x7c, 0x48, 0x60, 0xdc, 0x8f, 0x43, 0x25, 0x69, 0x05, + 0x0f, 0xd2, 0x72, 0xf2, 0x00, 0x81, 0x68, 0x81, 0x23, 0x7a, 0x09, 0x8b, 0xbd, 0x88, 0x82, 0xab, + 0xe4, 0x00, 0x0f, 0x09, 0xe4, 0x22, 0xee, 0x19, 0xb8, 0x9e, 0xb4, 0x6c, 0xe8, 0xad, 0x29, 0x7f, + 0x2d, 0x6b, 0xb8, 0xe0, 0x70, 0x89, 0x73, 0x58, 0x46, 0x39, 0x86, 0x43, 0xf0, 0xeb, 0x81, 0x85, + 0x1d, 0x02, 0xd3, 0xe1, 0xb9, 0x71, 0x2d, 0x13, 0x24, 0x8f, 0xd0, 0x7a, 0xc6, 0x68, 0xc1, 0xe7, + 0x1d, 0xce, 0xa7, 0x82, 0xd7, 0xd3, 0xf1, 0x51, 0xf6, 0x43, 0xf6, 0xac, 0x03, 0xfc, 0x8e, 0x00, + 0xf6, 0x1f, 0xc9, 0xf1, 0x4a, 0x52, 0x8c, 0xbd, 0xaf, 0xb1, 0xfc, 0xd5, 0x0c, 0x91, 0x82, 0xd9, + 0x0a, 0x67, 0x76, 0x11, 0x5f, 0x89, 0x63, 0xe6, 0xbf, 0x79, 0xf0, 0x07, 0x02, 0x13, 0x7d, 0x19, + 0xf1, 0x72, 0x5a, 0x0c, 0x1e, 0xf8, 0x2b, 0xe9, 0x03, 0x05, 0xf6, 0x35, 0x8e, 0xfd, 0x12, 0xbe, + 0x9e, 0x18, 0xbb, 0xb2, 0xef, 0x9d, 0xf9, 0x0f, 0xf0, 0x4f, 0x02, 0xc5, 0x98, 0x83, 0x2b, 0xde, + 0xc8, 0xd4, 0x36, 0x7d, 0xfe, 0x54, 0x4e, 0x9a, 0x46, 0x10, 0x7e, 0x83, 0x13, 0xbe, 0x8a, 0x97, + 0x53, 0xb5, 0x61, 0xe9, 0xd8, 0xba, 0x3f, 0x08, 0x4c, 0x47, 0x50, 0x5d, 0x8b, 0xdf, 0xca, 0x07, + 0x30, 0x5c, 0xcf, 0x18, 0x2d, 0x88, 0x6d, 0x71, 0x62, 0x1b, 0xf8, 0x6e, 0x46, 0x62, 0x11, 0x0b, + 0xed, 0x6f, 0x02, 0x73, 0x71, 0x67, 0x2d, 0x8c, 0x33, 0x27, 0xe1, 0x59, 0x32, 0x7f, 0xf3, 0xc4, + 0x79, 0x84, 0x18, 0x6f, 0x73, 0x31, 0xae, 0x63, 0x39, 0x4e, 0x8c, 0xbb, 0x7e, 0xc6, 0x52, 0x94, + 0xe1, 0x7f, 0x11, 0xc8, 0x47, 0x1f, 0x5c, 0xf0, 0xcd, 0x34, 0xb6, 0x85, 0x9d, 0xde, 0xf2, 0x6f, + 0x9d, 0x20, 0x83, 0xe0, 0xfb, 0x21, 0xe7, 0xbb, 0x85, 0xef, 0x0f, 0x63, 0x73, 0x55, 0xee, 0x78, + 0x35, 0xf8, 0xe1, 0xab, 0x5c, 0x79, 0x74, 0x54, 0x20, 0x87, 0x47, 0x05, 0xf2, 0xcb, 0x51, 0x81, + 0x7c, 0xd9, 0x29, 0x8c, 0x1c, 0x76, 0x0a, 0x23, 0x3f, 0x77, 0x0a, 0x23, 0x1f, 0x2c, 0x69, 0xba, + 0x7d, 0xb7, 0x5d, 0x93, 0xeb, 0x6c, 0xd7, 0x29, 0x5c, 0xea, 0xfe, 0x60, 0xbd, 0xd7, 0x05, 0xc3, + 0xbe, 0x6f, 0x50, 0xab, 0x36, 0xc6, 0x3f, 0x58, 0xbf, 0xf6, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x33, 0x15, 0x56, 0x97, 0xfa, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1810,7 +1812,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/orderbook/query.proto", + Metadata: "sgenetwork/sge/orderbook/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/orderbook/types/query.pb.gw.go b/x/orderbook/types/query.pb.gw.go index b3472daf..8de744ce 100644 --- a/x/orderbook/types/query.pb.gw.go +++ b/x/orderbook/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: sge/orderbook/query.proto +// source: sgenetwork/sge/orderbook/query.proto /* Package types is a reverse proxy. diff --git a/x/orderbook/types/stats.pb.go b/x/orderbook/types/stats.pb.go index b7e756d0..ca757d8f 100644 --- a/x/orderbook/types/stats.pb.go +++ b/x/orderbook/types/stats.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/orderbook/stats.proto +// source: sgenetwork/sge/orderbook/stats.proto package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -33,7 +33,7 @@ func (m *OrderBookStats) Reset() { *m = OrderBookStats{} } func (m *OrderBookStats) String() string { return proto.CompactTextString(m) } func (*OrderBookStats) ProtoMessage() {} func (*OrderBookStats) Descriptor() ([]byte, []int) { - return fileDescriptor_bbf84578c9c8bd09, []int{0} + return fileDescriptor_3f23c49f1ff7e427, []int{0} } func (m *OrderBookStats) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -73,22 +73,24 @@ func init() { proto.RegisterType((*OrderBookStats)(nil), "sgenetwork.sge.orderbook.OrderBookStats") } -func init() { proto.RegisterFile("sge/orderbook/stats.proto", fileDescriptor_bbf84578c9c8bd09) } +func init() { + proto.RegisterFile("sgenetwork/sge/orderbook/stats.proto", fileDescriptor_3f23c49f1ff7e427) +} -var fileDescriptor_bbf84578c9c8bd09 = []byte{ - // 182 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2c, 0x4e, 0x4f, 0xd5, - 0xcf, 0x2f, 0x4a, 0x49, 0x2d, 0x4a, 0xca, 0xcf, 0xcf, 0xd6, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0xd6, - 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x28, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, - 0xca, 0xd6, 0x2b, 0x4e, 0x4f, 0xd5, 0x83, 0xab, 0x52, 0xb2, 0xe7, 0xe2, 0xf3, 0x07, 0x71, 0x9c, - 0xf2, 0xf3, 0xb3, 0x83, 0x41, 0x3a, 0x84, 0x74, 0xb9, 0x84, 0x8a, 0x52, 0x8b, 0xf3, 0x73, 0xca, - 0x52, 0x53, 0xe2, 0x4b, 0xf3, 0x8a, 0x53, 0x4b, 0x4a, 0x72, 0x52, 0x53, 0x24, 0x18, 0x15, 0x98, - 0x35, 0x38, 0x83, 0x04, 0x61, 0x32, 0xa1, 0x30, 0x09, 0x27, 0xb7, 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, 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, - 0xd5, 0x2f, 0x4e, 0x4f, 0xd5, 0x85, 0x3a, 0x00, 0xc4, 0xd6, 0xaf, 0x40, 0x72, 0x68, 0x49, 0x65, - 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0xa5, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x5a, - 0x75, 0x21, 0xc6, 0x00, 0x00, 0x00, +var fileDescriptor_3f23c49f1ff7e427 = []byte{ + // 180 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x29, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x2f, 0x4a, 0x49, 0x2d, + 0x4a, 0xca, 0xcf, 0xcf, 0xd6, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, + 0x17, 0x92, 0x40, 0xa8, 0xd2, 0x2b, 0x4e, 0x4f, 0xd5, 0x83, 0xab, 0x52, 0xb2, 0xe7, 0xe2, 0xf3, + 0x07, 0x71, 0x9c, 0xf2, 0xf3, 0xb3, 0x83, 0x41, 0x3a, 0x84, 0x74, 0xb9, 0x84, 0x8a, 0x52, 0x8b, + 0xf3, 0x73, 0xca, 0x52, 0x53, 0xe2, 0x4b, 0xf3, 0x8a, 0x53, 0x4b, 0x4a, 0x72, 0x52, 0x53, 0x24, + 0x18, 0x15, 0x98, 0x35, 0x38, 0x83, 0x04, 0x61, 0x32, 0xa1, 0x30, 0x09, 0x27, 0xb7, 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, 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, + 0x4b, 0xce, 0xcf, 0x05, 0x39, 0x4d, 0x17, 0xd9, 0x99, 0x15, 0x48, 0x0e, 0x2d, 0xa9, 0x2c, 0x48, + 0x2d, 0x4e, 0x62, 0x03, 0xbb, 0xd4, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x7b, 0xf6, 0xfd, 0x77, + 0xd1, 0x00, 0x00, 0x00, } func (m *OrderBookStats) Marshal() (dAtA []byte, err error) { diff --git a/x/ovm/client/cli/query_proposal_test.go b/x/ovm/client/cli/query_proposal_test.go index d30df598..d7ace70b 100644 --- a/x/ovm/client/cli/query_proposal_test.go +++ b/x/ovm/client/cli/query_proposal_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + tmcli "github.com/cometbft/cometbft/libs/cli" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/sge-network/sge/testutil/network" "github.com/sge-network/sge/testutil/nullify" @@ -13,7 +14,6 @@ import ( "github.com/sge-network/sge/x/ovm/types" "github.com/spf13/cast" "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/ovm/client/cli/query_pub_keys_test.go b/x/ovm/client/cli/query_pub_keys_test.go index 5206c057..7caed147 100644 --- a/x/ovm/client/cli/query_pub_keys_test.go +++ b/x/ovm/client/cli/query_pub_keys_test.go @@ -4,13 +4,13 @@ import ( "fmt" "testing" + tmcli "github.com/cometbft/cometbft/libs/cli" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/sge-network/sge/testutil/network" simappUtil "github.com/sge-network/sge/testutil/simapp" "github.com/sge-network/sge/x/ovm/client/cli" "github.com/sge-network/sge/x/ovm/types" "github.com/stretchr/testify/require" - tmcli "github.com/tendermint/tendermint/libs/cli" "google.golang.org/grpc/status" ) diff --git a/x/ovm/client/cli/tx_pubkeys_proposal_test.go b/x/ovm/client/cli/tx_pubkeys_proposal_test.go index b3087964..e2762dd7 100644 --- a/x/ovm/client/cli/tx_pubkeys_proposal_test.go +++ b/x/ovm/client/cli/tx_pubkeys_proposal_test.go @@ -27,7 +27,7 @@ func TestCmdChangePubkeysListProposal(t *testing.T) { commonArgs := []string{ fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), - fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock), + fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), fmt.Sprintf( "--%s=%s", flags.FlagFees, diff --git a/x/ovm/keeper/keeper.go b/x/ovm/keeper/keeper.go index 510a49db..6ad34fea 100644 --- a/x/ovm/keeper/keeper.go +++ b/x/ovm/keeper/keeper.go @@ -3,12 +3,12 @@ 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/sge-network/sge/x/ovm/types" - "github.com/tendermint/tendermint/libs/log" ) // Keeper is the type for module properties diff --git a/x/ovm/module.go b/x/ovm/module.go index 9c2c4110..f9c244e7 100644 --- a/x/ovm/module.go +++ b/x/ovm/module.go @@ -9,7 +9,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" @@ -114,15 +114,9 @@ func NewAppModule( // Name returns the module's name. func (am AppModule) Name() string { return am.AppModuleBasic.Name() } -// Route returns the module's message routing key. -func (am AppModule) Route() sdk.Route { return sdk.NewRoute(types.RouterKey, NewHandler(am.keeper)) } - // QuerierRoute returns the module's query routing key. func (AppModule) QuerierRoute() string { return types.QuerierRoute } -// LegacyQuerierHandler returns the module's Querier. -func (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/ovm/module_simulation.go b/x/ovm/module_simulation.go index 8c7c56ab..cbbe5663 100644 --- a/x/ovm/module_simulation.go +++ b/x/ovm/module_simulation.go @@ -5,7 +5,7 @@ import ( "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" - simappparams "github.com/cosmos/cosmos-sdk/simapp/params" + simtestutil "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 +19,7 @@ import ( var ( _ = sample.AccAddress _ = ovmsimulation.FindAccount - _ = simappparams.StakePerAccount + _ = simtestutil.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace ) @@ -42,8 +42,8 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP } // RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(_ *rand.Rand) []simtypes.ParamChange { - return []simtypes.ParamChange{} +func (AppModule) RandomizedParams(_ *rand.Rand) []simtypes.LegacyParamChange { + return []simtypes.LegacyParamChange{} } // RegisterStoreDecoder registers a decoder diff --git a/x/ovm/types/codec.go b/x/ovm/types/codec.go index f7578b24..a954cca2 100644 --- a/x/ovm/types/codec.go +++ b/x/ovm/types/codec.go @@ -4,7 +4,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" - cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" ) @@ -34,6 +33,6 @@ var ( func init() { RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) + // cryptocodec.RegisterCrypto(amino) sdk.RegisterLegacyAminoCodec(amino) } diff --git a/x/ovm/types/genesis.pb.go b/x/ovm/types/genesis.pb.go index 7d6585ce..968933e4 100644 --- a/x/ovm/types/genesis.pb.go +++ b/x/ovm/types/genesis.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/ovm/genesis.proto +// source: sgenetwork/sge/ovm/genesis.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -40,7 +40,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_89d2511229f4bb0b, []int{0} + return fileDescriptor_38b9a617643a053f, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -101,31 +101,32 @@ func init() { proto.RegisterType((*GenesisState)(nil), "sgenetwork.sge.ovm.GenesisState") } -func init() { proto.RegisterFile("sge/ovm/genesis.proto", fileDescriptor_89d2511229f4bb0b) } +func init() { proto.RegisterFile("sgenetwork/sge/ovm/genesis.proto", fileDescriptor_38b9a617643a053f) } -var fileDescriptor_89d2511229f4bb0b = []byte{ - // 335 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xc1, 0x4a, 0xc3, 0x40, - 0x10, 0x4d, 0xda, 0x52, 0x34, 0x55, 0x0f, 0xb1, 0xd6, 0x10, 0x24, 0x56, 0x0f, 0xd2, 0x83, 0x26, - 0x50, 0x2f, 0xde, 0x14, 0x3d, 0x78, 0x28, 0x48, 0x51, 0xf0, 0xe0, 0x25, 0x6c, 0xca, 0xb0, 0x2d, - 0x49, 0xba, 0x21, 0xb3, 0xa9, 0xe6, 0x2f, 0xfc, 0x2b, 0x7b, 0xec, 0xd1, 0x93, 0x48, 0xfb, 0x23, - 0x92, 0xed, 0xa4, 0x50, 0xcc, 0x6d, 0xf7, 0xcd, 0x7b, 0x6f, 0xde, 0xcc, 0x18, 0x47, 0xc8, 0xc1, - 0x13, 0xb3, 0xd8, 0xe3, 0x30, 0x05, 0x9c, 0xa0, 0x9b, 0xa4, 0x42, 0x0a, 0xd3, 0xc4, 0xe2, 0x2f, - 0xdf, 0x45, 0x1a, 0xba, 0xc8, 0xc1, 0x15, 0xb3, 0xd8, 0x6e, 0x73, 0xc1, 0x85, 0x2a, 0x7b, 0xc5, - 0x6b, 0xcd, 0xb4, 0xdb, 0xa5, 0x41, 0xc2, 0x52, 0x16, 0x93, 0xde, 0x3e, 0x2e, 0xd1, 0x10, 0x72, - 0x7f, 0xc6, 0xb2, 0x48, 0x52, 0xa1, 0xb3, 0xa1, 0xa7, 0x22, 0x11, 0xc8, 0x22, 0xc2, 0x0f, 0x4b, - 0x1c, 0x25, 0x93, 0xe4, 0x72, 0xfe, 0x55, 0x33, 0xf6, 0x1e, 0xd7, 0xb9, 0x5e, 0x24, 0x93, 0x60, - 0xde, 0x18, 0xcd, 0x75, 0x1b, 0x4b, 0xef, 0xea, 0xbd, 0x56, 0xdf, 0x76, 0xff, 0xe7, 0x74, 0x87, - 0x8a, 0x71, 0xdf, 0x98, 0xff, 0x9c, 0x6a, 0xcf, 0xc4, 0x37, 0x6f, 0x8d, 0xdd, 0x4d, 0x14, 0xab, - 0xa6, 0xc4, 0x27, 0x55, 0xe2, 0x01, 0xe4, 0xaf, 0x05, 0x87, 0xe4, 0x3b, 0x21, 0xfd, 0xcd, 0xc8, - 0xb0, 0x92, 0x2c, 0x08, 0x21, 0x47, 0x7f, 0x34, 0x66, 0x53, 0x0e, 0x7e, 0x39, 0x01, 0x5a, 0xf5, - 0x6e, 0xbd, 0xd7, 0xea, 0x5f, 0x56, 0x86, 0xc9, 0x82, 0x68, 0x32, 0x1a, 0x40, 0x8e, 0x0f, 0x4a, - 0x35, 0x24, 0x11, 0xf9, 0x77, 0xc8, 0x73, 0xbb, 0x88, 0xe6, 0x93, 0x71, 0x50, 0xda, 0xfb, 0x6a, - 0x23, 0x56, 0x43, 0x65, 0x3e, 0xab, 0xec, 0x41, 0xcc, 0x62, 0x47, 0xe5, 0xdc, 0xfb, 0xc9, 0x16, - 0x78, 0x37, 0x5f, 0x3a, 0xfa, 0x62, 0xe9, 0xe8, 0xbf, 0x4b, 0x47, 0xff, 0x5c, 0x39, 0xda, 0x62, - 0xe5, 0x68, 0xdf, 0x2b, 0x47, 0x7b, 0xbb, 0xe0, 0x13, 0x39, 0xce, 0x02, 0x77, 0x24, 0x62, 0x0f, - 0x39, 0x5c, 0x91, 0x79, 0xf1, 0xf6, 0x3e, 0xd4, 0x45, 0x64, 0x9e, 0x00, 0x06, 0x4d, 0x75, 0x92, - 0xeb, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x9e, 0xd5, 0xa7, 0x31, 0x02, 0x00, 0x00, +var fileDescriptor_38b9a617643a053f = []byte{ + // 338 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xbf, 0x4e, 0xf3, 0x30, + 0x14, 0xc5, 0x93, 0xb6, 0xaa, 0xbe, 0x2f, 0x05, 0x06, 0x0b, 0xa1, 0x28, 0x42, 0xee, 0x9f, 0x01, + 0x75, 0x00, 0x47, 0x2a, 0x0b, 0x1b, 0x08, 0x06, 0x86, 0x4a, 0xa8, 0x02, 0x89, 0x81, 0x25, 0x72, + 0x2a, 0xcb, 0xad, 0x92, 0xd4, 0x56, 0xae, 0x53, 0xc8, 0x5b, 0xf0, 0x56, 0x74, 0xec, 0xc8, 0x84, + 0x50, 0xfb, 0x22, 0x28, 0xae, 0x0b, 0x54, 0x78, 0x4b, 0xec, 0xdf, 0x39, 0xbe, 0xe7, 0x1e, 0xaf, + 0x03, 0x9c, 0xcd, 0x98, 0x7a, 0x16, 0x79, 0x12, 0x02, 0x67, 0xa1, 0x98, 0x67, 0x61, 0x75, 0x02, + 0x53, 0x20, 0x32, 0x17, 0x4a, 0x20, 0xf4, 0x43, 0x10, 0xe0, 0x8c, 0x88, 0x79, 0x16, 0x1c, 0x72, + 0xc1, 0x85, 0xbe, 0x0e, 0xab, 0xaf, 0x0d, 0x19, 0xb4, 0x2d, 0x5e, 0x92, 0xe6, 0x34, 0x33, 0x56, + 0x41, 0xcf, 0x02, 0x24, 0xac, 0x8c, 0xe6, 0xb4, 0x48, 0x95, 0x61, 0xba, 0x36, 0x93, 0x5c, 0x48, + 0x01, 0x34, 0x35, 0x08, 0xb6, 0x20, 0xa0, 0xa8, 0x32, 0xcf, 0xf4, 0xde, 0x6a, 0xde, 0xde, 0xed, + 0x26, 0xc3, 0x83, 0xa2, 0x8a, 0xa1, 0x0b, 0xaf, 0xb9, 0x99, 0xc3, 0x77, 0x3b, 0x6e, 0xbf, 0x35, + 0x08, 0xc8, 0xdf, 0x4c, 0x64, 0xa4, 0x89, 0xeb, 0xc6, 0xe2, 0xa3, 0xed, 0xdc, 0x1b, 0x1e, 0x5d, + 0x7a, 0xff, 0xbf, 0x07, 0xf4, 0x6b, 0x5a, 0x7c, 0x6c, 0x13, 0x0f, 0x59, 0xf9, 0x58, 0x31, 0x46, + 0xfe, 0x2f, 0x31, 0xff, 0x28, 0xf5, 0x7c, 0x59, 0xc4, 0x09, 0x2b, 0x21, 0x1a, 0x4f, 0xe8, 0x8c, + 0xb3, 0x68, 0x1b, 0x06, 0xfc, 0x7a, 0xa7, 0xde, 0x6f, 0x0d, 0x4e, 0xad, 0xc3, 0x14, 0x71, 0x3a, + 0x1d, 0x0f, 0x59, 0x09, 0x37, 0x5a, 0x35, 0x32, 0x22, 0xe3, 0x7f, 0x64, 0x3c, 0x77, 0x2f, 0x01, + 0xdd, 0x79, 0x07, 0x5b, 0xfb, 0x48, 0x6f, 0xc4, 0x6f, 0xe8, 0x99, 0xbb, 0xd6, 0x37, 0x0c, 0x59, + 0xed, 0x68, 0x9b, 0x7b, 0x5f, 0xee, 0x1c, 0x5e, 0x2d, 0x56, 0xd8, 0x5d, 0xae, 0xb0, 0xfb, 0xb9, + 0xc2, 0xee, 0xeb, 0x1a, 0x3b, 0xcb, 0x35, 0x76, 0xde, 0xd7, 0xd8, 0x79, 0x3a, 0xe1, 0x53, 0x35, + 0x29, 0x62, 0x32, 0x16, 0x59, 0xd5, 0xc1, 0xd9, 0xef, 0x3e, 0x5e, 0x74, 0x23, 0xaa, 0x94, 0x0c, + 0xe2, 0xa6, 0xae, 0xe4, 0xfc, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x01, 0x1f, 0xc4, 0xc4, 0x68, 0x02, + 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ovm/types/key_vault.pb.go b/x/ovm/types/key_vault.pb.go index 422ba09f..fd9d4b98 100644 --- a/x/ovm/types/key_vault.pb.go +++ b/x/ovm/types/key_vault.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/ovm/key_vault.proto +// source: sgenetwork/sge/ovm/key_vault.proto package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -32,7 +32,7 @@ func (m *KeyVault) Reset() { *m = KeyVault{} } func (m *KeyVault) String() string { return proto.CompactTextString(m) } func (*KeyVault) ProtoMessage() {} func (*KeyVault) Descriptor() ([]byte, []int) { - return fileDescriptor_58deae9100d60c6b, []int{0} + return fileDescriptor_c57e8bf69362e3d7, []int{0} } func (m *KeyVault) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -72,21 +72,23 @@ func init() { proto.RegisterType((*KeyVault)(nil), "sgenetwork.sge.ovm.KeyVault") } -func init() { proto.RegisterFile("sge/ovm/key_vault.proto", fileDescriptor_58deae9100d60c6b) } +func init() { + proto.RegisterFile("sgenetwork/sge/ovm/key_vault.proto", fileDescriptor_c57e8bf69362e3d7) +} -var fileDescriptor_58deae9100d60c6b = []byte{ - // 171 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2f, 0x4e, 0x4f, 0xd5, - 0xcf, 0x2f, 0xcb, 0xd5, 0xcf, 0x4e, 0xad, 0x8c, 0x2f, 0x4b, 0x2c, 0xcd, 0x29, 0xd1, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x2a, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, - 0x2b, 0x4e, 0x4f, 0xd5, 0xcb, 0x2f, 0xcb, 0x55, 0xd2, 0xe6, 0xe2, 0xf0, 0x4e, 0xad, 0x0c, 0x03, - 0xa9, 0x12, 0x92, 0xe7, 0xe2, 0x2e, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0x8e, 0xcf, 0x4e, 0xad, 0x2c, - 0x96, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x0c, 0xe2, 0x82, 0x08, 0x79, 0xa7, 0x56, 0x16, 0x3b, 0x39, - 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, 0x5a, 0x7a, 0x66, 0x49, 0x46, - 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x71, 0x7a, 0xaa, 0x2e, 0xd4, 0x1a, 0x10, 0x5b, 0xbf, - 0x02, 0xec, 0x98, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x4b, 0x8c, 0x01, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x8f, 0x9b, 0xca, 0x0f, 0xa4, 0x00, 0x00, 0x00, +var fileDescriptor_c57e8bf69362e3d7 = []byte{ + // 169 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2a, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x2f, 0xcb, 0xd5, 0xcf, + 0x4e, 0xad, 0x8c, 0x2f, 0x4b, 0x2c, 0xcd, 0x29, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, + 0x42, 0xa8, 0xd1, 0x2b, 0x4e, 0x4f, 0xd5, 0xcb, 0x2f, 0xcb, 0x55, 0xd2, 0xe6, 0xe2, 0xf0, 0x4e, + 0xad, 0x0c, 0x03, 0xa9, 0x12, 0x92, 0xe7, 0xe2, 0x2e, 0x28, 0x4d, 0xca, 0xc9, 0x4c, 0x8e, 0xcf, + 0x4e, 0xad, 0x2c, 0x96, 0x60, 0x54, 0x60, 0xd6, 0xe0, 0x0c, 0xe2, 0x82, 0x08, 0x79, 0xa7, 0x56, + 0x16, 0x3b, 0x39, 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, 0x5a, 0x7a, + 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0x2e, 0xc8, 0x7a, 0x5d, 0x64, 0xa7, 0x54, 0x80, + 0x1d, 0x53, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, 0x89, 0x31, 0x20, 0x00, 0x00, 0xff, + 0xff, 0x51, 0xe3, 0x8a, 0x8c, 0xaf, 0x00, 0x00, 0x00, } func (m *KeyVault) Marshal() (dAtA []byte, err error) { diff --git a/x/ovm/types/params.pb.go b/x/ovm/types/params.pb.go index b1147ddd..91b5d56d 100644 --- a/x/ovm/types/params.pb.go +++ b/x/ovm/types/params.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/ovm/params.proto +// source: sgenetwork/sge/ovm/params.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + 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_65fb97c596bcf99f, []int{0} + return fileDescriptor_169f97f56fec979a, []int{0} } func (m *Params) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -63,20 +63,20 @@ func init() { proto.RegisterType((*Params)(nil), "sgenetwork.sge.ovm.Params") } -func init() { proto.RegisterFile("sge/ovm/params.proto", fileDescriptor_65fb97c596bcf99f) } +func init() { proto.RegisterFile("sgenetwork/sge/ovm/params.proto", fileDescriptor_169f97f56fec979a) } -var fileDescriptor_65fb97c596bcf99f = []byte{ - // 155 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x29, 0x4e, 0x4f, 0xd5, - 0xcf, 0x2f, 0xcb, 0xd5, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x12, 0x2a, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x4e, 0x4f, - 0xd5, 0xcb, 0x2f, 0xcb, 0x95, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xeb, 0x83, 0x58, 0x10, - 0x95, 0x4a, 0x7c, 0x5c, 0x6c, 0x01, 0x60, 0x9d, 0x56, 0x2c, 0x33, 0x16, 0xc8, 0x33, 0x38, 0x39, - 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, 0x5a, 0x7a, 0x66, 0x49, 0x46, - 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x71, 0x7a, 0xaa, 0x2e, 0xd4, 0x7c, 0x10, 0x5b, 0xbf, - 0x02, 0xec, 0x84, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0xc1, 0xc6, 0x80, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x63, 0xe2, 0x33, 0xd8, 0x9a, 0x00, 0x00, 0x00, +var fileDescriptor_169f97f56fec979a = []byte{ + // 153 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x2f, 0xcb, 0xd5, 0x2f, + 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0x28, 0xd0, + 0x2b, 0x4e, 0x4f, 0xd5, 0xcb, 0x2f, 0xcb, 0x95, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x4b, 0xeb, + 0x83, 0x58, 0x10, 0x95, 0x4a, 0x7c, 0x5c, 0x6c, 0x01, 0x60, 0x9d, 0x56, 0x2c, 0x33, 0x16, 0xc8, + 0x33, 0x38, 0x39, 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, 0x5a, 0x7a, + 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0x2e, 0xc8, 0x52, 0x5d, 0x64, 0x07, 0x54, 0x80, + 0x9d, 0x50, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x36, 0xd8, 0x18, 0x10, 0x00, 0x00, 0xff, + 0xff, 0x0a, 0x76, 0x8b, 0x3f, 0xa5, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/ovm/types/proposal.pb.go b/x/ovm/types/proposal.pb.go index 495f57da..51b7bf6b 100644 --- a/x/ovm/types/proposal.pb.go +++ b/x/ovm/types/proposal.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/ovm/proposal.proto +// source: sgenetwork/sge/ovm/proposal.proto package types import ( fmt "fmt" _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -56,7 +56,7 @@ func (x ProposalResult) String() string { } func (ProposalResult) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_e792f74ac2c59557, []int{0} + return fileDescriptor_68d5b3dc34bd8d1b, []int{0} } // ProposalStatus is the enum type for the proposal status. @@ -88,7 +88,7 @@ func (x ProposalStatus) String() string { } func (ProposalStatus) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_e792f74ac2c59557, []int{1} + return fileDescriptor_68d5b3dc34bd8d1b, []int{1} } // PublicKeysChangeProposal is the type for the proposal for additions and @@ -118,7 +118,7 @@ func (m *PublicKeysChangeProposal) Reset() { *m = PublicKeysChangePropos func (m *PublicKeysChangeProposal) String() string { return proto.CompactTextString(m) } func (*PublicKeysChangeProposal) ProtoMessage() {} func (*PublicKeysChangeProposal) Descriptor() ([]byte, []int) { - return fileDescriptor_e792f74ac2c59557, []int{0} + return fileDescriptor_68d5b3dc34bd8d1b, []int{0} } func (m *PublicKeysChangeProposal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -216,44 +216,44 @@ func init() { proto.RegisterType((*PublicKeysChangeProposal)(nil), "sgenetwork.sge.ovm.PublicKeysChangeProposal") } -func init() { proto.RegisterFile("sge/ovm/proposal.proto", fileDescriptor_e792f74ac2c59557) } - -var fileDescriptor_e792f74ac2c59557 = []byte{ - // 532 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x4d, 0x6b, 0x1a, 0x41, - 0x1c, 0xc6, 0x1d, 0x4d, 0xa2, 0x8e, 0x54, 0x64, 0x08, 0xc9, 0xd4, 0x94, 0xdd, 0x25, 0x87, 0xb2, - 0x04, 0xba, 0x16, 0x73, 0x28, 0xf4, 0x54, 0x5f, 0x56, 0xba, 0x6d, 0x1a, 0x97, 0xd9, 0x55, 0x4a, - 0x29, 0xc8, 0xaa, 0x93, 0x75, 0xf1, 0x65, 0x64, 0x67, 0xb4, 0xf5, 0x2b, 0xf4, 0xd4, 0x8f, 0x95, - 0x63, 0x8e, 0xed, 0x45, 0x8a, 0xde, 0xfa, 0x29, 0xca, 0xbe, 0x18, 0xd1, 0x08, 0xbd, 0x3d, 0xf3, - 0x3c, 0xcf, 0xfc, 0xe7, 0xc7, 0xc0, 0x1f, 0x9e, 0x71, 0x97, 0x96, 0xd8, 0x7c, 0x5c, 0x9a, 0xfa, - 0x6c, 0xca, 0xb8, 0x33, 0xd2, 0xa6, 0x3e, 0x13, 0x0c, 0x21, 0xee, 0xd2, 0x09, 0x15, 0xdf, 0x98, - 0x3f, 0xd4, 0xb8, 0x4b, 0x35, 0x36, 0x1f, 0x17, 0x4f, 0x5d, 0xe6, 0xb2, 0x30, 0x2e, 0x05, 0x2a, - 0x6a, 0x16, 0x4f, 0x37, 0x13, 0x84, 0xd7, 0x1b, 0x52, 0x11, 0xbb, 0x68, 0xe3, 0xce, 0x99, 0xa0, - 0x91, 0x77, 0xf9, 0x3b, 0x05, 0xb1, 0x39, 0xeb, 0x8e, 0xbc, 0xde, 0x47, 0xba, 0xe0, 0xb5, 0x81, - 0x33, 0x71, 0xa9, 0x19, 0x3f, 0x8b, 0xf2, 0x30, 0xe9, 0xf5, 0x31, 0x50, 0x80, 0x7a, 0x44, 0x92, - 0x5e, 0x1f, 0x61, 0x98, 0xee, 0xf9, 0xd4, 0x11, 0xcc, 0xc7, 0x49, 0x05, 0xa8, 0x59, 0xb2, 0x39, - 0xa2, 0xaf, 0xf0, 0xd9, 0x98, 0xf5, 0xbd, 0x3b, 0xaf, 0xe7, 0x08, 0x8f, 0x4d, 0x38, 0x4e, 0x29, - 0x40, 0xcd, 0x95, 0x5f, 0x6b, 0x4f, 0x91, 0x35, 0x73, 0xd6, 0x1d, 0x3e, 0x79, 0xcb, 0x74, 0x16, - 0x23, 0xe6, 0xf4, 0xab, 0x47, 0xf7, 0x4b, 0x39, 0x41, 0x76, 0x87, 0x21, 0x0d, 0x1e, 0x07, 0xc8, - 0x1c, 0x1f, 0x29, 0x29, 0x35, 0x57, 0xc6, 0x87, 0xa6, 0xb6, 0x99, 0xa0, 0x24, 0xaa, 0xa1, 0x6b, - 0x98, 0xe1, 0xc2, 0xf1, 0x45, 0x47, 0x70, 0x7c, 0xac, 0x00, 0x35, 0x55, 0x3d, 0x5f, 0x2d, 0xe5, - 0xb4, 0x15, 0x78, 0xb6, 0xf5, 0x77, 0x29, 0x3f, 0xc6, 0xe4, 0x51, 0xa1, 0xb7, 0xf0, 0xc4, 0xa7, - 0x7c, 0x36, 0x12, 0xf8, 0x44, 0x01, 0x6a, 0xbe, 0x7c, 0x79, 0x90, 0x3d, 0xc6, 0x25, 0x61, 0x93, - 0xc4, 0x37, 0x90, 0x0c, 0x73, 0x91, 0xea, 0x8c, 0xa9, 0x70, 0x70, 0x3a, 0xfc, 0x1c, 0x18, 0x59, - 0x9f, 0xa8, 0x70, 0xd0, 0x1b, 0x98, 0xbd, 0xf3, 0x26, 0x1e, 0x1f, 0x04, 0x48, 0x99, 0x10, 0xe9, - 0xf9, 0x6a, 0x29, 0x67, 0x1a, 0xa1, 0x19, 0x32, 0x6d, 0x0b, 0x64, 0x2b, 0x03, 0x2a, 0x2e, 0x1c, - 0x31, 0xe3, 0x38, 0xfb, 0x7f, 0x2a, 0x2b, 0x6c, 0x92, 0xf8, 0xc6, 0xd5, 0x0f, 0x00, 0xf3, 0xbb, - 0xc0, 0x48, 0x86, 0x17, 0x26, 0x69, 0x9a, 0x4d, 0xab, 0x72, 0xd3, 0x21, 0xba, 0xd5, 0xba, 0xb1, - 0x3b, 0xad, 0x5b, 0xcb, 0xd4, 0x6b, 0x46, 0xc3, 0xd0, 0xeb, 0x85, 0x04, 0x7a, 0x01, 0xf1, 0x7e, - 0xa1, 0x62, 0x9a, 0xa4, 0xd9, 0xd6, 0xeb, 0x05, 0x70, 0x28, 0x25, 0xfa, 0x07, 0xbd, 0x66, 0xeb, - 0xf5, 0x42, 0x12, 0x5d, 0xc0, 0xf3, 0xfd, 0x54, 0xff, 0x6c, 0x1a, 0x44, 0xaf, 0x17, 0x52, 0x57, - 0xc3, 0x2d, 0x4b, 0x84, 0xb9, 0xc3, 0x62, 0xd9, 0x15, 0xbb, 0x65, 0xed, 0xb1, 0x14, 0xe1, 0xd9, - 0x7e, 0xa1, 0x52, 0xb3, 0x8d, 0xb6, 0xbe, 0x47, 0x12, 0x67, 0x0d, 0xe3, 0xd6, 0xb0, 0xde, 0x07, - 0x24, 0xd5, 0x77, 0xf7, 0x2b, 0x09, 0x3c, 0xac, 0x24, 0xf0, 0x67, 0x25, 0x81, 0x9f, 0x6b, 0x29, - 0xf1, 0xb0, 0x96, 0x12, 0xbf, 0xd6, 0x52, 0xe2, 0xcb, 0x4b, 0xd7, 0x13, 0x83, 0x59, 0x57, 0xeb, - 0xb1, 0x71, 0x89, 0xbb, 0xf4, 0x55, 0xfc, 0x95, 0x81, 0x2e, 0x7d, 0x8f, 0x56, 0x66, 0x31, 0xa5, - 0xbc, 0x7b, 0x12, 0xae, 0xc7, 0xf5, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, 0xb8, 0x1e, 0x88, - 0x8c, 0x03, 0x00, 0x00, +func init() { proto.RegisterFile("sgenetwork/sge/ovm/proposal.proto", fileDescriptor_68d5b3dc34bd8d1b) } + +var fileDescriptor_68d5b3dc34bd8d1b = []byte{ + // 533 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x4d, 0x8f, 0xd2, 0x40, + 0x18, 0xc7, 0x19, 0xd8, 0xe5, 0x65, 0x88, 0x84, 0x4c, 0x8c, 0x3b, 0xb2, 0xda, 0xd6, 0x3d, 0x98, + 0x66, 0x13, 0x8b, 0x61, 0x0f, 0x26, 0x9e, 0xe4, 0xa5, 0xc4, 0xea, 0xba, 0x34, 0xd3, 0x42, 0x8c, + 0x31, 0x21, 0x05, 0x66, 0x4b, 0xc3, 0xcb, 0x90, 0xce, 0x80, 0xf2, 0x15, 0x3c, 0xf9, 0xb1, 0xf6, + 0xb8, 0x47, 0xbd, 0x10, 0x03, 0x37, 0x3f, 0x85, 0xe9, 0x8b, 0x8b, 0xb0, 0x24, 0xde, 0x9e, 0x3e, + 0xff, 0xdf, 0xf3, 0xf4, 0xd7, 0x26, 0x0f, 0x7c, 0xc6, 0x5d, 0x3a, 0xa5, 0xe2, 0x0b, 0xf3, 0x47, + 0x65, 0xee, 0xd2, 0x32, 0x5b, 0x4c, 0xca, 0x33, 0x9f, 0xcd, 0x18, 0x77, 0xc6, 0xda, 0xcc, 0x67, + 0x82, 0x21, 0xb4, 0x45, 0x34, 0xee, 0x52, 0x8d, 0x2d, 0x26, 0xa5, 0x87, 0x2e, 0x73, 0x59, 0x18, + 0x97, 0x83, 0x2a, 0x22, 0x4b, 0xf2, 0x81, 0x65, 0xc2, 0xeb, 0x8f, 0xa8, 0x88, 0x81, 0xa7, 0x07, + 0x80, 0x05, 0x13, 0x34, 0x8a, 0xcf, 0x7e, 0xa6, 0x20, 0x36, 0xe7, 0xbd, 0xb1, 0xd7, 0x7f, 0x4f, + 0x97, 0xbc, 0x3e, 0x74, 0xa6, 0x2e, 0x35, 0x63, 0x19, 0x54, 0x80, 0x49, 0x6f, 0x80, 0x81, 0x02, + 0xd4, 0x23, 0x92, 0xf4, 0x06, 0x08, 0xc3, 0x4c, 0xdf, 0xa7, 0x8e, 0x60, 0x3e, 0x4e, 0x2a, 0x40, + 0xcd, 0x91, 0xbf, 0x8f, 0xe8, 0x33, 0x7c, 0x30, 0x61, 0x03, 0xef, 0xda, 0xeb, 0x3b, 0xc2, 0x63, + 0x53, 0x8e, 0x53, 0x0a, 0x50, 0xf3, 0x95, 0x97, 0xda, 0xfd, 0x0f, 0xd1, 0xcc, 0x79, 0x6f, 0x74, + 0xef, 0x5d, 0xa6, 0xb3, 0x1c, 0x33, 0x67, 0x50, 0x3b, 0xba, 0x59, 0xc9, 0x09, 0xb2, 0xbb, 0x0c, + 0x69, 0xf0, 0x38, 0x50, 0xe6, 0xf8, 0x48, 0x49, 0xa9, 0xf9, 0x0a, 0x3e, 0xb4, 0xb5, 0xc3, 0x04, + 0x25, 0x11, 0x86, 0x2e, 0x60, 0x96, 0x0b, 0xc7, 0x17, 0x5d, 0xc1, 0xf1, 0xb1, 0x02, 0xd4, 0x54, + 0xed, 0x64, 0xbd, 0x92, 0x33, 0x56, 0xd0, 0xb3, 0xad, 0xdf, 0x2b, 0xf9, 0x2e, 0x26, 0x77, 0x15, + 0x7a, 0x0d, 0xd3, 0x3e, 0xe5, 0xf3, 0xb1, 0xc0, 0x69, 0x05, 0xa8, 0x85, 0xca, 0xd9, 0x41, 0xf7, + 0x58, 0x97, 0x84, 0x24, 0x89, 0x27, 0x90, 0x0c, 0xf3, 0x51, 0xd5, 0x9d, 0x50, 0xe1, 0xe0, 0x4c, + 0xf8, 0x73, 0x60, 0xd4, 0xfa, 0x40, 0x85, 0x83, 0x5e, 0xc1, 0xdc, 0xb5, 0x37, 0xf5, 0xf8, 0x30, + 0x50, 0xca, 0x86, 0x4a, 0x8f, 0xd7, 0x2b, 0x39, 0xdb, 0x0c, 0x9b, 0xa1, 0xd3, 0x16, 0x20, 0xdb, + 0x32, 0xb0, 0xe2, 0xc2, 0x11, 0x73, 0x8e, 0x73, 0xff, 0xb7, 0xb2, 0x42, 0x92, 0xc4, 0x13, 0xe7, + 0xdf, 0x00, 0x2c, 0xec, 0x0a, 0x23, 0x19, 0x9e, 0x9a, 0xa4, 0x65, 0xb6, 0xac, 0xea, 0x65, 0x97, + 0xe8, 0x56, 0xfb, 0xd2, 0xee, 0xb6, 0xaf, 0x2c, 0x53, 0xaf, 0x1b, 0x4d, 0x43, 0x6f, 0x14, 0x13, + 0xe8, 0x09, 0xc4, 0xfb, 0x40, 0xd5, 0x34, 0x49, 0xab, 0xa3, 0x37, 0x8a, 0xe0, 0x50, 0x4a, 0xf4, + 0x77, 0x7a, 0xdd, 0xd6, 0x1b, 0xc5, 0x24, 0x3a, 0x85, 0x27, 0xfb, 0xa9, 0xfe, 0xd1, 0x34, 0x88, + 0xde, 0x28, 0xa6, 0xce, 0x47, 0x5b, 0x97, 0x48, 0x73, 0xc7, 0xc5, 0xb2, 0xab, 0x76, 0xdb, 0xda, + 0x73, 0x29, 0xc1, 0x47, 0xfb, 0x40, 0xb5, 0x6e, 0x1b, 0x1d, 0x7d, 0xcf, 0x24, 0xce, 0x9a, 0xc6, + 0x95, 0x61, 0xbd, 0x0d, 0x4c, 0x6a, 0x6f, 0x6e, 0xd6, 0x12, 0xb8, 0x5d, 0x4b, 0xe0, 0xd7, 0x5a, + 0x02, 0xdf, 0x37, 0x52, 0xe2, 0x76, 0x23, 0x25, 0x7e, 0x6c, 0xa4, 0xc4, 0xa7, 0xe7, 0xae, 0x27, + 0x86, 0xf3, 0x9e, 0xd6, 0x67, 0x93, 0xe0, 0x1c, 0x5e, 0xfc, 0x7b, 0x1a, 0x5f, 0xa3, 0xeb, 0x59, + 0xce, 0x28, 0xef, 0xa5, 0xc3, 0xf3, 0xb8, 0xf8, 0x13, 0x00, 0x00, 0xff, 0xff, 0xfb, 0x9a, 0x7b, + 0x01, 0xad, 0x03, 0x00, 0x00, } func (m *PublicKeysChangeProposal) Marshal() (dAtA []byte, err error) { diff --git a/x/ovm/types/query.pb.go b/x/ovm/types/query.pb.go index 2fb8cd60..f741f14e 100644 --- a/x/ovm/types/query.pb.go +++ b/x/ovm/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/ovm/query.proto +// source: sgenetwork/sge/ovm/query.proto package types @@ -8,8 +8,8 @@ import ( fmt "fmt" query "github.com/cosmos/cosmos-sdk/types/query" _ "github.com/cosmos/gogoproto/gogoproto" - grpc1 "github.com/gogo/protobuf/grpc" - proto "github.com/gogo/protobuf/proto" + 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" @@ -39,7 +39,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_40d67ba9adaeca00, []int{0} + return fileDescriptor_a7cac1d680082419, []int{0} } func (m *QueryParamsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -79,7 +79,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_40d67ba9adaeca00, []int{1} + return fileDescriptor_a7cac1d680082419, []int{1} } func (m *QueryParamsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -124,7 +124,7 @@ func (m *QueryPubKeysRequest) Reset() { *m = QueryPubKeysRequest{} } func (m *QueryPubKeysRequest) String() string { return proto.CompactTextString(m) } func (*QueryPubKeysRequest) ProtoMessage() {} func (*QueryPubKeysRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_40d67ba9adaeca00, []int{2} + return fileDescriptor_a7cac1d680082419, []int{2} } func (m *QueryPubKeysRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -164,7 +164,7 @@ func (m *QueryPubKeysResponse) Reset() { *m = QueryPubKeysResponse{} } func (m *QueryPubKeysResponse) String() string { return proto.CompactTextString(m) } func (*QueryPubKeysResponse) ProtoMessage() {} func (*QueryPubKeysResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40d67ba9adaeca00, []int{3} + return fileDescriptor_a7cac1d680082419, []int{3} } func (m *QueryPubKeysResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -211,7 +211,7 @@ func (m *QueryPublicKeysChangeProposalRequest) Reset() { *m = QueryPubli func (m *QueryPublicKeysChangeProposalRequest) String() string { return proto.CompactTextString(m) } func (*QueryPublicKeysChangeProposalRequest) ProtoMessage() {} func (*QueryPublicKeysChangeProposalRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_40d67ba9adaeca00, []int{4} + return fileDescriptor_a7cac1d680082419, []int{4} } func (m *QueryPublicKeysChangeProposalRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -265,7 +265,7 @@ func (m *QueryPublicKeysChangeProposalResponse) Reset() { *m = QueryPubl func (m *QueryPublicKeysChangeProposalResponse) String() string { return proto.CompactTextString(m) } func (*QueryPublicKeysChangeProposalResponse) ProtoMessage() {} func (*QueryPublicKeysChangeProposalResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40d67ba9adaeca00, []int{5} + return fileDescriptor_a7cac1d680082419, []int{5} } func (m *QueryPublicKeysChangeProposalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -312,7 +312,7 @@ func (m *QueryPublicKeysChangeProposalsRequest) Reset() { *m = QueryPubl func (m *QueryPublicKeysChangeProposalsRequest) String() string { return proto.CompactTextString(m) } func (*QueryPublicKeysChangeProposalsRequest) ProtoMessage() {} func (*QueryPublicKeysChangeProposalsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_40d67ba9adaeca00, []int{6} + return fileDescriptor_a7cac1d680082419, []int{6} } func (m *QueryPublicKeysChangeProposalsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -369,7 +369,7 @@ func (m *QueryPublicKeysChangeProposalsResponse) Reset() { func (m *QueryPublicKeysChangeProposalsResponse) String() string { return proto.CompactTextString(m) } func (*QueryPublicKeysChangeProposalsResponse) ProtoMessage() {} func (*QueryPublicKeysChangeProposalsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40d67ba9adaeca00, []int{7} + return fileDescriptor_a7cac1d680082419, []int{7} } func (m *QueryPublicKeysChangeProposalsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -423,49 +423,49 @@ func init() { proto.RegisterType((*QueryPublicKeysChangeProposalsResponse)(nil), "sgenetwork.sge.ovm.QueryPublicKeysChangeProposalsResponse") } -func init() { proto.RegisterFile("sge/ovm/query.proto", fileDescriptor_40d67ba9adaeca00) } +func init() { proto.RegisterFile("sgenetwork/sge/ovm/query.proto", fileDescriptor_a7cac1d680082419) } -var fileDescriptor_40d67ba9adaeca00 = []byte{ - // 609 bytes of a gzipped FileDescriptorProto +var fileDescriptor_a7cac1d680082419 = []byte{ + // 611 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0x8d, 0x43, 0x08, 0x74, 0x91, 0x8a, 0xba, 0x0d, 0x90, 0x5a, 0xc8, 0x54, 0x86, 0x26, 0xa1, - 0x80, 0x57, 0x0d, 0x97, 0xd2, 0x13, 0x2a, 0x12, 0x1c, 0x90, 0x20, 0x98, 0x1b, 0x97, 0x6a, 0x9d, - 0xac, 0xb6, 0x56, 0x13, 0xaf, 0xeb, 0x5d, 0x27, 0x44, 0x55, 0x2f, 0xfc, 0x02, 0x24, 0x7e, 0x06, - 0x3f, 0x02, 0x24, 0x2e, 0x3d, 0x56, 0xe2, 0xc2, 0x09, 0xa1, 0x84, 0x3f, 0xc1, 0x0d, 0x79, 0x77, - 0x9d, 0x0f, 0x35, 0x89, 0x45, 0xb8, 0x45, 0xb3, 0x6f, 0xde, 0x7b, 0xf3, 0x3c, 0x13, 0xb0, 0xce, - 0x29, 0x41, 0xac, 0xdb, 0x41, 0xc7, 0x31, 0x89, 0xfa, 0x4e, 0x18, 0x31, 0xc1, 0x20, 0xe4, 0x94, - 0x04, 0x44, 0xf4, 0x58, 0x74, 0xe4, 0x70, 0x4a, 0x1c, 0xd6, 0xed, 0x98, 0x25, 0xca, 0x28, 0x93, - 0xcf, 0x28, 0xf9, 0xa5, 0x90, 0xe6, 0x76, 0x93, 0xf1, 0x0e, 0xe3, 0xc8, 0xc3, 0x9c, 0x28, 0x0a, - 0xd4, 0xdd, 0xf1, 0x88, 0xc0, 0x3b, 0x28, 0xc4, 0xd4, 0x0f, 0xb0, 0xf0, 0x59, 0xa0, 0xb1, 0xb7, - 0x29, 0x63, 0xb4, 0x4d, 0x10, 0x0e, 0x7d, 0x84, 0x83, 0x80, 0x09, 0xf9, 0xc8, 0xf5, 0x6b, 0x29, - 0x35, 0x12, 0xe2, 0x08, 0x77, 0xd2, 0xea, 0xcd, 0x51, 0x35, 0x62, 0x21, 0xe3, 0xb8, 0xad, 0xea, - 0x76, 0x09, 0xc0, 0x37, 0x89, 0x5a, 0x43, 0x82, 0x5d, 0x72, 0x1c, 0x13, 0x2e, 0xec, 0xd7, 0x60, - 0x7d, 0xaa, 0xca, 0x43, 0x16, 0x70, 0x02, 0x77, 0x41, 0x51, 0x91, 0x96, 0x8d, 0x4d, 0xa3, 0x76, - 0xad, 0x6e, 0x3a, 0x17, 0xe7, 0x73, 0x54, 0xcf, 0x7e, 0xe1, 0xec, 0xe7, 0x9d, 0x9c, 0xab, 0xf1, - 0xf6, 0x8d, 0x94, 0x30, 0xf6, 0x5e, 0x92, 0xfe, 0x48, 0x67, 0x1b, 0x94, 0xa6, 0xcb, 0x5a, 0x08, - 0x82, 0x42, 0xdb, 0xe7, 0xa2, 0x6c, 0x6c, 0x5e, 0xaa, 0xad, 0xb8, 0xf2, 0xb7, 0x1d, 0x81, 0x7b, - 0x29, 0xb6, 0xed, 0x37, 0x13, 0xf8, 0xb3, 0x43, 0x1c, 0x50, 0xd2, 0xd0, 0x03, 0x69, 0x4e, 0xb8, - 0x0a, 0xf2, 0x7e, 0x4b, 0x1a, 0x2c, 0xb8, 0x79, 0xbf, 0x05, 0xf7, 0x40, 0x91, 0x0b, 0x2c, 0x62, - 0x5e, 0xce, 0x6f, 0x1a, 0xb5, 0xd5, 0xba, 0x3d, 0xd3, 0xb4, 0x26, 0x79, 0x2b, 0x91, 0xae, 0xee, - 0xb0, 0x7b, 0x60, 0x2b, 0x43, 0x53, 0x1b, 0x7e, 0x05, 0xae, 0xa6, 0xc1, 0xea, 0x6c, 0x1e, 0xce, - 0x94, 0x99, 0xc3, 0xa3, 0xd3, 0x1a, 0x71, 0xd8, 0x9f, 0x8d, 0x0c, 0xe5, 0x34, 0x42, 0xf8, 0x1c, - 0x80, 0xf1, 0x82, 0x68, 0xed, 0x8a, 0xa3, 0xb6, 0xc9, 0x49, 0xb6, 0xc9, 0x51, 0x0b, 0xa9, 0xb7, - 0xc9, 0x69, 0x60, 0x4a, 0x74, 0xaf, 0x3b, 0xd1, 0xf9, 0x5f, 0x31, 0x7d, 0x33, 0x40, 0x25, 0xcb, - 0xad, 0x0e, 0xaa, 0x01, 0x56, 0xd2, 0x21, 0xb9, 0xfc, 0xbc, 0xcb, 0x25, 0x35, 0x26, 0x81, 0x2f, - 0xa6, 0x02, 0xc8, 0xcb, 0x00, 0xaa, 0x99, 0x01, 0x28, 0x3b, 0x93, 0x09, 0xd4, 0xff, 0x14, 0xc0, - 0x65, 0x39, 0x05, 0x8c, 0x40, 0x51, 0x6d, 0x31, 0xac, 0xcc, 0xf2, 0x76, 0xf1, 0x60, 0xcc, 0x6a, - 0x26, 0x4e, 0x09, 0xda, 0xb7, 0x3e, 0x7c, 0xff, 0xfd, 0x29, 0xbf, 0x06, 0xaf, 0xa3, 0xe9, 0x33, - 0x85, 0x3d, 0x70, 0x45, 0x5f, 0x01, 0x5c, 0x40, 0x36, 0x75, 0x3e, 0x66, 0x2d, 0x1b, 0xa8, 0x65, - 0x37, 0xa4, 0xec, 0x3a, 0x5c, 0x1b, 0xcb, 0xc6, 0xde, 0xc1, 0x51, 0xa2, 0xf6, 0xd5, 0x00, 0xe5, - 0x79, 0x69, 0xc3, 0xdd, 0x45, 0x0a, 0x8b, 0xce, 0xd0, 0x7c, 0xb2, 0x44, 0xa7, 0x36, 0x8b, 0xa4, - 0xd9, 0xfb, 0xb0, 0x3a, 0x69, 0x36, 0xf1, 0x7a, 0x90, 0x7e, 0x75, 0x74, 0xa2, 0x36, 0xef, 0x14, - 0x9d, 0xf8, 0xad, 0x53, 0xf8, 0xc5, 0x00, 0x1b, 0x73, 0x57, 0x0f, 0xfe, 0xbb, 0x93, 0x51, 0xc0, - 0x7b, 0xcb, 0xb4, 0xea, 0x29, 0x1e, 0xc8, 0x29, 0xb6, 0xe0, 0xdd, 0xb9, 0x53, 0xf0, 0xd1, 0x18, - 0xfb, 0x4f, 0xcf, 0x06, 0x96, 0x71, 0x3e, 0xb0, 0x8c, 0x5f, 0x03, 0xcb, 0xf8, 0x38, 0xb4, 0x72, - 0xe7, 0x43, 0x2b, 0xf7, 0x63, 0x68, 0xe5, 0xde, 0x55, 0xa8, 0x2f, 0x0e, 0x63, 0xcf, 0x69, 0xb2, - 0x4e, 0x42, 0xf4, 0x48, 0xbb, 0x91, 0xa4, 0xef, 0x25, 0xad, 0xe8, 0x87, 0x84, 0x7b, 0x45, 0xf9, - 0x7f, 0xfe, 0xf8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x96, 0x42, 0xd4, 0xaf, 0x88, 0x06, 0x00, - 0x00, + 0x10, 0x8d, 0x43, 0x08, 0x74, 0x91, 0x8a, 0xba, 0x2d, 0x22, 0xb5, 0x90, 0x5b, 0x0c, 0x4d, 0x42, + 0x01, 0xaf, 0x1a, 0x2e, 0xa5, 0x27, 0x54, 0x24, 0x38, 0x20, 0x41, 0x30, 0x37, 0x2e, 0xd5, 0x3a, + 0x59, 0x6d, 0xad, 0x26, 0x5e, 0xd7, 0xbb, 0x4e, 0x88, 0xaa, 0x5e, 0xf8, 0x05, 0x48, 0xfc, 0x0c, + 0x7e, 0x04, 0x48, 0x5c, 0x7a, 0xac, 0xc4, 0x85, 0x13, 0x42, 0x09, 0x7f, 0x82, 0x1b, 0xf2, 0xee, + 0x3a, 0x1f, 0x34, 0x89, 0x45, 0xb8, 0x59, 0x9e, 0x37, 0xef, 0xbd, 0x79, 0x9e, 0x31, 0xb0, 0x38, + 0x25, 0x01, 0x11, 0x5d, 0x16, 0x1d, 0x21, 0x4e, 0x09, 0x62, 0x9d, 0x36, 0x3a, 0x8e, 0x49, 0xd4, + 0x73, 0xc2, 0x88, 0x09, 0x06, 0xe1, 0xa8, 0xee, 0x70, 0x4a, 0x1c, 0xd6, 0x69, 0x9b, 0x6b, 0x94, + 0x51, 0x26, 0xcb, 0x28, 0x79, 0x52, 0x48, 0x73, 0xbb, 0xc1, 0x78, 0x9b, 0x71, 0xe4, 0x61, 0x4e, + 0x14, 0x05, 0xea, 0xec, 0x78, 0x44, 0xe0, 0x1d, 0x14, 0x62, 0xea, 0x07, 0x58, 0xf8, 0x2c, 0xd0, + 0xd8, 0x5b, 0x94, 0x31, 0xda, 0x22, 0x08, 0x87, 0x3e, 0xc2, 0x41, 0xc0, 0x84, 0x2c, 0x72, 0x5d, + 0xdd, 0x98, 0xe2, 0x29, 0xc4, 0x11, 0x6e, 0xa7, 0x80, 0xdb, 0xd3, 0x00, 0x11, 0x0b, 0x19, 0xc7, + 0x2d, 0x05, 0xb1, 0xd7, 0x00, 0x7c, 0x9d, 0x78, 0xa8, 0xcb, 0x3e, 0x97, 0x1c, 0xc7, 0x84, 0x0b, + 0xfb, 0x15, 0x58, 0x9d, 0x78, 0xcb, 0x43, 0x16, 0x70, 0x02, 0x77, 0x41, 0x51, 0xf1, 0x97, 0x8c, + 0x4d, 0xa3, 0x7a, 0xad, 0x66, 0x3a, 0x17, 0xa7, 0x76, 0x54, 0xcf, 0x7e, 0xe1, 0xec, 0xc7, 0x46, + 0xce, 0xd5, 0x78, 0xfb, 0x46, 0x4a, 0x18, 0x7b, 0x2f, 0x48, 0x6f, 0xa8, 0xb3, 0x0d, 0xd6, 0x26, + 0x5f, 0x6b, 0x21, 0x08, 0x0a, 0x2d, 0x9f, 0x8b, 0x92, 0xb1, 0x79, 0xa9, 0xba, 0xe4, 0xca, 0x67, + 0x3b, 0x02, 0x77, 0x53, 0x6c, 0xcb, 0x6f, 0x24, 0xf0, 0xa7, 0x87, 0x38, 0xa0, 0xa4, 0xae, 0x07, + 0xd2, 0x9c, 0x70, 0x19, 0xe4, 0xfd, 0xa6, 0x34, 0x58, 0x70, 0xf3, 0x7e, 0x13, 0xee, 0x81, 0x22, + 0x17, 0x58, 0xc4, 0xbc, 0x94, 0xdf, 0x34, 0xaa, 0xcb, 0x35, 0x7b, 0xaa, 0x69, 0x4d, 0xf2, 0x46, + 0x22, 0x5d, 0xdd, 0x61, 0x77, 0xc1, 0x56, 0x86, 0xa6, 0x36, 0xfc, 0x12, 0x5c, 0x4d, 0x83, 0xd5, + 0xd9, 0x3c, 0x98, 0x2a, 0x33, 0x83, 0x47, 0xa7, 0x35, 0xe4, 0xb0, 0x3f, 0x19, 0x19, 0xca, 0x69, + 0x84, 0xf0, 0x19, 0x00, 0xa3, 0xb5, 0xd1, 0xda, 0x65, 0x47, 0xed, 0x98, 0x93, 0xec, 0x98, 0xa3, + 0xd6, 0x54, 0xef, 0x98, 0x53, 0xc7, 0x94, 0xe8, 0x5e, 0x77, 0xac, 0xf3, 0xbf, 0x62, 0xfa, 0x6a, + 0x80, 0x72, 0x96, 0x5b, 0x1d, 0x54, 0x1d, 0x2c, 0xa5, 0x43, 0x72, 0xf9, 0x79, 0x17, 0x4b, 0x6a, + 0x44, 0x02, 0x9f, 0x4f, 0x04, 0x90, 0x97, 0x01, 0x54, 0x32, 0x03, 0x50, 0x76, 0xc6, 0x13, 0xa8, + 0xfd, 0x2e, 0x80, 0xcb, 0x72, 0x0a, 0x18, 0x81, 0xa2, 0xda, 0x62, 0x58, 0x9e, 0xe6, 0xed, 0xe2, + 0xc1, 0x98, 0x95, 0x4c, 0x9c, 0x12, 0xb4, 0x6f, 0xbe, 0xff, 0xf6, 0xeb, 0x63, 0x7e, 0x05, 0x5e, + 0xff, 0xeb, 0x62, 0x61, 0x17, 0x5c, 0xd1, 0x57, 0x00, 0xe7, 0x90, 0x4d, 0x9c, 0x8f, 0x59, 0xcd, + 0x06, 0x6a, 0xd9, 0x75, 0x29, 0xbb, 0x0a, 0x57, 0x46, 0xb2, 0xb1, 0x77, 0x70, 0x94, 0xa8, 0x7d, + 0x31, 0x40, 0x69, 0x56, 0xda, 0x70, 0x77, 0x9e, 0xc2, 0xbc, 0x33, 0x34, 0x1f, 0x2f, 0xd0, 0xa9, + 0xcd, 0x22, 0x69, 0xf6, 0x1e, 0xac, 0x8c, 0x9b, 0x4d, 0xbc, 0x1e, 0xa4, 0x5f, 0x1d, 0x9d, 0xa8, + 0xcd, 0x3b, 0x45, 0x27, 0x7e, 0xf3, 0x14, 0x7e, 0x36, 0xc0, 0xfa, 0xcc, 0xd5, 0x83, 0xff, 0xee, + 0x64, 0x18, 0xf0, 0xde, 0x22, 0xad, 0x7a, 0x8a, 0xfb, 0x72, 0x8a, 0x2d, 0x78, 0x67, 0xe6, 0x14, + 0x7c, 0x38, 0xc6, 0xfe, 0x93, 0xb3, 0xbe, 0x65, 0x9c, 0xf7, 0x2d, 0xe3, 0x67, 0xdf, 0x32, 0x3e, + 0x0c, 0xac, 0xdc, 0xf9, 0xc0, 0xca, 0x7d, 0x1f, 0x58, 0xb9, 0xb7, 0x65, 0xea, 0x8b, 0xc3, 0xd8, + 0x73, 0x1a, 0xac, 0x9d, 0x10, 0x3d, 0x1c, 0xff, 0x9f, 0xbf, 0x93, 0xb4, 0xa2, 0x17, 0x12, 0xee, + 0x15, 0xe5, 0xff, 0xfc, 0xd1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x29, 0x22, 0xb0, 0x10, 0xa9, + 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -661,7 +661,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/ovm/query.proto", + Metadata: "sgenetwork/sge/ovm/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/ovm/types/query.pb.gw.go b/x/ovm/types/query.pb.gw.go index 376dcd1b..7559c9a5 100644 --- a/x/ovm/types/query.pb.gw.go +++ b/x/ovm/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: sge/ovm/query.proto +// source: sgenetwork/sge/ovm/query.proto /* Package types is a reverse proxy. diff --git a/x/ovm/types/stats.pb.go b/x/ovm/types/stats.pb.go index 5b9c357d..52cbb048 100644 --- a/x/ovm/types/stats.pb.go +++ b/x/ovm/types/stats.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/ovm/stats.proto +// source: sgenetwork/sge/ovm/stats.proto package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -32,7 +32,7 @@ func (m *ProposalStats) Reset() { *m = ProposalStats{} } func (m *ProposalStats) String() string { return proto.CompactTextString(m) } func (*ProposalStats) ProtoMessage() {} func (*ProposalStats) Descriptor() ([]byte, []int) { - return fileDescriptor_2e241b25311754a9, []int{0} + return fileDescriptor_194a174fcf0c1b0d, []int{0} } func (m *ProposalStats) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -72,22 +72,22 @@ func init() { proto.RegisterType((*ProposalStats)(nil), "sgenetwork.sge.ovm.ProposalStats") } -func init() { proto.RegisterFile("sge/ovm/stats.proto", fileDescriptor_2e241b25311754a9) } +func init() { proto.RegisterFile("sgenetwork/sge/ovm/stats.proto", fileDescriptor_194a174fcf0c1b0d) } -var fileDescriptor_2e241b25311754a9 = []byte{ - // 183 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x4e, 0x4f, 0xd5, - 0xcf, 0x2f, 0xcb, 0xd5, 0x2f, 0x2e, 0x49, 0x2c, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, - 0x12, 0x2a, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x4e, 0x4f, 0xd5, - 0xcb, 0x2f, 0xcb, 0x55, 0x72, 0xe4, 0xe2, 0x0d, 0x28, 0xca, 0x2f, 0xc8, 0x2f, 0x4e, 0xcc, 0x09, - 0x06, 0x29, 0x15, 0x32, 0xe0, 0x12, 0x29, 0x28, 0x4d, 0xca, 0x4e, 0xad, 0x2c, 0x8e, 0x4f, 0xce, - 0x48, 0xcc, 0x4b, 0x4f, 0x8d, 0x4f, 0xce, 0x2f, 0xcd, 0x2b, 0x91, 0x60, 0x54, 0x60, 0xd4, 0x60, - 0x09, 0x12, 0x82, 0xca, 0x39, 0x83, 0xa5, 0x9c, 0x41, 0x32, 0x4e, 0x0e, 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, 0xa5, 0x96, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, - 0x9f, 0xab, 0x5f, 0x9c, 0x9e, 0xaa, 0x0b, 0xb5, 0x1c, 0xc4, 0xd6, 0xaf, 0x00, 0x3b, 0xaf, 0xa4, - 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x3e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x67, - 0x44, 0xfa, 0x02, 0xb6, 0x00, 0x00, 0x00, +var fileDescriptor_194a174fcf0c1b0d = []byte{ + // 181 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x2f, 0xcb, 0xd5, 0x2f, + 0x2e, 0x49, 0x2c, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0xc8, 0xeb, 0x15, + 0xa7, 0xa7, 0xea, 0xe5, 0x97, 0xe5, 0x2a, 0x39, 0x72, 0xf1, 0x06, 0x14, 0xe5, 0x17, 0xe4, 0x17, + 0x27, 0xe6, 0x04, 0x83, 0x94, 0x0a, 0x19, 0x70, 0x89, 0x14, 0x94, 0x26, 0x65, 0xa7, 0x56, 0x16, + 0xc7, 0x27, 0x67, 0x24, 0xe6, 0xa5, 0xa7, 0xc6, 0x27, 0xe7, 0x97, 0xe6, 0x95, 0x48, 0x30, 0x2a, + 0x30, 0x6a, 0xb0, 0x04, 0x09, 0x41, 0xe5, 0x9c, 0xc1, 0x52, 0xce, 0x20, 0x19, 0x27, 0x87, 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, 0x52, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, + 0xd2, 0x4b, 0xce, 0xcf, 0x05, 0x39, 0x48, 0x17, 0xd9, 0x71, 0x15, 0x60, 0xe7, 0x95, 0x54, 0x16, + 0xa4, 0x16, 0x27, 0xb1, 0x81, 0xdd, 0x67, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x0b, 0x85, 0x9e, + 0xf0, 0xc1, 0x00, 0x00, 0x00, } func (m *ProposalStats) Marshal() (dAtA []byte, err error) { diff --git a/x/ovm/types/ticket.pb.go b/x/ovm/types/ticket.pb.go index 745fbcff..36661ab7 100644 --- a/x/ovm/types/ticket.pb.go +++ b/x/ovm/types/ticket.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/ovm/ticket.proto +// source: sgenetwork/sge/ovm/ticket.proto package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -35,7 +35,7 @@ func (m *PubkeysChangeProposalPayload) Reset() { *m = PubkeysChangePropo func (m *PubkeysChangeProposalPayload) String() string { return proto.CompactTextString(m) } func (*PubkeysChangeProposalPayload) ProtoMessage() {} func (*PubkeysChangeProposalPayload) Descriptor() ([]byte, []int) { - return fileDescriptor_d64e3af56c76dec2, []int{0} + return fileDescriptor_927c5f9e79be7a2e, []int{0} } func (m *PubkeysChangeProposalPayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,7 +90,7 @@ func (m *ProposalVotePayload) Reset() { *m = ProposalVotePayload{} } func (m *ProposalVotePayload) String() string { return proto.CompactTextString(m) } func (*ProposalVotePayload) ProtoMessage() {} func (*ProposalVotePayload) Descriptor() ([]byte, []int) { - return fileDescriptor_d64e3af56c76dec2, []int{1} + return fileDescriptor_927c5f9e79be7a2e, []int{1} } func (m *ProposalVotePayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -138,28 +138,28 @@ func init() { proto.RegisterType((*ProposalVotePayload)(nil), "sgenetwork.sge.ovm.ProposalVotePayload") } -func init() { proto.RegisterFile("sge/ovm/ticket.proto", fileDescriptor_d64e3af56c76dec2) } +func init() { proto.RegisterFile("sgenetwork/sge/ovm/ticket.proto", fileDescriptor_927c5f9e79be7a2e) } -var fileDescriptor_d64e3af56c76dec2 = []byte{ - // 274 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xbd, 0x4a, 0xfc, 0x40, - 0x14, 0x47, 0x33, 0xff, 0xff, 0x22, 0x38, 0xab, 0x16, 0xa3, 0x45, 0x10, 0x19, 0xe3, 0x16, 0x92, - 0xc6, 0x09, 0xa8, 0x0f, 0x20, 0x5a, 0x2d, 0x36, 0x21, 0x85, 0x85, 0x4d, 0xc8, 0xc7, 0x65, 0x36, - 0xe4, 0xe3, 0x86, 0xcc, 0x24, 0x6e, 0xde, 0xc2, 0xc7, 0xb2, 0xdc, 0xd2, 0x52, 0x92, 0x17, 0x91, - 0x24, 0x1b, 0x58, 0xb0, 0x1b, 0x0e, 0x87, 0xc3, 0xdc, 0x1f, 0xbd, 0x50, 0x12, 0x1c, 0x6c, 0x72, - 0x47, 0x27, 0x51, 0x0a, 0x5a, 0x94, 0x15, 0x6a, 0x64, 0x4c, 0x49, 0x28, 0x40, 0x7f, 0x60, 0x95, - 0x0a, 0x25, 0x41, 0x60, 0x93, 0x5f, 0xb2, 0xd9, 0x6c, 0x50, 0xc3, 0xe4, 0xad, 0x42, 0x7a, 0xe5, - 0xd6, 0x61, 0x0a, 0xad, 0x7a, 0xd9, 0x04, 0x85, 0x04, 0xb7, 0xc2, 0x12, 0x55, 0x90, 0xb9, 0x41, - 0x9b, 0x61, 0x10, 0xb3, 0x6b, 0xba, 0x2c, 0xeb, 0x30, 0x4b, 0x22, 0x7f, 0x70, 0x4c, 0x62, 0xfd, - 0xb7, 0x8f, 0x3d, 0x3a, 0xa1, 0x57, 0x68, 0x15, 0xbb, 0xa1, 0x27, 0x19, 0x04, 0x31, 0x54, 0x7e, - 0x52, 0xc4, 0xb0, 0x35, 0xff, 0x59, 0xc4, 0x3e, 0xf5, 0x96, 0x13, 0x5b, 0x0f, 0x68, 0x95, 0xd1, - 0xf3, 0x39, 0xfb, 0x86, 0x1a, 0x0e, 0xd3, 0x7b, 0xec, 0x27, 0xb1, 0x49, 0x2c, 0x62, 0x2f, 0x3c, - 0x3a, 0xa3, 0x75, 0xcc, 0x1e, 0xe9, 0x62, 0xf8, 0xe9, 0x98, 0x3c, 0xbb, 0xb7, 0xc4, 0xdf, 0x93, - 0xc4, 0x61, 0xd7, 0x1b, 0xed, 0xe7, 0xa7, 0xaf, 0x8e, 0x93, 0x5d, 0xc7, 0xc9, 0x4f, 0xc7, 0xc9, - 0x67, 0xcf, 0x8d, 0x5d, 0xcf, 0x8d, 0xef, 0x9e, 0x1b, 0xef, 0xb7, 0x32, 0xd1, 0x9b, 0x3a, 0x14, - 0x11, 0xe6, 0x8e, 0x92, 0x70, 0xb7, 0x8f, 0x0d, 0x6f, 0x67, 0x3b, 0x4d, 0xd8, 0x96, 0xa0, 0xc2, - 0xa3, 0x71, 0x9a, 0x87, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x3c, 0xf1, 0x66, 0x5a, 0x01, - 0x00, 0x00, +var fileDescriptor_927c5f9e79be7a2e = []byte{ + // 273 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xbd, 0x4e, 0x84, 0x40, + 0x14, 0x46, 0x19, 0xdd, 0x98, 0x38, 0xab, 0x16, 0xd8, 0x10, 0xa3, 0xb3, 0xb8, 0x85, 0xa1, 0x71, + 0x48, 0xd4, 0x07, 0x30, 0x5a, 0x6d, 0x6c, 0x08, 0x85, 0x85, 0x0d, 0xe1, 0xe7, 0x86, 0x25, 0x0c, + 0x5c, 0xc2, 0x0c, 0xb8, 0xbc, 0x85, 0x8f, 0x65, 0xb9, 0xa5, 0xa5, 0x81, 0x17, 0x31, 0x80, 0x1b, + 0x49, 0xdc, 0xf6, 0xe4, 0xbb, 0x27, 0x33, 0x87, 0x2e, 0x64, 0x0c, 0x39, 0xa8, 0x77, 0x2c, 0x53, + 0x5b, 0xc6, 0x60, 0x63, 0x9d, 0xd9, 0x2a, 0x09, 0x53, 0x50, 0xbc, 0x28, 0x51, 0xa1, 0xae, 0xff, + 0x0d, 0xb8, 0x8c, 0x81, 0x63, 0x9d, 0x5d, 0x5c, 0xed, 0x39, 0xaa, 0x51, 0xc1, 0x78, 0xb2, 0x0c, + 0xe8, 0xa5, 0x53, 0x05, 0x29, 0x34, 0xf2, 0x79, 0xed, 0xe7, 0x31, 0x38, 0x25, 0x16, 0x28, 0x7d, + 0xe1, 0xf8, 0x8d, 0x40, 0x3f, 0xd2, 0x17, 0x74, 0x5e, 0x54, 0x81, 0x48, 0x42, 0xaf, 0xdf, 0x18, + 0xc4, 0x3c, 0xb4, 0x8e, 0x5d, 0x3a, 0xa2, 0x17, 0x68, 0xa4, 0x7e, 0x4d, 0x4f, 0x04, 0xf8, 0x11, + 0x94, 0x5e, 0x92, 0x47, 0xb0, 0x31, 0x0e, 0x4c, 0x62, 0x9d, 0xba, 0xf3, 0x91, 0xad, 0x7a, 0xb4, + 0x14, 0xf4, 0x7c, 0xa7, 0x7d, 0x45, 0x05, 0x53, 0xf5, 0x2f, 0xf6, 0x92, 0xc8, 0x20, 0x26, 0xb1, + 0x66, 0x2e, 0xdd, 0xa1, 0x55, 0xa4, 0x3f, 0xd0, 0x59, 0xff, 0xd2, 0x41, 0x79, 0x76, 0x67, 0xf2, + 0xff, 0xbf, 0xe3, 0x53, 0xaf, 0x3b, 0xac, 0x9f, 0x1e, 0x3f, 0x5b, 0x46, 0xb6, 0x2d, 0x23, 0xdf, + 0x2d, 0x23, 0x1f, 0x1d, 0xd3, 0xb6, 0x1d, 0xd3, 0xbe, 0x3a, 0xa6, 0xbd, 0xdd, 0xc4, 0x89, 0x5a, + 0x57, 0x01, 0x0f, 0x31, 0xeb, 0x53, 0xdc, 0x4e, 0xb3, 0x6c, 0xc6, 0x9a, 0x4d, 0x01, 0x32, 0x38, + 0x1a, 0xd2, 0xdc, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x9b, 0xd6, 0x02, 0x4e, 0x70, 0x01, 0x00, + 0x00, } func (m *PubkeysChangeProposalPayload) Marshal() (dAtA []byte, err error) { diff --git a/x/ovm/types/ticket_jwt.go b/x/ovm/types/ticket_jwt.go index 83ef5b22..705c14b6 100644 --- a/x/ovm/types/ticket_jwt.go +++ b/x/ovm/types/ticket_jwt.go @@ -7,9 +7,9 @@ import ( "strings" gtime "time" + "github.com/cometbft/cometbft/types/time" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang-jwt/jwt/v4" - "github.com/tendermint/tendermint/types/time" ) // jwtTicket is the Ticket implementer. diff --git a/x/ovm/types/tx.pb.go b/x/ovm/types/tx.pb.go index fd933b36..87c2aa0f 100644 --- a/x/ovm/types/tx.pb.go +++ b/x/ovm/types/tx.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/ovm/tx.proto +// source: sgenetwork/sge/ovm/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" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -40,7 +40,7 @@ func (m *MsgSubmitPubkeysChangeProposalRequest) Reset() { *m = MsgSubmit func (m *MsgSubmitPubkeysChangeProposalRequest) String() string { return proto.CompactTextString(m) } func (*MsgSubmitPubkeysChangeProposalRequest) ProtoMessage() {} func (*MsgSubmitPubkeysChangeProposalRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a52019debc2dbb94, []int{0} + return fileDescriptor_f051013778245841, []int{0} } func (m *MsgSubmitPubkeysChangeProposalRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -95,7 +95,7 @@ func (m *MsgSubmitPubkeysChangeProposalResponse) Reset() { func (m *MsgSubmitPubkeysChangeProposalResponse) String() string { return proto.CompactTextString(m) } func (*MsgSubmitPubkeysChangeProposalResponse) ProtoMessage() {} func (*MsgSubmitPubkeysChangeProposalResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a52019debc2dbb94, []int{1} + return fileDescriptor_f051013778245841, []int{1} } func (m *MsgSubmitPubkeysChangeProposalResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -147,7 +147,7 @@ func (m *MsgVotePubkeysChangeRequest) Reset() { *m = MsgVotePubkeysChang func (m *MsgVotePubkeysChangeRequest) String() string { return proto.CompactTextString(m) } func (*MsgVotePubkeysChangeRequest) ProtoMessage() {} func (*MsgVotePubkeysChangeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_a52019debc2dbb94, []int{2} + return fileDescriptor_f051013778245841, []int{2} } func (m *MsgVotePubkeysChangeRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -207,7 +207,7 @@ func (m *MsgVotePubkeysChangeResponse) Reset() { *m = MsgVotePubkeysChan func (m *MsgVotePubkeysChangeResponse) String() string { return proto.CompactTextString(m) } func (*MsgVotePubkeysChangeResponse) ProtoMessage() {} func (*MsgVotePubkeysChangeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_a52019debc2dbb94, []int{3} + return fileDescriptor_f051013778245841, []int{3} } func (m *MsgVotePubkeysChangeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -250,31 +250,31 @@ func init() { proto.RegisterType((*MsgVotePubkeysChangeResponse)(nil), "sgenetwork.sge.ovm.MsgVotePubkeysChangeResponse") } -func init() { proto.RegisterFile("sge/ovm/tx.proto", fileDescriptor_a52019debc2dbb94) } +func init() { proto.RegisterFile("sgenetwork/sge/ovm/tx.proto", fileDescriptor_f051013778245841) } -var fileDescriptor_a52019debc2dbb94 = []byte{ - // 335 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x4f, 0x4b, 0xf3, 0x40, - 0x10, 0xc6, 0xbb, 0x2d, 0xf4, 0x7d, 0x5d, 0x28, 0xea, 0x1e, 0x24, 0xb4, 0x12, 0x4a, 0xc0, 0xd2, - 0x8b, 0x89, 0xe8, 0x45, 0x3d, 0x49, 0x3d, 0x89, 0x14, 0x4a, 0x04, 0x41, 0x2f, 0xa5, 0x89, 0xc3, - 0x36, 0xc4, 0x64, 0x62, 0x66, 0x93, 0x36, 0xdf, 0xc2, 0x43, 0x3f, 0x94, 0xc7, 0x1e, 0x3d, 0x4a, - 0xfb, 0x45, 0xa4, 0x69, 0x7b, 0x90, 0x5a, 0x5b, 0x7a, 0xdb, 0x67, 0x96, 0xf9, 0xcd, 0x33, 0x7f, - 0xf8, 0x01, 0x49, 0xb0, 0x30, 0x0d, 0x2c, 0x35, 0x34, 0xa3, 0x18, 0x15, 0x0a, 0x41, 0x12, 0x42, - 0x50, 0x03, 0x8c, 0x7d, 0x93, 0x24, 0x98, 0x98, 0x06, 0xc6, 0x13, 0x3f, 0x69, 0x93, 0x7c, 0x48, - 0x9c, 0xc0, 0x53, 0x9d, 0xc4, 0xf1, 0x21, 0xa3, 0xdb, 0x7e, 0x2f, 0x94, 0xd0, 0x89, 0x31, 0x42, - 0xea, 0xbd, 0xda, 0xf0, 0x96, 0x00, 0x29, 0xa1, 0xf1, 0x7f, 0x6e, 0x0c, 0x3d, 0x85, 0xb1, 0xc6, - 0xea, 0xac, 0xb9, 0x67, 0x2f, 0xa5, 0x38, 0xe2, 0x65, 0xe5, 0xb9, 0x3e, 0x28, 0xad, 0x98, 0x7f, - 0x2c, 0x94, 0xd1, 0xe2, 0x8d, 0x4d, 0x68, 0x8a, 0x30, 0x24, 0x98, 0xb1, 0x29, 0x71, 0x5d, 0x20, - 0xca, 0xd9, 0xff, 0xed, 0xa5, 0x34, 0x06, 0xbc, 0xd6, 0x26, 0xf9, 0x88, 0x0a, 0x7e, 0x10, 0x76, - 0x36, 0x25, 0x1a, 0x7c, 0x3f, 0x45, 0x05, 0x71, 0xd7, 0x87, 0xac, 0xeb, 0x85, 0x2f, 0x30, 0xd4, - 0x4a, 0x75, 0xd6, 0xac, 0xd8, 0x95, 0x3c, 0x7c, 0x0f, 0xd9, 0xdd, 0x2c, 0x68, 0x5c, 0xf2, 0xe3, - 0xdf, 0x0b, 0x6f, 0xb2, 0x7c, 0x3e, 0x2a, 0xf2, 0x52, 0x9b, 0xa4, 0x18, 0x31, 0x5e, 0xfb, 0xa3, - 0x79, 0x71, 0x65, 0xae, 0xae, 0xc3, 0xdc, 0x6a, 0x17, 0xd5, 0xeb, 0x5d, 0x52, 0x17, 0xc6, 0x53, - 0x7e, 0xb8, 0xd2, 0x95, 0xb0, 0xd6, 0x00, 0xd7, 0x0d, 0xbe, 0x7a, 0xb6, 0x7d, 0xc2, 0xbc, 0x6e, - 0xeb, 0xe6, 0x63, 0xa2, 0xb3, 0xf1, 0x44, 0x67, 0x5f, 0x13, 0x9d, 0xbd, 0x4f, 0xf5, 0xc2, 0x78, - 0xaa, 0x17, 0x3e, 0xa7, 0x7a, 0xe1, 0xb9, 0x21, 0x3d, 0xd5, 0x4f, 0x1c, 0xd3, 0xc5, 0xc0, 0x22, - 0x09, 0xa7, 0x0b, 0xec, 0xec, 0x6d, 0x0d, 0xe7, 0x17, 0x9c, 0x45, 0x40, 0x4e, 0x39, 0xbf, 0xe2, - 0x8b, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x56, 0x90, 0x2a, 0xbf, 0xd9, 0x02, 0x00, 0x00, +var fileDescriptor_f051013778245841 = []byte{ + // 334 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0xc1, 0x4a, 0xc3, 0x40, + 0x10, 0x86, 0xbb, 0x2d, 0x54, 0x5d, 0x28, 0xe2, 0x1e, 0x24, 0xb4, 0x12, 0x4a, 0xc0, 0xd2, 0x8b, + 0x89, 0xe8, 0x45, 0x3d, 0x49, 0x3d, 0x89, 0x14, 0x4a, 0x04, 0x41, 0x2f, 0xa5, 0x89, 0xc3, 0x36, + 0xc4, 0x64, 0xe3, 0xce, 0x26, 0x6d, 0xde, 0xc2, 0x43, 0x1f, 0xca, 0x63, 0x8f, 0x1e, 0xa5, 0x7d, + 0x11, 0x49, 0xda, 0xa2, 0x52, 0x6b, 0x4b, 0x8f, 0xff, 0x0e, 0xf3, 0xcd, 0x3f, 0x3b, 0x3f, 0xad, + 0x21, 0x87, 0x10, 0xd4, 0x40, 0x48, 0xdf, 0x42, 0x0e, 0x96, 0x48, 0x02, 0x4b, 0x0d, 0xcd, 0x48, + 0x0a, 0x25, 0x18, 0xfb, 0x2e, 0x9a, 0xc8, 0xc1, 0x14, 0x49, 0x60, 0x3c, 0xd2, 0xe3, 0x36, 0xf2, + 0xfb, 0xd8, 0x09, 0x3c, 0xd5, 0x89, 0x1d, 0x1f, 0x52, 0xbc, 0xe9, 0xf7, 0x42, 0x0e, 0x1d, 0x29, + 0x22, 0x81, 0xbd, 0x17, 0x1b, 0x5e, 0x63, 0x40, 0xc5, 0x34, 0xba, 0xe3, 0x4a, 0xe8, 0x29, 0x21, + 0x35, 0x52, 0x27, 0xcd, 0x3d, 0x7b, 0x21, 0xd9, 0x21, 0x2d, 0x2b, 0xcf, 0xf5, 0x41, 0x69, 0xc5, + 0xbc, 0x30, 0x57, 0x46, 0x8b, 0x36, 0xd6, 0xa1, 0x31, 0x12, 0x21, 0x42, 0xc6, 0xc6, 0xd8, 0x75, + 0x01, 0x31, 0x67, 0xef, 0xda, 0x0b, 0x69, 0x0c, 0x68, 0xad, 0x8d, 0xfc, 0x41, 0x28, 0xf8, 0x45, + 0xd8, 0xda, 0x14, 0x6b, 0xd0, 0xfd, 0x44, 0x28, 0x90, 0x5d, 0x1f, 0xd2, 0xae, 0x17, 0x3e, 0xc3, + 0x50, 0x2b, 0xd5, 0x49, 0xb3, 0x62, 0x57, 0xf2, 0xe7, 0x3b, 0x48, 0x6f, 0xb3, 0x47, 0xe3, 0x82, + 0x1e, 0xfd, 0x3d, 0x78, 0x9d, 0xe5, 0xb3, 0x51, 0x91, 0x96, 0xda, 0xc8, 0xd9, 0x88, 0xd0, 0xda, + 0x3f, 0xcb, 0xb3, 0x4b, 0x73, 0xf9, 0x1c, 0xe6, 0x46, 0xb7, 0xa8, 0x5e, 0x6d, 0xd3, 0x3a, 0x37, + 0x9e, 0xd0, 0x83, 0xa5, 0xad, 0x98, 0xb5, 0x02, 0xb8, 0xea, 0xe3, 0xab, 0xa7, 0x9b, 0x37, 0xcc, + 0xe6, 0xb6, 0xae, 0xdf, 0x27, 0x3a, 0x19, 0x4f, 0x74, 0xf2, 0x39, 0xd1, 0xc9, 0xdb, 0x54, 0x2f, + 0x8c, 0xa7, 0x7a, 0xe1, 0x63, 0xaa, 0x17, 0x9e, 0x1a, 0xdc, 0x53, 0xfd, 0xd8, 0x31, 0x5d, 0x11, + 0x64, 0x99, 0x3d, 0xf9, 0x99, 0xdf, 0xe1, 0x2c, 0xc1, 0x69, 0x04, 0xe8, 0x94, 0xf3, 0x14, 0x9f, + 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x13, 0x33, 0xc7, 0x36, 0xe4, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -398,7 +398,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "sge/ovm/tx.proto", + Metadata: "sgenetwork/sge/ovm/tx.proto", } func (m *MsgSubmitPubkeysChangeProposalRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/ovm/types/vote.pb.go b/x/ovm/types/vote.pb.go index 96892946..7bb5f782 100644 --- a/x/ovm/types/vote.pb.go +++ b/x/ovm/types/vote.pb.go @@ -1,11 +1,11 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: sge/ovm/vote.proto +// source: sgenetwork/sge/ovm/vote.proto package types import ( fmt "fmt" - proto "github.com/gogo/protobuf/proto" + proto "github.com/cosmos/gogoproto/proto" io "io" math "math" math_bits "math/bits" @@ -51,7 +51,7 @@ func (x ProposalVote) String() string { } func (ProposalVote) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_bbd1cf24e657c25c, []int{0} + return fileDescriptor_f9405d800fb1f522, []int{0} } // Vote is the type for the proposal vote. @@ -66,7 +66,7 @@ func (m *Vote) Reset() { *m = Vote{} } func (m *Vote) String() string { return proto.CompactTextString(m) } func (*Vote) ProtoMessage() {} func (*Vote) Descriptor() ([]byte, []int) { - return fileDescriptor_bbd1cf24e657c25c, []int{0} + return fileDescriptor_f9405d800fb1f522, []int{0} } func (m *Vote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -114,26 +114,26 @@ func init() { proto.RegisterType((*Vote)(nil), "sgenetwork.sge.ovm.Vote") } -func init() { proto.RegisterFile("sge/ovm/vote.proto", fileDescriptor_bbd1cf24e657c25c) } +func init() { proto.RegisterFile("sgenetwork/sge/ovm/vote.proto", fileDescriptor_f9405d800fb1f522) } -var fileDescriptor_bbd1cf24e657c25c = []byte{ +var fileDescriptor_f9405d800fb1f522 = []byte{ // 250 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2a, 0x4e, 0x4f, 0xd5, - 0xcf, 0x2f, 0xcb, 0xd5, 0x2f, 0xcb, 0x2f, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x02, - 0x89, 0xe5, 0xa5, 0x96, 0x94, 0xe7, 0x17, 0x65, 0xeb, 0x15, 0xa7, 0xa7, 0xea, 0xe5, 0x97, 0xe5, - 0x2a, 0x45, 0x73, 0xb1, 0x84, 0xe5, 0x97, 0xa4, 0x0a, 0xc9, 0x72, 0x71, 0x15, 0x94, 0x26, 0xe5, - 0x64, 0x26, 0xc7, 0x67, 0xa7, 0x56, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x71, 0x42, 0x44, - 0xbc, 0x53, 0x2b, 0x85, 0x4c, 0xb8, 0x58, 0x40, 0x06, 0x49, 0x30, 0x29, 0x30, 0x6a, 0xf0, 0x19, - 0x29, 0xe8, 0x61, 0x9a, 0xa4, 0x17, 0x50, 0x94, 0x5f, 0x90, 0x5f, 0x9c, 0x98, 0x03, 0x32, 0x2e, - 0x08, 0xac, 0x5a, 0x2b, 0x8a, 0x8b, 0x07, 0x59, 0x54, 0x48, 0x96, 0x4b, 0x32, 0x20, 0xc8, 0x3f, - 0xc0, 0x3f, 0xd8, 0xd1, 0x27, 0x3e, 0xcc, 0x3f, 0xc4, 0x35, 0x3e, 0xd4, 0x2f, 0x38, 0xc0, 0xd5, - 0xd9, 0xd3, 0xcd, 0xd3, 0xd5, 0x45, 0x80, 0x41, 0x48, 0x84, 0x4b, 0x00, 0x55, 0xda, 0xcf, 0x5f, - 0x80, 0x51, 0x48, 0x94, 0x4b, 0x10, 0x55, 0x34, 0xd2, 0x35, 0x58, 0x80, 0xc9, 0xc9, 0xe1, 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, 0xd4, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, - 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x8b, 0xd3, 0x53, 0x75, 0xa1, 0x0e, 0x05, 0xb1, 0xf5, 0x2b, 0xc0, - 0x61, 0x52, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x0e, 0x15, 0x63, 0x40, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xa0, 0xd0, 0x72, 0x8c, 0x2b, 0x01, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2d, 0x4e, 0x4f, 0xcd, + 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0x2f, 0xcb, 0xd5, 0x2f, + 0xcb, 0x2f, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x42, 0x48, 0xeb, 0x15, 0xa7, + 0xa7, 0xea, 0xe5, 0x97, 0xe5, 0x2a, 0x45, 0x73, 0xb1, 0x84, 0xe5, 0x97, 0xa4, 0x0a, 0xc9, 0x72, + 0x71, 0x15, 0x94, 0x26, 0xe5, 0x64, 0x26, 0xc7, 0x67, 0xa7, 0x56, 0x4a, 0x30, 0x2a, 0x30, 0x6a, + 0x70, 0x06, 0x71, 0x42, 0x44, 0xbc, 0x53, 0x2b, 0x85, 0x4c, 0xb8, 0x58, 0x40, 0x06, 0x49, 0x30, + 0x29, 0x30, 0x6a, 0xf0, 0x19, 0x29, 0xe8, 0x61, 0x9a, 0xa4, 0x17, 0x50, 0x94, 0x5f, 0x90, 0x5f, + 0x9c, 0x98, 0x03, 0x32, 0x2e, 0x08, 0xac, 0x5a, 0x2b, 0x8a, 0x8b, 0x07, 0x59, 0x54, 0x48, 0x96, + 0x4b, 0x32, 0x20, 0xc8, 0x3f, 0xc0, 0x3f, 0xd8, 0xd1, 0x27, 0x3e, 0xcc, 0x3f, 0xc4, 0x35, 0x3e, + 0xd4, 0x2f, 0x38, 0xc0, 0xd5, 0xd9, 0xd3, 0xcd, 0xd3, 0xd5, 0x45, 0x80, 0x41, 0x48, 0x84, 0x4b, + 0x00, 0x55, 0xda, 0xcf, 0x5f, 0x80, 0x51, 0x48, 0x94, 0x4b, 0x10, 0x55, 0x34, 0xd2, 0x35, 0x58, + 0x80, 0xc9, 0xc9, 0xe1, 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, 0xd4, 0xd2, + 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0x41, 0xa1, 0xa0, 0x8b, 0x1c, 0x22, 0x15, + 0xe0, 0x30, 0x29, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x87, 0x8a, 0x31, 0x20, 0x00, 0x00, + 0xff, 0xff, 0x27, 0xa6, 0x07, 0x11, 0x36, 0x01, 0x00, 0x00, } func (m *Vote) Marshal() (dAtA []byte, err error) { From dc9d04402d2258afd77a72c7c6b6ed1756cfb3c2 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Fri, 20 Oct 2023 09:40:03 +0300 Subject: [PATCH 02/51] lint: fix workflows and sim_test --- .github/workflows/gosec.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 12 +++---- app/sim_test.go | 50 +++++++++++++++++++----------- proto/Dockerfile | 2 +- proto/sgenetwork/sge/mint/tx.proto | 11 ++++--- x/bet/module_simulation.go | 2 +- x/house/module_simulation.go | 2 +- x/market/module_simulation.go | 2 +- x/mint/module_simulation.go | 2 +- x/mint/types/tx.pb.go | 38 +++++++++++------------ x/orderbook/module_simulation.go | 2 +- x/ovm/module_simulation.go | 2 +- 13 files changed, 72 insertions(+), 57 deletions(-) diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index b67b1d43..d1007033 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-go@v3 with: path: /usr/local/go/bin - go-version: '1.18.10' + go-version: '1.20' - name: Checkout Source uses: actions/checkout@v2 - name: Set env vars diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 464480cd..074fc97f 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.20 - uses: technote-space/get-diff-action@v6.0.1 with: PATTERNS: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5509b466..ae87b49a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,12 +15,12 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.20 - name: Display go version run: go version - name: install tparse run: | - export GO111MODULE="on" && go install github.com/mfridman/tparse@v0.11.1 + export GO111MODULE="on" && go install github.com/mfridman/tparse@v0.13.1 - uses: actions/cache@v2.1.6 with: path: ~/go/bin @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.20 - uses: technote-space/get-diff-action@v4 id: git_diff with: @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.20 - uses: actions/checkout@v2 - name: Create a file with all the pkgs run: go list ./... > pkgs.txt @@ -86,7 +86,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.20 - uses: technote-space/get-diff-action@v4 with: PATTERNS: | @@ -164,7 +164,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.20 - uses: technote-space/get-diff-action@v4 with: PATTERNS: | diff --git a/app/sim_test.go b/app/sim_test.go index fe522de7..5bbb725e 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -6,7 +6,6 @@ import ( "os" "testing" - sdksimapp "cosmossdk.io/simapp" dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" "github.com/cometbft/cometbft/libs/rand" @@ -32,7 +31,14 @@ func init() { // Profile with: // /usr/local/go/bin/go test -benchmem -run=^$ github.com/cosmos/cosmos-sdk/SgeApp -bench ^BenchmarkFullAppSimulation$ -Commit=true -cpuprofile cpu.out func BenchmarkFullAppSimulation(b *testing.B) { - config, db, dir, logger, _, err := simtestutil.SetupSimulation("goleveldb-app-sim", "Simulation") + config := simcli.NewConfigFromFlags() + db, dir, logger, _, err := simtestutil.SetupSimulation( + config, + "goleveldb-app-sim", + "Simulation", + simcli.FlagVerboseValue, + simcli.FlagEnabledValue, + ) if err != nil { b.Fatalf("simulation setup failed: %s", err.Error()) } @@ -45,7 +51,7 @@ func BenchmarkFullAppSimulation(b *testing.B) { } }() - app := app.NewSgeApp( + sApp := app.NewSgeApp( logger, db, nil, @@ -62,17 +68,21 @@ func BenchmarkFullAppSimulation(b *testing.B) { _, simParams, simErr := simulation.SimulateFromSeed( b, os.Stdout, - app.BaseApp, - simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager()), + sApp.BaseApp, + simtestutil.AppStateFn( + sApp.AppCodec(), + sApp.SimulationManager(), + app.NewDefaultGenesisState(), + ), simulation2.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simtestutil.SimulationOperations(app, app.AppCodec(), config), - app.ModuleAccountAddrs(), + simtestutil.SimulationOperations(sApp, sApp.AppCodec(), config), + sApp.ModuleAccountAddrs(), config, - app.AppCodec(), + sApp.AppCodec(), ) // export state and simParams before the simulation error is checked - if err = simtestutil.CheckExportSimulation(app, config, simParams); err != nil { + if err = simtestutil.CheckExportSimulation(sApp, config, simParams); err != nil { b.Fatal(err) } @@ -96,12 +106,12 @@ func TestAppStateDeterminism(t *testing.T) { t.Skip("skipping application simulation") } - config := sdksimapp.NewConfigFromFlags() + config := simcli.NewConfigFromFlags() config.InitialBlockHeight = 1 config.ExportParamsPath = "" config.OnOperation = false config.AllInvariants = false - config.ChainID = sdksimapp.SimAppChainID + config.ChainID = SimAppChainID numSeeds := 3 numTimesToRunPerSeed := 5 @@ -119,7 +129,7 @@ func TestAppStateDeterminism(t *testing.T) { } db := dbm.NewMemDB() - app := app.NewSgeApp( + sApp := app.NewSgeApp( logger, db, nil, @@ -140,13 +150,17 @@ func TestAppStateDeterminism(t *testing.T) { _, _, err := simulation.SimulateFromSeed( t, os.Stdout, - app.BaseApp, - simtestutil.AppStateFn(app.AppCodec(), app.SimulationManager()), + sApp.BaseApp, + simtestutil.AppStateFn( + sApp.AppCodec(), + sApp.SimulationManager(), + app.NewDefaultGenesisState(), + ), simulation2.RandomAccounts, // Replace with own random account function if using keys other than secp256k1 - simtestutil.SimulationOperations(app, app.AppCodec(), config), - app.ModuleAccountAddrs(), + simtestutil.SimulationOperations(sApp, sApp.AppCodec(), config), + sApp.ModuleAccountAddrs(), config, - app.AppCodec(), + sApp.AppCodec(), ) require.NoError(t, err) @@ -154,7 +168,7 @@ func TestAppStateDeterminism(t *testing.T) { simtestutil.PrintStats(db) } - appHash := app.LastCommitID().Hash + appHash := sApp.LastCommitID().Hash appHashList[j] = appHash if j != 0 { diff --git a/proto/Dockerfile b/proto/Dockerfile index f5e6f162..e390388b 100644 --- a/proto/Dockerfile +++ b/proto/Dockerfile @@ -3,7 +3,7 @@ FROM bufbuild/buf:1.7.0 as BUILDER -FROM golang:1.19-alpine +FROM golang:1.20-alpine RUN apk add --no-cache \ diff --git a/proto/sgenetwork/sge/mint/tx.proto b/proto/sgenetwork/sge/mint/tx.proto index dd422c8a..1b118f07 100644 --- a/proto/sgenetwork/sge/mint/tx.proto +++ b/proto/sgenetwork/sge/mint/tx.proto @@ -7,7 +7,6 @@ import "cosmos/msg/v1/msg.proto"; import "amino/amino.proto"; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; -import "sgenetwork/sge/mint/minter.proto"; import "sgenetwork/sge/mint/params.proto"; // Msg defines the x/mint Msg service. @@ -26,15 +25,17 @@ service Msg { // Since: cosmos-sdk 0.47 message MsgUpdateParams { option (cosmos.msg.v1.signer) = "authority"; - option (amino.name) = "sge/x/mint/MsgUpdateParams"; + option (amino.name) = "sge/x/mint/MsgUpdateParams"; - // authority is the address that controls the module (defaults to x/gov unless overwritten). - string authority = 1 [(cosmos_proto.scalar) = "cosmos.AddressString"]; + // authority is the address that controls the module (defaults to x/gov unless + // overwritten). + string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; // params defines the x/mint parameters to update. // // NOTE: All parameters must be supplied. - Params params = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + Params params = 2 + [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ]; } // MsgUpdateParamsResponse defines the response structure for executing a diff --git a/x/bet/module_simulation.go b/x/bet/module_simulation.go index 5adf8f14..ed002c1a 100644 --- a/x/bet/module_simulation.go +++ b/x/bet/module_simulation.go @@ -37,7 +37,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/house/module_simulation.go b/x/house/module_simulation.go index 85f59c86..73abc571 100644 --- a/x/house/module_simulation.go +++ b/x/house/module_simulation.go @@ -30,7 +30,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/market/module_simulation.go b/x/market/module_simulation.go index 360cfaa8..ad809617 100644 --- a/x/market/module_simulation.go +++ b/x/market/module_simulation.go @@ -44,7 +44,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/mint/module_simulation.go b/x/mint/module_simulation.go index 883b5d4c..cf6095dd 100644 --- a/x/mint/module_simulation.go +++ b/x/mint/module_simulation.go @@ -30,7 +30,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/mint/types/tx.pb.go b/x/mint/types/tx.pb.go index eab8c977..7e829349 100644 --- a/x/mint/types/tx.pb.go +++ b/x/mint/types/tx.pb.go @@ -35,7 +35,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // // Since: cosmos-sdk 0.47 type MsgUpdateParams struct { - // authority is the address that controls the module (defaults to x/gov unless overwritten). + // authority is the address that controls the module (defaults to x/gov unless + // overwritten). Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` // params defines the x/mint parameters to update. // @@ -138,30 +139,29 @@ func init() { func init() { proto.RegisterFile("sgenetwork/sge/mint/tx.proto", fileDescriptor_e427455b4e24bcf3) } var fileDescriptor_e427455b4e24bcf3 = []byte{ - // 353 bytes of a gzipped FileDescriptorProto + // 347 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x29, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x46, 0xc8, 0xea, 0x15, 0xa7, 0xa7, 0xea, 0x81, 0x64, 0xa5, 0xc4, 0x93, 0xf3, 0x8b, 0x73, 0xf3, 0x8b, 0xf5, 0x73, 0x8b, 0xd3, 0xf5, 0xcb, 0x0c, 0x41, 0x14, 0x44, 0xb5, 0x94, 0x60, 0x62, 0x6e, 0x66, 0x5e, 0xbe, 0x3e, 0x98, 0x84, 0x0a, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, 0x16, 0x54, 0x54, 0x12, 0x62, 0x42, - 0x3c, 0x44, 0x02, 0xc2, 0x81, 0x4a, 0x29, 0x60, 0x73, 0x0f, 0x88, 0x48, 0x2d, 0xc2, 0xa7, 0xa2, - 0x20, 0xb1, 0x28, 0x31, 0x17, 0x6a, 0x86, 0xd2, 0x0e, 0x46, 0x2e, 0x7e, 0xdf, 0xe2, 0xf4, 0xd0, - 0x82, 0x94, 0xc4, 0x92, 0xd4, 0x00, 0xb0, 0x8c, 0x90, 0x19, 0x17, 0x67, 0x62, 0x69, 0x49, 0x46, - 0x7e, 0x51, 0x66, 0x49, 0xa5, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xc4, 0xa5, 0x2d, 0xba, - 0x22, 0x50, 0xcb, 0x1d, 0x53, 0x52, 0x8a, 0x52, 0x8b, 0x8b, 0x83, 0x4b, 0x8a, 0x32, 0xf3, 0xd2, - 0x83, 0x10, 0x4a, 0x85, 0xec, 0xb8, 0xd8, 0x20, 0x66, 0x4b, 0x30, 0x29, 0x30, 0x6a, 0x70, 0x1b, - 0x49, 0xeb, 0x61, 0x09, 0x12, 0x3d, 0x88, 0x25, 0x4e, 0x9c, 0x27, 0xee, 0xc9, 0x33, 0xac, 0x78, - 0xbe, 0x41, 0x8b, 0x31, 0x08, 0xaa, 0xcb, 0x4a, 0xb7, 0xe9, 0xf9, 0x06, 0x2d, 0x84, 0x79, 0x5d, - 0xcf, 0x37, 0x68, 0x49, 0x81, 0x5c, 0x5d, 0x01, 0x71, 0x37, 0x9a, 0x33, 0x95, 0x24, 0xb9, 0xc4, - 0xd1, 0x84, 0x82, 0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x8d, 0x0a, 0xb8, 0x98, 0x7d, 0x8b, - 0xd3, 0x85, 0x92, 0xb8, 0x78, 0x50, 0x3c, 0xa6, 0x82, 0xd5, 0x41, 0x68, 0x86, 0x48, 0xe9, 0x10, - 0xa3, 0x0a, 0x66, 0x95, 0x14, 0x6b, 0x03, 0xc8, 0x0f, 0x4e, 0x8e, 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, 0xa5, 0x9e, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, - 0x0b, 0x8a, 0x03, 0x5d, 0xe4, 0xf8, 0x80, 0xfa, 0xac, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, - 0x1c, 0x23, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x34, 0x84, 0xdc, 0x2c, 0x67, 0x02, 0x00, - 0x00, + 0x3c, 0x44, 0x02, 0xc2, 0x81, 0x4a, 0x29, 0x60, 0x73, 0x4f, 0x41, 0x62, 0x51, 0x62, 0x2e, 0x54, + 0x85, 0xd2, 0x0e, 0x46, 0x2e, 0x7e, 0xdf, 0xe2, 0xf4, 0xd0, 0x82, 0x94, 0xc4, 0x92, 0xd4, 0x00, + 0xb0, 0x8c, 0x90, 0x19, 0x17, 0x67, 0x62, 0x69, 0x49, 0x46, 0x7e, 0x51, 0x66, 0x49, 0xa5, 0x04, + 0xa3, 0x02, 0xa3, 0x06, 0xa7, 0x93, 0xc4, 0xa5, 0x2d, 0xba, 0x22, 0x50, 0xa3, 0x1d, 0x53, 0x52, + 0x8a, 0x52, 0x8b, 0x8b, 0x83, 0x4b, 0x8a, 0x32, 0xf3, 0xd2, 0x83, 0x10, 0x4a, 0x85, 0xec, 0xb8, + 0xd8, 0x20, 0x66, 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, 0xdb, 0xf4, 0x7c, 0x83, 0x16, 0xc2, 0xbc, 0xae, 0xe7, 0x1b, 0xb4, 0xa4, 0x40, 0xae, + 0xae, 0x80, 0xb8, 0x1b, 0xcd, 0x99, 0x4a, 0x92, 0x5c, 0xe2, 0x68, 0x42, 0x41, 0xa9, 0xc5, 0x05, + 0xf9, 0x79, 0xc5, 0xa9, 0x46, 0x05, 0x5c, 0xcc, 0xbe, 0xc5, 0xe9, 0x42, 0x49, 0x5c, 0x3c, 0x28, + 0x1e, 0x53, 0xc1, 0xea, 0x20, 0x34, 0x43, 0xa4, 0x74, 0x88, 0x51, 0x05, 0xb3, 0x4a, 0x8a, 0xb5, + 0x01, 0xe4, 0x07, 0x27, 0xc7, 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, 0x52, + 0x4f, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0x05, 0xc5, 0x81, 0x2e, 0x72, 0x7c, + 0x40, 0x7d, 0x56, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x8e, 0x11, 0x63, 0x40, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xfa, 0xbf, 0x3b, 0x92, 0x45, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/orderbook/module_simulation.go b/x/orderbook/module_simulation.go index 46bca310..a1e8a07b 100644 --- a/x/orderbook/module_simulation.go +++ b/x/orderbook/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/ovm/module_simulation.go b/x/ovm/module_simulation.go index cbbe5663..bade4095 100644 --- a/x/ovm/module_simulation.go +++ b/x/ovm/module_simulation.go @@ -37,7 +37,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 } From 4f562d5401ef53fb0e713a9b763e2d108e4f7b0c Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Fri, 20 Oct 2023 10:03:11 +0300 Subject: [PATCH 03/51] tmp: disavle go version check --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1bf4d3fc..cfaa0d08 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ endif check_version: ifneq ($(GO_MINOR_VERSION),20) - @echo "ERROR: Go version 1.20 is required for this version of SGE. Go 1.20 has changes that are believed to break consensus." + @echo "ERROR: Go version 1.20 is required for this version of SGE. Go 1.21 has changes that are believed to break consensus." exit 1 endif @@ -125,7 +125,7 @@ BUILD_TARGETS := build install build: BUILD_ARGS=-o $(BUILDDIR)/ -$(BUILD_TARGETS): check_version go.sum $(BUILDDIR)/ +$(BUILD_TARGETS): go.sum $(BUILDDIR)/ GOWORK=off go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./... $(BUILDDIR)/: From 9696053fd7e500b2d79932539dec6ded744f189c Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Fri, 20 Oct 2023 10:21:11 +0300 Subject: [PATCH 04/51] fix: testutil chain id removal --- Makefile | 2 +- testutil/simapp/simapp.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cfaa0d08..5cd4875f 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ BUILD_TARGETS := build install build: BUILD_ARGS=-o $(BUILDDIR)/ -$(BUILD_TARGETS): go.sum $(BUILDDIR)/ +$(BUILD_TARGETS): check_version go.sum $(BUILDDIR)/ GOWORK=off go $@ -mod=readonly $(BUILD_FLAGS) $(BUILD_ARGS) ./... $(BUILDDIR)/: diff --git a/testutil/simapp/simapp.go b/testutil/simapp/simapp.go index 3b34e5b4..763190d1 100644 --- a/testutil/simapp/simapp.go +++ b/testutil/simapp/simapp.go @@ -116,7 +116,6 @@ func SetupWithGenesisAccounts( appInstance.InitChain( abci.RequestInitChain{ - ChainId: "test-sge", Validators: validatorUpdates, ConsensusParams: DefaultConsensusParams, AppStateBytes: stateBytes, From c3e1fc6a2f284a8a242231d239e053f2feff0d46 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Fri, 20 Oct 2023 10:28:05 +0300 Subject: [PATCH 05/51] fix: workflows version single quoted --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 074fc97f..df78d908 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: - go-version: 1.20 + go-version: '1.20' - uses: technote-space/get-diff-action@v6.0.1 with: PATTERNS: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ae87b49a..674d542e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.20 + go-version: '1.20' - name: Display go version run: go version - name: install tparse @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v3 with: - go-version: 1.20 + go-version: '1.20' - uses: technote-space/get-diff-action@v4 id: git_diff with: @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/setup-go@v3 with: - go-version: 1.20 + go-version: '1.20' - uses: actions/checkout@v2 - name: Create a file with all the pkgs run: go list ./... > pkgs.txt @@ -86,7 +86,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v3 with: - go-version: 1.20 + go-version: '1.20' - uses: technote-space/get-diff-action@v4 with: PATTERNS: | @@ -164,7 +164,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v3 with: - go-version: 1.20 + go-version: '1.20' - uses: technote-space/get-diff-action@v4 with: PATTERNS: | From 07e20b8ff4e0a77dd9ec8ef4a2a87ee0324cbdac Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Fri, 20 Oct 2023 11:10:58 +0300 Subject: [PATCH 06/51] fix: set grpc service and network tests --- app/app.go | 12 ++++++++++++ cmd/sged/cmd/root.go | 17 +++++++++++++++++ testutil/network/network.go | 16 +++++++++++++--- 3 files changed, 42 insertions(+), 3 deletions(-) diff --git a/app/app.go b/app/app.go index a516bf04..4f50a079 100644 --- a/app/app.go +++ b/app/app.go @@ -12,6 +12,9 @@ import ( tmjson "github.com/cometbft/cometbft/libs/json" "github.com/cometbft/cometbft/libs/log" tmos "github.com/cometbft/cometbft/libs/os" + + autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" + reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node" @@ -19,6 +22,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/runtime" + runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services" "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -182,6 +186,14 @@ func NewSgeApp( ) app.mm.RegisterServices(app.configurator) + // v47 - no dependecy injection, so register new gRPC services. + autocliv1.RegisterQueryServer(app.GRPCQueryRouter(), runtimeservices.NewAutoCLIQueryService(app.mm.Modules)) + reflectionSvc, err := runtimeservices.NewReflectionService() + if err != nil { + panic(err) + } + reflectionv1.RegisterReflectionServiceServer(app.GRPCQueryRouter(), reflectionSvc) + // create the simulation manager and define the order of the modules for deterministic simulations // // NOTE: this is not required apps that don't use the simulator for fuzz testing diff --git a/cmd/sged/cmd/root.go b/cmd/sged/cmd/root.go index 763651e3..c80f936e 100644 --- a/cmd/sged/cmd/root.go +++ b/cmd/sged/cmd/root.go @@ -7,6 +7,7 @@ import ( "github.com/spf13/cast" "github.com/spf13/cobra" + "github.com/spf13/pflag" dbm "github.com/cometbft/cometbft-db" tmcfg "github.com/cometbft/cometbft/config" @@ -121,6 +122,22 @@ func addModuleInitFlags(startCmd *cobra.Command) { crisis.AddModuleInitFlags(startCmd) } +func overwriteFlagDefaults(c *cobra.Command, defaults map[string]string) { + set := func(s *pflag.FlagSet, key, val string) { + if f := s.Lookup(key); f != nil { + f.DefValue = val + f.Value.Set(val) + } + } + for key, val := range defaults { + set(c.Flags(), key, val) + set(c.PersistentFlags(), key, val) + } + for _, c := range c.Commands() { + overwriteFlagDefaults(c, defaults) + } +} + func queryCommand() *cobra.Command { cmd := &cobra.Command{ Use: "query", diff --git a/testutil/network/network.go b/testutil/network/network.go index ff1db16a..291f0317 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -52,7 +52,10 @@ 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 { - encoding := app.MakeEncodingConfig() + var ( + encoding = app.MakeEncodingConfig() + chainID = "chain-" + tmrand.NewRand().Str(6) + ) return network.Config{ Codec: encoding.Marshaler, TxConfig: encoding.TxConfig, @@ -61,16 +64,23 @@ func DefaultConfig() network.Config { AccountRetriever: authtypes.AccountRetriever{}, AppConstructor: func(val network.ValidatorI) servertypes.Application { return app.NewSgeApp( - val.GetCtx().Logger, 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, simtestutil.EmptyAppOptions{}, 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, NumValidators: 1, BondDenom: sdk.DefaultBondDenom, MinGasPrices: fmt.Sprintf("0.000006%s", sdk.DefaultBondDenom), From dd5cf498d7e57ad3dc67e370d353d5346a42ca28 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Fri, 20 Oct 2023 12:34:20 +0300 Subject: [PATCH 07/51] feat: register v0.47 compatible query --- .github/workflows/gosec.yml | 2 +- .golangci.yml | 2 +- app/app.go | 1 + go.mod | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index d1007033..60f8681c 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -25,4 +25,4 @@ jobs: - name: Run Gosec Security Scanner uses: cosmos/gosec@master with: - args: ./... + args: '-exclude-generated ./...' diff --git a/.golangci.yml b/.golangci.yml index 4cf253d4..c52864fb 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ run: tests: true - timeout: 10m + timeout: 15m sort-results: true allow-parallel-runners: true exclude-dir: testutil/testdata_pulsar diff --git a/app/app.go b/app/app.go index 4f50a079..db6b41be 100644 --- a/app/app.go +++ b/app/app.go @@ -187,6 +187,7 @@ func NewSgeApp( app.mm.RegisterServices(app.configurator) // v47 - no dependecy injection, so register new gRPC services. + //#nosec autocliv1.RegisterQueryServer(app.GRPCQueryRouter(), runtimeservices.NewAutoCLIQueryService(app.mm.Modules)) reflectionSvc, err := runtimeservices.NewReflectionService() if err != nil { diff --git a/go.mod b/go.mod index adaf6edc..75563542 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ module github.com/sge-network/sge go 1.20 require ( + cosmossdk.io/api v0.3.1 cosmossdk.io/math v1.1.2 cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 github.com/cometbft/cometbft v0.37.2 @@ -46,7 +47,7 @@ require ( github.com/sashamelentyev/interfacebloat v1.1.0 // indirect github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect github.com/sivchari/nosnakecase v1.7.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect + github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 // indirect github.com/timonwong/loggercheck v0.9.3 // indirect go.uber.org/atomic v1.10.0 // indirect @@ -62,7 +63,6 @@ require ( 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 - cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect cosmossdk.io/errors v1.0.0 // indirect From 7dd53914e0c4d000f42b7e37da90139fbd52bcaa Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Fri, 20 Oct 2023 12:47:29 +0300 Subject: [PATCH 08/51] workflows: upgrade setup-go --- .github/workflows/gosec.yml | 4 ++-- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index 60f8681c..9e1268ff 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -13,7 +13,7 @@ jobs: GO111MODULE: on steps: - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: path: /usr/local/go/bin go-version: '1.20' @@ -25,4 +25,4 @@ jobs: - name: Run Gosec Security Scanner uses: cosmos/gosec@master with: - args: '-exclude-generated ./...' + args: './...' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index df78d908..d5dbb7e8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: '1.20' - uses: technote-space/get-diff-action@v6.0.1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 674d542e..2b519427 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: install-tparse: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: '1.20' - name: Display go version @@ -33,7 +33,7 @@ jobs: go-arch: ["amd64", "arm", "arm64"] steps: - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: '1.20' - uses: technote-space/get-diff-action@v4 @@ -49,7 +49,7 @@ jobs: split-test-files: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: '1.20' - uses: actions/checkout@v2 @@ -84,7 +84,7 @@ jobs: part: ["00", "01", "02", "03"] steps: - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: '1.20' - uses: technote-space/get-diff-action@v4 @@ -162,7 +162,7 @@ jobs: part: ["00", "01", "02", "03"] steps: - uses: actions/checkout@v2 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: '1.20' - uses: technote-space/get-diff-action@v4 From b5570978a265532e228267c18fb32777f9a040fb Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 16 Jan 2024 09:43:03 +0300 Subject: [PATCH 09/51] feat: upgrade go.mod to 0.47.4.7 --- go.mod | 36 ++++++++-------- go.sum | 68 +++++++++++++++--------------- x/bet/client/cli/query_bet_test.go | 6 +-- 3 files changed, 53 insertions(+), 57 deletions(-) diff --git a/go.mod b/go.mod index bfdeb8f5..ae57d877 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ go 1.21 require ( cosmossdk.io/api v0.3.1 cosmossdk.io/errors v1.0.0 - cosmossdk.io/math v1.1.2 + cosmossdk.io/math v1.2.0 cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 - github.com/cometbft/cometbft v0.37.2 + github.com/cometbft/cometbft v0.37.4 github.com/cometbft/cometbft-db v0.8.0 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.7 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.3.0 github.com/golang-jwt/jwt v3.2.2+incompatible @@ -26,8 +26,8 @@ require ( github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 - google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d - google.golang.org/grpc v1.58.1 + google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 + google.golang.org/grpc v1.58.3 gopkg.in/yaml.v2 v2.4.0 mvdan.cc/gofumpt v0.4.0 ) @@ -37,7 +37,7 @@ require ( github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect github.com/alingse/asasalint v0.0.11 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/iavl v0.20.0 // indirect + github.com/cosmos/iavl v0.20.1 // indirect github.com/creachadair/taskgroup v0.4.2 // indirect github.com/curioswitch/go-reassign v0.2.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect @@ -59,10 +59,10 @@ require ( require ( 4d63.com/gochecknoglobals v0.1.0 // indirect - cloud.google.com/go v0.110.6 // 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/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect @@ -74,7 +74,7 @@ require ( github.com/Antonboom/errname v0.1.7 // indirect github.com/Antonboom/nilnil v0.1.1 // indirect github.com/BurntSushi/toml v1.2.1 // indirect - github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect + github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/OpenPeeDeeP/depguard v1.1.1 // indirect @@ -109,7 +109,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/ics23/go v0.10.0 // indirect - github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect + github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect github.com/daixiang0/gci v0.8.1 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -148,7 +148,7 @@ require ( github.com/gofrs/flock v0.8.1 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/golang/glog v1.1.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -164,8 +164,8 @@ require ( github.com/google/go-cmp v0.5.9 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/s2a-go v0.1.4 // 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/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect @@ -199,7 +199,7 @@ require ( github.com/julz/importas v0.1.0 // indirect github.com/kisielk/errcheck v1.6.2 // indirect github.com/kisielk/gotool v1.0.0 // indirect - github.com/klauspost/compress v1.16.3 // 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/kulti/thelper v0.6.3 // indirect @@ -291,7 +291,7 @@ require ( golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect golang.org/x/mod v0.13.0 // indirect - golang.org/x/net v0.16.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect golang.org/x/sync v0.4.0 // indirect golang.org/x/sys v0.13.0 // indirect @@ -299,10 +299,10 @@ require ( golang.org/x/text v0.13.0 // indirect golang.org/x/tools v0.14.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-20230803162519-f966b187b2e5 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect + google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // 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 3e6126de..f4a1aca7 100644 --- a/go.sum +++ b/go.sum @@ -36,8 +36,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.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.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= @@ -116,8 +116,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= @@ -203,8 +203,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/simapp v0.0.0-20230831152633-2e9e5d6eea24 h1:A+LHM41uss8WNJ+qZCdvCjtiG6UiIN7ZqmPZz6R25wc= cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24/go.mod h1:1kVkzonF2p6SYsSMXXURz/kx50QWArqazCk1Myulu8g= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -232,8 +232,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 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/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/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= +github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= 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= @@ -420,8 +420,8 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE 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= -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 v0.37.4 h1:xyvvEqlyfK8MgNIIKVJaMsuIp03wxOcFmVkT26+Ikpg= +github.com/cometbft/cometbft v0.37.4/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8= 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= @@ -442,8 +442,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.5 h1:n1+WjP/VM/gAEOx3TqU2/Ny734rj/MX1kpUnn7zVJP8= -github.com/cosmos/cosmos-sdk v0.47.5/go.mod h1:EHwCeN9IXonsjKcjpS12MqeStdZvIdxt3VYXhus3G3c= +github.com/cosmos/cosmos-sdk v0.47.7 h1:yoyWF/x2dvKysgB8PVnSc83JIhbx3l11ZSf+bgBBfHQ= +github.com/cosmos/cosmos-sdk v0.47.7/go.mod h1:hljXsedSCJYge78hyaMYy+yzDQVGZtKAZBjZn5QMddk= 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= @@ -460,8 +460,8 @@ 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/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.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= -github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= +github.com/cosmos/ledger-cosmos-go v0.12.4 h1:drvWt+GJP7Aiw550yeb3ON/zsrgW0jgh5saFCr7pDnw= +github.com/cosmos/ledger-cosmos-go v0.12.4/go.mod h1:fjfVWRf++Xkygt9wzCsjEBdjcf7wiiY35fv3ctT+k4M= 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/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= @@ -672,8 +672,8 @@ github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w 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.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +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= @@ -798,8 +798,8 @@ github.com/google/uuid v1.5.0/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= @@ -809,8 +809,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= @@ -996,8 +996,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.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= -github.com/klauspost/compress v1.16.3/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 h1:2U0HzY8BJ8hVwDKIzp7y4voR9CX/nvcfymLmg2UiOio= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= @@ -1681,8 +1681,8 @@ golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= 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.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos= -golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +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= @@ -2031,8 +2031,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= @@ -2152,12 +2152,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-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/genproto v0.0.0-20231012201019-e917dd12ba7a h1:fwgW9j3vHirt4ObdHoYNwuO24BEZjSzbh+zPaNWoiY8= +google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= +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-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo= +google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= 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= @@ -2199,8 +2199,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.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58= -google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= +google.golang.org/grpc v1.58.3/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= diff --git a/x/bet/client/cli/query_bet_test.go b/x/bet/client/cli/query_bet_test.go index d49c3252..f544f9d6 100644 --- a/x/bet/client/cli/query_bet_test.go +++ b/x/bet/client/cli/query_bet_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + sdkmath "cosmossdk.io/math" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" @@ -16,11 +17,6 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - sdkmath "cosmossdk.io/math" - "github.com/cosmos/cosmos-sdk/client/flags" - clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sge-network/sge/testutil/network" "github.com/sge-network/sge/testutil/nullify" "github.com/sge-network/sge/testutil/simapp" From fc08f752519946c5f6ee256275ac31196606eede Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:17:22 +0300 Subject: [PATCH 10/51] workflow: upgrade golang version --- .github/workflows/gosec.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index 9e1268ff..c6af9363 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-go@v4 with: path: /usr/local/go/bin - go-version: '1.20' + go-version: '1.21' - name: Checkout Source uses: actions/checkout@v2 - name: Set env vars diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d5dbb7e8..d1c2af14 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' - uses: technote-space/get-diff-action@v6.0.1 with: PATTERNS: | diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2b519427..1f192b33 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' - name: Display go version run: go version - name: install tparse @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' - uses: technote-space/get-diff-action@v4 id: git_diff with: @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' - uses: actions/checkout@v2 - name: Create a file with all the pkgs run: go list ./... > pkgs.txt @@ -86,7 +86,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' - uses: technote-space/get-diff-action@v4 with: PATTERNS: | @@ -164,7 +164,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: '1.21' - uses: technote-space/get-diff-action@v4 with: PATTERNS: | From 9f16d846f0e8408380a6c01cbc53585a9c136134 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:27:03 +0300 Subject: [PATCH 11/51] fix: protos and tests --- proto/sgenetwork/sge/bet/ticket.proto | 1 - x/bet/types/ticket.pb.go | 46 +++++++++---------- x/house/client/cli/query_deposit_test.go | 1 + .../keeper/msg_server_balance_test.go | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/proto/sgenetwork/sge/bet/ticket.proto b/proto/sgenetwork/sge/bet/ticket.proto index a12344c0..e73c68a4 100644 --- a/proto/sgenetwork/sge/bet/ticket.proto +++ b/proto/sgenetwork/sge/bet/ticket.proto @@ -6,7 +6,6 @@ import "gogoproto/gogo.proto"; import "sgenetwork/sge/type/kyc.proto"; import "sgenetwork/sge/bet/bet.proto"; import "sgenetwork/sge/bet/bet_odds.proto"; -import "sgenetwork/sge/bet/odds_type.proto"; option go_package = "github.com/sge-network/sge/x/bet/types"; diff --git a/x/bet/types/ticket.pb.go b/x/bet/types/ticket.pb.go index ccd9a36d..84f73cd1 100644 --- a/x/bet/types/ticket.pb.go +++ b/x/bet/types/ticket.pb.go @@ -113,29 +113,29 @@ func init() { func init() { proto.RegisterFile("sgenetwork/sge/bet/ticket.proto", fileDescriptor_5c3f88574fd82596) } var fileDescriptor_5c3f88574fd82596 = []byte{ - // 350 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x52, 0xc1, 0x4a, 0xc3, 0x40, - 0x14, 0x4c, 0x6a, 0x6d, 0x6b, 0xaa, 0x97, 0xc5, 0x43, 0xa8, 0x35, 0xad, 0x15, 0xa4, 0x17, 0x13, - 0xa8, 0xe0, 0x4d, 0x28, 0xb5, 0x37, 0x11, 0x25, 0x08, 0x82, 0x97, 0xb2, 0xd9, 0x7d, 0xac, 0x25, - 0x69, 0x37, 0x74, 0x9f, 0xd8, 0xfc, 0x85, 0x3f, 0xe2, 0x7f, 0xf4, 0xd8, 0xa3, 0x27, 0x91, 0xf6, - 0x47, 0x24, 0x9b, 0x14, 0xa5, 0x06, 0x6f, 0x79, 0x99, 0x99, 0x37, 0xf3, 0x86, 0xb5, 0x5a, 0x4a, - 0xc0, 0x14, 0xf0, 0x55, 0xce, 0x42, 0x4f, 0x09, 0xf0, 0x02, 0x40, 0x0f, 0xc7, 0x2c, 0x04, 0x74, - 0xe3, 0x99, 0x44, 0x49, 0xc8, 0x0f, 0xc1, 0x55, 0x02, 0xdc, 0x00, 0xb0, 0x71, 0x28, 0xa4, 0x90, - 0x1a, 0xf6, 0xd2, 0xaf, 0x8c, 0xd9, 0x38, 0xde, 0x5a, 0x85, 0x49, 0x0c, 0x5e, 0x98, 0xb0, 0x1c, - 0x6e, 0x16, 0x38, 0x05, 0x1b, 0x9b, 0xc6, 0x49, 0x31, 0x3a, 0x92, 0x9c, 0xab, 0x9c, 0xd2, 0x29, - 0xa0, 0xa4, 0xf0, 0x28, 0x35, 0xca, 0x38, 0x9d, 0xf7, 0x92, 0x45, 0x1e, 0xa9, 0x80, 0xd9, 0x83, - 0xbe, 0xe1, 0x9e, 0x26, 0x91, 0xa4, 0x9c, 0xf4, 0xad, 0x03, 0x05, 0x11, 0x30, 0x04, 0xae, 0x37, - 0xda, 0x66, 0xdb, 0xec, 0xd6, 0x7b, 0x47, 0xee, 0xdf, 0xe3, 0xdc, 0x01, 0xe0, 0x1d, 0xe7, 0xca, - 0xdf, 0xdf, 0x28, 0xd2, 0x89, 0x0c, 0xad, 0x5a, 0x98, 0xb0, 0x11, 0xa7, 0x48, 0xed, 0x92, 0x16, - 0x9f, 0x6e, 0x8b, 0x75, 0x8c, 0x9b, 0x84, 0x0d, 0x29, 0xd2, 0xdc, 0x78, 0x50, 0x5e, 0x7c, 0xb6, - 0x0c, 0xbf, 0x1a, 0x66, 0x7f, 0xc9, 0x95, 0x55, 0xa3, 0x51, 0x94, 0x45, 0x28, 0xb7, 0x77, 0xba, - 0xf5, 0x5e, 0xe7, 0x9f, 0x08, 0xd7, 0x72, 0x12, 0x53, 0x86, 0x7e, 0x95, 0x46, 0x91, 0x0e, 0x71, - 0x69, 0x95, 0x27, 0x80, 0xd4, 0xde, 0xd5, 0x01, 0x9a, 0x45, 0xd2, 0x5b, 0x40, 0x9a, 0x5a, 0xe5, - 0xce, 0x9a, 0x4f, 0x6c, 0xab, 0xca, 0xe4, 0x14, 0x61, 0x8e, 0x76, 0xa5, 0x6d, 0x76, 0xf7, 0xfc, - 0xcd, 0x38, 0xe8, 0x2f, 0x56, 0x8e, 0xb9, 0x5c, 0x39, 0xe6, 0xd7, 0xca, 0x31, 0xdf, 0xd6, 0x8e, - 0xb1, 0x5c, 0x3b, 0xc6, 0xc7, 0xda, 0x31, 0x9e, 0xce, 0xc4, 0x18, 0x9f, 0x5f, 0x02, 0x97, 0xc9, - 0x49, 0xda, 0xf6, 0xf9, 0xef, 0xe6, 0xe7, 0xd9, 0x33, 0x49, 0x62, 0x50, 0x41, 0x45, 0x17, 0x7f, - 0xf1, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x11, 0x32, 0xf6, 0x49, 0x02, 0x00, 0x00, + // 343 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x4b, 0x02, 0x41, + 0x18, 0x86, 0x77, 0xcd, 0xd4, 0xd6, 0xba, 0x0c, 0x1d, 0x16, 0xb3, 0xd5, 0x0c, 0xc2, 0x4b, 0xb3, + 0x60, 0xd0, 0x2d, 0x10, 0xf3, 0x16, 0x51, 0x2c, 0x41, 0xd0, 0x45, 0x66, 0x67, 0x3e, 0x26, 0xd9, + 0xd5, 0x59, 0x9c, 0x2f, 0x72, 0xff, 0x45, 0x7f, 0xa4, 0xff, 0xe1, 0xd1, 0x63, 0xa7, 0x08, 0xfd, + 0x23, 0xb1, 0xb3, 0x4a, 0x61, 0xd2, 0x6d, 0xbf, 0xfd, 0xde, 0x77, 0xde, 0x67, 0x5e, 0xc6, 0x69, + 0x68, 0x09, 0x63, 0xc0, 0x57, 0x35, 0x89, 0x7c, 0x2d, 0xc1, 0x0f, 0x01, 0x7d, 0x1c, 0xf2, 0x08, + 0x90, 0x26, 0x13, 0x85, 0x8a, 0x90, 0x1f, 0x01, 0xd5, 0x12, 0x68, 0x08, 0x58, 0x3b, 0x94, 0x4a, + 0x2a, 0xb3, 0xf6, 0xb3, 0xaf, 0x5c, 0x59, 0x3b, 0xde, 0x38, 0x0a, 0xd3, 0x04, 0xfc, 0x28, 0xe5, + 0xab, 0x75, 0x7d, 0x4b, 0x52, 0xb8, 0x8e, 0xa9, 0x9d, 0x6c, 0xdf, 0x0e, 0x94, 0x10, 0x3a, 0x97, + 0xb4, 0xde, 0x0b, 0x0e, 0x79, 0x64, 0x12, 0x26, 0x0f, 0x86, 0xef, 0x9e, 0xa5, 0xb1, 0x62, 0x82, + 0x74, 0x9d, 0x03, 0x0d, 0x31, 0x70, 0x04, 0x61, 0xd4, 0xae, 0xdd, 0xb4, 0xdb, 0xd5, 0xce, 0x11, + 0xfd, 0x0b, 0x4e, 0x7b, 0x80, 0x77, 0x42, 0xe8, 0x60, 0x7f, 0xed, 0xc8, 0x26, 0xd2, 0x77, 0x2a, + 0x51, 0xca, 0x07, 0x82, 0x21, 0x73, 0x0b, 0xc6, 0x7c, 0xba, 0x69, 0xce, 0xee, 0x42, 0x6f, 0x52, + 0xde, 0x67, 0xc8, 0x56, 0xc1, 0xbd, 0xe2, 0xec, 0xb3, 0x61, 0x05, 0xe5, 0x28, 0xff, 0x4b, 0xae, + 0x9c, 0x0a, 0x8b, 0xe3, 0x1c, 0xa1, 0xd8, 0xdc, 0x69, 0x57, 0x3b, 0xad, 0x7f, 0x10, 0xae, 0xd5, + 0x28, 0x61, 0x1c, 0x83, 0x32, 0x8b, 0x63, 0x03, 0x71, 0xe9, 0x14, 0x47, 0x80, 0xcc, 0xdd, 0x35, + 0x00, 0xf5, 0x6d, 0xd6, 0x5b, 0x40, 0x96, 0x45, 0xad, 0x92, 0x8d, 0x9e, 0xb8, 0x4e, 0x99, 0xab, + 0x31, 0xc2, 0x14, 0xdd, 0x52, 0xd3, 0x6e, 0xef, 0x05, 0xeb, 0xb1, 0xd7, 0x9d, 0x2d, 0x3c, 0x7b, + 0xbe, 0xf0, 0xec, 0xaf, 0x85, 0x67, 0xbf, 0x2d, 0x3d, 0x6b, 0xbe, 0xf4, 0xac, 0x8f, 0xa5, 0x67, + 0x3d, 0x9d, 0xc9, 0x21, 0x3e, 0xbf, 0x84, 0x94, 0xab, 0x51, 0x56, 0xf6, 0xf9, 0xef, 0xe2, 0xa7, + 0xf9, 0x13, 0x48, 0x13, 0xd0, 0x61, 0xc9, 0x14, 0x7f, 0xf1, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x6b, + 0x10, 0xb1, 0xd7, 0x25, 0x02, 0x00, 0x00, } func (m *WagerTicketPayload) Marshal() (dAtA []byte, err error) { diff --git a/x/house/client/cli/query_deposit_test.go b/x/house/client/cli/query_deposit_test.go index 336686e2..e9a79ebd 100644 --- a/x/house/client/cli/query_deposit_test.go +++ b/x/house/client/cli/query_deposit_test.go @@ -5,6 +5,7 @@ import ( "testing" "time" + sdkmath "cosmossdk.io/math" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" diff --git a/x/subaccount/keeper/msg_server_balance_test.go b/x/subaccount/keeper/msg_server_balance_test.go index efaa4b12..8e07cad4 100644 --- a/x/subaccount/keeper/msg_server_balance_test.go +++ b/x/subaccount/keeper/msg_server_balance_test.go @@ -275,7 +275,7 @@ func TestNewMsgServerTopUp_Errors(t *testing.T) { _, err := msgServer.Create(sdk.WrapSDKContext(ctx), msg) require.NoError(t, err) }, - expectedErr: "0usge is smaller than 123usge: insufficient funds", + expectedErr: "spendable balance is smaller than 123usge", }, } From bbd2fa732b8424256d7791b0f7b9e73e4b53885c Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:36:18 +0300 Subject: [PATCH 12/51] fix: orderbook cli tests import --- x/orderbook/client/cli/query_bet_test.go | 6 ++++-- x/orderbook/client/cli/query_exposure_odds_test.go | 10 ++++++---- .../client/cli/query_exposure_participation_test.go | 7 +++++-- x/orderbook/client/cli/query_orderbook_test.go | 6 ++---- x/orderbook/client/cli/query_participation_test.go | 10 ++++++---- 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/x/orderbook/client/cli/query_bet_test.go b/x/orderbook/client/cli/query_bet_test.go index 8bb835a5..6bd4db73 100644 --- a/x/orderbook/client/cli/query_bet_test.go +++ b/x/orderbook/client/cli/query_bet_test.go @@ -4,6 +4,10 @@ import ( "fmt" "testing" + "github.com/google/uuid" + "github.com/spf13/cast" + "github.com/stretchr/testify/require" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" @@ -14,8 +18,6 @@ import ( bettypes "github.com/sge-network/sge/x/bet/types" "github.com/sge-network/sge/x/orderbook/client/cli" "github.com/sge-network/sge/x/orderbook/types" - "github.com/spf13/cast" - "github.com/stretchr/testify/require" ) func networkWithParticipationBetObjects(t *testing.T, n int) (*network.Network, []types.ParticipationBetPair) { diff --git a/x/orderbook/client/cli/query_exposure_odds_test.go b/x/orderbook/client/cli/query_exposure_odds_test.go index 15eedf5b..bba5b5ec 100644 --- a/x/orderbook/client/cli/query_exposure_odds_test.go +++ b/x/orderbook/client/cli/query_exposure_odds_test.go @@ -4,6 +4,12 @@ import ( "fmt" "testing" + "github.com/google/uuid" + "github.com/spf13/cast" + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" @@ -12,10 +18,6 @@ import ( "github.com/sge-network/sge/testutil/nullify" "github.com/sge-network/sge/x/orderbook/client/cli" "github.com/sge-network/sge/x/orderbook/types" - "github.com/spf13/cast" - "github.com/stretchr/testify/require" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) func networkWithOddsExposureObjects(t *testing.T, n int) (*network.Network, []types.OrderBookOddsExposure) { diff --git a/x/orderbook/client/cli/query_exposure_participation_test.go b/x/orderbook/client/cli/query_exposure_participation_test.go index feb15359..1e96d39b 100644 --- a/x/orderbook/client/cli/query_exposure_participation_test.go +++ b/x/orderbook/client/cli/query_exposure_participation_test.go @@ -4,6 +4,11 @@ import ( "fmt" "testing" + "github.com/google/uuid" + "github.com/spf13/cast" + "github.com/stretchr/testify/require" + + sdkmath "cosmossdk.io/math" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" @@ -12,8 +17,6 @@ import ( "github.com/sge-network/sge/testutil/nullify" "github.com/sge-network/sge/x/orderbook/client/cli" "github.com/sge-network/sge/x/orderbook/types" - "github.com/spf13/cast" - "github.com/stretchr/testify/require" ) func networkWithParticipationExposureObjects(t *testing.T, n int) (*network.Network, []types.ParticipationExposure) { diff --git a/x/orderbook/client/cli/query_orderbook_test.go b/x/orderbook/client/cli/query_orderbook_test.go index 46f2857c..2095bd33 100644 --- a/x/orderbook/client/cli/query_orderbook_test.go +++ b/x/orderbook/client/cli/query_orderbook_test.go @@ -4,20 +4,18 @@ import ( "fmt" "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/google/uuid" "github.com/spf13/cast" "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" + "github.com/sge-network/sge/testutil/network" "github.com/sge-network/sge/testutil/nullify" - "github.com/sge-network/sge/x/orderbook/client/cli" "github.com/sge-network/sge/x/orderbook/types" ) diff --git a/x/orderbook/client/cli/query_participation_test.go b/x/orderbook/client/cli/query_participation_test.go index 5d717cd4..7ad8e590 100644 --- a/x/orderbook/client/cli/query_participation_test.go +++ b/x/orderbook/client/cli/query_participation_test.go @@ -4,6 +4,12 @@ import ( "fmt" "testing" + "github.com/spf13/cast" + "github.com/stretchr/testify/require" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" + + sdkmath "cosmossdk.io/math" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" @@ -12,10 +18,6 @@ import ( "github.com/sge-network/sge/testutil/nullify" "github.com/sge-network/sge/x/orderbook/client/cli" "github.com/sge-network/sge/x/orderbook/types" - "github.com/spf13/cast" - "github.com/stretchr/testify/require" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" ) const ( From d7386cf71e94e233e936df03141c6ff8e713ceb3 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:56:52 +0300 Subject: [PATCH 13/51] workflow: gosec modify --- .github/workflows/gosec.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index c6af9363..eface6ff 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -12,17 +12,9 @@ jobs: env: GO111MODULE: on steps: - - name: Set up Go - uses: actions/setup-go@v4 - with: - path: /usr/local/go/bin - go-version: '1.21' - name: Checkout Source - uses: actions/checkout@v2 - - name: Set env vars - run: | - echo "${HOME}/goroot/bin" >> $GITHUB_PATH + uses: actions/checkout@v4 - name: Run Gosec Security Scanner - uses: cosmos/gosec@master + uses: informalsystems/gosec@master with: - args: './...' + args: ./... From ec27bb3e37fe1a5c4d4bbd22ed25e12bb761fbd0 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 17 Jan 2024 13:02:56 +0300 Subject: [PATCH 14/51] workflow: golangci modification --- .github/workflows/lint.yml | 68 ++++--- go.mod | 162 ++++++++------- go.sum | 390 ++++++++++++++++++++----------------- 3 files changed, 334 insertions(+), 286 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d1c2af14..6405f120 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,52 +5,58 @@ on: branches: - master +env: + GO_VERSION: '1.21' + jobs: golangci: name: Run golangci-lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v4 + - + name: Check out repository code + uses: actions/checkout@v4 + - + uses: technote-space/get-diff-action@v6.1.2 with: - go-version: '1.21' - - uses: technote-space/get-diff-action@v6.0.1 + PATTERNS: | + **/**.go + go.mod + go.sum + .github/** + Makefile + - + name: 🐿 Setup Golang + uses: actions/setup-go@v5 with: - PATTERNS: | - **/**.go - go.mod - go.sum - - name: Get data from build cache - uses: actions/cache@v2 - with: - # In order: - # * Module download cache - # * Linter cache (Linux) - # * Build cache (Linux) - # * Build cache (Mac) - # * Build cache (Windows) - path: | - ~/go/pkg/mod - ~/.cache/golangci-lint - ~/.cache/go-build - ~/Library/Caches/go-build - ~\AppData\Local\go-build - key: ${{ runner.os }}-go-linter-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go-linter-${{ matrix.go-version }}- - - name: Run golangci-lint - run: make lint + go-version: ${{env.GO_VERSION}} + + - + name: Run golangci-lint if: env.GIT_DIFF + run: make lint documentation-linter: name: Run super-linter runs-on: ubuntu-latest steps: - - name: Checkout Code - uses: actions/checkout@v3 + - + name: Check out repository code + uses: actions/checkout@v4 with: # Full git history is needed to get a proper list of changed files # within `super-linter`. fetch-depth: 0 - - name: Run documentation linter + - + name: Get git diff + uses: technote-space/get-diff-action@v6.1.2 + with: + PATTERNS: | + **/**.md + go.mod + go.sum + Makefile + - + name: Run documentation linter + if: env.GIT_DIFF run: make mdlint diff --git a/go.mod b/go.mod index ae57d877..08724c0c 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/protobuf v1.5.3 - github.com/golangci/golangci-lint v1.50.1 + github.com/golangci/golangci-lint v1.55.2 github.com/google/uuid v1.5.0 github.com/gorilla/mux v1.8.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 @@ -29,11 +29,11 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 google.golang.org/grpc v1.58.3 gopkg.in/yaml.v2 v2.4.0 - mvdan.cc/gofumpt v0.4.0 + mvdan.cc/gofumpt v0.5.0 ) require ( - github.com/Abirdcfly/dupword v0.0.7 // indirect + github.com/Abirdcfly/dupword v0.0.13 // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect github.com/alingse/asasalint v0.0.11 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect @@ -42,23 +42,24 @@ require ( github.com/curioswitch/go-reassign v0.2.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/google/btree v1.1.2 // indirect - github.com/kkHAIKE/contextcheck v1.1.3 // indirect + github.com/kkHAIKE/contextcheck v1.1.4 // indirect github.com/maratori/testableexamples v1.0.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/sashamelentyev/interfacebloat v1.1.0 // indirect - github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect + github.com/sashamelentyev/usestdlibvars v1.24.0 // indirect github.com/sivchari/nosnakecase v1.7.0 // indirect github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.16.0 // indirect - github.com/timonwong/loggercheck v0.9.3 // indirect + github.com/timonwong/loggercheck v0.9.4 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect + go.uber.org/zap v1.24.0 // indirect golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect ) require ( - 4d63.com/gochecknoglobals v0.1.0 // indirect + 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect + 4d63.com/gochecknoglobals v0.2.1 // 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 @@ -69,36 +70,43 @@ require ( cosmossdk.io/log v1.2.1 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect + github.com/4meepo/tagalign v1.3.3 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect - github.com/Antonboom/errname v0.1.7 // indirect - github.com/Antonboom/nilnil v0.1.1 // indirect - github.com/BurntSushi/toml v1.2.1 // indirect + github.com/Antonboom/errname v0.1.12 // indirect + github.com/Antonboom/nilnil v0.1.7 // indirect + github.com/Antonboom/testifylint v0.2.3 // indirect + github.com/BurntSushi/toml v1.3.2 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect - github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect + github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 // indirect github.com/Masterminds/semver v1.5.0 // indirect - github.com/OpenPeeDeeP/depguard v1.1.1 // indirect + github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // indirect + github.com/alecthomas/go-check-sumtype v0.1.3 // indirect + github.com/alexkohler/nakedret/v2 v2.0.2 // indirect github.com/alexkohler/prealloc v1.0.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect - github.com/ashanbrown/forbidigo v1.3.0 // indirect + github.com/ashanbrown/forbidigo v1.6.0 // indirect github.com/ashanbrown/makezero v1.1.1 // indirect github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/benbjohnson/clock v1.3.0 // 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/bkielbasa/cyclop v1.2.0 // indirect + github.com/bkielbasa/cyclop v1.2.1 // indirect github.com/blizzy78/varnamelen v0.8.0 // indirect - github.com/bombsimon/wsl/v3 v3.3.0 // indirect - github.com/breml/bidichk v0.2.3 // indirect - github.com/breml/errchkjson v0.3.0 // indirect + github.com/bombsimon/wsl/v3 v3.4.0 // indirect + github.com/breml/bidichk v0.2.7 // indirect + github.com/breml/errchkjson v0.3.6 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect - github.com/butuzov/ireturn v0.1.1 // indirect + github.com/butuzov/ireturn v0.2.2 // indirect + github.com/butuzov/mirror v1.1.0 // indirect + github.com/catenacyber/perfsprint v0.2.0 // indirect + github.com/ccojocar/zxcvbn-go v1.0.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/charithe/durationcheck v0.0.9 // indirect - github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect + github.com/charithe/durationcheck v0.0.10 // indirect + github.com/chavacava/garif v0.1.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 @@ -111,7 +119,7 @@ require ( github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/ledger-cosmos-go v0.12.4 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect - github.com/daixiang0/gci v0.8.1 // indirect + github.com/daixiang0/gci v0.11.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect @@ -124,25 +132,26 @@ require ( github.com/dvsekhvalnov/jose2go v1.5.0 // indirect github.com/esimonov/ifshort v1.0.4 // indirect github.com/ettle/strcase v0.1.1 // indirect - github.com/fatih/color v1.13.0 // indirect + github.com/fatih/color v1.15.0 // indirect github.com/fatih/structtag v1.2.0 // indirect github.com/firefart/nonamedreturns v1.0.4 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect github.com/getsentry/sentry-go v0.23.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect - github.com/go-critic/go-critic v0.6.5 // indirect + github.com/ghostiam/protogetter v0.2.3 // indirect + github.com/go-critic/go-critic v0.9.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 - github.com/go-toolsmith/astcast v1.0.0 // indirect - github.com/go-toolsmith/astcopy v1.0.2 // indirect - github.com/go-toolsmith/astequal v1.0.3 // indirect - github.com/go-toolsmith/astfmt v1.0.0 // indirect - github.com/go-toolsmith/astp v1.0.0 // indirect - github.com/go-toolsmith/strparse v1.0.0 // indirect - github.com/go-toolsmith/typep v1.0.2 // indirect - github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect + github.com/go-toolsmith/astcast v1.1.0 // indirect + github.com/go-toolsmith/astcopy v1.1.0 // indirect + github.com/go-toolsmith/astequal v1.1.0 // indirect + github.com/go-toolsmith/astfmt v1.1.0 // indirect + github.com/go-toolsmith/astp v1.1.0 // indirect + github.com/go-toolsmith/strparse v1.1.0 // indirect + github.com/go-toolsmith/typep v1.1.0 // indirect + github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gofrs/flock v0.8.1 // indirect @@ -155,18 +164,18 @@ require ( github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect - github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect + github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect - github.com/golangci/misspell v0.3.5 // indirect - github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect + github.com/golangci/misspell v0.4.1 // indirect + github.com/golangci/revgrep v0.5.2 // indirect github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/orderedcode v0.0.1 // indirect github.com/google/s2a-go v0.1.4 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect - github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect + github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/gostaticanalysis/analysisutil v0.7.1 // indirect @@ -191,78 +200,78 @@ require ( github.com/huandu/skiplist v1.2.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/jgautheron/goconst v1.5.1 // indirect + github.com/jgautheron/goconst v1.6.0 // indirect github.com/jingyugao/rowserrcheck v1.1.1 // indirect github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/julz/importas v0.1.0 // indirect - github.com/kisielk/errcheck v1.6.2 // indirect + github.com/kisielk/errcheck v1.6.3 // indirect github.com/kisielk/gotool v1.0.0 // 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/kulti/thelper v0.6.3 // indirect - github.com/kunwardeep/paralleltest v1.0.6 // indirect - github.com/kyoh86/exportloopref v0.1.8 // indirect + github.com/kunwardeep/paralleltest v1.0.8 // indirect + github.com/kyoh86/exportloopref v0.1.11 // indirect github.com/ldez/gomoddirectives v0.2.3 // indirect - github.com/ldez/tagliatelle v0.3.1 // indirect - github.com/leonklingele/grouper v1.1.0 // indirect - github.com/lib/pq v1.10.7 // indirect + github.com/ldez/tagliatelle v0.5.0 // indirect + github.com/leonklingele/grouper v1.1.1 // indirect + github.com/lib/pq v1.10.9 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/linxGnu/grocksdb v1.7.16 // indirect github.com/lufeee/execinquery v1.2.1 // indirect + github.com/macabu/inamedparam v0.1.2 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect - github.com/maratori/testpackage v1.1.0 // indirect - github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect + github.com/maratori/testpackage v1.1.1 // indirect + github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/mattn/go-runewidth v0.0.10 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mbilski/exhaustivestruct v1.2.0 // indirect - github.com/mgechev/revive v1.2.4 // indirect + github.com/mgechev/revive v1.3.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // 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/moricho/tparallel v0.2.1 // indirect + github.com/moricho/tparallel v0.3.1 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/nakabonne/nestif v0.3.1 // indirect - github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect - github.com/nishanths/exhaustive v0.8.3 // indirect + github.com/nishanths/exhaustive v0.11.0 // indirect github.com/nishanths/predeclared v0.2.2 // indirect + github.com/nunnatsa/ginkgolinter v0.14.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pelletier/go-toml/v2 v2.0.8 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect - github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/polyfloyd/go-errorlint v1.0.5 // indirect + github.com/polyfloyd/go-errorlint v1.4.5 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect - github.com/quasilyte/go-ruleguard v0.3.18 // indirect - github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect - github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect + github.com/quasilyte/go-ruleguard v0.4.0 // indirect + github.com/quasilyte/gogrep v0.5.0 // indirect + github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/cors v1.8.3 // indirect github.com/rs/zerolog v1.30.0 // indirect - github.com/ryancurrah/gomodguard v1.2.4 // indirect - github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect - github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect + github.com/ryancurrah/gomodguard v1.3.0 // indirect + github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect + github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/securego/gosec/v2 v2.13.1 // indirect + github.com/securego/gosec/v2 v2.18.2 // indirect github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect - github.com/sirupsen/logrus v1.9.0 // indirect - github.com/sivchari/containedctx v1.0.2 // indirect - github.com/sivchari/tenv v1.7.0 // indirect - github.com/sonatard/noctx v0.0.1 // indirect - github.com/sourcegraph/go-diff v0.6.1 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/sivchari/containedctx v1.0.3 // indirect + github.com/sivchari/tenv v1.7.1 // indirect + github.com/sonatard/noctx v0.0.2 // indirect + github.com/sourcegraph/go-diff v0.7.0 // indirect github.com/spf13/afero v1.9.5 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect @@ -270,26 +279,31 @@ require ( github.com/stretchr/objx v0.5.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect - github.com/tdakkota/asciicheck v0.1.1 // indirect + github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect + github.com/tdakkota/asciicheck v0.2.0 // indirect github.com/tendermint/go-amino v0.16.0 // indirect - github.com/tetafro/godot v1.4.11 // indirect + github.com/tetafro/godot v1.4.15 // indirect github.com/tidwall/btree v1.6.0 // indirect - github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect - github.com/tomarrell/wrapcheck/v2 v2.7.0 // indirect + github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect + github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect github.com/ulikunitz/xz v0.5.11 // indirect - github.com/ultraware/funlen v0.0.3 // indirect + github.com/ultraware/funlen v0.1.0 // indirect github.com/ultraware/whitespace v0.0.5 // indirect - github.com/uudashr/gocognit v1.0.6 // indirect + github.com/uudashr/gocognit v1.1.2 // indirect + github.com/xen0n/gosmopolitan v1.2.2 // indirect github.com/yagipy/maintidx v1.0.0 // indirect github.com/yeya24/promlinter v0.2.0 // indirect + github.com/ykadowak/zerologlint v0.1.3 // indirect github.com/zondax/hid v0.9.2 // indirect github.com/zondax/ledger-go v0.14.3 // indirect - gitlab.com/bosi/decorder v0.2.3 // indirect + gitlab.com/bosi/decorder v0.4.1 // indirect + go-simpler.org/sloglint v0.1.2 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect + go.tmz.dev/musttag v0.7.2 // indirect golang.org/x/crypto v0.14.0 // indirect - golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect + golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect golang.org/x/mod v0.13.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect @@ -306,10 +320,10 @@ require ( google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - honnef.co/go/tools v0.3.3 // indirect + honnef.co/go/tools v0.4.6 // indirect mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect - mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect + mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect nhooyr.io/websocket v1.8.7 // indirect pgregory.net/rapid v0.5.5 // indirect sigs.k8s.io/yaml v1.3.0 // indirect diff --git a/go.sum b/go.sum index f4a1aca7..9380bcfb 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ -4d63.com/gochecknoglobals v0.1.0 h1:zeZSRqj5yCg28tCkIV/z/lWbwvNm5qnKVS15PI8nhD0= -4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= +4d63.com/gocheckcompilerdirectives v1.2.1 h1:AHcMYuw56NPjq/2y615IGg2kYkBdTvOaojYCBcRE7MA= +4d63.com/gocheckcompilerdirectives v1.2.1/go.mod h1:yjDJSxmDTtIHHCqX0ufRYZDL6vQtMG7tJdKVeWwsqvs= +4d63.com/gochecknoglobals v0.2.1 h1:1eiorGsgHOFOuoOiJDy2psSrQbRdIHrlge0IJIkUgDc= +4d63.com/gochecknoglobals v0.2.1/go.mod h1:KRE8wtJB3CXCsb1xy421JfTHIIbmT3U5ruxw2Qu8fSU= 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= @@ -215,22 +217,26 @@ 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/go.mod h1:wMEGFFFNuPos7vHmWXfszqImLppbc0wEhh6JBfJIUgw= git.sr.ht/~sircmpwn/go-bare v0.0.0-20210406120253-ab86bc2846d9/go.mod h1:BVJwbDfVjCjoFiKrhkei6NdGcZYpkDkdyCdg1ukytRA= +github.com/4meepo/tagalign v1.3.3 h1:ZsOxcwGD/jP4U/aw7qeWu58i7dwYemfy5Y+IF1ACoNw= +github.com/4meepo/tagalign v1.3.3/go.mod h1:Q9c1rYMZJc9dPRkbQPpcBNCLEmY2njbAsXhQOZFE2dE= 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.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/Abirdcfly/dupword v0.0.13 h1:SMS17YXypwP000fA7Lr+kfyBQyW14tTT+nRv9ASwUUo= +github.com/Abirdcfly/dupword v0.0.13/go.mod h1:Ut6Ue2KgF/kCOawpW4LnExT+xZLQviJPE4klBPMK/5Y= +github.com/Antonboom/errname v0.1.12 h1:oh9ak2zUtsLp5oaEd/erjB4GPu9w19NyoIskZClDcQY= +github.com/Antonboom/errname v0.1.12/go.mod h1:bK7todrzvlaZoQagP1orKzWXv59X/x0W0Io2XT1Ssro= +github.com/Antonboom/nilnil v0.1.7 h1:ofgL+BA7vlA1K2wNQOsHzLJ2Pw5B5DpWRLdDAVvvTow= +github.com/Antonboom/nilnil v0.1.7/go.mod h1:TP+ScQWVEq0eSIxqU8CbdT5DFWoHp0MbP+KMUO1BKYQ= +github.com/Antonboom/testifylint v0.2.3 h1:MFq9zyL+rIVpsvLX4vDPLojgN7qODzWsrnftNX2Qh60= +github.com/Antonboom/testifylint v0.2.3/go.mod h1:IYaXaOX9NbfAyO+Y04nfjGI8wDemC1rUyM/cYolz018= 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/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-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 v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= +github.com/BurntSushi/toml v1.3.2/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 v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= @@ -239,8 +245,8 @@ github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3 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/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 h1:3ZBs7LAezy8gh0uECsA6CGU43FF3zsx5f4eah5FxTMA= +github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0/go.mod h1:rZLTje5A9kFBe0pzhpe2TdhRniBF++PRHQuRpR8esVc= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= @@ -250,8 +256,8 @@ github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEV 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.1 h1:TSUznLjvp/4IUP+OQ0t/4jF4QUyxIcVX8YnghZdunyA= -github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= +github.com/OpenPeeDeeP/depguard/v2 v2.1.0 h1:aQl70G173h/GZYhWf36aE5H0KaujXfVMnn/f1kSDVYY= +github.com/OpenPeeDeeP/depguard/v2 v2.1.0/go.mod h1:PUBgk35fX4i7JDmwzlJwJ+GMe6NfO1723wmJMgPThNQ= 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= @@ -264,11 +270,19 @@ github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV 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/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk= +github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= +github.com/alecthomas/go-check-sumtype v0.1.3 h1:M+tqMxB68hcgccRXBMVCPI4UJ+QUfdSx0xdbypKCqA8= +github.com/alecthomas/go-check-sumtype v0.1.3/go.mod h1:WyYPfhfkdhyrdaligV6svFopZV8Lqdzn5pyVBaV6jhQ= +github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk= +github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= 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= 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/nakedret/v2 v2.0.2 h1:qnXuZNvv3/AxkAb22q/sEsEpcA99YxLFACDtEw9TPxE= +github.com/alexkohler/nakedret/v2 v2.0.2/go.mod h1:2b8Gkk0GsOrqQv/gPWjNLDSKwG8I5moSXG1K4VIBcTQ= 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= @@ -286,8 +300,8 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ 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/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -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/forbidigo v1.6.0 h1:D3aewfM37Yb3pxHujIPSpTf6oQk9sc9WZi8gerOIVIY= +github.com/ashanbrown/forbidigo v1.6.0/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU= 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/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= @@ -316,18 +330,18 @@ 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 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A= -github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= +github.com/bkielbasa/cyclop v1.2.1 h1:AeF71HZDob1P2/pRm1so9cd1alZnrpyc4q2uP2l0gJY= +github.com/bkielbasa/cyclop v1.2.1/go.mod h1:K/dT/M0FPAiYjBgQGau7tz+3TMh4FWAEqlMhzFWCrgM= 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/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 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/bombsimon/wsl/v3 v3.4.0 h1:RkSxjT3tmlptwfgEgTgU+KYKLI35p/tviNXNXiL2aNU= +github.com/bombsimon/wsl/v3 v3.4.0/go.mod h1:KkIB+TXkqy6MvK9BDZVbZxKNYsE1/oLRJbIFtf14qqo= +github.com/breml/bidichk v0.2.7 h1:dAkKQPLl/Qrk7hnP6P+E0xOodrq8Us7+U0o4UBOAlQY= +github.com/breml/bidichk v0.2.7/go.mod h1:YodjipAGI9fGcYM7II6wFvGhdMYsC5pHDlGzqvEW3tQ= +github.com/breml/errchkjson v0.3.6 h1:VLhVkqSBH96AvXEyclMR37rZslRrY2kcyq+31HCsVrA= +github.com/breml/errchkjson v0.3.6/go.mod h1:jhSDoFheAF2RSDOlCfhHO9KqhZgAYLyvHe7bRCX8f/U= 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= @@ -355,14 +369,20 @@ github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtE 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.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/butuzov/ireturn v0.2.2 h1:jWI36dxXwVrI+RnXDwux2IZOewpmfv930OuIRfaBUJ0= +github.com/butuzov/ireturn v0.2.2/go.mod h1:RfGHUvvAuFFxoHKf4Z8Yxuh6OjlCw1KvR2zM1NFHeBk= +github.com/butuzov/mirror v1.1.0 h1:ZqX54gBVMXu78QLoiqdwpl2mgmoOJTk7s4p4o+0avZI= +github.com/butuzov/mirror v1.1.0/go.mod h1:8Q0BdQU6rC6WILDiBM60DBfvV78OLJmMmixe7GF45AE= github.com/bwesterb/go-ristretto v1.2.0/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA= github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= 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/catenacyber/perfsprint v0.2.0 h1:azOocHLscPjqXVJ7Mf14Zjlkn4uNua0+Hcg1wTR6vUo= +github.com/catenacyber/perfsprint v0.2.0/go.mod h1:/wclWYompEyjUD2FuIIDVKNkqz7IgBIWXIH3V0Zol50= +github.com/ccojocar/zxcvbn-go v1.0.1 h1:+sxrANSCj6CdadkcMnvde/GWU1vZiiXRbqYSCalV4/4= +github.com/ccojocar/zxcvbn-go v1.0.1/go.mod h1:g1qkXtUSvHP8lhHp5GrSmTz6uWALGRMQdw6Qnz/hi60= 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= @@ -376,10 +396,10 @@ 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.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/charithe/durationcheck v0.0.10 h1:wgw73BiocdBDQPik+zcEoBG/ob8uyBHf2iyoHGPf5w4= +github.com/charithe/durationcheck v0.0.10/go.mod h1:bCWXb7gYRysD1CU3C+u4ceO49LoGOY1C1L6uouGNreQ= +github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc= +github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= @@ -471,12 +491,11 @@ 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/cristalhq/acmd v0.8.1/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= 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/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= -github.com/daixiang0/gci v0.8.1 h1:T4xpSC+hmsi4CSyuYfIJdMZAr9o7xZmHpQVygMghGZ4= -github.com/daixiang0/gci v0.8.1/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c= +github.com/daixiang0/gci v0.11.2 h1:Oji+oPsp3bQ6bNNgX30NBAVT18P4uBH4sRZnlOlTj7Y= +github.com/daixiang0/gci v0.11.2/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= 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/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= @@ -546,8 +565,9 @@ github.com/ethereum/go-ethereum v1.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd 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/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= +github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= +github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= 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= @@ -576,6 +596,8 @@ github.com/getsentry/sentry-go v0.23.0 h1:dn+QRCeJv4pPt9OjVXiMcGIBIefaTJPw/h0bZW 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/ghostiam/protogetter v0.2.3 h1:qdv2pzo3BpLqezwqfGDLZ+nHEYmc5bUpIdsMbBVwMjw= +github.com/ghostiam/protogetter v0.2.3/go.mod h1:KmNLOsy1v04hKbvZs8EfGI1fk39AgTdRDxWNYPfXVc4= 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.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= @@ -583,8 +605,8 @@ github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH8 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.5 h1:fDaR/5GWURljXwF8Eh31T2GZNz9X4jeboS912mWF8Uo= -github.com/go-critic/go-critic v0.6.5/go.mod h1:ezfP/Lh7MA6dBNn4c6ab5ALv3sKnZVLx37tr00uuaOY= +github.com/go-critic/go-critic v0.9.0 h1:Pmys9qvU3pSML/3GEQ2Xd9RZ/ip+aXHKILuxczKGV/U= +github.com/go-critic/go-critic v0.9.0/go.mod h1:5P8tdXL7m/6qnyG6oRAlYLORvoXH0WDypYgAEmagT40= 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-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -603,6 +625,8 @@ 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-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= +github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= 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= @@ -617,26 +641,28 @@ github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq 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-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -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.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.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-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-toolsmith/astcast v1.1.0 h1:+JN9xZV1A+Re+95pgnMgDboWNVnIMMQXwfBwLRPgSC8= +github.com/go-toolsmith/astcast v1.1.0/go.mod h1:qdcuFWeGGS2xX5bLM/c3U9lewg7+Zu4mr+xPwZIB4ZU= +github.com/go-toolsmith/astcopy v1.1.0 h1:YGwBN0WM+ekI/6SS6+52zLDEf8Yvp3n2seZITCUBt5s= +github.com/go-toolsmith/astcopy v1.1.0/go.mod h1:hXM6gan18VA1T/daUEHCFcYiW8Ai1tIwIzHY6srfEAw= 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/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.2-0.20220101231613-e814995d17c5 h1:eD9POs68PHkwrx7hAB78z1cb6PfGq/jyWn3wJywsH1o= -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/astequal v1.1.0 h1:kHKm1AWqClYn15R0K1KKE4RG614D46n+nqUQ06E1dTw= +github.com/go-toolsmith/astequal v1.1.0/go.mod h1:sedf7VIdCL22LD8qIvv7Nn9MuWJruQA/ysswh64lffQ= +github.com/go-toolsmith/astfmt v1.1.0 h1:iJVPDPp6/7AaeLJEruMsBUlOYCmvg0MoCfJprsOmcco= +github.com/go-toolsmith/astfmt v1.1.0/go.mod h1:OrcLlRwu0CuiIBp/8b5PYF9ktGVZUjlNMV634mhwuQ4= +github.com/go-toolsmith/astp v1.1.0 h1:dXPuCl6u2llURjdPLLDxJeZInAeZ0/eZwFJmqZMnpQA= +github.com/go-toolsmith/astp v1.1.0/go.mod h1:0T1xFGz9hicKs8Z5MfAqSUitoUYS30pDMsRVIDHs8CA= +github.com/go-toolsmith/pkgload v1.2.2 h1:0CtmHq/02QhxcF7E9N5LIFcYFsMR5rdovfqTtRKkgIk= +github.com/go-toolsmith/pkgload v1.2.2/go.mod h1:R2hxLNRKuAsiXCo2i5J6ZQPhnPMOVtU+f0arbFPWCus= github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -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-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQiyP2Bvw= +github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ= +github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus= +github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig= +github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80U= +github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= 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= @@ -720,19 +746,19 @@ github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9 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 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-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.50.1 h1:C829clMcZXEORakZlwpk7M4iDw2XiwxxKaG504SZ9zY= -github.com/golangci/golangci-lint v1.50.1/go.mod h1:AQjHBopYS//oB8xs0y0M/dtxdKHkdhl0RvmjUct0/4w= +github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e h1:ULcKCDV1LOZPFxGZaA6TlQbiM3J2GCPnkx/bGF6sX/g= +github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e/go.mod h1:Pm5KhLPA8gSnQwrQ6ukebRcapGb/BG9iUkdaiCcGHJM= +github.com/golangci/golangci-lint v1.55.2 h1:yllEIsSJ7MtlDBwDJ9IMBkyEUz2fYE0b5B8IUgO1oP8= +github.com/golangci/golangci-lint v1.55.2/go.mod h1:H60CZ0fuqoTwlTvnbyjhpZPWp7KmsjwV2yupIMiMXbM= 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-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ= -github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs= +github.com/golangci/misspell v0.4.1 h1:+y73iSicVy2PqyX7kmUefHusENlrP9YwuHZHPLGQj/g= +github.com/golangci/misspell v0.4.1/go.mod h1:9mAN1quEo3DlpbaIKKyEvRxK1pwqR9s/Sea1bJCtlNI= +github.com/golangci/revgrep v0.5.2 h1:EndcWoRhcnfj2NHQ+28hyuXpLMF+dQmCN+YaeeIl4FU= +github.com/golangci/revgrep v0.5.2/go.mod h1:bjAMA+Sh/QUfTDcHzxfyHxr4xKvllVr/0sCv2e7jJHA= 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/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -754,8 +780,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= @@ -784,6 +811,7 @@ github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/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/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= @@ -814,8 +842,8 @@ github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qK 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= -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/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 h1:mrEEilTAUmaAORhssPPkxj84TsHrPMLBGW2Z4SoTxm8= +github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= 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= @@ -829,12 +857,8 @@ 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.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= @@ -943,8 +967,8 @@ github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+ 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 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+WcM= -github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= +github.com/jgautheron/goconst v1.6.0 h1:gbMLWKRMkzAc6kYsQL6/TxaoBUg3Jm9LSF/Ih1ADWGA= +github.com/jgautheron/goconst v1.6.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= 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= @@ -958,7 +982,6 @@ 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/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= @@ -984,12 +1007,12 @@ github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= 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/errcheck v1.6.3 h1:dEKh+GLHcWm2oN34nMvDzn1sqI0i0WxPvrgiJA5JuM8= +github.com/kisielk/errcheck v1.6.3/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/kkHAIKE/contextcheck v1.1.4 h1:B6zAaLhOEEcjvUgIYEqystmnFk1Oemn8bvJhbt0GMb8= +github.com/kkHAIKE/contextcheck v1.1.4/go.mod h1:1+i/gWqokIa+dm31mqGLZhZJ7Uh44DJGZVmr6QRBNJg= 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= @@ -1019,25 +1042,25 @@ 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/kunwardeep/paralleltest v1.0.8 h1:Ul2KsqtzFxTlSU7IP0JusWlLiNqQaloB9vguyjbE558= +github.com/kunwardeep/paralleltest v1.0.8/go.mod h1:2C7s65hONVqY7Q5Efj5aLzRCNLjw2h4eMc9EcypGjcY= 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/kyoh86/exportloopref v0.1.11 h1:1Z0bcmTypkL3Q4k+IDHMWTcnCliEZcaPiIe0/ymEyhQ= +github.com/kyoh86/exportloopref v0.1.11/go.mod h1:qkV4UF1zGl6EkF1ox8L5t9SwyeBAZ3qLMd6up458uqA= 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 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/ldez/tagliatelle v0.5.0 h1:epgfuYt9v0CG3fms0pEgIMNPuFf/LpPIfjk4kyqSioo= +github.com/ldez/tagliatelle v0.5.0/go.mod h1:rj1HmWiL1MiKQuOONhd09iySTEkUuE/8+5jtPYz9xa4= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= 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/leonklingele/grouper v1.1.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt8ivzU= +github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= 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= @@ -1048,6 +1071,8 @@ github.com/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG 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-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= +github.com/macabu/inamedparam v0.1.2 h1:RR5cnayM6Q7cDhQol32DE2BGAPGMnffJ31LFE+UklaU= +github.com/macabu/inamedparam v0.1.2/go.mod h1:Xg25QvY7IBRl1KLPV9Rbml8JOMZtF/iAkNkmV7eQgjw= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= @@ -1057,10 +1082,10 @@ 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.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/maratori/testpackage v1.1.1 h1:S58XVV5AD7HADMmD0fNnziNHqKvSdDuEKdPD1rNTU04= +github.com/maratori/testpackage v1.1.1/go.mod h1:s4gRK/ym6AMrqpOa/kEbQTV4Q4jb7WeLZzVhVVVOQMc= +github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 h1:gWg6ZQ4JhDfJPqlo2srm/LN17lpybq15AryXIRcWYLE= +github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= 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= @@ -1088,7 +1113,6 @@ github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzp github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRRpdGg= github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= -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-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= @@ -1096,8 +1120,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk 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/revive v1.2.4 h1:+2Hd/S8oO2H0Ikq2+egtNwQsVhAeELHjxjIUFX5ajLI= -github.com/mgechev/revive v1.2.4/go.mod h1:iAWlQishqCuj4yhV24FTnKSXGpbAA+0SckXB8GQMX/Q= +github.com/mgechev/revive v1.3.4 h1:k/tO3XTaWY4DEHal9tWBkkUMJYO/dLDVyMmAQxmIMDc= +github.com/mgechev/revive v1.3.4/go.mod h1:W+pZCMu9qj8Uhfs1iJMQsEFLRozUfvwFwqVvRbSNLVw= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= 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= @@ -1128,8 +1152,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb 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/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4= -github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= +github.com/moricho/tparallel v0.3.1 h1:fQKD4U1wRMAYNngDonW5XupoB/ZGJHdpzrWqgyg9krA= +github.com/moricho/tparallel v0.3.1/go.mod h1:leENX2cUv7Sv2qDgdi0D0fCftN8fRC67Bcn8pqzeYNI= github.com/mrz1836/go-sanitize v1.3.1 h1:bTxpzDXzGh9cp3XLTeVKgL2iLqEwCaLqqe+3BmpnCbo= github.com/mrz1836/go-sanitize v1.3.1/go.mod h1:Js6Gq1uiarNReoOeOKxPXxNpKy1FRlbgDDZnJG4THdM= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= @@ -1150,14 +1174,14 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE 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/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.6/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= 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/exhaustive v0.11.0 h1:T3I8nUGhl/Cwu5Z2hfc92l0e04D2GEW6e0l8pzda2l0= +github.com/nishanths/exhaustive v0.11.0/go.mod h1:RqwDsZ1xY0dNdqHho2z6X+bgzizwbLYOWnZbbl2wLB4= 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/nunnatsa/ginkgolinter v0.14.1 h1:khx0CqR5U4ghsscjJ+lZVthp3zjIFytRXPTaQ/TMiyA= +github.com/nunnatsa/ginkgolinter v0.14.1/go.mod h1:nY0pafUSst7v7F637e7fymaMlQqI9c0Wka2fGsDkzWg= 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= @@ -1173,14 +1197,14 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= 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.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= -github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU= +github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= 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.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= -github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= +github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA= +github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= 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= @@ -1199,8 +1223,9 @@ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnh github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= 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.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= +github.com/otiai10/copy v1.11.0 h1:OKBD80J/mLBrwnzXqGtFCzprFSGioo30JcmR4APsNwc= +github.com/otiai10/copy v1.11.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww= 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= @@ -1221,8 +1246,6 @@ github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssy github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/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/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= @@ -1238,8 +1261,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= 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.5 h1:AHB5JRCjlmelh9RrLxT9sgzpalIwwq4hqE8EkwIwKdY= -github.com/polyfloyd/go-errorlint v1.0.5/go.mod h1:APVvOesVSAnne5SClsPxPdfvZTVDojXh1/G3qb5wjGI= +github.com/polyfloyd/go-errorlint v1.4.5 h1:70YWmMy4FgRHehGNOUask3HtSFSOLKgmDn7ryNe7LqI= +github.com/polyfloyd/go-errorlint v1.4.5/go.mod h1:sIZEbFoDOCnTYYZoVkjc4hTnM459tuWA9H/EkdXwsKk= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= 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= @@ -1282,17 +1305,12 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -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/go-ruleguard v0.4.0 h1:DyM6r+TKL+xbKB4Nm7Afd1IQh9kEUKQs2pboWGKtvQo= +github.com/quasilyte/go-ruleguard v0.4.0/go.mod h1:Eu76Z/R8IXtViWUIHkE3p8gdH3/PKk1eh3YGfaEof10= +github.com/quasilyte/gogrep v0.5.0 h1:eTKODPXbI8ffJMN+W2aE0+oL0z/nh8/5eNdiO34SOAo= +github.com/quasilyte/gogrep v0.5.0/go.mod h1:Cm9lpz9NZjEoL1tgZ2OgeUKPIxL1meE7eo60Z6Sk+Ng= +github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 h1:TCg2WBOl980XxGFEZSS6KlBGIV0diGdySzxATTWoqaU= +github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727/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= @@ -1322,23 +1340,23 @@ github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiS 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.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/ryancurrah/gomodguard v1.3.0 h1:q15RT/pd6UggBXVBuLps8BXRvl5GPBcwVA7BJHMLuTw= +github.com/ryancurrah/gomodguard v1.3.0/go.mod h1:ggBxb3luypPEzqVtq33ee7YSN35V28XeGnid8dnni50= +github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= +github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= 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/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc= +github.com/sanposhiho/wastedassign/v2 v2.0.7/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= 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/sashamelentyev/usestdlibvars v1.24.0 h1:MKNzmXtGh5N0y74Z/CIaJh4GlB364l0K1RUT08WSWAc= +github.com/sashamelentyev/usestdlibvars v1.24.0/go.mod h1:9cYkq+gYJ+a5W2RPdhfaSCnTVUC1OQP/bSiiBhq3OZE= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -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/securego/gosec/v2 v2.18.2 h1:DkDt3wCiOtAHf1XkiXZBhQ6m6mK/b9T/wD257R3/c+I= +github.com/securego/gosec/v2 v2.18.2/go.mod h1:xUuqSF6i0So56Y2wwohWAmB07EdBkUN6crbLlHwbyJs= 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= @@ -1353,22 +1371,22 @@ 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/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/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE= +github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4= 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/sivchari/tenv v1.7.1 h1:PSpuD4bu6fSmtWMxSGWcvqUUgIn7k3yOJhOIzVWn8Ak= +github.com/sivchari/tenv v1.7.1/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= 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= -github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= -github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= +github.com/sonatard/noctx v0.0.2 h1:L7Dz4De2zDQhW8S0t+KUjY0MAQJd6SgVwhzNIc4ok00= +github.com/sonatard/noctx v0.0.2/go.mod h1:kzFz+CzWSjQ2OzIm46uJZoXuBpa2+0y3T36U18dWqIo= 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/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0= +github.com/sourcegraph/go-diff v0.7.0/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= @@ -1405,7 +1423,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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 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= @@ -1423,16 +1440,18 @@ 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/tdakkota/asciicheck v0.1.1 h1:PKzG7JUTUmVspQTDqtkX9eSiLGossXTybutHwTXuO0A= -github.com/tdakkota/asciicheck v0.1.1/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= +github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8= +github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c/go.mod h1:SbErYREK7xXdsRiigaQiQkI9McGRzYMvlKYaP3Nimdk= +github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM= +github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg= 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/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA= github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= -github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw= -github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= +github.com/tetafro/godot v1.4.15 h1:QzdIs+XB8q+U1WmQEWKHQbKmCw06QuQM7gLx/dky2RM= +github.com/tetafro/godot v1.4.15/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio= 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= @@ -1440,16 +1459,16 @@ 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 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/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M= +github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ= +github.com/timonwong/loggercheck v0.9.4 h1:HKKhqrjcVj8sxL7K77beXh0adEm6DLjV/QOGeMXEVi4= +github.com/timonwong/loggercheck v0.9.4/go.mod h1:caz4zlPcgvpEkXgVnAJGowHAMW2NwHaNlpS8xDbVhTg= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/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/tomarrell/wrapcheck/v2 v2.8.1 h1:HxSqDSN0sAt0yJYsrcYVoEeyM4aI9yAm3KQpIXDJRhQ= +github.com/tomarrell/wrapcheck/v2 v2.8.1/go.mod h1:/n2Q3NZ4XFT50ho6Hbxg+RV1uyo2Uow/Vdm9NQcl5SE= 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/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= @@ -1463,21 +1482,23 @@ github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZg 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/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI= +github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4= 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/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 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y= -github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= +github.com/uudashr/gocognit v1.1.2 h1:l6BAEKJqQH2UpKAPKdMfZf5kE4W/2xk8pfU1OVLvniI= +github.com/uudashr/gocognit v1.1.2/go.mod h1:aAVdLURqcanke8h3vg35BC++eseDm66Z7KmchI5et4k= 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/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU= +github.com/xen0n/gosmopolitan v1.2.2/go.mod h1:7XX7Mj61uLYrj0qmeN0zi7XDon9JRAEhYQqAPLVNTeg= 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= @@ -1486,6 +1507,8 @@ github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsT 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/ykadowak/zerologlint v0.1.3 h1:TLy1dTW3Nuc+YE3bYRPToG1Q9Ej78b5UUN6bjbGdxPE= +github.com/ykadowak/zerologlint v0.1.3/go.mod h1:KaUskqF3e/v59oPmdq1U1DnKcuHokl2/K1U4pmIELKg= 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= @@ -1497,8 +1520,12 @@ 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= -gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0= -gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= +gitlab.com/bosi/decorder v0.4.1 h1:VdsdfxhstabyhZovHafFw+9eJ6eU0d2CkFNJcZz/NU4= +gitlab.com/bosi/decorder v0.4.1/go.mod h1:jecSqWUew6Yle1pCr2eLWTensJMmsxHsBwt+PVbkAqA= +go-simpler.org/assert v0.6.0 h1:QxSrXa4oRuo/1eHMXSBFHKvJIpWABayzKldqZyugG7E= +go-simpler.org/assert v0.6.0/go.mod h1:74Eqh5eI6vCK6Y5l3PI8ZYFXG4Sa+tkr70OIPJAUr28= +go-simpler.org/sloglint v0.1.2 h1:IjdhF8NPxyn0Ckn2+fuIof7ntSnVUAqBFcQRrnG9AiM= +go-simpler.org/sloglint v0.1.2/go.mod h1:2LL+QImPfTslD5muNPydAEYmpXIj6o/WYcqnJjLi4o4= 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= @@ -1515,6 +1542,8 @@ 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/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.tmz.dev/musttag v0.7.2 h1:1J6S9ipDbalBSODNT5jCep8dhZyMr4ttnjQagmGYR5s= +go.tmz.dev/musttag v0.7.2/go.mod h1:m6q5NiiSKMnQYokefa2xGoyoXnrswCbJ0AWYzf4Zs28= 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= @@ -1531,8 +1560,8 @@ 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.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= -go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1559,6 +1588,7 @@ 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.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= @@ -1579,8 +1609,9 @@ golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8H 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/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -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-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 h1:jWGQJV4niP+CCmFW9ekjA9Zx8vYORzOUH2/Nl5WPuLQ= +golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833/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= @@ -1610,6 +1641,9 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= 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/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1679,7 +1713,9 @@ 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.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= @@ -1724,6 +1760,7 @@ 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.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1838,6 +1875,7 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.2.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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1847,6 +1885,7 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR 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.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= 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.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= @@ -1880,13 +1919,10 @@ golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGm 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= @@ -1897,7 +1933,6 @@ golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/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-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= @@ -1912,7 +1947,6 @@ golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapK 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= @@ -1925,30 +1959,22 @@ golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjs 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-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-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-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-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= @@ -1960,11 +1986,14 @@ 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.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/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.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= +golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2223,7 +2252,6 @@ 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= @@ -2268,16 +2296,16 @@ 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.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA= -honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= -mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= -mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= +honnef.co/go/tools v0.4.6 h1:oFEHCKeID7to/3autwsWfnuv69j3NsfcXbvJKuIcep8= +honnef.co/go/tools v0.4.6/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= +mvdan.cc/gofumpt v0.5.0 h1:0EQ+Z56k8tXjj/6TQD25BFNKQXpCvT0rnansIc7Ug5E= +mvdan.cc/gofumpt v0.5.0/go.mod h1:HBeVDtMKRZpXyxFciAirzdKklDlGu8aAy1wEbH5Y9js= 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-20220706161116-678bad134442 h1:seuXWbRB1qPrS3NQnHmFKLJLtskWyueeIzmLXghMGgk= -mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2YjFf5CaW0Bw4RL8RfbEf4GRggJk= +mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d h1:3rvTIIM22r9pvXk+q3swxUQAQOxksVMGK7sml4nG57w= +mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RFiZMMsLVL+A96Nvptar8Fj71is= 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= From 920406bc1d8be03aaf59dea8f3a6c02ddb81ca02 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 17 Jan 2024 13:07:13 +0300 Subject: [PATCH 15/51] lint: disable depguard of golangci --- .golangci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index c52864fb..8ce1386f 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -13,7 +13,6 @@ linters: enable: - asciicheck - bidichk - - depguard - durationcheck - errcheck - errname From b9bbd7a14088aaa1339458bf78d302f828ef70b2 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 17 Jan 2024 14:41:35 +0300 Subject: [PATCH 16/51] lint: remove unused vars --- app/app.go | 1 - app/keepers/keepers.go | 1 - app/modules.go | 15 +++++++-------- app/upgrades/v3/upgrades.go | 2 +- app/upgrades/v4/upgrades.go | 2 +- app/upgrades/v5/upgrades.go | 2 +- x/bet/keeper/settle.go | 9 ++------- x/bet/types/expected_keepers.go | 4 ---- x/bet/types/odds_type.go | 14 +++++++------- x/market/simulation/genesis_test.go | 2 +- x/orderbook/keeper/bet_settle.go | 6 ------ x/orderbook/keeper/bet_wager.go | 5 ++--- x/orderbook/keeper/exposure_odds_test.go | 14 ++++++-------- .../keeper/exposure_participation_test.go | 18 ++++++++---------- .../keeper/grpc_query_exposure_odds_test.go | 8 ++++---- .../grpc_query_exposure_participation_test.go | 12 ++++++------ .../grpc_query_participation_bet_test.go | 4 ++-- .../keeper/grpc_query_participation_test.go | 8 ++++---- x/orderbook/keeper/participation_bet_test.go | 6 ++---- x/orderbook/keeper/participation_test.go | 13 ++++++------- x/ovm/simulation/genesis_test.go | 2 +- x/reward/client/cli/query.go | 2 +- x/reward/keeper/params.go | 2 +- x/reward/module.go | 2 +- x/subaccount/module.go | 2 +- x/subaccount/simulation/genesis_test.go | 2 +- 26 files changed, 66 insertions(+), 92 deletions(-) diff --git a/app/app.go b/app/app.go index c808158f..2afaf00d 100644 --- a/app/app.go +++ b/app/app.go @@ -159,7 +159,6 @@ func NewSgeApp( bApp, cdc, mAccPerms, - app.ModuleAccountAddrs(), skipUpgradeHeights, homePath, invCheckPeriod, diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 4c4d3523..c499e48e 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -166,7 +166,6 @@ func NewAppKeeper( bApp *baseapp.BaseApp, cdc *codec.LegacyAmino, maccPerms map[string][]string, - moduleAccAddress map[string]bool, skipUpgradeHeights map[int64]bool, homePath string, invCheckPeriod uint, diff --git a/app/modules.go b/app/modules.go index 918fd6db..1337f532 100644 --- a/app/modules.go +++ b/app/modules.go @@ -43,8 +43,6 @@ import ( ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibc "github.com/cosmos/ibc-go/v7/modules/core" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/sge-network/sge/x/mint" - minttypes "github.com/sge-network/sge/x/mint/types" sgeappparams "github.com/sge-network/sge/app/params" betmodule "github.com/sge-network/sge/x/bet" @@ -54,6 +52,7 @@ import ( marketmodule "github.com/sge-network/sge/x/market" marketmoduletypes "github.com/sge-network/sge/x/market/types" mintmodule "github.com/sge-network/sge/x/mint" + mintmoduletypes "github.com/sge-network/sge/x/mint/types" orderbookmodule "github.com/sge-network/sge/x/orderbook" orderbookmoduletypes "github.com/sge-network/sge/x/orderbook/types" ovmmodule "github.com/sge-network/sge/x/ovm" @@ -72,7 +71,7 @@ import ( var mAccPerms = map[string][]string{ authtypes.FeeCollectorName: nil, distrtypes.ModuleName: nil, - minttypes.ModuleName: {authtypes.Minter}, + mintmoduletypes.ModuleName: {authtypes.Minter}, stakingtypes.BondedPoolName: {authtypes.Burner, authtypes.Staking}, stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking}, govtypes.ModuleName: {authtypes.Burner}, @@ -145,7 +144,7 @@ func appModules( capability.NewAppModule(appCodec, *app.CapabilityKeeper, false), crisis.NewAppModule(app.CrisisKeeper, skipGenesisInvariants, app.GetSubspace(crisistypes.ModuleName)), gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)), - mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, app.BankKeeper), + mintmodule.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, app.BankKeeper), slashing.NewAppModule( appCodec, app.SlashingKeeper, @@ -223,7 +222,7 @@ func simulationModules( app.interfaceRegistry, ), gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(govtypes.ModuleName)), - mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), + mintmodule.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName)), distr.NewAppModule( appCodec, @@ -273,7 +272,7 @@ func orderBeginBlockers() []string { // upgrades should be run first upgradetypes.ModuleName, capabilitytypes.ModuleName, - minttypes.ModuleName, + mintmoduletypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName, evidencetypes.ModuleName, @@ -314,7 +313,7 @@ func orderEndBlockers() []string { banktypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName, - minttypes.ModuleName, + mintmoduletypes.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, @@ -344,7 +343,7 @@ func orderInitBlockers() []string { stakingtypes.ModuleName, slashingtypes.ModuleName, govtypes.ModuleName, - minttypes.ModuleName, + mintmoduletypes.ModuleName, ibcexported.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, diff --git a/app/upgrades/v3/upgrades.go b/app/upgrades/v3/upgrades.go index d1f043f8..9f702038 100644 --- a/app/upgrades/v3/upgrades.go +++ b/app/upgrades/v3/upgrades.go @@ -14,7 +14,7 @@ const DefaultExpeditedPeriod time.Duration = time.Hour * 24 func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, - keepers *keepers.AppKeepers, + _ *keepers.AppKeepers, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { // not applicable anymore diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index e26b3bcf..d3e7d641 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -14,7 +14,7 @@ const DefaultExpeditedPeriod time.Duration = time.Hour * 24 func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, - keepers *keepers.AppKeepers, + _ *keepers.AppKeepers, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { return mm.RunMigrations(ctx, configurator, fromVM) diff --git a/app/upgrades/v5/upgrades.go b/app/upgrades/v5/upgrades.go index 29a947f8..e72072e1 100644 --- a/app/upgrades/v5/upgrades.go +++ b/app/upgrades/v5/upgrades.go @@ -14,7 +14,7 @@ const DefaultExpeditedPeriod time.Duration = time.Hour * 24 func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, - keepers *keepers.AppKeepers, + _ *keepers.AppKeepers, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { return mm.RunMigrations(ctx, configurator, fromVM) diff --git a/x/bet/keeper/settle.go b/x/bet/keeper/settle.go index 4a557d1c..7be0c471 100644 --- a/x/bet/keeper/settle.go +++ b/x/bet/keeper/settle.go @@ -111,18 +111,13 @@ func (k Keeper) settleResolved(ctx sdk.Context, bet *types.Bet) error { return sdkerrors.Wrapf(sdkerrtypes.ErrInvalidAddress, "%s", err) } - payout, err := types.CalculatePayoutProfit(bet.OddsValue, bet.Amount) - if err != nil { - return err - } - if bet.Result == types.Bet_RESULT_LOST { - if err := k.orderbookKeeper.BettorLoses(ctx, bettorAddress, bet.Amount, payout.TruncateInt(), bet.UID, bet.BetFulfillment, bet.MarketUID); err != nil { + if err := k.orderbookKeeper.BettorLoses(ctx, bettorAddress, bet.BetFulfillment, bet.MarketUID); err != nil { return sdkerrors.Wrapf(types.ErrInOBBettorLoses, "%s", err) } bet.Status = types.Bet_STATUS_SETTLED } else if bet.Result == types.Bet_RESULT_WON { - if err := k.orderbookKeeper.BettorWins(ctx, bettorAddress, bet.Amount, payout.TruncateInt(), bet.UID, bet.BetFulfillment, bet.MarketUID); err != nil { + if err := k.orderbookKeeper.BettorWins(ctx, bettorAddress, bet.BetFulfillment, bet.MarketUID); err != nil { return sdkerrors.Wrapf(types.ErrInOBBettorWins, "%s", err) } bet.Status = types.Bet_STATUS_SETTLED diff --git a/x/bet/types/expected_keepers.go b/x/bet/types/expected_keepers.go index f37c4cdc..db68babc 100644 --- a/x/bet/types/expected_keepers.go +++ b/x/bet/types/expected_keepers.go @@ -58,16 +58,12 @@ type OrderbookKeeper interface { BettorWins( ctx sdk.Context, bettorAddress sdk.AccAddress, - betAmount, payout sdkmath.Int, - uniqueLock string, fulfillment []*BetFulfillment, bookUID string, ) error BettorLoses( ctx sdk.Context, bettorAddress sdk.AccAddress, - betAmount, payout sdkmath.Int, - uniqueLock string, fulfillment []*BetFulfillment, bookUID string, ) error diff --git a/x/bet/types/odds_type.go b/x/bet/types/odds_type.go index 253d6341..aa289879 100644 --- a/x/bet/types/odds_type.go +++ b/x/bet/types/odds_type.go @@ -1,9 +1,9 @@ package types import ( + sdkerrors "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrtypes "github.com/cosmos/cosmos-sdk/types/errors" ) // CalculateDecimalPayout calculates total payout of a certain bet amount by decimal odds calculations @@ -12,19 +12,19 @@ func CalculateDecimalPayout(oddsVal string, amount sdkmath.Int) (sdk.Dec, error) oddsDecVal, err := sdk.NewDecFromStr(oddsVal) if err != nil { return sdk.ZeroDec(), - sdkerrtypes.Wrapf(ErrDecimalOddsIncorrectFormat, "%s", err) + sdkerrors.Wrapf(ErrDecimalOddsIncorrectFormat, "%s", err) } // odds value should not be negative or zero if !oddsDecVal.IsPositive() { return sdk.ZeroDec(), - sdkerrtypes.Wrapf(ErrDecimalOddsShouldBePositive, "%s", oddsVal) + sdkerrors.Wrapf(ErrDecimalOddsShouldBePositive, "%s", oddsVal) } // odds value should not be less than 1 if oddsDecVal.LTE(sdk.OneDec()) { return sdk.ZeroDec(), - sdkerrtypes.Wrapf(ErrDecimalOddsCanNotBeLessThanOne, "%s", oddsVal) + sdkerrors.Wrapf(ErrDecimalOddsCanNotBeLessThanOne, "%s", oddsVal) } // calculate payout @@ -40,19 +40,19 @@ func CalculateDecimalBetAmount(oddsVal string, payoutProfit sdk.Dec) (sdk.Dec, e oddsDecVal, err := sdk.NewDecFromStr(oddsVal) if err != nil { return sdk.ZeroDec(), - sdkerrtypes.Wrapf(ErrDecimalOddsIncorrectFormat, "%s", err) + sdkerrors.Wrapf(ErrDecimalOddsIncorrectFormat, "%s", err) } // odds value should not be negative or zero if !oddsDecVal.IsPositive() { return sdk.ZeroDec(), - sdkerrtypes.Wrapf(ErrDecimalOddsShouldBePositive, "%s", oddsVal) + sdkerrors.Wrapf(ErrDecimalOddsShouldBePositive, "%s", oddsVal) } // odds value should not be less than 1 if oddsDecVal.LTE(sdk.OneDec()) { return sdk.ZeroDec(), - sdkerrtypes.Wrapf(ErrDecimalOddsCanNotBeLessThanOne, "%s", oddsVal) + sdkerrors.Wrapf(ErrDecimalOddsCanNotBeLessThanOne, "%s", oddsVal) } // calculate bet amount diff --git a/x/market/simulation/genesis_test.go b/x/market/simulation/genesis_test.go index 70cb7e30..0cddb507 100644 --- a/x/market/simulation/genesis_test.go +++ b/x/market/simulation/genesis_test.go @@ -20,7 +20,7 @@ import ( // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. // Abnormal scenarios are not tested here. -func TestRandomizedGenState(t *testing.T) { +func TestRandomizedGenState(_ *testing.T) { interfaceRegistry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(interfaceRegistry) diff --git a/x/orderbook/keeper/bet_settle.go b/x/orderbook/keeper/bet_settle.go index cec3ff0f..8a9da7c2 100644 --- a/x/orderbook/keeper/bet_settle.go +++ b/x/orderbook/keeper/bet_settle.go @@ -36,9 +36,6 @@ func (k Keeper) RefundBettor( func (k Keeper) BettorWins( ctx sdk.Context, bettorAddress sdk.AccAddress, - betAmount sdkmath.Int, - payoutProfit sdkmath.Int, - _ string, betFulfillments []*bettypes.BetFulfillment, orderBookUID string, ) error { @@ -81,9 +78,6 @@ func (k Keeper) BettorWins( func (k Keeper) BettorLoses( ctx sdk.Context, bettorAddress sdk.AccAddress, - betAmount sdkmath.Int, - _ sdkmath.Int, - _ string, betFulfillments []*bettypes.BetFulfillment, orderBookUID string, ) error { diff --git a/x/orderbook/keeper/bet_wager.go b/x/orderbook/keeper/bet_wager.go index 39cd26ad..3c2fe70b 100644 --- a/x/orderbook/keeper/bet_wager.go +++ b/x/orderbook/keeper/bet_wager.go @@ -4,7 +4,6 @@ import ( sdkerrors "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrtypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/spf13/cast" bettypes "github.com/sge-network/sge/x/bet/types" @@ -203,7 +202,7 @@ func (k Keeper) initFulfillmentInfo( return } if book.ParticipationCount != cast.ToUint64(len(bps)) { - err = sdkerrtypes.Wrapf(types.ErrBookParticipationsNotFound, "%s", book.UID) + err = sdkerrors.Wrapf(types.ErrBookParticipationsNotFound, "%s", book.UID) return } @@ -212,7 +211,7 @@ func (k Keeper) initFulfillmentInfo( return } if book.ParticipationCount != cast.ToUint64(len(pes)) { - err = sdkerrtypes.Wrapf(types.ErrParticipationExposuresNotFound, "%s, %s", book.UID, oddsUID) + err = sdkerrors.Wrapf(types.ErrParticipationExposuresNotFound, "%s, %s", book.UID, oddsUID) return } diff --git a/x/orderbook/keeper/exposure_odds_test.go b/x/orderbook/keeper/exposure_odds_test.go index 97d7d937..1fc591a1 100644 --- a/x/orderbook/keeper/exposure_odds_test.go +++ b/x/orderbook/keeper/exposure_odds_test.go @@ -9,13 +9,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sge-network/sge/testutil/nullify" - "github.com/sge-network/sge/testutil/simapp" "github.com/sge-network/sge/x/orderbook/keeper" "github.com/sge-network/sge/x/orderbook/types" ) func createNOrderBookOddsExposure( - tApp *simapp.TestApp, keeper *keeper.KeeperTest, ctx sdk.Context, n int, @@ -33,8 +31,8 @@ func createNOrderBookOddsExposure( } func TestOddsExposuresByOrderBookGet(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNOrderBookOddsExposure(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNOrderBookOddsExposure(k, ctx, 10) rst, err := k.GetOddsExposuresByOrderBook(ctx, uuid.NewString(), @@ -55,8 +53,8 @@ func TestOddsExposuresByOrderBookGet(t *testing.T) { } func TestOrderBookOddsExposureGet(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNOrderBookOddsExposure(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNOrderBookOddsExposure(k, ctx, 10) rst, found := k.GetOrderBookOddsExposure(ctx, uuid.NewString(), @@ -83,8 +81,8 @@ func TestOrderBookOddsExposureGet(t *testing.T) { } func TestOrderBookOddsExposureGetAll(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNOrderBookOddsExposure(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNOrderBookOddsExposure(k, ctx, 10) exposures, err := k.GetAllOrderBookExposures(ctx) require.NoError(t, err) diff --git a/x/orderbook/keeper/exposure_participation_test.go b/x/orderbook/keeper/exposure_participation_test.go index ac054957..365f82f6 100644 --- a/x/orderbook/keeper/exposure_participation_test.go +++ b/x/orderbook/keeper/exposure_participation_test.go @@ -10,13 +10,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sge-network/sge/testutil/nullify" - "github.com/sge-network/sge/testutil/simapp" "github.com/sge-network/sge/x/orderbook/keeper" "github.com/sge-network/sge/x/orderbook/types" ) func createNParticipationExposure( - tApp *simapp.TestApp, keeper *keeper.KeeperTest, ctx sdk.Context, n int, @@ -40,8 +38,8 @@ func createNParticipationExposure( } func TestParticipationExposureGet(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNParticipationExposure(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNParticipationExposure(k, ctx, 10) rst, err := k.GetExposureByOrderBookAndOdds(ctx, items[0].OrderBookUID, @@ -68,8 +66,8 @@ func TestParticipationExposureGet(t *testing.T) { } func TestExposureByOrderBookAndParticipationIndexGet(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNParticipationExposure(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNParticipationExposure(k, ctx, 10) rst, err := k.GetExposureByOrderBookAndParticipationIndex(ctx, items[0].OrderBookUID, @@ -91,8 +89,8 @@ func TestExposureByOrderBookAndParticipationIndexGet(t *testing.T) { } func TestAllHistoricalParticipationExposuresGet(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNParticipationExposure(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNParticipationExposure(k, ctx, 10) rst, err := k.GetAllHistoricalParticipationExposures(ctx) require.NoError(t, err) @@ -100,8 +98,8 @@ func TestAllHistoricalParticipationExposuresGet(t *testing.T) { } func TestParticipationExposureGetAll(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNParticipationExposure(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNParticipationExposure(k, ctx, 10) exposures, err := k.GetAllParticipationExposures(ctx) require.NoError(t, err) diff --git a/x/orderbook/keeper/grpc_query_exposure_odds_test.go b/x/orderbook/keeper/grpc_query_exposure_odds_test.go index a6d2af62..7f6c53cc 100644 --- a/x/orderbook/keeper/grpc_query_exposure_odds_test.go +++ b/x/orderbook/keeper/grpc_query_exposure_odds_test.go @@ -17,9 +17,9 @@ import ( ) func TestOrderBookExposureQuerySingle(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNOrderBookOddsExposure(tApp, k, ctx, 2) + msgs := createNOrderBookOddsExposure(k, ctx, 2) for _, tc := range []struct { desc string request *types.QueryOrderBookExposureRequest @@ -71,9 +71,9 @@ func TestOrderBookExposureQuerySingle(t *testing.T) { } func TestOrderBookExposuresQueryPaginated(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNOrderBookOddsExposure(tApp, k, ctx, 5) + msgs := createNOrderBookOddsExposure(k, ctx, 5) request := func(next []byte, offset, limit uint64, total bool) *types.QueryOrderBookExposuresRequest { return &types.QueryOrderBookExposuresRequest{ diff --git a/x/orderbook/keeper/grpc_query_exposure_participation_test.go b/x/orderbook/keeper/grpc_query_exposure_participation_test.go index 2ea5cd0f..1fa6cd8f 100644 --- a/x/orderbook/keeper/grpc_query_exposure_participation_test.go +++ b/x/orderbook/keeper/grpc_query_exposure_participation_test.go @@ -16,9 +16,9 @@ import ( ) func TestOrderBookParticipationExposuresQueryPaginated(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNParticipationExposure(tApp, k, ctx, 5) + msgs := createNParticipationExposure(k, ctx, 5) request := func(next []byte, offset, limit uint64, total bool) *types.QueryOrderBookParticipationExposuresRequest { return &types.QueryOrderBookParticipationExposuresRequest{ @@ -73,9 +73,9 @@ func TestOrderBookParticipationExposuresQueryPaginated(t *testing.T) { } func TestParticipationExposuresQueryPaginated(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNParticipationExposure(tApp, k, ctx, 5) + msgs := createNParticipationExposure(k, ctx, 5) request := func(next []byte, offset, limit uint64, total bool) *types.QueryParticipationExposuresRequest { return &types.QueryParticipationExposuresRequest{ @@ -131,9 +131,9 @@ func TestParticipationExposuresQueryPaginated(t *testing.T) { } func TestHistoricalParticipationExposuresQueryPaginated(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNParticipationExposure(tApp, k, ctx, 5) + msgs := createNParticipationExposure(k, ctx, 5) request := func(next []byte, offset, limit uint64, total bool) *types.QueryHistoricalParticipationExposuresRequest { return &types.QueryHistoricalParticipationExposuresRequest{ diff --git a/x/orderbook/keeper/grpc_query_participation_bet_test.go b/x/orderbook/keeper/grpc_query_participation_bet_test.go index 5a986c2c..a5e9c228 100644 --- a/x/orderbook/keeper/grpc_query_participation_bet_test.go +++ b/x/orderbook/keeper/grpc_query_participation_bet_test.go @@ -16,9 +16,9 @@ import ( ) func TestParticipationFulfilledBetsQueryPaginated(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNParticipationBetPair(tApp, k, ctx, 5) + msgs := createNParticipationBetPair(k, ctx, 5) request := func(next []byte, offset, limit uint64, total bool) *types.QueryParticipationFulfilledBetsRequest { return &types.QueryParticipationFulfilledBetsRequest{ diff --git a/x/orderbook/keeper/grpc_query_participation_test.go b/x/orderbook/keeper/grpc_query_participation_test.go index 19aa16ef..2536e6ee 100644 --- a/x/orderbook/keeper/grpc_query_participation_test.go +++ b/x/orderbook/keeper/grpc_query_participation_test.go @@ -17,9 +17,9 @@ import ( ) func TestParticipationQuerySingle(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNParticipation(tApp, k, ctx, 2) + msgs := createNParticipation(k, ctx, 2) for _, tc := range []struct { desc string request *types.QueryOrderBookParticipationRequest @@ -71,9 +71,9 @@ func TestParticipationQuerySingle(t *testing.T) { } func TestOrderBookParticipationsQueryPaginated(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNParticipation(tApp, k, ctx, 5) + msgs := createNParticipation(k, ctx, 5) request := func(next []byte, offset, limit uint64, total bool) *types.QueryOrderBookParticipationsRequest { return &types.QueryOrderBookParticipationsRequest{ diff --git a/x/orderbook/keeper/participation_bet_test.go b/x/orderbook/keeper/participation_bet_test.go index a66a212c..10ffc224 100644 --- a/x/orderbook/keeper/participation_bet_test.go +++ b/x/orderbook/keeper/participation_bet_test.go @@ -10,13 +10,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sge-network/sge/testutil/nullify" - "github.com/sge-network/sge/testutil/simapp" "github.com/sge-network/sge/x/orderbook/keeper" "github.com/sge-network/sge/x/orderbook/types" ) func createNParticipationBetPair( - tApp *simapp.TestApp, keeper *keeper.KeeperTest, ctx sdk.Context, n int, @@ -34,8 +32,8 @@ func createNParticipationBetPair( } func TestParticipationBetPairGetAll(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNParticipationBetPair(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNParticipationBetPair(k, ctx, 10) betPairs, err := k.GetAllParticipationBetPair(ctx) require.NoError(t, err) diff --git a/x/orderbook/keeper/participation_test.go b/x/orderbook/keeper/participation_test.go index 705d2b41..eb8f76ea 100644 --- a/x/orderbook/keeper/participation_test.go +++ b/x/orderbook/keeper/participation_test.go @@ -21,7 +21,6 @@ import ( ) func createNParticipation( - tApp *simapp.TestApp, keeper *keeper.KeeperTest, ctx sdk.Context, n int, @@ -71,8 +70,8 @@ func createTestMarket( } func TestParticipationGet(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNParticipation(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNParticipation(k, ctx, 10) rst, found := k.GetOrderBookParticipation(ctx, items[0].OrderBookUID, @@ -99,8 +98,8 @@ func TestParticipationGet(t *testing.T) { } func TestParticipationsOfOrderBookGet(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNParticipation(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNParticipation(k, ctx, 10) rst, err := k.GetParticipationsOfOrderBook(ctx, uuid.NewString(), @@ -123,8 +122,8 @@ func TestParticipationsOfOrderBookGet(t *testing.T) { } func TestParticipationGetAll(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNParticipation(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNParticipation(k, ctx, 10) participations, err := k.GetAllOrderBookParticipations(ctx) require.NoError(t, err) diff --git a/x/ovm/simulation/genesis_test.go b/x/ovm/simulation/genesis_test.go index 7bc43ee6..342e5bb4 100644 --- a/x/ovm/simulation/genesis_test.go +++ b/x/ovm/simulation/genesis_test.go @@ -20,7 +20,7 @@ import ( // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. // Abnormal scenarios are not tested here. -func TestRandomizedGenState(t *testing.T) { +func TestRandomizedGenState(_ *testing.T) { interfaceRegistry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(interfaceRegistry) diff --git a/x/reward/client/cli/query.go b/x/reward/client/cli/query.go index 049abefe..60a26fad 100644 --- a/x/reward/client/cli/query.go +++ b/x/reward/client/cli/query.go @@ -11,7 +11,7 @@ import ( ) // GetQueryCmd returns the cli query commands for this module -func GetQueryCmd(queryRoute string) *cobra.Command { +func GetQueryCmd(_ string) *cobra.Command { // Group reward queries under a subcommand cmd := &cobra.Command{ Use: types.ModuleName, diff --git a/x/reward/keeper/params.go b/x/reward/keeper/params.go index 16f132a7..d2f0a3ad 100644 --- a/x/reward/keeper/params.go +++ b/x/reward/keeper/params.go @@ -7,7 +7,7 @@ import ( ) // GetParams get all parameters as types.Params -func (k Keeper) GetParams(ctx sdk.Context) types.Params { +func (k Keeper) GetParams(_ sdk.Context) types.Params { return types.NewParams() } diff --git a/x/reward/module.go b/x/reward/module.go index 2ea5db17..17347bad 100644 --- a/x/reward/module.go +++ b/x/reward/module.go @@ -60,7 +60,7 @@ func (AppModuleBasic) DefaultGenesis(cdc codec.JSONCodec) json.RawMessage { } // ValidateGenesis used to validate the GenesisState, given in its json.RawMessage form -func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncodingConfig, bz json.RawMessage) error { +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) diff --git a/x/subaccount/module.go b/x/subaccount/module.go index 06882fcd..5645f7c3 100644 --- a/x/subaccount/module.go +++ b/x/subaccount/module.go @@ -146,6 +146,6 @@ func (AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} // EndBlock executes all ABCI EndBlock logic respective to the module. It // returns no validator updates. -func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { +func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { return []abci.ValidatorUpdate{} } diff --git a/x/subaccount/simulation/genesis_test.go b/x/subaccount/simulation/genesis_test.go index 8c719e39..51458ffa 100644 --- a/x/subaccount/simulation/genesis_test.go +++ b/x/subaccount/simulation/genesis_test.go @@ -20,7 +20,7 @@ import ( // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. // Abnormal scenarios are not tested here. -func TestRandomizedGenState(t *testing.T) { +func TestRandomizedGenState(_ *testing.T) { interfaceRegistry := codectypes.NewInterfaceRegistry() cdc := codec.NewProtoCodec(interfaceRegistry) From eef4799269367df03ccceed4c2b0a8f0030b5bf5 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:04:54 +0300 Subject: [PATCH 17/51] lint: deprecated replace --- .golangci.yml | 1 - app/keepers/keepers.go | 3 +-- cmd/sged/cmd/root.go | 22 ++++--------------- go.mod | 2 +- testutil/simapp/test_helpers.go | 5 +++-- x/bet/keeper/settle.go | 2 +- x/bet/types/expected_keepers.go | 1 - x/house/keeper/msg_server_withdraw.go | 3 +-- x/mint/types/msgs.go | 2 +- x/mint/types/params_test.go | 2 +- x/orderbook/keeper/bet_settle.go | 1 - .../keeper/grpc_query_orderbook_test.go | 8 +++---- x/orderbook/keeper/orderbook_test.go | 10 ++++----- x/orderbook/keeper/participation_test.go | 5 ++--- x/reward/keeper/msg_server_campaign.go | 2 +- x/reward/module_simulation.go | 2 +- x/reward/types/reward.go | 2 +- x/reward/types/reward_signup.go | 2 +- x/subaccount/keeper/balance.go | 10 ++++----- x/subaccount/keeper/msg_server_house.go | 2 +- x/subaccount/types/expected_keepers.go | 2 +- 21 files changed, 34 insertions(+), 55 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 8ce1386f..2201e992 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -30,7 +30,6 @@ linters: - ineffassign - makezero - misspell - - nakedret - nilnil - promlinter - staticcheck diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index c499e48e..f0e47514 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -24,7 +24,6 @@ import ( feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/group" groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" @@ -576,7 +575,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, paramsKeeper.Subspace(minttypes.ModuleName) paramsKeeper.Subspace(distrtypes.ModuleName) paramsKeeper.Subspace(slashingtypes.ModuleName) - paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govv1.ParamKeyTable()) + paramsKeeper.Subspace(govtypes.ModuleName) paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) paramsKeeper.Subspace(ibcexported.ModuleName) diff --git a/cmd/sged/cmd/root.go b/cmd/sged/cmd/root.go index c80f936e..f16a0b09 100644 --- a/cmd/sged/cmd/root.go +++ b/cmd/sged/cmd/root.go @@ -7,7 +7,6 @@ import ( "github.com/spf13/cast" "github.com/spf13/cobra" - "github.com/spf13/pflag" dbm "github.com/cometbft/cometbft-db" tmcfg "github.com/cometbft/cometbft/config" @@ -89,7 +88,10 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { cfg := sdk.GetConfig() cfg.Seal() - gentxModule := app.ModuleBasics[genutiltypes.ModuleName].(genutil.AppModuleBasic) + gentxModule, ok := app.ModuleBasics[genutiltypes.ModuleName].(genutil.AppModuleBasic) + if !ok { + panic("genutil AppModuleBasic assertion failed") + } rootCmd.AddCommand( genutilcli.InitCmd(app.ModuleBasics, app.DefaultNodeHome), @@ -122,22 +124,6 @@ func addModuleInitFlags(startCmd *cobra.Command) { crisis.AddModuleInitFlags(startCmd) } -func overwriteFlagDefaults(c *cobra.Command, defaults map[string]string) { - set := func(s *pflag.FlagSet, key, val string) { - if f := s.Lookup(key); f != nil { - f.DefValue = val - f.Value.Set(val) - } - } - for key, val := range defaults { - set(c.Flags(), key, val) - set(c.PersistentFlags(), key, val) - } - for _, c := range c.Commands() { - overwriteFlagDefaults(c, defaults) - } -} - func queryCommand() *cobra.Command { cmd := &cobra.Command{ Use: "query", diff --git a/go.mod b/go.mod index 08724c0c..2c505cf0 100644 --- a/go.mod +++ b/go.mod @@ -48,7 +48,7 @@ require ( github.com/sashamelentyev/interfacebloat v1.1.0 // indirect github.com/sashamelentyev/usestdlibvars v1.24.0 // indirect github.com/sivchari/nosnakecase v1.7.0 // indirect - github.com/spf13/pflag v1.0.5 + github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.16.0 // indirect github.com/timonwong/loggercheck v0.9.4 // indirect go.uber.org/atomic v1.10.0 // indirect diff --git a/testutil/simapp/test_helpers.go b/testutil/simapp/test_helpers.go index d1460cea..c2a6fd8e 100644 --- a/testutil/simapp/test_helpers.go +++ b/testutil/simapp/test_helpers.go @@ -11,10 +11,11 @@ import ( "github.com/golang-jwt/jwt" "github.com/spf13/cast" + sdkerrors "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/errors" + sdkerrtypes "github.com/cosmos/cosmos-sdk/types/errors" ) // PKs is a slice of public keys for test @@ -96,7 +97,7 @@ func newPubKeyFromHex(pk string) (res cryptotypes.PubKey) { panic(err) } if len(pkBytes) != ed25519.PubKeySize { - panic(errors.Wrap(errors.ErrInvalidPubKey, "invalid pubkey size")) + panic(sdkerrors.Wrap(sdkerrtypes.ErrInvalidPubKey, "invalid pubkey size")) } return &ed25519.PubKey{Key: pkBytes} } diff --git a/x/bet/keeper/settle.go b/x/bet/keeper/settle.go index 7be0c471..50c9043d 100644 --- a/x/bet/keeper/settle.go +++ b/x/bet/keeper/settle.go @@ -112,7 +112,7 @@ func (k Keeper) settleResolved(ctx sdk.Context, bet *types.Bet) error { } if bet.Result == types.Bet_RESULT_LOST { - if err := k.orderbookKeeper.BettorLoses(ctx, bettorAddress, bet.BetFulfillment, bet.MarketUID); err != nil { + if err := k.orderbookKeeper.BettorLoses(ctx, bet.BetFulfillment, bet.MarketUID); err != nil { return sdkerrors.Wrapf(types.ErrInOBBettorLoses, "%s", err) } bet.Status = types.Bet_STATUS_SETTLED diff --git a/x/bet/types/expected_keepers.go b/x/bet/types/expected_keepers.go index db68babc..9828270a 100644 --- a/x/bet/types/expected_keepers.go +++ b/x/bet/types/expected_keepers.go @@ -63,7 +63,6 @@ type OrderbookKeeper interface { ) error BettorLoses( ctx sdk.Context, - bettorAddress sdk.AccAddress, fulfillment []*BetFulfillment, bookUID string, ) error diff --git a/x/house/keeper/msg_server_withdraw.go b/x/house/keeper/msg_server_withdraw.go index 78f4755d..59bcf95e 100644 --- a/x/house/keeper/msg_server_withdraw.go +++ b/x/house/keeper/msg_server_withdraw.go @@ -16,7 +16,7 @@ func (k msgServer) Withdraw(goCtx context.Context, ) (*types.MsgWithdrawResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - depositorAddr, isOnBehalf, err := k.Keeper.ParseWithdrawTicketAndValidate(goCtx, ctx, msg, true) + depositorAddr, isOnBehalf, err := k.Keeper.ParseWithdrawTicketAndValidate(goCtx, msg, true) if err != nil { return nil, err } @@ -38,7 +38,6 @@ func (k msgServer) Withdraw(goCtx context.Context, // ParseWithdrawTicketAndValidate parses the withdraw payload ticket and validate. func (k Keeper) ParseWithdrawTicketAndValidate( goCtx context.Context, - ctx sdk.Context, msg *types.MsgWithdraw, authzAllowed bool, ) (string, bool, error) { diff --git a/x/mint/types/msgs.go b/x/mint/types/msgs.go index a08186ef..0e66bc57 100644 --- a/x/mint/types/msgs.go +++ b/x/mint/types/msgs.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" ) var _ sdk.Msg = &MsgUpdateParams{} diff --git a/x/mint/types/params_test.go b/x/mint/types/params_test.go index 5cf13a99..830d4e3b 100644 --- a/x/mint/types/params_test.go +++ b/x/mint/types/params_test.go @@ -64,7 +64,7 @@ func TestIsPhaseEndPhase(t *testing.T) { require.True(t, p.IsEndPhaseByStep(11)) } -func TestParamKeyTable(t *testing.T) { +func TestParamKeyTable(_ *testing.T) { types.ParamKeyTable() } diff --git a/x/orderbook/keeper/bet_settle.go b/x/orderbook/keeper/bet_settle.go index 8a9da7c2..8da14671 100644 --- a/x/orderbook/keeper/bet_settle.go +++ b/x/orderbook/keeper/bet_settle.go @@ -77,7 +77,6 @@ func (k Keeper) BettorWins( // removes the payout lock. func (k Keeper) BettorLoses( ctx sdk.Context, - bettorAddress sdk.AccAddress, betFulfillments []*bettypes.BetFulfillment, orderBookUID string, ) error { diff --git a/x/orderbook/keeper/grpc_query_orderbook_test.go b/x/orderbook/keeper/grpc_query_orderbook_test.go index 646b462e..3d5d47ae 100644 --- a/x/orderbook/keeper/grpc_query_orderbook_test.go +++ b/x/orderbook/keeper/grpc_query_orderbook_test.go @@ -17,9 +17,9 @@ import ( ) func TestOrderBookQuerySingle(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNOrderBook(tApp, k, ctx, 2) + msgs := createNOrderBook(k, ctx, 2) for _, tc := range []struct { desc string request *types.QueryOrderBookRequest @@ -68,9 +68,9 @@ func TestOrderBookQuerySingle(t *testing.T) { } func TestOrderBooksQueryPaginated(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) + k, ctx := setupKeeper(t) wctx := sdk.WrapSDKContext(ctx) - msgs := createNOrderBook(tApp, k, ctx, 5) + msgs := createNOrderBook(k, ctx, 5) request := func(next []byte, offset, limit uint64, total bool) *types.QueryOrderBooksRequest { return &types.QueryOrderBooksRequest{ diff --git a/x/orderbook/keeper/orderbook_test.go b/x/orderbook/keeper/orderbook_test.go index 5a816ca6..4b93e336 100644 --- a/x/orderbook/keeper/orderbook_test.go +++ b/x/orderbook/keeper/orderbook_test.go @@ -10,13 +10,11 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sge-network/sge/testutil/nullify" - "github.com/sge-network/sge/testutil/simapp" "github.com/sge-network/sge/x/orderbook/keeper" "github.com/sge-network/sge/x/orderbook/types" ) func createNOrderBook( - tApp *simapp.TestApp, keeper *keeper.KeeperTest, ctx sdk.Context, n int, @@ -35,8 +33,8 @@ func createNOrderBook( } func TestOrderBookGet(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNOrderBook(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNOrderBook(k, ctx, 10) rst, found := k.GetOrderBook(ctx, uuid.NewString(), @@ -61,8 +59,8 @@ func TestOrderBookGet(t *testing.T) { } func TestOrderBookGetAll(t *testing.T) { - tApp, k, ctx := setupKeeperAndApp(t) - items := createNOrderBook(tApp, k, ctx, 10) + k, ctx := setupKeeper(t) + items := createNOrderBook(k, ctx, 10) orderBooks, err := k.GetAllOrderBooks(ctx) require.NoError(t, err) diff --git a/x/orderbook/keeper/participation_test.go b/x/orderbook/keeper/participation_test.go index eb8f76ea..26373b64 100644 --- a/x/orderbook/keeper/participation_test.go +++ b/x/orderbook/keeper/participation_test.go @@ -47,7 +47,6 @@ func createNParticipation( func createTestMarket( tApp *simapp.TestApp, - keeper *keeper.KeeperTest, ctx sdk.Context, marketUID string, status markettypes.MarketStatus, @@ -176,7 +175,7 @@ func TestInitiateOrderBookParticipation(t *testing.T) { } { t.Run(tc.desc, func(t *testing.T) { marketUID := uuid.NewString() - createTestMarket(tApp, k, ctx, marketUID, tc.marketStatus, oddsUIDs) + createTestMarket(tApp, ctx, marketUID, tc.marketStatus, oddsUIDs) err := k.InitiateOrderBook(ctx, marketUID, oddsUIDs) require.NoError(t, err) @@ -245,7 +244,7 @@ func TestWithdrawOrderBookParticipation(t *testing.T) { } { t.Run(tc.desc, func(t *testing.T) { marketUID := uuid.NewString() - createTestMarket(tApp, k, ctx, marketUID, markettypes.MarketStatus_MARKET_STATUS_ACTIVE, oddsUIDs) + createTestMarket(tApp, ctx, marketUID, markettypes.MarketStatus_MARKET_STATUS_ACTIVE, oddsUIDs) err := k.InitiateOrderBook(ctx, marketUID, oddsUIDs) require.NoError(t, err) diff --git a/x/reward/keeper/msg_server_campaign.go b/x/reward/keeper/msg_server_campaign.go index 9b97348a..a88c82e5 100644 --- a/x/reward/keeper/msg_server_campaign.go +++ b/x/reward/keeper/msg_server_campaign.go @@ -68,7 +68,7 @@ func (k msgServer) CreateCampaign(goCtx context.Context, msg *types.MsgCreateCam return nil, err } - err = rewardFactory.ValidateCampaign(campaign, cast.ToUint64(ctx.BlockTime().Unix())) + err = rewardFactory.ValidateCampaign(campaign) if err != nil { return nil, err } diff --git a/x/reward/module_simulation.go b/x/reward/module_simulation.go index 8ab8b3cc..1120e304 100644 --- a/x/reward/module_simulation.go +++ b/x/reward/module_simulation.go @@ -68,7 +68,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/reward/types/reward.go b/x/reward/types/reward.go index 0f7b68e4..8c49d965 100644 --- a/x/reward/types/reward.go +++ b/x/reward/types/reward.go @@ -59,7 +59,7 @@ func NewRewardByCampaign(uid, campaignUID string) RewardByCampaign { // IRewardFactory defines the methods that should be implemented for all reward types. type IRewardFactory interface { - ValidateCampaign(campaign Campaign, blockTime uint64) error + ValidateCampaign(campaign Campaign) error Calculate( goCtx context.Context, ctx sdk.Context, keepers RewardFactoryKeepers, campaign Campaign, ticket, creator string, ) (Receiver, RewardPayloadCommon, error) diff --git a/x/reward/types/reward_signup.go b/x/reward/types/reward_signup.go index 2a648f90..572c63cc 100644 --- a/x/reward/types/reward_signup.go +++ b/x/reward/types/reward_signup.go @@ -18,7 +18,7 @@ type SignUpReward struct{} func NewSignUpReward() SignUpReward { return SignUpReward{} } // VaidateCampaign validates campaign definitions. -func (sur SignUpReward) ValidateCampaign(campaign Campaign, blockTime uint64) error { +func (sur SignUpReward) ValidateCampaign(campaign Campaign) error { if campaign.RewardCategory != RewardCategory_REWARD_CATEGORY_SIGNUP { return sdkerrors.Wrapf(ErrWrongRewardCategory, "signup rewards can only have single definition") } diff --git a/x/subaccount/keeper/balance.go b/x/subaccount/keeper/balance.go index 063f0069..3852153e 100644 --- a/x/subaccount/keeper/balance.go +++ b/x/subaccount/keeper/balance.go @@ -184,12 +184,12 @@ func (k Keeper) withdrawLockedAndUnlocked(ctx sdk.Context, subAccAddr sdk.AccAdd lockedAmountToWithdraw = sdkmath.ZeroInt() break - } else { - lb.Amount = sdkmath.ZeroInt() - updatedLockedBalances = append(updatedLockedBalances, lb) - - lockedAmountToWithdraw = lockedAmountToWithdraw.Sub(lb.Amount) } + + lb.Amount = sdkmath.ZeroInt() + updatedLockedBalances = append(updatedLockedBalances, lb) + + lockedAmountToWithdraw = lockedAmountToWithdraw.Sub(lb.Amount) } if lockedAmountToWithdraw.GT(sdkmath.ZeroInt()) { diff --git a/x/subaccount/keeper/msg_server_house.go b/x/subaccount/keeper/msg_server_house.go index c0548c92..015ded0c 100644 --- a/x/subaccount/keeper/msg_server_house.go +++ b/x/subaccount/keeper/msg_server_house.go @@ -80,7 +80,7 @@ func (k msgServer) HouseWithdraw(goCtx context.Context, msg *types.MsgHouseWithd panic("data corruption: subaccount balance not found") } - _, _, err := k.keeper.houseKeeper.ParseWithdrawTicketAndValidate(goCtx, ctx, msg.Msg, true) + _, _, err := k.keeper.houseKeeper.ParseWithdrawTicketAndValidate(goCtx, msg.Msg, true) if err != nil { return nil, err } diff --git a/x/subaccount/types/expected_keepers.go b/x/subaccount/types/expected_keepers.go index 3e7ca276..c9492706 100644 --- a/x/subaccount/types/expected_keepers.go +++ b/x/subaccount/types/expected_keepers.go @@ -34,7 +34,7 @@ type HouseKeeper interface { GetParams(ctx sdk.Context) housetypes.Params ParseDepositTicketAndValidate(goCtx context.Context, ctx sdk.Context, msg *housetypes.MsgDeposit, authzAllowed bool) (string, error) Deposit(ctx sdk.Context, creator, depositor string, marketUID string, amount sdkmath.Int) (participationIndex uint64, feeAmount sdkmath.Int, err error) - ParseWithdrawTicketAndValidate(goCtx context.Context, ctx sdk.Context, msg *housetypes.MsgWithdraw, authzAllowed bool) (string, bool, error) + ParseWithdrawTicketAndValidate(goCtx context.Context, msg *housetypes.MsgWithdraw, authzAllowed bool) (string, bool, error) CalcAndWithdraw(ctx sdk.Context, msg *housetypes.MsgWithdraw, depositorAddr string, isOnBehalf bool) (uint64, error) } From dfbb696926f970ba00df0de9be3db0db09ff0497 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 22 Jan 2024 20:25:08 +0300 Subject: [PATCH 18/51] tmp: invalid gosec version --- .github/workflows/gosec.yml | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index eface6ff..7c4bf21c 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -1,20 +1,39 @@ name: Run Gosec on: push: + paths: + - "**/*.go" + - "go.mod" + - "go.sum" branches: - master pull_request: + paths: + - "**/*.go" + - "go.mod" + - "go.sum" branches: - master jobs: tests: + permissions: + security-events: write + runs-on: ubuntu-latest env: GO111MODULE: on steps: - name: Checkout Source - uses: actions/checkout@v4 + uses: actions/checkout@v3 + - name: Run Gosec Security Scanner - uses: informalsystems/gosec@master + uses: securego/gosec@master with: - args: ./... + # we let the report trigger content trigger a failure using the GitHub Security features. + args: "-no-fail -fmt sarif -out results.sarif ./..." + + - name: Upload SARIF file + uses: github/codeql-action/upload-sarif@v2 + with: + # Path to SARIF file relative to the root of the repository + sarif_file: results.sarif From 02f8a34679b67f06be15e01bb841a54dce550567 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 22 Jan 2024 20:36:03 +0300 Subject: [PATCH 19/51] lint: gofumpt --- x/orderbook/module.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/x/orderbook/module.go b/x/orderbook/module.go index abf354ea..22f27183 100644 --- a/x/orderbook/module.go +++ b/x/orderbook/module.go @@ -20,8 +20,6 @@ import ( "github.com/sge-network/sge/x/orderbook/types" ) -var () - // ---------------------------------------------------------------------------- // AppModuleBasic // ---------------------------------------------------------------------------- From 9c5eae044f45ea49801c64589cb48b6d64e2313c Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 24 Jan 2024 15:41:54 +0300 Subject: [PATCH 20/51] upgrade: v47.8 --- app/app.go | 2 + app/upgrades/v8/consts.go | 19 +++++++ app/upgrades/v8/upgrades.go | 19 +++++++ go.mod | 54 +++++++++--------- go.sum | 109 ++++++++++++++++++++---------------- 5 files changed, 128 insertions(+), 75 deletions(-) create mode 100644 app/upgrades/v8/consts.go create mode 100644 app/upgrades/v8/upgrades.go diff --git a/app/app.go b/app/app.go index 8480c2a3..6d91ff39 100644 --- a/app/app.go +++ b/app/app.go @@ -54,6 +54,7 @@ import ( v5 "github.com/sge-network/sge/app/upgrades/v5" v6 "github.com/sge-network/sge/app/upgrades/v6" v7 "github.com/sge-network/sge/app/upgrades/v7" + v8 "github.com/sge-network/sge/app/upgrades/v8" // unnamed import of statik for swagger UI support _ "github.com/cosmos/cosmos-sdk/client/docs/statik" @@ -84,6 +85,7 @@ var ( v5.Upgrade, v6.Upgrade, v7.Upgrade, + v8.Upgrade, } ) diff --git a/app/upgrades/v8/consts.go b/app/upgrades/v8/consts.go new file mode 100644 index 00000000..585c935f --- /dev/null +++ b/app/upgrades/v8/consts.go @@ -0,0 +1,19 @@ +package v8 + +import ( + store "github.com/cosmos/cosmos-sdk/store/types" + + "github.com/sge-network/sge/app/upgrades" +) + +// UpgradeName defines the on-chain upgrade name for the v1.6.0 upgrade. +const UpgradeName = "v1.6.0" + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateUpgradeHandler, + StoreUpgrades: store.StoreUpgrades{ + Added: []string{}, + Deleted: []string{}, + }, +} diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go new file mode 100644 index 00000000..0221194e --- /dev/null +++ b/app/upgrades/v8/upgrades.go @@ -0,0 +1,19 @@ +package v8 + +import ( + 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/sge-network/sge/app/keepers" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + k *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + + return mm.RunMigrations(ctx, configurator, fromVM) + } +} diff --git a/go.mod b/go.mod index 2c505cf0..82adea82 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,13 @@ go 1.21 require ( cosmossdk.io/api v0.3.1 - cosmossdk.io/errors v1.0.0 + cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.2.0 cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 github.com/cometbft/cometbft v0.37.4 github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.7 + github.com/cosmos/cosmos-sdk v0.47.8 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.3.0 github.com/golang-jwt/jwt v3.2.2+incompatible @@ -26,8 +26,8 @@ require ( github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.4 - google.golang.org/genproto/googleapis/api v0.0.0-20231002182017-d307bd883b97 - google.golang.org/grpc v1.58.3 + google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 + google.golang.org/grpc v1.60.1 gopkg.in/yaml.v2 v2.4.0 mvdan.cc/gofumpt v0.5.0 ) @@ -60,14 +60,14 @@ require ( require ( 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect 4d63.com/gochecknoglobals v0.2.1 // indirect - cloud.google.com/go v0.110.8 // indirect - cloud.google.com/go/compute v1.23.0 // indirect + cloud.google.com/go v0.111.0 // indirect + cloud.google.com/go/compute v1.23.3 // 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.5 // indirect cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect - cosmossdk.io/log v1.2.1 // indirect + cosmossdk.io/log v1.3.0 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/4meepo/tagalign v1.3.3 // indirect @@ -144,6 +144,8 @@ 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-logr/logr v1.2.4 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-toolsmith/astcast v1.1.0 // indirect github.com/go-toolsmith/astcopy v1.1.0 // indirect github.com/go-toolsmith/astequal v1.1.0 // indirect @@ -172,8 +174,8 @@ require ( github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/orderedcode v0.0.1 // indirect - github.com/google/s2a-go v0.1.4 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect + github.com/google/s2a-go v0.1.7 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect github.com/googleapis/gax-go/v2 v2.12.0 // indirect github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect github.com/gorilla/handlers v1.5.1 // indirect @@ -227,7 +229,7 @@ require ( github.com/maratori/testpackage v1.1.1 // indirect github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.10 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mbilski/exhaustivestruct v1.2.0 // indirect @@ -260,7 +262,7 @@ require ( github.com/rivo/uniseg v0.2.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/cors v1.8.3 // indirect - github.com/rs/zerolog v1.30.0 // indirect + github.com/rs/zerolog v1.31.0 // indirect github.com/ryancurrah/gomodguard v1.3.0 // indirect github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect @@ -301,23 +303,25 @@ require ( go-simpler.org/sloglint v0.1.2 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/otel v1.19.0 // indirect + go.opentelemetry.io/otel/metric v1.19.0 // indirect + go.opentelemetry.io/otel/trace v1.19.0 // indirect go.tmz.dev/musttag v0.7.2 // indirect - golang.org/x/crypto v0.14.0 // indirect + golang.org/x/crypto v0.16.0 // indirect golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect golang.org/x/mod v0.13.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.12.0 // indirect + golang.org/x/net v0.19.0 // indirect + golang.org/x/oauth2 v0.13.0 // indirect golang.org/x/sync v0.4.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/sys v0.16.0 // indirect + golang.org/x/term v0.15.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/tools 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-20231012201019-e917dd12ba7a // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/api v0.149.0 // indirect + google.golang.org/appengine v1.6.8 // indirect + google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect + google.golang.org/protobuf v1.32.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect honnef.co/go/tools v0.4.6 // indirect @@ -344,8 +348,6 @@ replace ( // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 - // github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - // https://github.com/cosmos/cosmos-sdk/issues/14949 // pin the version of goleveldb to v1.0.1-0.20210819022825-2ae1ddf74ef7 required by SDK v47 upgrade guide. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 diff --git a/go.sum b/go.sum index 9380bcfb..7a8024ae 100644 --- a/go.sum +++ b/go.sum @@ -38,8 +38,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.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM= +cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU= 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= @@ -77,8 +77,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.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= +cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= 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= @@ -118,8 +118,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.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= +cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= 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,10 +201,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.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.2.1 h1:Xc1GgTCicniwmMiKwDxUjO4eLhPxoVdI9vtMW8Ti/uk= -cosmossdk.io/log v1.2.1/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4= +cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= +cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= +cosmossdk.io/log v1.3.0 h1:L0Z0XstClo2kOU4h3V1iDoE5Ji64sg5HLOogzGg67Oo= +cosmossdk.io/log v1.3.0/go.mod h1:HIDyvWLqZe2ovlWabsDN4aPMpY/nUEquAhgfTf2ZzB8= cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig= cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 h1:A+LHM41uss8WNJ+qZCdvCjtiG6UiIN7ZqmPZz6R25wc= @@ -462,8 +462,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.7 h1:yoyWF/x2dvKysgB8PVnSc83JIhbx3l11ZSf+bgBBfHQ= -github.com/cosmos/cosmos-sdk v0.47.7/go.mod h1:hljXsedSCJYge78hyaMYy+yzDQVGZtKAZBjZn5QMddk= +github.com/cosmos/cosmos-sdk v0.47.8 h1:kzYF2xhnfi8dy15t2VVS24tc2KcuU4JBgjh9yCFx4y4= +github.com/cosmos/cosmos-sdk v0.47.8/go.mod h1:VTAtthIsmfplanhFfUTfT6ED4F+kkJxT7nmvmKXRthI= 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= @@ -625,8 +625,11 @@ 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-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= github.com/go-logr/logr v1.2.4/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/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= @@ -814,8 +817,8 @@ github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLe 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/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -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/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= +github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= 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= @@ -826,8 +829,8 @@ github.com/google/uuid v1.5.0/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.4 h1:uGy6JWR/uMIILU8wbf+OkstIrNiMjGpEIyhx8f6W7s4= -github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k= +github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs= +github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0= 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= @@ -1094,7 +1097,6 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc 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-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -1105,8 +1107,9 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky 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= github.com/mattn/go-isatty v0.0.17/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-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/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= @@ -1335,8 +1338,8 @@ 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.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/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= +github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= 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= @@ -1541,6 +1544,14 @@ 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/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= +go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= +go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= +go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= +go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= +go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= +go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= +go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.tmz.dev/musttag v0.7.2 h1:1J6S9ipDbalBSODNT5jCep8dhZyMr4ttnjQagmGYR5s= go.tmz.dev/musttag v0.7.2/go.mod h1:m6q5NiiSKMnQYokefa2xGoyoXnrswCbJ0AWYzf4Zs28= @@ -1586,12 +1597,11 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/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= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= +golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= 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= @@ -1717,8 +1727,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= +golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= 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= @@ -1744,8 +1754,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= @@ -1847,7 +1857,6 @@ golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBc 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-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-20211019181941-9d821ace8654/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-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1879,8 +1888,9 @@ golang.org/x/sys v0.2.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/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/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= +golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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= @@ -1888,8 +1898,8 @@ 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.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.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= 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= @@ -1903,8 +1913,8 @@ 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.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.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= @@ -2060,8 +2070,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.128.0 h1:RjPESny5CnQRn9V6siglged+DZCgfu9l6mO9dkX9VOg= -google.golang.org/api v0.128.0/go.mod h1:Y611qgqaE92On/7g65MQgxYul3c0rEB894kniWLY750= +google.golang.org/api v0.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= +google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= 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= @@ -2069,8 +2079,9 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/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/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM= +google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= 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-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -2181,12 +2192,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-20231012201019-e917dd12ba7a h1:fwgW9j3vHirt4ObdHoYNwuO24BEZjSzbh+zPaNWoiY8= -google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE= -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-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg= +google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o= +google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 h1:gphdwh0npgs8elJ4T6J+DQJHPVF7RsuJHCfwztUb4J4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= 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= @@ -2228,8 +2239,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.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= -google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= +google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= 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= @@ -2246,8 +2257,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.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= +google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= 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= @@ -2285,8 +2296,8 @@ 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.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= -gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= +gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= +gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= 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= From 9fd1ebb361c3b6556eae1e50c7df7da11e10239c Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:18:50 +0300 Subject: [PATCH 21/51] refactor: remove RandomizedParams from appmodule --- x/bet/module_simulation.go | 5 ----- x/house/module_simulation.go | 6 ------ x/market/module_simulation.go | 5 ----- x/mint/module_simulation.go | 6 ------ x/orderbook/module_simulation.go | 5 ----- x/ovm/module_simulation.go | 5 ----- x/reward/module_simulation.go | 5 ----- 7 files changed, 37 deletions(-) diff --git a/x/bet/module_simulation.go b/x/bet/module_simulation.go index 3e1271ae..333622ae 100644 --- a/x/bet/module_simulation.go +++ b/x/bet/module_simulation.go @@ -42,11 +42,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { - return betsimulation.ParamChanges(r) -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { sdr[types.StoreKey] = betsimulation.NewDecodeStore(am.cdc) diff --git a/x/house/module_simulation.go b/x/house/module_simulation.go index 6f7abca0..f5f3fe9c 100644 --- a/x/house/module_simulation.go +++ b/x/house/module_simulation.go @@ -2,7 +2,6 @@ package house import ( //#nosec - "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -35,11 +34,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { - return housesimulation.ParamChanges(r) -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { sdr[types.StoreKey] = housesimulation.NewDecodeStore(am.cdc) diff --git a/x/market/module_simulation.go b/x/market/module_simulation.go index 6f998ce6..55416425 100644 --- a/x/market/module_simulation.go +++ b/x/market/module_simulation.go @@ -49,11 +49,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { - return marketsimulation.ParamChanges(r) -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { sdr[types.StoreKey] = marketsimulation.NewDecodeStore(am.cdc) diff --git a/x/mint/module_simulation.go b/x/mint/module_simulation.go index 18a9ceee..c45b1963 100644 --- a/x/mint/module_simulation.go +++ b/x/mint/module_simulation.go @@ -2,7 +2,6 @@ package mint import ( //#nosec - "math/rand" "github.com/cosmos/cosmos-sdk/baseapp" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -35,11 +34,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { - return mintsimulation.ParamChanges(r) -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { sdr[types.StoreKey] = mintsimulation.NewDecodeStore(am.cdc) diff --git a/x/orderbook/module_simulation.go b/x/orderbook/module_simulation.go index 3b680eb4..0089e5ee 100644 --- a/x/orderbook/module_simulation.go +++ b/x/orderbook/module_simulation.go @@ -41,11 +41,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(r *rand.Rand) []simtypes.LegacyParamChange { - return orderbooksimulation.ParamChanges(r) -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { sdr[types.StoreKey] = orderbooksimulation.NewDecodeStore(am.cdc) diff --git a/x/ovm/module_simulation.go b/x/ovm/module_simulation.go index c1285223..a198605f 100644 --- a/x/ovm/module_simulation.go +++ b/x/ovm/module_simulation.go @@ -42,11 +42,6 @@ func (AppModule) ProposalContents(_ module.SimulationState) []simtypes.WeightedP return nil } -// RandomizedParams creates randomized param changes for the simulator -func (AppModule) RandomizedParams(_ *rand.Rand) []simtypes.LegacyParamChange { - return []simtypes.LegacyParamChange{} -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { sdr[types.StoreKey] = ovmsimulation.NewDecodeStore(am.cdc) diff --git a/x/reward/module_simulation.go b/x/reward/module_simulation.go index 1120e304..78f9c61c 100644 --- a/x/reward/module_simulation.go +++ b/x/reward/module_simulation.go @@ -72,11 +72,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.LegacyParamChange { - return []simtypes.LegacyParamChange{} -} - // RegisterStoreDecoder registers a decoder func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} From eccdb80a5b4faa2183a95ff9e9388457e30570f1 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 24 Jan 2024 19:50:30 +0300 Subject: [PATCH 22/51] feat: add upgrade handler changes of v47 --- app/upgrades/v8/consts.go | 7 ++++++- app/upgrades/v8/upgrades.go | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/app/upgrades/v8/consts.go b/app/upgrades/v8/consts.go index 585c935f..eb4a0578 100644 --- a/app/upgrades/v8/consts.go +++ b/app/upgrades/v8/consts.go @@ -2,6 +2,8 @@ package v8 import ( store "github.com/cosmos/cosmos-sdk/store/types" + consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" "github.com/sge-network/sge/app/upgrades" ) @@ -13,7 +15,10 @@ var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, CreateUpgradeHandler: CreateUpgradeHandler, StoreUpgrades: store.StoreUpgrades{ - Added: []string{}, + Added: []string{ + crisistypes.ModuleName, + consensustypes.ModuleName, + }, Deleted: []string{}, }, } diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index 0221194e..c5c08de5 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -1,9 +1,14 @@ package v8 import ( + "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + + exported "github.com/cosmos/ibc-go/v7/modules/core/exported" + "github.com/sge-network/sge/app/keepers" ) @@ -13,6 +18,23 @@ func CreateUpgradeHandler( k *keepers.AppKeepers, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + // Migrate Tendermint consensus parameters from x/params module to a + // dedicated x/consensus module. + baseAppLegacySS := k.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable()) + baseapp.MigrateParams(ctx, baseAppLegacySS, &k.ConsensusParamsKeeper) + + // https://github.com/cosmos/ibc-go/blob/v7.1.0/docs/migrations/v7-to-v7_1.md + // explicitly update the IBC 02-client params, adding the localhost client type + params := k.IBCKeeper.ClientKeeper.GetParams(ctx) + params.AllowedClients = append(params.AllowedClients, exported.Localhost) + k.IBCKeeper.ClientKeeper.SetParams(ctx, params) + + // update gov params to use a 20% initial deposit ratio, allowing us to remote the ante handler + govParams := k.GovKeeper.GetParams(ctx) + govParams.MinInitialDepositRatio = sdk.NewDec(20).Quo(sdk.NewDec(100)).String() + if err := k.GovKeeper.SetParams(ctx, govParams); err != nil { + return nil, err + } return mm.RunMigrations(ctx, configurator, fromVM) } From 5e4926f2ec05d6b9cf877e02d83b010452ab6d01 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 29 Jan 2024 11:03:53 +0300 Subject: [PATCH 23/51] fix: upgrade param types of v47 --- app/upgrades/v8/upgrades.go | 76 +++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index c5c08de5..ba616a40 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -4,12 +4,31 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" + 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" + distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/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" exported "github.com/cosmos/ibc-go/v7/modules/core/exported" "github.com/sge-network/sge/app/keepers" + betmoduletypes "github.com/sge-network/sge/x/bet/types" + housemoduletypes "github.com/sge-network/sge/x/house/types" + marketmoduletypes "github.com/sge-network/sge/x/market/types" + minttypes "github.com/sge-network/sge/x/mint/types" + orderbookmoduletypes "github.com/sge-network/sge/x/orderbook/types" + ovmmoduletypes "github.com/sge-network/sge/x/ovm/types" + rewardmoduletypes "github.com/sge-network/sge/x/reward/types" + subaccountmoduletypes "github.com/sge-network/sge/x/subaccount/types" ) func CreateUpgradeHandler( @@ -18,6 +37,63 @@ func CreateUpgradeHandler( k *keepers.AppKeepers, ) upgradetypes.UpgradeHandler { return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + // https://github.com/cosmos/cosmos-sdk/pull/12363/files + // Set param key table for params module migration + for _, subspace := range k.ParamsKeeper.GetSubspaces() { + subspace := subspace + + var keyTable paramstypes.KeyTable + switch subspace.Name() { + case authtypes.ModuleName: + keyTable = authtypes.ParamKeyTable() + case banktypes.ModuleName: + keyTable = banktypes.ParamKeyTable() + case stakingtypes.ModuleName: + keyTable = stakingtypes.ParamKeyTable() + + // case minttypes.ModuleName: + // keyTable = minttypes.ParamKeyTable() + case distrtypes.ModuleName: + keyTable = distrtypes.ParamKeyTable() + case slashingtypes.ModuleName: + keyTable = slashingtypes.ParamKeyTable() + case govtypes.ModuleName: + keyTable = govv1.ParamKeyTable() + case crisistypes.ModuleName: + keyTable = crisistypes.ParamKeyTable() + + // ibc types + case ibctransfertypes.ModuleName: + keyTable = ibctransfertypes.ParamKeyTable() + case icahosttypes.SubModuleName: + keyTable = icahosttypes.ParamKeyTable() + case icacontrollertypes.SubModuleName: + keyTable = icacontrollertypes.ParamKeyTable() + + // sge modules + case betmoduletypes.ModuleName: + keyTable = betmoduletypes.ParamKeyTable() + case housemoduletypes.ModuleName: + keyTable = housemoduletypes.ParamKeyTable() + case marketmoduletypes.ModuleName: + keyTable = marketmoduletypes.ParamKeyTable() + case minttypes.ModuleName: + keyTable = minttypes.ParamKeyTable() + case orderbookmoduletypes.ModuleName: + keyTable = orderbookmoduletypes.ParamKeyTable() + case ovmmoduletypes.ModuleName: + keyTable = ovmmoduletypes.ParamKeyTable() + case subaccountmoduletypes.ModuleName: + keyTable = subaccountmoduletypes.ParamKeyTable() + case rewardmoduletypes.ModuleName: + keyTable = rewardmoduletypes.ParamKeyTable() + } + + if !subspace.HasKeyTable() { + subspace.WithKeyTable(keyTable) + } + } + // Migrate Tendermint consensus parameters from x/params module to a // dedicated x/consensus module. baseAppLegacySS := k.ParamsKeeper.Subspace(baseapp.Paramspace).WithKeyTable(paramstypes.ConsensusParamsKeyTable()) From c659e33e4abf153ab18540978a3974b8284373be Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 29 Jan 2024 11:08:30 +0300 Subject: [PATCH 24/51] lint: upgrade handler staticcheck --- app/upgrades/v8/upgrades.go | 1 + 1 file changed, 1 insertion(+) diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index ba616a40..58cc94fc 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -31,6 +31,7 @@ import ( subaccountmoduletypes "github.com/sge-network/sge/x/subaccount/types" ) +//nolint:staticcheck func CreateUpgradeHandler( mm *module.Manager, configurator module.Configurator, From 2588ecffa3999d8739744625de927d7e7ac426cc Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:36:43 +0300 Subject: [PATCH 25/51] refactor: replace sdk.Dec with sdkmath.LegacyDec --- app/prefix.go | 6 +- app/upgrades/v1/upgrades.go | 3 +- app/upgrades/v2/upgrades.go | 2 +- app/upgrades/v3/consts.go | 8 +- app/upgrades/v8/upgrades.go | 3 +- docs/specs/Mint/04_Begin_Block.md | 8 +- proto/buf.lock | 12 +- proto/sgenetwork/sge/bet/bet.proto | 2 +- proto/sgenetwork/sge/bet/bet_odds.proto | 4 +- proto/sgenetwork/sge/house/params.proto | 2 +- proto/sgenetwork/sge/mint/minter.proto | 6 +- proto/sgenetwork/sge/mint/phase.proto | 4 +- proto/sgenetwork/sge/mint/query.proto | 4 +- .../sge/orderbook/participation.proto | 6 +- testutil/simapp/simapp.go | 22 ++-- x/bet/client/cli/query_bet_test.go | 3 +- x/bet/keeper/bet_test.go | 2 +- x/bet/keeper/keeper_test.go | 8 +- x/bet/keeper/settle_test.go | 13 +- x/bet/keeper/wager_test.go | 39 +++--- x/bet/simulation/decoder_test.go | 3 +- x/bet/types/bet.pb.go | 122 +++++++++--------- x/bet/types/bet_odds.pb.go | 33 ++--- x/bet/types/expected_keepers.go | 4 +- x/bet/types/odds_type.go | 31 +++-- x/bet/types/payout.go | 29 ++--- x/bet/types/ticket.go | 10 +- x/bet/types/ticket_test.go | 14 +- x/house/keeper/params.go | 2 +- x/house/simulation/genesis.go | 7 +- x/house/simulation/genesis_test.go | 3 +- x/house/types/deposit.go | 3 +- x/house/types/params.go | 8 +- x/house/types/params.pb.go | 47 ++++--- x/mint/abci.go | 3 +- x/mint/keeper/minter.go | 2 +- x/mint/keeper/minter_test.go | 2 +- x/mint/simulation/decoder_test.go | 4 +- x/mint/simulation/genesis.go | 12 +- x/mint/types/expected_keepers.go | 2 +- x/mint/types/genesis_test.go | 7 +- x/mint/types/minter.go | 20 +-- x/mint/types/minter.pb.go | 41 +++--- x/mint/types/minter_test.go | 96 +++++++------- x/mint/types/params.go | 52 ++++---- x/mint/types/params_test.go | 5 +- x/mint/types/phase.pb.go | 34 ++--- x/mint/types/phase_test.go | 7 +- x/mint/types/query.pb.go | 82 ++++++------ x/orderbook/keeper/bet_settle_test.go | 3 +- x/orderbook/keeper/bet_wager.go | 30 ++--- x/orderbook/keeper/bet_wager_test.go | 24 ++-- x/orderbook/types/participation.pb.go | 6 +- x/ovm/types/consts.go | 4 +- x/ovm/types/key_vault.go | 4 +- x/subaccount/keeper/msg_server_bet_test.go | 8 +- x/subaccount/keeper/msg_server_house_test.go | 4 +- x/subaccount/simulation/genesis.go | 7 +- 58 files changed, 464 insertions(+), 468 deletions(-) diff --git a/app/prefix.go b/app/prefix.go index caed132a..bf8413fb 100644 --- a/app/prefix.go +++ b/app/prefix.go @@ -1,7 +1,9 @@ package app import ( + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/sge-network/sge/app/keepers" "github.com/sge-network/sge/app/params" ) @@ -26,11 +28,11 @@ func SetConfig() { config.SetBech32PrefixForValidator(ValidatorAddressPrefix, ValidatorPubKeyPrefix) config.SetBech32PrefixForConsensusNode(ConsNodeAddressPrefix, ConsNodePubKeyPrefix) - err := sdk.RegisterDenom(params.HumanCoinUnit, sdk.OneDec()) + err := sdk.RegisterDenom(params.HumanCoinUnit, sdkmath.LegacyOneDec()) if err != nil { panic(err) } - err = sdk.RegisterDenom(params.BaseCoinUnit, sdk.NewDecWithPrec(1, params.SGEExponent)) + err = sdk.RegisterDenom(params.BaseCoinUnit, sdkmath.LegacyNewDecWithPrec(1, params.SGEExponent)) if err != nil { panic(err) } diff --git a/app/upgrades/v1/upgrades.go b/app/upgrades/v1/upgrades.go index 527444c3..9d2e44eb 100644 --- a/app/upgrades/v1/upgrades.go +++ b/app/upgrades/v1/upgrades.go @@ -1,6 +1,7 @@ package v1 import ( + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" @@ -13,7 +14,7 @@ import ( func setCommissionRate(stakingKeeper *stakingkeeper.Keeper, ctx sdk.Context) { // the minimal commission rate of 5% (0.05) // (default is needed to be set because of SDK store migrations that set the param) - stakingtypes.DefaultMinCommissionRate = sdk.NewDecWithPrec(5, 2) + stakingtypes.DefaultMinCommissionRate = sdkmath.LegacyNewDecWithPrec(5, 2) stakingKeeper.IterateValidators(ctx, func(index int64, val stakingtypes.ValidatorI) (stop bool) { if val.GetCommission().LT(stakingtypes.DefaultMinCommissionRate) { diff --git a/app/upgrades/v2/upgrades.go b/app/upgrades/v2/upgrades.go index e43a64d4..0400ef84 100644 --- a/app/upgrades/v2/upgrades.go +++ b/app/upgrades/v2/upgrades.go @@ -22,7 +22,7 @@ func CreateUpgradeHandler( var minDeposit sdkmath.Int housePS.Get(ctx, []byte("MinDeposit"), &minDeposit) - var houseParticipationFee sdk.Dec + var houseParticipationFee sdkmath.LegacyDec housePS.Get(ctx, []byte("HouseParticipationFee"), &houseParticipationFee) p := housetypes.NewParams( diff --git a/app/upgrades/v3/consts.go b/app/upgrades/v3/consts.go index 13388a3b..2000f358 100644 --- a/app/upgrades/v3/consts.go +++ b/app/upgrades/v3/consts.go @@ -1,7 +1,7 @@ package v3 import ( - sdk "github.com/cosmos/cosmos-sdk/types" + sdkmath "cosmossdk.io/math" "github.com/sge-network/sge/app/upgrades" ) @@ -11,11 +11,11 @@ const UpgradeName = "v1.2.0" // Expedite governance params var ( // DefaultMinExpeditedDepositTokens is the default minimum deposit required for expedited proposals. - DefaultMinExpeditedDepositTokens = sdk.NewInt(50000000000) + DefaultMinExpeditedDepositTokens = sdkmath.NewInt(50000000000) // DefaultExpeditedQuorum is the default quorum percentage required for expedited proposals. - DefaultExpeditedQuorum = sdk.NewDecWithPrec(750, 3) + DefaultExpeditedQuorum = sdkmath.LegacyNewDecWithPrec(750, 3) // DefaultExpeditedThreshold is the default voting threshold percentage required for expedited proposals. - DefaultExpeditedThreshold = sdk.NewDecWithPrec(750, 3) + DefaultExpeditedThreshold = sdkmath.LegacyNewDecWithPrec(750, 3) ) var Upgrade = upgrades.Upgrade{ diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v8/upgrades.go index 58cc94fc..6a3b143b 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v8/upgrades.go @@ -1,6 +1,7 @@ package v8 import ( + sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -108,7 +109,7 @@ func CreateUpgradeHandler( // update gov params to use a 20% initial deposit ratio, allowing us to remote the ante handler govParams := k.GovKeeper.GetParams(ctx) - govParams.MinInitialDepositRatio = sdk.NewDec(20).Quo(sdk.NewDec(100)).String() + govParams.MinInitialDepositRatio = sdkmath.LegacyNewDec(20).Quo(sdkmath.LegacyNewDec(100)).String() if err := k.GovKeeper.SetParams(ctx, govParams); err != nil { return nil, err } diff --git a/docs/specs/Mint/04_Begin_Block.md b/docs/specs/Mint/04_Begin_Block.md index b87eaf97..d2638a26 100644 --- a/docs/specs/Mint/04_Begin_Block.md +++ b/docs/specs/Mint/04_Begin_Block.md @@ -13,7 +13,7 @@ func (m Minter) CurrentPhase(params Params, currentBlock int64) (Phase, int) { return params.GetPhaseAtStep(1), 1 } - cumulativeBlock := sdk.NewDec(0) + cumulativeBlock := sdkmath.LegacyNewDec(0) var currentStep int var found bool @@ -26,7 +26,7 @@ func (m Minter) CurrentPhase(params Params, currentBlock int64) (Phase, int) { // if the current block is less than or equal to cummulative blocks // this means that we are in the i+1 step which is set in above line - if sdk.NewDec(currentBlock).LTE(cumulativeBlock) { + if sdkmath.LegacyNewDec(currentBlock).LTE(cumulativeBlock) { found = true // it is the current phase // so there is no need for furthur phase blocks check @@ -77,7 +77,7 @@ Since the SGE-Network chain is predominantly reliant on phases for its inflation ```go // NextPhaseProvisions returns the phase provisions based on current total // supply and inflation rate. -func (m Minter) NextPhaseProvisions(totalSupply sdkmath.Int, excludeAmount sdkmath.Int, phase Phase) sdk.Dec { +func (m Minter) NextPhaseProvisions(totalSupply sdkmath.Int, excludeAmount sdkmath.Int, phase Phase) sdkmath.LegacyDec { // calculate annual provisions as normal annualProvisions := m.Inflation.MulInt(totalSupply.Sub(excludeAmount)) @@ -99,7 +99,7 @@ Calculate the provisions generated for each block based on current phase provisi ```go // BlockProvisions returns the provisions for a block based on the phase // provisions rate. -func (m Minter) BlockProvisions(params Params, phaseStep int) (sdk.Coin, sdk.Dec) { +func (m Minter) BlockProvisions(params Params, phaseStep int) (sdk.Coin, sdkmath.LegacyDec) { // get total blocks in this phase blocksPerPhase := params.getPhaseBlocks(phaseStep).TruncateDec() diff --git a/proto/buf.lock b/proto/buf.lock index abf79a0e..0af52ccb 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -9,18 +9,18 @@ deps: - remote: buf.build owner: cosmos repository: cosmos-sdk - commit: e7dd2c968d9a403b8f1a01a8d8c8a581 - digest: shake256:e766fba8cb060d67357cc715f5c39ca32661b069f829a016962e2b6879f3cebcaecb23c9ac9f7846e04e10a0a6163298713078bc9ef0cf3400885a0acf5ba3bc + commit: fb7629d893cb44a799c16916d09ccc0b + digest: shake256:7cbbcdd4f4b2ca91e7b161ef0c58b794d37d105b87b1aab0a73b539508b1f39b3ff8b94148dd75eeaebbdb049730a6a3606d8879f84e65f08559bd9aa4d512c8 - remote: buf.build owner: cosmos repository: gogo-proto - commit: 5e5b9fdd01804356895f8f79a6f1ddc1 - digest: shake256:0b85da49e2e5f9ebc4806eae058e2f56096ff3b1c59d1fb7c190413dd15f45dd456f0b69ced9059341c80795d2b6c943de15b120a9e0308b499e43e4b5fc2952 + commit: 88ef6483f90f478fb938c37dde52ece3 + digest: shake256:89c45df2aa11e0cff97b0d695436713db3d993d76792e9f8dc1ae90e6ab9a9bec55503d48ceedd6b86069ab07d3041b32001b2bfe0227fa725dd515ff381e5ba - remote: buf.build owner: googleapis repository: googleapis - commit: a86849a25cc04f4dbe9b15ddddfbc488 - digest: shake256:e19143328f8cbfe13fc226aeee5e63773ca494693a72740a7560664270039a380d94a1344234b88c7691311460df9a9b1c2982190d0a2612eae80368718e1943 + commit: e874a0be2bf140a5a4c7d4122c635823 + digest: shake256:4fe3036b4d706f6ee2b13c730bd04777f021dfd02ed27e6e40480acfe664a7548238312ee0727fd77648a38d227e296d43f4a38a34cdd46068156211016d9657 - remote: buf.build owner: protocolbuffers repository: wellknowntypes diff --git a/proto/sgenetwork/sge/bet/bet.proto b/proto/sgenetwork/sge/bet/bet.proto index ab23aa82..fa37e214 100644 --- a/proto/sgenetwork/sge/bet/bet.proto +++ b/proto/sgenetwork/sge/bet/bet.proto @@ -63,7 +63,7 @@ message Bet { // max_loss_multiplier is the multiplier coefficient of max loss. string max_loss_multiplier = 13 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; diff --git a/proto/sgenetwork/sge/bet/bet_odds.proto b/proto/sgenetwork/sge/bet/bet_odds.proto index 03ff64d5..c0f9e083 100644 --- a/proto/sgenetwork/sge/bet/bet_odds.proto +++ b/proto/sgenetwork/sge/bet/bet_odds.proto @@ -29,7 +29,7 @@ message BetOdds { (gogoproto.customname) = "MaxLossMultiplier", (gogoproto.jsontag) = "max_loss_multiplier", json_name = "max_loss_multiplier", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } @@ -49,7 +49,7 @@ message BetOddsCompact { (gogoproto.customname) = "MaxLossMultiplier", (gogoproto.jsontag) = "max_loss_multiplier", json_name = "max_loss_multiplier", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/proto/sgenetwork/sge/house/params.proto b/proto/sgenetwork/sge/house/params.proto index 6881fbb0..8a59194d 100644 --- a/proto/sgenetwork/sge/house/params.proto +++ b/proto/sgenetwork/sge/house/params.proto @@ -19,7 +19,7 @@ message Params { // house_participation_fee is the % of the deposit to be paid for a house // participation by the depositor. string house_participation_fee = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; diff --git a/proto/sgenetwork/sge/mint/minter.proto b/proto/sgenetwork/sge/mint/minter.proto index fda7f96a..4ca28787 100644 --- a/proto/sgenetwork/sge/mint/minter.proto +++ b/proto/sgenetwork/sge/mint/minter.proto @@ -9,7 +9,7 @@ import "gogoproto/gogo.proto"; message Minter { // inflation is the current annual inflation rate. string inflation = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; // phase_step is the index of phases slice + 1. @@ -17,13 +17,13 @@ message Minter { // phase_provisions is the current phase expected provisions. string phase_provisions = 3 [ (gogoproto.moretags) = "yaml:\"phase_provisions\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; // truncated_tokens holds current truncated tokens because of Dec to Int // conversion in the minting. string truncated_tokens = 4 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/proto/sgenetwork/sge/mint/phase.proto b/proto/sgenetwork/sge/mint/phase.proto index 1617166d..999f6ee4 100644 --- a/proto/sgenetwork/sge/mint/phase.proto +++ b/proto/sgenetwork/sge/mint/phase.proto @@ -12,13 +12,13 @@ message Phase { // inflation is the current phase inflation rate. string inflation = 1 [ (gogoproto.moretags) = "yaml:\"inflation\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; // year_coefficient is the proportion of a complete year. string year_coefficient = 2 [ (gogoproto.moretags) = "yaml:\"year_coefficient\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/proto/sgenetwork/sge/mint/query.proto b/proto/sgenetwork/sge/mint/query.proto index 182c5b84..4d4651bf 100644 --- a/proto/sgenetwork/sge/mint/query.proto +++ b/proto/sgenetwork/sge/mint/query.proto @@ -58,7 +58,7 @@ message QueryInflationRequest {} message QueryInflationResponse { // inflation is the current minting inflation value. bytes inflation = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } @@ -84,7 +84,7 @@ message QueryPhaseProvisionsRequest {} message QueryPhaseProvisionsResponse { // phase_provisions is the current minting phase provisions value. bytes phase_provisions = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", (gogoproto.nullable) = false ]; } diff --git a/proto/sgenetwork/sge/orderbook/participation.proto b/proto/sgenetwork/sge/orderbook/participation.proto index f795d658..0c95c985 100644 --- a/proto/sgenetwork/sge/orderbook/participation.proto +++ b/proto/sgenetwork/sge/orderbook/participation.proto @@ -99,14 +99,16 @@ message OrderBookParticipation { // is_settled represents if the participation is settled or not. bool is_settled = 14 [ (gogoproto.moretags) = "yaml:\"is_settled\"" ]; - // returned_amount is the total returned amount to the user's account including reimbursed fees. + // returned_amount is the total returned amount to the user's account + // including reimbursed fees. string returned_amount = 15 [ (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"returned_amount\"" ]; - // reimbursed_fee is the fee reimbursed because of reasons such as market calcellation. + // reimbursed_fee is the fee reimbursed because of reasons such as market + // calcellation. string reimbursed_fee = 16 [ (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, diff --git a/testutil/simapp/simapp.go b/testutil/simapp/simapp.go index 36832d28..eafaa75c 100644 --- a/testutil/simapp/simapp.go +++ b/testutil/simapp/simapp.go @@ -300,12 +300,12 @@ func stakingDefaultTestGenesis( ConsensusPubkey: pk0, Status: stakingtypes.Bonded, Tokens: valPower1, - DelegatorShares: sdk.NewDecFromInt(valPower1), + DelegatorShares: sdkmath.LegacyNewDecFromInt(valPower1), Description: stakingtypes.NewDescription("hoop", "", "", "", ""), Commission: stakingtypes.NewCommission( - sdk.NewDecWithPrec(5, 1), - sdk.NewDecWithPrec(5, 1), - sdk.NewDec(0), + sdkmath.LegacyNewDecWithPrec(5, 1), + sdkmath.LegacyNewDecWithPrec(5, 1), + sdkmath.LegacyNewDec(0), ), } bondedVal2 := stakingtypes.Validator{ @@ -313,12 +313,12 @@ func stakingDefaultTestGenesis( ConsensusPubkey: pk1, Status: stakingtypes.Bonded, Tokens: valPower2, - DelegatorShares: sdk.NewDecFromInt(valPower2), + DelegatorShares: sdkmath.LegacyNewDecFromInt(valPower2), Description: stakingtypes.NewDescription("bloop", "", "", "", ""), Commission: stakingtypes.NewCommission( - sdk.NewDecWithPrec(5, 1), - sdk.NewDecWithPrec(5, 1), - sdk.NewDec(0), + sdkmath.LegacyNewDecWithPrec(5, 1), + sdkmath.LegacyNewDecWithPrec(5, 1), + sdkmath.LegacyNewDec(0), ), } @@ -379,9 +379,9 @@ func NewStakingHelper(t *testing.T, ctx sdk.Context, k stakingKeeper.Keeper) *st func validatorDefaultCommission() stakingtypes.CommissionRates { return stakingtypes.NewCommissionRates( - sdk.MustNewDecFromStr("0.1"), - sdk.MustNewDecFromStr("0.2"), - sdk.MustNewDecFromStr("0.01"), + sdkmath.LegacyMustNewDecFromStr("0.1"), + sdkmath.LegacyMustNewDecFromStr("0.2"), + sdkmath.LegacyMustNewDecFromStr("0.01"), ) } diff --git a/x/bet/client/cli/query_bet_test.go b/x/bet/client/cli/query_bet_test.go index f544f9d6..e10319a9 100644 --- a/x/bet/client/cli/query_bet_test.go +++ b/x/bet/client/cli/query_bet_test.go @@ -10,7 +10,6 @@ import ( tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/google/uuid" "github.com/spf13/cast" "github.com/stretchr/testify/require" @@ -66,7 +65,7 @@ func networkWithBetObjects(t *testing.T, n int) (*network.Network, []types.Bet) OddsValue: "10", Amount: sdkmath.NewInt(10), Fee: sdkmath.NewInt(1), - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), } nullify.Fill(&bet) diff --git a/x/bet/keeper/bet_test.go b/x/bet/keeper/bet_test.go index d270d4b1..7f5ef1a2 100644 --- a/x/bet/keeper/bet_test.go +++ b/x/bet/keeper/bet_test.go @@ -32,7 +32,7 @@ func createNBet( items[i].Amount = sdkmath.NewInt(10) items[i].Fee = sdkmath.NewInt(1) items[i].MarketUID = testMarketUID - items[i].MaxLossMultiplier = sdk.NewDec(10) + items[i].MaxLossMultiplier = sdkmath.LegacyNewDec(10) id := uint64(i + 1) keeper.SetBet(ctx, items[i], id) diff --git a/x/bet/keeper/keeper_test.go b/x/bet/keeper/keeper_test.go index 76456fcf..47732bd6 100644 --- a/x/bet/keeper/keeper_test.go +++ b/x/bet/keeper/keeper_test.go @@ -34,20 +34,20 @@ var ( UID: testOddsUID1, MarketUID: testMarketUID, Value: "4.20", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), } testBetOdds = &[]types.BetOdds{ { UID: testOddsUID1, - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, { UID: testOddsUID2, - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, { UID: testOddsUID3, - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, } testCreator string diff --git a/x/bet/keeper/settle_test.go b/x/bet/keeper/settle_test.go index 703492de..7bba1932 100644 --- a/x/bet/keeper/settle_test.go +++ b/x/bet/keeper/settle_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrtypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/sge-network/sge/testutil/simapp" @@ -52,7 +51,7 @@ func TestSettleBet(t *testing.T) { bet: &types.Bet{ MarketUID: testMarketUID, OddsValue: "10", - Amount: sdk.NewInt(1000000), + Amount: sdkmath.NewInt(1000000), Creator: testCreator, OddsUID: testOddsUID1, Status: types.Bet_STATUS_SETTLED, @@ -73,7 +72,7 @@ func TestSettleBet(t *testing.T) { bet: &types.Bet{ MarketUID: testMarketUID, OddsValue: "10", - Amount: sdk.NewInt(1000000), + Amount: sdkmath.NewInt(1000000), Creator: testCreator, OddsUID: testOddsUID1, }, @@ -92,7 +91,7 @@ func TestSettleBet(t *testing.T) { bet: &types.Bet{ MarketUID: testMarketUID, OddsValue: "10", - Amount: sdk.NewInt(1000000), + Amount: sdkmath.NewInt(1000000), Creator: testCreator, OddsUID: testOddsUID1, }, @@ -111,7 +110,7 @@ func TestSettleBet(t *testing.T) { bet: &types.Bet{ MarketUID: testMarketUID, OddsValue: "10", - Amount: sdk.NewInt(1000000), + Amount: sdkmath.NewInt(1000000), Creator: testCreator, OddsUID: testOddsUID1, }, @@ -131,7 +130,7 @@ func TestSettleBet(t *testing.T) { bet: &types.Bet{ MarketUID: testMarketUID, OddsValue: "10", - Amount: sdk.NewInt(1000000), + Amount: sdkmath.NewInt(1000000), Creator: testCreator, OddsUID: testOddsUID1, @@ -245,7 +244,7 @@ func TestBatchSettleBet(t *testing.T) { UID: testOddsUID1, MarketUID: marketUID, Value: "4.20", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, ) } diff --git a/x/bet/keeper/wager_test.go b/x/bet/keeper/wager_test.go index c7482bb7..11fc0464 100644 --- a/x/bet/keeper/wager_test.go +++ b/x/bet/keeper/wager_test.go @@ -7,7 +7,6 @@ import ( "github.com/stretchr/testify/require" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrtypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/sge-network/sge/testutil/simapp" @@ -33,8 +32,8 @@ func TestWager(t *testing.T) { MarketUID: "notExistMarketUID", }, betOdds: map[string]*types.BetOddsCompact{ - "odds1": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("0.1")}, - "odds2": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("1.0")}, + "odds1": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1")}, + "odds2": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("1.0")}, }, err: sdkerrtypes.ErrInvalidAddress, }, @@ -46,8 +45,8 @@ func TestWager(t *testing.T) { Creator: simapp.TestParamUsers["user1"].Address.String(), }, betOdds: map[string]*types.BetOddsCompact{ - "odds1": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("0.1")}, - "odds2": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("1.0")}, + "odds1": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1")}, + "odds2": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("1.0")}, }, err: types.ErrNoMatchingMarket, }, @@ -63,8 +62,8 @@ func TestWager(t *testing.T) { Creator: simapp.TestParamUsers["user1"].Address.String(), }, betOdds: map[string]*types.BetOddsCompact{ - "odds1": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("0.1")}, - "odds2": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("1.0")}, + "odds1": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1")}, + "odds2": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("1.0")}, }, err: types.ErrInactiveMarket, }, @@ -80,8 +79,8 @@ func TestWager(t *testing.T) { Creator: simapp.TestParamUsers["user1"].Address.String(), }, betOdds: map[string]*types.BetOddsCompact{ - "odds1": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("0.1")}, - "odds2": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("1.0")}, + "odds1": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1")}, + "odds2": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("1.0")}, }, err: types.ErrInactiveMarket, }, @@ -98,8 +97,8 @@ func TestWager(t *testing.T) { Creator: simapp.TestParamUsers["user1"].Address.String(), }, betOdds: map[string]*types.BetOddsCompact{ - "odds1": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("0.1")}, - "odds2": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("1.0")}, + "odds1": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1")}, + "odds2": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("1.0")}, }, err: types.ErrEndTSIsPassed, }, @@ -127,8 +126,8 @@ func TestWager(t *testing.T) { Creator: simapp.TestParamUsers["user1"].Address.String(), }, betOdds: map[string]*types.BetOddsCompact{ - "odds1": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("0.1")}, - "odds2": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("1.0")}, + "odds1": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1")}, + "odds2": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("1.0")}, }, err: types.ErrOddsUIDNotExist, }, @@ -156,8 +155,8 @@ func TestWager(t *testing.T) { Creator: simapp.TestParamUsers["user1"].Address.String(), }, betOdds: map[string]*types.BetOddsCompact{ - "odds1": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("0.1")}, - "odds2": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("1.0")}, + "odds1": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1")}, + "odds2": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("1.0")}, }, err: types.ErrBetAmountIsLow, }, @@ -177,13 +176,13 @@ func TestWager(t *testing.T) { UID: "odds1", MarketUID: "uid_success", Value: "2.52", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, { UID: "odds2", MarketUID: "uid_success", Value: "1.50", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, }, bet: &types.Bet{ @@ -193,11 +192,11 @@ func TestWager(t *testing.T) { Amount: sdkmath.NewInt(1000000), OddsValue: "5", Creator: simapp.TestParamUsers["user1"].Address.String(), - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, betOdds: map[string]*types.BetOddsCompact{ - "odds1": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("0.1")}, - "odds2": {UID: "odds1", MaxLossMultiplier: sdk.MustNewDecFromStr("1.0")}, + "odds1": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1")}, + "odds2": {UID: "odds1", MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("1.0")}, }, }, } diff --git a/x/bet/simulation/decoder_test.go b/x/bet/simulation/decoder_test.go index 4b09ad18..fc6893ad 100644 --- a/x/bet/simulation/decoder_test.go +++ b/x/bet/simulation/decoder_test.go @@ -8,7 +8,6 @@ import ( "github.com/stretchr/testify/require" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" "github.com/sge-network/sge/app" @@ -32,7 +31,7 @@ func TestDecodeStore(t *testing.T) { UID: uuid.NewString(), MarketUID: uuid.NewString(), Value: "100", - MaxLossMultiplier: sdk.NewDec(1), + MaxLossMultiplier: sdkmath.LegacyNewDec(1), }, types.MetaData{ SelectedOddsType: types.OddsType_ODDS_TYPE_DECIMAL, diff --git a/x/bet/types/bet.pb.go b/x/bet/types/bet.pb.go index f975abcd..69067b70 100644 --- a/x/bet/types/bet.pb.go +++ b/x/bet/types/bet.pb.go @@ -6,7 +6,6 @@ package types import ( cosmossdk_io_math "cosmossdk.io/math" 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" @@ -140,7 +139,7 @@ type Bet struct { // settlement_height is the block height at which the bet is settled. SettlementHeight int64 `protobuf:"varint,12,opt,name=settlement_height,json=settlementHeight,proto3" json:"settlement_height,omitempty"` // max_loss_multiplier is the multiplier coefficient of max loss. - MaxLossMultiplier github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,13,opt,name=max_loss_multiplier,json=maxLossMultiplier,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_loss_multiplier"` + MaxLossMultiplier cosmossdk_io_math.LegacyDec `protobuf:"bytes,13,opt,name=max_loss_multiplier,json=maxLossMultiplier,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"max_loss_multiplier"` // bet_fulfillment is the fulfillment data. BetFulfillment []*BetFulfillment `protobuf:"bytes,14,rep,name=bet_fulfillment,json=betFulfillment,proto3" json:"bet_fulfillment,omitempty"` // meta is metadata for bet @@ -555,67 +554,66 @@ func init() { func init() { proto.RegisterFile("sgenetwork/sge/bet/bet.proto", fileDescriptor_7e3a1b484a8c9a09) } var fileDescriptor_7e3a1b484a8c9a09 = []byte{ - // 950 bytes of a gzipped FileDescriptorProto + // 944 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x55, 0x41, 0x6f, 0xe2, 0x46, - 0x14, 0x8e, 0x81, 0x25, 0xcb, 0x4b, 0x42, 0xcc, 0x64, 0xbb, 0xb5, 0xd2, 0x2c, 0x20, 0x4b, 0xad, - 0x90, 0xaa, 0x35, 0x12, 0xab, 0xdd, 0x43, 0x7b, 0x29, 0x60, 0xa7, 0xa1, 0x25, 0x40, 0x07, 0x68, - 0xa5, 0x3d, 0xd4, 0x32, 0x78, 0x42, 0xdc, 0xd8, 0x18, 0x79, 0x86, 0x36, 0xf9, 0x03, 0x3d, 0xf7, - 0x27, 0xf4, 0xe7, 0xec, 0x71, 0x8f, 0x55, 0x0f, 0xa8, 0x25, 0xb7, 0x3d, 0xee, 0x2f, 0xa8, 0x66, - 0x3c, 0x80, 0x51, 0xe9, 0x36, 0x87, 0x84, 0x99, 0x6f, 0xbe, 0xef, 0x9b, 0xf1, 0x9b, 0x37, 0xef, - 0xc1, 0x19, 0x9d, 0x90, 0x29, 0x61, 0xbf, 0x84, 0xd1, 0x4d, 0x95, 0x4e, 0x48, 0x75, 0x44, 0x18, - 0xff, 0x33, 0x66, 0x51, 0xc8, 0x42, 0x84, 0x36, 0xab, 0x06, 0x9d, 0x10, 0x63, 0x44, 0xd8, 0xe9, - 0x93, 0x49, 0x38, 0x09, 0xc5, 0x72, 0x95, 0x8f, 0x62, 0xe6, 0xa9, 0xbe, 0xc3, 0x27, 0x74, 0x5d, - 0x6a, 0xb3, 0xbb, 0x19, 0x89, 0x39, 0xfa, 0xbb, 0x7d, 0x48, 0x37, 0x08, 0x43, 0x65, 0x48, 0xcf, - 0x3d, 0x57, 0x53, 0xca, 0x4a, 0x25, 0xd7, 0xc8, 0x2f, 0x17, 0xa5, 0xf4, 0xb0, 0x65, 0xbe, 0x5b, - 0x94, 0x38, 0x8a, 0xf9, 0x3f, 0xf4, 0x25, 0x40, 0xe0, 0x44, 0x37, 0x84, 0xd9, 0x9c, 0x98, 0x12, - 0xc4, 0x4f, 0x96, 0x8b, 0x52, 0xee, 0x52, 0xa0, 0x31, 0x3d, 0x41, 0xc1, 0x89, 0x31, 0x7a, 0x01, - 0x8f, 0xc5, 0xce, 0x5c, 0x9a, 0x16, 0xd2, 0x8f, 0x97, 0x8b, 0xd2, 0x7e, 0xd7, 0x75, 0x69, 0x2c, - 0x5c, 0x2f, 0xe3, 0xf5, 0x08, 0x3d, 0x03, 0x10, 0xe3, 0x9f, 0x1d, 0x7f, 0x4e, 0xb4, 0x47, 0x5c, - 0x86, 0x73, 0x1c, 0xf9, 0x9e, 0x03, 0xe8, 0x25, 0x64, 0x9d, 0x20, 0x9c, 0x4f, 0x99, 0x96, 0x15, - 0x8e, 0xcf, 0xde, 0x2c, 0x4a, 0x7b, 0x7f, 0x2e, 0x4a, 0x1f, 0x8d, 0x43, 0x1a, 0x84, 0x94, 0xba, - 0x37, 0x86, 0x17, 0x56, 0x03, 0x87, 0x5d, 0x1b, 0xad, 0x29, 0xc3, 0x92, 0x8c, 0xaa, 0x90, 0xbe, - 0x22, 0x44, 0xdb, 0x7f, 0x88, 0x86, 0x33, 0xd1, 0x2b, 0xc8, 0x52, 0xe6, 0xb0, 0x39, 0xd5, 0x1e, - 0x97, 0x95, 0x4a, 0xbe, 0x56, 0x34, 0xfe, 0x7d, 0x03, 0x46, 0x83, 0x30, 0xa3, 0x2f, 0x58, 0x58, - 0xb2, 0xb9, 0x2e, 0x22, 0x74, 0xee, 0x33, 0x2d, 0xf7, 0x61, 0x1d, 0x16, 0x2c, 0x2c, 0xd9, 0x48, - 0x83, 0xfd, 0x71, 0x44, 0x1c, 0x16, 0x46, 0x1a, 0x88, 0x6f, 0x5e, 0x4d, 0x79, 0x40, 0xc4, 0x90, - 0xb8, 0xb6, 0xc3, 0xb4, 0x83, 0xb2, 0x52, 0x49, 0xe3, 0x9c, 0x44, 0xea, 0x0c, 0x7d, 0x0e, 0x05, - 0x4a, 0x18, 0xf3, 0x49, 0x40, 0xa6, 0xcc, 0xbe, 0x26, 0xde, 0xe4, 0x9a, 0x69, 0x87, 0x82, 0xa5, - 0x6e, 0x16, 0x2e, 0x04, 0x8e, 0x7e, 0x84, 0x93, 0xc0, 0xb9, 0xb5, 0xfd, 0x90, 0x52, 0x3b, 0x98, - 0xfb, 0xcc, 0x9b, 0xf9, 0x1e, 0x89, 0xb4, 0x23, 0x11, 0x16, 0x43, 0x86, 0xe5, 0xb3, 0x89, 0xc7, - 0xae, 0xe7, 0x23, 0x63, 0x1c, 0x06, 0xd5, 0x38, 0x42, 0xf2, 0xe7, 0x39, 0x75, 0x6f, 0xaa, 0x3c, - 0x8d, 0xa8, 0x61, 0x92, 0x31, 0x2e, 0x04, 0xce, 0x6d, 0x3b, 0xa4, 0xf4, 0x72, 0x6d, 0x84, 0xbe, - 0x85, 0xe3, 0x11, 0x61, 0xf6, 0xd5, 0xdc, 0xbf, 0xf2, 0x7c, 0x9f, 0x6f, 0xac, 0xe5, 0xcb, 0xe9, - 0xca, 0x41, 0x4d, 0xff, 0x8f, 0x30, 0x9c, 0x6f, 0x98, 0x38, 0x3f, 0xda, 0x9a, 0xa3, 0x57, 0x90, - 0x09, 0x08, 0x73, 0xb4, 0xe3, 0xb2, 0x52, 0x39, 0xa8, 0x9d, 0xed, 0x72, 0xb8, 0x24, 0xcc, 0x31, - 0x1d, 0xe6, 0x34, 0x32, 0xfc, 0xec, 0x58, 0xf0, 0xf5, 0xdf, 0x15, 0xc8, 0xc6, 0xb7, 0x82, 0x9e, - 0x02, 0xea, 0x0f, 0xea, 0x83, 0x61, 0xdf, 0x1e, 0x76, 0xfa, 0x3d, 0xab, 0xd9, 0x3a, 0x6f, 0x59, - 0xa6, 0xba, 0x87, 0x0a, 0x70, 0x24, 0xf1, 0x5e, 0xbb, 0xde, 0xb4, 0x4c, 0x55, 0x41, 0x27, 0x70, - 0x2c, 0xa1, 0x66, 0xbd, 0xd3, 0xb4, 0xda, 0x96, 0xa9, 0xa6, 0x10, 0x82, 0xbc, 0x04, 0xeb, 0x8d, - 0x2e, 0x1e, 0x58, 0xa6, 0x9a, 0x4e, 0x60, 0x3d, 0xab, 0x63, 0xb6, 0x3a, 0x5f, 0xab, 0x19, 0x74, - 0x0a, 0x4f, 0x25, 0x86, 0xad, 0xfe, 0xb0, 0x3d, 0xb0, 0x4d, 0xab, 0xd9, 0xae, 0x63, 0xcb, 0x54, - 0x1f, 0x25, 0xf8, 0x7d, 0x6b, 0x30, 0xe0, 0xbe, 0x59, 0xfd, 0x27, 0xc8, 0xc6, 0xf7, 0xcf, 0x4f, - 0x28, 0x25, 0xdb, 0x27, 0x44, 0x90, 0x97, 0xf8, 0x6a, 0x17, 0x05, 0xe5, 0x01, 0x24, 0xf6, 0x43, - 0xb7, 0xa3, 0xa6, 0xd0, 0x31, 0x1c, 0xc8, 0x79, 0xbb, 0xdb, 0x1f, 0xa8, 0x69, 0xfe, 0x0d, 0x12, - 0xc0, 0xd6, 0xf9, 0xb0, 0x63, 0x5a, 0xa6, 0x9a, 0xd1, 0x2f, 0x20, 0x3b, 0x6c, 0x99, 0xb5, 0x96, - 0xf9, 0x80, 0xe7, 0x7e, 0x06, 0x29, 0xf9, 0xcc, 0x33, 0x8d, 0xc3, 0xe5, 0xa2, 0x94, 0x12, 0xeb, - 0x29, 0xcf, 0xc5, 0x29, 0xcf, 0xd5, 0x2f, 0x00, 0x7a, 0x64, 0xea, 0x7a, 0xd3, 0xc9, 0xc3, 0x8a, - 0x47, 0x22, 0xa7, 0x53, 0x5b, 0x39, 0xad, 0x0f, 0x01, 0xfa, 0x22, 0x37, 0xdd, 0x87, 0x39, 0x7d, - 0x0a, 0x3c, 0x39, 0x58, 0x18, 0xd9, 0x8e, 0xeb, 0x46, 0x84, 0x52, 0x69, 0x78, 0x14, 0xa3, 0xf5, - 0x18, 0xd4, 0xff, 0x4e, 0x41, 0x7e, 0x3b, 0xa9, 0x50, 0x17, 0x4e, 0x66, 0x4e, 0xc4, 0xbc, 0xb1, - 0x37, 0x73, 0xa6, 0x6c, 0x2d, 0x8f, 0xf7, 0x2a, 0xbe, 0x5f, 0x94, 0x4e, 0xef, 0x9c, 0xc0, 0xff, - 0x42, 0xdf, 0x41, 0xd2, 0x31, 0x4a, 0xa0, 0x72, 0x8f, 0x2d, 0x43, 0xe6, 0x85, 0x53, 0xdb, 0x9b, - 0xba, 0xe4, 0x56, 0xc6, 0x6c, 0x97, 0xe1, 0x86, 0x94, 0x34, 0xe4, 0x68, 0x8b, 0x83, 0xe8, 0x3b, - 0x00, 0xfe, 0x66, 0x64, 0x55, 0x8b, 0xeb, 0x64, 0xed, 0x83, 0x15, 0xea, 0xfd, 0xa2, 0x54, 0x88, - 0x37, 0xd9, 0x08, 0x75, 0x9c, 0x1b, 0x11, 0x56, 0x8f, 0xab, 0xdd, 0x6b, 0x38, 0x9a, 0x39, 0x77, - 0xe1, 0x9c, 0xd9, 0xb3, 0x28, 0xbc, 0xf2, 0x98, 0x96, 0x11, 0xae, 0x2f, 0xff, 0xcf, 0xf5, 0xc9, - 0xea, 0xe8, 0x09, 0xad, 0x8e, 0x0f, 0xe3, 0x79, 0x2f, 0x9e, 0xfe, 0xaa, 0xc0, 0xe3, 0xd5, 0xb3, - 0x43, 0xdf, 0x00, 0xa2, 0xc4, 0x27, 0x63, 0x5e, 0x9c, 0xd6, 0x4d, 0x46, 0x04, 0x37, 0xbf, 0xfb, - 0xc1, 0xf2, 0xda, 0x3f, 0xb8, 0x9b, 0x11, 0x5e, 0x9b, 0x62, 0xdd, 0x0a, 0x41, 0x06, 0x9c, 0x6c, - 0x7b, 0xc5, 0x1d, 0x20, 0xbe, 0xe8, 0x42, 0x92, 0x2e, 0x3a, 0x41, 0xe3, 0xab, 0x37, 0xcb, 0xa2, - 0xf2, 0x76, 0x59, 0x54, 0xfe, 0x5a, 0x16, 0x95, 0xdf, 0xee, 0x8b, 0x7b, 0x6f, 0xef, 0x8b, 0x7b, - 0x7f, 0xdc, 0x17, 0xf7, 0x5e, 0x27, 0x0b, 0x18, 0x9d, 0x90, 0xe7, 0xc9, 0x76, 0x78, 0x2b, 0x1a, - 0xa2, 0x28, 0x62, 0xa3, 0xac, 0xe8, 0x86, 0x2f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x9e, - 0xaf, 0xdf, 0x7b, 0x07, 0x00, 0x00, + 0x14, 0x8e, 0x81, 0x25, 0xe1, 0x25, 0x21, 0xce, 0x64, 0xbb, 0xb5, 0xb2, 0x59, 0x40, 0xae, 0x5a, + 0x45, 0xaa, 0x6a, 0x24, 0x56, 0xbb, 0x87, 0xf6, 0x52, 0xc0, 0x4e, 0x43, 0x4b, 0x80, 0x0e, 0xd0, + 0x4a, 0x7b, 0xb1, 0x0c, 0x9e, 0x10, 0x37, 0x36, 0x46, 0x9e, 0xa1, 0x0d, 0x7f, 0xa0, 0xe7, 0xfe, + 0x84, 0xfe, 0x9c, 0x3d, 0xee, 0xb1, 0xea, 0x81, 0xb6, 0xe4, 0xd6, 0xe3, 0xfe, 0x82, 0x6a, 0xc6, + 0x03, 0x18, 0x2d, 0xdd, 0xcd, 0x01, 0x34, 0xf3, 0xcd, 0xf7, 0x7d, 0x6f, 0xfc, 0x66, 0xe6, 0x3d, + 0x38, 0xa3, 0x23, 0x32, 0x26, 0xec, 0x97, 0x30, 0xba, 0x2d, 0xd3, 0x11, 0x29, 0x0f, 0x08, 0xe3, + 0x3f, 0x63, 0x12, 0x85, 0x2c, 0x44, 0x68, 0xbd, 0x6a, 0xd0, 0x11, 0x31, 0x06, 0x84, 0x9d, 0x3e, + 0x1e, 0x85, 0xa3, 0x50, 0x2c, 0x97, 0xf9, 0x28, 0x66, 0x9e, 0xea, 0x5b, 0x7c, 0x42, 0xd7, 0xa5, + 0x36, 0x9b, 0x4d, 0x48, 0xcc, 0xd1, 0xff, 0xda, 0x85, 0x74, 0x8d, 0x30, 0x54, 0x82, 0xf4, 0xd4, + 0x73, 0x35, 0xa5, 0xa4, 0x9c, 0xe7, 0x6a, 0xf9, 0xc5, 0xbc, 0x98, 0xee, 0x37, 0xcc, 0x7f, 0xe7, + 0x45, 0x8e, 0x62, 0xfe, 0x87, 0xbe, 0x02, 0x08, 0x9c, 0xe8, 0x96, 0x30, 0x9b, 0x13, 0x53, 0x82, + 0xf8, 0x74, 0x31, 0x2f, 0xe6, 0xae, 0x04, 0x1a, 0xd3, 0x13, 0x14, 0x9c, 0x18, 0xa3, 0xe7, 0xb0, + 0x27, 0x22, 0x73, 0x69, 0x5a, 0x48, 0x3f, 0x5e, 0xcc, 0x8b, 0xbb, 0x6d, 0xd7, 0xa5, 0xb1, 0x70, + 0xb5, 0x8c, 0x57, 0x23, 0xf4, 0x0c, 0x40, 0x8c, 0x7f, 0x76, 0xfc, 0x29, 0xd1, 0x1e, 0x71, 0x19, + 0xce, 0x71, 0xe4, 0x07, 0x0e, 0xa0, 0x17, 0x90, 0x75, 0x82, 0x70, 0x3a, 0x66, 0x5a, 0x56, 0x38, + 0x3e, 0x7b, 0x3d, 0x2f, 0xee, 0xfc, 0x39, 0x2f, 0x7e, 0x34, 0x0c, 0x69, 0x10, 0x52, 0xea, 0xde, + 0x1a, 0x5e, 0x58, 0x0e, 0x1c, 0x76, 0x63, 0x34, 0xc6, 0x0c, 0x4b, 0x32, 0x2a, 0x43, 0xfa, 0x9a, + 0x10, 0x6d, 0xf7, 0x21, 0x1a, 0xce, 0x44, 0x2f, 0x21, 0x4b, 0x99, 0xc3, 0xa6, 0x54, 0xdb, 0x2b, + 0x29, 0xe7, 0xf9, 0x4a, 0xc1, 0x78, 0xf7, 0x04, 0x8c, 0x1a, 0x61, 0x46, 0x57, 0xb0, 0xb0, 0x64, + 0x73, 0x5d, 0x44, 0xe8, 0xd4, 0x67, 0x5a, 0xee, 0xfd, 0x3a, 0x2c, 0x58, 0x58, 0xb2, 0x91, 0x06, + 0xbb, 0xc3, 0x88, 0x38, 0x2c, 0x8c, 0x34, 0x10, 0xdf, 0xbc, 0x9c, 0xf2, 0x84, 0x88, 0x21, 0x71, + 0x6d, 0x87, 0x69, 0xfb, 0x25, 0xe5, 0x3c, 0x8d, 0x73, 0x12, 0xa9, 0x32, 0xf4, 0x39, 0x1c, 0x53, + 0xc2, 0x98, 0x4f, 0x02, 0x32, 0x66, 0xf6, 0x0d, 0xf1, 0x46, 0x37, 0x4c, 0x3b, 0x10, 0x2c, 0x75, + 0xbd, 0x70, 0x29, 0x70, 0xd4, 0x85, 0x93, 0xc0, 0xb9, 0xb3, 0xfd, 0x90, 0x52, 0x3b, 0x98, 0xfa, + 0xcc, 0x9b, 0xf8, 0x1e, 0x89, 0xb4, 0x43, 0x91, 0x96, 0x4f, 0x64, 0x5a, 0x9e, 0xbe, 0x9b, 0x96, + 0x26, 0x19, 0x39, 0xc3, 0x99, 0x49, 0x86, 0xf8, 0x38, 0x70, 0xee, 0x9a, 0x21, 0xa5, 0x57, 0x2b, + 0x35, 0xfa, 0x0e, 0x8e, 0x06, 0x84, 0xd9, 0xd7, 0x53, 0xff, 0xda, 0xf3, 0x7d, 0x1e, 0x4d, 0xcb, + 0x97, 0xd2, 0xe7, 0xfb, 0x15, 0xfd, 0x7f, 0xbe, 0xfd, 0x62, 0xcd, 0xc4, 0xf9, 0xc1, 0xc6, 0x1c, + 0xbd, 0x84, 0x4c, 0x40, 0x98, 0xa3, 0x1d, 0x95, 0x94, 0xf3, 0xfd, 0xca, 0xd9, 0x36, 0x87, 0x2b, + 0xc2, 0x1c, 0xd3, 0x61, 0x4e, 0x2d, 0xc3, 0x37, 0x8c, 0x05, 0x5f, 0xff, 0x5d, 0x81, 0x6c, 0x7c, + 0x14, 0xe8, 0x09, 0xa0, 0x6e, 0xaf, 0xda, 0xeb, 0x77, 0xed, 0x7e, 0xab, 0xdb, 0xb1, 0xea, 0x8d, + 0x8b, 0x86, 0x65, 0xaa, 0x3b, 0xe8, 0x18, 0x0e, 0x25, 0xde, 0x69, 0x56, 0xeb, 0x96, 0xa9, 0x2a, + 0xe8, 0x04, 0x8e, 0x24, 0x54, 0xaf, 0xb6, 0xea, 0x56, 0xd3, 0x32, 0xd5, 0x14, 0x42, 0x90, 0x97, + 0x60, 0xb5, 0xd6, 0xc6, 0x3d, 0xcb, 0x54, 0xd3, 0x09, 0xac, 0x63, 0xb5, 0xcc, 0x46, 0xeb, 0x1b, + 0x35, 0x83, 0x4e, 0xe1, 0x89, 0xc4, 0xb0, 0xd5, 0xed, 0x37, 0x7b, 0xb6, 0x69, 0xd5, 0x9b, 0x55, + 0x6c, 0x99, 0xea, 0xa3, 0x04, 0xbf, 0x6b, 0xf5, 0x7a, 0xdc, 0x37, 0xab, 0xff, 0x04, 0xd9, 0xf8, + 0xd0, 0xf9, 0x0e, 0xa5, 0x64, 0x73, 0x87, 0x08, 0xf2, 0x12, 0x5f, 0x46, 0x51, 0x50, 0x1e, 0x40, + 0x62, 0x3f, 0xb6, 0x5b, 0x6a, 0x0a, 0x1d, 0xc1, 0xbe, 0x9c, 0x37, 0xdb, 0xdd, 0x9e, 0x9a, 0xe6, + 0xdf, 0x20, 0x01, 0x6c, 0x5d, 0xf4, 0x5b, 0xa6, 0x65, 0xaa, 0x19, 0xfd, 0x12, 0xb2, 0xfd, 0x86, + 0x59, 0x69, 0x98, 0x0f, 0x78, 0xe3, 0x67, 0x90, 0x92, 0x6f, 0x3b, 0x53, 0x3b, 0x58, 0xcc, 0x8b, + 0x29, 0xb1, 0x9e, 0xf2, 0x5c, 0x9c, 0xf2, 0x5c, 0xfd, 0x12, 0xa0, 0x43, 0xc6, 0xae, 0x37, 0x1e, + 0x3d, 0xac, 0x62, 0x24, 0x2e, 0x72, 0x6a, 0xe3, 0x22, 0xeb, 0x7d, 0x80, 0xae, 0xb8, 0x90, 0xee, + 0xc3, 0x9c, 0x3e, 0x05, 0x7e, 0x39, 0x58, 0x18, 0xd9, 0x8e, 0xeb, 0x46, 0x84, 0x52, 0x69, 0x78, + 0x18, 0xa3, 0xd5, 0x18, 0xd4, 0xff, 0x49, 0x41, 0x7e, 0xf3, 0x52, 0xa1, 0x36, 0x9c, 0x4c, 0x9c, + 0x88, 0x79, 0x43, 0x6f, 0xe2, 0x8c, 0xd9, 0x4a, 0x1e, 0xc7, 0x2a, 0xbc, 0x9d, 0x17, 0x4f, 0x67, + 0x4e, 0xe0, 0x7f, 0xa9, 0x6f, 0x21, 0xe9, 0x18, 0x25, 0x50, 0x19, 0x63, 0xc3, 0x90, 0x79, 0xe1, + 0xd8, 0xf6, 0xc6, 0x2e, 0xb9, 0x93, 0x39, 0xdb, 0x66, 0xb8, 0x26, 0x25, 0x0d, 0x39, 0xda, 0xe0, + 0x20, 0xfa, 0x1e, 0x80, 0xbf, 0x19, 0x59, 0xca, 0xe2, 0xe2, 0x58, 0x79, 0x6f, 0x59, 0x7a, 0x3b, + 0x2f, 0x1e, 0xc7, 0x41, 0xd6, 0x42, 0x1d, 0xe7, 0x06, 0x84, 0x55, 0xe3, 0x12, 0xf7, 0x0a, 0x0e, + 0x27, 0xce, 0x2c, 0x9c, 0x32, 0x7b, 0x12, 0x85, 0xd7, 0x1e, 0xd3, 0x32, 0xc2, 0xf5, 0xc5, 0x87, + 0x5c, 0x1f, 0x2f, 0xb7, 0x9e, 0xd0, 0xea, 0xf8, 0x20, 0x9e, 0x77, 0xe2, 0xe9, 0xaf, 0x0a, 0xec, + 0x2d, 0x9f, 0x1d, 0xfa, 0x16, 0x10, 0x25, 0x3e, 0x19, 0xf2, 0x8a, 0xb4, 0xea, 0x2c, 0x22, 0xb9, + 0xf9, 0xed, 0x0f, 0x96, 0x17, 0xfc, 0xde, 0x6c, 0x42, 0x78, 0x41, 0x8a, 0x75, 0x4b, 0x04, 0x19, + 0x70, 0xb2, 0xe9, 0x15, 0x97, 0xfd, 0xf8, 0xa0, 0x8f, 0x93, 0x74, 0x51, 0xfe, 0x6b, 0x5f, 0xbf, + 0x5e, 0x14, 0x94, 0x37, 0x8b, 0x82, 0xf2, 0xf7, 0xa2, 0xa0, 0xfc, 0x76, 0x5f, 0xd8, 0x79, 0x73, + 0x5f, 0xd8, 0xf9, 0xe3, 0xbe, 0xb0, 0xf3, 0xea, 0xb3, 0x91, 0xc7, 0x6e, 0xa6, 0x03, 0x63, 0x18, + 0x06, 0xbc, 0xef, 0x7d, 0x91, 0xec, 0x81, 0x77, 0xa2, 0x0b, 0xf2, 0x6d, 0xd2, 0x41, 0x56, 0xb4, + 0xc0, 0xe7, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x63, 0x11, 0x7a, 0x70, 0x07, 0x00, 0x00, } func (m *Bet) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/bet_odds.pb.go b/x/bet/types/bet_odds.pb.go index 813e089b..ce0a848f 100644 --- a/x/bet/types/bet_odds.pb.go +++ b/x/bet/types/bet_odds.pb.go @@ -4,8 +4,8 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" 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" @@ -36,7 +36,7 @@ type BetOdds struct { // message. Required | NonUnique | "1.286" or "2/7" or "+500" Value string `protobuf:"bytes,3,opt,name=value,proto3" json:"value,omitempty"` // max_loss_multiplier is the factor for calculating max loss for given odds - MaxLossMultiplier github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=max_loss_multiplier,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_loss_multiplier"` + MaxLossMultiplier cosmossdk_io_math.LegacyDec `protobuf:"bytes,4,opt,name=max_loss_multiplier,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"max_loss_multiplier"` } func (m *BetOdds) Reset() { *m = BetOdds{} } @@ -99,7 +99,7 @@ type BetOddsCompact struct { // Required | Unique | uuid-v4 or code UID string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` // max_loss_multiplier is the factor for calculating max loss for given odds - MaxLossMultiplier github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=max_loss_multiplier,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"max_loss_multiplier"` + MaxLossMultiplier cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=max_loss_multiplier,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"max_loss_multiplier"` } func (m *BetOddsCompact) Reset() { *m = BetOddsCompact{} } @@ -150,28 +150,29 @@ func init() { func init() { proto.RegisterFile("sgenetwork/sge/bet/bet_odds.proto", fileDescriptor_cabb5a887005fe34) } var fileDescriptor_cabb5a887005fe34 = []byte{ - // 336 bytes of a gzipped FileDescriptorProto + // 341 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x2c, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0x4f, 0x4a, 0x2d, 0x01, 0xe1, 0xf8, 0xfc, 0x94, 0x94, 0x62, 0xbd, 0x82, 0xa2, 0xfc, 0x92, 0x7c, 0x21, 0x21, 0x84, 0x12, 0xbd, 0xe2, 0xf4, 0x54, 0xbd, 0xa4, 0xd4, 0x12, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0xb4, 0x3e, - 0x88, 0x05, 0x51, 0xa9, 0xd4, 0xcb, 0xc4, 0xc5, 0xee, 0x94, 0x5a, 0xe2, 0x9f, 0x92, 0x52, 0x2c, + 0x88, 0x05, 0x51, 0xa9, 0xd4, 0xc4, 0xc4, 0xc5, 0xee, 0x94, 0x5a, 0xe2, 0x9f, 0x92, 0x52, 0x2c, 0xa4, 0xc0, 0xc5, 0x5c, 0x9a, 0x99, 0x22, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0xe9, 0xc4, 0xf7, 0xe8, 0x9e, 0x3c, 0x73, 0xa8, 0xa7, 0xcb, 0xab, 0x7b, 0xf2, 0x20, 0xd1, 0x20, 0x10, 0x21, 0x64, 0xcd, 0xc5, 0x95, 0x9b, 0x58, 0x94, 0x9d, 0x5a, 0x12, 0x0f, 0x52, 0xc8, 0x04, 0x56, 0x28, 0xfd, 0xe8, 0x9e, 0x3c, 0xa7, 0x2f, 0x58, 0x14, 0xa2, 0x1c, 0x49, 0x49, 0x10, 0x12, 0x5b, 0x48, 0x84, 0x8b, - 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x19, 0xa4, 0x2f, 0x08, 0xc2, 0x11, 0xea, 0x61, 0xe4, + 0xb5, 0x2c, 0x31, 0xa7, 0x34, 0x55, 0x82, 0x19, 0xa4, 0x2f, 0x08, 0xc2, 0x11, 0x6a, 0x64, 0xe4, 0x12, 0xce, 0x4d, 0xac, 0x88, 0xcf, 0xc9, 0x2f, 0x2e, 0x8e, 0xcf, 0x2d, 0xcd, 0x29, 0xc9, 0x2c, - 0xc8, 0xc9, 0x4c, 0x2d, 0x92, 0x60, 0x01, 0x1b, 0x1e, 0x75, 0xe2, 0x9e, 0x3c, 0xc3, 0xad, 0x7b, - 0xf2, 0x6a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xc9, 0xf9, 0xc5, - 0xb9, 0xf9, 0xc5, 0x50, 0x4a, 0xb7, 0x38, 0x25, 0x5b, 0xbf, 0xa4, 0xb2, 0x20, 0xb5, 0x58, 0xcf, - 0x25, 0x35, 0xf9, 0xd1, 0x3d, 0x79, 0x41, 0xdf, 0xc4, 0x0a, 0x9f, 0xfc, 0xe2, 0x62, 0x5f, 0xb8, - 0x51, 0xaf, 0xee, 0xc9, 0x63, 0xb3, 0x21, 0x08, 0x9b, 0xa0, 0xd2, 0x41, 0x46, 0x2e, 0x3e, 0x68, - 0x78, 0x38, 0xe7, 0xe7, 0x16, 0x24, 0x26, 0x97, 0x10, 0x11, 0x2c, 0xb8, 0xfc, 0xc0, 0x34, 0x20, - 0x7e, 0x70, 0x72, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, - 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x64, 0x27, - 0x14, 0xa7, 0xa7, 0xea, 0x22, 0x27, 0xa3, 0x0a, 0x70, 0x42, 0x02, 0x3b, 0x23, 0x89, 0x0d, 0x9c, - 0x38, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x68, 0x38, 0xa4, 0xb5, 0x6b, 0x02, 0x00, 0x00, + 0xc8, 0xc9, 0x4c, 0x2d, 0x92, 0x60, 0x01, 0x1b, 0xee, 0x7f, 0xe2, 0x9e, 0x3c, 0xc3, 0xad, 0x7b, + 0xf2, 0xd2, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, 0xc5, 0x29, 0xd9, 0x7a, 0x99, 0xf9, 0xfa, 0xb9, + 0x89, 0x25, 0x19, 0x7a, 0x3e, 0xa9, 0xe9, 0x89, 0xc9, 0x95, 0x2e, 0xa9, 0xc9, 0x8f, 0xee, 0xc9, + 0x0b, 0xfa, 0x26, 0x56, 0xf8, 0xe4, 0x17, 0x17, 0xfb, 0xc2, 0xf5, 0xbf, 0xba, 0x27, 0x8f, 0xcd, + 0xd8, 0x20, 0x6c, 0x82, 0x4a, 0xdb, 0x18, 0xb9, 0xf8, 0xa0, 0x81, 0xe0, 0x9c, 0x9f, 0x5b, 0x90, + 0x98, 0x5c, 0x42, 0x44, 0x58, 0xe0, 0x72, 0x38, 0x13, 0xfd, 0x1c, 0xee, 0xe4, 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, 0x6a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, + 0xc9, 0xf9, 0xb9, 0xa0, 0x44, 0xa2, 0x8b, 0x9c, 0x60, 0x2a, 0xc0, 0x49, 0xa6, 0xa4, 0xb2, 0x20, + 0xb5, 0x38, 0x89, 0x0d, 0x9c, 0x0c, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x49, 0xc4, 0x29, + 0xe1, 0x55, 0x02, 0x00, 0x00, } func (m *BetOdds) Marshal() (dAtA []byte, err error) { diff --git a/x/bet/types/expected_keepers.go b/x/bet/types/expected_keepers.go index 9828270a..7feab15c 100644 --- a/x/bet/types/expected_keepers.go +++ b/x/bet/types/expected_keepers.go @@ -39,9 +39,9 @@ type OrderbookKeeper interface { ProcessWager( ctx sdk.Context, betUID, bookUID, oddsUID string, - maxLossMultiplier sdk.Dec, + maxLossMultiplier sdkmath.LegacyDec, betAmount sdkmath.Int, - payoutProfit sdk.Dec, + payoutProfit sdkmath.LegacyDec, bettorAddress sdk.AccAddress, betFee sdkmath.Int, oddsVal string, diff --git a/x/bet/types/odds_type.go b/x/bet/types/odds_type.go index aa289879..f6cfa7da 100644 --- a/x/bet/types/odds_type.go +++ b/x/bet/types/odds_type.go @@ -3,27 +3,26 @@ package types import ( sdkerrors "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" ) // CalculateDecimalPayout calculates total payout of a certain bet amount by decimal odds calculations -func CalculateDecimalPayout(oddsVal string, amount sdkmath.Int) (sdk.Dec, error) { - // decimal odds value should be sdk.Dec, so convert it directly - oddsDecVal, err := sdk.NewDecFromStr(oddsVal) +func CalculateDecimalPayout(oddsVal string, amount sdkmath.Int) (sdkmath.LegacyDec, error) { + // decimal odds value should be sdkmath.LegacyDec, so convert it directly + oddsDecVal, err := sdkmath.LegacyNewDecFromStr(oddsVal) if err != nil { - return sdk.ZeroDec(), + return sdkmath.LegacyZeroDec(), sdkerrors.Wrapf(ErrDecimalOddsIncorrectFormat, "%s", err) } // odds value should not be negative or zero if !oddsDecVal.IsPositive() { - return sdk.ZeroDec(), + return sdkmath.LegacyZeroDec(), sdkerrors.Wrapf(ErrDecimalOddsShouldBePositive, "%s", oddsVal) } // odds value should not be less than 1 - if oddsDecVal.LTE(sdk.OneDec()) { - return sdk.ZeroDec(), + if oddsDecVal.LTE(sdkmath.LegacyOneDec()) { + return sdkmath.LegacyZeroDec(), sdkerrors.Wrapf(ErrDecimalOddsCanNotBeLessThanOne, "%s", oddsVal) } @@ -35,28 +34,28 @@ func CalculateDecimalPayout(oddsVal string, amount sdkmath.Int) (sdk.Dec, error) } // CalculateBetAmount calculates bet amount -func CalculateDecimalBetAmount(oddsVal string, payoutProfit sdk.Dec) (sdk.Dec, error) { - // decimal odds value should be sdk.Dec, so convert it directly - oddsDecVal, err := sdk.NewDecFromStr(oddsVal) +func CalculateDecimalBetAmount(oddsVal string, payoutProfit sdkmath.LegacyDec) (sdkmath.LegacyDec, error) { + // decimal odds value should be sdkmath.LegacyDec, so convert it directly + oddsDecVal, err := sdkmath.LegacyNewDecFromStr(oddsVal) if err != nil { - return sdk.ZeroDec(), + return sdkmath.LegacyZeroDec(), sdkerrors.Wrapf(ErrDecimalOddsIncorrectFormat, "%s", err) } // odds value should not be negative or zero if !oddsDecVal.IsPositive() { - return sdk.ZeroDec(), + return sdkmath.LegacyZeroDec(), sdkerrors.Wrapf(ErrDecimalOddsShouldBePositive, "%s", oddsVal) } // odds value should not be less than 1 - if oddsDecVal.LTE(sdk.OneDec()) { - return sdk.ZeroDec(), + if oddsDecVal.LTE(sdkmath.LegacyOneDec()) { + return sdkmath.LegacyZeroDec(), sdkerrors.Wrapf(ErrDecimalOddsCanNotBeLessThanOne, "%s", oddsVal) } // calculate bet amount - betAmount := payoutProfit.Quo(oddsDecVal.Sub(sdk.OneDec())) + betAmount := payoutProfit.Quo(oddsDecVal.Sub(sdkmath.LegacyOneDec())) // get the integer part of the bet amount return betAmount, nil diff --git a/x/bet/types/payout.go b/x/bet/types/payout.go index 99c69b47..f54d7dd3 100644 --- a/x/bet/types/payout.go +++ b/x/bet/types/payout.go @@ -2,38 +2,37 @@ package types import ( sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" ) // CalculatePayoutProfit calculates the amount of payout profit portion according to bet odds value and amount -func CalculatePayoutProfit(oddsVal string, amount sdkmath.Int) (sdk.Dec, error) { +func CalculatePayoutProfit(oddsVal string, amount sdkmath.Int) (sdkmath.LegacyDec, error) { payout, err := calculatePayout(oddsVal, amount) if err != nil { - return sdk.ZeroDec(), err + return sdkmath.LegacyZeroDec(), err } // bettor profit is the subtracted amount of payout from bet amount - profit := payout.Sub(sdk.NewDecFromInt(amount)) + profit := payout.Sub(sdkmath.LegacyNewDecFromInt(amount)) return profit, nil } // calculatePayout calculates the amount of payout according to bet odds value and amount -func calculatePayout(oddsVal string, amount sdkmath.Int) (sdk.Dec, error) { +func calculatePayout(oddsVal string, amount sdkmath.Int) (sdkmath.LegacyDec, error) { // total payout should be paid to bettor payout, err := CalculateDecimalPayout(oddsVal, amount) if err != nil { - return sdk.ZeroDec(), err + return sdkmath.LegacyZeroDec(), err } return payout, nil } // CalculateBetAmount calculates the amount of bet according to bet odds value and payout profit -func CalculateBetAmount(oddsVal string, payoutProfit sdk.Dec) (sdk.Dec, error) { +func CalculateBetAmount(oddsVal string, payoutProfit sdkmath.LegacyDec) (sdkmath.LegacyDec, error) { betAmount, err := calculateBetAmount(oddsVal, payoutProfit) if err != nil { - return sdk.ZeroDec(), err + return sdkmath.LegacyZeroDec(), err } return betAmount, nil @@ -43,12 +42,12 @@ func CalculateBetAmount(oddsVal string, payoutProfit sdk.Dec) (sdk.Dec, error) { // and returns the int and the truncated decimal part. func CalculateBetAmountInt( oddsVal string, - payoutProfit sdk.Dec, - truncatedBetAmount sdk.Dec, -) (sdkmath.Int, sdk.Dec, error) { + payoutProfit sdkmath.LegacyDec, + truncatedBetAmount sdkmath.LegacyDec, +) (sdkmath.Int, sdkmath.LegacyDec, error) { expectedBetAmountDec, err := CalculateBetAmount(oddsVal, payoutProfit) if err != nil { - return sdkmath.Int{}, sdk.Dec{}, err + return sdkmath.Int{}, sdkmath.LegacyDec{}, err } // add previous loop truncated value to the calculated bet amount expectedBetAmountDec = expectedBetAmountDec.Add(truncatedBetAmount) @@ -58,17 +57,17 @@ func CalculateBetAmountInt( betAmount := expectedBetAmountDec.RoundInt() // save the truncated amount in the calculations for the next loop - truncatedBetAmount = truncatedBetAmount.Add(expectedBetAmountDec.Sub(sdk.NewDecFromInt(betAmount))) + truncatedBetAmount = truncatedBetAmount.Add(expectedBetAmountDec.Sub(sdkmath.LegacyNewDecFromInt(betAmount))) return betAmount, truncatedBetAmount, nil } // calculateBetAmount calculates the amount of bet according to bet odds value and payoutProfit -func calculateBetAmount(oddsVal string, payoutProfit sdk.Dec) (sdk.Dec, error) { +func calculateBetAmount(oddsVal string, payoutProfit sdkmath.LegacyDec) (sdkmath.LegacyDec, error) { // total payout should be paid to bettor betAmount, err := CalculateDecimalBetAmount(oddsVal, payoutProfit) if err != nil { - return sdk.ZeroDec(), err + return sdkmath.LegacyZeroDec(), err } return betAmount, nil diff --git a/x/bet/types/ticket.go b/x/bet/types/ticket.go index 31b42e49..ec00a01c 100644 --- a/x/bet/types/ticket.go +++ b/x/bet/types/ticket.go @@ -4,7 +4,7 @@ import ( "strings" sdkerrors "cosmossdk.io/errors" - sdk "github.com/cosmos/cosmos-sdk/types" + sdkmath "cosmossdk.io/math" "github.com/sge-network/sge/utils" ) @@ -50,11 +50,11 @@ func (payload *WagerTicketPayload) ValidateOdds() error { return ErrEmptyOddsValue } - if payload.SelectedOdds.MaxLossMultiplier.IsNil() || payload.SelectedOdds.MaxLossMultiplier.LTE(sdk.ZeroDec()) { + if payload.SelectedOdds.MaxLossMultiplier.IsNil() || payload.SelectedOdds.MaxLossMultiplier.LTE(sdkmath.LegacyZeroDec()) { return ErrMaxLossMultiplierCanNotBeZero } - if payload.SelectedOdds.MaxLossMultiplier.GT(sdk.OneDec()) { + if payload.SelectedOdds.MaxLossMultiplier.GT(sdkmath.LegacyOneDec()) { return ErrMaxLossMultiplierCanNotBeMoreThanOne } @@ -66,11 +66,11 @@ func (payload *WagerTicketPayload) ValidateCompactOdds(odds BetOddsCompact) erro return ErrInvalidOddsUID } - if odds.MaxLossMultiplier.IsNil() || odds.MaxLossMultiplier.LTE(sdk.ZeroDec()) { + if odds.MaxLossMultiplier.IsNil() || odds.MaxLossMultiplier.LTE(sdkmath.LegacyZeroDec()) { return ErrMaxLossMultiplierCanNotBeZero } - if odds.MaxLossMultiplier.GT(sdk.OneDec()) { + if odds.MaxLossMultiplier.GT(sdkmath.LegacyOneDec()) { return ErrMaxLossMultiplierCanNotBeMoreThanOne } diff --git a/x/bet/types/ticket_test.go b/x/bet/types/ticket_test.go index 523fdb04..2c10c22f 100644 --- a/x/bet/types/ticket_test.go +++ b/x/bet/types/ticket_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - sdk "github.com/cosmos/cosmos-sdk/types" + sdkmath "cosmossdk.io/math" sgetypes "github.com/sge-network/sge/types" "github.com/sge-network/sge/x/bet/types" @@ -24,7 +24,7 @@ func TestTicketFieldsValidation(t *testing.T) { MarketUID: "6e31c60f-2025-48ce-ae79-1dc110f16355", UID: " ", Value: "10", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, kyc: sgetypes.KycDataPayload{ Ignore: true, @@ -39,7 +39,7 @@ func TestTicketFieldsValidation(t *testing.T) { MarketUID: " ", UID: "6e31c60f-2025-48ce-ae79-1dc110f16355", Value: "10", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, kyc: sgetypes.KycDataPayload{ Approved: true, @@ -53,7 +53,7 @@ func TestTicketFieldsValidation(t *testing.T) { MarketUID: "6e31c60f-2025-48ce-ae79-1dc110f16355", UID: "6e31c60f-2025-48ce-ae79-1dc110f16355", Value: "", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, kyc: sgetypes.KycDataPayload{ Approved: true, @@ -67,7 +67,7 @@ func TestTicketFieldsValidation(t *testing.T) { MarketUID: "6e31c60f-2025-48ce-ae79-1dc110f16355", UID: "6e31c60f-2025-48ce-ae79-1dc110f16355", Value: "10", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, err: types.ErrUserKycFailed, }, @@ -77,7 +77,7 @@ func TestTicketFieldsValidation(t *testing.T) { MarketUID: "6e31c60f-2025-48ce-ae79-1dc110f16355", UID: "6e31c60f-2025-48ce-ae79-1dc110f16355", Value: "10", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, kyc: sgetypes.KycDataPayload{ Approved: true, @@ -91,7 +91,7 @@ func TestTicketFieldsValidation(t *testing.T) { MarketUID: "6e31c60f-2025-48ce-ae79-1dc110f16355", UID: "6e31c60f-2025-48ce-ae79-1dc110f16355", Value: "10", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, kyc: sgetypes.KycDataPayload{ Approved: true, diff --git a/x/house/keeper/params.go b/x/house/keeper/params.go index 9fd0033c..d2e6293c 100644 --- a/x/house/keeper/params.go +++ b/x/house/keeper/params.go @@ -24,7 +24,7 @@ func (k Keeper) GetMinAllowedDepositAmount(ctx sdk.Context) (res sdkmath.Int) { } // GetHouseParticipationFee returns % of deposit to be paid for house participation by an account -func (k Keeper) GetHouseParticipationFee(ctx sdk.Context) (res sdk.Dec) { +func (k Keeper) GetHouseParticipationFee(ctx sdk.Context) (res sdkmath.LegacyDec) { return k.GetParams(ctx).HouseParticipationFee } diff --git a/x/house/simulation/genesis.go b/x/house/simulation/genesis.go index 1e665afc..1bdff9e8 100644 --- a/x/house/simulation/genesis.go +++ b/x/house/simulation/genesis.go @@ -10,7 +10,6 @@ import ( "github.com/spf13/cast" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/sge-network/sge/x/house/types" @@ -23,8 +22,8 @@ const ( ) // GenHouseParticipationFee randomized batch settlement count -func GenHouseParticipationFee(r *rand.Rand) sdk.Dec { - return sdk.NewDec(cast.ToInt64(r.Intn(99))) +func GenHouseParticipationFee(r *rand.Rand) sdkmath.LegacyDec { + return sdkmath.LegacyNewDec(cast.ToInt64(r.Intn(99))) } // GenMinDeposit randomized house by uid query count @@ -34,7 +33,7 @@ func GenMinDeposit(r *rand.Rand) sdkmath.Int { // RandomizedGenState generates a random GenesisState for house func RandomizedGenState(simState *module.SimulationState) { - var houseParticipationFee sdk.Dec + var houseParticipationFee sdkmath.LegacyDec simState.AppParams.GetOrGenerate( simState.Cdc, HouseParticipationFee, &houseParticipationFee, simState.Rand, func(r *rand.Rand) { houseParticipationFee = GenHouseParticipationFee(r) }, diff --git a/x/house/simulation/genesis_test.go b/x/house/simulation/genesis_test.go index f09e823b..7f555469 100644 --- a/x/house/simulation/genesis_test.go +++ b/x/house/simulation/genesis_test.go @@ -11,7 +11,6 @@ import ( sdkmath "cosmossdk.io/math" "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" @@ -44,7 +43,7 @@ func TestRandomizedGenState(t *testing.T) { var houseGenesis types.GenesisState simState.Cdc.MustUnmarshalJSON(simState.GenState[types.ModuleName], &houseGenesis) - require.Equal(t, sdk.NewDecWithPrec(1, 1), houseGenesis.Params.HouseParticipationFee) + require.Equal(t, sdkmath.LegacyNewDecWithPrec(1, 1), houseGenesis.Params.HouseParticipationFee) require.Equal(t, sdkmath.NewInt(100), houseGenesis.Params.MinDeposit) } diff --git a/x/house/types/deposit.go b/x/house/types/deposit.go index 4f6b5a4e..56dee1f3 100644 --- a/x/house/types/deposit.go +++ b/x/house/types/deposit.go @@ -4,7 +4,6 @@ import ( yaml "gopkg.in/yaml.v2" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" ) // NewDeposit creates a new deposit object @@ -33,6 +32,6 @@ func (d *Deposit) String() string { } // CalcHouseParticipationFeeAmount sets participation fee amount for house -func (d *Deposit) CalcHouseParticipationFeeAmount(feePercentage sdk.Dec) sdkmath.Int { +func (d *Deposit) CalcHouseParticipationFeeAmount(feePercentage sdkmath.LegacyDec) sdkmath.Int { return feePercentage.MulInt(d.Amount).RoundInt() } diff --git a/x/house/types/params.go b/x/house/types/params.go index b09a916d..ad192a3d 100644 --- a/x/house/types/params.go +++ b/x/house/types/params.go @@ -34,7 +34,7 @@ func ParamKeyTable() paramtypes.KeyTable { } // NewParams creates a new Params instance -func NewParams(minDeposit sdkmath.Int, houseParticipationFee sdk.Dec, maxWithdrawalCount uint64) Params { +func NewParams(minDeposit sdkmath.Int, houseParticipationFee sdkmath.LegacyDec, maxWithdrawalCount uint64) Params { return Params{ MinDeposit: minDeposit, HouseParticipationFee: houseParticipationFee, @@ -67,7 +67,7 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { func DefaultParams() Params { return NewParams( sdkmath.NewInt(DefaultMinDeposit), - sdk.MustNewDecFromStr(DefaultHouseParticipationFee), + sdkmath.LegacyMustNewDecFromStr(DefaultHouseParticipationFee), DefaultMaxWithdrawalCount, ) } @@ -106,12 +106,12 @@ func validateMinimumDeposit(i interface{}) error { // validateHouseParticipationFee performs validation of house participation fee func validateHouseParticipationFee(i interface{}) error { - v, ok := i.(sdk.Dec) + v, ok := i.(sdkmath.LegacyDec) if !ok { return fmt.Errorf("invalid parameter type: %T", i) } - if v.LT(sdk.ZeroDec()) { + if v.LT(sdkmath.LegacyZeroDec()) { return fmt.Errorf("house participation fee cannot be lower than 0: %d", v) } diff --git a/x/house/types/params.pb.go b/x/house/types/params.pb.go index 2d59db76..377eb13d 100644 --- a/x/house/types/params.pb.go +++ b/x/house/types/params.pb.go @@ -6,7 +6,6 @@ package types import ( cosmossdk_io_math "cosmossdk.io/math" 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" @@ -31,7 +30,7 @@ type Params struct { MinDeposit cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=min_deposit,json=minDeposit,proto3,customtype=cosmossdk.io/math.Int" json:"min_deposit" yaml:"min_deposit"` // house_participation_fee is the % of the deposit to be paid for a house // participation by the depositor. - HouseParticipationFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=house_participation_fee,json=houseParticipationFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"house_participation_fee"` + HouseParticipationFee cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=house_participation_fee,json=houseParticipationFee,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"house_participation_fee"` // max_withdrawal_count is the maximum number of withdrawals allowed // per participation index. MaxWithdrawalCount uint64 `protobuf:"varint,3,opt,name=max_withdrawal_count,json=maxWithdrawalCount,proto3" json:"max_withdrawal_count,omitempty" yaml:"max_withdrawal_count"` @@ -83,28 +82,28 @@ func init() { func init() { proto.RegisterFile("sgenetwork/sge/house/params.proto", fileDescriptor_a973c755b8200942) } var fileDescriptor_a973c755b8200942 = []byte{ - // 335 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x31, 0x6b, 0xc2, 0x40, - 0x14, 0xc7, 0x13, 0x2b, 0x42, 0xd3, 0x2d, 0x28, 0x95, 0x16, 0x12, 0x9b, 0xa1, 0xb8, 0x78, 0x19, - 0xdc, 0x1c, 0x53, 0x29, 0x74, 0xb3, 0x52, 0x28, 0x74, 0x09, 0x67, 0xf2, 0xbc, 0x1c, 0x7a, 0x79, - 0x21, 0x77, 0xa2, 0x7e, 0x8b, 0x8e, 0xdd, 0xda, 0x8f, 0xe3, 0xe8, 0x58, 0x3a, 0x84, 0xa2, 0xdf, - 0xc0, 0x4f, 0x50, 0x3c, 0x43, 0x9b, 0xa1, 0xd3, 0xdd, 0x3d, 0x7e, 0xef, 0xfd, 0xfe, 0xdc, 0xb3, - 0x6e, 0x24, 0x83, 0x14, 0xd4, 0x12, 0xf3, 0x99, 0x2f, 0x19, 0xf8, 0x09, 0x2e, 0x24, 0xf8, 0x19, - 0xcd, 0xa9, 0x90, 0x24, 0xcb, 0x51, 0xa1, 0xdd, 0xfc, 0x43, 0x88, 0x64, 0x40, 0x34, 0x72, 0xd5, - 0x64, 0xc8, 0x50, 0x03, 0xfe, 0xf1, 0x76, 0x62, 0xbd, 0xf7, 0x9a, 0xd5, 0x18, 0xe9, 0x66, 0xfb, - 0xc9, 0xba, 0x10, 0x3c, 0x0d, 0x63, 0xc8, 0x50, 0x72, 0xd5, 0x36, 0x3b, 0x66, 0xf7, 0x3c, 0xe8, - 0x6f, 0x0a, 0xd7, 0xf8, 0x2a, 0xdc, 0x56, 0x84, 0x52, 0xa0, 0x94, 0xf1, 0x8c, 0x70, 0xf4, 0x05, - 0x55, 0x09, 0x79, 0x48, 0xd5, 0xa1, 0x70, 0xed, 0x35, 0x15, 0xf3, 0x81, 0x57, 0xe9, 0xf4, 0xc6, - 0x96, 0xe0, 0xe9, 0xf0, 0xf4, 0xb0, 0xa7, 0xd6, 0xa5, 0xf6, 0x87, 0x19, 0xcd, 0x15, 0x8f, 0x78, - 0x46, 0x15, 0xc7, 0x34, 0x9c, 0x02, 0xb4, 0x6b, 0xda, 0x40, 0x4a, 0xc3, 0x2d, 0xe3, 0x2a, 0x59, - 0x4c, 0x48, 0x84, 0xc2, 0x3f, 0xc9, 0xca, 0xa3, 0x27, 0xe3, 0x99, 0xaf, 0xd6, 0x19, 0x48, 0x32, - 0x84, 0x68, 0xdc, 0xd2, 0xe3, 0x46, 0xd5, 0x69, 0xf7, 0x00, 0xf6, 0xa3, 0xd5, 0x14, 0x74, 0x15, - 0x2e, 0xb9, 0x4a, 0xe2, 0x9c, 0x2e, 0xe9, 0x3c, 0x8c, 0x70, 0x91, 0xaa, 0xf6, 0x59, 0xc7, 0xec, - 0xd6, 0x03, 0xf7, 0x50, 0xb8, 0xd7, 0x65, 0xd2, 0x7f, 0x28, 0x6f, 0x6c, 0x0b, 0xba, 0x7a, 0xfe, - 0xad, 0xde, 0x1d, 0x8b, 0x83, 0xfa, 0xdb, 0x87, 0x6b, 0x04, 0xc1, 0x66, 0xe7, 0x98, 0xdb, 0x9d, - 0x63, 0x7e, 0xef, 0x1c, 0xf3, 0x75, 0xef, 0x18, 0xdb, 0xbd, 0x63, 0x7c, 0xee, 0x1d, 0xe3, 0xa5, - 0x5b, 0x49, 0x2c, 0x19, 0xf4, 0xaa, 0x6b, 0x59, 0x95, 0x8b, 0xd1, 0xb9, 0x27, 0x0d, 0xfd, 0xd9, - 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9c, 0xeb, 0x04, 0xd7, 0xbd, 0x01, 0x00, 0x00, + // 331 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x41, 0x4b, 0x02, 0x41, + 0x14, 0xc7, 0x77, 0x4d, 0x84, 0xb6, 0xdb, 0xa2, 0x24, 0x09, 0xbb, 0xb6, 0x5d, 0xbc, 0xb4, 0x7b, + 0xf0, 0xe6, 0x71, 0x93, 0x20, 0xe8, 0x60, 0x12, 0x04, 0x75, 0x58, 0xc6, 0xf5, 0x35, 0x3b, 0xe8, + 0xcc, 0x1b, 0x76, 0x46, 0xd4, 0x6f, 0xd1, 0xa1, 0x43, 0xc7, 0x3e, 0x8e, 0x47, 0x8f, 0xd1, 0x61, + 0x09, 0xfd, 0x06, 0x7e, 0x82, 0x70, 0x94, 0x12, 0xea, 0x36, 0xf3, 0xf8, 0xbd, 0xf7, 0x7b, 0xbc, + 0xbf, 0x73, 0xae, 0x28, 0x08, 0xd0, 0x53, 0xcc, 0x47, 0x91, 0xa2, 0x10, 0x65, 0x38, 0x51, 0x10, + 0x49, 0x92, 0x13, 0xae, 0x42, 0x99, 0xa3, 0x46, 0xb7, 0xfa, 0x8b, 0x84, 0x8a, 0x42, 0x68, 0x90, + 0xb3, 0x2a, 0x45, 0x8a, 0x06, 0x88, 0xb6, 0xaf, 0x1d, 0x1b, 0xbc, 0x96, 0x9c, 0x4a, 0xcf, 0x34, + 0xbb, 0xf7, 0xce, 0x09, 0x67, 0x22, 0x19, 0x82, 0x44, 0xc5, 0x74, 0xdd, 0x6e, 0xda, 0xad, 0xe3, + 0xb8, 0xbd, 0x28, 0x7c, 0xeb, 0xb3, 0xf0, 0x6b, 0x29, 0x2a, 0x8e, 0x4a, 0x0d, 0x47, 0x21, 0xc3, + 0x88, 0x13, 0x9d, 0x85, 0x37, 0x42, 0x6f, 0x0a, 0xdf, 0x9d, 0x13, 0x3e, 0xee, 0x04, 0x07, 0x9d, + 0x41, 0xdf, 0xe1, 0x4c, 0x74, 0x77, 0x1f, 0xf7, 0xc9, 0x39, 0x35, 0xfe, 0x44, 0x92, 0x5c, 0xb3, + 0x94, 0x49, 0xa2, 0x19, 0x8a, 0xe4, 0x19, 0xa0, 0x5e, 0x32, 0x86, 0x8b, 0xbd, 0xa1, 0xf1, 0xd7, + 0x70, 0x0b, 0x94, 0xa4, 0xf3, 0x2e, 0xa4, 0xfd, 0x9a, 0x99, 0xd1, 0x3b, 0x1c, 0x71, 0x0d, 0xe0, + 0xde, 0x39, 0x55, 0x4e, 0x66, 0xc9, 0x94, 0xe9, 0x6c, 0x98, 0x93, 0x29, 0x19, 0x27, 0x29, 0x4e, + 0x84, 0xae, 0x1f, 0x35, 0xed, 0x56, 0x39, 0xf6, 0x37, 0x85, 0xdf, 0xd8, 0xaf, 0xf7, 0x0f, 0x15, + 0xf4, 0x5d, 0x4e, 0x66, 0x0f, 0x3f, 0xd5, 0xab, 0x6d, 0xb1, 0x53, 0x7e, 0x7b, 0xf7, 0xad, 0x38, + 0x5e, 0xac, 0x3c, 0x7b, 0xb9, 0xf2, 0xec, 0xaf, 0x95, 0x67, 0xbf, 0xac, 0x3d, 0x6b, 0xb9, 0xf6, + 0xac, 0x8f, 0xb5, 0x67, 0x3d, 0xb6, 0x28, 0xd3, 0xd9, 0x64, 0x10, 0xa6, 0xc8, 0xb7, 0xf7, 0xbf, + 0x3c, 0xcc, 0x62, 0xb6, 0x4f, 0x43, 0xcf, 0x25, 0xa8, 0x41, 0xc5, 0x5c, 0xb8, 0xfd, 0x1d, 0x00, + 0x00, 0xff, 0xff, 0x38, 0xab, 0xc1, 0xbc, 0xb2, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/abci.go b/x/mint/abci.go index 44dfd389..7ff22cc8 100644 --- a/x/mint/abci.go +++ b/x/mint/abci.go @@ -5,6 +5,7 @@ import ( "github.com/spf13/cast" + sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/mint/types" @@ -52,7 +53,7 @@ func BeginBlocker(ctx sdk.Context, k keeper.Keeper) { } // if the inflation rate is zero, means that we have no minting, so the rest of the code should not be called - if minter.Inflation.Equal(sdk.ZeroDec()) { + if minter.Inflation.Equal(sdkmath.LegacyZeroDec()) { return } diff --git a/x/mint/keeper/minter.go b/x/mint/keeper/minter.go index c6bcc1af..a5e24f1b 100644 --- a/x/mint/keeper/minter.go +++ b/x/mint/keeper/minter.go @@ -40,7 +40,7 @@ func (k Keeper) TokenSupply(ctx sdk.Context, denom string) sdkmath.Int { // BondedRatio implements an alias call to the underlying staking keeper's // to be used in BeginBlocker. -func (k Keeper) BondedRatio(ctx sdk.Context) sdk.Dec { +func (k Keeper) BondedRatio(ctx sdk.Context) sdkmath.LegacyDec { return k.stakingKeeper.BondedRatio(ctx) } diff --git a/x/mint/keeper/minter_test.go b/x/mint/keeper/minter_test.go index 20797dba..bf6808df 100644 --- a/x/mint/keeper/minter_test.go +++ b/x/mint/keeper/minter_test.go @@ -26,7 +26,7 @@ func TestStakingTokenSupply(t *testing.T) { func TestBondedRatio(t *testing.T) { k, ctx := setupKeeper(t) bondedRatio := k.BondedRatio(ctx) - expectedBondedRatio, _ := sdk.NewDecFromStr("0.000998003992015968") + expectedBondedRatio, _ := sdkmath.LegacyNewDecFromStr("0.000998003992015968") require.Equal(t, expectedBondedRatio, bondedRatio) } diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index 72a1aa7c..813823dd 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/require" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" "github.com/sge-network/sge/app" @@ -18,7 +18,7 @@ func TestDecodeStore(t *testing.T) { cdc := app.MakeEncodingConfig().Marshaler dec := simulation.NewDecodeStore(cdc) - minter := types.NewMinter(sdk.OneDec(), sdk.NewDec(15), 1, sdk.NewDec(0)) + minter := types.NewMinter(sdkmath.LegacyOneDec(), sdkmath.LegacyNewDec(15), 1, sdkmath.LegacyNewDec(0)) kvPairs := kv.Pairs{ Pairs: []kv.Pair{ diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index 417a38fe..cb4cf51d 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -7,7 +7,7 @@ import ( //#nosec "math/rand" - sdk "github.com/cosmos/cosmos-sdk/types" + sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/types/module" "github.com/sge-network/sge/app/params" @@ -20,19 +20,19 @@ const ( ) // GenInflation randomized Inflation -func GenInflation(r *rand.Rand) sdk.Dec { - return sdk.NewDec(int64(r.Intn(99))).QuoInt64(100) +func GenInflation(r *rand.Rand) sdkmath.LegacyDec { + return sdkmath.LegacyNewDec(int64(r.Intn(99))).QuoInt64(100) } // GenBlocksPerYear randomized BlocksPerYear -func GenBlocksPerYear(_ *rand.Rand) sdk.Dec { - return sdk.NewDec(types.BlocksPerYear) +func GenBlocksPerYear(_ *rand.Rand) sdkmath.LegacyDec { + return sdkmath.LegacyNewDec(types.BlocksPerYear) } // RandomizedGenState generates a random GenesisState for mint func RandomizedGenState(simState *module.SimulationState) { // minter - var inflation sdk.Dec + var inflation sdkmath.LegacyDec simState.AppParams.GetOrGenerate( simState.Cdc, Inflation, &inflation, simState.Rand, func(r *rand.Rand) { inflation = GenInflation(r) }, diff --git a/x/mint/types/expected_keepers.go b/x/mint/types/expected_keepers.go index c88a889a..dbd4f9c5 100644 --- a/x/mint/types/expected_keepers.go +++ b/x/mint/types/expected_keepers.go @@ -8,7 +8,7 @@ import ( // StakingKeeper defines the expected staking keeper type StakingKeeper interface { StakingTokenSupply(ctx sdk.Context) sdkmath.Int - BondedRatio(ctx sdk.Context) sdk.Dec + BondedRatio(ctx sdk.Context) sdkmath.LegacyDec } // AccountKeeper defines the contract required for account APIs. diff --git a/x/mint/types/genesis_test.go b/x/mint/types/genesis_test.go index 5e02b62f..03059cba 100644 --- a/x/mint/types/genesis_test.go +++ b/x/mint/types/genesis_test.go @@ -6,7 +6,6 @@ import ( "github.com/stretchr/testify/require" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sge-network/sge/x/mint/types" ) @@ -75,7 +74,7 @@ func TestGenesisStateValidate(t *testing.T) { MintDenom: types.DefaultParams().MintDenom, BlocksPerYear: types.DefaultParams().BlocksPerYear, Phases: []types.Phase{ - {YearCoefficient: sdk.MustNewDecFromStr("0"), Inflation: sdk.MustNewDecFromStr("0")}, + {YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0"), Inflation: sdkmath.LegacyMustNewDecFromStr("0")}, }, ExcludeAmount: types.DefaultParams().ExcludeAmount, }, @@ -103,7 +102,7 @@ func TestGenesisStateValidate(t *testing.T) { MintDenom: types.DefaultParams().MintDenom, BlocksPerYear: types.DefaultParams().BlocksPerYear, Phases: []types.Phase{ - {YearCoefficient: sdk.MustNewDecFromStr("0"), Inflation: sdk.MustNewDecFromStr("0")}, + {YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0"), Inflation: sdkmath.LegacyMustNewDecFromStr("0")}, }, ExcludeAmount: types.DefaultParams().ExcludeAmount, }, @@ -127,7 +126,7 @@ func TestGenesisStateValidate(t *testing.T) { desc: "negative inflation", genState: types.NewGenesisState( types.Minter{ - Inflation: sdk.NewDec(-10), + Inflation: sdkmath.LegacyNewDec(-10), PhaseStep: types.DefaultInitialMinter().PhaseStep, PhaseProvisions: types.DefaultInitialMinter().PhaseProvisions, }, diff --git a/x/mint/types/minter.go b/x/mint/types/minter.go index 5376099d..859fa0a3 100644 --- a/x/mint/types/minter.go +++ b/x/mint/types/minter.go @@ -9,7 +9,7 @@ import ( // NewMinter returns a new Minter object with the given inflation and phase // provisions values. -func NewMinter(inflation, phaseProvisions sdk.Dec, phaseStep int32, truncatedTokens sdk.Dec) Minter { +func NewMinter(inflation, phaseProvisions sdkmath.LegacyDec, phaseStep int32, truncatedTokens sdkmath.LegacyDec) Minter { return Minter{ Inflation: inflation, PhaseProvisions: phaseProvisions, @@ -19,12 +19,12 @@ func NewMinter(inflation, phaseProvisions sdk.Dec, phaseStep int32, truncatedTok } // InitialMinter returns an initial Minter object with a given inflation value. -func InitialMinter(inflation sdk.Dec) Minter { +func InitialMinter(inflation sdkmath.LegacyDec) Minter { return NewMinter( inflation, - sdk.NewDec(initialPhaseProvision), + sdkmath.LegacyNewDec(initialPhaseProvision), initialPhaseStep, - sdk.NewDec(initialTruncatedTokens), + sdkmath.LegacyNewDec(initialTruncatedTokens), ) } @@ -32,7 +32,7 @@ func InitialMinter(inflation sdk.Dec) Minter { // which uses an inflation rate of 10%. func DefaultInitialMinter() Minter { return InitialMinter( - sdk.NewDec(initialInflation), + sdkmath.LegacyNewDec(initialInflation), ) } @@ -51,7 +51,7 @@ func (Minter) CurrentPhase(params Params, currentBlock int64) (Phase, int) { return params.GetPhaseAtStep(1), 1 } - cumulativeBlock := sdk.NewDec(0) + cumulativeBlock := sdkmath.LegacyNewDec(0) var currentStep int var found bool @@ -64,7 +64,7 @@ func (Minter) CurrentPhase(params Params, currentBlock int64) (Phase, int) { // if the current block is less than or equal to cumulative blocks // this means that we are in the i+1 step which is set in above line - if sdk.NewDec(currentBlock).LTE(cumulativeBlock) { + if sdkmath.LegacyNewDec(currentBlock).LTE(cumulativeBlock) { found = true // it is the current phase // so there is no need for further phase blocks check @@ -84,7 +84,7 @@ func (Minter) CurrentPhase(params Params, currentBlock int64) (Phase, int) { // NextPhaseProvisions returns the phase provisions based on current total // supply and inflation rate. -func (m Minter) NextPhaseProvisions(totalSupply, excludeAmount sdkmath.Int, phase Phase) sdk.Dec { +func (m Minter) NextPhaseProvisions(totalSupply, excludeAmount sdkmath.Int, phase Phase) sdkmath.LegacyDec { // calculate annual provisions as normal annualProvisions := m.Inflation.MulInt(totalSupply.Sub(excludeAmount)) @@ -98,7 +98,7 @@ func (m Minter) NextPhaseProvisions(totalSupply, excludeAmount sdkmath.Int, phas // BlockProvisions returns the provisions for a block based on the phase // provisions rate. -func (m Minter) BlockProvisions(params Params, phaseStep int) (sdk.Coin, sdk.Dec) { +func (m Minter) BlockProvisions(params Params, phaseStep int) (sdk.Coin, sdkmath.LegacyDec) { // get total blocks in this phase blocksPerPhase := params.getPhaseBlocks(phaseStep).TruncateDec() @@ -115,6 +115,6 @@ func (m Minter) BlockProvisions(params Params, phaseStep int) (sdk.Coin, sdk.Dec } // AnnualProvisions returns annual provisions for the phase. -func (m Minter) AnnualProvisions(phase Phase) sdk.Dec { +func (m Minter) AnnualProvisions(phase Phase) sdkmath.LegacyDec { return m.PhaseProvisions.Quo(phase.YearCoefficient) } diff --git a/x/mint/types/minter.pb.go b/x/mint/types/minter.pb.go index a8a40c58..a4ce36f7 100644 --- a/x/mint/types/minter.pb.go +++ b/x/mint/types/minter.pb.go @@ -4,8 +4,8 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" 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" @@ -27,14 +27,14 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Minter represents the minting state. type Minter struct { // inflation is the current annual inflation rate. - Inflation github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation"` + Inflation cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"inflation"` // phase_step is the index of phases slice + 1. PhaseStep int32 `protobuf:"varint,2,opt,name=phase_step,json=phaseStep,proto3" json:"phase_step,omitempty"` // phase_provisions is the current phase expected provisions. - PhaseProvisions github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=phase_provisions,json=phaseProvisions,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"phase_provisions" yaml:"phase_provisions"` + PhaseProvisions cosmossdk_io_math.LegacyDec `protobuf:"bytes,3,opt,name=phase_provisions,json=phaseProvisions,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"phase_provisions" yaml:"phase_provisions"` // truncated_tokens holds current truncated tokens because of Dec to Int // conversion in the minting. - TruncatedTokens github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=truncated_tokens,json=truncatedTokens,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"truncated_tokens"` + TruncatedTokens cosmossdk_io_math.LegacyDec `protobuf:"bytes,4,opt,name=truncated_tokens,json=truncatedTokens,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"truncated_tokens"` } func (m *Minter) Reset() { *m = Minter{} } @@ -84,26 +84,27 @@ func init() { func init() { proto.RegisterFile("sgenetwork/sge/mint/minter.proto", fileDescriptor_a969bd1a18aad64f) } var fileDescriptor_a969bd1a18aad64f = []byte{ - // 303 bytes of a gzipped FileDescriptorProto + // 307 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x28, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xcd, 0xcc, 0x2b, 0x01, 0x13, 0xa9, 0x45, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xc2, 0x08, 0x15, 0x7a, 0xc5, 0xe9, 0xa9, 0x7a, 0x20, 0x49, 0x29, 0x91, 0xf4, 0xfc, 0xf4, 0x7c, 0xb0, 0xbc, 0x3e, 0x88, 0x05, 0x51, - 0xaa, 0x74, 0x8c, 0x89, 0x8b, 0xcd, 0x17, 0xac, 0x57, 0xc8, 0x87, 0x8b, 0x33, 0x33, 0x2f, 0x2d, - 0x27, 0xb1, 0x24, 0x33, 0x3f, 0x4f, 0x82, 0x51, 0x81, 0x51, 0x83, 0xd3, 0x49, 0xef, 0xc4, 0x3d, - 0x79, 0x86, 0x5b, 0xf7, 0xe4, 0xd5, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, - 0xf5, 0x93, 0xf3, 0x8b, 0x73, 0xf3, 0x8b, 0xa1, 0x94, 0x6e, 0x71, 0x4a, 0xb6, 0x7e, 0x49, 0x65, - 0x41, 0x6a, 0xb1, 0x9e, 0x4b, 0x6a, 0x72, 0x10, 0xc2, 0x00, 0x21, 0x59, 0x2e, 0xae, 0x82, 0x8c, - 0xc4, 0xe2, 0xd4, 0xf8, 0xe2, 0x92, 0xd4, 0x02, 0x09, 0x26, 0x05, 0x46, 0x0d, 0xd6, 0x20, 0x4e, - 0xb0, 0x48, 0x70, 0x49, 0x6a, 0x81, 0x50, 0x09, 0x97, 0x00, 0x44, 0xba, 0xa0, 0x28, 0xbf, 0x2c, - 0xb3, 0x38, 0x33, 0x3f, 0xaf, 0x58, 0x82, 0x19, 0x6c, 0xa7, 0x27, 0x69, 0x76, 0x7e, 0xba, 0x27, - 0x2f, 0x5e, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0x6e, 0x9e, 0x52, 0x10, 0x3f, 0x58, 0x28, 0x00, - 0x2e, 0x22, 0x14, 0xc9, 0x25, 0x50, 0x52, 0x54, 0x9a, 0x97, 0x9c, 0x58, 0x92, 0x9a, 0x12, 0x5f, - 0x92, 0x9f, 0x9d, 0x9a, 0x57, 0x2c, 0xc1, 0x42, 0x96, 0x4f, 0xf9, 0xe1, 0xe6, 0x84, 0x80, 0x8d, - 0x71, 0x72, 0x3c, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, - 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0x75, 0x24, 0x23, - 0x8b, 0xd3, 0x53, 0x75, 0x91, 0xe3, 0xae, 0x02, 0x12, 0x7b, 0x60, 0x73, 0x93, 0xd8, 0xc0, 0x51, - 0x62, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x77, 0x77, 0xbd, 0x3f, 0xe1, 0x01, 0x00, 0x00, + 0xaa, 0xb4, 0x94, 0x89, 0x8b, 0xcd, 0x17, 0xac, 0x57, 0xc8, 0x91, 0x8b, 0x33, 0x33, 0x2f, 0x2d, + 0x27, 0xb1, 0x24, 0x33, 0x3f, 0x4f, 0x82, 0x51, 0x81, 0x51, 0x83, 0xd3, 0x49, 0xf9, 0xc4, 0x3d, + 0x79, 0x86, 0x5b, 0xf7, 0xe4, 0xa5, 0x93, 0xf3, 0x8b, 0x73, 0xf3, 0x8b, 0x8b, 0x53, 0xb2, 0xf5, + 0x32, 0xf3, 0xf5, 0x73, 0x13, 0x4b, 0x32, 0xf4, 0x7c, 0x52, 0xd3, 0x13, 0x93, 0x2b, 0x5d, 0x52, + 0x93, 0x83, 0x10, 0xba, 0x84, 0x64, 0xb9, 0xb8, 0x0a, 0x32, 0x12, 0x8b, 0x53, 0xe3, 0x8b, 0x4b, + 0x52, 0x0b, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x83, 0x38, 0xc1, 0x22, 0xc1, 0x25, 0xa9, 0x05, + 0x42, 0x99, 0x5c, 0x02, 0x10, 0xe9, 0x82, 0xa2, 0xfc, 0xb2, 0xcc, 0xe2, 0xcc, 0xfc, 0xbc, 0x62, + 0x09, 0x66, 0xb0, 0x45, 0x76, 0x44, 0x58, 0xf4, 0xe9, 0x9e, 0xbc, 0x78, 0x65, 0x62, 0x6e, 0x8e, + 0x95, 0x12, 0xba, 0x21, 0x4a, 0x41, 0xfc, 0x60, 0xa1, 0x00, 0xb8, 0x88, 0x90, 0x1f, 0x97, 0x40, + 0x49, 0x51, 0x69, 0x5e, 0x72, 0x62, 0x49, 0x6a, 0x4a, 0x7c, 0x49, 0x7e, 0x76, 0x6a, 0x5e, 0xb1, + 0x04, 0x0b, 0xf1, 0x7e, 0xe2, 0x87, 0x6b, 0x0e, 0x01, 0xeb, 0x75, 0x72, 0x3c, 0xf1, 0x48, 0x8e, + 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, + 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xf5, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, + 0xfc, 0x5c, 0x50, 0x74, 0xe8, 0x22, 0x47, 0x4d, 0x05, 0x24, 0x72, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, + 0x93, 0xd8, 0xc0, 0x21, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x93, 0xe9, 0x58, 0x3d, 0xc0, + 0x01, 0x00, 0x00, } func (m *Minter) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/minter_test.go b/x/mint/types/minter_test.go index 20d00a14..228332c9 100644 --- a/x/mint/types/minter_test.go +++ b/x/mint/types/minter_test.go @@ -21,36 +21,36 @@ func TestPhaseInflation(t *testing.T) { tests := []struct { phase int - expInflation sdk.Dec + expInflation sdkmath.LegacyDec }{ // phase 1 - {1, sdk.MustNewDecFromStr("0.229787234042553191")}, + {1, sdkmath.LegacyMustNewDecFromStr("0.229787234042553191")}, // phase 2 - {2, sdk.MustNewDecFromStr("0.286259541984732824")}, + {2, sdkmath.LegacyMustNewDecFromStr("0.286259541984732824")}, // phase 3 - {3, sdk.MustNewDecFromStr("0.150250417362270451")}, + {3, sdkmath.LegacyMustNewDecFromStr("0.150250417362270451")}, // phase 4 - {4, sdk.MustNewDecFromStr("0.116459627329192547")}, + {4, sdkmath.LegacyMustNewDecFromStr("0.116459627329192547")}, // phase 5 - {5, sdk.MustNewDecFromStr("0.088041085840058694")}, + {5, sdkmath.LegacyMustNewDecFromStr("0.088041085840058694")}, // phase 6 - {6, sdk.MustNewDecFromStr("0.063246661981728742")}, + {6, sdkmath.LegacyMustNewDecFromStr("0.063246661981728742")}, // phase 7 - {7, sdk.MustNewDecFromStr("0.040871934604904632")}, + {7, sdkmath.LegacyMustNewDecFromStr("0.040871934604904632")}, // phase 8 - {8, sdk.MustNewDecFromStr("0.032042723631508678")}, + {8, sdkmath.LegacyMustNewDecFromStr("0.032042723631508678")}, // phase 9 - {9, sdk.MustNewDecFromStr("0.019710906701708279")}, + {9, sdkmath.LegacyMustNewDecFromStr("0.019710906701708279")}, // phase 10 - {10, sdk.MustNewDecFromStr("0.003903708523096942")}, + {10, sdkmath.LegacyMustNewDecFromStr("0.003903708523096942")}, // end phase, inflation: 0% - {11, sdk.MustNewDecFromStr("0")}, + {11, sdkmath.LegacyMustNewDecFromStr("0")}, // end phase, inflation: 0% - {13, sdk.MustNewDecFromStr("0")}, + {13, sdkmath.LegacyMustNewDecFromStr("0")}, // end phase, inflation: 0% - {23, sdk.MustNewDecFromStr("0")}, + {23, sdkmath.LegacyMustNewDecFromStr("0")}, // end phase, inflation: 0% - {-1, sdk.MustNewDecFromStr("0")}, + {-1, sdkmath.LegacyMustNewDecFromStr("0")}, } for i, tc := range tests { inflation := params.GetPhaseAtStep(tc.phase).Inflation @@ -112,8 +112,8 @@ func TestNextPhaseAfterAppendToEndPhase(t *testing.T) { params.Phases = append( params.Phases, types.Phase{ - YearCoefficient: sdk.MustNewDecFromStr("1"), - Inflation: sdk.MustNewDecFromStr("0.032042723631508678"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("1"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.032042723631508678"), }, ) phase, _ := minter.CurrentPhase(params, 351) @@ -129,8 +129,8 @@ func TestNextPhaseAfterRelaceEndPhase(t *testing.T) { params.BlocksPerYear = 100 params.Phases = []types.Phase{ { - YearCoefficient: sdk.MustNewDecFromStr("1"), - Inflation: sdk.MustNewDecFromStr("0.00000000000000000"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("1"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.00000000000000000"), }, types.EndPhase(), } @@ -139,48 +139,48 @@ func TestNextPhaseAfterRelaceEndPhase(t *testing.T) { params.Phases = []types.Phase{ { - YearCoefficient: sdk.MustNewDecFromStr("2.5"), - Inflation: sdk.MustNewDecFromStr("0.00000000000000000"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("2.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.00000000000000000"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.229787234042553191"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.229787234042553191"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.286259541984732824"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.286259541984732824"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.150250417362270451"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.150250417362270451"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.116459627329192547"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.116459627329192547"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.088041085840058694"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.088041085840058694"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.063246661981728742"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.063246661981728742"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.040871934604904632"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.040871934604904632"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.032042723631508678"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.032042723631508678"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.019710906701708279"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.019710906701708279"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.003903708523096942"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.003903708523096942"), }, } phase, _ := minter.CurrentPhase(params, 250) @@ -189,7 +189,7 @@ func TestNextPhaseAfterRelaceEndPhase(t *testing.T) { } func TestBlockProvision(t *testing.T) { - minter := types.InitialMinter(sdk.NewDecWithPrec(1, 1)) + minter := types.InitialMinter(sdkmath.LegacyNewDecWithPrec(1, 1)) params := types.DefaultParams() tests := []struct { @@ -203,7 +203,7 @@ func TestBlockProvision(t *testing.T) { } for i, tc := range tests { - minter.PhaseProvisions = sdk.NewDec(tc.phaseProvisions) + minter.PhaseProvisions = sdkmath.LegacyNewDec(tc.phaseProvisions) provisions, _ := minter.BlockProvisions(params, 1) expProvisions := sdk.NewCoin(params.MintDenom, @@ -319,24 +319,24 @@ func TestAnnualProvisions(t *testing.T) { t.Log(minter.PhaseProvisions) annualProvisions := minter.AnnualProvisions(firstPhase) - require.Equal(t, firstPhase.Inflation.Mul(sdk.NewDec(totalSupply-excludeAmount)), annualProvisions) + require.Equal(t, firstPhase.Inflation.Mul(sdkmath.LegacyNewDec(totalSupply-excludeAmount)), annualProvisions) } // Benchmarking :) // previously using sdkmath.Int operations: // BenchmarkBlockProvision-4 5000000 220 ns/op // -// using sdk.Dec operations: (current implementation) +// using sdkmath.LegacyDec operations: (current implementation) // BenchmarkBlockProvision-4 3000000 429 ns/op func BenchmarkBlockProvision(b *testing.B) { b.ReportAllocs() - minter := types.InitialMinter(sdk.NewDecWithPrec(1, 1)) + minter := types.InitialMinter(sdkmath.LegacyNewDecWithPrec(1, 1)) params := types.DefaultParams() s1 := rand.NewSource(100) //#nosec r1 := rand.New(s1) - minter.PhaseProvisions = sdk.NewDec(r1.Int63n(1000000)) + minter.PhaseProvisions = sdkmath.LegacyNewDec(r1.Int63n(1000000)) // run the BlockProvision function b.N times for n := 0; n < b.N; n++ { @@ -361,7 +361,7 @@ func BenchmarkPhaseInflation(b *testing.B) { // BenchmarkNextPhaseProvisions-4 5000000 251 ns/op func BenchmarkNextPhaseProvisions(b *testing.B) { b.ReportAllocs() - minter := types.InitialMinter(sdk.NewDecWithPrec(1, 1)) + minter := types.InitialMinter(sdkmath.LegacyNewDecWithPrec(1, 1)) params := types.DefaultParams() totalSupply := sdkmath.NewInt(100000000000000) phase := params.GetPhaseAtStep(1) diff --git a/x/mint/types/params.go b/x/mint/types/params.go index 2d0a546f..ce8d775f 100644 --- a/x/mint/types/params.go +++ b/x/mint/types/params.go @@ -59,44 +59,44 @@ var ( // DefaultPhases is the default value for inflation phases DefaultPhases = []Phase{ { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.229787234042553191"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.229787234042553191"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.286259541984732824"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.286259541984732824"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.150250417362270451"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.150250417362270451"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.116459627329192547"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.116459627329192547"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.088041085840058694"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.088041085840058694"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.063246661981728742"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.063246661981728742"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.040871934604904632"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.040871934604904632"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.032042723631508678"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.032042723631508678"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.019710906701708279"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.019710906701708279"), }, { - YearCoefficient: sdk.MustNewDecFromStr("0.5"), - Inflation: sdk.MustNewDecFromStr("0.003903708523096942"), + YearCoefficient: sdkmath.LegacyMustNewDecFromStr("0.5"), + Inflation: sdkmath.LegacyMustNewDecFromStr("0.003903708523096942"), }, } ) @@ -187,15 +187,15 @@ func (p Params) IsEndPhaseByStep(phaseStep int) bool { // NonePhase returns none phase object // none phase is the initial phase of inflation with height 1 func NonePhase() Phase { - return Phase{Inflation: sdk.MustNewDecFromStr("0"), YearCoefficient: sdk.ZeroDec()} + return Phase{Inflation: sdkmath.LegacyMustNewDecFromStr("0"), YearCoefficient: sdkmath.LegacyZeroDec()} } // EndPhase returns end phase which there is no phase item with remaining blocks func EndPhase() Phase { maxUInt64 := new(big.Int).SetUint64(math.MaxUint64) return Phase{ - Inflation: sdk.MustNewDecFromStr("0"), - YearCoefficient: sdk.NewDecFromBigInt(maxUInt64), + Inflation: sdkmath.LegacyMustNewDecFromStr("0"), + YearCoefficient: sdkmath.LegacyNewDecFromBigInt(maxUInt64), } } @@ -210,7 +210,7 @@ func IsEndPhase(phase Phase) bool { } // getPhaseBlocks returns the total blocks of a certain phase step -func (p Params) getPhaseBlocks(phaseStep int) sdk.Dec { +func (p Params) getPhaseBlocks(phaseStep int) sdkmath.LegacyDec { // get the phase year coefficient yearCoefficient := p.Phases[phaseStep-1].YearCoefficient @@ -222,7 +222,7 @@ func (p Params) getPhaseBlocks(phaseStep int) sdk.Dec { // current block = 50 // so the changing point of the phase is in block number 50.5 which is not applicable // the 0.5 provisions will be calculated in the BlockProvisions method of Minter - phaseBlocks := yearCoefficient.Mul(sdk.NewDec(p.BlocksPerYear)).TruncateDec() + phaseBlocks := yearCoefficient.Mul(sdkmath.LegacyNewDec(p.BlocksPerYear)).TruncateDec() return phaseBlocks } @@ -276,7 +276,7 @@ func validatePhases(i interface{}) error { } for _, p := range v { - if !p.YearCoefficient.GT(sdk.ZeroDec()) { + if !p.YearCoefficient.GT(sdkmath.LegacyZeroDec()) { return fmt.Errorf(ErrTextYearCoefficientMustBePositive) } if IsEndPhase(p) { diff --git a/x/mint/types/params_test.go b/x/mint/types/params_test.go index 830d4e3b..4f1b40fb 100644 --- a/x/mint/types/params_test.go +++ b/x/mint/types/params_test.go @@ -7,7 +7,6 @@ import ( "github.com/stretchr/testify/require" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sge-network/sge/app/params" "github.com/sge-network/sge/x/mint/types" @@ -18,7 +17,7 @@ func TestParamsYML(t *testing.T) { MintDenom: params.DefaultBondDenom, BlocksPerYear: 10, Phases: []types.Phase{ - {Inflation: sdk.NewDec(10), YearCoefficient: sdk.NewDec(1)}, + {Inflation: sdkmath.LegacyNewDec(10), YearCoefficient: sdkmath.LegacyNewDec(1)}, }, ExcludeAmount: sdkmath.NewInt(100), } @@ -90,5 +89,5 @@ func TestNonPhase(t *testing.T) { params := types.DefaultParams() phase := params.GetPhaseAtStep(0) - require.Equal(t, sdk.NewDec(0), phase.YearCoefficient) + require.Equal(t, sdkmath.LegacyNewDec(0), phase.YearCoefficient) } diff --git a/x/mint/types/phase.pb.go b/x/mint/types/phase.pb.go index cbd4beae..132544c4 100644 --- a/x/mint/types/phase.pb.go +++ b/x/mint/types/phase.pb.go @@ -4,8 +4,8 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" 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" @@ -27,9 +27,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Phase defines the phase parameters for the module. type Phase struct { // inflation is the current phase inflation rate. - Inflation github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation" yaml:"inflation"` + Inflation cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"inflation" yaml:"inflation"` // year_coefficient is the proportion of a complete year. - YearCoefficient github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=year_coefficient,json=yearCoefficient,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"year_coefficient" yaml:"year_coefficient"` + YearCoefficient cosmossdk_io_math.LegacyDec `protobuf:"bytes,2,opt,name=year_coefficient,json=yearCoefficient,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"year_coefficient" yaml:"year_coefficient"` } func (m *Phase) Reset() { *m = Phase{} } @@ -71,24 +71,24 @@ func init() { func init() { proto.RegisterFile("sgenetwork/sge/mint/phase.proto", fileDescriptor_a4ef2371d48b7ae6) } var fileDescriptor_a4ef2371d48b7ae6 = []byte{ - // 264 bytes of a gzipped FileDescriptorProto + // 268 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2f, 0x4e, 0x4f, 0xcd, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0xd6, 0x2f, 0x4e, 0x4f, 0xd5, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0xc8, 0x48, 0x2c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x46, 0x28, 0xd0, 0x2b, 0x4e, 0x4f, 0xd5, 0x03, 0x29, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xeb, 0x83, - 0x58, 0x10, 0xa5, 0x4a, 0x4f, 0x19, 0xb9, 0x58, 0x03, 0x40, 0x5a, 0x85, 0x12, 0xb8, 0x38, 0x33, - 0xf3, 0xd2, 0x72, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0x9c, - 0x4e, 0xdc, 0x93, 0x67, 0xb8, 0x75, 0x4f, 0x5e, 0x2d, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, - 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, 0xe9, 0x16, 0xa7, 0x64, 0xeb, - 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0xb9, 0xa4, 0x26, 0x7f, 0xba, 0x27, 0x2f, 0x50, 0x99, 0x98, - 0x9b, 0x63, 0xa5, 0x04, 0x37, 0x48, 0x29, 0x08, 0x61, 0xa8, 0x50, 0x09, 0x97, 0x40, 0x65, 0x6a, - 0x62, 0x51, 0x7c, 0x72, 0x7e, 0x6a, 0x5a, 0x5a, 0x66, 0x72, 0x66, 0x6a, 0x5e, 0x89, 0x04, 0x13, - 0xd8, 0x22, 0x4f, 0x92, 0x2d, 0x12, 0x87, 0x58, 0x84, 0x6e, 0x9e, 0x52, 0x10, 0x3f, 0x48, 0xc8, - 0x19, 0x21, 0x62, 0xc5, 0x32, 0x63, 0x81, 0x3c, 0x83, 0x93, 0xe3, 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, 0xa9, 0x23, 0xd9, 0x59, 0x9c, 0x9e, 0xaa, 0x8b, 0x1c, 0xb2, 0x15, - 0x90, 0xb0, 0x05, 0x5b, 0x9c, 0xc4, 0x06, 0x0e, 0x31, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xad, 0x61, 0x84, 0x39, 0x7f, 0x01, 0x00, 0x00, + 0x58, 0x10, 0xa5, 0x4a, 0xe7, 0x19, 0xb9, 0x58, 0x03, 0x40, 0x5a, 0x85, 0x42, 0xb9, 0x38, 0x33, + 0xf3, 0xd2, 0x72, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0xcc, + 0x4f, 0xdc, 0x93, 0x67, 0xb8, 0x75, 0x4f, 0x5e, 0x3a, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0xb8, 0x38, + 0x25, 0x5b, 0x2f, 0x33, 0x5f, 0x3f, 0x37, 0xb1, 0x24, 0x43, 0xcf, 0x27, 0x35, 0x3d, 0x31, 0xb9, + 0xd2, 0x25, 0x35, 0xf9, 0xd3, 0x3d, 0x79, 0x81, 0xca, 0xc4, 0xdc, 0x1c, 0x2b, 0x25, 0xb8, 0x6e, + 0xa5, 0x20, 0x84, 0x49, 0x42, 0x99, 0x5c, 0x02, 0x95, 0xa9, 0x89, 0x45, 0xf1, 0xc9, 0xf9, 0xa9, + 0x69, 0x69, 0x99, 0xc9, 0x99, 0xa9, 0x79, 0x25, 0x12, 0x4c, 0x60, 0xd3, 0xed, 0x88, 0x33, 0x5d, + 0x1c, 0x62, 0x3a, 0xba, 0x21, 0x4a, 0x41, 0xfc, 0x20, 0x21, 0x67, 0x84, 0x88, 0x15, 0xcb, 0x8c, + 0x05, 0xf2, 0x0c, 0x4e, 0x8e, 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, 0xa5, + 0x9e, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0x0a, 0x37, 0x5d, 0xe4, 0x30, + 0xac, 0x80, 0x84, 0x62, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x38, 0x6c, 0x8c, 0x01, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x9e, 0x0e, 0xbc, 0xcd, 0x69, 0x01, 0x00, 0x00, } func (m *Phase) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/phase_test.go b/x/mint/types/phase_test.go index d7aee158..9d3fcd49 100644 --- a/x/mint/types/phase_test.go +++ b/x/mint/types/phase_test.go @@ -3,17 +3,16 @@ package types_test import ( "testing" + sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/require" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/sge-network/sge/x/mint/types" ) func TestPhaseYML(t *testing.T) { phase := types.Phase{ - Inflation: sdk.NewDec(10), - YearCoefficient: sdk.NewDec(1), + Inflation: sdkmath.LegacyNewDec(10), + YearCoefficient: sdkmath.LegacyNewDec(1), } ymlStr := phase.String() diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go index 7b0505e5..bec0ca98 100644 --- a/x/mint/types/query.pb.go +++ b/x/mint/types/query.pb.go @@ -5,8 +5,8 @@ package types import ( context "context" + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" - 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" @@ -158,7 +158,7 @@ var xxx_messageInfo_QueryInflationRequest proto.InternalMessageInfo // Query/Inflation RPC method. type QueryInflationResponse struct { // inflation is the current minting inflation value. - Inflation github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"inflation"` + Inflation cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"inflation"` } func (m *QueryInflationResponse) Reset() { *m = QueryInflationResponse{} } @@ -322,7 +322,7 @@ var xxx_messageInfo_QueryPhaseProvisionsRequest proto.InternalMessageInfo // Query/PhaseProvisions RPC method. type QueryPhaseProvisionsResponse struct { // phase_provisions is the current minting phase provisions value. - PhaseProvisions github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=phase_provisions,json=phaseProvisions,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"phase_provisions"` + PhaseProvisions cosmossdk_io_math.LegacyDec `protobuf:"bytes,1,opt,name=phase_provisions,json=phaseProvisions,proto3,customtype=cosmossdk.io/math.LegacyDec" json:"phase_provisions"` } func (m *QueryPhaseProvisionsResponse) Reset() { *m = QueryPhaseProvisionsResponse{} } @@ -462,44 +462,44 @@ func init() { func init() { proto.RegisterFile("sgenetwork/sge/mint/query.proto", fileDescriptor_ee35ae03c8ab12c8) } var fileDescriptor_ee35ae03c8ab12c8 = []byte{ - // 581 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x3d, 0x6f, 0xd3, 0x40, - 0x1c, 0xc6, 0x63, 0x44, 0x22, 0x72, 0x54, 0xa4, 0xba, 0x16, 0xa8, 0xdc, 0xd4, 0x89, 0x2c, 0x9a, - 0x54, 0x40, 0x7c, 0x4d, 0x19, 0x10, 0x23, 0x51, 0x19, 0x2a, 0x31, 0x04, 0x33, 0xc1, 0x12, 0x39, - 0xc9, 0xd5, 0xb5, 0xda, 0xdc, 0x5d, 0x7d, 0xe7, 0x42, 0x56, 0x66, 0x06, 0x24, 0x3e, 0x01, 0x03, - 0xdf, 0xa5, 0x63, 0x25, 0x16, 0xc4, 0x50, 0xa1, 0x84, 0x81, 0x8f, 0x81, 0x7c, 0x3e, 0x3b, 0x89, - 0xe3, 0x34, 0xa5, 0x53, 0xa2, 0xff, 0xcb, 0xf3, 0xfc, 0xec, 0x7b, 0xce, 0xa0, 0xc2, 0x5d, 0x4c, - 0xb0, 0xf8, 0x40, 0xfd, 0x63, 0xc4, 0x5d, 0x8c, 0x06, 0x1e, 0x11, 0xe8, 0x34, 0xc0, 0xfe, 0xd0, - 0x62, 0x3e, 0x15, 0x14, 0xae, 0x4d, 0x06, 0x2c, 0xee, 0x62, 0x2b, 0x1c, 0xd0, 0xd7, 0x5d, 0xea, - 0x52, 0xd9, 0x47, 0xe1, 0xbf, 0x68, 0x54, 0x2f, 0xbb, 0x94, 0xba, 0x27, 0x18, 0x39, 0xcc, 0x43, - 0x0e, 0x21, 0x54, 0x38, 0xc2, 0xa3, 0x84, 0xab, 0x6e, 0x35, 0xcb, 0x89, 0x39, 0xbe, 0x33, 0x50, - 0x13, 0xe6, 0x3a, 0x80, 0x6f, 0x42, 0xe7, 0xb6, 0x2c, 0xda, 0xf8, 0x34, 0xc0, 0x5c, 0x98, 0x6d, - 0xb0, 0x36, 0x53, 0xe5, 0x8c, 0x12, 0x8e, 0xe1, 0x0b, 0x50, 0x88, 0x96, 0x37, 0xb4, 0xaa, 0xb6, - 0x73, 0x77, 0x6f, 0xd3, 0xca, 0x00, 0xb5, 0xa2, 0xa5, 0xd6, 0xed, 0xf3, 0xcb, 0x4a, 0xce, 0x56, - 0x0b, 0xe6, 0x43, 0x70, 0x5f, 0x2a, 0x1e, 0x90, 0xc3, 0x13, 0x89, 0x18, 0x5b, 0x1d, 0x82, 0x07, - 0xe9, 0x86, 0x72, 0x7b, 0x0d, 0x8a, 0x5e, 0x5c, 0x94, 0x86, 0x2b, 0x2d, 0x2b, 0xd4, 0xfc, 0x75, - 0x59, 0xa9, 0xb9, 0x9e, 0x38, 0x0a, 0xba, 0x56, 0x8f, 0x0e, 0x50, 0x8f, 0xf2, 0x01, 0xe5, 0xea, - 0xa7, 0xc1, 0xfb, 0xc7, 0x48, 0x0c, 0x19, 0xe6, 0xd6, 0x3e, 0xee, 0xd9, 0x13, 0x81, 0x04, 0xa0, - 0x7d, 0xe4, 0x70, 0xfc, 0x56, 0x60, 0x16, 0x03, 0x3c, 0x57, 0x00, 0x53, 0x0d, 0x05, 0xb0, 0x05, - 0x00, 0x0b, 0x8b, 0x1d, 0x2e, 0x30, 0x93, 0x04, 0x79, 0xbb, 0xc8, 0xe2, 0x31, 0x73, 0x0b, 0x6c, - 0x4e, 0x16, 0xdb, 0x3e, 0x3d, 0xf3, 0x78, 0xf8, 0xea, 0x63, 0xdd, 0x21, 0x28, 0x67, 0xb7, 0x95, - 0xfa, 0x3b, 0xb0, 0x1a, 0xa9, 0xb3, 0xa4, 0x77, 0xc3, 0xa7, 0x2c, 0xb1, 0x59, 0x0b, 0xb3, 0x0c, - 0x74, 0x69, 0xfd, 0x8a, 0xf4, 0xd5, 0x53, 0x39, 0x22, 0x48, 0xc0, 0xf6, 0x15, 0x77, 0xba, 0xab, - 0xb8, 0xb6, 0x41, 0xc9, 0xe3, 0x1d, 0x8f, 0x74, 0x30, 0xe9, 0x77, 0xa4, 0xb2, 0xc4, 0xba, 0x63, - 0xaf, 0x78, 0xfc, 0x80, 0xc4, 0x4b, 0x7b, 0x7f, 0xf3, 0x20, 0x2f, 0x65, 0x60, 0x00, 0x0a, 0xd1, - 0x91, 0xc3, 0x7a, 0x66, 0x1e, 0xe6, 0xf3, 0xa5, 0xef, 0x2c, 0x1f, 0x8c, 0x68, 0xcc, 0x8d, 0x4f, - 0x3f, 0xfe, 0x7c, 0xbd, 0x05, 0xe1, 0x6a, 0x3a, 0xbf, 0xf0, 0xb3, 0x06, 0x8a, 0x49, 0x68, 0xe0, - 0xe3, 0xc5, 0x8a, 0xe9, 0xc8, 0xe9, 0x4f, 0xae, 0x35, 0xab, 0x00, 0x6a, 0x12, 0xa0, 0x0a, 0x8d, - 0xf8, 0x08, 0x24, 0xc3, 0x59, 0xb3, 0x8b, 0x85, 0xd3, 0x44, 0x49, 0xbe, 0x24, 0x4e, 0x12, 0xa1, - 0xab, 0x70, 0xd2, 0x01, 0xbc, 0x0a, 0x67, 0x2e, 0x93, 0x4b, 0x70, 0xe4, 0x71, 0x85, 0x69, 0x85, - 0xdf, 0x35, 0x50, 0x4a, 0x25, 0x0f, 0xee, 0x2e, 0x31, 0x9a, 0xcb, 0xb0, 0xde, 0xfc, 0x8f, 0x0d, - 0x05, 0xd8, 0x90, 0x80, 0x75, 0xb8, 0xbd, 0x18, 0x70, 0x2a, 0xf1, 0xf0, 0x9b, 0x06, 0xee, 0xcd, - 0x06, 0x11, 0xa2, 0xc5, 0xa6, 0x99, 0x81, 0xd6, 0x77, 0xaf, 0xbf, 0xa0, 0x20, 0x9f, 0x4a, 0xc8, - 0x1a, 0x7c, 0x94, 0x09, 0x89, 0x49, 0x3f, 0xbe, 0xf7, 0xe1, 0x56, 0xeb, 0xe5, 0xf9, 0xc8, 0xd0, - 0x2e, 0x46, 0x86, 0xf6, 0x7b, 0x64, 0x68, 0x5f, 0xc6, 0x46, 0xee, 0x62, 0x6c, 0xe4, 0x7e, 0x8e, - 0x8d, 0xdc, 0xfb, 0xfa, 0xd4, 0x0d, 0xe5, 0x2e, 0x6e, 0x4c, 0x7f, 0x6b, 0x3f, 0x46, 0xa2, 0xf2, - 0x9a, 0x76, 0x0b, 0xf2, 0x6b, 0xfb, 0xec, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x96, 0x9d, 0xe6, - 0x23, 0xfb, 0x05, 0x00, 0x00, + // 585 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x41, 0x6f, 0x12, 0x4d, + 0x1c, 0xc6, 0xd9, 0x37, 0x2f, 0x44, 0xc6, 0x46, 0x9a, 0x69, 0xd5, 0x66, 0xa1, 0x0b, 0x59, 0x6d, + 0x69, 0xd4, 0xee, 0x96, 0x7a, 0x30, 0x1e, 0x4b, 0xea, 0xa1, 0x89, 0x31, 0x88, 0x37, 0x3d, 0x90, + 0x01, 0xc6, 0x65, 0xd2, 0x32, 0x33, 0x65, 0x66, 0xab, 0x5c, 0x3d, 0x7b, 0x30, 0xf1, 0x13, 0x78, + 0xf0, 0xbb, 0xf4, 0xd8, 0xc4, 0x8b, 0xf1, 0xd0, 0x18, 0xf0, 0xe0, 0xc7, 0x30, 0x3b, 0x3b, 0xbb, + 0xc0, 0xb2, 0x94, 0xf6, 0x46, 0xe6, 0xff, 0x7f, 0x9e, 0xe7, 0xb7, 0xcc, 0xb3, 0x0b, 0xca, 0xc2, + 0xc3, 0x14, 0xcb, 0x0f, 0x6c, 0x70, 0xec, 0x0a, 0x0f, 0xbb, 0x7d, 0x42, 0xa5, 0x7b, 0xea, 0xe3, + 0xc1, 0xd0, 0xe1, 0x03, 0x26, 0x19, 0x5c, 0x9b, 0x2c, 0x38, 0xc2, 0xc3, 0x4e, 0xb0, 0x60, 0xae, + 0x7b, 0xcc, 0x63, 0x6a, 0xee, 0x06, 0xbf, 0xc2, 0x55, 0xb3, 0xe4, 0x31, 0xe6, 0x9d, 0x60, 0x17, + 0x71, 0xe2, 0x22, 0x4a, 0x99, 0x44, 0x92, 0x30, 0x2a, 0xf4, 0xb4, 0x92, 0x96, 0xc4, 0xd1, 0x00, + 0xf5, 0xf5, 0x86, 0xbd, 0x0e, 0xe0, 0xeb, 0x20, 0xb9, 0xa1, 0x0e, 0x9b, 0xf8, 0xd4, 0xc7, 0x42, + 0xda, 0x0d, 0xb0, 0x36, 0x73, 0x2a, 0x38, 0xa3, 0x02, 0xc3, 0xe7, 0x20, 0x17, 0x8a, 0x37, 0x8c, + 0x8a, 0xb1, 0x73, 0x7b, 0xbf, 0xe8, 0xa4, 0x80, 0x3a, 0xa1, 0xa8, 0xfe, 0xff, 0xf9, 0x65, 0x39, + 0xd3, 0xd4, 0x02, 0xfb, 0x3e, 0xb8, 0xab, 0x1c, 0x8f, 0xe8, 0xfb, 0x13, 0x85, 0x18, 0x45, 0xbd, + 0x03, 0xf7, 0x92, 0x03, 0x9d, 0x76, 0x00, 0xf2, 0x24, 0x3a, 0x54, 0x81, 0x2b, 0xf5, 0x07, 0x81, + 0xe7, 0xaf, 0xcb, 0x72, 0xb1, 0xc3, 0x44, 0x9f, 0x09, 0xd1, 0x3d, 0x76, 0x08, 0x73, 0xfb, 0x48, + 0xf6, 0x9c, 0x97, 0xd8, 0x43, 0x9d, 0xe1, 0x21, 0xee, 0x34, 0x27, 0xaa, 0x38, 0xb5, 0xd1, 0x43, + 0x02, 0xbf, 0x91, 0x98, 0x47, 0xa9, 0xcf, 0x74, 0xea, 0xd4, 0x40, 0xa7, 0x6e, 0x02, 0xc0, 0x83, + 0xc3, 0x96, 0x90, 0x98, 0xab, 0xd8, 0x6c, 0x33, 0xcf, 0xa3, 0x35, 0x7b, 0x13, 0x14, 0x27, 0xc2, + 0xc6, 0x80, 0x9d, 0x11, 0x11, 0xfc, 0xdf, 0x91, 0x2f, 0x05, 0xa5, 0xf4, 0xb1, 0x76, 0x7f, 0x05, + 0x56, 0x43, 0x77, 0x1e, 0xcf, 0x6e, 0xf2, 0x68, 0x05, 0x3e, 0xeb, 0x6b, 0x97, 0x80, 0xa9, 0xf2, + 0x5e, 0xd0, 0xae, 0x7e, 0x14, 0x24, 0xfd, 0x98, 0xe6, 0x50, 0xc3, 0x26, 0xa7, 0x1a, 0x66, 0x0b, + 0x14, 0x88, 0x68, 0x11, 0xda, 0xc2, 0xb4, 0xdb, 0x52, 0xce, 0x8a, 0xe5, 0x56, 0x73, 0x85, 0x88, + 0x23, 0x1a, 0x89, 0xf6, 0xff, 0x66, 0x41, 0x56, 0xd9, 0x40, 0x1f, 0xe4, 0xc2, 0xcb, 0x85, 0xd5, + 0xd4, 0x9b, 0x9f, 0x6f, 0x92, 0xb9, 0xb3, 0x7c, 0x31, 0xa4, 0xb1, 0x37, 0x3e, 0xfd, 0xf8, 0xf3, + 0xf5, 0x3f, 0x08, 0x57, 0x93, 0x4d, 0x85, 0x9f, 0x0d, 0x90, 0x8f, 0xeb, 0x01, 0x1f, 0x2d, 0x76, + 0x4c, 0x96, 0xcb, 0x7c, 0x7c, 0xad, 0x5d, 0x0d, 0xb0, 0xad, 0x00, 0x2a, 0xd0, 0x72, 0xc3, 0x2b, + 0x08, 0x19, 0xce, 0x6a, 0x6d, 0x2c, 0x51, 0xcd, 0x8d, 0x4b, 0xa5, 0x70, 0xe2, 0xde, 0x5c, 0x85, + 0x93, 0x6c, 0xdd, 0x55, 0x38, 0x73, 0x45, 0x5c, 0x82, 0xa3, 0xae, 0x2b, 0xa8, 0x28, 0xfc, 0x6e, + 0x80, 0x42, 0xa2, 0x6e, 0x70, 0x6f, 0x49, 0xd0, 0x5c, 0x71, 0xcd, 0xda, 0x0d, 0x14, 0x1a, 0x70, + 0x57, 0x01, 0x56, 0xe1, 0xd6, 0x62, 0xc0, 0xa9, 0x9a, 0xc3, 0x6f, 0x06, 0xb8, 0x33, 0x5b, 0x44, + 0xe8, 0x2e, 0x0e, 0x4d, 0x2d, 0xb4, 0xb9, 0x77, 0x7d, 0x81, 0x86, 0x7c, 0xa2, 0x20, 0xb7, 0xe1, + 0xc3, 0x54, 0x48, 0x4c, 0xbb, 0xd1, 0xcb, 0x1e, 0xa8, 0xea, 0x07, 0xe7, 0x23, 0xcb, 0xb8, 0x18, + 0x59, 0xc6, 0xef, 0x91, 0x65, 0x7c, 0x19, 0x5b, 0x99, 0x8b, 0xb1, 0x95, 0xf9, 0x39, 0xb6, 0x32, + 0x6f, 0xab, 0x1e, 0x91, 0x3d, 0xbf, 0xed, 0x74, 0x58, 0x3f, 0xe8, 0xe7, 0xee, 0xf4, 0x57, 0xf5, + 0x63, 0x68, 0x2a, 0x87, 0x1c, 0x8b, 0x76, 0x4e, 0x7d, 0x57, 0x9f, 0xfe, 0x0b, 0x00, 0x00, 0xff, + 0xff, 0xcd, 0x1b, 0xcf, 0xa5, 0xe5, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/orderbook/keeper/bet_settle_test.go b/x/orderbook/keeper/bet_settle_test.go index 9f2efa3b..6bfefdae 100644 --- a/x/orderbook/keeper/bet_settle_test.go +++ b/x/orderbook/keeper/bet_settle_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "testing" + sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" @@ -19,7 +20,7 @@ func TestBetSettlement(t *testing.T) { func (ts *testBetSuite) settleBetsAndTest( bets []bettypes.Bet, - winner1PayoutProfit, winner2PayoutProfit sdk.Dec, + winner1PayoutProfit, winner2PayoutProfit sdkmath.LegacyDec, ) { winner1BalAfterWager := ts.tApp.BankKeeper.GetBalance( ts.ctx, diff --git a/x/orderbook/keeper/bet_wager.go b/x/orderbook/keeper/bet_wager.go index a287e83f..48c82a45 100644 --- a/x/orderbook/keeper/bet_wager.go +++ b/x/orderbook/keeper/bet_wager.go @@ -14,9 +14,9 @@ import ( func (k Keeper) ProcessWager( ctx sdk.Context, betUID, bookUID, oddsUID string, - maxLossMultiplier sdk.Dec, + maxLossMultiplier sdkmath.LegacyDec, betAmount sdkmath.Int, - payoutProfit sdk.Dec, + payoutProfit sdkmath.LegacyDec, bettorAddress sdk.AccAddress, betFee sdkmath.Int, oddsVal string, betID uint64, @@ -83,8 +83,8 @@ func (k Keeper) fulfillBetByParticipationQueue( fInfo.updatedfulfillmentQueue = fulfillmentQueue // the decimal amount that is being lost in the bet amount calculation from payout profit - truncatedBetAmount := sdk.NewDec(0) - requeThreshold := sdk.NewIntFromUint64(k.GetRequeueThreshold(ctx)) + truncatedBetAmount := sdkmath.LegacyNewDec(0) + requeThreshold := sdkmath.NewIntFromUint64(k.GetRequeueThreshold(ctx)) // continue until updatedFulfillmentQueue gets empty for fInfo.hasUnfulfilledQueueItem() { var err error @@ -102,7 +102,7 @@ func (k Keeper) fulfillBetByParticipationQueue( var betAmountToFulfill sdkmath.Int betAmountToFulfill, truncatedBetAmount, err = bettypes.CalculateBetAmountInt( fInfo.oddsVal, - sdk.NewDecFromInt(fInfo.inProcessItem.availableLiquidity), + sdkmath.LegacyNewDecFromInt(fInfo.inProcessItem.availableLiquidity), truncatedBetAmount, ) if err != nil { @@ -167,12 +167,12 @@ func (k Keeper) fulfillBetByParticipationQueue( func (k Keeper) initFulfillmentInfo( ctx sdk.Context, betAmount sdkmath.Int, - payoutProfit sdk.Dec, + payoutProfit sdkmath.LegacyDec, betUID string, betID uint64, oddsUID string, oddsVal string, - maxLossMultiplier sdk.Dec, + maxLossMultiplier sdkmath.LegacyDec, book *types.OrderBook, odds map[string]*bettypes.BetOddsCompact, oddUIDS []string, @@ -306,7 +306,7 @@ func (k Keeper) fulfill( // subtract the payout profit that is fulfilled from the initial payout profit // to prevent being calculated multiple times - fInfo.payoutProfit = fInfo.payoutProfit.Sub(sdk.NewDecFromInt(payoutProfitToFulfill)) + fInfo.payoutProfit = fInfo.payoutProfit.Sub(sdkmath.LegacyNewDecFromInt(payoutProfitToFulfill)) // store the bet pair in the state participationBetPair := types.NewParticipationBetPair( @@ -418,9 +418,9 @@ type fulfillmentInfo struct { betID uint64 oddsUID string oddsVal string - maxLossMultiplier sdk.Dec + maxLossMultiplier sdkmath.LegacyDec betAmount sdkmath.Int - payoutProfit sdk.Dec + payoutProfit sdkmath.LegacyDec fulfilledBetAmount sdkmath.Int fulfillmentQueue []uint64 @@ -488,12 +488,12 @@ func (fInfo *fulfillmentInfo) hasUnfulfilledQueueItem() bool { func (fInfo *fulfillmentInfo) IsFulfilled() bool { // if the remaining payout is less than 1.00, means that the decimal part will be ignored - return fInfo.payoutProfit.LT(sdk.OneDec()) || len(fInfo.fulfillmentQueue) == 0 + return fInfo.payoutProfit.LT(sdkmath.LegacyOneDec()) || len(fInfo.fulfillmentQueue) == 0 } func (fInfo *fulfillmentInfo) NoMoreLiquidityAvailable() bool { // if the remaining payout is less than 1.00, means that the decimal part will be ignored - return fInfo.payoutProfit.GTE(sdk.OneDec()) + return fInfo.payoutProfit.GTE(sdkmath.LegacyOneDec()) } func (fInfo *fulfillmentInfo) notEnoughLiquidityAvailable() bool { @@ -526,14 +526,14 @@ func (fItem *fulfillmentItem) setFulfilledSecondary(sItem *fulfillmentItem) { fItem.participation.ExposuresNotFilled-- } -func (fItem *fulfillmentItem) setAvailableLiquidity(maxLossMultiplier sdk.Dec) { +func (fItem *fulfillmentItem) setAvailableLiquidity(maxLossMultiplier sdkmath.LegacyDec) { fItem.availableLiquidity = fItem.calcAvailableLiquidity(maxLossMultiplier) } -func (fItem *fulfillmentItem) calcAvailableLiquidity(maxLossMultiplier sdk.Dec) sdkmath.Int { +func (fItem *fulfillmentItem) calcAvailableLiquidity(maxLossMultiplier sdkmath.LegacyDec) sdkmath.Int { return maxLossMultiplier. MulInt(fItem.participation.CurrentRoundLiquidity). - Sub(sdk.NewDecFromInt(fItem.participationExposure.Exposure)).TruncateInt() + Sub(sdkmath.LegacyNewDecFromInt(fItem.participationExposure.Exposure)).TruncateInt() } func (fItem *fulfillmentItem) allExposureFulfilled() bool { diff --git a/x/orderbook/keeper/bet_wager_test.go b/x/orderbook/keeper/bet_wager_test.go index 68b6d80d..d2c0bacc 100644 --- a/x/orderbook/keeper/bet_wager_test.go +++ b/x/orderbook/keeper/bet_wager_test.go @@ -77,7 +77,7 @@ func newTestBetSuite(t *testing.T) testBetSuite { return testBetSuite{t, k, ctx, *tApp, betFee, market, deposits, participations} } -func (ts *testBetSuite) placeBetsAndTest() ([]bettypes.Bet, sdk.Dec, sdk.Dec) { +func (ts *testBetSuite) placeBetsAndTest() ([]bettypes.Bet, sdkmath.LegacyDec, sdkmath.LegacyDec) { ts.tApp.MarketKeeper.SetMarket(ts.ctx, ts.market) err := ts.k.InitiateOrderBook(ts.ctx, ts.market.UID, []string{ @@ -167,7 +167,7 @@ func (ts *testBetSuite) placeBetsAndTest() ([]bettypes.Bet, sdk.Dec, sdk.Dec) { betOdds := make(map[string]*bettypes.BetOddsCompact) var oddUIDS []string for _, odd := range ts.market.Odds { - betOdds[odd.UID] = &bettypes.BetOddsCompact{UID: odd.UID, MaxLossMultiplier: sdk.MustNewDecFromStr("0.3")} + betOdds[odd.UID] = &bettypes.BetOddsCompact{UID: odd.UID, MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.3")} oddUIDS = append(oddUIDS, odd.UID) } @@ -309,7 +309,7 @@ func (ts *testBetSuite) placeTestBet( expErr error, odds map[string]*bettypes.BetOddsCompact, oddUIDS []string, -) (bettypes.Bet, sdk.Dec, []*bettypes.BetFulfillment) { +) (bettypes.Bet, sdkmath.LegacyDec, []*bettypes.BetFulfillment) { bet := bettypes.Bet{ UID: uuid.NewString(), MarketUID: marketUID, @@ -320,7 +320,7 @@ func (ts *testBetSuite) placeTestBet( Status: bettypes.Bet_STATUS_PENDING, Creator: bettorAddr.String(), CreatedAt: cast.ToInt64(ts.ctx.BlockTime().Unix()), - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), } payoutProfit, err := bettypes.CalculatePayoutProfit(bet.OddsValue, bet.Amount) @@ -371,7 +371,7 @@ func newTestBetSuiteForLargeNumbers(t *testing.T) testBetSuite { betFee := sdkmath.NewInt(10) params := tApp.HouseKeeper.GetParams(ctx) - params.HouseParticipationFee = sdk.NewDec(0) + params.HouseParticipationFee = sdkmath.LegacyNewDec(0) tApp.HouseKeeper.SetParams(ctx, params) marketUID := uuid.NewString() @@ -443,13 +443,13 @@ func (ts *testBetSuite) bulkDepositPlaceBetsAndTest() { require.True(ts.t, found) } - multipliers := []sdk.Dec{ - sdk.MustNewDecFromStr("0.8649932157"), - sdk.MustNewDecFromStr("0.8658575751"), - sdk.MustNewDecFromStr("0.9368906369"), - sdk.MustNewDecFromStr("0.81411403723"), - sdk.MustNewDecFromStr("1.00"), - sdk.MustNewDecFromStr("0.92010393313"), + multipliers := []sdkmath.LegacyDec{ + sdkmath.LegacyMustNewDecFromStr("0.8649932157"), + sdkmath.LegacyMustNewDecFromStr("0.8658575751"), + sdkmath.LegacyMustNewDecFromStr("0.9368906369"), + sdkmath.LegacyMustNewDecFromStr("0.81411403723"), + sdkmath.LegacyMustNewDecFromStr("1.00"), + sdkmath.LegacyMustNewDecFromStr("0.92010393313"), } betOdds := make(map[string]*bettypes.BetOddsCompact) var oddUIDS []string diff --git a/x/orderbook/types/participation.pb.go b/x/orderbook/types/participation.pb.go index f515f1e4..94a551d3 100644 --- a/x/orderbook/types/participation.pb.go +++ b/x/orderbook/types/participation.pb.go @@ -57,9 +57,11 @@ type OrderBookParticipation struct { ActualProfit cosmossdk_io_math.Int `protobuf:"bytes,13,opt,name=actual_profit,json=actualProfit,proto3,customtype=cosmossdk.io/math.Int" json:"actual_profit" yaml:"actual_profit"` // is_settled represents if the participation is settled or not. IsSettled bool `protobuf:"varint,14,opt,name=is_settled,json=isSettled,proto3" json:"is_settled,omitempty" yaml:"is_settled"` - // returned_amount is the total returned amount to the user's account including reimbursed fees. + // returned_amount is the total returned amount to the user's account + // including reimbursed fees. ReturnedAmount cosmossdk_io_math.Int `protobuf:"bytes,15,opt,name=returned_amount,json=returnedAmount,proto3,customtype=cosmossdk.io/math.Int" json:"returned_amount" yaml:"returned_amount"` - // reimbursed_fee is the fee reimbursed because of reasons such as market calcellation. + // reimbursed_fee is the fee reimbursed because of reasons such as market + // calcellation. ReimbursedFee cosmossdk_io_math.Int `protobuf:"bytes,16,opt,name=reimbursed_fee,json=reimbursedFee,proto3,customtype=cosmossdk.io/math.Int" json:"reimbursed_fee" yaml:"reimbursed_fee"` } diff --git a/x/ovm/types/consts.go b/x/ovm/types/consts.go index b6f03afa..3123a8aa 100644 --- a/x/ovm/types/consts.go +++ b/x/ovm/types/consts.go @@ -1,6 +1,6 @@ package types -import sdk "github.com/cosmos/cosmos-sdk/types" +import sdkmath "cosmossdk.io/math" // JWT constants const ( @@ -34,4 +34,4 @@ const ( // minVoteMajorityForDecisionPercentage is the minimum majority percentage of votes for // a proposal to be valid for making decision. -var minVoteMajorityForDecisionPercentage = sdk.NewDecWithPrec(6667, 4) // 66.67% +var minVoteMajorityForDecisionPercentage = sdkmath.LegacyNewDecWithPrec(6667, 4) // 66.67% diff --git a/x/ovm/types/key_vault.go b/x/ovm/types/key_vault.go index 36f2c9fc..1f3f9f50 100644 --- a/x/ovm/types/key_vault.go +++ b/x/ovm/types/key_vault.go @@ -5,7 +5,7 @@ import ( "github.com/golang-jwt/jwt/v4" - sdk "github.com/cosmos/cosmos-sdk/types" + sdkmath "cosmossdk.io/math" "github.com/sge-network/sge/utils" ) @@ -57,7 +57,7 @@ func (k *KeyVault) validatePubKeys() error { func (k *KeyVault) MajorityCount() int64 { count := len(k.PublicKeys) - majorityVoteCount := sdk.NewDec(int64(count)). + majorityVoteCount := sdkmath.LegacyNewDec(int64(count)). Mul(minVoteMajorityForDecisionPercentage). Ceil().TruncateInt64() diff --git a/x/subaccount/keeper/msg_server_bet_test.go b/x/subaccount/keeper/msg_server_bet_test.go index e3b75b1f..477cbefa 100644 --- a/x/subaccount/keeper/msg_server_bet_test.go +++ b/x/subaccount/keeper/msg_server_bet_test.go @@ -35,20 +35,20 @@ var ( UID: testOddsUID1, MarketUID: testMarketUID, Value: "4.20", - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), } testBetOdds = &[]bettypes.BetOdds{ { UID: testOddsUID1, - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, { UID: testOddsUID2, - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, { UID: testOddsUID3, - MaxLossMultiplier: sdk.MustNewDecFromStr("0.1"), + MaxLossMultiplier: sdkmath.LegacyMustNewDecFromStr("0.1"), }, } testCreator string diff --git a/x/subaccount/keeper/msg_server_house_test.go b/x/subaccount/keeper/msg_server_house_test.go index 1623c88f..7d510a2f 100644 --- a/x/subaccount/keeper/msg_server_house_test.go +++ b/x/subaccount/keeper/msg_server_house_test.go @@ -89,7 +89,7 @@ func TestMsgServer(t *testing.T) { _, err = betMsgServer.Wager(sdk.WrapSDKContext(ctx), testBetMsgWager(t, bettor1, bettor1Funds)) require.NoError(t, err) - participateFee := app.HouseKeeper.GetHouseParticipationFee(ctx).Mul(sdk.NewDecFromInt(deposit)).TruncateInt() + participateFee := app.HouseKeeper.GetHouseParticipationFee(ctx).Mul(sdkmath.LegacyNewDecFromInt(deposit)).TruncateInt() bettorFee := sdkmath.NewInt(100) t.Run("house wins", func(t *testing.T) { @@ -135,7 +135,7 @@ func TestMsgServer(t *testing.T) { require.NoError(t, err) require.Equal(t, subBalance.SpentAmount.String(), sdk.ZeroInt().Add(participateFee).String()) - require.Equal(t, subBalance.LostAmount, sdk.NewDecFromInt(bettor1Funds.Sub(bettorFee)).Mul(sdk.MustNewDecFromStr("3.2")).TruncateInt()) + require.Equal(t, subBalance.LostAmount, sdkmath.LegacyNewDecFromInt(bettor1Funds.Sub(bettorFee)).Mul(sdkmath.LegacyMustNewDecFromStr("3.2")).TruncateInt()) // check profits were forwarded to subacc owner ownerBalance := app.BankKeeper.GetAllBalances(ctx, subAccOwner) require.Equal(t, ownerBalance.AmountOf(params.DefaultBondDenom), sdk.ZeroInt()) diff --git a/x/subaccount/simulation/genesis.go b/x/subaccount/simulation/genesis.go index 8e118237..ef92c0d1 100644 --- a/x/subaccount/simulation/genesis.go +++ b/x/subaccount/simulation/genesis.go @@ -10,7 +10,6 @@ import ( "github.com/spf13/cast" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/sge-network/sge/x/subaccount/types" @@ -23,8 +22,8 @@ const ( ) // GenHouseParticipationFee randomized batch settlement count -func GenHouseParticipationFee(r *rand.Rand) sdk.Dec { - return sdk.NewDec(cast.ToInt64(r.Intn(99))) +func GenHouseParticipationFee(r *rand.Rand) sdkmath.LegacyDec { + return sdkmath.LegacyNewDec(cast.ToInt64(r.Intn(99))) } // GenMinDeposit randomized house by uid query count @@ -34,7 +33,7 @@ func GenMinDeposit(r *rand.Rand) sdkmath.Int { // RandomizedGenState generates a random GenesisState for house func RandomizedGenState(simState *module.SimulationState) { - var houseParticipationFee sdk.Dec + var houseParticipationFee sdkmath.LegacyDec simState.AppParams.GetOrGenerate( simState.Cdc, HouseParticipationFee, &houseParticipationFee, simState.Rand, func(r *rand.Rand) { houseParticipationFee = GenHouseParticipationFee(r) }, From ad56c5010cffc49484bfea47efaf938dcb898397 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:42:34 +0300 Subject: [PATCH 26/51] upgrade: ibc to v7.3.2 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 82adea82..c2a51014 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.47.8 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-go/v7 v7.3.0 + github.com/cosmos/ibc-go/v7 v7.3.2 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/protobuf v1.5.3 diff --git a/go.sum b/go.sum index 7a8024ae..852e35e9 100644 --- a/go.sum +++ b/go.sum @@ -474,8 +474,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-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/ibc-go/v7 v7.3.2 h1:FeUDcBX7VYY0e0iRmcVkPPUjYfAqIc//QuHXo8JHz9c= +github.com/cosmos/ibc-go/v7 v7.3.2/go.mod h1:IMeOXb7gwpZ+/nOG5BuUkdW4weM1ezvN4PQPws4uzOI= 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/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= From 45aeb5bbb280348d5d2f405b6052ab5c3e225352 Mon Sep 17 00:00:00 2001 From: unknown unknown Date: Wed, 14 Feb 2024 15:13:18 +0100 Subject: [PATCH 27/51] add legacy router and update cosmos sdk replace --- app/keepers/keepers.go | 1 + go.mod | 6 ++++-- go.sum | 11 +++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index f0e47514..6c25193b 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -340,6 +340,7 @@ func NewAppKeeper( govConfig, govModAddress, ) + appKeepers.GovKeeper.SetLegacyRouter(govRouter) // IBC Fee Module keeper appKeepers.IBCFeeKeeper = ibcfeekeeper.NewKeeper( diff --git a/go.mod b/go.mod index c2a51014..de55230d 100644 --- a/go.mod +++ b/go.mod @@ -67,7 +67,7 @@ require ( cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect - cosmossdk.io/log v1.3.0 // indirect + cosmossdk.io/log v1.3.1 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/4meepo/tagalign v1.3.3 // indirect @@ -262,7 +262,7 @@ require ( github.com/rivo/uniseg v0.2.0 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/cors v1.8.3 // indirect - github.com/rs/zerolog v1.31.0 // indirect + github.com/rs/zerolog v1.32.0 // indirect github.com/ryancurrah/gomodguard v1.3.0 // indirect github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect @@ -337,6 +337,8 @@ replace ( // cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 + github.com/cosmos/cosmos-sdk => github.com/sge-network/cosmos-sdk v0.47.9-0.20240214090649-ddf6d79cf327 + // support concurrency for iavl github.com/cosmos/iavl => github.com/cosmos/iavl v0.20.1 diff --git a/go.sum b/go.sum index 852e35e9..2117919d 100644 --- a/go.sum +++ b/go.sum @@ -203,8 +203,8 @@ cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98ok cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= -cosmossdk.io/log v1.3.0 h1:L0Z0XstClo2kOU4h3V1iDoE5Ji64sg5HLOogzGg67Oo= -cosmossdk.io/log v1.3.0/go.mod h1:HIDyvWLqZe2ovlWabsDN4aPMpY/nUEquAhgfTf2ZzB8= +cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI= +cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig= cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 h1:A+LHM41uss8WNJ+qZCdvCjtiG6UiIN7ZqmPZz6R25wc= @@ -462,8 +462,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.8 h1:kzYF2xhnfi8dy15t2VVS24tc2KcuU4JBgjh9yCFx4y4= -github.com/cosmos/cosmos-sdk v0.47.8/go.mod h1:VTAtthIsmfplanhFfUTfT6ED4F+kkJxT7nmvmKXRthI= 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= @@ -1338,8 +1336,8 @@ 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.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= -github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= +github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= 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= @@ -1364,6 +1362,7 @@ github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KR 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/sge-network/cosmos-sdk v0.47.9-0.20240214090649-ddf6d79cf327/go.mod h1:mFCwvXpfYFc+NYGKulRaq2lNLaXlX0VNNrdYE09Fgjg= 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 v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= From 30b59c273f1375c08dbc4c233a0345eed2f7749f Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 14 Feb 2024 17:26:56 +0300 Subject: [PATCH 28/51] lint: go.sum regenerate --- go.sum | 1 + 1 file changed, 1 insertion(+) diff --git a/go.sum b/go.sum index 2117919d..742e6498 100644 --- a/go.sum +++ b/go.sum @@ -1362,6 +1362,7 @@ github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KR 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/sge-network/cosmos-sdk v0.47.9-0.20240214090649-ddf6d79cf327 h1:dzrl/2f3EbqyEVRBXFk7zI6gUEVG4Sjs4ib71bKqnb4= github.com/sge-network/cosmos-sdk v0.47.9-0.20240214090649-ddf6d79cf327/go.mod h1:mFCwvXpfYFc+NYGKulRaq2lNLaXlX0VNNrdYE09Fgjg= 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= From 71f44392a6267a58ed425e422790e9286c108d5d Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Thu, 4 Apr 2024 16:23:17 +0300 Subject: [PATCH 29/51] fix: cosmos-sdk fork --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 5a691580..dafc4939 100644 --- a/go.mod +++ b/go.mod @@ -337,7 +337,7 @@ replace ( // cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - github.com/cosmos/cosmos-sdk => github.com/sge-network/cosmos-sdk v0.47.9-0.20240214090649-ddf6d79cf327 + github.com/cosmos/cosmos-sdk => github.com/sge-network/cosmos-sdk v0.47.9-0.20240404130223-34f270686d17 // support concurrency for iavl github.com/cosmos/iavl => github.com/cosmos/iavl v0.20.1 diff --git a/go.sum b/go.sum index fcaa8ba3..a2b84b16 100644 --- a/go.sum +++ b/go.sum @@ -1362,8 +1362,8 @@ github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KR 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/sge-network/cosmos-sdk v0.47.9-0.20240214090649-ddf6d79cf327 h1:dzrl/2f3EbqyEVRBXFk7zI6gUEVG4Sjs4ib71bKqnb4= -github.com/sge-network/cosmos-sdk v0.47.9-0.20240214090649-ddf6d79cf327/go.mod h1:mFCwvXpfYFc+NYGKulRaq2lNLaXlX0VNNrdYE09Fgjg= +github.com/sge-network/cosmos-sdk v0.47.9-0.20240404130223-34f270686d17 h1:N04lFNSwZgORzivRlFRPAXOx9DfcJdJfuKJBhKPXInE= +github.com/sge-network/cosmos-sdk v0.47.9-0.20240404130223-34f270686d17/go.mod h1:mFCwvXpfYFc+NYGKulRaq2lNLaXlX0VNNrdYE09Fgjg= 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 v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= From 62e4f10e8465eb154f8ed95acf43bcb42c60775e Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 8 Apr 2024 12:23:49 +0300 Subject: [PATCH 30/51] refactor: rename v8 upgrade to v9 --- app/app.go | 4 ++-- app/upgrades/{v8 => v9}/consts.go | 6 +++--- app/upgrades/{v8 => v9}/upgrades.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename app/upgrades/{v8 => v9}/consts.go (82%) rename app/upgrades/{v8 => v9}/upgrades.go (99%) diff --git a/app/app.go b/app/app.go index 6d91ff39..95ffd237 100644 --- a/app/app.go +++ b/app/app.go @@ -54,7 +54,7 @@ import ( v5 "github.com/sge-network/sge/app/upgrades/v5" v6 "github.com/sge-network/sge/app/upgrades/v6" v7 "github.com/sge-network/sge/app/upgrades/v7" - v8 "github.com/sge-network/sge/app/upgrades/v8" + v9 "github.com/sge-network/sge/app/upgrades/v9" // unnamed import of statik for swagger UI support _ "github.com/cosmos/cosmos-sdk/client/docs/statik" @@ -85,7 +85,7 @@ var ( v5.Upgrade, v6.Upgrade, v7.Upgrade, - v8.Upgrade, + v9.Upgrade, } ) diff --git a/app/upgrades/v8/consts.go b/app/upgrades/v9/consts.go similarity index 82% rename from app/upgrades/v8/consts.go rename to app/upgrades/v9/consts.go index eb4a0578..c2544d24 100644 --- a/app/upgrades/v8/consts.go +++ b/app/upgrades/v9/consts.go @@ -1,4 +1,4 @@ -package v8 +package v9 import ( store "github.com/cosmos/cosmos-sdk/store/types" @@ -8,8 +8,8 @@ import ( "github.com/sge-network/sge/app/upgrades" ) -// UpgradeName defines the on-chain upgrade name for the v1.6.0 upgrade. -const UpgradeName = "v1.6.0" +// UpgradeName defines the on-chain upgrade name for the v1.7.0 upgrade. +const UpgradeName = "v1.7.0" var Upgrade = upgrades.Upgrade{ UpgradeName: UpgradeName, diff --git a/app/upgrades/v8/upgrades.go b/app/upgrades/v9/upgrades.go similarity index 99% rename from app/upgrades/v8/upgrades.go rename to app/upgrades/v9/upgrades.go index 6a3b143b..039c542f 100644 --- a/app/upgrades/v8/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -1,4 +1,4 @@ -package v8 +package v9 import ( sdkmath "cosmossdk.io/math" From 6f10f5bdf1853f7552330065fc8e94bf0508f77b Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 11:01:48 +0300 Subject: [PATCH 31/51] refactor: replace existing sdk.int --- x/bet/types/params.go | 2 +- x/house/keeper/deposit.go | 2 +- x/house/types/deposit_authorizaton.go | 2 +- x/house/types/message_deposit_test.go | 5 ++-- x/house/types/withdraw_authorizaton.go | 2 +- x/mint/types/params.go | 2 +- x/orderbook/keeper/bet_wager.go | 4 +-- x/orderbook/keeper/bet_wager_test.go | 2 +- x/orderbook/keeper/exposure_odds.go | 5 ++-- x/orderbook/keeper/participation.go | 2 +- x/orderbook/keeper/participation_test.go | 4 +-- x/orderbook/types/exposure.go | 5 ++-- x/orderbook/types/participation.go | 20 ++++++------- x/reward/keeper/campaign_test.go | 2 +- x/reward/keeper/distribution.go | 5 ++-- x/reward/keeper/msg_server_reward_test.go | 16 +++++------ x/reward/types/campaign_authorizaton.go | 6 ++-- x/reward/types/reward_bet_bonus.go | 2 +- x/subaccount/genesis_test.go | 7 ++--- x/subaccount/keeper/msg_server_bet_test.go | 6 ++-- x/subaccount/keeper/msg_server_house_test.go | 28 +++++++++---------- .../keeper/msg_server_subaccount_test.go | 6 ++-- x/subaccount/keeper/query_server_test.go | 7 +++-- x/subaccount/keeper/subaccount.go | 6 ++-- x/subaccount/keeper/subaccount_test.go | 6 ++-- 25 files changed, 77 insertions(+), 77 deletions(-) diff --git a/x/bet/types/params.go b/x/bet/types/params.go index c85b69d6..75bb0d48 100644 --- a/x/bet/types/params.go +++ b/x/bet/types/params.go @@ -138,7 +138,7 @@ func validateConstraints(i interface{}) error { return fmt.Errorf("minimum bet amount must be more than one: %d", v.MinAmount.Int64()) } - if v.Fee.LT(sdk.ZeroInt()) { + if v.Fee.LT(sdkmath.ZeroInt()) { return fmt.Errorf("minimum bet fee must be positive: %d", v.Fee.Int64()) } diff --git a/x/house/keeper/deposit.go b/x/house/keeper/deposit.go index 28246c99..7fbdbf27 100644 --- a/x/house/keeper/deposit.go +++ b/x/house/keeper/deposit.go @@ -58,7 +58,7 @@ func (k Keeper) Deposit(ctx sdk.Context, creator, depositor string, marketUID string, amount sdkmath.Int, ) (participationIndex uint64, feeAmount sdkmath.Int, err error) { // Create the deposit object - deposit := types.NewDeposit(creator, depositor, marketUID, amount, sdk.ZeroInt(), 0) + deposit := types.NewDeposit(creator, depositor, marketUID, amount, sdkmath.ZeroInt(), 0) feeAmount = deposit.CalcHouseParticipationFeeAmount(k.GetHouseParticipationFee(ctx)) diff --git a/x/house/types/deposit_authorizaton.go b/x/house/types/deposit_authorizaton.go index f67e413b..5944b592 100644 --- a/x/house/types/deposit_authorizaton.go +++ b/x/house/types/deposit_authorizaton.go @@ -50,7 +50,7 @@ func (a DepositAuthorization) ValidateBasic() error { if a.SpendLimit.IsNil() { return sdkerrtypes.ErrInvalidCoins.Wrap("spend limit cannot be nil") } - if a.SpendLimit.LTE(sdk.ZeroInt()) { + if a.SpendLimit.LTE(sdkmath.ZeroInt()) { return sdkerrtypes.ErrInvalidCoins.Wrap("spend limit cannot be less than or equal to zero") } if a.SpendLimit.LT(minDepositGrant) { diff --git a/x/house/types/message_deposit_test.go b/x/house/types/message_deposit_test.go index ea1e5aef..b5604ea9 100644 --- a/x/house/types/message_deposit_test.go +++ b/x/house/types/message_deposit_test.go @@ -7,7 +7,6 @@ import ( "github.com/stretchr/testify/require" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" sdkerrtypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/sge-network/sge/testutil/sample" @@ -49,7 +48,7 @@ func TestMsgDepositValidateBasic(t *testing.T) { msg: types.MsgDeposit{ Creator: sample.AccAddress(), MarketUID: uuid.NewString(), - Amount: sdk.ZeroInt(), + Amount: sdkmath.ZeroInt(), Ticket: "Ticket", }, err: sdkerrtypes.ErrInvalidRequest, @@ -76,7 +75,7 @@ func TestNewDeposit(t *testing.T) { Amount: sdkmath.NewInt(100), ParticipationIndex: 0, WithdrawalCount: 0, - TotalWithdrawalAmount: sdk.ZeroInt(), + TotalWithdrawalAmount: sdkmath.ZeroInt(), } res := types.NewDeposit( expected.Creator, diff --git a/x/house/types/withdraw_authorizaton.go b/x/house/types/withdraw_authorizaton.go index 0fb4d5ac..2cfc7f67 100644 --- a/x/house/types/withdraw_authorizaton.go +++ b/x/house/types/withdraw_authorizaton.go @@ -50,7 +50,7 @@ func (a WithdrawAuthorization) ValidateBasic() error { if a.WithdrawLimit.IsNil() { return sdkerrtypes.ErrInvalidCoins.Wrap("withdraw limit cannot be nil") } - if a.WithdrawLimit.LTE(sdk.ZeroInt()) { + if a.WithdrawLimit.LTE(sdkmath.ZeroInt()) { return sdkerrtypes.ErrInvalidCoins.Wrap("withdraw limit cannot be less than or equal to zero") } if a.WithdrawLimit.GT(maxWithdrawGrant) { diff --git a/x/mint/types/params.go b/x/mint/types/params.go index ce8d775f..12504060 100644 --- a/x/mint/types/params.go +++ b/x/mint/types/params.go @@ -245,7 +245,7 @@ func validateExcludeAmount(i interface{}) error { return fmt.Errorf(ErrTextInvalidParamType, i) } - if v.LT(sdk.ZeroInt()) { + if v.LT(sdkmath.ZeroInt()) { return fmt.Errorf(ErrTextExcludeAmountMustBePositive, v) } diff --git a/x/orderbook/keeper/bet_wager.go b/x/orderbook/keeper/bet_wager.go index 48c82a45..728af91c 100644 --- a/x/orderbook/keeper/bet_wager.go +++ b/x/orderbook/keeper/bet_wager.go @@ -464,7 +464,7 @@ func (fInfo *fulfillmentInfo) checkFullfillmentForOtherOdds(requeThreshold sdkma // availableLiquidity is the available amount of tokens to be used from the participation exposure fInfo.secondaryProcessItem.setAvailableLiquidity(betOdd.MaxLossMultiplier) - if fInfo.secondaryProcessItem.isLiquidityLessThanThreshold(requeThreshold, sdk.ZeroInt()) { + if fInfo.secondaryProcessItem.isLiquidityLessThanThreshold(requeThreshold, sdkmath.ZeroInt()) { fInfo.inProcessItem.setFulfilledSecondary(&fInfo.secondaryProcessItem) eUpdate = append(eUpdate, fInfo.secondaryProcessItem.participationExposure) } @@ -513,7 +513,7 @@ func (fItem *fulfillmentItem) isLiquidityLessThanThreshold(threshold, adjAmount } func (fItem *fulfillmentItem) noLiquidityAvailable() bool { - return fItem.availableLiquidity.LTE(sdk.ZeroInt()) + return fItem.availableLiquidity.LTE(sdkmath.ZeroInt()) } func (fItem *fulfillmentItem) setFulfilled() { diff --git a/x/orderbook/keeper/bet_wager_test.go b/x/orderbook/keeper/bet_wager_test.go index d2c0bacc..9407bb80 100644 --- a/x/orderbook/keeper/bet_wager_test.go +++ b/x/orderbook/keeper/bet_wager_test.go @@ -465,7 +465,7 @@ func (ts *testBetSuite) bulkDepositPlaceBetsAndTest() { OddsUID: ts.market.Odds[1].UID, OddsValue: "4.415", Amount: betAmount, - Fee: sdk.ZeroInt(), + Fee: sdkmath.ZeroInt(), Status: bettypes.Bet_STATUS_PENDING, Creator: bettorAddr.String(), CreatedAt: cast.ToInt64(ts.ctx.BlockTime().Unix()), diff --git a/x/orderbook/keeper/exposure_odds.go b/x/orderbook/keeper/exposure_odds.go index 9feff83f..afa2c48b 100644 --- a/x/orderbook/keeper/exposure_odds.go +++ b/x/orderbook/keeper/exposure_odds.go @@ -1,6 +1,7 @@ package keeper import ( + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sge-network/sge/x/orderbook/types" @@ -92,8 +93,8 @@ func (k Keeper) initParticipationExposures( pe := types.NewParticipationExposure( orderBookUID, boe.OddsUID, - sdk.ZeroInt(), - sdk.ZeroInt(), + sdkmath.ZeroInt(), + sdkmath.ZeroInt(), participationIndex, 1, false, diff --git a/x/orderbook/keeper/participation.go b/x/orderbook/keeper/participation.go index 310f2d5c..94278b98 100644 --- a/x/orderbook/keeper/participation.go +++ b/x/orderbook/keeper/participation.go @@ -132,7 +132,7 @@ func (k Keeper) InitiateOrderBookParticipation( index, book.UID, addr.String(), book.OddsCount, // all odds need to be filled in the next steps liquidity, feeAmount, liquidity, // int the start, liquidity and current round liquidity are the same - sdk.ZeroInt(), sdk.ZeroInt(), sdk.ZeroInt(), sdkmath.Int{}, "", sdk.ZeroInt(), + sdkmath.ZeroInt(), sdkmath.ZeroInt(), sdkmath.ZeroInt(), sdkmath.Int{}, "", sdkmath.ZeroInt(), ) // fund order book liquidity pool from participant's account. diff --git a/x/orderbook/keeper/participation_test.go b/x/orderbook/keeper/participation_test.go index 62166488..bbe6f345 100644 --- a/x/orderbook/keeper/participation_test.go +++ b/x/orderbook/keeper/participation_test.go @@ -217,7 +217,7 @@ func TestWithdrawOrderBookParticipation(t *testing.T) { { desc: "no participation", depositorAddr: simapp.TestParamUsers["user1"].Address, - depositAmount: sdk.ZeroInt(), + depositAmount: sdkmath.ZeroInt(), withdrawMode: housetypes.WithdrawalMode_WITHDRAWAL_MODE_FULL, err: types.ErrOrderBookParticipationNotFound, }, @@ -266,7 +266,7 @@ func TestWithdrawOrderBookParticipation(t *testing.T) { marketUID, participationIndex, tc.withdrawMode, - sdk.ZeroInt(), + sdkmath.ZeroInt(), tc.depositAmount, ) diff --git a/x/orderbook/types/exposure.go b/x/orderbook/types/exposure.go index 1ab973f9..24c2a000 100644 --- a/x/orderbook/types/exposure.go +++ b/x/orderbook/types/exposure.go @@ -4,7 +4,6 @@ import ( yaml "gopkg.in/yaml.v2" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" ) // NewOrderBookOddsExposure creates a new book odds exposure object @@ -55,8 +54,8 @@ func (pe ParticipationExposure) NextRound() ParticipationExposure { return NewParticipationExposure( pe.OrderBookUID, pe.OddsUID, - sdk.ZeroInt(), - sdk.ZeroInt(), + sdkmath.ZeroInt(), + sdkmath.ZeroInt(), pe.ParticipationIndex, pe.Round+1, false, diff --git a/x/orderbook/types/participation.go b/x/orderbook/types/participation.go index 14a2dffe..04b97d34 100644 --- a/x/orderbook/types/participation.go +++ b/x/orderbook/types/participation.go @@ -78,7 +78,7 @@ func (p *OrderBookParticipation) ValidateWithdraw( // maxWithdrawalAmount returns the max withdrawal amount of a participation. func (p *OrderBookParticipation) maxWithdrawalAmount() sdkmath.Int { - if p.CurrentRoundMaxLoss.LT(sdk.ZeroInt()) { + if p.CurrentRoundMaxLoss.LT(sdkmath.ZeroInt()) { return p.CurrentRoundLiquidity } return p.CurrentRoundLiquidity.Sub(p.CurrentRoundMaxLoss) @@ -86,7 +86,7 @@ func (p *OrderBookParticipation) maxWithdrawalAmount() sdkmath.Int { // IsLiquidityInCurrentRound determines if the participation has liquidity in current round. func (p *OrderBookParticipation) IsLiquidityInCurrentRound() bool { - return p.CurrentRoundLiquidity.GT(sdk.ZeroInt()) + return p.CurrentRoundLiquidity.GT(sdkmath.ZeroInt()) } // WithdrawableAmount returns the withdrawal amount according to the withdrawal mode and max withdrawable amount. @@ -100,7 +100,7 @@ func (p *OrderBookParticipation) WithdrawableAmount( var withdrawalAmt sdkmath.Int switch mode { case housetypes.WithdrawalMode_WITHDRAWAL_MODE_FULL: - if maxTransferableAmount.LTE(sdk.ZeroInt()) { + if maxTransferableAmount.LTE(sdkmath.ZeroInt()) { return sdkmath.Int{}, sdkerrors.Wrapf( ErrMaxWithdrawableAmountIsZero, "%d, %d", @@ -135,25 +135,25 @@ func (p *OrderBookParticipation) SetLiquidityAfterWithdrawal(withdrawalAmt sdkma // NotParticipatedInBetFulfillment determines if the participation has // participated in the bet fulfillment. func (p *OrderBookParticipation) NotParticipatedInBetFulfillment() bool { - return p.TotalBetAmount.Equal(sdk.ZeroInt()) + return p.TotalBetAmount.Equal(sdkmath.ZeroInt()) } // IsEligibleForNextRound determines if the participation has enough // liquidity to be used in the next round or not func (p *OrderBookParticipation) IsEligibleForNextRound() bool { - return p.CurrentRoundLiquidity.GT(sdk.ZeroInt()) + return p.CurrentRoundLiquidity.GT(sdkmath.ZeroInt()) } // IsEligibleForNextRound determines if the participation has enough // liquidity to be used in the next round or not func (p *OrderBookParticipation) IsEligibleForNextRoundPreLiquidityReduction() bool { - maxLoss := sdk.MaxInt(sdk.ZeroInt(), p.CurrentRoundMaxLoss) - return p.CurrentRoundLiquidity.Sub(maxLoss).GT(sdk.ZeroInt()) + maxLoss := sdk.MaxInt(sdkmath.ZeroInt(), p.CurrentRoundMaxLoss) + return p.CurrentRoundLiquidity.Sub(maxLoss).GT(sdkmath.ZeroInt()) } // TrimCurrentRoundLiquidity subtracts the max loss from the current round liquidity. func (p *OrderBookParticipation) TrimCurrentRoundLiquidity() { - maxLoss := sdk.MaxInt(sdk.ZeroInt(), p.CurrentRoundMaxLoss) + maxLoss := sdk.MaxInt(sdkmath.ZeroInt(), p.CurrentRoundMaxLoss) p.CurrentRoundLiquidity = p.CurrentRoundLiquidity.Sub(maxLoss) } @@ -163,8 +163,8 @@ func (p *OrderBookParticipation) ResetForNextRound(notFilledExposures uint64) { // prepare participation for the next round p.ExposuresNotFilled = notFilledExposures p.MaxLoss = p.MaxLoss.Add(p.CurrentRoundMaxLoss) - p.CurrentRoundTotalBetAmount = sdk.ZeroInt() - p.CurrentRoundMaxLoss = sdk.ZeroInt() + p.CurrentRoundTotalBetAmount = sdkmath.ZeroInt() + p.CurrentRoundMaxLoss = sdkmath.ZeroInt() } // SetCurrentRound sets the current round total bet amount and max loss. diff --git a/x/reward/keeper/campaign_test.go b/x/reward/keeper/campaign_test.go index 12b5926b..075b811c 100644 --- a/x/reward/keeper/campaign_test.go +++ b/x/reward/keeper/campaign_test.go @@ -33,7 +33,7 @@ func createNCampaign(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.Camp items[i].RewardAmountType = types.RewardAmountType_REWARD_AMOUNT_TYPE_FIXED items[i].IsActive = true items[i].Meta = "campaign " + items[i].UID - items[i].Pool = types.Pool{Spent: sdk.ZeroInt(), Withdrawn: sdk.ZeroInt(), Total: sdkmath.NewInt(100)} + items[i].Pool = types.Pool{Spent: sdkmath.ZeroInt(), Withdrawn: sdkmath.ZeroInt(), Total: sdkmath.NewInt(100)} keeper.SetCampaign(ctx, items[i]) } diff --git a/x/reward/keeper/distribution.go b/x/reward/keeper/distribution.go index 9eb020d1..6acbeb28 100644 --- a/x/reward/keeper/distribution.go +++ b/x/reward/keeper/distribution.go @@ -2,6 +2,7 @@ package keeper import ( sdkerrors "cosmossdk.io/errors" + sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/spf13/cast" @@ -12,7 +13,7 @@ import ( // DistributeRewards distributes the rewards according to the input distribution list. func (k Keeper) DistributeRewards(ctx sdk.Context, receiver types.Receiver) (uint64, error) { unlockTS := uint64(0) - if receiver.SubaccountAmount.GT(sdk.ZeroInt()) { + if receiver.SubaccountAmount.GT(sdkmath.ZeroInt()) { moduleAccAddr := types.RewardPoolFunder{}.GetModuleAcc() unlockTS = cast.ToUint64(ctx.BlockTime().Unix()) + receiver.UnlockPeriod if _, err := k.subaccountKeeper.TopUp(ctx, k.accountKeeper.GetModuleAddress(moduleAccAddr).String(), receiver.MainAccountAddr, @@ -25,7 +26,7 @@ func (k Keeper) DistributeRewards(ctx sdk.Context, receiver types.Receiver) (uin return unlockTS, sdkerrors.Wrapf(types.ErrSubaccountRewardTopUp, "subaccount address %s, %s", receiver.SubaccountAddr, err) } } - if receiver.MainAccountAmount.GT(sdk.ZeroInt()) { + if receiver.MainAccountAmount.GT(sdkmath.ZeroInt()) { if err := k.modFunder.Refund( types.RewardPoolFunder{}, ctx, sdk.MustAccAddressFromBech32(receiver.MainAccountAddr), diff --git a/x/reward/keeper/msg_server_reward_test.go b/x/reward/keeper/msg_server_reward_test.go index 7a723053..b79aeefe 100644 --- a/x/reward/keeper/msg_server_reward_test.go +++ b/x/reward/keeper/msg_server_reward_test.go @@ -88,7 +88,7 @@ func TestMsgApplySignupReward(t *testing.T) { _, err := tApp.SubaccountKeeper.CreateSubaccount(ctx, receiverAddr, receiverAddr, []subaccounttypes.LockedBalance{ { - Amount: sdk.ZeroInt(), + Amount: sdkmath.ZeroInt(), UnlockTS: uint64(ctx.BlockTime().Add(60 * time.Minute).Unix()), }, }) @@ -165,7 +165,7 @@ func TestMsgApplySignupRewardWithCap(t *testing.T) { _, err := tApp.SubaccountKeeper.CreateSubaccount(ctx, receiverAddr, receiverAddr, []subaccounttypes.LockedBalance{ { - Amount: sdk.ZeroInt(), + Amount: sdkmath.ZeroInt(), UnlockTS: uint64(ctx.BlockTime().Add(60 * time.Minute).Unix()), }, }) @@ -223,7 +223,7 @@ func TestMsgApplySignupRefereeReward(t *testing.T) { _, err := tApp.SubaccountKeeper.CreateSubaccount(ctx, receiverAddr, receiverAddr, []subaccounttypes.LockedBalance{ { - Amount: sdk.ZeroInt(), + Amount: sdkmath.ZeroInt(), UnlockTS: uint64(ctx.BlockTime().Add(60 * time.Minute).Unix()), }, }) @@ -316,7 +316,7 @@ func TestMsgApplySignupReferrerReward(t *testing.T) { _, err := tApp.SubaccountKeeper.CreateSubaccount(ctx, receiverAddr, receiverAddr, []subaccounttypes.LockedBalance{ { - Amount: sdk.ZeroInt(), + Amount: sdkmath.ZeroInt(), UnlockTS: uint64(ctx.BlockTime().Add(60 * time.Minute).Unix()), }, }) @@ -455,7 +455,7 @@ func TestMsgApplySignupAffiliateReward(t *testing.T) { _, err := tApp.SubaccountKeeper.CreateSubaccount(ctx, receiverAddr, receiverAddr, []subaccounttypes.LockedBalance{ { - Amount: sdk.ZeroInt(), + Amount: sdkmath.ZeroInt(), UnlockTS: uint64(ctx.BlockTime().Add(60 * time.Minute).Unix()), }, }) @@ -548,7 +548,7 @@ func TestMsgApplySignupAffiliateeReward(t *testing.T) { _, err := tApp.SubaccountKeeper.CreateSubaccount(ctx, receiverAddr, receiverAddr, []subaccounttypes.LockedBalance{ { - Amount: sdk.ZeroInt(), + Amount: sdkmath.ZeroInt(), UnlockTS: uint64(ctx.BlockTime().Add(60 * time.Minute).Unix()), }, }) @@ -698,7 +698,7 @@ func TestMsgApplyBetBonus(t *testing.T) { _, err := tApp.SubaccountKeeper.CreateSubaccount(ctx, bettor, bettor, []subaccounttypes.LockedBalance{ { - Amount: sdk.ZeroInt(), + Amount: sdkmath.ZeroInt(), UnlockTS: uint64(ctx.BlockTime().Add(60 * time.Minute).Unix()), }, }) @@ -839,7 +839,7 @@ func TestMsgApplySignupRewardSubaccount(t *testing.T) { _, err := tApp.SubaccountKeeper.CreateSubaccount(ctx, receiverAddr, receiverAddr, []subaccounttypes.LockedBalance{ { - Amount: sdk.ZeroInt(), + Amount: sdkmath.ZeroInt(), UnlockTS: uint64(ctx.BlockTime().Add(60 * time.Minute).Unix()), }, }) diff --git a/x/reward/types/campaign_authorizaton.go b/x/reward/types/campaign_authorizaton.go index e3c47a19..c7743b4b 100644 --- a/x/reward/types/campaign_authorizaton.go +++ b/x/reward/types/campaign_authorizaton.go @@ -54,7 +54,7 @@ func (a CreateCampaignAuthorization) ValidateBasic() error { if a.SpendLimit.IsNil() { return sdkerrtypes.ErrInvalidCoins.Wrap("spend limit cannot be nil") } - if a.SpendLimit.LTE(sdk.ZeroInt()) { + if a.SpendLimit.LTE(sdkmath.ZeroInt()) { return sdkerrtypes.ErrInvalidCoins.Wrap("spend limit cannot be less than or equal to zero") } @@ -110,7 +110,7 @@ func (a UpdateCampaignAuthorization) ValidateBasic() error { if a.SpendLimit.IsNil() { return sdkerrtypes.ErrInvalidCoins.Wrap("spend limit cannot be nil") } - if a.SpendLimit.LTE(sdk.ZeroInt()) { + if a.SpendLimit.LTE(sdkmath.ZeroInt()) { return sdkerrtypes.ErrInvalidCoins.Wrap("spend limit cannot be less than or equal to zero") } @@ -164,7 +164,7 @@ func (a WithdrawCampaignAuthorization) ValidateBasic() error { if a.WithdrawLimit.IsNil() { return sdkerrtypes.ErrInvalidCoins.Wrap("withdraw limit cannot be nil") } - if a.WithdrawLimit.LTE(sdk.ZeroInt()) { + if a.WithdrawLimit.LTE(sdkmath.ZeroInt()) { return sdkerrtypes.ErrInvalidCoins.Wrap("withdraw limit cannot be less than or equal to zero") } if a.WithdrawLimit.GT(maxWithdrawGrant) { diff --git a/x/reward/types/reward_bet_bonus.go b/x/reward/types/reward_bet_bonus.go index f387dc51..48ed0161 100644 --- a/x/reward/types/reward_bet_bonus.go +++ b/x/reward/types/reward_bet_bonus.go @@ -10,7 +10,7 @@ import ( bettypes "github.com/sge-network/sge/x/bet/types" ) -var percent = sdk.NewInt(100) +var percent = sdkmath.NewInt(100) // BetBonusReward is the type for bet bonus rewards calculations type BetBonusReward struct{} diff --git a/x/subaccount/genesis_test.go b/x/subaccount/genesis_test.go index 66e64e02..79b4fc17 100644 --- a/x/subaccount/genesis_test.go +++ b/x/subaccount/genesis_test.go @@ -7,7 +7,6 @@ import ( "github.com/stretchr/testify/require" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/sge-network/sge/testutil/sample" "github.com/sge-network/sge/testutil/simapp" @@ -36,9 +35,9 @@ func TestGenesis(t *testing.T) { Owner: subAccOwner.String(), Balance: types.AccountSummary{ DepositedAmount: subAccFunds, - SpentAmount: sdk.ZeroInt(), - WithdrawnAmount: sdk.ZeroInt(), - LostAmount: sdk.ZeroInt(), + SpentAmount: sdkmath.ZeroInt(), + WithdrawnAmount: sdkmath.ZeroInt(), + LostAmount: sdkmath.ZeroInt(), }, LockedBalances: []types.LockedBalance{ { diff --git a/x/subaccount/keeper/msg_server_bet_test.go b/x/subaccount/keeper/msg_server_bet_test.go index 477cbefa..20162ae0 100644 --- a/x/subaccount/keeper/msg_server_bet_test.go +++ b/x/subaccount/keeper/msg_server_bet_test.go @@ -165,8 +165,8 @@ func TestMsgServer_Bet(t *testing.T) { // now we check the subaccount balance balance, exists := k.GetAccountSummary(ctx, subAccAddr) require.True(t, exists) - require.Equal(t, sdk.ZeroInt(), balance.SpentAmount) - require.Equal(t, sdk.ZeroInt(), balance.LostAmount) + require.Equal(t, sdkmath.ZeroInt(), balance.SpentAmount) + require.Equal(t, sdkmath.ZeroInt(), balance.LostAmount) require.Equal(t, halfBetAmt, balance.WithdrawnAmount) // the owner has no balances ownerBalance := app.BankKeeper.GetBalance(ctx, subAccOwner, params.DefaultBondDenom).Amount @@ -190,7 +190,7 @@ func TestMsgServer_Bet(t *testing.T) { // now we check the subaccount balance balance, exists := k.GetAccountSummary(ctx, subAccAddr) require.True(t, exists) - require.Equal(t, balance.SpentAmount, sdk.ZeroInt()) + require.Equal(t, balance.SpentAmount, sdkmath.ZeroInt()) ownerBalance := app.BankKeeper.GetBalance(ctx, subAccOwner, params.DefaultBondDenom).Amount diff --git a/x/subaccount/keeper/msg_server_house_test.go b/x/subaccount/keeper/msg_server_house_test.go index 7d510a2f..c0213f6a 100644 --- a/x/subaccount/keeper/msg_server_house_test.go +++ b/x/subaccount/keeper/msg_server_house_test.go @@ -109,7 +109,7 @@ func TestMsgServer(t *testing.T) { require.True(t, exists) require.NoError(t, err) - require.Equal(t, subBalance.SpentAmount.String(), sdk.ZeroInt().Add(participateFee).String()) + require.Equal(t, subBalance.SpentAmount.String(), sdkmath.ZeroInt().Add(participateFee).String()) // check profits were forwarded to subacc owner ownerBalance := app.BankKeeper.GetAllBalances(ctx, subAccOwner) require.Equal(t, @@ -134,11 +134,11 @@ func TestMsgServer(t *testing.T) { require.True(t, exists) require.NoError(t, err) - require.Equal(t, subBalance.SpentAmount.String(), sdk.ZeroInt().Add(participateFee).String()) + require.Equal(t, subBalance.SpentAmount.String(), sdkmath.ZeroInt().Add(participateFee).String()) require.Equal(t, subBalance.LostAmount, sdkmath.LegacyNewDecFromInt(bettor1Funds.Sub(bettorFee)).Mul(sdkmath.LegacyMustNewDecFromStr("3.2")).TruncateInt()) // check profits were forwarded to subacc owner ownerBalance := app.BankKeeper.GetAllBalances(ctx, subAccOwner) - require.Equal(t, ownerBalance.AmountOf(params.DefaultBondDenom), sdk.ZeroInt()) + require.Equal(t, ownerBalance.AmountOf(params.DefaultBondDenom), sdkmath.ZeroInt()) }) t.Run("house refund", func(t *testing.T) { ctx, _ := ctx.CacheContext() @@ -157,11 +157,11 @@ func TestMsgServer(t *testing.T) { require.True(t, exists) require.NoError(t, err) - require.Equal(t, subBalance.SpentAmount, sdk.ZeroInt()) - require.Equal(t, subBalance.LostAmount, sdk.ZeroInt()) + require.Equal(t, subBalance.SpentAmount, sdkmath.ZeroInt()) + require.Equal(t, subBalance.LostAmount, sdkmath.ZeroInt()) // check profits were forwarded to subacc owner ownerBalance := app.BankKeeper.GetAllBalances(ctx, subAccOwner) - require.Equal(t, ownerBalance.AmountOf(params.DefaultBondDenom), sdk.ZeroInt()) + require.Equal(t, ownerBalance.AmountOf(params.DefaultBondDenom), sdkmath.ZeroInt()) }) // TODO: not participated in bet fulfillment. @@ -176,7 +176,7 @@ func TestMsgServer(t *testing.T) { require.True(t, exists) require.Equal(t, subBalance.SpentAmount.String(), sdkmath.NewInt(131999680).String()) // NOTE: there was a match in the bet + participate fee - require.Equal(t, subBalance.LostAmount.String(), sdk.ZeroInt().String()) + require.Equal(t, subBalance.LostAmount.String(), sdkmath.ZeroInt().String()) }) t.Run("withdrawal and market refund with bet fulfillment", func(t *testing.T) { @@ -200,11 +200,11 @@ func TestMsgServer(t *testing.T) { require.True(t, exists) require.NoError(t, err) - require.Equal(t, subBalance.SpentAmount, sdk.ZeroInt()) - require.Equal(t, subBalance.LostAmount, sdk.ZeroInt()) + require.Equal(t, subBalance.SpentAmount, sdkmath.ZeroInt()) + require.Equal(t, subBalance.LostAmount, sdkmath.ZeroInt()) // check profits were forwarded to subacc owner ownerBalance := app.BankKeeper.GetAllBalances(ctx, subAccOwner) - require.Equal(t, ownerBalance.AmountOf(params.DefaultBondDenom), sdk.ZeroInt()) + require.Equal(t, ownerBalance.AmountOf(params.DefaultBondDenom), sdkmath.ZeroInt()) }) } @@ -271,7 +271,7 @@ func TestHouseWithdrawal_MarketRefund(t *testing.T) { subBalance, exists = k.GetAccountSummary(ctx, subAccAddr) require.True(t, exists) require.Equal(t, subBalance.SpentAmount, sdkmath.NewInt(100).Mul(micro)) // all minus participation fee - require.Equal(t, subBalance.LostAmount, sdk.ZeroInt()) + require.Equal(t, subBalance.LostAmount, sdkmath.ZeroInt()) require.Equal(t, subBalance.DepositedAmount, subAccFunds) subBankBalance := app.BankKeeper.GetAllBalances(ctx, subAccAddr) require.Equal(t, subBankBalance.AmountOf(params.DefaultBondDenom), subAccFunds.Sub(sdkmath.NewInt(100).Mul(micro))) // original funds - fee @@ -292,13 +292,13 @@ func TestHouseWithdrawal_MarketRefund(t *testing.T) { require.True(t, exists) require.NoError(t, err) - require.Equal(t, subBalance.SpentAmount, sdk.ZeroInt()) - require.Equal(t, subBalance.LostAmount, sdk.ZeroInt()) + require.Equal(t, subBalance.SpentAmount, sdkmath.ZeroInt()) + require.Equal(t, subBalance.LostAmount, sdkmath.ZeroInt()) subBankBalance = app.BankKeeper.GetAllBalances(ctx, subAccAddr) require.Equal(t, subBankBalance.AmountOf(params.DefaultBondDenom), subAccFunds) // original funds - fee was refunded // check profits were not forwarded to subacc owner ownerBalance := app.BankKeeper.GetAllBalances(ctx, subAccOwner) - require.Equal(t, ownerBalance.AmountOf(params.DefaultBondDenom), sdk.ZeroInt()) + require.Equal(t, ownerBalance.AmountOf(params.DefaultBondDenom), sdkmath.ZeroInt()) } func houseWithdrawMsg(t testing.TB, owner sdk.AccAddress, amt sdkmath.Int, partecipationIndex uint64) *housetypes.MsgWithdraw { diff --git a/x/subaccount/keeper/msg_server_subaccount_test.go b/x/subaccount/keeper/msg_server_subaccount_test.go index 244d24ad..41858487 100644 --- a/x/subaccount/keeper/msg_server_subaccount_test.go +++ b/x/subaccount/keeper/msg_server_subaccount_test.go @@ -64,9 +64,9 @@ func TestMsgServer_Create(t *testing.T) { // get the balance of the account subaccountBalance, exists := app.SubaccountKeeper.GetAccountSummary(ctx, types.NewAddressFromSubaccount(1)) require.True(t, exists) - require.Equal(t, sdk.ZeroInt(), subaccountBalance.SpentAmount) - require.Equal(t, sdk.ZeroInt(), subaccountBalance.LostAmount) - require.Equal(t, sdk.ZeroInt(), subaccountBalance.WithdrawnAmount) + require.Equal(t, sdkmath.ZeroInt(), subaccountBalance.SpentAmount) + require.Equal(t, sdkmath.ZeroInt(), subaccountBalance.LostAmount) + require.Equal(t, sdkmath.ZeroInt(), subaccountBalance.WithdrawnAmount) require.Equal(t, sdkmath.NewInt(123), subaccountBalance.DepositedAmount) } diff --git a/x/subaccount/keeper/query_server_test.go b/x/subaccount/keeper/query_server_test.go index bdaa16f4..118b577f 100644 --- a/x/subaccount/keeper/query_server_test.go +++ b/x/subaccount/keeper/query_server_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + sdkmath "cosmossdk.io/math" "github.com/stretchr/testify/require" sdk "github.com/cosmos/cosmos-sdk/types" @@ -62,9 +63,9 @@ func TestQueryServer(t *testing.T) { require.Equal(t, subAccAddr.String(), gotSubaccount.Address) require.Equal(t, types.AccountSummary{ DepositedAmount: subAccFunds, - SpentAmount: sdk.ZeroInt(), - WithdrawnAmount: sdk.ZeroInt(), - LostAmount: sdk.ZeroInt(), + SpentAmount: sdkmath.ZeroInt(), + WithdrawnAmount: sdkmath.ZeroInt(), + LostAmount: sdkmath.ZeroInt(), }, gotSubaccount.Balance) require.Len(t, gotSubaccount.LockedBalance, 1) require.Equal(t, subAccFunds, gotSubaccount.LockedBalance[0].Amount) diff --git a/x/subaccount/keeper/subaccount.go b/x/subaccount/keeper/subaccount.go index a863261c..0df03653 100644 --- a/x/subaccount/keeper/subaccount.go +++ b/x/subaccount/keeper/subaccount.go @@ -123,9 +123,9 @@ func (k Keeper) CreateSubaccount(ctx sdk.Context, creator, owner string, k.SetLockedBalances(ctx, subAccAddr, lockedBalances) k.SetAccountSummary(ctx, subAccAddr, types.AccountSummary{ DepositedAmount: lockedBalance, - SpentAmount: sdk.ZeroInt(), - WithdrawnAmount: sdk.ZeroInt(), - LostAmount: sdk.ZeroInt(), + SpentAmount: sdkmath.ZeroInt(), + WithdrawnAmount: sdkmath.ZeroInt(), + LostAmount: sdkmath.ZeroInt(), }) return subAccAddr.String(), nil } diff --git a/x/subaccount/keeper/subaccount_test.go b/x/subaccount/keeper/subaccount_test.go index 7c670367..ad79f73e 100644 --- a/x/subaccount/keeper/subaccount_test.go +++ b/x/subaccount/keeper/subaccount_test.go @@ -93,9 +93,9 @@ func TestSetBalances(t *testing.T) { _, k, ctx := setupKeeperAndApp(t) balance := types.AccountSummary{ - DepositedAmount: sdk.ZeroInt(), - SpentAmount: sdk.ZeroInt(), - WithdrawnAmount: sdk.ZeroInt(), + DepositedAmount: sdkmath.ZeroInt(), + SpentAmount: sdkmath.ZeroInt(), + WithdrawnAmount: sdkmath.ZeroInt(), LostAmount: sdk.OneInt(), } From 43eacf90913cfe303b047eb9f1c66f3e6a3cdeed Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:15:57 +0300 Subject: [PATCH 32/51] upgrade: cosmos fork latest hash 054c8c413d45cc0b771c8fa52ab492a673411c7d --- go.mod | 77 ++++++++++++------------ go.sum | 183 ++++++++++++++++++++++++++++----------------------------- 2 files changed, 131 insertions(+), 129 deletions(-) diff --git a/go.mod b/go.mod index dafc4939..accbbdc1 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,17 @@ go 1.21 require ( cosmossdk.io/api v0.3.1 cosmossdk.io/errors v1.0.1 - cosmossdk.io/math v1.2.0 + cosmossdk.io/math v1.3.0 cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 - github.com/cometbft/cometbft v0.37.4 + github.com/cometbft/cometbft v0.37.5 github.com/cometbft/cometbft-db v0.8.0 - github.com/cosmos/cosmos-proto v1.0.0-beta.2 + github.com/cosmos/cosmos-proto v1.0.0-beta.4 github.com/cosmos/cosmos-sdk v0.47.8 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.3.2 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-jwt/jwt/v4 v4.5.0 - github.com/golang/protobuf v1.5.3 + github.com/golang/protobuf v1.5.4 github.com/golangci/golangci-lint v1.55.2 github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.1 @@ -26,8 +26,8 @@ require ( github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 - google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 - google.golang.org/grpc v1.60.1 + google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 + google.golang.org/grpc v1.62.1 gopkg.in/yaml.v2 v2.4.0 mvdan.cc/gofumpt v0.5.0 ) @@ -40,7 +40,7 @@ require ( github.com/cosmos/iavl v0.20.1 // indirect github.com/creachadair/taskgroup v0.4.2 // indirect github.com/curioswitch/go-reassign v0.2.0 // indirect - github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/kkHAIKE/contextcheck v1.1.4 // indirect github.com/maratori/testableexamples v1.0.0 // indirect @@ -49,22 +49,22 @@ require ( github.com/sashamelentyev/usestdlibvars v1.24.0 // indirect github.com/sivchari/nosnakecase v1.7.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.16.0 // indirect + github.com/spf13/viper v1.18.2 // indirect github.com/timonwong/loggercheck v0.9.4 // indirect go.uber.org/atomic v1.10.0 // indirect - go.uber.org/multierr v1.8.0 // indirect + go.uber.org/multierr v1.9.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect ) require ( 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect 4d63.com/gochecknoglobals v0.2.1 // indirect - cloud.google.com/go v0.111.0 // indirect + cloud.google.com/go v0.112.0 // indirect cloud.google.com/go/compute v1.23.3 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.5 // indirect - cloud.google.com/go/storage v1.30.1 // indirect + cloud.google.com/go/storage v1.36.0 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect cosmossdk.io/log v1.3.1 // indirect @@ -121,7 +121,7 @@ require ( github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect github.com/daixiang0/gci v0.11.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect github.com/denis-tingaikin/go-header v0.4.3 // indirect github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect @@ -135,7 +135,7 @@ require ( github.com/fatih/color v1.15.0 // indirect github.com/fatih/structtag v1.2.0 // indirect github.com/firefart/nonamedreturns v1.0.4 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect github.com/getsentry/sentry-go v0.23.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect @@ -144,7 +144,7 @@ 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-logr/logr v1.2.4 // indirect + github.com/go-logr/logr v1.3.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-toolsmith/astcast v1.1.0 // indirect github.com/go-toolsmith/astcopy v1.1.0 // indirect @@ -159,7 +159,7 @@ require ( github.com/gofrs/flock v0.8.1 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/glog v1.1.2 // indirect + github.com/golang/glog v1.2.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -210,7 +210,7 @@ require ( github.com/julz/importas v0.1.0 // indirect github.com/kisielk/errcheck v1.6.3 // indirect github.com/kisielk/gotool v1.0.0 // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/compress v1.17.0 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/kulti/thelper v0.6.3 // indirect @@ -246,9 +246,9 @@ require ( github.com/nishanths/predeclared v0.2.2 // indirect github.com/nunnatsa/ginkgolinter v0.14.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.8 // indirect + github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/polyfloyd/go-errorlint v1.4.5 // indirect github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect @@ -265,6 +265,8 @@ require ( github.com/rs/zerolog v1.32.0 // indirect github.com/ryancurrah/gomodguard v1.3.0 // indirect github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect + github.com/sagikazarmark/locafero v0.4.0 // indirect + github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/securego/gosec/v2 v2.18.2 // indirect @@ -273,13 +275,13 @@ require ( github.com/sivchari/containedctx v1.0.3 // indirect github.com/sivchari/tenv v1.7.1 // indirect github.com/sonatard/noctx v0.0.2 // indirect + github.com/sourcegraph/conc v0.3.0 // indirect github.com/sourcegraph/go-diff v0.7.0 // indirect - github.com/spf13/afero v1.9.5 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/afero v1.11.0 // indirect github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect github.com/stretchr/objx v0.5.2 // indirect - github.com/subosito/gotenv v1.4.2 // indirect + github.com/subosito/gotenv v1.6.0 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect github.com/tdakkota/asciicheck v0.2.0 // indirect @@ -303,25 +305,28 @@ require ( go-simpler.org/sloglint v0.1.2 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/otel v1.19.0 // indirect - go.opentelemetry.io/otel/metric v1.19.0 // indirect - go.opentelemetry.io/otel/trace v1.19.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect + go.opentelemetry.io/otel v1.21.0 // indirect + go.opentelemetry.io/otel/metric v1.21.0 // indirect + go.opentelemetry.io/otel/trace v1.21.0 // indirect go.tmz.dev/musttag v0.7.2 // indirect - golang.org/x/crypto v0.16.0 // indirect + golang.org/x/crypto v0.18.0 // indirect golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect golang.org/x/mod v0.13.0 // indirect - golang.org/x/net v0.19.0 // indirect - golang.org/x/oauth2 v0.13.0 // indirect - golang.org/x/sync v0.4.0 // indirect + golang.org/x/net v0.20.0 // indirect + golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.15.0 // indirect + golang.org/x/term v0.16.0 // indirect golang.org/x/text v0.14.0 // indirect + golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.14.0 // indirect - google.golang.org/api v0.149.0 // indirect + google.golang.org/api v0.155.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect - google.golang.org/protobuf v1.32.0 // indirect + google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect honnef.co/go/tools v0.4.6 // indirect @@ -329,7 +334,7 @@ require ( mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect nhooyr.io/websocket v1.8.7 // indirect - pgregory.net/rapid v0.5.5 // indirect + pgregory.net/rapid v1.1.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) @@ -337,7 +342,7 @@ replace ( // cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - github.com/cosmos/cosmos-sdk => github.com/sge-network/cosmos-sdk v0.47.9-0.20240404130223-34f270686d17 + github.com/cosmos/cosmos-sdk => github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45 // support concurrency for iavl github.com/cosmos/iavl => github.com/cosmos/iavl v0.20.1 diff --git a/go.sum b/go.sum index a2b84b16..236887a7 100644 --- a/go.sum +++ b/go.sum @@ -8,7 +8,6 @@ cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSR 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= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -22,7 +21,6 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= @@ -38,8 +36,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.111.0 h1:YHLKNupSD1KqjDbQ3+LVdQ81h/UJbJyZG203cEfnQgM= -cloud.google.com/go v0.111.0/go.mod h1:0mibmpKP1TyOOFYQY5izo0LnT+ecvOQ0Sg3OdmMiNRU= +cloud.google.com/go v0.112.0 h1:tpFCD7hpHFlQ8yPwT3x+QeXqc2T6+n6T+hmABHfDUSM= +cloud.google.com/go v0.112.0/go.mod h1:3jEEVwZ/MHU4djK5t5RHuKOA/GbLddgTdVubX1qnPD4= 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= @@ -177,12 +175,11 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= 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.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= -cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= +cloud.google.com/go/storage v1.36.0 h1:P0mOkAcaJxhCTvAkMhxMfrTKiNcub4YmmPBtlhAyTr8= +cloud.google.com/go/storage v1.36.0/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8= 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= @@ -205,8 +202,8 @@ cosmossdk.io/errors v1.0.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= cosmossdk.io/log v1.3.1 h1:UZx8nWIkfbbNEWusZqzAx3ZGvu54TZacWib3EzUYmGI= cosmossdk.io/log v1.3.1/go.mod h1:2/dIomt8mKdk6vl3OWJcPk2be3pGOS8OQaLUM/3/tCM= -cosmossdk.io/math v1.2.0 h1:8gudhTkkD3NxOP2YyyJIYYmt6dQ55ZfJkDOaxXpy7Ig= -cosmossdk.io/math v1.2.0/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= +cosmossdk.io/math v1.3.0 h1:RC+jryuKeytIiictDslBP9i1fhkVm6ZDmZEoNP316zE= +cosmossdk.io/math v1.3.0/go.mod h1:vnRTxewy+M7BtXBNFybkuhSH4WfedVAAnERHgVFhp3k= cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 h1:A+LHM41uss8WNJ+qZCdvCjtiG6UiIN7ZqmPZz6R25wc= cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24/go.mod h1:1kVkzonF2p6SYsSMXXURz/kx50QWArqazCk1Myulu8g= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -250,8 +247,8 @@ github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0/go.mod h1:rZLTje5A9kFBe0 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -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/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= +github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= 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= @@ -427,6 +424,8 @@ 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-20231128003011-0fa0005c9caa h1:jQCWAUqqlij9Pgj2i/PB79y4KOPYVyFYdROxgaCwdTQ= +github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa/go.mod h1:x/1Gn8zydmfq8dk6e9PdstVsDgu9RuyIIJqAaF//0IM= 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/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= @@ -440,8 +439,8 @@ github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE 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= -github.com/cometbft/cometbft v0.37.4 h1:xyvvEqlyfK8MgNIIKVJaMsuIp03wxOcFmVkT26+Ikpg= -github.com/cometbft/cometbft v0.37.4/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8= +github.com/cometbft/cometbft v0.37.5 h1:/U/TlgMh4NdnXNo+YU9T2NMCWyhXNDF34Mx582jlvq0= +github.com/cometbft/cometbft v0.37.5/go.mod h1:QC+mU0lBhKn8r9qvmnq53Dmf3DWBt4VtkcKw2C81wxY= 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= @@ -460,8 +459,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/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= -github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= +github.com/cosmos/cosmos-proto v1.0.0-beta.4 h1:aEL7tU/rLOmxZQ9z4i7mzxcLbSCY48OdY7lIWTLG7oU= +github.com/cosmos/cosmos-proto v1.0.0-beta.4/go.mod h1:oeB+FyVzG3XrQJbJng0EnV8Vljfk9XvTIpGILNU/9Co= 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= @@ -499,8 +498,9 @@ github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnG github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 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= @@ -557,6 +557,8 @@ 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.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v1.0.4 h1:gVPz/FMfvh57HdSJQyvBtF00j8JU4zdyUgIUNhlgg0A= +github.com/envoyproxy/protoc-gen-validate v1.0.4/go.mod h1:qys6tmnRsYrQqIhm2bvKZH4Blx/1gTIZ2UKVY1M+Yew= 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.10.17/go.mod h1:Lt5WzjM07XlXc95YzrhosmR4J9Ahd6X2wyEV2SvGhk0= @@ -569,8 +571,8 @@ github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBD 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/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/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-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= @@ -583,8 +585,8 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk github.com/frankban/quicktest v1.14.6/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.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= 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/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= @@ -624,8 +626,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG 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.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= +github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= 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/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= @@ -699,8 +701,8 @@ github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w 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.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo= -github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ= +github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= +github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= 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= @@ -735,8 +737,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -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/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/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= @@ -807,7 +809,6 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf 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-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -841,7 +842,6 @@ github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMd 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= github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 h1:mrEEilTAUmaAORhssPPkxj84TsHrPMLBGW2Z4SoTxm8= github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= @@ -1020,8 +1020,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.17.0 h1:Rnbp4K9EjcDuVuHtd0dgA4qNuv9yKDYKK1ulpJwgrqM= +github.com/klauspost/compress v1.17.0/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/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= @@ -1030,7 +1030,6 @@ github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPR github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/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.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.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -1239,8 +1238,8 @@ github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChl 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/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= -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/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= +github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= 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= @@ -1258,10 +1257,10 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE 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/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 v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/polyfloyd/go-errorlint v1.4.5 h1:70YWmMy4FgRHehGNOUask3HtSFSOLKgmDn7ryNe7LqI= github.com/polyfloyd/go-errorlint v1.4.5/go.mod h1:sIZEbFoDOCnTYYZoVkjc4hTnM459tuWA9H/EkdXwsKk= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= @@ -1346,6 +1345,10 @@ github.com/ryancurrah/gomodguard v1.3.0/go.mod h1:ggBxb3luypPEzqVtq33ee7YSN35V28 github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ= +github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4= +github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE= +github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc= github.com/sanposhiho/wastedassign/v2 v2.0.7/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= @@ -1362,8 +1365,8 @@ github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KR 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/sge-network/cosmos-sdk v0.47.9-0.20240404130223-34f270686d17 h1:N04lFNSwZgORzivRlFRPAXOx9DfcJdJfuKJBhKPXInE= -github.com/sge-network/cosmos-sdk v0.47.9-0.20240404130223-34f270686d17/go.mod h1:mFCwvXpfYFc+NYGKulRaq2lNLaXlX0VNNrdYE09Fgjg= +github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45 h1:gdXKc/Y7QTsuDsoC/S3R/LdXAxazOFzjxNoiJmpFaYE= +github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45/go.mod h1:WjqTUUHJnaRjkgJbP2aQ1F+9pxDpLsOBpfuP2S0W+Ck= 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 v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= @@ -1388,14 +1391,16 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/sonatard/noctx v0.0.2 h1:L7Dz4De2zDQhW8S0t+KUjY0MAQJd6SgVwhzNIc4ok00= github.com/sonatard/noctx v0.0.2/go.mod h1:kzFz+CzWSjQ2OzIm46uJZoXuBpa2+0y3T36U18dWqIo= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= +github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0= github.com/sourcegraph/go-diff v0.7.0/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.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM= -github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0= github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= @@ -1404,15 +1409,13 @@ github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tL 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= 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.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= -github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= +github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ= +github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk= 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/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= @@ -1437,12 +1440,11 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= 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/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -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/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8= +github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= 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/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8= @@ -1546,29 +1548,32 @@ 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/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= -go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= -go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= -go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= -go.opentelemetry.io/otel/sdk v1.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o= -go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A= -go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= -go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= +go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= +go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= +go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= +go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= +go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= +go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= +go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.tmz.dev/musttag v0.7.2 h1:1J6S9ipDbalBSODNT5jCep8dhZyMr4ttnjQagmGYR5s= go.tmz.dev/musttag v0.7.2/go.mod h1:m6q5NiiSKMnQYokefa2xGoyoXnrswCbJ0AWYzf4Zs28= 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.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= 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.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= -go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= +go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ= 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= @@ -1596,14 +1601,12 @@ golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/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-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-20210711020723-a769d52b0f97/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-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY= -golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= +golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= 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= @@ -1618,8 +1621,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-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us= -golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= +golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 h1:jWGQJV4niP+CCmFW9ekjA9Zx8vYORzOUH2/Nl5WPuLQ= @@ -1701,7 +1704,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY 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-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= golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -1712,7 +1714,6 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx 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-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= 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= @@ -1729,8 +1730,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c= -golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U= +golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= +golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= 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= @@ -1756,8 +1757,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.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY= -golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0= +golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= +golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= 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= @@ -1773,8 +1774,8 @@ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJ 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.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ= -golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= +golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= 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= @@ -1836,7 +1837,6 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w 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-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= @@ -1845,7 +1845,6 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/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= @@ -1883,7 +1882,6 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc 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-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1900,8 +1898,8 @@ 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.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.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= -golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= +golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= +golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= 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= @@ -1923,6 +1921,8 @@ golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20191024005414-555d28b269f0/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.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= +golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= 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= @@ -1989,7 +1989,6 @@ golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/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= @@ -2072,8 +2071,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.149.0 h1:b2CqT6kG+zqJIVKRQ3ELJVLN1PwHZ6DJ3dW8yl82rgY= -google.golang.org/api v0.149.0/go.mod h1:Mwn1B7JTXrzXtnvmzQE2BD6bYZQ8DShKZDZbeN9I7qI= +google.golang.org/api v0.155.0 h1:vBmGhCYs0djJttDNynWo44zosHlPvHmA0XiN2zP2DtA= +google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk= 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= @@ -2124,10 +2123,8 @@ google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6D 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= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2194,12 +2191,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-20240102182953-50ed04b92917 h1:nz5NESFLZbJGPFxDT/HCn+V1mZ8JGNoY4nUpmW/Y2eg= -google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917/go.mod h1:pZqR+glSb11aJ+JQcczCvgf47+duRuzNSKqE8YAQnV0= -google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o= -google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 h1:gphdwh0npgs8elJ4T6J+DQJHPVF7RsuJHCfwztUb4J4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1/go.mod h1:daQN87bsDqDoe316QbbvX60nMoJQa4r6Ds0ZuoAe5yA= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= +google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= +google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= 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= @@ -2241,8 +2238,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.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU= -google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM= +google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= +google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= 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= @@ -2259,8 +2256,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.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= -google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= 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= @@ -2322,8 +2319,8 @@ mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RF 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.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= -pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= +pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw= +pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= From f2f8eb6978eb46c02802d7addc98925b083ddc5b Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:09:10 +0300 Subject: [PATCH 33/51] fix: fix import golang.org/x/exp version compatible with 0.47 --- go.mod | 4 +++- go.sum | 36 +++--------------------------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/go.mod b/go.mod index accbbdc1..2b1ab1ae 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,6 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.9.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect ) require ( @@ -312,6 +311,7 @@ require ( go.opentelemetry.io/otel/trace v1.21.0 // indirect go.tmz.dev/musttag v0.7.2 // indirect golang.org/x/crypto v0.18.0 // indirect + golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect golang.org/x/mod v0.13.0 // indirect golang.org/x/net v0.20.0 // indirect @@ -358,4 +358,6 @@ replace ( // https://github.com/cosmos/cosmos-sdk/issues/14949 // pin the version of goleveldb to v1.0.1-0.20210819022825-2ae1ddf74ef7 required by SDK v47 upgrade guide. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 + + golang.org/x/exp => golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb ) diff --git a/go.sum b/go.sum index 236887a7..84d89b35 100644 --- a/go.sum +++ b/go.sum @@ -208,7 +208,6 @@ cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 h1:A+LHM41uss8WNJ+qZCdvCj cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24/go.mod h1:1kVkzonF2p6SYsSMXXURz/kx50QWArqazCk1Myulu8g= 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= 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= @@ -234,7 +233,6 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg6 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/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 v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= @@ -609,9 +607,6 @@ github.com/go-critic/go-critic v0.9.0 h1:Pmys9qvU3pSML/3GEQ2Xd9RZ/ip+aXHKILuxczK github.com/go-critic/go-critic v0.9.0/go.mod h1:5P8tdXL7m/6qnyG6oRAlYLORvoXH0WDypYgAEmagT40= 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-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= 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= @@ -1607,29 +1602,13 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= -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-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -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= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -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-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= +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/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 h1:jWGQJV4niP+CCmFW9ekjA9Zx8vYORzOUH2/Nl5WPuLQ= golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833/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= 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= @@ -1642,12 +1621,8 @@ golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPI 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/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/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= 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.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= @@ -1659,6 +1634,7 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 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/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1788,7 +1764,6 @@ golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190130150945-aca44879d564/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= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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= @@ -1800,7 +1775,6 @@ golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7w 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-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-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1932,7 +1906,6 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm 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-20190311212946-11955173bddd/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-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -1942,10 +1915,8 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn 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-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-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-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= @@ -1962,7 +1933,6 @@ golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapK 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-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= From 7ddaf9b42caac483eb6df3fae3e62d2bcb886cff Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:26:33 +0300 Subject: [PATCH 34/51] upgrade: golang version to 1.22 --- .github/workflows/lint.yml | 2 +- .github/workflows/test.yml | 10 +++++----- Makefile | 4 ++-- go.mod | 2 +- proto/Dockerfile | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6405f120..bf74c24c 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -6,7 +6,7 @@ on: - master env: - GO_VERSION: '1.21' + GO_VERSION: '1.22' jobs: golangci: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 22664529..828a70d2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.21 + go-version: 1.22 - name: Display go version run: go version - name: install tparse @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v4 with: - go-version: 1.21 + go-version: 1.22 - uses: technote-space/get-diff-action@v4 id: git_diff with: @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/setup-go@v4 with: - go-version: 1.21 + go-version: 1.22 - uses: actions/checkout@v2 - name: Create a file with all the pkgs run: go list ./... > pkgs.txt @@ -86,7 +86,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v4 with: - go-version: 1.21 + go-version: 1.22 - uses: technote-space/get-diff-action@v4 with: PATTERNS: | @@ -164,7 +164,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v4 with: - go-version: 1.21 + go-version: 1.22 - uses: technote-space/get-diff-action@v4 with: PATTERNS: | diff --git a/Makefile b/Makefile index 1c5413a7..7a1cb6c7 100644 --- a/Makefile +++ b/Makefile @@ -114,8 +114,8 @@ endif ############################################################################### check_version: -ifneq ($(GO_MINOR_VERSION),21) - @echo "ERROR: Go version 1.21 is required for this version of SGE. Go 1.21 has changes that are believed to break consensus." +ifneq ($(GO_MINOR_VERSION),22) + @echo "ERROR: Go version 1.22 is required for this version of SGE. Go 1.22 has changes that are believed to break consensus." exit 1 endif diff --git a/go.mod b/go.mod index 2b1ab1ae..7015dad9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/sge-network/sge -go 1.21 +go 1.22 require ( cosmossdk.io/api v0.3.1 diff --git a/proto/Dockerfile b/proto/Dockerfile index a72cb10a..0de9948c 100644 --- a/proto/Dockerfile +++ b/proto/Dockerfile @@ -1,9 +1,9 @@ # This Dockerfile is used for proto generation # To build, run `make proto-image-build` -FROM bufbuild/buf:1.7.0 as BUILDER +FROM bufbuild/buf:1.9.0 as BUILDER -FROM golang:1.21-alpine +FROM golang:1.22-alpine RUN apk add --no-cache \ @@ -12,7 +12,7 @@ RUN apk add --no-cache \ git \ make -ENV GOLANG_PROTOBUF_VERSION=1.28.0 \ +ENV GOLANG_PROTOBUF_VERSION=1.28.1 \ GOGO_PROTOBUF_VERSION=1.3.2 \ GRPC_GATEWAY_VERSION=1.16.0 From c6140b8148a57bbd42eace1857646ee3d5b6c1eb Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:39:25 +0300 Subject: [PATCH 35/51] workflow: codequl upgrade to v3 --- .github/workflows/codeql.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 48547718..4ba59778 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -41,11 +41,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -59,7 +59,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -72,6 +72,6 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:${{matrix.language}}" From de21643b78d9dfd370201315c8b81c604c355b5c Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:52:11 +0300 Subject: [PATCH 36/51] workflow: codeql golang version --- .github/workflows/codeql.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 4ba59778..080401e9 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -19,7 +19,9 @@ on: branches: [ "master" ] schedule: - cron: '26 6 * * 2' - +env: + GO_VERSION: 1.22 + jobs: analyze: name: Analyze From d1b539895ace6911772bae89bf86ca15b4059fe8 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:56:04 +0300 Subject: [PATCH 37/51] workflow: codeql bump version to cdcdbb579706841c47f7063dda365e292e5cad7a --- .github/workflows/codeql.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 080401e9..200deb3d 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -21,7 +21,7 @@ on: - cron: '26 6 * * 2' env: GO_VERSION: 1.22 - + jobs: analyze: name: Analyze @@ -47,7 +47,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -61,7 +61,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v3 + uses: github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a # ℹ️ Command-line programs to run using the OS shell. # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun @@ -74,6 +74,6 @@ jobs: # ./location_of_script_within_repo/buildscript.sh - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a with: category: "/language:${{matrix.language}}" From 686a4a32aa1c5f7d74dc188ca8cfe90c18220b33 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:09:46 +0300 Subject: [PATCH 38/51] workflow: codeql use setup-go --- .github/workflows/codeql.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 200deb3d..079f3852 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -44,6 +44,13 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 + + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: ${{ env.GO_VERSION }} + check-latest: true + cache: false # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From 2e2b0e33692f0d38c150364a720cff234feb0813 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:14:25 +0300 Subject: [PATCH 39/51] workflow: test setup-go upgrade to v5 --- .github/workflows/test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 828a70d2..cdcbba2e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: install-tparse: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.22 - name: Display go version @@ -33,7 +33,7 @@ jobs: go-arch: ["amd64", "arm", "arm64"] steps: - uses: actions/checkout@v2 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.22 - uses: technote-space/get-diff-action@v4 @@ -49,7 +49,7 @@ jobs: split-test-files: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.22 - uses: actions/checkout@v2 @@ -84,7 +84,7 @@ jobs: part: ["00", "01", "02", "03"] steps: - uses: actions/checkout@v2 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.22 - uses: technote-space/get-diff-action@v4 @@ -162,7 +162,7 @@ jobs: part: ["00", "01", "02", "03"] steps: - uses: actions/checkout@v2 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.22 - uses: technote-space/get-diff-action@v4 From aa567314ee4eaf99270608e7a3a88017ce5f4393 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:17:15 +0300 Subject: [PATCH 40/51] docs: upgrade go to 1.22 --- Makefile | 2 +- README.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7a1cb6c7..6d1c31f6 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ endif check_version: ifneq ($(GO_MINOR_VERSION),22) - @echo "ERROR: Go version 1.22 is required for this version of SGE. Go 1.22 has changes that are believed to break consensus." + @echo "ERROR: Go version 1.22 is required for this version of SGE. Go 1.21 has changes that are believed to break consensus." exit 1 endif diff --git a/README.md b/README.md index 0546ad66..2116e976 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ At launch, the SGE Network will be optimized to deploy an inaugural application: ## Installation Steps > ->Prerequisite: go1.21+ required. [ref](https://golang.org/doc/install) +>Prerequisite: go1.22+ required. [ref](https://golang.org/doc/install) Sge could be installed by two ways - downloading binary from releases page or build from source. @@ -138,7 +138,7 @@ sged start | Version | Mainnet | Testnet | SDK Version | |:-------:|:-------:|:-------:|:-----------:| -| v1.1.0 | ✓ | ✓ | v0.46.14 | +| v1.7.0 | ✓ | ✓ | v0.47.10 | ## Active Networks @@ -146,7 +146,7 @@ sged start - [sgenet-1](https://github.com/sge-network/networks/tree/master/mainnet/sgenet-1) -- Place the genesis file with the genesis file of the chain. +- Place the genesis file with the genesis file of the chain. ```shell wget https://github.com/sge-network/networks/blob/master/mainnet/sgenet-1/genesis.json -O ~/.sge/config/genesis.json @@ -174,12 +174,12 @@ sged start --minimum-gas-prices [desired-gas-price(ex. 0.001usge)] ### Testnet -- [sge-network-3](https://github.com/sge-network/networks/tree/master/testnet/sge-network-3) +- [sge-network-4](https://github.com/sge-network/networks/tree/master/testnet/sge-network-4) - Place the genesis file with the genesis file of the chain. ```shell -wget https://github.com/sge-network/networks/blob/master/testnet/sge-network-3/genesis.json -O ~/.sge/config/genesis.json +wget https://github.com/sge-network/networks/blob/master/testnet/sge-network-4/genesis.json -O ~/.sge/config/genesis.json ``` Verify genesis hash sum @@ -188,7 +188,7 @@ Verify genesis hash sum sha256sum ~/.sge/config/genesis.json ``` -Correct sha256 sum for sge-network-3 genesis file is caa7f15bab24a87718bff96ffeee058373154f7701a1e8977fff46d2f620dbcb +Correct sha256 sum for sge-network-4 genesis file is caa7f15bab24a87718bff96ffeee058373154f7701a1e8977fff46d2f620dbcb - Add `persistent_peers` or `seeds` in `${HOME}/.sge/config/config.toml` @@ -231,4 +231,4 @@ sged version ### Documentations -For the most up to date documentation please visit [Gitbook](https://sgenetwork.gitbook.io/documentation-1/) +For the most up-to-date documentation please visit [Gitbook](https://sgenetwork.gitbook.io/documentation-1/) From 16a9242effc52e93944f2f7ad4a93716a21be584 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:23:29 +0300 Subject: [PATCH 41/51] upgrade: ibc-go to v7.4.0 --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7015dad9..00c7237e 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-beta.4 github.com/cosmos/cosmos-sdk v0.47.8 github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-go/v7 v7.3.2 + github.com/cosmos/ibc-go/v7 v7.4.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/protobuf v1.5.4 diff --git a/go.sum b/go.sum index 84d89b35..0c769277 100644 --- a/go.sum +++ b/go.sum @@ -469,8 +469,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-go/v7 v7.3.2 h1:FeUDcBX7VYY0e0iRmcVkPPUjYfAqIc//QuHXo8JHz9c= -github.com/cosmos/ibc-go/v7 v7.3.2/go.mod h1:IMeOXb7gwpZ+/nOG5BuUkdW4weM1ezvN4PQPws4uzOI= +github.com/cosmos/ibc-go/v7 v7.4.0 h1:8FqYMptvksgMvlbN4UW9jFxTXzsPyfAzEZurujXac8M= +github.com/cosmos/ibc-go/v7 v7.4.0/go.mod h1:L/KaEhzV5TGUCTfGysVgMBQtl5Dm7hHitfpk+GIeoAo= 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/keyring v1.2.0 h1:8C1lBP9xhImmIabyXW4c3vFjjLiBdGCmfLUfeZlV1Yo= From 21112e0463ebcfdfd356e027e298ce15e5a959e8 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 15 Apr 2024 14:10:49 +0300 Subject: [PATCH 42/51] fix: ignore build dir --- .gitignore | 3 +++ Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8c806e68..d896d3bd 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ # ignore visual studio code dev container config .devcontainer + +# ignore build directory +build \ No newline at end of file diff --git a/Makefile b/Makefile index 6d1c31f6..b3ba976b 100644 --- a/Makefile +++ b/Makefile @@ -115,7 +115,7 @@ endif check_version: ifneq ($(GO_MINOR_VERSION),22) - @echo "ERROR: Go version 1.22 is required for this version of SGE. Go 1.21 has changes that are believed to break consensus." + @echo "ERROR: Go version 1.22 is required for this version of SGE." exit 1 endif From 162db98afa5ba849afe7dbfe3274b769646103db Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 15 Apr 2024 17:02:57 +0300 Subject: [PATCH 43/51] upgrade: grpc upgrade --- go.mod | 38 +++++++++++++------------- go.sum | 72 +++++++++++++++++++++++++------------------------- proto/buf.lock | 4 +-- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/go.mod b/go.mod index 00c7237e..66945ebe 100644 --- a/go.mod +++ b/go.mod @@ -26,8 +26,8 @@ require ( github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 - google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 - google.golang.org/grpc v1.62.1 + google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de + google.golang.org/grpc v1.63.2 gopkg.in/yaml.v2 v2.4.0 mvdan.cc/gofumpt v0.5.0 ) @@ -60,9 +60,9 @@ require ( 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect 4d63.com/gochecknoglobals v0.2.1 // indirect cloud.google.com/go v0.112.0 // indirect - cloud.google.com/go/compute v1.23.3 // indirect + cloud.google.com/go/compute v1.24.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v1.1.5 // indirect + cloud.google.com/go/iam v1.1.6 // indirect cloud.google.com/go/storage v1.36.0 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect @@ -143,7 +143,7 @@ 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-logr/logr v1.3.0 // indirect + github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-toolsmith/astcast v1.1.0 // indirect github.com/go-toolsmith/astcopy v1.1.0 // indirect @@ -304,28 +304,28 @@ require ( go-simpler.org/sloglint v0.1.2 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect - go.opentelemetry.io/otel v1.21.0 // indirect - go.opentelemetry.io/otel/metric v1.21.0 // indirect - go.opentelemetry.io/otel/trace v1.21.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 // indirect + go.opentelemetry.io/otel v1.22.0 // indirect + go.opentelemetry.io/otel/metric v1.22.0 // indirect + go.opentelemetry.io/otel/trace v1.22.0 // indirect go.tmz.dev/musttag v0.7.2 // indirect - golang.org/x/crypto v0.18.0 // indirect - golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect + golang.org/x/crypto v0.19.0 // indirect + golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect golang.org/x/mod v0.13.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/oauth2 v0.16.0 // indirect + golang.org/x/net v0.21.0 // indirect + golang.org/x/oauth2 v0.17.0 // indirect golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.16.0 // indirect + golang.org/x/sys v0.17.0 // indirect + golang.org/x/term v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/tools v0.14.0 // indirect - google.golang.org/api v0.155.0 // indirect + google.golang.org/api v0.162.0 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect + google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect google.golang.org/protobuf v1.33.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 0c769277..95719994 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,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.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk= -cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI= +cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= +cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= 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= @@ -116,8 +116,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.5 h1:1jTsCu4bcsNsE4iiqNT5SHwrDRCfRmIaaaVFhRveTJI= -cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXEbzv8= +cloud.google.com/go/iam v1.1.6 h1:bEa06k05IO4f4uJonbB5iAgKTPpABy1ayxaIZV/GHVc= +cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWOGTwI= 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= @@ -621,8 +621,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG 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.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= 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/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= @@ -1543,18 +1543,18 @@ 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.46.1 h1:SpGay3w+nEwMpfVnbqOLH5gY52/foP8RE8UzTZ1pdSE= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1/go.mod h1:4UoMYEZOC0yN/sPGH76KPkkU7zgiEWYWL9vwmbnTJPE= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo= -go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc= -go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo= -go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4= -go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0 h1:UNQQKPfTDe1J81ViolILjTKPr9WetKW6uei2hFgJmFs= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.47.0/go.mod h1:r9vWsPS/3AQItv3OSlEJ/E4mbrhUbbw18meOjArPtKQ= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0 h1:sv9kVfal0MK0wBMCOGr+HeJm9v803BkJxGrk2au7j08= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.47.0/go.mod h1:SK2UL73Zy1quvRPonmOmRDiWk1KBV3LyIeeIxcEApWw= +go.opentelemetry.io/otel v1.22.0 h1:xS7Ku+7yTFvDfDraDIJVpw7XPyuHlB9MCiqqX5mcJ6Y= +go.opentelemetry.io/otel v1.22.0/go.mod h1:eoV4iAi3Ea8LkAEI9+GFT44O6T/D0GWAVFyZVCC6pMI= +go.opentelemetry.io/otel/metric v1.22.0 h1:lypMQnGyJYeuYPhOM/bgjbFM6WE44W1/T45er4d8Hhg= +go.opentelemetry.io/otel/metric v1.22.0/go.mod h1:evJGjVpZv0mQ5QBRJoBF64yMuOf4xCWdXjK8pzFvliY= go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E= -go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc= -go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ= +go.opentelemetry.io/otel/trace v1.22.0 h1:Hg6pPujv0XG9QaVbGOBVHunyuLcCC3jN7WEhPx83XD0= +go.opentelemetry.io/otel/trace v1.22.0/go.mod h1:RbbHXVqKES9QhzZq/fE5UnOSILqRt40a21sPw2He1xo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.tmz.dev/musttag v0.7.2 h1:1J6S9ipDbalBSODNT5jCep8dhZyMr4ttnjQagmGYR5s= go.tmz.dev/musttag v0.7.2/go.mod h1:m6q5NiiSKMnQYokefa2xGoyoXnrswCbJ0AWYzf4Zs28= @@ -1600,8 +1600,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.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= -golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc= -golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg= +golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= 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/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= @@ -1706,8 +1706,8 @@ golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= 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= @@ -1733,8 +1733,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.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= -golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= +golang.org/x/oauth2 v0.17.0 h1:6m3ZPmLEFdVxKKWnKq4VqZ60gutO35zm+zrAHVmHyDQ= +golang.org/x/oauth2 v0.17.0/go.mod h1:OzPDGQiuQMguemayvdylqddI7qcD9lnSDb+1FiwQ5HA= 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= @@ -1863,8 +1863,8 @@ 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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 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= @@ -1872,8 +1872,8 @@ 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.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.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= 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= @@ -2041,8 +2041,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.155.0 h1:vBmGhCYs0djJttDNynWo44zosHlPvHmA0XiN2zP2DtA= -google.golang.org/api v0.155.0/go.mod h1:GI5qK5f40kCpHfPn6+YzGAByIKWv8ujFnmoWm7Igduk= +google.golang.org/api v0.162.0 h1:Vhs54HkaEpkMBdgGdOT2P6F0csGG/vxDS0hWHJzmmps= +google.golang.org/api v0.162.0/go.mod h1:6SulDkfoBIg4NFmCuZ39XeeAgSHCPecfSUuDyYlAHs0= 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= @@ -2161,12 +2161,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-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= -google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= -google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 h1:Lj5rbfG876hIAYFjqiJnPHfhXbv+nzTWfm04Fg/XSVU= -google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80/go.mod h1:4jWUdICTdgc3Ibxmr8nAJiiLHwQBY0UI0XZcEMaFKaA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 h1:AjyfHzEPEFp/NpvfN5g+KDla3EMojjhRVZc1i7cj+oM= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80/go.mod h1:PAREbraiVEVGVdTZsVWjSbbTtSyGbAgIIvni8a8CD5s= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= +google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de h1:jFNzHPIeuzhdRwVhbZdiym9q0ory/xY3sA+v2wPg8I0= +google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:5iCWqnniDlqZHrd3neWVTOwvh/v6s3232omMecelax8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de h1:cZGRis4/ot9uVm639a+rHCUaG0JJHEsdyzSQTMX+suY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:H4O17MA/PE9BsGx3w+a+W2VOLLD1Qf7oJneAoU6WktY= 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= @@ -2208,8 +2208,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.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM= +google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= 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= diff --git a/proto/buf.lock b/proto/buf.lock index d21d8831..e8cab8f5 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -19,8 +19,8 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - commit: 7a6bc1e3207144b38e9066861e1de0ff - digest: shake256:d646836485c34192401253703c4e7ce899c826fceec060bf4b2a62c4749bd9976dc960833e134a1f814725e1ffd60b1bb3cf0335a7e99ef0e8cec34b070ffb66 + commit: 4ed3bc159a8b4ac68fe253218760d035 + digest: shake256:7149cf5e9955c692d381e557830555d4e93f205a0f1b8e2dfdae46d029369aa3fc1980e35df0d310f7cc3b622f93e19ad276769a283a967dd3065ddfd3a40e13 - remote: buf.build owner: protocolbuffers repository: wellknowntypes From a78d48f35de10857f07995c1de1a7c2440827da2 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Fri, 3 May 2024 18:06:54 +0300 Subject: [PATCH 44/51] feat: integrate cosmwasm --- app/ante.go | 79 ++++++++++++++++ app/app.go | 68 ++++++++++++-- app/app_test.go | 2 + app/keepers/keepers.go | 179 ++++++++++++++++++++++++++++++++---- app/keepers/keys.go | 10 +- app/modules.go | 65 +++++++++---- app/prefix.go | 4 + app/sim_test.go | 3 + app/upgrades/v9/consts.go | 8 ++ app/upgrades/v9/upgrades.go | 11 +++ cmd/sged/cmd/root.go | 45 ++++++++- go.mod | 17 +++- go.sum | 22 +++-- testutil/network/network.go | 3 + testutil/simapp/simapp.go | 4 + 15 files changed, 464 insertions(+), 56 deletions(-) create mode 100644 app/ante.go diff --git a/app/ante.go b/app/ante.go new file mode 100644 index 00000000..7f4afcaf --- /dev/null +++ b/app/ante.go @@ -0,0 +1,79 @@ +package app + +import ( + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + + ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" + ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + + errorsmod "cosmossdk.io/errors" + + "github.com/cosmos/cosmos-sdk/codec" + 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" + bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" +) + +// HandlerOptions extends the SDK's AnteHandler options by requiring the IBC +// channel keeper and a BankKeeper with an added method for fee sharing. +type HandlerOptions struct { + ante.HandlerOptions + + GovKeeper govkeeper.Keeper + IBCKeeper *ibckeeper.Keeper + BankKeeper bankkeeper.Keeper + TxCounterStoreKey storetypes.StoreKey + WasmConfig wasmtypes.WasmConfig + Cdc codec.BinaryCodec + + StakingKeeper stakingkeeper.Keeper +} + +// NewAnteHandler returns an AnteHandler that checks and increments sequence +// numbers, checks signatures & account numbers, and deducts fees from the first +// signer. +func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) { + if options.AccountKeeper == nil { + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder") + } + + if options.BankKeeper == nil { + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder") + } + + if options.SignModeHandler == nil { + return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder") + } + + sigGasConsumer := options.SigGasConsumer + if sigGasConsumer == nil { + sigGasConsumer = ante.DefaultSigVerificationGasConsumer + } + + anteDecorators := []sdk.AnteDecorator{ + // GlobalFee query params for minimum fee + ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first + wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit), + wasmkeeper.NewCountTXDecorator(options.TxCounterStoreKey), + ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker), + ante.NewValidateBasicDecorator(), + ante.NewTxTimeoutHeightDecorator(), + ante.NewValidateMemoDecorator(options.AccountKeeper), + ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper), + + // 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.NewRedundantRelayDecorator(options.IBCKeeper), + } + + return sdk.ChainAnteDecorators(anteDecorators...), nil +} diff --git a/app/app.go b/app/app.go index 1ddcab96..778721eb 100644 --- a/app/app.go +++ b/app/app.go @@ -6,12 +6,14 @@ import ( "net/http" "os" "path/filepath" + "strconv" 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" autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" @@ -42,8 +44,13 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + wasmlckeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper" ibcclientHandler "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" + wasm "github.com/CosmWasm/wasmd/x/wasm" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/sge-network/sge/app/keepers" sgeappparams "github.com/sge-network/sge/app/params" "github.com/sge-network/sge/app/upgrades" @@ -137,6 +144,7 @@ func NewSgeApp( invCheckPeriod uint, encodingConfig sgeappparams.EncodingConfig, appOpts servertypes.AppOptions, + wasmOpts []wasmkeeper.Option, baseAppOptions ...func(*baseapp.BaseApp), ) *SgeApp { appCodec := encodingConfig.Marshaler @@ -170,9 +178,16 @@ func NewSgeApp( skipUpgradeHeights, homePath, invCheckPeriod, + wasmOpts, appOpts, ) + if maxSize := os.Getenv("MAX_WASM_SIZE"); maxSize != "" { + // https://github.com/CosmWasm/wasmd#compile-time-parameters + val, _ := strconv.ParseInt(maxSize, 10, 32) + wasmtypes.MaxWasmSize = int(val) + } + // NOTE: we may consider parsing `appOpts` inside module constructors. For the moment // we prefer to be more strict in what arguments the modules expect. skipGenesisInvariants := cast.ToBool(appOpts.Get(crisis.FlagSkipGenesisInvariants)) @@ -214,6 +229,11 @@ func NewSgeApp( } reflectionv1.RegisterReflectionServiceServer(app.GRPCQueryRouter(), reflectionSvc) + wasmConfig, err := wasm.ReadWasmConfig(appOpts) + if err != nil { + panic("error while reading wasm config: " + err.Error()) + } + // create the simulation manager and define the order of the modules for deterministic simulations // // NOTE: this is not required apps that don't use the simulator for fuzz testing @@ -231,13 +251,24 @@ func NewSgeApp( // initialize BaseApp app.SetInitChainer(app.InitChainer) app.SetBeginBlocker(app.BeginBlocker) - anteHandler, err := ante.NewAnteHandler( - ante.HandlerOptions{ - AccountKeeper: app.AccountKeeper, - BankKeeper: app.BankKeeper, - FeegrantKeeper: app.FeeGrantKeeper, - SignModeHandler: encodingConfig.TxConfig.SignModeHandler(), - SigGasConsumer: ante.DefaultSigVerificationGasConsumer, + anteHandler, err := NewAnteHandler( + HandlerOptions{ + HandlerOptions: ante.HandlerOptions{ + AccountKeeper: app.AppKeepers.AccountKeeper, + BankKeeper: app.AppKeepers.BankKeeper, + FeegrantKeeper: app.AppKeepers.FeeGrantKeeper, + SignModeHandler: encodingConfig.TxConfig.SignModeHandler(), + SigGasConsumer: ante.DefaultSigVerificationGasConsumer, + }, + + GovKeeper: *app.AppKeepers.GovKeeper, + IBCKeeper: app.AppKeepers.IBCKeeper, + BankKeeper: app.AppKeepers.BankKeeper, + TxCounterStoreKey: app.AppKeepers.GetKey(wasmtypes.StoreKey), + WasmConfig: wasmConfig, + Cdc: appCodec, + + StakingKeeper: *app.AppKeepers.StakingKeeper, }, ) if err != nil { @@ -246,6 +277,17 @@ func NewSgeApp( app.SetAnteHandler(anteHandler) app.SetEndBlocker(app.EndBlocker) + if manager := app.SnapshotManager(); manager != nil { + err = manager.RegisterExtensions( + wasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.AppKeepers.WasmKeeper), + // https://github.com/cosmos/ibc-go/pull/5439 + wasmlckeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.AppKeepers.WasmClientKeeper), + ) + if err != nil { + panic("failed to register snapshot extension: " + err.Error()) + } + } + app.setupUpgradeHandlers() app.setupUpgradeStoreLoaders() @@ -253,6 +295,18 @@ func NewSgeApp( if err := app.LoadLatestVersion(); err != nil { tmos.Exit(err.Error()) } + ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{}) + + // https://github.com/cosmos/ibc-go/pull/5439 + if err := wasmlckeeper.InitializePinnedCodes(ctx, appCodec); err != nil { + tmos.Exit(fmt.Sprintf("wasmlckeeper failed initialize pinned codes %s", err)) + } + + if err := app.AppKeepers.WasmKeeper.InitializePinnedCodes(ctx); err != nil { + tmos.Exit(fmt.Sprintf("app.AppKeepers.WasmKeeper failed initialize pinned codes %s", err)) + } + + app.AppKeepers.CapabilityKeeper.Seal() } return app diff --git a/app/app_test.go b/app/app_test.go index 34e8609c..71adb6a6 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -3,6 +3,7 @@ package app_test import ( "testing" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" tmdb "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -24,6 +25,7 @@ func TestApp(t *testing.T) { 0, encCdc, simtestutil.EmptyAppOptions{}, + []wasmkeeper.Option{}, ) } require.NotPanics(t, panicFunc) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 6c25193b..21a65cb8 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -1,10 +1,16 @@ package keepers import ( + "fmt" + "path" + "path/filepath" + "strings" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" servertypes "github.com/cosmos/cosmos-sdk/server/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" + sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" @@ -24,6 +30,7 @@ import ( feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/group" groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" @@ -38,16 +45,19 @@ 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" - icahost "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host" - ibc "github.com/cosmos/ibc-go/v7/modules/core" - ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" // ibc-go + ibc_hooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7" + ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/keeper" + ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" + wasmlckeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper" + wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" 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" ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" @@ -56,15 +66,28 @@ import ( "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibctransferkeeper "github.com/cosmos/ibc-go/v7/modules/apps/transfer/keeper" 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" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" ibcporttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" - mintkeeper "github.com/sge-network/sge/x/mint/keeper" - minttypes "github.com/sge-network/sge/x/mint/types" + + // cosmwasm + + wasmapp "github.com/CosmWasm/wasmd/app" + "github.com/CosmWasm/wasmd/x/wasm" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + wasmvm "github.com/CosmWasm/wasmvm" // sge + mintkeeper "github.com/sge-network/sge/x/mint/keeper" + minttypes "github.com/sge-network/sge/x/mint/types" + betmodule "github.com/sge-network/sge/x/bet" betmodulekeeper "github.com/sge-network/sge/x/bet/keeper" betmoduletypes "github.com/sge-network/sge/x/bet/types" @@ -97,6 +120,8 @@ import ( _ "github.com/cosmos/cosmos-sdk/client/docs/statik" ) +var wasmCapabilities = strings.Join(wasmapp.AllCapabilities(), ",") + type AppKeepers struct { // keys to access the substores keys map[string]*storetypes.KVStoreKey @@ -121,6 +146,12 @@ type AppKeepers struct { GroupKeeper groupkeeper.Keeper ConsensusParamsKeeper consensusparamkeeper.Keeper + //// CosmWasm keepers \\\\ + ContractKeeper wasmtypes.ContractOpsKeeper + WasmClientKeeper wasmlckeeper.Keeper + WasmKeeper wasmkeeper.Keeper + ScopedWasmKeeper capabilitykeeper.ScopedKeeper + //// SGE keepers \\\\ BetKeeper *betmodulekeeper.Keeper MarketKeeper *marketmodulekeeper.Keeper @@ -150,6 +181,7 @@ type AppKeepers struct { // IBC Keepers IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly IBCFeeKeeper ibcfeekeeper.Keeper + IBCHooksKeeper *ibchookskeeper.Keeper ICAControllerKeeper icacontrollerkeeper.Keeper ICAHostKeeper icahostkeeper.Keeper @@ -158,6 +190,9 @@ type AppKeepers struct { ICAModule ica.AppModule TransferModule transfer.AppModule IBCFeeModule ibcfee.AppModule + + Ics20WasmHooks *ibc_hooks.WasmHooks + HooksICS4Wrapper ibc_hooks.ICS4Middleware } func NewAppKeeper( @@ -168,7 +203,8 @@ func NewAppKeeper( skipUpgradeHeights map[int64]bool, homePath string, invCheckPeriod uint, - _ servertypes.AppOptions, + wasmOpts []wasmkeeper.Option, + appOpts servertypes.AppOptions, ) AppKeepers { appKeepers := AppKeepers{} // Set keys KVStoreKey, TransientStoreKey, MemoryStoreKey @@ -196,17 +232,10 @@ func NewAppKeeper( // grant capabilities for the ibc and ibc-transfer modules appKeepers.ScopedIBCKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName) - appKeepers.ScopedTransferKeeper = appKeepers.CapabilityKeeper.ScopeToModule( - ibctransfertypes.ModuleName, - ) - appKeepers.ScopedICAControllerKeeper = appKeepers.CapabilityKeeper.ScopeToModule( - icacontrollertypes.SubModuleName, - ) - appKeepers.ScopedICAHostKeeper = appKeepers.CapabilityKeeper.ScopeToModule( - icahosttypes.SubModuleName, - ) - - appKeepers.CapabilityKeeper.Seal() + appKeepers.ScopedTransferKeeper = appKeepers.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) + appKeepers.ScopedICAControllerKeeper = appKeepers.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) + appKeepers.ScopedICAHostKeeper = appKeepers.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) + appKeepers.ScopedWasmKeeper = appKeepers.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName) // add keepers appKeepers.CrisisKeeper = crisiskeeper.NewKeeper( @@ -342,6 +371,20 @@ func NewAppKeeper( ) appKeepers.GovKeeper.SetLegacyRouter(govRouter) + // Configure the hooks keeper + hooksKeeper := ibchookskeeper.NewKeeper( + appKeepers.keys[ibchookstypes.StoreKey], + ) + appKeepers.IBCHooksKeeper = &hooksKeeper + + junoPrefix := sdk.GetConfig().GetBech32AccountAddrPrefix() + wasmHooks := ibc_hooks.NewWasmHooks(appKeepers.IBCHooksKeeper, &appKeepers.WasmKeeper, junoPrefix) // The contract keeper needs to be set later + appKeepers.Ics20WasmHooks = &wasmHooks + appKeepers.HooksICS4Wrapper = ibc_hooks.NewICS4Middleware( + appKeepers.IBCKeeper.ChannelKeeper, + appKeepers.Ics20WasmHooks, + ) + // IBC Fee Module keeper appKeepers.IBCFeeKeeper = ibcfeekeeper.NewKeeper( appCodec, @@ -395,6 +438,101 @@ func NewAppKeeper( appKeepers.SlashingKeeper, ) + dataDir := filepath.Join(homePath, "data") + + wasmConfig, err := wasm.ReadWasmConfig(appOpts) + if err != nil { + panic("error while reading wasm config: " + err.Error()) + } + + // Stargate Queries + acceptedStargateQueries := 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{}, + + // governance + "/cosmos.gov.v1beta1.Query/Vote": &govv1.QueryVoteResponse{}, + + // distribution + "/cosmos.distribution.v1beta1.Query/DelegationRewards": &distrtypes.QueryDelegationRewardsResponse{}, + + // staking + "/cosmos.staking.v1beta1.Query/Delegation": &stakingtypes.QueryDelegationResponse{}, + "/cosmos.staking.v1beta1.Query/Redelegations": &stakingtypes.QueryRedelegationsResponse{}, + "/cosmos.staking.v1beta1.Query/UnbondingDelegation": &stakingtypes.QueryUnbondingDelegationResponse{}, + "/cosmos.staking.v1beta1.Query/Validator": &stakingtypes.QueryValidatorResponse{}, + "/cosmos.staking.v1beta1.Query/Params": &stakingtypes.QueryParamsResponse{}, + "/cosmos.staking.v1beta1.Query/Pool": &stakingtypes.QueryPoolResponse{}, + } + + querierOpts := wasmkeeper.WithQueryPlugins( + &wasmkeeper.QueryPlugins{ + Stargate: wasmkeeper.AcceptListStargateQuerier(acceptedStargateQueries, bApp.GRPCQueryRouter(), appCodec), + }) + wasmOpts = append(wasmOpts, querierOpts) + + mainWasmer, err := wasmvm.NewVM(path.Join(dataDir, "wasm"), wasmCapabilities, 32, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize) + if err != nil { + panic(fmt.Sprintf("failed to create juno wasm vm: %s", err)) + } + + lcWasmer, err := wasmvm.NewVM(filepath.Join(dataDir, "light-client-wasm"), wasmCapabilities, 32, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize) + if err != nil { + panic(fmt.Sprintf("failed to create juno wasm vm for 08-wasm: %s", err)) + } + + appKeepers.WasmKeeper = wasmkeeper.NewKeeper( + appCodec, + appKeepers.keys[wasmtypes.StoreKey], + appKeepers.AccountKeeper, + appKeepers.BankKeeper, + appKeepers.StakingKeeper, + distrkeeper.NewQuerier(appKeepers.DistrKeeper), + appKeepers.IBCFeeKeeper, + appKeepers.IBCKeeper.ChannelKeeper, + &appKeepers.IBCKeeper.PortKeeper, + appKeepers.ScopedWasmKeeper, + appKeepers.TransferKeeper, + bApp.MsgServiceRouter(), + bApp.GRPCQueryRouter(), + dataDir, + wasmConfig, + wasmCapabilities, + govModAddress, + append(wasmOpts, wasmkeeper.WithWasmEngine(mainWasmer))..., + ) + + // 08-wasm light client + accepted := make([]string, 0) + for k := range acceptedStargateQueries { + accepted = append(accepted, k) + } + + wasmLightClientQuerier := wasmlctypes.QueryPlugins{ + // Custom: MyCustomQueryPlugin(), + // `myAcceptList` is a `[]string` containing the list of gRPC query paths that the chain wants to allow for the `08-wasm` module to query. + // These queries must be registered in the chain's gRPC query router, be deterministic, and track their gas usage. + // The `AcceptListStargateQuerier` function will return a query plugin that will only allow queries for the paths in the `myAcceptList`. + // The query responses are encoded in protobuf unlike the implementation in `x/wasm`. + Stargate: wasmlctypes.AcceptListStargateQuerier(accepted), + } + + appKeepers.WasmClientKeeper = wasmlckeeper.NewKeeperWithVM( + appCodec, + appKeepers.keys[wasmlctypes.StoreKey], + appKeepers.IBCKeeper.ClientKeeper, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), + lcWasmer, + bApp.GRPCQueryRouter(), + wasmlckeeper.WithQueryPlugins(&wasmLightClientQuerier), + ) + + // set the contract keeper for the Ics20WasmHooks + appKeepers.ContractKeeper = wasmkeeper.NewDefaultPermissionKeeper(&appKeepers.WasmKeeper) + appKeepers.Ics20WasmHooks.ContractKeeper = &appKeepers.WasmKeeper + // // SGE keepers \\\\ appKeepers.OrderbookKeeper = orderbookmodulekeeper.NewKeeper( @@ -545,11 +683,17 @@ func NewAppKeeper( icaHostStack = icahost.NewIBCModule(appKeepers.ICAHostKeeper) icaHostStack = ibcfee.NewIBCMiddleware(icaHostStack, appKeepers.IBCFeeKeeper) + // Create fee enabled wasm ibc Stack + var wasmStack porttypes.IBCModule + wasmStack = wasm.NewIBCHandler(appKeepers.WasmKeeper, appKeepers.IBCKeeper.ChannelKeeper, appKeepers.IBCFeeKeeper) + wasmStack = ibcfee.NewIBCMiddleware(wasmStack, appKeepers.IBCFeeKeeper) + // Create static IBC router, add transfer route, then set and seal it ibcRouter := ibcporttypes.NewRouter() ibcRouter.AddRoute(icacontrollertypes.SubModuleName, icaControllerStack) ibcRouter.AddRoute(icahosttypes.SubModuleName, icaHostStack) ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferStack) + ibcRouter.AddRoute(wasmtypes.ModuleName, wasmStack) appKeepers.IBCKeeper.SetRouter(ibcRouter) @@ -589,6 +733,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, paramsKeeper.Subspace(housemoduletypes.ModuleName) paramsKeeper.Subspace(rewardmoduletypes.ModuleName) paramsKeeper.Subspace(subaccountmoduletypes.ModuleName) + paramsKeeper.Subspace(wasmtypes.ModuleName) return paramsKeeper } diff --git a/app/keepers/keys.go b/app/keepers/keys.go index e729f34f..b4d80fd8 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -18,12 +18,19 @@ import ( slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + + // ibc-go + ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + // cosmwasm + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" + betmoduletypes "github.com/sge-network/sge/x/bet/types" housemoduletypes "github.com/sge-network/sge/x/house/types" marketmoduletypes "github.com/sge-network/sge/x/market/types" @@ -50,7 +57,8 @@ func (appKeepers *AppKeepers) GenerateKeys() { minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey, govtypes.StoreKey, paramstypes.StoreKey, consensusparamtypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey, capabilitytypes.StoreKey, authzkeeper.StoreKey, group.StoreKey, - ibcexported.StoreKey, ibctransfertypes.StoreKey, ibcfeetypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, + wasmtypes.StoreKey, wasmlctypes.StoreKey, + ibcexported.StoreKey, ibctransfertypes.StoreKey, ibcfeetypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, ibchookstypes.StoreKey, orderbookmoduletypes.StoreKey, betmoduletypes.StoreKey, marketmoduletypes.StoreKey, diff --git a/app/modules.go b/app/modules.go index 1337f532..b552dc72 100644 --- a/app/modules.go +++ b/app/modules.go @@ -13,6 +13,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/capability" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" + consensusparamtypes "github.com/cosmos/cosmos-sdk/x/consensus/types" "github.com/cosmos/cosmos-sdk/x/crisis" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" distr "github.com/cosmos/cosmos-sdk/x/distribution" @@ -35,6 +36,10 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/cosmos-sdk/x/upgrade" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + + ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" + wasmlc "github.com/cosmos/ibc-go/modules/light-clients/08-wasm" + wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" @@ -44,6 +49,9 @@ import ( ibc "github.com/cosmos/ibc-go/v7/modules/core" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + wasm "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + sgeappparams "github.com/sge-network/sge/app/params" betmodule "github.com/sge-network/sge/x/bet" betmoduletypes "github.com/sge-network/sge/x/bet/types" @@ -57,11 +65,10 @@ import ( orderbookmoduletypes "github.com/sge-network/sge/x/orderbook/types" ovmmodule "github.com/sge-network/sge/x/ovm" ovmmoduletypes "github.com/sge-network/sge/x/ovm/types" - subaccountmodule "github.com/sge-network/sge/x/subaccount" - subaccounttypes "github.com/sge-network/sge/x/subaccount/types" - rewardmodule "github.com/sge-network/sge/x/reward" rewardmoduletypes "github.com/sge-network/sge/x/reward/types" + subaccountmodule "github.com/sge-network/sge/x/subaccount" + subaccounttypes "github.com/sge-network/sge/x/subaccount/types" // unnamed import of statik for swagger UI support _ "github.com/cosmos/cosmos-sdk/client/docs/statik" @@ -81,6 +88,9 @@ var mAccPerms = map[string][]string{ ibcfeetypes.ModuleName: nil, icatypes.ModuleName: nil, + // cosmwasm + wasmtypes.ModuleName: {}, + // sge betmoduletypes.BetFeeCollectorFunder{}.GetModuleAcc(): nil, housemoduletypes.HouseFeeCollectorFunder{}.GetModuleAcc(): nil, @@ -103,16 +113,19 @@ var ModuleBasics = module.NewBasicManager( params.AppModuleBasic{}, crisis.AppModuleBasic{}, slashing.AppModuleBasic{}, + upgrade.AppModuleBasic{}, + evidence.AppModuleBasic{}, feegrantmodule.AppModuleBasic{}, authzmodule.AppModuleBasic{}, + vesting.AppModuleBasic{}, groupmodule.AppModuleBasic{}, + + wasm.AppModuleBasic{}, ibc.AppModuleBasic{}, - upgrade.AppModuleBasic{}, - evidence.AppModuleBasic{}, transfer.AppModuleBasic{}, - vesting.AppModuleBasic{}, ica.AppModuleBasic{}, ibcfee.AppModuleBasic{}, + wasmlc.AppModuleBasic{}, // sge betmodule.AppModuleBasic{}, @@ -184,12 +197,13 @@ func appModules( app.BankKeeper, app.interfaceRegistry, ), + wasm.NewAppModule(appCodec, &app.AppKeepers.WasmKeeper, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), app.IBCModule, params.NewAppModule(app.ParamsKeeper), app.TransferModule, app.IBCFeeModule, app.ICAModule, - + wasmlc.NewAppModule(app.AppKeepers.WasmClientKeeper), app.BetModule, app.MarketModule, app.OrderbookModule, @@ -255,6 +269,7 @@ func simulationModules( app.BankKeeper, app.interfaceRegistry, ), + wasm.NewAppModule(appCodec, &app.AppKeepers.WasmKeeper, app.AppKeepers.StakingKeeper, app.AppKeepers.AccountKeeper, app.AppKeepers.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), app.IBCModule, app.TransferModule, @@ -277,8 +292,6 @@ func orderBeginBlockers() []string { slashingtypes.ModuleName, evidencetypes.ModuleName, stakingtypes.ModuleName, - ibctransfertypes.ModuleName, - ibcexported.ModuleName, authtypes.ModuleName, banktypes.ModuleName, govtypes.ModuleName, @@ -289,8 +302,14 @@ func orderBeginBlockers() []string { group.ModuleName, paramstypes.ModuleName, vestingtypes.ModuleName, - icatypes.ModuleName, + consensusparamtypes.ModuleName, + ibctransfertypes.ModuleName, + ibcexported.ModuleName, ibcfeetypes.ModuleName, + icatypes.ModuleName, + wasmtypes.ModuleName, + ibchookstypes.ModuleName, + wasmlctypes.ModuleName, betmoduletypes.ModuleName, marketmoduletypes.ModuleName, orderbookmoduletypes.ModuleName, @@ -306,8 +325,6 @@ func orderEndBlockers() []string { crisistypes.ModuleName, govtypes.ModuleName, stakingtypes.ModuleName, - ibcexported.ModuleName, - ibctransfertypes.ModuleName, capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, @@ -322,8 +339,14 @@ func orderEndBlockers() []string { paramstypes.ModuleName, upgradetypes.ModuleName, vestingtypes.ModuleName, - icatypes.ModuleName, + consensusparamtypes.ModuleName, + ibcexported.ModuleName, + ibctransfertypes.ModuleName, ibcfeetypes.ModuleName, + icatypes.ModuleName, + wasmtypes.ModuleName, + ibchookstypes.ModuleName, + wasmlctypes.ModuleName, betmoduletypes.ModuleName, marketmoduletypes.ModuleName, orderbookmoduletypes.ModuleName, @@ -344,19 +367,23 @@ func orderInitBlockers() []string { slashingtypes.ModuleName, govtypes.ModuleName, mintmoduletypes.ModuleName, - ibcexported.ModuleName, + crisistypes.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, - feegrant.ModuleName, + paramstypes.ModuleName, + upgradetypes.ModuleName, group.ModuleName, - crisistypes.ModuleName, + vestingtypes.ModuleName, + feegrant.ModuleName, + consensusparamtypes.ModuleName, ibctransfertypes.ModuleName, + ibcexported.ModuleName, icatypes.ModuleName, ibcfeetypes.ModuleName, - paramstypes.ModuleName, - upgradetypes.ModuleName, - vestingtypes.ModuleName, + wasmtypes.ModuleName, + wasmlctypes.ModuleName, + ibchookstypes.ModuleName, betmoduletypes.ModuleName, marketmoduletypes.ModuleName, orderbookmoduletypes.ModuleName, diff --git a/app/prefix.go b/app/prefix.go index bf8413fb..bf7d304f 100644 --- a/app/prefix.go +++ b/app/prefix.go @@ -4,6 +4,8 @@ import ( sdkmath "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/sge-network/sge/app/keepers" "github.com/sge-network/sge/app/params" ) @@ -28,6 +30,8 @@ func SetConfig() { config.SetBech32PrefixForValidator(ValidatorAddressPrefix, ValidatorPubKeyPrefix) config.SetBech32PrefixForConsensusNode(ConsNodeAddressPrefix, ConsNodePubKeyPrefix) + config.SetAddressVerifier(wasmtypes.VerifyAddressLen()) + err := sdk.RegisterDenom(params.HumanCoinUnit, sdkmath.LegacyOneDec()) if err != nil { panic(err) diff --git a/app/sim_test.go b/app/sim_test.go index 5bbb725e..e38bb02a 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -6,6 +6,7 @@ import ( "os" "testing" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" dbm "github.com/cometbft/cometbft-db" "github.com/cometbft/cometbft/libs/log" "github.com/cometbft/cometbft/libs/rand" @@ -61,6 +62,7 @@ func BenchmarkFullAppSimulation(b *testing.B) { simcli.FlagPeriodValue, app.MakeEncodingConfig(), simtestutil.EmptyAppOptions{}, + []wasmkeeper.Option{}, interBlockCacheOpt(), ) @@ -139,6 +141,7 @@ func TestAppStateDeterminism(t *testing.T) { simcli.FlagPeriodValue, app.MakeEncodingConfig(), simtestutil.EmptyAppOptions{}, + []wasmkeeper.Option{}, interBlockCacheOpt(), ) diff --git a/app/upgrades/v9/consts.go b/app/upgrades/v9/consts.go index c2544d24..a61e07e2 100644 --- a/app/upgrades/v9/consts.go +++ b/app/upgrades/v9/consts.go @@ -5,6 +5,11 @@ import ( consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types" crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" + ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" + + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" + "github.com/sge-network/sge/app/upgrades" ) @@ -18,6 +23,9 @@ var Upgrade = upgrades.Upgrade{ Added: []string{ crisistypes.ModuleName, consensustypes.ModuleName, + ibchookstypes.StoreKey, + wasmtypes.ModuleName, + wasmlctypes.ModuleName, }, Deleted: []string{}, }, diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index 039c542f..902bd6f5 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -1,6 +1,8 @@ package v9 import ( + "fmt" + sdkmath "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" @@ -16,11 +18,14 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/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" exported "github.com/cosmos/ibc-go/v7/modules/core/exported" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/sge-network/sge/app/keepers" betmoduletypes "github.com/sge-network/sge/x/bet/types" housemoduletypes "github.com/sge-network/sge/x/house/types" @@ -72,6 +77,10 @@ func CreateUpgradeHandler( case icacontrollertypes.SubModuleName: keyTable = icacontrollertypes.ParamKeyTable() + // wasm + case wasmtypes.ModuleName: + keyTable = wasmtypes.ParamKeyTable() //nolint:staticcheck + // sge modules case betmoduletypes.ModuleName: keyTable = betmoduletypes.ParamKeyTable() @@ -92,6 +101,7 @@ func CreateUpgradeHandler( } if !subspace.HasKeyTable() { + fmt.Println(subspace.Name()) subspace.WithKeyTable(keyTable) } } @@ -105,6 +115,7 @@ func CreateUpgradeHandler( // explicitly update the IBC 02-client params, adding the localhost client type params := k.IBCKeeper.ClientKeeper.GetParams(ctx) params.AllowedClients = append(params.AllowedClients, exported.Localhost) + params.AllowedClients = append(params.AllowedClients, wasmlctypes.Wasm) k.IBCKeeper.ClientKeeper.SetParams(ctx, params) // update gov params to use a 20% initial deposit ratio, allowing us to remote the ante handler diff --git a/cmd/sged/cmd/root.go b/cmd/sged/cmd/root.go index f16a0b09..16ed8b8e 100644 --- a/cmd/sged/cmd/root.go +++ b/cmd/sged/cmd/root.go @@ -5,6 +5,7 @@ import ( "os" "path/filepath" + "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cast" "github.com/spf13/cobra" @@ -23,6 +24,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/rpc" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/server" + serverconfig "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/cosmos/cosmos-sdk/snapshots" snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types" @@ -36,6 +38,10 @@ import ( genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + wasm "github.com/CosmWasm/wasmd/x/wasm" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + "github.com/sge-network/sge/app" "github.com/sge-network/sge/app/params" ) @@ -75,7 +81,9 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { return err } - return server.InterceptConfigsPreRunHandler(cmd, "", nil, tmcfg.DefaultConfig()) + customAppTemplate, customAppConfig := initAppConfig() + + return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, tmcfg.DefaultConfig()) }, } @@ -84,6 +92,30 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { return rootCmd, encodingConfig } +// initAppConfig helps to override default appConfig template and configs. +// return "", nil if no custom configuration is required for the application. +func initAppConfig() (string, interface{}) { + type CustomAppConfig struct { + serverconfig.Config + + Wasm wasmtypes.WasmConfig `mapstructure:"wasm"` + } + + // Optionally allow the chain developer to overwrite the SDK's default + // server config. + srvCfg := serverconfig.DefaultConfig() + // srvCfg.MinGasPrices = "0ujuno,0ujunox" // GlobalFee handles + + customAppConfig := CustomAppConfig{ + Config: *srvCfg, + Wasm: wasmtypes.DefaultWasmConfig(), + } + + customAppTemplate := serverconfig.DefaultConfigTemplate + wasmtypes.DefaultConfigTemplate() + + return customAppTemplate, customAppConfig +} + func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { cfg := sdk.GetConfig() cfg.Seal() @@ -122,6 +154,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { func addModuleInitFlags(startCmd *cobra.Command) { crisis.AddModuleInitFlags(startCmd) + wasm.AddModuleInitFlags(startCmd) } func queryCommand() *cobra.Command { @@ -220,6 +253,11 @@ func newApp( panic(err) } + var wasmOpts []wasmkeeper.Option + if cast.ToBool(appOpts.Get("telemetry.enabled")) { + wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer)) + } + return app.NewSgeApp( logger, db, @@ -230,6 +268,7 @@ func newApp( cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), app.MakeEncodingConfig(), // Ideally, we would reuse the one created by NewRootCmd. appOpts, + wasmOpts, baseapp.SetPruning(pruningOpts), baseapp.SetMinGasPrices(cast.ToString(appOpts.Get(server.FlagMinGasPrices))), baseapp.SetHaltHeight(cast.ToUint64(appOpts.Get(server.FlagHaltHeight))), @@ -261,6 +300,7 @@ func createSimappAndExport( encCfg := app.MakeEncodingConfig() // Ideally, we would reuse the one created by NewRootCmd. encCfg.Marshaler = codec.NewProtoCodec(encCfg.InterfaceRegistry) var sgeApp *app.SgeApp + var emptyWasmOpts []wasmkeeper.Option if height != -1 { sgeApp = app.NewSgeApp( logger, @@ -272,13 +312,14 @@ func createSimappAndExport( cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), encCfg, appOpts, + emptyWasmOpts, ) if err := sgeApp.LoadHeight(height); err != nil { return servertypes.ExportedApp{}, err } } else { - sgeApp = app.NewSgeApp(logger, db, traceStore, true, map[int64]bool{}, "", cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), encCfg, appOpts) + sgeApp = app.NewSgeApp(logger, db, traceStore, true, map[int64]bool{}, "", cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), encCfg, appOpts, emptyWasmOpts) } return sgeApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) diff --git a/go.mod b/go.mod index 66945ebe..0e2311a2 100644 --- a/go.mod +++ b/go.mod @@ -7,11 +7,15 @@ require ( cosmossdk.io/errors v1.0.1 cosmossdk.io/math v1.3.0 cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 + github.com/CosmWasm/wasmd v0.45.0 + github.com/CosmWasm/wasmvm v1.5.2 github.com/cometbft/cometbft v0.37.5 github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/cosmos-proto v1.0.0-beta.4 github.com/cosmos/cosmos-sdk v0.47.8 github.com/cosmos/gogoproto v1.4.10 + github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad + github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5 github.com/cosmos/ibc-go/v7 v7.4.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-jwt/jwt/v4 v4.5.0 @@ -22,6 +26,7 @@ require ( github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 github.com/mrz1836/go-sanitize v1.3.1 + github.com/prometheus/client_golang v1.16.0 github.com/rakyll/statik v0.1.7 github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 @@ -64,14 +69,14 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.6 // indirect cloud.google.com/go/storage v1.36.0 // indirect - cosmossdk.io/core v0.5.1 // indirect + cosmossdk.io/core v0.6.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.4 // indirect cosmossdk.io/log v1.3.1 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/4meepo/tagalign v1.3.3 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect - github.com/99designs/keyring v1.2.1 // indirect + github.com/99designs/keyring v1.2.2 // indirect github.com/Antonboom/errname v0.1.12 // indirect github.com/Antonboom/nilnil v0.1.7 // indirect github.com/Antonboom/testifylint v0.2.3 // indirect @@ -127,6 +132,7 @@ require ( github.com/dgraph-io/badger/v2 v2.2007.4 // 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.2+incompatible // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.6.0 // indirect github.com/esimonov/ifshort v1.0.4 // indirect @@ -172,6 +178,7 @@ require ( github.com/golangci/revgrep v0.5.2 // indirect github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // 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.7 // indirect github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect @@ -245,14 +252,14 @@ require ( github.com/nishanths/predeclared v0.2.2 // indirect github.com/nunnatsa/ginkgolinter v0.14.1 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/polyfloyd/go-errorlint v1.4.5 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect github.com/quasilyte/go-ruleguard v0.4.0 // indirect github.com/quasilyte/gogrep v0.5.0 // indirect github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect @@ -342,6 +349,8 @@ replace ( // cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 + github.com/CosmWasm/wasmd => github.com/sge-network/wasmd v0.0.0-20240503124041-93276618b032 + github.com/cosmos/cosmos-sdk => github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45 // support concurrency for iavl diff --git a/go.sum b/go.sum index 95719994..79ed5035 100644 --- a/go.sum +++ b/go.sum @@ -194,8 +194,8 @@ cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoIS collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= 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/core v0.6.1 h1:OBy7TI2W+/gyn2z40vVvruK3di+cAluinA6cybFbE7s= +cosmossdk.io/core v0.6.1/go.mod h1:g3MMBCBXtxbDWBURDVnJE7XML4BG5qENhs0gzkcpuFA= 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.1 h1:bzu+Kcr0kS/1DuPBtUFdWjzLqyUuCiyHjyJB6srBV/0= @@ -235,6 +235,8 @@ github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8 github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= +github.com/CosmWasm/wasmvm v1.5.2 h1:+pKB1Mz9GZVt1vadxB+EDdD1FOz3dMNjIKq/58/lrag= +github.com/CosmWasm/wasmvm v1.5.2/go.mod h1:Q0bSEtlktzh7W2hhEaifrFp1Erx11ckQZmjq8FLCyys= 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= @@ -469,6 +471,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.1 h1:rM1kqeG3/HBT85vsZdoSNsehciqUQPWrR4BYmqE2+zg= github.com/cosmos/iavl v0.20.1/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= +github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad h1:ozJyL/gd3hXYQodS7EESUQgu+1CeJ9nvb9sfHufmsjI= +github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad/go.mod h1:JwHFbo1oX/ht4fPpnPvmhZr+dCkYK1Vihw+vZE9umR4= +github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5 h1:sMoHjep+KInjMrppNCEutMVm1p8nI9WhKCuMQ+EcUHw= +github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5/go.mod h1:VR2Hg2i/X1bafbmmNsV2Khwsg0PzNeuWoVKmSN5dAwo= github.com/cosmos/ibc-go/v7 v7.4.0 h1:8FqYMptvksgMvlbN4UW9jFxTXzsPyfAzEZurujXac8M= github.com/cosmos/ibc-go/v7 v7.4.0/go.mod h1:L/KaEhzV5TGUCTfGysVgMBQtl5Dm7hHitfpk+GIeoAo= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= @@ -526,6 +532,8 @@ 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/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/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= @@ -1267,8 +1275,8 @@ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3O 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.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_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= @@ -1297,8 +1305,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O 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.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +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/quasilyte/go-ruleguard v0.4.0 h1:DyM6r+TKL+xbKB4Nm7Afd1IQh9kEUKQs2pboWGKtvQo= github.com/quasilyte/go-ruleguard v0.4.0/go.mod h1:Eu76Z/R8IXtViWUIHkE3p8gdH3/PKk1eh3YGfaEof10= @@ -1362,6 +1370,8 @@ github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfP github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45 h1:gdXKc/Y7QTsuDsoC/S3R/LdXAxazOFzjxNoiJmpFaYE= github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45/go.mod h1:WjqTUUHJnaRjkgJbP2aQ1F+9pxDpLsOBpfuP2S0W+Ck= +github.com/sge-network/wasmd v0.0.0-20240503124041-93276618b032 h1:h36Vah9OlpBhVFxAEwo9cSRLhX1vhN5f4Q4Hue2BKXw= +github.com/sge-network/wasmd v0.0.0-20240503124041-93276618b032/go.mod h1:uQOWQUhJrZpsroGkmunpIJfj4tY9NIZWDVw1f42hjtI= 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 v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= diff --git a/testutil/network/network.go b/testutil/network/network.go index 291f0317..25d8893f 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -17,6 +17,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + "github.com/sge-network/sge/app" ) @@ -73,6 +75,7 @@ func DefaultConfig() network.Config { 0, encoding, simtestutil.EmptyAppOptions{}, + []wasmkeeper.Option{}, baseapp.SetPruning(pruningtypes.NewPruningOptionsFromString(val.GetAppConfig().Pruning)), baseapp.SetMinGasPrices(val.GetAppConfig().MinGasPrices), baseapp.SetChainID(chainID), diff --git a/testutil/simapp/simapp.go b/testutil/simapp/simapp.go index eafaa75c..8f68e3dd 100644 --- a/testutil/simapp/simapp.go +++ b/testutil/simapp/simapp.go @@ -24,6 +24,9 @@ import ( stakingKeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" stakingtestutil "github.com/cosmos/cosmos-sdk/x/staking/testutil" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + "github.com/sge-network/sge/app" "github.com/sge-network/sge/app/params" "github.com/sge-network/sge/utils" @@ -56,6 +59,7 @@ func setup(withGenesis bool, invCheckPeriod uint) (*TestApp, app.GenesisState) { invCheckPeriod, encCdc, simtestutil.EmptyAppOptions{}, + []wasmkeeper.Option{}, ) if withGenesis { return &TestApp{SgeApp: *appInstance}, app.NewDefaultGenesisState() From 5b16f7d01d0aace4bcfaf92ad76508a2ec38fbda Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 6 May 2024 14:38:18 +0300 Subject: [PATCH 45/51] refactor: replace wasmd build --- app/keepers/keepers.go | 8 ++++---- cmd/sged/cmd/root.go | 1 - go.mod | 4 ++-- go.sum | 8 ++++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 21a65cb8..99af60b0 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -377,8 +377,8 @@ func NewAppKeeper( ) appKeepers.IBCHooksKeeper = &hooksKeeper - junoPrefix := sdk.GetConfig().GetBech32AccountAddrPrefix() - wasmHooks := ibc_hooks.NewWasmHooks(appKeepers.IBCHooksKeeper, &appKeepers.WasmKeeper, junoPrefix) // The contract keeper needs to be set later + sgePrefix := sdk.GetConfig().GetBech32AccountAddrPrefix() + wasmHooks := ibc_hooks.NewWasmHooks(appKeepers.IBCHooksKeeper, &appKeepers.WasmKeeper, sgePrefix) // The contract keeper needs to be set later appKeepers.Ics20WasmHooks = &wasmHooks appKeepers.HooksICS4Wrapper = ibc_hooks.NewICS4Middleware( appKeepers.IBCKeeper.ChannelKeeper, @@ -475,12 +475,12 @@ func NewAppKeeper( mainWasmer, err := wasmvm.NewVM(path.Join(dataDir, "wasm"), wasmCapabilities, 32, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize) if err != nil { - panic(fmt.Sprintf("failed to create juno wasm vm: %s", err)) + panic(fmt.Sprintf("failed to create sge wasm vm: %s", err)) } lcWasmer, err := wasmvm.NewVM(filepath.Join(dataDir, "light-client-wasm"), wasmCapabilities, 32, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize) if err != nil { - panic(fmt.Sprintf("failed to create juno wasm vm for 08-wasm: %s", err)) + panic(fmt.Sprintf("failed to create sge wasm vm for 08-wasm: %s", err)) } appKeepers.WasmKeeper = wasmkeeper.NewKeeper( diff --git a/cmd/sged/cmd/root.go b/cmd/sged/cmd/root.go index 16ed8b8e..f61b4c0a 100644 --- a/cmd/sged/cmd/root.go +++ b/cmd/sged/cmd/root.go @@ -104,7 +104,6 @@ func initAppConfig() (string, interface{}) { // Optionally allow the chain developer to overwrite the SDK's default // server config. srvCfg := serverconfig.DefaultConfig() - // srvCfg.MinGasPrices = "0ujuno,0ujunox" // GlobalFee handles customAppConfig := CustomAppConfig{ Config: *srvCfg, diff --git a/go.mod b/go.mod index 0e2311a2..939a77a7 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.8 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad - github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5 + github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1 github.com/cosmos/ibc-go/v7 v7.4.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-jwt/jwt/v4 v4.5.0 @@ -349,7 +349,7 @@ replace ( // cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - github.com/CosmWasm/wasmd => github.com/sge-network/wasmd v0.0.0-20240503124041-93276618b032 + github.com/CosmWasm/wasmd => github.com/sge-network/wasmd v0.0.0-20240506113624-5ccb26abde7a github.com/cosmos/cosmos-sdk => github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45 diff --git a/go.sum b/go.sum index 79ed5035..289bc8eb 100644 --- a/go.sum +++ b/go.sum @@ -473,8 +473,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/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad h1:ozJyL/gd3hXYQodS7EESUQgu+1CeJ9nvb9sfHufmsjI= github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad/go.mod h1:JwHFbo1oX/ht4fPpnPvmhZr+dCkYK1Vihw+vZE9umR4= -github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5 h1:sMoHjep+KInjMrppNCEutMVm1p8nI9WhKCuMQ+EcUHw= -github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5/go.mod h1:VR2Hg2i/X1bafbmmNsV2Khwsg0PzNeuWoVKmSN5dAwo= +github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1 h1:fCtG9qasnNzhgxGR1jM9eBufZ5WQVpy0KdaOpKRfg8Y= +github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1/go.mod h1:h114vYKBtI5zKBeSyr8y5JZ8ZtpQJInO4TYww2IQr6o= github.com/cosmos/ibc-go/v7 v7.4.0 h1:8FqYMptvksgMvlbN4UW9jFxTXzsPyfAzEZurujXac8M= github.com/cosmos/ibc-go/v7 v7.4.0/go.mod h1:L/KaEhzV5TGUCTfGysVgMBQtl5Dm7hHitfpk+GIeoAo= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= @@ -1370,8 +1370,8 @@ github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfP github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45 h1:gdXKc/Y7QTsuDsoC/S3R/LdXAxazOFzjxNoiJmpFaYE= github.com/sge-network/cosmos-sdk v0.47.9-0.20240409081440-054c8c413d45/go.mod h1:WjqTUUHJnaRjkgJbP2aQ1F+9pxDpLsOBpfuP2S0W+Ck= -github.com/sge-network/wasmd v0.0.0-20240503124041-93276618b032 h1:h36Vah9OlpBhVFxAEwo9cSRLhX1vhN5f4Q4Hue2BKXw= -github.com/sge-network/wasmd v0.0.0-20240503124041-93276618b032/go.mod h1:uQOWQUhJrZpsroGkmunpIJfj4tY9NIZWDVw1f42hjtI= +github.com/sge-network/wasmd v0.0.0-20240506113624-5ccb26abde7a h1:cg3upuH1sZBjFKY2p7qgE9LTtGt2ccH8vucTGMWquSo= +github.com/sge-network/wasmd v0.0.0-20240506113624-5ccb26abde7a/go.mod h1:uQOWQUhJrZpsroGkmunpIJfj4tY9NIZWDVw1f42hjtI= 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 v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= From 951bc19124916ad7ce61fe114eb4fbca28da7755 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Mon, 6 May 2024 16:58:37 +0300 Subject: [PATCH 46/51] lint: multi import ibcport --- app/keepers/keepers.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 99af60b0..c8503e0b 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -71,7 +71,6 @@ 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" ibcporttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" - porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" @@ -684,7 +683,7 @@ func NewAppKeeper( icaHostStack = ibcfee.NewIBCMiddleware(icaHostStack, appKeepers.IBCFeeKeeper) // Create fee enabled wasm ibc Stack - var wasmStack porttypes.IBCModule + var wasmStack ibcporttypes.IBCModule wasmStack = wasm.NewIBCHandler(appKeepers.WasmKeeper, appKeepers.IBCKeeper.ChannelKeeper, appKeepers.IBCFeeKeeper) wasmStack = ibcfee.NewIBCMiddleware(wasmStack, appKeepers.IBCFeeKeeper) From 2247acca829e5d63d4d86cea67f9036a42d4520b Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Tue, 7 May 2024 15:13:53 +0300 Subject: [PATCH 47/51] fix: remove manual cosmvm generate --- Dockerfile | 75 +++++++++++++++++++++++++++++++ Makefile | 19 ++++++++ app/app.go | 6 +-- app/keepers/keepers.go | 88 +++++++------------------------------ app/keepers/keys.go | 4 +- app/modules.go | 14 +++--- app/upgrades/v9/consts.go | 4 +- app/upgrades/v9/upgrades.go | 4 +- cmd/sged/cmd/root.go | 33 ++++++-------- go.mod | 2 +- 10 files changed, 140 insertions(+), 109 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..d0f3ac19 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,75 @@ +# syntax=docker/dockerfile:1 + +ARG GO_VERSION="1.22" +ARG RUNNER_IMAGE="gcr.io/distroless/static-debian11" +ARG BUILD_TAGS="netgo,ledger,muslc" + +# -------------------------------------------------------- +# Builder +# -------------------------------------------------------- + +FROM golang:${GO_VERSION}-alpine3.19 as builder + +ARG GIT_VERSION +ARG GIT_COMMIT +ARG BUILD_TAGS + +RUN apk add --no-cache \ + ca-certificates \ + build-base \ + linux-headers + +# Download go dependencies +WORKDIR /sge +COPY go.mod go.sum ./ +RUN --mount=type=cache,target=/root/.cache/go-build \ + --mount=type=cache,target=/root/go/pkg/mod \ + go mod download + +# Cosmwasm - Download correct libwasmvm version +RUN ARCH=$(uname -m) && WASMVM_VERSION=$(go list -m github.com/CosmWasm/wasmvm | sed 's/.* //') && \ + wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/libwasmvm_muslc.$ARCH.a \ + -O /lib/libwasmvm_muslc.a && \ + # verify checksum + wget https://github.com/CosmWasm/wasmvm/releases/download/$WASMVM_VERSION/checksums.txt -O /tmp/checksums.txt && \ + sha256sum /lib/libwasmvm_muslc.a | grep $(cat /tmp/checksums.txt | grep libwasmvm_muslc.$ARCH | cut -d ' ' -f 1) + +# Copy the remaining files +COPY . . + +# Build sged binary +RUN --mount=type=cache,target=/root/.cache/go-build \ + --mount=type=cache,target=/root/go/pkg/mod \ + GOWORK=off go build \ + -mod=readonly \ + -tags "netgo,ledger,muslc" \ + -ldflags \ + "-X github.com/cosmos/cosmos-sdk/version.Name="sge" \ + -X github.com/cosmos/cosmos-sdk/version.AppName="sged" \ + -X github.com/cosmos/cosmos-sdk/version.Version=${GIT_VERSION} \ + -X github.com/cosmos/cosmos-sdk/version.Commit=${GIT_COMMIT} \ + -X github.com/cosmos/cosmos-sdk/version.BuildTags=${BUILD_TAGS} \ + -w -s -linkmode=external -extldflags '-Wl,-z,muldefs -static'" \ + -trimpath \ + -o /sge/build/sged \ + /sge/cmd/sged/main.go + +# -------------------------------------------------------- +# Runner +# -------------------------------------------------------- + +FROM ${RUNNER_IMAGE} + +COPY --from=builder /sge/build/sged /bin/sged + +ENV HOME /sge +WORKDIR $HOME + +EXPOSE 26656 +EXPOSE 26657 +EXPOSE 1317 +# Note: uncomment the line below if you need pprof in localsge +# We disable it by default in out main Dockerfile for security reasons +# EXPOSE 6060 + +ENTRYPOINT ["sged"] diff --git a/Makefile b/Makefile index b3ba976b..40823969 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ ifeq (,$(VERSION)) endif endif +GO_VERSION := $(shell cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2) PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation') LEDGER_ENABLED ?= true SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed 's/ /\@/g') @@ -131,6 +132,24 @@ $(BUILD_TARGETS): check_version go.sum $(BUILDDIR)/ $(BUILDDIR)/: mkdir -p $(BUILDDIR)/ +build-reproducible-amd64: go.sum + mkdir -p $(BUILDDIR) + $(DOCKER) buildx create --name sgebuilder --node sgebinary || true + $(DOCKER) buildx use sgebuilder + $(DOCKER) buildx build \ + --build-arg GO_VERSION=$(GO_VERSION) \ + --build-arg GIT_VERSION=$(VERSION) \ + --build-arg GIT_COMMIT=$(COMMIT) \ + --build-arg RUNNER_IMAGE=alpine:3.19 \ + --platform linux/amd64 \ + -t sge:local-amd64 \ + --load \ + -f Dockerfile . + $(DOCKER) rm -f sgebinary || true + $(DOCKER) create -ti --name sgebinary sge:local-amd64 + $(DOCKER) cp sgebinary:/bin/sged $(BUILDDIR)/sged-linux-amd64 + $(DOCKER) rm -f sgebinary + build-linux: go.sum LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build diff --git a/app/app.go b/app/app.go index 778721eb..3c123e09 100644 --- a/app/app.go +++ b/app/app.go @@ -44,7 +44,7 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - wasmlckeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper" + ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper" ibcclientHandler "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" wasm "github.com/CosmWasm/wasmd/x/wasm" @@ -281,7 +281,7 @@ func NewSgeApp( err = manager.RegisterExtensions( wasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.AppKeepers.WasmKeeper), // https://github.com/cosmos/ibc-go/pull/5439 - wasmlckeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.AppKeepers.WasmClientKeeper), + ibcwasmkeeper.NewWasmSnapshotter(app.CommitMultiStore(), &app.AppKeepers.WasmClientKeeper), ) if err != nil { panic("failed to register snapshot extension: " + err.Error()) @@ -298,7 +298,7 @@ func NewSgeApp( ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{}) // https://github.com/cosmos/ibc-go/pull/5439 - if err := wasmlckeeper.InitializePinnedCodes(ctx, appCodec); err != nil { + if err := ibcwasmkeeper.InitializePinnedCodes(ctx, appCodec); err != nil { tmos.Exit(fmt.Sprintf("wasmlckeeper failed initialize pinned codes %s", err)) } diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index c8503e0b..d91f016c 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -1,10 +1,7 @@ package keepers import ( - "fmt" - "path" "path/filepath" - "strings" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" @@ -30,7 +27,6 @@ import ( feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/group" groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" @@ -51,8 +47,8 @@ import ( ibc_hooks "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7" ibchookskeeper "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/keeper" ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" - wasmlckeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper" - wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" + ibcwasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper" + ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" 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" @@ -69,18 +65,14 @@ import ( ibc "github.com/cosmos/ibc-go/v7/modules/core" ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - ibcconnectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" ibcporttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" // cosmwasm - - wasmapp "github.com/CosmWasm/wasmd/app" "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - wasmvm "github.com/CosmWasm/wasmvm" // sge @@ -119,8 +111,6 @@ import ( _ "github.com/cosmos/cosmos-sdk/client/docs/statik" ) -var wasmCapabilities = strings.Join(wasmapp.AllCapabilities(), ",") - type AppKeepers struct { // keys to access the substores keys map[string]*storetypes.KVStoreKey @@ -147,7 +137,7 @@ type AppKeepers struct { //// CosmWasm keepers \\\\ ContractKeeper wasmtypes.ContractOpsKeeper - WasmClientKeeper wasmlckeeper.Keeper + WasmClientKeeper ibcwasmkeeper.Keeper WasmKeeper wasmkeeper.Keeper ScopedWasmKeeper capabilitykeeper.ScopedKeeper @@ -437,50 +427,20 @@ func NewAppKeeper( appKeepers.SlashingKeeper, ) - dataDir := filepath.Join(homePath, "data") - + wasmDir := filepath.Join(homePath, "cwvm") wasmConfig, err := wasm.ReadWasmConfig(appOpts) if err != nil { panic("error while reading wasm config: " + err.Error()) } - // Stargate Queries - acceptedStargateQueries := 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{}, - - // governance - "/cosmos.gov.v1beta1.Query/Vote": &govv1.QueryVoteResponse{}, - - // distribution - "/cosmos.distribution.v1beta1.Query/DelegationRewards": &distrtypes.QueryDelegationRewardsResponse{}, - - // staking - "/cosmos.staking.v1beta1.Query/Delegation": &stakingtypes.QueryDelegationResponse{}, - "/cosmos.staking.v1beta1.Query/Redelegations": &stakingtypes.QueryRedelegationsResponse{}, - "/cosmos.staking.v1beta1.Query/UnbondingDelegation": &stakingtypes.QueryUnbondingDelegationResponse{}, - "/cosmos.staking.v1beta1.Query/Validator": &stakingtypes.QueryValidatorResponse{}, - "/cosmos.staking.v1beta1.Query/Params": &stakingtypes.QueryParamsResponse{}, - "/cosmos.staking.v1beta1.Query/Pool": &stakingtypes.QueryPoolResponse{}, - } - - querierOpts := wasmkeeper.WithQueryPlugins( - &wasmkeeper.QueryPlugins{ - Stargate: wasmkeeper.AcceptListStargateQuerier(acceptedStargateQueries, bApp.GRPCQueryRouter(), appCodec), - }) - wasmOpts = append(wasmOpts, querierOpts) - - mainWasmer, err := wasmvm.NewVM(path.Join(dataDir, "wasm"), wasmCapabilities, 32, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize) - if err != nil { - panic(fmt.Sprintf("failed to create sge wasm vm: %s", err)) - } + ibcWasmConfig := + ibcwasmtypes.WasmConfig{ + DataDir: filepath.Join(wasmDir, "ibc_08-wasm"), + SupportedCapabilities: "iterator,stargate,abort", + ContractDebugMode: false, + } - lcWasmer, err := wasmvm.NewVM(filepath.Join(dataDir, "light-client-wasm"), wasmCapabilities, 32, wasmConfig.ContractDebugMode, wasmConfig.MemoryCacheSize) - if err != nil { - panic(fmt.Sprintf("failed to create sge wasm vm for 08-wasm: %s", err)) - } + wasmCapabilities := "iterator,staking,stargate" appKeepers.WasmKeeper = wasmkeeper.NewKeeper( appCodec, @@ -496,36 +456,20 @@ func NewAppKeeper( appKeepers.TransferKeeper, bApp.MsgServiceRouter(), bApp.GRPCQueryRouter(), - dataDir, + wasmDir, wasmConfig, wasmCapabilities, govModAddress, - append(wasmOpts, wasmkeeper.WithWasmEngine(mainWasmer))..., + wasmOpts..., ) - // 08-wasm light client - accepted := make([]string, 0) - for k := range acceptedStargateQueries { - accepted = append(accepted, k) - } - - wasmLightClientQuerier := wasmlctypes.QueryPlugins{ - // Custom: MyCustomQueryPlugin(), - // `myAcceptList` is a `[]string` containing the list of gRPC query paths that the chain wants to allow for the `08-wasm` module to query. - // These queries must be registered in the chain's gRPC query router, be deterministic, and track their gas usage. - // The `AcceptListStargateQuerier` function will return a query plugin that will only allow queries for the paths in the `myAcceptList`. - // The query responses are encoded in protobuf unlike the implementation in `x/wasm`. - Stargate: wasmlctypes.AcceptListStargateQuerier(accepted), - } - - appKeepers.WasmClientKeeper = wasmlckeeper.NewKeeperWithVM( + appKeepers.WasmClientKeeper = ibcwasmkeeper.NewKeeperWithConfig( appCodec, - appKeepers.keys[wasmlctypes.StoreKey], + appKeepers.keys[ibcwasmtypes.StoreKey], appKeepers.IBCKeeper.ClientKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(), - lcWasmer, + ibcWasmConfig, bApp.GRPCQueryRouter(), - wasmlckeeper.WithQueryPlugins(&wasmLightClientQuerier), ) // set the contract keeper for the Ics20WasmHooks diff --git a/app/keepers/keys.go b/app/keepers/keys.go index b4d80fd8..4f24e08f 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -21,6 +21,7 @@ import ( // ibc-go ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" + ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types" ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" @@ -29,7 +30,6 @@ import ( // cosmwasm wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" betmoduletypes "github.com/sge-network/sge/x/bet/types" housemoduletypes "github.com/sge-network/sge/x/house/types" @@ -57,7 +57,7 @@ func (appKeepers *AppKeepers) GenerateKeys() { minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey, govtypes.StoreKey, paramstypes.StoreKey, consensusparamtypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey, capabilitytypes.StoreKey, authzkeeper.StoreKey, group.StoreKey, - wasmtypes.StoreKey, wasmlctypes.StoreKey, + wasmtypes.StoreKey, ibcwasmtypes.StoreKey, ibcexported.StoreKey, ibctransfertypes.StoreKey, ibcfeetypes.StoreKey, icacontrollertypes.StoreKey, icahosttypes.StoreKey, ibchookstypes.StoreKey, orderbookmoduletypes.StoreKey, betmoduletypes.StoreKey, diff --git a/app/modules.go b/app/modules.go index b552dc72..a4fdaa1c 100644 --- a/app/modules.go +++ b/app/modules.go @@ -38,8 +38,8 @@ import ( upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" - wasmlc "github.com/cosmos/ibc-go/modules/light-clients/08-wasm" - wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" + ibcwasmmodule "github.com/cosmos/ibc-go/modules/light-clients/08-wasm" + ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" ica "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts" icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" @@ -125,7 +125,7 @@ var ModuleBasics = module.NewBasicManager( transfer.AppModuleBasic{}, ica.AppModuleBasic{}, ibcfee.AppModuleBasic{}, - wasmlc.AppModuleBasic{}, + ibcwasmmodule.AppModuleBasic{}, // sge betmodule.AppModuleBasic{}, @@ -203,7 +203,7 @@ func appModules( app.TransferModule, app.IBCFeeModule, app.ICAModule, - wasmlc.NewAppModule(app.AppKeepers.WasmClientKeeper), + ibcwasmmodule.NewAppModule(app.AppKeepers.WasmClientKeeper), app.BetModule, app.MarketModule, app.OrderbookModule, @@ -309,7 +309,7 @@ func orderBeginBlockers() []string { icatypes.ModuleName, wasmtypes.ModuleName, ibchookstypes.ModuleName, - wasmlctypes.ModuleName, + ibcwasmtypes.ModuleName, betmoduletypes.ModuleName, marketmoduletypes.ModuleName, orderbookmoduletypes.ModuleName, @@ -346,7 +346,7 @@ func orderEndBlockers() []string { icatypes.ModuleName, wasmtypes.ModuleName, ibchookstypes.ModuleName, - wasmlctypes.ModuleName, + ibcwasmtypes.ModuleName, betmoduletypes.ModuleName, marketmoduletypes.ModuleName, orderbookmoduletypes.ModuleName, @@ -382,7 +382,7 @@ func orderInitBlockers() []string { icatypes.ModuleName, ibcfeetypes.ModuleName, wasmtypes.ModuleName, - wasmlctypes.ModuleName, + ibcwasmtypes.ModuleName, ibchookstypes.ModuleName, betmoduletypes.ModuleName, marketmoduletypes.ModuleName, diff --git a/app/upgrades/v9/consts.go b/app/upgrades/v9/consts.go index a61e07e2..915ed4f3 100644 --- a/app/upgrades/v9/consts.go +++ b/app/upgrades/v9/consts.go @@ -6,9 +6,9 @@ import ( crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types" + ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" "github.com/sge-network/sge/app/upgrades" ) @@ -25,7 +25,7 @@ var Upgrade = upgrades.Upgrade{ consensustypes.ModuleName, ibchookstypes.StoreKey, wasmtypes.ModuleName, - wasmlctypes.ModuleName, + ibcwasmtypes.ModuleName, }, Deleted: []string{}, }, diff --git a/app/upgrades/v9/upgrades.go b/app/upgrades/v9/upgrades.go index 902bd6f5..8308f03b 100644 --- a/app/upgrades/v9/upgrades.go +++ b/app/upgrades/v9/upgrades.go @@ -18,7 +18,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - wasmlctypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" + ibcwasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/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" @@ -115,7 +115,7 @@ func CreateUpgradeHandler( // explicitly update the IBC 02-client params, adding the localhost client type params := k.IBCKeeper.ClientKeeper.GetParams(ctx) params.AllowedClients = append(params.AllowedClients, exported.Localhost) - params.AllowedClients = append(params.AllowedClients, wasmlctypes.Wasm) + params.AllowedClients = append(params.AllowedClients, ibcwasmtypes.Wasm) k.IBCKeeper.ClientKeeper.SetParams(ctx, params) // update gov params to use a 20% initial deposit ratio, allowing us to remote the ante handler diff --git a/cmd/sged/cmd/root.go b/cmd/sged/cmd/root.go index f61b4c0a..798db623 100644 --- a/cmd/sged/cmd/root.go +++ b/cmd/sged/cmd/root.go @@ -300,26 +300,19 @@ func createSimappAndExport( encCfg.Marshaler = codec.NewProtoCodec(encCfg.InterfaceRegistry) var sgeApp *app.SgeApp var emptyWasmOpts []wasmkeeper.Option - if height != -1 { - sgeApp = app.NewSgeApp( - logger, - db, - traceStore, - false, - map[int64]bool{}, - "", - cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), - encCfg, - appOpts, - emptyWasmOpts, - ) - - if err := sgeApp.LoadHeight(height); err != nil { - return servertypes.ExportedApp{}, err - } - } else { - sgeApp = app.NewSgeApp(logger, db, traceStore, true, map[int64]bool{}, "", cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), encCfg, appOpts, emptyWasmOpts) - } + loadLatest := height == -1 + sgeApp = app.NewSgeApp( + logger, + db, + traceStore, + loadLatest, + map[int64]bool{}, + cast.ToString(appOpts.Get(flags.FlagHome)), + cast.ToUint(appOpts.Get(server.FlagInvCheckPeriod)), + encCfg, + appOpts, + emptyWasmOpts, + ) return sgeApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) } diff --git a/go.mod b/go.mod index 939a77a7..9b006d01 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( cosmossdk.io/math v1.3.0 cosmossdk.io/simapp v0.0.0-20230831152633-2e9e5d6eea24 github.com/CosmWasm/wasmd v0.45.0 - github.com/CosmWasm/wasmvm v1.5.2 github.com/cometbft/cometbft v0.37.5 github.com/cometbft/cometbft-db v0.8.0 github.com/cosmos/cosmos-proto v1.0.0-beta.4 @@ -82,6 +81,7 @@ require ( github.com/Antonboom/testifylint v0.2.3 // indirect github.com/BurntSushi/toml v1.3.2 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect + github.com/CosmWasm/wasmvm v1.5.2 // indirect github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // indirect From 9fddde1b2d54dea1b04ea1a4dde351c735bd9a03 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 8 May 2024 12:51:20 +0300 Subject: [PATCH 48/51] downgrade: alpine to 3.18 prevent sigabort error --- Dockerfile | 2 +- Makefile | 2 +- proto/Dockerfile | 2 +- proto/buf.lock | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d0f3ac19..0ae6b491 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ ARG BUILD_TAGS="netgo,ledger,muslc" # Builder # -------------------------------------------------------- -FROM golang:${GO_VERSION}-alpine3.19 as builder +FROM golang:${GO_VERSION}-alpine3.18 as builder ARG GIT_VERSION ARG GIT_COMMIT diff --git a/Makefile b/Makefile index 40823969..31e9a316 100644 --- a/Makefile +++ b/Makefile @@ -140,7 +140,7 @@ build-reproducible-amd64: go.sum --build-arg GO_VERSION=$(GO_VERSION) \ --build-arg GIT_VERSION=$(VERSION) \ --build-arg GIT_COMMIT=$(COMMIT) \ - --build-arg RUNNER_IMAGE=alpine:3.19 \ + --build-arg RUNNER_IMAGE=alpine:3.18 \ --platform linux/amd64 \ -t sge:local-amd64 \ --load \ diff --git a/proto/Dockerfile b/proto/Dockerfile index 0de9948c..3ff044e3 100644 --- a/proto/Dockerfile +++ b/proto/Dockerfile @@ -3,7 +3,7 @@ FROM bufbuild/buf:1.9.0 as BUILDER -FROM golang:1.22-alpine +FROM golang:1.22-alpine3.18 RUN apk add --no-cache \ diff --git a/proto/buf.lock b/proto/buf.lock index 07312228..83c7a202 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -19,7 +19,7 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - commit: 4ed3bc159a8b4ac68fe253218760d035 + commit: 1f6ed065c9f04b5cb843d6e7603d6454 digest: shake256:7149cf5e9955c692d381e557830555d4e93f205a0f1b8e2dfdae46d029369aa3fc1980e35df0d310f7cc3b622f93e19ad276769a283a967dd3065ddfd3a40e13 - remote: buf.build owner: protocolbuffers From 9e34176e5006f505e10efa552375f6ee31f487e6 Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 8 May 2024 13:21:14 +0300 Subject: [PATCH 49/51] lint: gofumpt --- app/keepers/keepers.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index d91f016c..ed642a07 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -433,12 +433,11 @@ func NewAppKeeper( panic("error while reading wasm config: " + err.Error()) } - ibcWasmConfig := - ibcwasmtypes.WasmConfig{ - DataDir: filepath.Join(wasmDir, "ibc_08-wasm"), - SupportedCapabilities: "iterator,stargate,abort", - ContractDebugMode: false, - } + ibcWasmConfig := ibcwasmtypes.WasmConfig{ + DataDir: filepath.Join(wasmDir, "ibc_08-wasm"), + SupportedCapabilities: "iterator,stargate,abort", + ContractDebugMode: false, + } wasmCapabilities := "iterator,staking,stargate" From 2d05591a93d94265a67fc399425a8861b72cbefe Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Wed, 8 May 2024 14:03:48 +0300 Subject: [PATCH 50/51] feat: cross compile wasm ibc compatibility --- .github/workflows/test.yml | 56 ++++++++++++++++++++++++++++---------- Makefile | 20 ++++++++++++++ go.mod | 2 +- go.sum | 4 +-- 4 files changed, 65 insertions(+), 17 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cdcbba2e..5b9fe851 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,24 +27,52 @@ jobs: key: ${{ runner.os }}-go-tparse-binary build: + name: sged-${{ matrix.targetos }}-${{ matrix.arch }} runs-on: ubuntu-latest + strategy: matrix: - go-arch: ["amd64", "arm", "arm64"] + arch: [amd64, arm64] + targetos: [darwin, linux] + include: + - targetos: darwin + arch: arm64 + steps: - - uses: actions/checkout@v2 - - uses: actions/setup-go@v5 - with: - go-version: 1.22 - - uses: technote-space/get-diff-action@v4 - id: git_diff + - name: Check out repository code + uses: actions/checkout@v4 + - name: Get git diff + uses: technote-space/get-diff-action@v6.1.2 with: PATTERNS: | - **/**.go + **/**.wasm + !tests/** + **/**.go !**/*_test.go go.mod go.sum - - name: Build - run: GOARCH=${{ matrix.go-arch }} LEDGER_ENABLED=false make build + Makefile + .github/workflows/build.yml + - name: 🐿 Setup Golang + uses: actions/setup-go@v5 + if: env.GIT_DIFF + with: + go-version-file: go.mod + env: + GOOS: ${{ matrix.targetos }} + GOARCH: ${{ matrix.arch }} + - name: Download Dependencies + if: env.GIT_DIFF + run: go mod download + - name: Build sged + if: env.GIT_DIFF + run: | + GOWRK=off go build cmd/sged/main.go + - name: Upload sged artifact + if: env.GIT_DIFF + uses: actions/upload-artifact@v3 + with: + name: sged-${{ matrix.targetos }}-${{ matrix.arch }} + path: cmd/sged/sged split-test-files: runs-on: ubuntu-latest @@ -52,7 +80,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: 1.22 - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Create a file with all the pkgs run: go list ./... > pkgs.txt - name: Split pkgs into 4 files @@ -83,7 +111,7 @@ jobs: matrix: part: ["00", "01", "02", "03"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: 1.22 @@ -110,7 +138,7 @@ jobs: runs-on: ubuntu-latest needs: tests steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: technote-space/get-diff-action@v4 with: PATTERNS: | @@ -161,7 +189,7 @@ jobs: matrix: part: ["00", "01", "02", "03"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: 1.22 diff --git a/Makefile b/Makefile index 31e9a316..1d89bef5 100644 --- a/Makefile +++ b/Makefile @@ -132,6 +132,8 @@ $(BUILD_TARGETS): check_version go.sum $(BUILDDIR)/ $(BUILDDIR)/: mkdir -p $(BUILDDIR)/ +build-reproducible: build-reproducible-amd64 build-reproducible-arm64 + build-reproducible-amd64: go.sum mkdir -p $(BUILDDIR) $(DOCKER) buildx create --name sgebuilder --node sgebinary || true @@ -150,6 +152,24 @@ build-reproducible-amd64: go.sum $(DOCKER) cp sgebinary:/bin/sged $(BUILDDIR)/sged-linux-amd64 $(DOCKER) rm -f sgebinary +build-reproducible-arm64: go.sum + mkdir -p $(BUILDDIR) + $(DOCKER) buildx create --name sgebuilder || true + $(DOCKER) buildx use sgebuilder + $(DOCKER) buildx build \ + --build-arg GO_VERSION=$(GO_VERSION) \ + --build-arg GIT_VERSION=$(VERSION) \ + --build-arg GIT_COMMIT=$(COMMIT) \ + --build-arg RUNNER_IMAGE=alpine:3.18 \ + --platform linux/arm64 \ + -t sge:local-arm64 \ + --load \ + -f Dockerfile . + $(DOCKER) rm -f sgebinary || true + $(DOCKER) create -ti --name sgebinary sge:local-arm64 + $(DOCKER) cp sgebinary:/bin/sged $(BUILDDIR)/sged-linux-arm64 + $(DOCKER) rm -f sgebinary + build-linux: go.sum LEDGER_ENABLED=false GOOS=linux GOARCH=amd64 $(MAKE) build diff --git a/go.mod b/go.mod index 9b006d01..44044b6d 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/cosmos/cosmos-sdk v0.47.8 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad - github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1 + github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5 github.com/cosmos/ibc-go/v7 v7.4.0 github.com/golang-jwt/jwt v3.2.2+incompatible github.com/golang-jwt/jwt/v4 v4.5.0 diff --git a/go.sum b/go.sum index 289bc8eb..459ce2ea 100644 --- a/go.sum +++ b/go.sum @@ -473,8 +473,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/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad h1:ozJyL/gd3hXYQodS7EESUQgu+1CeJ9nvb9sfHufmsjI= github.com/cosmos/ibc-apps/modules/ibc-hooks/v7 v7.0.0-20240502201956-e9b46e4bf0ad/go.mod h1:JwHFbo1oX/ht4fPpnPvmhZr+dCkYK1Vihw+vZE9umR4= -github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1 h1:fCtG9qasnNzhgxGR1jM9eBufZ5WQVpy0KdaOpKRfg8Y= -github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-0.20231213092633-b306e7a706e1/go.mod h1:h114vYKBtI5zKBeSyr8y5JZ8ZtpQJInO4TYww2IQr6o= +github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5 h1:sMoHjep+KInjMrppNCEutMVm1p8nI9WhKCuMQ+EcUHw= +github.com/cosmos/ibc-go/modules/light-clients/08-wasm v0.1.1-ibc-go-v7.3-wasmvm-v1.5/go.mod h1:VR2Hg2i/X1bafbmmNsV2Khwsg0PzNeuWoVKmSN5dAwo= github.com/cosmos/ibc-go/v7 v7.4.0 h1:8FqYMptvksgMvlbN4UW9jFxTXzsPyfAzEZurujXac8M= github.com/cosmos/ibc-go/v7 v7.4.0/go.mod h1:L/KaEhzV5TGUCTfGysVgMBQtl5Dm7hHitfpk+GIeoAo= github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= From f3c78825b1e6fc85abd7d813f57739f3ca40f09e Mon Sep 17 00:00:00 2001 From: scorpioborn <97235353+scorpioborn@users.noreply.github.com> Date: Fri, 24 May 2024 10:43:24 +0300 Subject: [PATCH 51/51] fix: remove node flag from build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1d89bef5..b24613df 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ build-reproducible: build-reproducible-amd64 build-reproducible-arm64 build-reproducible-amd64: go.sum mkdir -p $(BUILDDIR) - $(DOCKER) buildx create --name sgebuilder --node sgebinary || true + $(DOCKER) buildx create --name sgebuilder || true $(DOCKER) buildx use sgebuilder $(DOCKER) buildx build \ --build-arg GO_VERSION=$(GO_VERSION) \