diff --git a/.changeset/entries/41e30546ae8276c665719a67b7cda664fd8e609c06f9a4b2a55f6f0ebf260abb.yaml b/.changeset/entries/41e30546ae8276c665719a67b7cda664fd8e609c06f9a4b2a55f6f0ebf260abb.yaml new file mode 100644 index 0000000000..17960064a6 --- /dev/null +++ b/.changeset/entries/41e30546ae8276c665719a67b7cda664fd8e609c06f9a4b2a55f6f0ebf260abb.yaml @@ -0,0 +1,6 @@ +type: deps +module: other +pull_request: 1246 +description: Bump wasmd to 0.50.0 +backward_compatible: false +date: 2023-11-02T05:31:03.762902975Z diff --git a/.changeset/entries/651715426d9509d1e76263ab8313d90f416ce8973e88dc51ef89e0df3b3d75e0.yaml b/.changeset/entries/651715426d9509d1e76263ab8313d90f416ce8973e88dc51ef89e0df3b3d75e0.yaml new file mode 100644 index 0000000000..c16aee6a6e --- /dev/null +++ b/.changeset/entries/651715426d9509d1e76263ab8313d90f416ce8973e88dc51ef89e0df3b3d75e0.yaml @@ -0,0 +1,6 @@ +type: deps +module: other +pull_request: 1246 +description: Bump cosmos sdk to v0.50.3 +backward_compatible: false +date: 2023-11-02T05:29:58.252068969Z diff --git a/.changeset/entries/a11fd18cbf1a62ef72f896652407063fab25f8576b551025eaa9c8fc78aea5c2.yaml b/.changeset/entries/a11fd18cbf1a62ef72f896652407063fab25f8576b551025eaa9c8fc78aea5c2.yaml new file mode 100644 index 0000000000..9d9fbfb925 --- /dev/null +++ b/.changeset/entries/a11fd18cbf1a62ef72f896652407063fab25f8576b551025eaa9c8fc78aea5c2.yaml @@ -0,0 +1,6 @@ +type: fix +module: x/profiles +pull_request: 1250 +description: Fix missing account number of account creation +backward_compatible: true +date: 2023-09-28T08:12:05.365508338Z diff --git a/.changeset/entries/d3d0d6c7b4338e76c67c43e133140ea05c345cc0ce16cc45a0dcfd7e87b95090.yaml b/.changeset/entries/d3d0d6c7b4338e76c67c43e133140ea05c345cc0ce16cc45a0dcfd7e87b95090.yaml new file mode 100644 index 0000000000..dd76dd3541 --- /dev/null +++ b/.changeset/entries/d3d0d6c7b4338e76c67c43e133140ea05c345cc0ce16cc45a0dcfd7e87b95090.yaml @@ -0,0 +1,6 @@ +type: deps +module: other +pull_request: 1246 +description: Bump ibc-go to v8.0.0 +backward_compatible: false +date: 2023-11-02T05:30:24.946321857Z diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 67d414fc28..b6a3256d6a 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -17,7 +17,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Compute diff ๐Ÿ“œ uses: technote-space/get-diff-action@v6.1.2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index eb78100b0b..56ddef3bd2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Compute diff ๐Ÿ“œ uses: technote-space/get-diff-action@v6.1.2 diff --git a/.github/workflows/mutest.yml b/.github/workflows/mutest.yml index b585a06e84..9cc975f2bf 100644 --- a/.github/workflows/mutest.yml +++ b/.github/workflows/mutest.yml @@ -16,7 +16,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Run mutation tests ๐Ÿงช continue-on-error: true diff --git a/.github/workflows/on-chain-upgrade.yml b/.github/workflows/on-chain-upgrade.yml index cf96c6f376..5bafbe9ab0 100644 --- a/.github/workflows/on-chain-upgrade.yml +++ b/.github/workflows/on-chain-upgrade.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Install Desmos ๐Ÿ”ง run: make clean install diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cc528b5ca9..64c15806a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Unshallow run: git fetch --prune --unshallow --tags --force @@ -49,7 +49,7 @@ jobs: # - name: Setup Go ๐Ÿงฐ # uses: actions/setup-go@v5 # with: -# go-version: '1.20' +# go-version: '1.21' # # - name: Build the binary ๐Ÿญ # run: | @@ -82,7 +82,7 @@ jobs: # - name: Setup Go ๐Ÿงฐ # uses: actions/setup-go@v5 # with: -# go-version: '1.20' +# go-version: '1.21' # # - name: Compute diff ๐Ÿ“œ # uses: technote-space/get-diff-action@v6.1.0 @@ -131,7 +131,7 @@ jobs: # - name: Setup Go ๐Ÿงฐ # uses: actions/setup-go@v5 # with: -# go-version: '1.20' +# go-version: '1.21' # # - name: Build the binary ๐Ÿญ # run: | diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml index 6d7618fe19..4ce3dac7a9 100644 --- a/.github/workflows/sims.yml +++ b/.github/workflows/sims.yml @@ -31,7 +31,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Build ๐Ÿ”จ run: make build @@ -43,7 +43,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Install runsim ๐Ÿƒ run: export GO111MODULE="on" && go install github.com/cosmos/tools/cmd/runsim@v1.0.0 @@ -64,7 +64,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Compute diff ๐Ÿ“œ uses: technote-space/get-diff-action@v6.1.2 @@ -95,7 +95,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Compute diff ๐Ÿ“œ uses: technote-space/get-diff-action@v6.1.2 @@ -126,7 +126,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Compute diff ๐Ÿ“œ uses: technote-space/get-diff-action@v6.1.2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35185e9dfe..640d84f479 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Display go version ๐Ÿ›‚ run: go version @@ -49,7 +49,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Compute diff ๐Ÿ“œ uses: technote-space/get-diff-action@v6.1.2 @@ -113,7 +113,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Compute diff ๐Ÿ“œ uses: technote-space/get-diff-action@v6.1.2 @@ -220,7 +220,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Compute diff ๐Ÿ“œ uses: technote-space/get-diff-action@v6.1.2 @@ -308,7 +308,7 @@ jobs: - name: Setup Go ๐Ÿงฐ uses: actions/setup-go@v5 with: - go-version: '1.20' + go-version: '1.21' - name: Compute diff ๐Ÿ“œ uses: technote-space/get-diff-action@v6.1.2 diff --git a/.golangci.yml b/.golangci.yml index 97bb319baf..09f2e4d1b9 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -63,6 +63,12 @@ issues: text: "SA1019:" linters: - staticcheck + + # TODO: Remove it when legacy v1beta1 gov types are removed from ibc-go + - text: 'SA1019: "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" is deprecated: The legacy v1beta1 gov types maintained in this file are deprecated and will be removed in a future release. Please use MsgIBCSoftwareUpgrade and MsgRecoverClient in favour of the legacy v1beta1 gov proposal types.' + linters: + - staticcheck + max-issues-per-linter: 10000 max-same-issues: 10000 diff --git a/Makefile b/Makefile index f027c286c9..972150a6d6 100644 --- a/Makefile +++ b/Makefile @@ -353,7 +353,7 @@ update-deps-types: ############################################################################### ### Protobuf ### ############################################################################### -protoVer=0.11.6 +protoVer=0.14.0 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer) protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace --user $(shell id -u):$(shell id -g) $(protoImageName) @@ -391,7 +391,7 @@ build-docker-desmosnode: # Setups 4 folders representing each one the genesis state of a testnet node setup-localnet: build-linux - if ! [ -f build/node0/desmos/config/genesis.json ]; then $(BUILDDIR)/desmos testnet \ + if ! [ -f build/node0/.desmos/config/genesis.json ]; then $(BUILDDIR)/desmos testnet \ -o ./build --starting-ip-address 192.168.255.2 --keyring-backend=test \ --v=$(if $(NODES),$(NODES),4) \ --gentx-coin-denom=$(if $(COIN_DENOM),$(COIN_DENOM),"stake") \ diff --git a/app/ante.go b/app/ante.go index d065e3721b..9ce916d0b7 100644 --- a/app/ante.go +++ b/app/ante.go @@ -1,15 +1,15 @@ package app import ( + corestoretypes "cosmossdk.io/core/store" "cosmossdk.io/errors" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" - ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante" - ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante" + ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" - subspaceante "github.com/desmos-labs/desmos/v6/x/subspaces/ante" + subspacesante "github.com/desmos-labs/desmos/v6/x/subspaces/ante" subspaceskeeper "github.com/desmos-labs/desmos/v6/x/subspaces/keeper" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" @@ -23,7 +23,7 @@ type HandlerOptions struct { IBCkeeper *ibckeeper.Keeper SubspacesKeeper subspaceskeeper.Keeper - TxCounterStoreKey storetypes.StoreKey + TxCounterStoreKey corestoretypes.KVStoreService WasmConfig *wasmTypes.WasmConfig } @@ -58,8 +58,9 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) { ante.NewTxTimeoutHeightDecorator(), ante.NewValidateMemoDecorator(options.AccountKeeper), ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper), - subspaceante.NewDeductFeeDecorator( - ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), options.AccountKeeper, options.BankKeeper, options.SubspacesKeeper, options.TxFeeChecker), + subspacesante.NewDeductFeeDecorator( + ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker), options.AccountKeeper, options.BankKeeper, options.SubspacesKeeper, options.TxFeeChecker, + ), // SetPubKeyDecorator must be called before all signature verification decorators ante.NewSetPubKeyDecorator(options.AccountKeeper), ante.NewValidateSigCountDecorator(options.AccountKeeper), diff --git a/app/app.go b/app/app.go index c3ddbd40a5..25a269e742 100644 --- a/app/app.go +++ b/app/app.go @@ -3,15 +3,16 @@ package app import ( "fmt" "io" - "os" "path/filepath" "strings" "github.com/desmos-labs/desmos/v6/app/upgrades" + "cosmossdk.io/client/v2/autocli" + "cosmossdk.io/core/appmodule" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/server" - storetypes "github.com/cosmos/cosmos-sdk/store/types" postskeeper "github.com/desmos-labs/desmos/v6/x/posts/keeper" @@ -19,61 +20,60 @@ import ( consensusparamkeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" - ibcclient "github.com/cosmos/ibc-go/v7/modules/core/02-client" - "github.com/cosmos/cosmos-sdk/client/flags" servertypes "github.com/cosmos/cosmos-sdk/server/types" "github.com/spf13/cast" - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/server/api" - "github.com/cosmos/cosmos-sdk/server/config" - - dbm "github.com/cometbft/cometbft-db" + "cosmossdk.io/log" abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" tmos "github.com/cometbft/cometbft/libs/os" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/streaming" + "github.com/cosmos/cosmos-sdk/codec/types" + runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services" + "github.com/cosmos/cosmos-sdk/server/api" + "github.com/cosmos/cosmos-sdk/server/config" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth" - _ "github.com/cosmos/cosmos-sdk/x/auth/tx/config" // import for side-effects + authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec" "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/auth/ante" - capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" - feegrantkeeper "github.com/cosmos/cosmos-sdk/x/feegrant/keeper" + feegrantkeeper "cosmossdk.io/x/feegrant/keeper" mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" - - 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" - ibctransfer "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" - ibcclienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/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" - solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" - ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - - 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" - - "github.com/cosmos/cosmos-sdk/x/upgrade" + "github.com/cosmos/ibc-go/modules/capability" + capabilitykeeper "github.com/cosmos/ibc-go/modules/capability/keeper" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + + ibcfee "github.com/cosmos/ibc-go/v8/modules/apps/29-fee" + ibcfeekeeper "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/keeper" + ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types" + ibctransfer "github.com/cosmos/ibc-go/v8/modules/apps/transfer" + ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" + ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" + ibc "github.com/cosmos/ibc-go/v8/modules/core" + ibcclient "github.com/cosmos/ibc-go/v8/modules/core/02-client" + ibcclienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" + ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" + ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" + solomachine "github.com/cosmos/ibc-go/v8/modules/light-clients/06-solomachine" + ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" + ibctestingtypes "github.com/cosmos/ibc-go/v8/testing/types" + + ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts" + icacontroller "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller" + icacontrollerkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/keeper" + icacontrollertypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/types" + icahost "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host" + icahostkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/keeper" + icahosttypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/host/types" "github.com/desmos-labs/desmos/v6/x/profiles" profileskeeper "github.com/desmos-labs/desmos/v6/x/profiles/keeper" @@ -85,21 +85,21 @@ import ( supplykeeper "github.com/desmos-labs/desmos/v6/x/supply/keeper" tokenfactorykeeper "github.com/desmos-labs/desmos/v6/x/tokenfactory/keeper" + evidencekeeper "cosmossdk.io/x/evidence/keeper" + upgradekeeper "cosmossdk.io/x/upgrade/keeper" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper" distrkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" - evidencekeeper "github.com/cosmos/cosmos-sdk/x/evidence/keeper" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" slashingkeeper "github.com/cosmos/cosmos-sdk/x/slashing/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" + upgradetypes "cosmossdk.io/x/upgrade/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal" @@ -185,11 +185,14 @@ func NewDesmosApp( // merge the AppConfig and other configuration in one config appConfig = depinject.Configs( - AppConfig, + GetAppConfig(), depinject.Supply( // supply the application options appOpts, + // supply the logger + logger, + // ADVANCED CONFIGURATION // @@ -199,11 +202,28 @@ func NewDesmosApp( // add it below. By default the auth module uses simulation.RandomGenesisAccounts. // // authtypes.RandomGenesisAccountsFn(simulation.RandomGenesisAccounts), - + // // For providing a custom a base account type add it below. // By default the auth module uses authtypes.ProtoBaseAccount(). // - // func() authtypes.AccountI { return authtypes.ProtoBaseAccount() }, + // func() sdk.AccountI { return authtypes.ProtoBaseAccount() }, + // + // For providing a different address codec, add it below. + // By default the auth module uses a Bech32 address codec, + // with the prefix defined in the auth module configuration. + // + // func() address.Codec { return <- custom address codec type -> } + + // + // STAKING + // + // For provinding a different validator and consensus address codec, add it below. + // By default the staking module uses the bech32 prefix provided in the auth config, + // and appends "valoper" and "valcons" for validator and consensus addresses respectively. + // When providing a custom address codec in auth, custom address codecs must be provided here as well. + // + // func() runtime.ValidatorAddressCodec { return <- custom validator address codec type -> } + // func() runtime.ConsensusAddressCodec { return <- custom consensus address codec type -> } // // MINT @@ -224,7 +244,6 @@ func NewDesmosApp( &app.interfaceRegistry, &app.AccountKeeper, &app.BankKeeper, - &app.CapabilityKeeper, &app.StakingKeeper, &app.SlashingKeeper, &app.MintKeeper, @@ -277,21 +296,25 @@ func NewDesmosApp( // } // baseAppOptions = append(baseAppOptions, prepareOpt) - app.App = appBuilder.Build(logger, db, traceStore, baseAppOptions...) + app.App = appBuilder.Build(db, traceStore, baseAppOptions...) // set up non depinject support modules store keys - storeKeys := sdk.NewKVStoreKeys( - ibcexported.StoreKey, ibctransfertypes.StoreKey, ibcfeetypes.StoreKey, + storeKeys := storetypes.NewKVStoreKeys( + capabilitytypes.StoreKey, ibcexported.StoreKey, ibctransfertypes.StoreKey, ibcfeetypes.StoreKey, icahosttypes.StoreKey, icacontrollertypes.StoreKey, wasmtypes.StoreKey, ) for _, key := range storeKeys { app.RegisterStores(key) } + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + for _, key := range memKeys { + app.RegisterStores(key) + } + // load state streaming if enabled - if _, _, err := streaming.LoadStreamingServices(app.App.BaseApp, appOpts, app.appCodec, logger, app.kvStoreKeys()); err != nil { - logger.Error("failed to load state streaming", "err", err) - os.Exit(1) + if err := app.RegisterStreamingServices(appOpts, app.kvStoreKeys()); err != nil { + panic(err) } /**** Module Options ****/ @@ -301,6 +324,9 @@ func NewDesmosApp( app.ParamsKeeper.Subspace(m) } + // add capability keeper and ScopeToModule for ibc module + app.CapabilityKeeper = capabilitykeeper.NewKeeper(app.appCodec, storeKeys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey]) + // add capability keeper and ScopeToModule for ibc module scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibcexported.ModuleName) scopedIBCTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) @@ -309,9 +335,14 @@ func NewDesmosApp( scopedICAControllerKeeper := app.CapabilityKeeper.ScopeToModule(icacontrollertypes.SubModuleName) scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) + // seal capability keeper after scoping modules + // Applications that wish to enforce statically created ScopedKeepers should call `Seal` after creating + // their scoped modules in `NewApp` with `ScopeToModule` + app.CapabilityKeeper.Seal() + // Create IBC keeper app.IBCKeeper = ibckeeper.NewKeeper( - app.appCodec, app.GetKey(ibcexported.StoreKey), app.GetSubspace(ibcexported.ModuleName), app.StakingKeeper, app.UpgradeKeeper, scopedIBCKeeper, + app.appCodec, storeKeys[ibcexported.StoreKey], app.GetSubspace(ibcexported.ModuleName), app.StakingKeeper, app.UpgradeKeeper, scopedIBCKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) // Register the proposal types @@ -321,56 +352,59 @@ func NewDesmosApp( govRouter := govv1beta1.NewRouter() govRouter.AddRoute(govtypes.RouterKey, govv1beta1.ProposalHandler). AddRoute(paramproposal.RouterKey, params.NewParamChangeProposalHandler(app.ParamsKeeper)). // This should be removed. It is still in place to avoid failures of modules that have not yet been upgraded. - AddRoute(upgradetypes.RouterKey, upgrade.NewSoftwareUpgradeProposalHandler(app.UpgradeKeeper)). - AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) + // Add deprecated ibc proposal handler to prevent the approved proposal from failing before upgrading, references: https://github.com/cosmos/ibc-go/issues/4721 + AddRoute(ibcclienttypes.RouterKey, ibcclient.NewClientProposalHandler(app.IBCKeeper.ClientKeeper)) //nolint app.IBCFeeKeeper = ibcfeekeeper.NewKeeper( - app.appCodec, app.GetKey(ibcfeetypes.StoreKey), + app.appCodec, storeKeys[ibcfeetypes.StoreKey], app.IBCKeeper.ChannelKeeper, // may be replaced with IBC middleware app.IBCKeeper.ChannelKeeper, - &app.IBCKeeper.PortKeeper, app.AccountKeeper, app.BankKeeper, + app.IBCKeeper.PortKeeper, app.AccountKeeper, app.BankKeeper, ) // Create IBC transfer keeper app.TransferKeeper = ibctransferkeeper.NewKeeper( app.appCodec, - app.GetKey(ibctransfertypes.StoreKey), + storeKeys[ibctransfertypes.StoreKey], app.GetSubspace(ibctransfertypes.ModuleName), app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, - &app.IBCKeeper.PortKeeper, + app.IBCKeeper.PortKeeper, app.AccountKeeper, app.BankKeeper, scopedIBCTransferKeeper, + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) // Create interchain account keepers app.ICAHostKeeper = icahostkeeper.NewKeeper( app.appCodec, - app.GetKey(icahosttypes.StoreKey), + storeKeys[icahosttypes.StoreKey], app.GetSubspace(icahosttypes.SubModuleName), app.IBCFeeKeeper, // use ics29 fee as ics4Wrapper in middleware stack app.IBCKeeper.ChannelKeeper, - &app.IBCKeeper.PortKeeper, + app.IBCKeeper.PortKeeper, app.AccountKeeper, scopedICAHostKeeper, app.MsgServiceRouter(), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) app.ICAControllerKeeper = icacontrollerkeeper.NewKeeper( app.appCodec, - app.GetKey(icacontrollertypes.StoreKey), + storeKeys[icacontrollertypes.StoreKey], app.GetSubspace(icacontrollertypes.SubModuleName), app.IBCFeeKeeper, // use ics29 fee as ics4Wrapper in middleware stack app.IBCKeeper.ChannelKeeper, - &app.IBCKeeper.PortKeeper, + app.IBCKeeper.PortKeeper, scopedICAControllerKeeper, app.MsgServiceRouter(), + authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) // Setup profiles IBC keepers manually app.ProfilesKeeper.SetIBCKeepers( app.IBCKeeper.ChannelKeeper, - &app.IBCKeeper.PortKeeper, + app.IBCKeeper.PortKeeper, scopedProfilesKeeper, ) @@ -402,14 +436,14 @@ func NewDesmosApp( availableCapabilities := strings.Join(AllWasmCapabilities(), ",") app.WasmKeeper = wasmkeeper.NewKeeper( app.appCodec, - app.GetKey(wasmtypes.StoreKey), + runtime.NewKVStoreService(storeKeys[wasmtypes.StoreKey]), app.AccountKeeper, app.BankKeeper, app.StakingKeeper, distrkeeper.NewQuerier(app.DistrKeeper), app.IBCFeeKeeper, // ICS4 Wrapper: fee IBC middleware app.IBCKeeper.ChannelKeeper, - &app.IBCKeeper.PortKeeper, + app.IBCKeeper.PortKeeper, scopedWasmKeeper, app.TransferKeeper, app.MsgServiceRouter(), @@ -453,13 +487,18 @@ func NewDesmosApp( // NOTE: Any module instantiated in the module manager that is later modified // must be passed by reference here. legacyModules := []module.AppModule{ + // IBC modules + capability.NewAppModule(app.appCodec, *app.CapabilityKeeper, false), ibc.NewAppModule(app.IBCKeeper), ibctransfer.NewAppModule(app.TransferKeeper), ibcfee.NewAppModule(app.IBCFeeKeeper), ica.NewAppModule(&app.ICAControllerKeeper, &app.ICAHostKeeper), + ibctm.NewAppModule(), + solomachine.NewAppModule(), + + // Custom modules wasm.NewAppModule(app.appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)), } - if err := app.RegisterModules(legacyModules...); err != nil { panic(err) } @@ -479,10 +518,6 @@ func NewDesmosApp( app.ModuleManager.RegisterInvariants(app.CrisisKeeper) app.registerUpgradeHandlers() - // register additional types - ibctm.AppModuleBasic{}.RegisterInterfaces(app.interfaceRegistry) - solomachine.AppModuleBasic{}.RegisterInterfaces(app.interfaceRegistry) - app.ScopedIBCKeeper = scopedIBCKeeper app.ScopedIBCTransferKeeper = scopedIBCTransferKeeper app.ScopedProfilesKeeper = scopedProfilesKeeper @@ -500,7 +535,7 @@ func NewDesmosApp( SigGasConsumer: ante.DefaultSigVerificationGasConsumer, }, IBCkeeper: app.IBCKeeper, - TxCounterStoreKey: app.GetKey(wasmtypes.StoreKey), + TxCounterStoreKey: runtime.NewKVStoreService(storeKeys[wasmtypes.StoreKey]), WasmConfig: &wasmConfig, SubspacesKeeper: *app.SubspacesKeeper, }, @@ -552,7 +587,7 @@ func NewDesmosApp( // For instance, the upgrade module will set automatically the module version map in its init genesis thanks to app wiring. // However, when registering a module manually (i.e. that does not support app wiring), the module version map // must be set manually as follow. The upgrade module will de-duplicate the module version map. - app.SetInitChainer(func(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain { + app.SetInitChainer(func(ctx sdk.Context, req *abci.RequestInitChain) (*abci.ResponseInitChain, error) { app.UpgradeKeeper.SetModuleVersionMap(ctx, app.ModuleManager.GetVersionMap()) return app.App.InitChainer(ctx, req) }) @@ -680,3 +715,51 @@ func BlockedAddresses() map[string]bool { return result } + +// IBC TestingApp functions + +// GetBaseApp implements the ibctesting.TestingApp interface +func (app *DesmosApp) GetBaseApp() *baseapp.BaseApp { + return app.BaseApp +} + +// GetStakingKeeper implements the ibctesting.TestingApp interface +func (app *DesmosApp) GetStakingKeeper() ibctestingtypes.StakingKeeper { + return app.StakingKeeper +} + +// GetIBCKeeper implements the ibctesting.TestingApp interface +func (app *DesmosApp) GetIBCKeeper() *ibckeeper.Keeper { + return app.IBCKeeper +} + +// GetScopedIBCKeeper implements the ibctesting.TestingApp interface +func (app *DesmosApp) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper { + return app.ScopedIBCKeeper +} + +// GetTxConfig implements the ibctesting.TestingApp interface +func (app *DesmosApp) GetTxConfig() client.TxConfig { + return app.txConfig +} + +// AutoCliOpts returns the autocli options for the app. +func (app *DesmosApp) AutoCliOpts() autocli.AppOptions { + modules := make(map[string]appmodule.AppModule, 0) + for _, m := range app.ModuleManager.Modules { + if moduleWithName, ok := m.(module.HasName); ok { + moduleName := moduleWithName.Name() + if appModule, ok := moduleWithName.(appmodule.AppModule); ok { + modules[moduleName] = appModule + } + } + } + + return autocli.AppOptions{ + Modules: modules, + ModuleOptions: runtimeservices.ExtractAutoCLIOptions(app.ModuleManager.Modules), + AddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()), + ValidatorAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ValidatorAddrPrefix()), + ConsensusAddressCodec: authcodec.NewBech32Codec(sdk.GetConfig().GetBech32ConsensusAddrPrefix()), + } +} diff --git a/app/app_config.go b/app/app_config.go index 074652721c..1e70deb5cb 100644 --- a/app/app_config.go +++ b/app/app_config.go @@ -4,19 +4,21 @@ import ( "os" "path/filepath" + "github.com/prometheus/client_golang/prometheus" + "github.com/spf13/cast" + + evidencetypes "cosmossdk.io/x/evidence/types" + "cosmossdk.io/x/feegrant" + "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/cosmos/cosmos-sdk/x/authz" 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" - evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" - "github.com/prometheus/client_golang/prometheus" - "github.com/spf13/cast" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/cosmos/cosmos-sdk/x/consensus" @@ -26,6 +28,7 @@ import ( authmodulev1 "cosmossdk.io/api/cosmos/auth/module/v1" + "cosmossdk.io/x/evidence" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/module" @@ -33,7 +36,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank" "github.com/cosmos/cosmos-sdk/x/crisis" distr "github.com/cosmos/cosmos-sdk/x/distribution" - "github.com/cosmos/cosmos-sdk/x/evidence" "github.com/cosmos/cosmos-sdk/x/genutil" "github.com/cosmos/cosmos-sdk/x/gov" "github.com/cosmos/cosmos-sdk/x/params" @@ -42,28 +44,26 @@ import ( "github.com/cosmos/cosmos-sdk/x/slashing" "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/cosmos/cosmos-sdk/x/capability" + "github.com/cosmos/ibc-go/modules/capability" - feegrantmodule "github.com/cosmos/cosmos-sdk/x/feegrant/module" + feegrantmodule "cosmossdk.io/x/feegrant/module" "github.com/cosmos/cosmos-sdk/x/mint" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" - ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" - ibctransfer "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" - ibcclientclient "github.com/cosmos/ibc-go/v7/modules/core/02-client/client" - ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" - solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" - ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" + ibcfee "github.com/cosmos/ibc-go/v8/modules/apps/29-fee" + ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types" + ibctransfer "github.com/cosmos/ibc-go/v8/modules/apps/transfer" + ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" + ibc "github.com/cosmos/ibc-go/v8/modules/core" + ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" + solomachine "github.com/cosmos/ibc-go/v8/modules/light-clients/06-solomachine" + ibctm "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" - 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" + ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts" + icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" - "github.com/cosmos/cosmos-sdk/x/upgrade" - upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + "cosmossdk.io/x/upgrade" + upgradetypes "cosmossdk.io/x/upgrade/types" "github.com/desmos-labs/desmos/v6/x/posts" postskeeper "github.com/desmos-labs/desmos/v6/x/posts/keeper" @@ -163,10 +163,6 @@ var ( gov.NewAppModuleBasic( []govclient.ProposalHandler{ paramsclient.ProposalHandler, - upgradeclient.LegacyProposalHandler, - upgradeclient.LegacyCancelProposalHandler, - ibcclientclient.UpdateClientProposalHandler, - ibcclientclient.UpgradeProposalHandler, }, ), params.AppModuleBasic{}, @@ -215,85 +211,40 @@ var ( {Account: tokenfactorytypes.ModuleName, Permissions: []string{authtypes.Minter, authtypes.Burner}}, } + // NOTE: upgrade module is required to be prioritized + preblockerOder = []string{ + upgradetypes.ModuleName, + } + // During begin block slashing happens after distr.BeginBlocker so that // there is nothing left over in the validator fee pool, so as to keep the // CanWithdrawInvariant invariant. // NOTE: staking module is required if HistoricalEntries param > 0 // NOTE: capability module's beginblocker must come before any modules using capabilities (e.g. IBC) beginBlockerOrder = []string{ - upgradetypes.ModuleName, + // Simd modules capabilitytypes.ModuleName, minttypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName, evidencetypes.ModuleName, stakingtypes.ModuleName, - authtypes.ModuleName, - banktypes.ModuleName, - govtypes.ModuleName, - crisistypes.ModuleName, - genutiltypes.ModuleName, authz.ModuleName, - feegrant.ModuleName, - paramstypes.ModuleName, - vestingtypes.ModuleName, - consensusparamtypes.ModuleName, // IBC modules ibcexported.ModuleName, - ibctransfertypes.ModuleName, - ibcfeetypes.ModuleName, - icatypes.ModuleName, // Custom modules subspacestypes.ModuleName, - relationshipstypes.ModuleName, profilestypes.ModuleName, - poststypes.ModuleName, - reportstypes.ModuleName, - reactionstypes.ModuleName, - supplytypes.ModuleName, - tokenfactorytypes.ModuleName, - - wasmtypes.ModuleName, } endBlockerOrder = []string{ + // Simd modules crisistypes.ModuleName, govtypes.ModuleName, stakingtypes.ModuleName, - capabilitytypes.ModuleName, - authtypes.ModuleName, - banktypes.ModuleName, - distrtypes.ModuleName, - slashingtypes.ModuleName, - minttypes.ModuleName, - genutiltypes.ModuleName, - evidencetypes.ModuleName, - authz.ModuleName, feegrant.ModuleName, - paramstypes.ModuleName, - upgradetypes.ModuleName, - vestingtypes.ModuleName, - consensusparamtypes.ModuleName, - - // IBC modules - ibcexported.ModuleName, - ibctransfertypes.ModuleName, - ibcfeetypes.ModuleName, - icatypes.ModuleName, - - // Custom modules - subspacestypes.ModuleName, - relationshipstypes.ModuleName, - profilestypes.ModuleName, - poststypes.ModuleName, - reportstypes.ModuleName, - reactionstypes.ModuleName, - supplytypes.ModuleName, - tokenfactorytypes.ModuleName, - - wasmtypes.ModuleName, } // NOTE: The genutils module must occur after staking so that pools are @@ -306,6 +257,8 @@ var ( // genesis phase. For example bank transfer, auth account check, staking, ... genesisModuleOrder = []string{ capabilitytypes.ModuleName, + + // Simd modules authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, @@ -347,6 +300,7 @@ var ( // alphabetically (default order) // NOTE: The relationships module must occur before the profiles module, or all relationships will be deleted migrationModuleOrder = []string{ + runtime.ModuleName, authtypes.ModuleName, authz.ModuleName, banktypes.ModuleName, @@ -369,6 +323,8 @@ var ( ibctransfertypes.ModuleName, ibcfeetypes.ModuleName, icatypes.ModuleName, + ibctm.ModuleName, + solomachine.ModuleName, // Custom modules subspacestypes.ModuleName, diff --git a/app/app_module_config.go b/app/app_module_config.go index eb066069ca..1c3062a836 100644 --- a/app/app_module_config.go +++ b/app/app_module_config.go @@ -1,12 +1,13 @@ package app import ( + "cosmossdk.io/depinject" + runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1" appv1alpha1 "cosmossdk.io/api/cosmos/app/v1alpha1" authmodulev1 "cosmossdk.io/api/cosmos/auth/module/v1" authzmodulev1 "cosmossdk.io/api/cosmos/authz/module/v1" bankmodulev1 "cosmossdk.io/api/cosmos/bank/module/v1" - capabilitymodulev1 "cosmossdk.io/api/cosmos/capability/module/v1" consensusmodulev1 "cosmossdk.io/api/cosmos/consensus/module/v1" crisismodulev1 "cosmossdk.io/api/cosmos/crisis/module/v1" distrmodulev1 "cosmossdk.io/api/cosmos/distribution/module/v1" @@ -23,28 +24,48 @@ import ( vestingmodulev1 "cosmossdk.io/api/cosmos/vesting/module/v1" "cosmossdk.io/core/appconfig" + evidencetypes "cosmossdk.io/x/evidence/types" + "cosmossdk.io/x/feegrant" + upgradetypes "cosmossdk.io/x/upgrade/types" + "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/cosmos/cosmos-sdk/x/authz" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" consensustypes "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" + "github.com/cosmos/cosmos-sdk/x/genutil" genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + "github.com/cosmos/cosmos-sdk/x/gov" + govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + paramsclient "github.com/cosmos/cosmos-sdk/x/params/client" 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" - icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types" - ibcfeetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" - ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + _ "cosmossdk.io/x/evidence" // import for side-effects + _ "cosmossdk.io/x/feegrant/module" // import for side-effects + _ "cosmossdk.io/x/upgrade" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/auth/tx/config" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/auth/vesting" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/authz/module" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/bank" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/consensus" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/crisis" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/distribution" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/mint" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/params" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/slashing" // import for side-effects + _ "github.com/cosmos/cosmos-sdk/x/staking" // import for side-effects + + icatypes "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/types" + ibcfeetypes "github.com/cosmos/ibc-go/v8/modules/apps/29-fee/types" + ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" @@ -57,6 +78,15 @@ import ( supplymodulev1 "github.com/desmos-labs/desmos/v6/api/desmos/supply/module/v1" tokenfactorymodulev1 "github.com/desmos-labs/desmos/v6/api/desmos/tokenfactory/module/v1" + _ "github.com/desmos-labs/desmos/v6/x/posts" // import for side-effects + _ "github.com/desmos-labs/desmos/v6/x/profiles" // import for side-effects + _ "github.com/desmos-labs/desmos/v6/x/reactions" // import for side-effects + _ "github.com/desmos-labs/desmos/v6/x/relationships" // import for side-effects + _ "github.com/desmos-labs/desmos/v6/x/reports" // import for side-effects + _ "github.com/desmos-labs/desmos/v6/x/subspaces" // import for side-effects + _ "github.com/desmos-labs/desmos/v6/x/supply" // import for side-effects + _ "github.com/desmos-labs/desmos/v6/x/tokenfactory" // import for side-effects + poststypes "github.com/desmos-labs/desmos/v6/x/posts/types" profilestypes "github.com/desmos-labs/desmos/v6/x/profiles/types" reactionstypes "github.com/desmos-labs/desmos/v6/x/reactions/types" @@ -84,20 +114,18 @@ var ( // We allow the following module accounts to receive funds: // govtypes.ModuleName } +) - // application configuration (used by depinject) - AppConfig = appconfig.Compose(&appv1alpha1.Config{ +// GetAppConfig returns the depinject config for building modules +func GetAppConfig() depinject.Config { + return depinject.Configs(appconfig.Compose(&appv1alpha1.Config{ Modules: []*appv1alpha1.ModuleConfig{ // SDK modules { - Name: "runtime", + Name: runtime.ModuleName, Config: appconfig.WrapAny(&runtimev1alpha1.Module{ - AppName: appName, - // During begin block slashing happens after distr.BeginBlocker so that - // there is nothing left over in the validator fee pool, so as to keep the - // CanWithdrawInvariant invariant. - // NOTE: staking module is required if HistoricalEntries param > 0 - // NOTE: capability module's beginblocker must come before any modules using capabilities (e.g. IBC) + AppName: appName, + PreBlockers: preblockerOder, BeginBlockers: beginBlockerOrder, EndBlockers: endBlockerOrder, OverrideStoreKeys: []*runtimev1alpha1.StoreKeyConfig{ @@ -106,19 +134,14 @@ var ( KvStoreKey: "acc", }, }, - InitGenesis: genesisModuleOrder, - // When ExportGenesis is not specified, the export genesis module order - // is equal to the init genesis order - // ExportGenesis: genesisModuleOrder, - // Uncomment if you want to set a custom migration order here. - // OrderMigrations: nil, + InitGenesis: genesisModuleOrder, OrderMigrations: migrationModuleOrder, }), }, { Name: authtypes.ModuleName, Config: appconfig.WrapAny(&authmodulev1.Module{ - Bech32Prefix: sdk.Bech32MainPrefix, + Bech32Prefix: sdk.GetConfig().GetBech32AccountAddrPrefix(), ModuleAccountPermissions: maccPerms, // By default modules authority is the governance module. This is configurable with the following: // Authority: "group", // A custom module authority can be set using a module name @@ -137,7 +160,12 @@ var ( }, { Name: stakingtypes.ModuleName, - Config: appconfig.WrapAny(&stakingmodulev1.Module{}), + Config: appconfig.WrapAny(&stakingmodulev1.Module{ + // NOTE: specifying a prefix is only necessary when using bech32 addresses + // If not specfied, the auth Bech32Prefix appended with "valoper" and "valcons" is used by default + // Bech32PrefixValidator: "desmosvaloper", + // Bech32PrefixConsensus: "desmosvalcons", + }), }, { Name: slashingtypes.ModuleName, @@ -167,12 +195,6 @@ var ( Name: distrtypes.ModuleName, Config: appconfig.WrapAny(&distrmodulev1.Module{}), }, - { - Name: capabilitytypes.ModuleName, - Config: appconfig.WrapAny(&capabilitymodulev1.Module{ - SealKeeper: true, - }), - }, { Name: evidencetypes.ModuleName, Config: appconfig.WrapAny(&evidencemodulev1.Module{}), @@ -232,5 +254,16 @@ var ( Config: appconfig.WrapAny(&tokenfactorymodulev1.Module{}), }, }, - }) -) + }), + depinject.Supply( + // supply custom module basics + map[string]module.AppModuleBasic{ + genutiltypes.ModuleName: genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator), + govtypes.ModuleName: gov.NewAppModuleBasic( + []govclient.ProposalHandler{ + paramsclient.ProposalHandler, + }, + ), + }, + )) +} diff --git a/app/app_test.go b/app/app_test.go index 6ee85d702a..5da906751a 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -3,15 +3,15 @@ package app import ( "encoding/json" "fmt" - "os" "testing" "github.com/stretchr/testify/require" - dbm "github.com/cometbft/cometbft-db" + "cosmossdk.io/log" + "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" tmtypes "github.com/cometbft/cometbft/types" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" "github.com/cosmos/cosmos-sdk/testutil/mock" @@ -24,19 +24,20 @@ import ( func TestCheckProfilesKeeper(t *testing.T) { db := dbm.NewMemDB() app := NewDesmosApp( - log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, + log.NewTestLogger(t), db, nil, true, simtestutil.NewAppOptionsWithFlagHome(t.TempDir()), ) require.Equal(t, app.IBCKeeper.ChannelKeeper, app.ProfilesKeeper.ChannelKeeper) - require.Equal(t, &app.IBCKeeper.PortKeeper, app.ProfilesKeeper.PortKeeper) + require.Equal(t, app.IBCKeeper.PortKeeper, app.ProfilesKeeper.PortKeeper) require.Equal(t, app.ScopedProfilesKeeper, app.ProfilesKeeper.ScopedKeeper) } func TestSimAppExportAndBlockedAddrs(t *testing.T) { db := dbm.NewMemDB() + logger := log.NewTestLogger(t) app := NewDesmosApp( - log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, + logger, db, nil, true, simtestutil.NewAppOptionsWithFlagHome(t.TempDir()), ) @@ -52,7 +53,7 @@ func TestSimAppExportAndBlockedAddrs(t *testing.T) { acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0) balance := banktypes.Balance{ Address: acc.GetAddress().String(), - Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000000000000))), + Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(100000000000000))), } genesisState := NewDefaultGenesisState(app.AppCodec()) @@ -62,7 +63,7 @@ func TestSimAppExportAndBlockedAddrs(t *testing.T) { // Initialize the chain app.InitChain( - abci.RequestInitChain{ + &abci.RequestInitChain{ Validators: []abci.ValidatorUpdate{}, ConsensusParams: simtestutil.DefaultConsensusParams, AppStateBytes: stateBytes, @@ -85,11 +86,18 @@ func TestSimAppExportAndBlockedAddrs(t *testing.T) { ) } - app.Commit() + // finalize block so we have CheckTx state set + _, err = app.FinalizeBlock(&abci.RequestFinalizeBlock{ + Height: 1, + }) + require.NoError(t, err) + + _, err = app.Commit() + require.NoError(t, err) // Making a new app object with the db, so that initchain hasn't been called app2 := NewDesmosApp( - log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, nil, true, simtestutil.NewAppOptionsWithFlagHome(t.TempDir()), + logger.With("instance", "second"), db, nil, true, simtestutil.NewAppOptionsWithFlagHome(t.TempDir()), ) _, err = app2.ExportAppStateAndValidators(false, []string{}, []string{}) require.NoError(t, err, "ExportAppStateAndValidators should not have an error") diff --git a/app/desmos/cmd/chainlink/builder/builder.go b/app/desmos/cmd/chainlink/builder/builder.go index bf0da19b14..ee2dcf1657 100644 --- a/app/desmos/cmd/chainlink/builder/builder.go +++ b/app/desmos/cmd/chainlink/builder/builder.go @@ -1,15 +1,14 @@ package builder import ( - "github.com/cosmos/cosmos-sdk/codec" - + "github.com/cosmos/cosmos-sdk/client" "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink/types" "github.com/desmos-labs/desmos/v6/x/profiles/client/utils" ) // ChainLinkJSONBuilder allows to build a ChainLinkJSON instance type ChainLinkJSONBuilder interface { - BuildChainLinkJSON(cdc codec.Codec, chain types.Chain) (utils.ChainLinkJSON, error) + BuildChainLinkJSON(ctx client.Context, chain types.Chain) (utils.ChainLinkJSON, error) } // ChainLinkJSONBuilderProvider allows to provide the provider ChainLinkJSONBuilder implementation based on whether diff --git a/app/desmos/cmd/chainlink/builder/multi/builder.go b/app/desmos/cmd/chainlink/builder/multi/builder.go index e75694ad60..484f6d1e97 100644 --- a/app/desmos/cmd/chainlink/builder/multi/builder.go +++ b/app/desmos/cmd/chainlink/builder/multi/builder.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/tx/signing" authsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" @@ -30,7 +30,7 @@ func NewAccountChainLinkJSONBuilder(getter getter.MultiSignatureAccountReference } // BuildChainLinkJSON implements ChainLinkJSONBuilder -func (b *AccountChainLinkJSONBuilder) BuildChainLinkJSON(_ codec.Codec, chain types.Chain) (utils.ChainLinkJSON, error) { +func (b *AccountChainLinkJSONBuilder) BuildChainLinkJSON(ctx client.Context, chain types.Chain) (utils.ChainLinkJSON, error) { txFilePath, err := b.getter.GetMultiSignedTxFilePath() if err != nil { return utils.ChainLinkJSON{}, err @@ -81,14 +81,14 @@ func (b *AccountChainLinkJSONBuilder) BuildChainLinkJSON(_ codec.Codec, chain ty } // Re-create the bytes that have been signed in order to produce the signature - signingData := authsigning.SignerData{ + signerData := authsigning.SignerData{ AccountNumber: 0, Sequence: 0, ChainID: signedChainID, Address: addr, PubKey: sigs[0].PubKey, } - value, err := txCfg.SignModeHandler().GetSignBytes(signMode, signingData, parsedTx) + value, err := authsigning.GetSignBytesAdapter(ctx.CmdContext, ctx.TxConfig.SignModeHandler(), signMode, signerData, txBuilder.GetTx()) if err != nil { return utils.ChainLinkJSON{}, err } diff --git a/app/desmos/cmd/chainlink/builder/single/builder.go b/app/desmos/cmd/chainlink/builder/single/builder.go index 419c224388..0373c63bf8 100644 --- a/app/desmos/cmd/chainlink/builder/single/builder.go +++ b/app/desmos/cmd/chainlink/builder/single/builder.go @@ -3,10 +3,11 @@ package single import ( "encoding/hex" - "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/tx/signing" "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink/getter" "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink/types" @@ -33,14 +34,14 @@ func NewAccountChainLinkJSONBuilder(owner string, getter getter.SingleSignatureA } // BuildChainLinkJSON implements ChainLinkJSONBuilder -func (b *AccountChainLinkJSONBuilder) BuildChainLinkJSON(cdc codec.Codec, chain types.Chain) (utils.ChainLinkJSON, error) { +func (b *AccountChainLinkJSONBuilder) BuildChainLinkJSON(ctx client.Context, chain types.Chain) (utils.ChainLinkJSON, error) { mnemonic, err := b.getter.GetMnemonic() if err != nil { return utils.ChainLinkJSON{}, err } // Create an in-memory keybase for signing - keyBase := keyring.NewInMemory(cdc) + keyBase := keyring.NewInMemory(ctx.Codec) _, err = keyBase.NewAccount(KeyName, mnemonic, "", chain.DerivationPath, hd.Secp256k1) if err != nil { return utils.ChainLinkJSON{}, err @@ -51,7 +52,7 @@ func (b *AccountChainLinkJSONBuilder) BuildChainLinkJSON(cdc codec.Codec, chain accAddr, _ := key.GetAddress() addr, _ := sdk.Bech32ifyAddressBytes(chain.Prefix, accAddr) value := []byte(b.owner) - sig, pubkey, err := keyBase.Sign(KeyName, value) + sig, pubkey, err := keyBase.Sign(KeyName, value, signing.SignMode_SIGN_MODE_TEXTUAL) if err != nil { return utils.ChainLinkJSON{}, err } diff --git a/app/desmos/cmd/chainlink/create_json.go b/app/desmos/cmd/chainlink/create_json.go index 735abe59a9..08d9102dbd 100644 --- a/app/desmos/cmd/chainlink/create_json.go +++ b/app/desmos/cmd/chainlink/create_json.go @@ -58,7 +58,7 @@ Providing an invalid transaction (either with an account-number or sequence not return err } - chainLinkJSON, err := provider(owner, isSingleSignatureAccount).BuildChainLinkJSON(clientCtx.Codec, chain) + chainLinkJSON, err := provider(owner, isSingleSignatureAccount).BuildChainLinkJSON(clientCtx, chain) if err != nil { return err } diff --git a/app/desmos/cmd/chainlink/create_json_test.go b/app/desmos/cmd/chainlink/create_json_test.go index 1433bc77fa..1877390e4e 100644 --- a/app/desmos/cmd/chainlink/create_json_test.go +++ b/app/desmos/cmd/chainlink/create_json_test.go @@ -15,6 +15,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" + "github.com/cosmos/cosmos-sdk/types/tx/signing" multibuilder "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink/builder/multi" singlebuilder "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink/builder/single" @@ -60,7 +61,7 @@ func (suite *CreateJSONChainLinkTestSuite) TestSingleSignatureAccount() { key, err := keyBase.Key(singlebuilder.KeyName) suite.Require().NoError(err) - sig, _, err := keyBase.Sign(singlebuilder.KeyName, []byte(suite.Owner)) + sig, _, err := keyBase.Sign(singlebuilder.KeyName, []byte(suite.Owner), signing.SignMode_SIGN_MODE_TEXTUAL) suite.Require().NoError(err) pubKey, err := key.GetPubKey() diff --git a/app/desmos/cmd/commands.go b/app/desmos/cmd/commands.go new file mode 100644 index 0000000000..b725cf98c5 --- /dev/null +++ b/app/desmos/cmd/commands.go @@ -0,0 +1,256 @@ +package cmd + +import ( + "errors" + "io" + "os" + + "cosmossdk.io/log" + confixcmd "cosmossdk.io/tools/confix/cmd" + cmtcfg "github.com/cometbft/cometbft/config" + tmcli "github.com/cometbft/cometbft/libs/cli" + dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/debug" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/keys" + "github.com/cosmos/cosmos-sdk/client/pruning" + "github.com/cosmos/cosmos-sdk/client/rpc" + "github.com/cosmos/cosmos-sdk/client/snapshot" + "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/types/module" + authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + "github.com/cosmos/cosmos-sdk/x/crisis" + genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" + "github.com/desmos-labs/desmos/v6/app" + "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink" + chainlinktypes "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink/getter" + chainlinkprovider "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink/provider" + "github.com/desmos-labs/desmos/v6/app/desmos/cmd/sign" + "github.com/spf13/cobra" + "github.com/spf13/viper" +) + +// initCometBFTConfig helps to override default CometBFT Config values. +// return cmtcfg.DefaultConfig if no custom configuration is required for the application. +func initCometBFTConfig() *cmtcfg.Config { + cfg := cmtcfg.DefaultConfig() + + // these values put a higher strain on node memory + // cfg.P2P.MaxNumInboundPeers = 100 + // cfg.P2P.MaxNumOutboundPeers = 40 + + return cfg +} + +// initAppConfig helps to override default appConfig template and configs. +// return "", nil if no custom configuration is required for the application. +func initAppConfig() (string, interface{}) { + // The following code snippet is just for reference. + + // WASMConfig defines configuration for the wasm module. + type WASMConfig struct { + // This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries + QueryGasLimit uint64 `mapstructure:"query_gas_limit"` + + // Address defines the gRPC-web server to listen on + LruSize uint64 `mapstructure:"lru_size"` + } + + type CustomAppConfig struct { + serverconfig.Config + + WASM WASMConfig `mapstructure:"wasm"` + } + + // Optionally allow the chain developer to overwrite the SDK's default + // server config. + srvCfg := serverconfig.DefaultConfig() + // The SDK's default minimum gas price is set to "" (empty value) inside + // app.toml. If left empty by validators, the node will halt on startup. + // However, the chain developer can set a default app.toml value for their + // validators here. + // + // In summary: + // - if you leave srvCfg.MinGasPrices = "", all validators MUST tweak their + // own app.toml config, + // - if you set srvCfg.MinGasPrices non-empty, validators CAN tweak their + // own app.toml to override, or use this default value. + // + // In Desmos, we set the min gas prices to 0. + srvCfg.MinGasPrices = "0stake" + + customAppConfig := CustomAppConfig{ + Config: *srvCfg, + WASM: WASMConfig{ + LruSize: 1, + QueryGasLimit: 300000, + }, + } + + customAppTemplate := serverconfig.DefaultConfigTemplate + ` +[wasm] +# This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries +query_gas_limit = 300000 +# This is the number of wasm vm instances we keep cached in memory for speed-up +# Warning: this is currently unstable and may lead to crashes, best to keep for 0 unless testing locally +lru_size = 0` + + return customAppTemplate, customAppConfig +} + +func initRootCmd( + rootCmd *cobra.Command, + txConfig client.TxConfig, + basicManager module.BasicManager, +) { + rootCmd.AddCommand( + genutilcli.InitCmd(basicManager, app.DefaultNodeHome), + genesisCommand(txConfig, basicManager), + tmcli.NewCompletionCmd(rootCmd, true), + testnetCmd(app.ModuleBasics, banktypes.GenesisBalancesIterator{}), + debug.Cmd(), + confixcmd.ConfigCommand(), + pruning.Cmd(newApp, app.DefaultNodeHome), + snapshot.Cmd(newApp), + ) + + server.AddCommands(rootCmd, app.DefaultNodeHome, newApp, appExport, addModuleInitFlags) + + // add keybase, auxiliary RPC, query, and tx child commands + rootCmd.AddCommand( + server.StatusCommand(), + queryCommand(), + txCommand(), + sign.GetSignCmd(), + chainlink.GetCreateChainLinkJSON( + chainlinktypes.NewChainLinkReferencePrompt(), + chainlinkprovider.DefaultChainLinkJSONBuilderProvider, + ), + keys.Commands(), + ) +} + +func addModuleInitFlags(startCmd *cobra.Command) { + crisis.AddModuleInitFlags(startCmd) +} + +// genesisCommand builds genesis-related `simd genesis` command. Users may provide application specific commands as a parameter +func genesisCommand(txConfig client.TxConfig, basicManager module.BasicManager, cmds ...*cobra.Command) *cobra.Command { + cmd := genutilcli.Commands(txConfig, basicManager, app.DefaultNodeHome) + + for _, subCmd := range cmds { + cmd.AddCommand(subCmd) + } + return cmd +} + +func queryCommand() *cobra.Command { + cmd := &cobra.Command{ + Use: "query", + Aliases: []string{"q"}, + Short: "Querying subcommands", + DisableFlagParsing: false, + SuggestionsMinimumDistance: 2, + RunE: client.ValidateCmd, + } + + cmd.AddCommand( + rpc.QueryEventForTxCmd(), + server.QueryBlockCmd(), + authcmd.QueryTxsByEventsCmd(), + server.QueryBlocksCmd(), + authcmd.QueryTxCmd(), + server.QueryBlockResultsCmd(), + ) + + return cmd +} + +func txCommand() *cobra.Command { + cmd := &cobra.Command{ + Use: "tx", + Short: "Transactions subcommands", + DisableFlagParsing: false, + SuggestionsMinimumDistance: 2, + RunE: client.ValidateCmd, + } + + cmd.AddCommand( + authcmd.GetSignCommand(), + authcmd.GetSignBatchCommand(), + authcmd.GetMultiSignCommand(), + authcmd.GetMultiSignBatchCmd(), + authcmd.GetValidateSignaturesCommand(), + authcmd.GetBroadcastCommand(), + authcmd.GetEncodeCommand(), + authcmd.GetDecodeCommand(), + authcmd.GetSimulateCmd(), + ) + + return cmd +} + +// newApp creates the application +func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts servertypes.AppOptions) servertypes.Application { + return app.NewDesmosApp( + logger, db, traceStore, true, + appOpts, + server.DefaultBaseappOptions(appOpts)..., + ) +} + +// appExport creates a new app (optionally at a given height) +// and exports state. +func appExport( + logger log.Logger, + db dbm.DB, + traceStore io.Writer, + height int64, + forZeroHeight bool, + jailAllowedAddrs []string, + appOpts servertypes.AppOptions, + modulesToExport []string, +) (servertypes.ExportedApp, error) { + // this check is necessary as we use the flag in x/upgrade. + // we can exit more gracefully by checking the flag here. + homePath, ok := appOpts.Get(flags.FlagHome).(string) + if !ok || homePath == "" { + return servertypes.ExportedApp{}, errors.New("application home is not set") + } + + viperAppOpts, ok := appOpts.(*viper.Viper) + if !ok { + return servertypes.ExportedApp{}, errors.New("appOpts is not viper.Viper") + } + + // overwrite the FlagInvCheckPeriod + viperAppOpts.Set(server.FlagInvCheckPeriod, 1) + appOpts = viperAppOpts + + var desmosApp *app.DesmosApp + if height != -1 { + desmosApp = app.NewDesmosApp(logger, db, traceStore, false, appOpts) + + if err := desmosApp.LoadHeight(height); err != nil { + return servertypes.ExportedApp{}, err + } + } else { + desmosApp = app.NewDesmosApp(logger, db, traceStore, true, appOpts) + } + + return desmosApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) +} + +var tempDir = func() string { + dir, err := os.MkdirTemp("", "desmos") + if err != nil { + dir = app.DefaultNodeHome + } + defer os.RemoveAll(dir) + + return dir +} diff --git a/app/desmos/cmd/root.go b/app/desmos/cmd/root.go index c9da0f37a5..8c08e1cb94 100644 --- a/app/desmos/cmd/root.go +++ b/app/desmos/cmd/root.go @@ -1,56 +1,53 @@ package cmd import ( - "errors" - "io" "os" - simappparams "cosmossdk.io/simapp/params" - serverconfig "github.com/cosmos/cosmos-sdk/server/config" - - "github.com/cosmos/cosmos-sdk/client/config" - "github.com/cosmos/cosmos-sdk/client/pruning" - "github.com/cosmos/cosmos-sdk/client/snapshot" - - "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink" - "github.com/desmos-labs/desmos/v6/app/desmos/cmd/sign" - - "github.com/cosmos/cosmos-sdk/x/crisis" - + "cosmossdk.io/log" + "cosmossdk.io/simapp/params" + dbm "github.com/cosmos/cosmos-db" "github.com/desmos-labs/desmos/v6/app" - - 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" "github.com/spf13/cobra" - "github.com/spf13/viper" "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/debug" - "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/cosmos/cosmos-sdk/client/keys" - "github.com/cosmos/cosmos-sdk/client/rpc" + "github.com/cosmos/cosmos-sdk/client/config" + "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/server" - servertypes "github.com/cosmos/cosmos-sdk/server/types" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" + "github.com/cosmos/cosmos-sdk/types/module" + "github.com/cosmos/cosmos-sdk/types/tx/signing" + "github.com/cosmos/cosmos-sdk/x/auth/tx" + txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - - chainlinktypes "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink/getter" - chainlinkprovider "github.com/desmos-labs/desmos/v6/app/desmos/cmd/chainlink/provider" + "github.com/cosmos/cosmos-sdk/x/genutil" + genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types" + "github.com/cosmos/cosmos-sdk/x/gov" + govclient "github.com/cosmos/cosmos-sdk/x/gov/client" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + paramsclient "github.com/cosmos/cosmos-sdk/x/params/client" ) -// NewRootCmd creates a new root command for desmos. It is called once in the +// NewRootCmd creates a new root command for simd. It is called once in the // main function. -func NewRootCmd() (*cobra.Command, simappparams.EncodingConfig) { - encodingConfig := app.MakeEncodingConfig() +func NewRootCmd() *cobra.Command { + // Read in the configuration file for the sdk + cfg := sdk.GetConfig() + app.SetupConfig(cfg) + cfg.Seal() + + // we "pre"-instantiate the application for getting the injected/configured encoding configuration + tempApp := app.NewDesmosApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, simtestutil.NewAppOptionsWithFlagHome(tempDir())) + encodingConfig := params.EncodingConfig{ + InterfaceRegistry: tempApp.InterfaceRegistry(), + Codec: tempApp.AppCodec(), + TxConfig: tempApp.TxConfig(), + Amino: tempApp.LegacyAmino(), + } + initClientCtx := client.Context{}. WithCodec(encodingConfig.Codec). WithInterfaceRegistry(encodingConfig.InterfaceRegistry). - WithTxConfig(encodingConfig.TxConfig). WithLegacyAmino(encodingConfig.Amino). WithInput(os.Stdin). WithAccountRetriever(authtypes.AccountRetriever{}). @@ -58,13 +55,15 @@ func NewRootCmd() (*cobra.Command, simappparams.EncodingConfig) { WithViper("DESMOS") rootCmd := &cobra.Command{ - Use: "desmos", - Short: "Desmos application", + Use: "desmos", + Short: "Desmos application", + SilenceErrors: true, PersistentPreRunE: func(cmd *cobra.Command, _ []string) error { // set the default command outputs cmd.SetOut(cmd.OutOrStdout()) cmd.SetErr(cmd.ErrOrStderr()) + initClientCtx = initClientCtx.WithCmdContext(cmd.Context()) initClientCtx, err := client.ReadPersistentCommandFlags(initClientCtx, cmd.Flags()) if err != nil { return err @@ -75,233 +74,56 @@ func NewRootCmd() (*cobra.Command, simappparams.EncodingConfig) { return err } + // This needs to go after ReadFromClientConfig, as that function + // sets the RPC client needed for SIGN_MODE_TEXTUAL. This sign mode + // is only available if the client is online. + if !initClientCtx.Offline { + enabledSignModes := tx.DefaultSignModes + enabledSignModes = append(enabledSignModes, signing.SignMode_SIGN_MODE_TEXTUAL) + txConfigOpts := tx.ConfigOptions{ + EnabledSignModes: enabledSignModes, + TextualCoinMetadataQueryFn: txmodule.NewGRPCCoinMetadataQueryFn(initClientCtx), + } + txConfig, err := tx.NewTxConfigWithOptions( + initClientCtx.Codec, + txConfigOpts, + ) + if err != nil { + return err + } + + initClientCtx = initClientCtx.WithTxConfig(txConfig) + } + if err := client.SetCmdClientContextHandler(initClientCtx, cmd); err != nil { return err } customAppTemplate, customAppConfig := initAppConfig() - customTMConfig := initTendermintConfig() - - return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customTMConfig) - }, - } - - initRootCmd(rootCmd, encodingConfig) - - return rootCmd, encodingConfig -} - -// initTendermintConfig helps to override default Tendermint Config values. -// return tmcfg.DefaultConfig if no custom configuration is required for the application. -func initTendermintConfig() *tmcfg.Config { - cfg := tmcfg.DefaultConfig() - - // these values put a higher strain on node memory - // cfg.P2P.MaxNumInboundPeers = 100 - // cfg.P2P.MaxNumOutboundPeers = 40 - - return cfg -} + customCMTConfig := initCometBFTConfig() -// initAppConfig helps to override default appConfig template and configs. -// return "", nil if no custom configuration is required for the application. -func initAppConfig() (string, interface{}) { - // The following code snippet is just for reference. - - // WASMConfig defines configuration for the wasm module. - type WASMConfig struct { - // This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries - QueryGasLimit uint64 `mapstructure:"query_gas_limit"` - - // Address defines the gRPC-web server to listen on - LruSize uint64 `mapstructure:"lru_size"` - } - - type CustomAppConfig struct { - serverconfig.Config - - WASM WASMConfig `mapstructure:"wasm"` - } - - // Optionally allow the chain developer to overwrite the SDK's default - // server config. - srvCfg := serverconfig.DefaultConfig() - // The SDK's default minimum gas price is set to "" (empty value) inside - // app.toml. If left empty by validators, the node will halt on startup. - // However, the chain developer can set a default app.toml value for their - // validators here. - // - // In summary: - // - if you leave srvCfg.MinGasPrices = "", all validators MUST tweak their - // own app.toml config, - // - if you set srvCfg.MinGasPrices non-empty, validators CAN tweak their - // own app.toml to override, or use this default value. - // - // In Desmos, we set the min gas prices to 0. - srvCfg.MinGasPrices = "0stake" - - customAppConfig := CustomAppConfig{ - Config: *srvCfg, - WASM: WASMConfig{ - LruSize: 1, - QueryGasLimit: 300000, + return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customCMTConfig) }, } - customAppTemplate := serverconfig.DefaultConfigTemplate + ` -[wasm] -# This is the maximum sdk gas (wasm and storage) that we allow for any x/wasm "smart" queries -query_gas_limit = 300000 -# This is the number of wasm vm instances we keep cached in memory for speed-up -# Warning: this is currently unstable and may lead to crashes, best to keep for 0 unless testing locally -lru_size = 0` - - return customAppTemplate, customAppConfig -} - -func initRootCmd(rootCmd *cobra.Command, encodingConfig simappparams.EncodingConfig) { - // Read in the configuration file for the sdk - cfg := sdk.GetConfig() - app.SetupConfig(cfg) - cfg.Seal() - - rootCmd.AddCommand( - genutilcli.InitCmd(app.ModuleBasics, app.DefaultNodeHome), - genesisCommand(encodingConfig), - tmcli.NewCompletionCmd(rootCmd, true), - testnetCmd(app.ModuleBasics, banktypes.GenesisBalancesIterator{}), - debug.Cmd(), - config.Cmd(), - pruning.Cmd(newApp, app.DefaultNodeHome), - snapshot.Cmd(newApp), - ) - - server.AddCommands(rootCmd, app.DefaultNodeHome, newApp, createDesmosappAndExport, addModuleInitFlags) - - // add keybase, auxiliary RPC, query, and tx child commands - rootCmd.AddCommand( - rpc.StatusCommand(), - queryCommand(), - txCommand(), - sign.GetSignCmd(), - chainlink.GetCreateChainLinkJSON( - chainlinktypes.NewChainLinkReferencePrompt(), - chainlinkprovider.DefaultChainLinkJSONBuilderProvider, + initRootCmd(rootCmd, encodingConfig.TxConfig, module.NewBasicManagerFromManager(tempApp.ModuleManager, map[string]module.AppModuleBasic{ + genutiltypes.ModuleName: genutil.NewAppModuleBasic(genutiltypes.DefaultMessageValidator), + govtypes.ModuleName: gov.NewAppModuleBasic( + []govclient.ProposalHandler{ + paramsclient.ProposalHandler, + }, ), - keys.Commands(app.DefaultNodeHome), - ) -} - -func addModuleInitFlags(startCmd *cobra.Command) { - crisis.AddModuleInitFlags(startCmd) -} - -// genesisCommand builds genesis-related `simd genesis` command. Users may provide application specific commands as a parameter -func genesisCommand(encodingConfig simappparams.EncodingConfig, cmds ...*cobra.Command) *cobra.Command { - cmd := genutilcli.GenesisCoreCommand(encodingConfig.TxConfig, app.ModuleBasics, app.DefaultNodeHome) - - for _, sub_cmd := range cmds { - cmd.AddCommand(sub_cmd) - } - return cmd -} - -func queryCommand() *cobra.Command { - cmd := &cobra.Command{ - Use: "query", - Aliases: []string{"q"}, - Short: "Querying subcommands", - DisableFlagParsing: true, - SuggestionsMinimumDistance: 2, - RunE: client.ValidateCmd, - } - - cmd.AddCommand( - authcmd.GetAccountCmd(), - rpc.ValidatorCommand(), - rpc.BlockCommand(), - authcmd.QueryTxsByEventsCmd(), - authcmd.QueryTxCmd(), - ) - - app.ModuleBasics.AddQueryCommands(cmd) - cmd.PersistentFlags().String(flags.FlagChainID, "", "The network chain ID") - - return cmd -} - -func txCommand() *cobra.Command { - cmd := &cobra.Command{ - Use: "tx", - Short: "Transactions subcommands", - DisableFlagParsing: true, - SuggestionsMinimumDistance: 2, - RunE: client.ValidateCmd, - } - - cmd.AddCommand( - authcmd.GetSignCommand(), - authcmd.GetSignBatchCommand(), - authcmd.GetMultiSignCommand(), - authcmd.GetValidateSignaturesCommand(), - flags.LineBreak, - authcmd.GetBroadcastCommand(), - authcmd.GetEncodeCommand(), - authcmd.GetDecodeCommand(), - flags.LineBreak, - ) - - app.ModuleBasics.AddTxCommands(cmd) - cmd.PersistentFlags().String(flags.FlagChainID, "", "The network chain ID") - - return cmd -} - -func newApp(logger log.Logger, db dbm.DB, traceStore io.Writer, appOpts servertypes.AppOptions) servertypes.Application { - return app.NewDesmosApp( - logger, db, traceStore, true, - appOpts, - server.DefaultBaseappOptions(appOpts)..., - ) -} - -// createDesmosappAndExport creates a new app (optionally at a given height) -// and exports state. -func createDesmosappAndExport( - logger log.Logger, - db dbm.DB, - traceStore io.Writer, - height int64, - forZeroHeight bool, - jailAllowedAddrs []string, - appOpts servertypes.AppOptions, - modulesToExport []string, -) (servertypes.ExportedApp, error) { - var desmosApp *app.DesmosApp - homePath, ok := appOpts.Get(flags.FlagHome).(string) - if !ok || homePath == "" { - return servertypes.ExportedApp{}, errors.New("application home is not set") - } - - viperAppOpts, ok := appOpts.(*viper.Viper) - if !ok { - return servertypes.ExportedApp{}, errors.New("appOpts is not viper.Viper") - } - - // overwrite the FlagInvCheckPeriod - viperAppOpts.Set(server.FlagInvCheckPeriod, 1) - appOpts = viperAppOpts + })) - desmosApp = app.NewDesmosApp( - logger, db, traceStore, height == -1, - appOpts, - ) + // add keyring to autocli opts + autoCliOpts := tempApp.AutoCliOpts() + initClientCtx, _ = config.ReadFromClientConfig(initClientCtx) + autoCliOpts.Keyring, _ = keyring.NewAutoCLIKeyring(initClientCtx.Keyring) + autoCliOpts.ClientCtx = initClientCtx - if height != -1 { - if err := desmosApp.LoadHeight(height); err != nil { - return servertypes.ExportedApp{}, err - } + if err := autoCliOpts.EnhanceRootCommand(rootCmd); err != nil { + panic(err) } - return desmosApp.ExportAppStateAndValidators(forZeroHeight, jailAllowedAddrs, modulesToExport) + return rootCmd } diff --git a/app/desmos/cmd/sign/sign.go b/app/desmos/cmd/sign/sign.go index f9e6fe26a6..9b6df97b98 100644 --- a/app/desmos/cmd/sign/sign.go +++ b/app/desmos/cmd/sign/sign.go @@ -107,7 +107,7 @@ The printed JSON object can be safely used as the verification proof when connec // signRaw signs the given value directly by converting it into raw bytes func signRaw(txFactory tx.Factory, key *keyring.Record, value string) (valueBz []byte, sigBz []byte, err error) { valueBz = []byte(value) - sigBz, _, err = txFactory.Keybase().Sign(key.Name, valueBz) + sigBz, _, err = txFactory.Keybase().Sign(key.Name, valueBz, signing.SignMode_SIGN_MODE_TEXTUAL) return valueBz, sigBz, err } @@ -126,7 +126,7 @@ func signAmino(clientCtx client.Context, txFactory tx.Factory, key *keyring.Reco } // Sign the data with the private key - err = tx.Sign(txFactory, key.Name, txBuilder, true) + err = tx.Sign(clientCtx.CmdContext, txFactory, key.Name, txBuilder, true) if err != nil { return } @@ -144,7 +144,7 @@ func signAmino(clientCtx client.Context, txFactory tx.Factory, key *keyring.Reco Sequence: txFactory.Sequence(), Address: address.String(), } - valueBz, err = clientCtx.TxConfig.SignModeHandler().GetSignBytes(signMode, signerData, txBuilder.GetTx()) + valueBz, err = authsigning.GetSignBytesAdapter(clientCtx.CmdContext, clientCtx.TxConfig.SignModeHandler(), signMode, signerData, txBuilder.GetTx()) if err != nil { return } diff --git a/app/desmos/cmd/testnet.go b/app/desmos/cmd/testnet.go index dada6fcf53..e7245ac6ba 100644 --- a/app/desmos/cmd/testnet.go +++ b/app/desmos/cmd/testnet.go @@ -10,6 +10,8 @@ import ( "os" "path/filepath" + "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/testutil" tmconfig "github.com/cometbft/cometbft/config" @@ -80,7 +82,7 @@ Example: return InitTestnet( clientCtx, cmd, config, mbm, genBalIterator, outputDir, chainID, minGasPrices, - nodeDirPrefix, nodeDaemonHome, startingIPAddress, gentxCoinDenom, keyringBackend, algo, numValidators, + nodeDirPrefix, nodeDaemonHome, startingIPAddress, gentxCoinDenom, keyringBackend, algo, numValidators, clientCtx.TxConfig.SigningContext().ValidatorAddressCodec(), ) }, } @@ -88,7 +90,7 @@ Example: cmd.Flags().Int(flagNumValidators, 4, "Number of validators to initialize the testnet with") cmd.Flags().StringP(flagOutputDir, "o", "./mytestnet", "Directory to store initialization data for the testnet") cmd.Flags().String(flagNodeDirPrefix, "node", "Prefix the directory name for each node with (node results in node0, node1, ...)") - cmd.Flags().String(flagNodeDaemonHome, "desmos", "Home directory of the node's daemon configuration") + cmd.Flags().String(flagNodeDaemonHome, ".desmos", "Home directory of the node's daemon configuration") cmd.Flags().String(flagStartingIPAddress, "192.168.0.1", "Starting IP address (192.168.0.1 results in persistent peers list ID0@192.168.0.1:46656, ID1@192.168.0.2:46656, ...)") cmd.Flags().String(flagGenTxCoinDenom, sdk.DefaultBondDenom, "Denomination of the coin to be used when generating genesis transactions") cmd.Flags().String(flags.FlagChainID, "", "genesis file chain-id, if left blank will be randomly created") @@ -118,6 +120,7 @@ func InitTestnet( keyringBackend, algoStr string, numValidators int, + valAddrCodec runtime.ValidatorAddressCodec, ) error { if chainID == "" { @@ -212,14 +215,18 @@ func InitTestnet( genBalances = append(genBalances, banktypes.Balance{Address: addr.String(), Coins: coins.Sort()}) genAccounts = append(genAccounts, authtypes.NewBaseAccount(addr, nil, 0, 0)) + valStr, err := valAddrCodec.BytesToString(sdk.ValAddress(addr)) + if err != nil { + return err + } valTokens := sdk.TokensFromConsensusPower(100, sdk.DefaultPowerReduction) createValMsg, err := stakingtypes.NewMsgCreateValidator( - sdk.ValAddress(addr), + valStr, valPubKeys[i], sdk.NewCoin(gentxCoinDenom, valTokens), stakingtypes.NewDescription(nodeDirName, "", "", "", ""), - stakingtypes.NewCommissionRates(sdk.OneDec(), sdk.OneDec(), sdk.OneDec()), - sdk.OneInt(), + stakingtypes.NewCommissionRates(math.LegacyOneDec(), math.LegacyOneDec(), math.LegacyOneDec()), + math.OneInt(), ) if err != nil { return err @@ -239,7 +246,7 @@ func InitTestnet( WithKeybase(kb). WithTxConfig(clientCtx.TxConfig) - if err := tx.Sign(txFactory, nodeDirName, txBuilder, true); err != nil { + if err := tx.Sign(cmd.Context(), txFactory, nodeDirName, txBuilder, true); err != nil { return err } @@ -261,7 +268,7 @@ func InitTestnet( err := collectGenFiles( clientCtx, nodeConfig, chainID, nodeIDs, valPubKeys, numValidators, - outputDir, nodeDirPrefix, nodeDaemonHome, genBalIterator, + outputDir, nodeDirPrefix, nodeDaemonHome, genBalIterator, valAddrCodec, ) if err != nil { return err @@ -325,6 +332,7 @@ func collectGenFiles( clientCtx client.Context, nodeConfig *tmconfig.Config, chainID string, nodeIDs []string, valPubKeys []cryptotypes.PubKey, numValidators int, outputDir, nodeDirPrefix, nodeDaemonHome string, genBalIterator banktypes.GenesisBalancesIterator, + valAddrCodec runtime.ValidatorAddressCodec, ) error { var appState json.RawMessage @@ -341,12 +349,12 @@ func collectGenFiles( nodeID, valPubKey := nodeIDs[i], valPubKeys[i] initCfg := genutiltypes.NewInitConfig(chainID, gentxsDir, nodeID, valPubKey) - genDoc, err := types.GenesisDocFromFile(nodeConfig.GenesisFile()) + appGenesis, err := genutiltypes.AppGenesisFromFile(nodeConfig.GenesisFile()) if err != nil { return err } - nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.Codec, clientCtx.TxConfig, nodeConfig, initCfg, *genDoc, genBalIterator, genutiltypes.DefaultMessageValidator) + nodeAppState, err := genutil.GenAppStateFromConfig(clientCtx.Codec, clientCtx.TxConfig, nodeConfig, initCfg, appGenesis, genBalIterator, genutiltypes.DefaultMessageValidator, valAddrCodec) if err != nil { return err } diff --git a/app/desmos/main.go b/app/desmos/main.go index 005e03a945..9874fa9eac 100644 --- a/app/desmos/main.go +++ b/app/desmos/main.go @@ -1,10 +1,9 @@ package main import ( + "fmt" "os" - "github.com/cosmos/cosmos-sdk/server" - "github.com/desmos-labs/desmos/v6/app" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" @@ -13,14 +12,9 @@ import ( ) func main() { - rootCmd, _ := cmd.NewRootCmd() + rootCmd := cmd.NewRootCmd() if err := svrcmd.Execute(rootCmd, "", app.DefaultNodeHome); err != nil { - switch e := err.(type) { - case server.ErrorCode: - os.Exit(e.Code) - - default: - os.Exit(1) - } + fmt.Fprintln(rootCmd.OutOrStderr(), err) + os.Exit(1) } } diff --git a/app/export.go b/app/export.go index 9c08e730f0..5f56e4dc4f 100644 --- a/app/export.go +++ b/app/export.go @@ -6,9 +6,10 @@ import ( "encoding/json" "log" + storetypes "cosmossdk.io/store/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" servertypes "github.com/cosmos/cosmos-sdk/server/types" - distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -23,7 +24,7 @@ func (app *DesmosApp) ExportAppStateAndValidators( ) (servertypes.ExportedApp, error) { // as if they could withdraw from the start of the next block - ctx := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) + ctx := app.NewContextLegacy(true, tmproto.Header{Height: app.LastBlockHeight()}) // We export at last height + 1, because that's the height at which // Tendermint will start InitChain. @@ -33,7 +34,11 @@ func (app *DesmosApp) ExportAppStateAndValidators( app.prepForZeroHeightGenesis(ctx, jailAllowedAddrs) } - genState := app.ModuleManager.ExportGenesisForModules(ctx, app.appCodec, modulesToExport) + genState, err := app.ModuleManager.ExportGenesisForModules(ctx, app.appCodec, modulesToExport) + if err != nil { + return servertypes.ExportedApp{}, err + } + appState, err := json.MarshalIndent(genState, "", " ") if err != nil { return servertypes.ExportedApp{}, err @@ -81,18 +86,20 @@ func (app *DesmosApp) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList [] // withdraw all validator commission app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { - _, err := app.DistrKeeper.WithdrawValidatorCommission(ctx, val.GetOperator()) - // we don't care if the error is telling us there are no commissions, as currently we have no inflation - // TODO: remove this once we add inflation (if ever) - if err != nil && err != distrtypes.ErrNoValidatorCommission { - log.Fatal(err) + valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator()) + if err != nil { + panic(err) } - + _, _ = app.DistrKeeper.WithdrawValidatorCommission(ctx, valBz) return false }) // withdraw all delegator rewards - dels := app.StakingKeeper.GetAllDelegations(ctx) + dels, err := app.StakingKeeper.GetAllDelegations(ctx) + if err != nil { + panic(err) + } + for _, delegation := range dels { valAddr, err := sdk.ValAddressFromBech32(delegation.ValidatorAddress) if err != nil { @@ -118,14 +125,27 @@ func (app *DesmosApp) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList [] // reinitialize all validators app.StakingKeeper.IterateValidators(ctx, func(_ int64, val stakingtypes.ValidatorI) (stop bool) { - + valBz, err := app.StakingKeeper.ValidatorAddressCodec().StringToBytes(val.GetOperator()) + if err != nil { + panic(err) + } // donate any unwithdrawn outstanding reward fraction tokens to the community pool - scraps := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, val.GetOperator()) - feePool := app.DistrKeeper.GetFeePool(ctx) + scraps, err := app.DistrKeeper.GetValidatorOutstandingRewardsCoins(ctx, valBz) + if err != nil { + panic(err) + } + feePool, err := app.DistrKeeper.FeePool.Get(ctx) + if err != nil { + panic(err) + } feePool.CommunityPool = feePool.CommunityPool.Add(scraps...) - app.DistrKeeper.SetFeePool(ctx, feePool) + if err := app.DistrKeeper.FeePool.Set(ctx, feePool); err != nil { + panic(err) + } - app.DistrKeeper.Hooks().AfterValidatorCreated(ctx, val.GetOperator()) + if err := app.DistrKeeper.Hooks().AfterValidatorCreated(ctx, valBz); err != nil { + panic(err) + } return false }) @@ -169,13 +189,13 @@ func (app *DesmosApp) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList [] // Iterate through validators by power descending, reset bond heights, and // update bond intra-tx counters. store := ctx.KVStore(app.GetKey(stakingtypes.StoreKey)) - iter := sdk.KVStoreReversePrefixIterator(store, stakingtypes.ValidatorsKey) + iter := storetypes.KVStoreReversePrefixIterator(store, stakingtypes.ValidatorsKey) counter := int16(0) for ; iter.Valid(); iter.Next() { addr := sdk.ValAddress(stakingtypes.AddressFromValidatorsKey(iter.Key())) - validator, found := app.StakingKeeper.GetValidator(ctx, addr) - if !found { + validator, err := app.StakingKeeper.GetValidator(ctx, addr) + if err != nil { panic("expected validator, not found") } @@ -190,7 +210,7 @@ func (app *DesmosApp) prepForZeroHeightGenesis(ctx sdk.Context, jailWhiteList [] iter.Close() - _, err := app.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) + _, err = app.StakingKeeper.ApplyAndReturnValidatorSetUpdates(ctx) if err != nil { panic(err) } diff --git a/app/params/encoding.go b/app/params/encoding.go index f3929c4cab..3b6bd9adea 100644 --- a/app/params/encoding.go +++ b/app/params/encoding.go @@ -2,15 +2,28 @@ package params import ( simappparams "cosmossdk.io/simapp/params" + "cosmossdk.io/x/tx/signing" "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/codec/address" "github.com/cosmos/cosmos-sdk/codec/types" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/tx" + "github.com/cosmos/gogoproto/proto" ) // MakeEncodingConfig creates an EncodingConfig for an amino based test configuration. func MakeEncodingConfig() simappparams.EncodingConfig { amino := codec.NewLegacyAmino() - interfaceRegistry := types.NewInterfaceRegistry() + interfaceRegistry, err := types.NewInterfaceRegistryWithOptions(types.InterfaceRegistryOptions{ + ProtoFiles: proto.HybridResolver, + SigningOptions: signing.Options{ + AddressCodec: address.NewBech32Codec(sdk.Bech32MainPrefix), + ValidatorAddressCodec: address.NewBech32Codec(sdk.Bech32MainPrefix + sdk.PrefixValidator + sdk.PrefixOperator), + }, + }) + if err != nil { + panic(err) + } marshaler := codec.NewProtoCodec(interfaceRegistry) txCfg := tx.NewTxConfig(marshaler, tx.DefaultSignModes) diff --git a/app/sim_test.go b/app/sim_test.go index b9812d26d0..8cee833d06 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -10,9 +10,9 @@ import ( "strings" "testing" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server" - storetypes "github.com/cosmos/cosmos-sdk/store/types" reactionstypes "github.com/desmos-labs/desmos/v6/x/reactions/types" @@ -25,9 +25,9 @@ import ( authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + evidencetypes "cosmossdk.io/x/evidence/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - evidencetypes "github.com/cosmos/cosmos-sdk/x/evidence/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" @@ -41,19 +41,18 @@ import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - dbm "github.com/cometbft/cometbft-db" + "cosmossdk.io/log" abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" + dbm "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/require" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" - ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + ibctransfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" + ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" + "cosmossdk.io/store" "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/cosmos/cosmos-sdk/store" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/simulation" simcli "github.com/cosmos/cosmos-sdk/x/simulation/client/cli" ) @@ -223,8 +222,8 @@ func TestAppImportExport(t *testing.T) { } }() - ctxA := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) - ctxB := newApp.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) + ctxA := app.NewContextLegacy(true, tmproto.Header{Height: app.LastBlockHeight()}) + ctxB := newApp.NewContextLegacy(true, tmproto.Header{Height: app.LastBlockHeight()}) newApp.ModuleManager.InitGenesis(ctxB, app.AppCodec(), genesisState) newApp.StoreConsensusParams(ctxB, exported.ConsensusParams) @@ -267,7 +266,7 @@ func TestAppImportExport(t *testing.T) { storeA := ctxA.KVStore(skp.A) storeB := ctxB.KVStore(skp.B) - failedKVAs, failedKVBs := sdk.DiffKVStores(storeA, storeB, skp.Prefixes) + failedKVAs, failedKVBs := simtestutil.DiffKVStores(storeA, storeB, skp.Prefixes) require.Equal(t, len(failedKVAs), len(failedKVBs), "unequal sets of key-values to compare") fmt.Printf("compared %d different key/value pairs between %s and %s\n", len(failedKVAs), skp.A, skp.B) @@ -346,7 +345,7 @@ func TestAppSimulationAfterImport(t *testing.T) { ) require.Equal(t, appName, newApp.Name()) - newApp.InitChain(abci.RequestInitChain{ + newApp.InitChain(&abci.RequestInitChain{ ChainId: SimAppChainID, AppStateBytes: exported.AppState, }) @@ -380,8 +379,12 @@ func TestAppStateDeterminism(t *testing.T) { config.ChainID = SimAppChainID numSeeds := 3 - numTimesToRunPerSeed := 5 + numTimesToRunPerSeed := 3 // This used to be set to 5, but we've temporarily reduced it to 3 for the sake of faster CI. appHashList := make([]json.RawMessage, numTimesToRunPerSeed) + // We will be overriding the random seed and just run a single simulation on the provided seed value + if config.Seed != simcli.DefaultSeedValue { + numSeeds = 1 + } appOptions := make(simtestutil.AppOptionsMap, 0) appOptions[flags.FlagHome] = t.TempDir() @@ -393,7 +396,7 @@ func TestAppStateDeterminism(t *testing.T) { for j := 0; j < numTimesToRunPerSeed; j++ { var logger log.Logger if simcli.FlagVerboseValue { - logger = log.TestingLogger() + logger = log.NewTestLogger(t) } else { logger = log.NewNopLogger() } diff --git a/app/upgrades.go b/app/upgrades.go index 2380db3cd7..d1d21ed76c 100644 --- a/app/upgrades.go +++ b/app/upgrades.go @@ -1,14 +1,10 @@ package app import ( - v620 "github.com/desmos-labs/desmos/v6/app/upgrades/v620" - v630 "github.com/desmos-labs/desmos/v6/app/upgrades/v630" - v640 "github.com/desmos-labs/desmos/v6/app/upgrades/v640" + v7 "github.com/desmos-labs/desmos/v6/app/upgrades/v7" ) // registerUpgradeHandlers registers all the upgrade handlers that are supported by the app func (app *DesmosApp) registerUpgradeHandlers() { - app.registerUpgrade(v620.NewUpgrade(app.ModuleManager, app.Configurator())) - app.registerUpgrade(v630.NewUpgrade(app.ModuleManager, app.Configurator())) - app.registerUpgrade(v640.NewUpgrade(app.ModuleManager, app.Configurator())) + app.registerUpgrade(v7.NewUpgrade(app.ModuleManager, app.Configurator())) } diff --git a/app/upgrades/upgrade.go b/app/upgrades/upgrade.go index 0e2df775f8..c8cee32837 100644 --- a/app/upgrades/upgrade.go +++ b/app/upgrades/upgrade.go @@ -1,8 +1,8 @@ package upgrades import ( - storetypes "github.com/cosmos/cosmos-sdk/store/types" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + storetypes "cosmossdk.io/store/types" + upgradetypes "cosmossdk.io/x/upgrade/types" ) // Upgrade represents a generic on-chain upgrade diff --git a/app/upgrades/v630/upgrade.go b/app/upgrades/v630/upgrade.go deleted file mode 100644 index 7474c2abfb..0000000000 --- a/app/upgrades/v630/upgrade.go +++ /dev/null @@ -1,46 +0,0 @@ -package v630 - -import ( - storetypes "github.com/cosmos/cosmos-sdk/store/types" - 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/desmos-labs/desmos/v6/app/upgrades" -) - -var ( - _ upgrades.Upgrade = &Upgrade{} -) - -// Upgrade represents the v6.3.0 upgrade -type Upgrade struct { - mm *module.Manager - configurator module.Configurator -} - -// NewUpgrade returns a new Upgrade instance -func NewUpgrade(mm *module.Manager, configurator module.Configurator) *Upgrade { - return &Upgrade{ - mm: mm, - configurator: configurator, - } -} - -// Name implements upgrades.Upgrade -func (u *Upgrade) Name() string { - return "v6.3.0" -} - -// Handler implements upgrades.Upgrade -func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { - return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - // This upgrade does not require any migration, so we can simply return the current version map - return u.mm.RunMigrations(ctx, u.configurator, fromVM) - } -} - -// StoreUpgrades implements upgrades.Upgrade -func (u *Upgrade) StoreUpgrades() *storetypes.StoreUpgrades { - return &storetypes.StoreUpgrades{} -} diff --git a/app/upgrades/v640/upgrade.go b/app/upgrades/v640/upgrade.go deleted file mode 100644 index 238617cd65..0000000000 --- a/app/upgrades/v640/upgrade.go +++ /dev/null @@ -1,46 +0,0 @@ -package v640 - -import ( - storetypes "github.com/cosmos/cosmos-sdk/store/types" - 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/desmos-labs/desmos/v6/app/upgrades" -) - -var ( - _ upgrades.Upgrade = &Upgrade{} -) - -// Upgrade represents the v6.4.0 upgrade -type Upgrade struct { - mm *module.Manager - configurator module.Configurator -} - -// NewUpgrade returns a new Upgrade instance -func NewUpgrade(mm *module.Manager, configurator module.Configurator) *Upgrade { - return &Upgrade{ - mm: mm, - configurator: configurator, - } -} - -// Name implements upgrades.Upgrade -func (u *Upgrade) Name() string { - return "v6.4.0" -} - -// Handler implements upgrades.Upgrade -func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { - return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - // This upgrade does not require any migration, so we can simply return the current version map - return u.mm.RunMigrations(ctx, u.configurator, fromVM) - } -} - -// StoreUpgrades implements upgrades.Upgrade -func (u *Upgrade) StoreUpgrades() *storetypes.StoreUpgrades { - return &storetypes.StoreUpgrades{} -} diff --git a/app/upgrades/v620/upgrade.go b/app/upgrades/v7/upgrade.go similarity index 62% rename from app/upgrades/v620/upgrade.go rename to app/upgrades/v7/upgrade.go index 2d25226215..9ab8768b13 100644 --- a/app/upgrades/v620/upgrade.go +++ b/app/upgrades/v7/upgrade.go @@ -1,10 +1,11 @@ -package v620 +package upgrades import ( - storetypes "github.com/cosmos/cosmos-sdk/store/types" - sdk "github.com/cosmos/cosmos-sdk/types" + "context" + + storetypes "cosmossdk.io/store/types" + upgradetypes "cosmossdk.io/x/upgrade/types" "github.com/cosmos/cosmos-sdk/types/module" - upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" "github.com/desmos-labs/desmos/v6/app/upgrades" ) @@ -13,7 +14,7 @@ var ( _ upgrades.Upgrade = &Upgrade{} ) -// Upgrade represents the v6.2.0 upgrade +// Upgrade represents the v6 upgrade type Upgrade struct { mm *module.Manager configurator module.Configurator @@ -29,18 +30,20 @@ func NewUpgrade(mm *module.Manager, configurator module.Configurator) *Upgrade { // Name implements upgrades.Upgrade func (u *Upgrade) Name() string { - return "v6.2.0" + return "v7" } // Handler implements upgrades.Upgrade func (u *Upgrade) Handler() upgradetypes.UpgradeHandler { - return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { - // This upgrade does not require any migration, so we can simply return the current version map + return func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + // After properly setting all the validator commissions, we can proceed with the normal migration return u.mm.RunMigrations(ctx, u.configurator, fromVM) } } // StoreUpgrades implements upgrades.Upgrade func (u *Upgrade) StoreUpgrades() *storetypes.StoreUpgrades { - return &storetypes.StoreUpgrades{} + return &storetypes.StoreUpgrades{ + Added: []string{}, + } } diff --git a/app/utils.go b/app/utils.go index f7c0c762bd..c362572200 100644 --- a/app/utils.go +++ b/app/utils.go @@ -5,13 +5,13 @@ package app import ( "fmt" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" + simtypes "github.com/cosmos/cosmos-sdk/types/simulation" ) // GetSimulationLog unmarshals the KVPair's Value to the corresponding type based on the // each's module store key and the prefix bytes of the KVPair's key. -func GetSimulationLog(storeName string, sdr sdk.StoreDecoderRegistry, kvAs, kvBs []kv.Pair) (log string) { +func GetSimulationLog(storeName string, sdr simtypes.StoreDecoderRegistry, kvAs, kvBs []kv.Pair) (log string) { for i := 0; i < len(kvAs); i++ { if len(kvAs[i].Value) == 0 && len(kvBs[i].Value) == 0 { // skip if the value doesn't have any bytes diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go index bb4f0dd6ba..2640881ae7 100644 --- a/client/docs/statik/statik.go +++ b/client/docs/statik/statik.go @@ -8,6 +8,6 @@ import ( ) func init() { - data := "PK\x03\x04\x14\x00\x08\x00\x08\x00\x00\x00!(\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0c\x00 \x00swagger.yamlUT\x05\x00\x01\x80Cm8\xec\xfd]w\xdc8\xb2\xe7\x0b\xdf\xfbS\xc4S\x17S\xae\x19[\xae\xee\xea\xf5\\\xf8\x9c=\xeb\xb8mU\xb7f\xdc\xb6\xb6,\xf7\xac>\xb3\xf6RS\x99\xc8\x14\xc7\x99d6\x89\xb4\xad]\xbb\xbf\xfbYx#A&^\x02H\xa4\xa5]\x15qS.%\x19\x04\x82 \x08\xe2\xffC\xa0\xffR\xad\xd7\xac{ \xdf\xff\xfe\xec\xc7\xef\x9f\xd4\xcd\xaa}\xf9\x04\x80\xd7|\xc3^\xc2\x1b\xd6o\xdb\x1e\x9e\xc3\xd5\xf9\x87k\xa8\x9a%\xac\xaf._\xc3\x9f*\xce\xbeT\xf7\xb0l\x17\xfd\x13\x80%\xeb\x17]\xbd\xe3u\xdb\xbc\x84W\xea\xd8\xba\xe1\xac[U\x0b\x06\xab\xb6\x83\x9eW\x9c\xc1?\xf6\xac\xab\x998\xe33\xebzy\xf4Og?\x9e\xfd\xf8dW\xf1\xbb^\\\xf6\xc5R^\xf0\xc5\xaekW\xf5\x86\xf5/>\xff\xf4\xa2\xda\xed\x9eo\xea\xe6\x93<\x00`\xcd\xb8\xfa\x07@\xbf\xdfn\xab\xee\xfe%\xfc\xf7\xe7\xfa/\x00\xafv\xbbM\xbd\xa8DY\xde\x8a\x93\xccE\x81\xdf1\xa8\xc6\x1f{\x90>\xa1\xea\xfbvQW\x9c-\x81\xb7\xf2\xa0u\xfd\x995O\x06\x87\xfb\x9eu\xcf\xa0^\xc1\xaek?\xd7K\xb6<\x83\xf7\xfc\x8eu_\xea\x9e=\x83\x9a\x0f\x17\xa86\x9b\xf9E\xd45\x06W=o;\xb6<\xd3\xff\xdf\xeeX'\x8f\xbaX\xbe<(\xb6>\xa6c\xfd\xaemz\xd6\xbf\x1c\x9c|\xff\xfb\x1f\x7f\xfc~\xfc\xdf\x83\xe8\xf7\xfb\xc5\x82\xf5\xfdj\xbf\x19\xce>\xb3\x8e\xee\x17wl[\xd9\xe7\x03\xf0\xfb\x1d{ \xed\xed\xffa\x0b>\xf9a\xd7\x89B\xf2\xda\xbe\xbe2\xeb\x86\xd8\xa6\x83\xeb/5\xe7\xe2 \xfaS\xcd\xff\xbc\xbf}\x06\x8c/~\xf0:\x14\xf7R\x9c[\xaedV\xd7\xe0\xb2\x8f\xfa\x82\xd06\x07\x0f\xaf]~\xe0\xd5\xda\xd4!\xe8P\xf7\\\x81z\xca\xbe0\xd2b>\xc8\xfeR\xb6\x0e\x16o\x13\xc1X\xb0f\xbf\xf5\x87\xf39\xbc\xba\xbc|{\xf1\xfa\xd5\xf5\xc5\xfbw7o/\xde\xfd\xcf\x9b\x0f\xd7\xaf\xae\xcfo.\xde]\\_\xbcz{\xf1\xff\x9e\xbf\xb9\xf9\xf8\xee\xc3\xe5\xf9\xeb\x8b\x9f/\xce\xdf\xa4;\xfa\xeb\xf9\xd5\xc5\xcf\xe6\xef\x1f\xae_]]\x1f\xed\xe5\xfc\xea\xea\xfd\xd5\x91>>||\xfd\xfa\xfc\xc3\x87t/\xd7\x17\x7f9\x7fs\xf3\xfe\xe3\xb5\xe7\xd4%[U\xfb\x0d\x7fY&\xb0\x93\xce=\xd0\x96S\xef\xa3xS\x04\xda\x15\xc0]\xd5\xc3\xff\xd9\xf7\x1cn\x19k\xa0nj^W\x9b\xfa\xdf=\x9d\xa04d\xe0U\x130\x05\x18/\xd4\xf3\xaa\x13\xaf\xe1[V7k1B\xa8W\xf5\xf1\x97\x93mer1\xd6u\xe25\x0c\xcb\xbdxj\xe4\x13\xa6.\xa6\x1f\xfb]\xd7\x8a\x17\xe8\xb1\x17\xd6\x0dlr\xe9i\xd5\xacW\xf5\xe6\xf0u\x19\xbf\xdc\xd0\x12'\xd7\xe0\xf5\x96-\xa1\xdds\xf1*\xdb0\xf8R\xd5\\\\U\x0c\xc3\xe6uu^\xb4\xed\xaa\xc5\x86\xddt\xec\x1f{\xd6\xf3HG\x15h\x92\xef\xa5\x9f+\xe5\x06:\xb6\xebX\xcf\x1a\xae^\x80\xda;\xf0\xbb\x8a\xeb\xd0\xb0\x06\xb6\xd5\x92y\xfd\xe9\xe1\x99*\xdei\xdf\x91\xf5\xb2\xc0\x0bh\xd5v\xdb\x8a\xbf\x84}\xdd\xf0\xff\xff\x1f\xe2o\xaa\x8b7b\xb4!\xaax\xf1\xc6t\xfd:L\xde\x93\xf5\xbdR}\xc4\xcd\x83\x14[\xdd\xe6\x0f\xb2\x04\xaa\n\xaa\xf8U\xa3K\x07\xaat^O\x8bj\xb3\xb9 \x8d\xa2\x00\xd5\xdc\x84\xbd\xae6\x1b\xc7`K\xfce\xdf\xab\x11\xfe\x8eu\xa2\x86\xe2\x87\xa0+]\xf6\xd8\x0d@59@6;\xc0\x0f\xcf\x00\x7fC\x01\x1d>a\xf3\x91\x9c\xe86\xc61q\xfb\xa5a]\x7fW\xef\xa0\xbfk\xf7\x9b@\xef\xac\xed\x96!zrl#\x80SV\xfa\x8e}\x05\xd6,\xda%[\xca\xd2\xa8f#\xfb'UWQ\x17\xdd\x8a\xa2\x0ee\x9d\xef\xe7#\xca'\xd1\xf3\xaa\xc5\xa2\xdd7|\x8c\xb3\xff\xa9\xd9\xd4\xac)\xf4\xc8\xe3\x02\xf5Z^\xf1\xe2\xcd\xbc+\x1f{+U\xa6\xa1O\x8f\xdep\x11\xcb\xa1G\x0fu\x13\x1d\xeb\xc5\x90\xca\xe3P\x17\xff?\xfc\xc5\xd7}\xc2V\xbe\x07\xbbv\xab\xfbV\xe1\xd4\x94\xdd~-\x9ey\x1d\xbdo6\xf7P}\xae\xeaMu+\xde\xadwL}6\xa8\xf9\x8d\xba\x07\xf5f\x0e\x0f.\x11=\x06\xa6\xb7\xd0\xa3\x07D\xaf\xf9A\x1di\xdf\xb8\xca\x9e'\x88\x0e \xb4\xb7x\xb9\x01Yva\x9f\xab\xcd>\xf8\xa1\x07\xf8\x16\x0c\xe8V,\xec\xcf\xec\xebs\xf3\xa8\xcbR\xd8\xc3\x10\xe8\xebu#\x86\xa1\xf7\xd1w\x04\x8c\xdf{\xc1\xe3\x84\xc7\x8a\xef\xbb\x87\xaf\xedP\x92\xd9\xc0k\xd7\xb5\xcb\xfdB\xd6:\xeaO\xf8\x18\x06\xce\"z\xde3VU\xbda\xe1\x0eJ\xd5\xe2gy\xe0\xb4}\xaa\x93\x1f\xa8m\xcao\x84\xf2w\xeb\\\xb8U\xa1\x9fL,\xc1\x97\x9a\xab\x17\xac\xa8\xf5\xbes\x87t\xd11\x19\x86\x1b1\xc4?b\xc6\xcb\x8c\xf0\x96\x15g\xcf\x85\xafp\xbf\x1ahb\xafu\x89\xae\xeb-\x9b\xbf\x16\x84c\xa8\x9b\xf9\x84\xda\x97\xc0{AV\xd03P`_wu\xf7\xc8\xaa\x7f>\x94 \x1f\x00\xaf\xb3/\xf5f\xa3j\xe9*P\xb80\xb3\xd9c\xc7\xf0W\x0c\xc8\xd5\x0d\xe0-T\xb0`\x0d\xef\x02\xdf\xf3\xf6\xa0e\xfa\xcb\xaeZ\xd7\x8dgx\xaa\x0by9\x1c\x02K\xb6\xaa\x1b=\xf9>\x9e9LL\x1fz\x08=\xc6\xe1\x87\xb7a_\xf9\xcd'v\xefn\x19\xd1vaZ\xc5\xed=w7\x88\xc9L\x8cw\xacaJa>\xe5\xc4?y+^+\xbb\xaa\xd7\x9f \x97\xd5\xda|\x16\x9f\xa9\xdf=\xce\xfe\xb1g\x9d\x1aD\n\xb7\"\x80\x0c\xb6m\xcf\x81\xadV\xf5B\x8c\xb56\xf7gp\xc1U\xdb\xb9e\xc0\xb6;~\x0f\xf5\xca\xd7\xa2\xefX\xc7\xa0\xea\x184-l\xdb\xce\x8c\x81z\xd7\x80\x87\xb7\xbc\xda\x1c\x19\xcc\xc07d\xec\xe9\x92\x97\x97Q\x94\xffh\xf6\xdb[\xd6\x89f\xac\x8bl\x8d\xc2\xbc\xf5\xb5\x03-\xc7\xd57\xd2\x99o\x18\xfe\xa5\xea\xa1g\xfc\x19\xd4\xbc\xd7\xe3\x82\xba\x87}\xa3\x1a\xf1\x12Z#\xfb\x1c\x9c\x1f\x9f\xa5SEQ\xad^\xd5J\xdd\xaf[\xb6\x14\xef\xe5\xbaQ\xc2\x9ay0`\xcb\xfa\xbeZ\xb3^\x0c1\xdd\x1d\xc2\x1ds\xd5c\xd1v\xca\xc7R\xbc\xa2\xcd,\x8b\xf6&\xdf\xf7\xf2\x13\xc6\x8e\x8c3\x1c\xe6\x8c\x0f\xedv,\xf7/\xde\xceK\x8e\xd1w\xb2\xf7\x86?V\xddp\x93\xfe\x05~\xf7\x7f\x85N\x9a\x84E\xb6\xef\x7f\x81\xdf;\xcf\xf8\xe7\xe4\x8f\xbe\xd6\xf3\xaf\xe2\x89\x99ki\xc3\x05\x0e\xe6\xa0\xf4\xdf\xf5\xcc\x92|\xdcf\x0eE\xb4\xe6\x01\xe2-\xac\x19\x9f\x7f\xdci=Q|/W\xa3\x9e\xb3\xefY7\x9cn\xa6\x86-\x7fS\xf1\xae\x81}\xc3\xbe\xee\xd8B\xc4Q\x8eAN\xa9\xe1y\x069\x81\xa7[\x0c\"}'\xd4\x0dgk\xab\xb2\xc6L_P7\xfc\xa7\xdf\xcf~\xd5\xad,\xa9\x0cZ:\xf3\x9d\xf3m\xb5Gq\xfa\xcd\xbe\xf3\xf4\x93\x88\x9e\x12\xd3w({\x05\x1f\xaf\xde\xbe\xe8X\xdf\xee\xbb\x05S\n\x9b\x1cI\xee\x9b\xfa\x1f{\xb6\xb9\x87z\xc9\x1a^\xaf\x8c\xd8-\xae\x0d\xad\xafo\x04\xf5\xdd\xca:3\xad\xef=n\xd7\xb5\xbc]\xb4\x1b\xb8\xdd\xafV\xac37\xed\x0c\xae\xa5r)\xeb\x06\xdb}\xcf\xcd\xb0\x03*\xff\x10|\xc3\xaa\x9e\xfb\xaf\xd56\x0c\xbe{\xf1\x1d,\xee\xaa\xaeZp\xd6\x9d\xc9\xb9\x99M\xd5s\xe8\xd9z\xcb\x9a\xe1\x83\xfd\xe3\xd5\xdb\xef{\xd8U\xfc\xce\xebM\x16jx\xe8\xfdW\x95\x03\xef\xfdfs\x0f\xff\xd8W\x1b57\xafD\xc1\xd5\x18\xc9\xa7U\x0fu`\n\xe7\xef\xa2(/\xd6m\xbb\xde\xb03\x19\xb3\xdb\xfd\xea\xec\xcd^\x0d\x10\xff\xfe\x83\xaa\x89t;\xce'\xd5\xfeo\x9a\n\x16U\xd36\xf5\xa2\xda\xc8g\xc8\x7f\xe5\xa7\xecl}\xf6L\x84Vv\xfa\xdf\x9d}'\xde0M\xcb\xa1Z,\xd8\x8e\xb3\xe5\x0fgO\xfc\xa7_\x88\xcf\xbfj\xc1\xeb\x05{\x06\x9cU[\xf1\x8e\xd8W\"\x1c\xbb\x8e-\xda\xed\xae\x16/\xd9F\xf7\x92\xb7uS\x1dt\x93\xa3I\n\xe2~'\xdb`%;\xc9{\xff\xa5U_\x075\x17}\xea\xbe\x97\xc3e9\x91\xd46\\\x8cx\xda\x15\xbcj\xee\xcf\xe0\xcf\xed\x17\xf6\x99u\xcfD \xbc\xce>^\xbd\xed\xf5`[\xb8\xf2\xbc \x95\xc9\x1e\x94\xc1\xdf\xef8\xdf\xfd\xfd\x99\xfao\xff\xf7g\xd0vbh\xa4~}&[\xe3\xa2j\xa0\x95Og\x15Riz\xc6a\xbf\x83J\xd6=p]\xd6}f\xfa\x0bp[\xedz\xd5\xb4d\xc9y;\xbct\xe5\x80\xa3\xe6\x92R |.\xad\xda\xcd\xa6\xfd\xd2\xbf\x0c\xdc\xdb\xff\n\x17\xab\xb1F\xa2Y\x18\x8ae\xa8\xb4\xfe\x12\xddo\xd9\xd2=\x14\xd0\x8e^5\xf0\xe7\xeb\xebK\xf8\xd3\xf9\xb5\x11\xcb?^\xbdU\xcf\xd8}\xcd6K\xa8\xbcg\xff\xef\xf9cq}\xbfc\xff\xf6\xbf\xff\xcd{\x02\x98\xf1W\xa3\xdb\x9b~\x8d\xc8;\xa4'+\xa0j\xd4+\xcc?]\xf7_\xed/\xa3^\x8e|+\x1135\x0e_T\x0b\xd1\xb7\xb4\xed\xa7\xfdn\x18\xb1\xdcV}`\xaaZU6DG\xd1\xcc{)x\xaa\x95\\\xf5\xb5\xa7\x1em?R\xb3\xad\xd7w\x1cn\x03\x9d\x92\xac\xb4\x9c\x81\xaa\xb7\xbb\x0d\x13/Y5\xa2\x1dF\xb1=\xdbV\x0d\xaf\x17\xce\x0f\xc5\xc8L.b\x08\x14\xfd\xf6\xc6\x8f\x92\xfe\xa2\x90\x05\xa8D\xa1\xea\xa55\xc09\x18\xc7\xe8\x97{u\xdb~\xf6\xb7i\x1d\x02\xfd(\xb8\xaa\x8f)\xd9\xdf_5\xf7\x7f\x1fge\xaa\x06\xaa\xee\xb6\xe6\x9dx\x88\xfd%t\xba2\xef\x88j\xd3\xea\xa6\x07\x95\xfb\xd6\x8a\xdeY\xbehT o\xa7\xc3\xc2\xd9\xf0o\x18\xd5y\x9a\xe6\xa5yp6\xf5\xad,\xb6~\x8f\xf4\xd0\xefw\xbb\xb6\x93o\xf0]\xb5\xf8\xf4b\xdf\x88\xff\x88\xf7\xb6j\x17\xee'H\xbf\xe8\xfd\x03\x9bv\x05{\xae:6\xd3=\xf4\xa2c\xad\x96\xcbZ\xf5\x15\xb0f\x0d\xeb\xe4'\xe7\x96\xf1\xbbv\xa9q:\xf7\xcd\x14\xe5Q\xb7\xd0}\xbd\xf3\xaf\x95h\xfc\xf0\xbb\x97p)\xca/\xfa\x05]\x95j\x08z\xdd\xc0\xeb\xff\xf6\xdf\x02\xaf\xc9\x9f\xdb\x16Vm\x0b\xff\x02ggg\xfe/_Q\x98\xaa\xb9\xf7\x1fP5\xf7g\xa2\x18?w\xed\xf6\xe9\xaam\x7f\xf0\x1fzv\xe6\x7f\xff\xd5+x*\\}\x94\x15\xb9n\x9f\xfe\x17\xe1\xeb\x87\xe0\x87|\xc8\xdf?\xc3\xb1\xfb}$v\xff\xa3\xfa\\\x15\x0b\x1e\xfc\x8b\x1c\x1b\x8a\xab\x14\x88P\xdd?\xfd\xb9m\xcf\x16\x9b\xaa\xef#\x01RE\x14'\xa9:Z'\xfa\xcb\x10\x89\xdcO\x91\xc8]\xde\xf3\xbb\xb6 \xc4N\x15\xea\xe7\xb6}zvv\xe6\x7f\x19\x0cq{\x1a\\\xe0\xf6~\x1c\xc6\x99\xb7\x91\x9a\x00w\x8f\xa2\xf5\xac\x9b\x18\xe6\xb8/\xf5\xbdc\x88\xf6b\xb5\xdfl\xce\xe4\x0fb\xf8\xfb=T\xd6\xdbS\xbcYE\xdb\xf2\xbdkT\x9bs_lxU5\x9b{\xf3\x9dz0\xf90\x0c\xbb\xa1ZI\xf8\xd8s!9/\xf2\xfd\x8b\xef\xdd\x97\xd2\xefXSd\xf9\xf5\x0cL?#\xdf\xad\xda\xf6\xec\xb6\xeade\xbf\xbe\xb8?\xfb\xf7\xefT\x14\xe5\xb7\x9c\xd3\x9f\xff\xd3V\x16\xf5;\xe1C\xbc^\x9d\x87\xfc\x8f\x0f\xef\xdfy~\x12\xb7Z\xfc\x9dz\x02oUw=\xbf\x91722i\xafO\x10m\xcf\x1c\xef\x9e\xb2\x97\xe6y\xbc\x85\x85J\xf5\x9d\x8c\xe5w/\xe1;\xd7\xc39\x0d\xc3\x99\xaa\xe5w\xcfB\xfed\xfd\xdeU[\xe1\xf3\xffVU\xf8\xef\xc1\x13D\xfdf\xc7\xa7V\xf2b\xa5\xbf\xd3\xa6mM\xb5\x86\xba\x87/l\xb3y\xfe\xa9i\xbf4\xb2;\xb9\xabz\xa8`\xb1\xefy\xbb\x0d\xfd\xf8\x88\x1b\xd5\xb1~\xc2\xa3\xcc\xe7Y\xe5\xad\x9eF\xd5\x00\x0d\xd6lv\xcf\xaanq\xa7N\xb7{\xba\xbayy \xaeu\xec\x1f\xfb\xbac\xcb\x97\xb0\xaa6\x13I\xd59a`B\xe0\x06\x13\x90\x91\xb0&\x03\xe7Z\xe0\xc1\xe2%\xcf\xaa/\x03\xeaLc!\xe2p&\x02\xbdT\xef\xf5z%\xef\x95\x9cZ\xdd\xf4-\xf4\x8c\x9f(\x1ef\xc1\x142\x18\xc3r\xa7Y\xf5\x8d\x1b\xa8\x9b\xbe^\xb2\x83\x90\x1c\x1b\x0d\xdb\xd7\xe9\x832\x92&g\x9f\xd8\xbd/43\x86CC\x1b\x95\x1ejt\x8c\xef\xbbFI\xf3\xb6J}6\x10\x1er\xa6u=\x9b\x92\x9450t\\\x88\xda\x90$i\xdb\xc8\xa9\x98v\xb5\xea\x19\x87\xb6\x83iqa\xf2l\x95\x8e\x96g\xde\xcd\x11DU>d\x13\xd3\x95\x91\xa1l\xf6[\xd6\xd5\x0b\xf37\xf9VZT\xcd@RK~V\x07~\xdf\x0c\xf3\xbc\xb3\xcf\xbb\x0b\xe9m#\xba\xa8!\x84jft\xdf\x8bP\x7fb\x89\xf1\x9c\xba?qpg\x0c\x8c#\xbc\x9bz[c\xa3+\x8f5p\x91\x0f\x8dQ\x1a\x80\xdd\x82\xf9\xc0;O\xbc\xed\xd4\x8c\x9f\xfd\xa7\x8b\x15l\xd8\x8a\x1b\x94H\xb3E\xe6\x1bJ\xca\x17\x1a\x99mu\xe4\xc4\x07\x19\xab\x16w\xe2!\x7f\xc0(\xda\x80\xcfx~(\x96\xd6\x19\"\xa2\xb2\x85\xb6\xc0\xbb=\x93\x8cG\xdd,E\x97\xc5\x06!\xd3\x10\xe3\xe2@\xc7\xf2\x87\xbaYl\xf6\xcbY_X\x81\x06\xfaW\xce;&\xb9\x04K\xe0\x10C\x1c\x8b\x93\x9bu.\x1f/\xfa\xd9\xdd\x9aUAv\xb7\x1d\xeb5A\"\x1f\xaf\xf1y\x14\x8f\xdc\x99~\x9a\xeau\xd3v\xf3\xde\\?\x8d\xd3K\xa8\xc8\x1c{co\xdbv\xc3\xaa&t\x03;\xf6\x99u=\xf6M\xa6\x8f\x9e\xdf\xb8\xda\x02\xc4:\xe6~\x12&~\xc45\x98\xa2\xa5\xdan\xc9\xba\xf9\xfc\xf0\x87\xbaY\xb0\x97\xb0h\xc5\x90\xe9y\xbf\xfc\x04?\x9e\xfd\xe1\xa7\xa2\xd1\xe0\xd5z2\xd8\xfbW\xed-\x98\x0c\xe1\x85Zl\xd1\xbf\xf8eX \xf2O\xe5\xc4\x95 \xe1?\xbc \x12\xfex?\xac\xeb\x18\x12\x19\x80\xe8V7\x87t\x93\x86\x9bT\x82\x04\xe3O/\xfa\xa8Qy\x0d\xc6\xab\xe9\x83\x1fu\x82\x03\x1fc\x94\xc5\xa7\xfa\xd3\x14D\x15\xb2\xe3R\x14\xf8WU\x15LO\x10\x0c\x0cD\x83\x03\xd8\x95o\xd1X\x01\x14NJ\x10OI\x90R\xa6\xe0z\x8d\xc2\xc9\x08b\xa9\x08\x02\x89\x08\x92\xd2\x10D\xeb\x1fJA\x90\xbap=\xd5MB\xfa\x01\x9c\x8fP\xf2\x01\x9c\x87\xf0\xea\xb0\xf8ro\xe7\x89%\xd3\x0e`$\xed\xf4;\x17I9\x90\x9cp\x00\x19\xec2\xe9\x06p\x17+\x9el\x00w\xd9B\xa9\x06\xe2-\xafd\xa2\x01L\x9a\x81X\xa7\x99\x99b\xc0\xbf\xe2\x82\x87\x13\x0c\x14x\xcb\x85\x16\xecF;R\xc0\xad\xad\x008\"\xa9\x00>\xa5\xc0 \x8a{d2\x01\xc4*\xf2X\x93\x82\xe44\x02\xe1\x8c\x14\xa0?\x07BI\x04\xa2\xcd\nPM\x0b\xb0\x83(\xc0\xde<@\x06\x0c\x92\x13\x07\xc0mx\xc9,D{d\xdc\xed\x86SU\xb5`\xba\x80\xbcd\x01\xd8T\x01\x88D\x01\xa8\x00a\x82S2E@B\x82\x80Pz\x80Xr\x80B\xa9\x01\n$\x06\x88\xf6\x02\xf1\x1e \x9a\x12\xa0dB\x80hy\x01Uf\x88\x01\xa4\xcaPm\x14\x90\xed\x14\x8a&\x01\x88\xa7\x00@&\x008i\x1d\x8f_\xfa\x8f]\xf8\x1f[\xf6_h\xd1\x7f\xc1\xf6\x87X\xee\x9fzo\x8eY\xea\x8fX\xe8\x1f-\x0en\x95{\xac!\x15]\xe0\xef_\xde\x8fZ\xdc\xff\x8d\xaa\x9c\xb3\xa8_\x8a$\x1e\x7f\x9e%\xfd\xa1b\x14^\xce\xef[\xcc\x9f\xb2\x88v\x9c\xb8\x1dV\xd3\x1e\x96\xca\xcc\xb3\xcf\xfc\xe9Nt\xf6W\xf3y&\x17\xe4\xc8nE-\xab\xad\x9a\xc3yg\xa5\xf3U\xe3\\\xf3\xe0\x8b\x96\xd4\xce~\xa5%\xb5\xd8\xf9+ZRKKj}G\xd2\x92Zi\xb4\xa4\xf6\xd0hI--\xa9\xf5\x19-\xa9\xa5%\xb5\xd2hI--\xa9\xa5%\xb5\xb4\xa4V\x19-\xa9\xa5%\xb5\xb4\xa4\x96\x96\xd4\xd2\x92ZZR;5\xff\xa7--\xa9\xa5%\xb5\x1e\xa3%\xb5\xb4\xa4\x96\x96\xd4\x96YR;\xd01\x96\x97\xd0\xe7'\x9ep1\x9c\xbeZ\x14\x0b\xdcEPO\xe7^\xeb\xe6\xe5|\xf2}\\H\xc2\xbb}d\xb9T\xde2\x12\x85\x0f\xa9\xf3\xd2V\x8e\xbc\x97g\x0e\xabF\x0c\xf6\xa9\x1c\xca7\x8d=Q(\xaf6\xde\xd7q\xfeW\x07\xc8\x90\xa3V\xee\xdc\xc9\x02T1\xee\xd4x\xf0\xd1.2\xb1\x83o\x1b\x7f\x00\xdd\xed\xa8m4\x11\xd8a\xd4Gl\xa1E\xc4AR\x86|\xd9<\xde\xe8U.\xbe\xa5/f\x1dT\xac\xc6\xee\xaeQ\n\xd7\xf2\x06\x1f\xde^U\xd4Wj\xdd=\xeb\x87y\xb3\x83l\xd2\xad\xdd\x8c\x8dQ\n~J\xc1\x8f\x0e&\xa5\xe07F)\xf8\x9d\x96\x9b\x82?\x1cp\x17C\xa4\xde\xc9\x08~\xe8p\xda\x81[\xcb\x16f?\x1d\xf0CsxH\xf5\xa1\xe3\xf3E\xc8\xd0\xecWB\x86b\xady4B\x86\x08\x19r\x1b!C\xd2\x08\x19:4B\x86\x08\x19\xf2\x19!C\x84\x0cI#d\x88\x90!B\x86\x08\x19RF\xc8\x10!C\x84\x0c\x112D\xc8\x10!CS\xf3\x7f\xda\x122D\xc8\x90\xc7\x08\x19\"d\x88\x90\xa12\xc8P\xb1\x14\xf4J\x1e\xc7\x82\x82H\x16`\x8a\x16x\xca\xca\xe1Y\x80A\xb4\xe0\x08L\xcb\xebP\x1c\x18B\xb5\xa04\xae\x05Qd\x0br\xb1-\xaf7\xf5\xfd\x1b\x9e\n@\xe0[\x10F\xb8 \x0b\xe3\xf2\xba\n\xe2]\x90\x8bxy\xbd\xa9ad`\xd2\xad\x1c\xea\x05(\xdc\x0b2\x90/H\xc3\xbe \x07\xfd\x82d\xfc\x0b\xc2\xdd\x08D\x90\x1cH\xc0r\xb0(\x18\xe4\xe0`\x90\x8a\x84A\xb8\xe29h\x98\xd7\x99\x05^a\x1f\x19\x1c\"\x16| \xe4\xbe\x18\x01L\x0c\xca\xa2b\x10\xc3\xc5 \x8c\x8cy\xcf\xc9E\xc9\xa0`\xdbM@\xca +\x83\xc0\x08%\x96\x85\x03L\x9e\x18\xf760\xb2\xfd~\xe5\xac\x13\xdd\xa2\x92E\xb5b\xe6\xf5\xa7f\xfa\x16m\xd3H \xdf\x1f\xdba\xab\xa27R$\x86\xd0FW\xbb\xaemW^\x91.Z\xc7Kq\xfa\xb4\x86\xe3\x96\x81\xd2\xb7\xbb\xb2\xa1g#\x10\x84B\xaa\xe1n\x7f\xeb\xcfw\xa3\x0cq%@^\x0d\x90:%\xe0'\xc3 a\x0e\xc9XQ\xcd\x122uKH\xd1.\xa3\x9eFm\x13\xa3_Bi\x0d\x13rtL(\xa9eB\x92\x9e\x19ue\xa7VH\xd44\xa1\x8c\xae e\xb5M8B\xdf\x84\x0c\x8d3\xeaP\xbcRSuN(\xaauB\xb6\xde X\xcd3\xeae\xaa\x89buO(\xad}B\x11\xfd\x13\xf25P(\xa9\x83B\x92\x16\x1au5I\xe9\x80\xd3C\xe1t\x9a(\x9cX\x17\x85\xd3i\xa3\x90\xa1\x8fB\x8aF\x1a\xf5d\xa7\x80\x00\xbcN\n\xa9Zi\xd4\x9b\xec'R\xf4R\xc8\xd3L\xa1\xb4n\n\xc9\xda)\x94\xd2O\x01\xa3\xa1B\xda\xd0\x11\xa9\xa5B\xc6(3IS\x8dz\xe3&\xc5\x04RW\x85\xc4\x12'\xea\xabA_\xd3\xd1,Rc\x85T\x9d5\xe8 \xa1\xc1Bi\x1d\x16\x12\xb5X\xc8\xd4cc\x0e\xb1\x9a,\x14\xd5e!M>\x04\xac>\x0b\xe9\x1a-`D\x89#\xb4Z@\xfa\x8fLX\x16\xd4m!;\xf8i\xfa- k\x9e\xa9\xe3\xc21Z.\xe0#^D\xd3\x854]\x17\x12\xb4]H\xd2w\x01\x7fS\xf2t^H\xd6z!\xa6\xf7BI\xcd\x17rt_8B\xfb\x85t\xfd\x17\x907)\xa6\x03\x03\xd6O\x9a\x1e\x0c\x855a\xc0\x163\xf2\xc4\xa6\xeb\xc3Aw\xb7\xf78\x8d\x182u\xe2\xa0C\x9d\xea#\xaa\x15C\xa6^\x1ct\xc8\xcd\xdc^P3\x86\x0c\xdd8\xe8lL\x05\x82\x98VA\xea\xc7\x10\xd7\x90\xa1\xac\x8e\x0c\x18-\x19\x12\xf5\xe4\xc8\xfd\xb7\xd2\x89\x045e\xc8\xd0\x95\x83\xce>^\xbd=Cj\xcb\x90\xa9/C\xba\xc6\x0c\xb9:3di\xcd\x10\xef\x9a\x00\xa1\xdbA\x82v\x97\xa2;C\xae\xf6\x0c9\xfa3\xc4\x83QT\x87\x06\xac\x16\x0d\xa5\xf5hH\xd0\xa4!K\x97\x8ev\xd2Qm\x1a2\xf5i8R\xa3\x86\xc2\xed=Q\xab\x86d\xbd\x1a\"\xa3\xa9\xb8\xa6+\xecr\x7f\xfb?\xd9\xfd|\xb7\xa4\xdd\xfevS/dV\x06ke\xb0\x91\x9bc\xedK\x8a\xe1\xe2\x9e\xa9v\xc3#\x03\\1\xe6Q#\x80AQ\xf6\x1e\xdf\xd7\xeb\xa6\xe2\xfb\x0e\xb1\xd0\x80$\xdd\x80\x91\xa4K\x92\xee\xc4H\xd2\x8d:$I\x17H\xd2\x9d\x18I\xba$\xe9:\x8d$]e$\xe9\x92\xa4K\x92.I\xba\x11\x87$\xe9\"\xf5\x04\x92tI\xd2%I\x97$]\x92t\xa5\x91\xa4;1\x92tI\xd2\xb5\x8c$]\xb7\x91\xa4\x1b1\xac\xc4E\x92\xaem$\xe9\x86\x0e$I\xf7\x9bI\xba\x1f\x8cF:Wu\xef\xd8\xd7\xe7\xacY\xb4\xa2\xb9\x0fBjl*G\x9cx\xb9\xa9\xea\xe6\x9a}\xe5\xea\xf5\xe3=~'\x8e\xbb\xe1\xec+\x8f\xcb\xb3\xd1\xc9.\\e\xc7\xa2\x05*\xab^\x9a\xa2\xcar\x1e;\xe8P&\x00\x97\x93(z\x06?\xaa\xf1\x0c\xf1v\x1e%WA\xdf,\xdafU\xaf\xf3\x97_\xcbD\xd9\xaf\xa5\x93\xe9\xcbQ9\xd6Mr\xbe\x04\xdb\xeb.\xb44\x1b\xa1\x9ec\x94s\x99\xda\xfd\xb8V\x80\x9d\x0d\xf4\x06\xc7^\x83\xaf\x96\xde\xcb\xc1\x89\xec\xfb\xbc\xde\xe4\xb8\xb3n>\x89\x97\xc0\xb6Zz\xe6+\x17\x1d\x93!\xbf\xe1\xb5\xbf\x9e\x88:\x9a\xe9\xdce\xc5\xd9s\xe1+\xbf\x89\xe8\x12]\xd7\xdb\x83'_8\x16\xdd\xba\x062L\x0d\xef\x02yjo\x19kT-\x9do\x9fpy\x86\xbc\xee\x8e\xfb1\x14M\xbc\xb3X-\xa7\xf8\xab\x06\xea\x86\xb3\xee9xR\x07/\xba\xb6\xef\x9f\xebv\xeb<\xc2\x91\x9f|\xdcW\xc0\x91\xb8]\x95\xffr\xdcg\xc1\xce\x85nm\xbf`r\xca\x1fz\x08='\xe1'\xc4l\x1f\xe3n7\xd1V\x13\x95\x00B[\xdc\x8c6lb\xa3w\x12\x19\xf6\xb3\x81]\xd5\xf7JvT\xbb\xde\xfcc\xcfz~\xa6~\xf78\x93\xbb\x1fH7\xa1\x0do.\xb85\xb2\x91{\x8b\xf8^>\xa2Y0)\x826-l\xdb\xcel\xbc\xe1T[\xe4\xde\x17G\x06s\xb6\xb9\x88m\xb1go\xd8z\xc3\xb7\x17\x8b%\xe2\xf9\xeak\x07\xda\xde\xc5\xc4s\xf8\x97Jny\xf1\x0cj\xde\x1b\x19\xba\x87}\xa3\x1a\xf1R)g_jG\xb3\x8dw\xaa\xf6NG\xaaV\x93\xfd\xd0\xea\x06\xd6W\x97\xaf\x87\x07\xc3\x0c\xe3z\xf8\"\xee\x99\xeb\xf6\xb8\xdf\xa0\x8b\xb6S>\xe4\xe8\xb5S\x95\x1f\xc6\xe1b\xc0-E8;2\xcep\x983>\xb4\xdb\xb1\xdc\xc1q_\xc7v\xb2_\x83?V\xddp\x93b_f\x93\xb0\xc8\xf6\xed\xfb&\x9b\x0e\xe1\xc2\x0f\xa3\xdc\xe7c\xdc\x06c\x12w\xb5\xdb\x8c\xfa\x7f\xf9Y\xb2j]Y\xd3\xa4\x8b\x17\xd6&\x1f\xe2\xee\xa8\xe9\x98\xf1a\xd1\x93H\xf6C2\xddG\xa3\x81}\xa3\x90\x19\xb6T\xc8\xc2)\xb7\xd3\x90\x17p\xf4\xca\xfe\xa7U\x8c\xe4|'\x88w\xc7\xda1\x9dd\x9e\xed\xba\xe1?\xfd~\xf6\xabn5IeX2^\xd5\x9bG\xb2\x0d\x08\x8f`\x89\xd1\x9e\x0f\xd3\x17(K\xc5\x0f\x8d\xfe\xe9u\xc8\x91\xd8!\x1a7\xc4\xec~\x11\xc1\x0cS\xf1B\x89\x0fz\xbda\xb1B\xd7,i2N\x88\xc7\x08'\x98\xa0\xd7\x1f\x1e\x1f<\x12\x1bL\xc3\x0552\xe4/v\n&\x98\x8a\x07\x06w\xb5H\xc1\x02\x93p@\x0b\xf7\xf3;\xc4a\x80(\xfc\x0f\xbb\x8b\x05\x02\xfb+\x86\xfb\x1d\x87\xf9e\xe0}E\xb0><\xce7\xc5\xf5\x02\xfd\x93\xe3\xddo\xdb \xf0\xbdSa{'\xc0\xf5R0=4\x9e7\xc1\xef\x82}x\x1c\xcbK\xc2\xf1 \xb8\x1b\x05\x16\xc3sLg\x86z\xe3T\xec\xce`u\xfe\x97`\x14\xb7;\x1a\xb3\x0b\xe2u\x88!P\xf4[\x1a?JJ\xc2\xe7d\x14%\x1e\xe7\xef\xb0\xa3\xd8\x1c\xa6d\x89\x98\\hg <\x1e\x97\x84\xc5\xc5\xd0\xb7\x1c\xe4McmN\x7fQ\xd4-\x07q\x83\xc0\xc6!1\xb4\xad\x0c\xd2\x86\xa4\xa9\xa2\x08[\x02\xba\x16\xe2%rP\xb5\x90?\x8f\x9cW\x08IK\x0b\x1e\x1eA\xc3D(\x019\xcbB\xcd\"\x91;\x1a-C\"e\x18\x94\x0c\x87\x90E\x82\x9a\x8e\x8c\xe1Q1/\"V\x04\x0dKB\xc2rP\xb0\x04\x04,\xc8B\x05\x8a\x15<\x0f\x8fx\x95B\xbb\"\xd5p\xfe\x96\x8ep\xf9vm\x88\xa2[9\xc8\x96\xc1\xb2\x9c\x0eC\xa8V\x0e\xa2\xe5\xbdP\x18\xcdJE\xb2,\xec\xca\xe9\xcf\xffi\x8b@\xb0\x02\xe8U:r\x15\xc6\xaaRp\xaa)2\xe5t\xe7\xc3\xa8R\xf1)\xf0\xee\xb4\x10\xc7\xa6Rq\xa9\x04L*\x19\x8fJ\xc3\xa2\x02\x04P\xa8TX\x1c\x04\x8b?%cOI\xb8\x93\xa7\x929x\x93\x86\x80\x02\xcf\x90\xeb\x97\x1c\x9cI#K\xee\xb6\x1d\xc2\x98\xd2\xf1%o\x07\x16\xc4\x96\x02\xb8R6\x92T\xa2\xcd% Hx\xf4\xc8\xbc\x86wUWm\x19g\xddd'z r\xc8M\xc7-\x07\xa1/\xcf\xa7f\xce\xf2\x07\xb5\xc9\xf8\x8cE\xd0{\x15\x98<\x11\xba\x8b\x14\xfe\xc5\xdd:d3zVu\x8b\xd9$\xc7@0\xac\xa6Sp9\xfb\xf0\xcf\xa6\x07L\x85\x15\xb73[z\x8f\xac\xb6\xd4\xe2\xc4\x03<\xed\x89\xedy}\x85\xa3\x98\n\x9bJ\xda\xfe\x0e&\x91\x87\n\x8b\xb0.\xd5[\xbc^\xa9\xc8\xd5=T\x9b\xbe\x85\x9e\xf1\x13\xc5\x83W\xdd\x9a\xf1\xf4X\\\xcb\xf3\xa6\"\x0d\xb7\xb7\x89\xb0\xf6\x98W\xb1\x98\x17x\xbc\xdd\xd3x\x1c\x86B\x05U\x86\xf9\xf4\x01\x19\x19\x91\xb3O\xec\xde\x17\x98\x99\xe0\xabq\x8bJ\x0f*:\xc6\xf7\x9d\x82\xd2&\xfa\xf2\xd9\xc0f\xc89\xd5\xf5l\xf2Q\xd6@\xbc\x08c\xbc\xc5{\x11\x98\xb6\x91\xad\xae]\xadz\xc6\xa1\xed`Z\\;uD\xf9hyf\xd8\x1cAT\xe5C60]\x19\x19\xcaf\xbfe]\xbd0\x7f\x93\xef\x9fE\xd5\x88\xfa\xa8\xe9\xc5;\xd6\x98\xc0\xef\x9baFw\xf6!w!\xbdmDK\x1cB\xa8\xe6@\xf7\xbd\x08\xf5'\x96\x18\xcf\xa9\xfb\x13\x07wF\xaf8\xc2\xbb\xa9\xb756\xba\xf2X\x83 \xf8\xa0\x165\xdbo\xb7`\x0d,\xec73\n@\xcd\xed\xd9\x7f\xbaX\xc1\x86\xad\xb8\x81\x804\x15d\xbe\x96\xa4P\xa1\x1e\x10u\x11\x11\xe7\xdb{`\xd5\xe2\x0e\xaa\xdd\xee\x01\xa3h\xa39\xe3\xf9\xa1XZg\x88\x88\xca\x16\xda\x02\xef\xf6Ln\xf4S7\xcbzQq6H\x96:\x82\xf2@\xdd\x90lwu\xb3\xd8\xec\x97\xb37C\xa5\xae2h\xc6\xb3;& \x04K\xca\x10\x83\x19\x8bp\x9bu.\x1f/\xfa\xd9\xdd\x9aUA\xf6\xb6\x1d\xeb5+\"\x1f\xaf\xf1y\x14\x8f\xdc\x99~\x9a\xeau\xd3v3!\xc8<\x8d\xd3K\xa8\xc8\x1c{co\xdbv\xc3\xac\x1c*\x8e\x1b\xd8\xb1\xcf\xac\xeb\xb1\xeft}\xf4\xfc\xc6\xd5\x16\xda\xd51\xf7\x930\xf1#\xae\xc1\x14\xe7$\xf9\xe2\xf9L\xf0\x87\xbaY\x881G+\x86F\xcf\xfb\xe5'\xf8\xf1\xec\x0f?\x15\x8d\x06\xaf\xd6\x93a\xdd\xbfjo/\x96r<\xf6B\x7f\xd0\xf4/>\xff\xf4B\xbeG\x9f\x8b7n\xffB\xe5\xe4Rg\xae\xd9\x00\x10\xf5\xfb\xed\xb6\xea\xee'\x11\x1b\x10\xa4\xf7\xf2\x1cY\xe0\x9a\xf5\x06[\xd2\xe9\xbdD\x8bT/jy\x81g.\x89[\x0d\x87\xc4C:\xfcI8\xa9FY\xc8z\xd5\x8b\xef\x97\xf9hB\x9f\xd6\xee\x98\x1a)_,_\xce\x8b\xa7\x0f1\x90\x93\x15\x9c\xef\x7f\xff\xe3\x8f\xdf\xfbI)\xe8\xf7\x8b\x05\xeb\xfb\xd5~sJD\xca\x0e\xbcm\xfc\x01X#1\xc6\xcc\x16\xd9\xc6\x91t\xb6\x0b5\xf8\xcc<\x1d\x89*\xcbV\xf1F\x11^3lY\xff\xb1]\x89\x16X7\xeb\x0d\x0b\x10\xf4r\x98.o\xde\xe1\xadS%\xd1\xfb\xc5\xb1~\xfa1 \x1f\x07}\xdbg\xa7\x12\xc9L$3:\x98D2\x1b#\x92\xd9iEH\xe6\x83\x80OIf\xf5\x8e\x1d\xae\xe2Z\x06\xa2\x87K\xb7\xf7\x8e):\x1d\xc3y\x94$A%?|[1\x18\xb1:N\xddo\x12\xf0L\xc03\x01\xcf\xda\x08x&\xe0y4\x02\x9e9\x01\xcfn#\xe0\xd9\x18\x01\xcf\x04<\x13\xf0\x8c\x1c%\x11\xf0<\x18\x01\xcf\xb6\x11\xf0L\xc0\xb3\xc3\x08xv\x1dC\xc03\x01\xcf\x04<\x13\xf0<5\xff\xa7-\x01\xcf\x04<{\x8c\x80g\x02\x9e x.\x03<\xa7\xf3\xbf\xef\xa7\xfc\xafV\x0dZ\x0d\xb3\xd8*\x15\xb4\xab35Y\xc8\xc7\x8f\xdei\xd5\xaa\xcdlfE\xd1\x01=o;9\x81\xa0\x9a\x97r-'\xbbz\xce\xaa\xe5\xb1\x00U\x11\xf6w\x8c\xc3\xb9\x83\xf1\xd5\xd1\x90\xf0\xae\x145d]\xe4\x1b\xda\x00\x9b3i\xf9`ry\x8a\xf9\x8e\xb3\x06\x95z\xcaO\x14\x04\xe2}1\xd1\"\xdeW\xd9\x89\x83\x1b'U\x89\xf7-\x11E\xe2}\x89\xf7\xfd\xf5\xf3\xbe\xfaA|n(\xda\xe7\x95!\x14\xfd\xdc\xaf\xf5\xa2{\xa3N7o\xfb\x11o4\x00\xb0\xfa$T\x0f\xfb\xe0\xda\xdeYx6j]\xd7\x9fY\xa3\x166\x89\xb1\xfa\xd3Q\x13\xfe\xc1z\xf9\xeb\xc3'\x8c\xaf\xaf(\xfa\xd8G\x0b\xfb\xca\xd1\xdd\xe3\xc0l\x8eb}\x07\xc4P\xae\xfc\xb3A\xd4%\xeb\xb9\xe9\x81t\xdb\xb3\x87\x85\x8e\xf4\xbd\xca\xf41\xe1\x12\x1d\x9d\xad\x9a#\xf6xFT\x1e\x90\x1a\x95\xb1T\xce(\xe8\xcc-6\x05f_K\xf3F\x10g\x8e \x83;\nW u\x0f\xe7\"\xfc\x11d2HA\x87\xc9\xfb6\x1f\xc9\"A2\x8f\x14t\x95\xbbWsQ. \x12\xd9$H\xe5\x93\xc2-{xOa\x19%(\xcd)\x01\x8eU\x82\x92\xbc\x12\x1c\xcd,A\x1e\xb7\x04\xa5\xd8%\xc8\xe2\x97\xc2\x8f\x03~\xef\xe5\x13pLpB\x96 N\xc33A\"\xd3\x04y\\S\xac\x0b\xc6\xb1MP\x96o\x82\x04\xc6 \xd29'\xc8`\x9d\x10]&v?\xe5\xa3\x99'\x88qO\x80\x1f\x9e!\xf8'H\x1c\xc5%sPAo){&cKY\x90\x89\x82$.\nJ\xb3Q\x90\xc9G\x85\xdb\x15r\xff\xe3LN\xca\xeb\x8f#\xf7=.\xc3K\x01\x1e\xfb\x01\x0c7\x05i\xec\x14\xc4\xe0\x84L\x86\n\x10~\x03\xc2h!\x9e\n\xb2\x82\x8b\xe7\xaa\x00Q\xcb\x0c\xbe\nr\x19+\xc0E\xf5h\xd6\n\xf0\xbc\x15 \x99+@sW\x80\x0bz:\x7f\x05I\x0c\x16\xc4\xf6&.\xc2bA*\x8f\x05\x99L\x16\xa4qY\x80\xb8 \xb1=\x88\xa3\xe7\xe39-(\xc8j\x01\xa6h\x81\xa7\xac\x1c\xb7\x05\x18v\x0b\x8e\xe0\xb7\xbc\x0e9b\x7f\xe1\xa2\x1c\x17DY.\xc8\xe5\xb9\xbc\xde0\xfb #\xb8.\x88\xef#\x9c\xcewy]E\xf7\x0f\xceb\xbf\xbc\xde\xa2\xfb\x06\x97c\xc0\x00\xc5\x81A\x06\x0b\x06i<\x18\xe40a\x90\xcc\x85A|;\xdcX)\xb1\xbc\x0e\x96\x11\x83\x1cN\x0cRY1\x08W<\x87\x19\xf3:C\xed\xff\x9b\xc3\x8e\x05\x1f\x08\xcc\xbe\xbf\x05\x192\x88qd\x10f\xc9\xbc\xe7\xe42fP\xb0\xed&\xb0f\x90\xc4\x9bA`\x84\x12K\xc9\x01&]\x8c\x7fk\xd3!\xf9\x91\xd2F\xa7)\x90\x0eM\xcd\xf4-\xda\xa6\x91\x82\xbe?\xb6\xb2G\xe6c\xcaN\xfdx;\x8f\xdfum\xbb\xf2\x8at\xd1:^\x8a\xd3\xa75T\xa8\xdc]\xbdS\xbe\xdd\x95\x0d=\x1b\x81 \x14R\x0dw\xfb[\x7f\xf2\x1be\x88+\x01\xf2j\x80\xd4)\x01?\x19\x06 sH\xc6\x8aj\x96\x90\xa9[B\x8av\x19\xf54j\x9b\x18\xfd\x12Jk\x98\x90\xa3cBI-\x13\x92\xf4\xcc\xa8+;\xe7B\xa2\xa6 etM(\xabm\xc2\x11\xfa&dh\x9cQ\x87\xe2\x95\x9a\xaasBQ\xad\x13\xb2\xf5N\xc0j\x9eQ/SM\x14\xab{Bi\xed\x13\x8a\xe8\x9f\x90\xaf\x81BI\x1d\x14\x92\xb4\xd0\xa8\xabI\xae\x07\x9c\x1e\n\xa7\xd3D\xe1\xc4\xba(\x9cN\x1b\x85\x0c}\x14R4\xd2\xa8';7\x04\xe0uRH\xd5J\xa3\xded?\x91\xa2\x97B\x9ef\n\xa5uSH\xd6N\xa1\x94~\n\x18\x0d\x15\xd2\x86\x8eH-\x152F\x99I\x9aj\xd4\x1b7\xb9'\x90\xba*$\x968Q_\x0d\xfa\x9a\x8ef\x91\x1a+\xa4\xea\xacAO\x08\x0d\x16J\xeb\xb0\x90\xa8\xc5B\xa6\x1e\x1bs\x88\xd5d\xa1\xa8.\x0bi\xf2!`\xf5YH\xd7h\x01#J\x1c\xa1\xd5\x02\xd2\x7fd\xc2\xb2\xa0n\x0b\xd9\xc1O\xd3o\x01Y\xf3L\x1d\x17\x8e\xd1r\x01\x1f\xf1\"\x9a.\xa4\xe9\xba\x90\xa0\xedB\x92\xbe\x0b\xf8\x9b\x92\xa7\xf3B\xb2\xd6\x0b1\xbd\x17Jj\xbe\x90\xa3\xfb\xc2\x11\xda/\xa4\xeb\xbf\x80\xbcI1\x1d\x18\xb0~\xd2\xf4`(\xac \x03\xb6\x98\x91'6]\x1f\x0e\xba\xbb\xbd\xc7i\xc4\x90\xa9\x13\x07\x1d\xea\x1c Q\xad\x182\xf5\xe2\xa0Cn\xe6\xf6\x82\x9a1d\xe8\xc6Agc\x8e\x10\xc4\xb4\nR?\x86\xb8\x86\x0ceud\xc0h\xc9\x90\xa8'G\xee\xbf\x95g$\xa8)C\x86\xae\x1ct\xf6\xf1\xea\xed\x19R[\x86L}\x19\xd25f\xc8\xd5\x99!Kk\x86x\xd7\x04\x08\xdd\x0e\x12\xb4\xbb\x14\xdd\x19r\xb5g\xc8\xd1\x9f!\x1e\x8c\xa2:4`\xb5h(\xadGC\x82&\x0dY\xbat\xb4\x93\x8ej\xd3\x90\xa9O\xc3\x91\x1a5\x14n\xef\x89Z5$\xeb\xd5\x10\x19M\xc55]a\x97\xfb\xdb\xff\xc9\xee\xe7[@\xee\xf6\xb7\x9bz!s4X\x8b\x80\x8d\xdc\x1ck_R\x0c\x17\xf7L\xb5\x1b\x1e\x19\xe0\x8a1\x8f\x1a\x01\x0c\x8a\xb2\xf7\xf8\xbe^7\x15\xdfw\x88\x85\x06$\xe9\x06\x8c$]\x92t'F\x92n\xd4!I\xba@\x92\xee\xc4H\xd2%I\xd7i$\xe9*#I\x97$]\x92tI\xd2\x8d8$I\x17\xa9'\x90\xa4K\x92.I\xba$\xe9\x92\xa4+\x8d$\xdd\x89\x91\xa4K\x92\xaee$\xe9\xba\x8d$\xdd\x88a%.\x92tm#I7t I\xba\xdfL\xd2\xfd`4\xd2\xb9\xaa{\xc7\xbe>g\xcd\xa2\x15\xcd}\x10RcS9\xe2\xc4\xcbMU7\xd7\xec+W\xaf\x1f\xef\xf1;q\xdc\x0dg_y\\\x9e\x8dNv\xe1*;\x16-PY\xf5\xd2\x14U\x96\xf3\xd8A\x872\x1d\xb8\x9cD\xd13\xf8Q\x8dg\x88\xb7\xf3(\xb5M\xc9\xa2mV\xf5:\x7f\xf9\xb5\xdc\xb0\xe4\xb5t2}9*\xc7\xbaI\xce\x97`{\xdd\x85\x96f#\xd4s\x8cr.\x13\xbd\x1f\xd7\n\xb0\xb3\x81\xde\xe0\xd8k\xf0\xd5\xd2{98\x91}\x9f\xd7\x9b\x1cw\xd6\xcd'\xf1\x12\xd8VK\xcf|\xe5\xa2c2\xe47\xbc\xf6\xd7\x13QG3\x9d\xbb\xac8{.|\xe57\x11]\xa2\xebz{\xf0\xe4\x0b\xc7\xa2[\xd7@\x86\xa9\xe1] O\xed-c\x8d\xaa\xa5\xf3\xed\x13.\x8f\xbc#o\xc5%\x0e\xef\xc7P4\xf1\xceb\xb5\x9c\xe2\xaf\x1a\xa8\x1b\xce\xba\xe7\xe0I\x1d\xbc\xe8\xda\xbe\x7f\xae\xdb\xad\xf3\x08g~\xf2P)\xdf\xd6\xbd\x14\x81\x0f\xf2\xde?S\xfbZ\xb4\x8d\x15F\xf5\xf9\xe6\x1eq[\x84\x8c\xb7|\x8e\xd2\x8d{ \xf8\xd2\xca{\x9e\xc1\xf0\xd3g6\xaaq\xb7\xc9h\x8b\x8c\xca\x0b\xa1\xcdtF\x1b\xb6\xcb\xd1{\x96\x0c;\xe7\xc0\xae\xea{%i\xaa\xfdu\xfe\xb1g=?S\xbf{\x9c\xc9}\x16\xa4\x9b\xd0\xd6:\x17\xdc\x1a5\xc9]L|/6\xd1\xe4\x98\x14X\x9b\x16\xb6mg\xb6\xf8p*9r\x97\x8d#\x839\xdb\xc6\xc4\xb6\xd8s=l\xf2\xe1\xdb\xf5\xc5\x12\x08}\xf5\xb5\x03m\xef\x97\xe29\xfcK%7\xd7x\x065\xef\x8d\xc4\xdd\xc3\xbeQ\x9b\x05,\x95*\xf7\xa5\xee\x0f\xdbG\xbc\xc3\xb6\xf7TR\xb5\x9al\xc2V7\xb0\xbe\xba|=l\xe4`\x86\x88=|\x11\xf7\xccu{\xdco\xe7E\xdb)\x1frd\xdc\xa9\xca\x0fc|1\x98\x97\x02\x9f\x1d\x19g8\xcc\x19\x1f\xda\xedX\xee\xe0\x98\xb2c;\xd9g\xc2\x1f\xabn\xb8I\xb1\xaf\xbeIXd\xfb\xf6}\xefM\x87\x87\xba\xf5\x1c<\x86r/\x11\xdfV\x1b\x93\xf8\xab\xfdm\xd4\xff\xcbO\x9f\xc3\xe4\xed\xd2\xd9\x0b\xef\x1e\"\xe2~\xa9\xc9\x9f\xe1<\xdd\xa5\xdaO\xcdt\xd3\x8e\x06\xf6\x8d\xe2s\xd8R\xf1\x11\xa7\xdc\xbbC^\xc0\xd7\xc9:\x1f_1l\xf4\x9d ^Tk\xc7\xdc\x95y\xd8\xeb\x86\xff\xf4\xfb\xd9\xaf\xba\x19%\x95a\xc9xUo\x1e\xc9\x9e#<\xc2@F\xbbBL\xe7\xa0,\x95u4b\xab\xd7!G2\x8eh\xb6\x11\xb3\xd5F\x84iLe\x19%\xab\xe8\xf5\x86e\x18]S\xb2\xc9\xec\"\x9eY\x9c0\x89^\x7fxV\xf1HF1\x8dM\xd4|\x92\xbf\xd8)Lb*\x8b\x18\xdcB#\x85ALb\x0f-\xb6\xd0\xef\x10\xc7\x1c\xa2XC\xec\x96\x19\x08\xc6\xb0\x18[x\x1cS\x98\xc1\x12\x16a\x08\xf1\xec\xe0\x94\x0d\x0c\xf4O\x9e\x8f\x1dc'`\x05O\xc5\x08\x9e\x80\x0dLa\x02\xd1,\xe0\x84\xf5\x0b\xf6\xe1q\x060\x89\xfd\x83\xe0\xd6\x17X\xe6\xcf1w\x1a\xea\x8dS\x19?\xc3\xf0\xf9_\x82Q\xb6\xefh\xa6/\xc8\xf2!\x86@\xd1\x8fk\xfc()\x89\xd5\x93Q\x94,\x9e\xbf\xc3\x8e2z\x98\x92%2y\xa1m,\xf0,^\x12\x83\x17\xe3\xecr\xf8:\xcd\xd09\xfdE\xb9\xba\x1c\x9e\x0e\x02\xbb\x94\xc48\xba2\xfc\x1c\x12\xdd\x8a\xf2r \x9c\\\x08\xce\xc8\xe1\xe2B\xfe<\xdaa!\xfe--xx\xde\x0d\x13\xa1\x04\xbe-\x8bk\x8bD\xeeh\x8e\x0d\xc9\xafa\xb85\x1c\xaf\x16 j:\x9f\x86\xe7\xd2\xbc\x8f\xe2\x91;\xd3OS\xbdn\xdan&)\x98\xa7qz \x15\x99co\xecm\xdbn\x98\x95\xfa\xc3q\x03;\xf6\x99u\xbd\xf7\x0d3\xbby\xfa\xe8\xf9\x8d\xab-j\xa8c\xee'a\xe2G\\\x83)\x84Fb\xb1\xf39\xc5\x0fu\xb3\x10o\xc0\xb6\xdf\xb6\xfd\xf3~\xf9 ~<\xfb\xc3OE\xa3\xc1\xab\xf5d\x80\xf0\xaf\xda\xdb\x8b\xa5\xdc\xf2\xe8\x85\x1e\x1a\xf7/>\xff\xf4b\xc9\xab\xf5s\xdeUM\xbfb\xdds\x0d\xfd\xe8\xb3\xd7l\xc0Q\xfa\xfdv[u\xf7\x93\xa8]4\x8bv[7\xeb7\xd7\xd5\xfaZ{\xd0`P/kP\xb3^I\xbew\x0c\xc4A`\xae\xd3\x1b\xbah\x9c\xff\x15\xcf\xc4\x18(\xa9\x90I\x9ar[-E\xd4\xbfT\x9d\x1eH\xee{\xd6\x8d\x9b8\xad\xeb\xcfl\xbe9T\xbbcj\xf4u\xb1|\x19,\xa4>\xdeP4V\xcc\xbe\xff\xfd\x8f?~\xefGq\xa0\xdf/\x16\xac\xefW\xfb\xcd)\x19\x9c\xe9\xdd\xb0\x8d?\x00\xce\"Z\xca\x0dooxW\xb9@\x1fe\x08A'F\xef\x81l+\xd7\xed\xb5\xb8\xce\xf4KY\xbd(t\xd7\xa7Z\x94\xe8J\x1d}\xa7m\xb7lhx\x1d[\xc2\xaak\x03\xbc\x84\xea\x96\x17\xac\xfe<\xaa@\x06\x85\xd3\x90C\xcf\x9a\xa5G\x80Q?\x9d48\x1f\xe4%\xe6\xb0\xb2\x19\x03\x1b\xddj\xa1\xde\x12*<\xac\xf137V\xfd\x9c\xc7\x98X\x9c\xb4NW&\xe0\xb3Zyo\xc4]\xc5\x9f\xf9\xd9M\x18\xd8\x96gj\xb1\xa8\xf78\xd1}Lo\xab\xf8g\xdd\xc9\xc6\xe5z\x84\x82Uq\xf41c\x8d\xa0\x9a\xf6\x81\xc1\xa8\xdf2\xfeE\xf4~\xfc\x8bD_\xbaC\x9d,T\x92\xa1\x13\x1e/\xce%\xbe\xae\xe0mg\x97|\xd8#\x8ff\xf7\xc1\xaeX\x9any\xf6\x13\xc1\xda\x04k\xc7\x1e\x19\x82\xb5 \xd6\x9e\xda\xa1\xe4\xa4[\xd0\xe5\xf8\x19\xa3n\x94N\xbb:\xfe\xd9\x04u\xe2!|\xcb\xe4\xd084FL\x05\xbf\x1d\xb7K\xb1\xe0\xc1\xd1\xf2\xc8\x83\x8fO(\x01\xe1\xb3_ \x08\x8f\xb5\xe6\xd1\x08\x08' \xdcm\x04\x84K# \xfc\xd0\x08\x08' \xdcg\x04\x84\x13\x10.\x8d\x80p\x02\xc2 \x08' \\\x19\x01\xe1\x04\x84\x13\x10N@8\x01\xe1\x04\x84O\xcd\xffiK@8\x01\xe1\x1e# \x9c\x80p\x02\xc2\xcb\x00\xe1\x06\x9e\xb0\x9c\x84\xbe>\x9f\xb6\x03p\xed\xc31f\x90\x89$\xb1x\xebH\x0d8\xe8\xd9\xd3\xd0\xd6Z\x02\x1bX\x03B\xb6\xd1\x88\xf1\xa9\xa9bB\xb6O\x18\xdc8lL\xc8v\x89(\x12\xb2M\xc8\xf6\xaf\x1f\xd9\x96/\xfd\x00\xa2})\x7f\x1f\x08l \xc9\xe8\xd3a\xdb.\xf7\x1b\xa6\xc6\x0dN^\xfaR\x1fyi\x1f\xf1h i;\x14\xb6y]A\x14\xd3h\xea\xc5\xa7\xc6\x9b\x879\xe8\x18\xa2\xceAJ,\xcd\xcd\x865k~\xe7\x9f\xe0B\xc8 (!d[}\xfdF\xd7\x8aa~\xeftXu\xe3\x9c\x12\\f\x10\x0b\x1d\xdb\xc8)\xfa\xe0V\xb7Cc6\xb7\xca%\x1a,y\xe5I\x1d^\xe0\x16vl}\xc3\xbe\x1e\x15\xd2_u+xs]\xad\xd17Z\xdfNy\x92\xebN\xde\xd6\xed\xc9n\xe47\x8f\x8c\xf7\xf9\xf8c\xdd\xa6F\xcc\xe3\xe9\xb6n\xd7]\xb5\xbbs\xcdo\xb6]\xb5\xd8\x9c\xaekSo\x80\x9bzY(\x9a\x01\xac\x18\x101\x05\xa9\x90\x8b\"]\xbc\x99\x7f\xcb^\xbc1\xe31\x15\x13]v5Z\x08\xf8[T\x9b\x8d\xba\x0b\x9fYW\xaf\x1c_\xb9S[V\xdcG\xbaT\xfd\xa7\x1b9x{<\xd1z\xd5\x7fz-\xc7\xaa\xb3h\x8d\xa3U\x15\xad~\xf8\xee\x17\xb5\x088\x9c\xc4)\x14\x8c\xad\xdc\xf0\xe1Q\x05\xe3/u\xe3\x0c\xc6\xb6n\xea\xed~;\x8e\xea\x87\x98\xdc\x05X\xc6\xe1C~\xd1nw\x1b\xc6\xa3\x9bd\xc8\xb8i\x1a\xc9\x1aNy\xb1\xb2]\xc7vU\xc7n\xd6U`\x87\x89o\x1d\xc3KU\xa8?U\xfd\xc1d\xd2\xd6\x84o]\x99\xcf\xd5}\x88\xa6\x02X\xee;3\xad\xa2*+c\x13\x8aa\xcf\xab5s>\xe8\x9e\x93\xd8W\xb6\xd8\xf3G\x16\xc4sU\xa8\xe2AT\x95U\xaaG(\x8a\xd8\xe0\xad\x18\xbbQ%\x8a\xc5\xce\xcd]\x1b\xf3\xf2\xd7\xc6\xa2\xaf*e\xf1\x17\x96\xb2%k\xdam\xf8\x10\xe4M\x17\x16\x8b\x802\xa4;\x0c/d\xecu[\x8fK#*\xe0\xed'\xa67o\xa9T\x15\xcd\x94B\xd5,\xa1\n\xef\xe8\xa3*\x11\xdbW\xf8\xdd\xfb\xeb\xf3\x97R\x91\xd3\x0dQI[\xb5\x84\x96.\x1a\xae_\x11\x03(\x16\xde\xd4\xd8R\x05tn\xfc\xe0\xe1\xc3nL\xfd\xf0\xad\x0d\xb7\xf7\xb0n\xd7\xad\x9cv\xf7\xab\xc8\x98g\xeeg\xc6^m]\xbd\xff\xf8\xc8\xad\x18\x1b\x08\xca\xea>\xb6K\xd2\xb0G\x92\xeebb\xdd\x7f\xfc\x81\xf3md`\xec\xbd\xf4\x80\x1eU\x8eO\xb9\xc7\x9f\x9c\x033\xba\xd0\xbe\x9f\x8f\x82T\x06\x9a\xfe\xae\xdeI-\x16\x16\xac\xe1]p\x13\xefj\xc4m\x87\x15\xab\xb7\xf7P\xc1\x1b9\xe9\x11\x18\xe7V\xbb\xdd\xcd\xa6n>\x05\x16Z\x1c9\x94\x95@`\xcd\xefo\x96Z\xb9\x89ui\x91G\x19\xd3\xe6\xf4v\x11\xc3\xb5\xc1\\\x1bn%\xca+Q@+f\xce\xed{Fc_wu\xe7!\xeab\xc5y\xb5\xdb\xbd\x15\xf1\x9d\xb4\x9eH\xe3\xa9v;\x8f7y\xab\x0e~\x1b\xd6u\xc9KL\x14p\xeb\"+\xcd\xaf\xce\xa6\xb0&\xde\x10k\xbc\xd4U\xa2\xab\xb9\xe4_\xd5\x82-]\xae\xab\xcb\xd73\x7f\xb4P\x8b\x16jE\x9fx\xec\x8b\x9b\x16j\xd1B-\xb7\xd1B-i\xb4P\xeb\xd0h\xa1\x16-\xd4\xf2\x19-\xd4\xa2\x85Z\xd2h\xa1\x16-\xd4\xa2\x85Z\xb4PK\x19-\xd4\xa2\x85Z\xb4P\x8b\x16j\xd1B-Z\xa855\xff\xa7--\xd4\xa2\x85Z\x1e\xa3\x85Z\xb4P\x8b\x16j\xe1\x17j%\xf1\xdd\xe6\xdf\xbf\xec{\xd6\xfdS\x9d\x16\xc9\xc5\xad\xb1m\x17\xf4\xad\xd4\xd8\xe1\xa3_\xae\xdaRi\xb3\xc7T\xb7`M\xc0\xeaU^\xd6`L7x\xe5{\xa9<,[\xa6\xe6V\xe4\x94Xe.\xf6L\xf7\xe3\x1a\xb6\x1f\xf4\xb5i\x1a\xdeAQ\x80f\xbf\xd9\x98sM/\xea\xe2\xd1\xf5O\x8f\x17DW\xc5\xf4\xc9WY$zX\x85\x8aN\xc0`f0\x8a\xebO8\xf5)G{\nkLY\n\x93\xbc\x84\xc7aT_*\xa0.ejK\xde\x19y\x9c\xb2t\x94\xae\x94\xa5*A\xb5\xd9\xf8\xa2\x88\xd3\x94r\x14\xa5\xd0\x87VH\xa99N\xab\xc9Pk\x8a\xe85\xc5\x15\x9b\xa8fs\x02\xd5\xe6T\xba\xcd \x94\x9b\x14\xed&W\xbd \xf6\xe11\xfd\xa6\xa0\x82\x83\xd5p\x12U\x9c\xe2:N\\\xc99Z\xcb\xa1\xf5>\xd1\x92\xe5i;NW\xb4\xde'G\xe5\x89\xe9\xb4\xdb\xb1\xdc\xc1i\x9d\x8e\xed\x98\x9c~\xffc\xd5\x0d7)\xf2\xf18\x0d\x8bl\xdf\xbe\xcf\xc7\x00\xbbu\xf00\xca\xf1\xa6\x1a\xa5\xa5\xa0[zhI\x99\x9a\x89\xdcr\xfd\x1e\xec\xf1N z\x86\xbe\xfd\xaca\x91\xaf\x11\x0e\x03\x91\xc9\xf7\xde\xf8\xadd7\xc4\x9c\x8d\x07\x0f\xaa\x13\xd9_S\x7f\x03\xf8\x8a;\x8c!\x9dc\xdf\xee\x1b\xd5bZXolg]|\xb8\xecK\xc7g\xb7\xfcEv?O\x0f\xf6Y\x91s\xc1\xf5l'\x15;\x14\x16\xb7\xf3\xc3\x89\xeaO\xdb\x1ec\xa2\xe5\x195\xd2\xb6\xc7e\x83\x1b\xdf\xb0\x97\xb6=.\x11E\xda\xf6\x98\xb6=\xfeun{|0\xe1<\xf9\x83\x7f\xde\xd9\x8a\xd8\x95}\xc6d\xd2x\xe2\x0b\xf4\xdc\x8a\x9e\xfe\xb12f\x0d\x9e\xcc\xc0L\xffa2\xb5<\xb9\x8a>\xe0\xd1\xce0;\x82h\xdbC\x8c\xe3\x17\x1d\xab\xb8\xebcH\x19b \xae\xe7%^+G\xf3\xc92\xed\xdftFv\x04\xdc\xe5\x11\xbd\x0b\xebvU\xc7=\x13S)\x85\nLM\xbe\xb6.t0=+\xe7\xb2\xe5 \xb4n>\xb7\x9b\xcf\xee\xe7\xd8\xb6h\xc5\xfe\x93\xcc\xcb\xd6\xcb\x83yY\xf1\x82\x90\x93\xaf^w\xf3;\x0bu\xef\x9f\x98\x95`\xa9\xe3\xd7\xf8\x94\xd0\xb4O1#\x92\x9ew\xfb\x85|\xdbU\x93Bx \xa7\x0bK\xd8U-\xb4m\x16l'\x1d|\xa7\x96\x04|'C\xd0U\x03\x9f\xd0\xb7\x12\x8bv\xb9k\x18\xff\xd2v\x9f\x0e&\x04i\xce\x96\xe6l\xe3O\"\xcd\xd9\xd2\x9c\xadm\xc9s\xb6\x93\xe1\x0fj\xea\xd6\xe5\xe5\xc5t\xacFko\xb5\xd1\x0c\xee\xafa\x06w\xfa\xb9Q~\n4:c\x10\xe2\x8e|3\xa1r\xf09\x8c\xbc\x02\x15*\\\x19Sf{\x1c\xee+;rR\xd7v\xe5\xfa\x0e\xe8\xd5\x94\xae\x9cI\x988\xacW\x87/\x005(\xa7\xf9\\\x9a\xcf\xa5\xf9\\\x9a\xcf-\x1cE\x9a\xcf\xa5\xf9\xdc_\xe7|\xae\x19\x19\xc9}\x0e\x86\xff\xf1\xcf\xe3\x9a \xa2\xfe\x90\xf6\x1d~\xd1\x13\xb6j\xcfx\xed`27;8yb\xaa\xf4H\xe7eg\x01\xb1\xed!F\xe6\xdfl\x86\xf0\xa3L}\x03\xf5R\xf5O\xb3\x048\xb3i\xf7\xa9\xc9G/\xbf\x94\xba\x00\x7f\xdeo\xab\xe6y\xc7\xaa\xa5\xec\xba\xec\xa41\xc1\xab\xdb\xad\xe4\xe8B\xbc7\xe3V\xcb\xab*\x85\xe8\x18B\xc5\xe0\x1d\xab\xfa}w\xda\x89\xea\xab\xe9\x04\xad\xb9&T\x0b\xf5ZP\xb7N&!i\x17\xb5\x9c\x9c\xf0\xae\xc5\x02\x80xp\xdb/M \xf2\xfc\x95\xe3\x83F\x96\xb5\xfd\xd2 \x1aX1abV\x8e\xe1\x1bQ_\xc0\x7f\xf1\xbamnx}T37\x0f\xe3\xb2\xe2\xec\xb9\xf0\x15.\xea \x98\xc8e?5\xf2a\x18\x17\xd2\xdd\xac\x18\xbb\xe1\xed'\xd6xz\x96p\x7f\xa6\xcc\xdb\xab)\x8b\xf4m\xcab=\x9c\xb2%k\xdam\xe8\x00T\x8c\x85U[\xf1(\x14p\x15\x9f\xe34\xf6\xba\xad\x1b\x95iH\xbc\x1cAF]\xe7\x93P\x153\x03\xb0\xaaYB\xe5\x07\xfaM\xe1CIM\x00\xde\xbd\xbf>\x7f)Wz\xaa\xa3\xf5\x92\xc9Z&\xc3\xb8h\xb8\x9e&\x18\x12\x90\xf4\x8e\xa9>\xdb\xf4Z35\xcb\x17\xbap_\xaf\x9b\x8a\xef;\xd6\x0f#\x121X_\xb7\xebV.\xe5\xf2\xadL\x8e\xf7ko\xeb^\x8eiW\x8c\xe9\xe8\xc9\xb0\xf5*\x88\xe6ka[7\xf5v\xbf\x85u%\xbe\xf9\xeb\x85'\x1f\x06\xa8\xd4Y25\x91\x1e\x97\x84\x13X\xf9\x1f(]\xf2\x0fC?1\xa4\x1d\xd1#\xa0e\xc5+%7\xa9\xa1\x8f\xcf\x19I@$\x01\xc5\x1f\x04\x92\x80H\x02\xb2m*\x01\xf9Z\x8f\xfc\xbe\x1b\xbe\xaf\xf2\x85\x9f\xf1;\xef\xea\xf2\xf5<@\xfa\xed`\xfe\x97$\xa0\x83\xf8\xfc\xd6% L\x8f\xa0\x8c\xd2\xafR\xfaU\xb7Q\xfaUi\x94~\xf5\xd0(\xfd*\xa5_\xf5\x19\xa5_\xa5\xf4\xab\xd2(\xfd\xaa\xbfMS\xfaUe\x94~\x95\xd2\xafF\x93\x88R\xfa\xd5\xdc\xc8Q\xfaUJ\xbf\xea0J\xbfJ\xe9W)\xfd*\xa5_\xa5\xf4\xab\x94~\x95\xd2\xaf\xfe\xe6\xd3\xaf\x12R\x9f\xc6+\x13R\x7f\xc2\xe0\xc6apB\xeaKD\x91\x90zB\xea\x7fKH\xfd\x8b_\xacu\x8a\xffT\xe7G\x12\xa5\x0c\xa4\xd9\x1c\xb5\xaf\x1b\xf5\x9cI\x8a\xf0\xb6\xdd\xab\xe6>\x00\xacr\xf6\x94\x9b\xb4\xb2\x83\xbbay\xa4\x93\xc5\xd7\xbf=z\x14\xbf(2\xe7\x03\xea\xa3\x93\xfbx\xbe+\x1b\xa5\xf7\x83\xf4\xd1\xd2\x1d\x05\xd1G\x11z\xec\xe5s\xf1\xf90<\x8f\xbd\xbaWL)\x8b\xcdG\x82\x19@\xe6\xb1\x159\n\x97\x0f\xc2\xf2\x99%@\x80\xf2\x08L>zq\x1c\"\x7f\x04 \x9f\x80\xc7\xf3\x08\x1c\x1fD\xe3\x83\xfd\x93\xb2\x18\x8f\x05\x18(>\x1aQ@\x01\xf1\x087\x18m\x10\xd2Qx\x04\xf0^\x16wG\xc2\xeey\xa8{\xac\x1f*\x8c\xb9\xe3!w\xef#Q\x08pG\xa1\xa9(2u\xc6\xa2\xce\xfc\x11\x85J\x14j\xa9\x9e\x8a(T\xa2P\xddF\x14\xaa4\xa2P\x0f\x8d(T\xa2P}F\x14*Q\xa8\xd2\x88B%\n\x95(T\xa2P\x95\x11\x85J\x14*Q\xa8D\xa1\x12\x85J\x14\xea\xd4\xfc\x9f\xb6D\xa1\x12\x85\xea1\xa2P\x89B%\n\xb5\x0c\x85\x8aH#~q\xb8\x07\x8a\xc9\xbfm\x9dr\xe4\x96\xff\xe0\xc3KJpG/\xe4\x0c]\xd5\x88\x1f\xd6]\xbb\x0fm\xd9\xf4'\xf1\xfb\xab\xe1x\x8de\x8dj\xe0\xba\xab\x1a.\xf3\xa6\x83re\xfa\xdf _4\xf3\xf2\xc4\x04\xe4\x91bF\xaaR\x8fC\xff\xb2n\\\x81\xf9\x1fL\xde\xcf\xc0\xdc\x8f\xa3\xedk\xa9y\xb6\xff\xfa\x97\xaaWQd\xfe1\x1c\x18\xc1Z\xb4 \xe7\x11\xcaC\xf9,\x8f#>c\x95\x11U\x96\xc8\x1c\xdc\xd1|\x07\x8f\xa8\x9d\x80\xab6 g\xcd\x8c\xa5*\x9fAg\xee\xe9\xaf\xc0\xf7`i\x05\x14\xe2*(d(\xa1\xe1\nT\xfc\x0e\xad\x86B)E\x142U\xd1\xa0C\x11\\\xb42\n\xc7\xab\xa3\x90\xac\x90\x06]i\xe5&I%\x85\xd2J)$\xaa\xa5\x90\xaa\x98\x86[\xf6\xa0\xa6bUS(\xad\x9c\x02N=\x85\x92\n*\x1c\xad\xa2B\x9e\x92\n\xa5\xd4T\xc8RT\xc3\x8fC\xa5vO\x89>7'QV\xe1\x84\xea*\x9cFa\x85D\x95\x15\xf2\x94\xd6X\x17\x8cS[\xa1\xac\xe2\n \xaa+\xa4+\xaf\x90\xa1\xbe\"\xba\xcc\x1f\x10\n,\x94Pa!\xa6\xc4\x02~x\x86Pd!q\x14\x97\xac\xcc\x06\xbdI\xd5\x16\xa1\xceBB)\x0b\xaa\xb4\x90\xa4\xd4Bi\xb5\x162\x15\xdbp\xbb\xea\xe3\xaa-\xe4+\xb7^\x7f\xe2\x8a1\xf5\x16\x8a)\xb8\x80\x17\"\x01\xa3\xe4B\x9a\x9a\x0b1\xb9$S\xd5\x05\x84\xdf\xc0Tm!\x85\x17\xb2\x82\x8bWz\x01Q\xcb\x0c\xc5\x17rU_\xc0E\xf5h\xf5\x17\xf0\n0 U`@+\xc1\x80\x0bz\xba\"\x0cI\xaa0\x84\x94a(\xa5\x0eC\xaaB\x0c\x99*1\xa4)\xc5\x80\xb8 !\xc5\x180\xe7\xe3\x95c(\xa8\x1e\x03\xa6h\x81\xa7\xac\x9c\x92\x0c\x185\x19\x8eP\x94\xbd\x0e\xe5\xbc`@U\x86\xd2\xca2D\xd5e\xc8U\x98\xbd\xde\xd4\xf7ox*\x00\xa14CXm\x86,\xc5\xd9\xeb*\xa8DC\xae\x1a\xed\xf5\xa6\x86\x91\x81I\xb7r\xaa4\xa0\x94i\xc8P\xa7!M\xa1\x86\x1c\x95\x1a\x92\x95j\x08w#\x10Q\x0f!AA\xc4\xaa\xd6\x90\xa3\\C\xaaz\x0d\xe1\x8a\xe7\xa8\xd8^g\x96F\x8c}dpjv\xf0\x81h\xd6aE\x1b\xca\xaa\xda\x10S\xb6!\xacn{\xcf\xc9U\xbd\xa1`\xdbMP\xbf!I\x01\x87\xc0\x08E+e\xd7U\xb7V\xa99FEo\x10\xc6d\xcb\xbbe\xac1\xba\x99\xd3\xd7p8ie\xd1I\x16\xd2\xcaH+#\xad\x8c\xb42\xd2\xcaH+\x03\xd2\xcaH+\x9b\x18ie\xcaH+#\xad\xcc6\xd2\xca(\xe1\xf41\x88G\n\xde\x91\x81vP\xc2iJ8M \xa7\xb1hFQ,#\x07\xc9\xa0\x84\xd3\xbe\xc3\xa2\xe8E\x02v\x81I\xa7\x9c\x82[P\xc2iJ8\x8d@'(\xe14d\xe2\x11 h\x04%\x9c.\x80>D\xb1\x87\\\xe4\xc1\xfb\xae\xa1\x84\xd3\x87F \xa7\xfd\xb8B\x1cUH\xc5\x14\x12\x10\x85d^\xe3\xf3(\x1e\xb93\xfd4\xd5\xeb\xa6\xedf:\x85y\x1a\xa7\x97P\x919\xf6\xc6\xde\xb6\xed\x86Y\xcb\xbc\x1d7\xb0c\x9fY795t\xf3\xf4\xd1\xf3\x1bW[\x14S\xc7\xdcO\xc2\xc4\x8f\xb8\x06SHO\xdb-Y7\x9f\xa8\xfcP7\x0b\xf6\x12\x16m\xbfm\xfb\xe7\xfd\xf2\x13\xfcx\xf6\x87\x9f\x8aF\xa3\xf4~\x11\xe25\x1d\xd8.\xe2c\xcf:\xdcn\x11\xd2\x91\xb9\xf3\x93\xcd\"\xa6>\x9e\x98Z\xd3^\x11Qt\x85\xf6\x8a\xa0\xbd\"\x0e\x8fA,\xb0\xc6\x08^\xc6R\xa1\xa5\xa03\xb7r\x15\x98\xca-\x0d/A\x1c`\x82\x0c\x88)\\\x01\xca\x7f\x93\x0b6A2\xdc\x14tE\xf9o(\xffM.\x00\x05y\x10\x14\x94\x02\xa1 \x0b\x86\n?\x0e\x94\xff&\x0d\x8e\x82D@\n\xf2 \xa9X\x17\xccQ\xa0\x14\x94\x85\xa5 \x01\x98\x82th\n2\xc0)D\x97I\xf9o\x94%CUAo\x94\xff\x86\xf2\xdf\xcc\xac\x0c|\x05x\x86\x080\x10\x16\xa4\x81X\x10#\x1d2\x81,@\xf8Edj9\x12\xce\x82\xac\xe0\xe2!-@\xd42\x03\xd6\x82\\`\x0bpQ=\x1a\xdc\x02<\xbc\x05H\x80\x0b\xd0\x10\x17\xe0\x82\x9e\x0esA\x12\xd0\x05\x94\xff&\x9e$&\xf8s\xf4|<\xf4\x05\x05\xc1/\xc0\x14\x8d\xf2\xdf\x94\x85\xc2 \n\x86A.\x1c\xe6\xf5F\xf9o(\xff\x8d\xcf\x92\x013H\x86\xcc\x80\xf2\xdf8-\x07@\xf3:\xa3\xfc7\xc6(\xff\x8d\xc3h\xaf\x08\x87a\xe7/\x80\xb42\xd2\xcal#\xad\x8c\xb42\xd2\xcaH+#\xad\x8c\xb42\xd2\xca\xe6FZ\x99\xc3\xb0\xa5$\xad,\xdc\xaeH+;4\xd2\xcaH+\xcb\x9e~#\xad\x8c\xb4\xb2\x90\x91Vf,Z4\xd2\xcaH+\xb3\x8c\xb42\xd2\xcaH+#\xad\x8c\xb4\xb2\xc1J\xb5\xdd\x87\xd4\xcah\xaf\x88\xc1=\xed\x15a\x19\xed\x15A{E\xd0^\x11\xcaN\xbbW\xc4\xc1=\x93K\xe1\xa7\x8b\xcd\xf3\xb7\x8a\x98-Z\x9f\x1dC\x1bG(\xa3\x8d#h\xe3\x88\xd1h\xe3\x08\xda8b\xb4\xa2\x9cH\n#\x92\xc4\x87\xd0\xc6\x11\xc7\xb2 \x19\x1cH\x11\x06$\x9d\xff\xa0\x8d#\x8e\xe1=RX\x8f\x0c\xce\x836\x8e\xa0\x8d#h\xe3\x08,\xa7Q\x94\xd1\xc8\xe13h\xe3\x08\xdfaQ\x0e#\x81\xc1\xc0l\x8b\x90\xc2^\xd0\xc6\x11\xb4q\x04\x82\xa3\xa0\x8d# \x93\x95H\xe0$h\xe3\x88\x02\x1cD\x94\x81\xc8\xe5\x1f\xbc\xef\x1a\xda8\xe2\xd0h\xe3\x08?\xbb\x10\xe7\x16R\x99\x85\x04^!\x99UH\xe3\x14h\xe3\x884\x16\x816\x8e\x18\x8c6\x8e\xd0\xf6\xeb\xd98B\xe6\xc8\xf5\x95\xfd\xe9\xfb\xe0F\x11\x07[D\x88\xcfh#\xbf\x9d\xcd*\x92\x9aA{V\x15\xda\xf9!%Z\xb4\xf3\x83\xb2\x13\x077\xbeg\x01\xed\xfcP\"\x8a\xb4\xf3\x03\xed\xfc\xf0\x1b\xde\xf9A\xc2}\x81\xfd\x1e\xac\xf0}\xecY\xf7'y\xb8,x\xcd\xecm\x1f\xe4\x9fe\x8b\x17\xf1\xd3CQ\xb3\x1f\x80=B\x19\xdcM\x85\x14\xe9\xa5\xfe\xcc\x1a\x18\x86;\x07{F\xa8\x8b\xeb_\x1f\xf1~\x11cDm\xe3\x0f@\xac|\xfb\xfd\".\xde\x1c\x0cIg\x9bB\xd4\xbd\xde\x05\x8c}\xad{\xcf\x1a\xfc\x9eI\x0d Zl\x1f\x86\xa4\xcc\xbd\xcf\xd7\xd4b\x08\xe3dG3k\xbc\xad\n\xe8\xad[\xed\x97\x12\xa5T\xe5\xfc\xf5\x9b\xd5\xf6\xa3\x84\x88\xa0^\xaa'v\x86\x12\xb9x_e\xb2\xef\xcdoG\xfa\xea\x7f\xdeo\xab\xe6y\xc7\xaa\xa5|w\xd9\xec\xcd\xb8G\x9c\xd3\x85\xfd<\x1f]\x0c\xf3\xfda{U\xe50w\xd1y\xfe\x8eu\xdb\xba\xef\xeb\xb6\xf1f#\n=\xe9\xca\xbc\xcf\xbb2|%\x02\xed\xf6r,\xa8\xfe\x9a\xd2S\x02\xc36'\xed\xd0\x7f\xcb\xbdz\xc4\xd7\xa8\x9f\xe5\x8aE\xc64-\xd3O\xcf\xc1r\xf1\xa7v\xa5\xae4;\x9d`r\x82\xc9\xe3-\x9a`r\x82\xc9m\x9bJYQ\x06\\\x0d\x1e\x8f\xe3\xbf\xf5\xe8\xf7\xea\xf2\xf5\x9b\xb7\x99\x01\xbb'<\xb8\x96\x1c\x06\x873@\xdcM\x7f\xeb\x1f\x1f7\xfc]\x94b\x8c\"\xdcQ\xd9\x05\xcf\xde\x95\x80\xb7c\xe8\xb6o\\6Z\x1cd\x8e\xa1\x82e\x91m\x1f\xb0\xfd\x0dj\x98\x07j\xfb1\xedh[9\x12\xd1\x8e\x02\xda\xd8\x02d\xc1\xd9Q4\x9bG\xc0\xec \x96\x8d-\xba\xb7U\xe6\x01\xd9~\xb0+\x10\x8bl\x18\x1b\x87Q\x16\xa0( \xa2$\x88\xd2\xf9;A\x94\x96\x11DI\x10\xe5h\x04Qr\x82(\xddF\x10\xa51\x82( \xa2$\x88\x129J\"\x88r0\x82(m#\x88\x92 J\x87\x11D\xe9:\x86 J\x82( \xa2$\x88rj\xfeO[\x82( \xa2\xf4\x18A\x94\x04Q\x12D\xf9\xa0\x10\xa5$\xcd\xec\xdeh.\xb1\x9d\x1e\xa24$F\xbc\xd8J\xca3\xf0\xe4Q\x85\xc4\xa1\x92\xa7!N^l\xc5c\xd6\x05\xf2\x10\x0e\xc2\xe1_\xd4\x91\x07)\x08\xb5\x07\xf9\x1a\xd4\xc0\xc9\x81T\xedfJ\xb4\xc7'&J\x8f\x14-\x99\x84\xc86\x9e\xaf\xe49\xe7\x99(\x1d\x17\xa5\xe3\x8a\xd3\x0c\x94\x8e\x8b\xd2q\xd9\xe6L\xc7u\xf0\x18N9\x12\xdd\xf3\x16\xc0I\xcc[\x81\xf6aVF\x18 a$\xa3\x11FB\x18\xc9h\x84\x91p\xc2H\xdcF\x18\x891\xc2H\x08#!\x8c\x049J\"\x8cd0\xc2Hl#\x8c\x840\x12\x87\x11F\xe2:\x860\x12\xc2H\x08#!\x8cdj\xfeO[\xc2H\x08#\xf1\x18a$\x84\x91\x10FB\x18 \x16#\xb1\xd2vL\x12q\x19\xa8\xe2\xd8,b8\xb6\x84\xd2p\xe5\xe68\xa24\\'\x0cn<\x81\x14\xa5\xe1*\x11EJ\xc3Ei\xb8~\xc3i\xb8\xac\xec5/~\x11/\xe4@\x1e\xae\x8f=\xeb\xect2v\n.\xcb\x8fag,\x1eR{: !-oOL\x08\x1e)\x08\x19L\xf3\xc3\xf3y\x94\xc7\x0f\xbeDs\x81% ?\xa8\xed\x9c\x0fG\xb6\xa2MY\xc9\xb3\xc6\xbb!\x9ed\xff\xe6\xc6\xb1\xbc`1\xa2IY1Qx\xa4\x14\xd44:\xb6\xf1\x07P\x1a\x1f\x05\x994\xdb\xd9o|\x0c\xbc\x9b\x15\xfa7\xf1\x8b\xe9\xc6\xca0\xb8\x84\x0f\x950\x85\x13#;=\x16\x9e\xb5\xcb\xa9\xed\xaa\x8e5<\x1a\xe0b\x05vn\xa2\xa8\na\xca\xeet\xd0xw\x1fD\xb5\x01}\xf5w\x96\xc0\x99\x1a)\xfby<\xba V\x18\xde\x8c~gEs=P\xeat\xb3\xc5\xf9\x14\x0b\x19p\x90\xben\xd6\x1b\xab \xbb\xfdQFF\xca\xc8H\x19\x19)##\x1c\x9f\x91\xd1\xbd\xb3\xa7\x19\xf4\xc431*\x92l\x18x]]\xbe\x9e\xf9#\xa8\x8c\xa0\xb2\xd8\xab5\xfe\xf0+#\xa8\x8c\xa02\xb7\x11T&\x8d\xa0\xb2C#\xa8\x8c\xa02\x9f\x11TFP\x994\x82\xca\x08*#\xa8\x8c\xa02e\x04\x95\x11TFP\x19Ae\x04\x95\x11T65\xff\xa7-Ae\x04\x95y\x8c\xa02\x82\xca\x08*{4P\xd9\x00\x01\x15\x06\xb3\xa2D\x19e1LK\x11GY\x0cO\x18\xdcx\x1b\xa5,\x86%\xa2HY\x0c)\x8b\xe1o \x8b\xa1\x1b\xd5}\xf1\xcbH)\x07\xd2\x17\x1a(n\xbe\x87s\xdd\xa8\xe7L\xfcV\xdd\xb6{n\xbf\xbf\xd5\xc4/\x1f\xb2\x19\x0e\x03\x02\x17\xbe\xfb\xc4\x04\xe0q\xd3\xbbEq\xbe(\x83\x1b\x95%\xf0\x10Z\x11\xfa6\\\xce\x10\xc8\x1a\xc7X\xcbP\xb7\x11\xe6\xb6`A\xf3h[?k\x1b\xbd\xd7Gs\xb6Q\xca\x16[\x84<\xc2\xb6\x1c_\x8b!\xe3\x12\xc18\xe2\xe2\x88\x8bs\xfdN\\\x9ce\xc4\xc5\x11\x177\x1aqq\x9c\xb88\xb7\x11\x17g\x8c\xb88\xe2\xe2\x88\x8bC\x8e\x92\x88\x8b\x1b\x8c\xb88\xdb\x88\x8b#.\xcea\xc4\xc5\xb9\x8e!.\x8e\xb88\xe2\xe2\x88\x8b\x9b\x9a\xff\xd3\x96\xb88\xe2\xe2m\x1a\xb5\xd6\xf1\xc6\xd0\xac\xa6\xf3\x899{\xb0\xcc\xc2B{\x87\xa5D\xcb3\x1bD{\x87\x95\x0dn|\xd7+\xda;\xacD\x14i\xef0\xda;\xec\xd7\xb9w\x18\x8a\x18\x0f\xa0\xe1\x1f\xf4\xb123\x96\x93\xfd\xeeMr\xb3J#\xdb\xb3\xad\x8b\xa6\xbb\x84\xd9\xee\x9e\x98\n?R>\xdb\n\x8dm\xfc\x01\x08\x96o\x0fg\x07\xd4\x9bh~;\xc3\xbd\x8aO\xa5[\xc6\xfcr\xe0\xa2\x93d\x9a\xbb\xcaC\xae\xbap\x8dC\xa9\xc80\xc9\xc8\\8\xba\xdeL*\\\xab`\xe9c\xa5.v\x9f\x0e6Z\x13et\x9e\xc2\xber\xd65\xd5&\x1aQ\x0c\x0dn\x8d\xfa\xcf\xb5_Q\x06\x85\xe3\xd5\xbd\xbf\x14\x9c}\xe5E/\x7f\xad\x11\x94p\xdd\x1b^\xfb\x9f.g\xad\xf4\x19\xb0h\x9bF\xbd\x12\xe5\x17r\xa8n\xd1\xc7\x1c\x10\x8f\xba\xb0\xbb\xaa\xbf\x9b\xf6\xec\x87\x16\xea\x86F\xf3vH\xa3!\xca\xac\x0cSre=\xaf:\xef]\x1e\x0dq\xbfGC=\x14\xa3\xc5\xbb\xb1\xd1.\x9a%\xfbj\xda\xd0\x00\xb5\x99\xc7_\x8e\xbdD#\x0b\x00s\xa3\x8d\x9d\x05\xaf\xd6*\x10~:A\x19k\xbc\x0f\xe4h\xbf\xfeX\xb1f\x19\x8b\x14\xaf\xd6\x85#\x95R\xf5\xebj\x0d\x1d[\xb1\x8e5\x0b\x06O\xe54\x86\x9e\xdaxf\x1eY\xf5\x81\x13\x9al2\xc6\xf8\"$\x9f\x0dE\x13\xfd\x9b\xba\xb2\xb5\xb4\xe2g\xb4\x9c\xda\xdb\x1bg\xabk\xe9y\xed\xb1\xae\x98\xee\xf3c\xb7\x99m\x9f\xad\x16MI\xa4Bq\x93\xf5\"\xe2L\xbbz[7\x9f2\xfa\xcd\xd07f\xbc\xbf\x8c\xf4\x95\x88\xc8\x9a\xf7\x88\x1a\x8fn\xaa\xf9W\xf63\xd1PV{\xb9\xb4\x06\x16\x15g\xeb\xb6\xab\xff]\xce&:=V{~\xe7Z,\xa7\x0c_\xa0W\xd2OtVa\xd16\x9fY\xd7W\xa8y\xaab3>\xce\x1d\xeb\xdb\xae^\xd7M\xb5\xd1\x0b\xceuwc\x95\xcf\xe9s\x182,o<\x93\x9d\xca\n\xb5\x85\xc8;\x13\xf7\xbe\x94\xae0\x8f\xd7\xb5F\xa8\x87J\x86O\x8a\xdf$e\xac\xd9oc\xdd\xcas\xb8|\xff\xe1\xfa\xe6\xea\xfc\xe7\xf3\xab\xf3w\xaf\xcfo\xae\xffvy~\xf3\xf1\xdd\x87\xcb\xf3\xd7\x17?_\x9c\xbf\xc9:\xff\xea\xfc\xf2\xed\xdf\xb2\xce\xfc\xd7\x8f\xef\xaf\xcf\xb3\xce\xbc:\x17\x7f\x0d\x9ej\xd6\xcb\x1eUg\x0c\x9f?Z4\xbe/\xe1]\x8b\xbc\xf1\xd6\xea\x81X\xff\x1f\xb8-/\xd5:\xcbq\x0c>\xcbf\xb1\xdb\xdc\x9bt\x13\xe3b\x85\xc0Db\xe4\x9a\xf2\x86\x86\xaf\xf9\x8f}\xcb\xc7%\x04\x05\xae\xa9\x9aB\xb4\xa2V\xff\x83\xbej$\x85\x8b2\xf4\x13\x8a\xeaL\x95\x1dL\xfd\x8f=\"\xa2\xcc\x12\x9cz\xb0BG\x9f\x92K]\xc2\x83\xba\xcd\x07\x08\xdf\xf7r\x88\x10\xc0\x7f\xa5\xa9\x95\xc4\x03U\")\x8c\xb6\xd9\x04V\x8e*\x1bR:\x89`\x18\xc5\x15\xd1/\x99\xac%m\xcf\xaf\x86\xa2\xfb\x07L\xb2\xe5\xc5\x9e\xf9x\xec^\xa9\x1c.\xc3\x18\xc4j\xeb=\xfa\x85#\xf1q\xb6\xac9[~\xe3rZ_9o\xab\x9e\x83*\x04\x88\x13\xa3\xa5\x96\xf9\xb6\x8e(\xaa.\x82L\x19\x13\xb9\x98\xf5\x8e\xb2V\x8ej<\xa6nT\xa5E\xb8\xab\xdbv\xcf\xa1\x82\xben\xd6\x1b\xa7\xbb`\x02\xaf\xd0\xf7\x13\xa5\xdf\xa2\xf4[\x94~K\xdbo;\xfd\x96\xaf\xf5H,p\x02\xdf\xa1\xb68tyy1e\xf8f\x87\x8c \xb5\x86\x1f(\x9f\xd6\xecW\xca\xa7\x85\xe9\x19\x94Q>-\xca\xa7\xe56\xca\xa7%\x8d\xf2i\x1d\x1a\xe5\xd3\xa2|Z>\xa3|Z\x94OK\x1a\xe5\xd3\xa2|Z\x94O\x8b\xf2i)\xa3|Z\x94O\x8b\xf2iQ>-\xca\xa7E\xf9\xb4\xa6\xe6\xff\xb4\xa5|Z\x94O\xcbc\x94O\x8b\xf2iQ>\xad\x87\xcc\xa7\xc5[K&V\x1c\xd7t\x1a\xf5\xf4\x89\xb4(\x95TZ\x9e\x1eJ%u\xc2\xe0\xc6\xdb(\xa5\x92*\x11EJ%E\xa9\xa4~\xcb\xa9\xa4^\xfc\xa2a\xfe\x7f*_\xae\xa4R\x92\x963\xb9\xa4D[\x9b`q)\xf9\xa4.G\x8c\xeeQ\xa7\x91*J\xf4E\x93AE\xc5\x07<\x87\x96\x9c\xeb)\x90\x15)\x96\xd1\x89\x07\x89\x1a@es:,\xf6\xb1\xb9\x9c\xbeA\x90\xb19\x9c\xa2\x19\x9c\xa2e:\x84kS\xb27\xf9s7e\\\x18\x91\xb7)\x9c\xb5\xc9Q\x97\x8c\x9cM\xc1\xe7\x10\xa2\xcf\"\xa0\xb25\xf1\x00\xa4e,\x9ay ZRe\xf1\xf2*C\xe5\x1c\x88\xde\xd7\xd1\x10\xcd}\xb4\x18\xe5:\x1az\xfd\xbc#\x9d\xb0\xcb8>\xfd \"\xcf\xc0\xaf7>\xd1\xec\x02\x88\x84' \xd1\x19W\x82c\xf3\x98\xc4\xb2\x94\x14\xcdQ\xa2\x9d\x1d\x97<)\x9e:\x89\xfa\x89\x99=\xfcs@\xfd\x84\xdb\xa8\x9f\x088;&\x93Q8\x8f\x11\xf5\x103{\xd8'\x00\x99\xb3\xe87\xdbC\xa0\xf2\x14!\xf2\xf4$D\x07_\xe1r\xf9\x89\xf0\xd9\x89\x12r\x13\xa5\xd7\xf9\xb8\xbcD\xe6c\xf4\xe8\xacD\xdaQVN\"\xffwT\xac\xe7\x0b\xf6z\xd1X\x8e\xef\x95\x12\x99\x88By\x88\xb0EA\xe5 Be \x8a^\x11\xd1\xa1\x1c\xb6\xb0\xe3r\x0f\xe12\x0f\x15\xb8\xe7G\xe7b\x96n\xe2\x8fMJ\xb6\xa1\xe8\x0dQ\x16\xcf4\x14\xcd\x83\x93qv<\xcbPn\x8e\xa1\xcc\x0cC\x05\xf2\x0bahec\xd1\x98&\xe4\x16Bdn\x80\x07\xc9+\xf4\xed\xb3\n}\xe3\x9cB\xbbxF!\xe4S\x88\xe8\x1c\x95\x1dL=cs a2 \x9d\xa8\xb0\x91g\xa1l\x06\xa1\xbc\xfcAy\xd9\x83\xac\xbc\x0c\x85r\x07\xc5\"\x96\x997\x08\xbck\xfb\xbcY\x8309\x83tiS3\x06E\x9bY\xe8\x9d\x94\x9e+(1SPj\x9e\xa0\xa4,AI9\x8223\x04\xe1re\x14\xce\x0et\xd2\xdc@\xdf>3\xd0\x03\xe4\x05\xfafY\x81\x109\x81\xa2O(.\xcf\x8e\xee\x1fR\xb2\x01\xe1r\x01\x95-_~\x16\xa0@\x0e\xa0h\x11\xf5\xc5\xe3\xf9\x7f\xac\xb7\xccq\xd9\x7f|/\x17\xc9`\xa8\x97\x18\"]\x87N\xd0!\x8bsu\xf9z\xe6\x8b\xd2rPZ\x8e\xd8\x18\x12\xfb\xa1Di9(-\x87\xdb(-\x874J\xcbqh\x94\x96\x83\xd2r\xf8\x8c\xd2rPZ\x0ei\x94\x96\x83\xd2rPZ\x0eJ\xcb\xa1\x8c\xd2rPZ\x0eJ\xcbAi9(-\x07\xa5\xe5\x98\x9a\xff\xd3\x96\xd2rPZ\x0e\x8fQZ\x0eJ\xcbAi9\x1e2-\x87{\x19\xe6\xa6\x9e|\x99}\x83\xd4\x1c\n\x0f\x8a\x17\\\xb1\xaa&\x97\xc8\xb7\xc9 Rz!\xf6\x8b\x8a\xf3jq\xb7e\x8d\xe1,}\x8b\xb2_\x8d\x07\x0e\xeb\xb3\xe5\xb4\x84\xf5w;0w\xd5g\x93dD\xad\xd5\x1eBz\xb0J\xdbr\xfd\xc4\xc4\xea\x91.\xd8>\x08\x97m\xfc\x01\x84\xbd\xe8\x82\xef\xa4\x89-\xcc\x1e\xa3\x81I-\xf4C\xcd\xdb\xe1/\xb5\x7f\xe6r\x0c\xb6\xc5\xdb{\x8f\x1e\x17\xf6z\\F\xb8\xbf\x87\x08\xd3a0\xdc\x95\xf6y\x1a\xea\xec<\"V\xd7\xd0rz\xcc\x82\xfa\x91k\\\x0d\xf8\xd8X|\xe7)R0k\xbc+\x82\"\x0f\x03 \x1e\x08@\xa8\xdd\x80\xbb\xdd\x80\x9c55\x96\xaa|\x07\x9d\xb9\xa7?\x03\xf3\x01\xa5\x15p\x88\xab\xe0\x90\xa1\x84\x87+P\xf1;\xb4\x1a\x0e\xa5\x14q\xc8T\xc5\x83\x0eEp\xd1\xca8\x1c\xaf\x8eC\xb2B\x1et\xa5\x95\xbb$\x95\x1cJ+\xe5\x90\xa8\x96C\xaab\x1en\xd9\x83\x9a\x8eU\xcd\xa1\xb4r\x0e8\xf5\x1cJ*\xe8p\xb4\x8a\x0eyJ:\x94R\xd3!KQ\x0f?\x0e\x95\"\xd2\xa3\xcf\xcdI\x94u8\xa1\xba\x0e\xa7Q\xd8!Qe\x87<\xa5=\xd6\x05\xe3\xd4v(\xab\xb8C\x82\xea\x0e\xe9\xca;d\xa8\xef\x88.\xf3\x07\x84\x02\x0f%Tx\x88)\xf1\x80\x1f\x9e!\x14yH\x1c\xc5%+\xf3AoR\xb5G\xa8\xf3\x90P\xca\x82*=$)\xf5PZ\xad\x87L\xc5>\xdc\xae\xfa\xb8j\x0f\xf9\xca\xbd\xd7\x9f\xb8bL\xbd\x87b\n>\xe0\x85h\xc0(\xf9\x90\xa6\xe6CL.\xcbT\xf5\x01\xe170U_H\xe1\x87\xac\xe0\xe2\x95~@\xd42C\xf1\x87\\\xd5\x1fpQ=Z\xfd\x07<\x01\x00H\n\x00\xd0$\x00\xe0\x82\x9eN\x04@\x12\x15\x00!2\x00J\xd1\x01\x90J\x08@&%\x00i\xa4\x00 nB\x88\x18\x00\xcc\xf9xr\x00\n\xd2\x03\x80)Z\xe0)+G\x12\x00\x86&\x80#\x88\x02\xafCq`\x88*\x80\xd2d\x01D\xe9\x02\xc8%\x0c\xbc\xde\xd4\xf7ox*\x00A\x1a@\x986\x80,\xe2\xc0\xeb*H\"@.\x8d\xe0\xf5\xa6\x86\x91\x81I\xb7rT\x02\xa0\xc8\x04\xc8\xa0\x13 \x8dP\x80\x1cJ\x01\x92I\x05\x08w#\x10Q\x8f!AA\xc6R\x0b\x90C.@*\xbd\x00\xe1\x8a\xe7P\x0c^g\x16#\x80}dp4C\xf0\x81h\xd6a\xa2\x01\xcaR\x0d\x10#\x1b L7x\xcf\xc9\xa5\x1e\xa0`\xdbM\xa0\x1f \x89\x80\x80\xc0\x08\xc5\xac\x9dV2\xd7\x80\xee\x87D1\x93\xd3i\xd4\xfd\xa6\xb9(*^\xa9D\x14v\x1et\xaf\xc71[\xbdO\x9f\xce\xca+n\xb6\x14\xf1\xaf.E-\xec\xf6N\xd3\xe0\xb2\x1f\x0c\x1b\x9b\xe8\x95\xce\xc3\x1e'\xb0\xab\xfa^M\xed\xaa\x9dP\xfe\xb1g=?S\xbf{\x9c\x8d[\xc0\x846A\xb9\xe0\xd6\x13,\xf7\x9b\xf0M\x00p\x99!\xae\xea\x184-l\xdb\xcel\xc6\xe0\x9c\x05\x93\xfb!\x1c\x19\xccxJ.\xef\x1c\xd2\xb0\x1d\x83o\x7f\x0ek)\x93\xaf\xbev\xa0\xed\x9d-<\x87\x7f\xa9\xe46\x08\xcf\xa0\xe6\xbd\x99\xe6\xefa\xdfH%\x84-\xd5L\xe6\x97\xba?l\x1f\xf1i1{\xf7\x1bU\xab ?V7\xb0\xbe\xba|=.\x8c\xd7\xddW\xaf\xb2\xfa\xb9n\x8f[eZ\xb4\x9d\xf2!{\xeaNU~x\xcf\x88\x17\x8a\x9c\x1c\xb5#\xe3\x0c\x879\xe3C\xbb\x1d\xcb\x1d\xec\xf7:\xb6\x93I\xe8\xe1\x8fU7\xdc\xa4\xd8\xc8b\x12\x16\xd9\xbe}\xe3\x8aiw\xa6[\xcf\xc1c8d\x1c\xb0\x80\x1dT\xf2\x01\x97\x9f\x17s\xa8H\xdc!\xcaC@y\x08b\xd3\xfe\xf1\xee@Y*\x8da\xa6\xb0\xbd\x0e\xb1$FQ\n\x83\xf2\x10P\x1e\x82\xd1\x8a\xd2\x15)dE\x12UAy\x08\x8e%(2\xe8\x89\"\xe4D:5Ay\x08\x8e\xa1$R\x08\x89\x0c:\x82\xf2\x10P\x1e\x02\xcaC\x80\xa5\x1b\x8a\x92\x0d9T\x03\xe5!\xf0\x1d\x16\xa5\x17\x12\xc8\x05\xcc*\xfb\x14b\x81\xf2\x10P\x1e\x02\x04}@y\x08 \x930H\xa0\x0b(\x0fA\x01z J\x0e\xe4R\x03\xdew\x0d\xe5!84\xcaC@y\x08fVbM8V\xd1OV\xf3\x93\x94|\xcaC\x90\xa9\xd8S\x1e\x02c\xa7\xcbC0n\xf5%\xa5v9g?\xdb\x89\xfeT\xcb\xfb\x8f\xceB\xc0g+\xf2\xbfMV\x02pm\x96\xff\x89\xdd\xfbJ?S\x16\xb5\xa2_\xe9\x97\x96\xbd\x17\xbe-a\x9e\x0d\xf2\xbf\x9c\xb3[\xcf&\xb7d\x00L\xca\x81\x90\xa4/\x13\xf3\xb7\x8d\xfc\xa8oW\xab\x9eq\xf1\x9d<-.X\x9aC\xcf&\x9b\x97\xe4\xec\xa6\xef\x0d\xe3d\x06\xc7\x11DU>_\x1cg\xb3'\xba22\x94\xcd~+7c\xd3\x7f\x93\xfd\xdb\xa2j\x86\xcdU\xbe\xdc\xb1\xc6\x04~\xdf\x0c3\x86\xb3\x0f\x85\x0b\xe9m\xc3\xfa~\x0c\xa1\x9ac\xdb\xf7\"\xd4\x9fXb<\xa7\xeeO\x1c\xdcx\x1b\xdd\xd4\xdb\x1a\x1b]y\xac\x91\xb9}\xdc\x84\x9aM\xb6[\xb0\x16\xc5\xf7\x9b\x99\xca\xac\xe6\x8e\xec?]\xac`\xc3V\xdcp&\x1a<1\xa3q9\x11\xae\x1e\x10u\x11\x11\xe7\xdb{`\xd5\xe2\x0e\xaa\xdd\xee\x01\xa3h\xd3\x1f\xe3\xf9\xa1XZg\xc8\xfeU\xed\xdc#z \x10\xff\xa8\x9be\xbd\xa88\x1b$1\x1dAy\xa0nH\xb6\xbb\xbaYl\xf6\xcb\xd9X\xbbRW\x194\xc9\xd9\x1d\x93\n\xb75U.^\x96c\x9d\xe63\xe7\x1f/\xfa\xd9\xdd\x9aUA~\x9et\xac\xd7,\x82|\xbc\xc6\xe7QV\xeab\xf7\xe9\xa3\x84\xae\xa0\x9e|\xb78Oa_9\xeb\x9a*\xce\xd1c\x88\xec\xa7\xed0\x92?\xd7~E\x19\x14\xa2X\xf7\xfeRp\xf65\xb2'l\xe2\xe5\xaf5\x9f\x13\xae{\xc3\xeb\xd0F\xb2\x8eZ\xe93\xac\xcd\x86\xcdZ\x05\xefU\xa2\x8f9 \x1euawU\x7f7\xed\xec\x0f-\xd4\x0d\x8d\x16Y;\x00\xb82+\xc3\x94\\Y\xcf\xab\xce{\x97GC\xdc\xef\xd1P\x0f\xc5h\xf1nl4\xb9\xe0\xc1\xb4\xa1\x81\xf8\xb3\x17\xb4\x1cj\xb4\x9c\xda[\x9f\x89o\xd4\xb5\xf4T\xf7XWL\xf7\xf9\xb1\xdb\xcc6\x80R+\xca$o\xa2\xa0\xd2z\x11q\xa6]\xbd\xad\x9bO\x19\xfdf\xe8\x1b3\xde_\xa2\xd6\xa5c\xbe\xe6\xaf\xd5xt\x92\xe3@\x96\xfc\x99h(\xab\xbd\\w\x04\x8b\x8a\xb3u\xdb\xd5\xff^Y\x93\x8bS\xab\xf6\xfc\xce\xb5\x92P\x19\xbe@\xaf\xa4\x9f\xe8\xac\xc2\xa2m>\xb3\xae\xafP\xf3T\xc5f|\xac\xd67NY\xb5]\xbd\xae\x9bj\xa3n\xb8\xe9n\xac\xf29}\x0eC\x86\xe5\x8dg\xb2SY\xa1\xb6\x10yg\xe2\xde\x97\xd2\x15\xe6\xf1\xba\xd6|\xf9P\xc9\xf0I\xf1\x9b\xa4\x8c5\xfbm\xac[y\x0e\x97\xef?\\\xdf\\\x9d\xff|~u\xfe\xee\xf5\xf9\xcd\xf5\xdf.\xcfo>\xbe\xfbpy\xfe\xfa\xe2\xe7\x8b\xf37Y\xe7_\x9d_\xbe\xfd[\xd6\x99\xff\xfa\xf1\xfd\xf5y\xd6\x99W\xe7\xe2\xaf\xc1S\xcdb\xe2\xa3\xea\x8cY\xbc0Z4\xbe/\xe1]\x8b\xbc\xf1\xd6\xd2\x8aX\xff\x1f\xb8-/\xd5\"\xd4q\x0c>\x19\x13wl\xb7\xb9\xd7\xf8\x91\xb5\x92#0\x91\x18\xb9\xa6\xbc\xa1\xe1k\xfec\xdf\xf2q}E\x81k\xaa\xa6\x10\xad\xa8\xd5\xff\xa0\xaf\x1a\xc9F\xa3\x0c\xfd\x84\xa2:Se\x07S\xffc\x8f\x88(\xb3\xa4\xca\x1e\xac\xd0\xd1\xa7\xe4R\x97\xf0\xa0n\xf3\x01\xc2\xf7\xbd\x1c\"\x04\xd8hij\x99\xf5\x00\x9aH0\xa3m6\x81e\xb5\xca\xe4\xda n\xe0S-\xc2\"\xfa%]\xcf\xcb\xb6\xe7WC\xd1\xfd\x03&\x9d))\xfc\xcc\xc7c\xf7\n6\xb5$\xbf\xf4\x18\xc4j\xeb=\xa3Tc\x94jL\x1a\xa5\x1a\xa3Tc\x94j\x8cR\x8d)\xa3Tc\x94j\x8cR\x8dQ\xaa1J5F\xa9\xc6\xa6\xe6\xff\xb4\xa5Tc\x94j\xccc\x94j\x8cR\x8dQ\xaa\xb1\x87L56\xc9$\xa5(\xaec\xf3`\x1d|\xcdG2\xce\x8c\xf9\x0b\x10\xe5\xd6 \x07NP\xec\xd4\xf4]\x94\x12+-\xdf\x10\xa5\xc4:ap\xe3\xc9\x9c(%V\x89(RJ,J\x89\xf5\xebL\x89\xd5\xb1J\xa7\xbc\xfa\xfc;\xff\xd6\xceb\xfc\x11\xc8\x80ue\x9c\\\xca\x03\x95\x9e\xd6\xc3,]\xa5:F\x0df4\x92n\xae\xa2\x1dN2a\xcd\x9c>1\xb5\x7f\xac\xc9\xb0\xac\x18\xd9\xe6u\x05Q\x94$\x9a\xd4**\xa3\xe0y:\xc7\x18Q\xf4\x17\xc3\x8aZ\x89Y\xa9\x9b\xdb1\xa5\xa38\xdcul]\xf7\x9culyc\xee\xb7\xa7\xe4\x1a\x0bU.\xad\xa5\x8dW\x83\x07s\xff\xff\xaa\x87L\xba5\x04\x02\x11X>\x17cv\x00X#:\xc9\xc0\x12\x1bw_spTt\xfd\x04\xc0\xff\xbacR\xc8\x8b\xd6\x15\xb5\x02X\x17\xdcq\xc4\xaac\xec\xc6\x9fO\xca{\x0f~\xee\x18\xbbf_\xf9\x7f\xca\xc8\x9b\xe0z*a\x8dz\xfd\x81\x13\xb6\xad\xbe\xdelX\xb3\xe6w\xb1\x82\x95\xd8Y\x1a\xd7p\xae\xef\x98(\x17\xa8r\xa9\xb1C\xb8\x9e\x01gw\x95W\xe2\xec\xd8\xfa\x86}\x8d\xd5;\xb2h\x0b\xa3\x81*\xbbb\xeb\xf3\xaf\xaa6r\xac7\xad\x92\xbeaz\xe4\x11\x90;\xf4\x02,5\x18\x11\xbd=o\xf5\x90\xf6\x8b\xfc60\xf8X?\xf9L\x08\xb04 \xd70\xa9\x80\x1eN\xd2\x85n\x98\xd9\xb1~\xfeb\x9c\xcc\xff\xed\x0e\x1e<\x17,\xa3y\xf8\xe1M\xe9\xecu]O\xa8.\xdf\x01q.G\x00\xb3\x82\xe5\xd3\xaeSGpu\xf9\x9a\x00W\x02\\\xa3\xdd\x03\xb6s \xc0\x95\x00W\xb7\x11\xe0*\x8d\x00\xd7C#\xc0\x95\x00W\x9f\x11\xe0J\x80\xab4\x02\\ p%\xc0\x95\x00We\x04\xb8\x12\xe0J\x80+\x01\xae\x04\xb8\x12\xe0:5\xff\xa7-\x01\xae\x04\xb8z\x8c\x00W\x02\\ p}H\xc0\xd5\x82\x17&\xcc\xa8\xcd\x92@\x160\x8a\xc3\xc8\xcap7r\xbf\xba_t\xf6\xcf\x7f\x8e'!P\x9c \x84#\xb1\xd9a;:+\xd7\x96\x9b\xc0yb\x02\xf3H\xd9\x9bY\\l\xe3\x0f\xa0\x8fE\xb9\x9d\xa4\xf9!L\xca\xeb#7\xa3\x1b\xd8\xac\xe8\x86t\xbb\xbd\x87\xf2\x08'\xa8-\\\xdd\xf9&\xd4\xad\xab.j\x86\xbf]\xd4\xd9{\xd0\x9d`\xe7\xbc\xa1t\xb3\x1d@\x9c\xe7#f\x18\x8f\xdeI\x8dG\xb4\\\xc0\xdd=@\xce \x1aK\xd5u\x83\xce\xdc\x93{\x81\xaf\xdd\xd2\xfa.\xc45^\xc8\xd0y\xc3\x15\xa8\xf8\x1dZ\xeb\x85Rz/dj\xbeA\x87\"\xb8h\xdd\x17\x8e\xd7~!Y\xff\x0d\xba\xd2\xbaT\x92\x06\x0c\xa5u`H\xd4\x82!U\x0f\x0e\xb7\xecA+\xc6j\xc2PZ\x17\x06\x9c6\x0c%\xf5a8Z#\x86<\x9d\x18Ji\xc5\x90\xa5\x17\x87\x1f\x87J\xe5=\x8f>7'\xd1\x8d\xe1\x84\xda1\x9cF?\x86D\x0d\x19\xf2t\xe4X\x17\x8c\xd3\x92\xa1\xac\x9e\x0c \x9a2\xa4\xeb\xca\x90\xa1-#\xba\xcc\x1f\x10\xfa2\x94\xd0\x98!6\n\x04\xfc\xf0\x0c\xa17C\xe2(.Yw\x0ez\x93\x9a4B{\x86\x84R\x16\xd4\xa0!I\x87\x86\xd2Z4d\xea\xd1\xe1v\xd5\xc75i\xc8\xd7\xa5\xbd\xfe\xc4\x15c\xda4\x14\xd3\xa7\x01/\xb3\x02F\xa7\x864\xad\x1abbP\xa6f\x0d\x08\xbf\x81\x89\xe8B\xfa5d\x05\x17\xafc\x03\xa2\x96\x19z6\xe4j\xda\x80\x8b\xea\xd1\xda6\xe0\xf5m@j\xdc\x80\xd6\xb9\x01\x17\xf4t\xbd\x1b\x924o\x08\xe9\xdePJ\xfb\x86T\xfd\x1b25pH\xd3\xc1\x01q\x13Bz8`\xce\xc7\xeb\xe2PP\x1b\x07L\xd1\x02OY9\x9d\x1c0Z9\x1c\xa1\x97{\x1d\x8a\x03C\x9a9\x94\xd6\xcd!\xaa\x9dC\xae~\xee\xf5\xa6\xbe\x7f\xc3S\x01\x08\x1d\x1d\xc2Z:d\xe9\xe9^WA\x9d\x1dr\xb5v\xaf75\x8c\x0cL\xba\x95\xd3\xdc\x01\xa5\xbbC\x86\xf6\x0ei\xfa;\xe4h\xf0\x90\xac\xc3C\xb8\x1b\x81\x886\n \xfa(V\x93\x87\x1c]\x1eR\xb5y\x08WxG(\xa7\xd9\x89\xd8\xc8k\x8es\x86-\x02\xb5\x007\xdd'\xb1\xe2\x95\xceH1n?\xe5\xf3F\xfbP\xd1>Tq\xe5\x9d\xf6\xa1\xeai\x1f*\xcb\x12\xf6\xa1\x1a\xb8\x9b\x02\xcb\xf2i\x07*Z\xa0\xef\xfc\x9d\x16\xe8[F\x0b\xf4i\x81\xfehE\xc1\x8c\x14(# \xc8\xa0\x05\xfa\xc7\xc2\x17\x19\xe0E\x11\xe8\"\x1d\xb8\xa0\x05\xfa\xc7\x00\x16)pE\x06XA\x0b\xf4i\x81>-\xd0\xc7\x82\x11E\xa1\x88\x1c \x82\x16\xe8\xfb\x0e\x8b\x82\x0f \xd0\x03f\xf9y\n\xec@\x0b\xf4i\x81>\x02\\\xa0\x05\xfa\x90 '$\x80 \xb4@\xbf\x00x\x10\x85\x0er\x81\x03\xef\xbb\x86\x16\xe8\x1f\x1a-\xd0\xa7\x05\xfa3+\xb1X\x1a\x0b\x03$\x83\x00I\x10\x00-\xd0\xcf\x14\xfbi\x81\xbe\xb1\xd3-\xd0W\xfb\xf5L\xf2a\xeb\xb5\xbc\x9e\xe5\xea\x96\xefS-\xda\xb7\xb6\x0eQ\xeb\x99}\xf5\xb9\x14E\xad\x97\x8f\xa5\xb4\xfb~\xf2Y\x1eR\xfa\x9f\x9aY\xe3\x1f\xe0c/\xde\xe1\xde\x1aL_\n&\xb5\xfa\xba\x95\x1bP\xb5C\xfet9b\x10Cku\xff\xea\xa5\xdc5e\x98\x9f\xa8T\x7fr6\x8bG\xea\xa6&\xb3\x88\xd0f\\)\xd1\xf2Le\xd1f\\e\x83\x1b\xdfF\x8a6\xe3*\x11E\xda\x8c\x8b6\xe3\xfa-o\xc6\xe5K\n\xf4\xe2\x17\xf3O\xf1wu\x9dP\x8a\xa0\xf06]r\x0e_\xfcE\xe5\x08\x1a\xc6B\xce\x0cAOL4\x1ey\x82\xa0\xa2\xc0f4\xcdOTc\xc2c\x86YY|<\xd9z\x82\xb9zNR\xe6#\xb2\xf4\x84\xcb\x19\xca\xd0\x13\xcf\xcfsLv\x9e\x80\xb8\x18lR\x10mV\x80\x00\xb8\x10\xf7 \x90\"\xa0\xb2,\x8c+\xe0/)\x1bOQ\x94+\ns\x95\xc6\xb9\xf0@W!\xa4+\x0f\xea\n\xb8K\xcc\xbfs$\xd8U\x1a\xedJ\x84\xbb\n\xe3]i\x80W\"\xe2\x15j\xc3\x19\x19w\x8ab^(\xd0\xab \xeau,\xec\x95\x85{\x15\x02\xber\x90\xaf\x803t\x86\x9d\x13`_\xa7\x03\xbfN\x82~\xa5\xc1_\xc5\xf1/,\x00V\x14\x01\xc3C`\xc9\x18X:\x08\x16\xed\nq\xb9t\x8e\x86\xc1\xa2ytP\x03*\x04\x12\x962\xeaJ\xc6\xc2B/At\xf6\x1c\\\xf9\n\xc2a)xXa@,\x0f\x11\x0b\xb5 T\xc6\x9cLL\xcc\xe3\x8d\xa3\xb2\xe5\x94A\xc5\xd0\xbc\x13\x02\x17K\x02\xc6b !r\xa0\xb1\x98O\xaf\n\\\x08\x1dK\x0f&\x1e\x1f\x8b\xd5-\x03!\xcb\x84\xc8\x10q<\x1a$C\xa3d8\x98\x0c\x8b\x93!\x82\x9c\x8e\x94\xa5@e\xc1\xfc7E\xc0\xb2D\xb4,\x0f.K\xc2\xcbbA\x0f\xe7\xbc\x89\x9c\x8b\xc7\xcc\xca\x81f\xd1By\x9f\x9fr\xb8\x19\x028\xcbG\xce<\xeex4\xc3MQ\xec,\x06\x9ee\xa2g\x1e_\xf1\xcc6\x08\xfc,\x92\xd5\xa64\x82V\x1cB\xf3ch%A4\x0c\x8a\x96\x0e\xa3%\xe1h\x19@Z*\x92\x16\xc9T\x13.\x1d\x16\x12\xc2\x82i\x19hZ\"\x9c\x16\xa8n\x0e\xa0\xe6q\x85\xc8M\x93\x03\xa9\x05\x9a|\x1f\x8e\xf7\xaf\x83\xb5\xe6<\xae\x86\x13\xc7\xc4\xf9\xee\xd5\xb1\xe6\xb81H\xe2m?82\xc5\xd1\x7f\x98-\x96=\xb8\x88>\xec\x11\xaf\x9b5E\xbe\x99\x05\xd46\xfe\x00\x02ft\xf1m\xd2\x04^`1k|\xa7\x0fpu^\xa2\xcf7\xcb]\xeb\xfepm\xae\xd7\xd7\x18r\xe7!\xb1\xea\x86V\xc4b\xd6\xc4:W\xc5\x1e4z\xf7-\xb9k;~W5\xcb\x1b\xb7\xdc\xae\x0cqWt >J}xt+U|k\xb5\xb0z?[\xc1u\xba[\xd6\xfdnS\xdd\xdf\x1c;\xd7\xab\x0b\xf5W\x95\x12C\xbc\x9aF5T_\xc3$bP\xc9JbE\x0b7\xab\xc3\xceb\xc6\x91(\x9a@\xa1$\x9163_\xd6\xec\x99w\x9d\xf5]\xc6h\xbb#\xda\xee(\xd6Zi\xbb#5\xbc\xa7\xed\x8e\x8c9\xb7;:x\x0c5\xcav0.BQm._/\\#9q\xa7\x88h#\xa2-\xf6\x8a\x8fw\x0b\xca\x88h#\xa2\xcdmD\xb4I#\xa2\xed\xd0\x88h#\xa2\xcdgD\xb4\x11\xd1&\x8d\x886\"\xda\x88h#\xa2M\x19\x11mD\xb4\x11\xd1FD\x1b\x11mD\xb4M\xcd\xffiKD\x1b\x11m\x1e#\xa2\x8d\x886\"\xda\x1e\x94h\x8b\xb0D\xdf\x9e\x0b\xa3\x0dt\xd2v'\xa1\x0dtN\x18\xdcx\x1b\xa5\x0dtJD\x916\xd0\xa1\x0dt~\xc3\x1b\xe8\xb8(a\xfc\xde9\x07X^\n'\x9c\xc8\x07?11\xfa\xcf\x83\x07\x17e\x04\xa3\x90oT\xd1(@\xb6\x95\x83{\x83\x98\xe67\xde\xe8\x06\x83\xf4b\x80\xde\xe8\x1d(\x08\xf3\"P^lqJa\xbc\xa1\xc6S\x0e\xe1E\x01\xbcN|7\x11\xbc+\xc9\xdd\x11v\xa7\x8d\xb0;\xc2\xeeF#\xec\x8e\xb0\xbb\xd1\x08\xbb\xe3\x84\xdd\xb9\x8d\xb0;c\x84\xdd\x11vG\xd8\x1dr\x94D\xd8\xdd`\x84\xdd\xd9F\xd8\x1daw\x0e#\xec\xceu\x0caw\x84\xdd\x11vG\xd8\xdd\xd4\xfc\x9f\xb6\x84\xdd\x11v\xe71\xc2\xee\x08\xbb#\xec\x8e\xb0;\xc8O\xc7v\x08\x13\x0cU:\xb6\xe4\xa5\xb2\xb3\x89/`I]\xc8\xdb\x17\xc8\xbav)\x7fwR\x13\xdbv\xb9\xdf0\xab\x01\xe8sg\x94\x84\xbc\x94r\xf3\xc4\xd4\xf1\x91\x02\x12v0l\xf3\xba\x82\xa8\xe4\xd6\xf3\xaaYV\x9d$.zg:6\x88H\x81\x10\x92\x03!V:e1Y\x10\x82\xa9\xca \xaa\x99\x8e\x16\xa7\x1b\x949\x18\x07\x11\x1f\xa8\x9b\xbe^\xb2I\x87\xe0\xf5\xa2|D\x0b\x1d\x9c\xca\x83\xb1,\xd7\xe2?\xd3\xe2xO\xb2\x9bg\xb1\x02\x047\x9f\x07xjd\x9d\x1f\xe0\xfc+g\x8dx%Z\xe5\x98\x05\xd2\xbf\xcf\xab2\xf9\x02\xac\xc4\xf8\xb4\xe6P\xedv\x1b)\xc3\xfare\xc5K\xf8A7\xf4+uy\xdf.z\xfa\xa8X|m\xa0vW/>\x89\xb7\x7f\x13\xd0|\xd5\xce\xab\xc5\x9d\xd2*\xac\xc2yn\x81d\x90\x1dr\xbe2|A^-\x97\x1d\xeb\xfb\xe9m\xf7\x84\\\xf5I\xe1k\x1e\xbd\xc9\x1f\x8fh\xec\x80\xab\x1e \xe7j\x8d\xa5\xea\xedAg\xeeI\xd7\xc0,Di\xdd\x1d\xe2\xda;d\xe8\xef\xe1\nT\xfc\x0e\xad\xc1C)\x1d\x1e2\xb5\xf8\xa0C\x11\\\xb4\x1e\x0f\xc7k\xf2\x90\xac\xcb\x07]i\xbd0I\x9b\x87\xd2\xfa<$j\xf4\x90\xaa\xd3\x87[\xf6\xa0\xe1c\xb5z(\xad\xd7\x03N\xb3\x87\x92\xba=\x1c\xad\xddC\x9e~\x0f\xa54|\xc8\xd2\xf1\xc3\x8fC\xd5\xb3e\\\xcb\x87\xd3\xe8\xf9pBM\x1fN\xa3\xebC\xa2\xb6\x0fy\xfa~\xac\x0b\xc6i\xfcPV\xe7\x87\x04\xad\x1f\xd2\xf5~\xc8\xd0\xfc\x11]\xe6\x0f\x08\xdd\x1fJh\xff\x10\xd3\xff\x01?\x01\x107!\xc4)\x00\xe6|<\xaf\x00\x05\x99\x05\xc0\x14-\xf0\x94\x95\xe3\x17\x00\xc30\xc0\x11\x1c\x83\xd7\xa180\xc42@i\x9e\x01\xa2L\x03\xe4r\x0d^o\xea\xfb7<\x15\x80\xe0\x1b \xcc8@\x16\xe7\xe0u\x15\xe4\x1f \x97\x81\xf0zS\xc3\xc8\xc0\xa4[9\x16\x02P<\x04d0\x11\x90\xc6E@\x0e\x1b\x01\xc9|\x04\x84\xbb\x11\x88h\xd6\x90\xa0[cY \xc8\xe1% \x95\x99\x80p\xc5s\xd8 \xaf3\x8bL\xc0>28\x86\"\xf8@4\xeb0G\x01eY\n\x88\xf1\x14\x10f*\xbc\xe7\xe4\xb2\x16P\xb0\xed&0\x17\x90\xc4]@`\x84b\x96YK\x95\x0b\xa1\x83J\xb1\xb0n\x9b\x9be\xc5\x8f\x91\x04\xcd<\x88p\xf3\x9c\xd7[\xdf\xad\x19\x96\x81o\xe5\x10\xf2@J\xfeR\xf5\x01\x15yXE-\x8f=\\E-^K\xea\x9b\xb9^\xb8kM\xbb\x06\xd1\xaeA\xf1\xec\x00\xb4kPO\xbb\x06Y\x96\xb4k\x90D\x86\xf0y\x18\x149E\x89\x18(\x11\x83\xe3wJ\xc4`\x19%b\xa0D\x0c\xa3\x15\x05=R \x8f$\xc0\x83\x121\x1c\x0bsd\x80\x1cE \x8et\x80\x83\x121\x1c\x03l\xa4\xc0\x1a\x19\xa0\x06%b\xa0D\x0c\x94\x88\x01\x0bZ\x14\x85,r\x00\x0bJ\xc4\xe0;,\nR$@\x14\x984\x03)\xf0\x04%b\xa0D\x0c\x08\x10\x82\x121@&\xec\x90\x00:P\"\x86\x02 C\x14b\xc8\x05\x18\xbc\xef\x1aJ\xc4ph\x94\x88\x81\x121\xcc\xac\xc4\xa2x,\\\x90\x0c\x16$A\x05\x94\x88!\x13\x1e\xa0D\x0c\xc6N\x98\x88\xc1\xb3\xca\xdfr\x91\x9e\xd3 5\xfd\x82Z\xb2{f\xf4\x12_\xf1g\xdf\xcf\xb9\x9a\xc7A{\xf3\xe9\x1c9\xda\x86K\xc3\xc8\xd2-\x82\xfaD\xb6&\x91\xa9C\xd8z\xc3\xc4\xdf\xe1'z\x86\xde\x90\xa51\xcc\xb4\x84yxf\xbaB\x8e\x960\xd3\x0c\xe6W\x98^ W3\x18\xb4\x81\xa9\xfb\x83\xc1T\x8e6\xe0\xd3\x00\x8e\x9a\xf7G\xcd\xf5c\xe7\xf4\xb3\xe7\xf1s\xe7\xee\xdds\xf4\x85\xe6\xe5K\xce\xc5\x17\x9a\x7f\x8f\xcd\xb9\xe7\xcd\xb3\x07\xe6\xd3\xd3\xe7\xd0\x83s\xe5\x88\xf9\xf1\xdc9q\xcf\xdcw\xe6|w\xce\xbeC\xb3\xd7\xe4\xecm(\x9f\x0d\xeb\x9c\xd0\xab0sb{\x9c\xc0>\x0cz\xd9\xbay\xa6\xf1\xc7\xfcK\x07 =B@\x9c\x95\x97\xe4cozE\xedc\xa9^\x80*\x86\x93\xb3\xe4[\xbb\xeea\xdd\xca\xdd\x94\xdaa\xdf;\xf9\xb5]\xaf\xac\x13e\xf7\xb7\xe9\xdb1@\x85\xe3A{#\xa6D+\xd2zho\xc42\xc1\x8d\xef\xeaG{#\x96\x88\"\xed\x8dH{#\xfe\x86\xf7FT\x87\xfc\xa2\xfe\x11\xdb\x1bQ\xaa\xc7\xfe\x8c\x84\xf8\xbd\x11\xad\xa5\x02\x8f<\x1ba\xd1u\x0b\xd1\x9c\x82\x9e\xdel4rjyj\xd9\x13\xcdSK\x9fv\x0e8Cg\xfc+4==\xb5\x92\x93\xd5S+4u=\xb5\xd8D\xf6\xd4\xf2\xa6\xb5#=~\x1c \xcf\x99\xfe\x0e5\x10$D\x8e\x9a&\x9fZ\xea\xa4y\xb4+\xc4\xe5\xf6\xcb\x9c\\\xb7-\x92\xd7\x0f5\xa0B \xe5)\xa3\xae\xe4\xd9\xf7\xd0K\x10\x9d\xcd\x0fW\xbe\x82py\n^^\x180\xcfC\xccC-\x08\x95\xc1/\x133\xf7x\xe3\xa8\xec}ePs4/\x8d\xc0\xcd\x93\x80\xf3X\x82\xaa\x1c\xe8<\xe6\xd3K\x91\x15B\xcf\xd3\x83\x89\xc7\xcfcu\xcb@\xd03!tD\x1c\x8f\x06\xd1\xd1(:\x0eF\xc7\xe2\xe8\x88 \xa7#\xe9)Pz0\x1f_\x110=\x11M\xcf\x83\xd3\x93\xf0\xf4X\xd0\xc39\xf8\"\xe7\xe21\xf5r\xa0z\xb4P\xde\xe7\xa7\x1c\xae\x8e\x00\xd6\xf3\x91u\x8f;\x1e\xcd\xb8W\x14[\x8f\x81\xeb\x99\xe8\xba\xc7W<\xd3\x1e\x02_\x8fd\xd9+\x8d\xb0\x17\x87\xd8\xfd\x18{I\x90\x1d\x83\xb2\xa7\xc3\xecI8{\x06\xd0\x9e\x8a\xb4G2\xe7\x85K\x87\x85\x8c\xb1`{\x06\xda\x9e\x08\xb7\x07\xaa\x9b\x03\xb8{\\!r\xe5\xe5@\xee\x81&\x1f\xcf\x93W\x10t\x8f\xe6\xc8;\x05\xec^\xaa-&\x00\xef)\xc8\xbbo|\x90\x96\xff\x0e\x91\xfd.:c\x80\xcb|wL\xde\xbbc\xb3\xde!\xf2U\xa5\xa5\xab\xa2lU\x94\xad\xca\xf5;e\xab\xb2\x8c\xb2UQ\xb6\xaa\xd1\x8a\xca\x91)bd\x92\x14I\xd9\xaa\x8e\x15 3\xe4\xc7\"\xe2c\xba\xf4H\xd9\xaa\x8e\x91\x1cS\x04\xc7\xc2r#Nl,(5b\x85F\xc7\x87\x00e\xab\x9a\x1aBZ\xc4\x8e\x92\x92eE\xcaV\x85\x12\x13s\xa4D\xcaV\xe5;,*\x1f&\x88\x87\x98\\L)\xc2!e\xab\xa2lU\x08y\x90\xb2UA\xa6 \x98 \x07R\xb6\xaa\x02\xf2_T\xfc\xcb\x95\xfe\xbc\xef\x1a\xcaVuh\x94\xad\x8a\xb2U\xcd\xacD\xe6 \xac\xa8\x97,\xe9% z\x94\xad*S\xc4\xa3lU\xc6N\x98\xadJ\xb4\x85\xf1.iimX\x17\xfa\xad\xf3V\x0dKX\xe3Ux\x98\xa2\xc6\xd6\xeb\x8a\x0f\xde\xcd\xfd\x8b\xcf\xbf{\xb1\xa8\xbb\xc5~S\xf1\xbaY\xbf\xf8e\xc9\x9av\x1bX\x96kM\x0d\xbc\x1e\xcf\x9353\x8aM\xb5\x1d\x16\x93\xb7\x9fX\xd3\x83u\x01\xf36\xdfV\xdd'\xa9\xe1\x0e\xde&\x13\xddj=\xaf,\x8b\xfe\xdbdI\xafue\xfd\xf3\xa3]\xd7k\xd5\xfdF\x85Y\x1d{\x11\x85\xdb\xf7Z\xbc\xc7\x8d\x8a{O2N\x9d{6l\x1ex\xa2\x92\x92\xdd\xa8\xda\xe5)\xe1d4w\x95\x12\x02'\xca!\xb7%\xcbJ\x88'\xbe\xd9\xed\x89\xda\xbb\xaa$\x8cbb\xa0l\x1dd\xcc\xc2\xde-\xbbm\xb2{\xear0\x19\xbf~\xe8N\x9bqA\xb2xe\xb5q0\x7f\xfdb\x03\x8b\x0d\xfc\x926p=\x80\x97|.^u\x02T\x92\x0b\xc6?\"\xf3\xed\xd9]\xd5\xb33\x9c/\x1f\xffx\xc7\x86\xea\x8fgH\x8b\xfe\xef'\xd6\x8b)c|,\xf3\xf3|`\x8aw\x8d\xac+\x19\xebk\xb7\x159h\xdb\xb3\x92\xb6\x93\x94\xed\xf8p`\xcb5\\\xd4\xde\xf6,T\xeb\xb3\xba4\x9eu\x93\x12{\xd9\x05\x9c\xb9\xb3\x9eA=\xf42so\\\x87p'\xbf\xc5d\xa6O\xb5\xf0e\xd3\x1fC\x1d\x13\xce\xb1(\x1e\x99\x06\xe3'\xdey\xf3\x89`\xd3v\xf8\x10\xcf\x86\xd5\xc6.\x0f\xb2\xe3+\xa6\xda\xaai\"/'\xa5(\xc9\x98\x95\x1d;\xe2\x11\xf1\xcfU7u\x99}^\n5|d\xe8SR\x9d#rv\xbcl\xeb&xVh.Rbd\xe8\xeeO\xe3\x11\xfa{D;2\xf1\xf5(\xaf\xa5\xe6\x9dDM!\xaeH\xf4/\xc8\x80\xd0\xfe\xec\xe3\xdf\x9f\xbd8\x1e\xdf\xd4\xcd\x87\xfeRq\xc6\x07\xf4'O\x1b\xab\x87\xc7\xdb\xad\x88\xef\xf3\xcc:1\xbd^\x89m\x83|\x1d\xe4\xebp\xc7s6y\x0f\xcd\xb9\xa8\xb0\xaf\x9b\x0f\xc0>\x1f\xebN$HI\x1a\xf6E\xadE\xff\xeb\xe0@\xc7\xf6|\xf8 \x94\xa9:\x1e\xb9\xbe\xde\xda\x11\xb2\xd8QupO\x9cz\x95S\xde\xd5x\xbcO\xaaU\xf8;x\xf30\xb1\xb8\xdd\xd4\n\x7f\xc7\xb6\x1a\x94\x93\xb3\xec\xbcj\xa84\x06\x0f*>/j\x92\xdb; \x02\xebA\"\xc5c\xe5\x1e\xd8g`\xcd\xa6\x1d\x0f\x00c\x19\xd8\xb3|\x8c\xcfu\x92\x1d\xcd\xeb\xf6h\xc1\x8a\x95fR\xa0\xad\x00u\xe76\xab#`?\x1e\xe2\xc2\x87\xa1\xadQ/\xb9\x9e\x8bW\xfa\xd4\x9dg\x02\x964\xcf\xe1\xb1\xc9\x8cJ3\xa4\x06+\x9eC\x0c\xab\xb18\xf7\x89\xa1z\xe0\x86H\x02\xdf\xc2\x97$\xea\xa0\xda%\xd5{\xc8\x1d\x83\xf3\xb1\x90\xbbx8l\xce7\x14u\x0fh\x0c\xf5\x15u\x85\x99\x11\x86\x97\x9cg\xd7\xf87\xb5\xeb*\x15-#\xac\xa9\xa3|pN+\x0b&\x102\x90\x7fa\x9f\x7f\x92\xe3U\xf8\x0eg{\xcc\x0f2xv\xe1\xfby\xdc\xb3i\xaa\xa6\xc3N\\\x05\xc8\x99\xa4\xd6j\xd2\xaf\xad\x14\x82S\x87\xd7n|F,\xbb\x846\xfd\x8a\xdd\xfb\xaa\xde3}n`m^\xf3?-?\x1a>\x9e\xf5\x83\xad\x07\xd2\xa6\x1a\x9es\x90\x8fw\xc5\xe2\xb4\x82\x07\xdd\xf13\x8d\xf5=u\x93oA\x86M\x8d\xcb\xbb\xe7pd\xa7@\x94\x8b\x87P\xc6\xe9\x0f5\xa30\x18\x94\x88|ga\x12\"\xf23d\xbe:\x9dO\xea\xd6\xd4\xaa\xde\xef\xc5a\xf6;E\x97v\xf0\xb4q4r\x15\xdc\xdd\xbea\xcd\xd0 >\x12\xd5`\x87\x1ck\xaf\xe7\xe3\x8e\xd1r\xf5\x14\xb3vo\xed{\xcdqz {G=\xb9\x84\xbd\xb1\xb4\xb1\xfe})\x7f0\xe5\xb4B\x9fT\xd6\xf6\xa4\xf3\x94B\x9cP\x02;#\xeet\x12\xa6<\xf9d\x12VL\xe4\xa9\xc4\xff\xe5\xd3N$\xfa\x0e\x82\x9aq\x93\x87\x90s~\x98.\xaeZ\xb93d\xbfo?\xcd\xc6\x88o\x1c\xfa\xe7 >\xe03\xe0\x9d=\xfeCt\xc7\xeb\xf7o\x9e\x81:\x88 #\xf0\xe7\xba]\xe9\xdf;T\x9fo\xf7\xac\xd9\x0d\x0f\x81\xa6r\xc2\x11DwLE\xdaBw\x15\xef\x9c\xa8*\xdc\xd5\xed\xae\xab\x8e\x0f\x8ft+^>Tu\xf3\xb2m\xee\xeb]p;\x96\x9e%\xb7OW\xd1O\x1ba\xbe\xf9\x1c\x1f\xc2u\xcf\xf4\xe3\x8d\x07I\x8b\x9f\x95+\x7fJ\xc7\xa2\xda\xcd[\xd6\x0f\xd2\xef,;\xb7\x127W\x0e\xad\xea\xd0\x12\xbf\xea\xe5\x04\xedD\x072\xac\xc4\xba\x9fpGv\xc6\xf2\xb6\x12\xdb/;[k\x0cG+\xcd\xc5\x1a\xc5\xc0\xcaUk\x8a\xac\xbc\xabC<\xdbj$\xc7\xaa\xc1L\xe9fV\x8d\xe2S\x8dbQ\x9d\xd9R\x8d>\xb2p\xa7\xc60\xa6*\xcc\xa8\x9a6\x0bOj,;\xea\xc4\x82\xaa\xb7\x86 \x8e\x89aB\xb53\x9e&\xf2\x9c\x06\xb1\x9b\x86\xb3\x98&p\x97\xc62\x96\xda\xa2\xe4\xb3\xf1\x91\xe6e!\xcd\xc6=\xeag\x1c\x8d\xe3\x19\xa5\x9c.\x16v\xd1\xf5\x9c\xa2\x1e\xee\xd0!\x8414\x96'\xd4\xca\x07\x1a\xc9\x02JxK\xbc\x0eZ\x83\xe7\xd3\xbd\x82Frz\xce\xdc\x9dT\xff~\xe7/;\x8e\xb5s\xc9\xd0\xa9\xa83\xb9:30t&\xf0r\x9a\xa3\\_\x0c\x1388-|\x9b),\x9bNzH\x0b\xa3\xa6\x97G\xd3\xa4\xa6\x0b\xe7\xcc4\xdf\xfd\x1b\xd5\xd6(V\xcc\x90\xc6\xfa\x180\xedm\xf3\xb2]\xae\xe0\xb8$\xdb\x1c\xc9g\xe9d\xb1\xb4sW\xba\x18+\xc9N\x08e\xa7\xf4qRjL\x94 \xfc\x93\x01\xac\x93\xe1\\\x93^\x86I\x82\x90\xd1(\x8ex\xc6\xc7\x1c\x99\xc6\x17IVJ\xf9%\x8a\x11\xd2\xc6\xfe\x98\xc2\xf9H\xf0;\xc6\xb2:\x92\x0c\x8e \xbc\x8d\xc6V\xdb\xca\xcch\xf01\xe6aa\x8c\xe7^\xd4x\x16\xa3\xd8\x15\xadL\x8aa\xfc\x89^\xd6Dq\x90\xf6q%\x8a\xc7\x9c\x0c\x89\x06e\xa0YZ(\x1f\x9d\x9b\x031\x90\xf90\x80\xefpQ\xe5\x04nC\x83\xc70\x81\xbd\x90b*\x8c\xe3'\xa4\xb8\x08\xf31\x10\xc6\x7f]/\xdb\xa0\x8fcp6\xd3\x14H\xf8Bx\xcf\xac~A\xf6y`\xdd8\x0d\xd1A\xa8x\xdb\xee\xd4\xbd\xe3\xa6m\x1a\x1e\xfd\xaf\xb6|B\xd1^q\xbf\xa1\x86y\x1e\xbb\xb6\xbd7\x00\xeb\xcb\xf1\xd7eu\xe6H\x04\xfe\x8a\xbbf\xb3\xbep\x87\xdf\xf1t\xb7\x8c,\xb7\xbeo\xd7\x01V\xc7!\xf8\xc0H\x7f\xda|F'\"8\x1d\x89\x90\xd5\x99\x089\x1d\x8a\xe0r*B\x9ac\x112:\x17\xc1\xeb`\x84X'#\xa48\x1a\xa9\x1e\xf3_\xd4\x14\xedp$ty/gJq<\x12\xea\x9c\x172\xe5u@B\xba\x13\x12\xf2;\"!\xcd\x19 i\x0eIz\x8a\x92\x95\xcc\xe6\xa6\x84\xec\xaeJ\xc8\xe9\xae\x84 \x97%\xe4t[\x82\xc3u \x89\xeeKj\x8e[.C\nrjB\xb2c\x93PH_}\x14\xe9\xee\x84\xc8\x001\xe7\x15G\xfe\xf5?\xd2\x05J\x99=\xc7\x85F\xeez\xa4\xb9C5e\xae\xeb\x8b2\xb8E!\xb7k\x14\x08\xf7(\xa4\xbbH5m\xa6\xc3\x14\x12\x9d\xa6\xe0\xf3%\x82\xfb:\"\xaf\x03\x15\xac\xf7{\x84;R\xed:\x8cSr\x92S\x15Vt\x86\xcf\xb9\n\xdev{\x9d\xac\xb0\xce\xd1\n\xae\xfe\x88t\xb8\x82\xcf\xe9\n\xdeK\x83|\xd7\x05Y;)\xd4 \x0b\x01\x8eX\xa0\xaf\x05Jp\xc8B\x98S\x16V9f!\xc49\x0b\xf6\x1bs\xc8\xe2-\xcf\xfa\x9c\xb5\x90\xec\xb0\x05WE\xb5_\xb3:o!\xd1\x81\xab\xa9\xa2\xaf\xeb\xc9\xea\xd2\x85\xccn]\xf0]\xbaC^\xb7\x93\xc7\xc5\x0b9\xdd\xbc\x90\xdd\xd5\x0b\xc1\xee^\x08q\xf9B\xb8\xdb\x17\x02]\xbf`\xbb1\x86.=\xd4Q\xe8\xbf\n'\xd0\x15\x0ca\xee`\xa0\x9a\x91\xd3-\x0c\xa9\xaeaM\x17y\xa5M>g1du\x18C\xf2x\xf0:\x8e!\xc0y\x0c\xc6\xaac\xcb4\xb9<\xdd\xfd\x13{\xd43\x06\x8e\xa7\xbb}\xbd\xe1\xac\x1aTv\x85\xf4&\x9b\xf7z\x8b\x18Tca\x1e\xd7\x0d\xb4\xc5T\xae\x96%}\xa6\xb8r\x8b+\xb7\xb8r\x8b+\xb7\xb8r\x8b+\xb7\xb8r\x8b+w\x92\xe2\xca-\xae\\)\xc5\x95\xebui\x16Wnq\xe5\x1aR\\\xb9q\x1e\xd2\xf0g\x8b+\xb7\xb8r\x89\x8fP\\\xb9\x0b)\xae\xdc\xe2\xca-\xae\xdc\x1c\xae\xdc\xeb\x89$H\xf3\xe6>\x90LB\xc2d\\\xee\xab\xba\xb9a\x9f\xf5\x83\x9bN\x18t\x1c\x9f\xbb\x1d\xd8\xe7!0m\xd0\xeaq\x96\x05\xba\xaa\x89FPP/\xd5\x0dRw\xeb\xd7\xf9\xc1\xe4?!\xbcYSo\x88\xdfy\xb4\xf1\xedF\xa1k\x80\xb9\x92V\xaa\x05|^\x92\xc2\x92\x11\xcc\xb3\xae\xf0\xc8\xe5@\x82Q\xfbq0\x99\x1bB\xd1%Y\"\xe0\x1b`J\x9a\x98\xadT\xba$\x9d\xd1d\xe2\xae \x9a>\x153\xda\x1fVs\x17F\xd5\xf0{V\xba\x9f\xc6s\xe1\xa6k\xfb\xfe\xa7\xc5\xa7\x13\xfc\x13\x04K\xc6\xab\x9bj\xb7\x92\xa9\xa4c\xbb[\xf6\xd9\xd9u\x87\xba\x89$3\xc9@\x8427i\x05\x13\xca\xf8\x92\x85\xa7x\xfc\xd3MW5\xfd=\xeb\xd6\xde;\xb2\x1d\xaa\xdd\xed\xd0\xde\x0e]\xb5\xf5\x8d6\xca\x9c\xf0\xb2\xdb\x9b\xf1\xed\xe5P@\xf3!\xa6\xc1\xf8\x94\xce>8\x88\x1aw\x0b\x7f\xe3}\xd7.\xfc\x0b\xb8\xff\xda\xb0\xfa\xe3\xec\xd6\x99(;[\xe1\x07i\xb6\xd3\xfd=\xf8?a\x0d\xb9\xe6\xcf\xea\xd3B\"k\xd2\x87$\x08\x0e\xb1\xf6\xc82\xa8\x13Q\xca\n\x86\x15\xbb\xe8\xbf+\xd96\x83\x96\xd4\xd2\xe6\x87jx\xc6O\x8e\x02!Q\x97\xb4q\x13\xa0v\xde\xae\xfe\xc8\x96\xbd4\xfe\xb3\xee\xf8\xf7\xd0G\xa46\x82\xe6\nA%\xbe\x9fx`\xaa\xcb\x1d\x1b>\x8d\x86b\xf8\xc4Q\x91\xce6<'z\xcb\x80\xf1HRs\xbaz3\x8ef\xda\xa4\x98v\x95\x91\x89ZZ7\xa2\x16\xfeS\x05\xee\xe5.\xff\xc9\x19;V\x9a\x9fS\xc4\xfb\xdc\xa9Vo\xd6\xb1\xbf\xbd\xad7\x1f\xc6\xb6\xac\xb4\xa9_\xd5`.\xeb\x1c`4\x87\x99&\xb2\x87F\xbcm\x19\x9eHm\xbb\xb2;\x08\x86]g\x8b\xe8\xab%\x16\x96`\"\xd7\xb5\xb2\x9c.\xc8K\x05f#\x99N%\x8b\xab\xa2P\xdb\x91\x8dcKN\xb2\xfe\xc3\xed\xc6s\xb7\x01\xac\xab\xfd\x8b\xfe\xc3Kn'\xb5\xda\xcf7d`\xed90\x84;\x8e\xaa\xff0\xd7\x1b\x96. \xa5\xb2\x07\xbeg\xccZ\xd9_\xc7\x8d\x1bQ\xd9C\xdd\xd4\x87\xd3a\xbe\xf3g\xaa\xb3\xb2tm\xda\xf1X\xb3@0\xb4\x9e^\xf0\xda\x11\xfcs\xc7\x8e\x1d\xab\x8e\xdd\xee*\x83e+\xbeM\x97\xa8\xf4/Uo,h\x07\xd9\x9c]%\xa1>\x8e\xfc\xccT|\x8a\x1e\xac\x1c\x1a\x10\xe5\xe7~\x18\x8fo\xd4@\x14\x0f\xb1\xcfls\x1a27\xea\x1c\x95&7\n+\x87\xe7\x07}wA5\xe6\x9e\xb1[\xfa\xf6\x8f\xe55}\xc6\xf5|\xe4\x01\xc4\x1e-C^\xd3l=\xce\xd1\xd71[\x1ew\xdd\"\x99xC J\xbe{JPBn+A\xa1F\xcak\xc6^\x1c\xa89=\x0f\x94{\xc6&\xa4\xbbz\xb4\x1ej\xc5@\xd6'\xb59L\xf4\xe5\\]H\x02\xd7\xa8\x05\xb5<72\xd2\x8fcrs+\xc9\xbc\x9c\xfdUY\xf5\x85\x02u[\"\xb7\xad\xfc.V#\x89\xd8\xba\x0c\xae=>$.\x80~V{;\xa3}Dq+Y\xec rvy\xac\xce\xc2^\xbf\xc2[\x91\xed\x16\x96(\xa6z\x1b\x95\xbf\xa7l\xc3\xef\x94\x8f\x99\xde\xc1Joc\xa4'\xd8\xe8\x83Oi)\x0c\xf4\xfa\xfd\x11\xe0\xb7!\xc4U\x15\xd5\xb4\xdb_\x0e&\xd9U\xe2\xfd sA\x19\x8a\x00\xa3p&G}\xb0uH>\xcc\xad\x1e\xad\xd4\x94\x0d\xfd\xc8yF\xa7ed\xd2\xa3\xd2p\xab\xd9\xed\n\xba\x1e\xf8y\xb0nv{\xdd\xa8\x10\x8b\xd9\xfa\xb1\x10\xbcX\xac<-\xc9\x13\x98\xfeQ\x82L\x1fu\xf2\x04\x97\xf5\xb1\x84\x19Q\xa7\xd0\xf5z\xa8\x81\x93t\x01W'\x83\xd5\x8d\xe2y\xcd\x17\x9e\x1c\xedR14\xa5\xf8U\x0ce\xc2\xcfb\xfc\x1e\xeel\x01\xc7\xf8\xcb\xe7t\x01\xbb\xe3\x05,\xd7v\x99\xbbg\xc8\xe0\x84\xe1zS\x1d1\xb0\xca\x19#\x9e\xbe\xe57\xd1F-\xf5\x8e\xabw\xc15\xac\xe5v+\xf5\n^EW\xea5\xbc\x93\"\xa1`q\x10RT\xc8\xbbW&\x94\xe7\xd0nO\xd6\xe3\xca\xcc\x97\x17pZ18\xedV|\x89\xa1\\\x80\x91\x9e\xe4hMp\x1c\xe2\x93\x1bs%6\x96\x0b0P\xca\x05\x18\xf2\xf5\xac\xc9\x8a \x89\x8a I\x8a\x84\xc1\xc8\x98\x8e\x987\x151[\x1a\xa2?\x051[\xfaa\xb9\x00\xa3\\\x80\xb1\"M\xb0\\\x80!:Z\xd5\x98\x92\x00\x18r'D\xb9\x00C\x91r\x01F\xb9\x00c\xc5]\x13\xfeg|\x89xiIx\xe5\x02\x0c!9\xd3\xeb\xac\xa9u\xe5\x02\x8cr\x01\xc6\xe21\x7f\x9a\\\xb9\x00#> .\xfe\xebz\x93\xdf|\x89o\xee\x0b0Ry\xcb\x0c\xbf\xc2\x92\xb3\xcc\xceWFp\x95\x15\x17]q\xd1I).:\x94\xe2\xa2\x93\xaf\x17\x17]q\xd1\x15\x17]q\xd1\x15\x17\x9d\xf2\xff\xc5EW\\t\xc5EW\\tR\x8a\x8b\xae\xb8\xe8\x8a\x8b\xae\xb8\xe8\xa0\xb8\xe8~\xcb.\xbaD\n\xaa\x05\xe9\x14E8E\xee\xffI\xf7`\n\xc9\x94)*lQ\xe0\xf6\x18pk^,\xb8\xda\x0c`\xcd8\x0c\xa3\x8f\x91b\xd2\xc8L\xea\x03\xca&Y\xae\x93\xb8f\x08}Z\xad\xfb\xa1\x1a\xf4\x13\xbd0\x1c\xe3_\xa4=\xb0|\x1b\xa2=\xac9\x19!\xf8?\xc1\x8b\xcb\xcb7\x17/_\xdc\\\xbc{{\xfb\xe6\xe2\xed?\xdd^\xdf\xbc\xb89\xbf\xbdx{qs\xf1\xe2\xcd\xc5\xff:\x7fu\xfb\xfe\xed\xf5\xe5\xf9\xcb\x8b\xd7\x17\xe7\xafB_\xff\xe7\xf3\xab\x8b\xd7\xf2\xf7\xeb\x9b\x17W7\x91\xef\x9e_]\xbd\xbb\x8az\xf3\xfa\xfd\xcb\x97\xe7\xd7\xd7\xa1\xef\xde\\\xfcz\xfe\xea\xf6\xdd\xfb\x9b\xc5\x0bb\xdb\xfa<\xa5\x9b\xdc^\x95\xb5_\xe09\xbc\x98\xd9\xdf\xfe\xcd\xf4\xf7sB8\xee\xac5\x02\xdd\xdd\xe5Q\x9f\xcc(l\x1c\x95\xdd0\xee\xf5\xd9hx\x89\x0c\xf4\x15\x85\xf0o\xbb(\x82\xfbb\x17\xb9/\xcb\x9c\xa5c\xd7n\xd4\xfb\xcfW\x15'\x06\xc4\xa2\xc0e3l9Q\xeeB\xa6\x91\xb3\xd0<\xd4\x07\xb6\x85\xf6\xc4\xb3@\xf6\x0c>U5\xa7\xd9\x93\xe1\xf0j\xbb\x94\xa2\x04\x8bB\xa7\xb2;H\xb1\x19#k*\xfa\xa0\xd1\x91\xcd\x8c\x81\x87j+\xf9\xc64eF\x8eE\x94\xb5\xd7s\x19\xc1gh\x1d9U07\xdd\xcfB!\xc5\xceF1\xa9L\xaf\xceJ\x96\n)\x16\x92\x06Eq\x1e\xd6\x8aI\xa9=g\xcb\x9d\xb5\xe5Y\xb5\xc1\xd7\x8b`_\xbdW\xf3\x05\xa8\xe2\xe8@XQ'rU\x87x~\x01\x8b6mo`\xf8\x9c\x84\xd8\xd80\xa4\x10\xac\x18R\xa2\xb70)l\x19\x84:\xdb\xa0G\x88\x8c4f\xff\xa1WK\x0c\xfb\x03\xb7\x95]{\x10s|T \xeb\xa4\x9aN\xddW\xf5\xaeY H\xfc\x980\xbe\xc3wS\xe3\x0cE\x9bMm\x0e\"\xcc\x9cX/\xac\xf3\xf8\x1a\xff\xbe\xa4\x07\x99\x17\x19\xdb\" t\xc4O[\xcb\x9d/\xe0\x1b+0W\xfd\x17\xe3\xec\xa7\xac \xf2\x1cx\x87iv\xcb\x0c9U,\x97\xd5Me\x05V\xc6:S\x7f!\x8f\xca\xcb\xb5N\x1cPym\xc7gle\xe1L\xd5\xa9\x9cG\xb9\xaf\xea=\xa3\xe6\x1d\xd6\xee5\xff\xf3\xf2#\xe3+O\xf6\x81\xf9F)\xadO\xcfG\x15\xd8U\x8b\xb3\xe3\x1c\x014\xb6a\xe6\x84\x06;\xe31\xb8\x8a\xbd\xb72\x1f\x83\xb2\xe0\xadg?\xfe4Z#\x85\xf8\x18\x85';>M\x1d\xcf'\xd5kjY\xef\xf7\"\x03\xf3;M\xdf\x92\x95q\xe9\x8a\xa0y\xaa+\xd4\xc9\xbd\x1b\xde\\\xd6\xef\x80\xb0\xb2an\x0f\x92*z8u\xf3\x94\x17\xea\xe4\xe6\x92\xc7F\xf0\x1d{\x0b;6\x90i\xa8\xa7\x1e\xfd\x84bE\xa9\xb7\xe1\x8e\x99w|I\\\xed\x94\xc1\x95Tw\xcb\xe4\xe5\x054\xfd7\x8ea\xe6\xd8MY\xdf\xb19.,/\xd0\x06\x93\xea\xcfW\xc2\xdbcs\x01I\xfa\"[\x0b\x96\xfb\x18\xfe\x89y\x87\xeb\xc3\xfc\x05\xc6\x11\xb2\x99\xa7Y\x1b\x19\xbd\xf8P\xe2\xc5c\xb5\x13\x19\xf8\xcfuU\x97\xd3\x9f\xb4\x84\xf1\xe9\xe7N\x8c\x11\xed\x9b\x07\xb9\xe2\x1a\xf6yX\xa6\x13C\x88\xcdpGQ\x18\xfb\x1bY\x8a<\xc8\x8c\xff\x94Y\xf7\xbd\xd8N^V\xbb\x89\xca\x0b\xff\xae)\xf9\xf7q\x92\xf0\xd7Guc\x0708\xb4\xfd\x00\x8c\x07\xc7\xf08\x9a3\xb8\x18\x14w\xfdqx\x84\xfa^\x1fD\x0f\xacc<\xba\xa9i\xe1\xd0vr\xa7\xb5\x08-\x19\xda\xa1\n\x8d\xc1\x8c\xa0\xc6\xe0\xeayo\xf0\x7f\xcc\xbc-2\xb0J\x89\x07\xd2\xeb\xafv\x14\xdf=\xdfr%\xfa\x16{\\*z6<\x83z\xe8eTX\x0f\xa7\x06\x07\xd1\x16\x83w>\xd5\xca\xb0\xb1\x7fC,R\xd8\xc9Z\x86XMpH\xdd\xc0\xee\xea\xf2\xe54\x10%N\xd1\x8f[\xd1\x8ei\x1b\xe7M\xdb\xe1\x83\x1cC\x91\xd6TB\x1b\xe3\x0e\x86\x9f0\xd4f.\xda&\x9f\xbcn\x0fs\xa5\xc8{8:v\xe4K%\xfc\xb9\xea\xa6\x9e\xb5\xdd\x0b\xb3h#\x1f\\:r\x86`\x06\xed\xd9\xf2[\xf0\xb5\xeb\x8bl\xb3\xb1\xcc\xe8k\x0c\x1a\x92\xb3\xd8\x95\xe5\xcca'\x83W\x9d\xe5\x8a@\xcc\x94P\xae\xbd\x00\xe6s}yO\xb1\xf3\xc6\xdeA3\xea\x81=\xba~\x99&\xd94\xbe\xe2*\x1d\x8b\xb4PXK\x16\xb4\xc5yRp\x9d\x13<\xde\x1b\xcfI!\x0b\xee\xe2B^Bk`9\xfd\xc5\xe0/\xa4\"\x93\xff_\n\x81\xc1\x04\xa20\xce\xb6QH\xccz$ \\A\x00\x1a\x13\xfa6\x85\xc7\x84\xbeK#2!\x9eu\xed\x95\x1c\xa8\x8c\x0f\x97Y\xff=T\xf7\xbf\xa1\xec\xdf0x\xd6\x8d\xcd\x04wd\x1a:\x13ZL6|&\xb4\xc0D\x84&d$\xe5\xc0h\xdc(\x8d\xcbleEjH\xac&z\xad\xa0\xfc\xca^\x03\xed\x81I\"p\x9b\x10\xe4&[\xb5\"\xf1\x1b\x0f\x00\xe1^\xb5\xa2\xa0\x1dR\x93\xad\x03=\x8eE\x9fk\xd1\xbbm\x00\xff\x07\x00o7\x80\x80YVaBVM\x0e\xac\xc8\x8b\x16elL>\xcc(\x185\xf2\xe3FN\xe4\xc8\xdbx\xcf`\xce\x8b\x1f\xd9\x11$\x1aC\xb2\xa3H\xc98R\x12\x92\x14m\x84\xadxR\x1eD)\xd928p%\xefH\x02\xc8\x8c-y\xd1\xa55Ur\xcc\xec\xbc\x18\x93\x1de\xb2\xe3L\xc9HS\xf2\x87w\xe0Mkz9\x06sr\xa2N\xce\xc2\xdd\xa8N~\xec\xc9\x83>\xe5\xa8k6\x0c*\x10)\x88\xc5\xa1L$\xaa8\xf6\x8bc\xbf8\xf6\x7f#\x8e\xfd\x10\xd8x\xf6\xe6\x1b\xe7X\xf1\xbbH\xe8\xc01=\xb6Wh\x13\xde{\xddg\x87X\xe0x\x08\xd0n\xd2t8\x9f\xa7\xdb\x8d\x7f/\x101\xde\xbc\xbd\x02\xf0\x05\x18\xaan\xc7B/\x9b\xa3'\xeb\xb2\x1b\x83\x11\x03\xbc3\xdb\xf0}\x86\xc1\xc0\xf3\xcb\x05\x00.\xebDY'~\x8b\xeb\x04\xddK.\xcb\xec\x87~5\xbf\x96\x8e\xf9\xcef#\x00\xed\xb5T\xe2\x8c\xb4w\xc1\x8b\x86\x17\xe1\xa5\x8c8\xf1\x98n\xb8\x8dG\xe4\x01%\xd5:{1\xdc\xa9\x84\xf5+\xe8\xb7\x8d\xde\xaa\xab\xc4\x96\xf5\x83\\&\xe4-N\x92\xe4lh\xcdeL\xfc\x8d.y\xb5kg \xc9\xcc\xe6\xbf9\x0e\xd0>\xa0\n\xf2\xd2\x9b\xa1\xd8I\xceP\xf2Q\x9d\xa1d#J;\x14\x8d\xd8\x0e%\x81\xde\x0e%\x80\xe4\x0e%\x9c\xea\x0e\xc5Kx\x87b\xebD\x93\xfc\x0e\xc5\xfa\xbc\x8f\x08\x0f%\x8d\x0e\x0f\xc5Qe\xe3\xf7$\x82\xf1\xb0\x9f\xb6\x0f\x85hPN\n?\x94$\"?C\x9bA\xec\x87\x92\x8f\xdeO)&\x0b\xc9\x1fJ\xea\x18\xf1\x12\xfe u\x1e\xda?\x14}i\xb2G\x9d \x9c\x94\x0e\xbc\xe1\xe3\xe4\xf3\xc0\xba\xd1\x1c\xa0\x7f_\xf1`\x13\x01\xb2\x9b\xb6i\xd8f\xa0\x9c\xb8S\xc8\x15y\xcd1\xcaq\xbe\x8ew\x16\x89\xc5.\x89\xfb\x86E\xc8.\x7f\xd1]c]k\x9c[\xdd\xb8\x02x\x16\x87F\x08\x08ys9\xec\xc1\x7f\xc2\x86\x80\x83\xab\x94X\xe7\xbdU\xe1\xf2\x14j\xd9\x06F:\xf1\xad\xca\x1c\xce}\x88u\xf0[\xb5\xf1Jy\x9c\xfc\x90\xc3\xd1\x0f\xf1\xce~\xab\xbe*\xc8\xe1\x0fiN\x7f\x88u\xfc\xdb\xab-oI\xf19\xff!\x12\x00\xb0*\x9boNq\x83\x00\x90\x00\x04\xd8\x15\x8a\xdbT\x1c`\x00\xe4\x04\x04\xc0\x0f\n@.`\x00\x92\xc0\x01X\x0f\x10@\x0e\x90\x00\x12\x80\x02\x87}\"OG\xb3d\x06\x0c\xe0\x89@\x03\xc8\x0f\x1c\xc0\n\xf0\x00\xa2\x01\x04\xa7\x0dw\x83\x08\x10\x05$XU\xb9\xef\x85\x99e\x05\xa0\x00\xb9A\x05\xf0\x02\x0b\x90\n.@\x86\x8c\x0f\x0f\xd0\x00+vI9\x01\x07\xf0\x82\x0e\x10X\xb38\xf0\x81T%\xd7\x087\x00\x019A\x08H\x03\"H}b\xa1\xb7ol\x12\x00 R\x1f}\xc7\xcd,\xe9\xc0\x04\x84\xf9\xdf\xc1\x07P@8H\x01.\xafc\x04X\x01\x1e}\x16OK\x06\xe0\x02Vw^\x18\x80\x01\x81=\x14\x08d@\x0c\x98\x01\xfe\x9eK\x025 \x0c\xd8\x80\x00p\x03\x82\x00\x0e\xf0w\xea:\xa0\x03\x82\xc1\x0e\xb0\x01\x1e\x90\x03\xf4\x805\xc0\x07D\x80\x1f\x10\x0e\x80\x80\xa7\x93m@\x08\xf8\xde\x0b\x03D \x13(\x02\xbe\xeaXfF\x14@Bj\xb2\xdc*4KV\xa0\x04\x1c` $\x00&\xa42\xeaF\xa2Y\x12\x80\x13R\x9f\xfdh\xeb\x01T\xc0\x0e\xaa@f`\x05\x92\xc0\x15R\x1d\x05\xb8@,\xe8\xe2\xb2[\x16\x1f5\xac\x04c \x1c\x90\x81\xb5\xa0\x0c\xac\x02f\xc0>\xbd\xc1\xe1|\x87\x15\x0e\xf8\x10\x90\x06\xd6\x025\xb0\x06\xac\x01{#\x13@\x1b\xc7\x1c\xa2\xfe\x92\x00\xe6\xd0c\xdb\x06\xe8@4\xa8C\xab\xb2\x01=\xf0\x04`\x0fd\x1as\x81\xa0\x0f\x04\x03?`Y\xcd\xdd\xb4\x03)\x17\xb6\xd3\xfd=S\xabX6H\xf6K\xdcgq\xf2-\x14\xb8\xa5\xc0-\xe4\x8e\xa7\xc0-\x05n)p\x8b\xa2\xa8\xc0-\x05n)p\xcb,\x05n\x99\xa4\xc0-\x05n)p\x0b\xacF\x0c\n\xdc\xb2\x90u\x9dW\xe0\x16U\n\xdcR\xe0\x96Y\n\xdc\xa2H\x81[\n\xdcR\xe0\x16\xab\x14\xb8\x85~\xa1\xc0-\x05n\xf9\xa6\xe1\x96\xeb\x89\xd5YC\\\x1eH\xeag\xc7\xd9\xe8r_\xd5\xcd\x0d\xfb\x10\x0c\xfc@T:ga\xcf$\xff^\xe0\x16E\n\xdcR\xe0\x96Y\n\xdcR\xe0\x16\x8b\x14\xb8EJ\x81[\n\xdcR\xe0\x96\xc0]R\x81[&)p\x8b*\x05n)p\x0b!\x05n\xa1\x9e)pK\x81[\n\xdcR\xe0\x96\xa5\x14\xb8e\xf9{\x81[\n\xdc\x82R\xe0\x96\x02\xb7\xd0*\x9f\x10n)\xec\x99\xa6\x14\xf6\xcc\xc2\x9e \xff)\xd83\xe9Z\xbc\xa9{\x8e\x9a\xc8=o%\x19\xf2\x9e\x01\xab6\x0f\x1c\xd1\x98\xea\x82{i\xee\x03\x9b\x80\xd9\xef\x1c\xe5\xfb\xb8;\x0b\x03ga\xe0,\x0c\x9cO\xc3\xc0)>\xe9\x92{\xd3G\x87ie\xe2T\x95\xfcl\xd3\xa2pr:(9/\x9aM{\xa8\x9b\xdd\xab\x9bjw\xd3UM\x7f\xcf:\xd1\x81\xebi9\xc5gybf\xce\xedP\xedn\x87\xf6v\xe8\xaa\xed\x9a\xe5\xc8\xbe\xdc\xf0\xc6\xb77\xa3\xbe\xa5\xf1\xc7\x19 V\xd1\xf1)\xdc\x99O\x01\x00\x86\xa6Ata\xc7\xb6p\xdf\xb5\x84s\x1c?\xe8\x86\xd5\x1fg\x0cC\x0eg\x01\xd1\xf7\xac\xd17H\xf8S\x96\xc6^sU\xfa\xaa*3\xba%\xaa\xb2\xe1FB4\x97\xf1\x7f\x99\xad\x15\xf5\xfen\xf9\x1b\xb6-K]\xafdGi\xb5\xb5v\xe0C5\xda.3hFFR<\xe3v\xde\xfc*\xbb\xfa#[v\xff\xf8\xcf\xba\xe3\x1f]\x1d\xaadU\x89\xc93\xd7\x18*1r\xc4\x03Se\xef\xd8\xf0\x89\xb1\x06\x86O\xcbE\xeb\xd4\xb3nF]\xa8\x12\xe5\x04U\n\xc1}\x10\xee\x1ex\x0c\xc74`\xb5bq\x83\xa76\xa9\xfdTu\xdb^\xed\x93\xf1\xe5\xb1\x16\xe2\xa7\xb2[(\xbb\x85\xb2[\xf8\x82\xbb\x05\x80X*}\x07\xd3w\xc8J\x1f\xce\xfd\xed\xd2\x16\xc8\x06~Yu\xd5a\xfd&\xe3\xc8_\x8b\xb3D\xf5\xe6\x83y\x06\xb7\x1e\xe6\xedG\xf9C\xdd\xdc\xeeY\xb3\x1b\x1e\xcc\xe3\xbc\xd3\x9f\xe2\x08\x958T\x9f3\xeb\xb4Y\x86\xb7\xa2\x1b\xf0\x03h\xe3\xaa\xab\x0el`\xdd\xb8\xb6\xec\xf9\xc0\x16\xab\xa2\xfc|\x9a.\xd9\xa5\xea\xef\xe3\x06-\xb9\x8b;\xb6\xbbe\x9fWu\xc5o\xea\xab\x8c\x13'\xf8\x03H\xe6\xf8\xf1%\xb5\xa7\xef\xea6\xb9\xa3\x9f\xac\x85\x7f\xae\xdb\xd5\x0d\xbc\xab\xdb]W\x1d\x1fT(\xb0\xed\xaa\xcd>}\xce\xa2a\xbc\xad\xb7\x91\xcd$\x96^pn^\x01\xaey\x91\x17\xaf\xf4\xed\xeb\xc5+\xb9q\xc5\xb6\x89\xba\x895oS\xed\xf7d\xe4\xdf\xd0\xc2G\xd6\xd5\xf7|\x87B9G\xb7\xd5\xa0\x07qV\xfd\x87[\xbe\x82\x7f\xb9V\xbf\xe8?\xbc\xe4\x87\x07\xad\xd5\xf3\x0e\x04[\xcd\xd7x\xf4\xe2U\xfd\x07s36\xca\xdc^\xaaq\x07\xee\xf2\xfd\xa2\x8d\xfb\xb5n\xc8\xc6\x1d\xea\xa6>\x9c\x0e\x80\xc7&\xb5\x8d\xf3\x81\x91P\xb7i\x0f\xc7=\x1b\xac\xeen\xde~\x11\x00\x0b\xfdi\xb3a}\xcf\xd1f\xed\xd9c\xc7\x8eU\xc7nw\x95\xe5\x16\x88\xa7\xe8\x8bK,\xf4/Uo\x9c&\x0f\xb2\x1bv\x95\xdc\xca\xf1\x1d\xd7\xf6\xc4\xc1G\x1a\xc9\xc0F\xf0\xb6R}\xd1\x0f\xe3\x8e\x89\x9a8\xda\xc3\xec3\xdb\x9c\x86/\xdc\x19\xe7Xh\xb6\xce\xc0F A\xf5\x86\xaf\x13\xee\x19\xbb\xc5\x92m}\xb0\xf4\xcaH1\xbc3\xcb\x97\xa2Sm\xb6\xaci\x0f\xf4\x9f<\x1fe\x14[KP<\xaf\xfb0\x94Q^\xb6\xf5\xbc\xc3\xae`h?0\x81\x98TXu\xb9\xdd\xae\x9a-\x0f\x00\xe5\x15\xb2E#\xbe}ws\xfe\x9c\x07F\x88\x8f\x8f\x11\x065\x8f\x1d\xbdh\x06a\xf6\xa6x]\x15\x80%\x15\n?\x1e\xf9\xb7 #\xec\xf9I\xa7\xee\x10\x18\xd8\xb5\xbb\x96\xa3\x9df\xd0\x82k\x1c\xbff\xec\xc5\x81\xb2p\xf30\xbegl\nT\xaf\x1e\xdd\x98\xde\xd0\xca\xe9h3q\xf6A\xac;M\xa5\xbc\xe3o\x04\xef-\xe6\x99\xa2\xe9\xe1\xa6Y\x9e\xe4O\xc2G\xa0\xac83\xb3`{\x0f\x15lX3t\"\xdbj\xa9\xa8\x9a\xb3\x14&\xcf\xd9\xdd#Tv\x96\xc3\xeax\xbc\xd5.1\x82\xb8m\x0d\x8f\x93\xae\x87\xc7\xdb\xad\x000W\x9a<\xb9\x1d\x15\x88\x93T\x07R\x1d\xdc\xf1\xa4\x05>\xe6\x95fr\xcc\x8d}>\xd6\x9dv$\x10\xfa^\x1c\x8f\xfcf\xa8\xc5W\xf2|\xa4\xeax\xc4\x9b\x9d\xbe\xd3\x94 %\x0b\xd7\xac\xa2F\x9cO\xa7#\n\x1c\xda\xediO\x1c\x88\x89c\xa7\xf3\xc4+\xce\xba\xa2\xf8\xc0S-\xfe\xb0\xfeX\x8b\xefE\x9dk\x072\x8d\xd1\xfa\xd9\xdd\xf606Q\x91X\xc7\xec\xe9\x891I\x89t\xf2aT\xca!u\x85\x935\xd1p\x88O/\x8cL*4R\xb1\xdc\xa9\x84Q \x84Qi\x83sz eJ\xa9d\xc1\x98\x14A%\x15P\xd3fI\x0c\x8cM\x07\x9c\xd2\xfe\xf4\xd6\x10\x91\x921\xa9\x7f\xf6\x14\xbf\xc4\xc4\xbe\xa0t\xbe\xf0\xb4\xbd\x84d\xbd\xd8\x14=[*^\xb6\x04\xbc\xbciw\xd9\x92\xed\xfc)vq\x89uDg\xda\xd2\xe9\xd6'\xd1y\x92\xe5\x86\x90\x14\xb9\xd8\xc48k\x02\\d\xda\x1b\x91\xecf](\xc3\xa0(c\x05\x8dLb\x9b\x93\xd5\xa8\xfe\xfd\xce_v\\\x9a\xda2%MQg&\xa7eHIKHD3G\xb9\xbe\x18&$\x9dY\x12\xccR\xd2\xca\x9c\xf9P\x96\x142o\xe2\x98\x99\x8b\x11\x9e$f\xbe\xfb7\xaa\xadQi`!\x8d\xf5\xa5|\xd9\xdb\xe6M\xefZ\x91\xd4E\xb692\x81\xcb\x99\xb6eO\xd6r\xa5h\x91\x9d\x10\x9a\x8e\xe5K\xc2\xd2R\xaf\x12\x12\xae\x02\xd2\xac\xc2\x93\xab\xbc)UD\x06\x92Q\x1c\xf1\x8c/U*-A\x8a\xac\x94\xf2KT\n\x94-\xdd)%\xc9\x89Hh\x8aMc\"S\x96\x12\x12\x95\x8c\xad\xb65\x15\xc9H@\xca\x93v\x14\x9fl\xa4%\x16E\xa5\x13YS\x87\xc2\x12\x86\xbciB\x81\xc9A!)AF\x8e\x8cYZh\x02\x86;\xe9'0\xd5' \xc1gQ\xe5\x84d\x1e#q'!]\x87J\xcd\x89K\xc8\xa1\x92o\xf2\xa5\xdc\xc4\x7f]oz\x8d/\xa9\x86\xb8\xb3\xfe\x1f\x17\x91,\x9a\x8b-\xc8\x85'\xf0\xe5\xab\xcb\x97B\x93\xd3\x93w\xc5\x8f\xaa\xc1\xbe;\x01\xcc)\xbe;\xf4[^\xe3\xef\xaa'\xbdRP\xbc\x05\xba7\xbf\x1b\xee\xf7[s\x96\x11U\xfa\xc5\xc8\xcb\xe1\x83\x17\xb3'd\x8e\x8eH+0\xdd\xd6\x16.\xb65\x85\xce\x19MJ\xc1\xac\x91\x8e\x06^\xf8\xf8\x8c@\xc6\x16)M\xf7U\xbdg[\xa3\x9b_\xf3\x9f\x97\xbd\x8c\x8f&\xf70\xf7y\xack\xec\xf9\xf8\n6\x0e=8\x06g\xdeX7\x99\xbf$^\xc2\x01\xb7l\xc2\x02\xfbE\xe7\x89k\xb4\x9e\xbdVz'`\xd0jM#\x9b\x95\xd2\xa4 \xb6\x11\x9fg\x9e\xa5cKq\x956\x10\x85iL4\xed\x80\xe3\x02{a:\x13k\x18\xb8\xbd7\xae\xd59\x19\xd0\x1d\xda\\ruG\xfc\x1c\"\xe6OhA\xf1\xf3F\xff\x1e\xd2*\xad\xfb \xbc0\"\x02A\xf9>\xfa\x1a\xf0\xa2y\x0c\xee\xfe\xc1\x800\xc8\x8e\xb1;?2\xc1\x164d\x91\x07\xae\x88\x87*hp\x82\xda\xb3\x07\x00\x13\xd1\xa0\xc4\x0cC(\xdat\x1f\xccj0\"\x11\x88\xe0\x1fy\xd9)\x0b\x10\"\x11\x80\xe0\xe7\xb0\x85vUy2\xf0`\x9c\x7f\xf2\xc1\x0c \x10CFx!\x12Z\xc8 +d\x81\x14\xf2\xc1 Y\xa0\x047\x8c\x10\x0f!\x90\xa0AV\xc0\x808<,\xedAV\xa0 \x02$\x08\xd9\x08\x90\xc0\x80}m\xca \x08\x0c\x13\x18@\x97\x97\x03\x04P\xc9T&\x00 \xd1\xf9\x9f\xee\xf8_,5y]\xfd\xb1n~\xab\xd7\x9bp\xef;]\xfbK_b\x98K\x7f\xf9\xce\xdf\xf4\xb6\xacv\xe3\xfb\x1a\xe3r\xdf\xd3\xf5w\xba\xed\x03]\xf6F\xbb\"\\\xf5V7=\xed\xa2\xb7\xb9\xe7\x8dF\x86\xb8\xe5].y\xc5\x1d\x1f\xe9\x8a\xf7\xb8\xe1\xc3\\\xf0N\xf7\xbb\xe6\xe5^\xa8\xd7\xfe\xe6r\xb7\xc7\xbb\xda\x8d\n\x88\xff\xcb\xe6^\xcf\xe8Z\xcf\xe6V\xcf\xe5R'\xdd\xe9\x0bWz\xba\x1b=\x8b\x0b=\x9f\xfb\xdc\xef:w\xba\xcd\x03\\\xe6>w\xf9\xc2\xef\xbc\xd4\x1e\xeaD\xb5\xbb\xc8\x03\xdc\xe3\x1e\xd7\xf8T\xbd\\.\xf1\x8c\xee\xf0<\xae\xf0\xfe\x113\xea\xff\xbco7\x1f\xd6\xf3\xc4\xdd\xf1\xd7\x9e\xd6\x13\xc9\xcb\x88\xe1:\xfd3\xbe\xe8aa=\xf5\xac\xc32\xf8\xb0j\xf0\xf8\xd76\x8c\xa8\x84Ak\x15Z\x89\xad\xa7\x12B\xbdJ\x08\x8a\xd2\xb1\xaa7\xe9&\x1c\xc5\xfa\x8ewW\\\xa1^\x1d\xe9\x9f\x12\xe5\xcd\x1d3E%\x8a\x1a\x1a\xfa\xeeu\xafL\x7f\xba\xeb\x8f\xd5\x86\x11$`\x01\x07V\x92\x14\xc8\xc1\xb3+\ns\xd1\x7f\xc9\nA\xdd\xf4\xf5\x96\xcd\x9c\xf6\x866\xdebA#e\xfc\xf1\x8e\x11}\xe0\xea\xed\xf7=\xeb\xf8\xd7\xd7\xabv_m\x86\xc9\x879\x8dR\xde\xd3b\x18\x8c\xbf\xef\xea\x8f\x1a\xd1\xbe\x18J\xcb\xaa\x8du\x96\x1f\xa0p\xc8\x16\x0e\xd9\xc2!\xfb\x059d\x1dL\xb0\xcb\x055$}\x06\xdfpe\xcf\xd0K\xf7\x95\xfa\xeb\xea\x15|\xa1\xf3i\x17r~I\x88\x9e\xe9\x11\xb2\x86\xbe\xc4\x17u;*\xf4\xc1\xc4O>\xb7dY\xee81Xw\xac\xba\xe1q}\xe1\xd4\xcd)\x8aBc%\xe5\xdb\x07\xbe\x92\xd4\xcd\xc7v\xff\x11\xe7\x04\xcd\xecn\xa9\xf07\xb2\x84\xd6[c \x1dG\xac}\xfdT\x1b\x04uo\xae\xa1\xdc\xa3\xac\xfc\xeaZ)\xae\x96\xca\xb0\x1eCw\xda`\x1a\xc5\xa2\xb0\xe5\x0e\xe4B%\x86\x1f\x10\xfc\xdb\xb0#\x7f\xef{\x84\xc6\xbe\xe7-\xeb\xaa\xe9\x0c\xca\xb3m\xf6\xd0\xb0\xe1S\xdb}\xe8\xcb\x8aZV\xd4\xb2\xa2~[+*\xb9\xce9\x17V\xf5\xed\x9f\x17\xaf\xd3Z\x8d>\xfd\xcb\xf8\xab>\xd6\xc7\x9f\xd2z\x95\xeb0r\xc3\xe81\x04\xd6q\x04J\xa7s\xdf\xb3\x12g/'\x9f\x94\xaf\xd9\xcbs]\x8c\xe7p\xf6/W\x7fA\x8e\n\xdbj\xa80p\x7f\xd1\xd9!\xe6\xe4\xec/\xf3\xd7\x0c0*\xe6\xe7\x88\x98\xce\xceO@u?\xd5\xf5\x96\x04M:29\xb4\xbbq\x10\xd7\xfd\xa2'\xf5+\x8b\x98j\xbf\xd7\x98n\x9e\xe3\x10\xdc\xd5\x9a\xe5r\xb4n\x8d\x1d\xf9\x92\xdd;\xd9\x0c\xb5\x9e\x81\x9d;\xb9\xde\x84\x12\xaa\x7fy\xae\x13\xffd\xd3\x92\xbc>'\x98/\xc8O\x9c\x0c\xfcEs\\cc\xff\x0dEz\xa4>\x8a\x91\x11\x80\xe2hGJv\x80Z\xa6\x85\x13\xd2\xf8\n\xe0\xf8\x12\xf25\x8a\xed\x19\xdc\xcd\x00\xaf\xb7\x16%#\xea\x89\xe2b\x7f\x86\xac\x08(J6\x1c\x14\xc5\x8a\x86\xa2P\xee\x82@L\x14%\x172\x8a\xe2c\x85\x86X\x94\x14%\x1a+\xa5\xfbn\xba\xaf\x0ch\x86hH\xc1MIm\xd3\x1df@2EC\"\x86J*$\xef5\x9b%\x06O%\x159\x98\xa4!\x1di\x95J\x02\xf0V\xf2\xcd`\x0c\x16%\x01\x89EI\xc0cm\x13\xddR\xd5lH-J^\xbc\x16%\x1bj\x8b\xe2\xc7nQ\xb2!\xb8(vfjHDsi[A2T\x03\x04\xe2\xbc(\xb1h/\xa9\xcc\x86\x00\xa3D\xe2\xc0($k5\xf8\xb7\x14\x0e\xf6j\x08\xdcqD\xa2\xc4\xb41\xb52YC@m\xd2pcC\xdd|w\x9c\xcej\x0dy0d\x944$\xd9P7h7\xcb\xcd\x92\x88*\x9b%\x11L\xd7\x90\x885\xa3xH\x9f\xc1\xc5z\x0d!\xe83\nI\x9d\xbb\n\x89F\xb1\xe9!\xe8H\x93\xb0i\x94\xf0\xce\xf1\xe1\xd4(\xbe^\xf0b\xd6(+\x90k\x14G\xefD\xa2\xd8(\x1e\xb6l\xf00f\x83\x975\x1b\xdc\x9d\x16\x8aq\xa3\xf8\x90n\x14\x83E\x1b\xd2Po\x94\x00\xec\x1b%\x1c\x01G\xf1\xe2\xe0(\xb6N\xa4\xd8\xb5\xc1\xf5\xbc\x0f\x1fGIC\xc9Q\x1cU6~O\xc2\xcd\x0dm\x06\x0b7$\xa2\xe9f \x0437\xa4b\xecf\x95u\xb6n\xc8\x8c\xbc\xa38X\xbb\x81f\xee\x86lX\xd7\xfd\xa0\xc2\x01O\x99\n)\x0b\x1d\xb7\x98b\xc3-k\xa8\xbc\x7f\xac:\xd6\x0c9s2\x7f\x90 \xcb\x8fJ\xdf`1\xb2N\xcak\xe3>0\xf0[\x08\xfdo\x15\xbc.\xac\x8d\xaauYU\x94\xd2\x94W\xb3\x0e\xadp}j\x8a\x81\xad%wNI\x9d}\xdd\xec\xf6\xca`Q\xb5\x08\x0d\xd4\xfc\xb0OG\x9c\x84\xb2\xd4U\x93o}\x82\x9d\xa8\xedo6\xc5.i\xb6\x9a\xf3\xd55Q\\S%u\xd6Z\xe7mr\x85\xd6\xcd^j\xfe\x86\xa4\x0f\xae\x9f\xc3\x8eY\x1cR\xe0\xba\x99\x9cc.\x97\xfdq\xd9\x1f\x97\xfd\xf1\x17\xdd\x1f\x13\xcbg\xc0vv\xb1~\x06\xef^\xc5/\xeb\x17P\xf1b\x94I\xc8\xb8m\x9d\x17\x1e\xee%\xd2\xa2\xc4\x08\x03\xbc~\xa3\xf6\xcb\xe9P5?u\xac\xda\xf2\xd9\xa2\xc6Y\xe5\xdc\xa4\xbd\x93\x17#nu\xc3^\xf7TAC\xc7\xaa\xfe\xd4\x85\xdaU\x9b\x9d\xb8Z\xde;(\xb5B\xb5\xe13_t+\x8f\xd0i75\x1f\xeb\xdc\xd9K\xd0a\x9bul?5k\xf9g\xac\x19\xf9\xed\xa7\xc6\xfaQ\xc9\x8b\xcdW\x964\xad~B\x99\xae\xben\x9b\xdb\xa1\x0e\x1e#\xb0\x8a\x9a{#.\x9aA\xec\xaa'\xc7\xa5\xea*6\x94 \xabk\xfc\xde\xd7\xbb\xa6\x1aN\x1d\xeb\xf9\x92Tw\x08\xa9\xed\xda]\xcb\xfd\xb5gA\xf3\xf5M\xdd\xf3\xf0\xc3{\xc6D\x8byS{l\xb8\xa4W<\xd4M}8\x1d`W\xf5p\xec\xea\xcd\xd8A\x18\x87\xa6\xa9\x13\xa7\x06\x8au\\\x1f\x82r/9\xcd\x93)be\xbf\xd76\x94\xaf\xf8z\xb3T\xb1X\xd5\xb4e\xc7\xe9\xa4\x91+\x9b,7|U\x8b8\x17\xca7\x9f\xf6`\x98\xfd<\xb8z\x19\x8c=\xf1\xac[\x0c\x13O;k\x97D\xdb\xa2\x18R\x16a_\xf2-\x8d\xe4\xe2H.\x8f!U\x8dZ\"-\x8bdDy\x8e\x85\xd2\xb9T\x06\x0drz\xb9\x8cZ0\x83\x96L\xfb\xa2iY6\x9d\x0b\xa7{\xe9t,\x9e\x9e\xe5\xd3\xb5\x80z^\xf5-\xa29\x97\xd1\xcc\x0b\xa9})]\xbb\x98\xbafy\xe6\x05\xd5\xb5\xa4\x92f qY-\xfe\x99\xe2\x9f)\xfe\x99\xaf\xe1\x9fY\xc2\x8f\xc6\x9es\xcd\x9e\x96\xbbk\x846\xff\xf6\xf6}\xcf\xbaB.8K\x08\x18R\xc8\x05K\xf2fI\xde\xa4\xb4\x95\xe4\xcd\x92\xbcY\x927\xa1$o.\xa5$o\x96\xe4\xcd\x92\xbc\xe9\xadMI\xde\x84\x92\xbc %y\xb3$o\x96\xe4\xcd\x92\xbciHI\xde,\xc9\x9bRJ\xf2&\x94\xe4\xcd\x92\xbcY\x927\xfdc\xe4K$o\x16r\xc1\xe2\x9f&\xff\\\xfc\xd3\xc5?]\xfc\xd3\xc5?]\xfc\xd3\x84\x14\xfft\xf1O\xfbw\x1c\xc5?]\xfc\xd3\x0b)\xfei!\xc5?]\xfc\xd3\xc5?\x1d\xe5\xec%\x7f.\xfei\xfd\xc7\xe2\x9f.\xfe\xe9\xe2\x9f6%\xd4\xf7X\xfc\xd3\xc5?\xed\x1b#_\xc2?]\xc8\x05KrNI\xce)\xc99BB\x93s`\xfe\xacI\xe4\x82\xff\xb8\xc8\xee\xa1Sn\x9c)>\xea\xeb?/\xdf\x97\xfd\x15\xc6\xd12\xbe\xcb\xb9 \x7f\x1d\xbfh\xb7>\xe1\xe7\x80\xefEe\xfc,\xe6S1f\xc5\x98\x15c\xf6\x05\x8d\x19\x99ih\xb3\x07\xeb\xac\x91\xaaa\xad!Zm\x81\xf8\x8e(\xcafX\x13 \x13f\xc8\xc5+_\xbe`\xddc\x95M\xeeDA\x8d\xf7\xe4D\xa3\x92M\xd0V\xb1\xbaGhAQ\x98\xb1Jn:\x11u\x7f\x0b\xb9)\xb5\xf86Z/\xe1iH\xb5\xf4R\x8e\xac;\xd4}\xbf\xe4\x05\x05\xcbz n^%{\x95\x0c\xfb|9\x17\x8b\xdd-\xd7\x94)M\xb4\x9d\xb8\x00\xc6\xde\xe9\xe1Xu\x83l\x85\xa6l\xd9&\xf99\xe5\xc4\xd5\x0f/\xe3O\xed=j\xfd\x0e\xbc\x06'\xc8\xd2\xe86fuj3\x7fk\xfd.\x87\xb7&n\x93\xf3\x0d\xa45\xa7\xd8$\xbbUr\x19\x81x\x1a\xd5\x08\xdb\xf4\xa4\x94\xb3!6\xea \xf8\x8eHK\xf5\x94\x8cGfYV\x8be\xb7Y\x1eZ\x1bW\xe5\x08\x8fLV\xdb\xa5[\xaf\x08\xfbU\xce(\xe5\x8cR\xce(\xdf\xd0\x19%\xect\xa2\xef\x19\xd6\xf3\xa1(\x86h\xf5\xce\x81\xb4\xa2+\xb6\x0f\x8b)\xb0eCU\xef\xe3\x14}\x0b\xfb\x10\x93Ke\xfcF\xca\x1a?\xf7\x16\xbd\xd0?\xd9^\xc4\xdc\x80\xac\xac\xd9\xb8L\x18u\x9aW\x98\xe5\xe2\xc2W\xf7Y#\xd9\x94\xd5\x81\xeeT\x0d\xc0\xfd\xd1@\xab\xa4\xdaf\xa66Y\xd87\xe3\xf5\xf9\x11{\xc9\xd46\x01\xec[\x05\x08\xae\xb2\xba?\xe81\xdb@n\x05\x16/i\x0e\x82\x85\x0e\xeb\xca\x9f\xfb\xebp\xad\xc4\xb8\x05\xcf\xd8\x05\xcf\xf8\x05 6\xadb(\x9b{:\xf8F\xbf\x99eo6?\xfd\x8a[>\xed\x8e\x01\xb4\x86\n\x87\x9d\xf6\xd1\xac\xab\xc7\xc2\xa0\xe3\x92\xb8\xca\xbf\xa5\xb6\xc2\xb9\x84\\\xab\x17\xf1\x04\xac\x16\xa4\xed%{\xd6bo\xed\x966\xec\n\x0f\xb3\\}X\xd2\x83\xd16\x04\xfd\x17W\x10\x97tD\x14\x1c~%\xc7\xf2\xa8F\xf6\xad\xd0\xb9\xee\x02\x0e\xf2h\xe6R\x1f~\xdd\x86x!\xfa\xa2\x0drd\x8a\xff \x1e\x9a\x89#r\x15\x89p\xf87\n\xa7\x0c^\xfd}\xd6\x10\x04\x9b\xd4\xc0.\xcd \xdc\xbfz\xc1\x1a\xcb\xaf\xab\xd4\xd5\xcc\xbe\x06\xa7\xef\n\xed\x16\x1e_\x0b\x83\xafs<\x99\xac\xbd\xa2\xc8!\x90\xaf\xd7\xc3\xd4\xfb\x14{h\x92\x8b\xd7\xbaB\xd2\xfc\xbb\x96\xc7]\x87\xffh\xb6]UI\n\xcd\xee\xbc\x1a\xce\x12\xce\xa6K\x1d\xe032\xe8\xd2\xdc\xb9\x8b\xc1\"-\xed4z\xd7\xf0\xe5Rfv:u\x06\xdb\xd9l[\x80H\xa7/u\xc4\xca\xb5 \xaft\xee&V!\xdc\x89\x9be\xbd1\\\xb6yW\x9cE\xe0WN\xa7\x02\xb97_\xefoU*\xa8\x1c)C<\xabb\xde\x1c\xdb~\xe0s\xe6\xc50T\x9b\x87\xd1\xb4|\xf1I\xb30=!\x9b\xe8\xb1\xd2j\x9a\xfbh%\xa7\xea+\xba\xa6\\d\xd5\xf4l\xda\xa6a\x9b\xb1g'w\xf5\xa8/\xb5\x11\xca\x06\xd8U;%?z\xaaH\x9e\x89wq?\x0d\n\xa33x\x1e\xb2\xba\xd8\x91++\xbd\xae\x0ed*\xbfuYu\xa7\xafeL\xdc\xb7\xa7\xec\xe7K\xd6\xcf\x96\xa6oM\xd0\x1f\xe2S\xf3s%\xe5\xbb\xd3\xf1\xa3\x12\xf1\xa3S\xf0y{u\x14\xc9\x9a|\x1f\x9dv\x8fsS\xd3fI\xb8OI\xb5\xe7i\xf5zk\x88L\x8e\x98\xf4z{*}b\x12}P\xfa|x\xaa|B\x92|Bz\x93_\x1c\x17\x98g\xc0\x86\x8d\xba\xa9\x91\x1a\xd8\xe7\x01\xb5(^\xfe\xf1-%X\x02=\xd1\xec\xf3\xa0\x0f\xfa_\xc4\x98\x9a\xdfV\x1b\xae\xbf\xc6s\xefcQ\x8f2\x02sW\xeew1\x02\x7f\x15c\n\x02\xc6\xdf\xa9{\xf2\xe8\xdbod\xec\x8d\xfb\xeaov\xec\x8d\x953\xc6\x1e\xc1\xf1\xec\x1f{\xff\xccw\xce3p2\x07\xd1#\x9e;\xc3\x15\x1d\xdb\xd6\x1d\xa2uZ\xb6\xc4\xb6\xee\x8f\xfb\xea\x91\"\x99\xf6W@\x8d\x02C=b7?\xd7\xc9\x1c\xef\xef;K($\xdf\x00p\xdfO\xbdY\xbc*^|S7\x1f\x02\x06\xba\xb2!\xa1\x8a`b\xe3\x00\xc7\xaa\xe3>\xee\xd3\xb0D\x1cQ\x8f\xbe\xdf\xb8\xac\xba\xea\x10\xbe\xdb8T\x9foGM\xb7{\xd6\xec\x86\x87$D\xf2\xd7\xea3\x8f\x0fAUTeg\x14\x9c\xd7r\xd9\xbd\xc7\xf176\xb0\xae\x97!\xa1\xfc\xdd\x1e\x0e\xed\xf6\xb4gT[\xdb\xfe\xcb\xa3\xd7\xc1\x80\xf5D\xc0\xce\xc3\xa7&Gl\xa6\xd0\x0fo\xbc\x87\xbb\x16\x89\x9d`\x84\xa0\x8ee\x89\x87\xd8\xe7\x81uM\xb5\xf7w\xb49;\xcf\xc5\xbb\xa3f\x1c\x04u\xaf\xea\x1e\xc7\xd1j\xa57\x02\x1b\xd4\xeb\xb9\xd8\x99[\xea#'\xe1\x1cE\xc0\x0fL\xcbZ\xad\xc2\xd7\xcd\xfd=XV9p'(\xaf\x8e\x8e'W=p\x1bP\xf0-0\x00t\\\xc7,1k\xcfPQ\x15\x01j\xb1\x04z\xc1\x84|\xed\x8al\x80\xb9xr\x9d\xe6\xe6\x0d\xfcUM\xdf\xc4\xa9Z\xa26r\x8a\x82u\xc7 \x8f\x14P\x06}\x19\xf4\xbf\xa5A\xbf\xe6\x04\x03\xc6)\x06\xcap'\xce\x17\xbf\xed\xe1N\x1e\x90\x80>$\x81\xbf\xaa\x19\x0fK\xe0>0Ape\xd6\x1d\x9c\x94\x17\xd7\x1f\x9e\x94\x97\x03\x0fP\xdc\xae\xc4y\n\xe8=\xe3\x0d\xaei\xfbJ\xdf\xe7=\x1b\xbb\xfe\xfe\xc4#\xe6`S\x0dl\xd7v\xf5\xff\xe1>i\xa1\xa3:\x0d\x0f\xc1Y\x1c\xfcYbG\xbai\x9b\x8f\xac\xeb+\xcb\xf9`\xd5\x0e\x9d\x0c\x0do\xbbzW\x8f\xdbk\xde\x91r\xb4+\xa5\n-\x93\xb9\xdd\xde\xf2\xc3VT\x1f\x07{c\xf8\xe3\xf40\xba\x11\xd1 S\x85\xf4\xc7\xec\xa3\x985'#9\x04\xe0'\xb8|w}s{u\xfe\xfa\xfc\xea\xfc\xed\xcb\xf3\xdb\x9b\x7f\xb9<\xbf}\xff\xf6\xfa\xf2\xfc\xe5\xc5\xeb\x8b\xf3W\x81o\\\x9d_\xbe\xf9\x97\xc0g\xff\xc7\xfbw7\xe7\x81\xcf^\x9d\x8f\xbfj\x0f\x0b\x18\xf7\xf9\xca\xba\xbb\x19,\x02\xfa\xe29\xbcm\x95\xa5\xd7\x16R\xe4\xee\xa4\xe7\x18\x86;\xabY\xac\xc0\x1d;\xee\x1f%\x085_\x94\xb18\\yJ\xe1\xdd\xeb.\xe5\xdfO\xed0G\x15E\x95\x82\x1f\xc6\xdb\x18e^9\xca9\xea\x01\xe8(\x8e\xd1\x1c\xe4\xe4\x9b\xe6\xf9<\x7f\xc9\xb29\xf2\x97\xb9p\x8aZF\x94d\xd4J7\xe9\x7f\xe8\xb9Q\x97\x01\xdbS\x14\xbf\xae\xf0\x84\xb1\x9e{\xe2V\xae)uol\x86Lz&g\x9f\xf4@\xb5\xfdp5U\xc8\xbeT\xf1/j\x9a\x1fi\xcaa_\x8fK\x92\\(\x94\xa1\xd1\xc3\x0f\xac\xe6\xf1\x89\xd54\xd0\x9fMC\xa4\xc31\xf9\xe3dp\x8f\xfb\xc7\xdb\x9e\x0dC\xdd\xecL\x8f\xc4\x15\x9f%\xf2\xcf\xd8\x9f\xb4\x0bB\xfb~\xba\x11\xfc \xf8\x9c\xbc\xbd>\xbf\xb9\xb9x\xfb\x17\x8b\xf1\xd0\x9f:\xff\xe7\xf3\xab\x7fy\xf7\xf6\xdc\xf1\xc8\xebwo\xde\xbc\xfb\x9f\xe7W\xd7\x8eg~}\x7f\xf3\xfe\xc5\x1b\xd7\x03\xe7oo.\xde\xbd\x9duL\x86\xcf_k\xbb\xb1s\xb4Y\x188\xa5si#g\xeb\x90\xe7p\xfe\x91u\x8fm\xc3&\x88\x9e\x87\xd0\x0e\xadj\xd8\xf4/\xe5\xea\xbe\xe7\xf0\xae\xd9?\x8aXo\xd6M\x11\x85\xb8\xbfH,\x05?\x80(B\xd1z8\x0d'\x9e\x0e \x0bM,F|FQ\xd0\x91\xb5\xc7=\x93.\x00\x1ex-f\xbf\xd0E\x17'J\x98\x92Y\xb7\xd5\xe0K\x1f\xf3&\xb3\xbe\x94\x89\xac\xe3\x13\xc4\x06\x8c\x07\xad\xb0m=\xb0m\x96\xf2\x94M\xd8\x9b\xaa\x1f\x00U/\xd2h\x95\xd2W\xa4\x19\xbf\x1b\x1f5T(\xa6\xcdL\xaa\xac\x1b\xac.\xcfL\xbdkO\xc32\x8a\xc1\xe2^\xe7\x05\xddtU\xd3\xdf\xb3N\xd08`\x15\x8dM\xde\x17u\xb9\xf3(\x999\xba\xe5(r\xb0\x06QS\xa1\xc1Xg\x93\n\xc7\xb1\xca\x8f\x7fr\xc4\xca\xf2:\xc5\xbd\xdflC\xbf\xa2\x9e\xce\xcd_\x15\x0ful\xc3\xea\x8f\x91\x9a\xe4\xcb\xea\xa8\x98\x16h\xdbg\xd5\xf72\xf8\xa3\xd2\xa9x\x84\x18\xdf\xec\x1f\xea#\xb4\x92\xc6k\n\xeb\xe6\x1dt\xdf\xb5\x07\xa59ro\xa7T\x89\x1ag\xd3R\x1c<\xb8\x96\xa7\x06\xefy!py\x0c\xdfa\x87\x9d\x0b\xc2N\x04Ag\x81\xd5\xa7\x00\xd7\x92\x98a\xe7\xff\xd4{\xfe\xa7\xde\xed?\xe9>?\xaf\xe5\xa1\xf7\xf3\xe6N>\xa2\x90\xc5\xbe=u\xc7\xcew\xe8\x8a>}\xaf\x1e\xb2KO\xdd\x9f;\xad\xcb\xcdd4\x8c\xaeRm\x81w~8\x9fSm\x80\x7f\xfe{\xe7\xfe\xaayO\xcfyo{|\xf3\xfd)\xe7\xfaS\xce\xf3'\x9c\xe3\xd48\xe5\xcbO\xb7$\x9e\xd9\xd6\xf7\xfc\xaf\x03\x1fr\xfdbu\xa2\x12\xf39\x01\xd6E\xb3i\x0fu\xb3\xb3\xad\xd5\xeb)\x12\xc5z\xfe\xc4\xae\xbc/Jk\x18\xb6\x07D1\xec\xb1P\x9e\xabRA{C\x14}\x87(4\xdak\x12\xb0[D1\xf7\x8c\x91\xba\x17\xfb\xc7\xc5\x83\x9a\x9b'i/\xb9\xd0\xa4\xee+\xf5\x9bi\x03\xf7\x95\xf6\x8a\xcaY\xa3\x00\xd6\xe3\xbb{A{#\x8fH8\xe3\xf9\xd1j\xaa\xa7\x9c7\x8a\xb6C\xb5]\xa4\x99\x0c\xed\xa7\xaa\xdb\xf6TuH.ca8\xcc\xbbmx\x1d\xe6\x9f\x17\x97\xda\x80m2\x16\x16d!\x85\x05\xb9\xb0 \x13\x0f\x87\xb2 \xd3\xa9\xd0\xebVc+\xc1\xa5\xd0\xa6\xd0M \xcf\xa5W\xb3r\xb1\xcb\x99m\xb3\x80\xc1\x94\xabw\x04G%R\x94|\x85~\x0d\\Q\xa3\xb3\x9e\xa8[KB\"HA5\xa11Q\xa4\xd3\xebD\xe7\x85p\\\x8bR\xa9\x1bw\xb4\xef\xd2\xee\xf7/\x9a\xfeS\xcc\x8d_\x15\xbe\xf7[\xdd\xad\x11h\xd0D\xf7Vo-\xa1\xaa:\xf2\xae\xb0(\x117\x0d\xec\xdb\x8d\x12\xcf\x8a\xf2Evy\na\xa4YS\xad:\xfb\xfdS\xb2h\x8f\xfaAc\x9e\xe2\xe3f\xc9k\xb9P#\x06\xd6m\xddl\xd9g3\x82\x88\x1af(\xceK'l\xb4\xca!\xcd\xc1\x8aL@\x07\xd6Ou8\\\x8aTg1\x97\x88\xda\x91\xbc\xe0k7\xbd\x18X\xc6\xcb\x107\x8f\xf2\x0e\xfe\xcex\x8f_\x05\x88\xfdl\x12\x8e\x8b\x0f\xc0\xa9e\x94\xd7\xcb\xa5\x16e;W\xb6s_p;\xa7\x7fR\xdb\x8a\x1c\xb4\xe2\xcf\xaf mW\x97/ec}{\x80~\x98\xb3\x89#\xf6\x01\xf3\xbb\xbf\xa3\xbd@p\x0e\xcdbq3\xd4P4\x8bfh\x08A\x00\x89\xf2Ev\x0b\x11\xc4\x90(\xf9\xf7\x0d\x0e\xc2H\x14\x836R\xbcO\x8f$\xf0\x84\"\x0f$\x91\xe4\xfc7G\xf4\xa9\x9b\x12\x0b%#\xb5$\x8a\x9d`\x12%\x1f\xcd$J6\xb2I\x14+\xe5$\xca\x10O<\x89\x92\x8b~\x12\xc5MB\x89\x12EE\x89\x12MHI\xf7\x1dw\xdc[i)Q\xa2\xc9)Imh3,\x14\x95()D\x95\xa4\xc2\xd3\x11*\xdeVKy\x11\xa4\x95\xa4\"+\x91%J\"\x9d\xa5T\x12@jI\xbe\x19Lt\x89\x92@w\x89\x92@zi\x9b\xe8\x96\xaaf\xa3\xc3D\xc9K\x8a\x89\x92\x8d\x1a\x13\xc5O\x90\x89\x92\x8d&\x13\xc5F\x96\x89\x92B\x99I\xdb\n\x82F\x13e\x08!\xd3D\x89\xa5\xd4$\x95\xd9h6Q\"\xc96Q\x08\xcaM\x14\xcf\x96\xc2z$F \xd9qDRq\xd2\xc6t\x02\x94\x87\x05!'\x8a\xaf6i\xe4\x9c\x86:N\xd6IPt\xa2d \xeaDI\xa3\xeb4\xd4\xf1\x1d\x0d\xb9yH\xa4\xee4K2\xa8K\xc8W\x19\xcb~!\x8e-\x87T\xb5d\xd0\xb1p\\B \x83\xce,\xa2\xfe\xd1\\:\x86\xa6\\|\x97\xe0\xe0\xbcT\x8a\x0b\xe1\xbd\x04\xd7w\xa6\x0cn\x18\x07&\xf5$\xc1\x83I=FqaR\xcf\x19|\x98\xe4C:'&\xac\xe3\xc5\x04\xafq\xcd\xc0\x8fI\xa9I\xe6\xc8\xa4\x94>\x0dO&U\xd2\x13qe\x92E\xe5\xe4\xcb\x04;g&\x84\xec\xf0L.K\x98\xe7\xa3\x8f?\x13\x9c\x1c\x9a\x90\\\xfe:>M095!`\xfb\xfc\x8e\xe4\xd6\x84\xa59\x8d\xe1\xd7\x9c\x14\x180UX\x12b?\x04\xa0_\xd7\x08\xcd\x8cO\xaf\xcf6<>=\xd9\xfb\xd3\xe5\x19\xe6@\xcd\xec\xb8\x99\xac^|\xfa]:zfO\n\x8c\xee4\x1f\x8a\xe6\xc0\xd1\x9ce\x9b\x136\x04K\xa3\xd0\xb4\x95\xc58\x105\x1b\xa6F\xd6v\x05\xaa\x16}\xe0\xb4ckn\x9f\xa3\xc3\xeb\xe8\xf5;\xfa=\x8f\x1e\xdf\xa3wW\x8d\xe2\xdd[\xa3\xf8=rQ>9\x876\xcb}\xaf\xb38\xfc\x90\xbf\x87\xb6[=\x92N\x14 \xb0\xe5\xf9\x90\x80LX\xc0\xa4&\x0e\x85s\xe1pe\x8e*\x92\x7f\x9c\x969j\xfbsb\xcb\xbf\xdd9\x1a\x83\xd8\xd90\xbb2;\x15\xc9;B-\xb7V\xcf\xf2;\x9e\x9d\xd6;\xdfP\x1c\xe0Y`\xcbC\x9a\x14\x03\xfb\xb9,\x0e\x0d\x08\x06A\x82\xebZ\x15\x07\x0b\xce\x87\x95h`pR\xb1\n\x1a\xa4\xc0A\x97]qR\xa4\xb9\xce/\x89 !\x0d\x13\x86\x14\xec\x84\n=`a\xf2\xd93\x192\xf4\x81\x86\xd1\xdf\xcab\xfb\xddv\x9f\xbf\xea\x1a\xbe!\x00b\xc0|\xb2\x83\x88\x01\x10\xd9\xaa\xf7\xec@\xe2z(q5\x98\x98\x04'\xfa|\xdeR\xbc\xfd\xb5\x0eR\xfc\x92\xa0\xe2\x97\x84\x15\xbf\x18\xb0\xe8\x84\x16\x03\xe6F\xc0\xbe\xc1p\xc7\xf9\x00F7\xc4\x98\xb5R\xd6U?#\xd4\xb8\x02l\\\x0b7.<\xe4\x89\x80\xa3\xabO\xe2QHC\x95\x81J\xbaq\xc9\xa9V\xa1\xc8\xa4sx\xd8\xae(\x0dC\xf5\xa8g-\x08e8F\x19\x88R\x06\xe2\x94\xab\x91J\xbf\xdd\xce\x84V>\x11^\xf9%\x11\xcb/\x8aY~\x01\xd4\xd2\x89[\x06m6i\xecp\x9a\xb3!\xe8\xa5\x0f\xbf\xccQ\x8f\xf5(&\x89c\x86\xec\xef\xedX\xe6\xc2V\xc7\xa1\x99%\xc7\xb6\xe4\xd8\x96\x1c\xdb\xaf\x91c\xbbd5\xa6 \xff\x90\x88\x02\xf5=\xa1/\x98\xd7X\xb2\xf9\x978\x83\x12g\x10\xd2i%\xce\x80VS\xe2\x0cl\x7f\x0c8X\x83o\xf0\xcd\xe2;`Cv\xa4\xa0`\x98\xff)1\xcc\x12g`\xca7=N\xcb\x1c\xb5\xfd9\xb1\xe5\xdf\xee\x1c-q\x06\xaa|\xb3#\xb4\xc4\x19\x948\x83Y\xd6\xb4\xaa\xc4\x19\xe8\xba&[\\\xe2\x0cJ\x9c\x01>\xec\x9bO%\xce \xa4M>\xbc\n\xc5\xdb_%\xce\xc0UV\x893\xc8[\xa9\x12g`\xea*q\x06%\xce@\x91\x12g`/\xab\xc4\x19\x948\x83eQ%\xce\xa0\xc4\x19\x948\x03E\xd9\xef2\xce\x80\xc2\xfc\xc3\x99\xbc\x17\xaf\xcb\xc6: \x0d\xf8\xe6\xe7\x1a\x97X\x1c\xa6\xc6\xf0T\xb76\xfe\x0d\x8dg\x1b\xe3\xdb\xbc8\xb7,\xce\x8dJ\xe0\xf6\x84\x1e\x9c\x89[\x91\xac\x1b\x90\xa7\xdfv|\x81\xcd\xc6\x13n1\xd4m\xbb\x18\xb9\xcbs\xc9\xb1\xed\xfbz|\xad[\xee\xec\xf9\x8d%\xe2\xa4\xb2\xa9\x1a~I'1%\x04\x02\xa2\xce\x06g\xa4\x8d\x06\x10\x90\xe6\xddb\xda\xe5\x01v\xbd_\xdb\xc4\xd5\x16\x9e\xfa/X \xc5\x85\xbe\x00\xb4\xc8*\xa4\x00V\x91\x00\x95\xfey\xdfK\x0f\xf87\xfbi\x0dP\xe6k|Z\x0d\x1dY\xe0\x06\xaeO\x1b\x03h\xcc{4\x12\xa6p\x15\x17\nCD\xc0\x0e\xc6\xc0\xe9Y\xf7\xa2\xe9?\xc9\xcd{\xc8\xf8\xa1\"\xe4\">\xe0b\xdfw=\x85\xc4m-qg:\xfc\xa0\\\x89\xbf\xf0$\xed\xdb\x8d\x12\x96f\xb8\xeb\"*\xaa\xdd\xcc_\xf5}\xbb\xa9-u\x99\x8a\xdd\xef\x89b\xf5\xe0<:,\x8f(v<\xf5\xb4S\x8f\x8c%\xf2o&\xee\xb3\x16\xd5\x11\n\xf0O\xfdm=N\x10\x16\x17.iF\x11\xba\xab\x8aEMk7\xd6@\x9d\x8b\x97\xe2f\xbf\x17\xe2Oj-\xc6)\x1461^\xa09\x95\xe5\xa0\x89\xe5\x1a\xc7\xf5Rv\xd5bnL\xe3{i[\x95W\x81\xdf_-^\x14\xf3\xa3c\x15^\xffz\xf6\xf1\x8fg\xaf;\xc6F\x03\xcd\xad\xc0e\xd5U\xb2\xc7\x02&\x0bk\xc6\xb5\xde\x18\x08wm\xbbgU\xa3\xb7\xef\x7f>0\xee\x1b\\\x94\x08Se\x14;#\xf4\n\x05\x87\xea\xf3\xed\x9e5\xbb\xe1!i\xc4\xdd<\xb0Q\x15\xa0*\xdcZx\xaa\"\xb6\x1b\xc0\x0f\x14\xbb[\xf6\xd9\xf3!\xed\xc7\xa8+\xb6;\xff\x8ce\xb2j\xf3\xa0\x15,\x8a\x1bO\x0bl3\xa8\x87Q\xee\xdb\xaf{ D\x0e-\xec\xebC=Z\xfdj\x98\xd7\x85\x9eo\x8e\xa4KY\xf8^\xb1-g\xeax!\xbe\xb5\xb6\x0f\xc3\xdf\xc6\x83\xca\xb2\x86x\xb9\xfa\xd4A\x96\xb1\xc4\x8f4W\xe2\x97\xd5\xf1\xcfRU\x947\xe3k\xdd8$+=G\x0e\x1fO\xaa\x9f\x87DT\xb2\xd4 wL-U\x17\xcap\x82\xf5\xa2\xa1\xc4k\x8f\xa6R\xb5\xdd\x9c\xf2\x16q=9\xf9i\xc1 \xf3\x8e\xaf\xd0\xd1\x10\xd6\xfe\x84\x80k\xc3\x01^\x8c\xdb\x87\x9f;\xd6\xb7\xa7n#\xae1\xe5S\xf5\xc4\xe3\xb3\xf7\x8fPo\xc7c\xcf}m\xde\xf2M\xa8\x9bo\xf8\xa4\x80\x1d\xcb\xf5\xe3\x88\x19\x896\xc0\xe14\xbb\x05\xc7M\xde\x9eU\xfd@i\x1b\xcf\xa9\xdf\xff\xfc\xfdl\n\xce\xb8\x9d\xdbW\xfd\x00=\xdb\x1d\x94[\x05\xdf_\xbd\xf9C\x0f\xc7jx\xe0\xea e\xd3\x1aB\x954\x10\xb7\xbe\xf2\x9e\x12\xeay\x9f\xfcP\xf1K\xc9\x89\xd7\xff:\x16l\xbdV\xf1\xaf?b\xbd\xb9\xc2y\x1d\x18\x1bO\xe8\xdaTM\xdb\xd4\x1b~\xce\xa5n:\x07\xf8\x81\x9d\xed\xce\x9e\x8d\xdd\xc6=M\xdf\x9f}?\xce\x89\xa6\x1d\xa0\xdal\xd8q`\xdb\x1f\xe9+\xff/\x1a8\x8e\x1dYo\xd83\x18\xd8h\x0cO\xfd\xa9\x1a\x9b}\xec\xd8\xa6=\x1c\xeb\xfdX/\x01\x15\xdf\xd5M\xd5=B%\x96\xe5\xa5\x8c=\"\x8e\xb0\xc3\x03#Q>\xf6y4\xf8P\xf3\x89|\xea\x99\xbc w\xfc\xf4\"\x94\xfeE\xf3x\x06\xbf\xb4\x9f\xd8G\xd6\xe1\xc5\xb8\xef\xaf\xdeP\xe0\"\xda\x01qA/UX\xbfy`\x07\x06\x7f}\x18\x86\xe3_\x9f\xe1\x7f\xfb\xbf>\x83\xb6\x83\xa6\x15\x7f}\xc6G\xd4\xb8\x9a\xc8]:\x1e\xc7 u\xa7\xe3x\x8a#o\xdf\xe5s\xe0#\xbf\x06\xb8\x1a\xe0P\x1d{\x1c\x1ec\xcd\xc7\x96J?\x1ewH\xd6\xb8\xe4V\xbd\xf0Z\xf4\xcf\xc9/\xf3wpq?\xd7s\xfc\x9c\xf2>\xe5\xa9)\xc2\xee\x9d\x0elK^\x0e\xfew\xf0\xa2\x81_nn.\xe1/\xe77\xd06\xd3\x81\x87O7\xbcN\xb82/\x19\xbdy<\xb2\x7f\xfd\xdf\xffJ(\x04\xe9]m\xe4H@\xbb\xc9\xfb\xf4\xd8\xb5\xdb\xd3f\xdc/\x02\xeb\xba\xb6\xa3n\x8e\xfe;xq<\xee\xebM%\xfa\xa0c\xe3Xj?\xe1\xee{Sm\xc6\xb9\xdc\xb6\x1fN\xc7\xc9\x89\x89+qk\xde\xfc\x0f\x16s\x04x\xa5r\xdb\xf1\xed\xcc\xf8\xd0A\x19\xcb[\x1c\xcc\x95l\xc0\xf8\xef\x8fm\xbd\x85\x8a\xb8\xf2\x1f\xf8 d\xac\x0e\x9f\xae\x1d\xbbo;\xf6L\xbe:j\xac\x86\xfa\xae\xde\xd7\xc3#4\x8cm\xa5\xbb\x98\x9b\x95\xee\xa3%p\xa3mF\xf3\xd5\xec\x18\x7f\x9c\xcf\x9a3\xf8\xe1}\xcf\xe0#\xebzt6\x0d\xf2~i\x1c?US\xed\xe8\xb6\xdeu\xac\xfa\xc0\xfdK\xa8\xf2\xecGj$\xbcm\x07\xf6\x1c\xcf\x1a\xf7\xa7f\x83#}\xac\xb5\xb0\x12\x9bS\xd7qTA\xf5\xc67\x96\x0en9\x08a\xba\xe1AZ\xfb\xbb\xd3\xfdx\xc0cU\xcf\x9e\xf1\xbb{\xebA\x16\xc47l\xdc/<\xcd\x8f;\xb6\xab\x9b\x86\x0eg\x18\x97X\xd28\x9bW\xd8\xd2\xf6\xed\x9a\xcf\x9e\x1e!\x80qz6\xba=\x80\x1fD:\x1cb(8\xdd~\x84C\xbd{\xa0\xac\xc0\x1d9\xfdy\xb3x\xf8B}8\xee\xd9a\xbanX\xf8a7\xd0\xb3C\xd5\x0c\xf5\xa6\xd7\xa7\x05\xb1W\x00\xdf\x12o\xc5\xa6 h\xfd\xffu\x9c\xfew\x0c\xaa\xb1\xf0z\xab,\xe0\xc6j-\xcf\x80w\xedGr\xe9\x9f\x02l\xf8\x17Y<\xe1\xae\x07^.>#\x81\x0dT\xdd]=\xf0\xbb\xe1\x1d\xf5\x11\x96TSV\xed\xdbf'\xee\x12\xd7?\xcfh\xef\xb8Y\xc6\xfa\xdc\x99[\x1a\xb5<\xb9;1\x06\xd3\xa5~\x81\xbd\xb0\xc6=\xf4\xa7\xe3\xb1\xed\xf8\x8av\xac6\x1f~\xc6{\xe5\xc7u\x0c\xbfmO\xcf$j)o\xef\xe14\xa09\x91\xd3\xb4\x1f\x0d\x99r\x19:w\x00qw\xc5tO=6\xe2\x85a\xbf\xf0\x93\xe8e\xc8\x8b\xa6\xff\xf8\x1c.\xc7z\x8e\xf3ST\xb9\x9a\x16\xaa\xba\x81\x97\xff\xf5\xbf\x92\x8b\xca\xeb\xb6\x85\xfb\xb6\x85\x7f\x80\xb3\xb33\n^\x1a\x1b^5\x8f\xd4\x9f\xaa\xe6\xf1l,\xf4u\xd7\x1e~\xb8o\xdb\x1f\xa9\x87\xce\xce\xa8\x95\xa3\xbe\x87\x1f\xc6\xd7\xdf\xf3\xaa\xde\xb4?\xfc\x97\xf1\xfd\x1f-\xd7]\xd3:\x8cK\xc8e_\xfc\xc9\xd3\x17\xff\xbd\xfaX%u\x06\xfc\x03\xdf\xd7\x8c\x9a#\xdb]\xf7?\xbcn\xdb\xb3\xcd\xbe\xea{k\xb3\xb1*\xe3\xe3\xd8\n\xe5\x15\xaaDk\x7f\xfc\xbd\xa7?.\x1f\x87\x87\xf1\xa8M\xe8\xc4*\xbcn\xdb\x1f\xce\xce\xce\xa84\x8e\xa97~\xb0\xfc\x95\x8f\x10\xdeKk:i|\xf1\x02\xfb\xe8\xd5\xf9\xf5\xcb\xab\x8b\xcb\x9bwW?\x9av\x15D!8\x8el\xc5`A\x96\xde\xf9\xff{z\xe7/-\x19\xe06\xf6\xcc\xf3\x7f\x80\xffr\xbc;{\xdd\xb6\xff\xef\xd9\xd9\x99~;:\x97\xaay|6n\xa0\xc6g\xab\xe6\xf1xw\xf6\x96}\xb2\xd6\xb3\xbe\xe7\xcf\xfe\xff\xfe\x01\x9azo\xbb\xfb\x9d\xee4\xe3rv\xd7\xb3Z\xe5\xc9WE]\xb0\xdeg\xef\x9bC\xd5\xf5\x0f\xd5\xfe\xa6\xc5!\x9fRQ\xed\xd7\x1b\xee\xba\xd9|\x98l\xa0\xdc\x1a\xc3\xdd\xe3\xbc\x05\x91\x96\x1aq\xbaG \xbf\x8e\x8b\xb5\xae\xf0\x0f\xc4\x86\xe2\xe7\xf1\xf4w\xc6\xff0n\xc4\xfe0\xee\xd8\xa7\x95c\\U\xc6\xefo\xdau\x1c\x11z\x01\x93\xb1n\xf6\x8f\xf2\xccb\x1c/\xa7M\x1fT\xf7\x03\xc3] ?\xd9\xfe\xe1\xe7?\xe8\n\xc5\xc1IV\x06OJL\x8c\xd0\xef\xef\xdb\xf6\xec\xae\xeax3>\xff\xfcx\xf6\x7f\xbe\xc7^\xc0=?u\x88\xe1\xc5~?>9.\x19\xda\x1f\xff\xfb\xf5\xbb\xb7\xc6\x8f\xe3G\x18\xff0\x1f\xa3q\xcb\xd3\x8e\x93Q\xac\xefx\\8\xf5L\x86\x07\xecN\xfb\xaa\xd35\x99\n\x10\xf7\x98\xd7\xe5gs\x04\x86\x98h\xcf\xc4ro\x1c\xbe\x95\xb5\xf2\x9e\xb7\xf6\xaf\xff\xcf\xd8\xde\xbf\x8a\xf3\xe2\xc2\xfd'{\xefL\xce\xed\xe7\xe4\x9e\xb6\xda|\x18\xa7\xf6|N\xba\xaf\xf7\x8c2\xa8\xd2\x08\\\xb2\xaeo\x1b\xcb(\x17.\x8f\xfb\xba\xeb\x87[\xde\xed\xb68\x0d\xf9(\x0f\x12\x13O\xfe)\xc8\x90\x8fB\x97\xfe=\xef\x8d\xef\x9f\xc3\xf7\xd4\x90_6\xf1\x0c\xdb\xf1\xfd3Z\x13o\xc1\xdb\xea0j\xfb\xbf\xb1\xaa\xffhytl\x81\xf6dH3.\xee\xc5\xce|\xf9\xed\xf1\xbb\xd5=|b\xfb\xfdO\x1f\x9a\xf6S\xc3'\xe3\x03\xf7\x04oN\xfd\xd0\x1e\xc4\x98]\xea[\x0e\xb4g\xb8/\xd4F\xdf\x1cR%\n\x1d\x07T\xb33\x1c3|p\xe9\x05\xfc\x95\x0fx9\xd6\x1e\xda\xfd\x16\x07\x9aR'\xee\xe4\x11c\x14\x84[E\x0cQ]\x1b/b\x1a\x9b\xf0\xc38\xc5e\x17\x18\xa7v\xe9Z\xfa\xd7\xff\xfd\xaf?\x92\xc38m<,\x0b\xb1\x0d \xde\xfcQ\xd9\x1f\xcf\xfe\xf4\xc7?\xf5\xdf\x93\x1fy\xfew\xfa\xbd\x86\xd2\x19\xfb\x9d\xf6\x94t\xcakPj5T\x88\xa3*\xd1\x85K\x1d\xe2\xfd\xffX\xc4<\xe9.\xfe\x10^\x95\xa9\x06W\x97/\x85.=\xc4\xc9\x8e%\xf4\x08V\xac\x86\x14\x8e\n\x9eE\xbeB\xbf\x06_\x0eP\x18;i\xf2\xe0\xf7\x13\x02Su\x0c\x0f\xa3\x8a\x9a\x8e\xed\xea~`\x1d\xdb\xde\x9aP\x89R\x8a\x00v\x14H\xf9jzSv\xa8\x06x\x11\x0d\\\xe5\x9a7\x80@)\x03 \x08N\x7f]\x02\x83\xdejZ!\xc2Q\xee;\xc6nM\x06\x13k\xa7X\xb0\xbfo\xa3+\xd6b\xa4R(\xact*\xc2\x8a\xf6\x80\x13\xf1\x01\xc8\x84\xa1J\xd1\xb1\xd4\xa9\x904\x18g\x1d\xc6J(\x88\x05[ UK\xf8\x15\xc0\x1d\x17\xa2\x999\x12\x93UF\xae4\xd7\x84\xb5\xfa\xee;\xb3\x0e8\xa4\x9d\x86\\\xb3\xaf\xe1\xe1\xabK\x05d\xe0\xaa\xc3\xaa\xaf\xb6\xe7\x93.\xdd\xa4\x07\xc5}\xfcFh\xb2|\x90\xb25M/[\xdd\"\xa0e;;V\x06\xce\xae\x00\x88\xd9\xe28\xb6\x1ap\xff\xa5\xc7\xb6\xc4{\xa7\x95\n\xb1S\xd9\x01g\x1f\xe4\x9c\x1bt\xce\x0c;{\x80\xe7d\xe89/\xf8\x1c\x02?'\x00\xd0y!\xe8 \x10:/\x0c\x1d\x00Dg\x87\xa2=`t\x1c\x1cM*rB\xd4Y@\xea@\x98\x9a|s\x15t\x9d\x0c^\xe7\x86\xaf\xed\x00vf\x08\xfb)@\xec\xcc0v(\x90\x9d\x19\xcav\x83\xd9\xd9\xe1l;\xa0\xbd\x02\xd2\x8e\x07\xb5Ie\x1c\xe8\xb6\xc0\xdaI\xc0\xb6\x15\xda\xf6n)\x9c\xf0v\xd8\x8e#\x1f\xc4\xed\x06\xb9\xfd\xb5\xc9\nt\xbb\xa1\xeel`w*\xdcm\xa8\xe3;\x1ar\xf3\x90\x17\xf2\xb6\x81\xde\xe9\xb0w\x00\xd6\xeb\x84\xbe\x03\xc1o+\x06\xb6\x12\x00\xb7\xeb!\xb0\x82d\x18|M\xe7\x84@\xe1\xfe^\x08\x82\xc3W\x03\xe2\xce\xdeI\x00\xc5\x03`q\x1f0\xee\x87\xc6\x9d\x9d\xb6\x06\x1e\x0f\x03\xc8I\x88<\x19$\x0f\x86\xc9\xd7\x02\xe5\x81P\xb9\xbd\x13i\xb8\xdc\xf1|\x08d\x9e\x034wV\xd9\xf8= :7\xb4\x11PzV0\xdd\x06\xa7'\x02\xeaf\x95M\x80=?\xc4\xee\x01\xd9-0{N\xa0=3\xd4\xfe\x14`\xfb\x1a\xb8=\x10p_\x05\xb9\x87\x83\xee\x16\xd8\xdd\x06\xb4\x86C\xad~\xe8}\x15\xf8\x1e\x0c\xbf\x93\x0d\xca\x0d\xc1\xe7\x05\xe1-0|n >7\x14\x9f>F\x82\xe0\xf80@^_\xd9\xf2\xb0{\x1a\xc0|:4_\x18\x80\n\x03Pa\x00\xfa\x1a\x0c@\x16\x105\x08>\xd5\x81\xd3\x95\xf10z\x84D\x04\x84\xea\x88\"Ya<\xbeB|\x0c\xa79\xd5\xb1\xd1\xb9=\x8a\xc6'Jt\x95%Q\xd6\xbc\x7fh\xbb\xe1\xa1j\xb6\xb7\x9bvK&\xbb\xdac\xb8\xc4=@\x93\n\x18UPT\x0cD\xb9\x92\x7f\xc3\x9ack/\x16\x03#\xf8~c\x86\xbd\x84>\xb6\x1d\xe7o\x03\xa7\x1e\xc9\x07\xa8\xc2)\x03g\x8eP\x07{\x87\xbbG\x05\xd8\xbbp\xebMq\x0e`\x9f\x8d\xb6)\xb2&\xaa\xc1hDhd\x83\xfebL\x8c\x831A\x7fO\xe1\x0eq\x13\xfa\x89\xc3\x0b\\\xc3\xd0=\xb5Cv\x82)\xd3\xdb9\xc1C\nO\x9d\xe4\xb6}L\xc6\x89NOum\xb2\x97\xddn\xd9\xed\x96\xdd\xee\xb7\xb0\xdb\xb5.q)\x0bl\xef_a\xaf\x16\xdb\xd5\x80\x954\x17\x97Wj\xd0\xde\x13\xd0t\x85\x07\xe7e\xe3\xe9\xf2\x04\xe1i\xcb\xd3\n\xc3<\x90\xc1vV\x1b\xe4\x06\x983\x86\xd6\xd9\x83\xea\xf2\x85\xd3e\x0b\xa4\xb3\x86\xd0\x0d\xf1\xc1s\xb9\xc2\xe6\xdc\x01sQ\xa1r\xd1Ar\xbc\xbdzl\x975<.:0\x0eg\xa7\xa6\xcd\x12\x12\x97\x12\x0c\xc7\x03\xdf\xf4\xd6\x10XKL\x00\x9c=\xd8-1\xcc-(\xc0-<\x98-!\x8c-!\x80\x8d0\x18\x19\xc3\xd4\xf2\x06\xa8e\x0bM\xf3\x07\xa5e\x0bG\xb3\x05\xa2\xa5\x84\xa0\x91\xe1fCH\xa0Yl\x88\x995\x9c,2\x90l\x8d\x97'\xec\x04c\xac\xa0\x91\xa1b\xd6\xdb>\x86E\x90\x98\xbd\xec\xb4\xc00\x0c\x04S\xd4\x99!a\x19\x82\xc1\xd2\xc2\xc0\xb4Q\xae/\x86\x89\xa1_\xa2\xa3U\x8d)A^\xce\x08&K`\x977\xa4\xcb\x8c\xcc\x08\x0f\xe32\xdf\xfd\x1b\xd5\xd6\xa8\xa0\xad\x90\xc6\xfa\x02\xb5\xecm\xf3\x06g\xad\x08\xcb\"\xdb\x1c\x19\x8a\xe5\x0c\xc2\xb2\x87_\xb9\x02\xaf\xc8N\x08\x0d\xb6\xf2\x85Yi\x01V \xa1U\x01AU\xe1\xe1T\xde@*\"\x1e\xc9(\x8ex\xc6\x170\x95\x16*EVJ\xf9%)0J\x0f\x84J \x81\"B\x9e\x92\x82\x9d\xf4\xe0\xa6\x9caM\xd6\x80&#\x94)O\x10S\xb6\xf0\xa5\xbc\x81Ka!K\xde`\xa5\xc00\xa5\x90\x00%#\x92\xc7,-4\xd4\xc4\x1d\x8e\x14\x18\x88\x14\x10\x82\xb4\xa8r\xce\xb0\xa3\xa4\x80#3\xc0(_hQ\xbe\xa0\xa2\xf8\xaf\xeb\x0d$\xf2\x85\x10I3\xad\x87\x0d\x91\xdbt\x7f\xa8PZ\x90\x10\xedF\xd5}\xaf\xdf\x82Cu=,\x98\xd1\xb1i\x03\xa7l\xc0\x9f\xeb[\xc6\x82}\x16\x98\xcfUT\n\xb4\xa7\xfb\xf6S\xe1\xbc\x19\xc2\x13]7cwa\x83\xf0\xcb\xdd?\x10K3\xa2#\\\xce6\xd8x\xf5\xdd\xefJ;\x16F\xb7o\xa1\x8f\x08\xee\xbe/4\x9d\x1d\xb46\xee`$\xd4\x9eBgct\x02XQ\x08\x92\xb7\x85\x1eO\x90oL\x91\xb45\xd6\x86\xfb(k\xbeXsc\xe8il\xd44\xb4\xed\x86\x90\xd8\xact:\x1a\x8a\x8a\x86\x9c\x01\xe0E\xfe\xd7\xd1\xcf,\xdf\x8de\x9e\x99\xda\x87\nu\xa3\x9e\xc8/\xa3\x07`\x90\xf6\xe8\xd8v\x03\xb7Fk\x8d\xcfP5\xdb\xaa\xe3\x13\xbf\x7f\xf2\x10\xa7'\x8d\x1e\x1a\xeb\xaf^\x07\xa4u\x9b\xfa\x1eY W\xf8\xce\xcd\xf8\x9feQ\xd61\xb9Z9\x91\x9e\xab\xdc\xceu\xfey`\xcd\xb8\xf7W\xca\xd0\x1a-\x8f\xe8\x9bj<\xa4\xd6f\"Qu<\xee9\xd2\xaa\x86\xb8\xd0\xa5_\x8b\x01q\x85\xaam\x1b]\xf1\x94\xac\x01\x9fo8-\x16\xda\x8e\xf5\xe6\xc38I\x1a\x0d\xbcEx\xa0k\x0f\xb0\xad\xef\xf9uv\xc3\xf4\xbd\x14CJ\xd4\xf0M\x8d\x17\xe9\xcf\xb8\x85\x18\xb9\xa8\x0eW\xbb\x86}\x9a\xd5\xf1z\x8d\x15\x19\xdbP\xab\x83L\xe6\x8f)?\xb5\x0d[\x105QS\xf5\xd0nO{1c\xd9h\x10\xc8\x89\xc8C,\xbe\x02a\x9euB\x83eR\x035\xb1\xc1>\xb9\xc1\xc3\xdacNr\xf0Lt\xf0LvH\x98\xf0`\x9b\xf4\xe0\x9e\x9b\x10>\xf9\xc1m\x00 \xb8 \x0bk@\x821 \xf5\xd5\x03m\x10\xc0Y\x934\xc3`\xa8\xbbcV\xe3\x00\xc1\x06\x02\x1c5\xcei(\x806\x16\xa0\x1a\x0cXo4\xa6\x17\x08[a\x8f\xe2\xc2\xd8-Q\x06\x1d\xae\xb54B\xf8\xc5V\x1b!\xec\xae8#\xf4\xb5\xb2\x12z\x0c\xbf\xd29;\x9f(\x11!\xc0\x00\x11\xa6\xc7\xda\x07A\xe6\xc6jh|j\x8d \x92`V\xcc=\x06aPD\xb9V{!\xaf\xd4\xc7\xe1\x8a\xa1\x99Sc\xd5\x89\xb1\x1c\xbf\xbe\x89!\xca\x0b\x9f\x18\xeb\x97\xe7/\xb2W\xfe\xca\xe9\x00\x96\x99T\xf6\xf0\xb4\xf2\xaf\xbb\x87\x8f\x9bc%\x96\xbf\xc4\xf2\x97X\xfe\xaf\x11\xcbO\xad>a\xebZ\xe8\x8eo\xfc\xff\x88um|-\xca\x14|\x85\x1d\x1f\x13\xf5\x9d\xc1\xa9M\xc7\x82\xaeZM\xac\x0d\x16\xab<#\xf6\x03\xb7\xf56\xfd\xb8\xbdv\x19\xb5-\xa2b\x1d';HA@`\x9e\x13\x81=%\nTV\xb7_e\xec\x1f\xbf\xa1|\x81\xad\x19\x1d5\xfe\xc0\xd6\xde\xad\xb0\xbc\x91[*Q\x1e\x1d\xaan\xc7t\xc6y\x9b\xf7\xc2\xee\xbb\x18\xca\xd5\xb6\x86dK\x8d\x00\x1f\xc3\xf0\x10\x9f\"\x01\x19\xd3$\xc0\x9b*\x01\xb1\xe9\x12\x90\x922A\xf5\x98\x9fU8:u\x82\xd0\xe5e\x14NI\xa1 \xd4\x95\xabm\xd3\xd2* -\xb5\x82\x9e\xa2d%\xb3%\\@\xf6\xa4\x0b\xc8\x99x\x01A\xc9\x17\x903\x01\x03\xca\xd5\xb6T1\x91\x89\x1bP\xae\xb6\x8dK\xec\xd0\x94\x95\xabm\xcb\xd5\xb6\x01:\xca\xd5\xb6K)W\xdb\x96\xabm\x03\x9f\xf5\xa5\x9d@r\xea \x94\xabm\x87\xc0\xe4\x14\xc8\x9c\xa0\x02>\xd6\xddr\xb5\xad?q\x05B\x92W <\x81\x05\x02\x93X\xa0\\m\x1b\x94\xe0\x02\xa9I.\x9a\xaer\xb5-\xa1,\x80Iw\xb9tH0\x94{L\xad\x1em\xee(\xae\xdb\xe6v[\x0d\xa1\x8eayF\x1a_\xf9i\xa8\x0f\x14h\x0b7\xf5\x81/\xd9\x86\x13\xffS\xd5\x1b\xfe\xfb \xdd\xe4OX\"\x8e\xf8\xfe\xbc\xde\xa8mX\xa2,*\x14\xe2\x07YxQ\xe1\x18KL\xf0\x00\x7f\xefw\x1a<\x10\x02\xca\xd8c\x082\xd4\xca\x18\xca\x0ex\xc6\x0e\xd0X \x1a7H\x13\x17\xed\xb0\x02\xa8\xb1@5!\xf1 Qp\x8d\x0d\xb0 )\xd0\x0f\xda\xd0\xb0\x8d\x03\xb8q\x87\x9d\x0e\xe5\xb2\xc8rYd\xb9,2\x06\xd8 \x80v\xb2\x83;\xe5\xb2H\x94U`P2\x1c\x94\x1b\x10*\x97E\xaa\x12\x06\x0de\x06\x87\xcae\x91\xe5\xb2H\x0fhT.\x8b\\\x0f \x19\xea\x86rYd\x18\x9c\xe4\xbf&1\x0cR*\x97ErY 1\x95\xcb\"QB \xa7rY$J\xb9,R\xff1#1\xe0\xff:\xfbog\xff\xcd>Or^\xe5\xb2h\xd0\xd1\xd9\x0e\xb1V\xc8\x9aK\x0d\xe4,\xa2\xe7\x90k\xc6\x82e\xd6\x82\x9b\x9fvu^.9\x8b\xc15\x93\xc1:\x9b=\xaf\xf9\xf2X\xa2g\xb6\xa1)ez\x1b\xca\xc4t7~\x0f\x9f\xf3\xe0m|\xf2\xdc\xd7\xf4U\xfa\xfc\x87\xbc6\x00\\v`\xd5u)\xf3\xc2h\\\x99r\xe6\x99\xf2\xf2\xe26\xdey\xeb\xa7>\xef\x8e\xb8p\x03ex\xd3\x16\xd0Q\xbf\xc5\xa7\x9d\xfa\xa3\x1f\xba\xd3f\x1cL\xb2S\x84\xa2\xa5\x0e\x0c\xe0\xe2!vg\xdf\xfd\x7f\x01\x00\x00\xff\xffPK\x07\x08X\xad\xc5r \xcc\x00\x00\x05\xac\x0c\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\x00\x00!(X\xad\xc5r \xcc\x00\x00\x05\xac\x0c\x00\x0c\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x00\x00\x00\x00swagger.yamlUT\x05\x00\x01\x80Cm8PK\x05\x06\x00\x00\x00\x00\x01\x00\x01\x00C\x00\x00\x00c\xcc\x00\x00\x00\x00" + data := "PK\x03\x04\x14\x00\x08\x00\x08\x00\x00\x00!(\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0c\x00 \x00swagger.yamlUT\x05\x00\x01\x80Cm8\xec\xfd]\x97\xdc\xb8\xb1\xe7\x0b\xdf\xebS\xc4\xd3\x17\xd3\xd2\x8cT\xea\xed\xf6z.t\x8eg\x1dY\xaa\xb6kF\x96\xca\xa5\x92g\xf9\xcc\xda\xab\xcc\xcaDfq\x94If\x93HI\xb5{\xfb\xbb\x9f\x857\x12d\xe2%\x80DJ\xe5\xee\x88\x1b\xb7U\xc9 \x00\x02 \x88\xff\x0f\x11\xfd\xe7j\xbdf\xdd\x0b\xf8\xfewg?|\xff\xa8nV\xed\x8bG\x00\xbc\xe6\x1b\xf6\x02^\xb3~\xdb\xf6\xf0\x0c\xae\xce\xdf_C\xd5,a}u\xf9\n\xfeTq\xf6\xb9\xba\x87e\xbb\xe8\x1f\x01,Y\xbf\xe8\xea\x1d\xaf\xdb\xe6\x05\xbcT\xbf\xad\x1b\xce\xbaU\xb5`\xb0j;\xe8y\xc5\x19\xfc\xbcg]\xcd\xc4\x15\x9fX\xd7\xcb_\xffx\xf6\xc3\xd9\x0f\x8fv\x15\xbf\xeb\xc5m\x9f/\xe5\x0d\x9f\xef\xbavUoX\xff\xfc\xd3\x8f\xcf\xab\xdd\xee\xd9\xa6n>\xca\x1f\x00\xac\x19W\xff\x01\xd0\xef\xb7\xdb\xaa\xbb\x7f\x01\xff\xfd\x99\xfe\x17\x80\x97\xbb\xdd\xa6^T\xa2,o\xc4E\xe6\xa6\xc0\xef\x18T\xe3\x1f{\x90>\xa1\xea\xfbvQW\x9c-\x81\xb7\xf2G\xeb\xfa\x13k\x1e\x0d\x0e\xf7=\xeb\x9eB\xbd\x82]\xd7~\xaa\x97ly\x06\xef\xf8\x1d\xeb>\xd7={\n5\x1fnPm6\xf3\x9b\xa8{\x0c\xaez\xdevly\xa6\xff\x7f\xbbc\x9d\xfc\xd5\xc5\xf2\xc5A\xb1\xf5o:\xd6\xef\xda\xa6g\xfd\x8b\xc1\xc9\xf7\xbf\xfb\xe1\x87\xef\xc7\xff{\xd0\xfa\xfd~\xb1`}\xbf\xdao\x86\xab\xcf\xac_\xf7\x8b;\xb6\xad\xec\xeb\x01\xf8\xfd\x8e\xbd\x80\xf6\xf6\xff\xb0\x05\x9f\xfca\xd7\x89B\xf2\xda\xbe\xbf2\xeb\x81\xd8\xa6\xdf\xd5\x8b;\xf9\x1cE\x15\xa1\xb6{\x88\xd3\xc3\xb2\xe2\x95\xf7\xf6z\x14U\xbc\x82E\xdb\xf0\xaanTG\\2^\xd5\x9b\x1e\xda\x15\xf0\xbb\xba\x87~\xc7\x16\xf5\xaa^\xc8\x9b\x06\xeb\xe2m&@4\x950\xab{\xfa\x7f\x84j9\x18kx=\xeb\xf7M\xb5e\xf0\x98\xad\xcf\xe0\xfas\xcd\xb9\x18A\x7f\xaa\xf9\x9f\xf7\xb7O\x81\xf1\xc5\x13\xafC\xf1,\xc5\xb5\xe5JfM\x0d.\xfb\xa0o\x08ms0x\xed\xf2\x03\xaf\xd6\xa6\x0eA\x87z\xe6\n\xd4S\xce\x85\x91\x1e\xf3^\xce\x97\xb2w\xb0x\x9f\x08\xb6\x05k\xf6[\x7fs>\x83\x97\x97\x97o.^\xbd\xbc\xbex\xf7\xf6\xe6\xcd\xc5\xdb\xffy\xf3\xfe\xfa\xe5\xf5\xf9\xcd\xc5\xdb\x8b\xeb\x8b\x97o.\xfe\xdf\xf3\xd77\x1f\xde\xbe\xbf<\x7fu\xf1\xd3\xc5\xf9\xebtG\x7f;\xbf\xba\xf8\xc9\xfc\xfb\xfb\xeb\x97W\xd7G{9\xbf\xbazwu\xa4\x8f\xf7\x1f^\xbd:\x7f\xff>\xdd\xcb\xf5\xc5_\xce_\xdf\xbc\xfbp\xed\xb9t\xc9V\xd5~\xc3_\x94i\xd8\xc9\xe4\x1e\xe8\xcb\xa9\xcfQ\xbc)\x02\xfd\n\xe0\xae\xea\xe1\xff\xec{\x0e\xb7\x8c5P75\xaf\xabM\xfd\x1f\x9eIP\x1a\xb2\xe1U\x170\x05\x18o\xd4\xf3\xaa\x13\xaf\xe1[V7k\xb1B\xa8W\xf5\xf1\xb7\x93}er3\xd6u\xe25\x0c\xcb\xbd\x185r\x84\xa9\x9b\xe9a\xbf\xebZ\xf1\x02=\xf6\xc6\xba\x83Mn=\xad\x9a\xf5\xaa\xde\x1c\xbe.\xe3\xb7\x1bz\xe2\xe4\x1e\xbc\xde\xb2%\xb4{.^e\x1b\x06\x9f\xab\x9a\x8b\xbb\x8ae\xd8\xbc\xae\xce\x9b\xb6]\xb5\xd8\xb0\x9b\x8e\xfd\xbcg=\x8fLT\x81.\xf9N\xfa\xb9Rn\xa0c\xbb\x8e\xf5\xac\xe1\xea\x05\xa8\xbd\x03\xbf\xab\xb8n\x1a\xd6\xc0\xb6Z2\xaf?\xbd\x07\xde\x0b\xb2\x82\x9e\x85\x02\xfb\xb2\xab\xbb\x07V\xfd\xf3\xa1L\xf8\x06\xf0:\xfb\\o6\xaa\x96\xae\x02\x85\x0b3\xdb=v,\x7f\xc5\x82\\=\x00\xdeB\x05\x0b\xd6\xf0.\xf0=o/Z\xa6\x7f\xd9U\xeb\xba\xf1,Ou!/\x87\x9f\xc0\x92\xad\xeaFo\xbe\x8fW\x0e\x1b\xd3\x87\x1eB\xc38\xbeK\xa7\x8a\xa2z\xbd\xaa\x95z^\xb7l)\xde\xcbu\xa3\x84530`\xcb\xfa\xbeZ\xb3^,1\xdd\x13\xc2\x1ds\xd5c\xd1v\xca\xc7R\xbc\xa2\xcd.\x8b\xf6&\xdf\xf7\xf2\x13\xc6n\x19gs\x98+\xde\xb7\xdb\xb1\xdc\xbfx'/\xb9F\xdf\xc9\xd9\x1b\xfeXu\xc3C\xfa\x03\xfc\xdb\xff\x15\xbah\xd2,\xb2\x7f\xff\x01~\xe7\xbc\xe2\x9f\x93\x7f\xf4\xf5\x9e\xbf\x8a\x113\xd7\xd2\x86\x1b\x1c\xecA\xe9\x7f\xd7;Kr\xb8\xcd\x1c\x8a\xd6\x9a7\x10oa\xcd\xf8\xfc\xe3N\xeb\x89\xe2{\xb9\x1a\xf5\x9c}\xcf\xba\xe1r\xb35l\xf9\x9b\x8aw\x0d\xec\x1b\xf6e\xc7\x16\xa2\x1d\xe5\x1a\xe4\x94\x1a\x9eg\x91\x13\x18\xddb\x11\xe9\xbb\xa0n8[[\x955f\xe6\x82\xba\xe1?\xfen\xf6W\xdd\xcb\x92\xca\xa0\xa53\xdf5_W{\x14\x97\xdf\xec;\xcf<\x89\x98)1s\x87\xb2\x97\xf0\xe1\xea\xcd\xf3\x8e\xf5\xed\xbe[0\xa5\xb0\xc9\x95\xe4\xbe\xa9\x7f\xde\xb3\xcd=\xd4K\xd6\xf0ze\xc4nqoh}s#\xa8\xefV\xd6\x99m}\xef\xefv]\xcb\xdbE\xbb\x81\xdb\xfdj\xc5:\xf3\xd0\xce\xe0Z*\x97\xb2n\xb0\xdd\xf7\xdc,;\xa0\xf2/\xc17\xac\xea\xb9\xff^m\xc3\xe0\xbb\xe7\xdf\xc1\xe2\xae\xea\xaa\x05g\xdd\x99\xdc\x9b\xd9T=\x87\x9e\xad\xb7\xac\x19>\xd8?\\\xbd\xf9\xbe\x87]\xc5\xef\xbc\xded\xa1\x86A\xef\xbf\xab\\x\xef7\x9b{\xf8y_m\xd4\xde\xbc\x12\x05WcK>\xaez\xa8\x03[8\xff\x10Ey\xben\xdb\xf5\x86\x9d\xc96\xbb\xdd\xaf\xce^\xef\xd5\x02\xf1\x1fOTM\xa4\xdbq?\xa9\xf6\x7f\xd3T\xb0\xa8\x9a\xb6\xa9\x17\xd5F\x8e!\xff\x9d\x1f\xb3\xb3\xf5\xd9S\xd1\xb4r\xd2\xff\xee\xec;\xf1\x86iZ\x0e\xd5b\xc1v\x9c-\x9f\x9c=\xf2_~!>\xff\xaa\x05\xaf\x17\xec)pVm\xc5;b_\x89\xe6\xd8ul\xd1nw\xb5x\xc96z\x96\xbc\xad\x9b\xea`\x9a\x1cMR\x10\xf7;\xd9\x07+9I\xde\xfbo\xad\xe6:\xa8\xb9\x98S\xf7\xbd\\.\xcb\x8d\xa4\xb6\xe1b\xc5\xd3\xae\xe0es\x7f\x06\x7fn?\xb3O\xac{*\x1a\xc2\xeb\xec\xc3\xd5\x9b^/\xb6\x85+\xcf\x0bR\x99\x9cA\x19\xfc\xe3\x8e\xf3\xdd?\x9e\xaa\xff\xed\xff\xf1\x14\xdaN,\x8d\xd4_\x9f\xca\xde\xb8\xa8\x1ah\xe5\xe8\xacB*M\xcf8\xecwP\xc9\xba\x07\xee\xcb\xbaOL\x7f\x01n\xab]\xaf\xba\x96,9o\x87\x97\xae\\p\xd4\\R*\x81\xcf\xa5U\xbb\xd9\xb4\x9f\xfb\x17\x81g\xfb_\xe1b5\xd6Ht\x0bC\xb1\x0c\x95\xd6_\xa2\xfb-[\xba\x97\x02\xda\xd1\xcb\x06\xfe|}} \x7f:\xbf6b\xf9\x87\xab7j\x8c\xdd\xd7l\xb3\x84\xca{\xf5\xff\x9e\x0f\x8b\xeb\xfb\x1d\xfb\xf7\xff\xfd\xef\xde\x0b\xc0\xac\xbf\x1a\xdd\xdf\xf4kD>!\xbdY\x01U\xa3^a\xfe\xed\xba\xffj\x7f\x19\xf5r\xe5[\x896S\xeb\xf0E\xb5\x10sK\xdb~\xdc\xef\x86\x15\xcbm\xd5\x07\xb6\xaaU\xc5\x03\xc5\xfep\xf5F\x96\xf1\xae\xfa$\xbb\xe0\xd6\x1aCK5\x88*S%\xf1\xdf\x9f\xdaz U\x13\xdauQ\x05\x94\xd3G\xc7Vm\xc7\x9e\x1a\x07\xc2o\xc5\xeb\xdbzS\xf3{h\x18[\x9a\x85\xa5\x9c\xf2\xbaO\xc1M\xf7\xb6\x11\xd3l#\x16\x99bh\x8b1{\x06\x8f?\xf4\xcc\xd0Y\xa2\x95D\xf7\x14s\x96\xea\x9fUS\xadC\xb5\xbf\xedX\xf5Q\xccA\xda\xf1\xd9\x13\x7f\x8fz\xdbr\xf6B\xd1/\xab}\xb3P#L\xd4C\xcf]\x8b}\xd7\xc9/\x1c{\xa5\xef\x9f.\xe5F\xb2\xfc,\xf2/\xf0\xf5\xbb\xecv/\xbe\"\xc4\x9b\x88=\x95L[\xcd\xcdM\xe5\xe2X*\xa5f\\z]\xdd\xb2u\xdd\xc8\x8d\xb0\xcf5\xbf\x0b\xbc\\\xeew\xecL\xf5\xffjW\xf7g\x8bv\x1b\x9a\x8d\xdf\xcb\x91\xda\xab\x8f\x0d1Q4\xf3Y\n\x1ek%W}\xed\xa9\xa1\xedGj\xb6\xf5\xfa\x8e\xc3m`R\x92\x95\x96;P\xf5v\xb7a\xe2%\xabV\xb4\xc3*\xb6g\xdb\xaa\xe1\xf5\xc2\xf9\xa1\x18\xd9\xc9E,\x81\xa2\xdf\xde\xf8U\xd2_\x14\xb2\x00\x95(T\xbd\xb4\x168\x07\xeb\x18\xfdr\xafn\xdbO\xfe>\xad\x9b@\x0f\x05W\xf51%\xfb\xc7\xcb\xe6\xfe\x1f\xe3\xaeL\xd5@\xd5\xdd\xd6\xbc\x13\x83\xd8_B\xa7+\xf3\x8e\xa86\xad\xeezP\xb9\x1f\xad\x98\x9d\xe5\x8bF\x95\xf0v\xba,\x9c-\xff\x86U\x9d\xa7k^\x9a\x81\xb3\xa9oe\xb1\xf5{\xa4\x87~\xbf\xdb\xb5\x9d|\x83\xef\xaa\xc5\xc7\xe7\xfbF\xfc\x8fxo\xab~\xe1\x1eA\xfaE\xef_\xd8\xb4+\xd8s5\xb1\x99\xe9\xa1\x17\x13k\xb5\\\xd6j\xae\x805kX'?9\xb7\x8c\xdf\xb5K\x8d\xd3\xb9\x1f\xa6(\x8fz\x84\xee\xfb\x9d\x7f\xa9D\xe7\x87\x7f{\x01\x97\xa2\xfcb^\xd0U\xa9\x86F\xaf\x1bx\xf5\xdf\xfe[\xe05\xf9S\xdb\xc2\xaam\xe1\x0fpvv\xe6\xff\xf2\x15\x85\xa9\x9a{\xff\x0f\xaa\xe6\xfeL\x14\xe3\xa7\xae\xdd>^\xb5\xed\x13\xffO\xcf\xce\xfc\xef\xbfz\x05\x8f\x85\xab\x0f\xb2\"\xd7\xed\xe3\xff\"|= ~\xc8\x87\xfc\xfd3\xdcv\xbf\x8b\xb4\xdd\xff\xa8>U\xc5\x1a\x0f\xfe \xd7\x86\xe2.\x05Z\xa8\xee\x1f\xff\xd4\xb6g\x8bM\xd5\xf7\x91\x06RE\x14\x17\xa9:Z\x17\xfa\xcb\xf0O\xef_\x9e?\x17\xdd\x1aW\xc6\xf7\xd5\x96\x89\xa5\xd3KU\xda5\xe3\xaf\xd5\x96\xc2E\xd3\xf3\xaaY\xb0\xc7Or\n\xef\xf4\x13\xaa\x8b\xfbO\xa6\x1b\xfc\x18\xe9\x06\x97\xf7\xfc\xaem\x02\x1dA\x15\xf2\xa7\xb6}|vv\xe6\x7f\xb3\x0d\x9d\xe0q\xf07r \xc9.\x92\xdbC\x84\x93\x0b\xd5\xe4\xaf\xcf\xdf\xbf\xba\xba\xb8\xbc~w\xf5$$\x0f\x8d\x83.|cu\xebps\xfe>\xd2\x9c\x7fj\x03\\\x81h\xca\x17\x7f\x80\xff\xb2\xbb=\xfb\xa9m\x7f9;;\xf3\xf7DQ\xea\xa7bI-\xae\xa8\x9a\xfb\xdd\xed\xd9[\xf69R\x81z%\xaf\xf8\xff\xfd\x01\x9az\x13\xde!\x0c\xb5r`\x80\x84\xaf\x9bU0\xe0F\x97T\xd5\xed\xecC\xb3\xad\xba\xfe\xae\xda\\\xb7j\xfa(U\x0d\xe7\xdf\xae\xa5\xfe\xb1\xf88\xbc\xa9\xccg\x18\xdc\xde\x8f\x8bR\xf3nU\xdb\xf9\xeeo\x02\xbd\x87(\x16m\xee[}\xefXp>_\xed7\x9b3\xf9\x07\xb1\x98\xff\x1e*k- \xd6 \xa2o\xf9\xde\x9c\xaa\xcf\xb9o6\xbcx\x9b\xcd\xbd\xf9\xea>\xd8J\x19>\"\xa0ZI\x94\xdas#\xb9\xcb\xf3\xfd\xf3\xef\xdd\xb7\xd2+\x06Sd\xb9\x17\x00L\x8f\x91\xefVm{v[u\xb2\xb2_\x9e\xdf\x9f\xfd\xc7w\xaa\x15\xe5\x97\xa9\xd3\x9f\xffC]\x16\xf5;\xe1\xc3\xb7X\xf8\x1f\xef\xdf\xbdu\xff\xe5\x0f\x7f\xf8\xc3\x1f\xfc]@\\7nH\xa9E\xb6B\xe5\xd4\nQ}\xf4\xee{f6\xa8\xd7\xfbM\xd5\xb9\xfd\x1d\xba\x91b\x1f\x1b\xd7tOG}AO\x17O\xd5\xb7\x8a\xcb]\xe5\xd9\xda\xb2\xd6[+\xf9\x95\xff\x8f\xffG\xb4\xdc?\xf4N\xcbDi4\xcf\xc6=>\xf4|\xf6\"\xf0uV->\x8aIm\xdc-X\xd5\x1b\xe6\x7f\x11\x99I\xf0\x92u}\xdb\x04G\xad\xde\xa6\\\xd5]\xcfo\xe4\x03\x8eH\x13\xfa\x02\xd1'\xcd\xef\xdd\xc2\x844\xdf+\x11 X\xaa\xefd[~\xf7\x02\xbes\x0d\xdai3\x9c\xa9Z~\xf74\xe4O\xd6\xefm\xb5\x15>\xffoU\x85\xff\x1e\xbc@\xd4o\xf6\xfb\xd4J^\xac\xf4\xd7\xe8\xb4\xaf\xa9\xdeP\xf7\xf0\x99m6\xcf>6\xed\xe7FN3wU\x0f\x15,\xf6=o\xb7\x89\x83k\xda\xe5\x9f\xaa\xaf\x9b\xd98\x18\xa5P]\x1c\xd1\x81=_\x9e\x95\xea\xd2\xee\x9b\xfdC\x0eF\xd3\xcf\xef\xda\xcdRurUr5\x94\xebf\x18\x1fZDr\xbbRC\xc6}\x1fY\x84\xb3\xe1m\xffXLk\xa6 \x0f\xf6\xcd\xccv\xf2\xbf\xff\xef\x7f\x7f\x12\x18H%\xfa\xdc\xf4\x86\xe1n'\x9bJ\xb8\xfc\xb7\xb3\xdf\xfd\xdb\xef\xfa\xef\x02]H\xfd\xef\xae\xea\xaa-\xe3\xac\xb3t\x95gr\xe2}1\x95\xcc\xc2\xdf\xd7\x8f\xdf\xe9\x9d\xd9'\xea\xfc\xd6d6\xd2g\x17\xf5\xf0\x11\x0f\xaac\xfd\x84\xba\x99\xef&\xcbG=mU\x83mX{\xf6=\xab\xba\xc5\x9d\xba\xdc\x9e\xe9\xea\xe6\xc5\x81\x84\xd8\xb1\x9f\xf7u\xc7\x96/`Um&\xc2\xb1s[\xc44\x81\x1b\xbf@\xb6\x84\xb5\xe59W<\x0f\x8ehy\xce\xb6\x19\x1ci\xda\x16\xa2\x1d\xceDC/\xd5\xfb\xbe^\xc9g%7\x907}\x0b=\xe3'j\x0fs,\x0c\xd9\x18\xc3\xa1\xaeY\xf5\x8d\x1b\xa8\x9b\xbe^\xb2\x83&9\xb65l_\xa7o\x94\x91\xa79\xfb\xc8\xee}M3#U4\x9aR\xe9\xa5F\xc7\xf8\xbek\x14\x80`k\xf1g\x03\xc7\"\xf7\x93\xd7\xb3\x8dWY\x03\xc3\x00\x86\xd8\x14\xc9\xcb\xb6\x8d\xdcpjW\xab\x9eq\xf1\xb1;-.L\xc6V\xe9\xd6\xf2\xec.:\x1aQ\x95\x0f\xd9\xc5tedS6\xfb-\xeb\xea\x85\xf97\xf9VZT\xcd\xc0\x8bKJX7\xfc\xbe\x19v\xb3g\xdf}\x17\xd2\xdbFLQC\x13\xaa\xfd\xdf}/\x9a\xfa#Kl\xcf\xa9\xfb\x137\xee\x8c\xf4q4\xef\xa6\xde\xd6\xd8\xd6\x95\xbf5\x08\x95\x0f\x00RJ\x87\xdd\x83\xf9@uO\xbc\xed\xd4\xbe\xa6\xfdO\x17+\xd8\xb0\x157\xc0\x94&\xa8\xcc\xb7\x95\x14i4\x18\xdc\xea\x96\x13\x1fj\xacZ\xdc\x89A\xfe\x0d[\xd1\xc6\x98\xc6\xebCmi]!ZT\xf6\xd0\x16x\xb7g\x92d\xa9\x9b\xa5\x98\xb2\xd8 \xd7\x1a.^\xfc\xd0q\xc8\xa3n\x16\x9b\xfdr6\x17V\xa0\x8f-\xac\x9cOL\xd2\x17\x96\x8c#\x968\x16\x0d8\x9b\\>\\\xf4\xb3\xa75\xab\x82\x9cn;\xd6kNF\x0e\xafq<\x8a!w\xa6GS\xbdn\xdan>\x9b\xeb\xd18\xbd\x85j\x99c\x1f\xecm\xdbnX\xd5\x84\x1e`\xc7>\xb1\xae\xc7\xbe\xc9\xf4\xaf\xe7\x0f\xae\xb60\xb8\x8e\xb9G\xc2\xc4\x8f\xb8\x07SLX\xdb-Y7\xff\xb0}_7\x0b\xf6\x02\x16\xadX2=\xeb\x97\x1f\xe1\x87\xb3\xdf\xffX\xb45x\xb5\x9e,\xf6\xfe\xaa\xbd\x05C>\x03D\x03\x1f\x94\x0c{\x10-/\xa0\xca\x0c1LV\x19\xaa\x8f\x02\xb2\x9fB\xd1P\x07\xf1@\x07\xc80\x07'\xad\xe3\xf1\x01\x0e\xb0\xe1\x0db\xc1\x0d\n\x856(\xd8\xff\x10A\x0dR\x9f\xcd1\x01\x0d\x10\xe1\x0c\xa2\xc5\xc1\x9d\xe5\x8fu\xa4\xa2a\x0c\xfcA\x0cP!\x0c\xbeR\x95sB\x17H\x91\xc4\xe3\xcf\x13\xb8 T\x8c\xc2A\x0b|!\x0bR\x8e\n\x8f\x1b\xb7\xc3\x99\xe1\xc3R\x99}\xf6\x99?=\x89\xce\xfe\xd5|\x9e\xc9cGrZQ\x87\x87\xab\xe6p\xdfY\xe9|\xd5\xb8\xd7<\xf8\xa2\x83\xc3\xb3\xbf\xd2\xc1a\xec\xfe\x15\x1d\x1c\xa6\x83\xc3\xbe_\xd2\xc1aitp\xf8\xd0\xe8\xe00\x1d\x1c\xf6\x19\x1d\x1c\xa6\x83\xc3\xd2\xe8\xe00\x1d\x1c\xa6\x83\xc3tpX\x19\x1d\x1c\xce9{K\x07\x87\xe9\xe0\xb0etp\xd8atp\x98\x0e\x0e\xd3\xc1a:8\xec\x1d=tp\x98\x0e\x0e\xd3\xc1\xe1\xdf\xfa\xc1\xe1\x81\x01\xb2\xbc\x84>\xb2\xf1\x1c\x8f9\x8d\xa0\x8e\xfe\x02wq\xe2\xd3\x1d\xe6\xbay1\x97\x18\xc6\xe32\xbc\xdbG\x0e\x85\xe5\x1d\x96Q\x90\x94\xba.\xed|\xcc;y\xe5p6\xc6\xc0\xad\xca\xa1|\xd3\xd8\xdb\xa1\xf2n\xe3s\x1dw\xb9u\x03\x19>\xd6\x8a\x83<9f+\xd6\xa3\xfa\x10\x00\xe68\x8d*\x9c\xfe\xe1\x83=Jc7\xbem\xfc\x1b\xa8\x8bG\xa5DE\xc0\x95Q\x1f\xb1\xe3$\x11\x07I\xd9\x0ed\xf7x\xad\xcf\xf2\xf8\x0e\xf8\x98\xd3^\xb1\x1a\xbb\xa7F)\xcf\xcb\x07|\xf8xUQ_\xaa\xe8\x02\xac\x1fv\x07\x0f\"\x83\xb7v76F\xe9\x14(\x9d\x02\xba1)\x9d\x821J\xa7\xe0\xb4\xdct\n\xe1\x06w\x91R\xea\x9d\x8c\xa0\xa4\x0e\xb7#\xb8u8c\xf6\xa7\x03Jj\x8eH\xa99t\x1c_\x04F\xcd\xfeJ`T\xac7\x8fF`\x14\x81Qn#0J\x1a\x81Q\x87F`\x14\x81Q>#0\x8a\xc0(i\x04F\x11\x18E`\x14\x81Q\xca\x08\x8c\xcaa\x8b\x08\x8c\"0\xca2\x02\xa3\x1cF`\x14\x81Q\x04F\x11\x18\xe5\x1d=\x04F\x11\x18E`\xd4o\x1d\x8c*\x96N@I$\xad\xe1\xa0,I\x0e\xda\xd5\x99\xda\x19\x9d*\x15\xc3\xd7\xfeS\xa86\xb3m$\x85E\xf4\\\x86\x0e4\xbdl\xc8\xaeP7=g\xd5\xd2\x9e\xf9r\x82\x10\xcf\xb6I\xb0\x19\x05\xfe\xd3\xdb\x1eC\xf8\xd2\xb1\x1dVm\xa7\xb5\x1bY\x0b\xf9\xea6q\xb1\xea\xc3\x0f\xe8Y\x9a\x80qC\xa4RC\xfbDU\xa6|\x01\x98\xd6\xa2|\x01\xcaN\xdc\xb8\xf1H\xf7\x94/\xa0D+R\xbe\x00\xca\x17\xf0\xeb\xcf\x17\xb0\xb8\xab\xeaFA\xd0(\xfa\xf9\x95\xf8\xfd\x1b\xb9\xfc0\xc8\xb3\\\x88\x8a\x7f\xd6\xcb\x12+\x96\x99\x96\xe9eB\x00\xb9pxj3rf\xdf\xe1\x0c\xde\x19\xa0ML\x10C\x9a\x81\xcd\xe6\xc0\xb7Z\xf28\xd1\xe7\xb1d\xfa\xaf\x0f\x96w\xb6Z\xdb6\xfe\x0d\x98\xa1\xa3p\xe7i\xe2\x01\x9b\xb0]\xb2\x9e\x9b9g\x9eE\x8c\xb7\xfe(\xdf\xfa7\xe1\x12\x05#\xfa\xc5*\x0c\x08P\np\x95\x07\xa4\xe0f,\x15\x9a\n:s+g\x81\xcd\xd7\xd2\xf0\x14\xc4\x01*\xc8\x80\xa8\xc2\x15\xa8\xf8\x1d\x1a\xa4\x82R0\x15d\x02UA\x87\xa2q\xd1P\x15\x1c\x0fVA2\\\x15t\xa5\xa1\x8f$\xc0\nJCV\x90\x08ZA*l\x15\xee\xd9\xf6\xd9\x1d\x14p\x05\xa5\xa1+\xc0\x81WP\x12\xbe\x82\xa3\x01,\xc8\x83\xb0\xa0\x14\x88\x05Y0Vx8T*\x99at\xdc\x9c\x04\xca\x82\x13\x82Yp\x1a8\x0b\x12\x01-\xc8\x83\xb4bS0\x0e\xd4\x82\xb2\xb0\x16$\x00[\x90\x0emA\x06\xb8\x85\x982\x9f \xe0-(\x01pA\x0c\xe2\x02\xfc\xf2\x0c\x01sA\xe2*.\x19\xea\nz\x93\xc0\x17\x02\xec\x82\x84R\x16\x04\xbc \xf2\x82\xd2\xa0\x17d\xc2^\xe1~\xd5\xc7\x81/\xc8\x87\xbe\xbc\xfe\xc4\x1dc\xe0\x17\x14\x83\xbf\x00\xcf0\x01\x06\x02\x834\x10\x0cblB&\x10\x06\x08\xbf\x01\xfd\xb3\x10\x1c\x06Y\x8d\x8b\x87\xc4\x00Q\xcb\x0cX\x0cr\x811\x0831(p\x0c\n\xc3cP\x08 \x83p\x8f)\x07\x92\x01\x1e&\x03$P\x06h\xa8\x0cp=*\x1d.\x83$\xc0\x0c\x82\x90\x19\x94\x02\xcd \x156\x83L\xe0\x0c\xd2\xa03@<\x85\xc8@\x8b_\x8f\x87\xd0\xa0 \x88\x06\x98\xa2\x05\xc6Y9(\x0d0`\x1a\x1c\x01\xa7y\x1d\x8a\x1f\x86\x005(\x0d\xa9A\x14T\x83\\X\xcd\xebM}\xdd\x877:\xe2\xd0\x1a\x04\xd9\x1a\x08\xc2k\x90\x05\xb0y]\x05\xc16\xc8\x85\xdb\xbc\xde\xd4\x02:\xb0\xddX\x0er\x03\x14\xe8\x06\x19\xb0\x1b\xa4\x01o\x90\x03\xbdA2\xf8\x06\x91Wy\x04F\x82\x04 \x0b\xc1A\x0e\x08\x07\xa90\x1c\x84+\x9e\x03\xc5y\x9dY\xc8\x19v\xc8\xe0\xe0\xb8\xe0\x80\x90\xd9]\x02\x80\x1c\x94\x85\xe4 \x06\xcaA\x18\x96\xf3^\x93\x0b\xd1A\xc1\xbe\x9b\x00\xd3A\x12P\x07\x81\xd5K,\xca\n\x988@\xeedF\xb2\xff~\xe1\xac\x13\xd3\xa2\x12\x84\xb5V\xe8\xf5\xa7\xf68\x17m\xd3Hx\xc1\xdf\xb6C\xc2\xad\xd7R\x1e\x87P\xba\xb6]\xd7\xb6+\xaf<\x19\xad\xe3\xa5\xb8|Z\xc31\xf1\xa5\xf4\xed\xaelhl\x04\x1a\xa1\x90^\xba\xdb\xdf\xfa\xe3\x19)C\xdc \x90w\x03\xa4B\x0b\xf8m@H\xd8=3VT\xad\x85L\xc5\x16RT\xdb\xa8\xa7Q\xd5\xc5(\xb7PZ\xbd\x85\x1c\x05\x17J\xaa\xb8\x90\xa4\xe4F]\xd9\xa13\x12\xd5\\(\xa3\xe8BYU\x17\x8ePv!C\xdd\x8d:\x14\xaf\xd4T\x85\x17\x8a\xaa\xbc\x90\xad\xf4\x02V\xed\x8dz\x99\xaa\xc1X\xc5\x17J\xab\xbePD\xf9\x85|\xf5\x17J*\xc0\x90\xa4\x02G]MBv\xe0\x94`8\x9d\x1a\x0c'V\x84\xe1t\xaa0d(\xc3\x90\xa2\x0eG=\xd9!>\x00\xaf\x10C\xaaJ\x1c\xf5&\xe7\x89\x14\xa5\x18\xf2\xd4b(\xad\x18C\xb2j\x0c\xa5\x94c\xc0\xa8\xc7\x90\xb6tD\xaa\xc8\x90\xb1\xcaLR\x93\xa3\xde\xb8 !\x82T\x94!\xb1\xc4\x89\xcar\xd0\xd7t5\x8bT\x97!Ua\x0ezB\xa8\xcfPZ\x81\x86D\x15\x1a2\x95\xe8\x98C\xac\x1a\x0dE\x15iH\x13N\x01\xabLC\xba:\x0d\x18\xc1\xe2\x08\x95\x1a\x90\xfe#\x1b\x96\x05\x15k\xc8n\xfc4\xe5\x1a\x905\xcfT\xb0\xe1\x18\x15\x1b\xe2\x02\x1bZ\xcd\x86\x13(\xdaPP\xd5\x86x\xef*\xabnC\x9a\xc2\x0d *7$)\xdd\x80\xef\x81y\x8a7$\xab\xde\x10U\xbe\xa1\xa4\xfa\x0d9\n8\x1c\xa1\x82C\xba\x12\x0e\xc8\xa7\x84\x18\xb08?i\xca8\x14V\xc7\x01[\xcc\xc8\x98MW\xca\x83\xeen\xefqj9d*\xe6A\x87:\xd4KT5\x87L\xe5<\xe8\x90\x9b\x9d\xcc\xa0z\x0e\x19\nz\xd0\xd9\x18\n\x06\xb1\x89\x84S\xd2!\xaa\xa6CTQ\x87\xb2\xaa:`\x94uHT\xd7#\xfd\xc3\n+\x13T\xd8!Ce\x0f:\xfbp\xf5\xe6\x0c\xa9\xb4C\xa6\xda\x0e\xe9\x8a;\xe4\xaa\xee\x90\xa5\xbcC|\xea\x02\x84\x8a Jf\x8a\n\x0f\xb9J<\xe4\xa8\xf1\x10o\x8c\xa2\xaa<`\x95y(\xad\xceC\x82B\x0fY*}t\x12\x8f*\xf5\x90\xa9\xd6\xc3\x91\x8a=\x14\xee\xef\x89\xca=$\xab\xf7\x10Ym\xc5\x15na\x97\xfb\xdb\xff\xc9\xee\xe7\xb9\xc1v\xfb\xdbM\xbd\x90\xd19\xac\x13\xe2F|\x8f\xf5/\x89\x06\x88g\xa6\xfa\x0d\x8f,\x80\xc5\x9aH\xad\x10\x06}\xdd\xfb\xfb\xbe^7\x15\xdfw\x88\x03'$p\x07\x8c\x04n\x12\xb8'F\x02w\xd4! \xdc@\x02\xf7\xc4H\xe0&\x81\xdbi$p+#\x81\x9b\x04n\x12\xb8I\xe0\x8e8$\x81\x1b\xa97\x90\xc0M\x02\xb7\xdfH\xe0\x9e\x19 \xdc~#\x81\xfb\xc00O 1`q~H\xe0v\x18 \xdc$p\x1b#\x81\x9b\x04\xee\xe9\x85$p\xab\x0bI\xe0\x0e9$\x81\xdbo%\xfb\xfb\xbf\x88\xc0\xfd\xde(\xc6s\x8d\xfb\x8e}y\xc6\x9aE+\xba\xfb +\xc76\xb6\xc4\x85\x97\x9b\xaan\xae\xd9\x17\xae^?\xde\xdf\xef\xc4\xefn8\xfb\xc2\xe3but\xeb\x0fW\xd9\xb1h\x81\xca\xaa\x97\xa6\xa8\xb2\xdc\xd5\x0f:\x94a\xf1\xe5\x96\x92\xd63\xa2\x8a\xd7\xd0\xde\xce_\xc9\x13\xf27\x8b\xb6Y\xd5\xeb\xfc\xa3\xf92|\xfc+\xe9d\xfarT\x8eu\x97\x9c\x1f\xcf\xf7\xba\x0b\x1d\xdbG\xb0\x04\x18\x8e@&<8\xae\x17`\xf7F\xbd\x8dc\xc7gPa\x19\xe4\xe2D\xce}^or]Z7\x1f\xc5K`[-=\xbb\xb7\x8b\x8e\xc9&\xbf\xe1\xb5\xbf\x9e\x88:\x9a\xcd\xede\xc5\xd93\xe1+\xbf\x8b\xe8\x12]\xd7\xdb\x83\x91/\x1c\x8bi]\xe3)\xa6\x86w\x81\xe8\xcd\xb7\x8c5\xaa\x96\xce\xb7O\xb8\xa2[0) 7-l\xdb\xce\xa4\xa3qjO2#\xcc\x91\x8d9K\xb9c[l\xec\x0d i|\x19\x8a,I\xd3W_\xbb\xa1\xed\xdc>\x9e\x9f\x7f\xaed\"\x98\xa7P\xf3\xde\x88\xf2=\xec\x1b\xd5\x89\x97JG\xfc\\;\xbam|R\xb5\xf3\x7f\xa9ZM\xb2\x04\xd6\x0d\xac\xaf._\x0d\x03\xc3,\xe3z\xf8,\x9e\x99\xeb\xf1\xb8\xdf\xa0\x8b\xb6S>\xe4\xea\xb5S\x95\x1f\xd6\xe1b\xc1-%I\xbbe\x9c\xcda\xaex\xdfn\xc7r\x07\xd7}\x1d\xdb\xc9y\x0d\xfeXu\xc3C\x8a}\x99M\x9aE\xf6o\xdf7\xd9t \x17\x1e\x8c2\xfb\xcd\x98\x1cf\xd2\xee*\x07\x93\xfa\xff\xf2\xb3d\xd5\xba\xa2\xedI\x17\xcf\xad\xd47\xe2\xe9\xa8\xed\x9aq\xb0\xe8M&{\x90L\xb3\xcb4\xb0o\x14@\xc4\x96\n\xe08e\x92\x19y\x03\xc7\xac\xec\x1f\xadb%\xe7\xbb@\xbc;\xd6\x8e\xed&3\xb6\xeb\x86\xff\xf8\xbb\xd9_u\xafI*\xc3\x92\xf1\xaa\xde<\x90\xe48<\x02iFg>\xcc\\\xa0,\x15\xc64j\xb0\xd7!GB\x98h\xf8\x12\x93\x13&\x02]\xa6\xc2\x96\x12\xa6\xf4z\xc3B\x96\xae]\xd4d\xb8\x12\x0fUN\xa0I\xaf?Q\xb7\x18H\x87\x04\xe80\xe0\x1c\x0e\x98\x8b\xb4~: \x87\x07\xe3\xfc@\\\x11\x10. \x80\xcb\x01\xdf\x12\x80\xb7 \xf9\x15(V\xf0:<\xd0V\nd\x8bT\xc3\xf9\xb7t`\xcd\x97\xbb$\n\xaa\xe5\x00j\x06Bs:\x0c\x81i9@\x9a\xf7Fa\x10-\x15@\xb3 3\xa7?\xff\x87z\x1c8\xf3\xf3%~\xc0,\x1d,\x0b\xc3c)\xd0\xd8\x14\x0cs\xba\xf3\xc1b\xa9\x90\x18xs\x8d\xc4\xe1\xb0T(,\x01\x06K\x86\xc0\xd2\xe0\xaf\x00\xe7\x14*\x15\x16z\xc1B^\xc9pW\x12\xd4\xe5\xa9d\x0e\xc4\xa5Q\xa7\xc4\xc1\x95\x03mi0\xcb\xdd\xb7C\xb0V:\xa4\xe5\x9d\xd8\x82pV\x00\xca\xca\x06\xafJ\xf4\xb9\x04\xd0\n\x0fX\x99\xd7\xf3\xae\xea\xaa-\xe3\xac\xb3t\x95g\nW\x11\xd3\x9f\xfd\xe9\x1b\xfa\xbe~lvf\x9f\xc0\x87\x9eus\xe2Bg\xeb0\xb1A\xf4\x14)\xfc\x8b\xa7uH\xa0\xf4\xac\xea\x16\xb3\xad\x9c\x81\xd3XM7\x1a\xeb\xe6\x85\xd2\xdb\xad\x7f\xeb\xd8\xcf\xfb\xbac\xcb\x17\xb0\xaa6\x13\xd9\xd7\xb9 b*\xac\xe8\xa4Y\xb8\x05d\xb5\xa5\xe2(\x06\xf0t&\xb6\xd5\x0b\x05\xdd\x98\n\x9bJ\xda\xfe\x0e\xb6\xca\x87\n\x8bf]\xaa\xb7{\xbdR-W\xf7Pm\xfa\x16z\xc6O\xd4\x1e\xbc\xea\xd6\x8c\xa7\xb7\xc5\xb5\xbcn*Eq;Q\x8a\xe9\x08C[\xcc\x0b<>\xeei{\x1c6\x85jT\xd9\xcc\xa7o\x90\x91\x849\xfb\xc8\xee}\x0d3\x93\xb55TR\xe9EE\xc7\xf8\xbeS\xe8\xddDE?\x1b\x08\x14\xb9s\xbc\x9em\xb1\xca\x1a\x88\x17a\x8c*y'\x1a\xa6md\xafkW\xab\x9eq\xf1Y;-\xae\x1d.\xa4|ky\xf6\x11\x1d\x8d\xa8\xca\x87\xec`\xba2\xb2)\x9b\xfd\x96u\xf5\xc2\xfc\x9b|\xff,\xaaF\xd4Gm\xa2\xde\xb1\xc64\xfc\xbe\x19\xf6\xadg_x\x17\xd2\xdbF\xf4\xc4\xa1 \xd5N\xef\xbe\x17M\xfd\x91%\xb6\xe7\xd4\xfd\x89\x1bw\xc6\xe88\x9awSokl\xeb\xca\xdf\x1a\xd0\xc2\x87\xee(M\xc3\xee\xc1\x1a\xcb\xd8of\xac\x83\xda\xc1\xb4\xff\xe9b\x05\x1b\xb6\xe2\x06u\xd2\xec\x93\xf9\x8a\x92r\x8c\x1a \xea&\xa2\x9do\xef\x81U\x8b;\xa8v\xbbo\xd8\x8a6\x804^\x1fjK\xeb\n\xd1\xa2\xb2\x87\xb6\xc0\xbb=\x93\xa9\xae\xeafY/*\xce\x06aV\xb7\xa0\xfc\xa1\xeeH\xb6\xbb\xbaYl\xf6\xcb\xd9\x9b\xa1Rw\x19\x94\xf1\xd9\x13\x93\x9c\x85%\xd8\x88\xc5\x8c\xc5\xf1\xcd&\x97\x0f\x17\xfd\xeci\xcd\xaa g\xdb\x8e\xf5\x9a\x88\x91\xc3k\x1c\x8fb\xc8\x9d\xe9\xd1T\xaf\x9b\xb6\x9b\xc9]f4No\xa1Z\xe6\xd8\x07{\xdb\xb6\x1bf\xc5\xcdq<\xc0\x8e}b]\x8f}\xa7\xeb_\xcf\x1f\\m\x01l\x1ds\x8f\x84\x89\x1fq\x0f\xa6h.IQ\xcf?a\xdf\xd7\xcdB\xac9Z\xb14z\xd6/?\xc2\x0fg\xbf\xff\xb1hk\xf0j=Y\xd6\xfdU{{\xbe\x94\xeb\xb1\xe7\xfa\x83\xa6\x7f\xfe\xe9\xc7\xe7\xf2=\xfaL\xbcq\xfb\xe7*\x0e\x9b\xbar\xcd\x06L\xaa\xdfo\xb7Uw?i\xb1\x01\xb4z'\xaf\x91\x05\xaeYo\xe0,\x1d\xd2M\xf4H\xf5\xa2\x967x\xea\x12\xf2\xd5rH\x0c\xd2\xe1\x9f\x84\x93j\x14\xbf\xacW\xbd\xf8~\x99\xaf&\xf4e\xed\x8e\xa9\x95\xf2\xc5\xf2\xc5\xbcx\xfa'\x06\xe5\xb2\x1a\xe7\xfb\xdf\xfd\xf0\xc3\xf7~\x1e\x0c\xfa\xfdb\xc1\xfa~\xb5\xdf\x9c\x12\x04\xb3\x1b\xde6\xfe\x0d\x88*\xb1\xc6\xcc\x96\x12\xc7\x95t\xb6\x0b\xb5\xf8\xcc\xbc\x1c d\xcb^\xf1Zql38[\xffc\xbb\x12=\xb0n\xd6\x1b\x168' \x97\xe9\xf2\xe1\x1d>:U\x12\x9d1\x91\xf5\xd3\x8f\x019\x1c\xf4c\x9f]J\xbc6\xf1\xda\xe8\xc6$^\xdb\x18\xf1\xdaN+\xc2k\x1f4\xf8\x94\xd7V\xef\xd8\xe1.\xae\xc3.z\xb9t{\xef\xd8\xa2\xd3m8o%\xc9\x89\xc9\x0f\xdfV,F\xac\x89S\xcf\x9b\x84u\x13\xd6MX\xb76\xc2\xba \xeb\x1e\x8d\xb0nNX\xb7\xdb\x08\xeb6FX7a\xdd\x84u#WI\x84u\x0fFX\xb7m\x84u\x13\xd6\xed0\xc2\xba \xeb\x8e\xf6\x10\xc2\xba\xfd\xd7\x10\xd6=1\xc2\xba \xeb\xf6w\x01\xc2\xba \xeb\xb6\x0d\x8b\xd8\x12\xd6-\x8d\xb0\xee\xdf\x02\xd6\x9dN9\xbf\x9bR\xceZ\x1bi5\xb2ckq\xd0\xae\xce\xd4\x96(\x1f?\xed\xa7U\xab6\xb3\xfd#\xc5@\xf4\xbc\xed\xe46\x89\xea^\xca\xb5\xdc\xd2\xeb9\xab\x96\xc7bbE\x08\xe7\xb1\x1d\xce\x1d$\xb3n\x0d\x89(K\xe9F\xd6E\xbe\xb9\x0d\x96:\x13\xd0\x0f\xb6\xd0\xa70\xf3\xb87R\xa9Q~\xa2F \xaa\x19\xd3ZD5+;q\xe3\xc6y\\\xa2\x9aK\xb4\"Q\xcdD5\xff\xfa\xa9f=\x10\x9f\x19V\xf8Ye8L?\xddl\xbd\xe8\xf4\xae\x9dy\xdb\x8f\x10\xa7\xc1\x9c\xd5'\xa1\x1a\xec\x83k;g\xf6l\xd5\xba\xae?\xb1F\x1d\xdf\x12k\xf5\xc7\xa3\xf2\xfd\xc4z\xf9\xeb\x9fOHf_Q\xf4o\x1f,\xd2,Ww\x0f\x03&:\x8ah\x1e@Jy\xbe\xd1\xc6m\x97\xac\xe7f\x06\xd2}\xcf^\x16:B1+\xd3\xbf \x97\xe8\xe8\xc8\xe3\x1c\x91\xbd\x1cQy@*q\xc6Ri\xaa\xa03\xb7\xa4\x16\xd8\x95-MUA\x9c\xac\x82\x0c\xba*\\\x81\xd4\xec\xe4E(+\xc8$\xad\x82\x0e\x933\x92\x1fI\\A2u\x15t\x95\x9b\x85\xbc(}\x05\x89\x04\x16\xa4RX\xe1\x9e=\xbc\xa7\xb0$\x16\x94\xa6\xb1\x00GdAI*\x0b\x8e&\xb3 \x8f\xce\x82R\x84\x16dQZ\xe1\xe1\x80\xcf*~\x02Z\x0bNHl\xc1i\xa8-H$\xb7 \x8f\xde\x8aM\xc18\x82\x0b\xcaR\\\x90@rA:\xcd\x05\x19D\x17b\xca\xc4f\n?\x9a\xec\x82\x18\xdd\x05\xf8\xe5\x19\x82\xf2\x82\xc4U\\2\xed\x15\xf4\x96\x92\x0d\x1c[\xca\x82\xe4\x17$\xd1_P\x9a\x00\x83L\n,\xdc\xaf\x90\x99\xbd3i0\xaf?\x8e\xcc\xe8]\x86\n\x03<\xdc\x04\x18:\x0c\xd2\x081\x88A\x0b\x99\xa4\x18 \xfc\x06\x84\xd1B\xd4\x18d5.\x9e\x1e\x03D-3(2\xc8%\xc9 \x9a\xe47N\x94Aa\xaa\x0c\n\x91e\x10\xc9\x04Y\x8c0\x03\x86d\xd5\xc3\xdb\xf9\xfb]\xd7\xb6+\xaf<\x19\xad\xe3\xa5\xb8|ZC\x05 \xde\xd5;\xe5\xdb]\xd9\xd0\xd8\x084B!\xbdt\xb7\xbf\xf5\x077R\x86\xb8\x13 \xef\x06H\x85\x16\xf0\xdb\x80\x90\xb0{f\xac\xa8Z\x0b\x99\x8a-\xa4\xa8\xb6QO\xa3\xaa\x8bQn\xa1\xb4z\x0b9\n.\x94Tq!I\xc9\x8d\xba\xb2cj$\xaa\xb9PF\xd1\x85\xb2\xaa.\x1c\xa1\xecB\x86\xba\x1bu(^\xa9\xa9\n/\x14Uy![\xe9\x05\xac\xda\x1b\xf52U\x83\xb1\x8a/\x94V}\xa1\x88\xf2\x0b\xf9\xea/\x94T\x80!I\x05\x8e\xba\x9a\xc4\xf2\xc0)\xc1p:5\x18N\xac\x08\xc3\xe9Ta\xc8P\x86!E\x1d\x8ez\xb2c\x7f\x00^!\x86T\x958\xeaM\xce\x13)J1\xe4\xa9\xc5PZ1\x86d\xd5\x18J)\xc7\x80Q\x8f!m\xe9\x88T\x91!c\x95\x99\xa4&G\xbdq\x13[\x04\xa9(Cb\x89\x13\x95\xe5\xa0\xaf\xe9j\x16\xa9.C\xaa\xc2\x1c\xf4\x84P\x9f\xa1\xb4\x02\x0d\x89*4d*\xd11\x87X5\x1a\x8a*\xd2\x90&\x9c\x02V\x99\x86tu\x1a0\x82\xc5\x11*5 \xfdG6,\x0b*\xd6\x90\xdd\xf8i\xca5 k\x9e\xa9`\xc31*6\xc4\x056\xb4\x9a\x0d'P\xb4\xa1\xa0\xaa\x0d\xf1\xdeUV\xdd\x864\x85\x1b\x12TnHR\xba\x01\xdf\x03\xf3\x14oHV\xbd!\xaa|CI\xf5\x1br\x14p8B\x05\x87t%\x1c\x90O 1`q~\xd2\x94q(\xac\x8e\x03\xb6\x98\x911\x9b\xae\x94\x07\xdd\xdd\xde\xe3\xd4r\xc8T\xcc\x83\x0eu\x0c\x98\xa8j\x0e\x99\xcay\xd0!7;\x99A\xf5\x1c2\x14\xf4\xa0\xb31F\x0cb\x13 \xa7\xa4CTM\x87\xa8\xa2\x0eeUu\xc0(\xeb\x90\xa8\xaeG\xfa\x87\x15o&\xa8\xb0C\x86\xca\x1et\xf6\xe1\xea\xcd\x19Ri\x87L\xb5\x1d\xd2\x15w\xc8U\xdd!Ky\x87\xf8\xd4\x05\x08\x15\x13\x12\x94\xcc\x14\x15\x1er\x95x\xc8Q\xe3!\xde\x18EUy\xc0*\xf3PZ\x9d\x87\x04\x85\x1e\xb2T\xfa\xe8$\x1eU\xea!S\xad\x87#\x15{(\xdc\xdf\x13\x95{HV\xef!\xb2\xda\x8a+\xdc\xc2.\xf7\xb7\xff\x93\xdd\xcf\x13\x9e\xee\xf6\xb7\x9bz!cuX\x87\xc1\x8d\xf8\x1e\xeb_\x12\x0d\x10\xcfL\xf5\x1b\x1eY\x00\x8b5\x91Z!\x0c\xfa\xba\xf7\xf7}\xbdn*\xbe\xef\x10\x07NH\xe0\x0e\x18 \xdc$pO\x8c\x04\xee\xa8C\x12\xb8\x81\x04\xee\x89\x91\xc0M\x02\xb7\xd3H\xe0VF\x027 \xdc$p\x93\xc0\x1dqH\x027Ro \x81\x9b\x04n\xbf\x91\xc0=3\x12\xb8\xfdF\x02\xf7\x81a\x9e\x12b\xc0\xe2\xfc\x90\xc0\xed0\x12\xb8I\xe06F\x027 \xdc\xd3\x0bI\xe0V\x17\x92\xc0\x1drH\x02\xb7\xdfJ\xf6\xf7\x7f\x11\x81\xfb\xbdQ\x8c\xe7\x1a\xf7\x1d\xfb\xf2\x8c5\x8bVt\xf7AV\x8eml\x89\x0b/7U\xdd\\\xb3/\\\xbd~\xbc\xbf\xdf\x89\xdf\xddp\xf6\x85\xc7\xc5\xea\xe8\xd6\x1f\xae\xb2c\xd1\x02\x95U/MQe\xb9\xab\x1ft(\x83\xe4\xcb-%\xadgD\x15\xaf\xa1\xbd\x9d\xbfR\xc9{\x16m\xb3\xaa\xd7\xf9G\xf3e\x1a\x9fW\xd2\xc9\xf4\xe5\xa8\x1c\xeb.9?\x9e\xefu\x17:\xb6\x8f` 0\x1c\x81L\x7fp\\/\xc0\xee\x8dz\x1b\xc7\x8e\xcf\xa0\xc22\xc8\xc5\x89\x9c\xfb\xbc\xde\xe4\xba\xb4n>\x8a\x97\xc0\xb6Zzvo\x17\x1d\x93M~\xc3k\x7f=\x11u4\x9b\xdb\xcb\x8a\xb3g\xc2W~\x17\xd1%\xba\xae\xb7\x07#_8\x16\xd3\xba\xc6SL\x0d\xef\x02\xd1\x9bo\x19kT-\x9do\x9fpy\xe4\x13y#nq\xf8<\x86\xa2\x89w\x16\xab\xa5\xe0Q5P7\x9cu\xcf\xc0\x13P{\xd1\xb5}\xffL\xf7[\xe7/\x9cQ\xfbC\xa5|S\xf7R\x12?\xc8\x06\xf1Te{i\x1b\xab\x19\xd5\xe7\x9d{\xc5m\xf1B\xde\xf29J7f\x06\xf1%[\xf0\x8c\xc1\xf0\xe83\xe9\x9b\xdc}2\xda#\xa3bK(\xc5\xd4hC\x12)\x9d\xc9g\xc8'\x05\xbb\xaa\xef\x95\xc0\xab\xb2N\xfd\xbcg=?S\x7f\xf78\x93\xd9G\xa4\x9bP\xc2\xa9\x0bn\xad\x9adn\x1f\xdf\x8bMt9&\xe5\xe6\xa6\x85m\xdb\x99\xc47N]K\xe6\x9e9\xb21g\xc9}l\x8b\x8d\xeb!\xf5\x8d/\x17\x92%\x97\xfa\xeak7\xb4\x9dE\xc8\xf3\xf3\xcf\x95L9\xf3\x14j\xde\x1b\xc1\xbf\x87}\xa3Rh,\x95F\xf9\xb9\xee\x0f\xfbG|\xc2\xb63\x8d\xa9ZMR\x13\xd6\x0d\xac\xaf._\x0d\xe9M\xcc\x12\xb1\x87\xcf\xe2\x99\xb9\x1e\x8f\xfb\xed\xbch;\xe5C\xae\x8c;U\xf9a\x8d/\x16\xf3R\xee\xb4[\xc6\xd9\x1c\xe6\x8a\xf7\xedv,wpM\xd9\xb1\x9d\x9c3\xe1\x8fU7<\xa4\xd8W\xdf\xa4Yd\xff\xf6}\xefM\x97\x87\xba\xf7\x1c\x0cC\x99a\xc7\x97\x80f\xd2\xfe*\xeb\x93\xfa\xff\xf2\xd3\xe70\xa5\x81t\xf6\xdc\x9bYG\x05\xb9\x18\xb5\x87\xa4\xf50\x94\x1e\x8e\xce\x8b\xb4~:\x8d\x87\xa7\xf0\xfc\xf4]\x11\xea.\x89\xb6\xcb\xa1\xec\x12\xe8\xba f\x16(V\xf0:<=W\x8a\x9a\x8bT\xc3\xf9\xb7t:\xce\x97(%J\xc5\xe5\xd0p\x86xs:\x0cQp9\xf4\x9b\xf7Fa\xea-\x95v\xb3\x886\xa7?\xff\x87z\x9cn\xf3\xc3,~\x9a-\x9db\x0b\x93j)\x84\xda\x94Bs\xba\xf3\x91i\xa9D\x1ax\x13\x9b\xc4I\xb4T\x02-\x81\xb2{_\x91g\xba\xa9\xe6\x15*\xfdz\xea\x18\xdfw\x8a\x18\x9b\x08\xb4g\x03\xdc \xf7 \xd7\xb3\xcd:Y\x031\xa5\xc6\x80\x85wb-\xd16r\x93\xa2]\xadz\xc6\xc5\x07\xd2\xb4\xb8v\x94\x8b\x9e\xf1\xc2\xad\xe5\xd9\x91r4\xa2*\x9f\xaf\x1dg\xbbA\xba2\xb2)\x9b\xfd\x96u\xf5\xc2\xfc\x9b\x9c\xc9\x16U#\xea\xa3\xb6\xe3\xeeXc\x1a~\xdf\x0c;\xa0\xb3o\x85\x0b\xe9m#\xfa\xcc\xd0\x84j\xcfp\xdf\x8b\xa6\xfe\xc8\x12\xdbs\xea\xfe\xc4\x8d;\xc3?\x1c\xcd\xbb\xa9\xb75\xb6u\xe5o\x8dv\xef\xa3B\xd4\xee\xb8\xdd\x83\xb5\xd2\xbf\xdf\xccTs\xb5\x17f\xff\xd3\xc5\n6l\xc5\x0dE\xa3\xb1\x1a3v\xe5\xc6\xbe\x1a \xea&\xa2\x9do\xef\x153U\xedv\xdf\xb0\x15m\xb6e\xbc>\xd4\x96\xd6\x15\xa2Ee\x0fm\x81w{&34\xd5\xcd\xb2^T\x9c\x0d\x12\x9fnA\xf9C\xdd\x91lwu\xb3\xd8\xec\x97\xb3\xd5v\xa5\xee2h\xac\xb3'&\x15{k\xeb_\xcc\xf3c\x9d\xe6J\xc0\x87\x8b~\xf6\xb4fU\x90\x1f(\x1d\xeb5[!\x87\xd78\x1e\xc5\x90;\xd3\xa3\xa9^7m7\x13N\xcch\x9c\xdeB\xb5\xcc\xb1\x0f\xf6\xb6m7\xcc\n\xf7\xe2x\x80\x1d\xfb\xc4\xba\xde\xfb\x86\x99=<\xfd\xeb\xf9\x83\xab-6\xaac\xee\x910\xf1#\xee\xc1\x14($\xe1\xdf\xf9\xc7\xd0\xfb\xbaY\x887`\xdbo\xdb\xfeY\xbf\xfc\x08?\x9c\xfd\xfe\xc7\xa2\xad\xc1\xab\xf5d\x81\xf0W\xed\xed\xf9R&\xfdz\xae\x97\xc6\xfd\xf3O?>_\xf2j\xfd\x8cwU\xd3\xafX\xf7L\xa3M\xfa\xea5\x1b\xa0\x9b~\xbf\xddV\xdd\xfd\xa4\xd5.\x9aE\xbb\xad\x9b\xf5\xeb\xebj}\xad=h\xfc\xa9\x975\xa8Y\xaf\x84\xed;\x06\xe2G`\xee\xd3\x1b\x86j\xdc\xe5\x16cbl(\xa9\x03Jft[-E\xab\x7f\xae:\xbd\x90\xdc\xf7\xac\x1b\xd3\x98\xad\xebOl\x9e\x1e\xad\xdd1\xb5\xfa\xbaX\xbe\x08\x16R\xff\xde\xb0BV\x9b}\xff\xbb\x1f~\xf8\xde\x0f\x1cA\xbf_,X\xdf\xaf\xf6\x9bS\x92F\xd3\xa7a\x1b\xff\x06\xd0\x8e\xe8)7\xbc\xbd\xe1]\xe5\xc2\x99\x94!d\xab\x18\xa3\x08\xb2\xaf\\\xb7\xd7\xe2>\xd3/e\xf5\xa2\xd0S\x9f\xeaQb*u\xcc\x9d\xb6\xdd\xb2\xa1\xe3ul \xab\xae\x0dP!jZ^\xb0\xfa\xd3\xa8u\x19\xe0O\xa3\x1c=k\x96\x1e\x99I\xfd\xe9\xa4\x8d\xf3^\xdeb\x8ed\x9b5\xb0Q\xe7\x16\xea-\xa1\x9a\x875~\xb2\xc8\xaa\x9f\xf37\xa6-NZ\xa7+\xd3\xe0\xb3Zy\x1f\xc4]\xc5\x9f\xfa U\x18\x08\x9e\xa7\xea\xc8\xac\xf7wb\xfa\x98>V\xf1\x9fu';\x97k\x08\x05\xab\xe2\x98c\xc6\x1aA5\x9d\x03\x83\xad~\xcb\xf8g1\xfb\xf1\xcf\x12\xf0\xe9\x0e\xd5\xc0PI\x86Ix\xbc9\x97\x90\xbeB\xd4\x9dS\xf2\xe1\x8c<\x9a=\x07\xbb\xda\xd2L\xcb\xb3?\x11\x92NHzl\xc8\x10\x92NH\xfa\xd4\x0e\xa5(\xdd\x83.\xc7\xcf\x18\xf5\xa0t\xa8\xdd\xf1\x9fM\xa3N<\x84\x1f\x99\\\x1a\x87\xd6\x88\xa9x\xbb\xe3q)\xe2=\xb8Z\x1e\xa9\xf7q\x84\x12\xf6>\xfb+a\xef\xb1\xde<\x1aa\xef\x84\xbd\xbb\x8d\xb0wi\x84\xbd\x1f\x1aa\xef\x84\xbd\xfb\x8c\xb0w\xc2\xde\xa5\x11\xf6N\xd8;a\xef\x84\xbd+#\xec=\x87\x1c'\xec\x9d\xb0w\xcb\x08{w\x18a\xef\x84\xbd\x13\xf6N\xd8\xbbw\xf4\x10\xf6N\xd8;a\xef\xbfu\xec\xdd \"\x96\x93\xd07\xf6\xe3v\xc0\xca}\xd0\xc9\x0c\xa5\x91\xbc\x19o\x1da\x1e\x07\xd5~\xda\xb4\xb5\x16\xfa\x06\xa2\x82\xc0t4H}jv\x9a\xc0\xf4\x136n\x1c\xa9&0\xbdD+\x12\x98N`\xfa\xaf\x1fL\x97/\xfd\x00\x88~)\xff>p\xe6\x12\x05\xd2\x97\xc3\xb6]\xee7L\xad\x1b\x9cT\xf8\xa5\xfe\xe5\xa5\xfd\x8b\x07\xcb\x81\xdbMa\x9b\xd7\x15Da\x94\xa6^|l\xbc1\xb5\x83\x8e!\xea\x1c\xa4\x90\xd4\xdclX\xb3\xe6w\xfe\x9d/\x84\xd8\x83\x92{\xb6\xd5\x97\xaft\xaf\x18\xcc\xf8V7\xab\xee\x9cSN\xcd,b\xa1c\x1b)D\x04\x938\x0f\x9d\xd9<*\x974\xb2\xe4\x95'\x0c|\x81G\xd8\xb1\xf5\x0d\xfbrT\x93\xfe\xaa{\xc1\xeb\xebj\x8d~\xd0\xfaq\xca\x8b\\O\xf2\xb6nO\xf6 \xbfz\xcbx\xc7\xc7\x1f\xeb6\xb5\xc5<\x9en\xebv\xddU\xbb;\xd7\xbeg\xdbU\x8b\xcd\xe9\xa66\xf5\x06\xb8\xa9\x97\x85Z3\x00O\x03\xa2MAr\x00\xa2H\x17\xaf\xe7\xdf\xb2\x17\xaf\xcdzL\xb5\x89.\xbbZ-\x04\xfc-\xaa\xcdF=\x85O\xac\xabW\x8e\xaf\xdc\xa9-+\xee\xe3y\xaa\xfe\xe3\x8d\\\xbc=\x9c\xd6z\xd9\x7f|%\xd7\xaa\xb3\xd6\x1aW\xab\xaa\xb5\xfa\xe1\xbb_\xd4\"\xe0p\xd2N\xa1\xc6\xd8\xca\xe4\x1d\x0f\xaa1\xfeR7\xce\xc6\xd8\xd6M\xbd\xddo\xc7U\xfd\xd0&w\x01bs\xf8\x90_\xb4\xdb\xdd\x86\xf1h\xc2\x13\xd9n\x9a\xb9\xb2\x96S^xn\xd7\xb1]\xd5\xb1\x9bu\x15\xc8\x16\xf2\xb5\xdb\xf0R\x15\xeaOU\x7f\xb0\x99\xb45\xcd\xb7\xae\xcc\xe7\xea>\xc4\x8c\x01,\xf7\x9d\xd9VQ\x95\x95m\x13j\xc3\x9eWk\xe6\x1c\xe8\x9e\x8b\xd8\x17\xb6\xd8\xf3\x07\xd6\x88\xe7\xaaP\xc5\x1bQUV\xa9\x1e\xa1V\xc46\xde\x8a\xb1\x1bU\xa2X\xdb\xb9\xe9rc^\xca\xdcX\xf4U\xa5,\xfe\xc2R\xb6dM\xbb\x0d\xff\x04\xf9\xd0\x85\xc5Z@\x19\xd2\x1d\x86\x8a2\xf6\xaa\xad\xc7\x03 \x15\xf0\xf6#\xd3\x89x*UE\xb3\xa5P5K\xa8\xc2\xd9\x99T%b\xc9\x18\xdf\xbe\xbb>\x7f!\x159\xdd\x11\x95\xb4UK4\xeb\xa2\xe1\xfa\x151\xe0p\xe1t\xdd\x96*\xa0\xf3\x1c\x04\x7f>d\xd6\xea\x87om\xb8\xbd\x87u\xbbn\xe5\xb6\xbb_]\xc6\x8c\xb9\x9f\x18{\xb9u\xcd\xfe\xe3\x90[16p\xa2\xd5},\xe3\xd5\x90\xefJO1\xb1\xe9?>\xe0|I)\x8c\xbd\x93\x1e\xd0\xab\xcaq\x94{\xfc\xc9=0\xa3\x0b\xed\xfb\xf9*H\xc5\xd9\xe9\xef\xea\x9d\xd4ba\xc1\x1a\xde\x05\xd3\xd3W#T<\x9c\xcb\xbd\xbd\x87\n^\xcbM\x8f\xc0:\xb7\xda\xedn6u\xf31p\x9c\xe4\xc8\xa5\xac\xc4\x1ek~\x7f\xb3\xd4\xcaMlJ\x8b\x0ceL\x9f\xd3\xf0\xd0po0\xf7\x86[ ,K\xe0\xd1j3g*\xa6\xd1\xd8\x97]\xddy\xb8\xc1Xq^\xeevoD\xfbNzO\xa4\xf3T\xbb\x9d\xc7\x9b|T\x07\x7f\x1bN\xaf\xc9[L\x14p\xeb&+M\xe9\xce\xb6\xb0&\xde\x10'\xd9\xd4]\xa2g\xd6\xe4\xbf\xaaci\xba\\W\x97\xaff\xfe\xe88\x1a\x1dG\x8b\x8ex\xec\x8b\x9b\x8e\xa3\xd1q4\xb7\xd1q4it\x1c\xed\xd0\xe88\x1a\x1dG\xf3\x19\x1dG\xa3\xe3h\xd2\xe88\x1a\x1dG\xa3\xe3ht\x1cM\x19\x1dG\xcb9\xd1E\xc7\xd1\xe88\x9aet\x1c\xcdat\x1c\x8d\x8e\xa3\xd1q4:\x8e\xe6\x1d=t\x1c\x8d\x8e\xa3\xd1q\xb4\xdf\xc2q\xb4$\x8a\xdd\xfc\xf7/\xfb\x9eu\xffT\x97E\xe2\xaak8\xdd\x85\xb6+\xcdy\xd8\xda\x90g\xd3T\x08\xf41l1X\xdb\xcc\xfa,\x9b\xb5J\xd3\x1d^\xf9^*\x0f\xcb\x96\xa9\x1d$\xb9\xf1W\x99\x9b=\xd5\xf3\xb8>R0\xa8\x88\xd3\x90\xca\x83n\x02\xcd~\xb31\xd7\x9aY\xd4E\xdd\xeb?=\\\xdc^\x15\xd3'\xd2e\xf1\xf6a\xad-\xba\xcd\x84\xd9\xa7)\xae\xb2\xe14\xb6\x1c\x85-\xac\xa4e\xe9h\xf2\x16\x1e\x87Q\x15\xad\x80\x86\x96\xa9\xa0yu\x07\x9c~v\x94z\x96\xa5\x9dA\xb5\xd9\xf8Z\x11\xa7\x9c\xe5\xe8f\xa1\xddl\x94jVX3C)f\x05\xf5\xb2\xa8ZVH+;F)K\xd6\xc9\n\xa8d\x855\xb2\x88BV\\\x1f;\x8d:V\\\x1b\xc3+cy\xbaX\xa0\xd1c\xaaX1M\x0c\xa7\x88%\xe9a\x85\xd5\xb0\x98\x16v\xa4\x12\x16\xd0\xc1\xa2\xcb\x93\xa8\x06\x86[\xbf\x94\xd5\xbfb\xeaW\xbcLy\xca\x97\x99\xd9\x1d\x0ec\xbaWA\xd5\xeb\x08\xcd\xcb\xadT\x87\x14\xaf\xb2zWX\xed*\xa1u\xa1\xc4\x9a\x88\xce\x85V\xb9\xfc[\xae\xe9\n\x97\xdf\x97s\x7f\xa3\x88\xb6\x95\xd2XX]+\xde&hM+C\xd1\xf2\xed\xb3\xc7\xd4\xacrZ\xd6\xf1J\x96{?\xab\x90\x8a\x85\xd2\xb0\xe2\n\x16F\xbf\n\xb6v\xaav\x85U\xae|\xbaU\x01\xd5*A\xb3JW\xac\xd0zU@\xe6\xf1\x16'p\x0dV\xa7*\xa3R\x05\x0b\xef\xf8K\x96>e\xb4(\x87?\x8f:UX\x9b\xf2+S\xb9\xba\x94\xdc!q\x15\xdc\xadJ\x95\xd5\xa4|\x1f\xc21=\xca\xb7a\xee\xd3\xa2\xca*Q\xf9:\x94Gs\xcaR\x9c\xa2\xeaR\x9a\xb6\x84V\x96\x12u\xa5\x14U\xc9\xab)\xf9K\x83\xdd\xdb\xc7\xe9I\x89jR\x82\x96\xe4\xacZY\x1d\xc97(\x8e\xd0\x90\x9c\xdb6^\x05)O?\niE\xe5\x95\xa2\xe3{\x12Z%\xc2jD\xd3\x17#\xe6\xbc\x96\xea\xceI\x07\xb6\x9c\xc7\x05)\x81\x986:\xb1E'\xb6F\xa3\x13[tbk\xb4\x1c\xe5\xc9\xeb\x8cNl\x1dZ!\x15\xea8\x1d*C\x89*\xa2E\x15W\xa3\xa2z\xd4 \x14\xa9SiR'P\xa5Rt\xa9\\e*8\x87\xc7\xb4\xa9\x82\xea\x14V\x9fJT\xa8\x8akTq\x95\xeah\x9d\x8aNlEK\x96\xa7[9]\xd1\x89\xad\x1c\x05+\xa6a\x95Q\xb1\x90\xd2LT\xc9J\xd0\xb2\xa2\xa7M\x12\xf5,:\xb1E'\xb6\xe8\xc4\x96m\x19\xaa\x17^\xf7\xa2\x13[\xc6\xe8\xc4\x16\x9d\xd8\xa2\x13[h\x9d\xec\x18\xa5\xcc\xe9\x8eNl9/@iktb\xab\x9c\xd2F'\xb6\x8e\xd6\xe1\xca\xf49\xb4\x16\x87W\xe3p \xc4\xf6\xbd?y\xd8K\x93\n\xcc\x9c\xac\x9a\xa6\x04\x1b\x12\x80\x0d\xc7\xb3\xa6\x1b\xc6u\xf3b\xae\x18\x8c\xf9Rx\xb7\xb7\x1f\x9fc\xdf\"v\xceL\x06\xa6\x14\x1f\xaaw\xf5\xae\x7f\xfe\xe9\xdf\x9e\xdfn\xda\xc5\xc7@\xca\x14+\x86\xea\x1f\xe5O'G\xcc\xd4\xd5\x83\xda\xa8\x8e\x95\x89\xaa>\x15k\x19\xb3\x82\x18'\xdbw\xfc\x8eu\x9f\xeb\x9e=\x85\x9a\x0f\x9e\xe4\x86\xbc\xf8\xd6\xe7\xad\x0cU+\x9d:O\x83\xa9\"\xe8\xbf<\xd8\xc3`v\x9b\xda\xc6\xbf\x81\xfc'\xcb\xc2\x1c\x1a\xaa2\xc4\xd6W, \xaa\xee\x18\xb8\xa4x\xb28\xa1h\xb0U\xa3\xb6\x15\xdb\xc6=Q\xa9\xfax\xd3(\xe0\xeb\xa3\n\xbd\x8c\x14Z\xdfn>\xe2G\xebX\xd5\xfbC\xe0\"\x8a\x83\xd9\x9c\x13v%o4/\xae\xd1}t9\xc6\x86\x16\xef\xb0[\xc6\xfc\xbb\xd1\xa6f+\x9f:\xd1\xefo\xfb]\xb5`\x81\xa4\x15\x88\xea\xa1\x82\xbd\xc7\xbb\xd8{]\x98P\xba\nS`\xa8\x9b\xbe^\xfa7L\xd5\xebrh)W\xd6;\xdbn\x87^\xe0\xf8 \xe6\xe9}\xe8Y'{\xdb\xbc\xe8\xabj\xc1\xc7\xfcif\x14\xc9'\xe7\xbd!X\x13\xad\xee\xc2\xee\xa2\x8b\xba\xcd\x1f\xec\x98O\xac\xe8AU\x93\xf4\xf1\xab\x9c\x04\xf1\x06\xf5\x1eROj f\xc8B \xbb\xaa\xd71\xb9U\xaeJ\x99b\xf3L\xfd\xdd\xe3l|M\x87\xd2T^pk1'3\x02\x06\xce\xc5vL\xaa{M\x0b\xdb\xb63\xe9\xf2\x9cr\x85\xccXwdc\x06\xc6[l\xb4\x0d \xf3|\x19\x14-\xb5\xcbW_\xbb\xa1\xed\xdc\x83\x9e\x9f\x7f\xaed\xa2:\xb1*\xe8\x8d\xae\xda\xc3\xbeQ\xd1\xb5\x97Jj\x12\xeb\x86\x83\xeb\xe3\x03\xd0\xceO\xaaj5Y|\xd7\x0d\xac\xaf._\x8d\xfc\x94^\xd9\xf6\xf0Y<3\xd7\xe3q\xcb\xf6\x8b\xb6S>\x96V\"\xd7a\x9d,F\xb5T\xb1\xec\x96q6\x87\xb9\xe2}\xbb\x1d\xcb\x1d\xdc\xee\xe9\xd8\x8eI\x91\xe1\x8fU7<\xa4\xc8\xc7\xe3\xb4Yd\xff\xf6}>\x06\x08\xb5\x83\xc1(\xd7\x9bj\x95\x96\x02\xa8\xe9\xa5%E\x14'>\xcd\xf5\xf7\xe0\x8cw\x02i7\xf4\xedg-\x8b|\x9dpX\x88L\xbe\xf7\xc6o%\xbb#\xe6$\xc8<\xa8N$\x0f\xac\xfe\x06\xf0\x15wXC:\xd7\xbe\xddW\xaa\xc5\xb4\xb0\xde\xb6\x9dM\xf1\xe1\xb2/\x1d\x9f\xdd\xf2/r\xfay|\x90\x0fH\xee\x11\xd7\xb3\x8c?vSXt\xd2\x93\x13\xd5\x9f\xd2scZ\xcb\xb3j\xa4\xf4\xdce\x1b7\x9eX\x9a\xd2s\x97hEJ\xcfM\xe9\xb9\x7f\x9d\xe9\xb9\x0f6\x9c'\xff\xe0\xdfw\xb6Z\xec\xca\xbeb\xb2i<\xf1\x05zoEo\xffX1\xcf\x06Ofa\xa6\xffa\xb2\xb5<\xb9\x8b\xfe\xc1\x83\xddav4\xa2m\xdfb\x1d\xbf\xe8X\xc5]\x1fC\xca\x10\x0bq\xbd/\xf1J9\x9ao\x96i\xfff2\xb2[\xc0]\x1e1\xbb\xb0nWu\xdc\xb31\x95R\xa8\xc0\xd6\xe4+\xebF\x07\xdb\xb3r/[.B\xeb\xe6S\xbb\xf9\xe4\x1e\xc7\xb6E+\xf6/\xb2/[/\x0f\xf6e\xc5\x0bBn\xbez\xdd\xcd\x9f,\xd4\xbd\x7fcV\xe2\xb3\x8e\xbf\xc6\xb7\x84\xa6s\x8aY\x91\xf4\xbc\xdb/\xe4\xdb\xae\x9a\x14\xc2C?]X\xc2\xae\xea\xa1m\xb3`;\xe9\xe0;u\xf0\xe1;\xd9\x04]5\xf0 }+\xe1o\x97\xbb\x86\xf1\xcfm\xf7\xf1`C\x90\xf6li\xcf6>\x12i\xcf\x96\xf6lmK\xde\xb3\x9d,\x7fP[\xb7./\xcf\xa7k5:a\xac\x8dvp\x7f\x0d;\xb8\xd3\xcf\x8d\xf2[\xa0\xd1\x1d\x83\x10w\xe4\xdb \x95\x8b\xcfa\xe5\x15\xa8P\xe1\xca\x982\xdb\xebp_\xd9\x91\x9b\xba\xb6+\xd7w@\xaf\xb6t\xe5N\xc2\xc4a\xbd:|\x01\xa8E9\xed\xe7\xd2~.\xed\xe7\xd2~n\xe1V\xa4\xfd\\\xda\xcf\xfdu\xee\xe7\x9a\x95\x91\xccT1\xfc\x1f\xff>\xae\xd9 \xea\x0fi\xdf\xe1/z\xc3\xf6\xb5\xbc\x83v0\xd9\x9b\x1d\x9c<2Uz\xa0\xfb\xb2\xb3\x06\xb1\xed[\xac\xcc\xbf\xda\x0e\xe1\x07\x19\xe0\x07\xea\xa5\x9a\x9ffa~f\xdb\xeeS\x93C/\xbf\x94\xba\x00\x7f\xdeo\xab\xe6Y\xc7\xaa\xa5\x9c\xba\xec\xd08\xc1\xbb\xdb\xbd\xe4\xe8B\xbc3\xebV\xcb\xab*\x85\x98\x18B\xc5\xe0\x1d\xab\xfa}w\xda\x8d\xea\xab\xe9\x06\xad\xb9'T\x0b\xf5ZP\x8fN\x86Zi\x17\xb5\xdc\x9c\xf0\x9e\xc5\x02\x80x\xe3\xb6\x9f\x9b\x12\xe4\xf9K\xc7\x07\x8d,k\xfb\xb9At\xb0b\xc2\xc4\xac\x1c\xc37\xa2\xbe\x81\xff\xe6u\xdb\xdc\xf0\xfa\xa8nn\x06\xe3\xb2\xe2\xec\x99\xf0\x15.\xea \x98\xc8c?5r0\x8c\x07\xe9nV\x8c\xdd\xf0\xf6#k<3Kx>S\xe6\x9d\xd5\x94E\xe66e\xb1\x19N\xd9\x925\xed6\xf4\x03T\x1b\x0b\xab\xb6b(\x14p\x15\xdf\xe34\xf6\xaa\xad\x1b\x15OI\xbc\x1cA\xb6\xba\x8e\x9a\xa1*f\x16`U\xb3\x84\xca\x0f\xf4\x9b\xc2\x87B\xb7\x00\xbc}w}\xfeB\x9e\xf4T\xbf\xd6G&k\x19\xf2\xe3\xa2\xe1z\x9b`\x08\xb3\xd2;\xb6\xfal\xd3g\xcd\xd4._\xe8\xc6}\xbdn*\xbe\xefX?\xacH\xc4b}\xdd\xae[y\x94\xcbwb9>\xaf\xbd\xa9{\xb9\xa6]1\xa6[O6[\xaf\x1a\xd1|-l\xeb\xa6\xde\xee\xb7\xb0\xae\xc47\x7f\xbd\xf0D\xfd\x00\x15 L\x06`\xd2\xeb\x92p\x98.\xff\x80\xd2%\x7f?\xcc\x13Cp\x15\xbd\x02ZV\xbcRr\x93Z\xfa\xf8\x9c\x91\x04D\x12P| \x90\x04D\x12\x90mS \xc8\xd7{\xe4\xf7\xdd\xf0}\x95/\xfc\x8c\xdfyW\x97\xaf\xe6\x0d\xa4\xdf\x0e\xe6\xff\x92\x04t\xd0>\xbfu \x083#(\xa3 \xb3\x14d\xd6m\x14dV\x1a\x05\x99=4\n2KAf}FAf)\xc8\xac4\n2\xeb\xef\xd3\x14dV\x19\x05\x99\xa5 \xb3\x14dV\x1a\x05\x99\xf5\x0c8\x8d\x18J\xea\xc4p\xb4V\x0cyz1\x94\xd2\x8c!K7\x0e\x0f\x87Je\xc2\x89\x8e\x9b\x93\xe8\xc7pB\x0d\x19N\xa3#C\xa2\x96\x0cyzrl\n\xc6i\xcaPVW\x86\x04m\x19\xd2\xf5e\xc8\xd0\x98\x11S\xe6\x13\x84\xce\x0c%\xb4f\x88\xe9\xcd\x80_\x9e!tgH\\\xc5%\xeb\xcfAoR\x9bFh\xd0\x90P\xca\x82Z4$\xe9\xd1PZ\x93\x86L]:\xdc\xaf\xfa\xb86\x0d\xf9\xfa\xb4\xd7\x9f\xb8cL\xa3\x86b:5\xe0\xe5V\xc0\xe8\xd5\x90\xa6YCLF\xc9\xd4\xae\x01\xe17\xb0U[H\xc7\x86\xac\xc6\xc5\xeb\xd9\x80\xa8e\x86\xae\x0d\xb9\xda6\x84\xe5;\x94\xc6\x0d\x85un(\xa4uC\xb8\xc7\x94\xd3\xbc\x01\xaf{\x03R\xfb\x06\xb4\xfe\x0d\xb8\x1e\x95\xae\x83C\x92\x16\x0eA=\x1cJi\xe2\x90\xaa\x8bC\xa66\x0ei\xfa8 \x9eBd\xa0\xc5\xaf\xc7\xeb\xe5PP3\x07L\xd1\x02\xe3\xac\x9c~\x0e\x18\x0d\x1d\x8e\xd0\xd1\xbd\x0e\xe5\xaeg@K\x87\xd2z:D5u\xc8\xd5\xd5\xbd\xde\xd4\xd7}x\xa3#\xae\xafCP\x06\x84\xa0\xce\x0eYZ\xbb\xd7UP\x83\x87\\\x1d\xde\xebM-\xa0\x03\xdb\x8d\xe5\xf4x@i\xf2\x90\xa1\xcbC\x9a6\x0f9\xfa<$k\xf4\x10y\x95GtSH\xd0N\xb1z=\xe4h\xf6\x90\xaa\xdbC\xb8\xe29\xfa\xbd\xd7\x99\xa5\x8ec\x87\x0cN\xc7\x0f\x0e\x88f\x1d\xd6\xf2\xa1\xac\x9e\x0f1M\x1f\xc2\xba\xbe\xf7\x9a\\\xbd\x1f\n\xf6\xdd\x04\xdd\x1f\x92\xb4\x7f\x08\xac^\xb4Fx]uk\x15ze\xd42\x07IP\xf6\xbc[\xc6\x1a\xa3\x18:}\x0d?'\x950\xba\xbdD*!\xa9\x84\xa4\x12\x92JH*!\xa9\x84@*!\xa9\x84\x13#\x95P\x19\xa9\x84\xa4\x12\xdaF*\xa1\xc7H%$\x950\xb6\xfd\x16\xfa+\xa9\x84\xa4\x12\xa2\nA*a\\J\x0b\xfe9z=\xa9\x84\xa4\x12N\x8cTBR I%T\x16+%Vi!\x95\x90TBR \x1d\x16Q CAR\x07\xb1P'\x85\x11+\xe0QAT\x9d\xd5l)\xe9\xa4:^g?16\xf8\xbb\x08\xbd\x1a9\xebV\x9e@\xf1\xaa\xc4\x7f\xea\xaa\xc6\xea\xbb=TJ\xc3\x94\x9b\xb3\xea(d\xdb\xc9\x7fl\xf7\xbb\x99\x9b1\x9f\x85\xef0lV^\x01\x93t\xc8\x1f\xd7\x16\x15\xfa\xdc\xbb)\x16J\x8c4\xda\x90\xfaH\xc7X\x1e\xb2 \xc1\xae\xea{\xb5\x91\xaer%\xfd\xbcg=?S\x7f\xf78\x93\xe7\xbf\xa5\x9bP\x9a\xa4\x0bn\xcd\x1a2#\x8do\xbb\x85\xdf\xb1\x8e\xc9m\xfd\xa6\x85m\xdb\x99t-\xce=G\x991\xe5\xc8\xc6\x8c\xa7j\xf0v\xfd!a\x8b/\x83\x8f\x15D\xd1W_\xbb\xa1\xed\xdc7\x9e\x9f\x7f\xaed\xa2\x94\xa7P\xf3\xde\x88*=\xec\x1b\x15M}\xa9\xf6\x8d?\xd7\xfda\xff\x88oB\xda\xf9\xb1T\xad&1\x1d\xea\x06\xd6W\x97\xaf\xc6\x90\xdcz\xca\xec\xe1\xb3xf\xae\xc7\xe3\xd6\xf4\x16m\xa7|\xc8\xb7C\xa7*?\xbc\xdb\xc4KLnE\xdb-\xe3l\x0es\xc5\xfbv;\x96;8\xd7vl\xc7\xe4\xae\xdf\x1f\xabnxH\xb1\xd5\xcc\xa4Yd\xff\xf6\xade\x0e\xa7P\xdd\x83\xac\\@C\xd8\xfb\xc6\xfeW\x13\xd8\xdc\xb4\xed#\x87\x93\x83\xf1,C \xcc\"\x0c\xa0\xe2\xa7\xbb\xfc<\x9f\x07<\x10\x8f\x9aB\xa9S(\xf5\x98Z\x13\x9fW\x94\xa5B4Fy\xf0:\xc4\x024E\xe1\x19\n\xa5N\xa1\xd4G+\n\xc5\xa4\x001I0\x0c\x85R?\x16|\xc9\x80^\x8a\x00/\xe9\xb0\x0b\x85R?\x06nI\x01[2\xa0\x16\n\xa5N\xa1\xd4)\x94:\x16J)\n\xa4\xe4\xc0(\x14J\xdd\xf7\xb3(t\x92\x00\x9c`\x82p\xa7\x80&\x14J='\x1ay\x0c$\xa1P\xea \xc0\x08\x12\x16\xc1\x80\"8H\x84B\xa9K\xcb\x01A\x12 \x10\n\xa5^\x00\xf2\x88\x02\x1e\xb9p\x87\xf7\xcdI\xa1\xd4\x0f\x8cB\xa9g@\x19q #\x15\xc6H\x001\x92!\x8c4\x00\x83B\xa9\xa7A\x16\x14J}0\n\xa5\xae\xed\xb8P\xea\xa2\xd9\xf4\xf9\xeb\x16\xe4yl\x13d\xfcqo/_N\x15_},\xbf\xe4!\x02\x85\x9f\xed\x11<6\xbb\xcbO\x9c\xd1\xa6\xa57\xd5\xd3C\xb1\xb1\x07\\\xe4q\xff\xe4lV\xddy\x88\xf9\xb1\xbe\xabj\xd3\x1fV\xf8P\xc9\xb34\xda\xd5\xaag\\|uM\x8b\x0b\x960\xd33~l3z\xfb\xcdd\x9b\xcb\xd1\x88\xaa|\xc8\xee\xa3+#\x9b\xb2\xd9oYW/\xcc\xbf\xc9N\xa3\x91\"\xb5\xc7w\xc7\x1a\xd3\xf0\xfbf\xd8V\x9d}\x80\\Ho\x1b\xd1\x11\x87&T\x1b\x91\xfb^4\xf5G\x96\xd8\x9eS\xf7'n\\\xcf\xa0\xb4\x9awSokl\xeb\xca\xdf\x1a\x16\xc0G\xa9\xa8-w\xbb\x07kr`\xbf\x99I\xf1j\x83\xcd\xfe\xa7\x8b\x15l\xd8\x8a\x1b\xaaGc>f\x91/\xd5\x025@\xd4MD;\xdf\xde\x03\xab\x16wP\xedv\xdf\xb0\x15m\xd6f\xbc>\xd4\x96\xd6\x15\xa2E{\x153CL\xb9 \xfe\xa3n\x96\xf5\xa2\xe2l\xd0\x0du\x0b\xca\x1f\xea\x8ed\xbb\xab\x9b\xc5f\xbf\x9c-\xe1+u\x97A\xb8\x9d=1\x89\x01Xz\x82xiX\x14\xc9lr\xf9p\xd1\xcf\x9e\xd6\xac\n\xf2\xab\xa7c\xbd\x066\xe4\xf0\x1a\xc7\xa3\x18rgz4\xd5\xeb\xa6\xedfj\x8c\x19\x8d\xd3[\xa8\x969\xf6\xc1\xde\xb6\xed\x86Y\xc7\xf8\x1d\x0f\xb0c\x9fX7\xb94\xf4\xf0\xf4\xaf\xe7\x0f\xae\xb6X\xad\x8e\xb9G\xc2\xc4\x8f\xb8\x07S\xe0R\xdb-Y7\xff\xc2z_7\x0b\xf6\x02\x16m\xbfm\xfbg\xfd\xf2#\xfcp\xf6\xfb\x1f\x8b\xb6F\xe9L(\xe25\x1dH\x84\xf2\xa1g\x1d.\x0f\x8atd\x9e\xfc$\x0d\xca\xd4\xc7#Sk\xca\x82\x12\x05t(\x0b\neA9\xfc\x0d\xe2\x00=F\xd63\x96\x8af\x05\x9d\xb9\xf5\xb9\xc0\x16oiD\x0b\xe2\x98\x16d\xa0Z\xe1\nP|\xa3\\|\x0b\x92\x11\xae\xa0+\x8aoD\xf1\x8dr1/\xc8C\xbd\xa0\x14\xee\x05Y\xc8Wx8P|\xa34\x04\x0c\x1210\xc8C\xc1bS0G\xe1`P\x16 \x83\x04,\x0c\xd2\xd10\xc8\xc0\xc3\x10S&\xc57R\x96\x8c\x8e\x05\xbdQ|#\x8ao4\xb32\x88\x19\xe0I)\xc0\xa0f\x90\x86\x9bA\x8c\x80\xc8\xc4\xce\x00\xe1\x97\xe2\x1b\x05,\x0bK\x83h\xd8\x958\x9e\x06\x85\x115(\x84\xa9\x01\xc57\xd2\x96\x85\xb0A\x12\xc6\x06\x14\xdf(\xf6\x14(\xbe\xd1\x91\xe8\x1b`\xf078\x02\x81\xf3:\xe4\x14\xdfHY\x1c\x8d\x03\x8ao\xe4\xfbA9\x94\x0eP8\x1dd u\x90\x86\xd5A\x0eZ\x07\xc9x\x1dP|#\xa7\xe5\xa0w^g\x14\xdf\xc8\x18\xc57r\x18eAq\x18v\xe7\x06H%$\x95\xd06R I%$\x95\x90TBR I%$\x95pn\xa4\x12:\x0c[JR \xc3\xfd\x8aT\xc2C#\x95\x90T\xc2\xd8\xf6[\xe8\xaf\xa4\x12\x92J\x88*\x04\xa9\x84q)-\xf8\xe7\xe8\xf5\xa4\x12\x92J81R I%$\x95PY\xac\x94X\xa5\x85TBR I%t\x18eA\xb1\x8c\xb2\xa0P\x16\x94x\xd7\xa7,(=eA\xb1\xec\xb4YP\x0e\x9e\x99\x0c\x7f0\x0d0\x90\x9f\x04e\x16\xa8`\xf6\x1bJ\x89\xa2\x8cR\xa2PJ\x94\xd1(%\n\xa5D\x19\xad(!\x93B\xc7$\x911\x94\x12\xe5X\n&\x83\x80)B\xbf\xa4\x93/\x94\x12\xe5\x18\xd2%\x85r\xc9 \\(%\n\xa5D\xa1\x94(XB\xa5(\x9d\x92C\xa6PJ\x14\xdf\xcf\xa2\x04J\x02}\x82I\xa6\x91B\x9dPJ\x94\x9c\xac\"1\xaa\x84R\xa2$\xd0#Hr\x04C\x8d\xe0\x88\x11J\x89\"-\x87\nI B(%J\x01\xe2#J{\xe4\x92\x1e\xde7'\xa5D90J\x89\x92Ah\xc4\xe9\x8cT2#\x81\xcaH&2\xd2h\x0cJ\x89\x92F\\PJ\x94\xc1(%\x8a\xb6_OJ\x14\x19\xfd\xd9W\xf6\xc7\xef\x82)P\x0e\x92\x9fT\xcd\x08\x86\x9c\xcd*\x92\x1a\x1b~V\x15\xcai\x92\xd2Z\x94\xd3D\xd9\x89\x1b7\x9e\x8d\x83r\x9a\x94hE\xcaiB9M~\xc39M$\xc2\x18\xc8db5\xdf\x87\x9eu\x7f\x92?\x97\x05\xaf\x99\x9d\xd0D\xfe\xb3\xec\xf1\xa2\xfd\xf4R\xd4d\xba\xb0W(\x83\xbb\xa9\\$\xbd\xd4\x9fX\x03\xc3r\xe7 \x1b\x8a\xba\xb9\xfe\xeb\x03\xce\x842\xb6\xa8m\xfc\x1bp9_?\x13\xca\xc5\xeb\x83%\xe9,\xddI\xdd\xeb\xfcv\xecK\xdd{b,\xf4L*\x1d\xd1b\xfb`+e\xee\x0cvS\x8b\x81\x9a\x93\\}\xd6z[\x15\xd0[\xb7\xda/\x98JA\xce\xf9\xd7\xafV\xdb\x0f\x12\x95\x82z\xa9F\xec\x0c\x98rQ\xcd\xca\xe4\xdc\x9b\xdf\x8f\xf4\xdd\xff\xbc\xdfV\xcd\xb3\x8eUK\xf9\xee\xb2 \xa31\xfb\xa1\xd3\x85=\x9e\x8f.\x86\xf9\xfe\xb0\xbd\xaar\x98\xa7\xe8\xbc~\xc7\xbam\xdd\xf7u\xdbx\xa3M\x85F\xba2\xefxW\x86\xafD\xa0\xdf^\x8e\x05\xd5_SzK`H\xe0\xd3\x0e\xf3\xb7\xccB%\xbeF\xfd\xc4Z\xaceL\xd72\xf3\xf4\x1c\x9f\x17\xff\xd4\xae\xd4\x9df\x97\x132O\xc8|\xbcG\x132O\xc8\xbcmS\x89+J\xba\xab\xc5\xe3q\x94\xbb^\xfd^]\xbe\x9a7\x11\x11\xeeD\xb8\xc7^\xd9\xf19A\x19\x11\xeeD\xb8\xbb\x8d\x08wiD\xb8\x1f\x1a\x11\xeeD\xb8\xfb\x8c\x08w\"\xdc\xa5\x11\xe1N\x84;\x11\xeeD\xb8+#\xc2=\x07\x12'\xc2\x9d\x08w\xcb\x88pw\x18\x11\xeeD\xb8\x13\xe1N\x84\xbbw\xf4\x10\xe1N\x84;\x11\xeeD\xb8\xe7\x10\xee\xbc\xb5dp\x0d\x9eMw\x8bO\xcf\xb6\x8f|\x92\xaf\xe0\x165\xf4\xde\xb0BK_\xd9\x8f\xa5$\x0f\x1597\x0cD\xa0{\x1eEL\xa0\xfb \x1b7\x8eh\x13\xe8^\xa2\x15 t'\xd0\xfd7\x0f\xba?\xffE\xfe\xaf\xf8\x17\xe5\xd1\xc5\xbc\xff\xa7\x83y\x1f\x90w>\xc1T\xe1\xae\xfad\xdef\x06_\x9fP\xefZX\x19\x1c\xce0x7\xe3\xae\xff\xf8\xb0\x11\xf7\xa2\xacf\x14T\x8f\x8aKx\xc2\xb0\x04\xa2\x1e\x03\xd4}\xeb\xb2\xd1\xe2\xb8v\x0c\x88,\x0b\xa6\xfb\xb0\xf4\xafP\xc3<\x1c\xdd\x0f\xa3G\xfb\xca\x91 z\x14C\xc7\x16 \x0bA\x8f\x02\xe8<\x82\x9f\x07\xe1sl\xd1\xbd\xbd2\x0f;\xf7\xe3k\x81\xb6\xc8F\xceq\xb0h\x01V\x94PQBE\x9d\x7f'T\xd42BE \x15\x1d\x8dPQN\xa8\xa8\xdb\x08\x155F\xa8(\xa1\xa2\x84\x8a\"WI\x84\x8a\x0eF\xa8\xa8m\x84\x8a\x12*\xea0BE \x15\x8d\xf6\x10BE\xfd\xd7\x10*:1BE \x15\xf5w\x01BE \x15\xb5\x0d\x8b\xed\x11**\x8dPQBE\xbd\xa8\xa8\xe4\xe9\xec\xd9h.$\x9e\x1e\x155\xbcI\xbc\xd8J\xb04\x88\xe8Q\x85\xc4\x01\xa1\xa7\xe1j\x9eo\xc50\xeb\x021%\x07y\xf4/\xea\x97\x07\xe1$\xb5\x07\xf9\x1a\xd4X\xcd\x81 \xef&g\xb4\xc7G\xa6\x95\x1e(@3i\"\xdbx\xbe^\xe9\xdcM\xa3\xd0j\x14Z-\xcelPh5\n\xadf\x9b3\xb4\xda\xc10\x9c\xd22z\xe6-\x00\xcd\x98\xb7\x02e\x0eWF\xb0\x0c\xc12\xa3\x11,C\xb0\xcch\x04\xcbp\x82e\xdcF\xb0\x8c1\x82e\x08\x96!X\x06\xb9J\"Xf0\x82el#X\x86`\x19\x87\x11,C\xb0L\xb4\x87\x10,\xe3\xbf\x86`\x99\x89\x11,C\xb0\x8c\xbf\x0b\x10,C\xb0\x8cmXp\x81`\x19i\x04\xcb\x10,\xf3\xeb\x80e\xac\x10,\x93\xa0j\x06\x1d96\"\x1c\x8e\xa0\xa1\x90j\xb9\xf1\xaa(\xa4\xda \x1b7\x1e\x0c\x8cB\xaa\x95hE\n\xa9F!\xd5~\xc3!\xd5\xacHD\xcf\x7f\x11/\xe4@L\xb5\x0f=\xeb\xec\xd0@v85\xcb\x8f!\x84,\xeaS{:\xe0=-o\x8fL\x13u\xf1\xab\xea\x1b\x91\x0c\xed\xe3U\xaf\xe5\x9bb\xfa\xcd\xaf\xdf\x1e\xb0\xacx\xa5\xce_x:E\x94\n\xb6J\xa7\xe9\xe7<&\xd8\xae%\xe1\xc0\x84\x03\xc7\x06\x08\x06'\x01\xc2\x81 \x07\xf6\xfe\x92p`i\x84\x03\x1f\x1a\xe1\xc0\x84\x03\xfb\x8cp`\xc2\x81\xa5\x11\x0eL80\xe1\xc0\x84\x03+#\x1c8\x87\xa8%\x1c\x98p`\xcb\x08\x07v\x18\xe1\xc0\x84\x03\x13\x0eL8\xb0w\xf4\x10\x0eL80\xe1\xc0\x84\x03g\xe1\xc06U;#t,7\xe9dm*o7\x93\xba\xa7\x02\xdfr\xd9\xb1\xbe\x9f@\xc1_\xab\xe0\xf8\\\xd0\x87\\G\xa8\x8c\xc7bo8r9 \x00\x9bb_\xba\x12\x81\x00\x7f:\xe3u\xaf6\x87\xfb\xb1\xba\x86\xee2.\x94\xc2\x08\xfej\x96\x8br\x1c\x06\xde\xf4\x9a\xfe\xb4\x931u\\\x19\x06\n\xf1\x01!\xa6pbe\xa7\xd7\xc8\xb3~9\xb5]\xd5\xb1\x86G\x1b\xb8X\x81\x9di?U!L\xd9\x9d\x0e\x1ao\xbeLT\x1f\xd0w\x7fk\xc9\xb8\xa9-e\x8f\xc7\xa3\x0bb5\xc3\xeb\xd1\xef\xach\xae\x01\xa5.7I\xf9\xa7\xf0\xcb\x00\xbd\xf4u\xb3\xdeX]\xd8\xed\x8f\xa2kRtM\x8a\xaeI\xd15\xe1\xf8\xe8\x9a\xee\\\xb4f\xd1\x13\x8f\xaa\xa9x\xb9a\xe1uu\xf9j\xe6\x8f\xd09B\xe7b\xaf\xd6\xf8\xe0WF\xe8\x1c\xa1sn#tN\x1a\xa1s\x87F\xe8\x1c\xa1s>#t\x8e\xd09i\x84\xce\x11:G\xe8\x1c\xa1s\xca\x08\x9d\xcb\xa1\xcf\x08\x9d#t\xce2B\xe7\x1cF\xe8\x1c\xa1s\x84\xce\x11:\xe7\x1d=\x84\xce\x11:G\xe8\x1c\xa1sG\xa3s\x03\xeaT\x18?\x8brs\x14\x912-\xdc\x1fE\xa4\xc6l\xe6\x8c[\xc4\xd9\xbc\xa9\x14\x80\x16\xbd\x13\x88G\xab6k\xc6\x91F8\xda\xec\xaf\x84\xa3\xc5\xfa\xf5h\x84\xa3\x11\x8e\xe66\xc2\xd1\xa4\x11\x8evh\x84\xa3\x11\x8e\xe63\xc2\xd1\x08G\x93F8\x1a\xe1h\x84\xa3\x11\x8e\xa6\x8cp\xb4\x1c\xa2\x8bp4\xc2\xd1,#\x1c\xcda\x84\xa3\x11\x8eF8\x1a\xe1h\xde\xd1C8\x1a\xe1h\x84\xa3\xfd\x16p\xb4\xf2\xd1^\xa4h\xaagM-\xc1U\x1d\x83\x9e\xcf\x12\x0b\xa5\xc7QI\x0d\xf8\xe2\xa0(B{\x04V\xde\x8b+\x83\xaaY\xc0\x8a\xdc\xa2\x98\x022\xfb^\x11&\xb2gN|\x0d\xf4\xc0\xb4k\xd4Z\xad\x1c\x9bf5\xdd5\xcd\xc9\x1a4k\x16\xcav\x97\xd2Z\x9e=/\xcavW\xb6q\xe3y\xda(\xdb]\x89V\xa4lw\x94\xed\xee\xd7\x99\xed\x0e\xc5\xc5\x07\x00\xf8\xf7\xfa\xb72\xca\x99\x93p\xefM\xa0\xbaJ\x83\xe9\xb3d[\xd3\xbcv\xb6\xbbG\xa6\xc2\x0f\x94B\xb7\x9a\xc66\xfe\x0d8\x9d\xaf\x8f\xa0\x074\xaah\xacBC\xf7\x8aO\xa5[\xc6\xfc\xa2\xe7\xa2\x93\xfc\x9d\xbb\xcaC\xdc\xc1p\x8dCa\xe50\x81\xe5\\\xd0\xbdN\x7f\x16\xaeU\xb0\xf4\xb1R\x17{N\x07\xa9\x01E\x19\x9d\x97\xb0/\x9cuM\xb5\x89\xb6(\x86y\xb7V\xfd\xe7\xda\xaf(\x83\x82\x0e\xeb\xde_\n\xce\xbe\xf0\xa2\xb7\xbf\xd6\xa0M\xb8\xee\x0d\xaf\xfd\xa3\xcbY+}\x05,\xda\xa6Q\xafD\xf9\x85\x1c\xaa[t\x98\x03b\xa8\x0b\xbb\xab\xfa\xbb\xe9\xcc~h\xa1ih4\xef\x844\x1a\xa2\xcc\xca0%W\xd6\xf3\xaa\xf3>\xe5\xd1\x10\xcf{4\xd4\xa0\x18->\x8d\x8dv\xd1,\xd9\x17\xd3\x87\x06t\xcf\x0c\x7f\xb9\xf6\x12\x9d,\x80\x05\x8e6N\x16\xbcZ\xab\x86\xf03\x18\xcaX\xe3\x1d\x90\xa3\xfd\xfa\xdb\x8a5\xcbXK\xf1j]\xb8\xa5R\xaa~]\xad\xa1c+\xd6\xb1f\xc1\xe0\xb1\xdc\xc6\xd0[\x1bO\xcd\x90U\x1f8\xa1\xcd&c\x8c/B\xba\xdaP41\xbf\xa9;[\x87\x80\xc4\x9d\xac\xfc\xa6\xfe\xf8\xa7\x07\xee\xfe\xac\xa7\x16\xebt\x8e\xf5\xec\xe2\x8e\xb6b*m\x1b\x9a\x9a,\xfb\x97\x1cn45\x85\x8c\xa6\xa6\xd0\x0fN35\xfdEO-\x9051\xed;\xd7\xa1\x8a\xd1hR\nZJo;\xcd@\xfbp\xf5\x86&\xa5\xa0M\xdb\n1)\x05N\xf6\x8c\x96\xd4R)U\xff\x9b\xdc\xeb\x1d\x8f\xbbX\x1a\x97\x9c\xa0\x06\x81\x02\xe1\xabc\xcb\xba3\x9fa\x91\xdf/\xeb~\xb7\xa9\xeeC\xe7\x9aF\xcb\xa9\xbd\x9d\xea]\xddK\xefk\x8fu\xc5L\x9f\x1f\xba\xcd,\xe1\xbb:\x1a&\x91\nE\x87\xd6\x8b\x883\xed\xeaM\xdd|\xcc\x987C\xdf\x98\xf1\xf922W\"Z\xd6\xbcG\xd4ztS\xcd\xbf\xb2\x9f\x8a\x8e\xb2\xda\xcb\x03D\xb0\xa88[\xb7]\xfd\x1fr7\xd1\xe9\xb1\xda\xf3;\xd7\x91@e\xf8\x02\xbd\x94~\xa2\xbb\n\x8b\xb6\xf9\xc4\xba\xbeB\xedS\x15\xdb\xf1\xb1z\xdf\xb8e\xd5v\xf5\xban\xaa\x8d>V\xaf\xa7\x1b\xab|N\x9f\xc3\x92ay\xe3\xd9\xecTV\xa8/D\xde\x99\xb8\xf7\xa5t\x85\x19^\xd7\x1a\x14\x1f*\x19\xbe(\xfe\x90\x94\xb1f\xbf\x8dM+\xcf\xe0\xf2\xdd\xfb\xeb\x9b\xab\xf3\x9f\xce\xaf\xce\xdf\xbe:\xbf\xb9\xfe\xfb\xe5\xf9\xcd\x87\xb7\xef/\xcf_]\xfctq\xfe:\xeb\xfa\xab\xf3\xcb7\x7f\xcf\xba\xf2\xaf\x1f\xde]\x9fg]yu.\xfe5x\xa99\x15|T\x9d1\xa7\x10F\x8b\xb6\xef\x0bx\xdb\"\x1f\xbcuF\"6\xff\x07\x1e\xcb\x0bu\x9at\\\x83\xcfbv\xec6\xf7&\xa8\xc6x$#\xb0\x91\x18\xb9\xa7|\xa0\xe1{\xfe\xbco\xf9xP\xa2\xc0=UW\x88V\xd4\x9a\x7f\xd0w\x8d\x04\xaaQ\x86\x1e\xa1\xa8\xc9T\xd9\xc1\xd6\xff8#\"\xca,\xc1\xa9oV\xe8\xe8(\xb9\xd4%<\xa8\xdb|\x81\xf0}/\x97\x08\x01,X\x9a:/=P%\x92\xc2h\x9bM\xe0|\xac\xb2!p\x95h\x0c\xa3\xb8\"\xe6%\x13\x9b\xa5\xed\xf9\xd5Pt\xff\x82I\xf6\xbc\xd8\x98\x8f\xb7\xddK\x15\xa9fX\x83X}\xbd\x87\xc7\xac\x96\xe7\xda\xaaaT?\xd5}\xde\xeb\xaf\xed\xd4Pt\x7fQK\x1f7=\xe3\xbcn\x02k1U\xea+9\x8d\x98\x1f\xab\xc7\x8a\xd1#\x82\xdd/\xfc>{\x06rz\xbby\x7f~}}\xf1\xf6O\xa8\xf9|~\xcd\xf9\xdf\xce\xaf\xfe\xfe\xee\xad\xffA\xcf/\xf8\xe9\xdd\x9b7\xef\xfe\xd7\xf9\xd5{\xf4\x15\x7f\xf9p\xfd\xe1\xa5\x7f\x9d|\xf0\xf3\xf3\xb7\xd7\x17\xef\xde\xfa\xfc\x0fo\xb4\xd4\xba\xe3\x02\xee\x04[U\xbf\xb9\xac\x07\x8dy?\xf9\x9a\xfc\x05\x9c\x7fb\xdd}\xdb\xb0\x01,\x95\xac\x08o\xedwR\xb8\x0f\x85\x1e\xd0\x0b\xc5N\xa9\x93\xdc\xac\x1b\x10?\xb5\x10/zO\xf5\x88\xf5\x0d\xad{l\xf7|/C\x0c\x98\"\x14\xbd\xa9\xee(\xfa\xb6;\xd6\xee6\xcc\xec\x81K(DO\xa4\xda\xb3\xfb\xe6\xce\xfbI\xf5X|8,+^\xe2\xf0\xa9p\xf3\x8c\xd7\xdb\xc8\xcc\xf7J\xdfV\xfe>\xfa\x85#\xf1q\xb6\xac9[~\xe5rZ_9o\xaa\x9e\x83*\x04\x88\x0b\xa3\xa5\x96Q\xc5\x8e(\xaa.\x82\x0c\x8c\x13\xb9\x99\xf5\x8e\xb2\xce\xc7j<\xa6nT\xa5EsW\xb7\xed\x9eC\x05}\xdd\xac7Nw\xc10e\xa1\xef'\n2FA\xc6(\xc8\x98\xb6\xdfv\x901_\xef\x91X\xe0\x04\xbeC\xa5\xabtyy>e\xf8f?\x19\xc3\x86\x0d\x7f\xa0\xa8a\xb3\xbfR\xd40\xcc\xcc\xa0\x8c\xa2\x86Q\xd40\xb7Q\xd40i\x145\xec\xd0(j\x18E\x0d\xf3\x19E\x0d\xa3\xa8a\xd2(j\x18E\x0d\xa3\xa8a\x145L\x19E\x0d\xcb \xbcEQ\xc3(j\x98e\x145\xcca\x145\x8c\xa2\x86Q\xd40\x8a\x1a\xe6\x1d=\x145\x8c\xa2\x86Q\xd40\x8a\x1a\x96\x135\x8c\xb7\x96\x18\xaeh\xb5\xe9f\xf1\xe9\xc3\x85Q\xc0\xac\xb4hD\x140\xeb\x84\x8d\x1b\xef\xa3\x140\xabD+R\xc0,\n\x98\xf5[\x0e\x98\xf5\xfc\x17}d\xe1\x9f\xca\x97+t\x96d\x02M\xc4,\xd1\xd7&\xf0_J\xd4\xac\xcb\x11\x16|\xd0\xc1\xb2\x8ar\x8b\xd1\x90WQ\x89\x05O\xdb%G\xb4\n\xc4~\x8a\xc5\xad\xe2An\x08P1\xab\x0e\x8b}l\xc4\xaa\xaf\xd0\xc8\xd8HU\xd18U\xd12\x1d\"\xc4)1\xaa\xfc\x11\xaa2n\x8c\x88N\x15\x8eM\xe5\xa8KFd\xaa\xe08\x84\xe8X\x04TL*\x1e@\xd1\x8cE\xe3+DK\xaa,^^e\xa8\xc8\n\xd1\xe7:\x1a\xa2\xbb\x8f\x16cyGCG p\x04Mv\x19\xc7\x07yADS\xf8\xf5\xb6O4\x86\x02\"\xacKB\xeb\x8c\xe7\xdd\xb1\xd1Zb\xb1X\x8aFb\xd1\xce\x8e\x0b\x11\x15\x0f\x10E\xf3\xc4\xcc\xbe\xfd8\xa0y\xc2m4O\x04\x9c\x1d\x13\xaf)\x1c\xad\x89f\x88\x99}\xdb\x11\x80\x8c\xcc\xf4\x9b\x9d!P\xd1\x98\x10\xd1\x88\x12Z\x07_\xe1rQ\x98\xf01\x98\x12\"0\xa5\xd7\xf9\xb8\xe8K\xe6c\xf4\xe8\xd8K\xdaQV\xe4%\xffwTl\xe6\x0b\xcez\xd1\xb6\x1c\xdf+%\xe2-\x85\xa2-a\x8b\x82\x8a\xb4\x84\x8a\xb3\x14\xbd#bB9\xeca\xc7EX\xc2\xc5W*\xf0\xcc\x8f\x8e8-\xdd\xc4\x87MJL\xa5\xe8\x03Q\x16\x8f\xa7\x14\x8d\xf6\x93qu<\x96Rn$\xa5\xcc8J\x05\xa2(a\x98lc\xd16M\x88\xa0\x84\x88O\x01\xdf$z\xd2\xd7\x8f\x9d\xf4\x95#'\xed\xe2q\x93\x90\xa3\x1019*;\xd8z\xc6FL\xc2\xc4K:Qa#c\xa1l\x9c\xa4\xbc(Iy1\x92\xac\xe8\x13\x85\"$\xc5Z,3:\x12xO0zc#a\"#\xe9\xd2\xa6\xc6E\x8av\xb3\xd0;)=\"Rb<\xa4\xd4hHI\xb1\x90\x92\"!e\xc6A\xc2E\x04)\x1c\x03\xe9\xa4\x11\x90\xbe~\xfc\xa3o\x10\xfd\xe8\xab\xc5>BD>\x8a\x8eP\\4!=?\xa4\xc4<\xc2E<*[\xbe\xfcXG\x81HG\xd1\"\xea\x9b\xc7\xa3\x1cYo\x99\xe3b\x1c\xf9^.\x92\xc1P/1DP\x12\x1d\x86D\x16\xe7\xea\xf2\xd5\xcc\x17\x05\x1f\xa1\xe0#\xb15$\xf6C\x89\x82\x8fP\xf0\x11\xb7Q\xf0\x11i\x14|\xe4\xd0(\xf8\x08\x05\x1f\xf1\x19\x05\x1f\xa1\xe0#\xd2(\xf8\x08\x05\x1f\xa1\xe0#\x14|D\x19\x05\x1f\xc9\x89\xdfA\xc1G(\xf8\x88e\x14|\xc4a\x14|\x84\x82\x8fP\xf0\x11\n>\xe2\x1d=\x14|\x84\x82\x8fP\xf0\x11\n>\x92\x13|\xc4}\xd8tSO\xbe?\xbfB\x00\x12\x05A\xc5\x0b\xae\x88\\\x131\xe5\xeb\xc4I)}\xdc\xfcy\xc5y\xb5\xb8\xdb\xb2\xc6\xd0\xa4\xbe\xa3\xe7/\xc7\x1f\x0e\xa7\xd0\xe5\xe6\x8b\xf5\xefv\xc3\xdcU\x9fL(\x15u\"}h\xd2\x83\xb3\xe8\x96\xebG\xa6\xad\x1e\xe8\xb1\xf4\x83\xe6\xb2\x8d\x7f\x03\xf92z\xac=i\xfb\x0e\x93/6\xb0u\x87\x1e\xd4\xbc\x1d\xfe\xa5\xf6\xef\xcf\x8e\x8dm\x9d*\xf0\xfez<\xbe\xecq\x19\xa1\x1b\xbfE3\x1d6\x86\xbb\xd2>OC\x9d\x9d\xbf\x88\xd55\x144\x00\x136`\xa47W\x03$7\x16\xdfy\x89\x94\x05\x1b\xef\xb9\xa7\xc8`\x00\xc4\x80\x00\x84\xa6\x0f\xb8\xc7\x0d\xc8\xbdac\xa9\xfa~\xd0\x99{\x937\xb0OPZ\xe7\x87\xb8\xd6\x0f\x19z\x7f\xb8\x02\x15\xbfCk\xfePJ\xf7\x87L\xed?\xe8P4.Z\xff\x87\xe3\x19\x00H\xe6\x00\x82\xae\xb4>\x99\xc4\x02@i\x1e\x00\x12\x99\x00H\xe5\x02\xc2={`\x06\xb0l\x00\x94\xe6\x03\x00\xc7\x08@IN\x00\x8ef\x05 \x8f\x17\x80R\xcc\x00dq\x03\xe1\xe1P)\xee>:nN\xc2\x0f\xc0 \x19\x028\x0dG\x00\x89,\x01\xe4\xf1\x04\xb1)\x18\xc7\x14@Y\xae\x00\x12\xd8\x02H\xe7\x0b \x831@L\x99O\x10\x9c\x01\x94`\x0d \xc6\x1b\x00~y\x86\xe0\x0e q\x15\x97\xcc\x1f\x04\xbdI6\x01\xc1 @B)\x0b\xb2\x08\x90\xc4#@i&\x012\xb9\x84p\xbf\xea\xe3l\x02\xe4\xf3 ^\x7f\xe2\x8e1F\x01\x8aq\n\x80\x97\xdb\x01\xc3+@\x1a\xb3\x001\x19-\x93]\x00\x84\xdf\xc0V}!\x8e\x01\xb2\x1a\x17\xcf3\x00\xa2\x96\x19\\\x03\xe4\xb2\x0d\x10\x96oQ\x8c\x03\x14\xe6\x1c\xa0\x10\xeb\x00\xe1\x1eS\x8ey\x00<\xf7\x00H\xf6\x01\xd0\xfc\x03\xe0zT:\x07\x01I,\x04\x04y\x08(\xc5D@*\x17\x01\x99l\x04\xa4\xf1\x11\x80x\n\x91\x81\x16\xbf\x1e\xcfK@Af\x020E\x0b\x8c\xb3r\xfc\x04`\x18\n8\x82\xa3\xf0:\x14?\x0c\xb1\x14P\x9a\xa7\x80(S\x01\xb9\\\x85\xd7\x9b\xfa\xba\x0fot\xc4\xf9\n\x08\xca\xc0\x10\xe4, \x8b\xb5\xf0\xba\n2\x18\x90\xcbax\xbd\xa9\x05t`\xbb\xb1\x1c\x8f\x01(&\x032\xb8\x0cHc3 \x87\xcf\x80dF\x03\"\xaf\xf2\x88n\x0e \xda9\x96\xd7\x80\x1cf\x03R\xb9\x0d\x08W<\x87\xdf\xf0:\xb3\xe8\x08\xec\x90\xc1q\x1c\xc1\x01\xd1\xac\xc3,\x07\x94\xe59 \xc6t@\x98\xeb\xf0^\x93\xcb{@\xc1\xbe\x9b\xc0}@\x12\xfb\x01\x81\xd5\x8b9\x1b\xaf\x04\xbe\xe1hFH\x0e41\xbbF\xc5s\x1ak\xa4\xe2\x95\n4b\xc7\xb9\xf7z\x1c\xb3\x11\xf8\x94\xf9\xac\xb8\xf1&e\x8c\xff\xf40\xea\xe0\xbew\x83\n\x17\xddbH\\\xa3O\xb2\x0f9l`W\xf5\xbd\xda\xd4V\x99n~\xde\xb3\x9e\x9f\xa9\xbf{\x9c\x8d)~BIn.\xb85\x82e>\x11\xdf\xd6\x07\x97\x11\x00\xab\x8eA\xd3\xc2\xb6\xedL\xb2\x0d\xe7\xfe\x9f\xccwqdc\xc6C\xaeyw\xcf\x86t\x1b\xbe\xfc+\xd6Q5_}\xed\x86\xb63\x97x~\xfe\xb9\x92i.\x9eB\xcd{#p\xf4\xb0o\xa4\x06\xc4\x96j\x0f\xf7s\xdd\x1f\xf6\x8f\xf8\x86\xa0\x9d\xddH\xd5jB\xce\xd5\x0d\xac\xaf._\x8d\x81\x0f\xf4\xf4\xd5\xab\xa8\x8d\xae\xc7\xe3\xd6\xd7\x16m\xa7|\xc8\x99\xbaS\x95\x1f\xde3\xe2\x85\"\xb7\x85\xed\x96q6\x87\xb9\xe2}\xbb\x1d\xcb\x1d\x9c\xf7:\xb6\x93I\x06\xe0\x8fU7<\xa4\xd8\xcab\xd2,\xb2\x7f\xfb\xd6\x15\xd3\xe9L\xf7\x9e\x83a8D\x94\xb0P%Tp \x97\x9f\xe7s\x9cJ\x95\xa3\x11U\xf9|\xed8\xdb#\xd2\x95\x91M\xd9\xec\xb72\xa5\xa0\xfe79\xbf-\xaafH\x11\xf4\xf9\x8e5\xa6\xe1\xf7\xcd\xb0/:\xfb\x82\xb8\x90\xde6\xac\xef\xc7&T;\x89\xfb^4\xf5G\x96\xd8\x9eS\xf7'n\xdcx\x1f\xdd\xd4\xdb\x1a\xdb\xba\xf2\xb7F\xcc\xf7\xd1!j\xcf\xdc\xee\xc1Z\xfa\xdfofZ\xba\xda!\xb3\xff\xe9b\x05\x1b\xb6\xe2\x86\xa6\xd1x\x8dY\xa5\xcb\xed~5@\xd4MD;\xdf\xde\x03\xab\x16wP\xedv\xdf\xb0\x15m\xc6e\xbc>\xd4\x96\xd6\x15r~U\xf9\xa7\xc4\x0c\x04\xe2?\xeafY/*\xce\x06\xe1O\xb7\xa0\xfc\xa1\xeeH\xb6\xbb\xbaYl\xf6\xcb\xd9\x1a\xbcRw\x19\x94\xd7\xd9\x13\x93:\xbe%\x08\x88\x97\xe5X\xa7\xb9>\xf0\xe1\xa2\x9f=\xadY\x15\xe4gK\xc7zM\\\xc8\xe15\x8eG1\xe4\xce\xf4h\xaa\xd7\xcd\xecm\x02\xc3h\x9c\xdeB\xb5\xcc\xb1\x0f\xf6\xb6m7\xcc:\xca\xeex\x80\x1d\xfb\xc4\xba\xc9\xa5\xa1\x87\xa7\x7f=\x7fp\xb5\xc5Hu\xcc=\x12&~\xc4=\x98\x02\x86\xdan\xc9\xba\xf9'\xd2\xfb\xbaY\xb0\x17\xb0h\xfbm\xdb?\xeb\x97\x1f\xe1\x87\xb3\xdf\xffX\xb45\x8a\x87K\xda\xb5\x9b\x8d\xfc\xff\x9b\x8d\n\x9f\xd4\xf4\x9f\x87\xa5\x89;t\xd2f\xf3R\xfdh\x1a6I\xff\x9bIB#<\xe2c&\x0d>\x1f\x99Vy\xa8\xf1\x92\xec\xf6\xb1\x8d\x7f\x03\x04\xe7A\xc5Jz?DHZz\x82$\xcd2\xeaz=Y\x11\x83\xc4\xcb\xbc\x153\xab{#\xe3\xebF@\x9a\xada\xab\xbeo\x17\xf5$Gp$X\x90\x1ee\xe1\xe2\x96\x0bbd\x15w\xb3\x81YT&\xd9\x8f5\x00\xa1\xab\xe1t\xa7;\xfcM\xdd,\xd9\x17\x7f\x8c\xa2P\xf7W\x16\xc9G\x8f\xa9|Z\xf5U\x81\x07\xadS\xcfOV\xca\xcaK\xbd\x11i\xa63\x7f\xe9\xf7\xbd/\x8b\x18\xaa\x93\x19.|\xb9\xec\xc4\xcaT\x97Hf\x17W\xc52\x93\xa4xP\xaeiB\xe7\xe4\xeeY\xa7\xca:M\x8dj9R\xab.\x87\x1b\x82\xc9 &\x8f\xcf\xe2\x04\x93\x13Ln\x9b\x13&\xf7\xa5'\x1c\xd6p\xc7\x80\xe4\xe3\xe2\xf2\xea\xf2\xd5\xbc\x91\x88)'\xa6<\xf6\xae\x8d\xcf\n\xca\x88)'\xa6\xdcm\xc4\x94K#\xa6\xfc\xd0\x88)'\xa6\xdcg\xc4\x94\x13S.\x8d\x98rb\xca\x89)'\xa6\\\x191\xe59X61\xe5\xc4\x94[FL\xb9\xc3\x88)'\xa6\x9c\x98rb\xca\xbd\xa3\x87\x98rb\xca\x89)'\xa6\xfc\xb7\xc2\x94\x8b\xee;v\xac\x19\x04\xf15J+\xe9\x1eLi\x15\x8ec\x11\xf0#V\xeab\xcf\xe9\x83D\xcb\xa0\x9e|\xb78/a_8\xeb\x9a*~Z\x00\xc3\x9d?n\x87\x95\xfc\xb9\xf6+\xca\xa0@\xcc\xba\xf7\x97\x82\xb3/\x91\xcc\xc6\x89\xb7\xbf\xd6\x14R\xb8\xee\x0d\xafC\xe9\x90\x1d\xb5\xd2WX)\xb3\xcd\x89\x0c\xef]\xa2\xc3\x1c\x10C]\xd8]\xd5\xdfM'\xfbC\x0bMC\xa3ENH\x00\xae\xcc\xca0%W\xd6\xf3\xaa\xf3>\xe5\xd1\x10\xcf{4\xd4\xa0\x18->\x8d\x8d&\x8fu\x98>4p\x8d\xf6\xb1\x0e\x89\xbaE\xf2@+\x1b'\x0b^\xadUC\x84\x93`\x8a\xce\xe9\x1d\x90\xa3\xfd\xfa\xdb\x8a5\xcbXK\xf1j]\xb8\xa5R\xaa~]\xad\xa1c+\xd6\xb1f\xc1\xe0\xb1:\"\xa3\xb61\x9e\x9a!\xab\xbeyb\xd9$\x841\xbe\x08\xe7\xd4\xd2E\x13\xf3\x9b\xba\xb3u\xc3\"\xbf_\xd6\xfdnS\xdd\x87\x0e}\x8d\x96S{\xeb3\xf1\xb5\xba\x97\xde\xea\x1e\xeb\x8a\x99>?t\x9bY2/unN\xf2&\n\x9d\xad\x17\x11g\xda\xd5\x9b\xba\xf9\x981o\x86\xbe1\xe3\xf3%\xea\xf4=\xe6k\xfeZ\xadG'\x91\x1cd\xc9\x9f\x8a\x8e\xb2\xda\xcb\xd3U\xb0\xa88[\xb7]\xfd\x1f\x95\xb5\xb98\xb5j\xcf\xef\\\xe7%\x95\xe1\x0b\xf4R\xfa\x89\xee*,\xda\xe6\x13\xeb\xfa\n\xb5OUl\xc7\xc7\xea}\xe3\x96U\xdb\xd5\xeb\xba\xa96\xea\x81\x9b\xe9\xc6*\x9f\xd3\xe7\xb0dX\xdex6;\x95\x15\xea\x0b\x91w&\xee})]a\x86\xd7\xb5\xa6\xe8\x87J\x86/\x8a?$e\xac\xd9oc\xd3\xca3\xb8|\xf7\xfe\xfa\xe6\xea\xfc\xa7\xf3\xab\xf3\xb7\xaf\xceo\xae\xff~y~\xf3\xe1\xed\xfb\xcb\xf3W\x17?]\x9c\xbf\xce\xba\xfe\xea\xfc\xf2\xcd\xdf\xb3\xae\xfc\xeb\x87w\xd7\xe7YW^\x9d\x8b\x7f\x0d^j\x8eL\x1fUg\xcc\x11\x8d\xd1\xa2\xed\xfb\x02\xde\xb6\xc8\x07o\x1d \x89\xcd\xff\x81\xc7\xf2B\x1d\xb5\x1d\xd7\xe0\x935q\xc7v\x9b{\x8d\x1fY\xe7U\x02\x1b\x89\x91{\xca\x07\x1a\xbe\xe7\xcf\xfb\x96\x8f\xa7H\n\xdcSu\x85hE\xad\xf9\x07}\xd7H\xcc\x1de\xe8\x11\x8a\x9aL\x95\x1dl\xfd\x8f3\"\xa2\xcc\x92*\xfbf\x85\x8e\x8e\x92K]\xc2\x83\xba\xcd\x17\x08\xdf\xf7r\x89\x10`\xa6\xa5\xa9\xc3\xe4\x03h\"\xc1\x8c\xb6\xd9\x04\x0e\x0f+\x93'\xa0\xb8\x81O\xb5\x08\x8b\x98\x97t=/\xdb\x9e_\x0dE\xf7/\x98t<\xa8\xf0\x98\x8f\xb7\xddK\xd8\xd4\x92\xfc\xd2k\x10\xab\xaf\xf7\xf0\x98\xd5\xf2\xd0_5\x8c\xea\xa7\xba\xcf{\xfd\xb5\x9d\x1a\x8a\xee/j\xe9\xe3\xa6g\x9c\xd7M`-\xa6J}%\xa7\x11\xf3c\xf5X1zD\xb0\xfb\x85\xdfg\xcf@No7\xef\xcf\xaf\xaf/\xde\xfe 5\x9f\xcf\xaf9\xff\xdb\xf9\xd5\xdf\xdf\xbd\xf5?\xe8\xf9\x05?\xbd{\xf3\xe6\xdd\xff:\xbfz\x8f\xbe\xe2/\x1f\xae?\xbc\xf4\xaf\x93\x0f~~\xfe\xf6\xfa\xe2\xdd[\x9f\xff\xe1\x8d\x96Zw\\h\xa1`\xab\xea7\x97\xf5\xa01\xef'_\x93\xbf\x80\xf3O\xac\xbbo\x1b6P\xb7\x12\x1f\xe1\xad\xfdN\n\xf7\xa1\xd0\x03z\xa1p*u\xcc\x9ducd,\xb5\x80.yO\xf5\x88\xf5\x0d\xad{l\xf7|/\xe3/\x98\"\x14\xbd\xa9\xee(\xfa\xb6;\xd6\xee6\xcc\xec\x81\xb3\xe58\x91j\xcf\xee\x9b;\xef'\xd5c\xf1\xe1\xb0\xacx\x89\x93\xb9\xc2\xcd3^o#3\xdf+}[\xf9\xfb\xe8\x17\x8ed\xeb\xd9\xb2\xe6l\xf9\x95\xcbi}\xe5\xbc\xa9z\x0e\xaa\x10 .\x8c\x96\xba\xfd\xdc\x94\x88\xad\xf6N\xb8\x89\xdc\xcczGY\x87\x875\x1cS7\xaa\xd2\xa2\xb9\xab\xdbv\xcf\xa7i\xbag\xee(\x9c\x1a\x85S\x8b/P(\x9c\x1a\x85S\xb3-!\x9c\x9a\xcd\xde\xe5\xc7S\x9b\xe0\x80\x14P\x8d\x02\xaa\xb9\xfe\x1ey\xc1\xc6\xe7\x05e\x14P\x8d\x02\xaa\xb9\x8d\x02\xaaI\xa3\x80j\x87F\x01\xd5(\xa0\x9a\xcf(\xa0\x1a\x05T\x93F\x01\xd5(\xa0\x1a\x05T\xa3\x80j\xca(\xa0ZNL2\n\xa8F\x01\xd5,\xa3\x80j\x0e\xa3\x80j\x14P\x8d\x02\xaaQ@5\xef\xe8\xa1\x80j\x14P\x8d\x02\xaaQ@\xb5\x9c\x80j\x93xY\x8aU;6\xda\xd7\xc1\x9eE$\xae\xce\x18\xa5\x01Qn\x1dV\xe1\x04\xc5N\x0dRF\x81\xbf\xd2\xa2*Q\xe0\xaf\x136n\xfd\x9b?M\xb7X\x7f\x04\xe2|]\x19'\x97\xf2\x87J5\xeca\x16\x94S\xfdF-f4xo\xee\xa2\x1dN\xe2}\xcd\x9c>2\xb5\x7f\xa8!\xbf\xac6\xb2\xcd\xeb\n\xa2\xc0L4tWT,\xc2S\x83\x8e5\xa2\x98/\x86s\xc3\x12&S\x0f\xb7cJ-r\xb8\xeb\xd8\xba\xee9\xeb\xd8\xf2\xc6f\xa6\x16#b\xb6\xe7\xad^\xd2~\x96\xdf\x06\x06\x92\xeb'\x9f \x01b\x08\xe4I-\xd5\xa0\x87\x9bt\xa1\x07\xf6^\xcf\xa1\xf3\x17\xe3d\xffow0\xf0\\H\x90\xa6\xfe\x877\xa5s\xd6u\x8dP]\xbe\x03\xae^\xae\x00f\x05\xcbgz\xa7\x8e\xe0\xea\xf2\x15a\xbc\x84\xf1F\xa7\x07\xec\xe4@\x18/a\xbcn#\x8cW\x1aa\xbc\x87F\x18/a\xbc>#\x8c\x970^i\x84\xf1\x12\xc6K\x18/a\xbc\xca\x08\xe3\xcd!a \xe3%\x8c\xd72\xc2x\x1dF\x18/a\xbc\x84\xf1\x12\xc6\xeb\x1d=\x84\xf1\x12\xc6K\x18/a\xbc9\x18\xaf\x85hL\xc8X\x9b\x98\x81,,\x16\x07\xcb\x95\xa1\x8bd\xee\xc1_t$\xd7\x7f\x8e\x17!\x80\xa3 j$\xe1\xe0!\xb5\xa0\x157\xcd\xcd\x19=2\x0d\xf3@ \xa3Y\xbb\xd8\xc6\xbf\x81\n\x18\xa5\x93\x92v\xc10\xe1\xcb\x8fL,8\x10h\xd1\xe4\x82\xbb\xbd\x87e \x07\x1b.\\\xddyB\xf1\xd6U\x17\xa5c\xb4\x8b:;\x9f\xe0 \xb2 \x0e\xa5\x9besq^\x8f\xd8G=:+\x1e\x8f(\xd6\x80{z\x80\xdc\xf94\x96\xaa^\x07\x9d\xb9\xb70\x03_\xc1\xa5Ul\x88+\xd9\x90\xa1f\x87+P\xf1;\xb4\xa2\x0d\xa5Tm\xc8T\xb6\x83\x0eE\xe3\xa2\xd5m8^\xe1\x86d\x95;\xe8J\xaboIJ7\x94V\xbb!Q\xf1\x86T\xd5;\xdc\xb3\x07E\x1c\xab|Ci\xf5\x1bp\n8\x94T\xc1\xe1h%\x1c\xf2\xd4p(\xa5\x88C\x96*\x1e\x1e\x0e\x95\x8aa\x1f\x1d7'Q\xc7\xe1\x84\n9\x9cF%\x87D\xa5\x1c\xf2\xd4\xf2\xd8\x14\x8cS\xcc\xa1\xacj\x0e \xca9\xa4\xab\xe7\x90\xa1\xa0#\xa6\xcc'\x08\x15\x1dJ(\xe9\x10[\x05\x02~y\x86P\xd5!q\x15\x97\xac\xae\x07\xbdI\xe5\x1d\xa1\xb0CB)\x0b*\xed\x90\xa4\xb6Ci\xc5\x1d2U\xf7p\xbf\xea\xe3\xca;\xe4\xab\xef^\x7f\xe2\x8e1\x05\x1e\x8a\xa9\xf0\x80\x17\x93\x01\xa3\xc6C\x9a\"\x0f1\x91(S\x99\x07\x84\xdf\xc0Ft!\x95\x1e\xb2\x1a\x17\xaf\xd6\x03\xa2\x96\x19\xaa=\xe4*\xf7\x10\x16'Q\n>\x14V\xf1\xa1\x90\x92\x0f\xe1\x1eSN\xd1\x07\xbc\xaa\x0fHe\x1f\xd0\xea>\xe0zT\xba\xca\x0fIJ?\x04\xd5~(\xa5\xf8C\xaa\xea\x0f\x99\xca?\xa4\xa9\xff\x80x\n\x91\x81\x16\xbf\x1eO\x03@A\"\x000E\x0b\x8c\xb3rt\x00`\x08\x018\x82\x12\xf0:\x14?\x0c\x91\x02P\x9a\x16\x80(1\x00\xb9\xd4\x80\xd7\x9b\xfa\xba\x0fot\xc4\xe9\x01\x08\x8a\x9c\x10\xa4\x08 \x8b$\xf0\xba\n\x12\x06\x90K\x19x\xbd\xa9\x05t`\xbb\xb1\x1cm\x00(\xe2\x002\xa8\x03H#\x0f \x87>\x80d\x02\x01\"\xaf\xf2\x88*\x0c \xca0\x96F\x80\x1c\"\x01R\xa9\x04\x08W<\x87N\xf0:\xb3\xb4\x7f\xec\x90\xc1Q\n\xc1\x01\xd1\xac\xc3\xa4\x02\x94\xa5\x15 F,@\x98Z\xf0^\x93K3@\xc1\xbe\x9b@5@\x12\xd9\x00\xde\xd5\xcbi\xf2i\x1ba\xd1q\xcd\x90\xe8RK\x8f\xd3l\x9f\x15\xaft\xc4\x911\x89\x9a\xcf\x1beS\xa3ljq\xe6\x80\xb2\xa9\xf5\x94M\xcd\xb2\x84lj\x03qT \xec\x02\xe5Q\xa3\x00\x0c\xce\xbfS\x00\x06\xcb(\x00\x03\x05`\x18\xad(\x92\x92\x82\xa3$\xa1(\x14\x80\xe1X\xec$\x039)\x82\x9b\xa4\xa3&\x14\x80\xe1\x18\xb4$\x05+\xc9@J(\x00\x03\x05`\xa0\x00\x0cX$\xa4(\x0e\x92\x83\x82P\x00\x06\xdf\xcf\xa2\xc8G\x02\xee\x819\xba\x9f\x82yP\x00\x86\x9c\x18\x061\x8c\x83\x020$\xe0\x1aHT\x03\x83i\xe0\x10\x0d\n\xc0 -\x07\xc3H@0(\x00C\x01\xc4\"\x8aW\xe4\xa2\x15\xde7'\x05`80\n\xc0\x90\x81D\xc4q\x88T\x14\"\x01\x83HF \xd2\xf0\x07\n\xc0\x90\x868P\x00\x86\xc1(\x00\x83\xb6\xe3\x020\xa8\xacS\x93\xa8\xee\xfa\xac\xb6'\x1c\x81\xe5\xfbTA\x19\xac\x048\xea\xbc\xba\xaf>\x97\xa2\xa8\xf5\xf2\xa1\x94v\xdfO6\x1fB<\xc3c\xb37\xfe\x04>\xf4\xe2\xdd\xee\xad\xc1\xf4\xa5`\x12\x04\xac[\x99F\xad\x1d\xb2\x00\xc8\x95\x84Xs\xab\xe7W/e\xee\x9fa\x17\xa6R\xf3\xc9\xd9\xac=RS\xf3\xccZ\x84R\xca\xa5\xb4\x96g\xc3\x8eR\xca\x95m\xdcx24J)W\xa2\x15)\xa5\x1c\xa5\x94\xfb-\xa7\x94\xf3\x05}z\xfe\x8b\xf9O\xf1\xef\xea>\xa1\x10P\xe1dsR\xa9\x10\xff\xa2b@\x0dk!g\x04\xa8G\xa65\x1ex\x00\xa8\xa2Xj4\x8cSTI\xc3\xc3\x94YQ\x9a<\xd1\x98\x82\xb1\x98NR\xe6#\xa20\x85\xcb\x19\x8a\xc0\x14\x8f\xbftL\xf4\xa5\x80\x84\x1a\xecR\x10\xedV\x80\xc0\xd4\x10\xcf \x90R\xa7\xb2,X-\xe0/)\xdaRQ`-\x8a\xac\x95\x86\xd6\xf0\xd8Z!p-\x0f]\x0b\xb8K\x8c\xaft$\xbeV\x1a`KD\xd8\nCli\x18[\"\xc8\x16\xea\xc3\x19\x11\x95\x8a\xc2l(\x9c\xad \xd0v,\xd2\x96\x05\xb5\x15\xc2\xdar\xc0\xb6\x803t\x04\xa5\x13\xc0m\xa7\xc3\xdbN\x02\xb8\xa5!n\xc5!7,\xe6V\x14t\xc3\xa3n\xc9\xb0[:\xee\x16\x9d\nq\xb1\x92\x8eF\xde\xa2q\x92P\x0b*\x04\xf8\x96\xb2\xeaJ\x86\xdfB/Att$\\\xf9\n\"p)\x10\\a\x0c.\x0f\x84\x0b\xf5 TD\xa4L\x18\xce\xe3\x8d\xa3\xa2!\x95\x01\xe2\xd0T\x17\x02\x8aK\xc2\xe2b!1r\xd0\xb8\x98O\xaf\n\\\x08\x90KoL<$\x17\xab[\x06(\x97\x89\xca\x85\xc3\xb0\xc4q\xb9\xb2\xc0\\\x19d.D\x08\x14\xc3\xe6\xd0\xe0\x1c\x0e\x9d\xc3\xc2s\x88\x9e\x93\x0e\xd0\xa5 t\xe1\xb8FE0\xbaD\x90.\x0f\xa5K\x82\xe9b\xad\x1e\x8ee\x14\xb9\x16\x0f\xd5\x95\xc3\xea\xa2\x85\xf2\x8e\xa0rp\x1d\x02\xaf\xcb\x07\xec<\xeex4rQQ\xc8.\x86\xd9e\x82v\x1e_\xf1\x88Eq\xd8.\x1c\xad(\x14\xab\xa84rW\x1c\xba\xf3cw%\xc1;\x0cz\x97\x0e\xdf%\xe1w\x19\x00^*\x82\x17\x89?\x14.\x1d\x16\x8a\xc2\x82x\x19(^\"\x8c\x17\xa8n\x0e\x90\xe7q\x85\x888\x94\x03\xe5\x05\xba|<\xdaPA0/\x1ai\xe8\x14p^\xa9\xbe\x98\x00\xe8\xa5 z\xee\x95C(\x8aPt\xab#-\x82P\xa9\xf8A\xa8\xc8\x1f\xa8\xc0\x1f\xb3P\x1f3\x7f\x14\xf7\x83\xe2~\xb8\xfeNq?,\xa3\xb8\x1f\x14\xf7c\xb4\xa2\x92i\x8a`\x9a$\x97R\xdc\x8fcE\xd2\x0c\x89\xb4\x88@\x9a.\x8fR\xdc\x8fcd\xd1\x14Q\xb4\xb0$\x8a\x13D\x0b\xca\xa1X1\xd4\xb1x\xa7\xb8\x1fSC\xc8\x9f\xd8UR\xb2\xf4Iq?P\x82g\x8e\xdcIq?|?\x8bJ\x9c \x02'&bD\x8a\xb8Iq?rBg\xc4\xc4L\x8a\xfb\x91 `\"\xe5K\x8cx\x89\x93.)\xee\x87\xb4\x1c\xb12A\xaa\xa4\xb8\x1f\x05\xa4\xc9\xa80\x99+Kz\xdf\x9c\x14\xf7\xe3\xc0(\xeeG\x86\xfc\x18\x17\x1fS\xa5\xc7\x04\xe11YvL\x13\x1d)\xeeG\x9a\xccHq?\x06;\x85\xb4X\xa2\xcf%\xc8\x8axQ\x91\xe2~\x18{\xc8q?\xac\xf3\xbe\xf1'0\x1cn4\x85?\xaa\xa8\x87*\xa2\xeb\xbce\x91\x03\xcf\x1d[\xd7=g\x1d[>\x1b~\xef?\xddl\xed\xec\\\x0d\x17\x8eI\x1f\xdcg\x9e\xcd\xef\xc6F\x12o\xfb\xc1\x91)\x8e\xfe\x87\xd9\x11\xe8\x83\x9b\xe8\x9f=\xe0\xd3\xd0\xa6\xc87\xb3\x06\xb5\x8d\x7f\x03\x996z\xa4:i\x9b2pD9\x9e\xa5\x06\\\x93\x97\x98\xf3\xcd!\xe6\xba?H\x15|t+Y\x05\xeb\x0c\xb8z?[\x8d\xebt\xb7\xac\xfb\xdd\xa6\xba\xbf9vG[\x17\xeao*\xd0\x89x5\x8d\x9a\xaf\xbe\x87 \xaf\xa1B\xd0\xc4\x8a\x16\xeeV\x87\x93\xc5\x8c\x96Q\xcc\x84\x02f\"}f~X\xdd\xb3\xbb<\x9b\xbb\x8cQ\xaa.J\xd5\x15\xeb\xad\x94\xaaK-\xef)U\x971g\xaa\xae\x83a\xa8\x81\xbd\x83u\x11\x8a\xdds\xf9z\xeeZ\xc9\x89'E\xdc\x1eq{\xb1W||ZPF\xdc\x1eq{n#nO\x1aq{\x87F\xdc\x1eq{>#n\x8f\xb8=i\xc4\xed\x11\xb7G\xdc\x1eq{\xca\x88\xdb\xcbA\xdf\x88\xdb#n\xcf2\xe2\xf6\x1cF\xdc\x1eq{\xc4\xed\x11\xb7\xe7\x1d=\xc4\xed\x11\xb7G\xdc\x1eq{Y\xdc^\x84\x98\xfa\xfa\xf4\x1b%\x7fJ\xcb\xacC\xc9\x9fN\xd8\xb8\xf1>J\xc9\x9fJ\xb4\"%\x7f\xa2\xe4O\xbf\xe1\xe4O.\x16\x1a\x9f\xf7\xe9\x00>L\xa1\xa1\x13)\xe8G\xa6\x8d\xfeu \xe8\xa2$d\x14e\x8e\xea6\x05\xf8\xbdr\x08s\x10F\xfd\xcaI\x9a0\xe02\x06[\x8e>\x81\x82\xc82\x02X\xc6\x16\xa7\x14\xac\x1c\xea<\xe5@e\x14\xa6\xec\x84\x94\x13\xf1\xc2\x92t!\xc1\x85\xda\x08.$\xb8p4\x82\x0b .\x1c\x8d\xe0BNp\xa1\xdb\x08.4Fp!\xc1\x85\x04\x17\"WI\x04\x17\x0eFp\xa1m\x04\x17\x12\\\xe80\x82\x0b .\x8c\xf6\x10\x82\x0b\xfd\xd7\x10\\81\x82\x0b .\xf4w\x01\x82\x0b .\xb4\x0d\x0bz\x11\\(\x8d\xe0B\x82\x0b\xffu\xe0\xc2\xc4\xd0z\x87\xc8\xc4P\xa5cK^*\xd2\x9e\xf8\xce\x97l\x89||\x81\x08z\x97\xf2\xefN6d\xdb.\xf7\x1bfu\x00}\xed\x8c\x05\x91\xb7Rn\x1e\x99:>P\x0c\xc4n\x0c\xdb\xbc\xae *,\x8a\x8f\xb0e\xd5I\xae\xa4w\x86\xd6\x83\x88\xe0 !\xd1\x13b\xa5S\x16\x13?!\x18v\x0e\xa2\xca\xf0hq\x86C\x99\x83\xe4\x10\xed\x03u\xd3\xd7K6\x99\x10\xbc^\x94\x8fh\xa1\x83\x1b\x960\x96\xe5Z\xfc\xcf\xb48\xde\x8b\xec\xeeY\xac\x00\x81\xcdPa\x8f\x8dx\xf5\x04\xce\xbfp\xd6\x88W\xa2U\x8eYC\xfas\x16+\x93/\xc0J\xacOk\x0e\xd5n\xb7\x91b\xb3/\xeeY\xbc\x84\xefuG\xbfR\xb7\xf7\xe5}\xd4\xbf\x8a\xb5\xaf\x8d\x0d\xef\xea\xc5G\xf1\xf6o\x02\xca\xb6\xda\xed\xef\xda-,\xeb\xd5\x8au\xac\xe1C\xffqo[\xc6j\xf4\xa6\xee\xa5j9J\x16z\x04\xab\xdb\xa8\xb5D\xc3>\x8f\xb7\x11\xe5\xf5\x8d\xbfz\xf1Q\xb4D\xdd\x99\xaf>_U\xda\xc6Q^]V=\x17O\x9a\xd67 O.tg\xd1T\xee\xe2\xa4\x8c\xe2b\xf4\xcd\xaf._\xcd|\x11\x19CdLl\x92\xc3(+@d\x0c\x911\xde_\x12\x19#\x8d\xc8\x98C#2\x86\xc8\x18\x9f\x11\x19Cd\x8c4\"c\x88\x8c!2\x86\xc8\x18eD\xc6\xe4\xc0%D\xc6\x10\x19c\x19\x911\x0e#2\x86\xc8\x18\"c\x88\x8c\xf1\x8e\x1e\"c\x88\x8c!2\xe6\xb7@\xc6$P\x18\xfe\x08\x1f\x164\xe0\x0e\xe3\xa14I\x17\x9f\xa1?Z%\x87\"\xfeC\xa5\x1f\xd2\x1a\xa6\xf8\xca\x8c\x04\xf1\x90\xbf\xd4\x7fz\xb0\xc8\x86\x17\xab\xf8\x16JY4\xccG\xd2N\x11&c!*\xa6\x87\xe4*z\xb5Y\xe4t\x17+\xeeI2\x0e&\xe1\x1eA\xd4\x03\xd1\xa6\x89\x88\x07\x02\xef\xc0\xdf4\xb0\x93\x97\x8ct\x04w\xe6q8\x87.\x95\x97\xd3\xa8n\xdb=\x97\x81<\xa6\x93\xc6\xcc\x15\xe5\x0c\xa4\x9c\x81\xf1.N9\x03{\xca\x19h\x993g\xa0\x1bO\xd2\x0b\x10,\x9fdVB\x04(\x11\xa0\xe4\xf8;\x01J\x96\x11\xa0D\x80\xd2h\x04(q\x02\x94\xdcF\x80\x921\x02\x94\x08P\"@ \xb9J\"@i0\x02\x94l#@\x89\x00%\x87\x11\xa0D\x80R\xb4\x87\x10\xa0\xe4\xbf\x86\x00\xa5\x89\x11\xa0D\x80\x92\xbf\x0b\x10\xa0D\x80\x92mXX\x84\x00%i\x04(\xfdZ\x00\xa5\x13\x87\xee\x89\xf0G\x96\xdb\xf488\xa9\x11|(=`Z\xee5J\x0fx\xc2\xc6\x8d\xf7QJ\x0fX\xa2\x15)= \xa5\x07\xfc\xb5\xa6\x07\xc4\xa2\xc32\x1f`\x1f\xcf\x06\xa8\x00Cg\x06@\xf9\xa7\xbb\xea\x93y\x87\xad\xebO\xac\x81a]\xe0\xa0\x86\x1f\x99:?hh\xb8(\xb7\x18E\x7f\xa3\n\x0c\x9e\xb6+\x01\xfd~\xe5,} \xb0o\x00\xf5\x8d\xb6a\x12\xe6\x1b\x85|\xb1\xb7\xf3*a%\xf1^\x0c\xdc[\x04\xedE@yiL\x1e!y\x84\xe4\xb9\xfeNH\x9ee\x84\xe4\x11\x927\x1a!y\x9c\x90<\xb7\x11\x92g\x8c\x90\x04\xaf\xbc\xe6\xd5\xe9\x95!\x9e\x86.\x8eE\x8a\xfc\xc5ldr^-\xee\x94\"c\x15\xce\xf3\x08$i\xed\x80\x16\x94\xe1\x0b\xf2r\xb9\xecX\xdfO\x1f\xbb\xa7\xc9\xd5\x9c\x14\xbe\xe7\xd1i)y\x84$\x00\\\xf5\x00\xb9#m,\x95*\x08:so-\x07v'J\xd3\x05\x10'\x0c \x832\x08W\xa0\xe2wh\xd2\x00J\xd1\x06\x90I\x1c\x04\x1d\x8a\xc6ES\x07p\xce\x86b\xc6(\xd0\x06\x05\xdap\xfc\x9d\x02mXF\x816(\xd0\xc6hE\x11\x97\x14\xbc% m\xa1@\x1b\xc7b,\x19\x08K\x11|%\x1d]\xa1@\x1b\xc7\xa0*)\x98J\x06\xa2B\x816(\xd0\x06\x05\xda\xc0\"&E\xf1\x92\x1c\xb4\x84\x02m\xf8~\x16EH\x12\xf0\x11L\x88\x86\x14l\x84\x02m\xe4\xc4\xaa\x88a!\x14h#\x01\xff@\xa2\x1f\x18\xec\x03\x87|P\xa0\x0di9XG\x02\xd2A\x816\n \x1bQ\\#\x17\xd5\xf0\xbe9)\xd0\xc6\x81Q\xa0\x8d\x0c\xc4\"\x8eW\xa4\xa2\x15 XE2R\x91\x86SP\xa0\x8d4d\x82\x02m\x0cF\x816\xb4\x1d\x19h\xc3\x13\xc5\xc1r\x91\x1e\xb3\"5\xbc\x86:\x92}fT!_\xf1g\xbb\x04\xb9\xca\xceA\x7f\xf3\xa999\n\x8eK\xa9\xc9Rg\x82*L\xb6\xf2\x92\xa9\xb6\xd8\xaa\xca\xc4\xdf\xe1FD\x86\xaa\x92\xa5\xa4\xcc\x14\x93y\xf3\xcc\xd4\x93\x1c\xc5d\xa6\x8c\xcc\xef0\xbdA\xae22( S\xf7\x07\x8b\xac\x1c\x05\xc4\xa7t\x1c\xa5n\xa0\x14\x0d\xacr\x91\xadV\xe4*\x14n%\xa2\x90\xfaPRq(\xa42\xc4\x94\x85<5!\xa0\x1a\xa4+\x05AE\x00\xa1\x02\xe4\xee\xfc{v\xf83w\xf5s\xb2g\xcd^\x93\xb3\xb7\xa1\x1c\x1b\xd65\xa1Wa\xe6\xf6\xfd\xb8M\x7f\xd8\xe8e\xeb\xe6\x11+\xc6\xf8Z\x07\x01[B\xd8\x9f\x15w\xe6CofE\xedc\xa9^\x80\xaa\x0d'W\xc9\xb7v\xdd\xc3\xba\x959\xc1\xda!{\xa3\xfc\n\xafW\xd6\x85r\xfa\xdb\xf4\xed\xd8@\x85\xdb\x832|\xa6\xb4V\xa4\xf7P\x86\xcf2\x8d\x1b\xcfMI\x19>K\xb4\"e\xf8\xa4\x0c\x9f\xbf\xe1\x0c\x9f\xea'\xbf\xa8\xff\x88e\xf8\x94\x1a\xb9?\xe2$>\xc3\xa7u \xe2\x81G\x9b,z:#\x1a3\xd23\x9b\x8d\x86?SP0Z\xe4W-\xad\xf7\x8cP4F$\x8fD\x88\x0c\xc6\x87\xe4\x88\xe8\x90\xf1\xd8\x90\x05#C\x06\xe3BF[\xbeDL\xc8pDHl\x11\xf0\xd1 C\xb1 \x83\x83\x0e\xa2\x03\x0f \x8e\xb9#\xaa\x04HTJY\xd6\x96h\xc0_R\xf4\xc7\x9c\xed\xd2\x80\xbbh\xe4\xc7\xacm\xd5\x80?,\xf6~\xc4\xf6\xeb\xd4r6c\x03\xee\x12\xe3=fl\xd4N-k\xdb6\xe0/ \x81\xcf\xdb\xd2\x0d\xb8K\xc1\xe0\x13\xb7{C}8#\xc2c\xceVp\xc0\x1d\x02\x87?r\xcbx\xee\n\xb1\x81\x1c\xb8\x1e\xb9\xb5<\xb5\xec\x8d\xe6\xa9\xa5o;\x07\x9c\xa1#:\x16\xda\x9e\x9eZ\xc9\xcd\xea\xa9\x15\xda\xba\x9eZl#{jy\xdb\xda\x91\x19?\x8e\xc9\xe7l\x7f\x87:\x08\x12\x95Gm\x93O-u\xd3<:\x15\xe2b7fn\xae\xdb\x16\x89\xdb\x88ZP!\xc0\xf9\x94UW\xf2\xee{\xe8%\x88\x8e\xd6\x88+_A\x84>\x05\xa2/\x8c\xd1\xe7\x81\xf4\xa1\x1e\x84\x8a\xd0\x98 \xd3{\xbcqTt\xc62@=\x9a\nG@\xf5IX},DW\x0eZ\x1f\xf3\xe9\xa5\xc8\n\x01\xf6\xe9\x8d\x89\x87\xeccu\xcb\x00\xed3Q\xfbpX\xb88n_\x16\xb8/\x83\xdc\x87\x08\xc3b\xd8=\x1a\xbc\xc7\xa1\xf7X\xf8\x1e\xd1s\xd2\x01\xfc\x14\x04?\x1cg\xb1\x08\x86\x9f\x08\xe2\xe7\xa1\xf8I0~\xac\xd5\xc3\xb1\x15#\xd7\xe2\xa1\xfcrX~\xb4P\xde\x11T\x0e\xceG\xe0\xf9\xf9\x80\xbe\xc7\x1d\x8fFR,\n\xe9\xc70\xfdLP\xdf\xe3+\x1eA1\x0e\xeb\x87\xa3'\x86b'\x96F\xf6\x8bC\xfb~l\xbf$\xb8\x8fA\xf7\xff?\xf6\xde\xaf;n\x1c\xc9\x13}\xafO\x11\xb7\x1e\xb6\xabf]\xaa\xed\x99{\xee\x83\xcf\xed=\xd7-\xcb\xdd\xdaq\xd9ZI\x9e=\xb3{\xe6\xa8\xa9L(\xc5q&\x99C2mkw\xfa\xbb\xdfC\x04@\x82@\xe0\x0f\x01\xc8\xe5\xaeA\xbc\x94+E\x06\xfe\x10\x08\x00\xf1\x8b\xf8a}\xf0\xfe\xaa\xf0\xfd\x88\x00\xfe\xb5!\xfc\x1e>Dw\xedB\x83\xaaC\x03\xf9#B\xf9W\x06\xf3;\x9a\x1b\x13\xd0oQ\x15\xc0\x80\x18\x13\xd4\xef\x18\xf2~\xf6\xc3\x8c\x81\xfd^\xe6\xc3\xe7\x08\xee\xcf5\x16W\x04\xf8\xaf \xf1\xb7\xed\x1c\xd6\xb1\x1a\x06p\x1az=$a|\x86)l\x86\xa9\\\x86\x01,d\xebH\xc8\n\x07Y\xe1 \xa3\xfe^8\xc8\x14)\x1cd\x85\x83l\x96\xac\xf0\xeb\x1a\xf0u\x15\xf4Z8\xc8R\x01\xd7\x08\xb85\x0b\xd8\xba\x1ej-\x1cd)\x10\xeb\x1a\x8053\xbc\x1a\x06\xaef\x84VC\x81U\xe2 P8\xc8\x96\x12\x00\xa5\x86\xee\x92V\xc3\xa8\x85\x83,\x08<\x8d\x81N\x0b\x07\x99\xed1/\\\xba\x02,\x0da\xafZ\x03\x94\x16\x0e\xb2\x18\x1a/\x1f0Z8\xc8V\x80\xa1\x81Ph\x08\x10\x1a\x06\x83\x16\x0e2.1\xc0\xe7\n\xd8\xb3p\x90e\x809\xbd g,\xc4i]9\x0b\x07\x99!\x85\x83,\x02\xca\xf4\x03\x99ka\xcc\x15 \xe6j\x08s\x1d\x80Y8\xc8\xd6A\x96\x85\x83l\x92\xe7\x80)s\x8c\xb9\x15\x10e8@\xf9\x8c\x1cd\xe3X\x98\xbf\x92\x00\x10\xa7l\xdf\xaf\xcdF6%&\xfb\x9b\xf0\xebT\xd5\x97\x85=\x1e\xeb\xf7O?\x7f\xfa\xfd\xcf\x9b\xba\xdb\x9c\xf6\xd5P7\xbb\x9f\xff\xcf\x965\xed\xc1\x91l\xad8@\xce\xe7\xf7x\xcb$.U\x1d&\x8a\x80\xf6#kzP\n\x90\xab\xfc\xa1\xea>r\xa4z\xd2\xb6p\xe7c\x966\xaf\x8b\xf8m\x91\xa8\xad\x94,\xfe\xfc\xcdfk+m\xbf\xc3._\x01\x86:!l\xa5\x13\xfc8\xb6i\xb9\x10\xd9V\xbf\xe1\xf5\xd5\xb9nq\n\xbe]\xf0m\xb7s\xf7\x19\\\xc3\xae\xb5C5 \xa0\x0f\xbfM[\x0b\xa3\xb1d\x81P\xed\x0f\xce\xc1\xdc6x\xaa^=\x1e\xfa\xba;\xf6\xe5\xd86\xac e\xc1\xd1_C\xb6\xa1\x87j3\xb4\x1dz\xef\x87\x16\x8e\xedg<[\xc9\xc7\xe5_\x16\xaa6m\xf3\x89u\x83\x89\x8e\x8a\x86\x0b\x90w\xcb\xfa\xb1u\xda\xe6*\x95\x15%\xf7\xca\xc4\x89`\xfck\xd2-\xe7\x8bQ\x97 d\x90\x11M\x16\xcb\xb0gM\xb9U\x98v\xbe\xd9\xd5\x84\xb7+\xf3:\xc2\x1b\x1e\xb4\x82\x885\x03\xbb\xbb\x04C\x95\xc5\x82\xf8{Y,\xbcf\xb1,\x16\x19\x17\x0b~\xc4\xc0\xc6\xf3%\x83\x8f\x87\xde\xbeV(\x9dy\xc5\x1f\xc5`\x1c6\xf6!\xbf\xe4\x17G\x02\xda2\xe9\x80\x18N\x9d\xf4\x80)\xc5M\x8a\x0e\xed\xf6\xb4g\xbf\xeb\xe7>\x9cG\xa5\xec\xa5\xc5Z\x83%\x8b\xbf|\xb3\x8b\x8d\xda\x95\xaa,*s\\v\xe2\xc0\xfd\xe0\xb2\xf1r\xe9\xc5\x0e2\xbd\x86N{\xe4\xb6F|\xe6\xdeM\x91\xcc\x0f\xcc\x19\xc8\x9cD\xbe\xe4`\xf7\xf1\xd5\x12\x85\xd7\xd5\xfe\xe7 \xd3\x07\xe2X\x9d\xa8&$\x98a\x94s\xb4\x8erf\xf0a/\x82\x11\xb09\x92\xd2\xafj\xb6<\xdc\x81W\xce\x15\xf7\xf2\xee\xfd\xed\xc5K\xee$\x17\xfe\x01\xf46\xd7Y\x1d{\x11\x85\xb1\xf9F\xbc\xc7\x8d\x8a{O2N\x9d\x076l\x1ey:\x96\x92\xdd\xa9\xda\xe5)\xadf4w\x95\x12\xe8'\xca!\xb7%\xcbJ\x88'\xbe\xd9\xed\x89\xda\xbb\xaa$\x8cbb\xa0l\x1d\x14\xdb\xc2\xde-\xbbm\xb2{\xear0\x19\xbf~\xe8N\x9bqA\xb2xe\xb5q0\x7f\xfdb\x03\x8b\x0d\xfc\x9a6p=\x80\x97|.^u\x02TR(\xc6?\"\x9f\xf1\xd9}\xd5\xb33\x9c/\x9f~\x7f\xcf\x86\xea\xf7gHv\xffo'\xd6\x8b)c|,\xf3\xf3|d\x8aw\x8d\xac+\x19\xd1l\xb7\x159\xc8\xf8\xb3R\xf1\x93D\xfc\xf8p`\xcb5\\\xd4\xde\xf6,\x04\xfa\xb3\xba4\xf6|\x93\xe8|\xd9\x05\x9c\x8f>C\x0f,v\xc69I\xee\x0d\x8a\xfb<\x04\xf7\n\xf1\xba\xdez\x9d\xea\xdc\xde\xce\xac\x04\xf4\x04\xfd|*\xf9\xbcA8\x9fJ7\xcf\x1fYNsU\xfd\x92j^0\xbc\xc7wo\x02E<\xd7\x8a\xb4\xf0\xea\xcc4 \xe2\x1d\xf4\xf0\xf4\x0c\x97\x91,7\xedA\x9aY3:\xe5M\xdbB\xdf\x1e\xd8\xdd\xb4\xaa\x90\xd1Y\x8a\xa9V?\x9c\x1a\x98\x85\xf1%\x02\xcf\x98*\xa1\xbeX\xcb\xa94\x05\x08\xd5\x0d\xee\xa3:\xf1\x84\xa8r\x8f\x01\x86\xd2\x86\x08U\n\x81?\\| YZ\xd0t\x07\xaf-\xd2\xc4\x07\x1a\x99\xc0\x05fZ8\x84\x95\x99\xd6\x108V\xbd\xf0 +\xbdt\x86\x7fW\x14\xcc\x0ep\xd7\xd2r9(\xf1W\xdc\xde\xa8\xe9\xc7\xc3#\xeb\x18\x1f\x84M\x0b\x87\xb6\x93\x13|r\x82\x92\xf6%\xcc\xba\xea\x9f|R\x87\x1f\x9c\xb6\xa9Jb\xd9\xc3\xa2\xf9\xf4\xe5\x1a\x9f+>\xb3^@=\xf42?q\\\x87p'\xbf\xc5\x94\xad\xcf\xb5\xf0e\xd3\x1fC\x1d\x13\xce\xb1(\x1e\x99\x06\xe3g\xdey\xf3\x89`\xd3v\xf8\x10\xcf\xf9\xd5\xc6.\x0f\xb2\xe3+\xa6\xda\xaai\"/'\xa5(\xc9\x98\x95\x1d;\xe2\x11\xf1\x8fU7u\x99}^\n5|d\xe8SR\x9d#rv\x9c\xb7u\x13<+4\x17)12t\xf7\xa7\xf1\x08\xfd=\xa2\x1d\x99\xf8z\x94\xd7R\xf3N\xa2\xa6\x10W$\xfa\x17d@h\x7f\xf6\xe9\x1f\xce^\x1d\x8fo\xeb\xe6c\x7f\xa58\xe3\x03\xfa\x93'\xc7\xd5\xc3\xd3\xddV\xc4\xf7yf\x9d\x98^\"Kdz\x1d\xe4\xebp\xcf3Sy\x0f\xcd\x19\xb7\xb0\xaf\x9b\x8f\xc0\xbe\x1c\xebN\xa4\x81Ir\xfdE\xadE\xff\xeb\xe0@\xc7\xf6|\xf8 \x94\xa9:\x1e\xb9\xbe\xde\xda\x11\xb2\xd8QupO\x9cz\xf5\xa6\x00W\xe3\xf1\x96\xb0Va)\xe1\xcd\xc3\xf4\xe9vS+,%\xdbjPN\xce\xb2\xf3\xaa\xa1\xd2xJ\xf0\x94\x89\x1b\x96q\xd9\x96n\x98Q\xb1V'\xed\xf4H\x9f\x19\x95\xbe_\x1e\xf7\xac\x87<\xc9\xc0\x82\x1d<}8\x1e\xf1\xfc\x03\xdb\x9d\xc1\xed\xe7z\x18X\xf7\x02\xfeT\x0f\x7f>\xdd\xbf\x006l\xd4t\x90\xb1\xff\xf8\xb1oUy\x1f\xc4[2\x93\\-[-v<\xdd\xc9\xa2A|\xeeE\x15\xfaa\xc1Q#\xd4\xdf\x8c\xbf\xca} \xd1\x99Z\xc5XsZ\xe0/?\xc1\xab\xab\xab\xb7\x97\xe7\xafn/\xdf\xbf\xbb{{\xf9\xee\x1f\xefnn_\xdd^\xdc]\xbe\xbb\xbc\xbd|\xf5\xf6\xf2\x7f^\xbc\xbe\xfb\xf0\xee\xe6\xea\xe2\xfc\xf2\xcd\xe5\xc5\xeb\x90W\xff\xe9\xe2\xfa\xf2\x8d\xfc\xfd\xe6\xf6\xd5\xf5m\xc4{\x17\xd7\xd7\xef\xafW\xbfu\xf3\xe1\xfc\xfc\xe2\xe6&\xe4\xbd\xdb\xcb_.^\xdf\xbd\xffp;=,\xddI\xb1]b\xdf\xaf\xae\xed\xe5\x97\xf0\ng\xdc\xb8\xb8\xfd+\xe6\xf9.\xb6\xd7\xfc\xc0/\xd8L \xa0\x1c\xea\x93\x98\x85\xf4C\xc5o\x04\xbcg\xe3B\xfb\x89u\xc6]\x87a\x05\xf0o\xb7P\xcf]cl;\x1aQynG\xf5b\"\x1c\xbbv\xc3\xfa~}Q\xe2\x83/\n[V_\xf1\xc1.I-\xfc#c\xa1u\xa8\x0f\xe3\xc6\xe7\xc4\x17\xba=\x83\xcfU\xcd##$~\xa3\xb6G\x14\xd3v\xd5f\xcf\xee:\xd5\xe7\x02\xf3\xd4}\xcf\xff,w\xebSH\x81\xf4\x93\xe2\xcf\x18\xec-/\xa49T[&W \xd4\x1ec;\xf5\xdb\x82\xac&\xccq;\x90\xbcG\xe7\xb5\xdcg_\xbe\x9e\xa3\xbcy\xd5\x95\xc7EG\xe0\xf40\xaeVJ(\x1e\xbb\xf0\x86\xeb\xc5\xaa`5\xaaF\x94 X\xa6\xf2\xee\xa6\xda\xef\xef\x96\xab\x96\xa2\xf0\xbc\xda\xef\x89\xd5k\xfce\n(a\xddX1\xe5\x1b\x10-vxB\xed>P\xeb\x9a\x06\xae^\x02\xfb\xda\xb6\xbcN\xaa\xfd\xdc\xb0\xae\x7f\xac\x8f\x8a\xcf\x8b\x9a\xe4\xf6N\x82\xc0z\x90H\xf1X\xb9G\xf6\x05X\xb3i\xc7\x03\xc0X\x06\xf6,\x1f\xe3s\x9ddG\xf3\xba=Y\xb0b\xa5\x99\x14h+@\xdd\xb9\xcd\xea\x08\xd8\x8f\x87\xb8\xf0ahk\xd49\xd7s\xf9Z\x9f\xba\xf3L\xc0\x92\xe69<6\x99Q\xe9\x87\xd4`\xc5s\x88a5\x16\xe7>1T\x0f\xdc\x10I\xe0[\xf8\x92D\x1dT\xbb\xa4z\x0f\xb9cp>\x16r\x17\x0f\x87\xcd\xf9\x86\xa2\xee\x01\x8d\xa1\xbe\xa2\xae03\xc2\xf0\x92\xf3\xec\x06\xff\xa6v]\xa5\xa2e\x845u\x94\x0f\xceie\xc1\x04B\x06\xf2\x9f\xd9\x97\x9f\xe4x\x15\xbe\xc3\xd9\x1e\xf3\x83\x0c\x9e]\xf8~\x1e\xf7l\x9a\xaa\xe9\xb0\x13W\x01r&\xa9\xb5\x9a\xf4k+\x85`\x0e\xe2\xb5\x1b\x9f\x11\xcb.\xa1M\xbf8\xf9\xa1\xaa\xf7L\x9f\x1bX\x9b7\xfcO\xcb\x8f\x86\x8fg\xfd`\xeb\x81\xb4\xa9\x86\x17\x1c\xe4\xe3]\xb18\xad\xe0Aw\xfcLc}O\xdd\xe4[\x90aS\xe3\xf2\xee9\x1c\xd9\x89\x1e\xe5\xe2!\x94q\x92G\xcd(\x0c\x06\xf1#\xdfY\x98\xb4\x8f\xfc\x0c\x99\xafN\x17\x93\xba5\xb5\xaa\xf7{q\x98\xfdN\xd1\xa5\x1d\x99\x84\x15\x13y*\xf1\x7f\xf9\xb4\x13\x89\xbe\x83\xa0f\xdc\xe4!\xe4d \xa6\x8b\xabVn\x82\xd9\xef\xdb\xcf\xb31\xe2\x1b\x87\xfe%\x88\x0f\xf8\x02xg\x8f\xff\x10\xdd\xf1\xe6\xc3\xdb\x17\xa0\x0eb\xc2\x08\xfc\xb1nW\xfa\xf7\x0e\xd5\x97\xbb=kv\xc3c\xa0\xa9\x9cp\x04\xd1\x1dS\x91\xb6\xd0]\xc5;'\xaa\n\xf7u\xbb\xeb\xaa\xe3\xe3\x13\xdd\x8a\xf3\xc7\xaan\xce\xdb\xe6\xa1\xde\x05\xb7c\xe9Yr\xfbt\x15\xfd\xb4\x11\xe6\x9b\xcf\xf1!\\\xf7L?\xdex\x90\xb4\xf8Y\xb9\xf2\xe7t,\xaa\xdd\xbce\xfd \xfd\xce\xb2s+q\x1f\xe9\xd0\xaa\x0e-\xf1\xab^N\xd0Nt \xc3J\xac\xfb wdg,;-\xb1\xfd\xb2s\xd2\xc60\xd1\xd2\x8c\xb3Q<\xb3\\\xb5\xa6\xc8\xca.;\xc4s\xcaF2\xc9\x1a\xfc\x9bn\xfe\xd8(\xd6\xd8(\xae\xd8\x99\x13\xd6\xe8#\x0bCl\x0c/\xac\xc2\xff\xaai\xb3\xb0\xc1\xc6r\xc0N\\\xafzk\x08B\x99\x18\xbeW;\xafk\"\x9bk\x10\x87k8Wk\x02Ck,/\xab-J>\x1b\xebj^\xae\xd5l\x0c\xab~^\xd586U\xca\xe9b\xe1P]\xcf\x9c\xeaaH\x1dBxQc\xd9P\xad\xac\xa7\x91\\\xa7\x84\xb7\xc4\xeb\xa05\xd8L\xdd+h$s\xe9\xccPJ\xf5\xefw\xfe\xb2\xe3\xb8I\x97<\xa4\x8a:\x93\x914\x03\x0fi\x02\xfb\xa89\xca\xf5\xc50\x81i\xd4\xc2*\x9a\xc2%\xea$\xc1\xb4\xf0\x86z\xd9BM\xca\xbapfP\xf3\xdd\xbfRm\x8d\xe2\xfe\x0ci\xac\x8f\xe7\xd3\xde6/\xa7\xe7\n&O\x9dW\xd0\xc6\xda\x99\xce\xd5\x19\xcf\xd0\xb9\xe4\xe7Jd\xe3trp\xda\x997]|\x9bdo\x85rk\xfa\x185u\x1e\xcd\x04\xf6\xcc\x00\xce\xccp\xa6L/?&A'i\x14G<\xe3\xe3\xbdLc\xbb$+\xa5\xfc\x12\xc5gi\xe3\xaeLa\xac$\xd8)c9)I\xfe\xc9\x04\xd6I\xe3@`\xe3\x95\xd4 \xeft\x0e\xc9<\xcc\x91\xf1|\x91\x1a7d\x14#\xa4\x95\xfd1\x8c\xf3\xd1\xcb\xf4(\x0e\xff>~G\xf1\x98\x93\xd5\xd1\xa094K\x0b\xe5\xd0s\xf36\x06\xb25\x06p4.\xaa\x9c\xc0\xc7h\x0c\xc5\x04\xc6E\x8a]1\x8eS\x91\xe2O\xcc\xc7\x9a\x18\xffu\xbd\x0c\x89>^\xc4\xd9hS\xc0\xe6+\xe1\xf1\xb3\xfa2\xd9\x97\x81u\xe34D\xa7\xa6\xe2!\xbcW\xf7\xbb\x9b\xb6ix\xc6\x82\xda\xf2 \xf9{\xcd}\x9d\x1aN{\xec\xda\xf6\xc1\x00\xd9\xaf\xc6_\x97\xd5\x99\xa3'\xf8+\xee\x9a\xcd\xfa\xc2\x9d\x94\xc7\xd3\xfd2\x1a\xde\xfa\xbe]\x07X\x9d\x9d\xe0\x03P\xfd\xa9\xfe\x19\x1d\x9f\xe0t~BV\x07(\xe4t\x82\x82\xcb\x11\ni\xceP\xc8\xe8\x10\x05\xafS\x14b\x1d\xa3\x90\xe2\x1c\xa5z\xcc\x7f\x85V\xb4\x93\x94\xd0\xe5\xbd6+\xc5YJ\xa8s^\x95\x95\xd7i\n\xe9\x8eS\xc8\xef<\x854\x07*\xa49Q\xe9)JV2\x9bk\x15\xb2\xbbW!\xa7\x8b\x15\x82\xdc\xac\x90\xd3\xd5\n\x0ew+$\xba\\\xa99n\xb9\xa6*\xc8\x11\x0b\xc9\xceXB!})U\xa4\x8b\x16\"\x83\xda\x9c\x97O\xf9\xd7\xffH\xb7-e\xf6\x1cWM\xb9\xeb\x91\xe6\xc2\xd5\x94\xb9.\x96\xca\xe0\xca\x85\xdc\xee\\ \\\xba\x90\xee\xd6\xd5\xb4\x99N^Ht\xf4\x82\xcf\xff \xee\x8b\xa2\xbcN_\xb0\xdeU\x12\xee\xfc\xb5\xeb0N\xc9I\x8e`X\xd1\x19>\x870x\xdb\xedu\x0c\xc3:\xe70X\xee\xafq]\xed\x94\xee(\x86$g1\x90\x17:$:\x8d\xc1\xe78\x06\xef\xb5M\xbe\x0b\x9b\xac\xbd\x19\xeaH\x86\x00g2X.fJp*C\x98c\x19V9\x97!\xc4\xc1\x0c\xf6;\x8b\xc8\xe2-\xcf\xfa\x1c\xce\x90\xect\x06WE\xb5_\xb3:\xa0!\xd1 \xad\xa9\xa2/L\xca\xea\x96\x86\xcc\xaei\xf0\\{D\xdd\xc9B]u\x94\xc7U\x0d9\xdd\xd5\x90\xdde\x0d\xc1nk\x08q]C\xb8\xfb\x1a\x02]\xd8`\xbb\xad\x87.=\xd4\xe1\xe9\xbf\x86(\xd0\xa5\x0danm\xa0\x9a\x91\xd3\xbd\x0d\xa9.nM\x17y\x9dP>\xa77du|C\xf2x\xf0:\xc0!\xc0 \x0e\xc6:d\xcb\xf2\xb9:\xdd\xff#{\xd2\xb35\x8e\xa7\xfb}\xbd\xe1\x8c&Tf\x8b\xf4\x8a\x9b7\xc7\x8b\xf8_c\xa9\x1eW\x12\xb4\xceT\x9e\x9c%u\xa9\xb8\xa4\x8bK\xba\xb8\xa4\x8bK\xba\xb8\xa4\x8bK\xba\xb8\xa4\x8bKz\x92\xe2\x92..i)\xc5%\xedu\xcd\x16\x97tqI/\xa5\xb8\xa4').\xe9\xa5\x14\x97tqI/\xa4\xb8\xa4\x8bK\xda\xd0T\\\xd2\xc5%\xad)\xcb\xe6\x92\xbe\x99\x88\xa64\xaf\xf4#\xc9F%L\xc6\xd5\xbe\xaa\x9b[\xf6E?\x80\xea\xa4S\xc7\xf1\xb9\xbb\x81}\x19\x02SO\xad\x9esY\xa0\xab\x9ah\x04\x05}W\xdd \xfd\xbb~%$L~ \xc2+7\xf5\x86\xf8\x9dG\x7f\xdfm\x14\xca\x0f\x98+i\xa5\xeb\xc0\xe7%\xb10\x19Q>\xeb\n\x8f$\x0f$\xa9\xb5\x1fk\x93\xf9E\x14]\x92i\x04\xbe\x01\xb6\xad\x89\x1dM\xa5\xdc\xd2Yq&\xfe\x13\xa2\xe9S1\xa3\xfda5w\xc5T\x0d\xbf\xab\xa7\xfbit\xed\xc2O\x82\xfb\xaf\x0d\xab?\xcd\xee\xa9\x89\xf6\xb5\x15\xfe\x9cf;\xdd\x01\x85\xff\x13\xd6\x90\x1b\xfe\xac>-$B(}a\x82$\x13k\x8fL\x95:\x99\xa9\xac`X\xb1\x8b\xfe\xbb\x96m3\xa8m-m~\xac\x86\x17\xfc0)\x90\x1euI\x1b7\x01j\xe7\xed\xeaOl\xd9K\xe3?\xeb\x8e\x7f\x0f}Dj#h\xae\x10T\xe2\xfb\x89\x07\xa6\xba\xdc\xb3\xe1\xf3h(\x86\xcf\x1c\xdd\xe9l\xc3s\xa2H\x0d\x18\x8f$\xbd\xab\xab7\xe3\xa8\xcaM\x9arW\x19\x99\xe8\xc9u#j\xe1\xd0U`k\x0e]LN\xe5\xb1\xd2\xfc\x9c\"\xde\xe7\xce\xc1z\xb3\x8eA\xf0]\xbd\xf98\xb6e\xa5M\xfdU\x0d\xe6\xb2\xce\x01Fs\x98\xa9F{h\xc4\xdb\x96\xe1\x89\xf4\xc8+\xbb\x83`iv\xb6\x88\xbe\x9eda &\x82f+S\xee\x82\x00W`O\x92-W2\x01+\n\xb5\x1d\xd98\xb6\xe4$\xeb?\xdem<\xf7c\xc0\xba\xda\xbf\xea?\x9es;\xa9\xd5~\xbee\x05k\xcf\x01.\xdcqT\xfd\xc7\xb9\xde\xb0tR(\x95=\xf0=c\xd6\xca\xfe2n\xdc\x88\xca\x1e\xea\xa6>\x9c\x0e\xf3\xbdQS\x9d\x95\xa5k\xd3\x8e\xc7\x9a\x05\x12\xa3\xf5\xf4\x82\x1b\x91\xe00\xa9\xcda\xa2/\xe7\xeaB\x12\xb8F-\xae'\xe0FF\xfaqL~w%\xb9\x9a3\x08+\xab\xbeP\xa0nK\xe4\xb6\x95\xdf\xe7k$u[\x97\xc1\xb5\xc7\x87\xc4\x05\xd0\x7f3\x82\xfdV\x84\x88\xe2V\xde\x84@\x10\xfc\xcbcu\x96\x1b\x10Vx+\xb2\xdd\xe4\x13u\xdb\x81\xed:\x08O\xd9\x86\xdf)\xdf\xed\x06\x8e\x9b\x0dl\xb7\x1a\x107\x1a\x04\x9f\xd2Rn1\xd0\xef \x01\xbf\x0d!\xae;\xa9\xa6\xdd\xfer0\xc9\xae\x12\xef\x07\x99\x0b\xcaP\x04\x18\x8539\xea\x83\xadC\xf2an\xf5h\xa5\xa6l\xe8G\xce3:-#\x93\x1e\x95\x86[\xcdnW\xd0\xf5\xc0\xcf\x83u\xb3\xdb\xebF\x85X\xcc\xd6\x8f\x85\xe0\xc5b\xe5iI\x9e\xc0\xf4\x8f\x12d\xfa\xa8\x93'\xb8\xac\x8f%\\\x8a:\x85\xae\xd7C\x0d\x9c\xa4\xe3\xa9\xa2G=\xa8\x82\xf0\xcdEu\x99\xee\x00\x05{3\xbf\xc9\xdeMr\x90\x8er_\xb7Q\x1d\x97\xb5\x15\xa9\x9c\xe90m\x7f\xa2\xda\x92\xff\")\x13\xeeJsYh\xda\x14s\xaa\xfdE\xf1\x06\x00\xed\xbe\x80\xcc-Kugh\xea\xa4\x15\xd7&\xde37\"\xc5\xcd\xa1\xa9\x92N\x0f\xea\xeb\xf8\xdc\x1d`sy@\xe6\xf6\xe6r\x81\x80\xdd\x0d\x02!\xae\x10\xb0\xb9C s\x83s\xb9G\xc0\xe1\"\x01\xb0\xbbI\xc0\xe2*\x01\xa0\xdd%@\xb9L\xc0f\xd6P\xec S\x16\xf7 \xb8:\x19\xacn\x14\xcfk\xbe0\xebh\x97\x8a\xa1)\xc5\xafb(\x13~\x16\xe3\xf7pg\x0b8\xc6_>\xa7\x0b\xd8\x1d/`\xb9\xfa\xcd\xdc=C\x06'\x0c\xd7\x9b\xea\x88\x81U\xce\x18\xf1\xf4\x1d\xbf\xcd8j\xa9w\\\xdf\x0c\xaea-\xb7[\xa9\xd78+\xbaR\xafr\x9e\x14 \x05\x8b\x83\x90\xa2B\xde\xdf3\xa1<\x87v{\xb2\x1eWf\xfe\xc2\x80\xd3\x8a\xc11\xb8\xe2K\x0c\xe5\x12\x95\xf4dMk\xa2\xe6\x10\x9f\xa4\x99+A\xb3\\\xa2\x82R.Q\x91\xafgM\xbaLH\xb8LH\xb6$\x0cF\xc6\xb4\xca\xbc)\x95\xd9\xd2)\xfd\xa9\x94\xd9\xd2(\xcb%*\xe5\x12\x95\x15\xe9\x8e\xe5\x12\x15\xd1\xd1\xaa\xc6\x94D\xc6\x90{E\xca%*\x8a\x94KT\xa4\x94KT\x94\xffOH.\x0cH,\x0cO*\xf4&\x14\x96KTR\x92\x05\xcb%*\xa1i\x80\xd9R\x00\xf3\xa6\xff\x85\xa5\xfey\xd3\xfe\xc4\xe1\xdf\x97\xf2'\x1e+\x97\xa8\x04\xa6\xf4%\xa5\xf3\x95KT\x92.QI\xe5\x8c3|!K\xbe8;W\x1c\xc1\x13W\xdc\x8a\xc5\xad(\xa5\xb8\x15Q\x8a[Q\xbe^\xdc\x8a\xc5\xadX\xdc\x8a\xc5\xadX\xdc\x8a\xca\xff\x17\xb7bq+\x16\xb7\xa2\xfei\x8a[\xb1\xb8\x15\x17R\xdc\x8a\xc5\xad\xc8\xa5\xb8\x15\x83\x1dO\xc5\xadX\xdc\x8ak\xdc\x8a\x89T_\x0br/\x8a\xd8\x8b<\xb3\x90.\xcd\x142/y\xfcW\xf4i\xee\x97%\x89\x97\x1er\xab\xdd\x01\xcd\xbdGz&\xac\x88\x9c\xad\x94\xde\xf8\xfc\xc80\x8c\x94\x0f>I\x025Q\xed\xb4P\x813\xff\xec\xbf\x9fX\xf7\xa4\xf8%\xde\xd6\xcd\xc7?>\xc9,\xcdk\xd6\x1f\xdb\xa6g\xc1\x11\x9fcM\xa2\xfc\xb2\xa7^%\xfd\x81\x80X\xdb\x0f=\xf6\xbb\xc1\x06\xa6x\x9e\x95\xf7\x88\xa4[\x11\xb3kf \xb2\xa1\xaa\xf7\xe2\xb8S\xf7\xf3)Ypk)*l\xd1\xf6\xf6X{k\xfe1\xb8\xda\x0c`\xcd\xec\x0c\xa3\xe9\x91b\xd2\xf5L\xea\x03\xca&Y\xd1\x938}\x08}Z\xad\xfb\xa1\x1at/\x840\x1c\xe3_\xa4=\xb0|\x1b\xa2=\xac9\x19\xa9\x0e?\xc1\xab\xab\xab\xb7\x97\xe7\xafn/\xdf\xbf\xbb{{\xf9\xee\x1f\xefnn_\xdd^\xdc]\xbe\xbb\xbc\xbd|\xf5\xf6\xf2\x7f^\xbc\xbe\xfb\xf0\xee\xe6\xea\xe2\xfc\xf2\xcd\xe5\xc5\xeb\xd0\xd7\xff\xe9\xe2\xfa\xf2\x8d\xfc\xfd\xe6\xf6\xd5\xf5m\xe4\xbb\x17\xd7\xd7\xef\xaf\xa3\xde\xbc\xf9p~~qs\x13\xfa\xee\xed\xe5/\x17\xaf\xef\xde\x7f\xb8]\xbc 6\xb1/S\xba\xc9\xed Z\xfb\x05^\xc2\xab\x99e\xef_M\x8c\x82\x13\xefq\x07\xb3\x91P\xe0.\x8f\xfadFa\xe3\xa8\xec\x86q\xe7\xcfF\xc3Kd\xfa\xaf(\x84\x7f\xdbE\x11\xdc\x7f\xbc\xc81Z\xe6\x86\x1d\xbbv\xa3\xde\xfb\xbf\xaa81 \x16\x05.\x9ba\xcb=s\x172\x8d\x9c\x85\xe6\xa1>\xb0-\xb4'\x9em\xb3g\xf0\xb9\xaa9\x9d\xa1L;P\xdb\xa5\x14%\xd8*:\x95EC\x8a\xcd\x18YS\xfe\x07\x8d\xf6mffC\xeb\xc8]\x83\xb9\xe9~\xb6\x0f)v\xd6\x8fIezuV\xb2\x81H\xb1\x90a(\x8a\xf3\xb0\x83LJ\xed\xb9q\xee\xec8\xcf\xaa\x0d\xbe^\x04\xfb\xea\xbd\x9a\x97A\x15G\x07\xc2\x8a:\x91\xab:\xc4\xf38X\xb4i{\x03\xc3\x03%\xc4\xc6:\"\x85`\x1f\x91\x12\xbd\x85Ia%!\xd4\xd9\x06=\xc2z\xa41\xfbw\xbdZb\xd8\x1f\xb8\xad\xec\xda\x83\x98\xe3\xa3\x02Y'\xd5t\xea\x9e\xab\xf7\xcd\x02\xf5\xe2\xc7\x84\xf1\x1d\xbe\x9b\x1ag(\xdaljs\x10a\xe6\xc4za\x9d\xc77\xf8\xf7%\x0d\xcb\xbc\xc8\xd8\x16\x01\xa1#~\xdaZ\xee\x08\x02\xdfX\x81\xb9\xea\x7f6\xce~\xca\n\"\xcf\x81\xf7\x98\xce\xb8\xccDT\xc5r\xb9\xe1TV`e\xac3\xf5\xcf\xe4Qy\xb9\xd6\x89\x03*\xaf\xed\xf8\x8c\xad,\x9c\xa9:e\xf6(\x0fU\xbdg\xd4\xbc\xc3\xda\xbd\xe1\x7f^~d|\xe5\xd9>0\xdf(\xa5\xf5\xe9\xc5\xa8\x02\xbbjqv\x9c\xa3\x96\xc66\xcc\xdc\xdb`g\x96\x06W\xb1\x0fV\x86iP\x16\xbc\xf5,\xd3\x9fGk\xa4\x10L\xa3\xf0\xa4\xd2\xe7\xa9\xe3\xc5\xa4zM-\xeb\xfd^d\xba~\xa7\xe9[\xb2_.]\x114\x1fx\x85:\xb9w\xc3\x9b3\xfc\x1d\x10V6\xcc\xedARr\x0f\xa7n\x9e\xf2B\x9d\xdc\\\xf2x\x0e\xbecoa\xc7\x062\xdd\xf7\xd4\xa3\x9fP\xac(\xf56\xdc1\xf3\x9e/\x89\xab\x9d2\xb8\x92\xean\x99\xbc\xfc\x8b\xa6\xff\xc61\xcc\x1c\xbb)\xeb;6\xc7\x85\xe5\x05\xda`R\xfd\xf9Zx{l. I\x13ek\xc1r\x1f\xc3?1\xefp}\x98\xbf\xc2\xd8G6\xf3ak#\xa3\x17\x1fJ\xbcx\xacv\x82\xe9\xe0\xa5\xae\xeaj\xfa\x93\x96\x98?\xfd\xdc\x891\xa2}\xf3 W\\\xc3\xbe\x0c\xcb\xb4m\x08\xb1\x19\xee\xc8\x0fc\x7f#K\x91\x07\x99\xf1\x9f\x92\xdd\xa0\x17\xdb\xc9\xabj7Q\xa6\xe1\xdf5%\xff6N\x12\xfe\xfa\xa8n\xec\x00\x06\x87\xb6\x1f\x80\xf1\x80\x1e\x1e\xfbs\x06\x97\x83\xe2\xae?\x0eOP?\xe8\x83\xe8\x91u\x8cGd5-\x1c\xdaN\xee\xb4\x16\xe10C;T\xa1q\xa3\x11\x14$\\=\xef\x0d\xfe\x8f\x99\x1fG\x06\x83)1Lz\xfd\xd5\x8e\xe2\xbb\xe7;\xaeD\xdfb\x8fKE\xcf\x86\x17P\x0f\xbd\x8cd\xeb\xe1\xd4\xe0 \xdab\xc0\xd1\xe7Z\x196\xf6o\x88E\n;Y\xcb\xb0\xb0 \x0e\xa9\x1b\xd8]_\x9dO\x03Q\xe2\x14\xfd\xb8\x15\xed\x98\xb6q\xde\xb4\x1d>\xc81\x14iM%\xb41\xee`\xf8 Cm\xe6\xa2m\xf2\xc9\x9b\xf60W\x8a\xbc\xef\xa4cG\xbeT\xc2\x1f\xabn\xeaY\xdb\xfd;\x8b6\xf2\xc1\xa5#g\x08f\xd0\x9e-\xbf\x05_\xbb\xbe\xc86\x1b\xcb\x8c\xbe\xc6\xa0!9\x8b]Y\xce\x1cv2x\xd5Y\xae\x08\xc4L \xe54\x0c`\x98\xd7\x97\xf7\x14;o\xec\x1d4\xa3\x1e\xd8\xa3\xeb\x97i\x92\xb5\xe4W\\\xa5c\x91\x16\nk\xc9\x82\xb68O\n\xaes\x82\xc7{\xe39)d\xc1]\\\xc8Kh\x0d,\xa7\xbf\x18\xfc\x85Td\xde\xb3 \x85\xc0`\x02Q\x18g\xdb($f=\x12\x10\xae \x00\x8d }\x9b\xc2cB\xdf\xa5\x11\x99\x10\xcf\xba\xf6J\x0eT\xc6\x87\xcb\xac\xff\x1e\xaa\xfb\xdfP\xf6\xaf\x18\xf0\xeb\xc6f\x82;2\x0d\x9d -&\x1b>\x13Z`\"B\x132\x92r`4n\x94\xc6e\xb6\xb2\"5$V\x13\xbdVP~e\xaf\x81\xf6\xc0$\x11\xb8M\x08r\x93\xadZ\x91\xf8\x8d\x07\x80p\xafZQ\xd0\x0e\xa9\xc9\xd6\x81\x1e\xc7\xa2\xcf\xb5\xe8\xdd6\x80\xff\x03\x80\xb7\x1b@\xc0,\xab0!\xab&\x07V\xe4E\x8b26&\x1ff\x14\x8c\x1a\xf9q#'r\xe4m\xbcg0\xe7\xc5\x8f\xec\x08\x12\x8d!\xd9Q\xa4d\x1c) I\x8a6\xc2V<)\x0f\xa2\x94l\x19\x1c\xb8\x92w$\x01d\xc6\x96\xbc\xe8\xd2\x9a*9fv^\x8c\xc9\x8e2\xd9q\xa6d\xa4)\xf9\xc3;\xf0\xa65\xbd\x1c\x8399Q'g\xe1nT'?\xf6\xe4A\x9fr\xd45\x1b\x06\x15\x88\x14\xc4\xe2P&\x12U\x1c\xfb\xc5\xb1_\x1c\xfb\x7f#\x8e\xfd\x10\xd8x\xf6\xe6\x1b\xe7X\xf1\xbbH\xe8\xc01=\xb6Wh\x13\xde{\xddg\x87X\xe0x\x08\xd0n,u8\x9f\xa7[\xa4\x7f+\x101\xdep\xbe\x02\xf0\x05\x18\xaan\xc7B/\xf5\xa3'\xeb\xb2\x1b\x83\x11\x03\xbc\x9b\xdc\xf0}\x86\xc1\xc0\xf3\xcb\x05\x00.\xebDY'\xfe\x16\xd7 \xba\x97\\\x96\xd9\x0f\xfdj~-\x1d\xf3\x9d\xcdF\x00\xdak\xa9\xc4\x19i\xef\x82\x17\x0d/\xc2K\x19q\xe21\xddp\x1b\x8f\xc8\x03J\xaau\xf6b\xb8S \xebW\xd0o\x1b\xbdUW\x89-\xeb\x07\xb9L\xc8\xdb\xb2$1\xdb\xd0\x9a\xcb\x98\xf8\x1b]\xf2j\xd7\xce@\x12\xb0\xcd\x7fs\x1c\xa0}@\x15\xe4\xa5dC\xb1\x13\xb3\xa1\xe4\xa3gC\xc9F\xd2\x86b\xa5jC\x19\xe2 \xdbPr\xd1\xb6\xa1\xb8\xc9\xdbP\xa2(\xdcP\xa2\x89\xdc\xe8\xbe{:\xca\x9b\xbe(:7\x94hR7R\x1b:4,\xd4n()\x04o\xa4\xc2\xd3\x11*\xdeVKy\x11do\xa4\"+\x01\x1cJ\"\x0d\x9cT\x12@\x06G\xbe\x19L\x10\x87\x92@\x13\x87\x92@\x16g\x9b\xe8\x96\xaaf\xa3\x91C\xc9K&\x87\x92\x8dR\x0e\xc5O,\x87\x92\x8d^\x0e\xc5F2\x87\x92B5G\xdb\n\x82~\x0ee\x08!\xa1C\x89\xa5\xa2#\x95\xd9\xe8\xe9P\"I\xeaP\xac\x80\x8cgKa=\xbb\xa2\x84\xec8\")\xechc*i\xed\xf0\x1bi\xcf\xf8j\x93Fjg\xa8\xe3$w\x04\xb5\x1dJ\x06\x82;\x944\x9a;C\x1d\xdf\xd1\x90\x9b\x87D\xca;\xb3$\x83\x02\x0f%\x85\x08\x0f\xc5\xc9\x10\x87b!\xc5C\xf1R\xe3\xa1\x10|W\\\xc2i\xf2Plz\x0cN\xa1D\xe2<\x94\xf0\xce\xf1\x91\xe8\xa1\xf8z\xc1K\xa8\x87\xb2\x82V\x0f\xc5 /\xe3b\xa3\xd8CI'\xdaC\x89\xa7\xdbC!\xbel*\xf5\x1e\x8a\x93\x80\x0f\xc5N\xc37\xfd\xddJ\xc6\x87\xe2\xe8\xddPb>\x14\x1f=\x1f\x8aN\xd2\x87\x92@\xd5\x87\x12@\xd8\x87\x12N\xdb\x87\xe2%\xefC\xb1\xf5\xa2e`\xdb\x9f\xf7\x91\xfa\xa1\xa4Q\xfb\xa18\xaal\xfc\x9eD\xf6gh\xd3\xc8\xffPR(\x00\xcd\x12\x0cJ@\x94$b@\xb3\xcaK\xa2@\x94\x9ct\x81(6\xd2@\x14\x9d\xaf\x0dE'\x10D\xc9C#\x88\x92\x8dL\x10%/\xa5 J\x18\xb1 \x8a\x97^\x10E\xb8\xb0|$\x83\x8b\x87\x9dT\x83(\xd4\x12B\x12\xd3\xa1\x84\xd2\xd3\xb9\xc9\x07\x85\xae0\nB\xf1\xb0\x9f\x88\x10\x85hPNRB\x94$jBC\x9bAU\x88\x92\x8f\xb0P)&\x0bm!J\xea\x18\xf1R\x18\nu\x1e\"C\x14}\xb9\xb2\xc7\xd1 \xe4\x97\x0e%\xe2\xe3\xe4\xcb\xc0\xba\xd1\x1c b\xa1\xf8\xe4\x89\x90\xdfM\xdb4l3Pn\xe9)\x88\x8c\xbc \x1b\xe58_\xe4<\x8bD\x97\x97T\x84\xc3\"\x08\x99\xbf\xe8\xae\xb1\xae5\x0e(0.\x8f\x9e\xc5\xa1\x11\x02\x82\xf8\\\x10\x04\xf8}\x06\x10p\x14\x97\x12\x0bGX\x15.\xcf\xd5\x96\xada$,aU\xe6\x80+ \x16\xb2\xb0j\xe3\x95\xf2\xc0\x16\x90\x03\xba\x80x\xf8\xc2\xaa\xaf\n\x820 \x0d\xc6\x80X(\xc3^myW\x8d\x0f\xce\x80HH\xc3\xaal\xbe\xbf\xc6\x0dk@\x02\xb4aW(\xee\xb4q\xc0\x1b\x90\x13\xe2\x00?\xcc\x01\xb9\xa0\x0eH\x82;`=\xe4\x019`\x0fH\x80>\x1c\xf6\x89<1\xcd\x92\x19\x02\x81g\x82A ?\x14\x02+\xe0\x10\x88\x86D\x9c6\xdc\x0d\x8b@\x144bU\xe5\xbe\x9dg\x96\x15\x10 \xe4\x86I\xc0\x0b\x95@*\\\x02\x19rX<\xd0 \xac\xd8%\xe5\x84P\xc0\x0b\xa3@`\xcd\xe2\xe0\x14R\x95\\#\xdc\x90\n\xe4\x84U \x0dZ!\xf5\x89\x85\xde\xbe\xb1I\x80XH}\xf4MC\xb3\xa4C-\x10\x86(\x80\x0fr\x81p\xd8\x05\\\x9e\xc8\x08\xf8\x05<\xfa,\x9e\x96\x0cP\x0c\xac\xee\xbc0H\x06\x02{(\x10\x9a\x81\x18x\x06\xec\x9el/L\x03\x19\xa1\x1a\xc8\x00\xd7\x80}\x14\xe4\x81m \x0c\xba\x81\x00\xf8\x06\x82 \x1c\xf0\x8f\x90uP\x0e\x04\xc39`\x85t \x07\xac\x03k\xa0\x1d\x88\x80w \x1c\xe2\x01O/;&\x88\xfb\xbd0\xc8\x072\xc1>\xe0\xab\x8eenDA@\xa4&\xcb\x1dP\xb3d\x85\x82\xc0\x01\x07A\x02$D*\xa3\xee\x8f\x9a%\x01\x1a\"\xf5\xd9\x0f\xean\xc8\x08\xac\xb0\x11X\xa1#\xc8\x0c\x1fA\x12\x84D\xaa\xa3`%\x88\x85\x96HMn\xb8 VBN\x10\x0e;\xc1Z\xe8 V\xc1O\xe0X\x12\x1d\x10\x03\xac\x80\x19B\xa0(X\x0bG\xc1\x1aH\n\xec\x8dL\x80\xa6VN\xae\x04\xc8\x8a\x1e\xdb6\xd8\n\xa2\xa1+Z\x95\x0d\xce\x82g\x80\xb4 \xd3\x98\x0b\x84\xb6 \x18\xde\x02\xcb*\xef\xa6\x8b\xb8:\xdd\xff#{\xd2\x13b\x8f\xa7\xfb}\xbd\xe1\x89~\x14\xe5\x01\x8d\x1e\xa1(\x948\x96\x8d\xd3\xb86\xe3Jf'\x80q\xf2d\x14P\xa9\x80J\xe4N\xa8\x80J\x05T*\xa0\x92\xa2\xa8\x80J\x05T*\xa0\xd2,\x05T\x9a\xa4\x80J\x05T*\xa0\x12\xac\xc6E\n\xa8\xb4\x90u\x9dW@\xa5\x02*\x15P\xa9\x80J\x05TZJ\x01\x95\n\xa8T@%]\n\xa8D\xbfP@\xa5\x02*}\xd3\xa0\xd2\xcd\xc49\xae\xe1J\x8f$1\xb9\xe3\x04x\xb5\xaf\xea\xe6\x96}\x19,\xfc\xe3\xc7\xf1\xefw\x03\xfbb\xb0\x89\x82\xdf\x8d\xe1A\xc6\xa6\xa2\x1d\x8d@\xe3/\xf8\xdf\xeb\x06\xdank\xf1\x01\x8cGm\xe1\x03\xb5z\xb9\xa7~[\xfc\x15\xb9\xf96m\xf3P\xef,y`\x9c\x0d\xef\x9c?\xb1\xb4\xee\xf8\x96\x18\x0ft.\x98\xae1.\x07,\xe2\xbe,\x9f\x13\xc6\xda(5\x13\x0f\xd3\xd9\xb8Ke\xc9!n\xa8\xab{~3\xcdr\x9d{f\xa2v\xaaU\xeb\xb9\xdb%g\xbf\xa1\xcb$t\xf7\x90\xe5\x92\\\x96\xa2\n\xe3\xca\xc9j\xee\xc1\xac\x1a\xa8\x9b\x81u?\x8d\xa7\xdcM\xd7\xf6\xfdO\xe6\x88\\\x0ea\xa5\xcb\x0b\x1bna\xc3-l\xb8\xd5o\x85\x0d\xb7_t\xd6\x82-}\xdc,\x8a\x9b\xc7\xd4W\x7f\x9e\xdf\x85\xb1+\xf1\xc0y\xe6`s\x15\x9e\xac\x0b\xb10M\xcc\xdb\x85\xdbu\x92\xc2\xedZ\xb8]\x0b\xb7\xab)CH\xdcJL\xcc\x8a\x1dI\x0e\x88W\x89\x8dU)\xdc\xaeP\xb8]!=\x06\xe59\xe2O2\xc7\x9e\x84\xc6\x9d\xc4\xc5\x9cX\xbb\xbap\xbb\x16nW\xdeS\x85\xdbU\x95\x84X\x91\xc2\xedZ\xb8]\xa9GV\xc5|\xf8z!0\xd6cu\x9cG\xe1v%$ \x96\xc3\x17\xc7\xe1\x8f\xe1(\xdc\xae\x85\xdbu)\x85\xdb\xb5p\xbb\xfa\xe3(\xe2c(\n\xb7\xab!\x85\xdb\xb5p\xbbF\xc6,\xa4\x8e\x91\xc0X\x85\xb08\x85\xc2\xedZ\xb8]K\x1a\xeez\xc8\xc2\xaa\xad\xa4\xe1\xfa`\x0c\x88\x852\xec\xd5.i\xb8%\x0dW\x97\x95\x90\x07\xe4\x80= \x01\xfap\xd8'\xf2\xc44Kf\x08\x04\x9e \x06\x81\xfcP\x08\xac\x80C \x1a\x12q\xda\xf0\x92\x86KHI\xc3\x8d\x85P\xc0\x0b\xa3@`\xcd\xe2\xe0\x14RUI\xc3\xf5B,\xa4\xbe\x92\x86\x1b\x00\xbf@I\xc3-i\xb8%\x0dw!\xab\xa1\x1c\x08\x86s\xa0\xa4\xe1NR\xd2pK\x1anI\xc3\x0d\x84\x8f B\"\xd5\x954\\\xf2\x85\x00\xf8 J\x1an,4\xb5rr%@V\xf4\xd8.i\xb8\xc9\xd0\x16\x04\xc3[\x10\x95\x86[\xb8]\xc9\xbf\x17PI\x91\x02*\x15Pi\x96\x02*\x15P\xc9\"\x05T\x92R@\xa5\x02*\x15P)p\x97T@\xa5I\n\xa8\xa4J\x01\x95\n\xa8DH\x01\x95\n\xa8\xe4\x1d!\x05T\xb2\xbfS@\xa5\x85\x14P\xa9\x80J\xf6!P@\xa5\x02*\xa9\x12\xea\xe0/\xa0\x12\x97\x02*\xfd\xc7\x03\x95\n\xb7\xab)\x85\xdb\xb5p\xbb\xc2\x7f\x08nW\xba\x16o\xeb\x9ecCr/\\I\xfe\xc6\x17\xc0\xaa\xcd#\xc7m\xa6\xba\xe0\x1e\x9b{\xfa&\xf8\xf9;G\xf9>f\xd9\xc2\x0f[\xf8a\x0b?\xec\xf3\xf0\xc3\x8aO\xbad\x86\xf5\x91\xb5ZybU%?\xdb\xb4(\x8c\xb1\x0e\xc2\xd8\xcbf\xd3\x1e\xeaf\xf7\xfa\xb6\xda\xddvU\xd3?\xb0Nt\xe0z\xd2X\xf1Y\x9e\x997v;T\xbb\xbb\xa1\xbd\x1b\xbaj\xbbf9\xb2/7\xbc\xf1\xed\xed\xa8oi\xfcq\x06\x88Ut|\nw\xe6S\x98\x83\xa1i\x10]\xd8\xb1-\x08w\x0f\x9c\x99\xde\xa5-\x90\xab\xfe\xaa\xea\xaa\xc3\xfaM\xc6\x91\xbf\x16g\x89\xea\xcdG\xf3\x0cn=\xcc\xdb\x8f\xf2\x87\xba\xb9\xdb\xb3f7<\x9a\xc7y\xa7?\xc5\x11\x10r\xa8\xbed\xd6i\xb3\x0c\xefD7\xe0\x07\xd0\xc6UW\x1d\xd8\xc0\xbaqm\xd9\xf3\x81-VE\xf9\xf94]\xb2K\xd5\xdf\xc7\x0dZr\x17wlw\xc7\xbe\xac\xea\x8a\xbf\xa9\xaf2N\x9c\xe0\x0f \xef5\x18_R{\xfa\xben\x93;\xfa\xd9Z\xf8\xc7\xba]\xdd\xc0\xfb\xba\xddu\xd5\xf1Q\x85\x08\xdb\xae\xda\xec\xd3\xe7,\x1a\xc6\xbbz\x1b\xd9Lb\xe9\x05\xe7\xe6\x15\xe0\x86\x17y\xf9Z\xdf\xbe^\xbe\x96\x1bWl\x9b\xa8\x9bX\xf36\xd5~O\xc67\x0e-|b]\xfd\xc0w(\x94st[\x0dz\xa8j\xd5\x7f\xbc\xe3+\xf8\xd7k\xf5\xab\xfe\xe39?\xd2H\x066\x82\xb7\x95\xea\x8b~\x18wL\xd4\xc4\xd1\x1ef_\xd8\xe64|\xe5\xce\xb8\xc0B\xb3u\x066\x02\x01 \xaa7|\x9d\xf0\xc0\xd8\x1d\x96l\xeb\x83\xa5WF\x8a\xe1\x9dY\xbe\x14\x9dP\xb4eM{\xa0\xff\xe4\xf9(\xa3\xd8Z\x82\xe2y\xdd\x87\xa1\x8cr\xde\xd6\xf3\x0e\xbb\x82\xa1\xfd\xc8\x04bRa\xd5\xe5v\xbbj\xb6<\xcc\x95W\xc8\x16F\xf1\xee\xfd\xed\xc5K\x1e\x18!>>F\x18\xd4\x9d\x8e(ph\xb7\xa7=q &\x8e\x9d\xce\x13\xaf8\xeb\x8a\xe2\x03O\xb5\xf8\xc3\xfac-\xbe\x17u\xae\x1d\xc8dM\xebgw\xdb\xc3\xd8tLb\x1d\xb3'a\xc6\xa4^\xd2)\x96Q\x89\x95\xd4\x05c\xd6t\xca!>\x8922u\xd2H8s'LF\xa5IF%G\xceI\x90\x94)\xa5R\"c\x12!\x95\x84GM\x9b%\xfd16\xe9qJn\xd4[CDP\xc6$8\xda\x13\x19\x13\xd3\x17\x83\x92\x16\xc3\x93\x13\x13R\x12c\x13\x11m \x87\xd9\xd2\x0c\xf3&\x17fK)\xf4'\x12\xc6\xa5\x0f\x12\x9diK\x1a\\\x9f*\xe8I \x1cB\x12\x01c\xd3\xff\xaci~\x91\xc9}DJ\x9fu\xa1\x0c\x83\xa2\x8c\x1542UoN\xc9\xa3\xfa\xf7;\x7f\xd9q\xc9x\xcb\xc4;E\x9d\x99\x82\x97!\xf1.!\xdd\xce\x1c\xe5\xfab\x98\x90ZgI\xa3KI\x9esf}Y\x12\xe5\xbc\xe9qf\x8eFx*\x9c\xf9\xee_\xa9\xb6F%\xbb\x854\xd6\x97\xd8fo\x9b7\x89mE\xea\x9a\x1e\xa9kKSKON\x8bOI[\x06\xa4'\xa6\x9f9\x93\xce\xec\xa9f\xae\x043\xb2\xb7B\x93\xc9|)dz\xe2XB\xbaX@\x92Xxj\x987!\x8c\xc8\x9f2\x8a#\x9e\xf1%z\xa5\xa5w\x91\x95R~\x89J\xe0\xb2%k\xa5\xa4h\x11\xe9X\xb1IXd\xc2UB\x9a\x95q \xb0%R\xe9\x19\x1ez\xd2T\x9eT\xa9\xf8\x04)-\x19**\x05\xca\x9a\xee\x14\x96\xe4\xe4Mm\nLh\nIc2\xf2z\xcc\xd2B\x93F\xdc\x89J\x81\xe9I\x01II\x8b*'$ \x19C1!\xc5\x88J'\x8aK\"\xa2\x12\x86\xf2\xa5 \xc5\x7f]oJ\x90/\x11\x08\x8d6\xbd5\xa7\xdc\x82AnG\x81\x89__\x9d\x0bMN\xef\xe35?^\x07\xfb\x1b\x05\x98\xa8\xf8\x1b\xd1\xd7z\x83\xbf\xab\xde\xffJA\x1e\x17\x88\xe4\xfcn\xb8\xafr\xcd\xf9KT\xe9\xcfF.\x11\x1f\xbc\x98\xf1!\xf3\x8aD*\x84\xe9j\xb7\xb0\xe4\xad)t\xce\xc2R\nf\x8dt\x8e\xf0\xc2\xc7g\x04\x9a\xb7H\xc3z\xa8\xea=\xdb\x1a\xdd\xfc\x86\xff\xbc\xece|4\xb9\x87\xb9\x9ff]c/\xc6W\xb0q\xe8u2\xd8\x0c\xc7\xba\xc9\x9c+\xf1\x12\x0e\xb8e\x13\x16x5:|\\\xa3\xf5\xec\x8d\xd2;\x01\x83Vk\x1a\xd9\xac\x94&MP\x93\xf8<\xf3,\x1d[\x8a\xab\xb4\x81\x82Lc\xa2i\x07\x1c\x17\xd8\x0b\xd39^\xc3\xed\xed\xbdq\xa3\xce\xc9\x80\xee\xd0\xe6\x92\xab;\xe2\xe7\x101\x7fB\x0b\x8a\x9f7\xfa\xf7\x90Vi\xdd\x07\xe1\x85\x11Q\x13\xca\xf7\xd1\xd7\x80W\xcdSp\xf7\x0f\x06\xecBv\x8c\xdda\x93 j\xa1a\x96<\x10K<\xbcB\x03*\xd4\x0e>\x00L\x89\x06Rf\xe8D\xd1\xa6\xfb\x8dV\x03(\x89\xe0 \xff\xc8\xcbNY\x00'\x89\xa0 ?\x95-\xb4\xab\xca\x93\xc1\x12\xe34\x94\x0f\x1aI\x80E2B\"\x91pHN($\x0b\x0c\x92\x0f\x02\xc9\x02\x7f\xb8\xa1\x8fx\xd8\x83\x04:\xb2\x82\x1c\xc4\xe1ai\x0f\xb2\x82\x1b\x11\xc0F\xc8F\x80\x043\xeckSN\x10c\x98\x00\x0c\xba\xbc\x1c\xc0\x85J\x003\x81\x16\x89\x80E:X\xb1Xj\xf2\xc2\x13\xb1\xd0\x84\xd5SO@\x12N8b\xe9Y\x0c\x83!\x96\xef\xfcUo\xcbj\xe8\xc1\xd7\x18\x17\xe4@\xd7\xdf 5\x04\xc2\x0c\xaa\x0b\x97\x82\x17\xd2\xa0\x858Xav,%\xc0 V(\x81\x86\x11l\x10\x82\xd1\x1b!\xd0\x81\x0b6P!\x83H\xb8\xc0\x03\x15\x84\xc1\x04N\x88@\xf3\xc4/\xd4k\x7fsA\x02\xf1p\x80Q\x01\xf1\x7f\xd9 \x80\x8c\xee\xffl\xae\xff\\n\x7f\xca\xe5\xaf\xfaXUW\x7f\xba\x9b?\x8b\x8b?\x9f{\xdf\xef\xdaw\xba\xf5\x03\\\xfa>w\xfe\xc2/\xbe\xd4\x1e\xea\xe4\xb5\xbb\xf0\x03\xdc\xf7\x1e\xd7\xfdT\xbd\\.\xfb\x8c\xee\xfa<\xae\xfa\xd3pY\xef\x13q\xd5 \x87\xe7o\xa1\x90\xba7$\xd1\x0b\x88\x92\xee\x0b\\\xa83\x17\xdcD\xef\xe0B\xd7@\xdc\x07\x12\xeb/D\xf1\\aa\xbd\xf7\xc3\x1b\xd0L\xd3\xce\x87y\x13\xed\xef\xff\x95n\xfbj\xff\"JX\xe3}\xe1\xcd\xee\x96zC\x9c\x83\xbd\x8f(&!\xb1\xfd>\x8e4\x7f$J\x9cW\x12E\x8f\xd3K\xf0P\xa2x\xee\xd9p\xdd\xaf\xe1\xbeW\xc3\xd2{!\xfeK\x14_\xf03uoF\xa4G\x13% \x04:\xd4\xbb\x89\xe2\x0d\x83\xb6\\$A\x14K>\xe7\x0b\x87N\xf1\x80\xa2X\xaa\xb7\xf8-\x9bO\x14%\xa3g\x14%\x9b\x7f\x14%\x97\x97\x14\xc5~\xcf\x84I\x81o\xde+\x91\xee=E\xc9\xe2CE\xc9\xe7IE\xf1\xfbSQ\xbc\xc1\xd2A\xbe\xd5\xc5\x83\x9e{\x1f\x88\xab\x10\xa8RC=w\xbe\xfb\x1d\x02<\xaf\xe2A\x7f\xe8\xb4Q\xf9\\\xbeX\x94\x8c\x1eY\x94<~Y\x94<\xdeY\x94\x94\xef\xed\x0d\xa4\xf6\x87R\xe3J!\x82$9C\xc4\xb8\x13~\xac\x8f\xfd\xd9\xa7\xdf#\xc7\xc2\x1f\xf7\xed\xe6\xe3z\xe6\xc0{\xfe\xda\xf3\xfaQy\x191\xec\xb7\x7f\xc4\x17=\xbc\xbc\xa7\x9euX\x06\x1fV\x0d\x1e^\xdb\x86\x11\x950\x88\xceB+\xb1\xf5TB\xa8W)bQ:V\xf5&\x01\x89\xa3X\xdf\xe1\xf4\x9a+\xd4\xab#\xbdk\xa2\xbc\xb9c\xa6\x98OQCC\xdf\x83\xeeS\xeaO\xf7\xfd\xb1\xda0\x82\x16.\xe0\xb8M\xd2D9\x98\x97Ea.B8Y!\xa8\x9b\xbe\xde\xb2\xf9\x96\x03C\x1bo\xb1 \x163\xfex\xcf\x88>p\xf5\xf6\x87\x9eu\xfc\xeb\xebU{\xa86\xc3\xe4\x81\x9dF)\xefi1\x0c\xc6\xdfw\xf5'\xed\xea\x051\x94\x96U\x1b\xeb,?@a\x15.\xac\xc2\x85U\xf8+\xb2\n;\xb8\x81\x97\x0bjHr\x12\xbe\xe1\xcaM\xa2\x97\xeek\xf5\xd7\xd5+\xf8B\xe7\xf3.\xe4\xfc\xda\x18=\x8f&d\x0d=\xc7\x17u;*\xf4\xc1\xc4X?\xb7dY\xee81Xw\xac\xba\xe1i}\xe1\xd4]:\x8aBc%\xe5\xdb\x07\xbe\x92\xd4\xcd\xa7v\xff \xe7\x04\xcd\xf5o\xa9\xf07\xb2\x84\xd6[c \x1dG\xac}\xfdT\x1b\x04uo\xae\xa1\xdc\x1f\xae\xfc\xeaZ)\xae\x97\xca\xb0\x1eCw\xda`\x92\xca\xa2\xb0\xe5\x0e\xe4R\xbd*`@\xe8r\xc3\x8e\xfc\xbd\xef\x11\xd8\xfb\x9e\xb7\xac\xab\xa63(\xcfe\xdaC\xc3\x86\xcfm\xf7\xb1/+jYQ\xcb\x8a\xfam\xad\xa8\xe4:\xe7\\X\xd5\xb7\x7f^\xbcN3\x0f\x1a\xeb\xab\xfaN\xf0\x8aj,s\xe4\xd0N]\xda\xe8E\xcdYT\xd4\xaaE\x95M\xaeOd\xd1\x96\xc9KM\xdc,\xeb\x90c\x05\x9a\xd7\x1ez\x8c\xc5\xac7\x99V\x1a\xdb\xf0\x9bN\x90\xc1c\xcf\xf0\x95\xb8\x06D\x1e\xff\x88\xe1\x19\xf1\x17\x19\xe1\x0d\xd1\xfd d!\x8b\x0f\x9b\xe8\xe8P\x1d\x1b_y\xbc\x07\xb8.tG\x91\xe9\xb4\xd0\xdc\x15\xb4\xa3\"\xa3\x8bBsNH\xb7\x84\x18\xda\xb2!<5\xfbO]\xd5\xacaU\xc8\xd3\xf9\x97\xa6\x15!{\x95/\xed\xbb\xb1\x8a\xa2\x95<\x1a\xaaj6r\xc0\xe3\xdf\x02\xe7\xd8+b2\xf1~\xf5\x97P\x88k\xd7\xc6\x9af\x8b4\xb5\xc6\x99\x0e\xf1Q\xa6\xb9bL\x0bq-J!\xae\x95\xafg\x8d&M\x88%\xcd\x1dI\x9a-\x8e4o\x14i\xb6\x18R\x7f\x04i\xb6\xf8\xd1B\\[\x88kS\xa2@\x0bqmZ\xb4g\x08\x97\xab\xfe\xb37\xce\xb3\x10\xd7\x86s\xc4\x16\xe2Z\xa5\x1a\x85\xb8\xb6\x10\xd7\n)\xc4\xb5\xa9\xb1\x99\x85\xb8\xb6\x10\xd7.\xb4\x84\xc5_\x06D_\x16\xe2\xda\xf8\x98\xcb\xf8\xaf\xeb\x8d\xb7\xf4E[\x1a\x17N\xdfV\xdd\x8e\xf1\xcd\xec\xeci\x9c\\~\xb3\xe3Yx\x04\xc5\xdb\xd3\x03\xc5\x0bX\xbc\x80\xc5\x0bX\xbc\x80\xc5\x0bX\xbc\x80\xc5\x0bX\xbc\x80P\xbc\x80\xc5\x0b\xa8H\xf1\x02\x86;\xdc\x8a\x17P\xa9F\xf1\x02\x16/\xa0\x90\xe2\x05,^@.\xc5\x0b\x18\xec'*^\xc0\xe2\x05\\\xe3\x05\\\x84\xfc\xbf\x9a\xdc\x7f\x9b\xaa\xe1'\x83\xe6I\xf1 \xe2\xe7\x94\x87\x18y\x97\xcb\x1b\xc6\xa6\xf7.\x17vl`\xddC%\xc2\x07Eq<\xc8R\x0d\xeb\xac\xd0\xc1\xc8\xcf\xc8\x18\x878\xee\x83a\xd7\xb5\x9cK\x8f\n\xd4\xbcb\xdd\xa1\xee\xc7\xc3\xeckN\x98\xf9-\xc4l\xaa\x91\xdfu\x0f\xc7\xa9\x8a\xe3\xf0W\xf3\x8bz\xc6\xb7\xfbD\x15\x1c,\xa2\xce*\xa0\xc2\xf0\x1a\x8c\x9d\xfcR\xd7\xf7\xa1_F\\\x8bo1k\xd1*\x1b\xe4\xee]\x96\x04\xae\x13\xacZ\x8dE\x14\xbd\xda\x10\x91\xdd\xa2\xbc8\xff\x91*g\x99'\x08T\xae \x04Tj\x1eo\xbcxi\"\x94Xg>Z\x8d>\xfd\xd3\xf8\xab>\xd6\xc7\x9f\xd2z\x95\xeb0r\xf0\xe81\x04\xd6q\x04J\xa7s\x7f\xb9\x92\xcf '\x9f\x94_\xb3\x97\xe7\xba\x18\xcf\xe1\xec_\xae\xfe\x82B\x17\xb6\xd5Pa\x82\xc4\xa2\xb3C\xcc\xc9\xd9\x9f\xe6\xaf\x19`T\xcc\xcf\x111\x9d\x9d\x9f\x80\xea~\xaa\xeb-\x89\xb0t\x04xhw\xe3 \xae\xfbEO\xea\x17o1\xd5~\xaf1\xdd<\x97$\xb8\xab5\xcb\xe5h\xdd\x1a;\xf25\xbbw\xb2\x19j=\x03;wr\x17\n%T\xff\xf2\x9c2\xfe\xc9\xa6%y}\xee5_\x90\x9f9\xe9\xfa\xab\xe6\x12\xc7\xe6X\x18\x8a\xf4\x8c\x08\x14#\xf3\x02\xc5\xd1\x8e\x94,\x0c\xb5L\x0bs\xa8\xf1\x15\xc0\xf1%\xe4k\x14'8\xb8\x9b\x01^\x0f3JF\xa4\x16\xc5\xc5\x11\x0eYQ[\x94l\xd8-\x8a\x15\xc1E\xa1\x9c\x07\x818.J.4\x17\xc5\xc7\x1d\x0e\xb1\xc8.J4\xbeK\xf7\xddt\xeb\x1e\xd0<\xe2\x90\x82\xf5\x92\xda\xa6\x9b\xf8\x80\xe4\x13\x87D\xdc\x97TH\xde\xce7K\x0c\x06L*r\xf0\x8dC::,\x95\x04`\xc4\xe4\x9b\xc1\xb81J\x02z\x8c\x92\x80!\xdb&\xba\xa5\xaa\xd9\xd0e\x94\xbc\x183J6\xa4\x19\xc5\x8f7\xa3dC\x9dQ\xec\xfc\xe5\x90\x88@\xd3\xb6\x82\xe41\x07\x08\xc4\xa6Qb\x11jR\x99\x0d\xb5F\x89\xc4\xaeQHns\xf0o)\x1c\x1c\xe7\x10\xb8\xe3\x88D\xb6icj\xe5;\x87\x80\xda\xa4a\xdd\x86\xba\xf9\x06D\x9d\xfb\x1c\xf2\xe0\xde(i\xe8\xb7\xa1n\xd0\xeeG\x9c%\x11 7K\"\xf8\xd0!\x11\x1fG\xf1P\x83\x83\x8b\x1b\x1dB\x10s\x14\x92\xb2x\x15z\x8eb\xd3C\xd0\xbe&\xe1\xe9(\xe1\x9d\xe3\xc3\xd6Q|\xbd\xe0\xc5\xd9QV\xa0\xed(\x04\x07\xb5\x93O\x1d\xb2\xe0\xef(\xf1(<\n\xf1eS\x11y\x14\x0f\xc7:xx\xd6\xc1\xcb\xb5\x0e\xee/\x1e\x8a\xd7\xa3\xf8P{\x14\x93{\x1d\xd2\x10|\x94\x00\x1c\x1f%\x1c\xcdG\xf1b\xfa(\xb6^\xb4\x0cl\xfb\xf3>\xac\x1f%\x0d\xf1GqT\xd9\xf8=)\x06\xc0\xd0fp\xb7Cbd\x80Y\x02\xc1\xe7\x0e\xa9\xf1\x02f\x95u\x8ew\xc8\x1cE\x80b\xe7z\x07\x92\xef\x1dH\xcew\xc8\x16]\x80\x92-\xc6\x00%o\xa4\x01JX\xbc\x01\x8a7\xea\x00%0\xf6`\xf1\xb0\x87\x0f\x1e,K\x88\x85'\x1cV\xa0\xd6>nx\x08\x8fL\x10\x0f\xfb\xe3\x13P\x88\x06\xe5\x8cU@I\x8aX0\xb4\x11\xfc\xf1\x905\x8eA)&K4\x03J\xea\x18\xf1F6\x08u^Ny V\xbb\x94\x8c'\x14\"\xefI\xa8.\x1ew(\x1e\xf7\xe2q/\x1e\xf7\xe2q7\xa4x\xdc\x8b\xc7]\x97\xe2q/\x1e\xf7\xe2q7\x14\x15\x8f\xbb!\xe1N\xe5\xe2q\xa7\x1e)\x1e\xf7\xe2q/\x1ew)\xc5\xe3.\xa5x\xdc\x8b\xc7\xbdx\xdc\xa5\x14\x8f{\xf1\xb8\x17\x8f\xfb3y\xdc\x89\xe3YL\x8e\xa1\xa1d\x99sH\x98b5\xf5\x10%2\x01\x11\xcau[\xe5\xba\xadr\xdd\xd6\xd7\xbdn\x0b\xe6\xcf:\xcf=\xf4\x9e3\xee\xd1Q~\x95\xb7U\xca\x8e\xf9NyyyS\x97%/\n\x82\xef\xea\xd2\x14(\xb7u\xb9\xd2\xb1n0Awu\x1a\x96H\xec\x8d29\xd6\xf4\xaa\x84 \x16\x92E%\x93\x91\xd9\x97\xba\x1fT\x80\xe39\xd3Ue\xa1\xe3\x16Sl\xc2e\x0d\x95\xf7\x8fU\xc7\x9a!g\xde\xec\x0f\x126\xfaQ\xe9\x1b,F\xd6Iym\xdc\x07\x06~\x0b\xa1\xff\x9d\x82@\x86\xb5Q\xb5.\xab\x8aR\x9a\xf2z\xd6\xa1\x15\xaeOM1\xb0\xb5\x04\xdc)\xf1\xb6\xaf\x9b\xdd^\x19,\xaa\x16\xa1\x81\x9a\x1f\xf6\xe9\x88\x93P\x96\xbaj\xf2\xadO\x82\x14\xb5\xfd\x9bM\x83L\x9a\xad\xe6|uM\x14\xd7TI\x9d\xb5\xd6y\x9b\\\xa1u\xb3\x97\x9a\xbf!)\x9e\xeb\xe7\xb0c\x16\x87\x14\xb8n&\xe7\x98\xcbe\x7f\\\xf6\xc7e\x7f\xfcU\xf7\xc7\xc4\xf2\x19\xb0\x9d]\xac\x9f\xc1\xbbW\xf1\xcb\xfa\x05T\xbc\x18e\x122n[\xe7\x85\x87{\x89\xb4\xb87\xc2\x00\xaf\xdf\xa8\xfd\xf9t\xa8\x9a\x9f:Vm\xf9lQ#\xc7rn\xd2\xde\xcbKB\xb7\xbaa\xaf{\xaa\xa0\xa1cU\x7f\xeaB\xed\xaa\xcdN\\/\xef\xe0\x94Z\xa1\xda\xf0\x99/\xba\x95\xc7\x1c\xb5\x9b\x9a\x8fu\xee\xec%h\xd6\xcd:\xb6\x9f\x9b\xb5\x1cAV\xd6\x84\xf6sc\xfd\xa8\xe4%\xff+K\x9aV?\xa1LW_\xb7\xcd\xddP\x07\x0f\x1e9t\xb7\xd5\xc0~\x1a\xdf\xa3\xaa0\xc8[\x97\xb9\x87\xb1v\x0e\xac\xd9\x93~\xf7\xc0\xd8\xdd\xd0~dMOUf\x15c\xcf\xea\xd0\xd6-k\xda\x83\xf9\xb3s\xf3\x02P\x1d\xc6\xc1\xb4\xf25_(\xc8y[+n\x03\xe0=\"\x90\x08\xac\xa6t\"T\xcd\x96\x07\x8a\xf0JP`\xcb\xbb\xf7\xb7\x17/9\x8c\x82\xcf\x08\xac\xa2\xe6\xde\x88\xcbf\x10\xbb\xea\xc9q\xa9\xba\x8a\x0de\xc2\xea\x1a\xbf\xf7\xf5\xae\xa9\x86S\xc7z\xbe$\xd5\x1d\xc2l\xbbv\xd7r\x7f\xedY\xd0|}[\xf7<\xa0\xf2\x811\xd1b\xde\xd4\x1e\x1b. 1\x0fuS\x1fN\x07\xd8U=\x1c\xbbz3v\x10F\xd6i\xea\xc4\xa9\x81b\xb3\xd7\x87\xa0\xdcKN\xf3d\x8a\xc1\xd9\xef\xb5\x0d\xe5k\xbe\xde,U,V5m\xd9q:i\xe4\xca&\xcb\x0d_\xd5\"\xce\x85\xf2\xcd\xe7=\x18f?\x0f\xae^\x06cO<\xeb\x16\xc3\xc4\xd3\xce\xda%\xd1\xb6(\x86\x94E\xd8\x97|K#\xb98\x92\xcbcHU\xa3\x96H\xcb\"\x19Q\x9ec\xa1t.\x95A\x83\x9c^.\xa3\x16\xcc\xa0%\xd3\xbehZ\x96M\xe7\xc2\xe9^:\x1d\x8b\xa7g\xf9t-\xa0\x9eW}\x8bh\xcee4\xf3Bj_J\xd7.\xa6\xaeY\x9eyAu-\xa9\xa4\x19H\\V\x8b\x7f\xa6\xf8g\x8a\x7f\xe6\xd7\xf0\xcf,\xe1Gc\xcf\xb9fO\xcb\xdd5B\x9b\x7f{\xfb\xa1g]!\x80\x9c%\x04\x0c)\x04\x90%\x1d\xb5\xa4\xa3R\xdaJ:jIG-\xe9\xa8P\xd2Q\x97R\xd2QK:jIG\xf5\xd6\xa6\xa4\xa3BIG\x85\x92\x8eZ\xd2QK:jIG\x9d\xa4\xa4\xa3J)\xe9\xa8%\x1d\xb5\xa4\xa3J)\xe9\xa8%\x1d\xb5\xa4\xa3>S:j!\x80,\x1ew\xf2\xcf\xc5\xe3^<\xee\xc5\xe3^<\xee\xc5\xe3NH\xf1\xb8\x17\x8f\xbb\x7f\xc7Q<\xee\xc5\xe3\xbe\x90\xe2q\x17R<\xee\xc5\xe3^<\xee\xc5\xe3\x8eR<\xee\xfa\x8f\xc5\xe3^<\xee\xc5\xe3\xbe\x94Toj\xf1\xb8\x17\x8f\xbbo\x8c|\x0d\x8f{!\x80, T%\x81\xaa$P M\xa0\x82\xf9\xb3&\x11@\xfe\xd7E\x06\x16\x9d\x16\xe5L\xc3R_\xffy\xf9\xbe\xec\xaf0\x1e\x9d\xf1]\xce\x1f\xf9\xcb\xf8E\xbb\xf5IY\x07|/*+k1\x9f\x8a1+\xc6\xac\x18\xb3\xafh\xcc\xc8lP\x9b=Xg\x8dT\x0dk\x0d\xd1j\x0b\xc4wDQ6\xc3\x9a\xec\x990C._\xfbr:\xeb\x1e\xabl\xf2[\n\xfa\xc2g'\x83\x95\x8c\x8f\xb6\x8a\xd5=\x82%\x8a\xc2\x8cUrS\xbe\xa8\xfb[\xc8M{\xc6\xb7\xd1z \xcfC|\xa6\x97rd\xdd\xa1\xee\xfb%w+X\xd6Kps_\xd9\xabd\xd8\xe7\xab\xb9X\xecn\xb9\xa6L\xa9\xbc\xed\xc4\xd70\xf6N\x0f\xc7\xaa\x1bd+4e\xcb6\xc9\xcf)'\xae~x\x19\x7fj\x1fP\xebw\xe058A\x96F\xb71\xab\xd3\xcf\xf9[\xebw9\xbc5q\x9b\x9co \xf5<\xc5&\xd9\xad\x92\xcb\x08\xc4S\xddF\xd8\xa6g\xa5\x05\x0e\xb1Q\xcf\xc0IEZ\xaa\xe7d\xa52\xcb\xb2Z,\xbb\xcd\xf2P\x0f\xb9*Gxd\xb2\xda.\xddzE\xd8\xafrF)g\x94rF\xf9\x86\xce(a\xa7\x13}\xcf\xb0\x9e\xb3F1D\xabw\x0e\xa4\x15]\xb1}XL\x81-\x1b\xaaz\x1f\xa7\xe8[\xd8\x87\x98|7\xe37R\xd6\xf8\xb9\xb7\xe8\x85\xfe\xd9\xf6\"\xe6\x06de\xcd\xc6e\xc2\xa8\xd3\xbc\xc2,\x17\x17\xbe\xba\xcf\x1a\xc9\xa6\xac\x0e\xdd\xa7j\x00\xee\x8f\x06Z%\xd563\xb5\xc9\xc2\xbe\x19\xaf\xcf\x8f\xd8K\xa6\xb6 `\xdf*@p\x95\xd5\xfdA\x8f\xf9\x13r+\xb0xIs\x10,tXW\xfe\xdc_\x87k%\xc6-x\xc6.x\xc6/\x00\xb1i\x15C\xd9\xdc\xd3\xc17\xfa\xcd,{\xb3\xf9\xe9\xd7\xdc\xf2i\xf7@\xa05Tx\x06\xb5\x8ff]=\x16\x06\x1d\x97\xc4U\xfe-\xb5\x15\xce%\xe4F\xbd,)`\xb5 m/\xd9\xb3\x16{k\xb7\xb4a\xd7\xac\x98\xe5\xea\xc3\x92\x1e\x8c\xb6!\xe8\xbf\\\x84\xb8H%\xa2\xe0\xf0kS\x96G5\xb2o\x85\xceu\x97\xa4\x90G3\x97\xfa\xf0+Q\xc4\x0b\xd1\x97\xa1\x90#S\xfcO\xf0\xd0L\x1c\x91\xab\x88\x9e\xc3\xbfQ8\xad\xf3\xea\xef\xb3\x86\xc4\xd9\xa4oviN\xe0g\xd6\x0b\xd6\x98\x98]\xa5\xaef_6x\x97Wh\xb7p-[X\x96\x9d\xe3\xc9dV\x16E\x0e\x81\x9c\xca\x1e6\xe5\xe7\xd8C\x93|\xc9\xd6\x15\x92\xe6H\xb6<\xee:\xfcG3\"\xabJR\xa8\x90\xe7\xd5p\x96p\xc6c\xea\x00\x9f\x91\xe5\x98\xe67^\x0c\x16ii\xa7\xd1\xbb\x86\xd3\x982\xb3\xd3\xa93\xd8\xcef\xdb\x02D:}\xa9#V\xae\x05y\xa5s7\xb1\n\xe1N\xdc,\xeb\x8d\xe1\xb2\xcd\xbb\xe2,\x02\xbfr:\x15\xc8\xbd\xf9z\x7f\xabRA\xe5H\x19\xe2Y\x15\xf3\xe6\xd8\xf6\x03\x9f3\xaf\x86\xa1\xda<\x8e\xa6\xe5\xabO\x9a\x85\xe9 \xd9D\x8f\x95V\x13\xf7G+9U_\xd15eW\xab\xa6g\xd36\x0d\xdb\x8c=;\xb9\xabG}\xa9\x8dP6\xc0\xae\xda)\x19\xdfSE\xf2L\xbc\xcb\x87iP\x18\x9d\xc13\xab\xd5\xc5\x8e\\Y\xe9uu \xc9 \xac\xcb\xaa;!/#\x15\x81\x9d\x84 \x1f\xfd@6\xe2\x01+\xe5\xc0\x10O6\x90\x8bf\xc0M0\x10E-\x10M*\xc0\xdb\xab\xa3HV:\x81h\"\x01\x9c\x9b\x9a6\x0b\x85@\ny\x00'\n\xd0[Cdw\xc4\x10\x06\xd8\xc9\x01\x12i\x01\x82\x08\x01\xc2\x93\xff\x13\xd2\xfe\x13\x12\xfe \x83\x911\xad?oB\x7f\xb6T~\x7f\x12\x7f\xb6\xf4}[\xe2~J\xca>\x99\x9e?\x84$\xe6\xc7\xa6\xe4[\xd3\xef#\x13\xef\x89\x94{\xebB\x19\x064\x1b+hdj\xfd\x9cFO\xf5\xefw\xfe\xb2\xd3\x12\xe91q^Qg\xa6\xd0gH\x9eOK\x9b\xd7F\xb9\xbe\x18&\xa6\xca\x8b\x8eV5\xa6$\xc5;3\xbe-\x89\xf0\xde\x14x3\x174<\xed\xdd|\xf7\xafT[\xa3\x92\xdcC\x1a\xebKl\xb7\xb7\xcd\x9b\xcc\xbe\"\x8d]\xcf|\xb2\xa5\xae\xa7'\xad\xc7\xa7\xab/\x93\xf2\x12S\xd4\x9d\xc9\xe9\xf6\xb4tWB:\xd9[\xa1I\xe8\xbe\xf4s=\xf1\xe8\xff,\xc6\xd4\xfc\xb6\xdap\xfd5\xce\x17\x10\x8b\xd4\x94\x11\x98\xbbr\xbf\x89\x11\xf8\x8b\x18S\x100\xfeN\xdd\xb3G\x0c\x7f#co\xdce\x7f\xb3co\xac\x9c1\xf6\x08\xa6m\xff\xd8\xfb'\xbes\x9e\xc1\x9e9\xf0\x1f1\xe8\x19b\xe9\xd8\xb6\xee\x10a\xd42<\xb6u\x7f\xdcWO\x14\xd5\xb7\xbf\x02j\xe4\x1a\xea\x11\xbb\xf9\xb9N\xe6x\xff\xd0Y\xc27\xf9\x06\x80\xfb\xab\xea\xcd\xe2U\xf1\xe2\xdb\xba\xf9\x180\xd0\x95\x0d U\x04\x13\x1b\x078V\x1d\xf7\xcb\x9f\x86%J\x8az\xf4\xfd\xc6U\xd5U\x87\xf0\xdd\xc6\xa1\xfar7j\xba\xdb\xb3f7<&\xa1\xa8\xbfT_xL\x0b\xaa\xa2*;#\xf7\xbc\x96\xcb\xee=\x8e\xbf\xb1\x81u\xbd\x0cc\xe5\xef\xf6ph\xb7\xa7=\xa3\xda\xda\xf6_\x1fq\x0f\x06\xd9'\x1a|\x1e\xf259\x8f3\x85\xabxcT\xdc\xb5H\xec\x04#lv,K<\xc4\xbe\x0c\xack\xaa\xbd\xbf\xa3\xcd\xd9y!\xde\x1d5\xe3 \xa8{U\xf78\x8eV+\xbd\x15x\xa6^\xcf\xc5\xce\xdcR\x1f9 \xe7\xc8\x07~`Z\xd6jUL\x80\xb9\xbf\x07\xcb*\x07\xee\xa4\xea\xd5\x11\xfd\xe4\xaa\x07n\x03\n\xbe\x05\x06\x80\x8eE\x99%f\xed\x19*\xaa\"@-\x96@/\x98\x90\xaf]\x91\x0d0\x17O\xae\xd3\xdc\xbc\x81\xbf\xaa\xe9\x9b8UK\xd4FNQ\xb0\xee8\x01\xe4\x91\x02\xca\xa0/\x83\xfeoi\xd0\xaf9\xc1\x80q\x8a\x812\xdc\x89\xf3\xc5\xdf\xf6p'\x0fH@\x1f\x92\xc0_\xd5\x8c\x87%p\x1f\x98 \xb82\xeb\x0eN\xca\x8b\xeb\x0fO\xca\xcb\x81\x07(nW\xe2<\x05\xf4\x9e\xf1\x16\xd7\xb4}\xa5\xef\xf3^\x8c]\xffp\xe2Q~\xb0\xa9\x06\xb6k\xbb\xfa\x7fs\x9f\xb4\xd0Q\x9d\x86\xc7\xe0\xcc\x13\xfe,\xb1#\xdd\xb4\xcd'\xd6\xf5\x95\xe5|\xb0j\x87N\x86\xb3\xb7]\xbd\xab\xc7\xed5\xefH9\xda\x95R\x85\x96\xc9\xdcn\xef\xf8a+\xaa\x8f\x83\xbd1\xfcqz\x18\xdd\x8a\x08\x96\xa9B\xfac\xf6Q\xcc\x9a\x93\x91\xd0\x02\xf0\x13\\\xbd\xbf\xb9\xbd\xbb\xbexsq}\xf1\xee\xfc\xe2\xee\xf6\x9f\xaf.\xee>\xbc\xbb\xb9\xba8\xbf|sy\xf1:\xf0\x8d\xeb\x8b\xab\xb7\xff\x1c\xf8\xec\x7f\xff\xf0\xfe\xf6\"\xf0\xd9\xeb\x8b\xf1W\xeda\x01\xea\xbe\\Yw7\xebF@_\xbc\x84w\xad\xb2\xf4\xda\xc2\xa0\xdc\x9d\xf4\x12C\x87g5\x8b\x15\xb8c\xc7\xfd\x93\x04\xa1\xe6\xebJ\x16\x87+O)\xbc{\xdd\xa5\xfc\xdb\xa9\x1d\xe6H\xa8\xa8R\xf0\xc3x\x1b\xa3\xcc+G9G=h\x1e\xc51\x9a\x83\x9c|\xd3<\x9f\xe7/Y6G\xfe2\x17N\xd1\xe1\x88\x92\x8cZ\xe9&\xfdw=7\xea2\xc8|\xca<\xd0\x15\x9e0>uO\xdc\x8d6\xa5\x1b\x8e\xcd\x90\x89\xda\xe4\xec\x93\x1e\xa8\xb6\x1f\xae\xa7\n\xd9\x97*\xfeEM\xf3#M9\xec\xebqI\x92\x0b\x8524z\xf8\x81\xd5<\xa6\xb2\x9a\x06\xfa\x8bi\x88t8&\x7f\x9c\x0c\xeeq\xfft\xd7\xb3a\xa8\x9b\x9d\xe9\x91\xb8\xe6\xb3D\xfe\x19\xfb\x93vAh\xdfO7\x82?\x01\x9f\x93w7\x17\xb7\xb7\x97\xef\xfed1\x1e\xfaS\x17\xfftq\xfd\xcf\xef\xdf]8\x1ey\xf3\xfe\xed\xdb\xf7\xff\xe3\xe2\xfa\xc6\xf1\xcc/\x1fn?\xbcz\xebz\xe0\xe2\xdd\xed\xe5\xfbw\xb3\x8e\xc9\xf0\xf9km7v\x8e6\x0b\x03\xa7t.m\xe4l\x1d\xf2\x12.>\xb1\xee\xa9m\xd8\x04\xd1\xf3\xb0\xdf\xa1U\x0d\x9b\xfe\xa5\\\xdd\xf7\x12\xde7\xfb'\x11\x9f\xce\xba)\n\x12\xf7\x17\x89\xa5\xe0\x07\x10E(Z\x0f\xa7\xe1\xc4S\x18d\xa1\x89\xc5\x88\xcf(\n:\xb2\xf6\xb8g\xd2\x05\xc0\x83\xc5\xc5\xec\x17\xba\xe8\xe2D S\x02\xee\xb6\x1a|)o\xde\x04\xdcs\x99|;>Al\xc0x\xd0\n\xdb\xd6\x03\xdbf)O\xd9\x84\xbd\xad\xfa\x01P\xf5\"\xf5W)}Ej\xf4\xfb\xf1QC\x85b\xda\xccD\xd0\xba\xc1\xea\xf2l\xda\xfb\xf64,\xa3\x18,\xeeu^\xd0mW5\xfd\x03\xeb\x04\xf5\x04V\xd1\xd8\xe4}U\x97;\x8f\x92\x99\xa3[\x8e\"ol\x105\x15\x1a\x8cu6\xa9p\x1c\xab\xfc\xf8'G\xac,\xafS\xdc\xfb\xcd6\xf4+\xea)\xe8\xfcU\xf1P\xc76\xac\xfe\x14\xa9I\xbe\xac\x8e\x8ai\x81\xb6}V}/\x83?*\x9d\x8aG\x88\xf1\xcd\xfe\xb1>B+\xa9\xc7\xa6Pt\xdeA\x0f]{P\x9a#\xf7vJ\x95\xa8q6-\xc5\xc1\x83kyj\xf0\x9e\x17\x02\x97\xc7\xf0\x1dv\xd8\xb9 \xecD\x10t\x16X}\np-\x89\x19v\xfe\xcf\xbd\xe7\x7f\xee\xdd\xfe\xb3\xee\xf3\xf3Z\x1ez?o\xee\xe4#\nY\xec\xdbSw\xec|\x87\xae\xe8\xd3\xf7\xea!\xbb\xf4\xd4\xfd\xb9\xd3\xba\xdcNF\xc3\xe8*\xd5\x16x\xe7\x87\xf39\xd5\x06\xf8\xe7\xbfw\xee\xaf\x9a\xf7\xf4\x9c\xf7\xb6\xc77\xdf\x9fs\xae?\xe7<\x7f\xc69N\x8dS\xbe\xfctK\xb2\x9cm\xfd\xc0\xff:\xf0!\xd7/V'\x8aL\x80\x93v]6\x9b\xf6P7;\xdbZ\xbd\x9e\xd6Q\xac\xe7\xcf\xec\xca\xfb\xaaT\x8ca{@\x14\xc3\x1e\x0b\xe5\xb9*\x15\xb47D\xd1w\x88B\xa3\xbd&\x01\xbbE\x14s\xcf\x18\xa9{\xb1\x7f\\<\xa8\xb9y\x92\xf6\x92\x0bM\xea\xbeR\xbf\x1f8p_i\xaf\xa8\x9c5\n`=\xbe\xbb\x17T=\xf2\x88\x843\x9e\x1f\xad\xa6z\xcay\xa3h;T\xdbE\xd2\xc9\xd0~\xae\xbamOU\x87\xe4_\x16\x86\xc3\xbc\x8f\x87\xd7a\xfeyq\x11\x0f\xd8&can\x16R\x98\x9b\x0bs3\xf1p(s3\x9d\xbe\xbdn5\xb6\x92r\nm\nE\x06rsz5+\x97\xd1\x9c\xd96\x0b\x18L\xb9zGpT\"E\xc9W\xe8\xd7\xc0\x155:\xeb\x89\xbai%$\x82\x14T\x13\x1a\x13E:\xbdNt^\x08/\xb7(\x95\xba%H\xfb.\xed~\xff\xaa\xe9?\xc7\xdcRV\xe1{\x7f\xab\xbb5\x02\x0d\x9a(\xea\xea\xad%TUG\xde\x15\xe6'\xe2v\x84}\xbbQ\xe2YQ\xbe\xca.O!\xb94k\xaaUg\xbf\x7fN\xe6\xefQ?hlY|\xdc,\xb98\x17j\xc4\xc0\xba\xab\x9b-\xfbbF\x10Q\xc3\x0c\xc5yQ\x86\x8d\n:\xa49X\x91 \xe8\xc0\xfa\xa9\x0e\x87+\x91\xf8,\xe6\x12Q;\x92\xcb|\xed\xa6\x17\x03\xcbx\x19\xe2\xb6T\xde\xc1\xdf\x19\xef\xf1\xeb\x0b\xb1\x9fM\x92t\xf1\x018\x1d\x8e\xf2z\xb9\x88\xa3l\xe7\xcav\xee+n\xe7\xf4Oj[\x91\x83V\xfc\xf95\xa1\xed\xfa\xea\\6\xd6\xb7\x07\xe8\x879\x9b8b\x1f0\xbf\xfb\x1b\xda\x0b\x04\xe7\xd0,\x167C\x0dE\x0di\x86\x86\x10\xa4\x95(_e\xb7\x10Af\x89\x92\x7f\xdf\xe0 \xb9D1\xa8.\xc5\xfb\xf4H\x02O(\xf2@\x92_\xce\x7fsD\x9f\xbai\xbcP2\xd2a\xa2\xd8I1Q\xf2Qc\xa2d#\xc8D\xb1\xd2d\xa2\x0c\xf1d\x99(\xb9(3Q\xdc\xc4\x99(Q\xf4\x99(\xd1$\x9at\xdfq\xc7\xbd\x95J\x13%\x9aP\x93\xd4\x866\xc3B\xab\x89\x92B\xaeI*<\x1d\xa1\xe2m\xb5\x94\x17A\xb4I*\xb2\x92o\xa2$RpJ%\x01D\x9c\xe4\x9b\xc1\xe4\x9c( \x14\x9d( D\x9d\xb6\x89n\xa9j6\nO\x94\xbcD\x9e(\xd9\xe8\xb7D\xd2R\x94\xf0\xce\xf1\x11\x98\xa2\xf8z\xc1Kf\x8a\xb2\x82\xd2\x14\xc5 \x8e\xe4b\xa37EI'9E\x89\xa7:E!\xbel*\xed)\x8a\x93\xfc\x14\xc5N\x81:\xfd\xddJ\x84\x8a\xe2\xe8\xddPRT\x14\x1f5*\x8aN\x90\x8a\x92@\x93\x8a\x12@\x96\x8a\x12N\x99\x8a\xe2%NE\xb1\xf5\xa2e`\xdb\x9f\xf7\x11\xaa\xa2\xa4\xd1\xaa\xa28\xaal\xfc\x9eD\xb4jh\xd3\x88WQR\xe8W\xcd\x12\x0c:V\x94$RV\xb3\xcaK\x92V\x94\x9cT\xad(6\xc2V\x14\x9d+\x13E'oE\xc9C\xe1\x8a\x92\x8d\xc8\x15%/\x9d+J\x18\xa9+\x8a\x97\xda\x15E\xb8\xb0|\x04\xaf\x8b\x87\x9d4\xaf(\xd4\x12B\x92\x82\xa2\x84R\x83\xba\x89_\x85\xae0\xfaW\xf1\xb0\x9f\x04\x16\x85hPNBX\x94$ZXC\x9bA\x13\x8b\x92\x8f,V)&\x0be,J\xea\x18\xf1\xd2\xc7\nu\x1e\x12Y\x14}\xb9\x12nu7\xa1\xec\xe2\xd1\x04ZY(\x18r\xc1\x90\x0b\x86\xfc\xab`\xc8\xff\xaea\xc8$\xa2\x1b~\x1f\xb7\xa6 (\x90\xac\x1fV#\xc7\xc7\x89\x1c\x91|\x81~ \\Hp\xc2\xac\x08\x06|-t\x85`!N\x04',\xea\x8d7L$Q\x04\x02\xa6M\xe8$\x17\xa9\"\xd8\x88\x15\xc1U\xa6P\xbc\x82`\x91\xbf\xb5 Y\\Y\x80\x85l\x11H\xc2EZE(\xe9\"\xd8\xc658\x91i\x9a\x80\x11\xc0\x15\xfcf\x0d\x7fs\xa2\xe3\xe0A\xc8\xc1E\xd8\x05~\x9f6\xf8B\x12\xa4\xd8#1\xa4\xc4\xf0_\xd9\xf8\xea\xc0N\xe2\x05v\"/\xf8\x9bn/\xc9\x036\x8a\x85\xfa\x0e\xc2Z+\x1a\x92H\x81\xa7j\x8a\xa6\xc1S\x94\xac\xe7\x7f\x04+\x07$\x94y\x97s\x1c\x96y'\xe4\xb78\xef\xd6RP\x02IC e\xc6\xad\x1d\x816\xaaJ\xf8\x8d\xce8W{\xad3\xce\x12\xea\x07a\xad\x15\x0d\xc9\xc5~ ~\x06LXU\xb1\xf5L\x98\xca\xcbql\x98\x8a\x82`FL\x00\x9d\x15\x13\x1c\xd3\xdd\xc1\xf2\xf1r\x84\xa8\xcb\xc3\xd2\x11RR\x1e\xce\x8e\x90\x92\xb20x\xa8b\xc9\x05\x00\xff\x0c\xf0.\xd3\x86\xaf\xc9\xc5\xce `g\xe8\x84|\x95\xb1\xec\x17\xe2\xf8\x7fHUKN \x0bk'\x04r\x02\xcd\"\xea\x1f\xcd\x0edh\xca\xc5\xe0 \x0e\x16O\xa5\xb8\x10&Op}g\xca\xe0\x86\xb1zRO\x12\xcc\x9e\xd4c\x14\xbb'\xf5\x9c\xc1\xf0I>\xa4\xb3|\xc2:\xa6O\xf0\x1a\xd7\x0c\x8c\x9f\x94\x9ad\xd6OJ\xe9\xf30\x7fR%=\x13\xfb'YTN\x06P\xb0\xb3\x80B\xc8\x0e\xcfd\xe7\x84y>\xfa\x18A\xc1\xc9\n\n\xc9\xe5\xafc\x08\x05\x93%\x14\x02\xb6\xcf\xefI\xb6PX\x9a\xd3\x18\xc6\xd0I\x81\x01S\x85\xa5U\xf6C\x00\xfau\x83\xd0\xcc\xf8\xf4\xfa\xfc\xc9\xe3\xf3\xd3\xd7?_\xe6d\x0e\xd4\xcc\x8e\x9b\xc9\xea\xc5'\x14\xa6\xa3g\xf64\xc7\xe8N\xf3\xa1h\x0e\x1c\xcdY\xb69aC\xb04\nM[Y\x8c\x03Q\xb3ajdmW\xa0j\xd1\x07N;\xb6\xe6\xf69:\xbc\x8e^\xbf\xa3\xdf\xf3\xe8\xf1=zw\xd5(\xde\xbd5\x8a\xdf#\x17\xe5\x93sh\xb3\xdc`;\x8b\xc3\x0f\xf9[h\xbb\xd5#\xe9D\x01\x02[\x9e\x0f \xc8\x84\x05Lj\xe2P8\x17\x0eW\xe6\xa8\"\xf9\xc7i\x99\xa3\xb6?'\xb6\xfc\xdb\x9d\xa31\x88\x9d\x0d\xb3+\xb3S\x91\xbc#\xd4r\x0f\xf7,\xbf\xe1\xd9i\xbd\xc5\x0e\xc5\x01\x9e\x05\xb6<\xa4I1\xb0\x9f\xcb\xe2\xd0\x80`\x10$\xb8\xaeUq\xb0\xe0|X\x89\x06\x06'\x15\xab\xa0A\n\x1ct\xd9\x15'\xe9\x9b\xeb\xfc\x92\x08\x12\xd20aH\xc1N\xa8\xd0\x03\x16&\x9f=\x93!C\x1fh\x18\xfd\xad,\xb6\xdfm\xf7\xf9\xab\xae\xe1\x1b\x02 \x06\xcc';\x88\x18\x00\x91\xadz\xcf\x0e$\xae\x87\x12W\x83\x89Ip\xa2\xcf\xe7-\xc5\xdb_\xeb \xc5\xaf *~MX\xf1\xab\x01\x8bNh1`n\x04\xec\x1b\x0cw\x9c\x0f`tC\x8cY+e]\xf53B\x8d+\xc0\xc6\xb5p\xe3\xc2C\x9e\x088\xba\xfa$\x1e\x854T\x19\xa8\xa4\x1b\x97\x9cj\x15\x8aL:\x87\x87\xed\xd2\xd50T\x8fz\xd6\x82P\x86c\x94\x81(e N\xb9\x1a\xa9\xf4\xdb\xedLh\xe53\xe1\x95_\x13\xb1\xfc\xaa\x98\xe5W@-\x9d\xb8e\xd0f\x93\xc6\x0e\xa79\x1b\x82^\xfa\xf0\xcb\x1c\xf5X\x8fb\x928f\xc8\xfe\xde\x8ee.lu\x1c\x9aYrlK\x8em\xc9\xb1\xfd5rl\x97<\xcd\x14\xe4\x1f\x12Q\xa0\xbe'\xf4\x0535\xcb\xfb J\x9cA\x893\x08\xe9\xb4\x12g@\xab)q\x06\xb6?\x06\x1c\xac\xc17\xf8f\xf1\x1d\xb0!;RP0\xcc\xff\x90\x18f\x8930\xe5\x9b\x1e\xa7e\x8e\xda\xfe\x9c\xd8\xf2ow\x8e\x968\x03U\xbe\xd9\x11Z\xe2\x0cJ\x9c\xc1,kZU\xe2\x0ct]\x93-.q\x06%\xce\x00\x1f\xf6\xcd\xa7\x12g\x10\xd2&\x1f^\x85\xe2\xed\xaf\x12g\xe0*\xab\xc4\x19\xe4\xadT\x8930u\x958\x83\x12g\xa0H\x893\xb0\x97U\xe2\x0cJ\x9c\xc1\xb2\xa8\x12gP\xe2\x0cJ\x9c\x81\xa2\xec7\x19g@a\xfe\xe1L\xde\x8b\xd7ec\x9d\x84\x06|\xf3s\x83K,\x0eScx\xaa[\x1b\xff\x86\xc6\xb3\x8d\xf1m^\x9c[\x16\xe7F%p{B\x0f\xce\xc4\xadH\xd6\x0d\xc8\xf3o;\xbe\xc2f\xe3\x19\xb7\x18\xea\xb6]\x8c\xdc\xe5\xb9\xe4\xd8\xf6}=\xbe\xd6-w\xf6\xfc\xc6\x12qR\xd9T\x0d\xbfv\x94\x98\x12\x02\x01Qg\x833\xd2F\x03\x08H\xf3n1\xed\xf2\x00\xbb\xde\xafm\xe2j\x0bO\xfdW\xac\x84\xe2B_\x00Zd\x15R\x00\xabH\x80J\xff\xbc\x1f\xa4\x07\xfc\x9b\xfd\xb4\x06(\xf3k|Z\x0d\x1dY\xe0\x06\xaeO\x1b\x03h\xcc{4\x12\xa6p\x15\x17\nCD\xc0\x0e\xc6\xc0\xe9Y\xf7\xaa\xe9?\xcb\xcd{\xc8\xf8\xa1\"\xe4\">\xe0b\xdfw3\x85\xc4m-qg:\xfc\xa0\\\xf2\xbf\xf0$\xed\xdb\x8d\x12\x96f\xb8\xeb\"*z\xb9\x08>\x83\xaa\xef\xdbMm\xa9\xcbT\xec~O\x14\xab\x07\xe7\xd1ayD\xb1\xe3\xa9\xa7\x9dzd,\x91\x7f3qC\xb7\xa8\x8eP\x80\x7f\xea\xef\xeaq\x82\xb0\xb8pI3\x8a\xd0]U,jZ\xbb\xb1\x06\xea\\\xbc\x12\xb7\xfd\xbd\x12\x7fRk1N\xa1\xb0\x89\xf1\n\xcd\xa9,\x07M,\xd78\xae\x97\xb2\xab\x16sc\x1a\xdfK\xdb\xaa\xbc\n\xfcFn\xf1\xa2\x98\x1f\x1d\xab\xf0B\xdb\xb3O\xbf?{\xd316\x1ahn\x05\xae\xaa\xae\x92=\x160YX3\xae\xf5\xc6@\xb8o\xdb=\xab\x1a\xbd}\xff\xe3\x91q\xdf\xe0\xa2D\x98*\xa3\xd8\x19\xa1W(8T_\xee\xf6\xac\xd9\x0d\x8fI#\xee\xf6\x91\x8d\xaa\x00U\xe1\xd6\xc2S\x15\xb1\xdd\x00~\xa0\xd8\xdd\xb1/\x9e\x0fi?F]\xb3\xdd\xc5\x17,\x93U\x9bG\xad`Q\xdcxZ`\x9bA=\x8cr\xdf~\xddK rha_\x1f\xea\xd1\xeaW\xc3\xbc.\xf4|s$]\xca\xc2\xf7\x8am9S\xc7\x0b\xf1\xad\xb5}\x18\xfe6\x1eT\x965\xc4\xeb\xe2\xa7\x0e\xb2\x8c%~\xa4\xb9\x16\xbf\xac\x8e\x7f\x96\xaa\xa2\xbc\x19\xbf\xd6\x8dC\xb2\xd2s\xe4\xf0\xf1\xa4\xfayHD%K\x9dp\xc7\xd4Ru\xa1\x0c'X/\x1aJ\xbc\xf6h*U\xdb\xcd)o\x11\x17\xae\x93\x9f\x16\x9c0\xef\xf8\n\x1d\x0da\xedO\x08\xb8\x08\x1d\xe0\xd5\xb8}\xf8\xb9c}{\xea6\xe2jS>UO<>{\xff\x04\xf5v<\xf6<\xd4\xe6\xbd\xe5\x84\xba\xf9\x86O\n\xd8\xb1\\\xa8\x8e\x98\x91h\x03\x1cN\xb3[p\xdc\xe4\xedY\xd5\x0f\x94\xb6\xf1\x9c\xfa\xfd\xcf\xdf\xcf\xa6\xe0\x8c\xdb\xb9}\xd5\x0f\xd0\xb3\xddA\xb9U\xf0\xc3\xf5\xdb\xdf\xf5p\xac\x86G\xae\x9eP6\xad!TI\x03q\x13,\xef)\xa1\x9e\xf7\xc9\x0f\x15\xbff\x9dx\xfd/c\xc1\xd6k\x15\xff\xf2#\xd6\x9b+\x9c\xd7\x81\xb1\xf1\x84\xaeM\xd5\xb4M\xbd\xe1\xe7\\\xea\xeev\x80\x1f\xd8\xd9\xee\xec\xc5\xd8m\xdc\xd3\xf4\xfd\xd9\xf7\xe3\x9ch\xda\x01\xaa\xcd\x86\x1d\x07\xb6\xfd\x91\xba+\x16\xe0\xb2\x81\xe3\xd8\x91\xf5\x86\xbd\x80\x81\x8d\xc6\xf0\xd4\x9f\xaa\xb1\xd9\xc7\x8em\xda\xc3\xb1\xde\x8f\xf5\x12P\xf1}\xddT\xdd\x13TbY^\xca\xd8#\xe2\x08;<2\x12\xe5c_F\x83\x0f5\x9f\xc8\xa7\x9e\xc9\xdbq\xc7O/B\xe9_5Og\xf0\xe7\xf63\xfb\xc4:\xbc,\xf7\xc3\xf5[\n\\D; .\xed\xa5\n\xeb7\x8f\xec\xc0\xe0/\x8f\xc3p\xfc\xcb\x0b\xfco\xff\x97\x17\xd0v\xd0\xb4\xe2\xaf/\xf8\x88\x1aW\x13\xb9K\xc7\xe38\xa1\xeet\x1cOq\xe4\x8d\xbc|\x0e|\xe2W\x03W\x03\x1c\xaac\x8f\xc3c\xac\xf9\xd8R\xe9\xc7\xe3\x0e\xc9\x1a\x97\xdc\xaa\x17^\x8b\xfe%\xf9e\xfe\x0e.\x1f\xe6z\x8e\x9fS\xde\xb1<5E\xd8\xbd\xd3\x81m\xc9\x1b\xc3\xff\x0e^5\xf0\xe7\xdb\xdb+\xf8\xd3\xc5-\xb4\xcdt\xe0\xe1\xd3\x0d\xaf\x18\xae\xccKFo\x9f\x8e\xec_\xfe\xd7\xbf\x10\nAzW\x1b9\x12\xd0n\xf2>=v\xed\xf6\xb4\x19\xf7\x8b\xc0\xba\xae\xed\xa8\xdb\xa4\xff\x0e^\x1d\x8f\xfbzS\x89>\xe8\xd88\x96\xda\xcf\xb8\xfb\xdeT\x9bq.\xb7\xed\xc7\xd3qrb\xe2J\xacE\xe2\xa0\xd8\x82\xe7\xf85\xcbm\xc7\xb73\xe3C\x07e,oq0W\xb2\x01\xe3\xbf?\xb5\xf5\x16\xaa\x86\n\xdc\x04Q\x1d>];\xf6\xd0v\xec\x85|u\xd4X\x0d\xf5}\xbd\xaf\x87'h\x18\xdbJw17+\xdd'K\xe0F\xdb\x8c\xe6\xab\xd91\xfe8\x9f5g\xf0\xc3\x87\x9e\xc1'\xd6\xf5\xe8l\x1a\xe4\x9d\xd38~\xaa\xa6\xda\xd1m\xbd\xefX\xf5\x91\xfb\x97P\xe5\xd9\x8f\xd4Hx\xd7\x0e\xec%\x9e5\x1eN\xcd\x06G\xfaXka%6\xa7\xae\xe3\xa8\x82\xea\x8do,\x1d\xdcr\x10\xc2t\xc3\x83\xb4\xf6\xf7\xa7\x87\xf1\x80\xc7\xaa\x9e\xbd\xe0w\xf7\xd6\x83,\x88o\xd8\xb8_x\x9a\x1f\xf7lW7\x0d\x1d\xce0.\xb1\xa4q6\xaf\xb0\xa5\xed\xdb\x0d\x9f==B\x00\xe3\xf4lt{\x00?\x88t8\xc4Pp\xba\xfd\x08\x87z\xf7HY\x81{r\xfa\xf3f\xf1\xf0\x85\xfap\xdc\xb3\xc3t\xdd\xb0\xf0\xc3n\xa0g\x87\xaa\x19\xeaM\xafO\x0bb\xaf\x00\xbe%\xde\x8aMA\xd0\xfa\xff\xcb8\xfd\xef\x19Tc\xe1\xf5VY\xc0\x8d\xd5Z\x9e\x01\xef\xdbO\xe4\xd2?\x05\xd8\xf0/\xb2x\xc2]\x0f\xbc\\|F\x02\x1b\xa8\xba\xfbz\xe0\xf7\xc5;\xea#,\xa9\xa6\xac\xda\xb7\xcdN\xdc%\xae\x7f\x9e\xd1\xdeq\xb3\x8c\xf5\xb97\xb74jyrwb\x0c\xa6+\xfdR{a\x8d{\xe8O\xc7c\xdb\xf1\x15\xedXm>\xfe\x8cw\xcd\x8f\xeb\x18~\xdb\x9e\x9eI\xd4R\xde>\xc0i@s\"\xa7i?\x1a2\xe52t\xee\x00\xe2\xee\x8a\xe9\xeezl\xc4+\xc3~\xe1'\xd1\xcb\x90\x17M\xff\xfe%\\\x8d\xf5\x1c\xe7\xa7\xa8r5-Tu\x03\xe7\xff\xf9?\x93\x8b\xca\x9b\xb6\x85\x87\xb6\x85?\xc0\xd9\xd9\x19\x05/\x8d\x0d\xaf\x9a'\xeaOU\xf3t6\x16\xfa\xa6k\x0f?<\xb4\xed\x8f\xd4Cgg\xd4\xcaQ?\xc0\x0f\xe3\xeb\x1fxUo\xdb\x1f\xfe\xd3\xf8\xfe\x8f\x96\xeb\xaei\x1d\xc6%\xe4\xb2/\xfe\xde\xd3\x17\xff\xad\xfaT%u\x06\xfc\x81\xefkF\xcd\x91\xed\xae\xfb\x1f\xde\xb4\xed\xd9f_\xf5\xbd\xb5\xd9X\x95\xf1ql\x85\xf2\nU\xa2~;\xf7(?\xff<\x0e8_]n\xaa\x03\x1b\xb7 \xaf\xb0V;6\xbcFl\xeb\xb2\xe9\x87\xaa\xd9\xb0\x1f~\\WIR\x03]g\xfdG\xf9\x11\xff\xc1\xf3\x11\xaf\x9e\x86\xc7\xb6!?#V\xe9M\xdb\xfepvvF\xe5\x9eL\x9f\xf0\x07\xcb_\xf9\xb0\xe6\x9fv\xcd\x97\x1d_\xbc\xc4.|}qs~}yu\xfb\xfe\xfaGs1\x00Q\x08\x0e~[1X\x90\xad{\xfeoO\xf7\xfc\xa9%\xc3\xf2\xc6\xaey\xf9\x07\xf8O\xc7\xfb\xb37m\xfb\x7f\xce\xce\xce\xa8Q3\xd6\xee\xc5\xb8\xed\x1b\x9f\xad\x9a\xa7\xe3\xfd\xd9;\xf6\xd9Z\xd1\xfa\x81?\xfb\x7f\xfd\x01\x9azo\xbb\xb1\x9e\xee5r\xd0\xda\x9e\xd5*O\xbe*\xea\x82\xf5>\xfb\xd0\x1c\xaa\xae\x7f\xac\xf6\xb7-N\xd4\x94\x8aj\xbf\xder\x87\xd3\xe6\xe3d\xb9\xe5\x86\x1e\xee\x9f\xe6\x8d\x93\\_\x10]|\x92\xa0\xf1\xb8\xc5\xd0\x15\xfe\x8e\xd8\x06\xfd<\x9eY\xcf\xf8\x1f\xc6\xed\xe3\xef\xc6s\xc6\xb4\xde\x8dk\xe1\xf8\xfd\xcd\xd5\x08G\x84^\xc0\xb4\xc44\xfb'y\xd22\x0e\xc5\xd3V\x15\xaa\x87\x81\xe1^\x8a\x9f\xc7\x7f\xf7\xf3\xeft\x85\xe2\xb8'+\x83\xe7;&F\xe8\xf7\x0fm{v_u\xbc\x19_~~:\xfb\xdf\xdfc/\xe0I\x85:z\xf1b\xbf\x1f\x9f4\x17\xba\xffv\xf3\xfe\x9d\xfe\xdb\x1f\xfe\xf0\x87?P\x9fe|vv\x07\xe0\xd6\xad\x1d\xe7\xa7\xd8\xa7\xe0\xb1\xe7\xd43\x19\xe6\xb0;\xed\xabN\xd7d*@\xfcf\xde_\xbc\x98#I\xc4\xd4{!\xb6-\x86\x13AY\xf3\x1fx\xfb\xff\xf2\xff\x8d=\xf0\x17q\xee]\xb81e\x7f\x9e\xc9\xd9\xfe\x92\xdc\x9bW\x9b\x8f\xe3d\x9f\xcf{\x0f\xf5\x9eQFV\x9a\x85+\xd6\xf5mc\x19\xf7\xc2u\xf3Pw\xfdp\xc7?\x84-\xdeD>\xca\x83\xdd\xc4\x93\x7f\x1ff\xdc\x01,\xa5\x7f\xcf{\xe3\xfb\x97\xf0=5 \x96M<\xc3v|\xff\x82\xd6\xc4[\xf0\xae:\x8c\xda\xfe_\xac\xea\x7f\xb5<:\xb6@{2\xa4\x19\x97\x0f\xe2\x84\xb1\xfc\xf6\xf8\xdd\xea\x1e>\xb3\xfd\xfe\xa7\x8fM\xfb\xb9\xe1\xd3\xf3\x91{\xb47\xa7~h\x0f\xe40^\x0e\xb4\x17\xb8\xbf\xd5F\xdf\x1c\x1a&\n\x1d\x07T\xb33\x1cL|p\xe9\x05\xfc\x85\x0fx9\xd6\x1e\xdb\xfd\x16\x07\x9aR'\xee\xac\x12c\x14\x84{H\x0cQ]\x1b/b\x1a\x9b\xf0\xc38\xe9e\x17\x18\xde\x07\xe9\"\xfb\x97\xff\xf5/?\x92\xc38m<,\x0b\xb1\x0d \xde\xfcQ\xd9\xef\xcf\xfe\xfe\xf7\x7f\xdf\x7fO~\xe4\xf9\xdf\xe9\xf73J\xa7\xf2w\xdaS\x12\\\xd0 \xe1j\xa8\x10\x0fV\xa2$\x97:\xc4\xfb\xff\xbe\x88\xdd\xd2\xa1\x8a\x10~\x98\xa9\x06\xd7W\xe7B\x97\x1e\xaae\xc7Dz\x04]VC#G\x05\x97#_\xa1_\x83\xaf\x07\x8c\x8c\x9d4!\x11\xfd\x84$U\x1d\xc3C\xb5\xa2\xa6c\xbb\xba\x1fX\xc7\xb6w&\xe4\xa3\x94\"\x00*\x05\x1a\xbf\x9e\xde\x94\x1d\xaa\x01wD\x03WA\x0c\x06\xa0)e \x81\xcd\xe9\xafK\x80\xd3[M+\xd49\xcaC\xc7\xd8\x9d\xc9\xc4b\xed\x14\x0b\x86\xf9mt\xc5Z\xacW\n\x85\xf9NEXQ+p\"W\x00\x99\xb0`):&<\x15\x92\x06G\xad\xc3\x8a \x05\xb1\xa01\xa1j #\x03\xb8\xe3[43Gb\xcb\xca\xc8\x95\xe6\x9a\xb0V\xdf}g\xd6\x01\x87\xb4\xd3\x90k\xf65<\x0cw\xa9\x80\x0c\xc0uX\xf5\xd5\xf6|\xd2\xa5\x9b\xf4\xa0\xf8\x95\xbf\x11\xba/\x1f4nM7\xccV\xb7\x08\x88\xdc\xce\xf2\x95\x81{,\x00*\xb78\xc0\xad\x06\xdc\x7fy\xb3\x8d@\xc0i\xa5B\xecTv\xe0\xdc\x07\x9d\xe7\x06\xcf3\xc3\xe7\x1e\x00=\x19B\xcf\x0b\xa2\x87\xc0\xe8 @z^(=\x08L\xcf\x0b\xa7\x07\x00\xea\xd9!u\x0f\xa8\x1e\x07\xab\x93\x8a\x9cP{\x16\xb0=\x10n'\xdf\\\x05\xc1'\x83\xf0\xb9ax;\x10\x9f\x19\x8a\x7f\x0e0>3\x1c\x1f\n\xc8g\x86\xe4\xdd\xa0|vX\xde\x0e\xcc\xaf\x80\xe6\xe3\xc1yR\x19\x07\xec-\xf0|\x12@o\x85\xe8\xbd[\n'L\x1f\xb6\xe3\xc8\x07\xd5\xbb\xc1z\x7fm\xb2\x02\xf6n\xc8>\x1bh\x9f\n\xdb\x1b\xea\xf8\x8e\x86\xdc<\xe4\x85\xeem\xe0}:|\x1f\x80Y;!\xfc@\x10\xdf\x8a\x8a\xad\x04\xf2\xedz\x08\xac \x19\xce_\xd39!\x90\xbe\xbf\x17\x82`\xfd\xd5\xc0\xbe\x05%u\x82\xfb\xb9\xe0\xfdT\x80\x9fF\x812\x80\xfc\x010\xbf\x0f\xe8\xf7C\xfd\xce/\xbe\x06\xee\x0f\x03\xfci\xc8?\x19\xf4\x0f\x86\xfd\xd7\x02\xff\x81\xd0\xbf\xbd\x17-\x03\xdb\xfe|H\x08@\x8e \x00g\x95\x8d\xdf\x93B\x01\x0cmDh@\xd6\xe0\x00[x@b\x80\x80Ye3` \x7f\xc8\x80;h\x80\x0e\x1b\xa0\x03\x07r\x86\x0ed\x0e\x1ex\x8e\xf0\x815\x01\x04\x81!\x04\xab\x82\x08\xc2\xc3\x08,\x81\x046\xe88\x1c<\xf6\x07\x13\xac\n'\x08\x0e( \x1b\x94;\xa8 oX\x81%\xb0 whA\xee\xe0\x82\xf41\x12\x14`\x10\x16b\xa0\xafvyxW\x8dP\x83\xf4`\x83\xc2\xcdT\xb8\x99\n7\xd3\xaf\xc1\xcdd\x81\x85\x83\x00a\x1d\n^\x19\xe1\xa3\xc7|D\x80\xc2\x8e\xb8\x98\x15\xc6\xe3W\x88\xf8\xe1\x04\xb4:\xda;\xb7G\xd1\xf8L)\xc8\xb2$\xca\x9a\xf7\x8fm7\x1c0W \xa0;\x040*\xf8/:\xec\x8f\xb7W\x8fV\xb3\x06\xfcE\x87\xfa\xe1\xec\xd4\xb4Y\x82\xfcR\xc2\xfbx(\x9f\xde\x1a\x02\x7f\x89 \xe9\xb3\x87\xef%\x06\xee\x05\x85\xec\x85\x87\xe7%\x04\xe6%\x84\xe4\x11\x06#c\xe0]\xde\x90\xbbl\xc1v\xfe0\xbbl\x01v\xb6\xd0\xba\x94\xa0:2\x80n\x08 \x9d\x8b\x0d\x9a\xb3\x06\xc8E\x86\xc6\xad\xf1\xf2\x84\x9d`\x8c\x1542\xf8\xcdz\x0f\xcb\xb0\x08{\xb3\x97\x9d\x16\xea\x86\xa1m\x8a:3\xc8-Cx[Z`\x9b6\xca\xf5\xc501\x98Mt\xb4\xaa1%l\xcd\x19\x93e U\xf3\x06\xa9\x99\xd1\x1a\xe1\x81i\xe6\xbb\x7f\xa5\xda\x1a\x15\x86\x16\xd2X_\xe8\x99\xbdm\xdep\xb3\x15\x81fz(\x8d-\xb8,=\xac,>\xa0l \x9b'\x06\x919\xc3\xc7\xec\x81c\xae\x901\xb2\xb7B\xc3\xc4|\x01bzhXBPX@8Xx \x987\x04\x8c\x88\xa42\x8a#\x9e\xf1\x85z\xa5\x05y\x91\x95R~I\n\xe9\xd2C\xb8R\x82\xb7\x88`\xad\xa40-=,+g@\x96-\x14K\x8fO\xd1\xc3\xaf\xf2\x04^e\x0b\xb9\xca\x1bl\x15\x16f\xe5\x0d\xb0\n\x0c\xad\n \xaa2\xa2\x8f\xcc\xd2B\xc3c\xdc!T\x81\xc1S\x01aS\x8b*\xe7\x0c\x95J\n\x922\x83\xa2\xf2\x85C\xe5\x0b\x84\x8a\xff\xba\xde\xe0'_\xd8\x934\xdaz\xa8\x13y\xb4\xf0\x877\xa5\x056\xd1\xae_\xdd_\xfc-8\x81\xd7C\x99\x19\x9d\xb16@\xcd\x06V\xba\xbee,@i\x81&]E\xa5\xc0\x91:\x1e\x91\nA\xce\xb0\xa3\xe8\xba\x19o\x0c\x1b\x84_\xef6\x8bX\xb2\x17\x1d\x95s\xb6\xc1vK\x83\xfb]i\xc7\xc2.o\xb0\x90x\x04w\xdfW\x9a\xce\x0er!w\x00\x15jO!\x152:\x01\xac\xc8 \xc9\x9eC\x8f'\xc87\xa6H\xf2 k\xc3}\xc4A_\xad\xb91$A6\x82 \xdavCH\xdfpZ,\xb4\x1d\xeb\xcd\xc7q\x924\x1a\xe0\x8c\x90F\xd7\x1e`[?\xf0\xcb\x11\x87\xe9{)\x86\x94\xa8\xe1\xdb\xba\xe7 \xe5\x8c\xb5\x88\x91\x8b\xeap\xb5k\xd8\xe7Y\x1d\xaf\xd7X\x91\xb1\x0d\xb5:\xc8d\x1e\x9c\xf2S\xdb\xb0\x05]\x165U\x0f\xed\xf6\xb4\x173\x96\x8d\x06\x81\x9c\x88<,\xe4W\xa0-\xb4Nh\xb0Lj\xa0&6\xd8'7x\xb8\x93\xccI\x0e\x9e\x89\x0e\x9e\xc9\x0e \x13\x1el\x93\x1e\xdcs\x13\xc2'?\xb8\x0d\x00\x04\x17d\xe1nH0\x06\xa4\xbez\xa0\x0d\x028k\x92f\x18\x0cu\xf7\xccj\x1c \xd8@\x80\xa3\xc69\x0d\x05\xd0\xc6\x02T\x83\x01\xeb\x8d\xc6\xf4\x02a+\xec\x91g\x18o&\xca\xa0C\xcc\x96F\x08\xbf\xd8j#\x84\xdd\x15g\x84~\xadL\x8a\x1eC\xc6t\xe6\xd4gJ\x9e\x080@\x84\xe9\xb1\xf6A\x90\xb9\xb1\x1a\x1a\x9fZc\x82$\x98\x15s\x8fA\x18\x14Q\xae\xd5^T\xf7\xedi\xe0\x9b\xe7q\xb8b8\xe9\xd4Xub,\xc7\xafob\x88\xf2\xc2'\xc6\xfa\xe5\xf9\xab\xec\x95\x7f\xe5\x14\x06\xcbL*{xZ\xf9\xaf\xbb\x87\x8f\x9bc%\xff\xa0\xe4\x1f\x94\xfc\x83_#\xff\x80Z}\xc2\xd6\xb5\xd0\x1d\xdf\xf8\xff\x11\xeb\xda\xf8Z\x94)\xf8\x15v|L\xd4w\x06\xa76\x1d\x0b\xba\xb87\xb16X\xac\xf2\x8c\xd8\x0f\xdc\xd5\xdb\xf4\xe3\xf6\xdae\xd4\xb6\x88\x8au\x9c\xec \x05\x01\x81yN\x04\xf6\x94(PY\xdd~\x91\xf1\x8a\xfc\xbe\xfb\x05\xb6ft\xd4\xf8\x03[{\xc3\xc5\xf2~w\xa9Dyt\xa8\xba\x1d\xd3y\xffm\xde\x0b\xbb\xefb(\x17%\x1b\x92-\x9d\x03|<\xcfC|Z\x07dL\xed\x00oz\x07\xc4\xa6x@J\x9a\x07\xd5c~n\xe7\xe8t\x0fB\x97\x97\xd79%\xed\x83PW.JNK\x05\x81\xb4t\x10z\x8a\x92\x95\xcc\x96$\x02\xd9\x13E g\xb2\x08\x04%\x8c@\xce\xa4\x11(\x17%S\xc5D&\x9b@\xb9(9.\x19ESV.J.\x17%\x07\xe8(\x17%/\xa5\\\x94,\xc4\xcb\xa0\\.J.\x17%\xaf\xaf\xa8\xf6k\xd6T\x1aHL\xa7\xd1T\x95\x8b\x92\x13\x93n g\xe2\x0ddO\xbe\x81\xe0\x04\x1c\x08I\xc2\x81\xf0D\x1c\x08L\xc6\x81rQrP\xa2\x0e\xa4&\xebh\xba\xcaE\xc9\x84\xb2\x00\x16\xe3\xe5b\"A]\xee\xf9\xb5z\xe6\xb9\xc3\xbbn\x9b\xbbm5\x84:\xb8\xe5Yo|\xe5\xa7\xa1>P\xe03\xdc\xd6\x07\xbe\x88\x1b`\xc4\xe7\xaa7p\x88 \xa5\xe5OX\"\xa7\xf89\xa3\xde\xa8mX\xa2E*\xa4\xe3\x07\x8bxQ\xe1XQL\x10\x04\x7f\xef7\x1a\x04\x11\x02.\xd9c!2\xd4\xca\x18\xca\x0e\x98\xc9\x0e4Y\xa0&7\xd8\x14\x17\xb5\xb1\x02p\xb2@N!q\x16Q\xb0\x93\x0dx\n)\xd0\x0f>\xd1\xf0\x93\x03\x80r\x87\xcf\x0e\xe5\xea\xd1r\xf5h\xb9z4\x06\xa0\n\x80\xa8\xb2\x83T\xe5\xeaQ\x94U\xa0V2\xac\x95\x1b\xd8*W\x8f\xaa\x12\x06qe\x06\xb9\xca\xd5\xa3\xe5\xeaQ\x0f\xf8U\xae\x1e]\x0f\x84\x19\xea\x86r\xf5h\x18,\xe6\xbft3\x0c\x1a+W\x8frY \x95\x95\xabGI\xc5^\xe0\xcc\x07\x9d\xf9\xc1\xb3r\xf5h\xb9zT\x97r\xf5h\xb9z\xd4\x07\xc6e\x86\xe3\x9e\x03\x90[\x03\xc9\x05\x82r\xab`\xb9p`\xae\\=\x1a\x03\xd3\xe5\x05\xea\xca\xd5\xa3\xf9\xaf\x1e\x0d\x05\xee\x9c\xd0]\x10\xccB\xc3wq\x00^<\x84Wr,K\x8ee\xc9\xb1\xfc\x15s,\x17\xe0v\x18l\xee\xcd\xb1\xbcV\x981\x8c\xa9\xfc\xab\x11\xfcY\xf3\xf63Rtz\xf2\xf3\xb5\xcc|\xb2\x8d\xdel|2\x0f\xdf\xa5j1y\xd3\xb2\xeee\x96\xfd\xc2\xd0\xa8\xa3*&\xd3\x9e\x1a@\xc7)\xd1\xf6\xdb\x19@\xbe\x98\x87l\xa5/\xd6G2\xaaa\x08\x8f%1c\x18\xd6\x8d\xe6\xc0\xb8\x05#b\xc15\"WG)\x98\xf1 .\xf5\xee\x98\x04=\x1aa\xc5fc(\xf7\x96\xa5\xc7\x15\x94{\xcb\xc2b\x06x{\xcb\xbde\x93\xeb\"*q5\x11\xf5\x0f\xc2\xfb\xc3\xb1\xfd\x04T?\x01\xcf'\x0cFF\xd4>/^\x9f\x0d\xa9\xf7c\xf4\xd9\xd0\xf9roY\xb9\xb7l\x05N^\xee-\x13\x1d\xadjL\xc1\xbcC\xae\xf2\xd2\x7f\xf6\"\xdc\xe5\xde\xb2\xf0+\xc2\xca\xbdeJ5\xca\xbde\xe5\xde2!\xe5\xde\xb2T4\xb7\xdc[V\xee-[h C^\x030\xd7roY<\x8a\x1a\xffu\xbd\xc8\xa9\x0f3\x9d\x8d\xb6\x1f'\xb5 \xa4\xe4)\xc4\x8e\x8a\xae\xc5C\xe3\x90P\xd3\x07\xbe\xe4\x93\x0f\xf6\x85\x170#\x1f\x981\x95\x95\xc6\xed?s\xf9\x0bu\n\xa3\xbf\x8f\xc7_\x8c\x8b\xf1\xcc\xb6\x7f\x9arR\xcf\xebns\xdaWC\xdd\xecV\xe7\xa5n\xe6w\xefP\xad\xa3\xe3\xf5\x8e\xb0\x95n\x07\x0e\xc7_\x11\xe7\xc1\xdb\xf8\xe4\xb9\xaf\xe9\xab\xf4\xf9\x0fym\x00\xb8\xec\xc0\xaa\xcbw\xe6\x85\xd1\xb8\x80\xe7\xcc3\xe5\xe55\x80\xbc\xf3\xd6O}\xde\x1dq!\x12\xca\xf0\xa6-\xa0\xa3~\x8bO;\xf5G?t\xa7\xcd8\x98d\xa7\x08EK\x1d\x18t\xc6\xc3\x02\xcf\xbe\xfb\xff\x03\x00\x00\xff\xffPK\x07\x08\x84\xe59m\xc5\xcf\x00\x00\xe7\xf1\x0c\x00PK\x01\x02\x14\x03\x14\x00\x08\x00\x08\x00\x00\x00!(\x84\xe59m\xc5\xcf\x00\x00\xe7\xf1\x0c\x00\x0c\x00 \x00\x00\x00\x00\x00\x00\x00\x00\x00\xa4\x81\x00\x00\x00\x00swagger.yamlUT\x05\x00\x01\x80Cm8PK\x05\x06\x00\x00\x00\x00\x01\x00\x01\x00C\x00\x00\x00\x08\xd0\x00\x00\x00\x00" fs.Register(data) } diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml index 254dc959b0..17b3774a6f 100644 --- a/client/docs/swagger-ui/swagger.yaml +++ b/client/docs/swagger-ui/swagger.yaml @@ -281,8 +281,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -292,7 +296,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -320,9 +324,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -689,8 +693,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -700,7 +708,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -728,9 +736,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -953,8 +961,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -964,7 +976,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -992,9 +1004,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -1225,8 +1237,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -1236,7 +1252,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -1264,9 +1280,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -1416,8 +1432,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -1427,7 +1447,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -1455,9 +1475,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -1601,8 +1621,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -1612,7 +1636,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -1640,9 +1664,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -1858,8 +1882,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -1869,7 +1897,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -1897,9 +1925,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -2198,8 +2226,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -2209,7 +2241,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -2237,9 +2269,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -2472,8 +2504,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -2483,7 +2519,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -2511,9 +2547,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -2663,8 +2699,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -2674,7 +2714,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -2702,9 +2742,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -2848,8 +2888,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -2859,7 +2903,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -2887,9 +2931,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -3109,8 +3153,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -3120,7 +3168,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -3148,9 +3196,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -3449,8 +3497,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -3460,7 +3512,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -3488,9 +3540,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -3837,8 +3889,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -3848,7 +3904,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -3876,9 +3932,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -4031,8 +4087,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -4042,7 +4102,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -4070,9 +4130,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -4222,8 +4282,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -4233,7 +4297,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -4261,9 +4325,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -4863,8 +4927,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -4874,7 +4942,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -4902,9 +4970,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -5179,8 +5247,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -5190,7 +5262,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -5218,9 +5290,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -5389,8 +5461,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -5400,7 +5476,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -5428,9 +5504,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -5569,8 +5645,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -5580,7 +5660,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -5608,9 +5688,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -5800,8 +5880,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -5811,7 +5895,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -5839,9 +5923,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -6074,8 +6158,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -6085,7 +6173,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -6113,9 +6201,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -6254,8 +6342,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -6265,7 +6357,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -6293,9 +6385,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -6487,8 +6579,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -6498,7 +6594,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -6526,9 +6622,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -6828,8 +6924,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -6839,7 +6939,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -6867,9 +6967,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -7138,8 +7238,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -7149,7 +7253,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -7177,9 +7281,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -7389,8 +7493,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -7400,7 +7508,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -7428,9 +7536,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -7707,8 +7815,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -7718,7 +7830,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -7746,9 +7858,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -7983,8 +8095,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -7994,7 +8110,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -8022,9 +8138,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -8274,8 +8390,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -8285,7 +8405,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -8313,9 +8433,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -8501,8 +8621,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -8512,7 +8636,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -8540,9 +8664,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -8769,8 +8893,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -8780,7 +8908,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -8808,9 +8936,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -9257,8 +9385,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -9268,7 +9400,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -9296,9 +9428,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -9698,8 +9830,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -9709,7 +9845,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -9737,9 +9873,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -9923,8 +10059,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -9934,7 +10074,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -9962,9 +10102,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -10149,8 +10289,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -10160,7 +10304,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -10188,9 +10332,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -10483,8 +10627,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -10494,7 +10642,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -10522,9 +10670,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -10979,8 +11127,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -10990,7 +11142,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -11018,9 +11170,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -11295,8 +11447,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -11306,7 +11462,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -11334,9 +11490,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -11510,8 +11666,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -11521,7 +11681,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -11549,9 +11709,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -11740,8 +11900,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -11751,7 +11915,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -11779,9 +11943,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -12020,8 +12184,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -12031,7 +12199,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -12059,9 +12227,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -12220,8 +12388,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -12231,7 +12403,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -12259,9 +12431,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -12501,8 +12673,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -12512,7 +12688,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -12540,9 +12716,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -12794,8 +12970,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -12805,7 +12985,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -12833,9 +13013,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -13044,8 +13224,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -13055,7 +13239,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -13083,9 +13267,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -13300,8 +13484,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -13311,7 +13499,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -13339,9 +13527,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -13589,8 +13777,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -13600,7 +13792,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -13628,9 +13820,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -13816,8 +14008,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -13827,7 +14023,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -13855,9 +14051,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -14046,8 +14242,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -14057,7 +14257,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -14085,9 +14285,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -14388,8 +14588,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -14399,7 +14603,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -14427,9 +14631,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -14588,8 +14792,12 @@ paths: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -14599,7 +14807,7 @@ paths: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -14627,9 +14835,9 @@ paths: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -15241,8 +15449,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -15252,7 +15464,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -15276,9 +15488,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -15415,8 +15627,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -15426,7 +15642,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -15451,9 +15667,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -15587,8 +15803,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -15598,7 +15818,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -15623,9 +15843,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -16056,8 +16276,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -16067,7 +16291,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -16091,9 +16315,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -16222,8 +16446,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -16233,7 +16461,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -16257,9 +16485,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -16786,8 +17014,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -16797,7 +17029,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -16824,9 +17056,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -16967,8 +17199,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -16978,7 +17214,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -17006,9 +17242,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -17149,8 +17385,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -17160,7 +17400,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -17188,9 +17428,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -17396,8 +17636,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -17407,7 +17651,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -17434,9 +17678,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -17577,8 +17821,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -17588,7 +17836,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -17616,9 +17864,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -17759,8 +18007,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -17770,7 +18022,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -17798,9 +18050,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -18174,8 +18426,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -18185,7 +18441,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -18209,9 +18465,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -18376,8 +18632,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -18387,7 +18647,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -18411,9 +18671,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -18552,8 +18812,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -18563,7 +18827,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -18587,9 +18851,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -18885,8 +19149,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -18896,7 +19164,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -18920,9 +19188,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -19047,8 +19315,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -19058,7 +19330,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -19082,9 +19354,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -19297,8 +19569,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -19308,7 +19584,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -19335,9 +19611,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -19469,8 +19745,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -19480,7 +19760,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -19507,9 +19787,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -19913,8 +20193,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -19924,7 +20208,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -19951,9 +20235,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -20085,8 +20369,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -20096,7 +20384,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -20123,9 +20411,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -20585,8 +20873,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -20596,7 +20888,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -20620,9 +20912,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -21213,8 +21505,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -21224,7 +21520,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -21251,9 +21547,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -22108,8 +22404,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -22119,7 +22419,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -22144,9 +22444,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -22347,8 +22647,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -22358,7 +22662,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -22385,9 +22689,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -22644,8 +22948,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -22655,7 +22963,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -22679,9 +22987,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -23045,8 +23353,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -23056,7 +23368,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -23081,9 +23393,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -23249,8 +23561,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -23260,7 +23576,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -23287,9 +23603,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular @@ -23490,8 +23806,12 @@ definitions: if (any.is(Foo.class)) { foo = any.unpack(Foo.class); } + // or ... + if (any.isSameTypeAs(Foo.getDefaultInstance())) { + foo = any.unpack(Foo.getDefaultInstance()); + } - Example 3: Pack and unpack a message in Python. + Example 3: Pack and unpack a message in Python. foo = Foo(...) any = Any() @@ -23501,7 +23821,7 @@ definitions: any.Unpack(foo) ... - Example 4: Pack and unpack a message in Go + Example 4: Pack and unpack a message in Go foo := &pb.Foo{...} any, err := anypb.New(foo) @@ -23525,9 +23845,9 @@ definitions: name "y.z". - JSON + ==== The JSON representation of an `Any` value uses the regular diff --git a/contrib/images/desmos-builder/Dockerfile b/contrib/images/desmos-builder/Dockerfile index 044fa5004f..5163534812 100644 --- a/contrib/images/desmos-builder/Dockerfile +++ b/contrib/images/desmos-builder/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20-alpine +FROM golang:1.21-alpine ARG arch=x86_64 # Set up dependencies diff --git a/contrib/images/desmos-cosmovisor/Dockerfile b/contrib/images/desmos-cosmovisor/Dockerfile index 658a2e6299..6a9209bb7b 100644 --- a/contrib/images/desmos-cosmovisor/Dockerfile +++ b/contrib/images/desmos-cosmovisor/Dockerfile @@ -1,5 +1,5 @@ ARG DESMOS_VERSION="v0.17.2" -FROM golang:1.20-alpine AS build-env +FROM golang:1.21-alpine AS build-env ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3 RUN apk add --no-cache $PACKAGES diff --git a/contrib/images/desmos-env/Dockerfile b/contrib/images/desmos-env/Dockerfile index f6463d831f..7a774992ec 100644 --- a/contrib/images/desmos-env/Dockerfile +++ b/contrib/images/desmos-env/Dockerfile @@ -8,8 +8,8 @@ ARG UID=1000 ARG GID=1000 USER ${UID}:${GID} -VOLUME [ "/desmos" ] -WORKDIR /desmos +VOLUME [ "/.desmos" ] +WORKDIR /.desmos EXPOSE 26656 26657 ENTRYPOINT ["/usr/bin/wrapper.sh"] CMD ["start"] diff --git a/contrib/images/desmos-env/wrapper.sh b/contrib/images/desmos-env/wrapper.sh index 983e6c09ba..43798c3164 100755 --- a/contrib/images/desmos-env/wrapper.sh +++ b/contrib/images/desmos-env/wrapper.sh @@ -16,7 +16,7 @@ if [ -z "${BINARY_CHECK}" ]; then exit 1 fi -export DESMOSDHOME="/desmos/node${ID}/desmos" +export DESMOSDHOME="/desmos/node${ID}/.desmos" if [ -d "$(dirname "${DESMOSDHOME}"/"${LOG}")" ]; then "${BINARY}" --home "${DESMOSDHOME}" "$@" | tee "${DESMOSDHOME}/${LOG}" diff --git a/go.mod b/go.mod index a7c6f72159..03102a32f5 100644 --- a/go.mod +++ b/go.mod @@ -1,25 +1,33 @@ module github.com/desmos-labs/desmos/v6 -go 1.20 +go 1.21 require ( - cosmossdk.io/api v0.3.1 - cosmossdk.io/core v0.5.1 + cosmossdk.io/api v0.7.2 + cosmossdk.io/client/v2 v2.0.0-beta.1 + cosmossdk.io/core v0.11.0 cosmossdk.io/depinject v1.0.0-alpha.4 cosmossdk.io/errors v1.0.1 + cosmossdk.io/log v1.3.0 cosmossdk.io/math v1.2.0 cosmossdk.io/simapp v0.0.0-20230323161446-0af178d721ff - github.com/CosmWasm/wasmd v0.45.0 + cosmossdk.io/store v1.0.2 + cosmossdk.io/tools/confix v0.1.0 + cosmossdk.io/x/evidence v0.1.0 + cosmossdk.io/x/feegrant v0.1.0 + cosmossdk.io/x/tx v0.13.0 + cosmossdk.io/x/upgrade v0.1.0 + github.com/CosmWasm/wasmd v0.50.0 github.com/CosmWasm/wasmvm v1.5.1 - github.com/armon/go-metrics v0.4.1 github.com/btcsuite/btcd/btcec/v2 v2.3.2 - github.com/cometbft/cometbft v0.37.4 - github.com/cometbft/cometbft-db v0.9.1 - github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.5 + github.com/cometbft/cometbft v0.38.2 + github.com/cosmos/cosmos-db v1.0.0 + github.com/cosmos/cosmos-proto v1.0.0-beta.3 + github.com/cosmos/cosmos-sdk v0.50.3 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogoproto v1.4.11 - github.com/cosmos/ibc-go/v7 v7.3.1 + github.com/cosmos/ibc-go/modules/capability v1.0.0 + github.com/cosmos/ibc-go/v8 v8.0.0 github.com/ethereum/go-ethereum v1.10.18 github.com/ghodss/yaml v1.0.0 github.com/gogo/protobuf v1.3.2 @@ -28,6 +36,7 @@ require ( github.com/golangci/golangci-lint v1.55.2 github.com/gorilla/mux v1.8.1 github.com/grpc-ecosystem/grpc-gateway v1.16.0 + github.com/hashicorp/go-metrics v0.5.1 github.com/manifoldco/promptui v0.9.0 github.com/mr-tron/base58 v1.2.0 github.com/osmosis-labs/go-mutesting v0.0.0-20221219192234-827e6d6b9d4e @@ -36,9 +45,9 @@ require ( github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.16.0 + github.com/spf13/viper v1.17.0 github.com/stretchr/testify v1.8.4 - golang.org/x/exp v0.0.0-20230811145659-89c5cff77bcb + golang.org/x/exp v0.0.0-20231006140011-7918f672742d golang.org/x/perf v0.0.0-20230221235046-aebcfb61e84c google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f google.golang.org/grpc v1.60.1 @@ -54,8 +63,8 @@ require ( 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 - cosmossdk.io/log v1.2.1 // indirect - cosmossdk.io/tools/rosetta v0.2.1 // indirect + cosmossdk.io/collections v0.4.0 // indirect + cosmossdk.io/x/circuit v0.1.0 // 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 @@ -65,7 +74,8 @@ require ( 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/DataDog/datadog-go v3.2.0+incompatible // indirect + github.com/DataDog/zstd v1.5.5 // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 // indirect github.com/Masterminds/semver v1.5.0 // indirect @@ -77,10 +87,11 @@ require ( github.com/alingse/asasalint v0.0.11 // 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/aws/aws-sdk-go v1.44.224 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect + github.com/bits-and-blooms/bitset v1.8.0 // indirect github.com/bkielbasa/cyclop v1.2.1 // indirect github.com/blizzy78/varnamelen v0.8.0 // indirect github.com/bombsimon/wsl/v3 v3.4.0 // indirect @@ -97,40 +108,42 @@ require ( 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 + github.com/cockroachdb/errors v1.11.1 // indirect github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect + github.com/cockroachdb/pebble v0.0.0-20231102162011-844f0582c2eb // indirect github.com/cockroachdb/redact v1.1.5 // indirect - github.com/coinbase/rosetta-sdk-go/types v1.0.0 // indirect - github.com/confio/ics23/go v0.9.0 // indirect + github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect + github.com/cometbft/cometbft-db v0.9.1 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect - github.com/cosmos/iavl v0.20.1 // indirect + github.com/cosmos/iavl v1.0.0 // indirect 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/creachadair/taskgroup v0.4.2 // indirect + github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect + github.com/creachadair/atomicfile v0.3.2 // indirect + github.com/creachadair/tomledit v0.0.25 // indirect github.com/curioswitch/go-reassign v0.2.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/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect 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.1 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect - github.com/docker/distribution v2.8.2+incompatible // indirect + github.com/distribution/reference v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect + github.com/emicklei/dot v1.6.0 // indirect github.com/esimonov/ifshort v1.0.4 // indirect github.com/ettle/strcase v0.1.1 // indirect github.com/fatih/color v1.15.0 // indirect github.com/fatih/structtag v1.2.0 // indirect - github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/felixge/httpsnoop v1.0.4 // 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/getsentry/sentry-go v0.25.0 // 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 @@ -148,7 +161,7 @@ require ( github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gofrs/flock v0.8.1 // indirect github.com/gogo/googleapis v1.4.1 // 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/snappy v0.0.4 // indirect github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect @@ -169,28 +182,30 @@ require ( 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 + github.com/gorilla/handlers v1.5.2 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/gostaticanalysis/analysisutil v0.7.1 // indirect github.com/gostaticanalysis/comment v1.4.2 // indirect github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect github.com/gostaticanalysis/nilerr v0.1.1 // indirect - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect - github.com/gtank/merlin v0.1.1 // indirect - github.com/gtank/ristretto255 v0.1.2 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-getter v1.7.1 // indirect + github.com/hashicorp/go-hclog v1.5.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-plugin v1.5.2 // 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/golang-lru v1.0.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hashicorp/yamux v0.1.1 // 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/iancoleman/strcase v0.3.0 // indirect github.com/improbable-eng/grpc-web v0.15.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jessevdk/go-flags v1.4.0 // indirect @@ -203,7 +218,7 @@ require ( github.com/kisielk/errcheck v1.6.3 // indirect github.com/kisielk/gotool v1.0.0 // indirect github.com/kkHAIKE/contextcheck v1.1.4 // indirect - github.com/klauspost/compress v1.16.7 // indirect + github.com/klauspost/compress v1.17.4 // 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 @@ -222,12 +237,11 @@ 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.9 // indirect github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/mbilski/exhaustivestruct v1.2.0 // 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 @@ -238,12 +252,14 @@ require ( 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/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect + github.com/oklog/run v1.1.0 // 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.0.8 // indirect - github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect + github.com/pelletier/go-toml/v2 v2.1.0 // indirect + github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect github.com/pkg/errors v0.9.1 // 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_model v0.5.0 // indirect github.com/prometheus/common v0.45.0 // indirect @@ -255,9 +271,11 @@ require ( github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // 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/sagikazarmark/locafero v0.3.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/sashamelentyev/interfacebloat v1.1.0 // indirect @@ -269,19 +287,19 @@ require ( github.com/sivchari/nosnakecase v1.7.0 // 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.10.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.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 github.com/tendermint/go-amino v0.16.0 // indirect github.com/tetafro/godot v1.4.15 // indirect - github.com/tidwall/btree v1.6.0 // indirect + github.com/tidwall/btree v1.7.0 // indirect github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect github.com/timonwong/loggercheck v0.9.4 // indirect github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect @@ -305,14 +323,14 @@ require ( go.opencensus.io v0.24.0 // indirect go.tmz.dev/musttag v0.7.2 // indirect go.uber.org/atomic v1.10.0 // indirect - go.uber.org/multierr v1.8.0 // indirect + go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.24.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.19.0 // indirect golang.org/x/oauth2 v0.13.0 // indirect - golang.org/x/sync v0.4.0 // indirect + golang.org/x/sync v0.5.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect @@ -324,28 +342,29 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect + gotest.tools/v3 v3.5.1 // indirect honnef.co/go/tools v0.4.6 // indirect mvdan.cc/gofumpt v0.5.0 // 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-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 + pgregory.net/rapid v1.1.0 // indirect + sigs.k8s.io/yaml v1.4.0 // indirect ) replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 - // Our cosmos-sdk branch is: https://github.com/desmos-labs/cosmos-sdk v0.47.x-desmos - github.com/cosmos/cosmos-sdk => github.com/desmos-labs/cosmos-sdk v0.47.7-desmos + // Our cosmos-sdk branch is: https://github.com/desmos-labs/cosmos-sdk v0.50.x-desmos + github.com/cosmos/cosmos-sdk => github.com/desmos-labs/cosmos-sdk v0.50.3-desmos // Replace the Cosmos Ledger app with the Desmos fork - github.com/cosmos/ledger-cosmos-go => github.com/desmos-labs/ledger-desmos-go v0.12.1-desmos + github.com/cosmos/ledger-cosmos-go => github.com/desmos-labs/ledger-desmos-go v0.13.0-desmos // 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.8.1 + github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.1 // Downgraded to avoid bugs in following commits which caused simulations to fail. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 diff --git a/go.sum b/go.sum index acd8ba10be..443adf8c30 100644 --- a/go.sum +++ b/go.sum @@ -196,22 +196,40 @@ 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/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/api v0.7.2 h1:BO3i5fvKMKvfaUiMkCznxViuBEfyWA/k6w2eAF6q1C4= +cosmossdk.io/api v0.7.2/go.mod h1:IcxpYS5fMemZGqyYtErK7OqvdM0C8kdW3dq8Q/XIG38= +cosmossdk.io/client/v2 v2.0.0-beta.1 h1:XkHh1lhrLYIT9zKl7cIOXUXg2hdhtjTPBUfqERNA1/Q= +cosmossdk.io/client/v2 v2.0.0-beta.1/go.mod h1:JEUSu9moNZQ4kU3ir1DKD5eU4bllmAexrGWjmb9k8qU= +cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s= +cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0= +cosmossdk.io/core v0.11.0 h1:vtIafqUi+1ZNAE/oxLOQQ7Oek2n4S48SWLG8h/+wdbo= +cosmossdk.io/core v0.11.0/go.mod h1:LaTtayWBSoacF5xNzoF8tmLhehqlA9z1SWiPuNC6X1w= 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= cosmossdk.io/errors v1.0.1/go.mod h1:MeelVSZThMi4bEakzhhhE/CKqVv3nOJDA25bIqRDu/U= -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/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-20230323161446-0af178d721ff h1:P1ialzTepD1oxdNPYc5N8Eggq3RdejZq3cJs8YYMs9Y= cosmossdk.io/simapp v0.0.0-20230323161446-0af178d721ff/go.mod h1:AKzx6Mb544LjJ9RHmGFHjY9rEOLiUAi8I0F727TR0dY= -cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= -cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= +cosmossdk.io/store v1.0.2 h1:lSg5BTvJBHUDwswNNyeh4K/CbqiHER73VU4nDNb8uk0= +cosmossdk.io/store v1.0.2/go.mod h1:EFtENTqVTuWwitGW1VwaBct+yDagk7oG/axBMPH+FXs= +cosmossdk.io/tools/confix v0.1.0 h1:2OOZTtQsDT5e7P3FM5xqM0bPfluAxZlAwxqaDmYBE+E= +cosmossdk.io/tools/confix v0.1.0/go.mod h1:TdXKVYs4gEayav5wM+JHT+kTU2J7fozFNqoVaN+8CdY= +cosmossdk.io/x/circuit v0.1.0 h1:IAej8aRYeuOMritczqTlljbUVHq1E85CpBqaCTwYgXs= +cosmossdk.io/x/circuit v0.1.0/go.mod h1:YDzblVE8+E+urPYQq5kq5foRY/IzhXovSYXb4nwd39w= +cosmossdk.io/x/evidence v0.1.0 h1:J6OEyDl1rbykksdGynzPKG5R/zm6TacwW2fbLTW4nCk= +cosmossdk.io/x/evidence v0.1.0/go.mod h1:hTaiiXsoiJ3InMz1uptgF0BnGqROllAN8mwisOMMsfw= +cosmossdk.io/x/feegrant v0.1.0 h1:c7s3oAq/8/UO0EiN1H5BIjwVntujVTkYs35YPvvrdQk= +cosmossdk.io/x/feegrant v0.1.0/go.mod h1:4r+FsViJRpcZif/yhTn+E0E6OFfg4n0Lx+6cCtnZElU= +cosmossdk.io/x/nft v0.1.0 h1:VhcsFiEK33ODN27kxKLa0r/CeFd8laBfbDBwYqCyYCM= +cosmossdk.io/x/nft v0.1.0/go.mod h1:ec4j4QAO4mJZ+45jeYRnW7awLHby1JZANqe1hNZ4S3g= +cosmossdk.io/x/tx v0.13.0 h1:8lzyOh3zONPpZv2uTcUmsv0WTXy6T1/aCVDCqShmpzU= +cosmossdk.io/x/tx v0.13.0/go.mod h1:CpNQtmoqbXa33/DVxWQNx5Dcnbkv2xGUhL7tYQ5wUsY= +cosmossdk.io/x/upgrade v0.1.0 h1:z1ZZG4UL9ICTNbJDYZ6jOnF9GdEK9wyoEFi4BUScHXE= +cosmossdk.io/x/upgrade v0.1.0/go.mod h1:/6jjNGbiPCNtmA1N+rBtP601sr0g4ZXuj3yC6ClPCGY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= @@ -231,19 +249,21 @@ github.com/Antonboom/testifylint v0.2.3/go.mod h1:IYaXaOX9NbfAyO+Y04nfjGI8wDemC1 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-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= 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/CosmWasm/wasmd v0.45.0 h1:9zBqrturKJwC2kVsfHvbrA++EN0PS7UTXCffCGbg6JI= -github.com/CosmWasm/wasmd v0.45.0/go.mod h1:RnSAiqbNIZu4QhO+0pd7qGZgnYAMBPGmXpzTADag944= +github.com/CosmWasm/wasmd v0.50.0 h1:NVaGqCSTRfb9UTDHJwT6nQIWcb6VjlQl88iI+u1+qjE= +github.com/CosmWasm/wasmd v0.50.0/go.mod h1:UjmShW4l9YxaMytwJZ7IB7MWzHiynSZP3DdWrG0FRtk= github.com/CosmWasm/wasmvm v1.5.1 h1:2MHN9uFyHP6pxfvpBJ0JW6ujvAIBk9kQk283zyri0Ro= github.com/CosmWasm/wasmvm v1.5.1/go.mod h1:fXB+m2gyh4v9839zlIXdMZGeLAxqUdYdFQqYsTha2hc= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= +github.com/DataDog/zstd v1.5.5 h1:oWf5W7GtOLgp6bciQYDmhHHjdhYkALu6S/5Ni9ZgSvQ= +github.com/DataDog/zstd v1.5.5/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/v3 v3.1.0 h1:3ZBs7LAezy8gh0uECsA6CGU43FF3zsx5f4eah5FxTMA= @@ -253,7 +273,9 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go 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/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= +github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OpenPeeDeeP/depguard/v2 v2.1.0 h1:aQl70G173h/GZYhWf36aE5H0KaujXfVMnn/f1kSDVYY= @@ -268,13 +290,16 @@ github.com/aclements/go-gg v0.0.0-20170118225347-6dbb4e4fefb0/go.mod h1:55qNq4vc github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 h1:xlwdaKcTNVW4PtpQb8aKA4Pjy0CdJHEqvFbAnvR5m2g= github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794/go.mod h1:7e+I0LQFUI9AXWxOfsQROs9xPhoJtbsyWcjJqDd4KPY= github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= +github.com/adlio/schema v1.3.3/go.mod h1:1EsRssiv9/Ce2CMzq5DoL7RiMshhuigQxrR4DMV9fHg= 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/ajstarks/svgo v0.0.0-20210923152817-c3b6e2f0c527/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= @@ -295,8 +320,6 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= -github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/ashanbrown/forbidigo v1.6.0 h1:D3aewfM37Yb3pxHujIPSpTf6oQk9sc9WZi8gerOIVIY= @@ -306,8 +329,8 @@ github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvx github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= -github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.224 h1:09CiaaF35nRmxrzWZ2uRq5v6Ghg/d2RiPjZnSgtt+RQ= +github.com/aws/aws-sdk-go v1.44.224/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= @@ -319,6 +342,7 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbE github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -328,6 +352,8 @@ github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 h1:41iFGWnSlI2gVpmOtVTJZNodLdLQLn/KsJqFvXwnd/s= github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bits-and-blooms/bitset v1.8.0 h1:FD+XqgOZDUxxZ8hzoBFuV9+cGWY9CslN6d5MS5JVb4c= +github.com/bits-and-blooms/bitset v1.8.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8= github.com/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= @@ -345,14 +371,19 @@ github.com/breml/errchkjson v0.3.6/go.mod h1:jhSDoFheAF2RSDOlCfhHO9KqhZgAYLyvHe7 github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= -github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= +github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ= +github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= -github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bufbuild/protocompile v0.6.0 h1:Uu7WiSQ6Yj9DbkdnOe7U4mNKp58y9WDMKDn28/ZlunY= +github.com/bufbuild/protocompile v0.6.0/go.mod h1:YNP35qEYoYGme7QMtz5SBCoN4kL4g12jTtjuzRNdjpE= 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/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s= +github.com/bytedance/sonic v1.9.1/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= @@ -377,6 +408,9 @@ github.com/charithe/durationcheck v0.0.10/go.mod h1:bCWXb7gYRysD1CU3C+u4ceO49LoG 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= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= @@ -403,24 +437,27 @@ 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/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= +github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8= +github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/pebble v0.0.0-20231102162011-844f0582c2eb h1:6Po+YYKT5B5ZXN0wd2rwFBaebM0LufPf8p4zxOd48Kg= +github.com/cockroachdb/pebble v0.0.0-20231102162011-844f0582c2eb/go.mod h1:acMRUGd/BK8AUmQNK3spUCCGzFLZU2bSST3NMXSq2Kc= 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/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= +github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= -github.com/coinbase/rosetta-sdk-go/types v1.0.0/go.mod h1:eq7W2TMRH22GTW0N0beDnN931DW0/WOI1R2sdHNHG4c= -github.com/cometbft/cometbft v0.37.4 h1:xyvvEqlyfK8MgNIIKVJaMsuIp03wxOcFmVkT26+Ikpg= -github.com/cometbft/cometbft v0.37.4/go.mod h1:Cmg5Hp4sNpapm7j+x0xRyt2g0juQfmB752ous+pA0G8= +github.com/cometbft/cometbft v0.38.2 h1:io0JCh5EPxINKN5ZMI5hCdpW3QVZRy+o8qWe3mlJa/8= +github.com/cometbft/cometbft v0.38.2/go.mod h1:PIi48BpzwlHqtV3mzwPyQgOyOnU94BNBimLS2ebBHOg= github.com/cometbft/cometbft-db v0.9.1 h1:MIhVX5ja5bXNHF8EYrThkG9F7r9kSfv8BX4LWaxWJ4M= github.com/cometbft/cometbft-db v0.9.1/go.mod h1:iliyWaoV0mRwBJoizElCwwRA9Tf7jZJOURcRZF9m60U= -github.com/confio/ics23/go v0.9.0 h1:cWs+wdbS2KRPZezoaaj+qBleXgUk5WOQFMP3CQFGTr4= -github.com/confio/ics23/go v0.9.0/go.mod h1:4LPZ2NYqnYIVRklaozjNR1FScgDJ2s5Xrp+e/mYVRak= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= +github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -429,9 +466,10 @@ 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/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= +github.com/cosmos/cosmos-db v1.0.0 h1:EVcQZ+qYag7W6uorBKFPvX6gRjw6Uq2hIh4hCWjuQ0E= +github.com/cosmos/cosmos-db v1.0.0/go.mod h1:iBvi1TtqaedwLdcrZVYRSSCb6eSy61NLj4UNmdIgs0U= +github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o= +github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= @@ -439,21 +477,23 @@ github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= github.com/cosmos/gogoproto v1.4.11 h1:LZcMHrx4FjUgrqQSWeaGC1v/TeuVFqSLa43CC6aWR2g= github.com/cosmos/gogoproto v1.4.11/go.mod h1:/g39Mh8m17X8Q/GDEs5zYTSNaNnInBSohtaxzQnYq1Y= -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.1 h1:bil1IjnHdyWDASFYKfwdRiNtFP6WK3osW7QFEAgU4I8= -github.com/cosmos/ibc-go/v7 v7.3.1/go.mod h1:wvx4pPBofe5ZdMNV3OFRxSI4auEP5Qfqf8JXLLNV04g= +github.com/cosmos/iavl v1.0.0 h1:bw6t0Mv/mVCJvlMTOPHWLs5uUE3BRBfVWCRelOzl+so= +github.com/cosmos/iavl v1.0.0/go.mod h1:CmTGqMnRnucjxbjduneZXT+0vPgNElYvdefjX2q9tYc= +github.com/cosmos/ibc-go/modules/capability v1.0.0 h1:r/l++byFtn7jHYa09zlAdSeevo8ci1mVZNO9+V0xsLE= +github.com/cosmos/ibc-go/modules/capability v1.0.0/go.mod h1:D81ZxzjZAe0ZO5ambnvn1qedsFQ8lOwtqicG6liLBco= +github.com/cosmos/ibc-go/v8 v8.0.0 h1:QKipnr/NGwc+9L7NZipURvmSIu+nw9jOIWTJuDBqOhg= +github.com/cosmos/ibc-go/v8 v8.0.0/go.mod h1:C6IiJom0F3cIQCD5fKwVPDrDK9j/xTu563AWuOmXois= 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/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.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creachadair/taskgroup v0.4.2 h1:jsBLdAJE42asreGss2xZGZ8fJra7WtwnHWeJFxv2Li8= -github.com/creachadair/taskgroup v0.4.2/go.mod h1:qiXUOSrbwAY3u0JPGTzObbE3yf9hcXHDKBZ2ZjpCbgM= +github.com/creachadair/atomicfile v0.3.2 h1:f8haU8NcZ1NABfhHafpJIG+atR7481lqnx04clrxSOA= +github.com/creachadair/atomicfile v0.3.2/go.mod h1:3ZSR9ApQoZLvVNI5eRhzpU0a2Efu88TgNBIm0jRXCgA= +github.com/creachadair/tomledit v0.0.25 h1:QBzoVTd4hVsKF4tTrrHFbrtAbxT41WvW348aE4lvr3o= +github.com/creachadair/tomledit v0.0.25/go.mod h1:m4Z0a8730G9sNfBkfbFAM+iw2cBBr/YmNeSjTnBCkfw= 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/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= @@ -465,24 +505,26 @@ github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuA 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= 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= +github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo= github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU= github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/desmos-labs/cosmos-sdk v0.47.7-desmos h1:tVDgBdQiRxMfsI9xiweGx1jYEeymWbVdYxCYYXYbk3k= -github.com/desmos-labs/cosmos-sdk v0.47.7-desmos/go.mod h1:rHrJgrXEk6AsXiC96iezAzn067FaTMGibYp/g/sbGlk= -github.com/desmos-labs/ledger-desmos-go v0.12.1-desmos h1:uYU67f1pZ7Jht/q9cn5sTdeto0J+lRUHIJgmedDGEVM= -github.com/desmos-labs/ledger-desmos-go v0.12.1-desmos/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g= +github.com/desmos-labs/cosmos-sdk v0.50.3-desmos h1:CtUgeZH6x6hZEEWzNvXy1tcjpY/olZDiKhz/S7f9ue4= +github.com/desmos-labs/cosmos-sdk v0.50.3-desmos/go.mod h1:tlrkY1sntOt1q0OX/rqF0zRJtmXNoffAS6VFTcky+w8= +github.com/desmos-labs/ledger-desmos-go v0.13.0-desmos h1:e72xKoOLZ1Vy9CPf0OgFjGuf0Rs7f7iMSUsR8Uj/VD4= +github.com/desmos-labs/ledger-desmos-go v0.13.0-desmos/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= github.com/dgraph-io/badger/v2 v2.2007.4 h1:TRWBQg8UrlUhaFdco01nO2uXwzKS7zd+HVdwV/GHc4o= github.com/dgraph-io/badger/v2 v2.2007.4/go.mod h1:vSw/ax2qojzbN6eXHIx6KPKtCSHJN/Uz0X0VPruTIhk= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= @@ -494,14 +536,16 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0= +github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= 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.6.2/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= +github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= +github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= 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= @@ -515,6 +559,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= +github.com/emicklei/dot v1.6.0 h1:vUzuoVE8ipzS7QkES4UfxdpCwdU2U97m2Pb2tQCoYRY= +github.com/emicklei/dot v1.6.0/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -533,13 +579,13 @@ github.com/ethereum/go-ethereum v1.10.18/go.mod h1:RD3NhcSBjZpj3k+SnQq24wBrmnmie 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/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= -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/gencodec v0.0.0-20220412091415-8bb9e558978c/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY= @@ -547,35 +593,40 @@ github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+ github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= +github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +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/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= +github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU= +github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA= github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61/go.mod h1:Q0X6pkwTILDlzrGEckF6HKjXe48EgsY/l7K7vhY4MW8= 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/getsentry/sentry-go v0.25.0 h1:q6Eo+hS+yoJlTO3uu/azhQadsD8V+jQn2D8VvX1eOyI= +github.com/getsentry/sentry-go v0.25.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.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg= +github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU= 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.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-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g= github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks= github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY= @@ -600,22 +651,24 @@ 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.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= github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= -github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js= +github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU= github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= 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= @@ -628,6 +681,7 @@ github.com/go-toolsmith/astfmt v1.1.0/go.mod h1:OrcLlRwu0CuiIBp/8b5PYF9ktGVZUjlN 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/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQiyP2Bvw= github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ= @@ -637,14 +691,16 @@ github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80 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= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= -github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= +github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU= +github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og= +github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -665,8 +721,8 @@ github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzw github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.1.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= @@ -766,6 +822,7 @@ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw= +github.com/google/martian/v3 v3.3.2/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -782,8 +839,9 @@ 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/pprof v0.0.0-20230228050547-1710fef4ab10 h1:CqYfpuYIjnlNxM3msdyPRKabhXZWbKjf3Q8BWROFBso= +github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o= github.com/google/s2a-go v0.1.7/go.mod h1:50CgR4k1jNlWBu4UfS4AcfhVe1r6pdZPygJ3R8F0Qdw= @@ -817,8 +875,8 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR 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= +github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyEE= +github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= @@ -840,22 +898,18 @@ github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3 github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= github.com/gostaticanalysis/testutil v0.4.0 h1:nhdCmubdmDF6VEatUNjgUZBJKWRqugoISdUv3PPQgHY= +github.com/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Repi5x3CuviD3dgAZaBU= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= +github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= 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= -github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= -github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= -github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= -github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -868,13 +922,19 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY= github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744= +github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= +github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-metrics v0.5.1 h1:rfPwUqFU6uZXNvGl4hzjY8LEBsqFVU4si1H9/Hqck/U= +github.com/hashicorp/go-metrics v0.5.1/go.mod h1:KEjodfebIOuBYSAe/bHTm+HChmKSxAOXPBieMLYozDE= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/hashicorp/go-plugin v1.5.2 h1:aWv8eimFqWlsEiMrYZdPYl+FdHaBJSN4AWwGWfT1G2Y= +github.com/hashicorp/go-plugin v1.5.2/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= @@ -882,8 +942,9 @@ github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoD github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= @@ -891,14 +952,17 @@ github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs= github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c= +github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= +github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= 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= @@ -913,6 +977,8 @@ github.com/huandu/skiplist v1.2.0/go.mod h1:7v3iFjLcSAzO4fN5B8dvebvo/qsfumiLiDXM github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= +github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= +github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= @@ -938,7 +1004,8 @@ github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGAR github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= 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.3 h1:6SFRuqU45u9hIZPJAoZ8c28T3nK64BNdp9w6jFonzls= +github.com/jhump/protoreflect v1.15.3/go.mod h1:4ORHmSBmlCW8fh3xHmJMGyul1zNqZK4Elxc8qKP+p1k= 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= @@ -986,9 +1053,13 @@ 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.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4= +github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +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/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk= +github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -997,7 +1068,6 @@ 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= -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= @@ -1019,8 +1089,8 @@ github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdB 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/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= +github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= 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= @@ -1057,6 +1127,7 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= 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= @@ -1067,8 +1138,9 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -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= @@ -1086,9 +1158,6 @@ github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aks 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= -github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= @@ -1145,8 +1214,13 @@ github.com/nunnatsa/ginkgolinter v0.14.1 h1:khx0CqR5U4ghsscjJ+lZVthp3zjIFytRXPTa 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= +github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a h1:dlRvE5fWabOchtH7znfiFCcOvmIYgOeAS5ifBXBlh9Q= +github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s= 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/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= +github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= @@ -1158,16 +1232,21 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= 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.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.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= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= +github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -1178,10 +1257,12 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= +github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= github.com/osmosis-labs/go-mutesting v0.0.0-20221219192234-827e6d6b9d4e h1:yuDnnXG7UYi96gOVrDpEamdx14xr772yRg/LmJYobHE= github.com/osmosis-labs/go-mutesting v0.0.0-20221219192234-827e6d6b9d4e/go.mod h1:lV6KnqXYD/ayTe7310MHtM3I2q8Z6bBfMAi+bhwPYtI= 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= @@ -1193,15 +1274,15 @@ 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/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= -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= 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/petermattis/goid v0.0.0-20230904192822-1876fd5063bc h1:8bQZVK1X6BJR/6nYUPxQEP+ReTsceJTKizeuwjWOPUA= +github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= github.com/phpdave11/gofpdi v1.0.12/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= @@ -1209,6 +1290,7 @@ github.com/phpdave11/gofpdi v1.0.13/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1217,8 +1299,9 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/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= @@ -1281,8 +1364,6 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.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/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= @@ -1290,8 +1371,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= @@ -1302,6 +1383,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.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ= +github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U= +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= @@ -1341,14 +1426,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.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY= +github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ= 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= @@ -1357,15 +1444,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.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI= +github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI= 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= @@ -1387,13 +1472,15 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2/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.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= @@ -1408,8 +1495,8 @@ github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpR github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= 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/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI= +github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY= 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= @@ -1423,12 +1510,12 @@ github.com/tomarrell/wrapcheck/v2 v2.8.1/go.mod h1:/n2Q3NZ4XFT50ho6Hbxg+RV1uyo2U 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= +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= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU= +github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= 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= @@ -1476,6 +1563,7 @@ github.com/zondax/ledger-go v0.14.3/go.mod h1:IKKaoxupuB43g4NxeQmbLXv7T9AlQyie1U 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= @@ -1502,17 +1590,24 @@ go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= 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.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= 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/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k= +golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1522,17 +1617,17 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-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.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0= 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= @@ -1551,8 +1646,8 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH 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-20220426173459-3bcf042a4bf5/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= -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-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= +golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= 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= @@ -1669,6 +1764,8 @@ 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.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= 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-20170207211851-4464e7848382/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -1716,8 +1813,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.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.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= @@ -1804,6 +1901,7 @@ golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBc 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-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1823,6 +1921,7 @@ golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1834,6 +1933,8 @@ 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.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1843,6 +1944,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.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= 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= @@ -1858,6 +1961,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.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= 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= @@ -2212,6 +2317,7 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0/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= @@ -2248,8 +2354,8 @@ 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/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= +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= @@ -2272,13 +2378,13 @@ 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= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/proto/buf.lock b/proto/buf.lock index 9cfb67e595..eb98d7f7b4 100644 --- a/proto/buf.lock +++ b/proto/buf.lock @@ -9,8 +9,8 @@ deps: - remote: buf.build owner: cosmos repository: cosmos-sdk - commit: 954f7b05f38440fc8250134b15adec47 - digest: shake256:2ab4404fd04a7d1d52df0e2d0f2d477a3d83ffd88d876957bf3fedfd702c8e52833d65b3ce1d89a3c5adf2aab512616b0e4f51d8463f07eda9a8a3317ee3ac54 + commit: b446f3279dcf4c42b2dac30d5fa759dc + digest: shake256:855b9e3f8e880ded88af1fee0363af80a1bd16b5dc89d142f89bbec12a31a66e7f194646a9afdacdc19df71fa810385ef127d3b46f939cb0c4710bc1c4d5743a - remote: buf.build owner: cosmos repository: gogo-proto @@ -19,8 +19,8 @@ deps: - remote: buf.build owner: cosmos repository: ibc - commit: e6b07bb8a5a548f6a5135067a2538ddd - digest: shake256:5794f44aeabb1402b4d52c98c16f34536aa3b536edfe37354723364da8e98c84c4ade83b0bc32a378e60870e9442222132dcc4bf47d3b4395956f4ab73ed32b1 + commit: 2d4d5bdf83d54cafade8e48e3f6cc4b3 + digest: shake256:b1966cd943612d7694f5006e0021ed3ac2cba6881a7b1af5901042eede22b29772b7e481326240313cbf1f41d1bc42036f775a9663e3fc49e085d42ee0d03ffe - remote: buf.build owner: cosmos repository: ics23 @@ -29,5 +29,10 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - commit: cc916c31859748a68fd229a3c8d7a2e8 - digest: shake256:469b049d0eb04203d5272062636c078decefc96fec69739159c25d85349c50c34c7706918a8b216c5c27f76939df48452148cff8c5c3ae77fa6ba5c25c1b8bf8 + commit: 28151c0d0a1641bf938a7672c500e01d + digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de + - remote: buf.build + owner: protocolbuffers + repository: wellknowntypes + commit: 657250e6a39648cbb169d079a60bd9ba + digest: shake256:00de25001b8dd2e29d85fc4bcc3ede7aed886d76d67f5e0f7a9b320b90f871d3eb73507d50818d823a0512f3f8db77a11c043685528403e31ff3fef18323a9fb diff --git a/proto/buf.yaml b/proto/buf.yaml index 046b2a7390..ea670d003e 100644 --- a/proto/buf.yaml +++ b/proto/buf.yaml @@ -1,7 +1,7 @@ version: v1 name: buf.build/desmos-labs/desmos deps: - - buf.build/cosmos/cosmos-sdk:v0.47.0 + - buf.build/cosmos/cosmos-sdk - buf.build/cosmos/cosmos-proto - buf.build/cosmos/gogo-proto - buf.build/cosmos/ibc diff --git a/proto/desmos/profiles/v2/models_params.proto b/proto/desmos/profiles/v2/models_params.proto index 4c191b494d..cd3d4cd3ce 100644 --- a/proto/desmos/profiles/v2/models_params.proto +++ b/proto/desmos/profiles/v2/models_params.proto @@ -35,13 +35,13 @@ message NicknameParams { option (gogoproto.goproto_getters) = false; bytes min_length = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"min_length\"" ]; bytes max_length = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"max_length\"" ]; @@ -54,14 +54,14 @@ message DTagParams { string reg_ex = 1 [ (gogoproto.moretags) = "yaml:\"reg_ex\"" ]; bytes min_length = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"min_length\"", (gogoproto.customname) = "MinLength" ]; bytes max_length = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"max_length\"", (gogoproto.customname) = "MaxLength" @@ -73,7 +73,7 @@ message BioParams { option (gogoproto.goproto_getters) = false; bytes max_length = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"max_length\"" ]; diff --git a/proto/desmos/profiles/v3/models_params.proto b/proto/desmos/profiles/v3/models_params.proto index 0f1920b484..991cf190fe 100644 --- a/proto/desmos/profiles/v3/models_params.proto +++ b/proto/desmos/profiles/v3/models_params.proto @@ -47,14 +47,14 @@ message NicknameParams { option (gogoproto.goproto_getters) = false; bytes min_length = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"min_length\"", (amino.dont_omitempty) = true ]; bytes max_length = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"max_length\"", (amino.dont_omitempty) = true @@ -68,7 +68,7 @@ message DTagParams { string reg_ex = 1 [ (gogoproto.moretags) = "yaml:\"reg_ex\"" ]; bytes min_length = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"min_length\"", (gogoproto.customname) = "MinLength", @@ -76,7 +76,7 @@ message DTagParams { ]; bytes max_length = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"max_length\"", (gogoproto.customname) = "MaxLength", @@ -89,7 +89,7 @@ message BioParams { option (gogoproto.goproto_getters) = false; bytes max_length = 3 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"max_length\"", (amino.dont_omitempty) = true diff --git a/proto/desmos/profiles/v3/msg_server.proto b/proto/desmos/profiles/v3/msg_server.proto index 1a3549f68c..205ae365f2 100644 --- a/proto/desmos/profiles/v3/msg_server.proto +++ b/proto/desmos/profiles/v3/msg_server.proto @@ -1,13 +1,17 @@ syntax = "proto3"; package desmos.profiles.v3; +import "google/protobuf/any.proto"; +import "gogoproto/gogo.proto"; + import "cosmos/msg/v1/msg.proto"; +import "amino/amino.proto"; +import "cosmos_proto/cosmos.proto"; +import "ibc/core/client/v1/client.proto"; -import "desmos/profiles/v3/msgs_profile.proto"; -import "desmos/profiles/v3/msgs_dtag_requests.proto"; -import "desmos/profiles/v3/msgs_chain_links.proto"; -import "desmos/profiles/v3/msgs_app_links.proto"; -import "desmos/profiles/v3/msgs_params.proto"; +import "desmos/profiles/v3/models_app_links.proto"; +import "desmos/profiles/v3/models_chain_links.proto"; +import "desmos/profiles/v3/models_params.proto"; option go_package = "github.com/desmos-labs/desmos/v6/x/profiles/types"; @@ -70,4 +74,353 @@ service Msg { // // Since: Desmos 5.0.0 rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse); -} \ No newline at end of file +} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgSaveProfile represents a message to save a profile. +message MsgSaveProfile { + option (cosmos.msg.v1.signer) = "creator"; + option (amino.name) = "desmos/MsgSaveProfile"; + + // DTag of the profile. If it shouldn't be changed, [do-no-modify] can be used + // instead. + string dtag = 1 [ + (gogoproto.moretags) = "yaml:\"dtag\"", + (gogoproto.customname) = "DTag" + ]; + + // Nickname of the profile. If it shouldn't be changed, [do-no-modify] can be + // used instead. + string nickname = 2 [ (gogoproto.moretags) = "yaml:\"nickname\"" ]; + + // Bio of the profile. If it shouldn't be changed, [do-no-modify] can be used + // instead. + string bio = 3 [ (gogoproto.moretags) = "yaml:\"bio\"" ]; + + // URL to the profile picture. If it shouldn't be changed, [do-no-modify] can + // be used instead. + string profile_picture = 4 + [ (gogoproto.moretags) = "yaml:\"profile_picture\"" ]; + + // URL to the profile cover. If it shouldn't be changed, [do-no-modify] can be + // used instead. + string cover_picture = 5 [ (gogoproto.moretags) = "yaml:\"cover_picture\"" ]; + + // Address of the user associated to the profile + string creator = 6 [ + (gogoproto.moretags) = "yaml:\"creator\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; +} + +// MsgSaveProfileResponse defines the Msg/SaveProfile response type. +message MsgSaveProfileResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgDeleteProfile represents the message used to delete an existing profile. +message MsgDeleteProfile { + option (cosmos.msg.v1.signer) = "creator"; + option (amino.name) = "desmos/MsgDeleteProfile"; + + // Address associated to the profile to be deleted + string creator = 1 [ + (gogoproto.moretags) = "yaml:\"creator\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; +} + +// MsgDeleteProfileResponse defines the Msg/DeleteProfile response type. +message MsgDeleteProfileResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgRequestDTagTransfer represents the message used to request the DTag +// transfer to another user. +message MsgRequestDTagTransfer { + option (cosmos.msg.v1.signer) = "sender"; + option (amino.name) = "desmos/MsgRequestDTagTransfer"; + + // Receiver contains the address of the request receiver that owns the DTag to + // transfer if the request is accepted + string receiver = 1 [ (gogoproto.moretags) = "yaml:\"receiver\"" ]; + + // Sender contains the address of the request sender that will receive the + // receiver DTag if the requet is accepted + string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; +} + +// MsgRequestDTagTransferResponse defines the Msg/RequestDTagTransfer response +// type. +message MsgRequestDTagTransferResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgCancelDTagTransferRequest represents the message used to cancel a DTag +// transfer request. +message MsgCancelDTagTransferRequest { + option (cosmos.msg.v1.signer) = "sender"; + option (amino.name) = "desmos/MsgCancelDTagTransferRequest"; + + // Receiver contains the address of the request receiver + string receiver = 1 [ + (gogoproto.moretags) = "yaml:\"receiver\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; + + // Sender contains the address of the requets sender + string sender = 2 [ + (gogoproto.moretags) = "yaml:\"sender\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; +} + +// MsgCancelDTagTransferRequestResponse represents the +// Msg/CancelDTagTransferRequest response type. +message MsgCancelDTagTransferRequestResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgAcceptDTagTransferRequest represents the message used to accept a DTag +// transfer request. +message MsgAcceptDTagTransferRequest { + option (cosmos.msg.v1.signer) = "receiver"; + option (amino.name) = "desmos/MsgAcceptDTagTransferRequest"; + + // NewDTag represents the DTag that the request receiver will obtain if they + // accept the request + string new_dtag = 1 [ + (gogoproto.moretags) = "yaml:\"new_dtag\"", + (gogoproto.customname) = "NewDTag" + ]; + + // Sender represents the request sender + string sender = 2 [ + (gogoproto.moretags) = "yaml:\"sender\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; + + // Receiver represents the request receiver + string receiver = 3 [ + (gogoproto.moretags) = "yaml:\"receiver\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; +} + +// MsgAcceptDTagTransferRequestResponse defines the +// Msg/AcceptDTagTransferRequest response. +message MsgAcceptDTagTransferRequestResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgRefuseDTagTransferRequest represents the message used to refuse a DTag +// transfer request. +message MsgRefuseDTagTransferRequest { + option (cosmos.msg.v1.signer) = "receiver"; + option (amino.name) = "desmos/MsgRefuseDTagTransferRequest"; + + // Sender represents the request sender + string sender = 1 [ + (gogoproto.moretags) = "yaml:\"sender\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; + + // Receiver represents the request receiver + string receiver = 2 [ + (gogoproto.moretags) = "yaml:\"receiver\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; +} + +// MsgRefuseDTagTransferRequestResponse defines the +// Msg/RefuseDTagTransferRequest response. +message MsgRefuseDTagTransferRequestResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgLinkChainAccount represents a message to link an account to a profile. +message MsgLinkChainAccount { + option (cosmos.msg.v1.signer) = "signer"; + option (amino.name) = "desmos/MsgLinkChainAccount"; + + // ChainAddress contains the details of the external chain address to be + // linked + google.protobuf.Any chain_address = 1 [ + (gogoproto.moretags) = "yaml:\"source_address\"", + (cosmos_proto.accepts_interface) = "desmos.profiles.v3.AddressData" + ]; + + // Proof contains the proof of ownership of the external chain address + desmos.profiles.v3.Proof proof = 2 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"source_proof\"", + (amino.dont_omitempty) = true + ]; + + // ChainConfig contains the configuration of the external chain + desmos.profiles.v3.ChainConfig chain_config = 3 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"source_chain_config\"", + (amino.dont_omitempty) = true + ]; + + // Signer represents the Desmos address associated with the + // profile to which link the external account + string signer = 4 [ + (gogoproto.moretags) = "yaml:\"signer\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; +} + +// MsgLinkChainAccountResponse defines the Msg/LinkAccount response type. +message MsgLinkChainAccountResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgUnlinkChainAccount represents a message to unlink an account from a +// profile. +message MsgUnlinkChainAccount { + option (cosmos.msg.v1.signer) = "owner"; + option (amino.name) = "desmos/MsgUnlinkChainAccount"; + + // Owner represents the Desmos profile from which to remove the link + string owner = 1 [ + (gogoproto.moretags) = "yaml:\"owner\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; + + // ChainName represents the name of the chain to which the link to remove is + // associated + string chain_name = 2 [ (gogoproto.moretags) = "yaml:\"chain_name\"" ]; + + // Target represents the external address to be removed + string target = 3 [ (gogoproto.moretags) = "yaml:\"target\"" ]; +} + +// MsgUnlinkChainAccountResponse defines the Msg/UnlinkAccount response type. +message MsgUnlinkChainAccountResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgSetDefaultExternalAddress represents the message used to set a default +// address for a specific chain +message MsgSetDefaultExternalAddress { + option (cosmos.msg.v1.signer) = "signer"; + option (amino.name) = "desmos/MsgSetDefaultExternalAddress"; + + // Name of the chain for which to set the default address + string chain_name = 1; + + // Address to be set as the default one + string target = 2; + + // User signing the message + string signer = 3 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; +} + +// MsgSetDefaultExternalAddressResponse represents the +// Msg/SetDefaultExternalAddress response type +message MsgSetDefaultExternalAddressResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgLinkApplication defines a msg to connect a profile with a +// centralized application account (eg. Twitter, GitHub, etc). +message MsgLinkApplication { + option (cosmos.msg.v1.signer) = "sender"; + option (amino.name) = "desmos/MsgLinkApplication"; + + // The sender of the connection request + string sender = 1 [ + (gogoproto.moretags) = "yaml:\"sender\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; + + // LinkData contains the data related to the application to which connect + Data link_data = 2 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"link_data\"", + (amino.dont_omitempty) = true + ]; + + // Hex encoded call data that will be sent to the data source in order to + // verify the link + string call_data = 3 [ (gogoproto.moretags) = "yaml:\"call_data\"" ]; + + // The port on which the packet will be sent + string source_port = 4 [ (gogoproto.moretags) = "yaml:\"source_port\"" ]; + + // The channel by which the packet will be sent + string source_channel = 5 + [ (gogoproto.moretags) = "yaml:\"source_channel\"" ]; + + // Timeout height relative to the current block height. + // The timeout is disabled when set to 0. + ibc.core.client.v1.Height timeout_height = 6 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"timeout_height\"", + (amino.dont_omitempty) = true + ]; + + // Timeout timestamp (in nanoseconds) relative to the current block timestamp. + // The timeout is disabled when set to 0. + uint64 timeout_timestamp = 7 + [ (gogoproto.moretags) = "yaml:\"timeout_timestamp\"" ]; +} + +// MsgLinkApplicationResponse defines the Msg/LinkApplication +// response type. +message MsgLinkApplicationResponse {} + +// ------------------------------------------------------------------------------------------------------------------- + +// MsgUnlinkApplication defines a msg to delete an application link from a user +// profile +message MsgUnlinkApplication { + option (cosmos.msg.v1.signer) = "signer"; + option (amino.name) = "desmos/MsgUnlinkApplication"; + + // Application represents the name of the application to unlink + string application = 1 [ (gogoproto.moretags) = "yaml:\"application\"" ]; + + // Username represents the username inside the application to unlink + string username = 2 [ (gogoproto.moretags) = "yaml:\"username\"" ]; + + // Signer represents the Desmos account to which the application should be + // unlinked + string signer = 3 [ + (gogoproto.moretags) = "yaml:\"signer\"", + (cosmos_proto.scalar) = "cosmos.AddressString" + ]; +} + +// MsgUnlinkApplicationResponse defines the Msg/UnlinkApplication response +// type. +message MsgUnlinkApplicationResponse {} + +// -------------------------------------------------------------------------------------------------------------------- + +// MsgUpdateParams is the Msg/UpdateParams request type. +// +// Since: Desmos 5.0.0 +message MsgUpdateParams { + option (cosmos.msg.v1.signer) = "authority"; + option (amino.name) = "desmos/x/profiles/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 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: Desmos 5.0.0 +message MsgUpdateParamsResponse {} \ No newline at end of file diff --git a/proto/desmos/profiles/v3/msgs_app_links.proto b/proto/desmos/profiles/v3/msgs_app_links.proto deleted file mode 100644 index 6a7ac9cc8a..0000000000 --- a/proto/desmos/profiles/v3/msgs_app_links.proto +++ /dev/null @@ -1,86 +0,0 @@ -syntax = "proto3"; -package desmos.profiles.v3; - -option go_package = "github.com/desmos-labs/desmos/v6/x/profiles/types"; - -import "desmos/profiles/v3/models_app_links.proto"; - -import "amino/amino.proto"; -import "gogoproto/gogo.proto"; -import "cosmos/msg/v1/msg.proto"; -import "cosmos_proto/cosmos.proto"; -import "ibc/core/client/v1/client.proto"; - -// MsgLinkApplication defines a msg to connect a profile with a -// centralized application account (eg. Twitter, GitHub, etc). -message MsgLinkApplication { - option (cosmos.msg.v1.signer) = "sender"; - option (amino.name) = "desmos/MsgLinkApplication"; - - // The sender of the connection request - string sender = 1 [ - (gogoproto.moretags) = "yaml:\"sender\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; - - // LinkData contains the data related to the application to which connect - Data link_data = 2 [ - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"link_data\"", - (amino.dont_omitempty) = true - ]; - - // Hex encoded call data that will be sent to the data source in order to - // verify the link - string call_data = 3 [ (gogoproto.moretags) = "yaml:\"call_data\"" ]; - - // The port on which the packet will be sent - string source_port = 4 [ (gogoproto.moretags) = "yaml:\"source_port\"" ]; - - // The channel by which the packet will be sent - string source_channel = 5 - [ (gogoproto.moretags) = "yaml:\"source_channel\"" ]; - - // Timeout height relative to the current block height. - // The timeout is disabled when set to 0. - ibc.core.client.v1.Height timeout_height = 6 [ - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"timeout_height\"", - (amino.dont_omitempty) = true - ]; - - // Timeout timestamp (in nanoseconds) relative to the current block timestamp. - // The timeout is disabled when set to 0. - uint64 timeout_timestamp = 7 - [ (gogoproto.moretags) = "yaml:\"timeout_timestamp\"" ]; -} - -// MsgLinkApplicationResponse defines the Msg/LinkApplication -// response type. -message MsgLinkApplicationResponse {} - -// ------------------------------------------------------------------------------------------------------------------- - -// MsgUnlinkApplication defines a msg to delete an application link from a user -// profile -message MsgUnlinkApplication { - option (cosmos.msg.v1.signer) = "signer"; - option (amino.name) = "desmos/MsgUnlinkApplication"; - - // Application represents the name of the application to unlink - string application = 1 [ (gogoproto.moretags) = "yaml:\"application\"" ]; - - // Username represents the username inside the application to unlink - string username = 2 [ (gogoproto.moretags) = "yaml:\"username\"" ]; - - // Signer represents the Desmos account to which the application should be - // unlinked - string signer = 3 [ - (gogoproto.moretags) = "yaml:\"signer\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; -} - -// MsgUnlinkApplicationResponse defines the Msg/UnlinkApplication response -// type. -message MsgUnlinkApplicationResponse {} \ No newline at end of file diff --git a/proto/desmos/profiles/v3/msgs_chain_links.proto b/proto/desmos/profiles/v3/msgs_chain_links.proto deleted file mode 100644 index 5346268ed6..0000000000 --- a/proto/desmos/profiles/v3/msgs_chain_links.proto +++ /dev/null @@ -1,95 +0,0 @@ -syntax = "proto3"; -package desmos.profiles.v3; - -import "amino/amino.proto"; -import "gogoproto/gogo.proto"; -import "google/protobuf/any.proto"; -import "cosmos_proto/cosmos.proto"; -import "cosmos/msg/v1/msg.proto"; -import "desmos/profiles/v3/models_chain_links.proto"; - -option go_package = "github.com/desmos-labs/desmos/v6/x/profiles/types"; - -// MsgLinkChainAccount represents a message to link an account to a profile. -message MsgLinkChainAccount { - option (cosmos.msg.v1.signer) = "signer"; - option (amino.name) = "desmos/MsgLinkChainAccount"; - - // ChainAddress contains the details of the external chain address to be - // linked - google.protobuf.Any chain_address = 1 [ - (gogoproto.moretags) = "yaml:\"source_address\"", - (cosmos_proto.accepts_interface) = "desmos.profiles.v3.AddressData" - ]; - - // Proof contains the proof of ownership of the external chain address - desmos.profiles.v3.Proof proof = 2 [ - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"source_proof\"", - (amino.dont_omitempty) = true - ]; - - // ChainConfig contains the configuration of the external chain - desmos.profiles.v3.ChainConfig chain_config = 3 [ - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"source_chain_config\"", - (amino.dont_omitempty) = true - ]; - - // Signer represents the Desmos address associated with the - // profile to which link the external account - string signer = 4 [ - (gogoproto.moretags) = "yaml:\"signer\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; -} - -// MsgLinkChainAccountResponse defines the Msg/LinkAccount response type. -message MsgLinkChainAccountResponse {} - -// -------------------------------------------------------------------------------------------------------------------- - -// MsgUnlinkChainAccount represents a message to unlink an account from a -// profile. -message MsgUnlinkChainAccount { - option (cosmos.msg.v1.signer) = "owner"; - option (amino.name) = "desmos/MsgUnlinkChainAccount"; - - // Owner represents the Desmos profile from which to remove the link - string owner = 1 [ - (gogoproto.moretags) = "yaml:\"owner\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; - - // ChainName represents the name of the chain to which the link to remove is - // associated - string chain_name = 2 [ (gogoproto.moretags) = "yaml:\"chain_name\"" ]; - - // Target represents the external address to be removed - string target = 3 [ (gogoproto.moretags) = "yaml:\"target\"" ]; -} - -// MsgUnlinkChainAccountResponse defines the Msg/UnlinkAccount response type. -message MsgUnlinkChainAccountResponse {} - -// -------------------------------------------------------------------------------------------------------------------- - -// MsgSetDefaultExternalAddress represents the message used to set a default -// address for a specific chain -message MsgSetDefaultExternalAddress { - option (cosmos.msg.v1.signer) = "signer"; - option (amino.name) = "desmos/MsgSetDefaultExternalAddress"; - - // Name of the chain for which to set the default address - string chain_name = 1; - - // Address to be set as the default one - string target = 2; - - // User signing the message - string signer = 3 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; -} - -// MsgSetDefaultExternalAddressResponse represents the -// Msg/SetDefaultExternalAddress response type -message MsgSetDefaultExternalAddressResponse {} \ No newline at end of file diff --git a/proto/desmos/profiles/v3/msgs_dtag_requests.proto b/proto/desmos/profiles/v3/msgs_dtag_requests.proto deleted file mode 100644 index 8bd3436c33..0000000000 --- a/proto/desmos/profiles/v3/msgs_dtag_requests.proto +++ /dev/null @@ -1,110 +0,0 @@ -syntax = "proto3"; -package desmos.profiles.v3; - -import "amino/amino.proto"; -import "gogoproto/gogo.proto"; -import "cosmos/msg/v1/msg.proto"; -import "cosmos_proto/cosmos.proto"; - -option go_package = "github.com/desmos-labs/desmos/v6/x/profiles/types"; - -// MsgRequestDTagTransfer represents the message used to request the DTag -// transfer to another user. -message MsgRequestDTagTransfer { - option (cosmos.msg.v1.signer) = "sender"; - option (amino.name) = "desmos/MsgRequestDTagTransfer"; - - // Receiver contains the address of the request receiver that owns the DTag to - // transfer if the request is accepted - string receiver = 1 [ (gogoproto.moretags) = "yaml:\"receiver\"" ]; - - // Sender contains the address of the request sender that will receive the - // receiver DTag if the requet is accepted - string sender = 2 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; -} - -// MsgRequestDTagTransferResponse defines the Msg/RequestDTagTransfer response -// type. -message MsgRequestDTagTransferResponse {} - -// -------------------------------------------------------------------------------------------------------------------- - -// MsgCancelDTagTransferRequest represents the message used to cancel a DTag -// transfer request. -message MsgCancelDTagTransferRequest { - option (cosmos.msg.v1.signer) = "sender"; - option (amino.name) = "desmos/MsgCancelDTagTransferRequest"; - - // Receiver contains the address of the request receiver - string receiver = 1 [ - (gogoproto.moretags) = "yaml:\"receiver\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; - - // Sender contains the address of the requets sender - string sender = 2 [ - (gogoproto.moretags) = "yaml:\"sender\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; -} - -// MsgCancelDTagTransferRequestResponse represents the -// Msg/CancelDTagTransferRequest response type. -message MsgCancelDTagTransferRequestResponse {} - -// -------------------------------------------------------------------------------------------------------------------- - -// MsgAcceptDTagTransferRequest represents the message used to accept a DTag -// transfer request. -message MsgAcceptDTagTransferRequest { - option (cosmos.msg.v1.signer) = "receiver"; - option (amino.name) = "desmos/MsgAcceptDTagTransferRequest"; - - // NewDTag represents the DTag that the request receiver will obtain if they - // accept the request - string new_dtag = 1 [ - (gogoproto.moretags) = "yaml:\"new_dtag\"", - (gogoproto.customname) = "NewDTag" - ]; - - // Sender represents the request sender - string sender = 2 [ - (gogoproto.moretags) = "yaml:\"sender\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; - - // Receiver represents the request receiver - string receiver = 3 [ - (gogoproto.moretags) = "yaml:\"receiver\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; -} - -// MsgAcceptDTagTransferRequestResponse defines the -// Msg/AcceptDTagTransferRequest response. -message MsgAcceptDTagTransferRequestResponse {} - -// -------------------------------------------------------------------------------------------------------------------- - -// MsgRefuseDTagTransferRequest represents the message used to refuse a DTag -// transfer request. -message MsgRefuseDTagTransferRequest { - option (cosmos.msg.v1.signer) = "receiver"; - option (amino.name) = "desmos/MsgRefuseDTagTransferRequest"; - - // Sender represents the request sender - string sender = 1 [ - (gogoproto.moretags) = "yaml:\"sender\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; - - // Receiver represents the request receiver - string receiver = 2 [ - (gogoproto.moretags) = "yaml:\"receiver\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; -} - -// MsgRefuseDTagTransferRequestResponse defines the -// Msg/RefuseDTagTransferRequest response. -message MsgRefuseDTagTransferRequestResponse {} diff --git a/proto/desmos/profiles/v3/msgs_params.proto b/proto/desmos/profiles/v3/msgs_params.proto deleted file mode 100644 index fba8fda4cd..0000000000 --- a/proto/desmos/profiles/v3/msgs_params.proto +++ /dev/null @@ -1,35 +0,0 @@ -syntax = "proto3"; -package desmos.profiles.v3; - -import "amino/amino.proto"; -import "gogoproto/gogo.proto"; -import "cosmos_proto/cosmos.proto"; -import "cosmos/msg/v1/msg.proto"; - -import "desmos/profiles/v3/models_params.proto"; - -option go_package = "github.com/desmos-labs/desmos/v6/x/profiles/types"; - -// MsgUpdateParams is the Msg/UpdateParams request type. -// -// Since: Desmos 5.0.0 -message MsgUpdateParams { - option (cosmos.msg.v1.signer) = "authority"; - option (amino.name) = "desmos/x/profiles/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 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: Desmos 5.0.0 -message MsgUpdateParamsResponse {} \ No newline at end of file diff --git a/proto/desmos/profiles/v3/msgs_profile.proto b/proto/desmos/profiles/v3/msgs_profile.proto deleted file mode 100644 index 6c2fc721f8..0000000000 --- a/proto/desmos/profiles/v3/msgs_profile.proto +++ /dev/null @@ -1,65 +0,0 @@ -syntax = "proto3"; -package desmos.profiles.v3; - -import "amino/amino.proto"; -import "gogoproto/gogo.proto"; -import "cosmos/msg/v1/msg.proto"; -import "cosmos_proto/cosmos.proto"; - -option go_package = "github.com/desmos-labs/desmos/v6/x/profiles/types"; - -// MsgSaveProfile represents a message to save a profile. -message MsgSaveProfile { - option (cosmos.msg.v1.signer) = "creator"; - option (amino.name) = "desmos/MsgSaveProfile"; - - // DTag of the profile. If it shouldn't be changed, [do-no-modify] can be used - // instead. - string dtag = 1 [ - (gogoproto.moretags) = "yaml:\"dtag\"", - (gogoproto.customname) = "DTag" - ]; - - // Nickname of the profile. If it shouldn't be changed, [do-no-modify] can be - // used instead. - string nickname = 2 [ (gogoproto.moretags) = "yaml:\"nickname\"" ]; - - // Bio of the profile. If it shouldn't be changed, [do-no-modify] can be used - // instead. - string bio = 3 [ (gogoproto.moretags) = "yaml:\"bio\"" ]; - - // URL to the profile picture. If it shouldn't be changed, [do-no-modify] can - // be used instead. - string profile_picture = 4 - [ (gogoproto.moretags) = "yaml:\"profile_picture\"" ]; - - // URL to the profile cover. If it shouldn't be changed, [do-no-modify] can be - // used instead. - string cover_picture = 5 [ (gogoproto.moretags) = "yaml:\"cover_picture\"" ]; - - // Address of the user associated to the profile - string creator = 6 [ - (gogoproto.moretags) = "yaml:\"creator\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; -} - -// MsgSaveProfileResponse defines the Msg/SaveProfile response type. -message MsgSaveProfileResponse {} - -// -------------------------------------------------------------------------------------------------------------------- - -// MsgDeleteProfile represents the message used to delete an existing profile. -message MsgDeleteProfile { - option (cosmos.msg.v1.signer) = "creator"; - option (amino.name) = "desmos/MsgDeleteProfile"; - - // Address associated to the profile to be deleted - string creator = 1 [ - (gogoproto.moretags) = "yaml:\"creator\"", - (cosmos_proto.scalar) = "cosmos.AddressString" - ]; -} - -// MsgDeleteProfileResponse defines the Msg/DeleteProfile response type. -message MsgDeleteProfileResponse {} \ No newline at end of file diff --git a/proto/desmos/supply/v1/query.proto b/proto/desmos/supply/v1/query.proto index 938d629fed..3f241981dc 100644 --- a/proto/desmos/supply/v1/query.proto +++ b/proto/desmos/supply/v1/query.proto @@ -40,7 +40,7 @@ message QueryTotalResponse { option (gogoproto.goproto_getters) = false; string total_supply = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; } @@ -66,7 +66,7 @@ message QueryCirculatingResponse { option (gogoproto.goproto_getters) = false; string circulating_supply = 1 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + (gogoproto.customtype) = "cosmossdk.io/math.Int", (gogoproto.nullable) = false ]; } \ No newline at end of file diff --git a/tests/wasm/any_resolver_test.go b/tests/wasm/any_resolver_test.go index 45958f5948..937be3cbfb 100644 --- a/tests/wasm/any_resolver_test.go +++ b/tests/wasm/any_resolver_test.go @@ -10,27 +10,29 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/stretchr/testify/require" + ibctesting "github.com/cosmos/ibc-go/v8/testing" + "github.com/desmos-labs/desmos/v6/tests/wasm" - "github.com/desmos-labs/desmos/v6/testutil/ibctesting" + desmosibctesting "github.com/desmos-labs/desmos/v6/testutil/ibctesting" profilestypes "github.com/desmos-labs/desmos/v6/x/profiles/types" wasmtypes "github.com/desmos-labs/desmos/v6/x/wasm/types" ) func TestAnyResolverByProfile(t *testing.T) { // Create a test chain - coord := ibctesting.NewCoordinator(t, 1) + coord := desmosibctesting.NewCoordinator(t, 1) chain := &wasm.TestChain{coord.GetChain(ibctesting.GetChainID(1))} + // Store and instantiate test contract + contractAddr := wasm.InstantiateTestContract(t, chain) + // Save a profile saveProfileMsg := profilestypes.NewMsgSaveProfile( - "test_user", "test_user", "test bio", "https://profile.pic", "https://cover.pic", chain.Account.GetAddress().String(), + "test_user", "test_user", "test bio", "https://profile.pic", "https://cover.pic", chain.SenderAccount.GetAddress().String(), ) _, err := chain.SendMsgs(saveProfileMsg) require.NoError(t, err) - // Store and instantiate test contract - contractAddr := wasm.InstantiateTestContract(t, chain) - // Request profile via test contract profileReq := profilestypes.QueryProfileRequest{ User: "test_user", @@ -69,13 +71,16 @@ func TestAnyResolverByProfile(t *testing.T) { profilestypes.NewPictures( "https://profile.pic", "https://cover.pic", ), - chain.CurrentHeader.Time, - chain.Account, + chain.LastHeader.GetTime(), // creation time is the latest block time + chain.SenderAccount, ) require.NoError(t, err) // Encode expected profile response by stargate codec expRes := stargateCdc.MustMarshalJSON(&profilestypes.QueryProfileResponse{Profile: codectypes.UnsafePackAny(expProfile)}) + var r profilestypes.QueryProfileResponse + stargateCdc.MustUnmarshalJSON(expRes, &r) + require.Equal(t, expRes, res) } diff --git a/tests/wasm/helpers.go b/tests/wasm/helpers.go index 2f49df4548..c653d21128 100644 --- a/tests/wasm/helpers.go +++ b/tests/wasm/helpers.go @@ -12,10 +12,10 @@ import ( "github.com/CosmWasm/wasmd/x/wasm/types" abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - ibctesting "github.com/cosmos/ibc-go/v7/testing" + "github.com/cosmos/gogoproto/proto" "github.com/stretchr/testify/require" - chaintesting "github.com/desmos-labs/desmos/v6/testutil/ibctesting" + chaintesting "github.com/cosmos/ibc-go/v8/testing" ) type TestChain struct { @@ -25,14 +25,14 @@ type TestChain struct { // StoreCodeFile compresses code file then stores its byte code on chain func (chain *TestChain) StoreCodeFile(filename string) types.MsgStoreCodeResponse { wasmCode, err := os.ReadFile(filename) - require.NoError(chain.T, err) + require.NoError(chain, err) if strings.HasSuffix(filename, "wasm") { // compress for gas limit var buf bytes.Buffer gz := gzip.NewWriter(&buf) _, err := gz.Write(wasmCode) - require.NoError(chain.T, err) + require.NoError(chain, err) err = gz.Close() - require.NoError(chain.T, err) + require.NoError(chain, err) wasmCode = buf.Bytes() } return chain.StoreCode(wasmCode) @@ -41,41 +41,52 @@ func (chain *TestChain) StoreCodeFile(filename string) types.MsgStoreCodeRespons // StoreCode stores byte code on chain func (chain *TestChain) StoreCode(byteCode []byte) types.MsgStoreCodeResponse { storeMsg := &types.MsgStoreCode{ - Sender: chain.Account.GetAddress().String(), + Sender: chain.SenderAccount.GetAddress().String(), WASMByteCode: byteCode, } r, err := chain.SendMsgs(storeMsg) - require.NoError(chain.T, err) - // unmarshal protobuf response from data - require.Len(chain.T, r.MsgResponses, 1) - require.NotEmpty(chain.T, r.MsgResponses[0].GetCachedValue()) - pInstResp := r.MsgResponses[0].GetCachedValue().(*types.MsgStoreCodeResponse) - require.NotEmpty(chain.T, pInstResp.CodeID) - require.NotEmpty(chain.T, pInstResp.Checksum) - return *pInstResp + require.NoError(chain, err) + + var pInstResp types.MsgStoreCodeResponse + chain.UnwrapExecTXResult(r, &pInstResp) + + require.NotEmpty(chain, pInstResp.CodeID) + require.NotEmpty(chain, pInstResp.Checksum) + return pInstResp } // InstantiateContract instantiates contract by the given code ID func (chain *TestChain) InstantiateContract(codeID uint64, initMsg []byte) sdk.AccAddress { instantiateMsg := &types.MsgInstantiateContract{ - Sender: chain.Account.GetAddress().String(), - Admin: chain.Account.GetAddress().String(), + Sender: chain.SenderAccount.GetAddress().String(), + Admin: chain.SenderAccount.GetAddress().String(), CodeID: codeID, Label: "any-resolver-test", Msg: initMsg, - Funds: sdk.Coins{ibctesting.TestCoin}, + Funds: sdk.Coins{chaintesting.TestCoin}, } r, err := chain.SendMsgs(instantiateMsg) - require.NoError(chain.T, err) - require.Len(chain.T, r.MsgResponses, 1) - require.NotEmpty(chain.T, r.MsgResponses[0].GetCachedValue()) - pExecResp := r.MsgResponses[0].GetCachedValue().(*types.MsgInstantiateContractResponse) + require.NoError(chain, err) + + var pExecResp types.MsgInstantiateContractResponse + chain.UnwrapExecTXResult(r, &pExecResp) + a, err := sdk.AccAddressFromBech32(pExecResp.Address) - require.NoError(chain.T, err) + require.NoError(chain, err) return a } +// UnwrapExecTXResult is a helper to unpack execution result from proto any type +func (chain *TestChain) UnwrapExecTXResult(r *abci.ExecTxResult, target proto.Message) { + var wrappedRsp sdk.TxMsgData + require.NoError(chain, chain.Codec.Unmarshal(r.Data, &wrappedRsp)) + + // unmarshal protobuf response from data + require.Len(chain, wrappedRsp.MsgResponses, 1) + require.NoError(chain, proto.Unmarshal(wrappedRsp.MsgResponses[0].Value, target)) +} + // SmartQuery This will serialize the query message and submit it to the contract. // The response is parsed into the provided interface. // Usage: SmartQuery(addr, QueryMsg{Foo: 1}, &response) @@ -91,10 +102,13 @@ func (chain *TestChain) SmartQuery(contractAddr string, queryMsg interface{}, re } reqBin := chain.Codec.MustMarshal(&req) - res := chain.App.Query(abci.RequestQuery{ + res, err := chain.App.Query(chain.GetContext(), &abci.RequestQuery{ Path: "/cosmwasm.wasm.v1.Query/SmartContractState", Data: reqBin, }) + if err != nil { + return err + } if res.Code != 0 { return fmt.Errorf("query failed: (%d) %s", res.Code, res.Log) diff --git a/testutil/ibctesting/helper.go b/testutil/ibctesting/app.go similarity index 50% rename from testutil/ibctesting/helper.go rename to testutil/ibctesting/app.go index 05c19ec734..b8f399c2b4 100644 --- a/testutil/ibctesting/helper.go +++ b/testutil/ibctesting/app.go @@ -5,47 +5,46 @@ import ( "testing" "time" - dbm "github.com/cometbft/cometbft-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - tmtypes "github.com/cometbft/cometbft/types" + dbm "github.com/cosmos/cosmos-db" + "github.com/desmos-labs/desmos/v6/app" "github.com/stretchr/testify/require" + "cosmossdk.io/log" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/baseapp" - "github.com/cosmos/cosmos-sdk/client/flags" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" - "github.com/cosmos/cosmos-sdk/server" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - simapp "github.com/desmos-labs/desmos/v6/app" -) + abci "github.com/cometbft/cometbft/abci/types" + tmtypes "github.com/cometbft/cometbft/types" -func setup(chainID string, withGenesis bool, invCheckPeriod uint) (*simapp.DesmosApp, simapp.GenesisState) { - db := dbm.NewMemDB() + ibctesting "github.com/cosmos/ibc-go/v8/testing" +) - appOptions := make(simtestutil.AppOptionsMap, 0) - appOptions[flags.FlagHome] = simapp.DefaultNodeHome // ensure unique folder - appOptions[server.FlagInvCheckPeriod] = invCheckPeriod +var DefaultTestingAppInit = SetupTestingApp - app := simapp.NewDesmosApp(log.NewNopLogger(), db, nil, true, appOptions, baseapp.SetChainID(chainID)) - if withGenesis { - return app, simapp.NewDefaultGenesisState(app.AppCodec()) - } - return app, simapp.GenesisState{} +func SetupTestingApp() (ibctesting.TestingApp, map[string]json.RawMessage) { + db := dbm.NewMemDB() + desmosApp := app.NewDesmosApp(log.NewNopLogger(), db, nil, true, simtestutil.EmptyAppOptions{}) + return desmosApp, desmosApp.DefaultGenesis() } -// SetupWithGenesisValSet initializes a new SimApp with a validator set and genesis accounts +// SetupWithGenesisValSet initializes a new DesmosApp with a validator set and genesis accounts // that also act as delegators. For simplicity, each validator is bonded with a delegation -// of one consensus engine unit (10^6) in the default token of the simapp from first genesis -// account. A Nop logger is set in SimApp. -func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, chainID string, balances ...banktypes.Balance) *simapp.DesmosApp { - app, genesisState := setup(chainID, true, 5) +// of one consensus engine unit (10^6) in the default token of the desmos app from first genesis +// account. A Nop logger is set in DesmosApp. +func SetupWithGenesisValSet(tb testing.TB, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, chainID string, powerReduction sdkmath.Int, balances ...banktypes.Balance) ibctesting.TestingApp { + tb.Helper() + app, genesisState := DefaultTestingAppInit() + + // ensure baseapp has a chain-id set before running InitChain + baseapp.SetChainID(chainID)(app.GetBaseApp()) // set genesis accounts authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs) @@ -54,72 +53,64 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs validators := make([]stakingtypes.Validator, 0, len(valSet.Validators)) delegations := make([]stakingtypes.Delegation, 0, len(valSet.Validators)) - bondAmt := sdk.NewInt(1000000) + bondAmt := sdk.TokensFromConsensusPower(1, powerReduction) for _, val := range valSet.Validators { - pk, err := cryptocodec.FromTmPubKeyInterface(val.PubKey) - require.NoError(t, err) + pk, err := cryptocodec.FromCmtPubKeyInterface(val.PubKey) + require.NoError(tb, err) pkAny, err := codectypes.NewAnyWithValue(pk) - require.NoError(t, err) + require.NoError(tb, err) validator := stakingtypes.Validator{ OperatorAddress: sdk.ValAddress(val.Address).String(), ConsensusPubkey: pkAny, Jailed: false, Status: stakingtypes.Bonded, Tokens: bondAmt, - DelegatorShares: sdk.OneDec(), + DelegatorShares: sdkmath.LegacyOneDec(), Description: stakingtypes.Description{}, UnbondingHeight: int64(0), UnbondingTime: time.Unix(0, 0).UTC(), - Commission: stakingtypes.NewCommission(sdk.ZeroDec(), sdk.ZeroDec(), sdk.ZeroDec()), - MinSelfDelegation: sdk.ZeroInt(), + Commission: stakingtypes.NewCommission(sdkmath.LegacyZeroDec(), sdkmath.LegacyZeroDec(), sdkmath.LegacyZeroDec()), + MinSelfDelegation: sdkmath.ZeroInt(), } - validators = append(validators, validator) - delegations = append(delegations, stakingtypes.NewDelegation(genAccs[0].GetAddress(), val.Address.Bytes(), sdk.OneDec())) + validators = append(validators, validator) + delegations = append(delegations, stakingtypes.NewDelegation(genAccs[0].GetAddress().String(), sdk.ValAddress(val.Address).String(), sdkmath.LegacyOneDec())) } + // set validators and delegations - stakingGenesis := stakingtypes.NewGenesisState(stakingtypes.DefaultParams(), validators, delegations) - genesisState[stakingtypes.ModuleName] = app.AppCodec().MustMarshalJSON(stakingGenesis) + var stakingGenesis stakingtypes.GenesisState + app.AppCodec().MustUnmarshalJSON(genesisState[stakingtypes.ModuleName], &stakingGenesis) - totalSupply := sdk.NewCoins() - for _, b := range balances { - // add genesis acc tokens and delegated tokens to total supply - totalSupply = totalSupply.Add(b.Coins.Add(sdk.NewCoin(sdk.DefaultBondDenom, bondAmt))...) - } + bondDenom := stakingGenesis.Params.BondDenom // add bonded amount to bonded pool module account balances = append(balances, banktypes.Balance{ Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(), - Coins: sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, bondAmt)}, + Coins: sdk.Coins{sdk.NewCoin(bondDenom, bondAmt.Mul(sdkmath.NewInt(int64(len(valSet.Validators)))))}, }) + // set validators and delegations + stakingGenesis = *stakingtypes.NewGenesisState(stakingGenesis.Params, validators, delegations) + genesisState[stakingtypes.ModuleName] = app.AppCodec().MustMarshalJSON(&stakingGenesis) + // update total supply - bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{}, []banktypes.SendEnabled{}) + bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, sdk.NewCoins(), []banktypes.Metadata{}, []banktypes.SendEnabled{}) genesisState[banktypes.ModuleName] = app.AppCodec().MustMarshalJSON(bankGenesis) stateBytes, err := json.MarshalIndent(genesisState, "", " ") - require.NoError(t, err) + require.NoError(tb, err) // init chain will set the validator set and initialize the genesis accounts - app.InitChain( - abci.RequestInitChain{ + _, err = app.InitChain( + &abci.RequestInitChain{ ChainId: chainID, Validators: []abci.ValidatorUpdate{}, - ConsensusParams: simtestutil.DefaultConsensusParams, AppStateBytes: stateBytes, + ConsensusParams: simtestutil.DefaultConsensusParams, }, ) - - // commit genesis changes - app.Commit() - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{ - ChainID: chainID, - Height: app.LastBlockHeight() + 1, - AppHash: app.LastCommitID().Hash, - ValidatorsHash: valSet.Hash(), - NextValidatorsHash: valSet.Hash(), - }}) + require.NoError(tb, err) return app } diff --git a/testutil/ibctesting/chain.go b/testutil/ibctesting/chain.go index ca40d17da0..e8b3d3bd56 100644 --- a/testutil/ibctesting/chain.go +++ b/testutil/ibctesting/chain.go @@ -1,800 +1,126 @@ package ibctesting import ( - "bytes" - "fmt" - "strconv" "testing" - "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/crypto/tmhash" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - tmprotoversion "github.com/cometbft/cometbft/proto/tendermint/version" - tmtypes "github.com/cometbft/cometbft/types" - tmversion "github.com/cometbft/cometbft/version" "github.com/stretchr/testify/require" - "cosmossdk.io/errors" - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/codec" + sdkmath "cosmossdk.io/math" + "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" - cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - stakingtestutil "github.com/cosmos/cosmos-sdk/x/staking/testutil" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - commitmenttypes "github.com/cosmos/ibc-go/v7/modules/core/23-commitment/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" - "github.com/cosmos/ibc-go/v7/modules/core/exported" - "github.com/cosmos/ibc-go/v7/modules/core/types" - ibctmtypes "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" - "github.com/cosmos/ibc-go/v7/testing/mock" - - simapp "github.com/desmos-labs/desmos/v6/app" - - profilestypes "github.com/desmos-labs/desmos/v6/x/profiles/types" -) -const ( - TrustingPeriod = time.Hour * 24 * 7 * 2 - UnbondingPeriod = time.Hour * 24 * 7 * 3 - MaxClockDrift = time.Second * 10 + cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" + cmttypes "github.com/cometbft/cometbft/types" - DefaultDelayPeriod uint64 = 0 + ibctesting "github.com/cosmos/ibc-go/v8/testing" ) -var ( - DefaultOpenInitVersion *connectiontypes.Version - DefaultTrustLevel = ibctmtypes.DefaultTrustLevel - UpgradePath = []string{"upgrade", "upgradedIBCState"} - ConnectionVersion = connectiontypes.ExportedVersionsToProto(connectiontypes.GetCompatibleVersions())[0] -) - -// TestChain is a testing struct that wraps a simapp with the last TM Header, the current ABCI -// header and the validators of the TestChain. It also contains a field called ChainID. This -// is the clientID that *other* chains use to refer to this TestChain. The SenderAccount -// is used for delivering transactions through the application state. -// NOTE: the actual application uses an empty chain-id for ease of testing. -type TestChain struct { - T *testing.T - - App *simapp.DesmosApp - ChainID string - LastHeader *ibctmtypes.Header // header for last block height committed - CurrentHeader tmproto.Header // header for current block height - QueryServer types.QueryServer - TxConfig client.TxConfig - Codec codec.BinaryCodec - - Vals *tmtypes.ValidatorSet - Signers []tmtypes.PrivValidator - - PrivKey cryptotypes.PrivKey - Account authtypes.AccountI - - // IBC specific helpers - ClientIDs []string // ClientID's used on this chain - Connections []*TestConnection // track connectionID's created for this chain -} - -// NewTestChain initializes a new TestChain instance with a single validator set using a -// generated private key. It also creates a sender account to be used for delivering transactions. +// NewTestChainWithValSet initializes a new TestChain instance with the given validator set +// and signer array. It also initializes 10 Sender accounts with a balance of 10000000000000000000 coins of +// bond denom to use for tests. // // The first block height is committed to state in order to allow for client creations on // counterparty chains. The TestChain will return with a block height starting at 2. // // Time management is handled by the Coordinator in order to ensure synchrony between chains. // Each update of any chain increments the block header time for all chains by 5 seconds. -func NewTestChain(t *testing.T, chainID string) *TestChain { - // generate validator private/public key - privVal := mock.NewPV() - pubKey, err := privVal.GetPubKey() - require.NoError(t, err) +// +// NOTE: to use a custom sender privkey and account for testing purposes, replace and modify this +// constructor function. +// +// CONTRACT: Validator array must be provided in the order expected by Tendermint. +// i.e. sorted first by power and then lexicographically by address. +func NewTestChainWithValSet(tb testing.TB, coord *ibctesting.Coordinator, chainID string, valSet *cmttypes.ValidatorSet, signers map[string]cmttypes.PrivValidator) *ibctesting.TestChain { + tb.Helper() + genAccs := []authtypes.GenesisAccount{} + genBals := []banktypes.Balance{} + senderAccs := []ibctesting.SenderAccount{} + + // generate genesis accounts + for i := 0; i < ibctesting.MaxAccounts; i++ { + senderPrivKey := secp256k1.GenPrivKey() + acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), uint64(i), 0) + amount, ok := sdkmath.NewIntFromString("10000000000000000000") + require.True(tb, ok) + + // add sender account + balance := banktypes.Balance{ + Address: acc.GetAddress().String(), + Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, amount)), + } + + genAccs = append(genAccs, acc) + genBals = append(genBals, balance) - // create validator set with single validator - validator := tmtypes.NewValidator(pubKey, 1) - valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator}) - signers := []tmtypes.PrivValidator{privVal} + senderAcc := ibctesting.SenderAccount{ + SenderAccount: acc, + SenderPrivKey: senderPrivKey, + } - // generate genesis account - senderPrivKey := secp256k1.GenPrivKey() - acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0) - balance := banktypes.Balance{ - Address: acc.GetAddress().String(), - Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100000000000000))), + senderAccs = append(senderAccs, senderAcc) } - app := SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, chainID, balance) + desmosApp := SetupWithGenesisValSet(tb, valSet, genAccs, chainID, sdk.DefaultPowerReduction, genBals...) // create current header and call begin block - header := tmproto.Header{ + header := cmtproto.Header{ ChainID: chainID, Height: 1, - Time: globalStartTime, + Time: coord.CurrentTime.UTC(), } - // create an account to send transactions from - chain := &TestChain{ - T: t, - ChainID: chainID, - App: app, - CurrentHeader: header, - QueryServer: app.IBCKeeper, - TxConfig: app.TxConfig(), - Codec: app.AppCodec(), - Vals: valSet, - Signers: signers, - PrivKey: senderPrivKey, - Account: acc, - ClientIDs: make([]string, 0), - Connections: make([]*TestConnection, 0), - } + txConfig := desmosApp.GetTxConfig() + // create an account to send transactions from + chain := &ibctesting.TestChain{ + TB: tb, + Coordinator: coord, + ChainID: chainID, + App: desmosApp, + CurrentHeader: header, + QueryServer: desmosApp.GetIBCKeeper(), + TxConfig: txConfig, + Codec: desmosApp.AppCodec(), + Vals: valSet, + NextVals: valSet, + Signers: signers, + SenderPrivKey: senderAccs[0].SenderPrivKey, + SenderAccount: senderAccs[0].SenderAccount, + SenderAccounts: senderAccs, + } + + // commit genesis block chain.NextBlock() return chain } -// GetContext returns the current context for the application. -func (chain *TestChain) GetContext() sdk.Context { - return chain.App.BaseApp.NewContext(false, chain.CurrentHeader) -} - -// QueryProof performs an abci query with the given key and returns the proto encoded merkle proof -// for the query and the height at which the proof will succeed on a tendermint verifier. -func (chain *TestChain) QueryProof(key []byte) ([]byte, clienttypes.Height) { - res := chain.App.Query(abci.RequestQuery{ - Path: fmt.Sprintf("store/%s/key", exported.StoreKey), - Height: chain.App.LastBlockHeight() - 1, - Data: key, - Prove: true, - }) - - merkleProof, err := commitmenttypes.ConvertProofs(res.ProofOps) - require.NoError(chain.T, err) - - proof, err := chain.App.AppCodec().Marshal(&merkleProof) - require.NoError(chain.T, err) - - revision := clienttypes.ParseChainID(chain.ChainID) - - // proof height + 1 is returned as the proof created corresponds to the height the proof - // was created in the IAVL tree. Tendermint and subsequently the clients that rely on it - // have heights 1 above the IAVL tree. Thus we return proof height + 1 - return proof, clienttypes.NewHeight(revision, uint64(res.Height)+1) -} - -// QueryUpgradeProof performs an abci query with the given key and returns the proto encoded merkle proof -// for the query and the height at which the proof will succeed on a tendermint verifier. -func (chain *TestChain) QueryUpgradeProof(key []byte, height uint64) ([]byte, clienttypes.Height) { - res := chain.App.Query(abci.RequestQuery{ - Path: "store/upgrade/key", - Height: int64(height - 1), - Data: key, - Prove: true, - }) - - merkleProof, err := commitmenttypes.ConvertProofs(res.ProofOps) - require.NoError(chain.T, err) - - proof, err := chain.App.AppCodec().Marshal(&merkleProof) - require.NoError(chain.T, err) - - revision := clienttypes.ParseChainID(chain.ChainID) - - // proof height + 1 is returned as the proof created corresponds to the height the proof - // was created in the IAVL tree. Tendermint and subsequently the clients that rely on it - // have heights 1 above the IAVL tree. Thus we return proof height + 1 - return proof, clienttypes.NewHeight(revision, uint64(res.Height+1)) -} - -// QueryClientStateProof performs and abci query for a client state -// stored with a given clientID and returns the ClientState along with the proof -func (chain *TestChain) QueryClientStateProof(clientID string) (exported.ClientState, []byte) { - // retrieve client state to provide proof for - clientState, found := chain.App.IBCKeeper.ClientKeeper.GetClientState(chain.GetContext(), clientID) - require.True(chain.T, found) - - clientKey := host.FullClientStateKey(clientID) - proofClient, _ := chain.QueryProof(clientKey) - - return clientState, proofClient -} - -// QueryConsensusStateProof performs an abci query for a consensus state -// stored on the given clientID. The proof and consensusHeight are returned. -func (chain *TestChain) QueryConsensusStateProof(clientID string) ([]byte, clienttypes.Height) { - clientState := chain.GetClientState(clientID) - - consensusHeight := clientState.GetLatestHeight().(clienttypes.Height) - consensusKey := host.FullConsensusStateKey(clientID, consensusHeight) - proofConsensus, _ := chain.QueryProof(consensusKey) - - return proofConsensus, consensusHeight -} - -// NextBlock sets the last header to the current header and increments the current header to be -// at the next block height. It does not update the time as that is handled by the Coordinator. -// -// CONTRACT: this function must only be called after app.Commit() occurs -func (chain *TestChain) NextBlock() { - // set the last header to the current header - // use nil trusted fields - chain.LastHeader = chain.CurrentTMClientHeader() - - // increment the current header - chain.CurrentHeader = tmproto.Header{ - ChainID: chain.ChainID, - Height: chain.App.LastBlockHeight() + 1, - AppHash: chain.App.LastCommitID().Hash, - // NOTE: the time is increased by the coordinator to maintain time synchrony amongst - // chains. - Time: chain.CurrentHeader.Time, - ValidatorsHash: chain.Vals.Hash(), - NextValidatorsHash: chain.Vals.Hash(), - } - - chain.App.BeginBlock(abci.RequestBeginBlock{Header: chain.CurrentHeader}) - -} - -// sendMsgs delivers a transaction through the application without returning the result. -func (chain *TestChain) sendMsgs(msgs ...sdk.Msg) error { - _, err := chain.SendMsgs(msgs...) - return err -} - -// SendMsgs delivers a transaction through the application. It updates the senders sequence -// number and updates the TestChain's headers. It returns the result and error if one -// occurred. -func (chain *TestChain) SendMsgs(msgs ...sdk.Msg) (*sdk.Result, error) { - _, r, err := simtestutil.SignCheckDeliver( - chain.T, - chain.TxConfig, - chain.App.BaseApp, - chain.GetContext().BlockHeader(), - msgs, - chain.ChainID, - []uint64{chain.Account.GetAccountNumber()}, - []uint64{chain.Account.GetSequence()}, - true, true, chain.PrivKey, - ) - if err != nil { - return nil, err - } - - // SignCheckDeliver calls app.Commit() - chain.NextBlock() - - // increment sequence for successful transaction execution - chain.Account.SetSequence(chain.Account.GetSequence() + 1) - - return r, nil -} - -// GetClientState retrieves the client state for the provided clientID. The client is -// expected to exist otherwise testing will fail. -func (chain *TestChain) GetClientState(clientID string) exported.ClientState { - clientState, found := chain.App.IBCKeeper.ClientKeeper.GetClientState(chain.GetContext(), clientID) - require.True(chain.T, found) - - return clientState -} - -// GetConsensusState retrieves the consensus state for the provided clientID and height. -// It will return a success boolean depending on if consensus state exists or not. -func (chain *TestChain) GetConsensusState(clientID string, height exported.Height) (exported.ConsensusState, bool) { - return chain.App.IBCKeeper.ClientKeeper.GetClientConsensusState(chain.GetContext(), clientID, height) -} - -// GetValsAtHeight will return the validator set of the chain at a given height. It will return -// a success boolean depending on if the validator set exists or not at that height. -func (chain *TestChain) GetValsAtHeight(height int64) (*tmtypes.ValidatorSet, bool) { - histInfo, ok := chain.App.StakingKeeper.GetHistoricalInfo(chain.GetContext(), height) - if !ok { - return nil, false - } - - valSet := stakingtypes.Validators(histInfo.Valset) - - tmValidators, err := stakingtestutil.ToTmValidators(valSet, sdk.DefaultPowerReduction) - if err != nil { - panic(err) - } - return tmtypes.NewValidatorSet(tmValidators), true -} - -// GetConnection retrieves an IBC Connection for the provided TestConnection. The -// connection is expected to exist otherwise testing will fail. -func (chain *TestChain) GetConnection(testConnection *TestConnection) connectiontypes.ConnectionEnd { - connection, found := chain.App.IBCKeeper.ConnectionKeeper.GetConnection(chain.GetContext(), testConnection.ID) - require.True(chain.T, found) - - return connection -} - -// GetChannel retrieves an IBC Channel for the provided TestChannel. The channel -// is expected to exist otherwise testing will fail. -func (chain *TestChain) GetChannel(testChannel TestChannel) channeltypes.Channel { - channel, found := chain.App.IBCKeeper.ChannelKeeper.GetChannel(chain.GetContext(), testChannel.PortID, testChannel.ID) - require.True(chain.T, found) - - return channel -} - -// GetAcknowledgement retrieves an acknowledgement for the provided packet. If the -// acknowledgement does not exist then testing will fail. -func (chain *TestChain) GetAcknowledgement(packet exported.PacketI) []byte { - ack, found := chain.App.IBCKeeper.ChannelKeeper.GetPacketAcknowledgement(chain.GetContext(), packet.GetDestPort(), packet.GetDestChannel(), packet.GetSequence()) - require.True(chain.T, found) - - return ack -} - -// GetPrefix returns the prefix for used by a chain in connection creation -func (chain *TestChain) GetPrefix() commitmenttypes.MerklePrefix { - return commitmenttypes.NewMerklePrefix(chain.App.IBCKeeper.ConnectionKeeper.GetCommitmentPrefix().Bytes()) -} - -// NewClientID appends a new clientID string in the format: -// ClientFor -func (chain *TestChain) NewClientID(clientType string) string { - clientID := fmt.Sprintf("%s-%s", clientType, strconv.Itoa(len(chain.ClientIDs))) - chain.ClientIDs = append(chain.ClientIDs, clientID) - return clientID -} - -// AddTestConnection appends a new TestConnection which contains references -// to the connection id, client id and counterparty client id. -func (chain *TestChain) AddTestConnection(clientID, counterpartyClientID string) *TestConnection { - conn := chain.ConstructNextTestConnection(clientID, counterpartyClientID) - - chain.Connections = append(chain.Connections, conn) - return conn -} - -// ConstructNextTestConnection constructs the next test connection to be -// created given a clientID and counterparty clientID. The connection id -// format: -conn -func (chain *TestChain) ConstructNextTestConnection(clientID, counterpartyClientID string) *TestConnection { - connectionID := connectiontypes.FormatConnectionIdentifier(uint64(len(chain.Connections))) - return &TestConnection{ - ID: connectionID, - ClientID: clientID, - NextChannelVersion: "ics-20", - CounterpartyClientID: counterpartyClientID, - } -} - -// GetFirstTestConnection returns the first test connection for a given clientID. -// The connection may or may not exist in the chain state. -func (chain *TestChain) GetFirstTestConnection(clientID, counterpartyClientID string) *TestConnection { - if len(chain.Connections) > 0 { - return chain.Connections[0] - } - - return chain.ConstructNextTestConnection(clientID, counterpartyClientID) -} - -// AddTestChannel appends a new TestChannel which contains references to the port and channel ID -// used for channel creation and interaction. See 'NextTestChannel' for channel ID naming format. -func (chain *TestChain) AddTestChannel(conn *TestConnection, portID string) TestChannel { - channel := chain.NextTestChannel(conn, portID) - conn.Channels = append(conn.Channels, channel) - return channel -} - -// NextTestChannel returns the next test channel to be created on this connection, but does not -// add it to the list of created channels. This function is expected to be used when the caller -// has not created the associated channel in app state, but would still like to refer to the -// non-existent channel usually to test for its non-existence. -// -// channel ID format: -chan -// -// The port is passed in by the caller. -func (chain *TestChain) NextTestChannel(conn *TestConnection, portID string) TestChannel { - nextChanSeq := chain.App.IBCKeeper.ChannelKeeper.GetNextChannelSequence(chain.GetContext()) - channelID := channeltypes.FormatChannelIdentifier(nextChanSeq) - return TestChannel{ - PortID: portID, - ID: channelID, - ClientID: conn.ClientID, - CounterpartyClientID: conn.CounterpartyClientID, - Version: conn.NextChannelVersion, - } -} - -// ConstructMsgCreateClient constructs a message to create a new client state (tendermint or solomachine). -// NOTE: a solo machine client will be created with an empty diversifier. -func (chain *TestChain) ConstructMsgCreateClient(counterparty *TestChain, clientID string, clientType string) *clienttypes.MsgCreateClient { +// NewTestChain initializes a new test chain with a default of 4 validators +// Use this function if the tests do not need custom control over the validator set +func NewTestChain(t *testing.T, coord *ibctesting.Coordinator, chainID string) *ibctesting.TestChain { + t.Helper() + // generate validators private/public key var ( - clientState exported.ClientState - consensusState exported.ConsensusState - ) - - switch clientType { - case exported.Tendermint: - height := counterparty.LastHeader.GetHeight().(clienttypes.Height) - clientState = ibctmtypes.NewClientState( - counterparty.ChainID, DefaultTrustLevel, TrustingPeriod, UnbondingPeriod, MaxClockDrift, - height, commitmenttypes.GetSDKSpecs(), UpgradePath, - ) - consensusState = counterparty.LastHeader.ConsensusState() - default: - chain.T.Fatalf("unsupported client state type %s", clientType) - } - - msg, err := clienttypes.NewMsgCreateClient( - clientState, consensusState, chain.Account.GetAddress().String(), - ) - require.NoError(chain.T, err) - return msg -} - -// CreateTMClient will construct and execute a 07-tendermint MsgCreateClient. A counterparty -// client will be created on the (target) chain. -func (chain *TestChain) CreateTMClient(counterparty *TestChain, clientID string) error { - // construct MsgCreateClient using counterparty - msg := chain.ConstructMsgCreateClient(counterparty, clientID, exported.Tendermint) - return chain.sendMsgs(msg) -} - -// UpdateTMClient will construct and execute a 07-tendermint MsgUpdateClient. The counterparty -// client will be updated on the (target) chain. UpdateTMClient mocks the relayer flow -// necessary for updating a Tendermint client. -func (chain *TestChain) UpdateTMClient(counterparty *TestChain, clientID string) error { - header, err := chain.ConstructUpdateTMClientHeader(counterparty, clientID) - require.NoError(chain.T, err) - - msg, err := clienttypes.NewMsgUpdateClient( - clientID, header, - chain.Account.GetAddress().String(), - ) - require.NoError(chain.T, err) - - return chain.sendMsgs(msg) -} - -// ConstructUpdateTMClientHeader will construct a valid 07-tendermint Header to update the -// light client on the source chain. -func (chain *TestChain) ConstructUpdateTMClientHeader(counterparty *TestChain, clientID string) (*ibctmtypes.Header, error) { - header := counterparty.LastHeader - // Relayer must query for LatestHeight on client to get TrustedHeight - trustedHeight := chain.GetClientState(clientID).GetLatestHeight().(clienttypes.Height) - var ( - tmTrustedVals *tmtypes.ValidatorSet - ok bool - ) - // Once we get TrustedHeight from client, we must query the validators from the counterparty chain - // If the LatestHeight == LastHeader.Height, then TrustedValidators are current validators - // If LatestHeight < LastHeader.Height, we can query the historical validator set from HistoricalInfo - if trustedHeight == counterparty.LastHeader.GetHeight() { - tmTrustedVals = counterparty.Vals - } else { - // NOTE: We need to get validators from counterparty at height: trustedHeight+1 - // since the last trusted validators for a header at height h - // is the NextValidators at h+1 committed to in header h by - // NextValidatorsHash - tmTrustedVals, ok = counterparty.GetValsAtHeight(int64(trustedHeight.RevisionHeight + 1)) - if !ok { - return nil, errors.Wrapf(ibctmtypes.ErrInvalidHeaderHeight, "could not retrieve trusted validators at trustedHeight: %d", trustedHeight) - } - } - // inject trusted fields into last header - // for now assume revision number is 0 - header.TrustedHeight = trustedHeight - - trustedVals, err := tmTrustedVals.ToProto() - if err != nil { - return nil, err - } - header.TrustedValidators = trustedVals - - return header, nil - -} - -// ExpireClient fast forwards the chain's block time by the provided amount of time which will -// expire any clients with a trusting period less than or equal to this amount of time. -func (chain *TestChain) ExpireClient(amount time.Duration) { - chain.CurrentHeader.Time = chain.CurrentHeader.Time.Add(amount) -} - -// CurrentTMClientHeader creates a TM header using the current header parameters -// on the chain. The trusted fields in the header are set to nil. -func (chain *TestChain) CurrentTMClientHeader() *ibctmtypes.Header { - return chain.CreateTMClientHeader(chain.ChainID, chain.CurrentHeader.Height, clienttypes.Height{}, chain.CurrentHeader.Time, chain.Vals, nil, chain.Signers) -} - -// CreateTMClientHeader creates a TM header to update the TM client. Args are passed in to allow -// caller flexibility to use params that differ from the chain. -func (chain *TestChain) CreateTMClientHeader(chainID string, blockHeight int64, trustedHeight clienttypes.Height, timestamp time.Time, tmValSet, tmTrustedVals *tmtypes.ValidatorSet, signers []tmtypes.PrivValidator) *ibctmtypes.Header { - var ( - valSet *tmproto.ValidatorSet - trustedVals *tmproto.ValidatorSet - ) - require.NotNil(chain.T, tmValSet) - - vsetHash := tmValSet.Hash() - - tmHeader := tmtypes.Header{ - Version: tmprotoversion.Consensus{Block: tmversion.BlockProtocol, App: 2}, - ChainID: chainID, - Height: blockHeight, - Time: timestamp, - LastBlockID: MakeBlockID(make([]byte, tmhash.Size), 10_000, make([]byte, tmhash.Size)), - LastCommitHash: chain.App.LastCommitID().Hash, - DataHash: tmhash.Sum([]byte("data_hash")), - ValidatorsHash: vsetHash, - NextValidatorsHash: vsetHash, - ConsensusHash: tmhash.Sum([]byte("consensus_hash")), - AppHash: chain.CurrentHeader.AppHash, - LastResultsHash: tmhash.Sum([]byte("last_results_hash")), - EvidenceHash: tmhash.Sum([]byte("evidence_hash")), - ProposerAddress: tmValSet.Proposer.Address, - } - hhash := tmHeader.Hash() - blockID := MakeBlockID(hhash, 3, tmhash.Sum([]byte("part_set"))) - voteSet := tmtypes.NewVoteSet(chainID, blockHeight, 1, tmproto.PrecommitType, tmValSet) - - commit, err := tmtypes.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp) - require.NoError(chain.T, err) - - signedHeader := &tmproto.SignedHeader{ - Header: tmHeader.ToProto(), - Commit: commit.ToProto(), - } - - valSet, err = tmValSet.ToProto() - if err != nil { - panic(err) - } - - if tmTrustedVals != nil { - trustedVals, err = tmTrustedVals.ToProto() - if err != nil { - panic(err) - } - } - - // The trusted fields may be nil. They may be filled before relaying messages to a client. - // The relayer is responsible for querying client and injecting appropriate trusted fields. - return &ibctmtypes.Header{ - SignedHeader: signedHeader, - ValidatorSet: valSet, - TrustedHeight: trustedHeight, - TrustedValidators: trustedVals, - } -} - -// MakeBlockID copied unimported test functions from tmtypes to use them here -func MakeBlockID(hash []byte, partSetSize uint32, partSetHash []byte) tmtypes.BlockID { - return tmtypes.BlockID{ - Hash: hash, - PartSetHeader: tmtypes.PartSetHeader{ - Total: partSetSize, - Hash: partSetHash, - }, - } -} - -// CreateSortedSignerArray takes two PrivValidators, and the corresponding Validator structs -// (including voting power). It returns a signer array of PrivValidators that matches the -// sorting of ValidatorSet. -// The sorting is first by .VotingPower (descending), with secondary index of .Address (ascending). -func CreateSortedSignerArray(altPrivVal, suitePrivVal tmtypes.PrivValidator, - altVal, suiteVal *tmtypes.Validator) []tmtypes.PrivValidator { - - switch { - case altVal.VotingPower > suiteVal.VotingPower: - return []tmtypes.PrivValidator{altPrivVal, suitePrivVal} - case altVal.VotingPower < suiteVal.VotingPower: - return []tmtypes.PrivValidator{suitePrivVal, altPrivVal} - default: - if bytes.Compare(altVal.Address, suiteVal.Address) == -1 { - return []tmtypes.PrivValidator{altPrivVal, suitePrivVal} - } - return []tmtypes.PrivValidator{suitePrivVal, altPrivVal} - } -} - -// ConnectionOpenInit will construct and execute a MsgConnectionOpenInit. -func (chain *TestChain) ConnectionOpenInit( - counterparty *TestChain, - connection, counterpartyConnection *TestConnection, -) error { - msg := connectiontypes.NewMsgConnectionOpenInit( - connection.ClientID, - connection.CounterpartyClientID, - counterparty.GetPrefix(), DefaultOpenInitVersion, DefaultDelayPeriod, - chain.Account.GetAddress().String(), + validatorsPerChain = 4 + validators []*cmttypes.Validator + signersByAddress = make(map[string]cmttypes.PrivValidator, validatorsPerChain) ) - return chain.sendMsgs(msg) -} - -// ConnectionOpenTry will construct and execute a MsgConnectionOpenTry. -func (chain *TestChain) ConnectionOpenTry( - counterparty *TestChain, - connection, counterpartyConnection *TestConnection, -) error { - counterpartyClient, proofClient := counterparty.QueryClientStateProof(counterpartyConnection.ClientID) - - connectionKey := host.ConnectionKey(counterpartyConnection.ID) - proofInit, proofHeight := counterparty.QueryProof(connectionKey) - - proofConsensus, consensusHeight := counterparty.QueryConsensusStateProof(counterpartyConnection.ClientID) - - msg := connectiontypes.NewMsgConnectionOpenTry( - connection.ClientID, // does not support handshake continuation - counterpartyConnection.ID, counterpartyConnection.ClientID, - counterpartyClient, counterparty.GetPrefix(), []*connectiontypes.Version{ConnectionVersion}, DefaultDelayPeriod, - proofInit, proofClient, proofConsensus, - proofHeight, consensusHeight, - chain.Account.GetAddress().String(), - ) - return chain.sendMsgs(msg) -} - -// ConnectionOpenAck will construct and execute a MsgConnectionOpenAck. -func (chain *TestChain) ConnectionOpenAck( - counterparty *TestChain, - connection, counterpartyConnection *TestConnection, -) error { - counterpartyClient, proofClient := counterparty.QueryClientStateProof(counterpartyConnection.ClientID) - connectionKey := host.ConnectionKey(counterpartyConnection.ID) - proofTry, proofHeight := counterparty.QueryProof(connectionKey) - - proofConsensus, consensusHeight := counterparty.QueryConsensusStateProof(counterpartyConnection.ClientID) - - msg := connectiontypes.NewMsgConnectionOpenAck( - connection.ID, counterpartyConnection.ID, counterpartyClient, // testing doesn't use flexible selection - proofTry, proofClient, proofConsensus, - proofHeight, consensusHeight, - ConnectionVersion, - chain.Account.GetAddress().String(), - ) - return chain.sendMsgs(msg) -} - -// ConnectionOpenConfirm will construct and execute a MsgConnectionOpenConfirm. -func (chain *TestChain) ConnectionOpenConfirm( - counterparty *TestChain, - connection, counterpartyConnection *TestConnection, -) error { - connectionKey := host.ConnectionKey(counterpartyConnection.ID) - proof, height := counterparty.QueryProof(connectionKey) - - msg := connectiontypes.NewMsgConnectionOpenConfirm( - connection.ID, - proof, height, - chain.Account.GetAddress().String(), - ) - return chain.sendMsgs(msg) -} - -// CreatePortCapability binds and claims a capability for the given portID if it does not -// already exist. This function will fail testing on any resulting error. -// NOTE: only creation of a capbility for a ibcporfiles is supported -// Other applications must bind to the port in InitGenesis or modify this code. -func (chain *TestChain) CreatePortCapability(portID string) { - // check if the portId is already binded, if not bind it - _, ok := chain.App.ScopedIBCKeeper.GetCapability(chain.GetContext(), host.PortPath(portID)) - if !ok { - // create capability using the IBC capability keeper - cap, err := chain.App.ScopedIBCKeeper.NewCapability(chain.GetContext(), host.PortPath(portID)) - require.NoError(chain.T, err) - - switch portID { - case profilestypes.IBCPortID: - // claim capability using the ibcporfiles capability keeper - err = chain.App.ScopedProfilesKeeper.ClaimCapability(chain.GetContext(), cap, host.PortPath(portID)) - require.NoError(chain.T, err) - default: - panic(fmt.Sprintf("unsupported ibc testing package port ID %s", portID)) - } + for i := 0; i < validatorsPerChain; i++ { + _, privVal := cmttypes.RandValidator(false, 100) + pubKey, err := privVal.GetPubKey() + require.NoError(t, err) + validators = append(validators, cmttypes.NewValidator(pubKey, 1)) + signersByAddress[pubKey.Address().String()] = privVal } - chain.App.Commit() + // construct validator set; + // Note that the validators are sorted by voting power + // or, if equal, by address lexical order + valSet := cmttypes.NewValidatorSet(validators) - chain.NextBlock() -} - -// CreateChannelCapability binds and claims a capability for the given portID and channelID -// if it does not already exist. This function will fail testing on any resulting error. -func (chain *TestChain) CreateChannelCapability(portID, channelID string) { - capName := host.ChannelCapabilityPath(portID, channelID) - // check if the portId is already binded, if not bind it - _, ok := chain.App.ScopedIBCKeeper.GetCapability(chain.GetContext(), capName) - if !ok { - cap, err := chain.App.ScopedIBCKeeper.NewCapability(chain.GetContext(), capName) - require.NoError(chain.T, err) - err = chain.App.ScopedProfilesKeeper.ClaimCapability(chain.GetContext(), cap, capName) - require.NoError(chain.T, err) - } - - chain.App.Commit() - - chain.NextBlock() -} - -// GetChannelCapability returns the channel capability for the given portID and channelID. -// The capability must exist, otherwise testing will fail. -func (chain *TestChain) GetChannelCapability(portID, channelID string) *capabilitytypes.Capability { - cap, ok := chain.App.ScopedIBCKeeper.GetCapability(chain.GetContext(), host.ChannelCapabilityPath(portID, channelID)) - require.True(chain.T, ok) - - return cap -} - -// ChanOpenInit will construct and execute a MsgChannelOpenInit. -func (chain *TestChain) ChanOpenInit( - ch, counterparty TestChannel, - order channeltypes.Order, - connectionID string, -) error { - msg := channeltypes.NewMsgChannelOpenInit( - ch.PortID, - ch.Version, order, []string{connectionID}, - counterparty.PortID, - chain.Account.GetAddress().String(), - ) - return chain.sendMsgs(msg) -} - -// ChanOpenTry will construct and execute a MsgChannelOpenTry. -func (chain *TestChain) ChanOpenTry( - counterparty *TestChain, - ch, counterpartyCh TestChannel, - order channeltypes.Order, - connectionID string, -) error { - proof, height := counterparty.QueryProof(host.ChannelKey(counterpartyCh.PortID, counterpartyCh.ID)) - - msg := channeltypes.NewMsgChannelOpenTry( - ch.PortID, - ch.Version, order, []string{connectionID}, - counterpartyCh.PortID, counterpartyCh.ID, counterpartyCh.Version, - proof, height, - chain.Account.GetAddress().String(), - ) - return chain.sendMsgs(msg) -} - -// ChanOpenAck will construct and execute a MsgChannelOpenAck. -func (chain *TestChain) ChanOpenAck( - counterparty *TestChain, - ch, counterpartyCh TestChannel, -) error { - proof, height := counterparty.QueryProof(host.ChannelKey(counterpartyCh.PortID, counterpartyCh.ID)) - - msg := channeltypes.NewMsgChannelOpenAck( - ch.PortID, ch.ID, - counterpartyCh.ID, counterpartyCh.Version, // testing doesn't use flexible selection - proof, height, - chain.Account.GetAddress().String(), - ) - return chain.sendMsgs(msg) -} - -// ChanOpenConfirm will construct and execute a MsgChannelOpenConfirm. -func (chain *TestChain) ChanOpenConfirm( - counterparty *TestChain, - ch, counterpartyCh TestChannel, -) error { - proof, height := counterparty.QueryProof(host.ChannelKey(counterpartyCh.PortID, counterpartyCh.ID)) - - msg := channeltypes.NewMsgChannelOpenConfirm( - ch.PortID, ch.ID, - proof, height, - chain.Account.GetAddress().String(), - ) - return chain.sendMsgs(msg) + return NewTestChainWithValSet(t, coord, chainID, valSet, signersByAddress) } diff --git a/testutil/ibctesting/coordinator.go b/testutil/ibctesting/coordinator.go index ff3b2c6137..0aacfff039 100644 --- a/testutil/ibctesting/coordinator.go +++ b/testutil/ibctesting/coordinator.go @@ -1,425 +1,28 @@ package ibctesting import ( - "fmt" - "strconv" "testing" "time" - profilestypes "github.com/desmos-labs/desmos/v6/x/profiles/types" - - abci "github.com/cometbft/cometbft/abci/types" - "github.com/stretchr/testify/require" - - sdk "github.com/cosmos/cosmos-sdk/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibctesting "github.com/cosmos/ibc-go/v8/testing" ) var ( - ChainIDPrefix = "testchain" globalStartTime = time.Date(2020, 1, 2, 0, 0, 0, 0, time.UTC) - TimeIncrement = time.Second * 5 ) -// Coordinator is a testing struct which contains N TestChain's. It handles keeping all chains -// in sync with regards to time. -type Coordinator struct { - t *testing.T - - Chains map[string]*TestChain -} - -// NewCoordinator initializes Coordinator with N TestChain's -func NewCoordinator(t *testing.T, n int) *Coordinator { - chains := make(map[string]*TestChain) - - for i := 0; i < n; i++ { - chainID := GetChainID(i + 1) - chains[chainID] = NewTestChain(t, chainID) - } - return &Coordinator{ - t: t, - Chains: chains, - } -} - -// SetupClients is a helper function to create clients on both chains. It assumes the -// caller does not anticipate any errors. -func (coord *Coordinator) SetupClients( - chainA, chainB *TestChain, - clientType string, -) (string, string) { - - clientA, err := coord.CreateClient(chainA, chainB, clientType) - require.NoError(coord.t, err) - - clientB, err := coord.CreateClient(chainB, chainA, clientType) - require.NoError(coord.t, err) - - return clientA, clientB -} - -// SetupClientConnections is a helper function to create clients and the appropriate -// connections on both the source and counterparty chain. It assumes the caller does not -// anticipate any errors. -func (coord *Coordinator) SetupClientConnections( - chainA, chainB *TestChain, - clientType string, -) (string, string, *TestConnection, *TestConnection) { - - clientA, clientB := coord.SetupClients(chainA, chainB, clientType) - - connA, connB := coord.CreateConnection(chainA, chainB, clientA, clientB) - - return clientA, clientB, connA, connB -} - -// CreateClient creates a counterparty client on the source chain and returns the clientID. -func (coord *Coordinator) CreateClient( - source, counterparty *TestChain, - clientType string, -) (clientID string, err error) { - coord.CommitBlock(source, counterparty) - - clientID = source.NewClientID(clientType) - - switch clientType { - case exported.Tendermint: - err = source.CreateTMClient(counterparty, clientID) - - default: - err = fmt.Errorf("client type %s is not supported", clientType) - } - - if err != nil { - return "", err - } - - coord.IncrementTime() - - return clientID, nil -} - -// UpdateClient updates a counterparty client on the source chain. -func (coord *Coordinator) UpdateClient( - source, counterparty *TestChain, - clientID string, - clientType string, -) (err error) { - coord.CommitBlock(source, counterparty) - - switch clientType { - case exported.Tendermint: - err = source.UpdateTMClient(counterparty, clientID) - - default: - err = fmt.Errorf("client type %s is not supported", clientType) - } - - if err != nil { - return err - } - - coord.IncrementTime() - - return nil -} - -// CreateConnection constructs and executes connection handshake messages in order to create -// OPEN channels on chainA and chainB. The connection information of for chainA and chainB -// are returned within a TestConnection struct. The function expects the connections to be -// successfully opened otherwise testing will fail. -func (coord *Coordinator) CreateConnection( - chainA, chainB *TestChain, - clientA, clientB string, -) (*TestConnection, *TestConnection) { - - connA, connB, err := coord.ConnOpenInit(chainA, chainB, clientA, clientB) - require.NoError(coord.t, err) - - err = coord.ConnOpenTry(chainB, chainA, connB, connA) - require.NoError(coord.t, err) - - err = coord.ConnOpenAck(chainA, chainB, connA, connB) - require.NoError(coord.t, err) - - err = coord.ConnOpenConfirm(chainB, chainA, connB, connA) - require.NoError(coord.t, err) - - return connA, connB -} - -// CreateIBCProfilesChannels constructs and executes channel handshake messages to create OPEN -// ibc-profiles channel to profiles channel on chainA and chainB. The function expects the channels to be -// successfully opened otherwise testing will fail. -func (coord *Coordinator) CreateIBCProfilesChannels( - chainA, chainB *TestChain, - connA, connB *TestConnection, - order channeltypes.Order, -) (TestChannel, TestChannel) { - return coord.CreateChannel(chainA, chainB, connA, connB, profilestypes.IBCPortID, profilestypes.IBCPortID, order) -} - -// CreateChannel constructs and executes channel handshake messages in order to create -// OPEN channels on chainA and chainB. The function expects the channels to be successfully -// opened otherwise testing will fail. -func (coord *Coordinator) CreateChannel( - chainA, chainB *TestChain, - connA, connB *TestConnection, - sourcePortID, counterpartyPortID string, - order channeltypes.Order, -) (TestChannel, TestChannel) { - - channelA, channelB, err := coord.ChanOpenInit(chainA, chainB, connA, connB, sourcePortID, counterpartyPortID, order) - require.NoError(coord.t, err) - - err = coord.ChanOpenTry(chainB, chainA, channelB, channelA, connB, order) - require.NoError(coord.t, err) - - err = coord.ChanOpenAck(chainA, chainB, channelA, channelB) - require.NoError(coord.t, err) - - err = coord.ChanOpenConfirm(chainB, chainA, channelB, channelA) - require.NoError(coord.t, err) - - return channelA, channelB -} - -// IncrementTime iterates through all the TestChain's and increments their current header time -// by 5 seconds. -// -// CONTRACT: this function must be called after every commit on any TestChain. -func (coord *Coordinator) IncrementTime() { - for _, chain := range coord.Chains { - chain.CurrentHeader.Time = chain.CurrentHeader.Time.Add(TimeIncrement) - chain.App.BeginBlock(abci.RequestBeginBlock{Header: chain.CurrentHeader}) - } -} - -// SendMsg delivers a single provided message to the chain. The counterparty -// client is update with the new source consensus state. -func (coord *Coordinator) SendMsg(source, counterparty *TestChain, counterpartyClientID string, msg sdk.Msg) error { - return coord.SendMsgs(source, counterparty, counterpartyClientID, []sdk.Msg{msg}) -} - -// SendMsgs delivers the provided messages to the chain. The counterparty -// client is updated with the new source consensus state. -func (coord *Coordinator) SendMsgs(source, counterparty *TestChain, counterpartyClientID string, msgs []sdk.Msg) error { - if err := source.sendMsgs(msgs...); err != nil { - return err - } - - coord.IncrementTime() - - // update source client on counterparty connection - return coord.UpdateClient( - counterparty, source, - counterpartyClientID, exported.Tendermint, - ) -} - -// GetChain returns the TestChain using the given chainID and returns an error if it does -// not exist. -func (coord *Coordinator) GetChain(chainID string) *TestChain { - chain, found := coord.Chains[chainID] - require.True(coord.t, found, fmt.Sprintf("%s chain does not exist", chainID)) - return chain -} - -// GetChainID returns the chainID used for the provided index. -func GetChainID(index int) string { - return ChainIDPrefix + strconv.Itoa(index) -} - -// CommitBlock commits a block on the provided indexes and then increments the global time. -// -// CONTRACT: the passed in list of indexes must not contain duplicates -func (coord *Coordinator) CommitBlock(chains ...*TestChain) { - for _, chain := range chains { - chain.App.Commit() - chain.NextBlock() - } - coord.IncrementTime() -} - -// ConnOpenInit initializes a connection on the source chain with the state INIT -// using the OpenInit handshake call. -// -// NOTE: The counterparty testing connection will be created even if it is not created in the -// application state. -func (coord *Coordinator) ConnOpenInit( - source, counterparty *TestChain, - clientID, counterpartyClientID string, -) (*TestConnection, *TestConnection, error) { - sourceConnection := source.AddTestConnection(clientID, counterpartyClientID) - counterpartyConnection := counterparty.AddTestConnection(counterpartyClientID, clientID) - - // initialize connection on source - if err := source.ConnectionOpenInit(counterparty, sourceConnection, counterpartyConnection); err != nil { - return sourceConnection, counterpartyConnection, err - } - coord.IncrementTime() - - // update source client on counterparty connection - if err := coord.UpdateClient( - counterparty, source, - counterpartyClientID, exported.Tendermint, - ); err != nil { - return sourceConnection, counterpartyConnection, err - } - - return sourceConnection, counterpartyConnection, nil -} - -// ConnOpenTry initializes a connection on the source chain with the state TRYOPEN -// using the OpenTry handshake call. -func (coord *Coordinator) ConnOpenTry( - source, counterparty *TestChain, - sourceConnection, counterpartyConnection *TestConnection, -) error { - // initialize TRYOPEN connection on source - if err := source.ConnectionOpenTry(counterparty, sourceConnection, counterpartyConnection); err != nil { - return err - } - coord.IncrementTime() - - // update source client on counterparty connection - return coord.UpdateClient( - counterparty, source, - counterpartyConnection.ClientID, exported.Tendermint, - ) -} - -// ConnOpenAck initializes a connection on the source chain with the state OPEN -// using the OpenAck handshake call. -func (coord *Coordinator) ConnOpenAck( - source, counterparty *TestChain, - sourceConnection, counterpartyConnection *TestConnection, -) error { - // set OPEN connection on source using OpenAck - if err := source.ConnectionOpenAck(counterparty, sourceConnection, counterpartyConnection); err != nil { - return err - } - coord.IncrementTime() - - // update source client on counterparty connection - return coord.UpdateClient( - counterparty, source, - counterpartyConnection.ClientID, exported.Tendermint, - ) -} - -// ConnOpenConfirm initializes a connection on the source chain with the state OPEN -// using the OpenConfirm handshake call. -func (coord *Coordinator) ConnOpenConfirm( - source, counterparty *TestChain, - sourceConnection, counterpartyConnection *TestConnection, -) error { - if err := source.ConnectionOpenConfirm(counterparty, sourceConnection, counterpartyConnection); err != nil { - return err - } - coord.IncrementTime() - - // update source client on counterparty connection - return coord.UpdateClient( - counterparty, source, - counterpartyConnection.ClientID, exported.Tendermint, - ) -} - -// ChanOpenInit initializes a channel on the source chain with the state INIT -// using the OpenInit handshake call. -// -// NOTE: The counterparty testing channel will be created even if it is not created in the -// application state. -func (coord *Coordinator) ChanOpenInit( - source, counterparty *TestChain, - connection, counterpartyConnection *TestConnection, - sourcePortID, counterpartyPortID string, - order channeltypes.Order, -) (TestChannel, TestChannel, error) { - sourceChannel := source.AddTestChannel(connection, sourcePortID) - counterpartyChannel := counterparty.AddTestChannel(counterpartyConnection, counterpartyPortID) - - // NOTE: only creation of a capability for a transfer or mock port is supported - // Other applications must bind to the port in InitGenesis or modify this code. - source.CreatePortCapability(sourceChannel.PortID) - coord.IncrementTime() - - // initialize channel on source - if err := source.ChanOpenInit(sourceChannel, counterpartyChannel, order, connection.ID); err != nil { - return sourceChannel, counterpartyChannel, err - } - coord.IncrementTime() - - // update source client on counterparty connection - if err := coord.UpdateClient( - counterparty, source, - counterpartyConnection.ClientID, exported.Tendermint, - ); err != nil { - return sourceChannel, counterpartyChannel, err +func NewCoordinator(t *testing.T, n int) *ibctesting.Coordinator { + chains := make(map[string]*ibctesting.TestChain) + coord := &ibctesting.Coordinator{ + T: t, + CurrentTime: globalStartTime, } - return sourceChannel, counterpartyChannel, nil -} - -// ChanOpenTry initializes a channel on the source chain with the state TRYOPEN -// using the OpenTry handshake call. -func (coord *Coordinator) ChanOpenTry( - source, counterparty *TestChain, - sourceChannel, counterpartyChannel TestChannel, - connection *TestConnection, - order channeltypes.Order, -) error { - - // initialize channel on source - if err := source.ChanOpenTry(counterparty, sourceChannel, counterpartyChannel, order, connection.ID); err != nil { - return err - } - coord.IncrementTime() - - // update source client on counterparty connection - return coord.UpdateClient( - counterparty, source, - connection.CounterpartyClientID, exported.Tendermint, - ) -} - -// ChanOpenAck initializes a channel on the source chain with the state OPEN -// using the OpenAck handshake call. -func (coord *Coordinator) ChanOpenAck( - source, counterparty *TestChain, - sourceChannel, counterpartyChannel TestChannel, -) error { - - if err := source.ChanOpenAck(counterparty, sourceChannel, counterpartyChannel); err != nil { - return err - } - coord.IncrementTime() - - // update source client on counterparty connection - return coord.UpdateClient( - counterparty, source, - sourceChannel.CounterpartyClientID, exported.Tendermint, - ) -} - -// ChanOpenConfirm initializes a channel on the source chain with the state OPEN -// using the OpenConfirm handshake call. -func (coord *Coordinator) ChanOpenConfirm( - source, counterparty *TestChain, - sourceChannel, counterpartyChannel TestChannel, -) error { - - if err := source.ChanOpenConfirm(counterparty, sourceChannel, counterpartyChannel); err != nil { - return err + for i := 1; i <= n; i++ { + chainID := ibctesting.GetChainID(i) + chains[chainID] = NewTestChain(t, coord, chainID) } - coord.IncrementTime() + coord.Chains = chains - // update source client on counterparty connection - return coord.UpdateClient( - counterparty, source, - sourceChannel.CounterpartyClientID, exported.Tendermint, - ) + return coord } diff --git a/testutil/ibctesting/types.go b/testutil/ibctesting/types.go deleted file mode 100644 index 3644eee089..0000000000 --- a/testutil/ibctesting/types.go +++ /dev/null @@ -1,44 +0,0 @@ -package ibctesting - -import ( - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" -) - -// TestConnection is a testing helper struct to keep track of the connectionID, source clientID, -// counterparty clientID, and the next channel version used in creating and interacting with a -// connection. -type TestConnection struct { - ID string - ClientID string - CounterpartyClientID string - NextChannelVersion string - Channels []TestChannel -} - -// FirstOrNextTestChannel returns the first test channel if it exists, otherwise it -// returns the next test channel to be created. This function is expected to be used -// when the caller does not know if the channel has or has not been created in app -// state, but would still like to refer to it to test existence or non-existence. -func (conn *TestConnection) FirstOrNextTestChannel(portID string) TestChannel { - if len(conn.Channels) > 0 { - return conn.Channels[0] - } - return TestChannel{ - PortID: portID, - ID: channeltypes.FormatChannelIdentifier(0), - ClientID: conn.ClientID, - CounterpartyClientID: conn.CounterpartyClientID, - Version: conn.NextChannelVersion, - } -} - -// TestChannel is a testing helper struct to keep track of the portID and channelID -// used in creating and interacting with a channel. The clientID and counterparty -// client ID are also tracked to cut down on querying and argument passing. -type TestChannel struct { - PortID string - ID string - ClientID string - CounterpartyClientID string - Version string -} diff --git a/testutil/network.go b/testutil/network.go index 4efb1a5f34..7072db9580 100644 --- a/testutil/network.go +++ b/testutil/network.go @@ -4,14 +4,14 @@ import ( "fmt" "time" - dbm "github.com/cometbft/cometbft-db" + pruningtypes "cosmossdk.io/store/pruning/types" tmrand "github.com/cometbft/cometbft/libs/rand" + dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" servertypes "github.com/cosmos/cosmos-sdk/server/types" - 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" diff --git a/testutil/profilestesting/profiles.go b/testutil/profilestesting/profiles.go index 37d4854245..4ead91d246 100644 --- a/testutil/profilestesting/profiles.go +++ b/testutil/profilestesting/profiles.go @@ -1,6 +1,7 @@ package profilestesting import ( + "context" "encoding/hex" "fmt" "time" @@ -11,6 +12,7 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/bech32/legacybech32" + authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/gogo/protobuf/proto" @@ -33,7 +35,7 @@ func AssertNoProfileError(profile *types.Profile, err error) *types.Profile { return profile } -func AccountFromAddr(addr string) authtypes.AccountI { +func AccountFromAddr(addr string) sdk.AccountI { address, err := sdk.AccAddressFromBech32(addr) if err != nil { panic(err) @@ -58,7 +60,9 @@ func PubKeyFromJSON(cdc codec.Codec, pubKey string) cryptotypes.PubKey { return publicKey } -func ProfileFromAddr(address string) *types.Profile { +type ProfileOption func(*types.Profile) *types.Profile + +func ProfileFromAddr(address string, options ...func(*types.Profile) *types.Profile) *types.Profile { profile, err := types.NewProfile( fmt.Sprintf("%s-dtag", address), "", @@ -71,9 +75,20 @@ func ProfileFromAddr(address string) *types.Profile { panic(err) } + for _, option := range options { + profile = option(profile) + } + return profile } +func WithNextAccountNumber(ctx context.Context, ak authkeeper.AccountKeeper) ProfileOption { + return func(profile *types.Profile) *types.Profile { + profile.SetAccountNumber(ak.NextAccountNumber(ctx)) + return profile + } +} + // SingleSignatureFromHex convert the hex-encoded string of the single signature to CosmosSignatureData func SingleSignatureFromHex(hexEncodedSignature string) types.Signature { sig, err := hex.DecodeString(hexEncodedSignature) diff --git a/testutil/simtesting/utils.go b/testutil/simtesting/utils.go index 9280ee96a8..488cac78ca 100644 --- a/testutil/simtesting/utils.go +++ b/testutil/simtesting/utils.go @@ -48,7 +48,6 @@ func SendMsg( TxGen: txConfig, Cdc: nil, Msg: msg, - MsgType: msg.Type(), Context: ctx, SimAccount: simAccount, AccountKeeper: ak, diff --git a/testutil/storetesting/context.go b/testutil/storetesting/context.go index 236f878374..2ec558f7aa 100644 --- a/testutil/storetesting/context.go +++ b/testutil/storetesting/context.go @@ -1,11 +1,12 @@ package storetesting import ( - dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + dbm "github.com/cosmos/cosmos-db" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -13,7 +14,7 @@ func BuildContext( keys map[string]*storetypes.KVStoreKey, tKeys map[string]*storetypes.TransientStoreKey, memKeys map[string]*storetypes.MemoryStoreKey, ) sdk.Context { db := dbm.NewMemDB() - cms := store.NewCommitMultiStore(db) + cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) } diff --git a/types/crypto/ethsecp256k1/keys.pb.go b/types/crypto/ethsecp256k1/keys.pb.go index ea7d6ef1dd..a4d136df75 100644 --- a/types/crypto/ethsecp256k1/keys.pb.go +++ b/types/crypto/ethsecp256k1/keys.pb.go @@ -137,8 +137,8 @@ var fileDescriptor_0c10cadcf35beb64 = []byte{ 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x56, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x29, 0xa9, 0xc5, 0xb9, 0xf9, 0xc5, 0xba, 0x39, 0x89, 0x49, 0xc5, 0x50, - 0xb6, 0x7e, 0x99, 0xa9, 0x7e, 0x49, 0x65, 0x41, 0x6a, 0x31, 0xcc, 0x6b, 0xc8, 0x4e, 0x4d, 0x62, - 0x03, 0xbb, 0xcd, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xff, 0xac, 0x44, 0x1a, 0x02, 0x01, 0x00, + 0xb6, 0x7e, 0x99, 0x99, 0x7e, 0x49, 0x65, 0x41, 0x6a, 0x31, 0xcc, 0x6b, 0xc8, 0x4e, 0x4d, 0x62, + 0x03, 0xbb, 0xcd, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x92, 0x97, 0x91, 0x02, 0x01, 0x00, 0x00, } diff --git a/x/commons/wasm.go b/x/commons/wasm.go index d5c1f63981..a9de8731cc 100644 --- a/x/commons/wasm.go +++ b/x/commons/wasm.go @@ -10,8 +10,13 @@ import ( "github.com/cosmos/cosmos-sdk/codec" ) +type WasmMsg interface { + sdk.Msg + sdk.HasValidateBasic +} + // HandleWasmMsg deserialises the given sdk.Msg and checks whether it is valid or not -func HandleWasmMsg(cdc codec.Codec, data json.RawMessage, msg sdk.Msg) ([]sdk.Msg, error) { +func HandleWasmMsg(cdc codec.Codec, data json.RawMessage, msg WasmMsg) ([]sdk.Msg, error) { err := cdc.UnmarshalJSON(data, msg) if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) diff --git a/x/oracle/types/oracle.pb.go b/x/oracle/types/oracle.pb.go index 336dc8e412..5812f63541 100644 --- a/x/oracle/types/oracle.pb.go +++ b/x/oracle/types/oracle.pb.go @@ -1563,113 +1563,113 @@ var fileDescriptor_652b57db11528d07 = []byte{ // 1737 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xcb, 0x6f, 0x23, 0x49, 0x19, 0x4f, 0xdb, 0x4e, 0x62, 0x7f, 0x76, 0x5e, 0x35, 0x99, 0x8c, 0xc7, 0xbb, 0xd8, 0x21, 0x5a, - 0xd0, 0x30, 0x02, 0x9b, 0x0c, 0x0f, 0x31, 0xb3, 0x3c, 0x14, 0x3b, 0x9e, 0xc5, 0x28, 0x9a, 0xb1, - 0xca, 0xc9, 0x08, 0x21, 0xa1, 0x56, 0xb9, 0xbb, 0xe2, 0x94, 0xd2, 0x2f, 0xaa, 0xda, 0x89, 0xb3, - 0x37, 0x6e, 0x68, 0x4f, 0x7b, 0x41, 0xe2, 0xc0, 0x4a, 0x2b, 0xed, 0x8d, 0x2b, 0xe2, 0x1f, 0xe0, - 0x34, 0x37, 0xf6, 0x84, 0x38, 0x79, 0x91, 0xe7, 0x02, 0x7f, 0x00, 0x17, 0xb8, 0xa0, 0x7a, 0xb4, - 0xdb, 0x36, 0x5e, 0x86, 0x99, 0x05, 0x0e, 0x7b, 0x72, 0x7f, 0xaf, 0xea, 0xaf, 0xbe, 0xef, 0xf7, - 0x3d, 0xda, 0xb0, 0x17, 0x72, 0xe2, 0x78, 0xb4, 0x71, 0x75, 0xd8, 0xd0, 0x4f, 0xf5, 0x88, 0x87, - 0x71, 0x88, 0x0a, 0x86, 0xba, 0x3a, 0xac, 0xec, 0x0e, 0xc2, 0x41, 0xa8, 0xb8, 0x0d, 0xf9, 0xa4, - 0x15, 0x2a, 0xb5, 0x41, 0x18, 0x0e, 0x3c, 0xda, 0x50, 0x54, 0x7f, 0x78, 0xde, 0x88, 0x99, 0x4f, - 0x45, 0x4c, 0xfc, 0xc8, 0x28, 0x54, 0x9d, 0x50, 0xf8, 0xa1, 0x68, 0xf4, 0x89, 0x90, 0xc7, 0xf7, - 0x69, 0x4c, 0x0e, 0x1b, 0x4e, 0xc8, 0x02, 0x2d, 0x3f, 0xf8, 0x9b, 0x05, 0x70, 0x4c, 0x62, 0xd2, - 0x0b, 0x87, 0xdc, 0xa1, 0x68, 0x17, 0x56, 0xc3, 0xeb, 0x80, 0xf2, 0xb2, 0xb5, 0x6f, 0xdd, 0x2b, - 0x60, 0x4d, 0x20, 0x04, 0xb9, 0x80, 0xf8, 0xb4, 0x9c, 0x51, 0x4c, 0xf5, 0x8c, 0xf6, 0xa1, 0xe8, - 0x52, 0xe1, 0x70, 0x16, 0xc5, 0x2c, 0x0c, 0xca, 0x59, 0x25, 0x9a, 0x65, 0xa1, 0x0a, 0xe4, 0xcf, - 0x99, 0x47, 0x95, 0x65, 0x4e, 0x89, 0xa7, 0xb4, 0x94, 0xc5, 0x9c, 0x12, 0x31, 0xe4, 0x37, 0xe5, - 0x55, 0x2d, 0x4b, 0x68, 0xf4, 0x53, 0xc8, 0x9e, 0x53, 0x5a, 0x5e, 0xdb, 0xcf, 0xde, 0x2b, 0x3e, - 0xb8, 0x5b, 0xd7, 0x17, 0xa8, 0xcb, 0x0b, 0xd4, 0xcd, 0x05, 0xea, 0xad, 0x90, 0x05, 0xcd, 0xaf, - 0x3f, 0x1f, 0xd7, 0x56, 0x7e, 0xf3, 0x49, 0xed, 0xde, 0x80, 0xc5, 0x17, 0xc3, 0x7e, 0xdd, 0x09, - 0xfd, 0x86, 0xb9, 0xad, 0xfe, 0xf9, 0x9a, 0x70, 0x2f, 0x1b, 0xf1, 0x4d, 0x44, 0x85, 0x32, 0x10, - 0x58, 0x9e, 0xfb, 0x28, 0xf7, 0x97, 0x0f, 0x6b, 0xd6, 0xc1, 0x1f, 0x2c, 0x28, 0x3d, 0x55, 0xc1, - 0xed, 0x29, 0x87, 0xff, 0x6f, 0x37, 0xdf, 0x83, 0x35, 0xe1, 0x5c, 0x50, 0x9f, 0x98, 0x7b, 0x1b, - 0x0a, 0x3d, 0x84, 0x2d, 0xa1, 0x72, 0x60, 0x3b, 0xa1, 0x4b, 0xed, 0x21, 0xf7, 0xca, 0x6b, 0x52, - 0xa1, 0xb9, 0x33, 0x19, 0xd7, 0x36, 0x74, 0x7a, 0x5a, 0xa1, 0x4b, 0xcf, 0xf0, 0x09, 0xde, 0x10, - 0x29, 0xc9, 0x3d, 0x73, 0xa3, 0xdf, 0x59, 0x00, 0x98, 0x5c, 0x63, 0xfa, 0xb3, 0x21, 0x15, 0x31, - 0xfa, 0x1e, 0x14, 0xe9, 0x28, 0xa6, 0x3c, 0x20, 0x9e, 0xcd, 0x5c, 0x75, 0xab, 0x5c, 0xf3, 0xcd, - 0xc9, 0xb8, 0x06, 0x6d, 0xc3, 0xee, 0x1c, 0xff, 0x7d, 0x8e, 0xc2, 0x90, 0x18, 0x74, 0x5c, 0xf4, - 0x18, 0x36, 0x5d, 0x12, 0x13, 0xdb, 0xf8, 0xc4, 0x5c, 0x15, 0x82, 0x5c, 0x73, 0x7f, 0x32, 0xae, - 0x95, 0x52, 0xc0, 0xa8, 0x33, 0xe6, 0x68, 0x5c, 0x72, 0x53, 0xca, 0x95, 0xa1, 0x70, 0x88, 0xe7, - 0x49, 0x9e, 0x8a, 0x54, 0x09, 0x4f, 0x69, 0xe3, 0xf7, 0xcf, 0x2d, 0x28, 0x28, 0xbf, 0xa3, 0x90, - 0x7f, 0x66, 0xb7, 0xdf, 0x80, 0x02, 0x1d, 0xb1, 0x58, 0xc5, 0x50, 0x79, 0xbc, 0x81, 0xf3, 0x92, - 0x21, 0x43, 0x25, 0x93, 0x39, 0xe3, 0x47, 0x6e, 0xc6, 0x87, 0xbf, 0x66, 0x61, 0x3d, 0x09, 0xdc, - 0x13, 0xd8, 0xd6, 0x55, 0x67, 0xeb, 0x84, 0xa6, 0x6e, 0xbc, 0x35, 0x19, 0xd7, 0x36, 0x67, 0x41, - 0xa3, 0x5c, 0x59, 0xe0, 0xe0, 0xcd, 0x70, 0x96, 0x9e, 0x8f, 0x40, 0x66, 0x3e, 0x02, 0xe8, 0x10, - 0x76, 0xb9, 0x7e, 0x2d, 0x75, 0xed, 0x2b, 0xe2, 0x31, 0x97, 0xc4, 0x21, 0x17, 0xe5, 0xec, 0x7e, - 0xf6, 0x5e, 0x01, 0xdf, 0x9a, 0xca, 0x9e, 0x4d, 0x45, 0xf2, 0x86, 0x3e, 0x0b, 0x6c, 0x27, 0x1c, - 0x06, 0xb1, 0x02, 0x57, 0x0e, 0xe7, 0x7d, 0x16, 0xb4, 0x24, 0x8d, 0xbe, 0x04, 0x9b, 0xc6, 0xc6, - 0xbe, 0xa0, 0x6c, 0x70, 0x11, 0x2b, 0x90, 0x65, 0xf1, 0x86, 0xe1, 0xfe, 0x50, 0x31, 0xd1, 0x17, - 0xa1, 0x94, 0xa8, 0xc9, 0x7e, 0xa1, 0x80, 0x96, 0xc5, 0x45, 0xc3, 0x3b, 0x65, 0x3e, 0x45, 0x5f, - 0x81, 0x82, 0xe3, 0x31, 0x1a, 0xa8, 0xeb, 0xaf, 0x2b, 0x20, 0x96, 0x26, 0xe3, 0x5a, 0xbe, 0xa5, - 0x98, 0x9d, 0x63, 0x9c, 0xd7, 0xe2, 0x8e, 0x8b, 0xbe, 0x0f, 0x25, 0x4e, 0xae, 0x6d, 0x63, 0x2d, - 0xca, 0x79, 0x55, 0xb8, 0xb7, 0xeb, 0xd3, 0xde, 0x55, 0x4f, 0x61, 0xd9, 0xcc, 0xc9, 0xa2, 0xc5, - 0x45, 0x3e, 0xe5, 0x08, 0xf4, 0x18, 0x8a, 0xac, 0xef, 0xd8, 0xce, 0x05, 0x09, 0x02, 0xea, 0x95, - 0x0b, 0xfb, 0xd6, 0x82, 0x79, 0xa7, 0xd9, 0x6a, 0x69, 0x61, 0x73, 0x53, 0x22, 0x21, 0xa5, 0x31, - 0xb0, 0xbe, 0x63, 0x9e, 0x51, 0x4d, 0x42, 0x87, 0x3a, 0xc3, 0x98, 0xda, 0x03, 0x22, 0xca, 0xa0, - 0x62, 0x03, 0x86, 0xf5, 0x0e, 0x11, 0x26, 0xd7, 0xbf, 0xb4, 0x60, 0xcd, 0x80, 0xed, 0x4d, 0x28, - 0x4c, 0x83, 0x6e, 0xea, 0x3e, 0x65, 0xa0, 0xfb, 0xb0, 0xc3, 0x02, 0xbb, 0x4f, 0xcf, 0x43, 0x4e, - 0x6d, 0x4e, 0x45, 0xe8, 0x5d, 0x69, 0x4c, 0xe5, 0xf1, 0x16, 0x0b, 0x9a, 0x8a, 0x8f, 0x35, 0x1b, - 0xbd, 0x0d, 0x45, 0x1d, 0x03, 0x79, 0xae, 0xce, 0x5f, 0xf1, 0xc1, 0xee, 0x62, 0x08, 0xa4, 0xd0, - 0x44, 0x00, 0x78, 0xc2, 0x48, 0xfc, 0xfa, 0x75, 0x16, 0xee, 0x68, 0x28, 0x99, 0xc8, 0x74, 0x89, - 0x73, 0x49, 0x63, 0x59, 0x5b, 0xf3, 0xd9, 0xb0, 0xfe, 0x6d, 0x36, 0x96, 0xc1, 0x37, 0xf3, 0x5f, - 0x82, 0xef, 0x42, 0x01, 0x4b, 0x2c, 0x12, 0x71, 0x39, 0x8f, 0x45, 0x22, 0x2e, 0x35, 0x16, 0xe7, - 0x80, 0xba, 0xba, 0x00, 0xd4, 0x0b, 0x28, 0x9c, 0x53, 0x6a, 0x7b, 0xcc, 0x67, 0xf1, 0xff, 0xa2, - 0xd3, 0xe7, 0xcf, 0x29, 0x3d, 0x91, 0x87, 0x4b, 0x54, 0x44, 0x9c, 0x46, 0x84, 0x6b, 0x54, 0xac, - 0x6b, 0x54, 0x18, 0xd6, 0x3b, 0x44, 0x2c, 0xc2, 0x26, 0xff, 0x29, 0xb0, 0xa1, 0x70, 0xb0, 0x24, - 0x3b, 0x47, 0xce, 0x65, 0x10, 0x5e, 0x7b, 0xd4, 0x1d, 0x50, 0x9f, 0x06, 0x31, 0x7a, 0x08, 0x90, - 0x54, 0xd6, 0xb4, 0x6d, 0x54, 0x26, 0xe3, 0x5a, 0xc1, 0x58, 0xa9, 0x90, 0xa7, 0x04, 0x2e, 0x18, - 0xed, 0x8e, 0x6b, 0x5e, 0xf3, 0xfb, 0x0c, 0x94, 0x93, 0xf7, 0x88, 0x28, 0x0c, 0x04, 0x7d, 0x3d, - 0x18, 0xcc, 0x3b, 0x92, 0x79, 0x05, 0x47, 0x54, 0x56, 0x03, 0x61, 0x12, 0x97, 0x35, 0x59, 0x0d, - 0x84, 0x4e, 0xdc, 0x62, 0xeb, 0xc8, 0xfd, 0x6b, 0xeb, 0x50, 0x2a, 0xaa, 0x2c, 0xb4, 0xca, 0x6a, - 0xa2, 0xa2, 0x78, 0x4a, 0xe5, 0x07, 0xb2, 0x4f, 0x69, 0x15, 0x11, 0x93, 0x78, 0x28, 0x54, 0x0b, - 0xda, 0x7c, 0x50, 0x9e, 0xad, 0x18, 0xad, 0xd0, 0x53, 0x72, 0xd9, 0xc1, 0x66, 0x48, 0x39, 0x45, - 0x39, 0x15, 0x43, 0x2f, 0x56, 0x09, 0x2d, 0x61, 0x43, 0x99, 0x20, 0xfe, 0x31, 0x2b, 0x4b, 0x5c, - 0x32, 0x3e, 0x7f, 0x95, 0x33, 0x9f, 0xd8, 0xb5, 0xd7, 0x4e, 0xec, 0xfa, 0x4b, 0x12, 0x9b, 0x7f, - 0x79, 0x62, 0x0b, 0xff, 0x49, 0x62, 0xe1, 0x75, 0x13, 0x5b, 0x5c, 0x92, 0xd8, 0x08, 0xb6, 0xa6, - 0xa3, 0xd0, 0x18, 0xbc, 0x01, 0x05, 0x26, 0x6c, 0xe2, 0xc4, 0xec, 0x8a, 0xaa, 0x04, 0xe7, 0x71, - 0x9e, 0x89, 0x23, 0x45, 0xa3, 0x47, 0xb0, 0x2a, 0x58, 0xe0, 0xe8, 0xb6, 0x5d, 0x7c, 0x50, 0xa9, - 0xeb, 0x75, 0xb9, 0x9e, 0xac, 0xcb, 0xf5, 0xd3, 0x64, 0x5d, 0x6e, 0xe6, 0x65, 0x8f, 0x79, 0xff, - 0x93, 0x9a, 0x85, 0xb5, 0x89, 0x79, 0xe3, 0x11, 0x6c, 0xe9, 0xb3, 0xa6, 0xef, 0x45, 0x65, 0x58, - 0x27, 0xae, 0xcb, 0xa9, 0x10, 0x66, 0x66, 0x24, 0xa4, 0xdc, 0x21, 0xa3, 0xf0, 0x9a, 0x72, 0x0d, - 0x1b, 0xac, 0x89, 0x83, 0xe7, 0x39, 0x58, 0xeb, 0x12, 0x4e, 0x7c, 0x81, 0x0e, 0xe1, 0xb6, 0x4f, - 0x46, 0xf6, 0xcc, 0xb8, 0x34, 0xd9, 0x50, 0x9d, 0x02, 0x23, 0x9f, 0x8c, 0xd2, 0x59, 0xa9, 0xf3, - 0x72, 0x00, 0x1b, 0xd2, 0x24, 0x45, 0x8b, 0x3e, 0xbb, 0xe8, 0x93, 0xd1, 0x51, 0x02, 0x98, 0xfb, - 0xb0, 0x23, 0x75, 0x12, 0x74, 0xd9, 0x82, 0xbd, 0x4b, 0x4d, 0xe5, 0x6e, 0xf9, 0x64, 0xd4, 0x32, - 0xfc, 0x1e, 0x7b, 0x97, 0xa2, 0x06, 0xec, 0x2a, 0x17, 0xd4, 0xec, 0xb1, 0x53, 0x75, 0x0d, 0x42, - 0x79, 0x8e, 0x1e, 0x4b, 0xc7, 0x89, 0xc1, 0x37, 0x61, 0x8f, 0x8e, 0x22, 0xc6, 0x89, 0x5c, 0x6d, - 0xed, 0xbe, 0x17, 0x3a, 0x97, 0x73, 0xd0, 0xdc, 0x4d, 0xa5, 0x4d, 0x29, 0xd4, 0x2e, 0xbd, 0x05, - 0x9b, 0xb2, 0x8f, 0xdb, 0xe1, 0x35, 0x11, 0xbe, 0x6a, 0xac, 0x0a, 0xaa, 0xb8, 0x24, 0xb9, 0x4f, - 0x25, 0x53, 0xf6, 0xde, 0x87, 0x70, 0x37, 0xa2, 0x3c, 0xdd, 0x7c, 0xa6, 0x51, 0x49, 0x5b, 0xf5, - 0x5e, 0x44, 0xf9, 0x34, 0xf6, 0x26, 0x32, 0xd2, 0xf4, 0xab, 0x80, 0x04, 0xf1, 0x23, 0x8f, 0x05, - 0x03, 0x3b, 0xe6, 0x37, 0xc6, 0x25, 0xdd, 0xbd, 0xb7, 0x13, 0xc9, 0x29, 0xbf, 0xd1, 0xee, 0x7c, - 0x07, 0xca, 0xa6, 0xb6, 0x39, 0xbd, 0x26, 0xdc, 0xb5, 0x23, 0xca, 0x1d, 0x1a, 0xc4, 0x64, 0xa0, - 0x61, 0x9c, 0xc3, 0xe6, 0x13, 0x0c, 0x2b, 0x71, 0x77, 0x2a, 0x45, 0x8f, 0xe0, 0x2e, 0x0b, 0x34, - 0xbc, 0xec, 0x88, 0x06, 0xc4, 0x8b, 0x6f, 0x6c, 0x77, 0xa8, 0xef, 0x6b, 0x76, 0x8c, 0x3b, 0x89, - 0x42, 0x57, 0xcb, 0x8f, 0x8d, 0x18, 0xb5, 0xe1, 0x96, 0xdc, 0x6c, 0x92, 0x4b, 0xd1, 0x80, 0xf4, - 0x3d, 0xea, 0x2a, 0x64, 0xe7, 0x9b, 0xb7, 0x27, 0xe3, 0xda, 0x4e, 0xa7, 0xd9, 0x32, 0x77, 0x6a, - 0x6b, 0x21, 0xde, 0x61, 0x7d, 0x67, 0x9e, 0xf5, 0x28, 0xff, 0xab, 0x0f, 0x6b, 0x2b, 0x0a, 0x8d, - 0x6f, 0x03, 0xea, 0xd2, 0xc0, 0x65, 0xc1, 0xc0, 0x14, 0xd1, 0x09, 0x13, 0x6a, 0xc4, 0xa5, 0x2d, - 0x41, 0x82, 0x32, 0x2b, 0x27, 0xd8, 0xb4, 0xee, 0x93, 0x09, 0xf6, 0x23, 0x98, 0xd9, 0x9c, 0xd0, - 0x1d, 0x58, 0x57, 0x08, 0x48, 0xda, 0x22, 0x5e, 0x93, 0x64, 0xc7, 0x45, 0x5f, 0x00, 0x30, 0xab, - 0x58, 0xd2, 0x00, 0x0b, 0xb8, 0x60, 0x38, 0xd3, 0x31, 0xf5, 0x51, 0x06, 0x6e, 0x19, 0x2f, 0x9f, - 0x51, 0xce, 0xce, 0x99, 0xa3, 0x6f, 0xfc, 0x65, 0xc8, 0x3b, 0x17, 0x84, 0x05, 0x69, 0xb7, 0x2d, - 0x4e, 0xc6, 0xb5, 0xf5, 0x96, 0xe4, 0x75, 0x8e, 0xf1, 0xba, 0x12, 0x76, 0xdc, 0xf9, 0xcd, 0x2b, - 0xb3, 0xb8, 0x79, 0xcd, 0xf7, 0xb8, 0xec, 0xab, 0xf4, 0xb8, 0x85, 0xef, 0x87, 0xdc, 0x67, 0xfe, - 0xec, 0x59, 0x7d, 0x9d, 0xcf, 0x1e, 0x13, 0xa5, 0xdf, 0x5a, 0x50, 0xec, 0x72, 0xe6, 0x50, 0x33, - 0x8c, 0xe4, 0xb7, 0xdf, 0x8d, 0xdf, 0x0f, 0xbd, 0x24, 0xe4, 0x9a, 0x42, 0x55, 0x00, 0x7f, 0xe8, - 0xc5, 0x2c, 0xf2, 0xd8, 0xb4, 0x79, 0xcc, 0x70, 0xd0, 0x26, 0x64, 0xa2, 0x91, 0x29, 0xe8, 0x4c, - 0x34, 0x5a, 0x88, 0x4f, 0xee, 0x55, 0xe2, 0xf3, 0xf2, 0xe1, 0x7c, 0xff, 0x1f, 0x16, 0x6c, 0xcc, - 0xf5, 0x68, 0xf4, 0x5d, 0xa8, 0xe1, 0x76, 0xef, 0xe9, 0xc9, 0xb3, 0xb6, 0xdd, 0x3b, 0x3d, 0x3a, - 0x3d, 0xeb, 0xd9, 0x4f, 0xbb, 0xed, 0x27, 0xf6, 0xd9, 0x93, 0x5e, 0xb7, 0xdd, 0xea, 0x3c, 0xee, - 0xb4, 0x8f, 0xb7, 0x57, 0x2a, 0x77, 0xde, 0xfb, 0x60, 0xff, 0xd6, 0x12, 0x35, 0xf4, 0x6d, 0xd8, - 0x5b, 0x60, 0xf7, 0xce, 0x5a, 0xad, 0x76, 0xaf, 0xb7, 0x6d, 0x55, 0x2a, 0xef, 0x7d, 0xb0, 0xff, - 0x29, 0xd2, 0x25, 0x76, 0x8f, 0x8f, 0x3a, 0x27, 0x67, 0xb8, 0xbd, 0x9d, 0x59, 0x6a, 0x67, 0xa4, - 0x4b, 0xec, 0xda, 0x3f, 0xee, 0x76, 0x70, 0xfb, 0x78, 0x3b, 0xbb, 0xd4, 0xce, 0x48, 0x2b, 0xb9, - 0x5f, 0x7c, 0x54, 0x5d, 0x69, 0x76, 0x9e, 0x4f, 0xaa, 0xd6, 0xc7, 0x93, 0xaa, 0xf5, 0xe7, 0x49, - 0xd5, 0x7a, 0xff, 0x45, 0x75, 0xe5, 0xe3, 0x17, 0xd5, 0x95, 0x3f, 0xbd, 0xa8, 0xae, 0xfc, 0xa4, - 0x31, 0xb3, 0x7d, 0xba, 0x54, 0xad, 0x9d, 0x1e, 0xe9, 0x0b, 0xf3, 0xdc, 0xb8, 0xfa, 0x56, 0x63, - 0x64, 0xfe, 0xbd, 0xd1, 0xab, 0x68, 0x7f, 0x4d, 0x8d, 0x99, 0x6f, 0xfc, 0x33, 0x00, 0x00, 0xff, - 0xff, 0xe5, 0xd2, 0x61, 0x37, 0xde, 0x11, 0x00, 0x00, + 0xd0, 0x30, 0x02, 0x9b, 0x0c, 0x68, 0xc5, 0xcc, 0xf2, 0x50, 0xec, 0x78, 0x16, 0xa3, 0x68, 0xc6, + 0x2a, 0x27, 0x23, 0x84, 0x84, 0x5a, 0xe5, 0xee, 0x8a, 0x53, 0x4a, 0xbf, 0xa8, 0x6a, 0x27, 0xce, + 0xde, 0xb8, 0xa1, 0x3d, 0xed, 0x05, 0x89, 0x03, 0x2b, 0xad, 0xb4, 0x37, 0xae, 0x88, 0x7f, 0x80, + 0xd3, 0xdc, 0xd8, 0x13, 0xe2, 0xe4, 0x45, 0x9e, 0x0b, 0xfc, 0x01, 0x5c, 0xe0, 0x82, 0xea, 0xd1, + 0x6e, 0xdb, 0x78, 0x19, 0x66, 0x16, 0x38, 0xec, 0xc9, 0xfd, 0xbd, 0xaa, 0xbf, 0xfa, 0xbe, 0xdf, + 0xf7, 0x68, 0xc3, 0x5e, 0xc8, 0x89, 0xe3, 0xd1, 0xc6, 0xd5, 0x61, 0x43, 0x3f, 0xd5, 0x23, 0x1e, + 0xc6, 0x21, 0x2a, 0x18, 0xea, 0xea, 0xb0, 0xb2, 0x3b, 0x08, 0x07, 0xa1, 0xe2, 0x36, 0xe4, 0x93, + 0x56, 0xa8, 0xd4, 0x06, 0x61, 0x38, 0xf0, 0x68, 0x43, 0x51, 0xfd, 0xe1, 0x79, 0x23, 0x66, 0x3e, + 0x15, 0x31, 0xf1, 0x23, 0xa3, 0x50, 0x75, 0x42, 0xe1, 0x87, 0xa2, 0xd1, 0x27, 0x42, 0x1e, 0xdf, + 0xa7, 0x31, 0x39, 0x6c, 0x38, 0x21, 0x0b, 0xb4, 0xfc, 0xe0, 0x6f, 0x16, 0xc0, 0x31, 0x89, 0x49, + 0x2f, 0x1c, 0x72, 0x87, 0xa2, 0x5d, 0x58, 0x0d, 0xaf, 0x03, 0xca, 0xcb, 0xd6, 0xbe, 0x75, 0xaf, + 0x80, 0x35, 0x81, 0x10, 0xe4, 0x02, 0xe2, 0xd3, 0x72, 0x46, 0x31, 0xd5, 0x33, 0xda, 0x87, 0xa2, + 0x4b, 0x85, 0xc3, 0x59, 0x14, 0xb3, 0x30, 0x28, 0x67, 0x95, 0x68, 0x96, 0x85, 0x2a, 0x90, 0x3f, + 0x67, 0x1e, 0x55, 0x96, 0x39, 0x25, 0x9e, 0xd2, 0x52, 0x16, 0x73, 0x4a, 0xc4, 0x90, 0xdf, 0x94, + 0x57, 0xb5, 0x2c, 0xa1, 0xd1, 0x4f, 0x21, 0x7b, 0x4e, 0x69, 0x79, 0x6d, 0x3f, 0x7b, 0xaf, 0xf8, + 0xe0, 0x6e, 0x5d, 0x5f, 0xa0, 0x2e, 0x2f, 0x50, 0x37, 0x17, 0xa8, 0xb7, 0x42, 0x16, 0x34, 0xbf, + 0xf9, 0x7c, 0x5c, 0x5b, 0xf9, 0xcd, 0xa7, 0xb5, 0x7b, 0x03, 0x16, 0x5f, 0x0c, 0xfb, 0x75, 0x27, + 0xf4, 0x1b, 0xe6, 0xb6, 0xfa, 0xe7, 0x1b, 0xc2, 0xbd, 0x6c, 0xc4, 0x37, 0x11, 0x15, 0xca, 0x40, + 0x60, 0x79, 0xee, 0xa3, 0xdc, 0x5f, 0x3e, 0xaa, 0x59, 0x07, 0x7f, 0xb0, 0xa0, 0xf4, 0x54, 0x05, + 0xb7, 0xa7, 0x1c, 0xfe, 0xbf, 0xdd, 0x7c, 0x0f, 0xd6, 0x84, 0x73, 0x41, 0x7d, 0x62, 0xee, 0x6d, + 0x28, 0xf4, 0x10, 0xb6, 0x84, 0xca, 0x81, 0xed, 0x84, 0x2e, 0xb5, 0x87, 0xdc, 0x2b, 0xaf, 0x49, + 0x85, 0xe6, 0xce, 0x64, 0x5c, 0xdb, 0xd0, 0xe9, 0x69, 0x85, 0x2e, 0x3d, 0xc3, 0x27, 0x78, 0x43, + 0xa4, 0x24, 0xf7, 0xcc, 0x8d, 0x7e, 0x67, 0x01, 0x60, 0x72, 0x8d, 0xe9, 0xcf, 0x86, 0x54, 0xc4, + 0xe8, 0x7b, 0x50, 0xa4, 0xa3, 0x98, 0xf2, 0x80, 0x78, 0x36, 0x73, 0xd5, 0xad, 0x72, 0xcd, 0x37, + 0x27, 0xe3, 0x1a, 0xb4, 0x0d, 0xbb, 0x73, 0xfc, 0xf7, 0x39, 0x0a, 0x43, 0x62, 0xd0, 0x71, 0xd1, + 0x63, 0xd8, 0x74, 0x49, 0x4c, 0x6c, 0xe3, 0x13, 0x73, 0x55, 0x08, 0x72, 0xcd, 0xfd, 0xc9, 0xb8, + 0x56, 0x4a, 0x01, 0xa3, 0xce, 0x98, 0xa3, 0x71, 0xc9, 0x4d, 0x29, 0x57, 0x86, 0xc2, 0x21, 0x9e, + 0x27, 0x79, 0x2a, 0x52, 0x25, 0x3c, 0xa5, 0x8d, 0xdf, 0x3f, 0xb7, 0xa0, 0xa0, 0xfc, 0x8e, 0x42, + 0xfe, 0xb9, 0xdd, 0x7e, 0x03, 0x0a, 0x74, 0xc4, 0x62, 0x15, 0x43, 0xe5, 0xf1, 0x06, 0xce, 0x4b, + 0x86, 0x0c, 0x95, 0x4c, 0xe6, 0x8c, 0x1f, 0xb9, 0x19, 0x1f, 0xfe, 0x9a, 0x85, 0xf5, 0x24, 0x70, + 0x4f, 0x60, 0x5b, 0x57, 0x9d, 0xad, 0x13, 0x9a, 0xba, 0xf1, 0xd6, 0x64, 0x5c, 0xdb, 0x9c, 0x05, + 0x8d, 0x72, 0x65, 0x81, 0x83, 0x37, 0xc3, 0x59, 0x7a, 0x3e, 0x02, 0x99, 0xf9, 0x08, 0xa0, 0x43, + 0xd8, 0xe5, 0xfa, 0xb5, 0xd4, 0xb5, 0xaf, 0x88, 0xc7, 0x5c, 0x12, 0x87, 0x5c, 0x94, 0xb3, 0xfb, + 0xd9, 0x7b, 0x05, 0x7c, 0x6b, 0x2a, 0x7b, 0x36, 0x15, 0xc9, 0x1b, 0xfa, 0x2c, 0xb0, 0x9d, 0x70, + 0x18, 0xc4, 0x0a, 0x5c, 0x39, 0x9c, 0xf7, 0x59, 0xd0, 0x92, 0x34, 0xfa, 0x0a, 0x6c, 0x1a, 0x1b, + 0xfb, 0x82, 0xb2, 0xc1, 0x45, 0xac, 0x40, 0x96, 0xc5, 0x1b, 0x86, 0xfb, 0x43, 0xc5, 0x44, 0x5f, + 0x86, 0x52, 0xa2, 0x26, 0xfb, 0x85, 0x02, 0x5a, 0x16, 0x17, 0x0d, 0xef, 0x94, 0xf9, 0x14, 0x7d, + 0x0d, 0x0a, 0x8e, 0xc7, 0x68, 0xa0, 0xae, 0xbf, 0xae, 0x80, 0x58, 0x9a, 0x8c, 0x6b, 0xf9, 0x96, + 0x62, 0x76, 0x8e, 0x71, 0x5e, 0x8b, 0x3b, 0x2e, 0xfa, 0x3e, 0x94, 0x38, 0xb9, 0xb6, 0x8d, 0xb5, + 0x28, 0xe7, 0x55, 0xe1, 0xde, 0xae, 0x4f, 0x7b, 0x57, 0x3d, 0x85, 0x65, 0x33, 0x27, 0x8b, 0x16, + 0x17, 0xf9, 0x94, 0x23, 0xd0, 0x63, 0x28, 0xb2, 0xbe, 0x63, 0x3b, 0x17, 0x24, 0x08, 0xa8, 0x57, + 0x2e, 0xec, 0x5b, 0x0b, 0xe6, 0x9d, 0x66, 0xab, 0xa5, 0x85, 0xcd, 0x4d, 0x89, 0x84, 0x94, 0xc6, + 0xc0, 0xfa, 0x8e, 0x79, 0x46, 0x35, 0x09, 0x1d, 0xea, 0x0c, 0x63, 0x6a, 0x0f, 0x88, 0x28, 0x83, + 0x8a, 0x0d, 0x18, 0xd6, 0xbb, 0x44, 0x98, 0x5c, 0xff, 0xd2, 0x82, 0x35, 0x03, 0xb6, 0x37, 0xa1, + 0x30, 0x0d, 0xba, 0xa9, 0xfb, 0x94, 0x81, 0xee, 0xc3, 0x0e, 0x0b, 0xec, 0x3e, 0x3d, 0x0f, 0x39, + 0xb5, 0x39, 0x15, 0xa1, 0x77, 0xa5, 0x31, 0x95, 0xc7, 0x5b, 0x2c, 0x68, 0x2a, 0x3e, 0xd6, 0x6c, + 0xf4, 0x0e, 0x14, 0x75, 0x0c, 0xe4, 0xb9, 0x3a, 0x7f, 0xc5, 0x07, 0xbb, 0x8b, 0x21, 0x90, 0x42, + 0x13, 0x01, 0xe0, 0x09, 0x23, 0xf1, 0xeb, 0xd7, 0x59, 0xb8, 0xa3, 0xa1, 0x64, 0x22, 0xd3, 0x25, + 0xce, 0x25, 0x8d, 0x65, 0x6d, 0xcd, 0x67, 0xc3, 0xfa, 0xb7, 0xd9, 0x58, 0x06, 0xdf, 0xcc, 0x7f, + 0x09, 0xbe, 0x0b, 0x05, 0x2c, 0xb1, 0x48, 0xc4, 0xe5, 0x3c, 0x16, 0x89, 0xb8, 0xd4, 0x58, 0x9c, + 0x03, 0xea, 0xea, 0x02, 0x50, 0x2f, 0xa0, 0x70, 0x4e, 0xa9, 0xed, 0x31, 0x9f, 0xc5, 0xff, 0x8b, + 0x4e, 0x9f, 0x3f, 0xa7, 0xf4, 0x44, 0x1e, 0x2e, 0x51, 0x11, 0x71, 0x1a, 0x11, 0xae, 0x51, 0xb1, + 0xae, 0x51, 0x61, 0x58, 0xef, 0x12, 0xb1, 0x08, 0x9b, 0xfc, 0x67, 0xc0, 0x86, 0xc2, 0xc1, 0x92, + 0xec, 0x1c, 0x39, 0x97, 0x41, 0x78, 0xed, 0x51, 0x77, 0x40, 0x7d, 0x1a, 0xc4, 0xe8, 0x21, 0x40, + 0x52, 0x59, 0xd3, 0xb6, 0x51, 0x99, 0x8c, 0x6b, 0x05, 0x63, 0xa5, 0x42, 0x9e, 0x12, 0xb8, 0x60, + 0xb4, 0x3b, 0xae, 0x79, 0xcd, 0xef, 0x33, 0x50, 0x4e, 0xde, 0x23, 0xa2, 0x30, 0x10, 0xf4, 0xf5, + 0x60, 0x30, 0xef, 0x48, 0xe6, 0x15, 0x1c, 0x51, 0x59, 0x0d, 0x84, 0x49, 0x5c, 0xd6, 0x64, 0x35, + 0x10, 0x3a, 0x71, 0x8b, 0xad, 0x23, 0xf7, 0xaf, 0xad, 0x43, 0xa9, 0xa8, 0xb2, 0xd0, 0x2a, 0xab, + 0x89, 0x8a, 0xe2, 0x29, 0x95, 0x1f, 0xc8, 0x3e, 0xa5, 0x55, 0x44, 0x4c, 0xe2, 0xa1, 0x50, 0x2d, + 0x68, 0xf3, 0x41, 0x79, 0xb6, 0x62, 0xb4, 0x42, 0x4f, 0xc9, 0x65, 0x07, 0x9b, 0x21, 0xe5, 0x14, + 0xe5, 0x54, 0x0c, 0xbd, 0x58, 0x25, 0xb4, 0x84, 0x0d, 0x65, 0x82, 0xf8, 0xc7, 0xac, 0x2c, 0x71, + 0xc9, 0xf8, 0xe2, 0x55, 0xce, 0x7c, 0x62, 0xd7, 0x5e, 0x3b, 0xb1, 0xeb, 0x2f, 0x49, 0x6c, 0xfe, + 0xe5, 0x89, 0x2d, 0xfc, 0x27, 0x89, 0x85, 0xd7, 0x4d, 0x6c, 0x71, 0x49, 0x62, 0x23, 0xd8, 0x9a, + 0x8e, 0x42, 0x63, 0xf0, 0x06, 0x14, 0x98, 0xb0, 0x89, 0x13, 0xb3, 0x2b, 0xaa, 0x12, 0x9c, 0xc7, + 0x79, 0x26, 0x8e, 0x14, 0x8d, 0x1e, 0xc1, 0xaa, 0x60, 0x81, 0xa3, 0xdb, 0x76, 0xf1, 0x41, 0xa5, + 0xae, 0xd7, 0xe5, 0x7a, 0xb2, 0x2e, 0xd7, 0x4f, 0x93, 0x75, 0xb9, 0x99, 0x97, 0x3d, 0xe6, 0x83, + 0x4f, 0x6b, 0x16, 0xd6, 0x26, 0xe6, 0x8d, 0x47, 0xb0, 0xa5, 0xcf, 0x9a, 0xbe, 0x17, 0x95, 0x61, + 0x9d, 0xb8, 0x2e, 0xa7, 0x42, 0x98, 0x99, 0x91, 0x90, 0x72, 0x87, 0x8c, 0xc2, 0x6b, 0xca, 0x35, + 0x6c, 0xb0, 0x26, 0x0e, 0x9e, 0xe7, 0x60, 0xad, 0x4b, 0x38, 0xf1, 0x05, 0x3a, 0x84, 0xdb, 0x3e, + 0x19, 0xd9, 0x33, 0xe3, 0xd2, 0x64, 0x43, 0x75, 0x0a, 0x8c, 0x7c, 0x32, 0x4a, 0x67, 0xa5, 0xce, + 0xcb, 0x01, 0x6c, 0x48, 0x93, 0x14, 0x2d, 0xfa, 0xec, 0xa2, 0x4f, 0x46, 0x47, 0x09, 0x60, 0xee, + 0xc3, 0x8e, 0xd4, 0x49, 0xd0, 0x65, 0x0b, 0xf6, 0x1e, 0x35, 0x95, 0xbb, 0xe5, 0x93, 0x51, 0xcb, + 0xf0, 0x7b, 0xec, 0x3d, 0x8a, 0x1a, 0xb0, 0xab, 0x5c, 0x50, 0xb3, 0xc7, 0x4e, 0xd5, 0x35, 0x08, + 0xe5, 0x39, 0x7a, 0x2c, 0x1d, 0x27, 0x06, 0xdf, 0x86, 0x3d, 0x3a, 0x8a, 0x18, 0x27, 0x72, 0xb5, + 0xb5, 0xfb, 0x5e, 0xe8, 0x5c, 0xce, 0x41, 0x73, 0x37, 0x95, 0x36, 0xa5, 0x50, 0xbb, 0xf4, 0x16, + 0x6c, 0xca, 0x3e, 0x6e, 0x87, 0xd7, 0x44, 0xf8, 0xaa, 0xb1, 0x2a, 0xa8, 0xe2, 0x92, 0xe4, 0x3e, + 0x95, 0x4c, 0xd9, 0x7b, 0x1f, 0xc2, 0xdd, 0x88, 0xf2, 0x74, 0xf3, 0x99, 0x46, 0x25, 0x6d, 0xd5, + 0x7b, 0x11, 0xe5, 0xd3, 0xd8, 0x9b, 0xc8, 0x48, 0xd3, 0xaf, 0x03, 0x12, 0xc4, 0x8f, 0x3c, 0x16, + 0x0c, 0xec, 0x98, 0xdf, 0x18, 0x97, 0x74, 0xf7, 0xde, 0x4e, 0x24, 0xa7, 0xfc, 0x46, 0xbb, 0xf3, + 0x1d, 0x28, 0x9b, 0xda, 0xe6, 0xf4, 0x9a, 0x70, 0xd7, 0x8e, 0x28, 0x77, 0x68, 0x10, 0x93, 0x81, + 0x86, 0x71, 0x0e, 0x9b, 0x4f, 0x30, 0xac, 0xc4, 0xdd, 0xa9, 0x14, 0x3d, 0x82, 0xbb, 0x2c, 0xd0, + 0xf0, 0xb2, 0x23, 0x1a, 0x10, 0x2f, 0xbe, 0xb1, 0xdd, 0xa1, 0xbe, 0xaf, 0xd9, 0x31, 0xee, 0x24, + 0x0a, 0x5d, 0x2d, 0x3f, 0x36, 0x62, 0xd4, 0x86, 0x5b, 0x72, 0xb3, 0x49, 0x2e, 0x45, 0x03, 0xd2, + 0xf7, 0xa8, 0xab, 0x90, 0x9d, 0x6f, 0xde, 0x9e, 0x8c, 0x6b, 0x3b, 0x9d, 0x66, 0xcb, 0xdc, 0xa9, + 0xad, 0x85, 0x78, 0x87, 0xf5, 0x9d, 0x79, 0xd6, 0xa3, 0xfc, 0xaf, 0x3e, 0xaa, 0xad, 0x28, 0x34, + 0xbe, 0x03, 0xa8, 0x4b, 0x03, 0x97, 0x05, 0x03, 0x53, 0x44, 0x27, 0x4c, 0xa8, 0x11, 0x97, 0xb6, + 0x04, 0x09, 0xca, 0xac, 0x9c, 0x60, 0xd3, 0xba, 0x4f, 0x26, 0xd8, 0x8f, 0x60, 0x66, 0x73, 0x42, + 0x77, 0x60, 0x5d, 0x21, 0x20, 0x69, 0x8b, 0x78, 0x4d, 0x92, 0x1d, 0x17, 0x7d, 0x09, 0xc0, 0xac, + 0x62, 0x49, 0x03, 0x2c, 0xe0, 0x82, 0xe1, 0x4c, 0xc7, 0xd4, 0xc7, 0x19, 0xb8, 0x65, 0xbc, 0x7c, + 0x46, 0x39, 0x3b, 0x67, 0x8e, 0xbe, 0xf1, 0x57, 0x21, 0xef, 0x5c, 0x10, 0x16, 0xa4, 0xdd, 0xb6, + 0x38, 0x19, 0xd7, 0xd6, 0x5b, 0x92, 0xd7, 0x39, 0xc6, 0xeb, 0x4a, 0xd8, 0x71, 0xe7, 0x37, 0xaf, + 0xcc, 0xe2, 0xe6, 0x35, 0xdf, 0xe3, 0xb2, 0xaf, 0xd2, 0xe3, 0x16, 0xbe, 0x1f, 0x72, 0x9f, 0xfb, + 0xb3, 0x67, 0xf5, 0x75, 0x3e, 0x7b, 0x4c, 0x94, 0x7e, 0x6b, 0x41, 0xb1, 0xcb, 0x99, 0x43, 0xcd, + 0x30, 0x92, 0xdf, 0x7e, 0x37, 0x7e, 0x3f, 0xf4, 0x92, 0x90, 0x6b, 0x0a, 0x55, 0x01, 0xfc, 0xa1, + 0x17, 0xb3, 0xc8, 0x63, 0xd3, 0xe6, 0x31, 0xc3, 0x41, 0x9b, 0x90, 0x89, 0x46, 0xa6, 0xa0, 0x33, + 0xd1, 0x68, 0x21, 0x3e, 0xb9, 0x57, 0x89, 0xcf, 0xcb, 0x87, 0xf3, 0xfd, 0x7f, 0x58, 0xb0, 0x31, + 0xd7, 0xa3, 0xd1, 0x77, 0xa1, 0x86, 0xdb, 0xbd, 0xa7, 0x27, 0xcf, 0xda, 0x76, 0xef, 0xf4, 0xe8, + 0xf4, 0xac, 0x67, 0x3f, 0xed, 0xb6, 0x9f, 0xd8, 0x67, 0x4f, 0x7a, 0xdd, 0x76, 0xab, 0xf3, 0xb8, + 0xd3, 0x3e, 0xde, 0x5e, 0xa9, 0xdc, 0x79, 0xff, 0xc3, 0xfd, 0x5b, 0x4b, 0xd4, 0xd0, 0xdb, 0xb0, + 0xb7, 0xc0, 0xee, 0x9d, 0xb5, 0x5a, 0xed, 0x5e, 0x6f, 0xdb, 0xaa, 0x54, 0xde, 0xff, 0x70, 0xff, + 0x33, 0xa4, 0x4b, 0xec, 0x1e, 0x1f, 0x75, 0x4e, 0xce, 0x70, 0x7b, 0x3b, 0xb3, 0xd4, 0xce, 0x48, + 0x97, 0xd8, 0xb5, 0x7f, 0xdc, 0xed, 0xe0, 0xf6, 0xf1, 0x76, 0x76, 0xa9, 0x9d, 0x91, 0x56, 0x72, + 0xbf, 0xf8, 0xb8, 0xba, 0xd2, 0xec, 0x3c, 0x9f, 0x54, 0xad, 0x4f, 0x26, 0x55, 0xeb, 0xcf, 0x93, + 0xaa, 0xf5, 0xc1, 0x8b, 0xea, 0xca, 0x27, 0x2f, 0xaa, 0x2b, 0x7f, 0x7a, 0x51, 0x5d, 0xf9, 0x49, + 0x63, 0x66, 0xfb, 0x74, 0xa9, 0x5a, 0x3b, 0x3d, 0xd2, 0x17, 0xe6, 0xb9, 0x71, 0xf5, 0x76, 0x63, + 0x64, 0xfe, 0xbd, 0xd1, 0xab, 0x68, 0x7f, 0x4d, 0x8d, 0x99, 0x6f, 0xfd, 0x33, 0x00, 0x00, 0xff, + 0xff, 0xcd, 0x7b, 0x7f, 0x6f, 0xde, 0x11, 0x00, 0x00, } func (this *DataSource) Equal(that interface{}) bool { diff --git a/x/posts/abci_test.go b/x/posts/abci_test.go index 6f2b7e7f7d..67f167f15c 100644 --- a/x/posts/abci_test.go +++ b/x/posts/abci_test.go @@ -4,11 +4,12 @@ import ( "testing" "time" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + db "github.com/cosmos/cosmos-db" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" @@ -22,13 +23,13 @@ import ( func TestEndBlocker(t *testing.T) { // Define store keys - keys := sdk.NewMemoryStoreKeys( + keys := storetypes.NewMemoryStoreKeys( paramstypes.StoreKey, types.StoreKey, ) // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/posts/client/cli/cli_test.go b/x/posts/client/cli/cli_test.go index c554692965..34ca3514b1 100644 --- a/x/posts/client/cli/cli_test.go +++ b/x/posts/client/cli/cli_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" + "cosmossdk.io/math" tmcli "github.com/cometbft/cometbft/libs/cli" "github.com/cosmos/cosmos-sdk/client/flags" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -596,7 +597,7 @@ func (s *IntegrationTestSuite) TestCmdCreatePost() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -671,7 +672,7 @@ func (s *IntegrationTestSuite) TestCmdEditPost() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -724,7 +725,7 @@ func (s *IntegrationTestSuite) TestCmdDeletePost() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -798,7 +799,7 @@ func (s *IntegrationTestSuite) TestCmdAddPostAttachment() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -858,7 +859,7 @@ func (s *IntegrationTestSuite) TestCmdRemovePostAttachment() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -925,7 +926,7 @@ func (s *IntegrationTestSuite) TestCmdAnswerPoll() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1003,7 +1004,7 @@ func (s *IntegrationTestSuite) TestCmdMovePost() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1066,7 +1067,7 @@ func (s *IntegrationTestSuite) TestCmdRequestPostOwnerTransfer() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1121,7 +1122,7 @@ func (s *IntegrationTestSuite) TestCmdCancelPostOwnerTransfer() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1176,7 +1177,7 @@ func (s *IntegrationTestSuite) TestCmdAcceptPostOwnerTransfer() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1231,7 +1232,7 @@ func (s *IntegrationTestSuite) TestCmdRefusePostOwnerTransfer() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, diff --git a/x/posts/keeper/alias_functions.go b/x/posts/keeper/alias_functions.go index c6d4ea1f6a..53af6a78bd 100644 --- a/x/posts/keeper/alias_functions.go +++ b/x/posts/keeper/alias_functions.go @@ -5,6 +5,7 @@ import ( "fmt" "time" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" subspacestypes "github.com/desmos-labs/desmos/v6/x/subspaces/types" @@ -47,7 +48,7 @@ func (k Keeper) HasRelationship(ctx sdk.Context, user, counterparty string, subs // IteratePostIDs iterates over all the next post ids and performs the provided function func (k Keeper) IteratePostIDs(ctx sdk.Context, fn func(subspaceID uint64, postID uint64) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.NextPostIDPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.NextPostIDPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -65,7 +66,7 @@ func (k Keeper) IteratePostIDs(ctx sdk.Context, fn func(subspaceID uint64, postI // IteratePosts iterates over all the posts stored inside the context and performs the provided function func (k Keeper) IteratePosts(ctx sdk.Context, fn func(post types.Post) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.PostPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.PostPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -82,7 +83,7 @@ func (k Keeper) IteratePosts(ctx sdk.Context, fn func(post types.Post) (stop boo func (k Keeper) IterateSectionPosts(ctx sdk.Context, subspaceID uint64, sectionID uint32, fn func(post types.Post) (stop bool)) { store := ctx.KVStore(k.storeKey) storePrefix := types.SectionPostsPrefix(subspaceID, sectionID) - iterator := sdk.KVStorePrefixIterator(store, storePrefix) + iterator := storetypes.KVStorePrefixIterator(store, storePrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -112,7 +113,7 @@ func (k Keeper) GetPosts(ctx sdk.Context) []types.Post { // IterateSubspacePosts iterates over all the posts stored inside the given subspace and performs the provided function func (k Keeper) IterateSubspacePosts(ctx sdk.Context, subspaceID uint64, fn func(post types.Post) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspacePostsPrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspacePostsPrefix(subspaceID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -140,7 +141,7 @@ func (k Keeper) GetSubspacePosts(ctx sdk.Context, subspaceID uint64) []types.Pos // IterateActivePolls iterates over the polls in the active polls queue and performs the provided function func (k Keeper) IterateActivePolls(ctx sdk.Context, fn func(poll types.Attachment) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.ActivePollQueuePrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.ActivePollQueuePrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -160,7 +161,7 @@ func (k Keeper) IterateActivePolls(ctx sdk.Context, fn func(poll types.Attachmen // IterateActivePollsQueue iterates over the polls that are still active by the time given performs the provided function func (k Keeper) IterateActivePollsQueue(ctx sdk.Context, endTime time.Time, fn func(poll types.Attachment) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := store.Iterator(types.ActivePollQueuePrefix, sdk.PrefixEndBytes(types.ActivePollByTimeKey(endTime))) + iterator := store.Iterator(types.ActivePollQueuePrefix, storetypes.PrefixEndBytes(types.ActivePollByTimeKey(endTime))) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -180,7 +181,7 @@ func (k Keeper) IterateActivePollsQueue(ctx sdk.Context, endTime time.Time, fn f // IterateAttachments iterates over all the attachments in the given context and performs the provided function func (k Keeper) IterateAttachments(ctx sdk.Context, fn func(attachment types.Attachment) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.AttachmentPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.AttachmentPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -196,7 +197,7 @@ func (k Keeper) IterateAttachments(ctx sdk.Context, fn func(attachment types.Att // IteratePostAttachments iterates through the attachments associated with the provided post and performs the given function func (k Keeper) IteratePostAttachments(ctx sdk.Context, subspaceID uint64, postID uint64, fn func(attachment types.Attachment) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.PostAttachmentsPrefix(subspaceID, postID)) + iterator := storetypes.KVStorePrefixIterator(store, types.PostAttachmentsPrefix(subspaceID, postID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -224,7 +225,7 @@ func (k Keeper) GetPostAttachments(ctx sdk.Context, subspaceID uint64, postID ui // IterateUserAnswers iterates over all the polls user answers and performs the provided function func (k Keeper) IterateUserAnswers(ctx sdk.Context, fn func(answer types.UserAnswer) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.UserAnswerPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.UserAnswerPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -240,7 +241,7 @@ func (k Keeper) IterateUserAnswers(ctx sdk.Context, fn func(answer types.UserAns // IteratePollUserAnswers iterates through the answers to the given poll and performs the provided function func (k Keeper) IteratePollUserAnswers(ctx sdk.Context, subspaceID uint64, postID uint64, pollID uint32, fn func(answer types.UserAnswer) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.PollAnswersPrefix(subspaceID, postID, pollID)) + iterator := storetypes.KVStorePrefixIterator(store, types.PollAnswersPrefix(subspaceID, postID, pollID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -278,7 +279,7 @@ func (k Keeper) GetAllPostOwnerTransferRequests(ctx sdk.Context) []types.PostOwn // IteratePostOwnerTransferRequests iterates through the post owner transfer requests and performs the provided function func (k Keeper) IteratePostOwnerTransferRequests(ctx sdk.Context, fn func(request types.PostOwnerTransferRequest) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.PostOwnerTransferRequestPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.PostOwnerTransferRequestPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { diff --git a/x/posts/keeper/common_test.go b/x/posts/keeper/common_test.go index fcb9bac48e..b9a272901a 100644 --- a/x/posts/keeper/common_test.go +++ b/x/posts/keeper/common_test.go @@ -9,13 +9,14 @@ import ( "github.com/desmos-labs/desmos/v6/x/posts/testutil" "github.com/desmos-labs/desmos/v6/x/posts/types" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - db "github.com/cometbft/cometbft-db" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/stretchr/testify/suite" @@ -41,12 +42,12 @@ type KeeperTestSuite struct { func (suite *KeeperTestSuite) SetupTest() { // Define store keys - keys := sdk.NewMemoryStoreKeys(types.StoreKey) + keys := storetypes.NewMemoryStoreKeys(types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/posts/keeper/grpc_query.go b/x/posts/keeper/grpc_query.go index 27f1e56560..69716ee681 100644 --- a/x/posts/keeper/grpc_query.go +++ b/x/posts/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( "fmt" "cosmossdk.io/errors" - "github.com/cosmos/cosmos-sdk/store/prefix" + "cosmossdk.io/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/x/posts/keeper/grpc_query_test.go b/x/posts/keeper/grpc_query_test.go index 8351db6b26..ed91360c37 100644 --- a/x/posts/keeper/grpc_query_test.go +++ b/x/posts/keeper/grpc_query_test.go @@ -164,7 +164,7 @@ func (suite *KeeperTestSuite) TestQueryServer_SubspacePosts() { tc.store(ctx) } - res, err := suite.k.SubspacePosts(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.SubspacePosts(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -330,7 +330,7 @@ func (suite *KeeperTestSuite) TestQueryServer_SectionPosts() { tc.store(ctx) } - res, err := suite.k.SectionPosts(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.SectionPosts(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -413,7 +413,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Post() { tc.store(ctx) } - res, err := suite.k.Post(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Post(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -498,7 +498,7 @@ func (suite *KeeperTestSuite) TestQueryServer_PostAttachments() { tc.store(ctx) } - res, err := suite.k.PostAttachments(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.PostAttachments(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -603,7 +603,7 @@ func (suite *KeeperTestSuite) TestQueryServer_PollAnswers() { tc.store(ctx) } - res, err := suite.k.PollAnswers(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.PollAnswers(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -639,7 +639,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Params() { tc.store(ctx) } - res, err := suite.k.Params(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Params(ctx, tc.request) suite.Require().NoError(err) suite.Require().Equal(tc.expParams, res.Params) }) @@ -729,7 +729,7 @@ func (suite *KeeperTestSuite) TestQueryServer_IncomingPostOwnerTransferRequests( tc.store(ctx) } - res, err := suite.k.IncomingPostOwnerTransferRequests(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.IncomingPostOwnerTransferRequests(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { diff --git a/x/posts/keeper/keeper.go b/x/posts/keeper/keeper.go index 93cb3a70d5..d7a1bb88b7 100644 --- a/x/posts/keeper/keeper.go +++ b/x/posts/keeper/keeper.go @@ -1,9 +1,9 @@ package keeper import ( - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/posts/types" diff --git a/x/posts/keeper/msg_server_test.go b/x/posts/keeper/msg_server_test.go index 860163f21c..1f376ff743 100644 --- a/x/posts/keeper/msg_server_test.go +++ b/x/posts/keeper/msg_server_test.go @@ -538,7 +538,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CreatePost() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.CreatePost(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.CreatePost(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -814,7 +814,7 @@ func (suite *KeeperTestSuite) TestMsgServer_EditPost() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.EditPost(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.EditPost(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1045,7 +1045,7 @@ func (suite *KeeperTestSuite) TestMsgServer_DeletePost() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.DeletePost(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.DeletePost(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1303,7 +1303,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AddPostAttachment() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.AddPostAttachment(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.AddPostAttachment(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1702,7 +1702,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RemovePostAttachment() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.RemovePostAttachment(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.RemovePostAttachment(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -2305,7 +2305,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AnswerPoll() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.AnswerPoll(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.AnswerPoll(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -2360,7 +2360,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateParams() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.UpdateParams(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.UpdateParams(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -2892,7 +2892,7 @@ func (suite *KeeperTestSuite) TestMsgServer_MovePost() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.MovePost(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.MovePost(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -3194,7 +3194,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RequestPostOwnerTransfer() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.RequestPostOwnerTransfer(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.RequestPostOwnerTransfer(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -3286,7 +3286,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CancelPostOwnerTransfer() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.CancelPostOwnerTransferRequest(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.CancelPostOwnerTransferRequest(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -3529,7 +3529,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptPostOwnerTransfer() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.AcceptPostOwnerTransferRequest(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.AcceptPostOwnerTransferRequest(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -3621,7 +3621,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RefusePostOwnerTransfer() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.RefusePostOwnerTransferRequest(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.RefusePostOwnerTransferRequest(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { diff --git a/x/posts/legacy/v2/models.pb.go b/x/posts/legacy/v2/models.pb.go index 51b982a946..ec8ddb3c2d 100644 --- a/x/posts/legacy/v2/models.pb.go +++ b/x/posts/legacy/v2/models.pb.go @@ -1054,92 +1054,92 @@ func init() { func init() { proto.RegisterFile("desmos/posts/v1/models.proto", fileDescriptor_9cb993d391569998) } var fileDescriptor_9cb993d391569998 = []byte{ - // 1351 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0xda, 0x4e, 0xe2, 0xbc, 0xc4, 0x8e, 0x3b, 0x0d, 0xad, 0xeb, 0x52, 0x3b, 0x4d, 0xf9, - 0x13, 0x55, 0x74, 0xad, 0x06, 0xb5, 0x87, 0x72, 0x40, 0x49, 0xbc, 0x45, 0x8b, 0x92, 0x38, 0x1d, - 0xaf, 0x41, 0xe5, 0xb2, 0x9a, 0x78, 0xa7, 0xce, 0xa2, 0xf1, 0xae, 0xd9, 0x19, 0xbb, 0xf6, 0x17, - 0x40, 0x70, 0xab, 0x38, 0x81, 0xc4, 0xa1, 0x82, 0xaf, 0xd0, 0x3b, 0xd7, 0x8a, 0x53, 0x8f, 0x9c, - 0x02, 0x72, 0x2f, 0x7c, 0x08, 0x0e, 0x68, 0x66, 0x76, 0x9d, 0x4d, 0xd2, 0x50, 0x7a, 0x40, 0xe2, - 0xb6, 0xf3, 0xde, 0xef, 0xfd, 0xe6, 0xcd, 0xef, 0xbd, 0x79, 0x63, 0xc3, 0xdb, 0x1e, 0xe5, 0xbd, - 0x90, 0xd7, 0xfb, 0x21, 0x17, 0xbc, 0x3e, 0xbc, 0x5d, 0xef, 0x85, 0x1e, 0x65, 0xdc, 0xec, 0x47, - 0xa1, 0x08, 0xd1, 0xb2, 0xf6, 0x9a, 0xca, 0x6b, 0x0e, 0x6f, 0x57, 0x56, 0xba, 0x61, 0x37, 0x54, - 0xbe, 0xba, 0xfc, 0xd2, 0xb0, 0xca, 0x95, 0x6e, 0x18, 0x76, 0x19, 0xad, 0xab, 0xd5, 0xc1, 0xe0, - 0x51, 0x9d, 0x04, 0xe3, 0xd8, 0x55, 0x3b, 0xed, 0x12, 0x7e, 0x8f, 0x72, 0x41, 0x7a, 0xfd, 0x24, - 0xb6, 0x13, 0xca, 0x2d, 0x5c, 0x4d, 0xaa, 0x17, 0xda, 0xb5, 0xf6, 0xf5, 0x2c, 0xe4, 0xf6, 0x43, - 0x2e, 0x50, 0x1d, 0x16, 0xf9, 0xe0, 0x80, 0xf7, 0x49, 0x87, 0xba, 0xbe, 0x57, 0x36, 0x56, 0x8d, - 0xf5, 0xdc, 0x56, 0x71, 0x72, 0x54, 0x83, 0x56, 0x6c, 0xb6, 0x1b, 0x18, 0x12, 0x88, 0xed, 0xa1, - 0x0f, 0x00, 0x38, 0xed, 0x08, 0x3f, 0x0c, 0x24, 0x3e, 0xb3, 0x6a, 0xac, 0x17, 0xb6, 0x0a, 0x93, - 0xa3, 0xda, 0x42, 0x4b, 0x5b, 0xed, 0x06, 0x5e, 0x88, 0x01, 0xb6, 0x87, 0x2e, 0x41, 0xc6, 0xf7, - 0xca, 0x59, 0xc5, 0x3a, 0x37, 0x39, 0xaa, 0x65, 0xec, 0x06, 0xce, 0xf8, 0x9e, 0xdc, 0x96, 0x8e, - 0x04, 0x8d, 0x02, 0xc2, 0x24, 0x4d, 0x6e, 0xd5, 0x58, 0x5f, 0xd0, 0xdb, 0x5a, 0xb1, 0x59, 0x6e, - 0x9b, 0x40, 0x6c, 0x0f, 0x21, 0xc8, 0x09, 0x3a, 0x12, 0xe5, 0x59, 0x89, 0xc4, 0xea, 0x1b, 0xdd, - 0x81, 0x3c, 0x0d, 0x84, 0x2f, 0x7c, 0xca, 0xcb, 0x73, 0xab, 0xc6, 0xfa, 0xe2, 0xc6, 0x15, 0xf3, - 0x94, 0xaa, 0xa6, 0x15, 0x03, 0xf0, 0x14, 0x8a, 0x2e, 0xc1, 0x1c, 0x19, 0x88, 0xc3, 0x30, 0x2a, - 0xcf, 0x2b, 0xb2, 0x78, 0x85, 0x3e, 0x82, 0xe5, 0x4e, 0x18, 0x0c, 0x69, 0xc4, 0x49, 0x72, 0xbc, - 0xbc, 0x4a, 0x1c, 0x4d, 0x8e, 0x6a, 0xc5, 0xed, 0x94, 0xcb, 0x6e, 0xe0, 0x62, 0x1a, 0x6a, 0x7b, - 0xa8, 0x09, 0xa5, 0x88, 0x3e, 0xa2, 0x11, 0x0d, 0x3a, 0xd4, 0x73, 0xd5, 0xf6, 0xe5, 0x85, 0xd5, - 0xec, 0xfa, 0xe2, 0x46, 0xf5, 0x4c, 0x4e, 0x52, 0x78, 0x9c, 0x80, 0xb7, 0x72, 0xcf, 0x8f, 0x6a, - 0x33, 0x78, 0xf9, 0x38, 0x5a, 0xba, 0x39, 0x6a, 0x40, 0x31, 0xa2, 0x7d, 0x36, 0x76, 0x39, 0x15, - 0xc2, 0x0f, 0xba, 0xbc, 0x0c, 0xab, 0xc6, 0x7a, 0x71, 0xe3, 0xda, 0x19, 0x3a, 0x2c, 0x61, 0x2d, - 0x8d, 0xc2, 0x85, 0x28, 0xb5, 0xe2, 0xc8, 0x86, 0x42, 0x27, 0xa2, 0xfa, 0x3c, 0x1e, 0x11, 0xb4, - 0xbc, 0xa8, 0x74, 0xaa, 0x98, 0xba, 0x77, 0xcc, 0xa4, 0x77, 0x4c, 0x27, 0xe9, 0x9d, 0xad, 0xbc, - 0xcc, 0xe7, 0xc9, 0xef, 0x35, 0x03, 0x2f, 0x25, 0xa1, 0x0d, 0x22, 0x28, 0xfa, 0x14, 0x4a, 0x8c, - 0x70, 0xe1, 0x52, 0xcf, 0x17, 0xd4, 0xd3, 0x6c, 0x4b, 0xaf, 0x65, 0xcb, 0x29, 0xa6, 0xa2, 0x8c, - 0xb4, 0x54, 0xa0, 0xe4, 0xba, 0x97, 0xff, 0xfe, 0x69, 0xcd, 0xf8, 0xf3, 0x69, 0xcd, 0x58, 0xfb, - 0xce, 0x80, 0xc2, 0x09, 0x3d, 0xd0, 0x5d, 0xc8, 0x89, 0x71, 0x9f, 0xaa, 0x56, 0x2c, 0x6e, 0xac, - 0xfd, 0xb3, 0x7a, 0xce, 0xb8, 0x4f, 0xb1, 0xc2, 0xa3, 0x1b, 0x30, 0x2f, 0x31, 0x49, 0x57, 0xe6, - 0xb6, 0x60, 0x72, 0x54, 0x9b, 0x93, 0x68, 0xbb, 0x81, 0xe7, 0xa4, 0xcb, 0xf6, 0x50, 0x05, 0xf2, - 0xfd, 0x90, 0xfb, 0xf2, 0x50, 0xba, 0x2b, 0xf1, 0x74, 0x9d, 0x4a, 0xea, 0x99, 0x01, 0xf9, 0xa4, - 0x71, 0xd0, 0x5d, 0xc8, 0x1f, 0x12, 0x7e, 0x28, 0x48, 0x97, 0x97, 0x0d, 0x55, 0xd1, 0x95, 0x33, - 0x39, 0x39, 0xa4, 0x1b, 0xd7, 0x71, 0x8a, 0x95, 0x71, 0x3d, 0xd9, 0x73, 0x61, 0xc0, 0xcb, 0x99, - 0xd7, 0xc7, 0x25, 0x58, 0x64, 0x42, 0x6e, 0x10, 0x31, 0x5e, 0xce, 0x9e, 0x13, 0xd3, 0x8e, 0x58, - 0x1c, 0xa3, 0x70, 0xa9, 0xb4, 0x6d, 0xc8, 0x3a, 0xa4, 0x8b, 0x56, 0x60, 0x96, 0x0b, 0x12, 0x09, - 0x7d, 0x99, 0xb1, 0x5e, 0xa0, 0x12, 0x64, 0x69, 0x10, 0x4b, 0x83, 0xe5, 0xa7, 0xb4, 0x08, 0xd2, - 0x55, 0x32, 0x2c, 0x60, 0xf9, 0x99, 0xa2, 0xfa, 0x12, 0xb2, 0xed, 0x88, 0xbd, 0x09, 0xd5, 0x20, - 0x62, 0x09, 0xd5, 0x20, 0x62, 0xa8, 0x06, 0x8b, 0x9e, 0xcf, 0xfb, 0x8c, 0x8c, 0x5d, 0xe9, 0x51, - 0x17, 0x1c, 0x43, 0x6c, 0x6a, 0x47, 0x2c, 0xb5, 0xd7, 0xb7, 0x19, 0x80, 0x4d, 0x21, 0x48, 0xe7, - 0x50, 0x6a, 0xf0, 0x5f, 0x4f, 0xa4, 0x54, 0x9b, 0x64, 0xcf, 0x6d, 0x13, 0x3d, 0xb6, 0x72, 0x8a, - 0x2a, 0x3d, 0xb6, 0xda, 0x30, 0xdf, 0x09, 0x03, 0x41, 0x03, 0x3d, 0x88, 0x64, 0x79, 0x4e, 0xb7, - 0xfe, 0x66, 0x30, 0xde, 0x7a, 0xf7, 0xd7, 0x67, 0xb7, 0xae, 0x9f, 0xae, 0xdb, 0xf1, 0x11, 0xb7, - 0x35, 0x05, 0x4e, 0xb8, 0x52, 0x5a, 0x50, 0x98, 0xdd, 0xa5, 0x9e, 0x4f, 0xb4, 0xa2, 0xbe, 0x3a, - 0x8d, 0x52, 0xd4, 0x47, 0x57, 0x61, 0xa1, 0xe7, 0xf7, 0xa8, 0xab, 0x2e, 0x87, 0x56, 0x3a, 0x2f, - 0x0d, 0xf2, 0x0a, 0xdc, 0xbb, 0x95, 0x30, 0xfc, 0xab, 0x9d, 0xd7, 0x7e, 0xc8, 0xc9, 0xf1, 0xcf, - 0x98, 0xbc, 0x0f, 0x5f, 0x0d, 0x28, 0x57, 0xf7, 0xc1, 0xd0, 0x9c, 0xc9, 0x1a, 0xb5, 0xa1, 0xd4, - 0x8f, 0xc2, 0xa1, 0xef, 0x51, 0xcf, 0x25, 0x01, 0x7f, 0x4c, 0xa3, 0xa4, 0x91, 0xdf, 0x79, 0xc5, - 0xa5, 0x64, 0xcc, 0xdc, 0x8f, 0xd1, 0x9b, 0x0a, 0x9c, 0x0c, 0xb6, 0xfe, 0x09, 0x2b, 0x47, 0x1f, - 0xcb, 0xa9, 0x1d, 0xcf, 0x8f, 0xec, 0x1b, 0x4c, 0xa3, 0x79, 0x1a, 0xa8, 0xe1, 0x81, 0xee, 0xc2, - 0x65, 0xc2, 0x58, 0xf8, 0x98, 0xbb, 0xbd, 0x01, 0x13, 0x7e, 0x9f, 0xd1, 0x69, 0x7a, 0xb2, 0x62, - 0x79, 0xfc, 0x96, 0x76, 0xef, 0xc6, 0xde, 0x64, 0x63, 0x13, 0x2e, 0xc6, 0x71, 0x1a, 0xae, 0x26, - 0x19, 0x57, 0x85, 0xcc, 0xe3, 0x0b, 0xda, 0xa5, 0xb1, 0x72, 0x52, 0x71, 0xf4, 0x00, 0x2e, 0x3e, - 0xf2, 0xe5, 0x03, 0x25, 0x08, 0x63, 0x63, 0x37, 0xa2, 0x7c, 0xc0, 0x44, 0xf2, 0xd2, 0x5c, 0x7f, - 0xa5, 0x04, 0x8e, 0x44, 0x62, 0x0d, 0xc4, 0x17, 0x54, 0x74, 0xda, 0x54, 0xe1, 0x50, 0x3c, 0x29, - 0xd2, 0xf4, 0x5d, 0x33, 0x52, 0xef, 0xda, 0x36, 0x2c, 0x92, 0x69, 0xc9, 0x12, 0xcd, 0xaf, 0x9a, - 0xe7, 0x97, 0x35, 0x96, 0x3a, 0x1d, 0x75, 0xdc, 0x53, 0x6f, 0xda, 0x1b, 0x7f, 0x19, 0x00, 0x6d, - 0x4e, 0xa3, 0x38, 0xc1, 0xff, 0xc3, 0x75, 0x54, 0x20, 0x36, 0xfd, 0xa5, 0x50, 0x48, 0x40, 0x8c, - 0x69, 0x10, 0x93, 0xbf, 0x10, 0xde, 0x87, 0xe5, 0xb8, 0x0d, 0x5c, 0x3f, 0xf0, 0xe8, 0x88, 0xca, - 0xd2, 0x66, 0xd7, 0x0b, 0xb8, 0x18, 0x9b, 0x6d, 0x6d, 0x95, 0x92, 0x0f, 0x38, 0x8d, 0x54, 0x21, - 0x17, 0xb0, 0xfa, 0x4e, 0xdd, 0xc0, 0x5f, 0x0c, 0x28, 0x9d, 0x2e, 0x25, 0xda, 0x83, 0xf9, 0xa4, - 0xfc, 0xfa, 0x09, 0x30, 0x5f, 0x5b, 0x7e, 0x53, 0xeb, 0xa7, 0x57, 0x71, 0x81, 0x12, 0x92, 0xca, - 0x03, 0x58, 0x4a, 0xbb, 0xd1, 0x75, 0x58, 0x8a, 0x7b, 0x52, 0xa5, 0xae, 0x54, 0x2e, 0xe0, 0x45, - 0x6d, 0x53, 0x79, 0xcb, 0x51, 0x3c, 0x0c, 0x05, 0xe5, 0xf1, 0xd8, 0xd5, 0x8b, 0x54, 0x95, 0x8f, - 0x4f, 0x70, 0x0f, 0xe6, 0xf6, 0x49, 0x44, 0x7a, 0x1c, 0xbd, 0x07, 0xcb, 0x3d, 0x32, 0x72, 0x65, - 0x53, 0xb9, 0x8c, 0x06, 0x5d, 0x71, 0x18, 0x33, 0x17, 0x7a, 0x64, 0xe4, 0xd0, 0x91, 0xd8, 0x51, - 0xc6, 0xe3, 0xd8, 0x9b, 0x3f, 0x1a, 0x70, 0xe1, 0xcc, 0x03, 0x8b, 0x6e, 0x40, 0x6d, 0xbf, 0xd9, - 0x72, 0x5c, 0x6c, 0xdd, 0xb7, 0xb0, 0xb5, 0xb7, 0x6d, 0xb9, 0xce, 0xc3, 0x7d, 0xcb, 0x6d, 0xef, - 0xb5, 0xf6, 0xad, 0x6d, 0xfb, 0xbe, 0x6d, 0x35, 0x4a, 0x33, 0xe8, 0x1a, 0x5c, 0x79, 0x15, 0x08, - 0x5b, 0xfb, 0x3b, 0x0f, 0x4b, 0xc6, 0x79, 0xee, 0x07, 0xed, 0xa6, 0x63, 0x95, 0x32, 0xa8, 0x0a, - 0x95, 0x73, 0xa2, 0x9b, 0x2d, 0xa7, 0x94, 0xad, 0xe4, 0xbe, 0xf9, 0xb9, 0x3a, 0x73, 0xf3, 0x27, - 0x03, 0x96, 0xd2, 0x3f, 0x77, 0x24, 0xab, 0xda, 0xc0, 0x6d, 0x59, 0x8e, 0x63, 0xef, 0x7d, 0x72, - 0x2a, 0xa7, 0x0a, 0x5c, 0x3a, 0xe9, 0xb6, 0x3e, 0xb3, 0xf0, 0xc3, 0xe6, 0x9e, 0x55, 0x32, 0xd0, - 0x55, 0xb8, 0x7c, 0xd2, 0x77, 0xbf, 0xb9, 0xb3, 0xd3, 0xfc, 0xdc, 0xc2, 0xad, 0x52, 0x06, 0x95, - 0x61, 0xe5, 0xa4, 0x73, 0xb7, 0xed, 0xb4, 0x37, 0x77, 0x4a, 0xd9, 0xb3, 0x94, 0xbb, 0xd6, 0x9e, - 0x63, 0x37, 0xf7, 0x5a, 0xa5, 0x9c, 0x4e, 0x72, 0x6b, 0xe7, 0xf9, 0xa4, 0x6a, 0xbc, 0x98, 0x54, - 0x8d, 0x3f, 0x26, 0x55, 0xe3, 0xc9, 0xcb, 0xea, 0xcc, 0x8b, 0x97, 0xd5, 0x99, 0xdf, 0x5e, 0x56, - 0x67, 0xbe, 0xd8, 0xe8, 0xfa, 0xe2, 0x70, 0x70, 0x60, 0x76, 0xc2, 0x5e, 0x5d, 0xf7, 0xcf, 0x2d, - 0x46, 0x0e, 0x78, 0xfc, 0x5d, 0x1f, 0xde, 0xa9, 0x8f, 0xe2, 0x7f, 0x0b, 0x8c, 0x76, 0x49, 0x67, - 0x5c, 0x1f, 0x6e, 0x1c, 0xcc, 0xa9, 0xa1, 0xf8, 0xe1, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x10, - 0x22, 0x76, 0xcb, 0x4e, 0x0c, 0x00, 0x00, + // 1352 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xcf, 0xda, 0x4e, 0xe2, 0xbc, 0xc4, 0x8e, 0x3b, 0xcd, 0xb7, 0x75, 0xdd, 0x6f, 0xed, 0x34, + 0xe5, 0x47, 0x54, 0xd1, 0xb5, 0x1a, 0x44, 0x0e, 0xe5, 0x80, 0x92, 0x78, 0x8b, 0x16, 0x25, 0x71, + 0x3a, 0x5e, 0x83, 0xca, 0x65, 0x35, 0xf1, 0x4e, 0x9d, 0x45, 0xe3, 0x5d, 0xb3, 0x33, 0x76, 0xed, + 0x7f, 0x00, 0xc1, 0xad, 0xe2, 0x04, 0x12, 0x87, 0x0a, 0xfe, 0x85, 0xde, 0xb9, 0x56, 0x9c, 0x7a, + 0xe4, 0x14, 0x90, 0x7b, 0xe1, 0x8f, 0xe0, 0x80, 0x66, 0x66, 0xd7, 0xd9, 0x24, 0x0d, 0xa5, 0x07, + 0x24, 0x6e, 0x3b, 0xef, 0x7d, 0xde, 0x67, 0xde, 0x7c, 0xde, 0x9b, 0x37, 0x36, 0xfc, 0xdf, 0xa3, + 0xbc, 0x17, 0xf2, 0x7a, 0x3f, 0xe4, 0x82, 0xd7, 0x87, 0x77, 0xeb, 0xbd, 0xd0, 0xa3, 0x8c, 0x9b, + 0xfd, 0x28, 0x14, 0x21, 0x5a, 0xd6, 0x5e, 0x53, 0x79, 0xcd, 0xe1, 0xdd, 0xca, 0x4a, 0x37, 0xec, + 0x86, 0xca, 0x57, 0x97, 0x5f, 0x1a, 0x56, 0xb9, 0xd6, 0x0d, 0xc3, 0x2e, 0xa3, 0x75, 0xb5, 0x3a, + 0x1c, 0x3c, 0xaa, 0x93, 0x60, 0x1c, 0xbb, 0x6a, 0x67, 0x5d, 0xc2, 0xef, 0x51, 0x2e, 0x48, 0xaf, + 0x9f, 0xc4, 0x76, 0x42, 0xb9, 0x85, 0xab, 0x49, 0xf5, 0x42, 0xbb, 0xd6, 0xbe, 0x9a, 0x85, 0xdc, + 0x41, 0xc8, 0x05, 0xaa, 0xc3, 0x22, 0x1f, 0x1c, 0xf2, 0x3e, 0xe9, 0x50, 0xd7, 0xf7, 0xca, 0xc6, + 0xaa, 0xb1, 0x9e, 0xdb, 0x2e, 0x4e, 0x8e, 0x6b, 0xd0, 0x8a, 0xcd, 0x76, 0x03, 0x43, 0x02, 0xb1, + 0x3d, 0xf4, 0x1e, 0x00, 0xa7, 0x1d, 0xe1, 0x87, 0x81, 0xc4, 0x67, 0x56, 0x8d, 0xf5, 0xc2, 0x76, + 0x61, 0x72, 0x5c, 0x5b, 0x68, 0x69, 0xab, 0xdd, 0xc0, 0x0b, 0x31, 0xc0, 0xf6, 0xd0, 0x15, 0xc8, + 0xf8, 0x5e, 0x39, 0xab, 0x58, 0xe7, 0x26, 0xc7, 0xb5, 0x8c, 0xdd, 0xc0, 0x19, 0xdf, 0x93, 0xdb, + 0xd2, 0x91, 0xa0, 0x51, 0x40, 0x98, 0xa4, 0xc9, 0xad, 0x1a, 0xeb, 0x0b, 0x7a, 0x5b, 0x2b, 0x36, + 0xcb, 0x6d, 0x13, 0x88, 0xed, 0x21, 0x04, 0x39, 0x41, 0x47, 0xa2, 0x3c, 0x2b, 0x91, 0x58, 0x7d, + 0xa3, 0x0f, 0x20, 0x4f, 0x03, 0xe1, 0x0b, 0x9f, 0xf2, 0xf2, 0xdc, 0xaa, 0xb1, 0xbe, 0xb8, 0x71, + 0xcd, 0x3c, 0xa3, 0xaa, 0x69, 0xc5, 0x00, 0x3c, 0x85, 0xa2, 0x2b, 0x30, 0x47, 0x06, 0xe2, 0x28, + 0x8c, 0xca, 0xf3, 0x8a, 0x2c, 0x5e, 0xa1, 0x0f, 0x61, 0xb9, 0x13, 0x06, 0x43, 0x1a, 0x71, 0x92, + 0x1c, 0x2f, 0xaf, 0x12, 0x47, 0x93, 0xe3, 0x5a, 0x71, 0x27, 0xe5, 0xb2, 0x1b, 0xb8, 0x98, 0x86, + 0xda, 0x1e, 0x6a, 0x42, 0x29, 0xa2, 0x8f, 0x68, 0x44, 0x83, 0x0e, 0xf5, 0x5c, 0xb5, 0x7d, 0x79, + 0x61, 0x35, 0xbb, 0xbe, 0xb8, 0x51, 0x3d, 0x97, 0x93, 0x14, 0x1e, 0x27, 0xe0, 0xed, 0xdc, 0xf3, + 0xe3, 0xda, 0x0c, 0x5e, 0x3e, 0x89, 0x96, 0x6e, 0x8e, 0x1a, 0x50, 0x8c, 0x68, 0x9f, 0x8d, 0x5d, + 0x4e, 0x85, 0xf0, 0x83, 0x2e, 0x2f, 0xc3, 0xaa, 0xb1, 0x5e, 0xdc, 0xb8, 0x71, 0x8e, 0x0e, 0x4b, + 0x58, 0x4b, 0xa3, 0x70, 0x21, 0x4a, 0xad, 0x38, 0xb2, 0xa1, 0xd0, 0x89, 0xa8, 0x3e, 0x8f, 0x47, + 0x04, 0x2d, 0x2f, 0x2a, 0x9d, 0x2a, 0xa6, 0xee, 0x1d, 0x33, 0xe9, 0x1d, 0xd3, 0x49, 0x7a, 0x67, + 0x3b, 0x2f, 0xf3, 0x79, 0xf2, 0x5b, 0xcd, 0xc0, 0x4b, 0x49, 0x68, 0x83, 0x08, 0x8a, 0x3e, 0x81, + 0x12, 0x23, 0x5c, 0xb8, 0xd4, 0xf3, 0x05, 0xf5, 0x34, 0xdb, 0xd2, 0x6b, 0xd9, 0x72, 0x8a, 0xa9, + 0x28, 0x23, 0x2d, 0x15, 0x28, 0xb9, 0xee, 0xe5, 0xbf, 0x7b, 0x5a, 0x33, 0xfe, 0x78, 0x5a, 0x33, + 0xd6, 0xbe, 0x35, 0xa0, 0x70, 0x4a, 0x0f, 0xb4, 0x09, 0x39, 0x31, 0xee, 0x53, 0xd5, 0x8a, 0xc5, + 0x8d, 0xb5, 0xbf, 0x57, 0xcf, 0x19, 0xf7, 0x29, 0x56, 0x78, 0x74, 0x0b, 0xe6, 0x25, 0x26, 0xe9, + 0xca, 0xdc, 0x36, 0x4c, 0x8e, 0x6b, 0x73, 0x12, 0x6d, 0x37, 0xf0, 0x9c, 0x74, 0xd9, 0x1e, 0xaa, + 0x40, 0xbe, 0x1f, 0x72, 0x5f, 0x1e, 0x4a, 0x77, 0x25, 0x9e, 0xae, 0x53, 0x49, 0x3d, 0x33, 0x20, + 0x9f, 0x34, 0x0e, 0xda, 0x84, 0xfc, 0x11, 0xe1, 0x47, 0x82, 0x74, 0x79, 0xd9, 0x50, 0x15, 0x5d, + 0x39, 0x97, 0x93, 0x43, 0xba, 0x71, 0x1d, 0xa7, 0x58, 0x19, 0xd7, 0x93, 0x3d, 0x17, 0x06, 0xbc, + 0x9c, 0x79, 0x7d, 0x5c, 0x82, 0x45, 0x26, 0xe4, 0x06, 0x11, 0xe3, 0xe5, 0xec, 0x05, 0x31, 0xed, + 0x88, 0xc5, 0x31, 0x0a, 0x97, 0x4a, 0xdb, 0x86, 0xac, 0x43, 0xba, 0x68, 0x05, 0x66, 0xb9, 0x20, + 0x91, 0xd0, 0x97, 0x19, 0xeb, 0x05, 0x2a, 0x41, 0x96, 0x06, 0xb1, 0x34, 0x58, 0x7e, 0x4a, 0x8b, + 0x20, 0x5d, 0x25, 0xc3, 0x02, 0x96, 0x9f, 0x29, 0xaa, 0x2f, 0x20, 0xdb, 0x8e, 0xd8, 0x9b, 0x50, + 0x0d, 0x22, 0x96, 0x50, 0x0d, 0x22, 0x86, 0x6a, 0xb0, 0xe8, 0xf9, 0xbc, 0xcf, 0xc8, 0xd8, 0x95, + 0x1e, 0x75, 0xc1, 0x31, 0xc4, 0xa6, 0x76, 0xc4, 0x52, 0x7b, 0x7d, 0x93, 0x01, 0xd8, 0x12, 0x82, + 0x74, 0x8e, 0xa4, 0x06, 0xff, 0xf6, 0x44, 0x4a, 0xb5, 0x49, 0xf6, 0xc2, 0x36, 0xd1, 0x63, 0x2b, + 0xa7, 0xa8, 0xd2, 0x63, 0xab, 0x0d, 0xf3, 0x9d, 0x30, 0x10, 0x34, 0xd0, 0x83, 0x48, 0x96, 0xe7, + 0x6c, 0xeb, 0x6f, 0x05, 0xe3, 0xed, 0xb7, 0x7f, 0x79, 0x76, 0xe7, 0xe6, 0xd9, 0xba, 0x9d, 0x1c, + 0x71, 0x47, 0x53, 0xe0, 0x84, 0x2b, 0xa5, 0x05, 0x85, 0xd9, 0x3d, 0xea, 0xf9, 0x44, 0x2b, 0xea, + 0xab, 0xd3, 0x28, 0x45, 0x7d, 0x74, 0x1d, 0x16, 0x7a, 0x7e, 0x8f, 0xba, 0xea, 0x72, 0x68, 0xa5, + 0xf3, 0xd2, 0x20, 0xaf, 0xc0, 0xbd, 0x3b, 0x09, 0xc3, 0x3f, 0xda, 0x79, 0xed, 0xfb, 0x9c, 0x1c, + 0xff, 0x8c, 0xc9, 0xfb, 0xf0, 0xe5, 0x80, 0x72, 0x75, 0x1f, 0x0c, 0xcd, 0x99, 0xac, 0x51, 0x1b, + 0x4a, 0xfd, 0x28, 0x1c, 0xfa, 0x1e, 0xf5, 0x5c, 0x12, 0xf0, 0xc7, 0x34, 0x4a, 0x1a, 0xf9, 0xad, + 0x57, 0x5c, 0x4a, 0xc6, 0xcc, 0x83, 0x18, 0xbd, 0xa5, 0xc0, 0xc9, 0x60, 0xeb, 0x9f, 0xb2, 0x72, + 0xf4, 0x91, 0x9c, 0xda, 0xf1, 0xfc, 0xc8, 0xbe, 0xc1, 0x34, 0x9a, 0xa7, 0x81, 0x1a, 0x1e, 0x68, + 0x13, 0xae, 0x12, 0xc6, 0xc2, 0xc7, 0xdc, 0xed, 0x0d, 0x98, 0xf0, 0xfb, 0x8c, 0x4e, 0xd3, 0x93, + 0x15, 0xcb, 0xe3, 0xff, 0x69, 0xf7, 0x5e, 0xec, 0x4d, 0x36, 0x36, 0xe1, 0x72, 0x1c, 0xa7, 0xe1, + 0x6a, 0x92, 0x71, 0x55, 0xc8, 0x3c, 0xbe, 0xa4, 0x5d, 0x1a, 0x2b, 0x27, 0x15, 0x47, 0x0f, 0xe0, + 0xf2, 0x23, 0x5f, 0x3e, 0x50, 0x82, 0x30, 0x36, 0x76, 0x23, 0xca, 0x07, 0x4c, 0x24, 0x2f, 0xcd, + 0xcd, 0x57, 0x4a, 0xe0, 0x48, 0x24, 0xd6, 0x40, 0x7c, 0x49, 0x45, 0xa7, 0x4d, 0x15, 0x0e, 0xc5, + 0xd3, 0x22, 0x4d, 0xdf, 0x35, 0x23, 0xf5, 0xae, 0xed, 0xc0, 0x22, 0x99, 0x96, 0x2c, 0xd1, 0xfc, + 0xba, 0x79, 0x71, 0x59, 0x63, 0xa9, 0xd3, 0x51, 0x27, 0x3d, 0xf5, 0xa6, 0xbd, 0xf1, 0xa7, 0x01, + 0xd0, 0xe6, 0x34, 0x8a, 0x13, 0xfc, 0x2f, 0x5c, 0x47, 0x05, 0x62, 0xd3, 0x5f, 0x0a, 0x85, 0x04, + 0xc4, 0x98, 0x06, 0x31, 0xf9, 0x0b, 0xe1, 0x5d, 0x58, 0x8e, 0xdb, 0xc0, 0xf5, 0x03, 0x8f, 0x8e, + 0xa8, 0x2c, 0x6d, 0x76, 0xbd, 0x80, 0x8b, 0xb1, 0xd9, 0xd6, 0x56, 0x29, 0xf9, 0x80, 0xd3, 0x48, + 0x15, 0x72, 0x01, 0xab, 0xef, 0xd4, 0x0d, 0xfc, 0xd9, 0x80, 0xd2, 0xd9, 0x52, 0xa2, 0x7d, 0x98, + 0x4f, 0xca, 0xaf, 0x9f, 0x00, 0xf3, 0xb5, 0xe5, 0x37, 0xb5, 0x7e, 0x7a, 0x15, 0x17, 0x28, 0x21, + 0xa9, 0x3c, 0x80, 0xa5, 0xb4, 0x1b, 0xdd, 0x84, 0xa5, 0xb8, 0x27, 0x55, 0xea, 0x4a, 0xe5, 0x02, + 0x5e, 0xd4, 0x36, 0x95, 0xb7, 0x1c, 0xc5, 0xc3, 0x50, 0x50, 0x1e, 0x8f, 0x5d, 0xbd, 0x48, 0x55, + 0xf9, 0xe4, 0x04, 0xf7, 0x60, 0xee, 0x80, 0x44, 0xa4, 0xc7, 0xd1, 0x3b, 0xb0, 0xdc, 0x23, 0x23, + 0x57, 0x36, 0x95, 0xcb, 0x68, 0xd0, 0x15, 0x47, 0x31, 0x73, 0xa1, 0x47, 0x46, 0x0e, 0x1d, 0x89, + 0x5d, 0x65, 0x3c, 0x89, 0xbd, 0xfd, 0x83, 0x01, 0x97, 0xce, 0x3d, 0xb0, 0xe8, 0x16, 0xd4, 0x0e, + 0x9a, 0x2d, 0xc7, 0xc5, 0xd6, 0x7d, 0x0b, 0x5b, 0xfb, 0x3b, 0x96, 0xeb, 0x3c, 0x3c, 0xb0, 0xdc, + 0xf6, 0x7e, 0xeb, 0xc0, 0xda, 0xb1, 0xef, 0xdb, 0x56, 0xa3, 0x34, 0x83, 0x6e, 0xc0, 0xb5, 0x57, + 0x81, 0xb0, 0x75, 0xb0, 0xfb, 0xb0, 0x64, 0x5c, 0xe4, 0x7e, 0xd0, 0x6e, 0x3a, 0x56, 0x29, 0x83, + 0xaa, 0x50, 0xb9, 0x20, 0xba, 0xd9, 0x72, 0x4a, 0xd9, 0x4a, 0xee, 0xeb, 0x9f, 0xaa, 0x33, 0xb7, + 0x7f, 0x34, 0x60, 0x29, 0xfd, 0x73, 0x47, 0xb2, 0xaa, 0x0d, 0xdc, 0x96, 0xe5, 0x38, 0xf6, 0xfe, + 0xc7, 0x67, 0x72, 0xaa, 0xc0, 0x95, 0xd3, 0x6e, 0xeb, 0x53, 0x0b, 0x3f, 0x6c, 0xee, 0x5b, 0x25, + 0x03, 0x5d, 0x87, 0xab, 0xa7, 0x7d, 0xf7, 0x9b, 0xbb, 0xbb, 0xcd, 0xcf, 0x2c, 0xdc, 0x2a, 0x65, + 0x50, 0x19, 0x56, 0x4e, 0x3b, 0xf7, 0xda, 0x4e, 0x7b, 0x6b, 0xb7, 0x94, 0x3d, 0x4f, 0xb9, 0x67, + 0xed, 0x3b, 0x76, 0x73, 0xbf, 0x55, 0xca, 0xe9, 0x24, 0xb7, 0x77, 0x9f, 0x4f, 0xaa, 0xc6, 0x8b, + 0x49, 0xd5, 0xf8, 0x7d, 0x52, 0x35, 0x9e, 0xbc, 0xac, 0xce, 0xbc, 0x78, 0x59, 0x9d, 0xf9, 0xf5, + 0x65, 0x75, 0xe6, 0xf3, 0x8d, 0xae, 0x2f, 0x8e, 0x06, 0x87, 0x66, 0x27, 0xec, 0xd5, 0x75, 0xff, + 0xdc, 0x61, 0xe4, 0x90, 0xc7, 0xdf, 0xf5, 0xe1, 0x66, 0x7d, 0x14, 0xff, 0x5b, 0x60, 0xb4, 0x4b, + 0x3a, 0xe3, 0xfa, 0x70, 0xe3, 0x70, 0x4e, 0x0d, 0xc5, 0xf7, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, + 0xd3, 0x0f, 0xe2, 0x78, 0x4e, 0x0c, 0x00, 0x00, } func (this *Post) Equal(that interface{}) bool { diff --git a/x/posts/legacy/v2/store.go b/x/posts/legacy/v2/store.go index d6a7fe65ff..e43990ff16 100644 --- a/x/posts/legacy/v2/store.go +++ b/x/posts/legacy/v2/store.go @@ -1,7 +1,7 @@ package v2 import ( - storetypes "github.com/cosmos/cosmos-sdk/store/types" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/posts/types" diff --git a/x/posts/legacy/v2/store_test.go b/x/posts/legacy/v2/store_test.go index 737d0c0d78..499c5286bd 100644 --- a/x/posts/legacy/v2/store_test.go +++ b/x/posts/legacy/v2/store_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/stretchr/testify/require" @@ -36,7 +37,7 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) + keys := storetypes.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) paramsSubspace := newMockSubspace(types.Params{}) diff --git a/x/posts/legacy/v3/store.go b/x/posts/legacy/v3/store.go index d193f65d49..3731be0506 100644 --- a/x/posts/legacy/v3/store.go +++ b/x/posts/legacy/v3/store.go @@ -3,10 +3,10 @@ package v3 import ( "fmt" + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" v2 "github.com/desmos-labs/desmos/v6/x/posts/legacy/v2" @@ -44,7 +44,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar } // migratePosts migrates the posts preset inside the store from v2 to v3 -func migratePosts(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migratePosts(store storetypes.KVStore, cdc codec.BinaryCodec) error { prefixStore := prefix.NewStore(store, types.PostPrefix) iterator := prefixStore.Iterator(nil, nil) @@ -178,7 +178,7 @@ func migrateReplySettings(settings v2.ReplySetting) v4.ReplySetting { } // migrateAttachments migrates the attachments present inside the store from v2 to v3 -func migrateAttachments(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateAttachments(store storetypes.KVStore, cdc codec.BinaryCodec) error { prefixStore := prefix.NewStore(store, types.AttachmentPrefix) iterator := prefixStore.Iterator(nil, nil) @@ -266,7 +266,7 @@ func convertProvidedAnswers(v2Answers []v2.Poll_ProvidedAnswer) []v4.Poll_Provid } // migrateUserAnswers migrates all the user answers present inside the store from v2 to v3 -func migrateUserAnswers(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateUserAnswers(store storetypes.KVStore, cdc codec.BinaryCodec) error { prefixStore := prefix.NewStore(store, types.UserAnswerPrefix) iterator := prefixStore.Iterator(nil, nil) diff --git a/x/posts/legacy/v3/store_test.go b/x/posts/legacy/v3/store_test.go index c7367123b9..e5bc73a9c0 100644 --- a/x/posts/legacy/v3/store_test.go +++ b/x/posts/legacy/v3/store_test.go @@ -6,9 +6,10 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" v2 "github.com/desmos-labs/desmos/v6/x/posts/legacy/v2" @@ -25,9 +26,9 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) lastEditDate := time.Date(2022, 11, 30, 8, 0, 0, 0, time.UTC) testCases := []struct { diff --git a/x/posts/legacy/v4/models.pb.go b/x/posts/legacy/v4/models.pb.go index aa14ce1ab2..f4b1fa3bdb 100644 --- a/x/posts/legacy/v4/models.pb.go +++ b/x/posts/legacy/v4/models.pb.go @@ -1050,107 +1050,107 @@ var fileDescriptor_e95e095003620aff = []byte{ // 1652 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0x4b, 0x6f, 0x23, 0xc7, 0x11, 0xd6, 0x90, 0x5c, 0x3d, 0x5a, 0x22, 0x45, 0xb5, 0xe4, 0x15, 0x97, 0x6b, 0x73, 0xe8, 0xb6, - 0x11, 0x28, 0x46, 0x96, 0x44, 0x94, 0x18, 0x06, 0x16, 0xc8, 0x41, 0xa3, 0x9d, 0x35, 0x18, 0xe8, - 0x95, 0x26, 0xe9, 0x60, 0x7d, 0x99, 0xb4, 0x38, 0xbd, 0xd4, 0x04, 0xcd, 0x19, 0x7a, 0xba, 0x29, - 0x8b, 0x40, 0x80, 0x5c, 0x03, 0xe4, 0xe2, 0x63, 0x10, 0xe4, 0x60, 0x38, 0x7f, 0xc1, 0xfe, 0x0f, - 0x86, 0x4f, 0x3e, 0xe6, 0x34, 0x09, 0xb4, 0x97, 0xe4, 0x18, 0x9e, 0x73, 0x08, 0xfa, 0x31, 0xe4, - 0x90, 0xd4, 0x7a, 0xe3, 0x60, 0x01, 0xdf, 0x38, 0x55, 0xdf, 0x57, 0xd5, 0xd5, 0xf5, 0xe8, 0x22, - 0x78, 0xd3, 0xa7, 0x7c, 0x10, 0xf1, 0xe6, 0x30, 0xe2, 0x82, 0x37, 0xaf, 0x0f, 0x9b, 0x83, 0xc8, - 0xa7, 0x8c, 0x37, 0x86, 0x71, 0x24, 0x22, 0xb8, 0xad, 0xb5, 0x0d, 0xa5, 0x6d, 0x5c, 0x1f, 0x56, - 0xf7, 0xfa, 0x51, 0x3f, 0x52, 0xba, 0xa6, 0xfc, 0xa5, 0x61, 0xd5, 0x07, 0xfd, 0x28, 0xea, 0x33, - 0xda, 0x54, 0x5f, 0x97, 0xa3, 0xe7, 0x4d, 0x12, 0x8e, 0x8d, 0xca, 0x5e, 0x54, 0x89, 0x60, 0x40, - 0xb9, 0x20, 0x83, 0x61, 0xca, 0xed, 0x45, 0xd2, 0x85, 0xa7, 0x8d, 0xea, 0x0f, 0xad, 0x42, 0x5f, - 0xad, 0x81, 0xc2, 0x45, 0xc4, 0x05, 0x74, 0xc1, 0x26, 0x1f, 0x5d, 0xf2, 0x21, 0xe9, 0x51, 0x2f, - 0xf0, 0x2b, 0x56, 0xdd, 0x3a, 0x28, 0x38, 0xef, 0xde, 0x26, 0x36, 0x68, 0x1b, 0x71, 0xeb, 0xc9, - 0x24, 0xb1, 0xe1, 0x98, 0x0c, 0xd8, 0x63, 0x94, 0x81, 0x22, 0x0c, 0xd2, 0xaf, 0x96, 0x0f, 0x8f, - 0x00, 0xe0, 0xb4, 0x27, 0x82, 0x28, 0x94, 0x56, 0x72, 0x75, 0xeb, 0xa0, 0xe8, 0xa0, 0xdb, 0xc4, - 0xde, 0x68, 0x6b, 0xa9, 0x32, 0xb2, 0x63, 0x8c, 0x4c, 0x81, 0x08, 0x6f, 0x98, 0x8f, 0x96, 0x0f, - 0xdf, 0x01, 0xb9, 0xc0, 0xaf, 0xe4, 0xd5, 0x01, 0x76, 0x6f, 0x13, 0x3b, 0xa7, 0x38, 0x1b, 0x9a, - 0x23, 0xb1, 0xb9, 0xc0, 0x97, 0xc7, 0xa5, 0x37, 0x82, 0xc6, 0x21, 0x61, 0xd2, 0x51, 0xa1, 0x6e, - 0x1d, 0x6c, 0xe8, 0xe3, 0xba, 0x46, 0x9c, 0x3d, 0x6e, 0x06, 0x8a, 0x30, 0x48, 0xbf, 0x94, 0xaf, - 0x82, 0xa0, 0x37, 0xa2, 0x72, 0x4f, 0xf1, 0xb7, 0x27, 0x89, 0xbd, 0xa9, 0x19, 0x52, 0x8a, 0xb0, - 0x52, 0xc2, 0x5f, 0x82, 0x75, 0x1a, 0x8a, 0x40, 0x04, 0x94, 0x57, 0x56, 0xeb, 0xd6, 0xc1, 0xe6, - 0xe1, 0x83, 0xc6, 0x42, 0xd2, 0x1a, 0xae, 0x01, 0x38, 0xbb, 0x93, 0xc4, 0xde, 0x36, 0x5e, 0x8d, - 0x0c, 0xe1, 0x29, 0x5f, 0x39, 0x24, 0x7d, 0x5e, 0x59, 0xab, 0xe7, 0x17, 0x1c, 0x92, 0x3e, 0x97, - 0x0e, 0x49, 0x9f, 0xc3, 0x1f, 0x83, 0x55, 0x32, 0x12, 0x57, 0x51, 0x5c, 0x59, 0x57, 0xe7, 0xda, - 0x99, 0x24, 0x76, 0x51, 0xc3, 0xb4, 0x1c, 0x61, 0x03, 0x80, 0x5d, 0xb0, 0xdd, 0x8b, 0xc2, 0x6b, - 0x1a, 0x73, 0x92, 0x5e, 0xfa, 0x86, 0xba, 0xb9, 0x9f, 0xdc, 0x26, 0x76, 0xe9, 0x38, 0xa3, 0x52, - 0xf7, 0x71, 0x5f, 0x5b, 0x59, 0xa0, 0x20, 0x5c, 0xca, 0x4a, 0x5a, 0x3e, 0xfc, 0x2d, 0x28, 0xc7, - 0xf4, 0x39, 0x8d, 0x69, 0xd8, 0xa3, 0xbe, 0xa7, 0xa2, 0xac, 0x80, 0x7a, 0xfe, 0x60, 0xf3, 0xb0, - 0xb6, 0x14, 0xba, 0x2c, 0x1f, 0x9c, 0x82, 0x1d, 0xfb, 0xeb, 0xc4, 0x5e, 0x99, 0x24, 0xf6, 0xbe, - 0xf6, 0xb4, 0x68, 0x05, 0xe1, 0xed, 0x99, 0x48, 0x32, 0x39, 0xf4, 0x40, 0x29, 0xa6, 0x43, 0x36, - 0xf6, 0x38, 0x15, 0x22, 0x08, 0xfb, 0xbc, 0xb2, 0x59, 0xb7, 0x0e, 0x4a, 0x87, 0x6f, 0x2d, 0x79, - 0xc2, 0x12, 0xd6, 0xd6, 0x28, 0xe7, 0xc1, 0x24, 0xb1, 0xdf, 0x48, 0x9d, 0x64, 0xe9, 0x08, 0x17, - 0xe3, 0x0c, 0x90, 0x43, 0x02, 0x8a, 0xbd, 0x98, 0xea, 0x60, 0x7d, 0x22, 0x68, 0x65, 0x4b, 0x25, - 0xb1, 0xda, 0xd0, 0x7d, 0xd3, 0x48, 0xfb, 0xa6, 0xd1, 0x49, 0xfb, 0xc6, 0xa9, 0x9b, 0x28, 0xf6, - 0xcc, 0x7d, 0x65, 0xe9, 0xe8, 0xb3, 0xbf, 0xdb, 0x16, 0xde, 0x4a, 0x65, 0x4f, 0x88, 0xa0, 0x90, - 0x82, 0x32, 0x23, 0x5c, 0x78, 0xd4, 0x0f, 0x04, 0xf5, 0xb5, 0x97, 0xe2, 0x2b, 0xbd, 0xd8, 0xb3, - 0x7b, 0x5a, 0x64, 0x6b, 0x27, 0x25, 0x29, 0x76, 0x95, 0x54, 0xba, 0x79, 0xbc, 0xfe, 0xa7, 0xcf, - 0x6d, 0xeb, 0x9f, 0x9f, 0xdb, 0x16, 0xfa, 0xc6, 0x02, 0xc5, 0xb9, 0x8b, 0x87, 0x1f, 0x82, 0x82, - 0x18, 0x0f, 0xa9, 0xea, 0xdc, 0xd2, 0x21, 0xfa, 0xee, 0x34, 0x75, 0xc6, 0x43, 0x3a, 0x57, 0x7d, - 0xe3, 0x21, 0x95, 0xd5, 0x37, 0x1e, 0x52, 0xf8, 0x3e, 0x58, 0x93, 0xa4, 0xb4, 0x7f, 0x0b, 0xce, - 0x9b, 0xb7, 0x89, 0xbd, 0x2a, 0xe9, 0xaa, 0x84, 0x4a, 0x9a, 0x61, 0x20, 0x08, 0xaf, 0xca, 0x5f, - 0x2d, 0x1f, 0x36, 0xc1, 0xfa, 0x30, 0xe2, 0x81, 0xbc, 0x92, 0xb4, 0x79, 0x67, 0xad, 0x90, 0x6a, - 0x10, 0x9e, 0x82, 0x32, 0xc1, 0xfc, 0xdb, 0x02, 0xeb, 0x69, 0x03, 0xc1, 0x53, 0xb0, 0x7e, 0x45, - 0xf8, 0x95, 0xea, 0x12, 0x4b, 0x95, 0x5c, 0x65, 0x29, 0x96, 0x0e, 0xbd, 0x11, 0x1d, 0xd2, 0x77, - 0xf6, 0x4d, 0x9a, 0x8c, 0x97, 0x94, 0x87, 0xf0, 0xd4, 0x84, 0x34, 0x37, 0x90, 0xdd, 0x17, 0x85, - 0xbc, 0x92, 0xfb, 0x7e, 0xe6, 0x52, 0x1e, 0xc2, 0x53, 0x13, 0xf0, 0x17, 0xa0, 0x30, 0x8a, 0x19, - 0xaf, 0xe4, 0x95, 0xa9, 0xbd, 0x25, 0x53, 0xdd, 0x98, 0x39, 0xbb, 0xc6, 0x8c, 0xb9, 0x5b, 0x89, - 0x47, 0x58, 0xd1, 0x32, 0x31, 0xff, 0x1e, 0xac, 0x19, 0xb7, 0xf0, 0x47, 0xe0, 0x1e, 0x17, 0x24, - 0x16, 0x66, 0xe8, 0x96, 0x27, 0x89, 0xbd, 0x65, 0x26, 0xa4, 0x14, 0x23, 0xac, 0xd5, 0xb0, 0x0e, - 0xf2, 0x34, 0x4c, 0x93, 0x52, 0x9a, 0x24, 0x36, 0x48, 0xe7, 0x8c, 0x8f, 0xb0, 0x54, 0x49, 0x84, - 0x20, 0x7d, 0x75, 0xfd, 0x1b, 0x59, 0x84, 0x20, 0x7d, 0x84, 0xa5, 0x2a, 0x73, 0x80, 0x2f, 0x2d, - 0x90, 0xef, 0xc6, 0xec, 0xf5, 0x7a, 0x1f, 0xc5, 0x6c, 0xd9, 0xfb, 0x28, 0x66, 0x08, 0x4b, 0x15, - 0xfc, 0x00, 0x6c, 0xfa, 0x01, 0x1f, 0x32, 0x32, 0xf6, 0x24, 0x52, 0x4f, 0xed, 0xfb, 0xb3, 0x39, - 0x9d, 0x51, 0x22, 0x0c, 0xcc, 0x57, 0x37, 0x66, 0x99, 0x63, 0x7f, 0x91, 0x03, 0xe0, 0x48, 0x08, - 0xd2, 0xbb, 0x92, 0x39, 0x79, 0x5d, 0xcf, 0xd6, 0xff, 0x59, 0xf3, 0xb3, 0xa7, 0xaa, 0xf8, 0xf2, - 0xa7, 0xaa, 0x0f, 0xd6, 0x7a, 0x51, 0x28, 0x68, 0x28, 0x54, 0xc0, 0xb2, 0x6a, 0x16, 0x47, 0xc2, - 0x51, 0x38, 0x76, 0x3e, 0x98, 0xf9, 0x31, 0x70, 0xf4, 0xcd, 0x97, 0x8f, 0xde, 0x5e, 0x2c, 0xb0, - 0x59, 0xec, 0xc7, 0x1a, 0x85, 0x53, 0xeb, 0x99, 0x4b, 0xfa, 0xa3, 0x05, 0xee, 0x9d, 0x52, 0x3f, - 0x20, 0x3a, 0x27, 0x81, 0x0a, 0x6a, 0x21, 0x27, 0x81, 0xca, 0x49, 0x00, 0x7f, 0x0a, 0x36, 0x06, - 0xc1, 0x80, 0x7a, 0x6a, 0x78, 0xe8, 0xdc, 0xed, 0x4d, 0x12, 0xbb, 0x6c, 0x7a, 0x20, 0x55, 0xc9, - 0x26, 0x08, 0x06, 0x6a, 0x70, 0x3c, 0x7e, 0x94, 0x3a, 0xfa, 0x9f, 0x0e, 0x88, 0xfe, 0x75, 0x4f, - 0xee, 0x18, 0x8c, 0xc9, 0x11, 0xf1, 0xc9, 0x88, 0x72, 0x35, 0x22, 0x2c, 0xe5, 0x29, 0x33, 0x22, - 0x52, 0x0d, 0xc2, 0x53, 0x10, 0x1c, 0x82, 0xf2, 0x30, 0x8e, 0xae, 0x03, 0x9f, 0xfa, 0x1e, 0x09, - 0xf9, 0xa7, 0x34, 0x4e, 0x9b, 0xf8, 0xdd, 0x3b, 0xe6, 0x1b, 0x63, 0x8d, 0x0b, 0x83, 0x3e, 0x52, - 0xe0, 0xc5, 0xc7, 0x68, 0xd1, 0x16, 0xc2, 0xdb, 0xc3, 0x39, 0x02, 0x87, 0x58, 0xbe, 0xf5, 0x66, - 0x80, 0xe7, 0x5f, 0x39, 0xc0, 0x1f, 0xce, 0x0f, 0x8c, 0x94, 0xa9, 0x87, 0xf7, 0x1a, 0x0d, 0xd5, - 0xd4, 0x86, 0x1f, 0x83, 0x7d, 0xc2, 0x58, 0xf4, 0x29, 0xf7, 0x06, 0x23, 0x26, 0x82, 0x21, 0xa3, - 0xd3, 0x60, 0x64, 0x41, 0xac, 0x3b, 0x68, 0x92, 0xd8, 0x35, 0xf3, 0xbe, 0xdf, 0x0d, 0x44, 0xf8, - 0x0d, 0xad, 0x39, 0x35, 0x8a, 0xf4, 0xbc, 0xe7, 0x60, 0xd7, 0x50, 0x34, 0x52, 0xbd, 0x21, 0x5c, - 0xed, 0x33, 0xeb, 0xea, 0x7d, 0x79, 0x38, 0x67, 0xd7, 0x98, 0xd3, 0x28, 0x84, 0x77, 0xb4, 0x58, - 0x1b, 0x93, 0xef, 0x0c, 0x87, 0x9f, 0x80, 0xdd, 0xe7, 0x81, 0x5c, 0x95, 0x04, 0x61, 0x6c, 0xec, - 0xc5, 0x94, 0x8f, 0x98, 0x48, 0xf7, 0x9e, 0xb7, 0xef, 0xbc, 0xf5, 0x8e, 0x44, 0x62, 0x0d, 0x74, - 0x6a, 0x93, 0xc4, 0xae, 0x6a, 0x9f, 0x77, 0xd8, 0x41, 0x78, 0x47, 0x49, 0xb3, 0x94, 0xea, 0x9f, - 0x2d, 0x50, 0x9a, 0x4f, 0xdc, 0x74, 0x2f, 0xb3, 0xbe, 0x6b, 0x2f, 0x7b, 0x06, 0x36, 0xc9, 0xb4, - 0xd8, 0xd2, 0xc2, 0x78, 0xd8, 0x78, 0x79, 0x41, 0x3a, 0x55, 0x93, 0x2f, 0x33, 0x0e, 0x32, 0x6c, - 0x84, 0xb3, 0xb6, 0x66, 0xad, 0xf4, 0x7d, 0x6b, 0xfd, 0xab, 0x1c, 0x00, 0x5d, 0x4e, 0x63, 0x13, - 0xc7, 0x0f, 0x3b, 0x9e, 0x14, 0x8d, 0xa9, 0x05, 0x59, 0xcf, 0x28, 0x43, 0x63, 0x6c, 0x9e, 0xc6, - 0x58, 0x4a, 0x63, 0x72, 0x29, 0x3e, 0x06, 0xdb, 0x69, 0x9d, 0x04, 0xa1, 0x4f, 0x6f, 0xa8, 0xac, - 0xd3, 0xfc, 0x41, 0xd1, 0xa9, 0xce, 0x36, 0xc8, 0x05, 0x00, 0xc2, 0x25, 0x23, 0x69, 0x69, 0x81, - 0xcc, 0xe0, 0x88, 0xd3, 0x78, 0x79, 0xb3, 0x96, 0x52, 0xf9, 0x1c, 0x72, 0x1a, 0x67, 0x26, 0xd6, - 0x7f, 0x2c, 0x50, 0x5e, 0xac, 0x25, 0xf8, 0x1b, 0xb0, 0x96, 0xd6, 0x9f, 0xde, 0x04, 0x1a, 0xaf, - 0xac, 0xbf, 0x86, 0xbe, 0x78, 0xfd, 0xe5, 0xdc, 0x37, 0xf9, 0x2e, 0xa5, 0x7b, 0xa2, 0x29, 0xc2, - 0xd4, 0x6c, 0xf5, 0x77, 0x60, 0x2b, 0x4b, 0x80, 0x8f, 0xc1, 0x96, 0xe9, 0x23, 0x15, 0x98, 0x4a, - 0x58, 0xd1, 0xd9, 0x9f, 0x24, 0xf6, 0x6e, 0x36, 0x6e, 0xad, 0x95, 0x35, 0xa3, 0x3e, 0x55, 0xcc, - 0xf2, 0x21, 0xbd, 0x8e, 0x04, 0xe5, 0x26, 0x45, 0x99, 0x87, 0x54, 0x89, 0x11, 0xd6, 0xea, 0x4c, - 0x6d, 0xcd, 0xc2, 0xff, 0x08, 0xac, 0x5e, 0x90, 0x98, 0x0c, 0x38, 0x74, 0xc0, 0xf6, 0x80, 0xdc, - 0x78, 0xb2, 0xc0, 0x3d, 0x46, 0xc3, 0xbe, 0xb8, 0x32, 0x87, 0xc8, 0x5c, 0xfe, 0x02, 0x00, 0xe1, - 0xe2, 0x80, 0xdc, 0xc8, 0x6d, 0xe2, 0x44, 0x7d, 0xcf, 0xec, 0xbe, 0xf7, 0x17, 0x0b, 0xec, 0x2c, - 0x2d, 0x7e, 0xf0, 0x1d, 0x60, 0x5f, 0x9c, 0xb7, 0x3b, 0x1e, 0x76, 0x9f, 0xba, 0xd8, 0x3d, 0x3b, - 0x76, 0xbd, 0xce, 0xb3, 0x0b, 0xd7, 0xeb, 0x9e, 0xb5, 0x2f, 0xdc, 0xe3, 0xd6, 0xd3, 0x96, 0xfb, - 0xa4, 0xbc, 0x02, 0xdf, 0x02, 0x0f, 0xee, 0x02, 0x61, 0xf7, 0xe2, 0xe4, 0x59, 0xd9, 0x7a, 0x99, - 0xfa, 0x57, 0xdd, 0xf3, 0x8e, 0x5b, 0xce, 0xc1, 0x1a, 0xa8, 0xbe, 0x84, 0x7d, 0xde, 0xee, 0x94, - 0xf3, 0xd5, 0xc2, 0x1f, 0xfe, 0x5a, 0x5b, 0x79, 0xef, 0x0b, 0x0b, 0x6c, 0x65, 0x97, 0x7a, 0x69, - 0x55, 0x39, 0xf0, 0xda, 0x6e, 0xa7, 0xd3, 0x3a, 0xfb, 0x70, 0xe1, 0x4c, 0x55, 0x70, 0x7f, 0x5e, - 0xed, 0x7e, 0xe4, 0xe2, 0x67, 0xe7, 0x67, 0x6e, 0xd9, 0x82, 0x0f, 0xc1, 0xfe, 0xbc, 0xee, 0xe9, - 0xf9, 0xc9, 0xc9, 0xf9, 0xaf, 0x5d, 0xdc, 0x2e, 0xe7, 0x60, 0x05, 0xec, 0xcd, 0x2b, 0x4f, 0xbb, - 0x9d, 0xee, 0xd1, 0x49, 0x39, 0xbf, 0x6c, 0xf2, 0xd4, 0x3d, 0xeb, 0xb4, 0xce, 0xcf, 0xda, 0xe5, - 0x82, 0x3e, 0xa4, 0x73, 0xf2, 0xf5, 0x6d, 0xcd, 0xfa, 0xf6, 0xb6, 0x66, 0xfd, 0xe3, 0xb6, 0x66, - 0x7d, 0xf6, 0xa2, 0xb6, 0xf2, 0xed, 0x8b, 0xda, 0xca, 0xdf, 0x5e, 0xd4, 0x56, 0x3e, 0x3e, 0xec, - 0x07, 0xe2, 0x6a, 0x74, 0xd9, 0xe8, 0x45, 0x83, 0xa6, 0x2e, 0xcc, 0x47, 0x8c, 0x5c, 0x72, 0xf3, - 0xbb, 0x79, 0xfd, 0x7e, 0xf3, 0xc6, 0xfc, 0xe9, 0x67, 0xb4, 0x4f, 0x7a, 0xe3, 0xe6, 0xf5, 0xcf, - 0x2f, 0x57, 0xd5, 0x33, 0xf2, 0xb3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x0a, 0xeb, 0x0c, 0x59, + 0x11, 0x28, 0x46, 0x96, 0x44, 0x94, 0x87, 0x81, 0x05, 0x72, 0xd0, 0x68, 0x67, 0x0d, 0x06, 0x7a, + 0xa5, 0x49, 0x3a, 0x58, 0x5f, 0x26, 0x2d, 0x4e, 0x2f, 0x35, 0x41, 0x73, 0x86, 0x9e, 0x6e, 0xca, + 0x22, 0x10, 0x20, 0xd7, 0x00, 0xb9, 0xf8, 0x18, 0x04, 0x39, 0x18, 0xce, 0x5f, 0xb0, 0xff, 0x83, + 0xe1, 0x93, 0x8f, 0x39, 0x4d, 0x02, 0xed, 0x25, 0x39, 0x86, 0xe7, 0x1c, 0x82, 0x7e, 0x0c, 0x39, + 0x24, 0xb5, 0xde, 0x38, 0x58, 0xc0, 0x37, 0x4e, 0xd5, 0xf7, 0x55, 0x75, 0x75, 0x3d, 0xba, 0x08, + 0xde, 0xf4, 0x29, 0x1f, 0x44, 0xbc, 0x39, 0x8c, 0xb8, 0xe0, 0xcd, 0xeb, 0xc3, 0xe6, 0x20, 0xf2, + 0x29, 0xe3, 0x8d, 0x61, 0x1c, 0x89, 0x08, 0x6e, 0x6b, 0x6d, 0x43, 0x69, 0x1b, 0xd7, 0x87, 0xd5, + 0xbd, 0x7e, 0xd4, 0x8f, 0x94, 0xae, 0x29, 0x7f, 0x69, 0x58, 0xf5, 0x41, 0x3f, 0x8a, 0xfa, 0x8c, + 0x36, 0xd5, 0xd7, 0xe5, 0xe8, 0x79, 0x93, 0x84, 0x63, 0xa3, 0xb2, 0x17, 0x55, 0x22, 0x18, 0x50, + 0x2e, 0xc8, 0x60, 0x98, 0x72, 0x7b, 0x91, 0x74, 0xe1, 0x69, 0xa3, 0xfa, 0x43, 0xab, 0xd0, 0x97, + 0x6b, 0xa0, 0x70, 0x11, 0x71, 0x01, 0x5d, 0xb0, 0xc9, 0x47, 0x97, 0x7c, 0x48, 0x7a, 0xd4, 0x0b, + 0xfc, 0x8a, 0x55, 0xb7, 0x0e, 0x0a, 0xce, 0xbb, 0xb7, 0x89, 0x0d, 0xda, 0x46, 0xdc, 0x7a, 0x32, + 0x49, 0x6c, 0x38, 0x26, 0x03, 0xf6, 0x18, 0x65, 0xa0, 0x08, 0x83, 0xf4, 0xab, 0xe5, 0xc3, 0x23, + 0x00, 0x38, 0xed, 0x89, 0x20, 0x0a, 0xa5, 0x95, 0x5c, 0xdd, 0x3a, 0x28, 0x3a, 0xe8, 0x36, 0xb1, + 0x37, 0xda, 0x5a, 0xaa, 0x8c, 0xec, 0x18, 0x23, 0x53, 0x20, 0xc2, 0x1b, 0xe6, 0xa3, 0xe5, 0xc3, + 0x77, 0x40, 0x2e, 0xf0, 0x2b, 0x79, 0x75, 0x80, 0xdd, 0xdb, 0xc4, 0xce, 0x29, 0xce, 0x86, 0xe6, + 0x48, 0x6c, 0x2e, 0xf0, 0xe5, 0x71, 0xe9, 0x8d, 0xa0, 0x71, 0x48, 0x98, 0x74, 0x54, 0xa8, 0x5b, + 0x07, 0x1b, 0xfa, 0xb8, 0xae, 0x11, 0x67, 0x8f, 0x9b, 0x81, 0x22, 0x0c, 0xd2, 0x2f, 0xe5, 0xab, + 0x20, 0xe8, 0x8d, 0xa8, 0xdc, 0x53, 0xfc, 0xed, 0x49, 0x62, 0x6f, 0x6a, 0x86, 0x94, 0x22, 0xac, + 0x94, 0xf0, 0x97, 0x60, 0x9d, 0x86, 0x22, 0x10, 0x01, 0xe5, 0x95, 0xd5, 0xba, 0x75, 0xb0, 0x79, + 0xf8, 0xa0, 0xb1, 0x90, 0xb4, 0x86, 0x6b, 0x00, 0xce, 0xee, 0x24, 0xb1, 0xb7, 0x8d, 0x57, 0x23, + 0x43, 0x78, 0xca, 0x57, 0x0e, 0x49, 0x9f, 0x57, 0xd6, 0xea, 0xf9, 0x05, 0x87, 0xa4, 0xcf, 0xa5, + 0x43, 0xd2, 0xe7, 0xf0, 0x87, 0x60, 0x95, 0x8c, 0xc4, 0x55, 0x14, 0x57, 0xd6, 0xd5, 0xb9, 0x76, + 0x26, 0x89, 0x5d, 0xd4, 0x30, 0x2d, 0x47, 0xd8, 0x00, 0x60, 0x17, 0x6c, 0xf7, 0xa2, 0xf0, 0x9a, + 0xc6, 0x9c, 0xa4, 0x97, 0xbe, 0xa1, 0x6e, 0xee, 0x47, 0xb7, 0x89, 0x5d, 0x3a, 0xce, 0xa8, 0xd4, + 0x7d, 0xdc, 0xd7, 0x56, 0x16, 0x28, 0x08, 0x97, 0xb2, 0x92, 0x96, 0x0f, 0x7f, 0x0b, 0xca, 0x31, + 0x7d, 0x4e, 0x63, 0x1a, 0xf6, 0xa8, 0xef, 0xa9, 0x28, 0x2b, 0xa0, 0x9e, 0x3f, 0xd8, 0x3c, 0xac, + 0x2d, 0x85, 0x2e, 0xcb, 0x07, 0xa7, 0x60, 0xc7, 0xfe, 0x2a, 0xb1, 0x57, 0x26, 0x89, 0xbd, 0xaf, + 0x3d, 0x2d, 0x5a, 0x41, 0x78, 0x7b, 0x26, 0x92, 0x4c, 0x0e, 0x3d, 0x50, 0x8a, 0xe9, 0x90, 0x8d, + 0x3d, 0x4e, 0x85, 0x08, 0xc2, 0x3e, 0xaf, 0x6c, 0xd6, 0xad, 0x83, 0xd2, 0xe1, 0x5b, 0x4b, 0x9e, + 0xb0, 0x84, 0xb5, 0x35, 0xca, 0x79, 0x30, 0x49, 0xec, 0x37, 0x52, 0x27, 0x59, 0x3a, 0xc2, 0xc5, + 0x38, 0x03, 0xe4, 0x90, 0x80, 0x62, 0x2f, 0xa6, 0x3a, 0x58, 0x9f, 0x08, 0x5a, 0xd9, 0x52, 0x49, + 0xac, 0x36, 0x74, 0xdf, 0x34, 0xd2, 0xbe, 0x69, 0x74, 0xd2, 0xbe, 0x71, 0xea, 0x26, 0x8a, 0x3d, + 0x73, 0x5f, 0x59, 0x3a, 0xfa, 0xf4, 0xef, 0xb6, 0x85, 0xb7, 0x52, 0xd9, 0x13, 0x22, 0x28, 0xa4, + 0xa0, 0xcc, 0x08, 0x17, 0x1e, 0xf5, 0x03, 0x41, 0x7d, 0xed, 0xa5, 0xf8, 0x4a, 0x2f, 0xf6, 0xec, + 0x9e, 0x16, 0xd9, 0xda, 0x49, 0x49, 0x8a, 0x5d, 0x25, 0x95, 0x6e, 0x1e, 0xaf, 0xff, 0xe9, 0x33, + 0xdb, 0xfa, 0xe7, 0x67, 0xb6, 0x85, 0xbe, 0xb6, 0x40, 0x71, 0xee, 0xe2, 0xe1, 0x07, 0xa0, 0x20, + 0xc6, 0x43, 0xaa, 0x3a, 0xb7, 0x74, 0x88, 0xbe, 0x3d, 0x4d, 0x9d, 0xf1, 0x90, 0xce, 0x55, 0xdf, + 0x78, 0x48, 0x65, 0xf5, 0x8d, 0x87, 0x14, 0xfe, 0x0c, 0xac, 0x49, 0x52, 0xda, 0xbf, 0x05, 0xe7, + 0xcd, 0xdb, 0xc4, 0x5e, 0x95, 0x74, 0x55, 0x42, 0x25, 0xcd, 0x30, 0x10, 0x84, 0x57, 0xe5, 0xaf, + 0x96, 0x0f, 0x9b, 0x60, 0x7d, 0x18, 0xf1, 0x40, 0x5e, 0x49, 0xda, 0xbc, 0xb3, 0x56, 0x48, 0x35, + 0x08, 0x4f, 0x41, 0x99, 0x60, 0xfe, 0x6d, 0x81, 0xf5, 0xb4, 0x81, 0xe0, 0x29, 0x58, 0xbf, 0x22, + 0xfc, 0x4a, 0x75, 0x89, 0xa5, 0x4a, 0xae, 0xb2, 0x14, 0x4b, 0x87, 0xde, 0x88, 0x0e, 0xe9, 0x3b, + 0xfb, 0x26, 0x4d, 0xc6, 0x4b, 0xca, 0x43, 0x78, 0x6a, 0x42, 0x9a, 0x1b, 0xc8, 0xee, 0x8b, 0x42, + 0x5e, 0xc9, 0x7d, 0x37, 0x73, 0x29, 0x0f, 0xe1, 0xa9, 0x09, 0xf8, 0x0b, 0x50, 0x18, 0xc5, 0x8c, + 0x57, 0xf2, 0xca, 0xd4, 0xde, 0x92, 0xa9, 0x6e, 0xcc, 0x9c, 0x5d, 0x63, 0xc6, 0xdc, 0xad, 0xc4, + 0x23, 0xac, 0x68, 0x99, 0x98, 0x7f, 0x0f, 0xd6, 0x8c, 0x5b, 0xf8, 0x03, 0x70, 0x8f, 0x0b, 0x12, + 0x0b, 0x33, 0x74, 0xcb, 0x93, 0xc4, 0xde, 0x32, 0x13, 0x52, 0x8a, 0x11, 0xd6, 0x6a, 0x58, 0x07, + 0x79, 0x1a, 0xa6, 0x49, 0x29, 0x4d, 0x12, 0x1b, 0xa4, 0x73, 0xc6, 0x47, 0x58, 0xaa, 0x24, 0x42, + 0x90, 0xbe, 0xba, 0xfe, 0x8d, 0x2c, 0x42, 0x90, 0x3e, 0xc2, 0x52, 0x95, 0x39, 0xc0, 0x17, 0x16, + 0xc8, 0x77, 0x63, 0xf6, 0x7a, 0xbd, 0x8f, 0x62, 0xb6, 0xec, 0x7d, 0x14, 0x33, 0x84, 0xa5, 0x0a, + 0xbe, 0x0f, 0x36, 0xfd, 0x80, 0x0f, 0x19, 0x19, 0x7b, 0x12, 0xa9, 0xa7, 0xf6, 0xfd, 0xd9, 0x9c, + 0xce, 0x28, 0x11, 0x06, 0xe6, 0xab, 0x1b, 0xb3, 0xcc, 0xb1, 0x3f, 0xcf, 0x01, 0x70, 0x24, 0x04, + 0xe9, 0x5d, 0xc9, 0x9c, 0xbc, 0xae, 0x67, 0xeb, 0xff, 0xac, 0xf9, 0xd9, 0x53, 0x55, 0x7c, 0xf9, + 0x53, 0xd5, 0x07, 0x6b, 0xbd, 0x28, 0x14, 0x34, 0x14, 0x2a, 0x60, 0x59, 0x35, 0x8b, 0x23, 0xe1, + 0x28, 0x1c, 0x3b, 0xef, 0xcf, 0xfc, 0x18, 0x38, 0xfa, 0xfa, 0x8b, 0x47, 0x6f, 0x2f, 0x16, 0xd8, + 0x2c, 0xf6, 0x63, 0x8d, 0xc2, 0xa9, 0xf5, 0xcc, 0x25, 0xfd, 0xd1, 0x02, 0xf7, 0x4e, 0xa9, 0x1f, + 0x10, 0x9d, 0x93, 0x40, 0x05, 0xb5, 0x90, 0x93, 0x40, 0xe5, 0x24, 0x80, 0x3f, 0x06, 0x1b, 0x83, + 0x60, 0x40, 0x3d, 0x35, 0x3c, 0x74, 0xee, 0xf6, 0x26, 0x89, 0x5d, 0x36, 0x3d, 0x90, 0xaa, 0x64, + 0x13, 0x04, 0x03, 0x35, 0x38, 0x1e, 0x3f, 0x4a, 0x1d, 0xfd, 0x4f, 0x07, 0x44, 0xff, 0xba, 0x27, + 0x77, 0x0c, 0xc6, 0xe4, 0x88, 0xf8, 0x78, 0x44, 0xb9, 0x1a, 0x11, 0x96, 0xf2, 0x94, 0x19, 0x11, + 0xa9, 0x06, 0xe1, 0x29, 0x08, 0x0e, 0x41, 0x79, 0x18, 0x47, 0xd7, 0x81, 0x4f, 0x7d, 0x8f, 0x84, + 0xfc, 0x13, 0x1a, 0xa7, 0x4d, 0xfc, 0xee, 0x1d, 0xf3, 0x8d, 0xb1, 0xc6, 0x85, 0x41, 0x1f, 0x29, + 0xf0, 0xe2, 0x63, 0xb4, 0x68, 0x0b, 0xe1, 0xed, 0xe1, 0x1c, 0x81, 0x43, 0x2c, 0xdf, 0x7a, 0x33, + 0xc0, 0xf3, 0xaf, 0x1c, 0xe0, 0x0f, 0xe7, 0x07, 0x46, 0xca, 0xd4, 0xc3, 0x7b, 0x8d, 0x86, 0x6a, + 0x6a, 0xc3, 0x8f, 0xc0, 0x3e, 0x61, 0x2c, 0xfa, 0x84, 0x7b, 0x83, 0x11, 0x13, 0xc1, 0x90, 0xd1, + 0x69, 0x30, 0xb2, 0x20, 0xd6, 0x1d, 0x34, 0x49, 0xec, 0x9a, 0x79, 0xdf, 0xef, 0x06, 0x22, 0xfc, + 0x86, 0xd6, 0x9c, 0x1a, 0x45, 0x7a, 0xde, 0x73, 0xb0, 0x6b, 0x28, 0x1a, 0xa9, 0xde, 0x10, 0xae, + 0xf6, 0x99, 0x75, 0xf5, 0xbe, 0x3c, 0x9c, 0xb3, 0x6b, 0xcc, 0x69, 0x14, 0xc2, 0x3b, 0x5a, 0xac, + 0x8d, 0xc9, 0x77, 0x86, 0xc3, 0x8f, 0xc1, 0xee, 0xf3, 0x40, 0xae, 0x4a, 0x82, 0x30, 0x36, 0xf6, + 0x62, 0xca, 0x47, 0x4c, 0xa4, 0x7b, 0xcf, 0xdb, 0x77, 0xde, 0x7a, 0x47, 0x22, 0xb1, 0x06, 0x3a, + 0xb5, 0x49, 0x62, 0x57, 0xb5, 0xcf, 0x3b, 0xec, 0x20, 0xbc, 0xa3, 0xa4, 0x59, 0x4a, 0xf5, 0xcf, + 0x16, 0x28, 0xcd, 0x27, 0x6e, 0xba, 0x97, 0x59, 0xdf, 0xb6, 0x97, 0x3d, 0x03, 0x9b, 0x64, 0x5a, + 0x6c, 0x69, 0x61, 0x3c, 0x6c, 0xbc, 0xbc, 0x20, 0x9d, 0xaa, 0xc9, 0x97, 0x19, 0x07, 0x19, 0x36, + 0xc2, 0x59, 0x5b, 0xb3, 0x56, 0xfa, 0xae, 0xb5, 0xfe, 0x65, 0x0e, 0x80, 0x2e, 0xa7, 0xb1, 0x89, + 0xe3, 0xfb, 0x1d, 0x4f, 0x8a, 0xc6, 0xd4, 0x82, 0xac, 0x67, 0x94, 0xa1, 0x31, 0x36, 0x4f, 0x63, + 0x2c, 0xa5, 0x31, 0xb9, 0x14, 0x1f, 0x83, 0xed, 0xb4, 0x4e, 0x82, 0xd0, 0xa7, 0x37, 0x54, 0xd6, + 0x69, 0xfe, 0xa0, 0xe8, 0x54, 0x67, 0x1b, 0xe4, 0x02, 0x00, 0xe1, 0x92, 0x91, 0xb4, 0xb4, 0x40, + 0x66, 0x70, 0xc4, 0x69, 0xbc, 0xbc, 0x59, 0x4b, 0xa9, 0x7c, 0x0e, 0x39, 0x8d, 0x33, 0x13, 0xeb, + 0x3f, 0x16, 0x28, 0x2f, 0xd6, 0x12, 0xfc, 0x0d, 0x58, 0x4b, 0xeb, 0x4f, 0x6f, 0x02, 0x8d, 0x57, + 0xd6, 0x5f, 0x43, 0x5f, 0xbc, 0xfe, 0x72, 0xee, 0x9b, 0x7c, 0x97, 0xd2, 0x3d, 0xd1, 0x14, 0x61, + 0x6a, 0xb6, 0xfa, 0x3b, 0xb0, 0x95, 0x25, 0xc0, 0xc7, 0x60, 0xcb, 0xf4, 0x91, 0x0a, 0x4c, 0x25, + 0xac, 0xe8, 0xec, 0x4f, 0x12, 0x7b, 0x37, 0x1b, 0xb7, 0xd6, 0xca, 0x9a, 0x51, 0x9f, 0x2a, 0x66, + 0xf9, 0x90, 0x5e, 0x47, 0x82, 0x72, 0x93, 0xa2, 0xcc, 0x43, 0xaa, 0xc4, 0x08, 0x6b, 0x75, 0xa6, + 0xb6, 0x66, 0xe1, 0x7f, 0x08, 0x56, 0x2f, 0x48, 0x4c, 0x06, 0x1c, 0x3a, 0x60, 0x7b, 0x40, 0x6e, + 0x3c, 0x59, 0xe0, 0x1e, 0xa3, 0x61, 0x5f, 0x5c, 0x99, 0x43, 0x64, 0x2e, 0x7f, 0x01, 0x80, 0x70, + 0x71, 0x40, 0x6e, 0xe4, 0x36, 0x71, 0xa2, 0xbe, 0x67, 0x76, 0xdf, 0xfb, 0x8b, 0x05, 0x76, 0x96, + 0x16, 0x3f, 0xf8, 0x0e, 0xb0, 0x2f, 0xce, 0xdb, 0x1d, 0x0f, 0xbb, 0x4f, 0x5d, 0xec, 0x9e, 0x1d, + 0xbb, 0x5e, 0xe7, 0xd9, 0x85, 0xeb, 0x75, 0xcf, 0xda, 0x17, 0xee, 0x71, 0xeb, 0x69, 0xcb, 0x7d, + 0x52, 0x5e, 0x81, 0x6f, 0x81, 0x07, 0x77, 0x81, 0xb0, 0x7b, 0x71, 0xf2, 0xac, 0x6c, 0xbd, 0x4c, + 0xfd, 0xab, 0xee, 0x79, 0xc7, 0x2d, 0xe7, 0x60, 0x0d, 0x54, 0x5f, 0xc2, 0x3e, 0x6f, 0x77, 0xca, + 0xf9, 0x6a, 0xe1, 0x0f, 0x7f, 0xad, 0xad, 0xbc, 0xf7, 0xb9, 0x05, 0xb6, 0xb2, 0x4b, 0xbd, 0xb4, + 0xaa, 0x1c, 0x78, 0x6d, 0xb7, 0xd3, 0x69, 0x9d, 0x7d, 0xb0, 0x70, 0xa6, 0x2a, 0xb8, 0x3f, 0xaf, + 0x76, 0x3f, 0x74, 0xf1, 0xb3, 0xf3, 0x33, 0xb7, 0x6c, 0xc1, 0x87, 0x60, 0x7f, 0x5e, 0xf7, 0xf4, + 0xfc, 0xe4, 0xe4, 0xfc, 0xd7, 0x2e, 0x6e, 0x97, 0x73, 0xb0, 0x02, 0xf6, 0xe6, 0x95, 0xa7, 0xdd, + 0x4e, 0xf7, 0xe8, 0xa4, 0x9c, 0x5f, 0x36, 0x79, 0xea, 0x9e, 0x75, 0x5a, 0xe7, 0x67, 0xed, 0x72, + 0x41, 0x1f, 0xd2, 0x39, 0xf9, 0xea, 0xb6, 0x66, 0x7d, 0x73, 0x5b, 0xb3, 0xfe, 0x71, 0x5b, 0xb3, + 0x3e, 0x7d, 0x51, 0x5b, 0xf9, 0xe6, 0x45, 0x6d, 0xe5, 0x6f, 0x2f, 0x6a, 0x2b, 0x1f, 0x1d, 0xf6, + 0x03, 0x71, 0x35, 0xba, 0x6c, 0xf4, 0xa2, 0x41, 0x53, 0x17, 0xe6, 0x23, 0x46, 0x2e, 0xb9, 0xf9, + 0xdd, 0xbc, 0xfe, 0x79, 0xf3, 0xc6, 0xfc, 0xe9, 0x67, 0xb4, 0x4f, 0x7a, 0xe3, 0xe6, 0xf5, 0x4f, + 0x2f, 0x57, 0xd5, 0x33, 0xf2, 0x93, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xc6, 0x98, 0xea, 0x15, 0x10, 0x00, 0x00, } diff --git a/x/posts/legacy/v4/store.go b/x/posts/legacy/v4/store.go index fbc62eb06f..57fcb6d234 100644 --- a/x/posts/legacy/v4/store.go +++ b/x/posts/legacy/v4/store.go @@ -1,9 +1,9 @@ package v4 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/posts/types" @@ -19,7 +19,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar // removeInvalidPollAnswers iterates over all the polls and deletes the user answers for all the polls which // final results already been tallied. This is to delete all the answers that have been added after that. -func removeInvalidPollAnswers(store sdk.KVStore, cdc codec.BinaryCodec) error { +func removeInvalidPollAnswers(store storetypes.KVStore, cdc codec.BinaryCodec) error { attachmentStore := prefix.NewStore(store, types.AttachmentPrefix) attachmentsIterator := attachmentStore.Iterator(nil, nil) defer attachmentsIterator.Close() @@ -46,7 +46,7 @@ func removeInvalidPollAnswers(store sdk.KVStore, cdc codec.BinaryCodec) error { } // removePollAnswers removes from the store the answers related to the given poll -func removePollAnswers(store sdk.KVStore, subspaceID uint64, postID uint64, pollID uint32) error { +func removePollAnswers(store storetypes.KVStore, subspaceID uint64, postID uint64, pollID uint32) error { answersStore := prefix.NewStore(store, types.PollAnswersPrefix(subspaceID, postID, pollID)) answersIterator := answersStore.Iterator(nil, nil) diff --git a/x/posts/legacy/v4/store_test.go b/x/posts/legacy/v4/store_test.go index b7044b7fca..078b10a2c4 100644 --- a/x/posts/legacy/v4/store_test.go +++ b/x/posts/legacy/v4/store_test.go @@ -6,9 +6,10 @@ import ( v4 "github.com/desmos-labs/desmos/v6/x/posts/legacy/v4" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -21,9 +22,9 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) testCases := []struct { name string diff --git a/x/posts/legacy/v5/store.go b/x/posts/legacy/v5/store.go index 766ddc14a6..0dcc568c45 100644 --- a/x/posts/legacy/v5/store.go +++ b/x/posts/legacy/v5/store.go @@ -1,9 +1,9 @@ package v5 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" v4 "github.com/desmos-labs/desmos/v6/x/posts/legacy/v4" @@ -22,7 +22,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar } // migrateAttachments migrates all the attachments to v5 -func migrateAttachments(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateAttachments(store storetypes.KVStore, cdc codec.BinaryCodec) error { attachmentsStore := prefix.NewStore(store, types.AttachmentPrefix) attachmentsIterator := attachmentsStore.Iterator(nil, nil) defer attachmentsIterator.Close() diff --git a/x/posts/legacy/v5/store_test.go b/x/posts/legacy/v5/store_test.go index 782f233b66..ef6b1260fc 100644 --- a/x/posts/legacy/v5/store_test.go +++ b/x/posts/legacy/v5/store_test.go @@ -7,9 +7,10 @@ import ( v4 "github.com/desmos-labs/desmos/v6/x/posts/legacy/v4" v5 "github.com/desmos-labs/desmos/v6/x/posts/legacy/v5" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -22,9 +23,9 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) testCases := []struct { name string diff --git a/x/posts/legacy/v6/store.go b/x/posts/legacy/v6/store.go index 9b8f7a2477..d59e133807 100644 --- a/x/posts/legacy/v6/store.go +++ b/x/posts/legacy/v6/store.go @@ -1,8 +1,8 @@ package v6 import ( + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/posts/types" diff --git a/x/posts/legacy/v6/store_test.go b/x/posts/legacy/v6/store_test.go index 341fa753f4..0fefd844b8 100644 --- a/x/posts/legacy/v6/store_test.go +++ b/x/posts/legacy/v6/store_test.go @@ -3,6 +3,7 @@ package v6_test import ( "testing" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" @@ -34,7 +35,7 @@ func (ms mockSubspace) SetParamSet(ctx sdk.Context, ps paramstypes.ParamSet) { func TestMigrate(t *testing.T) { cdc, _ := app.MakeCodecs() - keys := sdk.NewKVStoreKeys(types.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) testCases := []struct { name string diff --git a/x/posts/legacy/v7/store.go b/x/posts/legacy/v7/store.go index e4092a7965..60281255aa 100644 --- a/x/posts/legacy/v7/store.go +++ b/x/posts/legacy/v7/store.go @@ -1,9 +1,9 @@ package v7 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/posts/types" diff --git a/x/posts/legacy/v7/store_test.go b/x/posts/legacy/v7/store_test.go index 5316a99945..89a1290cca 100644 --- a/x/posts/legacy/v7/store_test.go +++ b/x/posts/legacy/v7/store_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -16,7 +17,7 @@ import ( func TestMigrate(t *testing.T) { cdc, _ := app.MakeCodecs() - keys := sdk.NewKVStoreKeys(types.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) testCases := []struct { name string diff --git a/x/posts/module.go b/x/posts/module.go index 838ac19bce..ae51e5c40a 100644 --- a/x/posts/module.go +++ b/x/posts/module.go @@ -9,11 +9,11 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/depinject" + storetypes "cosmossdk.io/store/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -52,7 +52,6 @@ var ( _ module.AppModuleBasic = AppModuleBasic{} _ module.AppModuleSimulation = AppModule{} _ appmodule.AppModule = AppModule{} - _ depinject.OnePerModuleType = AppModule{} ) // AppModuleBasic defines the basic application module used by the posts module. @@ -206,16 +205,6 @@ func (AppModule) ConsensusVersion() uint64 { return consensusVersion } -// BeginBlock returns the begin blocker for the posts module. -func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} - -// EndBlock returns the end blocker for the posts module. It returns no validator -// updates. -func (am AppModule) EndBlock(ctx sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - EndBlocker(ctx, am.keeper) - return []abci.ValidatorUpdate{} -} - // -------------------------------------------------------------------------------------------------------------------- // AppModuleSimulation defines the module simulation functions used by the posts module. @@ -232,7 +221,7 @@ func (AppModule) ProposalMsgs(simState module.SimulationState) []simtypes.Weight } // RegisterStoreDecoder performs a no-op. -func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { +func (am AppModule) RegisterStoreDecoder(sdr simtypes.StoreDecoderRegistry) { sdr[types.ModuleName] = simulation.NewDecodeStore(am.cdc) } diff --git a/x/posts/simulation/operations.go b/x/posts/simulation/operations.go index 34ea690873..aba9753cf9 100644 --- a/x/posts/simulation/operations.go +++ b/x/posts/simulation/operations.go @@ -53,77 +53,77 @@ func WeightedOperations( k *keeper.Keeper, sk types.SubspacesKeeper, ak authkeeper.AccountKeeper, bk bankkeeper.Keeper, ) sim.WeightedOperations { var weightMsgCreatePost int - appParams.GetOrGenerate(cdc, OpWeightMsgCreatePost, &weightMsgCreatePost, nil, + appParams.GetOrGenerate(OpWeightMsgCreatePost, &weightMsgCreatePost, nil, func(_ *rand.Rand) { weightMsgCreatePost = DefaultWeightMsgCreatePost }, ) var weightMsgEditPost int - appParams.GetOrGenerate(cdc, OpWeightMsgEditPost, &weightMsgEditPost, nil, + appParams.GetOrGenerate(OpWeightMsgEditPost, &weightMsgEditPost, nil, func(_ *rand.Rand) { weightMsgEditPost = DefaultWeightMsgEditPost }, ) var weightMsgDeletePost int - appParams.GetOrGenerate(cdc, OpWeightMsgDeletePost, &weightMsgDeletePost, nil, + appParams.GetOrGenerate(OpWeightMsgDeletePost, &weightMsgDeletePost, nil, func(_ *rand.Rand) { weightMsgDeletePost = DefaultWeightMsgDeletePost }, ) var weightMsgAddPostAttachment int - appParams.GetOrGenerate(cdc, OpWeightMsgAddPostAttachment, &weightMsgAddPostAttachment, nil, + appParams.GetOrGenerate(OpWeightMsgAddPostAttachment, &weightMsgAddPostAttachment, nil, func(_ *rand.Rand) { weightMsgAddPostAttachment = DefaultWeightMsgAddPostAttachment }, ) var weightMsgRemovePostAttachment int - appParams.GetOrGenerate(cdc, OpWeightMsgRemovePostAttachment, &weightMsgRemovePostAttachment, nil, + appParams.GetOrGenerate(OpWeightMsgRemovePostAttachment, &weightMsgRemovePostAttachment, nil, func(_ *rand.Rand) { weightMsgRemovePostAttachment = DefaultWeightMsgRemovePostAttachment }, ) var weightMsgAnswerPoll int - appParams.GetOrGenerate(cdc, OpWeightMsgAnswerPoll, &weightMsgAnswerPoll, nil, + appParams.GetOrGenerate(OpWeightMsgAnswerPoll, &weightMsgAnswerPoll, nil, func(_ *rand.Rand) { weightMsgAnswerPoll = DefaultWeightMsgAnswerPoll }, ) var weightMsgMovePost int - appParams.GetOrGenerate(cdc, OpWeightMsgMovePost, &weightMsgMovePost, nil, + appParams.GetOrGenerate(OpWeightMsgMovePost, &weightMsgMovePost, nil, func(_ *rand.Rand) { weightMsgMovePost = DefaultWeightMsgMovePost }, ) var weightMsgRequestPostOwnerTransfer int - appParams.GetOrGenerate(cdc, OpWeightMsgRequestPostOwnerTransfer, &weightMsgRequestPostOwnerTransfer, nil, + appParams.GetOrGenerate(OpWeightMsgRequestPostOwnerTransfer, &weightMsgRequestPostOwnerTransfer, nil, func(r *rand.Rand) { weightMsgRequestPostOwnerTransfer = DefaultWeightMsgRequestPostOwnerTransfer }, ) var weightMsgCancelPostOwnerTransferRequest int - appParams.GetOrGenerate(cdc, OpWeightMsgCancelPostOwnerTransferRequest, &weightMsgCancelPostOwnerTransferRequest, nil, + appParams.GetOrGenerate(OpWeightMsgCancelPostOwnerTransferRequest, &weightMsgCancelPostOwnerTransferRequest, nil, func(r *rand.Rand) { weightMsgCancelPostOwnerTransferRequest = DefaultWeightMsgCancelPostOwnerTransferRequest }, ) var weightMsgAcceptPostOwnerTransferRequest int - appParams.GetOrGenerate(cdc, OpWeightMsgAcceptPostOwnerTransferRequest, &weightMsgAcceptPostOwnerTransferRequest, nil, + appParams.GetOrGenerate(OpWeightMsgAcceptPostOwnerTransferRequest, &weightMsgAcceptPostOwnerTransferRequest, nil, func(r *rand.Rand) { weightMsgAcceptPostOwnerTransferRequest = DefaultWeightMsgAcceptPostOwnerTransferRequest }, ) var weightMsgRefusePostOwnerTransferRequest int - appParams.GetOrGenerate(cdc, OpWeightMsgRefusePostOwnerTransferRequest, &weightMsgRefusePostOwnerTransferRequest, nil, + appParams.GetOrGenerate(OpWeightMsgRefusePostOwnerTransferRequest, &weightMsgRefusePostOwnerTransferRequest, nil, func(r *rand.Rand) { weightMsgRefusePostOwnerTransferRequest = DefaultWeightMsgRefusePostOwnerTransferRequest }, diff --git a/x/posts/types/codec.go b/x/posts/types/codec.go index 6a75a92338..6e9d7a02d5 100644 --- a/x/posts/types/codec.go +++ b/x/posts/types/codec.go @@ -6,11 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" "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" - authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" - govcodec "github.com/cosmos/cosmos-sdk/x/gov/codec" ) func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { @@ -60,29 +57,3 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } - -var ( - amino = codec.NewLegacyAmino() - - // AminoCodec references the global x/posts module codec. Note, the codec should - // ONLY be used in certain instances of tests and for JSON encoding as Amino is - // still used for that purpose. - // - // The actual codec used for serialization should be provided to x/posts and - // defined at the application level. - AminoCodec = codec.NewAminoCodec(amino) -) - -func init() { - RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) - sdk.RegisterLegacyAminoCodec(amino) - - // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be - // used to properly serialize MsgGrant and MsgExec instances - RegisterLegacyAminoCodec(authzcodec.Amino) - - // Register all Amino interfaces and concrete types on the gov Amino codec so that this can later be - // used to properly serialize MsgSubmitProposal instances - RegisterLegacyAminoCodec(govcodec.Amino) -} diff --git a/x/posts/types/genesis.pb.go b/x/posts/types/genesis.pb.go index ba5276ac2d..2829a05f9b 100644 --- a/x/posts/types/genesis.pb.go +++ b/x/posts/types/genesis.pb.go @@ -325,46 +325,46 @@ var fileDescriptor_c9604ecc42366da8 = []byte{ // 670 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xcd, 0x4e, 0xdb, 0x4c, 0x14, 0xcd, 0xf0, 0x13, 0x60, 0x42, 0x40, 0x98, 0x0f, 0xe1, 0x8f, 0x52, 0x3b, 0xa2, 0x9b, 0xb4, - 0x52, 0x6d, 0x09, 0xd4, 0x4a, 0x65, 0x47, 0x94, 0xaa, 0x58, 0x55, 0x55, 0x14, 0xe8, 0xa6, 0x1b, - 0x6b, 0x12, 0x0f, 0x61, 0xa4, 0xb1, 0xc7, 0xf5, 0x1d, 0x87, 0xf2, 0x04, 0x55, 0x77, 0x2c, 0xbb, - 0x64, 0xd9, 0x65, 0x1f, 0xa0, 0x0f, 0xc0, 0x92, 0x65, 0xa5, 0x4a, 0x69, 0x65, 0x16, 0xed, 0x63, - 0x54, 0x1e, 0x3b, 0x89, 0x43, 0x60, 0xd1, 0x45, 0x37, 0xd6, 0xcc, 0xdc, 0x73, 0xce, 0x3d, 0x33, - 0x3a, 0xbe, 0xf8, 0xbe, 0x47, 0xc1, 0x17, 0x60, 0x87, 0x02, 0x24, 0xd8, 0xbd, 0x1d, 0xbb, 0x4b, - 0x03, 0x0a, 0x0c, 0xac, 0x30, 0x12, 0x52, 0x68, 0xcb, 0x59, 0xd9, 0x52, 0x65, 0xab, 0xb7, 0xb3, - 0xb1, 0x42, 0x7c, 0x16, 0x08, 0x5b, 0x7d, 0x33, 0xcc, 0xc6, 0x7f, 0x5d, 0xd1, 0x15, 0x6a, 0x69, - 0xa7, 0xab, 0xfc, 0xd4, 0xec, 0x0a, 0xd1, 0xe5, 0xd4, 0x56, 0xbb, 0x76, 0x7c, 0x6c, 0x4b, 0xe6, - 0x53, 0x90, 0xc4, 0x0f, 0x73, 0xc0, 0xe6, 0xcd, 0xce, 0xbe, 0xf0, 0x28, 0xcf, 0x1b, 0x6f, 0x7d, - 0x98, 0xc5, 0x8b, 0x2f, 0x32, 0x2b, 0x87, 0x92, 0x48, 0xaa, 0x1d, 0xe1, 0x25, 0x88, 0xdb, 0x10, - 0x92, 0x0e, 0x05, 0xd7, 0x23, 0x92, 0xe8, 0xa8, 0x36, 0x5d, 0xaf, 0x6c, 0x6f, 0x59, 0x37, 0x2c, - 0x5a, 0x87, 0x39, 0xac, 0x49, 0x24, 0x79, 0x1e, 0xc8, 0xe8, 0xac, 0xb1, 0x70, 0xd9, 0x37, 0x4b, - 0x9f, 0x7f, 0x7d, 0x79, 0x84, 0x5a, 0xd5, 0xa1, 0x48, 0x5a, 0xd6, 0xf6, 0x31, 0x56, 0xbc, 0x4c, - 0x71, 0x4a, 0x29, 0x1a, 0x13, 0x8a, 0x07, 0x02, 0xe4, 0xad, 0x6a, 0x0b, 0x0a, 0xa2, 0x94, 0x9e, - 0xe2, 0x59, 0xb5, 0xd1, 0xa7, 0x95, 0xc8, 0xda, 0xad, 0x22, 0x45, 0x6e, 0x06, 0xd7, 0xf6, 0x71, - 0x85, 0x48, 0x49, 0x3a, 0x27, 0x3e, 0x0d, 0x24, 0xe8, 0x33, 0x8a, 0x7d, 0x6f, 0x82, 0xbd, 0x37, - 0xc4, 0x14, 0x35, 0x8a, 0x54, 0xed, 0x15, 0x5e, 0x24, 0x1d, 0xc9, 0x7a, 0xd4, 0x0d, 0x05, 0xe7, - 0xa0, 0xcf, 0x2a, 0x29, 0x73, 0x52, 0x4a, 0x81, 0x0e, 0x04, 0xe7, 0xa9, 0xf1, 0x71, 0xb9, 0x61, - 0x09, 0x34, 0x07, 0x2f, 0xc6, 0x40, 0x23, 0x97, 0x04, 0x70, 0x4a, 0x23, 0xd0, 0xcb, 0x77, 0x38, - 0x7b, 0x03, 0x34, 0xda, 0x53, 0x98, 0x31, 0xa9, 0x78, 0x78, 0x0c, 0xda, 0x2e, 0x2e, 0x87, 0x24, - 0x22, 0x3e, 0xe8, 0x73, 0x35, 0x54, 0xaf, 0x6c, 0xaf, 0x4f, 0x3e, 0x8e, 0x2a, 0x17, 0x05, 0x72, - 0x86, 0x16, 0xe3, 0xcd, 0x14, 0xe5, 0x8a, 0xd3, 0x80, 0x46, 0xae, 0x8c, 0x48, 0x00, 0xc7, 0x34, - 0x72, 0x23, 0xfa, 0x2e, 0xa6, 0xe9, 0x73, 0xcf, 0x2b, 0x5b, 0x0f, 0x6f, 0x7d, 0xee, 0xd7, 0x29, - 0xe7, 0x28, 0xa7, 0xb4, 0x32, 0x46, 0xb1, 0xc7, 0xff, 0xe1, 0x1d, 0x20, 0xd8, 0x9d, 0xff, 0x74, - 0x61, 0xa2, 0xdf, 0x17, 0x26, 0xda, 0xfa, 0x88, 0xf0, 0xca, 0x44, 0xa4, 0x34, 0x1b, 0x57, 0x06, - 0x49, 0x72, 0x99, 0xa7, 0xa3, 0x1a, 0xaa, 0xcf, 0x34, 0x96, 0x92, 0xbe, 0x89, 0x07, 0x58, 0xa7, - 0xd9, 0xc2, 0x03, 0x88, 0xe3, 0x69, 0xcf, 0xf0, 0x32, 0x0b, 0x98, 0x64, 0x84, 0xbb, 0xea, 0x3e, - 0xcc, 0xd3, 0xa7, 0x14, 0x69, 0x25, 0xe9, 0x9b, 0x55, 0x27, 0x2b, 0xa5, 0xa6, 0x9d, 0x66, 0xab, - 0xca, 0x0a, 0x5b, 0xaf, 0xe0, 0xe5, 0x2b, 0xc2, 0xd5, 0xb1, 0x30, 0xfe, 0xbd, 0x8f, 0x07, 0x78, - 0x6e, 0xbc, 0x3f, 0x4e, 0xfa, 0x66, 0x39, 0x6f, 0x5c, 0x0e, 0x55, 0x47, 0xed, 0x25, 0x5e, 0x1b, - 0x98, 0x1d, 0x25, 0x2c, 0xa5, 0x4c, 0xd7, 0x50, 0xbd, 0xda, 0x58, 0x4f, 0xfa, 0xe6, 0x6a, 0x6e, - 0x79, 0x14, 0x4c, 0xa7, 0xd9, 0x5a, 0x65, 0x13, 0x87, 0x45, 0xfb, 0xdf, 0x11, 0x5e, 0x1a, 0x4f, - 0xdf, 0x3f, 0xf2, 0xaf, 0x40, 0x9c, 0x8f, 0x1c, 0xe7, 0x20, 0xce, 0x33, 0x10, 0xe7, 0x8e, 0xa7, - 0x35, 0xf1, 0x3c, 0x0d, 0xbc, 0xf4, 0xcf, 0xa7, 0xfa, 0x8c, 0xca, 0xe5, 0x86, 0x95, 0x0d, 0x2d, - 0x6b, 0x30, 0xb4, 0xac, 0xa3, 0xc1, 0xd0, 0x6a, 0x54, 0xd3, 0xd8, 0x9c, 0xff, 0x30, 0x51, 0x16, - 0x9d, 0x39, 0x1a, 0x78, 0x4d, 0x22, 0xe9, 0xe8, 0x76, 0x8d, 0xfd, 0xcb, 0xc4, 0x40, 0x57, 0x89, - 0x81, 0x7e, 0x26, 0x06, 0x3a, 0xbf, 0x36, 0x4a, 0x57, 0xd7, 0x46, 0xe9, 0xdb, 0xb5, 0x51, 0x7a, - 0x6b, 0x75, 0x99, 0x3c, 0x89, 0xdb, 0x56, 0x47, 0xf8, 0x76, 0x96, 0xd3, 0xc7, 0x9c, 0xb4, 0x21, - 0x5f, 0xdb, 0xbd, 0x27, 0xf6, 0xfb, 0x7c, 0x0c, 0xca, 0xb3, 0x90, 0x42, 0xbb, 0xac, 0xfa, 0xef, - 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0x26, 0x9d, 0xda, 0x08, 0x9d, 0x05, 0x00, 0x00, + 0x52, 0x6d, 0x09, 0x24, 0xa4, 0xb2, 0x23, 0x4a, 0x55, 0xac, 0xaa, 0x2a, 0x0a, 0x74, 0xd3, 0x8d, + 0x35, 0x89, 0x87, 0x30, 0xd2, 0xd8, 0xe3, 0xfa, 0x8e, 0x43, 0x79, 0x82, 0xaa, 0x3b, 0x96, 0x5d, + 0xb2, 0xec, 0xb2, 0x0f, 0xd0, 0x07, 0x60, 0xc9, 0xb2, 0x52, 0xa5, 0xb4, 0x32, 0x8b, 0xf6, 0x31, + 0x2a, 0x8f, 0x9d, 0xc4, 0x21, 0xb0, 0xe8, 0xa2, 0x1b, 0x6b, 0x66, 0xee, 0x39, 0xe7, 0x9e, 0x19, + 0x1d, 0x5f, 0xfc, 0xd0, 0xa3, 0xe0, 0x0b, 0xb0, 0x43, 0x01, 0x12, 0xec, 0xde, 0x8e, 0xdd, 0xa5, + 0x01, 0x05, 0x06, 0x56, 0x18, 0x09, 0x29, 0xb4, 0xe5, 0xac, 0x6c, 0xa9, 0xb2, 0xd5, 0xdb, 0xd9, + 0x58, 0x21, 0x3e, 0x0b, 0x84, 0xad, 0xbe, 0x19, 0x66, 0xe3, 0xbf, 0xae, 0xe8, 0x0a, 0xb5, 0xb4, + 0xd3, 0x55, 0x7e, 0x6a, 0x76, 0x85, 0xe8, 0x72, 0x6a, 0xab, 0x5d, 0x3b, 0x3e, 0xb1, 0x25, 0xf3, + 0x29, 0x48, 0xe2, 0x87, 0x39, 0x60, 0xf3, 0x76, 0x67, 0x5f, 0x78, 0x94, 0xe7, 0x8d, 0xb7, 0x3e, + 0xcc, 0xe2, 0xc5, 0x17, 0x99, 0x95, 0x23, 0x49, 0x24, 0xd5, 0x8e, 0xf1, 0x12, 0xc4, 0x6d, 0x08, + 0x49, 0x87, 0x82, 0xeb, 0x11, 0x49, 0x74, 0x54, 0x9b, 0xae, 0x57, 0xb6, 0xb7, 0xac, 0x5b, 0x16, + 0xad, 0xa3, 0x1c, 0xd6, 0x24, 0x92, 0x3c, 0x0f, 0x64, 0x74, 0xde, 0x58, 0xb8, 0xea, 0x9b, 0xa5, + 0xcf, 0xbf, 0xbe, 0x3c, 0x41, 0xad, 0xea, 0x50, 0x24, 0x2d, 0x6b, 0x07, 0x18, 0x2b, 0x5e, 0xa6, + 0x38, 0xa5, 0x14, 0x8d, 0x09, 0xc5, 0x43, 0x01, 0xf2, 0x4e, 0xb5, 0x05, 0x05, 0x51, 0x4a, 0xbb, + 0x78, 0x56, 0x6d, 0xf4, 0x69, 0x25, 0xb2, 0x76, 0xa7, 0x48, 0x91, 0x9b, 0xc1, 0xb5, 0x03, 0x5c, + 0x21, 0x52, 0x92, 0xce, 0xa9, 0x4f, 0x03, 0x09, 0xfa, 0x8c, 0x62, 0x3f, 0x98, 0x60, 0xef, 0x0f, + 0x31, 0x45, 0x8d, 0x22, 0x55, 0x7b, 0x85, 0x17, 0x49, 0x47, 0xb2, 0x1e, 0x75, 0x43, 0xc1, 0x39, + 0xe8, 0xb3, 0x4a, 0xca, 0x9c, 0x94, 0x52, 0xa0, 0x43, 0xc1, 0x79, 0x6a, 0x7c, 0x5c, 0x6e, 0x58, + 0x02, 0xcd, 0xc1, 0x8b, 0x31, 0xd0, 0xc8, 0x25, 0x01, 0x9c, 0xd1, 0x08, 0xf4, 0xf2, 0x3d, 0xce, + 0xde, 0x00, 0x8d, 0xf6, 0x15, 0x66, 0x4c, 0x2a, 0x1e, 0x1e, 0x83, 0xb6, 0x87, 0xcb, 0x21, 0x89, + 0x88, 0x0f, 0xfa, 0x5c, 0x0d, 0xd5, 0x2b, 0xdb, 0xeb, 0x93, 0x8f, 0xa3, 0xca, 0x45, 0x81, 0x9c, + 0xa1, 0xc5, 0x78, 0x33, 0x45, 0xb9, 0xe2, 0x2c, 0xa0, 0x91, 0x2b, 0x23, 0x12, 0xc0, 0x09, 0x8d, + 0xdc, 0x88, 0xbe, 0x8b, 0x69, 0xfa, 0xdc, 0xf3, 0xca, 0xd6, 0xe3, 0x3b, 0x9f, 0xfb, 0x75, 0xca, + 0x39, 0xce, 0x29, 0xad, 0x8c, 0x51, 0xec, 0xf1, 0x7f, 0x78, 0x0f, 0x08, 0xf6, 0xe6, 0x3f, 0x5d, + 0x9a, 0xe8, 0xf7, 0xa5, 0x89, 0xb6, 0x3e, 0x22, 0xbc, 0x32, 0x11, 0x29, 0xcd, 0xc6, 0x95, 0x41, + 0x92, 0x5c, 0xe6, 0xe9, 0xa8, 0x86, 0xea, 0x33, 0x8d, 0xa5, 0xa4, 0x6f, 0xe2, 0x01, 0xd6, 0x69, + 0xb6, 0xf0, 0x00, 0xe2, 0x78, 0xda, 0x33, 0xbc, 0xcc, 0x02, 0x26, 0x19, 0xe1, 0xae, 0xba, 0x0f, + 0xf3, 0xf4, 0x29, 0x45, 0x5a, 0x49, 0xfa, 0x66, 0xd5, 0xc9, 0x4a, 0xa9, 0x69, 0xa7, 0xd9, 0xaa, + 0xb2, 0xc2, 0xd6, 0x2b, 0x78, 0xf9, 0x8a, 0x70, 0x75, 0x2c, 0x8c, 0x7f, 0xef, 0xe3, 0x11, 0x9e, + 0x1b, 0xef, 0x8f, 0x93, 0xbe, 0x59, 0xce, 0x1b, 0x97, 0x43, 0xd5, 0x51, 0x7b, 0x89, 0xd7, 0x06, + 0x66, 0x47, 0x09, 0x4b, 0x29, 0xd3, 0x35, 0x54, 0xaf, 0x36, 0xd6, 0x93, 0xbe, 0xb9, 0x9a, 0x5b, + 0x1e, 0x05, 0xd3, 0x69, 0xb6, 0x56, 0xd9, 0xc4, 0x61, 0xd1, 0xfe, 0x77, 0x84, 0x97, 0xc6, 0xd3, + 0xf7, 0x8f, 0xfc, 0x2b, 0x10, 0xe7, 0x23, 0xc7, 0x39, 0x88, 0xf3, 0x0c, 0xc4, 0xb9, 0xe3, 0x69, + 0x4d, 0x3c, 0x4f, 0x03, 0x2f, 0xfd, 0xf3, 0xa9, 0x3e, 0xa3, 0x72, 0xb9, 0x61, 0x65, 0x43, 0xcb, + 0x1a, 0x0c, 0x2d, 0xeb, 0x78, 0x30, 0xb4, 0x1a, 0xd5, 0x34, 0x36, 0x17, 0x3f, 0x4c, 0x94, 0x45, + 0x67, 0x8e, 0x06, 0x5e, 0x93, 0x48, 0x3a, 0xba, 0x5d, 0xe3, 0xe0, 0x2a, 0x31, 0xd0, 0x75, 0x62, + 0xa0, 0x9f, 0x89, 0x81, 0x2e, 0x6e, 0x8c, 0xd2, 0xf5, 0x8d, 0x51, 0xfa, 0x76, 0x63, 0x94, 0xde, + 0x5a, 0x5d, 0x26, 0x4f, 0xe3, 0xb6, 0xd5, 0x11, 0xbe, 0x9d, 0xe5, 0xf4, 0x29, 0x27, 0x6d, 0xc8, + 0xd7, 0x76, 0x6f, 0xd7, 0x7e, 0x9f, 0x8f, 0x41, 0x79, 0x1e, 0x52, 0x68, 0x97, 0x55, 0xff, 0x9d, + 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xa4, 0x3f, 0x7e, 0x9d, 0x05, 0x00, 0x00, } func (this *GenesisState) Equal(that interface{}) bool { diff --git a/x/posts/types/models.pb.go b/x/posts/types/models.pb.go index a33471f2a6..7ddc0cc4a2 100644 --- a/x/posts/types/models.pb.go +++ b/x/posts/types/models.pb.go @@ -1132,10 +1132,10 @@ func init() { func init() { proto.RegisterFile("desmos/posts/v3/models.proto", fileDescriptor_e330452b10ff3223) } var fileDescriptor_e330452b10ff3223 = []byte{ - // 1789 bytes of a gzipped FileDescriptorProto + // 1790 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x57, 0xcd, 0x6f, 0x1b, 0xc7, 0x15, 0xd7, 0x92, 0xb4, 0x44, 0x8d, 0x44, 0x8a, 0x1a, 0xc9, 0x36, 0x4d, 0x3b, 0x5c, 0x66, 0xe2, - 0xb6, 0xaa, 0x5b, 0x93, 0xa8, 0x8d, 0x20, 0x80, 0x02, 0x14, 0x10, 0xed, 0xb5, 0xc3, 0x42, 0x16, + 0xb6, 0xaa, 0x5b, 0x93, 0xa8, 0x8d, 0x36, 0x80, 0x02, 0x14, 0x10, 0xed, 0xb5, 0xc3, 0x42, 0x16, 0xd5, 0x21, 0xd9, 0xc0, 0xb9, 0x2c, 0x56, 0xdc, 0x11, 0xb5, 0xc0, 0x72, 0x97, 0xd9, 0x19, 0xca, 0x22, 0x50, 0xa0, 0xed, 0xad, 0x68, 0x51, 0x20, 0xb7, 0xf6, 0xd0, 0x43, 0x90, 0x5e, 0x7a, 0x2a, 0x72, 0xf0, 0x1f, 0x11, 0xe4, 0x14, 0xe4, 0xd4, 0xd3, 0xb6, 0xa0, 0x0f, 0xe9, 0x99, 0x7f, 0x41, @@ -1158,93 +1158,93 @@ var fileDescriptor_e330452b10ff3223 = []byte{ 0x59, 0x12, 0x30, 0x8f, 0x79, 0x84, 0x16, 0x97, 0x2b, 0xc6, 0xce, 0xda, 0x83, 0x5b, 0xd5, 0x85, 0x38, 0x56, 0x2d, 0x25, 0x50, 0xdf, 0x9a, 0xc4, 0xe6, 0x86, 0xb2, 0xaa, 0x68, 0x08, 0x4f, 0xf1, 0xc2, 0xa0, 0xd3, 0xa3, 0xc5, 0x95, 0x4a, 0x7a, 0xc1, 0xa0, 0xd3, 0xa3, 0xdc, 0xa0, 0xd3, 0xa3, - 0x70, 0x0f, 0x2c, 0x3b, 0x43, 0x76, 0x12, 0x46, 0xc5, 0xac, 0xb8, 0xd7, 0x4f, 0x27, 0xb1, 0x99, - 0x93, 0x62, 0x92, 0x8e, 0xbe, 0x7e, 0x79, 0x7f, 0x5b, 0xc5, 0x71, 0xcf, 0x75, 0x23, 0x42, 0x69, + 0x70, 0x0f, 0x2c, 0x3b, 0x43, 0x76, 0x12, 0x46, 0xc5, 0xac, 0xb8, 0xd7, 0x8f, 0x27, 0xb1, 0x99, + 0x93, 0x62, 0x92, 0x8e, 0xbe, 0x7a, 0x79, 0x7f, 0x5b, 0xc5, 0x71, 0xcf, 0x75, 0x23, 0x42, 0x69, 0x8b, 0x45, 0x5e, 0xd0, 0xc3, 0x0a, 0x08, 0x3b, 0x60, 0xa3, 0x1b, 0x06, 0xa7, 0x24, 0xa2, 0x8e, - 0x0e, 0xc6, 0xaa, 0xf0, 0xe8, 0xcf, 0xc7, 0xb1, 0x99, 0x7f, 0x94, 0x60, 0x09, 0x3f, 0xdd, 0x90, + 0x0e, 0xc6, 0xaa, 0xf0, 0xe8, 0x4f, 0xc7, 0xb1, 0x99, 0x7f, 0x94, 0x60, 0x09, 0x3f, 0xdd, 0x90, 0xda, 0x17, 0x20, 0x08, 0xe7, 0x93, 0x94, 0x86, 0x0b, 0x43, 0x50, 0x88, 0xc8, 0x31, 0x89, 0x48, 0xd0, 0x25, 0xae, 0x2d, 0x5e, 0x5f, 0x04, 0x95, 0xf4, 0xce, 0xda, 0x83, 0xf2, 0x39, 0x97, 0xf0, - 0xb4, 0xc2, 0x5a, 0xb8, 0x7e, 0xf7, 0x8b, 0xd8, 0x5c, 0x9a, 0xc4, 0xe6, 0x4d, 0x69, 0x69, 0x51, - 0x0b, 0xfa, 0xe7, 0x37, 0x9f, 0xdf, 0x33, 0xf0, 0xc6, 0x8c, 0xce, 0xe1, 0x14, 0xda, 0x20, 0x1f, + 0xb4, 0xc2, 0x5a, 0xb8, 0x7e, 0xf7, 0xf3, 0xd8, 0x5c, 0x9a, 0xc4, 0xe6, 0x4d, 0x69, 0x69, 0x51, + 0x0b, 0xfa, 0xe7, 0xd7, 0x9f, 0xdd, 0x33, 0xf0, 0xc6, 0x8c, 0xce, 0xe1, 0x14, 0xda, 0x20, 0x1f, 0x91, 0x81, 0x3f, 0xb2, 0x29, 0x61, 0xcc, 0x0b, 0x7a, 0xb4, 0xb8, 0x56, 0x31, 0x76, 0xf2, 0x0f, 0xde, 0x3a, 0x67, 0x0e, 0x73, 0xb1, 0x96, 0x94, 0xaa, 0xdf, 0x9a, 0xc4, 0xe6, 0x75, 0x6d, 0x29, 0x09, 0x47, 0x38, 0x17, 0x25, 0x04, 0x29, 0x3c, 0x06, 0xb9, 0x6e, 0x44, 0xe4, 0x8b, 0x5d, 0x87, 0x91, 0xe2, 0xba, 0x88, 0x70, 0xa9, 0x2a, 0x8b, 0xaa, 0xaa, 0x8b, 0xaa, 0xda, 0xd6, 0x45, 0x55, - 0xff, 0x91, 0x7a, 0xca, 0xb6, 0x72, 0x5a, 0x12, 0x8e, 0x3e, 0xf9, 0x8f, 0x69, 0xc8, 0xb7, 0xac, + 0xff, 0x81, 0x7a, 0xca, 0xb6, 0x72, 0x5a, 0x12, 0x8e, 0x3e, 0xfe, 0x8f, 0x69, 0xc8, 0xb7, 0xac, 0x6b, 0xc6, 0x63, 0x87, 0x11, 0x48, 0x40, 0xc1, 0x77, 0x28, 0xb3, 0x89, 0xeb, 0x31, 0xe2, 0x4a, 0x53, 0xb9, 0xd7, 0x9a, 0x32, 0x67, 0x1e, 0x5b, 0x44, 0x0b, 0x4b, 0x38, 0xcf, 0xc9, 0x96, 0xa0, 0x0a, 0x33, 0xbf, 0x04, 0xd7, 0xc2, 0x17, 0x01, 0x89, 0x8a, 0x79, 0x91, 0x39, 0x3b, 0x93, 0xd8, - 0x5c, 0x97, 0x78, 0x41, 0xbe, 0x3c, 0x71, 0x24, 0x6c, 0x37, 0xfb, 0xb7, 0x4f, 0x4d, 0xe3, 0x7f, - 0x9f, 0x9a, 0x06, 0xfa, 0xd2, 0x00, 0xb9, 0xb9, 0x10, 0xc2, 0xa7, 0x20, 0xc3, 0x46, 0x03, 0x22, + 0x5c, 0x97, 0x78, 0x41, 0xbe, 0x3c, 0x71, 0x24, 0x6c, 0x37, 0xfb, 0xb7, 0x4f, 0x4c, 0xe3, 0x7f, + 0x9f, 0x98, 0x06, 0xfa, 0xc2, 0x00, 0xb9, 0xb9, 0x10, 0xc2, 0xa7, 0x20, 0xc3, 0x46, 0x03, 0x22, 0x7a, 0x43, 0xfe, 0x01, 0xba, 0x3a, 0xe0, 0xed, 0xd1, 0x80, 0xcc, 0xe5, 0xf7, 0x68, 0x40, 0x78, - 0x7e, 0x8f, 0x06, 0x04, 0xbe, 0x0b, 0x56, 0x38, 0x48, 0x77, 0x88, 0x4c, 0xfd, 0xce, 0x38, 0x36, - 0x97, 0x39, 0x5c, 0x24, 0x63, 0x5e, 0x22, 0x94, 0x08, 0xc2, 0xcb, 0xfc, 0x5f, 0xc3, 0x85, 0x35, - 0x90, 0x1d, 0x84, 0xd4, 0xe3, 0x2e, 0xd5, 0xed, 0x61, 0x56, 0x6c, 0x9a, 0x83, 0xf0, 0x54, 0x28, - 0xf1, 0x98, 0xdf, 0xa7, 0x40, 0x56, 0x97, 0x28, 0xc4, 0x20, 0x7b, 0xe2, 0xd0, 0x13, 0x51, 0x87, - 0x86, 0x48, 0xde, 0xe2, 0xb9, 0xb7, 0xb4, 0xc9, 0x19, 0x6b, 0x3b, 0xbd, 0xfa, 0x1d, 0x15, 0x6b, - 0x65, 0x45, 0xe3, 0x54, 0xba, 0x4e, 0xf5, 0x70, 0x9d, 0x7d, 0x5e, 0xe4, 0x61, 0x40, 0x8b, 0xa9, - 0xef, 0xa6, 0x53, 0xe3, 0xb4, 0x4e, 0x7d, 0x86, 0x75, 0x90, 0x19, 0x46, 0x3e, 0x2d, 0xa6, 0x85, - 0xbe, 0xed, 0x73, 0xfa, 0x3a, 0x91, 0x5f, 0x2f, 0x2a, 0x5d, 0xca, 0xcb, 0x5c, 0x5e, 0xe9, 0x11, - 0xd8, 0x84, 0x0b, 0x7e, 0x07, 0x56, 0xd4, 0x05, 0xe0, 0x8f, 0xc1, 0x35, 0xca, 0x9c, 0x88, 0xa9, - 0x2e, 0x5f, 0x98, 0x25, 0x89, 0x20, 0x23, 0x2c, 0xd9, 0xb0, 0x02, 0xd2, 0x24, 0xd0, 0x31, 0xca, - 0x4f, 0x62, 0x13, 0xe8, 0xc6, 0xe6, 0x22, 0xcc, 0x59, 0x5c, 0x82, 0x39, 0x3d, 0x11, 0x8d, 0xd5, - 0xa4, 0x04, 0x73, 0x7a, 0x08, 0x73, 0x56, 0xe2, 0x02, 0x2f, 0x0d, 0x90, 0xee, 0x44, 0xfe, 0x0f, - 0x6b, 0x7d, 0x18, 0xf9, 0xe7, 0xad, 0x0f, 0x23, 0x1f, 0x61, 0xce, 0x82, 0xef, 0x81, 0x35, 0xd7, - 0xa3, 0x03, 0xdf, 0x19, 0xd9, 0x5c, 0x52, 0x8e, 0x89, 0x1b, 0xb3, 0xc1, 0x90, 0x60, 0x22, 0x0c, - 0xd4, 0xa9, 0x13, 0xf9, 0x89, 0x6b, 0x7f, 0x96, 0x02, 0x60, 0x8f, 0x31, 0xa7, 0x7b, 0xc2, 0x03, - 0xf3, 0x43, 0xcd, 0xc9, 0xef, 0x59, 0x02, 0xb3, 0xd9, 0x98, 0xbb, 0x7c, 0x36, 0xf6, 0xc0, 0x4a, - 0x37, 0x0c, 0x18, 0x09, 0x98, 0x78, 0x30, 0x4f, 0x9d, 0xc5, 0x0e, 0xb3, 0x17, 0x8c, 0xea, 0xef, - 0xcd, 0xec, 0x28, 0x71, 0xf4, 0xe5, 0xcb, 0xfb, 0x6f, 0x2f, 0x66, 0xd9, 0xec, 0xed, 0x8f, 0xa4, - 0x14, 0xd6, 0xda, 0x13, 0x4e, 0xfa, 0xb3, 0x01, 0xae, 0x3d, 0x23, 0xae, 0xe7, 0xc8, 0x98, 0x78, - 0xe2, 0x51, 0x0b, 0x31, 0xf1, 0x44, 0x4c, 0x3c, 0xf8, 0x0b, 0xb0, 0xda, 0xf7, 0xfa, 0xc4, 0x16, - 0xbd, 0x44, 0xc6, 0x6e, 0x7b, 0x12, 0x9b, 0x05, 0x55, 0x0d, 0x9a, 0x85, 0x70, 0x96, 0xff, 0xe7, - 0x7d, 0x64, 0xf7, 0xbe, 0x36, 0xf4, 0xad, 0x2e, 0x88, 0xfe, 0xb2, 0xcc, 0x97, 0x1a, 0xdf, 0xe7, - 0x1d, 0xe3, 0xe3, 0x21, 0xa1, 0xa2, 0x63, 0x18, 0xc2, 0x52, 0xa2, 0x63, 0x68, 0x0e, 0xc2, 0x53, - 0x21, 0x38, 0x04, 0x85, 0x41, 0x14, 0x9e, 0x7a, 0x2e, 0x71, 0x6d, 0x27, 0xa0, 0x2f, 0x48, 0xa4, - 0xcb, 0xf9, 0xee, 0x05, 0xed, 0xce, 0xf7, 0xab, 0x87, 0x4a, 0x7a, 0x4f, 0x08, 0x2f, 0x4e, 0xb9, - 0x45, 0x5d, 0x7a, 0xca, 0x0d, 0xe6, 0x50, 0x14, 0x7e, 0xc8, 0x37, 0x0c, 0x35, 0x14, 0xd2, 0xaf, - 0x1d, 0x0a, 0x95, 0xf9, 0xfe, 0xa1, 0x91, 0x89, 0xd1, 0xb3, 0x42, 0x02, 0x39, 0x0e, 0x3e, 0x02, - 0x37, 0x1d, 0xdf, 0x0f, 0x5f, 0x50, 0xbb, 0x3f, 0xf4, 0x99, 0x37, 0xf0, 0xc9, 0xf4, 0x59, 0x3c, - 0x35, 0xb2, 0x75, 0x34, 0x89, 0xcd, 0xb2, 0x5a, 0x2d, 0x2e, 0x16, 0x44, 0xf8, 0xba, 0xe4, 0x3c, - 0x53, 0x0c, 0x7d, 0xe9, 0x26, 0xd8, 0x52, 0x10, 0x29, 0x29, 0x86, 0x13, 0x15, 0xab, 0x54, 0x56, - 0x0c, 0xae, 0xdb, 0x73, 0x7a, 0x95, 0x3a, 0x29, 0x85, 0xf0, 0xa6, 0x24, 0x4b, 0x65, 0x7c, 0x80, - 0x51, 0xf8, 0x31, 0xd8, 0x3a, 0xf6, 0xf8, 0x96, 0xc6, 0x1c, 0xdf, 0x1f, 0xd9, 0x11, 0xa1, 0x43, - 0x9f, 0xe9, 0x95, 0xeb, 0xed, 0x0b, 0xfd, 0xdf, 0xe6, 0x92, 0x58, 0x0a, 0xd6, 0xcb, 0x93, 0xd8, - 0x2c, 0x49, 0x9b, 0x17, 0xe8, 0x41, 0x78, 0x53, 0x50, 0x93, 0x90, 0xd2, 0x4b, 0x03, 0xe4, 0xe7, - 0x43, 0x38, 0x5d, 0x09, 0x8d, 0xab, 0x56, 0x42, 0x0a, 0xd6, 0x9c, 0x69, 0xda, 0xe9, 0x14, 0xb9, - 0xb8, 0xcc, 0xde, 0x9f, 0x75, 0x83, 0x04, 0xe4, 0x5b, 0x96, 0x5a, 0xd2, 0xca, 0xac, 0xdc, 0xbe, - 0x6b, 0x3d, 0x7c, 0x9d, 0x02, 0xa0, 0x43, 0x49, 0xa4, 0x5e, 0xf8, 0x66, 0x5b, 0x98, 0x80, 0xf9, - 0x62, 0x6b, 0x97, 0x7d, 0x4c, 0xc1, 0x7c, 0x7f, 0x1e, 0xe6, 0xfb, 0x1a, 0xe6, 0xf3, 0x4d, 0xfd, - 0x03, 0xb0, 0xa1, 0x33, 0xc8, 0x0b, 0x5c, 0x72, 0x46, 0x78, 0x06, 0xa7, 0x77, 0x72, 0x22, 0xd3, - 0xd4, 0xfa, 0xba, 0x20, 0xa0, 0xaa, 0x2d, 0xaf, 0xc8, 0x0d, 0x49, 0x85, 0xef, 0x83, 0xcc, 0x90, - 0x92, 0x48, 0xed, 0xfc, 0x3f, 0x49, 0x0c, 0x4f, 0x7a, 0xd5, 0x82, 0x24, 0x40, 0x89, 0x96, 0xf7, - 0x87, 0x14, 0x28, 0x2c, 0xa6, 0x20, 0x24, 0x60, 0x45, 0xa7, 0xad, 0xdc, 0x2c, 0xaa, 0xaf, 0x4d, - 0xdb, 0xaa, 0x8c, 0x8a, 0x3c, 0xd5, 0x6f, 0xab, 0xda, 0xce, 0xeb, 0xe5, 0x55, 0xe6, 0xae, 0x2a, - 0x6b, 0x75, 0x2c, 0xfd, 0x16, 0xac, 0x27, 0x51, 0x70, 0x17, 0xac, 0xab, 0x1a, 0x14, 0x4f, 0x17, - 0x21, 0xcd, 0xd5, 0x6f, 0x4e, 0x62, 0x73, 0x2b, 0xe9, 0x19, 0xc9, 0x45, 0x78, 0x4d, 0x1e, 0x85, - 0x43, 0xf8, 0x38, 0x3e, 0x0d, 0x19, 0xa1, 0x2a, 0x88, 0x89, 0x71, 0x2c, 0xc8, 0x08, 0x4b, 0x76, - 0x22, 0xfb, 0x66, 0x3e, 0x18, 0x80, 0xe5, 0x43, 0x27, 0x72, 0xfa, 0x7c, 0x57, 0xd9, 0xe8, 0x3b, - 0x67, 0x36, 0x2f, 0x0e, 0xdb, 0x27, 0x41, 0x8f, 0x9d, 0xa8, 0x4b, 0x94, 0x66, 0xe1, 0x59, 0x10, - 0x40, 0x38, 0xd7, 0x77, 0xce, 0xf8, 0x4e, 0xb2, 0x2f, 0xce, 0xbb, 0x48, 0xeb, 0xfd, 0xd3, 0x37, - 0x9f, 0xdf, 0xbb, 0xae, 0xbe, 0xa3, 0xcf, 0xd4, 0x97, 0xb4, 0xb4, 0x83, 0xfe, 0x95, 0x02, 0x45, - 0x9e, 0x62, 0x4d, 0xbe, 0xad, 0xb6, 0x23, 0x27, 0xa0, 0xc7, 0xdc, 0x0b, 0xa2, 0x81, 0xbf, 0xe1, - 0xc4, 0xde, 0x03, 0xcb, 0x94, 0x04, 0x2e, 0x89, 0xd4, 0x50, 0x4b, 0x7c, 0xb5, 0x49, 0xfa, 0x15, - 0x5f, 0x6d, 0x52, 0x00, 0x3e, 0x05, 0xd9, 0x88, 0x74, 0x89, 0x77, 0x4a, 0x22, 0xb5, 0xab, 0xfc, - 0x6c, 0xd6, 0xe7, 0x35, 0xe7, 0x72, 0x35, 0x53, 0xf0, 0x2c, 0x44, 0xf7, 0xfe, 0x6e, 0x80, 0xcd, - 0x73, 0x8b, 0x39, 0x7c, 0x07, 0x98, 0x87, 0xcd, 0x56, 0xdb, 0xc6, 0xd6, 0x13, 0x0b, 0x5b, 0x07, - 0x8f, 0x2c, 0xbb, 0xfd, 0xfc, 0xd0, 0xb2, 0x3b, 0x07, 0xad, 0x43, 0xeb, 0x51, 0xe3, 0x49, 0xc3, - 0x7a, 0x5c, 0x58, 0x82, 0x6f, 0x81, 0x5b, 0x17, 0x09, 0x61, 0xeb, 0x70, 0xff, 0x79, 0xc1, 0xb8, - 0x8c, 0xfd, 0xeb, 0x4e, 0xb3, 0x6d, 0x15, 0x52, 0xb0, 0x0c, 0x4a, 0x97, 0xa0, 0x9b, 0xad, 0x76, - 0x21, 0x5d, 0xca, 0xfc, 0xf1, 0x1f, 0xe5, 0xa5, 0x7b, 0x9f, 0x19, 0x60, 0x3d, 0xf9, 0xe5, 0xc6, - 0xb5, 0x0a, 0x03, 0x76, 0xcb, 0x6a, 0xb7, 0x1b, 0x07, 0x4f, 0x17, 0xee, 0x54, 0x02, 0x37, 0xe6, - 0xd9, 0xd6, 0x6f, 0x2c, 0xfc, 0xbc, 0x79, 0x60, 0x15, 0x0c, 0x78, 0x1b, 0xdc, 0x9c, 0xe7, 0x3d, - 0x69, 0xee, 0xef, 0x37, 0x3f, 0xb4, 0x70, 0xab, 0x90, 0x82, 0x45, 0xb0, 0x3d, 0xcf, 0x7c, 0xd6, - 0x69, 0x77, 0xf6, 0xf6, 0x0b, 0xe9, 0xf3, 0x2a, 0x9f, 0x59, 0x07, 0xed, 0x46, 0xf3, 0xa0, 0x55, - 0xc8, 0xc8, 0x4b, 0xd6, 0x3f, 0xf8, 0x62, 0x5c, 0x36, 0xbe, 0x1a, 0x97, 0x8d, 0xff, 0x8e, 0xcb, - 0xc6, 0x27, 0xaf, 0xca, 0x4b, 0x5f, 0xbd, 0x2a, 0x2f, 0xfd, 0xfb, 0x55, 0x79, 0xe9, 0xa3, 0x6a, - 0xcf, 0x63, 0x27, 0xc3, 0xa3, 0x6a, 0x37, 0xec, 0xd7, 0x64, 0xc2, 0xde, 0xf7, 0x9d, 0x23, 0xaa, - 0xfe, 0xd7, 0x4e, 0xdf, 0x9d, 0xe6, 0x2f, 0x5f, 0x69, 0xe8, 0xd1, 0xb2, 0x18, 0x0d, 0x0f, 0xff, - 0x1f, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xa8, 0x65, 0x6b, 0x26, 0x12, 0x00, 0x00, + 0x7e, 0x8f, 0x06, 0x04, 0xfe, 0x1c, 0xac, 0x70, 0x90, 0xee, 0x10, 0x99, 0xfa, 0x9d, 0x71, 0x6c, + 0x2e, 0x73, 0xb8, 0x48, 0xc6, 0xbc, 0x44, 0x28, 0x11, 0x84, 0x97, 0xf9, 0xbf, 0x86, 0x0b, 0x6b, + 0x20, 0x3b, 0x08, 0xa9, 0xc7, 0x5d, 0xaa, 0xdb, 0xc3, 0xac, 0xd8, 0x34, 0x07, 0xe1, 0xa9, 0x50, + 0xe2, 0x31, 0xbf, 0x4f, 0x81, 0xac, 0x2e, 0x51, 0x88, 0x41, 0xf6, 0xc4, 0xa1, 0x27, 0xa2, 0x0e, + 0x0d, 0x91, 0xbc, 0xc5, 0x73, 0x6f, 0x69, 0x93, 0x33, 0xd6, 0x76, 0x7a, 0xf5, 0x3b, 0x2a, 0xd6, + 0xca, 0x8a, 0xc6, 0xa9, 0x74, 0x9d, 0xea, 0xe1, 0x3a, 0xfb, 0xbc, 0xc8, 0xc3, 0x80, 0x16, 0x53, + 0xdf, 0x4e, 0xa7, 0xc6, 0x69, 0x9d, 0xfa, 0x0c, 0xeb, 0x20, 0x33, 0x8c, 0x7c, 0x5a, 0x4c, 0x0b, + 0x7d, 0xdb, 0xe7, 0xf4, 0x75, 0x22, 0xbf, 0x5e, 0x54, 0xba, 0x94, 0x97, 0xb9, 0xbc, 0xd2, 0x23, + 0xb0, 0x09, 0x17, 0xfc, 0x0e, 0xac, 0xa8, 0x0b, 0xc0, 0x1f, 0x82, 0x6b, 0x94, 0x39, 0x11, 0x53, + 0x5d, 0xbe, 0x30, 0x4b, 0x12, 0x41, 0x46, 0x58, 0xb2, 0x61, 0x05, 0xa4, 0x49, 0xa0, 0x63, 0x94, + 0x9f, 0xc4, 0x26, 0xd0, 0x8d, 0xcd, 0x45, 0x98, 0xb3, 0xb8, 0x04, 0x73, 0x7a, 0x22, 0x1a, 0xab, + 0x49, 0x09, 0xe6, 0xf4, 0x10, 0xe6, 0xac, 0xc4, 0x05, 0x5e, 0x1a, 0x20, 0xdd, 0x89, 0xfc, 0xef, + 0xd7, 0xfa, 0x30, 0xf2, 0xcf, 0x5b, 0x1f, 0x46, 0x3e, 0xc2, 0x9c, 0x05, 0xdf, 0x05, 0x6b, 0xae, + 0x47, 0x07, 0xbe, 0x33, 0xb2, 0xb9, 0xa4, 0x1c, 0x13, 0x37, 0x66, 0x83, 0x21, 0xc1, 0x44, 0x18, + 0xa8, 0x53, 0x27, 0xf2, 0x13, 0xd7, 0xfe, 0x34, 0x05, 0xc0, 0x1e, 0x63, 0x4e, 0xf7, 0x84, 0x07, + 0xe6, 0xfb, 0x9a, 0x93, 0xdf, 0xb1, 0x04, 0x66, 0xb3, 0x31, 0x77, 0xf9, 0x6c, 0xec, 0x81, 0x95, + 0x6e, 0x18, 0x30, 0x12, 0x30, 0xf1, 0x60, 0x9e, 0x3a, 0x8b, 0x1d, 0x66, 0x2f, 0x18, 0xd5, 0xdf, + 0x9d, 0xd9, 0x51, 0xe2, 0xe8, 0x8b, 0x97, 0xf7, 0xdf, 0x5e, 0xcc, 0xb2, 0xd9, 0xdb, 0x1f, 0x49, + 0x29, 0xac, 0xb5, 0x27, 0x9c, 0xf4, 0x67, 0x03, 0x5c, 0x7b, 0x46, 0x5c, 0xcf, 0x91, 0x31, 0xf1, + 0xc4, 0xa3, 0x16, 0x62, 0xe2, 0x89, 0x98, 0x78, 0xf0, 0x67, 0x60, 0xb5, 0xef, 0xf5, 0x89, 0x2d, + 0x7a, 0x89, 0x8c, 0xdd, 0xf6, 0x24, 0x36, 0x0b, 0xaa, 0x1a, 0x34, 0x0b, 0xe1, 0x2c, 0xff, 0xcf, + 0xfb, 0xc8, 0xee, 0x7d, 0x6d, 0xe8, 0x1b, 0x5d, 0x10, 0xfd, 0x65, 0x99, 0x2f, 0x35, 0xbe, 0xcf, + 0x3b, 0xc6, 0x47, 0x43, 0x42, 0x45, 0xc7, 0x30, 0x84, 0xa5, 0x44, 0xc7, 0xd0, 0x1c, 0x84, 0xa7, + 0x42, 0x70, 0x08, 0x0a, 0x83, 0x28, 0x3c, 0xf5, 0x5c, 0xe2, 0xda, 0x4e, 0x40, 0x5f, 0x90, 0x48, + 0x97, 0xf3, 0xdd, 0x0b, 0xda, 0x9d, 0xef, 0x57, 0x0f, 0x95, 0xf4, 0x9e, 0x10, 0x5e, 0x9c, 0x72, + 0x8b, 0xba, 0xf4, 0x94, 0x1b, 0xcc, 0xa1, 0x28, 0xfc, 0x80, 0x6f, 0x18, 0x6a, 0x28, 0xa4, 0x5f, + 0x3b, 0x14, 0x2a, 0xf3, 0xfd, 0x43, 0x23, 0x13, 0xa3, 0x67, 0x85, 0x04, 0x72, 0x1c, 0x7c, 0x08, + 0x6e, 0x3a, 0xbe, 0x1f, 0xbe, 0xa0, 0x76, 0x7f, 0xe8, 0x33, 0x6f, 0xe0, 0x93, 0xe9, 0xb3, 0x78, + 0x6a, 0x64, 0xeb, 0x68, 0x12, 0x9b, 0x65, 0xb5, 0x5a, 0x5c, 0x2c, 0x88, 0xf0, 0x75, 0xc9, 0x79, + 0xa6, 0x18, 0xfa, 0xd2, 0x4d, 0xb0, 0xa5, 0x20, 0x52, 0x52, 0x0c, 0x27, 0x2a, 0x56, 0xa9, 0xac, + 0x18, 0x5c, 0xb7, 0xe7, 0xf4, 0x2a, 0x75, 0x52, 0x0a, 0xe1, 0x4d, 0x49, 0x96, 0xca, 0xf8, 0x00, + 0xa3, 0xf0, 0x23, 0xb0, 0x75, 0xec, 0xf1, 0x2d, 0x8d, 0x39, 0xbe, 0x3f, 0xb2, 0x23, 0x42, 0x87, + 0x3e, 0xd3, 0x2b, 0xd7, 0xdb, 0x17, 0xfa, 0xbf, 0xcd, 0x25, 0xb1, 0x14, 0xac, 0x97, 0x27, 0xb1, + 0x59, 0x92, 0x36, 0x2f, 0xd0, 0x83, 0xf0, 0xa6, 0xa0, 0x26, 0x21, 0xa5, 0x97, 0x06, 0xc8, 0xcf, + 0x87, 0x70, 0xba, 0x12, 0x1a, 0x57, 0xad, 0x84, 0x14, 0xac, 0x39, 0xd3, 0xb4, 0xd3, 0x29, 0x72, + 0x71, 0x99, 0xbd, 0x37, 0xeb, 0x06, 0x09, 0xc8, 0x37, 0x2c, 0xb5, 0xa4, 0x95, 0x59, 0xb9, 0x7d, + 0xdb, 0x7a, 0xf8, 0x2a, 0x05, 0x40, 0x87, 0x92, 0x48, 0xbd, 0xf0, 0xcd, 0xb6, 0x30, 0x01, 0xf3, + 0xc5, 0xd6, 0x2e, 0xfb, 0x98, 0x82, 0xf9, 0xfe, 0x3c, 0xcc, 0xf7, 0x35, 0xcc, 0xe7, 0x9b, 0xfa, + 0xfb, 0x60, 0x43, 0x67, 0x90, 0x17, 0xb8, 0xe4, 0x8c, 0xf0, 0x0c, 0x4e, 0xef, 0xe4, 0x44, 0xa6, + 0xa9, 0xf5, 0x75, 0x41, 0x40, 0x55, 0x5b, 0x5e, 0x91, 0x1b, 0x92, 0x0a, 0xdf, 0x03, 0x99, 0x21, + 0x25, 0x91, 0xda, 0xf9, 0x7f, 0x94, 0x18, 0x9e, 0xf4, 0xaa, 0x05, 0x49, 0x80, 0x12, 0x2d, 0xef, + 0x0f, 0x29, 0x50, 0x58, 0x4c, 0x41, 0x48, 0xc0, 0x8a, 0x4e, 0x5b, 0xb9, 0x59, 0x54, 0x5f, 0x9b, + 0xb6, 0x55, 0x19, 0x15, 0x79, 0xaa, 0xdf, 0x56, 0xb5, 0x9d, 0xd7, 0xcb, 0xab, 0xcc, 0x5d, 0x55, + 0xd6, 0xea, 0x58, 0xfa, 0x2d, 0x58, 0x4f, 0xa2, 0xe0, 0x2e, 0x58, 0x57, 0x35, 0x28, 0x9e, 0x2e, + 0x42, 0x9a, 0xab, 0xdf, 0x9c, 0xc4, 0xe6, 0x56, 0xd2, 0x33, 0x92, 0x8b, 0xf0, 0x9a, 0x3c, 0x0a, + 0x87, 0xf0, 0x71, 0x7c, 0x1a, 0x32, 0x42, 0x55, 0x10, 0x13, 0xe3, 0x58, 0x90, 0x11, 0x96, 0xec, + 0x44, 0xf6, 0xcd, 0x7c, 0x30, 0x00, 0xcb, 0x87, 0x4e, 0xe4, 0xf4, 0xf9, 0xae, 0xb2, 0xd1, 0x77, + 0xce, 0x6c, 0x5e, 0x1c, 0xb6, 0x4f, 0x82, 0x1e, 0x3b, 0x51, 0x97, 0x28, 0xcd, 0xc2, 0xb3, 0x20, + 0x80, 0x70, 0xae, 0xef, 0x9c, 0xf1, 0x9d, 0x64, 0x5f, 0x9c, 0x77, 0x91, 0xd6, 0xfb, 0xa7, 0xaf, + 0x3f, 0xbb, 0x77, 0x5d, 0x7d, 0x47, 0x9f, 0xa9, 0x2f, 0x69, 0x69, 0x07, 0xfd, 0x2b, 0x05, 0x8a, + 0x3c, 0xc5, 0x9a, 0x7c, 0x5b, 0x6d, 0x47, 0x4e, 0x40, 0x8f, 0xb9, 0x17, 0x44, 0x03, 0x7f, 0xc3, + 0x89, 0xbd, 0x07, 0x96, 0x29, 0x09, 0x5c, 0x12, 0xa9, 0xa1, 0x96, 0xf8, 0x6a, 0x93, 0xf4, 0x2b, + 0xbe, 0xda, 0xa4, 0x00, 0x7c, 0x0a, 0xb2, 0x11, 0xe9, 0x12, 0xef, 0x94, 0x44, 0x6a, 0x57, 0xf9, + 0xc9, 0xac, 0xcf, 0x6b, 0xce, 0xe5, 0x6a, 0xa6, 0xe0, 0x59, 0x88, 0xee, 0xfd, 0xdd, 0x00, 0x9b, + 0xe7, 0x16, 0x73, 0xf8, 0x0e, 0x30, 0x0f, 0x9b, 0xad, 0xb6, 0x8d, 0xad, 0x27, 0x16, 0xb6, 0x0e, + 0x1e, 0x59, 0x76, 0xfb, 0xf9, 0xa1, 0x65, 0x77, 0x0e, 0x5a, 0x87, 0xd6, 0xa3, 0xc6, 0x93, 0x86, + 0xf5, 0xb8, 0xb0, 0x04, 0xdf, 0x02, 0xb7, 0x2e, 0x12, 0xc2, 0xd6, 0xe1, 0xfe, 0xf3, 0x82, 0x71, + 0x19, 0xfb, 0xd7, 0x9d, 0x66, 0xdb, 0x2a, 0xa4, 0x60, 0x19, 0x94, 0x2e, 0x41, 0x37, 0x5b, 0xed, + 0x42, 0xba, 0x94, 0xf9, 0xe3, 0x3f, 0xca, 0x4b, 0xf7, 0x3e, 0x35, 0xc0, 0x7a, 0xf2, 0xcb, 0x8d, + 0x6b, 0x15, 0x06, 0xec, 0x96, 0xd5, 0x6e, 0x37, 0x0e, 0x9e, 0x2e, 0xdc, 0xa9, 0x04, 0x6e, 0xcc, + 0xb3, 0xad, 0xdf, 0x58, 0xf8, 0x79, 0xf3, 0xc0, 0x2a, 0x18, 0xf0, 0x36, 0xb8, 0x39, 0xcf, 0x7b, + 0xd2, 0xdc, 0xdf, 0x6f, 0x7e, 0x60, 0xe1, 0x56, 0x21, 0x05, 0x8b, 0x60, 0x7b, 0x9e, 0xf9, 0xac, + 0xd3, 0xee, 0xec, 0xed, 0x17, 0xd2, 0xe7, 0x55, 0x3e, 0xb3, 0x0e, 0xda, 0x8d, 0xe6, 0x41, 0xab, + 0x90, 0x91, 0x97, 0xac, 0xbf, 0xff, 0xf9, 0xb8, 0x6c, 0x7c, 0x39, 0x2e, 0x1b, 0xff, 0x1d, 0x97, + 0x8d, 0x8f, 0x5f, 0x95, 0x97, 0xbe, 0x7c, 0x55, 0x5e, 0xfa, 0xf7, 0xab, 0xf2, 0xd2, 0x87, 0xd5, + 0x9e, 0xc7, 0x4e, 0x86, 0x47, 0xd5, 0x6e, 0xd8, 0xaf, 0xc9, 0x84, 0xbd, 0xef, 0x3b, 0x47, 0x54, + 0xfd, 0xaf, 0x9d, 0xfe, 0x62, 0x9a, 0xbf, 0x7c, 0xa5, 0xa1, 0x47, 0xcb, 0x62, 0x34, 0x3c, 0xfc, + 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x91, 0x80, 0x1d, 0x26, 0x12, 0x00, 0x00, } func (this *Post) Equal(that interface{}) bool { diff --git a/x/posts/types/msgs.go b/x/posts/types/msgs.go index 671b1fb7d9..faa0735b56 100644 --- a/x/posts/types/msgs.go +++ b/x/posts/types/msgs.go @@ -5,7 +5,6 @@ import ( "strings" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" @@ -110,11 +109,6 @@ func (msg *MsgCreatePost) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgCreatePost) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgCreatePost) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Author) @@ -192,11 +186,6 @@ func (msg *MsgEditPost) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgEditPost) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgEditPost) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Editor) @@ -253,11 +242,6 @@ func (msg *MsgAddPostAttachment) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgAddPostAttachment) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgAddPostAttachment) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Editor) @@ -310,11 +294,6 @@ func (msg *MsgRemovePostAttachment) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgRemovePostAttachment) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgRemovePostAttachment) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Editor) @@ -356,11 +335,6 @@ func (msg *MsgDeletePost) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgDeletePost) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgDeletePost) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -427,11 +401,6 @@ func (msg *MsgAnswerPoll) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgAnswerPoll) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgAnswerPoll) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -441,8 +410,7 @@ func (msg *MsgAnswerPoll) GetSigners() []sdk.AccAddress { // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgMovePost{} - _ legacytx.LegacyMsg = &MsgMovePost{} + _ sdk.Msg = &MsgMovePost{} ) // NewMsgMovePost returns a new MsgMovePost instance @@ -494,11 +462,6 @@ func (msg *MsgMovePost) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgMovePost) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgMovePost) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Owner) @@ -508,8 +471,7 @@ func (msg *MsgMovePost) GetSigners() []sdk.AccAddress { // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgUpdateParams{} - _ legacytx.LegacyMsg = &MsgUpdateParams{} + _ sdk.Msg = &MsgUpdateParams{} ) func NewMsgUpdateParams(params Params, authority string) *MsgUpdateParams { @@ -544,8 +506,3 @@ func (msg *MsgUpdateParams) GetSigners() []sdk.AccAddress { authority := sdk.MustAccAddressFromBech32(msg.Authority) return []sdk.AccAddress{authority} } - -// GetSigners implements legacytx.LegacyMsg -func (msg *MsgUpdateParams) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} diff --git a/x/posts/types/msgs.pb.go b/x/posts/types/msgs.pb.go index 8e23a7ea8b..74e72a00d6 100644 --- a/x/posts/types/msgs.pb.go +++ b/x/posts/types/msgs.pb.go @@ -1549,114 +1549,114 @@ func init() { func init() { proto.RegisterFile("desmos/posts/v3/msgs.proto", fileDescriptor_c5bb13e2c778488f) } var fileDescriptor_c5bb13e2c778488f = []byte{ - // 1703 bytes of a gzipped FileDescriptorProto + // 1704 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xbb, 0x6f, 0x1b, 0x47, 0x1a, 0xd7, 0x92, 0x12, 0x2d, 0x0d, 0x45, 0x51, 0x5a, 0xd3, 0x27, 0x8a, 0xd6, 0x71, 0xa9, 0xb5, - 0x7c, 0xa0, 0x1f, 0x22, 0x4f, 0xd4, 0x19, 0x07, 0xf0, 0x80, 0x03, 0x48, 0x5b, 0x38, 0xd3, 0x38, - 0xde, 0x19, 0x2b, 0xb9, 0x71, 0x0a, 0x62, 0xc5, 0x1d, 0xad, 0x17, 0x58, 0xee, 0xd2, 0x3b, 0x23, - 0x59, 0x2a, 0x12, 0x04, 0xa9, 0x82, 0x54, 0xee, 0x52, 0x06, 0x48, 0x95, 0x22, 0x85, 0x0b, 0x23, - 0xff, 0x42, 0x9c, 0x54, 0x46, 0xaa, 0x04, 0x01, 0x98, 0x80, 0x2e, 0x5c, 0xa5, 0x51, 0x91, 0x54, - 0x01, 0x82, 0x79, 0xec, 0x83, 0xcb, 0x25, 0x25, 0xdb, 0x4a, 0x64, 0x20, 0x8d, 0xb4, 0xf3, 0xbd, - 0x66, 0xe6, 0x37, 0xbf, 0xef, 0x9b, 0x6f, 0x08, 0x72, 0x1a, 0x44, 0x1d, 0x1b, 0x95, 0xbb, 0x36, - 0xc2, 0xa8, 0xbc, 0xbf, 0x51, 0xee, 0x20, 0x1d, 0x95, 0xba, 0x8e, 0x8d, 0x6d, 0x31, 0xcd, 0x74, - 0x25, 0xaa, 0x2b, 0xed, 0x6f, 0xe4, 0x16, 0xd4, 0x8e, 0x61, 0xd9, 0x65, 0xfa, 0x97, 0xd9, 0xe4, - 0x32, 0xba, 0xad, 0xdb, 0xf4, 0xb3, 0x4c, 0xbe, 0xb8, 0x74, 0x49, 0xb7, 0x6d, 0xdd, 0x84, 0x65, - 0x3a, 0xda, 0xd9, 0xdb, 0x2d, 0xab, 0xd6, 0x21, 0x57, 0x49, 0x61, 0x15, 0x36, 0x3a, 0x10, 0x61, - 0xb5, 0xd3, 0x75, 0x7d, 0xdb, 0x36, 0x99, 0xb5, 0xc5, 0x82, 0xb2, 0x01, 0x57, 0x2d, 0xb2, 0x11, - 0x59, 0x63, 0x79, 0x7f, 0x9d, 0xfc, 0xe3, 0x8a, 0xe5, 0xa1, 0x5d, 0xd8, 0x1a, 0x34, 0xb9, 0x9b, - 0xfc, 0x6b, 0x02, 0xa4, 0x9a, 0x48, 0xbf, 0xe9, 0x40, 0x15, 0xc3, 0xbb, 0x36, 0xc2, 0xe2, 0x26, - 0x48, 0xa2, 0xbd, 0x1d, 0xd4, 0x55, 0xdb, 0xb0, 0x65, 0x68, 0x59, 0xa1, 0x20, 0x14, 0x27, 0xeb, - 0xab, 0xfd, 0x9e, 0x04, 0xb6, 0xb8, 0xb8, 0x71, 0xeb, 0xa8, 0x27, 0x89, 0x87, 0x6a, 0xc7, 0xac, - 0xca, 0x01, 0x53, 0x59, 0x01, 0xee, 0xa8, 0xa1, 0x89, 0x35, 0x00, 0x10, 0x6c, 0x63, 0xc3, 0xb6, - 0x48, 0x94, 0x58, 0x41, 0x28, 0xa6, 0xea, 0x72, 0xbf, 0x27, 0xcd, 0x6c, 0x31, 0x29, 0x0d, 0xb2, - 0xc0, 0x83, 0x78, 0x86, 0xb2, 0x32, 0xc3, 0x07, 0x0d, 0x8d, 0xac, 0x04, 0x1e, 0x60, 0xe8, 0x58, - 0xaa, 0x49, 0x62, 0xc4, 0x0b, 0x42, 0x71, 0x86, 0xad, 0x64, 0x93, 0x8b, 0x83, 0x2b, 0x09, 0x98, - 0xca, 0x0a, 0x70, 0x47, 0x0d, 0x4d, 0xbc, 0x04, 0x26, 0x31, 0x3c, 0xc0, 0xd9, 0x49, 0xea, 0x9f, - 0x3e, 0xea, 0x49, 0x49, 0xe6, 0x41, 0xa4, 0xb2, 0x42, 0x95, 0xe2, 0x1d, 0x30, 0x0d, 0x2d, 0x6c, - 0x60, 0x03, 0xa2, 0xec, 0x54, 0x41, 0x28, 0x26, 0x2b, 0x4b, 0xa5, 0xd0, 0x11, 0x97, 0x36, 0xb9, - 0x41, 0xfd, 0xfc, 0x51, 0x4f, 0x4a, 0xf3, 0x59, 0xb9, 0x4c, 0x56, 0x3c, 0x7f, 0x3a, 0xa1, 0xaa, - 0xa3, 0x6c, 0xa2, 0x10, 0x0f, 0x4d, 0xa8, 0xea, 0x88, 0x4c, 0xa8, 0xea, 0x48, 0x44, 0x20, 0xa9, - 0x62, 0xac, 0xb6, 0x1f, 0x74, 0xa0, 0x85, 0x51, 0xf6, 0x5c, 0x21, 0x5e, 0x4c, 0x56, 0x32, 0x25, - 0xc6, 0x80, 0x92, 0xcb, 0x80, 0x52, 0xcd, 0x3a, 0xac, 0xff, 0xcb, 0xdf, 0x64, 0xc0, 0x45, 0xfe, - 0xfa, 0xe9, 0xda, 0x4a, 0x78, 0x89, 0x35, 0x4f, 0x7f, 0xd3, 0xb6, 0x30, 0xb4, 0xb0, 0x12, 0x9c, - 0x45, 0xac, 0x81, 0x84, 0xba, 0x87, 0x1f, 0xd8, 0x4e, 0x76, 0x9a, 0x82, 0x71, 0xe5, 0xa8, 0x27, - 0xa5, 0x78, 0x64, 0x2a, 0x97, 0xbf, 0x79, 0xba, 0x96, 0xe1, 0xbc, 0xaa, 0x69, 0x9a, 0x03, 0x11, - 0xda, 0xc2, 0x8e, 0x61, 0xe9, 0x0a, 0x77, 0x14, 0xef, 0x81, 0x74, 0xdb, 0xb6, 0xf6, 0xa1, 0x83, - 0x54, 0xf7, 0x70, 0x67, 0x28, 0x45, 0xae, 0xf7, 0x7b, 0xd2, 0xdc, 0xcd, 0x80, 0x8a, 0x1e, 0xce, - 0x5f, 0x58, 0xf4, 0x90, 0x8b, 0xac, 0xcc, 0x05, 0x25, 0x0d, 0x4d, 0x6c, 0x81, 0x39, 0x07, 0x76, - 0xcd, 0xc3, 0x16, 0x82, 0x18, 0x1b, 0x96, 0x8e, 0xb2, 0xa0, 0x20, 0x14, 0xe7, 0x2a, 0x7f, 0x1d, - 0x3a, 0x05, 0x85, 0x98, 0x6d, 0x31, 0xab, 0xfa, 0xd2, 0x51, 0x4f, 0xba, 0xc0, 0xa6, 0x18, 0x74, - 0x97, 0x95, 0x94, 0x13, 0x30, 0x44, 0xa2, 0x0d, 0xe6, 0x1d, 0xb8, 0x0b, 0x1d, 0x68, 0xb5, 0xa1, - 0xd6, 0xa2, 0xd1, 0xb2, 0x49, 0x0a, 0x7a, 0x7e, 0x68, 0x0a, 0x92, 0x07, 0x8a, 0x6b, 0x5c, 0x5f, - 0x7d, 0xd6, 0x93, 0x26, 0x8e, 0x7a, 0xd2, 0xa2, 0x3b, 0xcf, 0x60, 0x14, 0xf9, 0xb3, 0x97, 0x4f, - 0xae, 0x0a, 0x4a, 0xda, 0x97, 0x13, 0x77, 0x54, 0x5d, 0xfd, 0xe0, 0xe5, 0x93, 0xab, 0x1c, 0xb5, - 0x8f, 0x5e, 0x3e, 0xb9, 0x9a, 0xe1, 0x79, 0x38, 0x90, 0x6d, 0xf2, 0x17, 0x02, 0xb8, 0x30, 0x20, - 0x51, 0x20, 0xea, 0xda, 0x16, 0x82, 0xe2, 0x0d, 0x70, 0x8e, 0xc4, 0xf7, 0x73, 0x70, 0xb9, 0xdf, - 0x93, 0x12, 0xc4, 0x84, 0x02, 0x3b, 0xc7, 0x56, 0xc3, 0x4d, 0x64, 0x25, 0x41, 0xbe, 0x1a, 0x9a, - 0xb8, 0x0b, 0x52, 0x6d, 0x12, 0x8c, 0x00, 0xad, 0xa9, 0x18, 0xd2, 0xd4, 0x4b, 0x56, 0x72, 0x43, - 0xcc, 0xda, 0x76, 0x6b, 0x4b, 0xfd, 0x32, 0xdf, 0x60, 0x86, 0x9f, 0x55, 0xd0, 0x5d, 0x7e, 0xfc, - 0x83, 0x24, 0xb0, 0x1d, 0xce, 0xba, 0x8a, 0x5b, 0x44, 0xfe, 0x61, 0x1c, 0x24, 0x9b, 0x48, 0xdf, - 0xd4, 0x0c, 0x7c, 0x9a, 0x65, 0x23, 0xb0, 0xeb, 0xd8, 0x2b, 0xec, 0xda, 0xcd, 0xf1, 0xf8, 0x49, - 0x73, 0x7c, 0xf2, 0x94, 0x72, 0x7c, 0x6a, 0x5c, 0x8e, 0xd7, 0x40, 0x02, 0x6a, 0x06, 0xb6, 0x9d, - 0x6c, 0x22, 0x9c, 0x6e, 0x4c, 0x3e, 0x26, 0xdd, 0x98, 0x41, 0x55, 0xa6, 0x2c, 0x62, 0x03, 0xc2, - 0x22, 0xd1, 0x67, 0x91, 0x0b, 0xbd, 0xfc, 0x10, 0x9c, 0x0f, 0x0c, 0x3d, 0x02, 0xdd, 0x07, 0x33, - 0xc4, 0x8f, 0xb1, 0x40, 0x38, 0x96, 0x05, 0x2b, 0x9c, 0x05, 0xf3, 0xfe, 0x02, 0xc3, 0x0c, 0x98, - 0x26, 0x42, 0x7a, 0xfa, 0x3f, 0x0b, 0xf4, 0xda, 0xb8, 0x05, 0x4d, 0x78, 0xba, 0xd7, 0xc6, 0x6b, - 0x9e, 0x7f, 0x0d, 0x24, 0x90, 0xa1, 0x5b, 0xd0, 0xe1, 0x0c, 0x08, 0x20, 0xcd, 0xe4, 0x63, 0x90, - 0x66, 0x06, 0x3c, 0x5f, 0xd9, 0x20, 0x94, 0xaf, 0xfe, 0x36, 0xe5, 0x45, 0x9a, 0xae, 0xbe, 0xc0, - 0x45, 0x5b, 0xfe, 0x29, 0x06, 0x32, 0x4d, 0xa4, 0xd7, 0x34, 0x9a, 0xfe, 0x7e, 0x1d, 0x3e, 0x63, - 0x60, 0x74, 0x70, 0xae, 0xcd, 0x6e, 0x02, 0x8a, 0xcc, 0xa8, 0x2b, 0xe6, 0x9f, 0x7e, 0x08, 0x6e, - 0x7e, 0xc2, 0xeb, 0xc5, 0x8d, 0x1e, 0xe0, 0xfa, 0xe4, 0xeb, 0x72, 0xfd, 0x5a, 0x88, 0xeb, 0x17, - 0xfd, 0x13, 0x18, 0x82, 0x55, 0xfe, 0x4a, 0x00, 0xcb, 0x51, 0x0a, 0x8f, 0xfe, 0x4d, 0x90, 0xf2, - 0xaf, 0x3e, 0x17, 0xf9, 0x54, 0xbd, 0xd8, 0xef, 0x49, 0xb3, 0xbe, 0x39, 0x05, 0x2f, 0x13, 0xbe, - 0x5c, 0x29, 0x84, 0xb3, 0xfe, 0xb8, 0xa1, 0x0d, 0x66, 0x53, 0xec, 0x74, 0xb3, 0xe9, 0xbb, 0x18, - 0x58, 0x6c, 0x22, 0x5d, 0x81, 0x1d, 0x7b, 0x1f, 0xbe, 0x55, 0xf4, 0x19, 0x02, 0x31, 0xfe, 0x46, - 0x20, 0x9e, 0x02, 0x49, 0x4a, 0x21, 0x92, 0xe4, 0x7d, 0x92, 0x44, 0xe1, 0x27, 0xbf, 0x0b, 0xa4, - 0x11, 0xaa, 0x3f, 0xa4, 0x50, 0xfe, 0x12, 0xa3, 0x85, 0xb2, 0x66, 0xa1, 0x47, 0xd0, 0xb9, 0x6b, - 0x9b, 0xe6, 0x19, 0x1f, 0x28, 0x75, 0x33, 0x4d, 0xff, 0x28, 0xb9, 0x9b, 0x69, 0x0e, 0xba, 0x99, - 0xa6, 0xeb, 0x66, 0x92, 0x1e, 0xfa, 0x36, 0x48, 0xab, 0x74, 0x0b, 0xa8, 0x65, 0x58, 0x1a, 0x3c, - 0xa0, 0x37, 0x68, 0xbc, 0x98, 0xaa, 0x4b, 0x7e, 0x8f, 0x17, 0x32, 0xe0, 0x7d, 0xd1, 0x1c, 0x17, - 0x37, 0x98, 0x34, 0x50, 0xa9, 0xa7, 0x7e, 0x87, 0x4a, 0xed, 0xe3, 0xcc, 0x2b, 0xb5, 0x2f, 0xf0, - 0x2a, 0xf5, 0x97, 0x02, 0x48, 0x37, 0x91, 0x7e, 0xaf, 0x4b, 0x0e, 0xed, 0xae, 0xea, 0xa8, 0x1d, - 0x24, 0xde, 0x01, 0x33, 0xac, 0x53, 0x33, 0xf0, 0x21, 0x3d, 0x92, 0x99, 0xfa, 0x75, 0xff, 0x88, - 0x3d, 0xd5, 0xe8, 0xb5, 0xf9, 0xee, 0xe2, 0x0d, 0x90, 0xe8, 0xd2, 0xa8, 0xbc, 0x4c, 0x2c, 0x0e, - 0xf7, 0x97, 0x54, 0x5d, 0x9f, 0x24, 0x44, 0x52, 0xb8, 0x71, 0x75, 0x9d, 0xec, 0xca, 0x0f, 0x13, - 0xe4, 0xf6, 0x01, 0x7f, 0xbc, 0x85, 0x56, 0x2d, 0x2f, 0xd1, 0xb2, 0x11, 0x14, 0x79, 0x9b, 0xfc, - 0x9c, 0xb5, 0x67, 0x4d, 0xce, 0xfa, 0x33, 0x66, 0x5d, 0x0b, 0x88, 0x58, 0x75, 0x74, 0x88, 0x5b, - 0xc1, 0x45, 0xc4, 0x69, 0x84, 0xf5, 0x7e, 0x4f, 0x9a, 0xdf, 0xa6, 0xda, 0x81, 0xa5, 0x2c, 0xb9, - 0xfd, 0x54, 0xd8, 0x4f, 0x56, 0xe6, 0xf1, 0xa0, 0xb9, 0x26, 0xbe, 0x03, 0x16, 0x5c, 0x43, 0xff, - 0xd1, 0x39, 0x49, 0x09, 0x5e, 0xee, 0xf7, 0xa4, 0x34, 0x8f, 0x1f, 0x78, 0x7a, 0x66, 0x07, 0xc3, - 0x07, 0x5e, 0xa0, 0x69, 0x3c, 0x60, 0xac, 0x89, 0xff, 0x06, 0x53, 0xf6, 0x23, 0x9f, 0xb1, 0xc5, - 0xa3, 0x9e, 0x34, 0xcb, 0xbc, 0xa9, 0x78, 0x34, 0x29, 0x98, 0x5b, 0x75, 0x85, 0x9c, 0x2c, 0xfb, - 0x0e, 0xb5, 0x70, 0xee, 0xf1, 0xc8, 0xff, 0xa5, 0x2d, 0x9c, 0x3b, 0x7c, 0xc3, 0x37, 0x80, 0xfc, - 0x7d, 0x0c, 0x5c, 0xa4, 0x45, 0xef, 0xe1, 0x1e, 0x44, 0xb4, 0x29, 0xfc, 0x3f, 0x99, 0x7c, 0xdb, - 0x51, 0x2d, 0xb4, 0x0b, 0x9d, 0x33, 0x26, 0xc3, 0x7f, 0xc0, 0xb4, 0x03, 0xdb, 0xd0, 0xd8, 0xf7, - 0xba, 0xb5, 0x6b, 0x7e, 0xaf, 0xed, 0x6a, 0x46, 0x83, 0xea, 0x39, 0xd3, 0x52, 0x02, 0x2d, 0x0d, - 0x46, 0xdc, 0x26, 0x4c, 0x3e, 0xae, 0x94, 0x50, 0x83, 0x6a, 0x85, 0x95, 0x12, 0x3a, 0x20, 0x67, - 0x23, 0x07, 0x6f, 0x93, 0x68, 0xf4, 0xe4, 0xcb, 0xe0, 0xd2, 0x18, 0xb5, 0x97, 0x81, 0x1f, 0xc7, - 0xc0, 0x0a, 0x79, 0xd9, 0xa9, 0x56, 0x1b, 0x9a, 0x11, 0x66, 0xd4, 0xfd, 0x2d, 0x68, 0x9b, 0x19, - 0x82, 0xf1, 0xd7, 0x45, 0x70, 0x3d, 0x84, 0xe0, 0x4a, 0xe0, 0x99, 0x1b, 0xbd, 0x75, 0xf9, 0x1a, - 0xb8, 0x72, 0x2c, 0x30, 0x1e, 0x8c, 0x9f, 0x30, 0x18, 0x6b, 0xed, 0x36, 0xec, 0xe2, 0xb7, 0x14, - 0xc6, 0xd3, 0x62, 0x74, 0x75, 0x83, 0x80, 0xe9, 0x0d, 0x43, 0x70, 0x8e, 0x80, 0x80, 0xc3, 0x39, - 0x1e, 0xa0, 0x30, 0x9c, 0x0a, 0xdc, 0xdd, 0x43, 0xf0, 0x4f, 0x0d, 0xe7, 0x08, 0x08, 0x38, 0x9c, - 0xe3, 0x01, 0x72, 0xe1, 0xac, 0x7c, 0x0a, 0x40, 0xbc, 0x89, 0x74, 0x71, 0x1b, 0x80, 0xc0, 0x4f, - 0xa8, 0xc3, 0xbf, 0x28, 0x0d, 0xfc, 0xc4, 0x93, 0xfb, 0xdb, 0x78, 0xbd, 0x57, 0xfe, 0xff, 0x07, - 0xa6, 0xbd, 0xdf, 0x57, 0x96, 0xa3, 0x7c, 0x5c, 0x6d, 0x6e, 0x75, 0x9c, 0xd6, 0x8b, 0xb7, 0x0d, - 0x40, 0xe0, 0xc5, 0x1e, 0xb9, 0x4a, 0x5f, 0x1f, 0xbd, 0xca, 0xe1, 0x97, 0xaf, 0x68, 0x80, 0x85, - 0xe1, 0x57, 0xef, 0xe5, 0x28, 0xe7, 0x21, 0xb3, 0xdc, 0xda, 0x89, 0xcc, 0xbc, 0xa9, 0x1c, 0x90, - 0x89, 0x7c, 0x24, 0x15, 0xa3, 0xc2, 0x44, 0x59, 0xe6, 0xfe, 0x7e, 0x52, 0xcb, 0x20, 0x68, 0x81, - 0xee, 0x3d, 0x12, 0x34, 0x5f, 0x1f, 0x0d, 0xda, 0x70, 0x13, 0x2a, 0xde, 0x07, 0xb3, 0x03, 0x0d, - 0x68, 0x21, 0xca, 0x2f, 0x68, 0x91, 0x2b, 0x1e, 0x67, 0x11, 0xa4, 0x8d, 0xd7, 0xf7, 0x45, 0xd2, - 0xc6, 0xd5, 0x46, 0xd3, 0x66, 0xa8, 0x0b, 0x79, 0x0f, 0x64, 0x47, 0xb6, 0x12, 0xd7, 0xa3, 0xf1, - 0x8c, 0xb6, 0xce, 0xfd, 0xe3, 0x55, 0xac, 0xbd, 0xf9, 0x1f, 0x0b, 0x20, 0x7f, 0xcc, 0x35, 0x5a, - 0x89, 0xcc, 0xa8, 0xb1, 0x3e, 0xb9, 0xea, 0xab, 0xfb, 0x0c, 0x2c, 0xe9, 0x98, 0x2b, 0x29, 0x72, - 0x49, 0xe3, 0x7d, 0xa2, 0x97, 0x74, 0xb2, 0xca, 0x4e, 0x97, 0x74, 0x4c, 0x59, 0xaf, 0x44, 0xc3, - 0x3f, 0xce, 0x27, 0x7a, 0x49, 0x27, 0xab, 0x8e, 0xb9, 0xa9, 0xf7, 0xc9, 0x13, 0xb0, 0x7e, 0xfb, - 0x59, 0x3f, 0x2f, 0x3c, 0xef, 0xe7, 0x85, 0x1f, 0xfb, 0x79, 0xe1, 0xf1, 0x8b, 0xfc, 0xc4, 0xf3, - 0x17, 0xf9, 0x89, 0x6f, 0x5f, 0xe4, 0x27, 0xee, 0x97, 0x74, 0x03, 0x3f, 0xd8, 0xdb, 0x29, 0xb5, - 0xed, 0x4e, 0x99, 0x4d, 0xb3, 0x66, 0xaa, 0x3b, 0x88, 0x7f, 0x97, 0xf7, 0x6f, 0x78, 0x4f, 0x1f, - 0x7c, 0xd8, 0x85, 0x68, 0x27, 0x41, 0x9f, 0xe3, 0x1b, 0xbf, 0x05, 0x00, 0x00, 0xff, 0xff, 0x05, - 0xb7, 0x75, 0xd6, 0x9a, 0x1b, 0x00, 0x00, + 0x7c, 0xa0, 0x1f, 0x22, 0x4f, 0xd4, 0xf9, 0x0e, 0xe0, 0x01, 0x07, 0x90, 0xb6, 0x70, 0xa6, 0x71, + 0xbc, 0x33, 0x56, 0x72, 0xe3, 0x2b, 0x88, 0x15, 0x77, 0xb4, 0x5e, 0x60, 0xb9, 0x4b, 0xef, 0x8c, + 0x64, 0xa9, 0x48, 0x10, 0xa4, 0x0a, 0x52, 0xb9, 0x4b, 0x19, 0x20, 0x55, 0x8a, 0x14, 0x2e, 0x8c, + 0xfc, 0x0b, 0x71, 0x52, 0x19, 0xa9, 0x12, 0x04, 0x60, 0x02, 0xba, 0x70, 0x95, 0x46, 0x45, 0x52, + 0x05, 0x08, 0xe6, 0xb1, 0x0f, 0x2e, 0x97, 0x94, 0x6c, 0x2b, 0x91, 0x81, 0x34, 0xd2, 0xce, 0xf7, + 0x9a, 0x99, 0xdf, 0xfc, 0xbe, 0x6f, 0xbe, 0x21, 0xc8, 0x69, 0x10, 0x75, 0x6c, 0x54, 0xee, 0xda, + 0x08, 0xa3, 0xf2, 0xfe, 0x46, 0xb9, 0x83, 0x74, 0x54, 0xea, 0x3a, 0x36, 0xb6, 0xc5, 0x34, 0xd3, + 0x95, 0xa8, 0xae, 0xb4, 0xbf, 0x91, 0x5b, 0x50, 0x3b, 0x86, 0x65, 0x97, 0xe9, 0x5f, 0x66, 0x93, + 0xcb, 0xe8, 0xb6, 0x6e, 0xd3, 0xcf, 0x32, 0xf9, 0xe2, 0xd2, 0x25, 0xdd, 0xb6, 0x75, 0x13, 0x96, + 0xe9, 0x68, 0x67, 0x6f, 0xb7, 0xac, 0x5a, 0x87, 0x5c, 0x25, 0x85, 0x55, 0xd8, 0xe8, 0x40, 0x84, + 0xd5, 0x4e, 0xd7, 0xf5, 0x6d, 0xdb, 0x64, 0xd6, 0x16, 0x0b, 0xca, 0x06, 0x5c, 0xb5, 0xc8, 0x46, + 0x64, 0x8d, 0xe5, 0xfd, 0x75, 0xf2, 0x8f, 0x2b, 0x96, 0x87, 0x76, 0x61, 0x6b, 0xd0, 0xe4, 0x6e, + 0xf2, 0x2f, 0x09, 0x90, 0x6a, 0x22, 0xfd, 0xa6, 0x03, 0x55, 0x0c, 0xef, 0xda, 0x08, 0x8b, 0x9b, + 0x20, 0x89, 0xf6, 0x76, 0x50, 0x57, 0x6d, 0xc3, 0x96, 0xa1, 0x65, 0x85, 0x82, 0x50, 0x9c, 0xac, + 0xaf, 0xf6, 0x7b, 0x12, 0xd8, 0xe2, 0xe2, 0xc6, 0xad, 0xa3, 0x9e, 0x24, 0x1e, 0xaa, 0x1d, 0xb3, + 0x2a, 0x07, 0x4c, 0x65, 0x05, 0xb8, 0xa3, 0x86, 0x26, 0xd6, 0x00, 0x40, 0xb0, 0x8d, 0x0d, 0xdb, + 0x22, 0x51, 0x62, 0x05, 0xa1, 0x98, 0xaa, 0xcb, 0xfd, 0x9e, 0x34, 0xb3, 0xc5, 0xa4, 0x34, 0xc8, + 0x02, 0x0f, 0xe2, 0x19, 0xca, 0xca, 0x0c, 0x1f, 0x34, 0x34, 0xb2, 0x12, 0x78, 0x80, 0xa1, 0x63, + 0xa9, 0x26, 0x89, 0x11, 0x2f, 0x08, 0xc5, 0x19, 0xb6, 0x92, 0x4d, 0x2e, 0x0e, 0xae, 0x24, 0x60, + 0x2a, 0x2b, 0xc0, 0x1d, 0x35, 0x34, 0xf1, 0x12, 0x98, 0xc4, 0xf0, 0x00, 0x67, 0x27, 0xa9, 0x7f, + 0xfa, 0xa8, 0x27, 0x25, 0x99, 0x07, 0x91, 0xca, 0x0a, 0x55, 0x8a, 0x77, 0xc0, 0x34, 0xb4, 0xb0, + 0x81, 0x0d, 0x88, 0xb2, 0x53, 0x05, 0xa1, 0x98, 0xac, 0x2c, 0x95, 0x42, 0x47, 0x5c, 0xda, 0xe4, + 0x06, 0xf5, 0xf3, 0x47, 0x3d, 0x29, 0xcd, 0x67, 0xe5, 0x32, 0x59, 0xf1, 0xfc, 0xe9, 0x84, 0xaa, + 0x8e, 0xb2, 0x89, 0x42, 0x3c, 0x34, 0xa1, 0xaa, 0x23, 0x32, 0xa1, 0xaa, 0x23, 0x11, 0x81, 0xa4, + 0x8a, 0xb1, 0xda, 0x7e, 0xd0, 0x81, 0x16, 0x46, 0xd9, 0x73, 0x85, 0x78, 0x31, 0x59, 0xc9, 0x94, + 0x18, 0x03, 0x4a, 0x2e, 0x03, 0x4a, 0x35, 0xeb, 0xb0, 0xfe, 0x4f, 0x7f, 0x93, 0x01, 0x17, 0xf9, + 0xab, 0xa7, 0x6b, 0x2b, 0xe1, 0x25, 0xd6, 0x3c, 0xfd, 0x4d, 0xdb, 0xc2, 0xd0, 0xc2, 0x4a, 0x70, + 0x16, 0xb1, 0x06, 0x12, 0xea, 0x1e, 0x7e, 0x60, 0x3b, 0xd9, 0x69, 0x0a, 0xc6, 0x95, 0xa3, 0x9e, + 0x94, 0xe2, 0x91, 0xa9, 0x5c, 0xfe, 0xfa, 0xe9, 0x5a, 0x86, 0xf3, 0xaa, 0xa6, 0x69, 0x0e, 0x44, + 0x68, 0x0b, 0x3b, 0x86, 0xa5, 0x2b, 0xdc, 0x51, 0xbc, 0x07, 0xd2, 0x6d, 0xdb, 0xda, 0x87, 0x0e, + 0x52, 0xdd, 0xc3, 0x9d, 0xa1, 0x14, 0xb9, 0xde, 0xef, 0x49, 0x73, 0x37, 0x03, 0x2a, 0x7a, 0x38, + 0x7f, 0x62, 0xd1, 0x43, 0x2e, 0xb2, 0x32, 0x17, 0x94, 0x34, 0x34, 0xb1, 0x05, 0xe6, 0x1c, 0xd8, + 0x35, 0x0f, 0x5b, 0x08, 0x62, 0x6c, 0x58, 0x3a, 0xca, 0x82, 0x82, 0x50, 0x9c, 0xab, 0xfc, 0x79, + 0xe8, 0x14, 0x14, 0x62, 0xb6, 0xc5, 0xac, 0xea, 0x4b, 0x47, 0x3d, 0xe9, 0x02, 0x9b, 0x62, 0xd0, + 0x5d, 0x56, 0x52, 0x4e, 0xc0, 0x10, 0x89, 0x36, 0x98, 0x77, 0xe0, 0x2e, 0x74, 0xa0, 0xd5, 0x86, + 0x5a, 0x8b, 0x46, 0xcb, 0x26, 0x29, 0xe8, 0xf9, 0xa1, 0x29, 0x48, 0x1e, 0x28, 0xae, 0x71, 0x7d, + 0xf5, 0x59, 0x4f, 0x9a, 0x38, 0xea, 0x49, 0x8b, 0xee, 0x3c, 0x83, 0x51, 0xe4, 0x4f, 0x5f, 0x3e, + 0xb9, 0x2a, 0x28, 0x69, 0x5f, 0x4e, 0xdc, 0x51, 0x75, 0xf5, 0xfd, 0x97, 0x4f, 0xae, 0x72, 0xd4, + 0x3e, 0x7c, 0xf9, 0xe4, 0x6a, 0x86, 0xe7, 0xe1, 0x40, 0xb6, 0xc9, 0x9f, 0x0b, 0xe0, 0xc2, 0x80, + 0x44, 0x81, 0xa8, 0x6b, 0x5b, 0x08, 0x8a, 0x37, 0xc0, 0x39, 0x12, 0xdf, 0xcf, 0xc1, 0xe5, 0x7e, + 0x4f, 0x4a, 0x10, 0x13, 0x0a, 0xec, 0x1c, 0x5b, 0x0d, 0x37, 0x91, 0x95, 0x04, 0xf9, 0x6a, 0x68, + 0xe2, 0x2e, 0x48, 0xb5, 0x49, 0x30, 0x02, 0xb4, 0xa6, 0x62, 0x48, 0x53, 0x2f, 0x59, 0xc9, 0x0d, + 0x31, 0x6b, 0xdb, 0xad, 0x2d, 0xf5, 0xcb, 0x7c, 0x83, 0x19, 0x7e, 0x56, 0x41, 0x77, 0xf9, 0xf1, + 0xf7, 0x92, 0xc0, 0x76, 0x38, 0xeb, 0x2a, 0x6e, 0x11, 0xf9, 0x07, 0x71, 0x90, 0x6c, 0x22, 0x7d, + 0x53, 0x33, 0xf0, 0x69, 0x96, 0x8d, 0xc0, 0xae, 0x63, 0xaf, 0xb0, 0x6b, 0x37, 0xc7, 0xe3, 0x27, + 0xcd, 0xf1, 0xc9, 0x53, 0xca, 0xf1, 0xa9, 0x71, 0x39, 0x5e, 0x03, 0x09, 0xa8, 0x19, 0xd8, 0x76, + 0xb2, 0x89, 0x70, 0xba, 0x31, 0xf9, 0x98, 0x74, 0x63, 0x06, 0x55, 0x99, 0xb2, 0x88, 0x0d, 0x08, + 0x8b, 0x44, 0x9f, 0x45, 0x2e, 0xf4, 0xf2, 0x43, 0x70, 0x3e, 0x30, 0xf4, 0x08, 0x74, 0x1f, 0xcc, + 0x10, 0x3f, 0xc6, 0x02, 0xe1, 0x58, 0x16, 0xac, 0x70, 0x16, 0xcc, 0xfb, 0x0b, 0x0c, 0x33, 0x60, + 0x9a, 0x08, 0xe9, 0xe9, 0xff, 0x24, 0xd0, 0x6b, 0xe3, 0x16, 0x34, 0xe1, 0xe9, 0x5e, 0x1b, 0xaf, + 0x79, 0xfe, 0x35, 0x90, 0x40, 0x86, 0x6e, 0x41, 0x87, 0x33, 0x20, 0x80, 0x34, 0x93, 0x8f, 0x41, + 0x9a, 0x19, 0xf0, 0x7c, 0x65, 0x83, 0x50, 0xbe, 0xfa, 0xdb, 0x94, 0x17, 0x69, 0xba, 0xfa, 0x02, + 0x17, 0x6d, 0xf9, 0xc7, 0x18, 0xc8, 0x34, 0x91, 0x5e, 0xd3, 0x68, 0xfa, 0xfb, 0x75, 0xf8, 0x8c, + 0x81, 0xd1, 0xc1, 0xb9, 0x36, 0xbb, 0x09, 0x28, 0x32, 0xa3, 0xae, 0x98, 0x7f, 0xf8, 0x21, 0xb8, + 0xf9, 0x09, 0xaf, 0x17, 0x37, 0x7a, 0x80, 0xeb, 0x93, 0xaf, 0xcb, 0xf5, 0x6b, 0x21, 0xae, 0x5f, + 0xf4, 0x4f, 0x60, 0x08, 0x56, 0xf9, 0x4b, 0x01, 0x2c, 0x47, 0x29, 0x3c, 0xfa, 0x37, 0x41, 0xca, + 0xbf, 0xfa, 0x5c, 0xe4, 0x53, 0xf5, 0x62, 0xbf, 0x27, 0xcd, 0xfa, 0xe6, 0x14, 0xbc, 0x4c, 0xf8, + 0x72, 0xa5, 0x10, 0xce, 0xfa, 0xe3, 0x86, 0x36, 0x98, 0x4d, 0xb1, 0xd3, 0xcd, 0xa6, 0x6f, 0x63, + 0x60, 0xb1, 0x89, 0x74, 0x05, 0x76, 0xec, 0x7d, 0xf8, 0x56, 0xd1, 0x67, 0x08, 0xc4, 0xf8, 0x1b, + 0x81, 0x78, 0x0a, 0x24, 0x29, 0x85, 0x48, 0x92, 0xf7, 0x49, 0x12, 0x85, 0x9f, 0xfc, 0x0e, 0x90, + 0x46, 0xa8, 0x7e, 0x97, 0x42, 0xf9, 0x73, 0x8c, 0x16, 0xca, 0x9a, 0x85, 0x1e, 0x41, 0xe7, 0xae, + 0x6d, 0x9a, 0x67, 0x7c, 0xa0, 0xd4, 0xcd, 0x34, 0xfd, 0xa3, 0xe4, 0x6e, 0xa6, 0x39, 0xe8, 0x66, + 0x9a, 0xae, 0x9b, 0x49, 0x7a, 0xe8, 0xdb, 0x20, 0xad, 0xd2, 0x2d, 0xa0, 0x96, 0x61, 0x69, 0xf0, + 0x80, 0xde, 0xa0, 0xf1, 0x62, 0xaa, 0x2e, 0xf9, 0x3d, 0x5e, 0xc8, 0x80, 0xf7, 0x45, 0x73, 0x5c, + 0xdc, 0x60, 0xd2, 0x40, 0xa5, 0x9e, 0xfa, 0x0d, 0x2a, 0xb5, 0x8f, 0x33, 0xaf, 0xd4, 0xbe, 0xc0, + 0xab, 0xd4, 0x5f, 0x08, 0x20, 0xdd, 0x44, 0xfa, 0xbd, 0x2e, 0x39, 0xb4, 0xbb, 0xaa, 0xa3, 0x76, + 0x90, 0x78, 0x07, 0xcc, 0xb0, 0x4e, 0xcd, 0xc0, 0x87, 0xf4, 0x48, 0x66, 0xea, 0xd7, 0xfd, 0x23, + 0xf6, 0x54, 0xa3, 0xd7, 0xe6, 0xbb, 0x8b, 0x37, 0x40, 0xa2, 0x4b, 0xa3, 0xf2, 0x32, 0xb1, 0x38, + 0xdc, 0x5f, 0x52, 0x75, 0x7d, 0x92, 0x10, 0x49, 0xe1, 0xc6, 0xd5, 0x75, 0xb2, 0x2b, 0x3f, 0x4c, + 0x90, 0xdb, 0x07, 0xfc, 0xf1, 0x16, 0x5a, 0xb5, 0xbc, 0x44, 0xcb, 0x46, 0x50, 0xe4, 0x6d, 0xf2, + 0x33, 0xd6, 0x9e, 0x35, 0x39, 0xeb, 0xcf, 0x98, 0x75, 0x2d, 0x20, 0x62, 0xd5, 0xd1, 0x21, 0x6e, + 0x05, 0x17, 0x11, 0xa7, 0x11, 0xd6, 0xfb, 0x3d, 0x69, 0x7e, 0x9b, 0x6a, 0x07, 0x96, 0xb2, 0xe4, + 0xf6, 0x53, 0x61, 0x3f, 0x59, 0x99, 0xc7, 0x83, 0xe6, 0x9a, 0xf8, 0x7f, 0xb0, 0xe0, 0x1a, 0xfa, + 0x8f, 0xce, 0x49, 0x4a, 0xf0, 0x72, 0xbf, 0x27, 0xa5, 0x79, 0xfc, 0xc0, 0xd3, 0x33, 0x3b, 0x18, + 0x3e, 0xf0, 0x02, 0x4d, 0xe3, 0x01, 0x63, 0x4d, 0xfc, 0x17, 0x98, 0xb2, 0x1f, 0xf9, 0x8c, 0x2d, + 0x1e, 0xf5, 0xa4, 0x59, 0xe6, 0x4d, 0xc5, 0xa3, 0x49, 0xc1, 0xdc, 0xaa, 0x2b, 0xe4, 0x64, 0xd9, + 0x77, 0xa8, 0x85, 0x73, 0x8f, 0x47, 0xfe, 0x0f, 0x6d, 0xe1, 0xdc, 0xe1, 0x1b, 0xbe, 0x01, 0xe4, + 0xef, 0x62, 0xe0, 0x22, 0x2d, 0x7a, 0x0f, 0xf7, 0x20, 0xa2, 0x4d, 0xe1, 0xff, 0xc8, 0xe4, 0xdb, + 0x8e, 0x6a, 0xa1, 0x5d, 0xe8, 0x9c, 0x31, 0x19, 0xfe, 0x0d, 0xa6, 0x1d, 0xd8, 0x86, 0xc6, 0xbe, + 0xd7, 0xad, 0x5d, 0xf3, 0x7b, 0x6d, 0x57, 0x33, 0x1a, 0x54, 0xcf, 0x99, 0x96, 0x12, 0x68, 0x69, + 0x30, 0xe2, 0x36, 0x61, 0xf2, 0x71, 0xa5, 0x84, 0x1a, 0x54, 0x2b, 0xac, 0x94, 0xd0, 0x01, 0x39, + 0x1b, 0x39, 0x78, 0x9b, 0x44, 0xa3, 0x27, 0x5f, 0x06, 0x97, 0xc6, 0xa8, 0xbd, 0x0c, 0xfc, 0x28, + 0x06, 0x56, 0xc8, 0xcb, 0x4e, 0xb5, 0xda, 0xd0, 0x8c, 0x30, 0xa3, 0xee, 0x6f, 0x41, 0xdb, 0xcc, + 0x10, 0x8c, 0xbf, 0x2e, 0x82, 0xeb, 0x21, 0x04, 0x57, 0x02, 0xcf, 0xdc, 0xe8, 0xad, 0xcb, 0xd7, + 0xc0, 0x95, 0x63, 0x81, 0xf1, 0x60, 0xfc, 0x98, 0xc1, 0x58, 0x6b, 0xb7, 0x61, 0x17, 0xbf, 0xa5, + 0x30, 0x9e, 0x16, 0xa3, 0xab, 0x1b, 0x04, 0x4c, 0x6f, 0x18, 0x82, 0x73, 0x04, 0x04, 0x1c, 0xce, + 0xf1, 0x00, 0x85, 0xe1, 0x54, 0xe0, 0xee, 0x1e, 0x82, 0x7f, 0x68, 0x38, 0x47, 0x40, 0xc0, 0xe1, + 0x1c, 0x0f, 0x90, 0x0b, 0x67, 0xe5, 0x13, 0x00, 0xe2, 0x4d, 0xa4, 0x8b, 0xdb, 0x00, 0x04, 0x7e, + 0x42, 0x1d, 0xfe, 0x45, 0x69, 0xe0, 0x27, 0x9e, 0xdc, 0x5f, 0xc6, 0xeb, 0xbd, 0xf2, 0xff, 0x5f, + 0x30, 0xed, 0xfd, 0xbe, 0xb2, 0x1c, 0xe5, 0xe3, 0x6a, 0x73, 0xab, 0xe3, 0xb4, 0x5e, 0xbc, 0x6d, + 0x00, 0x02, 0x2f, 0xf6, 0xc8, 0x55, 0xfa, 0xfa, 0xe8, 0x55, 0x0e, 0xbf, 0x7c, 0x45, 0x03, 0x2c, + 0x0c, 0xbf, 0x7a, 0x2f, 0x47, 0x39, 0x0f, 0x99, 0xe5, 0xd6, 0x4e, 0x64, 0xe6, 0x4d, 0xe5, 0x80, + 0x4c, 0xe4, 0x23, 0xa9, 0x18, 0x15, 0x26, 0xca, 0x32, 0xf7, 0xd7, 0x93, 0x5a, 0x06, 0x41, 0x0b, + 0x74, 0xef, 0x91, 0xa0, 0xf9, 0xfa, 0x68, 0xd0, 0x86, 0x9b, 0x50, 0xf1, 0x3e, 0x98, 0x1d, 0x68, + 0x40, 0x0b, 0x51, 0x7e, 0x41, 0x8b, 0x5c, 0xf1, 0x38, 0x8b, 0x20, 0x6d, 0xbc, 0xbe, 0x2f, 0x92, + 0x36, 0xae, 0x36, 0x9a, 0x36, 0x43, 0x5d, 0xc8, 0xbb, 0x20, 0x3b, 0xb2, 0x95, 0xb8, 0x1e, 0x8d, + 0x67, 0xb4, 0x75, 0xee, 0x6f, 0xaf, 0x62, 0xed, 0xcd, 0xff, 0x58, 0x00, 0xf9, 0x63, 0xae, 0xd1, + 0x4a, 0x64, 0x46, 0x8d, 0xf5, 0xc9, 0x55, 0x5f, 0xdd, 0x67, 0x60, 0x49, 0xc7, 0x5c, 0x49, 0x91, + 0x4b, 0x1a, 0xef, 0x13, 0xbd, 0xa4, 0x93, 0x55, 0x76, 0xba, 0xa4, 0x63, 0xca, 0x7a, 0x25, 0x1a, + 0xfe, 0x71, 0x3e, 0xd1, 0x4b, 0x3a, 0x59, 0x75, 0xcc, 0x4d, 0xbd, 0x47, 0x9e, 0x80, 0xf5, 0xdb, + 0xcf, 0xfa, 0x79, 0xe1, 0x79, 0x3f, 0x2f, 0xfc, 0xd0, 0xcf, 0x0b, 0x8f, 0x5f, 0xe4, 0x27, 0x9e, + 0xbf, 0xc8, 0x4f, 0x7c, 0xf3, 0x22, 0x3f, 0x71, 0xbf, 0xa4, 0x1b, 0xf8, 0xc1, 0xde, 0x4e, 0xa9, + 0x6d, 0x77, 0xca, 0x6c, 0x9a, 0x35, 0x53, 0xdd, 0x41, 0xfc, 0xbb, 0xbc, 0xff, 0x77, 0xef, 0xe9, + 0x83, 0x0f, 0xbb, 0x10, 0xed, 0x24, 0xe8, 0x73, 0x7c, 0xe3, 0xd7, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x38, 0x8e, 0x90, 0xa0, 0x9a, 0x1b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/posts/types/msgs_owner_transfer.go b/x/posts/types/msgs_owner_transfer.go index 09147c029a..94c6ef15dd 100644 --- a/x/posts/types/msgs_owner_transfer.go +++ b/x/posts/types/msgs_owner_transfer.go @@ -4,12 +4,10 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" ) var ( - _ sdk.Msg = &MsgRequestPostOwnerTransfer{} - _ legacytx.LegacyMsg = &MsgRequestPostOwnerTransfer{} + _ sdk.Msg = &MsgRequestPostOwnerTransfer{} ) // MsgRequestPostOwnerTransfer returns a new MsgRequestPostOwnerTransfer instance @@ -65,16 +63,10 @@ func (msg *MsgRequestPostOwnerTransfer) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{sender} } -// GetSigners implements legacytx.LegacyMsg -func (msg *MsgRequestPostOwnerTransfer) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgCancelPostOwnerTransferRequest{} - _ legacytx.LegacyMsg = &MsgCancelPostOwnerTransferRequest{} + _ sdk.Msg = &MsgCancelPostOwnerTransferRequest{} ) // MsgCancelPostOwnerTransferRequest returns a new MsgCancelPostOwnerTransferRequest instance @@ -120,16 +112,10 @@ func (msg *MsgCancelPostOwnerTransferRequest) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{sender} } -// GetSigners implements legacytx.LegacyMsg -func (msg *MsgCancelPostOwnerTransferRequest) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgAcceptPostOwnerTransferRequest{} - _ legacytx.LegacyMsg = &MsgAcceptPostOwnerTransferRequest{} + _ sdk.Msg = &MsgAcceptPostOwnerTransferRequest{} ) // MsgAcceptPostOwnerTransferRequest returns a new MsgAcceptPostOwnerTransferRequest instance @@ -175,16 +161,10 @@ func (msg *MsgAcceptPostOwnerTransferRequest) GetSigners() []sdk.AccAddress { return []sdk.AccAddress{receiver} } -// GetSigners implements legacytx.LegacyMsg -func (msg *MsgAcceptPostOwnerTransferRequest) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgRefusePostOwnerTransferRequest{} - _ legacytx.LegacyMsg = &MsgRefusePostOwnerTransferRequest{} + _ sdk.Msg = &MsgRefusePostOwnerTransferRequest{} ) // MsgRefusePostOwnerTransferRequest returns a new MsgRefusePostOwnerTransferRequest instance @@ -229,8 +209,3 @@ func (msg *MsgRefusePostOwnerTransferRequest) GetSigners() []sdk.AccAddress { receiver := sdk.MustAccAddressFromBech32(msg.Receiver) return []sdk.AccAddress{receiver} } - -// GetSigners implements legacytx.LegacyMsg -func (msg *MsgRefusePostOwnerTransferRequest) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} diff --git a/x/posts/types/msgs_owner_transfer_test.go b/x/posts/types/msgs_owner_transfer_test.go index cd3d097cf2..6147b8b535 100644 --- a/x/posts/types/msgs_owner_transfer_test.go +++ b/x/posts/types/msgs_owner_transfer_test.go @@ -99,11 +99,6 @@ func TestMsgRequestPostOwnerTransfer_ValidateBasic(t *testing.T) { } } -func TestMsgRequestPostOwnerTransfer_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRequestPostOwnerTransfer","value":{"post_id":"1","receiver":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","sender":"cosmos1eqpa6mv2jgevukaqtjmx5535vhc3mm3cf458zg","subspace_id":"1"}}` - require.Equal(t, expected, string(msgRequestPostOwnerTransfer.GetSignBytes())) -} - func TestMsgRequestPostOwnerTransfer_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRequestPostOwnerTransfer.Sender) require.Equal(t, []sdk.AccAddress{addr}, msgRequestPostOwnerTransfer.GetSigners()) @@ -177,11 +172,6 @@ func TestMsgCancelPostOwnerTransferRequest_ValidateBasic(t *testing.T) { } } -func TestMsgCancelPostOwnerTransferRequest_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgCancelPostOwnerTransfer","value":{"post_id":"1","sender":"cosmos1eqpa6mv2jgevukaqtjmx5535vhc3mm3cf458zg","subspace_id":"1"}}` - require.Equal(t, expected, string(msgCancelPostOwnerTransferRequest.GetSignBytes())) -} - func TestMsgCancelPostOwnerTransferRequest_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgCancelPostOwnerTransferRequest.Sender) require.Equal(t, []sdk.AccAddress{addr}, msgCancelPostOwnerTransferRequest.GetSigners()) @@ -255,11 +245,6 @@ func TestMsgAcceptPostOwnerTransferRequest_ValidateBasic(t *testing.T) { } } -func TestMsgAcceptPostOwnerTransferRequest_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgAcceptPostOwnerTransfer","value":{"post_id":"1","receiver":"cosmos1eqpa6mv2jgevukaqtjmx5535vhc3mm3cf458zg","subspace_id":"1"}}` - require.Equal(t, expected, string(msgAcceptPostOwnerTransferRequest.GetSignBytes())) -} - func TestMsgAcceptPostOwnerTransferRequest_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgAcceptPostOwnerTransferRequest.Receiver) require.Equal(t, []sdk.AccAddress{addr}, msgAcceptPostOwnerTransferRequest.GetSigners()) @@ -333,11 +318,6 @@ func TestMsgRefusePostOwnerTransferRequest_ValidateBasic(t *testing.T) { } } -func TestMsgRefusePostOwnerTransferRequest_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRefusePostOwnerTransfer","value":{"post_id":"1","receiver":"cosmos1eqpa6mv2jgevukaqtjmx5535vhc3mm3cf458zg","subspace_id":"1"}}` - require.Equal(t, expected, string(msgRefusePostOwnerTransferRequest.GetSignBytes())) -} - func TestMsgRefusePostOwnerTransferRequest_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRefusePostOwnerTransferRequest.Receiver) require.Equal(t, []sdk.AccAddress{addr}, msgRefusePostOwnerTransferRequest.GetSigners()) diff --git a/x/posts/types/msgs_test.go b/x/posts/types/msgs_test.go index b9c58eaf2c..61c706acc7 100644 --- a/x/posts/types/msgs_test.go +++ b/x/posts/types/msgs_test.go @@ -218,11 +218,6 @@ func TestMsgCreatePost_ValidateBasic(t *testing.T) { } } -func TestMsgCreatePost_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgCreatePost","value":{"attachments":[{"type":"desmos/Media","value":{"mime_type":"image/png","uri":"ftp://user:password@example.com/image.png"}},{"type":"desmos/Poll","value":{"end_date":"2020-01-01T12:00:00Z","provided_answers":[{"attachments":[{"type":"desmos/Media","value":{"mime_type":"image/png","uri":"ftp://user:password@example.com/cat.png"}}],"text":"Cat"},{"text":"Dog"}],"question":"What animal is best?"}}],"author":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","conversation_id":"1","entities":{"hashtags":[{"end":"3","start":"1","tag":"tag"}],"mentions":[{"end":"6","start":"4","tag":"tag"}],"urls":[{"display_url":"Display URL","end":"9","start":"7","url":"URL"}]},"external_id":"External ID","referenced_posts":[{"post_id":"1","type":2}],"reply_settings":1,"section_id":1,"subspace_id":"1","tags":["general"],"text":"This is a text"}}` - require.Equal(t, expected, string(msgCreatePost.GetSignBytes())) -} - func TestMsgCreatePost_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgCreatePost.Author) require.Equal(t, []sdk.AccAddress{addr}, msgCreatePost.GetSigners()) @@ -345,11 +340,6 @@ func TestMsgEditPost_ValidateBasic(t *testing.T) { } } -func TestMsgEditPost_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgEditPost","value":{"editor":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","entities":{"hashtags":[{"end":"3","start":"1","tag":"tag"}],"mentions":[{"end":"6","start":"4","tag":"tag"}],"urls":[{"display_url":"Display URL","end":"9","start":"7","url":"URL"}]},"post_id":"1","subspace_id":"1","tags":["general"],"text":"Edited text"}}` - require.Equal(t, expected, string(msgEditPost.GetSignBytes())) -} - func TestMsgEditPost_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgEditPost.Editor) require.Equal(t, []sdk.AccAddress{addr}, msgEditPost.GetSigners()) @@ -442,11 +432,6 @@ func TestMsgAddPostAttachment_ValidateBasic(t *testing.T) { } } -func TestMsgAddPostAttachment_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgAddPostAttachment","value":{"content":{"type":"desmos/Media","value":{"mime_type":"image/png","uri":"ftp://user:password@example.com/image.png"}},"editor":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","post_id":"1","subspace_id":"1"}}` - require.Equal(t, expected, string(msgAddPostAttachment.GetSignBytes())) -} - func TestMsgAddPostAttachment_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgAddPostAttachment.Editor) require.Equal(t, []sdk.AccAddress{addr}, msgAddPostAttachment.GetSigners()) @@ -534,11 +519,6 @@ func TestMsgRemovePostAttachment_ValidateBasic(t *testing.T) { } } -func TestMsgRemovePostAttachment_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRemovePostAttachment","value":{"attachment_id":1,"editor":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","post_id":"1","subspace_id":"1"}}` - require.Equal(t, expected, string(msgRemovePostAttachment.GetSignBytes())) -} - func TestMsgRemovePostAttachment_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRemovePostAttachment.Editor) require.Equal(t, []sdk.AccAddress{addr}, msgRemovePostAttachment.GetSigners()) @@ -612,11 +592,6 @@ func TestMsgDeletePost_ValidateBasic(t *testing.T) { } } -func TestMsgDeletePost_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgDeletePost","value":{"post_id":"1","signer":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","subspace_id":"1"}}` - require.Equal(t, expected, string(msgDeletePost.GetSignBytes())) -} - func TestMsgDeletePost_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgDeletePost.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgDeletePost.GetSigners()) @@ -731,11 +706,6 @@ func TestMsgAnswerPoll_ValidateBasic(t *testing.T) { } } -func TestMsgAnswerPoll_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgAnswerPoll","value":{"answers_indexes":[1,2,3],"poll_id":1,"post_id":"1","signer":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","subspace_id":"1"}}` - require.Equal(t, expected, string(msgAnswerPoll.GetSignBytes())) -} - func TestMsgAnswerPoll_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgAnswerPoll.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgAnswerPoll.GetSigners()) @@ -839,11 +809,6 @@ func TestMsgMovePost_ValidateBasic(t *testing.T) { } } -func TestMsgMovePost_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgMovePost","value":{"owner":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","post_id":"1","subspace_id":"1","target_subspace_id":"2"}}` - require.Equal(t, expected, string(msgMovePost.GetSignBytes())) -} - func TestMsgMovePost_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgMovePost.Owner) require.Equal(t, []sdk.AccAddress{addr}, msgMovePost.GetSigners()) @@ -897,11 +862,6 @@ func TestMsgUpdateParams_ValidateBasic(t *testing.T) { } } -func TestMsgUpdateParams_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/x/posts/MsgUpdateParams","value":{"authority":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","params":{"max_text_length":500}}}` - require.Equal(t, expected, string(msgUpdateParams.GetSignBytes())) -} - func TestMsgUpdateParams_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgUpdateParams.Authority) require.Equal(t, []sdk.AccAddress{addr}, msgUpdateParams.GetSigners()) diff --git a/x/posts/types/query.pb.go b/x/posts/types/query.pb.go index b48c6f6a01..ae0832d462 100644 --- a/x/posts/types/query.pb.go +++ b/x/posts/types/query.pb.go @@ -832,66 +832,66 @@ var fileDescriptor_ac444b4e366473d7 = []byte{ // 984 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x97, 0x4f, 0x6f, 0x1b, 0x55, 0x10, 0xc0, 0xfd, 0x1a, 0xc7, 0x6d, 0xc6, 0x54, 0xa5, 0x8f, 0xa0, 0x38, 0x9b, 0x62, 0xa7, 0x0b, - 0x02, 0x27, 0xd4, 0xbb, 0x34, 0x29, 0x15, 0xca, 0x01, 0x9a, 0x08, 0xda, 0x5a, 0x2a, 0x22, 0xdd, - 0x82, 0x84, 0xb8, 0x54, 0xcf, 0xde, 0xc7, 0x76, 0x25, 0x7b, 0xdf, 0x76, 0xdf, 0xda, 0xa5, 0xaa, - 0x72, 0x41, 0x1c, 0xb8, 0x81, 0xc4, 0x15, 0x44, 0x84, 0x84, 0xc4, 0x11, 0x04, 0xc7, 0x7e, 0x80, - 0x4a, 0x5c, 0x2a, 0xb8, 0xf4, 0x80, 0x10, 0x4a, 0x90, 0xe0, 0xce, 0x17, 0x40, 0xef, 0xcf, 0x3a, - 0xeb, 0x7f, 0xc9, 0xc6, 0xf2, 0xa1, 0x97, 0xc8, 0x3b, 0x33, 0x6f, 0xe6, 0x37, 0x33, 0x6f, 0x67, - 0x36, 0xb0, 0xe4, 0x52, 0xde, 0x66, 0xdc, 0x0e, 0x19, 0x8f, 0xb9, 0xdd, 0x5d, 0xb7, 0xef, 0x76, - 0x68, 0x74, 0xdf, 0x0a, 0x23, 0x16, 0x33, 0x7c, 0x46, 0x29, 0x2d, 0xa9, 0xb4, 0xba, 0xeb, 0xc6, - 0x59, 0xd2, 0xf6, 0x03, 0x66, 0xcb, 0xbf, 0xca, 0xc6, 0x98, 0xf7, 0x98, 0xc7, 0xe4, 0x4f, 0x5b, - 0xfc, 0xd2, 0xd2, 0x73, 0x1e, 0x63, 0x5e, 0x8b, 0xda, 0x24, 0xf4, 0x6d, 0x12, 0x04, 0x2c, 0x26, + 0x02, 0x27, 0xd4, 0xbb, 0x34, 0xa9, 0x22, 0x94, 0x03, 0x34, 0x11, 0xb4, 0xb5, 0x54, 0x44, 0xba, + 0x05, 0x09, 0x71, 0xa9, 0x9e, 0xbd, 0x8f, 0xed, 0x4a, 0xf6, 0xbe, 0xed, 0xbe, 0xb5, 0x4b, 0x55, + 0xe5, 0x82, 0x38, 0x70, 0x03, 0x89, 0x2b, 0x88, 0x08, 0x09, 0x89, 0x23, 0x08, 0x8e, 0xfd, 0x00, + 0x95, 0xb8, 0x54, 0x70, 0xe9, 0x01, 0x21, 0x94, 0x20, 0xc1, 0x9d, 0x2f, 0x80, 0xde, 0x9f, 0x75, + 0xd6, 0xff, 0x92, 0x8d, 0xe5, 0x03, 0x97, 0xc8, 0x3b, 0x33, 0x6f, 0xe6, 0x37, 0x33, 0x6f, 0x67, + 0x36, 0xb0, 0xe4, 0x52, 0xde, 0x66, 0xdc, 0x0e, 0x19, 0x8f, 0xb9, 0xdd, 0x5d, 0xb7, 0xef, 0x75, + 0x68, 0xf4, 0xc0, 0x0a, 0x23, 0x16, 0x33, 0x7c, 0x4e, 0x29, 0x2d, 0xa9, 0xb4, 0xba, 0xeb, 0xc6, + 0x79, 0xd2, 0xf6, 0x03, 0x66, 0xcb, 0xbf, 0xca, 0xc6, 0x98, 0xf7, 0x98, 0xc7, 0xe4, 0x4f, 0x5b, + 0xfc, 0xd2, 0xd2, 0x0b, 0x1e, 0x63, 0x5e, 0x8b, 0xda, 0x24, 0xf4, 0x6d, 0x12, 0x04, 0x2c, 0x26, 0xb1, 0xcf, 0x02, 0xae, 0xb5, 0xab, 0x4d, 0x26, 0x83, 0x36, 0x08, 0xa7, 0x2a, 0xa0, 0xdd, 0xbd, - 0xd8, 0xa0, 0x31, 0xb9, 0x68, 0x87, 0xc4, 0xf3, 0x03, 0x69, 0xac, 0x6d, 0x17, 0x95, 0xed, 0x6d, - 0x15, 0x42, 0x3d, 0x24, 0x41, 0x06, 0xd9, 0xdb, 0xcc, 0xa5, 0x2d, 0xad, 0x35, 0x3f, 0x43, 0xb0, - 0x78, 0x53, 0xf8, 0xbe, 0xd5, 0x69, 0xf0, 0x90, 0x34, 0xe9, 0xb6, 0x30, 0x73, 0xe8, 0xdd, 0x0e, - 0xe5, 0x31, 0xae, 0x40, 0x91, 0x6b, 0xf9, 0x6d, 0xdf, 0x2d, 0xa1, 0x65, 0x54, 0xcd, 0x3b, 0x90, - 0x88, 0xea, 0x2e, 0xbe, 0x0a, 0x70, 0xc0, 0x52, 0x3a, 0xb1, 0x8c, 0xaa, 0xc5, 0xb5, 0x97, 0x2d, - 0x1d, 0x5f, 0x80, 0x5b, 0xaa, 0x52, 0x1a, 0xdc, 0xda, 0x26, 0x1e, 0xd5, 0xce, 0x9d, 0xd4, 0x49, - 0xf3, 0x1b, 0x04, 0xc6, 0x28, 0x0c, 0x1e, 0xb2, 0x80, 0x53, 0x7c, 0x19, 0x66, 0x25, 0x7e, 0x09, - 0x2d, 0xcf, 0x54, 0x8b, 0x6b, 0xcf, 0x5b, 0x03, 0x25, 0xb7, 0x84, 0xf9, 0xd6, 0xdc, 0xa3, 0x3f, - 0x2b, 0xb9, 0x1f, 0xfe, 0xf9, 0x71, 0x15, 0x39, 0xca, 0x1c, 0x5f, 0x1b, 0x81, 0xf7, 0xca, 0x91, - 0x78, 0x2a, 0x68, 0x1f, 0xdf, 0x77, 0x08, 0x4a, 0x8a, 0x8f, 0x36, 0x85, 0xe0, 0x78, 0x55, 0x7a, - 0x01, 0x80, 0xab, 0x73, 0x42, 0x2f, 0x30, 0x4e, 0x3b, 0x73, 0x5a, 0x32, 0x54, 0xc4, 0x99, 0x89, - 0x8b, 0xf8, 0x75, 0xaf, 0x97, 0x7d, 0x90, 0x4f, 0x4b, 0x0d, 0x6f, 0xc0, 0xb3, 0x92, 0x4e, 0xc4, - 0xc9, 0x5c, 0xba, 0x05, 0x38, 0x29, 0x30, 0x92, 0xba, 0xe5, 0x9d, 0x82, 0x78, 0xac, 0xbb, 0x66, - 0x1d, 0xce, 0xa6, 0xbc, 0xe9, 0x1c, 0x2f, 0x41, 0x5e, 0xa8, 0xa5, 0x9f, 0x2c, 0x29, 0x4a, 0x6b, - 0xf3, 0x5b, 0x04, 0x4b, 0x3d, 0x5f, 0x9b, 0x71, 0x4c, 0x9a, 0x77, 0xda, 0x34, 0x38, 0x46, 0x7f, - 0xc7, 0x41, 0x4e, 0xad, 0xb3, 0x3f, 0x21, 0x38, 0x37, 0x9a, 0x50, 0x27, 0x7e, 0x1d, 0x8a, 0xe4, - 0x40, 0xac, 0x5b, 0xbc, 0x34, 0x94, 0xff, 0xc1, 0xd1, 0x74, 0x15, 0xd2, 0x47, 0xa7, 0xd7, 0xee, - 0x3d, 0x04, 0x0b, 0x9a, 0xb9, 0xd5, 0xda, 0x0c, 0xf8, 0x3d, 0x1a, 0x4d, 0xa1, 0xa2, 0x52, 0xd1, - 0x6a, 0x09, 0xc5, 0x8c, 0x7c, 0x8f, 0x0a, 0xe2, 0xb1, 0xee, 0xe2, 0x0b, 0x90, 0xef, 0x70, 0x1a, - 0x95, 0xf2, 0xcb, 0xa8, 0x3a, 0xb7, 0x55, 0xfa, 0xed, 0x97, 0xda, 0xbc, 0x86, 0xde, 0x74, 0xdd, - 0x88, 0x72, 0x7e, 0x2b, 0x8e, 0xfc, 0xc0, 0x73, 0xa4, 0xd5, 0x40, 0x63, 0x66, 0x27, 0x6e, 0xcc, - 0xf7, 0xc9, 0x5c, 0xe8, 0x4b, 0x52, 0x37, 0xe5, 0x0a, 0x9c, 0x24, 0x4a, 0x34, 0xb6, 0x21, 0x1f, - 0x70, 0x1a, 0xa9, 0x63, 0xe9, 0x86, 0x24, 0xc7, 0xa6, 0xd7, 0x8c, 0x79, 0xc0, 0x0a, 0x93, 0x44, - 0xa4, 0x9d, 0xb4, 0xc1, 0xbc, 0x09, 0xcf, 0xf5, 0x49, 0x35, 0xf7, 0x06, 0x14, 0x42, 0x29, 0xd1, - 0xef, 0xd1, 0xc2, 0xf0, 0x7b, 0x24, 0xd5, 0x69, 0x64, 0x7d, 0xc2, 0x7c, 0x82, 0xa0, 0x26, 0x7d, - 0xd6, 0x83, 0x26, 0x6b, 0xfb, 0x81, 0x27, 0x6e, 0xec, 0x7b, 0xf7, 0x02, 0x1a, 0xbd, 0x1f, 0x91, - 0x80, 0x7f, 0x4c, 0x23, 0x1d, 0x3c, 0xfb, 0x5d, 0xb8, 0x04, 0xa7, 0x22, 0xda, 0xa4, 0x7e, 0x97, - 0x46, 0xb2, 0x04, 0x87, 0x75, 0xb7, 0x67, 0x39, 0xad, 0x57, 0x6f, 0xe3, 0xd4, 0xe7, 0xbb, 0x95, - 0xdc, 0xbf, 0xbb, 0x95, 0x9c, 0xf9, 0x2b, 0x02, 0x2b, 0x6b, 0x6a, 0xba, 0x92, 0xdb, 0x02, 0x5d, + 0xdc, 0xa0, 0x31, 0xb9, 0x6c, 0x87, 0xc4, 0xf3, 0x03, 0x69, 0xac, 0x6d, 0x17, 0x95, 0xed, 0x1d, + 0x15, 0x42, 0x3d, 0x24, 0x41, 0x06, 0xd9, 0xdb, 0xcc, 0xa5, 0x2d, 0xad, 0x35, 0x3f, 0x45, 0xb0, + 0x78, 0x4b, 0xf8, 0xbe, 0xdd, 0x69, 0xf0, 0x90, 0x34, 0xe9, 0x8e, 0x30, 0x73, 0xe8, 0xbd, 0x0e, + 0xe5, 0x31, 0xae, 0x40, 0x91, 0x6b, 0xf9, 0x1d, 0xdf, 0x2d, 0xa1, 0x65, 0x54, 0xcd, 0x3b, 0x90, + 0x88, 0xea, 0x2e, 0xbe, 0x06, 0x70, 0xc8, 0x52, 0x3a, 0xb5, 0x8c, 0xaa, 0xc5, 0xb5, 0x97, 0x2d, + 0x1d, 0x5f, 0x80, 0x5b, 0xaa, 0x52, 0x1a, 0xdc, 0xda, 0x21, 0x1e, 0xd5, 0xce, 0x9d, 0xd4, 0x49, + 0xf3, 0x6b, 0x04, 0xc6, 0x28, 0x0c, 0x1e, 0xb2, 0x80, 0x53, 0xbc, 0x01, 0xb3, 0x12, 0xbf, 0x84, + 0x96, 0x67, 0xaa, 0xc5, 0xb5, 0xe7, 0xad, 0x81, 0x92, 0x5b, 0xc2, 0x7c, 0x7b, 0xee, 0xf1, 0x1f, + 0x95, 0xdc, 0xf7, 0x7f, 0xff, 0xb0, 0x8a, 0x1c, 0x65, 0x8e, 0xaf, 0x8f, 0xc0, 0x7b, 0xe5, 0x58, + 0x3c, 0x15, 0xb4, 0x8f, 0xef, 0x5b, 0x04, 0x25, 0xc5, 0x47, 0x9b, 0x42, 0x70, 0xb2, 0x2a, 0xbd, + 0x00, 0xc0, 0xd5, 0x39, 0xa1, 0x17, 0x18, 0x67, 0x9d, 0x39, 0x2d, 0x19, 0x2a, 0xe2, 0xcc, 0xc4, + 0x45, 0xfc, 0xaa, 0xd7, 0xcb, 0x3e, 0xc8, 0xff, 0x4b, 0x0d, 0x6f, 0xc2, 0xb3, 0x92, 0x4e, 0xc4, + 0xc9, 0x5c, 0xba, 0x05, 0x38, 0x2d, 0x30, 0x92, 0xba, 0xe5, 0x9d, 0x82, 0x78, 0xac, 0xbb, 0x66, + 0x1d, 0xce, 0xa7, 0xbc, 0xe9, 0x1c, 0xaf, 0x40, 0x5e, 0xa8, 0xa5, 0x9f, 0x2c, 0x29, 0x4a, 0x6b, + 0xf3, 0x1b, 0x04, 0x4b, 0x3d, 0x5f, 0x5b, 0x71, 0x4c, 0x9a, 0x77, 0xdb, 0x34, 0x38, 0x41, 0x7f, + 0xc7, 0x41, 0x4e, 0xad, 0xb3, 0x3f, 0x22, 0xb8, 0x30, 0x9a, 0x50, 0x27, 0x7e, 0x03, 0x8a, 0xe4, + 0x50, 0xac, 0x5b, 0xbc, 0x34, 0x94, 0xff, 0xe1, 0xd1, 0x74, 0x15, 0xd2, 0x47, 0xa7, 0xd7, 0xee, + 0x7d, 0x04, 0x0b, 0x9a, 0xb9, 0xd5, 0xda, 0x0a, 0xf8, 0x7d, 0x1a, 0x4d, 0xa1, 0xa2, 0x52, 0xd1, + 0x6a, 0x09, 0xc5, 0x8c, 0x7c, 0x8f, 0x0a, 0xe2, 0xb1, 0xee, 0xe2, 0x4b, 0x90, 0xef, 0x70, 0x1a, + 0x95, 0xf2, 0xcb, 0xa8, 0x3a, 0xb7, 0x5d, 0xfa, 0xf5, 0xe7, 0xda, 0xbc, 0x86, 0xde, 0x72, 0xdd, + 0x88, 0x72, 0x7e, 0x3b, 0x8e, 0xfc, 0xc0, 0x73, 0xa4, 0xd5, 0x40, 0x63, 0x66, 0x27, 0x6e, 0xcc, + 0x77, 0xc9, 0x5c, 0xe8, 0x4b, 0x52, 0x37, 0xe5, 0x2a, 0x9c, 0x26, 0x4a, 0x34, 0xb6, 0x21, 0xef, + 0x73, 0x1a, 0xa9, 0x63, 0xe9, 0x86, 0x24, 0xc7, 0xa6, 0xd7, 0x8c, 0x79, 0xc0, 0x0a, 0x93, 0x44, + 0xa4, 0x9d, 0xb4, 0xc1, 0xbc, 0x05, 0xcf, 0xf5, 0x49, 0x35, 0xf7, 0x26, 0x14, 0x42, 0x29, 0xd1, + 0xef, 0xd1, 0xc2, 0xf0, 0x7b, 0x24, 0xd5, 0x69, 0x64, 0x7d, 0xc2, 0x7c, 0x8a, 0xa0, 0x26, 0x7d, + 0xd6, 0x83, 0x26, 0x6b, 0xfb, 0x81, 0x27, 0x6e, 0xec, 0xbb, 0xf7, 0x03, 0x1a, 0xbd, 0x17, 0x91, + 0x80, 0x7f, 0x44, 0x23, 0x1d, 0x3c, 0xfb, 0x5d, 0xb8, 0x02, 0x67, 0x22, 0xda, 0xa4, 0x7e, 0x97, + 0x46, 0xb2, 0x04, 0x47, 0x75, 0xb7, 0x67, 0x39, 0xad, 0x57, 0x6f, 0xf3, 0xcc, 0x67, 0x7b, 0x95, + 0xdc, 0x3f, 0x7b, 0x95, 0x9c, 0xf9, 0x0b, 0x02, 0x2b, 0x6b, 0x6a, 0xba, 0x92, 0x3b, 0x02, 0x5d, 0xc9, 0xf4, 0x15, 0x58, 0x19, 0x39, 0x93, 0x46, 0x79, 0x49, 0x57, 0xb7, 0xe7, 0x65, 0x6a, 0x37, - 0x62, 0xed, 0x8f, 0x39, 0x98, 0x95, 0xd9, 0xe0, 0x5d, 0x04, 0xa7, 0xfb, 0xd6, 0x2e, 0x5e, 0x1d, - 0x82, 0x1c, 0xfb, 0x89, 0x60, 0xbc, 0x9a, 0xc9, 0x56, 0x01, 0x98, 0x97, 0x3f, 0xfd, 0xfd, 0xef, - 0xaf, 0x4e, 0xbc, 0x86, 0x2d, 0x7b, 0xf0, 0xa3, 0x24, 0xe9, 0x37, 0xb7, 0x1f, 0xa4, 0x6e, 0xc3, - 0x8e, 0x32, 0xc0, 0x3f, 0x23, 0x78, 0x26, 0xbd, 0xd4, 0xf0, 0xca, 0x98, 0xa8, 0xc3, 0xdb, 0xd9, - 0x58, 0xcd, 0x62, 0xaa, 0xf9, 0x6e, 0x48, 0xbe, 0xab, 0xf8, 0xed, 0xcc, 0x7c, 0x7a, 0x8b, 0x0b, - 0x71, 0x6f, 0xc3, 0x27, 0xd4, 0x5f, 0x20, 0xc8, 0x0b, 0xff, 0xf8, 0xfc, 0x68, 0x84, 0xd4, 0x22, - 0x34, 0xcc, 0xc3, 0x4c, 0x34, 0xdd, 0x15, 0x49, 0xb7, 0x81, 0xdf, 0x38, 0x5e, 0xf5, 0xec, 0x07, - 0x7a, 0x94, 0xee, 0xe0, 0x87, 0x08, 0xce, 0x0c, 0xac, 0x10, 0x7c, 0x61, 0x7c, 0xe4, 0xe1, 0x5d, - 0x68, 0xd4, 0x32, 0x5a, 0x4f, 0x5c, 0xd0, 0x01, 0x64, 0x3b, 0xbd, 0x9b, 0x1e, 0x22, 0x28, 0xa6, - 0x06, 0x2d, 0xae, 0x8e, 0x83, 0x19, 0x5c, 0x38, 0xc6, 0x4a, 0x06, 0x4b, 0x8d, 0xfc, 0xa1, 0x44, - 0x76, 0xf0, 0xf6, 0xc4, 0xc8, 0x62, 0x23, 0xc9, 0x67, 0xb9, 0xa7, 0x76, 0xec, 0x64, 0x9a, 0xc7, - 0x50, 0x50, 0x83, 0x13, 0xbf, 0x38, 0x06, 0x27, 0x3d, 0x9d, 0x8d, 0x97, 0x0e, 0x37, 0xd2, 0xb8, - 0x15, 0x89, 0xbb, 0x88, 0x17, 0x86, 0x70, 0xd5, 0x44, 0xc6, 0xff, 0x21, 0x38, 0x7f, 0xe4, 0xc4, - 0xc2, 0x6f, 0x8e, 0x0e, 0x96, 0x75, 0x8a, 0x1b, 0x6f, 0x4d, 0x7c, 0x5e, 0xe7, 0xf1, 0xae, 0xcc, - 0xe3, 0x1a, 0x7e, 0xe7, 0x58, 0x65, 0xaf, 0x31, 0xe1, 0xb4, 0x16, 0x6b, 0xaf, 0xb5, 0x64, 0x4e, - 0x6e, 0x5d, 0x7f, 0xb4, 0x57, 0x46, 0x8f, 0xf7, 0xca, 0xe8, 0xaf, 0xbd, 0x32, 0xfa, 0x72, 0xbf, - 0x9c, 0x7b, 0xbc, 0x5f, 0xce, 0x3d, 0xd9, 0x2f, 0xe7, 0x3e, 0xb2, 0x3c, 0x3f, 0xbe, 0xd3, 0x69, - 0x58, 0x4d, 0xd6, 0xd6, 0xa1, 0x6a, 0x2d, 0xd2, 0xe0, 0x49, 0xd8, 0xee, 0xeb, 0xf6, 0x27, 0x3a, - 0x76, 0x7c, 0x3f, 0xa4, 0xbc, 0x51, 0x90, 0xff, 0x28, 0xad, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, - 0xb3, 0x40, 0x04, 0xca, 0x04, 0x0e, 0x00, 0x00, + 0x62, 0xed, 0xf7, 0x39, 0x98, 0x95, 0xd9, 0xe0, 0x3d, 0x04, 0x67, 0xfb, 0xd6, 0x2e, 0x5e, 0x1d, + 0x82, 0x1c, 0xfb, 0x89, 0x60, 0xbc, 0x9a, 0xc9, 0x56, 0x01, 0x98, 0x1b, 0x9f, 0xfc, 0xf6, 0xd7, + 0x97, 0xa7, 0x5e, 0xc3, 0x96, 0x3d, 0xf8, 0x51, 0x92, 0xf4, 0x9b, 0xdb, 0x0f, 0x53, 0xb7, 0x61, + 0x57, 0x19, 0xe0, 0x9f, 0x10, 0x3c, 0x93, 0x5e, 0x6a, 0x78, 0x65, 0x4c, 0xd4, 0xe1, 0xed, 0x6c, + 0xac, 0x66, 0x31, 0xd5, 0x7c, 0x37, 0x25, 0xdf, 0x35, 0xfc, 0x56, 0x66, 0x3e, 0xbd, 0xc5, 0x85, + 0xb8, 0xb7, 0xe1, 0x13, 0xea, 0xcf, 0x11, 0xe4, 0x85, 0x7f, 0x7c, 0x71, 0x34, 0x42, 0x6a, 0x11, + 0x1a, 0xe6, 0x51, 0x26, 0x9a, 0xee, 0xaa, 0xa4, 0xdb, 0xc4, 0xaf, 0x9f, 0xac, 0x7a, 0xf6, 0x43, + 0x3d, 0x4a, 0x77, 0xf1, 0x23, 0x04, 0xe7, 0x06, 0x56, 0x08, 0xbe, 0x34, 0x3e, 0xf2, 0xf0, 0x2e, + 0x34, 0x6a, 0x19, 0xad, 0x27, 0x2e, 0xe8, 0x00, 0xb2, 0x9d, 0xde, 0x4d, 0x8f, 0x10, 0x14, 0x53, + 0x83, 0x16, 0x57, 0xc7, 0xc1, 0x0c, 0x2e, 0x1c, 0x63, 0x25, 0x83, 0xa5, 0x46, 0xfe, 0x40, 0x22, + 0x3b, 0x78, 0x67, 0x62, 0x64, 0xb1, 0x91, 0xe4, 0xb3, 0xdc, 0x53, 0xbb, 0x76, 0x32, 0xcd, 0x63, + 0x28, 0xa8, 0xc1, 0x89, 0x5f, 0x1c, 0x83, 0x93, 0x9e, 0xce, 0xc6, 0x4b, 0x47, 0x1b, 0x69, 0xdc, + 0x8a, 0xc4, 0x5d, 0xc4, 0x0b, 0x43, 0xb8, 0x6a, 0x22, 0xe3, 0x7f, 0x11, 0x5c, 0x3c, 0x76, 0x62, + 0xe1, 0x37, 0x46, 0x07, 0xcb, 0x3a, 0xc5, 0x8d, 0x37, 0x27, 0x3e, 0xaf, 0xf3, 0x78, 0x47, 0xe6, + 0x71, 0x1d, 0xbf, 0x7d, 0xa2, 0xb2, 0xd7, 0x98, 0x70, 0x5a, 0x8b, 0xb5, 0xd7, 0x5a, 0x32, 0x27, + 0xb7, 0x6f, 0x3c, 0xde, 0x2f, 0xa3, 0x27, 0xfb, 0x65, 0xf4, 0xe7, 0x7e, 0x19, 0x7d, 0x71, 0x50, + 0xce, 0x3d, 0x39, 0x28, 0xe7, 0x9e, 0x1e, 0x94, 0x73, 0x1f, 0x5a, 0x9e, 0x1f, 0xdf, 0xed, 0x34, + 0xac, 0x26, 0x6b, 0xeb, 0x50, 0xb5, 0x16, 0x69, 0xf0, 0x24, 0x6c, 0x77, 0xc3, 0xfe, 0x58, 0xc7, + 0x8e, 0x1f, 0x84, 0x94, 0x37, 0x0a, 0xf2, 0x1f, 0xa5, 0xf5, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, + 0x8e, 0x79, 0xe1, 0xbc, 0x04, 0x0e, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/posts/wasm/common_test.go b/x/posts/wasm/common_test.go index eee80ec620..f6f444c5f5 100644 --- a/x/posts/wasm/common_test.go +++ b/x/posts/wasm/common_test.go @@ -4,16 +4,17 @@ import ( "encoding/json" "testing" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/desmos-labs/desmos/v6/app" "github.com/desmos-labs/desmos/v6/x/posts/keeper" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + db "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/suite" "github.com/cosmos/cosmos-sdk/codec" @@ -105,12 +106,12 @@ func TestTestSuite(t *testing.T) { func (suite *TestSuite) SetupTest() { // Define store keys - keys := sdk.NewMemoryStoreKeys(types.StoreKey) + keys := storetypes.NewMemoryStoreKeys(types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/posts/wasm/querier.go b/x/posts/wasm/querier.go index 7edb677455..2fb4806890 100644 --- a/x/posts/wasm/querier.go +++ b/x/posts/wasm/querier.go @@ -69,7 +69,7 @@ func (querier PostsWasmQuerier) handleSubspacePostsRequest(ctx sdk.Context, requ if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - PostsResponse, err := querier.postsKeeper.SubspacePosts(sdk.WrapSDKContext(ctx), &PostsReq) + PostsResponse, err := querier.postsKeeper.SubspacePosts(ctx, &PostsReq) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -86,7 +86,7 @@ func (querier PostsWasmQuerier) handleSectionPostsRequest(ctx sdk.Context, reque if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - SectionPostsResponse, err := querier.postsKeeper.SectionPosts(sdk.WrapSDKContext(ctx), &incomingDtagReq) + SectionPostsResponse, err := querier.postsKeeper.SectionPosts(ctx, &incomingDtagReq) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -103,7 +103,7 @@ func (querier PostsWasmQuerier) handlePostRequest(ctx sdk.Context, request json. if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - PostResponse, err := querier.postsKeeper.Post(sdk.WrapSDKContext(ctx), &chainLinkReq) + PostResponse, err := querier.postsKeeper.Post(ctx, &chainLinkReq) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -121,7 +121,7 @@ func (querier PostsWasmQuerier) handlePostAttachmentsRequest(ctx sdk.Context, re if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - PostAttachmentsResponse, err := querier.postsKeeper.PostAttachments(sdk.WrapSDKContext(ctx), &PostAttachmentsReq) + PostAttachmentsResponse, err := querier.postsKeeper.PostAttachments(ctx, &PostAttachmentsReq) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -139,7 +139,7 @@ func (querier PostsWasmQuerier) handlePollAnswersRequest(ctx sdk.Context, reques return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } applicationLinkByChainIDResponse, err := querier.postsKeeper.PollAnswers( - sdk.WrapSDKContext(ctx), + ctx, &applicationReq, ) if err != nil { diff --git a/x/profiles/abci_benchmarks_test.go b/x/profiles/abci_benchmarks_test.go index e47015e41e..72dcb4c4d4 100644 --- a/x/profiles/abci_benchmarks_test.go +++ b/x/profiles/abci_benchmarks_test.go @@ -9,17 +9,20 @@ import ( "github.com/desmos-labs/desmos/v6/testutil/profilestesting" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + db "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/codec/address" + "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -29,14 +32,14 @@ import ( func setupBenchTest() (sdk.Context, authkeeper.AccountKeeper, *keeper.Keeper) { // Define the store keys - keys := sdk.NewKVStoreKeys(types.StoreKey, authtypes.StoreKey, paramstypes.StoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey, authtypes.StoreKey, paramstypes.StoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) storeKey := keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } @@ -53,9 +56,10 @@ func setupBenchTest() (sdk.Context, authkeeper.AccountKeeper, *keeper.Keeper) { ak := authkeeper.NewAccountKeeper( cdc, - keys[authtypes.StoreKey], + runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, app.GetMaccPerms(), + address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String(), ) diff --git a/x/profiles/abci_test.go b/x/profiles/abci_test.go index bf1984cc1e..ff229d5936 100644 --- a/x/profiles/abci_test.go +++ b/x/profiles/abci_test.go @@ -4,6 +4,8 @@ import ( "testing" "time" + "github.com/cosmos/cosmos-sdk/codec/address" + "github.com/cosmos/cosmos-sdk/runtime" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -16,11 +18,12 @@ import ( relationshipskeeper "github.com/desmos-labs/desmos/v6/x/relationships/keeper" relationshipstypes "github.com/desmos-labs/desmos/v6/x/relationships/types" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + db "github.com/cosmos/cosmos-db" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -31,13 +34,13 @@ import ( func TestBeginBlocker(t *testing.T) { // Define store keys - keys := sdk.NewMemoryStoreKeys( + keys := storetypes.NewKVStoreKeys( authtypes.StoreKey, relationshipstypes.StoreKey, types.StoreKey, ) // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } @@ -49,7 +52,7 @@ func TestBeginBlocker(t *testing.T) { cdc, legacyAmino := app.MakeCodecs() sk := subspaceskeeper.NewKeeper(cdc, keys[subspacestypes.StoreKey], nil, nil, "authority") rk := relationshipskeeper.NewKeeper(cdc, keys[relationshipstypes.StoreKey], sk) - ak := authkeeper.NewAccountKeeper(cdc, keys[authtypes.StoreKey], authtypes.ProtoBaseAccount, app.GetMaccPerms(), "cosmos", authtypes.NewModuleAddress("gov").String()) + ak := authkeeper.NewAccountKeeper(cdc, runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, app.GetMaccPerms(), address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String()) k := keeper.NewKeeper(cdc, legacyAmino, keys[types.StoreKey], ak, rk, nil, nil, nil, authtypes.NewModuleAddress("gov").String()) testCases := []struct { diff --git a/x/profiles/client/cli/cli_app_links.go b/x/profiles/client/cli/cli_app_links.go index 1d9cf651b4..e38df04554 100644 --- a/x/profiles/client/cli/cli_app_links.go +++ b/x/profiles/client/cli/cli_app_links.go @@ -11,8 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/version" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - channelutils "github.com/cosmos/ibc-go/v7/modules/core/04-channel/client/utils" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + channelutils "github.com/cosmos/ibc-go/v8/modules/core/04-channel/client/utils" "github.com/desmos-labs/desmos/v6/x/profiles/types" ) diff --git a/x/profiles/client/cli/cli_chain_links_test.go b/x/profiles/client/cli/cli_chain_links_test.go index eedc327c91..45129e847b 100644 --- a/x/profiles/client/cli/cli_chain_links_test.go +++ b/x/profiles/client/cli/cli_chain_links_test.go @@ -8,6 +8,7 @@ import ( "path" "time" + "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" @@ -326,7 +327,7 @@ func (s *IntegrationTestSuite) TestCmdLinkChainAccount() { fmt.Sprintf("--%s=%s", flags.FlagFrom, dstKeyName), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -391,7 +392,7 @@ func (s *IntegrationTestSuite) TestCmdUnlinkChainAccount() { fmt.Sprintf("--%s=%s", flags.FlagFrom, dstKeyName), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -456,7 +457,7 @@ func (s *IntegrationTestSuite) TestCmdSetDefaultExternalAddress() { fmt.Sprintf("--%s=%s", flags.FlagFrom, dstKeyName), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, diff --git a/x/profiles/client/cli/cli_dtag_requests_test.go b/x/profiles/client/cli/cli_dtag_requests_test.go index 3ce7ed121c..e2be15916f 100644 --- a/x/profiles/client/cli/cli_dtag_requests_test.go +++ b/x/profiles/client/cli/cli_dtag_requests_test.go @@ -6,6 +6,7 @@ package cli_test import ( "fmt" + "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" @@ -118,7 +119,7 @@ func (s *IntegrationTestSuite) TestCmdRequestDTagTransfer() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -175,7 +176,7 @@ func (s *IntegrationTestSuite) TestCmdCancelDTagTransfer() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -235,7 +236,7 @@ func (s *IntegrationTestSuite) TestCmdAcceptDTagTransfer() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -292,7 +293,7 @@ func (s *IntegrationTestSuite) TestCmdRefuseDTagTransfer() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, diff --git a/x/profiles/client/cli/cli_profile_test.go b/x/profiles/client/cli/cli_profile_test.go index b414e36b88..ba824bc6a3 100644 --- a/x/profiles/client/cli/cli_profile_test.go +++ b/x/profiles/client/cli/cli_profile_test.go @@ -7,6 +7,7 @@ import ( "fmt" "time" + "cosmossdk.io/math" codectypes "github.com/cosmos/cosmos-sdk/codec/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -119,7 +120,7 @@ func (s *IntegrationTestSuite) TestCmdSaveProfile() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -164,7 +165,7 @@ func (s *IntegrationTestSuite) TestCmdDeleteProfile() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, diff --git a/x/profiles/client/utils/cli.pb.go b/x/profiles/client/utils/cli.pb.go index 485c842e14..bea069199f 100644 --- a/x/profiles/client/utils/cli.pb.go +++ b/x/profiles/client/utils/cli.pb.go @@ -125,9 +125,9 @@ var fileDescriptor_8dd0252be1e0ade7 = []byte{ 0x05, 0xf2, 0x8c, 0x4e, 0x41, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x91, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0xb1, 0x5d, 0x37, 0x27, - 0x31, 0xa9, 0x18, 0xca, 0xd6, 0x2f, 0x33, 0xd5, 0xaf, 0x40, 0x44, 0x0b, 0x34, 0xc9, 0x94, 0x96, - 0x64, 0xe6, 0x14, 0x27, 0xb1, 0x81, 0x03, 0xd7, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xc8, 0xd2, - 0xaa, 0x71, 0x5c, 0x02, 0x00, 0x00, + 0x31, 0xa9, 0x18, 0xca, 0xd6, 0x2f, 0x33, 0xd3, 0xaf, 0x40, 0x44, 0x0b, 0x34, 0xc9, 0x94, 0x96, + 0x64, 0xe6, 0x14, 0x27, 0xb1, 0x81, 0x03, 0xd7, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x63, + 0xbd, 0x2a, 0x5c, 0x02, 0x00, 0x00, } func (this *ChainLinkJSON) Equal(that interface{}) bool { diff --git a/x/profiles/ibc_module.go b/x/profiles/ibc_module.go index 5871de9b19..ad04b42979 100644 --- a/x/profiles/ibc_module.go +++ b/x/profiles/ibc_module.go @@ -11,12 +11,12 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" + porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" + host "github.com/cosmos/ibc-go/v8/modules/core/24-host" - ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" "github.com/desmos-labs/desmos/v6/x/profiles/keeper" "github.com/desmos-labs/desmos/v6/x/profiles/types" diff --git a/x/profiles/keeper/alias_functions.go b/x/profiles/keeper/alias_functions.go index 1a77c15096..f9695c6402 100644 --- a/x/profiles/keeper/alias_functions.go +++ b/x/profiles/keeper/alias_functions.go @@ -3,8 +3,8 @@ package keeper import ( "bytes" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/desmos-labs/desmos/v6/x/profiles/types" ) @@ -12,7 +12,7 @@ import ( // IterateProfiles iterates through the Profiles set and performs the provided function func (k Keeper) IterateProfiles(ctx sdk.Context, fn func(profile *types.Profile) (stop bool)) { - k.ak.IterateAccounts(ctx, func(account authtypes.AccountI) (stop bool) { + k.ak.IterateAccounts(ctx, func(account sdk.AccountI) (stop bool) { profile, ok := account.(*types.Profile) if ok { @@ -49,7 +49,7 @@ func (k Keeper) IterateDTagTransferRequests( ctx sdk.Context, fn func(dTagTransferRequest types.DTagTransferRequest) (stop bool), ) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.DTagTransferRequestPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.DTagTransferRequestPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -67,7 +67,7 @@ func (k Keeper) IterateUserIncomingDTagTransferRequests( ctx sdk.Context, user string, fn func(dTagTransferRequest types.DTagTransferRequest) (stop bool), ) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.IncomingDTagTransferRequestsPrefix(user)) + iterator := storetypes.KVStorePrefixIterator(store, types.IncomingDTagTransferRequestsPrefix(user)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -84,7 +84,7 @@ func (k Keeper) IterateUserIncomingDTagTransferRequests( // IterateApplicationLinks iterates through all the application links and performs the provided function func (k Keeper) IterateApplicationLinks(ctx sdk.Context, fn func(link types.ApplicationLink) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.ApplicationLinkPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.ApplicationLinkPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -100,7 +100,7 @@ func (k Keeper) IterateApplicationLinks(ctx sdk.Context, fn func(link types.Appl // and performs the provided function func (k Keeper) IterateUserApplicationLinks(ctx sdk.Context, user string, fn func(link types.ApplicationLink) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.UserApplicationLinksPrefix(user)) + iterator := storetypes.KVStorePrefixIterator(store, types.UserApplicationLinksPrefix(user)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -128,7 +128,7 @@ func (k Keeper) GetApplicationLinks(ctx sdk.Context) []types.ApplicationLink { func (k Keeper) IterateExpiringApplicationLinks(ctx sdk.Context, fn func(link types.ApplicationLink) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.ExpiringAppLinkTimePrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.ExpiringAppLinkTimePrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -174,7 +174,7 @@ func (k Keeper) IterateExpiringApplicationLinks(ctx sdk.Context, fn func(link ty // IterateChainLinks iterates through the chain links and perform the provided function func (k Keeper) IterateChainLinks(ctx sdk.Context, fn func(link types.ChainLink) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.ChainLinksPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.ChainLinksPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -190,7 +190,7 @@ func (k Keeper) IterateChainLinks(ctx sdk.Context, fn func(link types.ChainLink) func (k Keeper) IterateUserChainLinks(ctx sdk.Context, user string, fn func(link types.ChainLink) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.UserChainLinksPrefix(user)) + iterator := storetypes.KVStorePrefixIterator(store, types.UserChainLinksPrefix(user)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -207,7 +207,7 @@ func (k Keeper) IterateUserChainLinks(ctx sdk.Context, user string, fn func(link func (k Keeper) IterateUserChainLinksByChain(ctx sdk.Context, user string, chainName string, fn func(link types.ChainLink) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.UserChainLinksChainPrefix(user, chainName)) + iterator := storetypes.KVStorePrefixIterator(store, types.UserChainLinksChainPrefix(user, chainName)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -234,7 +234,7 @@ func (k Keeper) GetChainLinks(ctx sdk.Context) []types.ChainLink { func (k Keeper) IterateDefaultExternalAddresses(ctx sdk.Context, fn func(entry types.DefaultExternalAddressEntry) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.DefaultExternalAddressPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.DefaultExternalAddressPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { diff --git a/x/profiles/keeper/alias_functions_test.go b/x/profiles/keeper/alias_functions_test.go index a703e9a3b5..a42dfacbe5 100644 --- a/x/profiles/keeper/alias_functions_test.go +++ b/x/profiles/keeper/alias_functions_test.go @@ -8,7 +8,6 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/desmos-labs/desmos/v6/x/profiles/types" ) @@ -31,16 +30,16 @@ func (suite *KeeperTestSuite) TestKeeper_IterateProfile() { profiles := []*types.Profile{ suite.CheckProfileNoError( - types.NewProfileFromAccount("first", authtypes.NewBaseAccountWithAddress(addr1), date), + types.NewProfileFromAccount("first", suite.ak.NewAccountWithAddress(suite.ctx, addr1), date), ), suite.CheckProfileNoError( - types.NewProfileFromAccount("second", authtypes.NewBaseAccountWithAddress(addr2), date), + types.NewProfileFromAccount("second", suite.ak.NewAccountWithAddress(suite.ctx, addr2), date), ), suite.CheckProfileNoError( - types.NewProfileFromAccount("not", authtypes.NewBaseAccountWithAddress(addr3), date), + types.NewProfileFromAccount("not", suite.ak.NewAccountWithAddress(suite.ctx, addr3), date), ), suite.CheckProfileNoError( - types.NewProfileFromAccount("third", authtypes.NewBaseAccountWithAddress(addr4), date), + types.NewProfileFromAccount("third", suite.ak.NewAccountWithAddress(suite.ctx, addr4), date), ), } diff --git a/x/profiles/keeper/common_test.go b/x/profiles/keeper/common_test.go index 4d8828271a..53e1cc2384 100644 --- a/x/profiles/keeper/common_test.go +++ b/x/profiles/keeper/common_test.go @@ -6,8 +6,11 @@ import ( "github.com/golang/mock/gomock" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" + "github.com/cosmos/cosmos-sdk/codec/address" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/go-bip39" "github.com/cosmos/cosmos-sdk/crypto/hd" @@ -17,16 +20,17 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + ibctesting "github.com/cosmos/ibc-go/v8/testing" "github.com/desmos-labs/desmos/v6/app" - "github.com/desmos-labs/desmos/v6/testutil/ibctesting" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" + desmosibctesting "github.com/desmos-labs/desmos/v6/testutil/ibctesting" "github.com/desmos-labs/desmos/v6/x/profiles/keeper" "github.com/desmos-labs/desmos/v6/x/profiles/testutil" "github.com/desmos-labs/desmos/v6/x/profiles/types" @@ -78,13 +82,13 @@ func (p TestProfile) Sign(data []byte) []byte { func (suite *KeeperTestSuite) SetupTest() { // Define the store keys - keys := sdk.NewKVStoreKeys(types.StoreKey, authtypes.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey, authtypes.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } @@ -99,9 +103,10 @@ func (suite *KeeperTestSuite) SetupTest() { // Dependencies initializations suite.ak = authkeeper.NewAccountKeeper( suite.cdc, - keys[authtypes.StoreKey], + runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, app.GetMaccPerms(), + address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String(), ) @@ -132,7 +137,7 @@ func (suite *KeeperTestSuite) SetupTest() { } func (suite *KeeperTestSuite) SetupIBCTest() { - suite.coordinator = ibctesting.NewCoordinator(suite.T(), 2) + suite.coordinator = desmosibctesting.NewCoordinator(suite.T(), 2) suite.chainA = suite.coordinator.GetChain(ibctesting.GetChainID(1)) suite.chainB = suite.coordinator.GetChain(ibctesting.GetChainID(2)) } @@ -181,3 +186,13 @@ func (suite *KeeperTestSuite) CheckProfileNoError(profile *types.Profile, err er func (suite *KeeperTestSuite) TearDownTest() { suite.ctrl.Finish() } + +func NewIBCProfilesPath(chainA, chainB *ibctesting.TestChain) *ibctesting.Path { + path := ibctesting.NewPath(chainA, chainB) + path.EndpointA.ChannelConfig.PortID = types.IBCPortID + path.EndpointB.ChannelConfig.PortID = types.IBCPortID + path.EndpointA.ChannelConfig.Version = "ics-20" + path.EndpointB.ChannelConfig.Version = "ics-20" + + return path +} diff --git a/x/profiles/keeper/genesis.go b/x/profiles/keeper/genesis.go index b3b7a60d1a..eacaabcaee 100644 --- a/x/profiles/keeper/genesis.go +++ b/x/profiles/keeper/genesis.go @@ -3,7 +3,6 @@ package keeper import ( abci "github.com/cometbft/cometbft/abci/types" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/desmos-labs/desmos/v6/x/profiles/types" ) @@ -39,7 +38,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, data types.GenesisState) []abci.Val } // Initialize the Profiles - k.ak.IterateAccounts(ctx, func(account authtypes.AccountI) (stop bool) { + k.ak.IterateAccounts(ctx, func(account sdk.AccountI) (stop bool) { if profile, ok := (account).(*types.Profile); ok { err := k.SaveProfile(ctx, profile) if err != nil { diff --git a/x/profiles/keeper/genesis_test.go b/x/profiles/keeper/genesis_test.go index 8b36f3725c..f86bd2c007 100644 --- a/x/profiles/keeper/genesis_test.go +++ b/x/profiles/keeper/genesis_test.go @@ -6,14 +6,14 @@ import ( "sort" "time" + "cosmossdk.io/math" "github.com/golang/mock/gomock" "github.com/desmos-labs/desmos/v6/testutil/profilestesting" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + host "github.com/cosmos/ibc-go/v8/modules/core/24-host" "github.com/desmos-labs/desmos/v6/x/profiles/types" ) @@ -43,8 +43,8 @@ func (suite *KeeperTestSuite) Test_ExportGenesis() { name: "non-empty state", store: func(ctx sdk.Context) { - profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47") - otherProfile := profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns") + profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)) + otherProfile := profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", profilestesting.WithNextAccountNumber(ctx, suite.ak)) err := suite.k.SaveProfile(suite.ctx, profile) suite.Require().NoError(err) @@ -61,16 +61,16 @@ func (suite *KeeperTestSuite) Test_ExportGenesis() { } params := types.NewParams( - types.NewNicknameParams(sdk.NewInt(100), sdk.NewInt(200)), - types.NewDTagParams("regex", sdk.NewInt(100), sdk.NewInt(200)), - types.NewBioParams(sdk.NewInt(1000)), + types.NewNicknameParams(math.NewInt(100), math.NewInt(200)), + types.NewDTagParams("regex", math.NewInt(100), math.NewInt(200)), + types.NewBioParams(math.NewInt(1000)), types.NewOracleParams( 32, 10, 6, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), types.NewAppLinksParams(types.DefaultAppLinksValidityDuration), ) @@ -84,7 +84,7 @@ func (suite *KeeperTestSuite) Test_ExportGenesis() { ), } for _, link := range chainLinks { - suite.ak.SetAccount(ctx, profilestesting.ProfileFromAddr(link.User)) + suite.ak.SetAccount(ctx, profilestesting.ProfileFromAddr(link.User, profilestesting.WithNextAccountNumber(ctx, suite.ak))) suite.Require().NoError(suite.k.SaveChainLink(ctx, link)) } @@ -114,7 +114,7 @@ func (suite *KeeperTestSuite) Test_ExportGenesis() { ), } for _, link := range applicationLinks { - suite.ak.SetAccount(ctx, profilestesting.ProfileFromAddr(link.User)) + suite.ak.SetAccount(ctx, profilestesting.ProfileFromAddr(link.User, profilestesting.WithNextAccountNumber(ctx, suite.ak))) suite.Require().NoError(suite.k.SaveApplicationLink(ctx, link)) } }, @@ -124,16 +124,16 @@ func (suite *KeeperTestSuite) Test_ExportGenesis() { types.NewDTagTransferRequest("dtag-1", "sender-1", "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), }, types.NewParams( - types.NewNicknameParams(sdk.NewInt(100), sdk.NewInt(200)), - types.NewDTagParams("regex", sdk.NewInt(100), sdk.NewInt(200)), - types.NewBioParams(sdk.NewInt(1000)), + types.NewNicknameParams(math.NewInt(100), math.NewInt(200)), + types.NewDTagParams("regex", math.NewInt(100), math.NewInt(200)), + types.NewBioParams(math.NewInt(1000)), types.NewOracleParams( 32, 10, 6, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), types.NewAppLinksParams(types.DefaultAppLinksValidityDuration), ), @@ -299,10 +299,10 @@ func (suite *KeeperTestSuite) Test_InitGenesis() { suite.scopedKeeper.EXPECT().GetCapability(gomock.Any(), host.PortPath("profiles-port-id")).Return(capabilitytypes.NewCapability(1), true) }, store: func(ctx sdk.Context) { - profile1 := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47") + profile1 := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile1) - profile2 := profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns") + profile2 := profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile2) err := suite.k.SaveProfile(suite.ctx, profile1) @@ -313,7 +313,7 @@ func (suite *KeeperTestSuite) Test_InitGenesis() { addr3, err := sdk.AccAddressFromBech32("cosmos1s3nh6tafl4amaxkke9kdejhp09lk93g9ev39r4") suite.Require().NoError(err) - suite.ak.SetAccount(ctx, authtypes.NewBaseAccountWithAddress(addr3)) + suite.ak.NewAccountWithAddress(ctx, addr3) }, genesis: types.NewGenesisState( []types.DTagTransferRequest{ @@ -321,16 +321,16 @@ func (suite *KeeperTestSuite) Test_InitGenesis() { types.NewDTagTransferRequest("dtag-2", "sender-2", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), }, types.NewParams( - types.NewNicknameParams(sdk.NewInt(100), sdk.NewInt(200)), - types.NewDTagParams("regex", sdk.NewInt(100), sdk.NewInt(200)), - types.NewBioParams(sdk.NewInt(1000)), + types.NewNicknameParams(math.NewInt(100), math.NewInt(200)), + types.NewDTagParams("regex", math.NewInt(100), math.NewInt(200)), + types.NewBioParams(math.NewInt(1000)), types.NewOracleParams( 32, 10, 6, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), types.NewAppLinksParams(types.DefaultAppLinksValidityDuration), ), @@ -391,16 +391,16 @@ func (suite *KeeperTestSuite) Test_InitGenesis() { suite.Require().Equal(requests, suite.k.GetDTagTransferRequests(ctx)) params := types.NewParams( - types.NewNicknameParams(sdk.NewInt(100), sdk.NewInt(200)), - types.NewDTagParams("regex", sdk.NewInt(100), sdk.NewInt(200)), - types.NewBioParams(sdk.NewInt(1000)), + types.NewNicknameParams(math.NewInt(100), math.NewInt(200)), + types.NewDTagParams("regex", math.NewInt(100), math.NewInt(200)), + types.NewBioParams(math.NewInt(1000)), types.NewOracleParams( 32, 10, 6, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), types.NewAppLinksParams(types.DefaultAppLinksValidityDuration), ) diff --git a/x/profiles/keeper/grpc_query.go b/x/profiles/keeper/grpc_query.go index 28c2f8c717..dc90ff2e36 100644 --- a/x/profiles/keeper/grpc_query.go +++ b/x/profiles/keeper/grpc_query.go @@ -4,8 +4,8 @@ import ( "context" "strings" + "cosmossdk.io/store/prefix" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/store/prefix" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/profiles/keeper/grpc_query_test.go b/x/profiles/keeper/grpc_query_test.go index b7331cc33f..8373de8a3b 100644 --- a/x/profiles/keeper/grpc_query_test.go +++ b/x/profiles/keeper/grpc_query_test.go @@ -70,7 +70,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Profile() { tc.store(ctx) } - res, err := suite.k.Profile(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.Profile(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) @@ -103,7 +103,7 @@ func (suite *KeeperTestSuite) TestQueryServer_IncomingDTagTransferRequests() { "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773", "cosmos19xz3mrvzvp9ymgmudhpukucg6668l5haakh04x", ) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) request = types.NewDTagTransferRequest( @@ -111,7 +111,7 @@ func (suite *KeeperTestSuite) TestQueryServer_IncomingDTagTransferRequests() { "cosmos19xz3mrvzvp9ymgmudhpukucg6668l5haakh04x", "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773", ) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) }, req: types.NewQueryIncomingDTagTransferRequestsRequest( @@ -164,10 +164,10 @@ func (suite *KeeperTestSuite) TestQueryServer_IncomingDTagTransferRequests() { name: "valid request without user", store: func(ctx sdk.Context) { receiver1 := "cosmos19xz3mrvzvp9ymgmudhpukucg6668l5haakh04x" - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(receiver1))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(receiver1, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) receiver2 := "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773" - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(receiver2))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(receiver2, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) request := types.NewDTagTransferRequest( "dtag", @@ -208,7 +208,7 @@ func (suite *KeeperTestSuite) TestQueryServer_IncomingDTagTransferRequests() { tc.store(ctx) } - res, err := suite.k.IncomingDTagTransferRequests(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.IncomingDTagTransferRequests(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) @@ -618,7 +618,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ChainLinks() { tc.store(ctx) } - res, err := suite.k.ChainLinks(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.ChainLinks(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -726,7 +726,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ChainLinkOwners() { tc.store(ctx) } - res, err := suite.k.ChainLinkOwners(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.ChainLinkOwners(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -760,8 +760,8 @@ func (suite *KeeperTestSuite) TestQueryServer_DefaultExternalAddresses() { { name: "query without any data returns everything", store: func(ctx sdk.Context) { - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"))) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveChainLink(ctx, firstChainLink)) suite.Require().NoError(suite.k.SaveChainLink(ctx, secondChainLink)) @@ -776,8 +776,8 @@ func (suite *KeeperTestSuite) TestQueryServer_DefaultExternalAddresses() { { name: "query with owner returns correct data", store: func(ctx sdk.Context) { - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"))) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveChainLink(ctx, firstChainLink)) suite.Require().NoError(suite.k.SaveChainLink(ctx, secondChainLink)) @@ -792,8 +792,8 @@ func (suite *KeeperTestSuite) TestQueryServer_DefaultExternalAddresses() { { name: "query with owner and chain name returns correct data", store: func(ctx sdk.Context) { - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"))) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveChainLink(ctx, firstChainLink)) suite.Require().NoError(suite.k.SaveChainLink(ctx, secondChainLink)) @@ -815,7 +815,7 @@ func (suite *KeeperTestSuite) TestQueryServer_DefaultExternalAddresses() { tc.store(ctx) } - res, err := suite.k.DefaultExternalAddresses(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.DefaultExternalAddresses(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -917,10 +917,10 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinks() { { name: "valid request with user", store: func(ctx sdk.Context) { - profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47") + profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile) - otherProfile := profilestesting.ProfileFromAddr("cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773") + otherProfile := profilestesting.ProfileFromAddr("cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, otherProfile) suite.Require().NoError(suite.k.SaveApplicationLink( @@ -1420,7 +1420,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinks() { tc.store(ctx) } - res, err := suite.k.ApplicationLinks(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.ApplicationLinks(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1501,7 +1501,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkByClientID() { tc.store(ctx) } - res, err := suite.k.ApplicationLinkByClientID(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.ApplicationLinkByClientID(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1523,7 +1523,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkOwners() { { name: "query without any data returns everything", store: func(ctx sdk.Context) { - profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47") + profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile) suite.Require().NoError(suite.k.SaveApplicationLink( @@ -1547,7 +1547,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkOwners() { )), ) - profile = profilestesting.ProfileFromAddr("cosmos1ngzeux3j0vfkps0779y0c8pnrmszlg0hekp5um") + profile = profilestesting.ProfileFromAddr("cosmos1ngzeux3j0vfkps0779y0c8pnrmszlg0hekp5um", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile) suite.Require().NoError(suite.k.SaveApplicationLink( @@ -1589,7 +1589,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkOwners() { { name: "query with application returns the correct data", store: func(ctx sdk.Context) { - profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47") + profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile) suite.Require().NoError(suite.k.SaveApplicationLink( @@ -1613,7 +1613,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkOwners() { )), ) - profile = profilestesting.ProfileFromAddr("cosmos1ngzeux3j0vfkps0779y0c8pnrmszlg0hekp5um") + profile = profilestesting.ProfileFromAddr("cosmos1ngzeux3j0vfkps0779y0c8pnrmszlg0hekp5um", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile) suite.Require().NoError(suite.k.SaveApplicationLink( @@ -1637,7 +1637,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkOwners() { )), ) - profile = profilestesting.ProfileFromAddr("cosmos1pxsak5c7ke5tz3d8alawuzu3cayr9s65ce7njr") + profile = profilestesting.ProfileFromAddr("cosmos1pxsak5c7ke5tz3d8alawuzu3cayr9s65ce7njr", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile) suite.Require().NoError(suite.k.SaveApplicationLink( @@ -1679,7 +1679,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkOwners() { { name: "query with application and username returns the correct data", store: func(ctx sdk.Context) { - profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47") + profile := profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile) suite.Require().NoError(suite.k.SaveApplicationLink( @@ -1703,7 +1703,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkOwners() { )), ) - profile = profilestesting.ProfileFromAddr("cosmos1ngzeux3j0vfkps0779y0c8pnrmszlg0hekp5um") + profile = profilestesting.ProfileFromAddr("cosmos1ngzeux3j0vfkps0779y0c8pnrmszlg0hekp5um", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile) suite.Require().NoError(suite.k.SaveApplicationLink( @@ -1727,7 +1727,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkOwners() { )), ) - profile = profilestesting.ProfileFromAddr("cosmos1mrmyggajlv0k3mlrhergjjnt75srn5y5u5a83x") + profile = profilestesting.ProfileFromAddr("cosmos1mrmyggajlv0k3mlrhergjjnt75srn5y5u5a83x", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.ak.SetAccount(ctx, profile) suite.Require().NoError(suite.k.SaveApplicationLink( @@ -1776,7 +1776,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ApplicationLinkOwners() { tc.store(ctx) } - res, err := suite.k.ApplicationLinkOwners(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.ApplicationLinkOwners(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1792,7 +1792,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Params() { suite.k.SetParams(ctx, types.DefaultParams()) - res, err := suite.k.Params(sdk.WrapSDKContext(ctx), &types.QueryParamsRequest{}) + res, err := suite.k.Params(ctx, &types.QueryParamsRequest{}) suite.Require().NoError(err) suite.Require().NotNil(res) diff --git a/x/profiles/keeper/invariants_test.go b/x/profiles/keeper/invariants_test.go index d9a71f9471..d3e9e8cea8 100644 --- a/x/profiles/keeper/invariants_test.go +++ b/x/profiles/keeper/invariants_test.go @@ -32,20 +32,20 @@ func (suite *KeeperTestSuite) TestKeeper_RegisterInvariants() { keeper.RegisterInvariants(mock, suite.k) suite.Require().Equal( - runtime.FuncForPC(reflect.ValueOf(keeper.ValidProfilesInvariant(suite.k)).Pointer()).Name(), - runtime.FuncForPC(reflect.ValueOf(mock.RegisteredMap[types.ModuleName+"valid-profiles"]).Pointer()).Name(), + runtime.FuncForPC(reflect.ValueOf(keeper.ValidProfilesInvariant(suite.k)).Pointer()), + runtime.FuncForPC(reflect.ValueOf(mock.RegisteredMap[types.ModuleName+"valid-profiles"]).Pointer()), ) suite.Require().Equal( - runtime.FuncForPC(reflect.ValueOf(keeper.ValidDTagTransferRequests(suite.k)).Pointer()).Name(), - runtime.FuncForPC(reflect.ValueOf(mock.RegisteredMap[types.ModuleName+"valid-dtag-transfer-requests"]).Pointer()).Name(), + runtime.FuncForPC(reflect.ValueOf(keeper.ValidDTagTransferRequests(suite.k)).Pointer()), + runtime.FuncForPC(reflect.ValueOf(mock.RegisteredMap[types.ModuleName+"valid-dtag-transfer-requests"]).Pointer()), ) suite.Require().Equal( - runtime.FuncForPC(reflect.ValueOf(keeper.ValidChainLinks(suite.k)).Pointer()).Name(), - runtime.FuncForPC(reflect.ValueOf(mock.RegisteredMap[types.ModuleName+"valid-chain-links"]).Pointer()).Name(), + runtime.FuncForPC(reflect.ValueOf(keeper.ValidChainLinks(suite.k)).Pointer()), + runtime.FuncForPC(reflect.ValueOf(mock.RegisteredMap[types.ModuleName+"valid-chain-links"]).Pointer()), ) suite.Require().Equal( - runtime.FuncForPC(reflect.ValueOf(keeper.ValidApplicationLinks(suite.k)).Pointer()).Name(), - runtime.FuncForPC(reflect.ValueOf(mock.RegisteredMap[types.ModuleName+"valid-application-links"]).Pointer()).Name(), + runtime.FuncForPC(reflect.ValueOf(keeper.ValidApplicationLinks(suite.k)).Pointer()), + runtime.FuncForPC(reflect.ValueOf(mock.RegisteredMap[types.ModuleName+"valid-application-links"]).Pointer()), ) } diff --git a/x/profiles/keeper/keeper.go b/x/profiles/keeper/keeper.go index b099bbaa95..5828896f90 100644 --- a/x/profiles/keeper/keeper.go +++ b/x/profiles/keeper/keeper.go @@ -11,9 +11,9 @@ import ( paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/profiles/types" diff --git a/x/profiles/keeper/keeper_dtag_transfers.go b/x/profiles/keeper/keeper_dtag_transfers.go index 64e5b1f051..e8fb2386bb 100644 --- a/x/profiles/keeper/keeper_dtag_transfers.go +++ b/x/profiles/keeper/keeper_dtag_transfers.go @@ -2,6 +2,7 @@ package keeper import ( "cosmossdk.io/errors" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -60,7 +61,7 @@ func (k Keeper) GetDTagTransferRequest(ctx sdk.Context, sender, receiver string) // GetDTagTransferRequests returns all the requests inside the given context func (k Keeper) GetDTagTransferRequests(ctx sdk.Context) (requests []types.DTagTransferRequest) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.DTagTransferRequestPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.DTagTransferRequestPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { diff --git a/x/profiles/keeper/keeper_dtag_transfers_test.go b/x/profiles/keeper/keeper_dtag_transfers_test.go index cdaf7dde48..f8f3278907 100644 --- a/x/profiles/keeper/keeper_dtag_transfers_test.go +++ b/x/profiles/keeper/keeper_dtag_transfers_test.go @@ -1,11 +1,7 @@ package keeper_test import ( - "bytes" - "fmt" - "strings" - - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/testutil/mock" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" @@ -66,10 +62,10 @@ func (suite *KeeperTestSuite) TestKeeper_SaveDTagTransferRequest() { "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1xcy3els9ua75kdm783c3qu0rfa2eplesldfevn"))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1xcy3els9ua75kdm783c3qu0rfa2eplesldfevn", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) }, transferReq: types.NewDTagTransferRequest( "dtag", @@ -101,10 +97,10 @@ func (suite *KeeperTestSuite) TestKeeper_SaveDTagTransferRequest() { "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1xcy3els9ua75kdm783c3qu0rfa2eplesldfevn"))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1xcy3els9ua75kdm783c3qu0rfa2eplesldfevn", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) }, transferReq: types.NewDTagTransferRequest( "dtag", @@ -182,22 +178,19 @@ func (suite *KeeperTestSuite) TestKeeper_SaveDTagTransferRequest_Logger() { "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Receiver))) - suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Sender))) + suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(suite.ctx, suite.ak)))) + suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Sender, profilestesting.WithNextAccountNumber(suite.ctx, suite.ak)))) // Setup Logger - var buf bytes.Buffer + logger := mock.NewMockLogger(suite.ctrl) ctx, _ := suite.ctx.CacheContext() - ctx = ctx.WithLogger(log.NewTMLogger(&buf)) + ctx = ctx.WithLogger(logger) + + logger.EXPECT().With("module", "x/"+types.ModuleName).Return(logger) + logger.EXPECT().Info("DTag transfer request", "sender", request.Sender, "receiver", request.Receiver) // Execute suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) - - // Check logs - msg := strings.TrimSpace(buf.String()) - suite.Require().Contains(msg, "DTag transfer request") - suite.Require().Contains(msg, fmt.Sprintf("sender=%s", request.Sender)) - suite.Require().Contains(msg, fmt.Sprintf("receiver=%s", request.Receiver)) } func (suite *KeeperTestSuite) TestKeeper_SaveDTagTransferRequest_AfterDTagTransferRequestCreated() { @@ -207,8 +200,8 @@ func (suite *KeeperTestSuite) TestKeeper_SaveDTagTransferRequest_AfterDTagTransf "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Receiver))) - suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Sender))) + suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(suite.ctx, suite.ak)))) + suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Sender, profilestesting.WithNextAccountNumber(suite.ctx, suite.ak)))) // Setup hooks suite.hooks.EXPECT().AfterDTagTransferRequestCreated(gomock.Any(), request) @@ -381,8 +374,8 @@ func (suite *KeeperTestSuite) TestKeeper_DeleteDTagTransferRequest_AfterDTagTran "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Receiver))) - suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Sender))) + suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(suite.ctx, suite.ak)))) + suite.Require().NoError(suite.k.SaveProfile(suite.ctx, profilestesting.ProfileFromAddr(request.Sender, profilestesting.WithNextAccountNumber(suite.ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveDTagTransferRequest(suite.ctx, request)) // Setup hooks @@ -403,10 +396,10 @@ func (suite *KeeperTestSuite) TestKeeper_DeleteAllUserIncomingDTagTransferReques { name: "DTag requests are deleted properly", store: func(ctx sdk.Context) { - profile1 := profilestesting.ProfileFromAddr("cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773") + profile1 := profilestesting.ProfileFromAddr("cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.Require().NoError(suite.k.SaveProfile(ctx, profile1)) - profile2 := profilestesting.ProfileFromAddr("cosmos19xz3mrvzvp9ymgmudhpukucg6668l5haakh04x") + profile2 := profilestesting.ProfileFromAddr("cosmos19xz3mrvzvp9ymgmudhpukucg6668l5haakh04x", profilestesting.WithNextAccountNumber(ctx, suite.ak)) suite.Require().NoError(suite.k.SaveProfile(ctx, profile2)) request := types.NewDTagTransferRequest( diff --git a/x/profiles/keeper/keeper_ibc.go b/x/profiles/keeper/keeper_ibc.go index 628231dde1..f518e20844 100644 --- a/x/profiles/keeper/keeper_ibc.go +++ b/x/profiles/keeper/keeper_ibc.go @@ -2,8 +2,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + host "github.com/cosmos/ibc-go/v8/modules/core/24-host" "github.com/desmos-labs/desmos/v6/x/profiles/types" ) diff --git a/x/profiles/keeper/keeper_params_test.go b/x/profiles/keeper/keeper_params_test.go index cbeccf8f23..9924e10b2e 100644 --- a/x/profiles/keeper/keeper_params_test.go +++ b/x/profiles/keeper/keeper_params_test.go @@ -1,6 +1,7 @@ package keeper_test import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/profiles/types" @@ -8,16 +9,16 @@ import ( func (suite *KeeperTestSuite) TestKeeper_SetParams() { params := types.NewParams( - types.NewNicknameParams(sdk.NewInt(3), sdk.NewInt(1000)), - types.NewDTagParams("^[A-Za-z0-9_]+$", sdk.NewInt(3), sdk.NewInt(1000)), - types.NewBioParams(sdk.NewInt(1000)), + types.NewNicknameParams(math.NewInt(3), math.NewInt(1000)), + types.NewDTagParams("^[A-Za-z0-9_]+$", math.NewInt(3), math.NewInt(1000)), + types.NewBioParams(math.NewInt(1000)), types.NewOracleParams( 32, 10, 6, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), types.NewAppLinksParams(types.DefaultAppLinksValidityDuration), ) @@ -38,16 +39,16 @@ func (suite *KeeperTestSuite) TestKeeper_GetParams() { name: "valid params do not error", store: func(ctx sdk.Context) { params := types.NewParams( - types.NewNicknameParams(sdk.NewInt(3), sdk.NewInt(1000)), - types.NewDTagParams("^[A-Za-z0-9_]+$", sdk.NewInt(3), sdk.NewInt(1000)), - types.NewBioParams(sdk.NewInt(1000)), + types.NewNicknameParams(math.NewInt(3), math.NewInt(1000)), + types.NewDTagParams("^[A-Za-z0-9_]+$", math.NewInt(3), math.NewInt(1000)), + types.NewBioParams(math.NewInt(1000)), types.NewOracleParams( 32, 10, 6, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), types.NewAppLinksParams(types.DefaultAppLinksValidityDuration), ) @@ -55,16 +56,16 @@ func (suite *KeeperTestSuite) TestKeeper_GetParams() { }, shouldErr: false, expParams: types.NewParams( - types.NewNicknameParams(sdk.NewInt(3), sdk.NewInt(1000)), - types.NewDTagParams("^[A-Za-z0-9_]+$", sdk.NewInt(3), sdk.NewInt(1000)), - types.NewBioParams(sdk.NewInt(1000)), + types.NewNicknameParams(math.NewInt(3), math.NewInt(1000)), + types.NewDTagParams("^[A-Za-z0-9_]+$", math.NewInt(3), math.NewInt(1000)), + types.NewBioParams(math.NewInt(1000)), types.NewOracleParams( 32, 10, 6, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), types.NewAppLinksParams(types.DefaultAppLinksValidityDuration), ), diff --git a/x/profiles/keeper/keeper_test.go b/x/profiles/keeper/keeper_test.go index 4d1f1c361e..a8260cd512 100644 --- a/x/profiles/keeper/keeper_test.go +++ b/x/profiles/keeper/keeper_test.go @@ -1,17 +1,15 @@ package keeper_test import ( - "bytes" "encoding/hex" - "fmt" "strings" "time" - "github.com/cometbft/cometbft/libs/log" "github.com/golang/mock/gomock" "github.com/desmos-labs/desmos/v6/testutil/profilestesting" + "github.com/cosmos/cosmos-sdk/testutil/mock" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/profiles/types" @@ -124,19 +122,15 @@ func (suite *KeeperTestSuite) TestKeeper_SaveProfile_Logger() { ) // Setup Logger - var buf bytes.Buffer - + logger := mock.NewMockLogger(suite.ctrl) ctx, _ := suite.ctx.CacheContext() - ctx = ctx.WithLogger(log.NewTMLogger(&buf)) + ctx = ctx.WithLogger(logger) + + logger.EXPECT().With("module", "x/"+types.ModuleName).Return(logger) + logger.EXPECT().Info("saved profile", "DTag", profile.DTag, "from", profile.GetAddress()) // Execute suite.Require().NoError(suite.k.SaveProfile(ctx, profile)) - - // Check logs - msg := strings.TrimSpace(buf.String()) - suite.Require().Contains(msg, "saved profile") - suite.Require().Contains(msg, fmt.Sprintf("DTag=%s", profile.DTag)) - suite.Require().Contains(msg, fmt.Sprintf("from=%s", profile.GetAccount().GetAddress().String())) } func (suite *KeeperTestSuite) TestKeeper_GetProfile() { diff --git a/x/profiles/keeper/msg_server_app_link_test.go b/x/profiles/keeper/msg_server_app_link_test.go index 8500841ad3..84275072e3 100644 --- a/x/profiles/keeper/msg_server_app_link_test.go +++ b/x/profiles/keeper/msg_server_app_link_test.go @@ -1,17 +1,15 @@ package keeper_test import ( - "bytes" "fmt" - "strings" "time" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/testutil/mock" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" + host "github.com/cosmos/ibc-go/v8/modules/core/24-host" "github.com/golang/mock/gomock" "github.com/desmos-labs/desmos/v6/pkg/obi" @@ -446,9 +444,15 @@ func (suite *KeeperTestSuite) TestMsgServer_LinkApplication_Logger() { Return(uint64(0), nil) // Setup Logger - var buf bytes.Buffer + logger := mock.NewMockLogger(suite.ctrl) ctx, _ := suite.ctx.CacheContext() - ctx = ctx.WithLogger(log.NewTMLogger(&buf)) + ctx = ctx.WithLogger(logger) + + logger.EXPECT().With("module", "x/"+types.ModuleName).Return(logger) + logger.EXPECT().Info("Application link created", + "application", "twitter", + "username", "twitteruser", + "account", "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773") // Execute server := keeper.NewMsgServerImpl(suite.k) @@ -462,13 +466,6 @@ func (suite *KeeperTestSuite) TestMsgServer_LinkApplication_Logger() { 0, )) suite.Require().NoError(err) - - // Check logs - msg := strings.TrimSpace(buf.String()) - suite.Require().Contains(msg, "Application link created") - suite.Require().Contains(msg, fmt.Sprintf("application=%s", "twitter")) - suite.Require().Contains(msg, fmt.Sprintf("username=%s", "twitteruser")) - suite.Require().Contains(msg, fmt.Sprintf("account=%s", "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773")) } func (suite *KeeperTestSuite) TestMsgServer_UnlinkApplication() { @@ -574,9 +571,15 @@ func (suite *KeeperTestSuite) TestMsgServer_UnlinkApplication_Logger() { ))) // Setup Logger - var buf bytes.Buffer + logger := mock.NewMockLogger(suite.ctrl) ctx, _ := suite.ctx.CacheContext() - ctx = ctx.WithLogger(log.NewTMLogger(&buf)) + ctx = ctx.WithLogger(logger) + + logger.EXPECT().With("module", "x/"+types.ModuleName).Return(logger) + logger.EXPECT().Info("Application link removed", + "application", "twitter", + "username", "twitteruser", + "account", "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773") // Execute server := keeper.NewMsgServerImpl(suite.k) @@ -586,11 +589,4 @@ func (suite *KeeperTestSuite) TestMsgServer_UnlinkApplication_Logger() { "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773", )) suite.Require().NoError(err) - - // Check logs - msg := strings.TrimSpace(buf.String()) - suite.Require().Contains(msg, "Application link removed") - suite.Require().Contains(msg, fmt.Sprintf("application=%s", "twitter")) - suite.Require().Contains(msg, fmt.Sprintf("username=%s", "twitteruser")) - suite.Require().Contains(msg, fmt.Sprintf("account=%s", "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773")) } diff --git a/x/profiles/keeper/msg_server_chain_link_test.go b/x/profiles/keeper/msg_server_chain_link_test.go index 3de7b23cfa..55394fa492 100644 --- a/x/profiles/keeper/msg_server_chain_link_test.go +++ b/x/profiles/keeper/msg_server_chain_link_test.go @@ -8,8 +8,6 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/desmos-labs/desmos/v6/x/profiles/keeper" sdk "github.com/cosmos/cosmos-sdk/types" @@ -75,13 +73,13 @@ func (suite *KeeperTestSuite) TestMsgServer_LinkChainAccount() { srcAccAddr, err := sdk.AccAddressFromBech32(srcAddr) suite.Require().NoError(err) - srcBaseAcc := authtypes.NewBaseAccountWithAddress(srcAccAddr) + srcBaseAcc := suite.ak.NewAccountWithAddress(ctx, srcAccAddr) suite.Require().NoError(srcBaseAcc.SetPubKey(srcPubKey)) suite.ak.SetAccount(suite.ctx, srcBaseAcc) destAccAddr, err := sdk.AccAddressFromBech32(destAddr) suite.Require().NoError(err) - destBaseAcc := authtypes.NewBaseAccountWithAddress(destAccAddr) + destBaseAcc := suite.ak.NewAccountWithAddress(ctx, destAccAddr) suite.Require().NoError(destBaseAcc.SetPubKey(destPubKey)) suite.ak.SetAccount(suite.ctx, destBaseAcc) @@ -136,7 +134,7 @@ func (suite *KeeperTestSuite) TestMsgServer_LinkChainAccount() { } server := keeper.NewMsgServerImpl(suite.k) - _, err = server.LinkChainAccount(sdk.WrapSDKContext(ctx), tc.msg) + _, err = server.LinkChainAccount(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -226,7 +224,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UnlinkChainAccount() { } server := keeper.NewMsgServerImpl(suite.k) - _, err := server.UnlinkChainAccount(sdk.WrapSDKContext(ctx), tc.msg) + _, err := server.UnlinkChainAccount(ctx, tc.msg) suite.Require().Equal(tc.expEvents, ctx.EventManager().Events()) if tc.shouldErr { @@ -318,7 +316,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SetDefaultExternalAddress() { } server := keeper.NewMsgServerImpl(suite.k) - _, err := server.SetDefaultExternalAddress(sdk.WrapSDKContext(ctx), tc.msg) + _, err := server.SetDefaultExternalAddress(ctx, tc.msg) suite.Require().Equal(tc.expEvents, ctx.EventManager().Events()) if tc.shouldErr { diff --git a/x/profiles/keeper/msg_server_dtag_transfers_test.go b/x/profiles/keeper/msg_server_dtag_transfers_test.go index e280245e3b..55a0510ad4 100644 --- a/x/profiles/keeper/msg_server_dtag_transfers_test.go +++ b/x/profiles/keeper/msg_server_dtag_transfers_test.go @@ -27,9 +27,9 @@ func (suite *KeeperTestSuite) TestMsgServer_RequestDTagTransfer() { }, store: func(ctx sdk.Context) { suite.Require().NoError(suite.k.SaveProfile(ctx, - profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"))) + profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveProfile(ctx, - profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"))) + profilestesting.ProfileFromAddr("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) }, msg: types.NewMsgRequestDTagTransfer( "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", @@ -59,7 +59,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RequestDTagTransfer() { "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) }, msg: types.NewMsgRequestDTagTransfer( @@ -74,7 +74,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RequestDTagTransfer() { suite.rk.EXPECT().HasUserBlocked(ctx, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", uint64(0)).Return(false) }, store: func(ctx sdk.Context) { - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", profilestesting.WithNextAccountNumber(ctx, suite.ak)))) }, msg: types.NewMsgRequestDTagTransfer( "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", @@ -104,7 +104,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RequestDTagTransfer() { } server := keeper.NewMsgServerImpl(suite.k) - _, err := server.RequestDTagTransfer(sdk.WrapSDKContext(ctx), tc.msg) + _, err := server.RequestDTagTransfer(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -140,7 +140,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CancelDTagTransfer() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) }, msg: types.NewMsgCancelDTagTransferRequest( @@ -172,7 +172,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CancelDTagTransfer() { } server := keeper.NewMsgServerImpl(suite.k) - _, err := server.CancelDTagTransferRequest(sdk.WrapSDKContext(ctx), tc.msg) + _, err := server.CancelDTagTransferRequest(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -235,11 +235,11 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Sender))) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Sender, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) - profile := profilestesting.ProfileFromAddr("cosmos1xcy3els9ua75kdm783c3qu0rfa2eplesldfevn") + profile := profilestesting.ProfileFromAddr("cosmos1xcy3els9ua75kdm783c3qu0rfa2eplesldfevn", profilestesting.WithNextAccountNumber(ctx, suite.ak)) profile.DTag = "NewDTag" suite.Require().NoError(suite.k.SaveProfile(ctx, profile)) }, @@ -258,11 +258,11 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Sender))) - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Sender, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) - profile := profilestesting.ProfileFromAddr("cosmos1xcy3els9ua75kdm783c3qu0rfa2eplesldfevn") + profile := profilestesting.ProfileFromAddr("cosmos1xcy3els9ua75kdm783c3qu0rfa2eplesldfevn", profilestesting.WithNextAccountNumber(ctx, suite.ak)) profile.DTag = "dtag" suite.Require().NoError(suite.k.SaveProfile(ctx, profile)) }, @@ -325,11 +325,11 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - receiverProfile := profilestesting.ProfileFromAddr(request.Receiver) + receiverProfile := profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)) receiverProfile.DTag = "DTag" - senderProfile := profilestesting.ProfileFromAddr(request.Sender) + senderProfile := profilestesting.ProfileFromAddr(request.Sender, profilestesting.WithNextAccountNumber(ctx, suite.ak)) senderProfile.DTag = "senderDTag" - otherProfile := profilestesting.ProfileFromAddr("cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773") + otherProfile := profilestesting.ProfileFromAddr("cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773", profilestesting.WithNextAccountNumber(ctx, suite.ak)) otherProfile.DTag = "NewDTag" suite.Require().NoError(suite.k.SaveProfile(ctx, senderProfile)) suite.Require().NoError(suite.k.SaveProfile(ctx, receiverProfile)) @@ -354,7 +354,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - receiverProfile := profilestesting.ProfileFromAddr(request.Receiver) + receiverProfile := profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)) receiverProfile.DTag = "DTag" suite.Require().NoError(suite.k.SaveProfile(ctx, receiverProfile)) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) @@ -383,9 +383,9 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - receiverProfile := profilestesting.ProfileFromAddr(request.Receiver) + receiverProfile := profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)) receiverProfile.DTag = "DTag" - suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Sender))) + suite.Require().NoError(suite.k.SaveProfile(ctx, profilestesting.ProfileFromAddr(request.Sender, profilestesting.WithNextAccountNumber(ctx, suite.ak)))) suite.Require().NoError(suite.k.SaveProfile(ctx, receiverProfile)) suite.Require().NoError(suite.k.SaveDTagTransferRequest(ctx, request)) }, @@ -419,9 +419,9 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", ) - receiverProfile := profilestesting.ProfileFromAddr(request.Receiver) + receiverProfile := profilestesting.ProfileFromAddr(request.Receiver, profilestesting.WithNextAccountNumber(ctx, suite.ak)) receiverProfile.DTag = "receiverDTag" - senderProfile := profilestesting.ProfileFromAddr(request.Sender) + senderProfile := profilestesting.ProfileFromAddr(request.Sender, profilestesting.WithNextAccountNumber(ctx, suite.ak)) senderProfile.DTag = "senderDTag" suite.Require().NoError(suite.k.SaveProfile(ctx, senderProfile)) suite.Require().NoError(suite.k.SaveProfile(ctx, receiverProfile)) @@ -461,7 +461,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AcceptDTagTransfer() { } server := keeper.NewMsgServerImpl(suite.k) - _, err := server.AcceptDTagTransferRequest(sdk.WrapSDKContext(ctx), tc.msg) + _, err := server.AcceptDTagTransferRequest(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -533,7 +533,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RefuseDTagTransfer() { } server := keeper.NewMsgServerImpl(suite.k) - _, err := server.RefuseDTagTransferRequest(sdk.WrapSDKContext(ctx), tc.msg) + _, err := server.RefuseDTagTransferRequest(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) diff --git a/x/profiles/keeper/msg_server_params_test.go b/x/profiles/keeper/msg_server_params_test.go index 9d91845a14..c4f02c5042 100644 --- a/x/profiles/keeper/msg_server_params_test.go +++ b/x/profiles/keeper/msg_server_params_test.go @@ -48,7 +48,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateParams() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.UpdateParams(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.UpdateParams(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) diff --git a/x/profiles/keeper/msgs_server_profile.go b/x/profiles/keeper/msgs_server_profile.go index 0e8b2fb267..a02cfeb792 100644 --- a/x/profiles/keeper/msgs_server_profile.go +++ b/x/profiles/keeper/msgs_server_profile.go @@ -2,6 +2,7 @@ package keeper import ( "context" + "fmt" "time" "cosmossdk.io/errors" @@ -40,6 +41,11 @@ func (k MsgServer) SaveProfile(goCtx context.Context, msg *types.MsgSaveProfile) return nil, err } + acc := k.ak.GetAccount(ctx, addr) + if acc == nil { + return nil, fmt.Errorf("account with address not found: %s", msg.Creator) + } + profile, err = types.NewProfileFromAccount(msg.DTag, k.ak.GetAccount(ctx, addr), ctx.BlockTime()) if err != nil { return nil, err diff --git a/x/profiles/keeper/msgs_server_profile_test.go b/x/profiles/keeper/msgs_server_profile_test.go index 84ba020b12..8a42e8fb16 100644 --- a/x/profiles/keeper/msgs_server_profile_test.go +++ b/x/profiles/keeper/msgs_server_profile_test.go @@ -31,6 +31,23 @@ func (suite *KeeperTestSuite) TestMsgServer_SaveProfile() { expEvents sdk.Events check func(ctx sdk.Context) }{ + { + name: "account not found returns error (with no previous profile created)", + msg: types.NewMsgSaveProfile( + "custom_dtag", + "my-nickname", + "my-bio", + "https://tc.com/profile-picture", + "https://tc.com/cover-pic", + "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773", + ), + check: func(ctx sdk.Context) { + _, found, err := suite.k.GetProfile(ctx, "cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773") + suite.Require().NoError(err) + suite.Require().True(found) + }, + shouldErr: true, + }, { name: "profile saved (with no previous profile created)", store: func(ctx sdk.Context) { @@ -254,7 +271,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SaveProfile() { } server := keeper.NewMsgServerImpl(suite.k) - _, err := server.SaveProfile(sdk.WrapSDKContext(ctx), tc.msg) + _, err := server.SaveProfile(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -310,7 +327,7 @@ func (suite *KeeperTestSuite) TestMsgServer_DeleteProfile() { } server := keeper.NewMsgServerImpl(suite.k) - _, err := server.DeleteProfile(sdk.WrapSDKContext(ctx), tc.msg) + _, err := server.DeleteProfile(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) diff --git a/x/profiles/keeper/relay_app_links.go b/x/profiles/keeper/relay_app_links.go index f8a58ce8d9..8ba97a4e27 100644 --- a/x/profiles/keeper/relay_app_links.go +++ b/x/profiles/keeper/relay_app_links.go @@ -6,12 +6,12 @@ import ( "strings" "cosmossdk.io/errors" - "github.com/armon/go-metrics" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" + host "github.com/cosmos/ibc-go/v8/modules/core/24-host" + "github.com/hashicorp/go-metrics" "github.com/desmos-labs/desmos/v6/pkg/obi" diff --git a/x/profiles/keeper/relay_app_links_test.go b/x/profiles/keeper/relay_app_links_test.go index 5c92d8d963..918840374f 100644 --- a/x/profiles/keeper/relay_app_links_test.go +++ b/x/profiles/keeper/relay_app_links_test.go @@ -7,16 +7,16 @@ import ( "strings" "time" + "github.com/desmos-labs/desmos/v6/app" "github.com/desmos-labs/desmos/v6/testutil/profilestesting" "github.com/desmos-labs/desmos/v6/pkg/obi" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - "github.com/cosmos/ibc-go/v7/modules/core/exported" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" - "github.com/desmos-labs/desmos/v6/testutil/ibctesting" + ibctesting "github.com/cosmos/ibc-go/v8/testing" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" + channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -64,10 +64,10 @@ func createResponsePacketData( func (suite *KeeperTestSuite) TestKeeper_StartProfileConnection() { var ( - applicationData types.Data - callData string - channelA, channelB ibctesting.TestChannel - err error + applicationData types.Data + callData string + path *ibctesting.Path + err error ) testCases := []struct { @@ -80,44 +80,49 @@ func (suite *KeeperTestSuite) TestKeeper_StartProfileConnection() { name: "source channel not found", malleate: func() { // channel references wrong ID - _, _, connA, connB := suite.coordinator.SetupClientConnections(suite.chainA, suite.chainB, exported.Tendermint) - channelA, _ = suite.coordinator.CreateIBCProfilesChannels(suite.chainA, suite.chainB, connA, connB, channeltypes.UNORDERED) - channelA.ID = "IDisInvalid" + path = NewIBCProfilesPath(suite.chainA, suite.chainB) + suite.coordinator.Setup(path) + path.EndpointA.ChannelID = "IDisInvalid" }, expPass: false, }, { name: "next seq send not found", malleate: func() { - _, _, connA, connB := suite.coordinator.SetupClientConnections(suite.chainA, suite.chainB, exported.Tendermint) - channelA = suite.chainA.NextTestChannel(connA, types.IBCPortID) - channelB = suite.chainB.NextTestChannel(connB, types.IBCPortID) + path = NewIBCProfilesPath(suite.chainA, suite.chainB) + suite.coordinator.SetupConnections(path) + + // setup test channels of endpoints + path.EndpointA.ChannelConfig.PortID = types.IBCPortID + path.EndpointA.ChannelID = "channel-1" + path.EndpointB.ChannelConfig.PortID = types.IBCPortID + path.EndpointB.ChannelID = "channel-1" // manually create channel so next seq send is never set - suite.chainA.App.IBCKeeper.ChannelKeeper.SetChannel( + suite.chainA.App.(*app.DesmosApp).IBCKeeper.ChannelKeeper.SetChannel( suite.chainA.GetContext(), - channelA.PortID, channelA.ID, + path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, channeltypes.NewChannel( channeltypes.OPEN, channeltypes.ORDERED, - channeltypes.NewCounterparty(channelB.PortID, channelB.ID), - []string{connA.ID}, + channeltypes.NewCounterparty(path.EndpointB.ChannelConfig.PortID, path.EndpointB.ChannelID), + []string{path.EndpointA.ConnectionID}, "ics-20", ), ) - suite.chainA.CreateChannelCapability(channelA.PortID, channelA.ID) + suite.chainA.CreateChannelCapability(suite.chainA.App.(*app.DesmosApp).ScopedProfilesKeeper, path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID) }, expPass: false, }, { name: "channel capability not found", malleate: func() { - _, _, connA, connB := suite.coordinator.SetupClientConnections(suite.chainA, suite.chainB, exported.Tendermint) - channelA, channelB = suite.coordinator.CreateIBCProfilesChannels(suite.chainA, suite.chainB, connA, connB, channeltypes.UNORDERED) - capability := suite.chainA.GetChannelCapability(channelA.PortID, channelA.ID) + path = NewIBCProfilesPath(suite.chainA, suite.chainB) + suite.coordinator.Setup(path) + capability := suite.chainA.GetChannelCapability(path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID) // Release channel capability - err := suite.chainA.App.ScopedProfilesKeeper.ReleaseCapability(suite.chainA.GetContext(), capability) + err := suite.chainA.App.(*app.DesmosApp).ScopedProfilesKeeper.ReleaseCapability(suite.chainA.GetContext(), capability) suite.Require().NoError(err) }, expPass: false, @@ -125,8 +130,8 @@ func (suite *KeeperTestSuite) TestKeeper_StartProfileConnection() { { name: "send without profile returns error", malleate: func() { - _, _, connA, connB := suite.coordinator.SetupClientConnections(suite.chainA, suite.chainB, exported.Tendermint) - channelA, channelB = suite.coordinator.CreateIBCProfilesChannels(suite.chainA, suite.chainB, connA, connB, channeltypes.UNORDERED) + path = NewIBCProfilesPath(suite.chainA, suite.chainB) + suite.coordinator.Setup(path) applicationData = types.NewData("twitter", "twitteruser") callData = "call_data" }, @@ -135,14 +140,14 @@ func (suite *KeeperTestSuite) TestKeeper_StartProfileConnection() { { name: "send with profile works properly", malleate: func() { - _, _, connA, connB := suite.coordinator.SetupClientConnections(suite.chainA, suite.chainB, exported.Tendermint) - channelA, channelB = suite.coordinator.CreateIBCProfilesChannels(suite.chainA, suite.chainB, connA, connB, channeltypes.UNORDERED) + path = NewIBCProfilesPath(suite.chainA, suite.chainB) + suite.coordinator.Setup(path) applicationData = types.NewData("twitter", "twitteruser") callData = "call_data" }, storeChainA: func(ctx sdk.Context) { - profile := profilestesting.ProfileFromAddr(suite.chainA.Account.GetAddress().String()) - suite.chainA.App.AccountKeeper.SetAccount(ctx, profile) + profile := profilestesting.ProfileFromAddr(suite.chainA.SenderAccount.GetAddress().String()) + suite.chainA.App.(*app.DesmosApp).AccountKeeper.SetAccount(ctx, profile) }, expPass: true, }, @@ -158,19 +163,19 @@ func (suite *KeeperTestSuite) TestKeeper_StartProfileConnection() { tc.storeChainA(suite.chainA.GetContext()) } - err = suite.chainA.App.ProfilesKeeper.StartProfileConnection( - suite.chainA.GetContext(), applicationData, callData, suite.chainA.Account.GetAddress(), - channelA.PortID, channelA.ID, - clienttypes.NewHeight(0, 110), 0, + err = suite.chainA.App.(*app.DesmosApp).ProfilesKeeper.StartProfileConnection( + suite.chainA.GetContext(), applicationData, callData, suite.chainA.SenderAccount.GetAddress(), + path.EndpointA.ChannelConfig.PortID, path.EndpointA.ChannelID, + clienttypes.NewHeight(10, 110), 0, ) if tc.expPass { suite.Require().NoError(err) - links := suite.chainA.App.ProfilesKeeper.GetApplicationLinks(suite.chainA.GetContext()) + links := suite.chainA.App.(*app.DesmosApp).ProfilesKeeper.GetApplicationLinks(suite.chainA.GetContext()) suite.Require().Len(links, 1) - suite.Require().Equal(suite.chainA.Account.GetAddress().String(), links[0].User) + suite.Require().Equal(suite.chainA.SenderAccount.GetAddress().String(), links[0].User) suite.Require().Equal(types.ApplicationLinkStateInitialized, links[0].State) } else { suite.Require().Error(err) diff --git a/x/profiles/keeper/relay_chain_links_test.go b/x/profiles/keeper/relay_chain_links_test.go index d24a6a4245..3fc7b01df3 100644 --- a/x/profiles/keeper/relay_chain_links_test.go +++ b/x/profiles/keeper/relay_chain_links_test.go @@ -8,6 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + "github.com/desmos-labs/desmos/v6/app" "github.com/desmos-labs/desmos/v6/testutil/profilestesting" "github.com/desmos-labs/desmos/v6/x/profiles/types" ) @@ -32,14 +33,14 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { packetData = types.LinkChainAccountPacketData{ SourceAddress: nil, SourceProof: types.NewProof( - suite.chainA.Account.GetPubKey(), + suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(srcSigHex), hex.EncodeToString([]byte(destAddr)), ), SourceChainConfig: types.NewChainConfig("cosmos"), DestinationAddress: destAddr, DestinationProof: types.NewProof( - suite.chainB.Account.GetPubKey(), + suite.chainB.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(destSigHex), hex.EncodeToString([]byte(srcAddr)), ), @@ -55,14 +56,14 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { packetData = types.LinkChainAccountPacketData{ SourceAddress: invalidAny, SourceProof: types.NewProof( - suite.chainA.Account.GetPubKey(), + suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(srcSigHex), hex.EncodeToString([]byte(destAddr)), ), SourceChainConfig: types.NewChainConfig("cosmos"), DestinationAddress: destAddr, DestinationProof: types.NewProof( - suite.chainB.Account.GetPubKey(), + suite.chainB.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(destSigHex), hex.EncodeToString([]byte(srcAddr)), ), @@ -76,14 +77,14 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { packetData = types.NewLinkChainAccountPacketData( types.NewBech32Address(srcAddr, "cosmos"), types.NewProof( - suite.chainA.Account.GetPubKey(), + suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(srcSigHex), hex.EncodeToString([]byte(destAddr)), ), types.NewChainConfig("cosmos"), "cosmos1asdjlansdjhasd", types.NewProof( - suite.chainB.Account.GetPubKey(), + suite.chainB.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(destSigHex), hex.EncodeToString([]byte(srcAddr)), ), @@ -97,14 +98,14 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { packetData = types.NewLinkChainAccountPacketData( types.NewBech32Address(srcAddr, "cosmos"), types.NewProof( - suite.chainA.Account.GetPubKey(), + suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(srcSigHex), hex.EncodeToString([]byte(destAddr)), ), types.NewChainConfig("cosmos"), destAddr, types.NewProof( - suite.chainB.Account.GetPubKey(), + suite.chainB.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(destSigHex), hex.EncodeToString([]byte(srcAddr)), ), @@ -118,23 +119,23 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { packetData = types.NewLinkChainAccountPacketData( types.NewBech32Address(srcAddr, "cosmos"), types.NewProof( - suite.chainA.Account.GetPubKey(), + suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(srcSigHex), hex.EncodeToString([]byte(destAddr)), ), types.NewChainConfig("cosmos"), destAddr, types.NewProof( - suite.chainB.Account.GetPubKey(), + suite.chainB.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(destSigHex), hex.EncodeToString([]byte(srcAddr)), ), ) }, store: func() { - addr := suite.chainB.Account.GetAddress() + addr := suite.chainB.SenderAccount.GetAddress() baseAcc := authtypes.NewBaseAccountWithAddress(addr) - baseAcc.SetPubKey(suite.chainA.Account.GetPubKey()) + baseAcc.SetPubKey(suite.chainA.SenderAccount.GetPubKey()) profile, err := types.NewProfile( "dtag", @@ -148,7 +149,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { baseAcc, ) suite.Require().NoError(err) - err = suite.chainB.App.ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) + err = suite.chainB.App.(*app.DesmosApp).ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) suite.Require().NoError(err) }, expPass: false, @@ -159,7 +160,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { packetData = types.NewLinkChainAccountPacketData( types.NewBech32Address(srcAddr, "cosmos"), types.NewProof( - suite.chainA.Account.GetPubKey(), + suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(srcSigHex), "696e76616c6964", ), @@ -168,16 +169,16 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { ), destAddr, types.NewProof( - suite.chainB.Account.GetPubKey(), + suite.chainB.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(destSigHex), hex.EncodeToString([]byte(srcAddr)), ), ) }, store: func() { - addr := suite.chainB.Account.GetAddress() + addr := suite.chainB.SenderAccount.GetAddress() baseAcc := authtypes.NewBaseAccountWithAddress(addr) - baseAcc.SetPubKey(suite.chainB.Account.GetPubKey()) + baseAcc.SetPubKey(suite.chainB.SenderAccount.GetPubKey()) profile, err := types.NewProfile( "dtag", @@ -191,7 +192,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { baseAcc, ) suite.Require().NoError(err) - err = suite.chainB.App.ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) + err = suite.chainB.App.(*app.DesmosApp).ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) suite.Require().NoError(err) }, expPass: false, @@ -202,7 +203,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { packetData = types.NewLinkChainAccountPacketData( types.NewBech32Address(srcAddr, "cosmos"), types.NewProof( - suite.chainA.Account.GetPubKey(), + suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(srcSigHex), hex.EncodeToString([]byte(destAddr)), ), @@ -211,16 +212,16 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { ), destAddr, types.NewProof( - suite.chainB.Account.GetPubKey(), + suite.chainB.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(destSigHex), "696e76616c6964", ), ) }, store: func() { - addr := suite.chainB.Account.GetAddress() + addr := suite.chainB.SenderAccount.GetAddress() baseAcc := authtypes.NewBaseAccountWithAddress(addr) - baseAcc.SetPubKey(suite.chainB.Account.GetPubKey()) + baseAcc.SetPubKey(suite.chainB.SenderAccount.GetPubKey()) profile, err := types.NewProfile( "dtag", @@ -234,7 +235,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { baseAcc, ) suite.Require().NoError(err) - err = suite.chainB.App.ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) + err = suite.chainB.App.(*app.DesmosApp).ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) suite.Require().NoError(err) }, expPass: false, @@ -245,7 +246,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { packetData = types.NewLinkChainAccountPacketData( types.NewBech32Address(srcAddr, "cosmos"), types.NewProof( - suite.chainA.Account.GetPubKey(), + suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(srcSigHex), hex.EncodeToString([]byte(destAddr)), ), @@ -254,16 +255,16 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { ), destAddr, types.NewProof( - suite.chainB.Account.GetPubKey(), + suite.chainB.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(destSigHex), hex.EncodeToString([]byte(srcAddr)), ), ) }, store: func() { - addr := suite.chainB.Account.GetAddress() + addr := suite.chainB.SenderAccount.GetAddress() baseAcc := authtypes.NewBaseAccountWithAddress(addr) - baseAcc.SetPubKey(suite.chainB.Account.GetPubKey()) + baseAcc.SetPubKey(suite.chainB.SenderAccount.GetPubKey()) profile, err := types.NewProfile( "dtag", @@ -277,16 +278,16 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { baseAcc, ) suite.Require().NoError(err) - err = suite.chainB.App.ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) + err = suite.chainB.App.(*app.DesmosApp).ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) suite.Require().NoError(err) // Store link - store := suite.chainB.GetContext().KVStore(suite.chainB.App.GetKey(types.StoreKey)) + store := suite.chainB.GetContext().KVStore(suite.chainB.App.(*app.DesmosApp).GetKey(types.StoreKey)) key := types.ChainLinksStoreKey(baseAcc.GetAddress().String(), "cosmos", srcAddr) link := types.NewChainLink( addr.String(), types.NewBech32Address(srcAddr, "cosmos"), - types.NewProof(suite.chainA.Account.GetPubKey(), profilestesting.SingleSignatureFromHex("1234"), hex.EncodeToString([]byte(srcAddr))), + types.NewProof(suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex("1234"), hex.EncodeToString([]byte(srcAddr))), types.NewChainConfig("cosmos"), time.Date(2021, 1, 1, 00, 00, 00, 000, time.UTC), ) @@ -300,7 +301,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { packetData = types.NewLinkChainAccountPacketData( types.NewBech32Address(srcAddr, "cosmos"), types.NewProof( - suite.chainA.Account.GetPubKey(), + suite.chainA.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(srcSigHex), hex.EncodeToString([]byte(destAddr)), ), @@ -309,16 +310,16 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { ), destAddr, types.NewProof( - suite.chainB.Account.GetPubKey(), + suite.chainB.SenderAccount.GetPubKey(), profilestesting.SingleSignatureFromHex(destSigHex), hex.EncodeToString([]byte(srcAddr)), ), ) }, store: func() { - addr := suite.chainB.Account.GetAddress() + addr := suite.chainB.SenderAccount.GetAddress() baseAcc := authtypes.NewBaseAccountWithAddress(addr) - baseAcc.SetPubKey(suite.chainB.Account.GetPubKey()) + baseAcc.SetPubKey(suite.chainB.SenderAccount.GetPubKey()) profile, err := types.NewProfile( "dtag", @@ -332,7 +333,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { baseAcc, ) suite.Require().NoError(err) - err = suite.chainB.App.ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) + err = suite.chainB.App.(*app.DesmosApp).ProfilesKeeper.SaveProfile(suite.chainB.GetContext(), profile) suite.Require().NoError(err) }, expPass: true, @@ -348,14 +349,14 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { tc := tc suite.Run(tc.name, func() { suite.SetupIBCTest() - srcAddr = suite.chainA.Account.GetAddress().String() - destAddr = suite.chainB.Account.GetAddress().String() + srcAddr = suite.chainA.SenderAccount.GetAddress().String() + destAddr = suite.chainB.SenderAccount.GetAddress().String() - srcSig, err := suite.chainA.PrivKey.Sign([]byte(destAddr)) + srcSig, err := suite.chainA.SenderPrivKey.Sign([]byte(destAddr)) suite.NoError(err) srcSigHex := hex.EncodeToString(srcSig) - dstSig, err := suite.chainB.PrivKey.Sign([]byte(srcAddr)) + dstSig, err := suite.chainB.SenderPrivKey.Sign([]byte(srcAddr)) suite.NoError(err) destSigHex := hex.EncodeToString(dstSig) @@ -364,7 +365,7 @@ func (suite *KeeperTestSuite) TestOnRecvPacket() { tc.store() } - ack, err := suite.chainB.App.ProfilesKeeper.OnRecvLinkChainAccountPacket(suite.chainB.GetContext(), packetData) + ack, err := suite.chainB.App.(*app.DesmosApp).ProfilesKeeper.OnRecvLinkChainAccountPacket(suite.chainB.GetContext(), packetData) if tc.expPass { suite.Require().NoError(err) suite.Require().Equal(tc.getExpAck(srcAddr), ack) diff --git a/x/profiles/legacy/v4/keeper.go b/x/profiles/legacy/v4/keeper.go index 968f6d6d24..802f0c9798 100644 --- a/x/profiles/legacy/v4/keeper.go +++ b/x/profiles/legacy/v4/keeper.go @@ -1,9 +1,9 @@ package v4 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" v4types "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v4/types" diff --git a/x/profiles/legacy/v4/store.go b/x/profiles/legacy/v4/store.go index be40259815..764d1b18d0 100644 --- a/x/profiles/legacy/v4/store.go +++ b/x/profiles/legacy/v4/store.go @@ -4,15 +4,14 @@ import ( "encoding/hex" "fmt" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/tx" "github.com/cosmos/cosmos-sdk/types/tx/signing" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" v4types "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v4/types" v5types "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v5/types" @@ -56,7 +55,7 @@ func MigrateStore(ctx sdk.Context, ak authkeeper.AccountKeeper, storeKey storety func migrateProfiles(ctx sdk.Context, ak authkeeper.AccountKeeper) error { var profiles []*v4types.Profile - ak.IterateAccounts(ctx, func(account authtypes.AccountI) (stop bool) { + ak.IterateAccounts(ctx, func(account sdk.AccountI) (stop bool) { if profile, ok := account.(*v4types.Profile); ok { profiles = append(profiles, profile) } diff --git a/x/profiles/legacy/v4/store_test.go b/x/profiles/legacy/v4/store_test.go index f485264c1b..c561d9cfb7 100644 --- a/x/profiles/legacy/v4/store_test.go +++ b/x/profiles/legacy/v4/store_test.go @@ -9,6 +9,8 @@ import ( types2 "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v4/types" v5types "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v5/types" + "github.com/cosmos/cosmos-sdk/codec/address" + "github.com/cosmos/cosmos-sdk/runtime" "github.com/cosmos/cosmos-sdk/types/tx" "github.com/cosmos/cosmos-sdk/types/tx/signing" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" @@ -16,14 +18,15 @@ import ( "github.com/desmos-labs/desmos/v6/testutil/profilestesting" profilestypes "github.com/desmos-labs/desmos/v6/x/profiles/types" - dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + dbm "github.com/cosmos/cosmos-db" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" @@ -38,7 +41,7 @@ func buildContext( keys map[string]*storetypes.KVStoreKey, tKeys map[string]*storetypes.TransientStoreKey, memKeys map[string]*storetypes.MemoryStoreKey, ) sdk.Context { db := dbm.NewMemDB() - cms := store.NewCommitMultiStore(db) + cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) } @@ -61,16 +64,17 @@ func TestMigrateStore(t *testing.T) { cdc, legacyAmino := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(authtypes.StoreKey, profilestypes.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(authtypes.StoreKey, profilestypes.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) // Build the x/auth keeper authKeeper := authkeeper.NewAccountKeeper( cdc, - keys[authtypes.StoreKey], + runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, - app.GetMaccPerms(), + nil, + address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String(), ) diff --git a/x/profiles/legacy/v4/types/codec.go b/x/profiles/legacy/v4/types/codec.go index 9ba48f06f4..9ea3f90272 100644 --- a/x/profiles/legacy/v4/types/codec.go +++ b/x/profiles/legacy/v4/types/codec.go @@ -4,12 +4,12 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" ) func RegisterInterfaces(registry types.InterfaceRegistry) { - registry.RegisterImplementations((*authtypes.AccountI)(nil), &Profile{}) + registry.RegisterImplementations((*sdk.AccountI)(nil), &Profile{}) registry.RegisterImplementations((*exported.VestingAccount)(nil), &Profile{}) registry.RegisterInterface( "desmos.profiles.v1beta1.AddressData", diff --git a/x/profiles/legacy/v4/types/models_app_links.pb.go b/x/profiles/legacy/v4/types/models_app_links.pb.go index dfccd72fe0..24d1e209b9 100644 --- a/x/profiles/legacy/v4/types/models_app_links.pb.go +++ b/x/profiles/legacy/v4/types/models_app_links.pb.go @@ -455,7 +455,7 @@ var fileDescriptor_33caa1214beac081 = []byte{ // 979 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x96, 0x4f, 0x6f, 0xe3, 0xc4, 0x1b, 0xc7, 0xe3, 0xc4, 0xcd, 0x36, 0xd3, 0x6d, 0x9b, 0xdf, 0xb4, 0x3f, 0x36, 0xb2, 0xd4, 0xd8, - 0xb8, 0xa8, 0x14, 0x50, 0x6d, 0xb5, 0x80, 0x84, 0x8a, 0x90, 0x88, 0x13, 0x57, 0xeb, 0xa5, 0xb4, + 0xb8, 0xa8, 0x14, 0x50, 0x6d, 0xb5, 0x20, 0x84, 0x8a, 0x90, 0x88, 0x13, 0x57, 0xeb, 0xa5, 0xb4, 0xd5, 0xc4, 0xd9, 0x95, 0xf6, 0x62, 0x4d, 0xec, 0x49, 0xb0, 0xd6, 0x89, 0x83, 0xff, 0x54, 0x14, 0xc4, 0x7d, 0xd5, 0xd3, 0xbe, 0x81, 0x4a, 0x2b, 0xf1, 0x3a, 0x10, 0xd7, 0xbd, 0x20, 0xed, 0x91, 0x93, 0x41, 0xe9, 0x85, 0x73, 0xce, 0x1c, 0x90, 0x67, 0xec, 0x24, 0x65, 0x37, 0xb4, 0x12, 0xb7, @@ -513,7 +513,7 @@ var fileDescriptor_33caa1214beac081 = []byte{ 0xf5, 0x75, 0xbd, 0xf0, 0xdb, 0x75, 0xbd, 0xf0, 0xf4, 0xf3, 0xbe, 0x1b, 0x7d, 0x13, 0x77, 0x15, 0xdb, 0x1f, 0xa8, 0x6c, 0xab, 0xf7, 0x3c, 0xdc, 0x0d, 0xb3, 0xb3, 0x7a, 0xfe, 0xa9, 0xfa, 0xdd, 0xec, 0x37, 0x80, 0x47, 0xfa, 0xd8, 0xbe, 0x50, 0xcf, 0x3f, 0x51, 0xa3, 0x8b, 0x11, 0x09, 0xbb, - 0x65, 0xfa, 0xe6, 0x7f, 0xfc, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa6, 0x30, 0x63, 0x3a, 0x2d, + 0x65, 0xfa, 0xe6, 0x7f, 0xfc, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x58, 0x4b, 0x83, 0x5e, 0x2d, 0x08, 0x00, 0x00, } diff --git a/x/profiles/legacy/v4/types/models_chain_links.pb.go b/x/profiles/legacy/v4/types/models_chain_links.pb.go index a229c0a759..1c21842715 100644 --- a/x/profiles/legacy/v4/types/models_chain_links.pb.go +++ b/x/profiles/legacy/v4/types/models_chain_links.pb.go @@ -302,45 +302,45 @@ var fileDescriptor_1c1946212735e419 = []byte{ // 647 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0x3f, 0x6f, 0xd3, 0x4e, 0x18, 0x8e, 0x7f, 0x6d, 0x5a, 0xe5, 0x92, 0xfc, 0x68, 0x4d, 0x10, 0xa1, 0x48, 0x76, 0x75, 0x45, - 0xa8, 0x0c, 0xb5, 0xe9, 0x3f, 0x09, 0xca, 0x42, 0x5d, 0x06, 0x04, 0x0c, 0xc8, 0x2a, 0x0b, 0x4b, - 0x74, 0x76, 0x2e, 0xae, 0x55, 0xdb, 0x67, 0xf9, 0xce, 0x51, 0xfc, 0x0d, 0x18, 0x3b, 0x20, 0xc1, - 0xd8, 0x0f, 0xc1, 0xcc, 0xc0, 0x54, 0x31, 0x75, 0x64, 0x32, 0xa8, 0x5d, 0x98, 0xfd, 0x09, 0xd0, - 0xdd, 0xd9, 0x4d, 0x94, 0x2a, 0x12, 0x30, 0xb1, 0xdd, 0xbd, 0xef, 0xf3, 0x3c, 0xef, 0x7b, 0xef, - 0xf3, 0xea, 0xc0, 0xc3, 0x3e, 0xa6, 0x21, 0xa1, 0x66, 0x9c, 0x90, 0x81, 0x1f, 0x60, 0x6a, 0x0e, - 0x37, 0x1d, 0xcc, 0xd0, 0xa6, 0x19, 0x92, 0x3e, 0x0e, 0x68, 0xcf, 0x3d, 0x42, 0x7e, 0xd4, 0x0b, - 0xfc, 0xe8, 0x98, 0x1a, 0x71, 0x42, 0x18, 0x51, 0x6f, 0x4b, 0x86, 0x51, 0x31, 0x8c, 0x92, 0xb1, - 0xd2, 0xf1, 0x88, 0x47, 0x04, 0xc6, 0xe4, 0x27, 0x09, 0x5f, 0xb9, 0xe3, 0x11, 0xe2, 0x05, 0xd8, - 0x14, 0x37, 0x27, 0x1d, 0x98, 0x28, 0xca, 0xca, 0x94, 0x3e, 0x9d, 0x62, 0x7e, 0x88, 0x29, 0x43, - 0x61, 0x5c, 0x71, 0x5d, 0xc2, 0x4b, 0xf5, 0xa4, 0xa8, 0xbc, 0xc8, 0x14, 0xfc, 0x3c, 0x07, 0x1a, - 0x07, 0xbc, 0xb7, 0x57, 0x7e, 0x74, 0xac, 0xae, 0x81, 0xf9, 0x94, 0xe2, 0xa4, 0xab, 0xac, 0x2a, - 0xeb, 0x0d, 0xeb, 0x46, 0x91, 0xeb, 0xcd, 0x0c, 0x85, 0xc1, 0x1e, 0xe4, 0x51, 0x68, 0x8b, 0xa4, - 0xea, 0x83, 0x45, 0xd4, 0xef, 0x27, 0x98, 0xd2, 0xee, 0x7f, 0xab, 0xca, 0x7a, 0x73, 0xab, 0x63, - 0xc8, 0x06, 0x8c, 0xaa, 0x01, 0x63, 0x3f, 0xca, 0xac, 0xc7, 0x45, 0xae, 0xff, 0x2f, 0xd9, 0x25, - 0x1c, 0x7e, 0xfd, 0xb4, 0xb1, 0x36, 0xe3, 0xd5, 0xc6, 0xbe, 0xc4, 0x3c, 0x43, 0x0c, 0xd9, 0x95, - 0xbe, 0xfa, 0x02, 0xd4, 0xe3, 0x84, 0x90, 0x41, 0x77, 0x4e, 0x14, 0xd2, 0x8c, 0x59, 0xec, 0xd7, - 0x1c, 0x65, 0x75, 0xce, 0x72, 0xbd, 0x56, 0xe4, 0x7a, 0x4b, 0x96, 0x15, 0x54, 0x68, 0x4b, 0x09, - 0xb5, 0x0f, 0x5a, 0xd2, 0x04, 0x97, 0x44, 0x03, 0xdf, 0xeb, 0xce, 0x0b, 0xc9, 0x7b, 0x33, 0x25, - 0xc5, 0x54, 0x0e, 0x04, 0xd6, 0xba, 0x5b, 0x0a, 0xdf, 0x94, 0xc2, 0x93, 0x3a, 0xd0, 0x6e, 0xba, - 0x63, 0xa4, 0x8a, 0x40, 0xdb, 0x4d, 0x30, 0x62, 0x3e, 0x89, 0x7a, 0xdc, 0x86, 0x6e, 0x5d, 0x94, - 0x59, 0xb9, 0x36, 0xa2, 0xc3, 0xca, 0x23, 0x6b, 0xb5, 0x14, 0xef, 0x94, 0xe2, 0x93, 0x74, 0x78, - 0xf2, 0x5d, 0x57, 0xec, 0x56, 0x15, 0xe3, 0xa4, 0xbd, 0xd6, 0xbb, 0x53, 0xbd, 0xf6, 0xf1, 0x54, - 0x57, 0x7e, 0x9e, 0xea, 0x0a, 0x7c, 0x0a, 0x9a, 0x13, 0x9d, 0x72, 0x07, 0x23, 0x14, 0xe2, 0xeb, - 0x0e, 0xf2, 0x28, 0xb4, 0x45, 0x72, 0x4a, 0xe1, 0x8b, 0x02, 0xea, 0x62, 0x7e, 0xea, 0x3e, 0x58, - 0x8c, 0x53, 0xa7, 0x77, 0x8c, 0x33, 0xc1, 0x9f, 0xe5, 0xac, 0x3a, 0x76, 0xb6, 0x84, 0x43, 0x7b, - 0x21, 0x4e, 0x9d, 0x97, 0x38, 0x53, 0xb7, 0x40, 0x83, 0xfa, 0x5e, 0x84, 0x58, 0x9a, 0x60, 0xb1, - 0x1e, 0x0d, 0xab, 0x53, 0xe4, 0xfa, 0x92, 0x84, 0x5f, 0xa5, 0xa0, 0x3d, 0x86, 0xa9, 0x3b, 0x00, - 0xc4, 0x01, 0x9f, 0x28, 0xc3, 0x23, 0x26, 0xac, 0x6e, 0x58, 0xb7, 0x8a, 0x5c, 0x5f, 0x2e, 0x6b, - 0x5c, 0xe5, 0xa0, 0xdd, 0x10, 0x97, 0x43, 0x3c, 0x62, 0x53, 0x8f, 0xf8, 0xa0, 0x80, 0xb6, 0x85, - 0xdd, 0xa3, 0xed, 0xad, 0x72, 0x91, 0xd4, 0xfb, 0xa0, 0x3e, 0x44, 0x41, 0x5a, 0x8d, 0x62, 0x69, - 0xbc, 0x17, 0x22, 0x0c, 0x6d, 0x99, 0x56, 0x1f, 0x80, 0x85, 0x38, 0xc1, 0x03, 0x7f, 0x54, 0xb6, - 0xbb, 0x5c, 0xe4, 0x7a, 0xbb, 0x5a, 0x20, 0x1e, 0xe7, 0x8f, 0x13, 0x87, 0xbd, 0xed, 0xc9, 0x92, - 0xbf, 0xb9, 0xcc, 0x30, 0x00, 0x6d, 0x0b, 0x51, 0xbc, 0xfb, 0xe8, 0x0f, 0x1b, 0xfb, 0xbb, 0x6a, - 0xef, 0x15, 0x00, 0x9e, 0xe3, 0xd1, 0x3f, 0x36, 0x04, 0xeb, 0xcd, 0xd9, 0x85, 0xa6, 0x9c, 0x5f, - 0x68, 0xca, 0x8f, 0x0b, 0x4d, 0x39, 0xb9, 0xd4, 0x6a, 0xe7, 0x97, 0x5a, 0xed, 0xdb, 0xa5, 0x56, - 0x7b, 0xfb, 0xc4, 0xf3, 0xd9, 0x51, 0xea, 0x18, 0x2e, 0x09, 0x4d, 0xa9, 0xb4, 0x11, 0x20, 0x87, - 0x96, 0x67, 0x73, 0xb8, 0x6b, 0x8e, 0xc6, 0x9f, 0x6a, 0x80, 0x3d, 0xe4, 0x66, 0xe6, 0x70, 0xc7, - 0x64, 0x59, 0x8c, 0xa9, 0xb3, 0x20, 0xf6, 0x72, 0xfb, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, - 0x2f, 0xf9, 0x20, 0x7e, 0x05, 0x00, 0x00, + 0xa8, 0x0c, 0xb5, 0xe9, 0x1f, 0x10, 0x94, 0x85, 0xba, 0x0c, 0x08, 0x18, 0x90, 0x55, 0x16, 0x96, + 0xe8, 0xec, 0x5c, 0x5c, 0xab, 0xb6, 0xcf, 0xf2, 0x9d, 0xa3, 0xf8, 0x1b, 0x30, 0x76, 0x40, 0x82, + 0xb1, 0x1f, 0x82, 0x99, 0x81, 0xa9, 0x62, 0xea, 0xc8, 0x64, 0x50, 0xbb, 0x30, 0xfb, 0x13, 0xa0, + 0xbb, 0xb3, 0x9b, 0x28, 0x55, 0x24, 0x60, 0x62, 0xbb, 0x7b, 0xdf, 0xe7, 0x79, 0xde, 0xf7, 0xde, + 0xe7, 0xd5, 0x81, 0xfb, 0x7d, 0x4c, 0x43, 0x42, 0xcd, 0x38, 0x21, 0x03, 0x3f, 0xc0, 0xd4, 0x1c, + 0x6e, 0x3a, 0x98, 0xa1, 0x4d, 0x33, 0x24, 0x7d, 0x1c, 0xd0, 0x9e, 0x7b, 0x88, 0xfc, 0xa8, 0x17, + 0xf8, 0xd1, 0x11, 0x35, 0xe2, 0x84, 0x30, 0xa2, 0xde, 0x94, 0x0c, 0xa3, 0x62, 0x18, 0x25, 0x63, + 0xa5, 0xe3, 0x11, 0x8f, 0x08, 0x8c, 0xc9, 0x4f, 0x12, 0xbe, 0x72, 0xcb, 0x23, 0xc4, 0x0b, 0xb0, + 0x29, 0x6e, 0x4e, 0x3a, 0x30, 0x51, 0x94, 0x95, 0x29, 0x7d, 0x3a, 0xc5, 0xfc, 0x10, 0x53, 0x86, + 0xc2, 0xb8, 0xe2, 0xba, 0x84, 0x97, 0xea, 0x49, 0x51, 0x79, 0x91, 0x29, 0xf8, 0x79, 0x0e, 0x34, + 0xf6, 0x79, 0x6f, 0xaf, 0xfc, 0xe8, 0x48, 0x5d, 0x03, 0xf3, 0x29, 0xc5, 0x49, 0x57, 0x59, 0x55, + 0xd6, 0x1b, 0xd6, 0xb5, 0x22, 0xd7, 0x9b, 0x19, 0x0a, 0x83, 0x5d, 0xc8, 0xa3, 0xd0, 0x16, 0x49, + 0xd5, 0x07, 0x8b, 0xa8, 0xdf, 0x4f, 0x30, 0xa5, 0xdd, 0xff, 0x56, 0x95, 0xf5, 0xe6, 0x56, 0xc7, + 0x90, 0x0d, 0x18, 0x55, 0x03, 0xc6, 0x5e, 0x94, 0x59, 0x8f, 0x8b, 0x5c, 0xff, 0x5f, 0xb2, 0x4b, + 0x38, 0xfc, 0xfa, 0x69, 0x63, 0x6d, 0xc6, 0xab, 0x8d, 0x3d, 0x89, 0x79, 0x86, 0x18, 0xb2, 0x2b, + 0x7d, 0xf5, 0x05, 0xa8, 0xc7, 0x09, 0x21, 0x83, 0xee, 0x9c, 0x28, 0xa4, 0x19, 0xb3, 0xd8, 0xaf, + 0x39, 0xca, 0xea, 0x9c, 0xe6, 0x7a, 0xad, 0xc8, 0xf5, 0x96, 0x2c, 0x2b, 0xa8, 0xd0, 0x96, 0x12, + 0x6a, 0x1f, 0xb4, 0xa4, 0x09, 0x2e, 0x89, 0x06, 0xbe, 0xd7, 0x9d, 0x17, 0x92, 0x77, 0x66, 0x4a, + 0x8a, 0xa9, 0xec, 0x0b, 0xac, 0x75, 0xbb, 0x14, 0xbe, 0x2e, 0x85, 0x27, 0x75, 0xa0, 0xdd, 0x74, + 0xc7, 0x48, 0x15, 0x81, 0xb6, 0x9b, 0x60, 0xc4, 0x7c, 0x12, 0xf5, 0xb8, 0x0d, 0xdd, 0xba, 0x28, + 0xb3, 0x72, 0x65, 0x44, 0x07, 0x95, 0x47, 0xd6, 0x6a, 0x29, 0xde, 0x29, 0xc5, 0x27, 0xe9, 0xf0, + 0xf8, 0xbb, 0xae, 0xd8, 0xad, 0x2a, 0xc6, 0x49, 0xbb, 0xad, 0x77, 0x27, 0x7a, 0xed, 0xe3, 0x89, + 0xae, 0xfc, 0x3c, 0xd1, 0x15, 0xf8, 0x14, 0x34, 0x27, 0x3a, 0xe5, 0x0e, 0x46, 0x28, 0xc4, 0x57, + 0x1d, 0xe4, 0x51, 0x68, 0x8b, 0xe4, 0x94, 0xc2, 0x17, 0x05, 0xd4, 0xc5, 0xfc, 0xd4, 0x3d, 0xb0, + 0x18, 0xa7, 0x4e, 0xef, 0x08, 0x67, 0x82, 0x3f, 0xcb, 0x59, 0x75, 0xec, 0x6c, 0x09, 0x87, 0xf6, + 0x42, 0x9c, 0x3a, 0x2f, 0x71, 0xa6, 0x6e, 0x81, 0x06, 0xf5, 0xbd, 0x08, 0xb1, 0x34, 0xc1, 0x62, + 0x3d, 0x1a, 0x56, 0xa7, 0xc8, 0xf5, 0x25, 0x09, 0xbf, 0x4c, 0x41, 0x7b, 0x0c, 0x53, 0x77, 0x00, + 0x88, 0x03, 0x3e, 0x51, 0x86, 0x47, 0x4c, 0x58, 0xdd, 0xb0, 0x6e, 0x14, 0xb9, 0xbe, 0x5c, 0xd6, + 0xb8, 0xcc, 0x41, 0xbb, 0x21, 0x2e, 0x07, 0x78, 0xc4, 0xa6, 0x1e, 0xf1, 0x41, 0x01, 0x6d, 0x0b, + 0xbb, 0x87, 0xdb, 0x5b, 0xe5, 0x22, 0xa9, 0x77, 0x41, 0x7d, 0x88, 0x82, 0xb4, 0x1a, 0xc5, 0xd2, + 0x78, 0x2f, 0x44, 0x18, 0xda, 0x32, 0xad, 0xde, 0x03, 0x0b, 0x71, 0x82, 0x07, 0xfe, 0xa8, 0x6c, + 0x77, 0xb9, 0xc8, 0xf5, 0x76, 0xb5, 0x40, 0x3c, 0xce, 0x1f, 0x27, 0x0e, 0xbb, 0xdb, 0x93, 0x25, + 0x7f, 0x73, 0x99, 0x61, 0x00, 0xda, 0x16, 0xa2, 0xf8, 0xc1, 0xa3, 0x3f, 0x6c, 0xec, 0xef, 0xaa, + 0xbd, 0x57, 0x00, 0x78, 0x8e, 0x47, 0xff, 0xd8, 0x10, 0xac, 0x37, 0xa7, 0xe7, 0x9a, 0x72, 0x76, + 0xae, 0x29, 0x3f, 0xce, 0x35, 0xe5, 0xf8, 0x42, 0xab, 0x9d, 0x5d, 0x68, 0xb5, 0x6f, 0x17, 0x5a, + 0xed, 0xed, 0x13, 0xcf, 0x67, 0x87, 0xa9, 0x63, 0xb8, 0x24, 0x34, 0xa5, 0xd2, 0x46, 0x80, 0x1c, + 0x5a, 0x9e, 0xcd, 0xe1, 0x43, 0x73, 0x34, 0xfe, 0x54, 0x03, 0xec, 0x21, 0x37, 0x33, 0x87, 0x3b, + 0x26, 0xcb, 0x62, 0x4c, 0x9d, 0x05, 0xb1, 0x97, 0xdb, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x19, + 0x54, 0x19, 0x44, 0x7e, 0x05, 0x00, 0x00, } func (this *ChainLink) Equal(that interface{}) bool { diff --git a/x/profiles/legacy/v4/types/models_dtag_requests.pb.go b/x/profiles/legacy/v4/types/models_dtag_requests.pb.go index 55dcdb7917..a4d468aa0b 100644 --- a/x/profiles/legacy/v4/types/models_dtag_requests.pb.go +++ b/x/profiles/legacy/v4/types/models_dtag_requests.pb.go @@ -78,26 +78,26 @@ func init() { var fileDescriptor_08f2e5360e821c5e = []byte{ // 315 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd0, 0xbf, 0x4e, 0xc3, 0x30, - 0x10, 0x06, 0xf0, 0x18, 0xa4, 0x0a, 0x52, 0x2a, 0x44, 0x5a, 0x89, 0x8a, 0xc1, 0x46, 0x59, 0x80, - 0x81, 0x58, 0xe5, 0xcf, 0x52, 0xb6, 0x8a, 0x8d, 0x2d, 0x2a, 0x0b, 0x4b, 0xe5, 0x34, 0x57, 0x53, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd0, 0xb1, 0x4e, 0xc3, 0x30, + 0x10, 0x06, 0xe0, 0x18, 0xa4, 0x0a, 0x52, 0x2a, 0x44, 0x5a, 0x89, 0x8a, 0xc1, 0x46, 0x59, 0x80, + 0x81, 0x58, 0x05, 0xc4, 0x50, 0xb6, 0x8a, 0x8d, 0x2d, 0x2a, 0x0b, 0x4b, 0xe5, 0x34, 0x57, 0x53, 0x29, 0xa9, 0x8b, 0xed, 0x46, 0xf4, 0x0d, 0x18, 0x19, 0x19, 0xfb, 0x38, 0x0c, 0x0c, 0x1d, 0x99, - 0x22, 0x94, 0x2e, 0xcc, 0x7d, 0x02, 0x14, 0x3b, 0x05, 0xb1, 0x9d, 0xcf, 0xbf, 0xef, 0x86, 0xcf, - 0xbd, 0x88, 0x41, 0xa5, 0x42, 0xd1, 0xa9, 0x14, 0xa3, 0x71, 0x02, 0x8a, 0x66, 0x9d, 0x08, 0x34, - 0xeb, 0xd0, 0x54, 0xc4, 0x90, 0xa8, 0x41, 0xac, 0x19, 0x1f, 0x48, 0x78, 0x9a, 0x81, 0xd2, 0x2a, - 0x98, 0x4a, 0xa1, 0x85, 0x77, 0x68, 0x33, 0xc1, 0x26, 0x13, 0x54, 0x99, 0xa3, 0x16, 0x17, 0x5c, - 0x18, 0x43, 0xcb, 0xc9, 0x72, 0xff, 0x03, 0xb9, 0xcd, 0xdb, 0x3e, 0xe3, 0x7d, 0xc9, 0x26, 0x6a, - 0x04, 0x32, 0xb4, 0xd7, 0xbc, 0x3b, 0xb7, 0x61, 0xae, 0x6b, 0x31, 0xd0, 0x92, 0xc5, 0xd0, 0x46, - 0xc7, 0xe8, 0x74, 0xb7, 0x77, 0x52, 0xe4, 0xa4, 0x6e, 0xbc, 0xe8, 0x97, 0xeb, 0x75, 0x4e, 0x5a, - 0x73, 0x96, 0x26, 0x5d, 0xff, 0x9f, 0xf6, 0xc3, 0x7a, 0xf9, 0xae, 0x90, 0x77, 0xe6, 0xd6, 0x14, - 0x4c, 0x62, 0x90, 0xed, 0x2d, 0x73, 0xe5, 0x60, 0x9d, 0x93, 0x86, 0x8d, 0xd9, 0xbd, 0x1f, 0x56, - 0xc0, 0xa3, 0xee, 0x8e, 0x84, 0x21, 0x8c, 0x33, 0x90, 0xed, 0x6d, 0x83, 0x9b, 0xeb, 0x9c, 0xec, - 0x5b, 0xbc, 0xf9, 0xf1, 0xc3, 0x5f, 0xd4, 0xdd, 0x7b, 0x59, 0x10, 0xe7, 0x6d, 0x41, 0xd0, 0xf7, - 0x82, 0xa0, 0xde, 0xfd, 0x7b, 0x81, 0xd1, 0xb2, 0xc0, 0xe8, 0xab, 0xc0, 0xe8, 0x75, 0x85, 0x9d, - 0xe5, 0x0a, 0x3b, 0x9f, 0x2b, 0xec, 0x3c, 0xdc, 0xf0, 0xb1, 0x7e, 0x9c, 0x45, 0xc1, 0x50, 0xa4, - 0xd4, 0x56, 0x74, 0x9e, 0xb0, 0x48, 0x55, 0x33, 0xcd, 0xae, 0xe9, 0xf3, 0x5f, 0xcf, 0x09, 0x70, - 0x36, 0x9c, 0xd3, 0xec, 0x8a, 0xea, 0xf9, 0x14, 0x54, 0x54, 0x33, 0x65, 0x5d, 0xfe, 0x04, 0x00, - 0x00, 0xff, 0xff, 0x09, 0xe3, 0xd1, 0xf0, 0x91, 0x01, 0x00, 0x00, + 0x22, 0x94, 0x2e, 0xcc, 0x7d, 0x02, 0x14, 0x3b, 0x05, 0xb1, 0x9d, 0xcf, 0xdf, 0x7f, 0xc3, 0xef, + 0x5e, 0xc4, 0xa0, 0x52, 0xa1, 0xe8, 0x54, 0x8a, 0xd1, 0x38, 0x01, 0x45, 0xb3, 0x4e, 0x04, 0x9a, + 0x75, 0x68, 0x2a, 0x62, 0x48, 0xd4, 0x20, 0xd6, 0x8c, 0x0f, 0x24, 0x3c, 0xcd, 0x40, 0x69, 0x15, + 0x4c, 0xa5, 0xd0, 0xc2, 0x3b, 0xb4, 0x99, 0x60, 0x93, 0x09, 0xaa, 0xcc, 0x51, 0x8b, 0x0b, 0x2e, + 0x8c, 0xa1, 0xe5, 0x64, 0xb9, 0xff, 0x81, 0xdc, 0xe6, 0x6d, 0x9f, 0xf1, 0xbe, 0x64, 0x13, 0x35, + 0x02, 0x19, 0xda, 0x6b, 0xde, 0x9d, 0xdb, 0x30, 0xd7, 0xb5, 0x18, 0x68, 0xc9, 0x62, 0x68, 0xa3, + 0x63, 0x74, 0xba, 0xdb, 0x3b, 0x29, 0x72, 0x52, 0x37, 0x5e, 0xf4, 0xcb, 0xf5, 0x3a, 0x27, 0xad, + 0x39, 0x4b, 0x93, 0xae, 0xff, 0x4f, 0xfb, 0x61, 0xbd, 0x7c, 0x57, 0xc8, 0x3b, 0x73, 0x6b, 0x0a, + 0x26, 0x31, 0xc8, 0xf6, 0x96, 0xb9, 0x72, 0xb0, 0xce, 0x49, 0xc3, 0xc6, 0xec, 0xde, 0x0f, 0x2b, + 0xe0, 0x51, 0x77, 0x47, 0xc2, 0x10, 0xc6, 0x19, 0xc8, 0xf6, 0xb6, 0xc1, 0xcd, 0x75, 0x4e, 0xf6, + 0x2d, 0xde, 0xfc, 0xf8, 0xe1, 0x2f, 0xea, 0xee, 0xbd, 0x2c, 0x88, 0xf3, 0xb6, 0x20, 0xe8, 0x7b, + 0x41, 0x50, 0xef, 0xfe, 0xbd, 0xc0, 0x68, 0x59, 0x60, 0xf4, 0x55, 0x60, 0xf4, 0xba, 0xc2, 0xce, + 0x72, 0x85, 0x9d, 0xcf, 0x15, 0x76, 0x1e, 0x6e, 0xf8, 0x58, 0x3f, 0xce, 0xa2, 0x60, 0x28, 0x52, + 0x6a, 0x2b, 0x3a, 0x4f, 0x58, 0xa4, 0xaa, 0x99, 0x66, 0xd7, 0xf4, 0xf9, 0xaf, 0xe7, 0x04, 0x38, + 0x1b, 0xce, 0x69, 0x76, 0x45, 0xf5, 0x7c, 0x0a, 0x2a, 0xaa, 0x99, 0xb2, 0x2e, 0x7f, 0x02, 0x00, + 0x00, 0xff, 0xff, 0xf7, 0x98, 0x31, 0x94, 0x91, 0x01, 0x00, 0x00, } func (this *DTagTransferRequest) Equal(that interface{}) bool { diff --git a/x/profiles/legacy/v4/types/models_profile.go b/x/profiles/legacy/v4/types/models_profile.go index 5cccc296d8..c223da3f44 100644 --- a/x/profiles/legacy/v4/types/models_profile.go +++ b/x/profiles/legacy/v4/types/models_profile.go @@ -12,20 +12,19 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/ghodss/yaml" "github.com/gogo/protobuf/proto" ) var ( - _ authtypes.AccountI = (*Profile)(nil) + _ sdk.AccountI = (*Profile)(nil) _ exported.VestingAccount = (*Profile)(nil) ) // NewProfile builds a new profile having the given DTag, creator and creation date func NewProfile( dTag string, nickname, bio string, pictures Pictures, creationDate time.Time, - account authtypes.AccountI, + account sdk.AccountI, ) (*Profile, error) { // Make sure myAccount is a proto.Message, e.g. a BaseAccount etc. protoAccount, ok := account.(proto.Message) @@ -48,9 +47,9 @@ func NewProfile( }, nil } -// GetAccount returns the underlying account as an authtypes.AccountI instance -func (p *Profile) GetAccount() authtypes.AccountI { - return p.Account.GetCachedValue().(authtypes.AccountI) +// GetAccount returns the underlying account as an sdk.AccountI instance +func (p *Profile) GetAccount() sdk.AccountI { + return p.Account.GetCachedValue().(sdk.AccountI) } // getVestingAccount returns the underlying account as an exported.VestingAccount instance @@ -64,7 +63,7 @@ func (p *Profile) getVestingAccount() exported.VestingAccount { // setAccount sets the given account as the underlying account instance. // This should be called after updating anything about the account (eg. after calling SetSequence). -func (p *Profile) setAccount(account authtypes.AccountI) error { +func (p *Profile) setAccount(account sdk.AccountI) error { accAny, err := codectypes.NewAnyWithValue(account) if err != nil { return err @@ -74,12 +73,12 @@ func (p *Profile) setAccount(account authtypes.AccountI) error { return nil } -// GetAddress implements authtypes.AccountI +// GetAddress implements sdk.AccountI func (p *Profile) GetAddress() sdk.AccAddress { return p.GetAccount().GetAddress() } -// SetAddress implements authtypes.AccountI +// SetAddress implements sdk.AccountI func (p *Profile) SetAddress(addr sdk.AccAddress) error { acc := p.GetAccount() err := acc.SetAddress(addr) @@ -90,12 +89,12 @@ func (p *Profile) SetAddress(addr sdk.AccAddress) error { return p.setAccount(acc) } -// GetPubKey implements authtypes.AccountI +// GetPubKey implements sdk.AccountI func (p *Profile) GetPubKey() cryptotypes.PubKey { return p.GetAccount().GetPubKey() } -// SetPubKey implements authtypes.AccountI +// SetPubKey implements sdk.AccountI func (p *Profile) SetPubKey(pubKey cryptotypes.PubKey) error { acc := p.GetAccount() err := acc.SetPubKey(pubKey) @@ -106,12 +105,12 @@ func (p *Profile) SetPubKey(pubKey cryptotypes.PubKey) error { return p.setAccount(acc) } -// GetAccountNumber implements authtypes.AccountI +// GetAccountNumber implements sdk.AccountI func (p *Profile) GetAccountNumber() uint64 { return p.GetAccount().GetAccountNumber() } -// SetAccountNumber implements authtypes.AccountI +// SetAccountNumber implements sdk.AccountI func (p *Profile) SetAccountNumber(accountNumber uint64) error { acc := p.GetAccount() err := acc.SetAccountNumber(accountNumber) @@ -122,12 +121,12 @@ func (p *Profile) SetAccountNumber(accountNumber uint64) error { return p.setAccount(acc) } -// GetSequence implements authtypes.AccountI +// GetSequence implements sdk.AccountI func (p *Profile) GetSequence() uint64 { return p.GetAccount().GetSequence() } -// SetSequence implements authtypes.AccountI +// SetSequence implements sdk.AccountI func (p *Profile) SetSequence(sequence uint64) error { acc := p.GetAccount() err := acc.SetSequence(sequence) @@ -241,7 +240,7 @@ func (p *Profile) GetDelegatedVesting() sdk.Coins { // UnpackInterfaces implements codectypes.UnpackInterfacesMessage func (p *Profile) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { if p.Account != nil { - var account authtypes.AccountI + var account sdk.AccountI err := unpacker.UnpackAny(p.Account, &account) if err != nil { return err @@ -265,7 +264,7 @@ type profilePretty struct { CreationDate time.Time `json:"creation_date" yaml:"creation_date"` } -// String implements authtypes.AccountIย implements stringer +// String implements sdk.AccountIย implements stringer func (p *Profile) String() string { out, _ := p.MarshalYAML() return out.(string) diff --git a/x/profiles/legacy/v4/types/models_profile.pb.go b/x/profiles/legacy/v4/types/models_profile.pb.go index f8fabd76e6..7b6f4666c1 100644 --- a/x/profiles/legacy/v4/types/models_profile.pb.go +++ b/x/profiles/legacy/v4/types/models_profile.pb.go @@ -144,38 +144,38 @@ func init() { var fileDescriptor_a19232e029005b86 = []byte{ // 503 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x3f, 0x6f, 0xd3, 0x40, - 0x18, 0xc6, 0x6d, 0x92, 0x36, 0xe9, 0xb5, 0x14, 0x74, 0x44, 0x8a, 0x89, 0x90, 0x2f, 0xdc, 0x80, - 0x2a, 0xd1, 0xde, 0xa9, 0xfc, 0x59, 0xc2, 0x54, 0xab, 0x0b, 0x5b, 0x64, 0x15, 0x06, 0x96, 0xe8, - 0xec, 0x5c, 0x5d, 0x83, 0xed, 0x8b, 0xe2, 0x4b, 0x44, 0xbe, 0x01, 0x63, 0xc7, 0x8e, 0xfe, 0x10, - 0x7c, 0x88, 0x8a, 0xa9, 0x23, 0x93, 0x41, 0xc9, 0xc2, 0xec, 0x4f, 0x80, 0xec, 0xbb, 0x6b, 0x05, - 0x88, 0xed, 0xee, 0x7d, 0x7e, 0xef, 0xf3, 0xbe, 0x7e, 0xce, 0xe0, 0x70, 0xca, 0xf3, 0x54, 0xe4, - 0x74, 0x36, 0x17, 0xe7, 0x71, 0xc2, 0x73, 0xba, 0x3c, 0x0e, 0xb8, 0x64, 0xc7, 0x34, 0x15, 0x53, - 0x9e, 0xe4, 0x13, 0x5d, 0x27, 0xb3, 0xb9, 0x90, 0x02, 0xf6, 0x15, 0x4d, 0x0c, 0x4d, 0x34, 0x3d, - 0xe8, 0x45, 0x22, 0x12, 0x0d, 0x43, 0xeb, 0x93, 0xc2, 0x07, 0x8f, 0x23, 0x21, 0xa2, 0x84, 0xd3, - 0xe6, 0x16, 0x2c, 0xce, 0x29, 0xcb, 0x56, 0x5a, 0x42, 0x7f, 0x4b, 0x32, 0x4e, 0x79, 0x2e, 0x59, - 0x3a, 0x33, 0xbd, 0xa1, 0xa8, 0x47, 0x4d, 0x94, 0xa9, 0xba, 0x28, 0x09, 0x17, 0x2d, 0xd0, 0x19, - 0xab, 0x0d, 0xe0, 0x18, 0x74, 0x58, 0x18, 0x8a, 0x45, 0x26, 0x1d, 0x7b, 0x68, 0x1f, 0xec, 0xbe, - 0xe8, 0x11, 0xe5, 0x4c, 0x8c, 0x33, 0x39, 0xc9, 0x56, 0xde, 0xf0, 0xdb, 0xd7, 0xa3, 0x27, 0xda, - 0x84, 0x2d, 0xe4, 0x85, 0x59, 0x9c, 0x9c, 0xa8, 0xe6, 0xb7, 0xbe, 0xb1, 0x81, 0xcf, 0x41, 0x7b, - 0x2a, 0x59, 0xe4, 0xdc, 0x1b, 0xda, 0x07, 0x3b, 0x5e, 0x7f, 0x5d, 0xa2, 0xf6, 0xe9, 0x19, 0x8b, - 0xaa, 0x12, 0xed, 0xae, 0x58, 0x9a, 0x8c, 0x70, 0xad, 0x62, 0xbf, 0x81, 0x20, 0x05, 0xdd, 0x2c, - 0x0e, 0x3f, 0x65, 0x2c, 0xe5, 0x4e, 0xab, 0x69, 0x78, 0x54, 0x95, 0xe8, 0x81, 0x02, 0x8d, 0x82, - 0xfd, 0x5b, 0x08, 0x0e, 0x41, 0x2b, 0x88, 0x85, 0xd3, 0x6e, 0xd8, 0xfd, 0xaa, 0x44, 0x40, 0xb1, - 0x41, 0x2c, 0xb0, 0x5f, 0x4b, 0xf0, 0x3d, 0xe8, 0xce, 0xe2, 0x50, 0x2e, 0xe6, 0x3c, 0x77, 0xb6, - 0x9a, 0x4f, 0x7a, 0x4a, 0xfe, 0x13, 0x3b, 0x19, 0x6b, 0xd0, 0xeb, 0x5f, 0x97, 0xc8, 0xba, 0x9b, - 0x6c, 0x0c, 0xb0, 0x7f, 0xeb, 0x05, 0x19, 0xb8, 0x1f, 0xce, 0x39, 0x93, 0xb1, 0xc8, 0x26, 0x53, - 0x26, 0xb9, 0xb3, 0xdd, 0x98, 0x0f, 0xfe, 0xc9, 0xeb, 0xcc, 0xbc, 0x84, 0x37, 0xd4, 0xae, 0x3d, - 0xe5, 0xfa, 0x47, 0x3b, 0xbe, 0xfc, 0x81, 0x6c, 0x7f, 0xcf, 0xd4, 0x4e, 0x99, 0xe4, 0xa3, 0xee, - 0x97, 0x02, 0x59, 0x57, 0x05, 0xb2, 0xf0, 0x47, 0xd0, 0x35, 0xbb, 0xc1, 0x43, 0xd0, 0xd1, 0x8b, - 0x37, 0x4f, 0xb4, 0xe3, 0xc1, 0xaa, 0x44, 0xfb, 0x7a, 0x51, 0x25, 0x60, 0xdf, 0x20, 0xf0, 0x19, - 0xd8, 0x0a, 0xc5, 0x92, 0xcf, 0x75, 0xfe, 0x0f, 0xab, 0x12, 0xed, 0xe9, 0xf1, 0x75, 0x19, 0xfb, - 0x4a, 0x1e, 0x75, 0xaf, 0x0a, 0x64, 0xff, 0x2a, 0x90, 0xed, 0xbd, 0xbb, 0x5e, 0xbb, 0xf6, 0xcd, - 0xda, 0xb5, 0x7f, 0xae, 0x5d, 0xfb, 0x72, 0xe3, 0x5a, 0x37, 0x1b, 0xd7, 0xfa, 0xbe, 0x71, 0xad, - 0x0f, 0x6f, 0xa2, 0x58, 0x5e, 0x2c, 0x02, 0x12, 0x8a, 0x94, 0xaa, 0x08, 0x8f, 0x12, 0x16, 0xe4, - 0xfa, 0x4c, 0x97, 0xaf, 0xe9, 0xe7, 0xbb, 0x1f, 0x3f, 0xe1, 0x11, 0x0b, 0x57, 0x74, 0xf9, 0x8a, - 0xca, 0xd5, 0x8c, 0xe7, 0xc1, 0x76, 0x13, 0xc8, 0xcb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8c, - 0x04, 0xd9, 0xcf, 0x22, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xb1, 0x6e, 0xd3, 0x40, + 0x18, 0xc7, 0x6d, 0x92, 0x36, 0xe9, 0xb5, 0x14, 0x74, 0x44, 0x8a, 0x89, 0x90, 0x2f, 0xdc, 0x80, + 0x2a, 0xd1, 0xde, 0xa9, 0x80, 0x18, 0xc2, 0x54, 0xab, 0x0b, 0x5b, 0x64, 0x15, 0x06, 0x96, 0xe8, + 0xec, 0x5c, 0x5d, 0x83, 0xed, 0x8b, 0xe2, 0x4b, 0x44, 0xde, 0x80, 0xb1, 0x63, 0x47, 0x3f, 0x04, + 0x0f, 0x51, 0x31, 0x75, 0x64, 0x32, 0x28, 0x59, 0x98, 0xfd, 0x04, 0xc8, 0xbe, 0xbb, 0x56, 0x80, + 0xd8, 0xee, 0xbe, 0xff, 0xef, 0xfb, 0x7f, 0x9f, 0xff, 0x67, 0x70, 0x38, 0xe5, 0x79, 0x2a, 0x72, + 0x3a, 0x9b, 0x8b, 0xf3, 0x38, 0xe1, 0x39, 0x5d, 0x1e, 0x07, 0x5c, 0xb2, 0x63, 0x9a, 0x8a, 0x29, + 0x4f, 0xf2, 0x89, 0xae, 0x93, 0xd9, 0x5c, 0x48, 0x01, 0xfb, 0x8a, 0x26, 0x86, 0x26, 0x9a, 0x1e, + 0xf4, 0x22, 0x11, 0x89, 0x86, 0xa1, 0xf5, 0x49, 0xe1, 0x83, 0xc7, 0x91, 0x10, 0x51, 0xc2, 0x69, + 0x73, 0x0b, 0x16, 0xe7, 0x94, 0x65, 0x2b, 0x2d, 0xa1, 0xbf, 0x25, 0x19, 0xa7, 0x3c, 0x97, 0x2c, + 0x9d, 0x99, 0xde, 0x50, 0xd4, 0xa3, 0x26, 0xca, 0x54, 0x5d, 0x94, 0x84, 0x8b, 0x16, 0xe8, 0x8c, + 0xd5, 0x06, 0x70, 0x0c, 0x3a, 0x2c, 0x0c, 0xc5, 0x22, 0x93, 0x8e, 0x3d, 0xb4, 0x0f, 0x76, 0x5f, + 0xf4, 0x88, 0x72, 0x26, 0xc6, 0x99, 0x9c, 0x64, 0x2b, 0x6f, 0xf8, 0xed, 0xeb, 0xd1, 0x13, 0x6d, + 0xc2, 0x16, 0xf2, 0xc2, 0x2c, 0x4e, 0x4e, 0x54, 0xf3, 0x5b, 0xdf, 0xd8, 0xc0, 0xe7, 0xa0, 0x3d, + 0x95, 0x2c, 0x72, 0xee, 0x0d, 0xed, 0x83, 0x1d, 0xaf, 0xbf, 0x2e, 0x51, 0xfb, 0xf4, 0x8c, 0x45, + 0x55, 0x89, 0x76, 0x57, 0x2c, 0x4d, 0x46, 0xb8, 0x56, 0xb1, 0xdf, 0x40, 0x90, 0x82, 0x6e, 0x16, + 0x87, 0x9f, 0x32, 0x96, 0x72, 0xa7, 0xd5, 0x34, 0x3c, 0xaa, 0x4a, 0xf4, 0x40, 0x81, 0x46, 0xc1, + 0xfe, 0x2d, 0x04, 0x87, 0xa0, 0x15, 0xc4, 0xc2, 0x69, 0x37, 0xec, 0x7e, 0x55, 0x22, 0xa0, 0xd8, + 0x20, 0x16, 0xd8, 0xaf, 0x25, 0xf8, 0x1e, 0x74, 0x67, 0x71, 0x28, 0x17, 0x73, 0x9e, 0x3b, 0x5b, + 0xcd, 0x27, 0x3d, 0x25, 0xff, 0x89, 0x9d, 0x8c, 0x35, 0xe8, 0xf5, 0xaf, 0x4b, 0x64, 0xdd, 0x4d, + 0x36, 0x06, 0xd8, 0xbf, 0xf5, 0x82, 0x0c, 0xdc, 0x0f, 0xe7, 0x9c, 0xc9, 0x58, 0x64, 0x93, 0x29, + 0x93, 0xdc, 0xd9, 0x6e, 0xcc, 0x07, 0xff, 0xe4, 0x75, 0x66, 0x5e, 0xc2, 0x1b, 0x6a, 0xd7, 0x9e, + 0x72, 0xfd, 0xa3, 0x1d, 0x5f, 0xfe, 0x40, 0xb6, 0xbf, 0x67, 0x6a, 0xa7, 0x4c, 0xf2, 0x51, 0xf7, + 0x4b, 0x81, 0xac, 0xab, 0x02, 0x59, 0xf8, 0x23, 0xe8, 0x9a, 0xdd, 0xe0, 0x21, 0xe8, 0xe8, 0xc5, + 0x9b, 0x27, 0xda, 0xf1, 0x60, 0x55, 0xa2, 0x7d, 0xbd, 0xa8, 0x12, 0xb0, 0x6f, 0x10, 0xf8, 0x0c, + 0x6c, 0x85, 0x62, 0xc9, 0xe7, 0x3a, 0xff, 0x87, 0x55, 0x89, 0xf6, 0xf4, 0xf8, 0xba, 0x8c, 0x7d, + 0x25, 0x8f, 0xba, 0x57, 0x05, 0xb2, 0x7f, 0x15, 0xc8, 0xf6, 0xde, 0x5d, 0xaf, 0x5d, 0xfb, 0x66, + 0xed, 0xda, 0x3f, 0xd7, 0xae, 0x7d, 0xb9, 0x71, 0xad, 0x9b, 0x8d, 0x6b, 0x7d, 0xdf, 0xb8, 0xd6, + 0x87, 0x37, 0x51, 0x2c, 0x2f, 0x16, 0x01, 0x09, 0x45, 0x4a, 0x55, 0x84, 0x47, 0x09, 0x0b, 0x72, + 0x7d, 0xa6, 0xcb, 0xd7, 0xf4, 0xf3, 0xdd, 0x8f, 0x9f, 0xf0, 0x88, 0x85, 0x2b, 0xba, 0x7c, 0x45, + 0xe5, 0x6a, 0xc6, 0xf3, 0x60, 0xbb, 0x09, 0xe4, 0xe5, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x72, + 0x7f, 0x39, 0xab, 0x22, 0x03, 0x00, 0x00, } func (this *Pictures) Equal(that interface{}) bool { diff --git a/x/profiles/legacy/v4/types/models_relationships.pb.go b/x/profiles/legacy/v4/types/models_relationships.pb.go index 487d3de6fc..45aaab148e 100644 --- a/x/profiles/legacy/v4/types/models_relationships.pb.go +++ b/x/profiles/legacy/v4/types/models_relationships.pb.go @@ -170,30 +170,30 @@ func init() { } var fileDescriptor_47c7d48489f1a7d0 = []byte{ - // 367 bytes of a gzipped FileDescriptorProto + // 368 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0xbf, 0x4e, 0xeb, 0x30, 0x18, 0xc5, 0xeb, 0x7b, 0xaf, 0x7a, 0xa9, 0xf9, 0x1f, 0x55, 0xa2, 0x62, 0x48, 0xc0, 0x13, 0x48, - 0x10, 0xab, 0x05, 0x96, 0xb2, 0x45, 0x2c, 0x5d, 0x83, 0xba, 0xb0, 0x54, 0x4e, 0x62, 0xd2, 0x88, - 0xa4, 0x8e, 0x6c, 0xb7, 0xa2, 0x6f, 0xc1, 0xc8, 0xd8, 0x27, 0x61, 0x66, 0xec, 0xc8, 0x14, 0x55, - 0xe9, 0xc2, 0x9c, 0x27, 0x40, 0x49, 0x9c, 0x16, 0x01, 0x1b, 0xdb, 0x91, 0xbf, 0xdf, 0xf9, 0x74, - 0x8e, 0xfc, 0xc1, 0x8e, 0x47, 0x45, 0xc4, 0x04, 0x8e, 0x39, 0xbb, 0x0f, 0x42, 0x2a, 0xf0, 0xa4, - 0xed, 0x50, 0x49, 0xda, 0x38, 0x62, 0x1e, 0x0d, 0xc5, 0x80, 0xd3, 0x90, 0xc8, 0x80, 0x8d, 0xc4, - 0x30, 0x88, 0x85, 0x19, 0x73, 0x26, 0x99, 0x76, 0x50, 0x7a, 0xcc, 0xca, 0x63, 0x2a, 0xcf, 0x61, - 0xd3, 0x67, 0x3e, 0x2b, 0x18, 0x9c, 0xab, 0x12, 0x47, 0x2f, 0x00, 0x6e, 0xd9, 0x9f, 0xd6, 0x68, - 0x67, 0xf0, 0xbf, 0xcb, 0x29, 0x91, 0x8c, 0xb7, 0xc0, 0x11, 0x38, 0x69, 0x58, 0x5a, 0x96, 0x18, - 0x3b, 0x53, 0x12, 0x85, 0x5d, 0xa4, 0x06, 0xc8, 0xae, 0x10, 0xad, 0x03, 0x1b, 0x9c, 0xba, 0x41, - 0x1c, 0xd0, 0x91, 0x6c, 0xfd, 0x29, 0xf8, 0x66, 0x96, 0x18, 0x7b, 0x25, 0xbf, 0x1a, 0x21, 0x7b, - 0x8d, 0x69, 0x16, 0xdc, 0x14, 0x63, 0x47, 0xc4, 0xc4, 0xa5, 0x83, 0xc0, 0x6b, 0xfd, 0x2d, 0x5c, - 0xc7, 0x69, 0x62, 0xc0, 0x5b, 0xf5, 0xdc, 0xbb, 0xc9, 0x12, 0x63, 0xb7, 0xdc, 0x51, 0xa1, 0xc8, - 0x86, 0x95, 0xec, 0x79, 0xdd, 0x8d, 0xe7, 0x99, 0x01, 0xde, 0x67, 0x06, 0x40, 0x0b, 0x00, 0x1b, - 0x7d, 0x41, 0xb9, 0x15, 0x32, 0xf7, 0x21, 0x4f, 0xef, 0xe4, 0x82, 0xfe, 0x90, 0x5e, 0x0d, 0x90, - 0x5d, 0x21, 0x6b, 0xda, 0x53, 0xd9, 0xbf, 0xd1, 0xde, 0x8a, 0xf6, 0xb4, 0x53, 0x58, 0xe7, 0x94, - 0x08, 0x36, 0x52, 0x91, 0xf7, 0xb3, 0xc4, 0xd8, 0xae, 0x8a, 0xe6, 0xef, 0xc8, 0x56, 0xc0, 0xd7, - 0x8a, 0xff, 0x7e, 0x55, 0xd1, 0xea, 0xbf, 0xa6, 0x3a, 0x98, 0xa7, 0x3a, 0x58, 0xa4, 0x3a, 0x78, - 0x5a, 0xea, 0xb5, 0xf9, 0x52, 0xaf, 0xbd, 0x2d, 0xf5, 0xda, 0xdd, 0xb5, 0x1f, 0xc8, 0xe1, 0xd8, - 0x31, 0x5d, 0x16, 0xe1, 0xf2, 0xdf, 0xcf, 0x43, 0xe2, 0x08, 0xa5, 0xf1, 0xe4, 0x0a, 0x3f, 0xae, - 0x8f, 0x27, 0xa4, 0x3e, 0x71, 0xa7, 0x78, 0x72, 0x89, 0xe5, 0x34, 0xa6, 0xc2, 0xa9, 0x17, 0x17, - 0x70, 0xf1, 0x11, 0x00, 0x00, 0xff, 0xff, 0xe5, 0x56, 0x00, 0xbe, 0x66, 0x02, 0x00, 0x00, + 0x10, 0xab, 0x05, 0x31, 0x94, 0x2d, 0x62, 0xe9, 0x1a, 0xd4, 0x85, 0xa5, 0x72, 0x12, 0x93, 0x46, + 0x24, 0x75, 0x64, 0xbb, 0x15, 0x7d, 0x0b, 0x46, 0xc6, 0x3e, 0x09, 0x33, 0x63, 0x47, 0xa6, 0xa8, + 0x4a, 0x17, 0xe6, 0x3c, 0x01, 0x4a, 0xe2, 0xb4, 0x08, 0xd8, 0xd8, 0x8e, 0xfc, 0xfd, 0xce, 0xa7, + 0x73, 0xe4, 0x0f, 0x76, 0x3c, 0x2a, 0x22, 0x26, 0x70, 0xcc, 0xd9, 0x7d, 0x10, 0x52, 0x81, 0x27, + 0x6d, 0x87, 0x4a, 0xd2, 0xc6, 0x11, 0xf3, 0x68, 0x28, 0x06, 0x9c, 0x86, 0x44, 0x06, 0x6c, 0x24, + 0x86, 0x41, 0x2c, 0xcc, 0x98, 0x33, 0xc9, 0xb4, 0x83, 0xd2, 0x63, 0x56, 0x1e, 0x53, 0x79, 0x0e, + 0x9b, 0x3e, 0xf3, 0x59, 0xc1, 0xe0, 0x5c, 0x95, 0x38, 0x7a, 0x01, 0x70, 0xcb, 0xfe, 0xb4, 0x46, + 0x3b, 0x83, 0xff, 0x5d, 0x4e, 0x89, 0x64, 0xbc, 0x05, 0x8e, 0xc0, 0x49, 0xc3, 0xd2, 0xb2, 0xc4, + 0xd8, 0x99, 0x92, 0x28, 0xec, 0x22, 0x35, 0x40, 0x76, 0x85, 0x68, 0x1d, 0xd8, 0xe0, 0xd4, 0x0d, + 0xe2, 0x80, 0x8e, 0x64, 0xeb, 0x4f, 0xc1, 0x37, 0xb3, 0xc4, 0xd8, 0x2b, 0xf9, 0xd5, 0x08, 0xd9, + 0x6b, 0x4c, 0xb3, 0xe0, 0xa6, 0x18, 0x3b, 0x22, 0x26, 0x2e, 0x1d, 0x04, 0x5e, 0xeb, 0x6f, 0xe1, + 0x3a, 0x4e, 0x13, 0x03, 0xde, 0xaa, 0xe7, 0xde, 0x4d, 0x96, 0x18, 0xbb, 0xe5, 0x8e, 0x0a, 0x45, + 0x36, 0xac, 0x64, 0xcf, 0xeb, 0x6e, 0x3c, 0xcf, 0x0c, 0xf0, 0x3e, 0x33, 0x00, 0x5a, 0x00, 0xd8, + 0xe8, 0x0b, 0xca, 0xad, 0x90, 0xb9, 0x0f, 0x79, 0x7a, 0x27, 0x17, 0xf4, 0x87, 0xf4, 0x6a, 0x80, + 0xec, 0x0a, 0x59, 0xd3, 0x9e, 0xca, 0xfe, 0x8d, 0xf6, 0x56, 0xb4, 0xa7, 0x9d, 0xc2, 0x3a, 0xa7, + 0x44, 0xb0, 0x91, 0x8a, 0xbc, 0x9f, 0x25, 0xc6, 0x76, 0x55, 0x34, 0x7f, 0x47, 0xb6, 0x02, 0xbe, + 0x56, 0xfc, 0xf7, 0xab, 0x8a, 0x56, 0xff, 0x35, 0xd5, 0xc1, 0x3c, 0xd5, 0xc1, 0x22, 0xd5, 0xc1, + 0xd3, 0x52, 0xaf, 0xcd, 0x97, 0x7a, 0xed, 0x6d, 0xa9, 0xd7, 0xee, 0xae, 0xfd, 0x40, 0x0e, 0xc7, + 0x8e, 0xe9, 0xb2, 0x08, 0x97, 0xff, 0x7e, 0x1e, 0x12, 0x47, 0x28, 0x8d, 0x27, 0x57, 0xf8, 0x71, + 0x7d, 0x3c, 0x21, 0xf5, 0x89, 0x3b, 0xc5, 0x93, 0x4b, 0x2c, 0xa7, 0x31, 0x15, 0x4e, 0xbd, 0xb8, + 0x80, 0x8b, 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x2d, 0xe0, 0xda, 0x66, 0x02, 0x00, 0x00, } func (this *Relationship) Equal(that interface{}) bool { diff --git a/x/profiles/legacy/v5/store.go b/x/profiles/legacy/v5/store.go index 42cf9ad3ee..a962b40468 100644 --- a/x/profiles/legacy/v5/store.go +++ b/x/profiles/legacy/v5/store.go @@ -1,9 +1,9 @@ package v5 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" v5types "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v5/types" @@ -36,7 +36,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar } // fixApplicationLinks fixes the application links by adding the missing owner keys -func fixApplicationLinks(store sdk.KVStore, cdc codec.BinaryCodec) error { +func fixApplicationLinks(store storetypes.KVStore, cdc codec.BinaryCodec) error { applicationLinksStore := prefix.NewStore(store, types.ApplicationLinkPrefix) applicationLinksIterator := applicationLinksStore.Iterator(nil, nil) @@ -61,7 +61,7 @@ func fixApplicationLinks(store sdk.KVStore, cdc codec.BinaryCodec) error { } // fixChainLinks fixes the chain links by adding the missing owner keys -func fixChainLinks(store sdk.KVStore, cdc codec.BinaryCodec, legacyAmino *codec.LegacyAmino) error { +func fixChainLinks(store storetypes.KVStore, cdc codec.BinaryCodec, legacyAmino *codec.LegacyAmino) error { chainLinkStore := prefix.NewStore(store, types.ChainLinksPrefix) chainLinksIterator := chainLinkStore.Iterator(nil, nil) diff --git a/x/profiles/legacy/v5/store_test.go b/x/profiles/legacy/v5/store_test.go index 2a9ea218b9..9d3db8d4e6 100644 --- a/x/profiles/legacy/v5/store_test.go +++ b/x/profiles/legacy/v5/store_test.go @@ -16,10 +16,11 @@ import ( "github.com/desmos-labs/desmos/v6/testutil/profilestesting" "github.com/desmos-labs/desmos/v6/x/profiles/types" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -29,9 +30,9 @@ func TestMigrateStore(t *testing.T) { cdc, legacyAmino := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(authtypes.StoreKey, types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(authtypes.StoreKey, types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) account := profilestesting.GetChainLinkAccount("cosmos", "cosmos") testCases := []struct { diff --git a/x/profiles/legacy/v5/types/codec.go b/x/profiles/legacy/v5/types/codec.go index 51739f2da7..b5511b979e 100644 --- a/x/profiles/legacy/v5/types/codec.go +++ b/x/profiles/legacy/v5/types/codec.go @@ -4,12 +4,12 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" ) func RegisterInterfaces(registry types.InterfaceRegistry) { - registry.RegisterImplementations((*authtypes.AccountI)(nil), &Profile{}) + registry.RegisterImplementations((*sdk.AccountI)(nil), &Profile{}) registry.RegisterImplementations((*exported.VestingAccount)(nil), &Profile{}) registry.RegisterInterface( "desmos.profiles.v2.AddressData", diff --git a/x/profiles/legacy/v5/types/models_app_links.pb.go b/x/profiles/legacy/v5/types/models_app_links.pb.go index bfcee3ef0f..3d9eb57764 100644 --- a/x/profiles/legacy/v5/types/models_app_links.pb.go +++ b/x/profiles/legacy/v5/types/models_app_links.pb.go @@ -452,68 +452,68 @@ func init() { } var fileDescriptor_c4a613de86d4edc0 = []byte{ - // 967 bytes of a gzipped FileDescriptorProto + // 969 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x4d, 0x6f, 0xdb, 0x46, - 0x14, 0x14, 0x25, 0x5a, 0x91, 0xd6, 0x71, 0xac, 0xae, 0xdd, 0x56, 0x20, 0x10, 0x91, 0xa6, 0x8b, - 0xc2, 0x49, 0x11, 0x12, 0x55, 0x51, 0xa0, 0x70, 0xd0, 0x02, 0xa2, 0x44, 0x23, 0x6c, 0x5d, 0x4b, - 0x58, 0xd1, 0x09, 0x90, 0x0b, 0xb1, 0x26, 0xd7, 0x2a, 0x11, 0x4a, 0x54, 0xf9, 0x61, 0xd4, 0x2d, + 0x14, 0x14, 0x25, 0x5a, 0xb1, 0xd6, 0xb1, 0xad, 0xae, 0xdd, 0x56, 0x20, 0x10, 0x91, 0xa6, 0x8b, + 0xc2, 0x49, 0x11, 0x12, 0x55, 0xd1, 0xa2, 0x70, 0xd0, 0x02, 0xa2, 0x44, 0x23, 0x6c, 0x5d, 0x5b, + 0x58, 0xd1, 0x09, 0x90, 0x0b, 0xb1, 0x26, 0xd7, 0x2a, 0x11, 0x4a, 0x54, 0xf9, 0x21, 0xd4, 0x2d, 0x7a, 0x0f, 0x7c, 0xca, 0x1f, 0x30, 0x10, 0xa0, 0x7f, 0xa2, 0xb7, 0x1e, 0x7a, 0xc9, 0x31, 0xc7, - 0x9e, 0xd8, 0x42, 0xbe, 0xe4, 0xac, 0x5f, 0x50, 0x70, 0x97, 0x94, 0xe4, 0x5a, 0x4a, 0x02, 0xf4, - 0x46, 0xbd, 0x37, 0x33, 0x6f, 0x76, 0xe7, 0x61, 0x05, 0xee, 0x39, 0x24, 0x1c, 0xfa, 0xa1, 0x3a, - 0x0e, 0xfc, 0x53, 0xd7, 0x23, 0xa1, 0x7a, 0xd6, 0x54, 0x87, 0xbe, 0x43, 0xbc, 0xd0, 0xc2, 0xe3, - 0xb1, 0xe5, 0xb9, 0xa3, 0x67, 0xa1, 0x32, 0x0e, 0xfc, 0xc8, 0x87, 0x90, 0x41, 0x95, 0x1c, 0xaa, - 0x9c, 0x35, 0x85, 0xed, 0x81, 0x3f, 0xf0, 0x69, 0x5b, 0x4d, 0xbf, 0x18, 0x52, 0x10, 0x07, 0xbe, - 0x3f, 0xf0, 0x88, 0x4a, 0x7f, 0x9d, 0xc4, 0xa7, 0x6a, 0xe4, 0x0e, 0x49, 0x18, 0xe1, 0xe1, 0x98, - 0x01, 0xe4, 0x37, 0x25, 0xb0, 0xd9, 0x1a, 0x8f, 0x3d, 0xd7, 0xc6, 0x91, 0xeb, 0x8f, 0x0e, 0xdd, - 0xd1, 0x33, 0xb8, 0x0b, 0xf8, 0x38, 0x24, 0x41, 0x9d, 0x93, 0xb8, 0xbd, 0xaa, 0xb6, 0x39, 0x4d, - 0xc4, 0xf5, 0x73, 0x3c, 0xf4, 0xf6, 0xe5, 0xb4, 0x2a, 0x23, 0xda, 0x84, 0x2d, 0xc0, 0x3b, 0x38, - 0xc2, 0xf5, 0xa2, 0xc4, 0xed, 0xad, 0x37, 0xeb, 0xca, 0x4d, 0x4b, 0x4a, 0x07, 0x47, 0x58, 0xdb, - 0x7a, 0x95, 0x88, 0x85, 0xb9, 0x44, 0xca, 0x91, 0x11, 0xa5, 0xc2, 0x1e, 0x58, 0x0b, 0x23, 0x1c, - 0x91, 0x7a, 0x49, 0xe2, 0xf6, 0xee, 0x34, 0xf7, 0x96, 0x69, 0xfc, 0xc7, 0x5b, 0x3f, 0xc5, 0x6b, - 0xb5, 0x69, 0x22, 0xde, 0x66, 0x7a, 0x54, 0x40, 0x46, 0x4c, 0x08, 0x0e, 0xc0, 0x1d, 0x3f, 0xc0, - 0xb6, 0x47, 0xac, 0x80, 0xfc, 0x18, 0x93, 0x30, 0xaa, 0xf3, 0xd4, 0xde, 0xce, 0x32, 0xe9, 0x2e, - 0x45, 0x22, 0x06, 0xd4, 0xee, 0x66, 0x3e, 0x3f, 0x64, 0xba, 0xd7, 0x65, 0x64, 0xb4, 0xe1, 0x2f, - 0xa2, 0xa1, 0x0e, 0xca, 0x01, 0x09, 0x63, 0x2f, 0xaa, 0xaf, 0xd1, 0x01, 0xc2, 0xb2, 0x01, 0x88, - 0x22, 0xb4, 0x0f, 0xa6, 0x89, 0xb8, 0xc1, 0x54, 0x19, 0x47, 0x46, 0x19, 0x19, 0x62, 0xb0, 0x61, - 0x07, 0x84, 0x9e, 0xce, 0x4a, 0x93, 0xa9, 0x97, 0x33, 0x35, 0x16, 0x9b, 0x92, 0xc7, 0xa6, 0x98, - 0x79, 0x6c, 0x9a, 0x94, 0xf9, 0xdc, 0x66, 0x8a, 0xd7, 0xe8, 0xf2, 0x8b, 0xbf, 0x45, 0x0e, 0xdd, - 0xce, 0x6b, 0x29, 0x69, 0xbf, 0xf2, 0xfc, 0xa5, 0x58, 0x78, 0xf3, 0x52, 0xe4, 0xe4, 0x5f, 0x00, - 0x9f, 0x26, 0x02, 0xbf, 0x02, 0xeb, 0x78, 0x7e, 0xab, 0x59, 0xca, 0x1f, 0x4d, 0x13, 0x11, 0x32, - 0xc9, 0x85, 0xa6, 0x8c, 0x16, 0xa1, 0x50, 0x05, 0x95, 0x34, 0xfb, 0x11, 0x1e, 0x12, 0x9a, 0x7b, - 0x55, 0xdb, 0x9a, 0x26, 0xe2, 0xe6, 0x7c, 0x39, 0xd2, 0x8e, 0x8c, 0x66, 0xa0, 0x85, 0xe1, 0xbf, - 0x97, 0xc0, 0xc6, 0xb5, 0x0b, 0x87, 0xbb, 0xa0, 0xe8, 0x3a, 0x74, 0x3a, 0xaf, 0x6d, 0x4d, 0x12, - 0xb1, 0x68, 0x74, 0xa6, 0x89, 0x58, 0x65, 0x62, 0xae, 0x23, 0xa3, 0xa2, 0xeb, 0xc0, 0x27, 0xa0, - 0x96, 0x25, 0x11, 0xda, 0x81, 0x3b, 0x8e, 0x2c, 0xd7, 0xa1, 0x93, 0x79, 0xed, 0xc1, 0x24, 0x11, - 0xef, 0x30, 0xc5, 0x3e, 0x6d, 0x51, 0xfa, 0xc7, 0xd7, 0xd2, 0x9b, 0x71, 0x64, 0x94, 0xed, 0x45, - 0x06, 0x75, 0x20, 0x06, 0x55, 0x1b, 0x7b, 0x9e, 0x45, 0x77, 0xb8, 0x44, 0x6f, 0xfd, 0xfe, 0x3b, - 0x97, 0x44, 0x69, 0x63, 0xcf, 0xa3, 0x5b, 0x5d, 0xcf, 0x52, 0xa8, 0x65, 0x29, 0xe4, 0x52, 0x32, - 0xaa, 0xd8, 0x19, 0x06, 0x7e, 0x0d, 0xaa, 0xb6, 0xe7, 0x92, 0x11, 0x35, 0xcd, 0xd3, 0xeb, 0x92, - 0x26, 0x89, 0x58, 0x69, 0xd3, 0x22, 0xb5, 0x9b, 0xd3, 0x73, 0x58, 0x4a, 0x67, 0x5d, 0x47, 0xf8, - 0x15, 0x54, 0xf2, 0x71, 0xff, 0x23, 0xb2, 0xcf, 0x17, 0xcf, 0xc9, 0x32, 0xdb, 0x7e, 0xbb, 0xef, - 0x7d, 0x3e, 0x0d, 0x6c, 0x21, 0xba, 0x3f, 0x8b, 0xa0, 0xcc, 0x56, 0x19, 0x7e, 0x03, 0x6e, 0x85, - 0xb1, 0x6d, 0x93, 0x30, 0xa4, 0x1e, 0xd6, 0x9b, 0xf2, 0xea, 0xbd, 0x57, 0xfa, 0x0c, 0xf9, 0xa8, - 0x80, 0x72, 0x12, 0x7c, 0x08, 0xca, 0xa7, 0xd8, 0xf5, 0x88, 0x93, 0x3d, 0x1b, 0x3b, 0x6f, 0xa1, - 0x1f, 0x50, 0xe0, 0xa3, 0x02, 0xca, 0x28, 0x82, 0x0f, 0x6e, 0x65, 0x92, 0xf0, 0x53, 0xb0, 0x76, - 0x86, 0xbd, 0x98, 0x64, 0x37, 0xb1, 0xf0, 0x1e, 0xd0, 0xb2, 0x8c, 0x58, 0x1b, 0x36, 0x41, 0x35, - 0x74, 0x07, 0x23, 0x1c, 0xc5, 0x01, 0xb9, 0x79, 0xfa, 0x59, 0x4b, 0x46, 0x73, 0xd8, 0xfc, 0xe0, - 0xc2, 0x3e, 0x28, 0x33, 0x13, 0xe9, 0x3c, 0x12, 0x04, 0x7e, 0x70, 0x73, 0x1e, 0x2d, 0xcb, 0x88, - 0xb5, 0xe7, 0xdc, 0xf9, 0x97, 0xb6, 0x06, 0x4a, 0x61, 0x3c, 0xbc, 0xff, 0x47, 0x09, 0x6c, 0x2f, - 0x7b, 0xcc, 0xe0, 0x13, 0xa0, 0xb4, 0x7a, 0xbd, 0x43, 0xa3, 0xdd, 0x32, 0x8d, 0xee, 0x91, 0x75, - 0x68, 0x1c, 0x7d, 0x67, 0xf5, 0xcd, 0x96, 0xa9, 0x5b, 0xc6, 0x91, 0x61, 0x1a, 0xad, 0x43, 0xe3, - 0xa9, 0xde, 0xb1, 0x8e, 0x8f, 0xfa, 0x3d, 0xbd, 0x6d, 0x1c, 0x18, 0x7a, 0xa7, 0x56, 0x10, 0x76, - 0x2f, 0x2e, 0x25, 0x71, 0x99, 0x9a, 0x31, 0x72, 0x23, 0x17, 0x7b, 0xee, 0xcf, 0xc4, 0x81, 0x26, - 0xf8, 0x6c, 0x85, 0xf0, 0x63, 0x1d, 0x19, 0x07, 0x79, 0xbd, 0x6f, 0xb6, 0x90, 0xa9, 0x77, 0x6a, - 0xdc, 0x4c, 0x75, 0xa6, 0xf6, 0x98, 0x04, 0xee, 0x69, 0x36, 0xa2, 0x1f, 0xe1, 0x20, 0x22, 0x0e, - 0xec, 0x81, 0x7b, 0xef, 0xa3, 0xaa, 0x23, 0xd4, 0x45, 0xb5, 0xa2, 0xb0, 0x73, 0x71, 0x29, 0xdd, - 0x5d, 0xa5, 0xa9, 0xa7, 0x97, 0xf6, 0xde, 0x3e, 0x8f, 0xdb, 0x6d, 0xbd, 0xdf, 0xaf, 0x95, 0xde, - 0xe1, 0x33, 0x5b, 0x91, 0x6f, 0x81, 0xb4, 0x42, 0xd5, 0x34, 0xbe, 0xd7, 0x3b, 0x56, 0xf7, 0xd8, - 0xac, 0xf1, 0xc2, 0x27, 0x17, 0x97, 0x92, 0xb4, 0x4a, 0x2a, 0x7d, 0x3f, 0x9d, 0x6e, 0x1c, 0x09, - 0xfc, 0xf3, 0xdf, 0x1a, 0x05, 0xed, 0xf8, 0xd5, 0xa4, 0xc1, 0xbd, 0x9e, 0x34, 0xb8, 0x7f, 0x26, - 0x0d, 0xee, 0xc5, 0x55, 0xa3, 0xf0, 0xfa, 0xaa, 0x51, 0xf8, 0xeb, 0xaa, 0x51, 0x78, 0xfa, 0x70, - 0xe0, 0x46, 0x3f, 0xc4, 0x27, 0x8a, 0xed, 0x0f, 0x55, 0xb6, 0xd0, 0x0f, 0x3c, 0x7c, 0x12, 0x66, - 0xdf, 0xea, 0xd9, 0x97, 0xea, 0x4f, 0xf3, 0xbf, 0x75, 0x8f, 0x0c, 0xb0, 0x7d, 0x9e, 0x16, 0xa3, - 0xf3, 0x31, 0x09, 0x4f, 0xca, 0xf4, 0x91, 0xff, 0xe2, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, - 0x8e, 0x48, 0x95, 0x00, 0x08, 0x00, 0x00, + 0x9e, 0xd8, 0x42, 0xbe, 0xe4, 0xac, 0x5f, 0x50, 0x70, 0x97, 0x94, 0xe4, 0x5a, 0x4a, 0x02, 0xe4, + 0x46, 0xed, 0x9b, 0x99, 0x37, 0xfb, 0xe6, 0x61, 0x05, 0xee, 0x3a, 0x24, 0xec, 0xfb, 0xa1, 0x3a, + 0x0c, 0xfc, 0x33, 0xd7, 0x23, 0xa1, 0x3a, 0x6a, 0xa8, 0x7d, 0xdf, 0x21, 0x5e, 0x68, 0xe1, 0xe1, + 0xd0, 0xf2, 0xdc, 0xc1, 0xd3, 0x50, 0x19, 0x06, 0x7e, 0xe4, 0x43, 0xc8, 0xa0, 0x4a, 0x0e, 0x55, + 0x46, 0x0d, 0x61, 0xbb, 0xe7, 0xf7, 0x7c, 0x5a, 0x56, 0xd3, 0x2f, 0x86, 0x14, 0xc4, 0x9e, 0xef, + 0xf7, 0x3c, 0xa2, 0xd2, 0x5f, 0xa7, 0xf1, 0x99, 0x1a, 0xb9, 0x7d, 0x12, 0x46, 0xb8, 0x3f, 0x64, + 0x00, 0xf9, 0x75, 0x09, 0x6c, 0x36, 0x87, 0x43, 0xcf, 0xb5, 0x71, 0xe4, 0xfa, 0x83, 0x43, 0x77, + 0xf0, 0x14, 0xee, 0x02, 0x3e, 0x0e, 0x49, 0x50, 0xe3, 0x24, 0x6e, 0xaf, 0xa2, 0x6d, 0x4e, 0x12, + 0x71, 0xed, 0x1c, 0xf7, 0xbd, 0x7d, 0x39, 0x3d, 0x95, 0x11, 0x2d, 0xc2, 0x26, 0xe0, 0x1d, 0x1c, + 0xe1, 0x5a, 0x51, 0xe2, 0xf6, 0xd6, 0x1a, 0x35, 0xe5, 0xa6, 0x25, 0xa5, 0x8d, 0x23, 0xac, 0x6d, + 0xbd, 0x4c, 0xc4, 0xc2, 0x4c, 0x22, 0xe5, 0xc8, 0x88, 0x52, 0x61, 0x07, 0xac, 0x84, 0x11, 0x8e, + 0x48, 0xad, 0x24, 0x71, 0x7b, 0x1b, 0x8d, 0xbd, 0x45, 0x1a, 0xff, 0xf3, 0xd6, 0x4d, 0xf1, 0x5a, + 0x75, 0x92, 0x88, 0xb7, 0x99, 0x1e, 0x15, 0x90, 0x11, 0x13, 0x82, 0x3d, 0xb0, 0xe1, 0x07, 0xd8, + 0xf6, 0x88, 0x15, 0x90, 0x9f, 0x62, 0x12, 0x46, 0x35, 0x9e, 0xda, 0xdb, 0x59, 0x24, 0x7d, 0x4c, + 0x91, 0x88, 0x01, 0xb5, 0x3b, 0x99, 0xcf, 0x0f, 0x99, 0xee, 0x75, 0x19, 0x19, 0xad, 0xfb, 0xf3, + 0x68, 0xa8, 0x83, 0x72, 0x40, 0xc2, 0xd8, 0x8b, 0x6a, 0x2b, 0xb4, 0x81, 0xb0, 0xa8, 0x01, 0xa2, + 0x08, 0xed, 0x83, 0x49, 0x22, 0xae, 0x33, 0x55, 0xc6, 0x91, 0x51, 0x46, 0x86, 0x18, 0xac, 0xdb, + 0x01, 0xa1, 0xb7, 0xb3, 0xd2, 0x64, 0x6a, 0xe5, 0x4c, 0x8d, 0xc5, 0xa6, 0xe4, 0xb1, 0x29, 0x66, + 0x1e, 0x9b, 0x26, 0x65, 0x3e, 0xb7, 0x99, 0xe2, 0x35, 0xba, 0xfc, 0xfc, 0x1f, 0x91, 0x43, 0xb7, + 0xf3, 0xb3, 0x94, 0xb4, 0xbf, 0xfa, 0xec, 0x85, 0x58, 0x78, 0xfd, 0x42, 0xe4, 0xe4, 0x5f, 0x01, + 0x9f, 0x26, 0x02, 0xbf, 0x06, 0x6b, 0x78, 0x36, 0xd5, 0x2c, 0xe5, 0x8f, 0x26, 0x89, 0x08, 0x99, + 0xe4, 0x5c, 0x51, 0x46, 0xf3, 0x50, 0xa8, 0x82, 0xd5, 0x34, 0xfb, 0x01, 0xee, 0x13, 0x9a, 0x7b, + 0x45, 0xdb, 0x9a, 0x24, 0xe2, 0xe6, 0x6c, 0x39, 0xd2, 0x8a, 0x8c, 0xa6, 0xa0, 0xb9, 0xe6, 0x7f, + 0x94, 0xc0, 0xfa, 0xb5, 0x81, 0xc3, 0x5d, 0x50, 0x74, 0x1d, 0xda, 0x9d, 0xd7, 0xb6, 0xc6, 0x89, + 0x58, 0x34, 0xda, 0x93, 0x44, 0xac, 0x30, 0x31, 0xd7, 0x91, 0x51, 0xd1, 0x75, 0xe0, 0x63, 0x50, + 0xcd, 0x92, 0x08, 0xed, 0xc0, 0x1d, 0x46, 0x96, 0xeb, 0xd0, 0xce, 0xbc, 0x76, 0x7f, 0x9c, 0x88, + 0x1b, 0x4c, 0xb1, 0x4b, 0x4b, 0x94, 0xfe, 0xf1, 0xb5, 0xf4, 0xa6, 0x1c, 0x19, 0x65, 0x7b, 0x91, + 0x41, 0x1d, 0x88, 0x41, 0xc5, 0xc6, 0x9e, 0x67, 0xd1, 0x1d, 0x2e, 0xd1, 0xa9, 0xdf, 0x7b, 0xeb, + 0x92, 0x28, 0x2d, 0xec, 0x79, 0x74, 0xab, 0x6b, 0x59, 0x0a, 0xd5, 0x2c, 0x85, 0x5c, 0x4a, 0x46, + 0xab, 0x76, 0x86, 0x81, 0xdf, 0x80, 0x8a, 0xed, 0xb9, 0x64, 0x40, 0x4d, 0xf3, 0x74, 0x5c, 0xd2, + 0x38, 0x11, 0x57, 0x5b, 0xf4, 0x90, 0xda, 0xcd, 0xe9, 0x39, 0x2c, 0xa5, 0xb3, 0xaa, 0x23, 0xfc, + 0x06, 0x56, 0xf3, 0x76, 0xef, 0x11, 0xd9, 0xe7, 0xf3, 0xf7, 0x64, 0x99, 0x6d, 0xbf, 0xd9, 0xf7, + 0x3e, 0x9f, 0x06, 0x36, 0x17, 0xdd, 0x5f, 0x45, 0x50, 0x66, 0xab, 0x0c, 0xbf, 0x05, 0xb7, 0xc2, + 0xd8, 0xb6, 0x49, 0x18, 0x52, 0x0f, 0x6b, 0x0d, 0x79, 0xf9, 0xde, 0x2b, 0x5d, 0x86, 0x7c, 0x58, + 0x40, 0x39, 0x09, 0x3e, 0x00, 0xe5, 0x33, 0xec, 0x7a, 0xc4, 0xc9, 0x9e, 0x8d, 0x9d, 0x37, 0xd0, + 0x0f, 0x28, 0xf0, 0x61, 0x01, 0x65, 0x14, 0xc1, 0x07, 0xb7, 0x32, 0x49, 0xf8, 0x29, 0x58, 0x19, + 0x61, 0x2f, 0x26, 0xd9, 0x24, 0xe6, 0xde, 0x03, 0x7a, 0x2c, 0x23, 0x56, 0x86, 0x0d, 0x50, 0x09, + 0xdd, 0xde, 0x00, 0x47, 0x71, 0x40, 0x6e, 0xde, 0x7e, 0x5a, 0x92, 0xd1, 0x0c, 0x36, 0xbb, 0xb8, + 0xb0, 0x0f, 0xca, 0xcc, 0x44, 0xda, 0x8f, 0x04, 0x81, 0x1f, 0xdc, 0xec, 0x47, 0x8f, 0x65, 0xc4, + 0xca, 0x33, 0xee, 0xec, 0x4b, 0x5b, 0x01, 0xa5, 0x30, 0xee, 0xdf, 0xfb, 0xb3, 0x04, 0xb6, 0x17, + 0x3d, 0x66, 0xf0, 0x31, 0x50, 0x9a, 0x9d, 0xce, 0xa1, 0xd1, 0x6a, 0x9a, 0xc6, 0xf1, 0x91, 0x75, + 0x68, 0x1c, 0x7d, 0x6f, 0x75, 0xcd, 0xa6, 0xa9, 0x5b, 0xc6, 0x91, 0x61, 0x1a, 0xcd, 0x43, 0xe3, + 0x89, 0xde, 0xb6, 0x4e, 0x8e, 0xba, 0x1d, 0xbd, 0x65, 0x1c, 0x18, 0x7a, 0xbb, 0x5a, 0x10, 0x76, + 0x2f, 0x2e, 0x25, 0x71, 0x91, 0x9a, 0x31, 0x70, 0x23, 0x17, 0x7b, 0xee, 0x2f, 0xc4, 0x81, 0x26, + 0xf8, 0x6c, 0x89, 0xf0, 0x23, 0x1d, 0x19, 0x07, 0xf9, 0x79, 0xd7, 0x6c, 0x22, 0x53, 0x6f, 0x57, + 0xb9, 0xa9, 0xea, 0x54, 0xed, 0x11, 0x09, 0xdc, 0xb3, 0xac, 0x45, 0x37, 0xc2, 0x41, 0x44, 0x1c, + 0xd8, 0x01, 0x77, 0xdf, 0x45, 0x55, 0x47, 0xe8, 0x18, 0x55, 0x8b, 0xc2, 0xce, 0xc5, 0xa5, 0x74, + 0x67, 0x99, 0xa6, 0x9e, 0x0e, 0xed, 0x9d, 0x7d, 0x9e, 0xb4, 0x5a, 0x7a, 0xb7, 0x5b, 0x2d, 0xbd, + 0xc5, 0x67, 0xb6, 0x22, 0xdf, 0x01, 0x69, 0x89, 0xaa, 0x69, 0xfc, 0xa0, 0xb7, 0xad, 0xe3, 0x13, + 0xb3, 0xca, 0x0b, 0x9f, 0x5c, 0x5c, 0x4a, 0xd2, 0x32, 0xa9, 0xf4, 0xfd, 0x74, 0x8e, 0xe3, 0x48, + 0xe0, 0x9f, 0xfd, 0x5e, 0x2f, 0x68, 0x27, 0x2f, 0xc7, 0x75, 0xee, 0xd5, 0xb8, 0xce, 0xfd, 0x3b, + 0xae, 0x73, 0xcf, 0xaf, 0xea, 0x85, 0x57, 0x57, 0xf5, 0xc2, 0xdf, 0x57, 0xf5, 0xc2, 0x93, 0x07, + 0x3d, 0x37, 0xfa, 0x31, 0x3e, 0x55, 0x6c, 0xbf, 0xaf, 0xb2, 0x85, 0xbe, 0xef, 0xe1, 0xd3, 0x30, + 0xfb, 0x56, 0x47, 0x5f, 0xa9, 0x3f, 0xcf, 0xfe, 0xd6, 0x3d, 0xd2, 0xc3, 0xf6, 0xb9, 0x3a, 0xfa, + 0x52, 0x8d, 0xce, 0x87, 0x24, 0x3c, 0x2d, 0xd3, 0x47, 0xfe, 0x8b, 0xff, 0x02, 0x00, 0x00, 0xff, + 0xff, 0xfc, 0xf5, 0xa8, 0xf1, 0x00, 0x08, 0x00, 0x00, } func (this *ApplicationLink) Equal(that interface{}) bool { diff --git a/x/profiles/legacy/v5/types/models_chain_links.pb.go b/x/profiles/legacy/v5/types/models_chain_links.pb.go index 2186795f23..3e75c75e21 100644 --- a/x/profiles/legacy/v5/types/models_chain_links.pb.go +++ b/x/profiles/legacy/v5/types/models_chain_links.pb.go @@ -386,58 +386,58 @@ func init() { } var fileDescriptor_1deb25c5b4df9624 = []byte{ - // 806 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x4f, 0x6f, 0xeb, 0x44, - 0x10, 0x8f, 0x69, 0xd3, 0x47, 0x36, 0xc9, 0xe3, 0xbd, 0x7d, 0x41, 0x4a, 0x0b, 0x8a, 0x23, 0x57, - 0x82, 0x22, 0xa8, 0xad, 0xa6, 0xad, 0x40, 0xe1, 0x42, 0x5c, 0x90, 0x2a, 0xd1, 0x4a, 0xc8, 0x2d, - 0x17, 0x2e, 0xd1, 0xda, 0xd9, 0xb8, 0xab, 0xda, 0x5e, 0xcb, 0x5e, 0x47, 0xf1, 0x37, 0xe0, 0x46, - 0xc5, 0x09, 0x71, 0xea, 0x37, 0xe0, 0xc2, 0x67, 0x40, 0x15, 0xa7, 0x1e, 0x7b, 0x0a, 0xa8, 0xbd, - 0x70, 0xce, 0x27, 0x40, 0xfb, 0xc7, 0x49, 0x9a, 0xb6, 0xa0, 0xde, 0xde, 0x6d, 0x77, 0xe6, 0xf7, - 0x9b, 0xf9, 0xcd, 0xce, 0x78, 0x0c, 0x3e, 0x1d, 0xe0, 0x34, 0xa4, 0xa9, 0x15, 0x27, 0x74, 0x48, - 0x02, 0x9c, 0x5a, 0xa3, 0x8e, 0x15, 0xd2, 0x01, 0x0e, 0xd2, 0xbe, 0x77, 0x86, 0x48, 0xd4, 0x0f, - 0x48, 0x74, 0x9e, 0x9a, 0x71, 0x42, 0x19, 0x85, 0x50, 0x82, 0xcd, 0x02, 0x6c, 0x8e, 0x3a, 0x1b, - 0x0d, 0x9f, 0xfa, 0x54, 0xb8, 0x2d, 0x7e, 0x92, 0xc8, 0x8d, 0x75, 0x9f, 0x52, 0x3f, 0xc0, 0x96, - 0xb8, 0xb9, 0xd9, 0xd0, 0x42, 0x51, 0xae, 0x5c, 0xfa, 0xb2, 0x8b, 0x91, 0x10, 0xa7, 0x0c, 0x85, - 0x71, 0xc1, 0xf5, 0x28, 0xcf, 0xd2, 0x97, 0x41, 0xe5, 0x45, 0xb9, 0x3e, 0x96, 0x37, 0x8b, 0x8d, - 0xad, 0x94, 0xf8, 0x11, 0x89, 0x7c, 0x6b, 0xb4, 0xe3, 0x62, 0x86, 0x76, 0x8a, 0xbb, 0x02, 0x6e, - 0x2b, 0xa0, 0x97, 0xe4, 0x31, 0xa3, 0x56, 0x98, 0x05, 0x8c, 0xa4, 0x64, 0x8e, 0x2e, 0x0c, 0x12, - 0x6e, 0xfc, 0xb6, 0x02, 0x2a, 0x07, 0xbc, 0xdc, 0x23, 0x12, 0x9d, 0xc3, 0x4d, 0xb0, 0x9a, 0xa5, - 0x38, 0x69, 0x6a, 0x6d, 0x6d, 0xab, 0x62, 0xbf, 0x37, 0x9d, 0xe8, 0xd5, 0x1c, 0x85, 0x41, 0xd7, - 0xe0, 0x56, 0xc3, 0x11, 0x4e, 0x38, 0x00, 0x2f, 0xd0, 0x60, 0x90, 0xe0, 0x34, 0x6d, 0xbe, 0xd3, - 0xd6, 0xb6, 0xaa, 0x9d, 0x86, 0x29, 0x0b, 0x33, 0x8b, 0xc2, 0xcc, 0x5e, 0x94, 0xdb, 0x7b, 0xd3, - 0x89, 0xfe, 0x52, 0xb2, 0x15, 0xdc, 0xf8, 0xf3, 0xf7, 0xed, 0xd6, 0xc3, 0x87, 0x34, 0x7b, 0xd2, - 0xfd, 0x35, 0x62, 0xc8, 0x29, 0x42, 0xc3, 0x6f, 0x40, 0x39, 0x4e, 0x28, 0x1d, 0x36, 0x57, 0x44, - 0x8e, 0x75, 0xf3, 0x11, 0xe2, 0x77, 0x1c, 0x60, 0x37, 0xae, 0x26, 0x7a, 0x69, 0x3a, 0xd1, 0x6b, - 0x32, 0x99, 0x60, 0x19, 0x8e, 0x64, 0xc3, 0x3e, 0xa8, 0xc9, 0x6e, 0x7a, 0x34, 0x1a, 0x12, 0xbf, - 0xb9, 0x2a, 0xa2, 0xe9, 0x8f, 0x45, 0x13, 0xcf, 0x70, 0x20, 0x60, 0xf6, 0x07, 0x2a, 0xe6, 0x1b, - 0x19, 0x73, 0x31, 0x84, 0xe1, 0x54, 0xbd, 0x39, 0x12, 0x22, 0x50, 0xf7, 0x12, 0x8c, 0x18, 0xa1, - 0x51, 0x9f, 0xf7, 0xb3, 0x59, 0x16, 0x19, 0x36, 0x1e, 0xbc, 0xc9, 0x69, 0xd1, 0x6c, 0xbb, 0xad, - 0x82, 0x37, 0x54, 0xf0, 0x45, 0xba, 0x71, 0xf1, 0x97, 0xae, 0x39, 0xb5, 0xc2, 0xc6, 0x49, 0xdd, - 0xda, 0x8f, 0x97, 0x7a, 0xe9, 0x97, 0x4b, 0x5d, 0xfb, 0xe7, 0x52, 0xd7, 0x8c, 0xaf, 0x40, 0x75, - 0x41, 0x29, 0x6f, 0x59, 0x84, 0x42, 0xfc, 0xb0, 0x65, 0xdc, 0x6a, 0x38, 0xc2, 0xb9, 0x14, 0xe1, - 0x46, 0x03, 0x65, 0xf1, 0x74, 0xb0, 0x07, 0x5e, 0xc4, 0x99, 0xdb, 0x3f, 0xc7, 0xb9, 0xe0, 0x3f, - 0xd5, 0x4a, 0x38, 0x6f, 0xa5, 0x82, 0x1b, 0xce, 0x5a, 0x9c, 0xb9, 0xdf, 0xe2, 0x1c, 0x1e, 0x82, - 0x0a, 0x1f, 0x40, 0xc4, 0xb2, 0x04, 0xff, 0xe7, 0x3c, 0x34, 0xa6, 0x13, 0xfd, 0x95, 0x0c, 0x32, - 0x23, 0x18, 0xce, 0x9c, 0x0c, 0xf7, 0x00, 0x88, 0x03, 0xfe, 0xce, 0x0c, 0x8f, 0x99, 0x68, 0x7b, - 0xc5, 0x7e, 0x7f, 0x3a, 0xd1, 0x5f, 0xab, 0xcc, 0x33, 0x9f, 0xe1, 0x54, 0xc4, 0xe5, 0x14, 0x8f, - 0xd9, 0x52, 0x69, 0x3f, 0x6b, 0xa0, 0x6e, 0x63, 0xef, 0x6c, 0xb7, 0xa3, 0x86, 0x0a, 0x7e, 0x04, - 0xca, 0x23, 0x14, 0x64, 0xc5, 0x03, 0xbd, 0x9a, 0x0f, 0x8a, 0x30, 0x1b, 0x8e, 0x74, 0xc3, 0x4f, - 0xc0, 0x5a, 0x9c, 0xe0, 0x21, 0x19, 0x8b, 0x22, 0x2a, 0xf6, 0xeb, 0xe9, 0x44, 0xaf, 0x17, 0x13, - 0xc5, 0xed, 0xbc, 0x64, 0x71, 0xe8, 0x9a, 0x8b, 0x29, 0xff, 0x7f, 0xa6, 0x0d, 0x1f, 0xd4, 0x6d, - 0x94, 0xe2, 0xfd, 0x2f, 0x9e, 0xa9, 0xe9, 0xd9, 0x89, 0x7e, 0xd2, 0x00, 0x38, 0xc4, 0xe3, 0xb7, - 0xa8, 0xf4, 0x5f, 0x35, 0xf0, 0xe6, 0x84, 0x44, 0x7e, 0x80, 0x4f, 0x8a, 0x3e, 0x73, 0x3b, 0xfc, - 0x1c, 0xac, 0xf2, 0x5d, 0x2b, 0x94, 0xbd, 0xec, 0x6c, 0x9a, 0x6a, 0xd7, 0xb1, 0xb1, 0x59, 0x6c, - 0x33, 0xb5, 0xaf, 0x4c, 0xce, 0x3b, 0xa6, 0x03, 0xec, 0x08, 0x02, 0xfc, 0x70, 0x79, 0xdc, 0x6a, - 0x0b, 0x23, 0xd4, 0xfd, 0x8c, 0xcb, 0x53, 0xd2, 0xda, 0x8f, 0x48, 0xbb, 0x27, 0xc2, 0xf8, 0x43, - 0x03, 0xf0, 0x98, 0xaf, 0xc3, 0xfb, 0xda, 0x8e, 0x40, 0xc5, 0x25, 0xac, 0x8f, 0x92, 0x04, 0x15, - 0x9f, 0x85, 0x55, 0x08, 0x94, 0x5b, 0xd5, 0x9c, 0x2d, 0xd1, 0x42, 0xe5, 0x01, 0x0d, 0x63, 0xe4, - 0x31, 0x9b, 0xb0, 0x1e, 0xa7, 0x39, 0xef, 0xba, 0xea, 0xc4, 0xa7, 0x7a, 0xa6, 0x8f, 0x2f, 0xcc, - 0x95, 0xa7, 0x3e, 0x10, 0x67, 0x01, 0xf7, 0xbc, 0x42, 0xec, 0xef, 0xaf, 0x6e, 0x5b, 0xda, 0xf5, - 0x6d, 0x4b, 0xfb, 0xfb, 0xb6, 0xa5, 0x5d, 0xdc, 0xb5, 0x4a, 0xd7, 0x77, 0xad, 0xd2, 0xcd, 0x5d, - 0xab, 0xf4, 0xc3, 0x97, 0x3e, 0x61, 0x67, 0x99, 0x6b, 0x7a, 0x34, 0xb4, 0x64, 0x98, 0xed, 0x00, - 0xb9, 0xa9, 0x3a, 0x5b, 0xa3, 0x7d, 0x6b, 0x3c, 0xff, 0x01, 0x06, 0xd8, 0x47, 0x5e, 0xce, 0x8d, - 0x2c, 0x8f, 0x71, 0xea, 0xae, 0x09, 0x79, 0xbb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x56, 0x0a, - 0xbd, 0xaf, 0x2a, 0x07, 0x00, 0x00, + // 809 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x4f, 0x6f, 0xe3, 0x44, + 0x14, 0x8f, 0x69, 0xd3, 0x25, 0x93, 0x64, 0xd9, 0x9d, 0x0d, 0x52, 0xb6, 0xa0, 0x38, 0xf2, 0x4a, + 0xb0, 0x08, 0xea, 0xd1, 0x66, 0x77, 0x01, 0x85, 0x0b, 0x71, 0x41, 0x5a, 0x89, 0x56, 0x42, 0x6e, + 0xb9, 0x70, 0x89, 0xc6, 0xce, 0xc4, 0x1d, 0xd5, 0xf6, 0x58, 0xf6, 0x38, 0x8a, 0xbf, 0x01, 0x37, + 0x2a, 0x4e, 0x88, 0x53, 0xbf, 0x01, 0x17, 0x3e, 0x03, 0xaa, 0x38, 0xf5, 0xd8, 0x53, 0x40, 0xed, + 0x85, 0x73, 0x3e, 0x01, 0x9a, 0x3f, 0x4e, 0xd2, 0xb4, 0x05, 0xf5, 0xc6, 0x6d, 0xe6, 0xbd, 0xdf, + 0xef, 0xbd, 0xdf, 0x9b, 0xf7, 0xfc, 0x0c, 0x3e, 0x1e, 0x91, 0x2c, 0x62, 0x19, 0x4a, 0x52, 0x36, + 0xa6, 0x21, 0xc9, 0xd0, 0xa4, 0x87, 0x22, 0x36, 0x22, 0x61, 0x36, 0xf4, 0x8f, 0x30, 0x8d, 0x87, + 0x21, 0x8d, 0x8f, 0x33, 0x3b, 0x49, 0x19, 0x67, 0x10, 0x2a, 0xb0, 0x5d, 0x82, 0xed, 0x49, 0x6f, + 0xbb, 0x15, 0xb0, 0x80, 0x49, 0x37, 0x12, 0x27, 0x85, 0xdc, 0x7e, 0x1a, 0x30, 0x16, 0x84, 0x04, + 0xc9, 0x9b, 0x97, 0x8f, 0x11, 0x8e, 0x0b, 0xed, 0x32, 0xd7, 0x5d, 0x9c, 0x46, 0x24, 0xe3, 0x38, + 0x4a, 0x4a, 0xae, 0xcf, 0x44, 0x96, 0xa1, 0x0a, 0xaa, 0x2e, 0xda, 0xf5, 0xa1, 0xba, 0x21, 0x3e, + 0x45, 0x19, 0x0d, 0x62, 0x1a, 0x07, 0x68, 0xf2, 0xc2, 0x23, 0x1c, 0xbf, 0x28, 0xef, 0x1a, 0xb8, + 0xa3, 0x81, 0x7e, 0x5a, 0x24, 0x9c, 0xa1, 0x28, 0x0f, 0x39, 0xcd, 0xe8, 0x12, 0x5d, 0x1a, 0x14, + 0xdc, 0xfa, 0x75, 0x03, 0xd4, 0x76, 0x45, 0xb9, 0x7b, 0x34, 0x3e, 0x86, 0xcf, 0xc0, 0x66, 0x9e, + 0x91, 0xb4, 0x6d, 0x74, 0x8d, 0xe7, 0x35, 0xe7, 0x9d, 0xf9, 0xcc, 0xac, 0x17, 0x38, 0x0a, 0xfb, + 0x96, 0xb0, 0x5a, 0xae, 0x74, 0xc2, 0x11, 0x78, 0x80, 0x47, 0xa3, 0x94, 0x64, 0x59, 0xfb, 0xad, + 0xae, 0xf1, 0xbc, 0xde, 0x6b, 0xd9, 0xaa, 0x30, 0xbb, 0x2c, 0xcc, 0x1e, 0xc4, 0x85, 0xf3, 0x6a, + 0x3e, 0x33, 0x1f, 0x2a, 0xb6, 0x86, 0x5b, 0x7f, 0xfc, 0xb6, 0xd3, 0xb9, 0xf9, 0x90, 0xf6, 0x40, + 0xb9, 0xbf, 0xc2, 0x1c, 0xbb, 0x65, 0x68, 0xf8, 0x35, 0xa8, 0x26, 0x29, 0x63, 0xe3, 0xf6, 0x86, + 0xcc, 0xf1, 0xd4, 0xbe, 0x85, 0xf8, 0xad, 0x00, 0x38, 0xad, 0xb3, 0x99, 0x59, 0x99, 0xcf, 0xcc, + 0x86, 0x4a, 0x26, 0x59, 0x96, 0xab, 0xd8, 0x70, 0x08, 0x1a, 0xaa, 0x9b, 0x3e, 0x8b, 0xc7, 0x34, + 0x68, 0x6f, 0xca, 0x68, 0xe6, 0x6d, 0xd1, 0xe4, 0x33, 0xec, 0x4a, 0x98, 0xf3, 0x9e, 0x8e, 0xf9, + 0x44, 0xc5, 0x5c, 0x0d, 0x61, 0xb9, 0x75, 0x7f, 0x89, 0x84, 0x18, 0x34, 0xfd, 0x94, 0x60, 0x4e, + 0x59, 0x3c, 0x14, 0xfd, 0x6c, 0x57, 0x65, 0x86, 0xed, 0x1b, 0x6f, 0x72, 0x58, 0x36, 0xdb, 0xe9, + 0xea, 0xe0, 0x2d, 0x1d, 0x7c, 0x95, 0x6e, 0x9d, 0xfc, 0x69, 0x1a, 0x6e, 0xa3, 0xb4, 0x09, 0x52, + 0xbf, 0xf1, 0xc3, 0xa9, 0x59, 0xf9, 0xf9, 0xd4, 0x34, 0xfe, 0x3e, 0x35, 0x0d, 0xeb, 0x4b, 0x50, + 0x5f, 0x51, 0x2a, 0x5a, 0x16, 0xe3, 0x88, 0xdc, 0x6c, 0x99, 0xb0, 0x5a, 0xae, 0x74, 0xae, 0x45, + 0xb8, 0x30, 0x40, 0x55, 0x3e, 0x1d, 0x1c, 0x80, 0x07, 0x49, 0xee, 0x0d, 0x8f, 0x49, 0x21, 0xf9, + 0x77, 0xb5, 0x12, 0x2e, 0x5b, 0xa9, 0xe1, 0x96, 0xbb, 0x95, 0xe4, 0xde, 0x37, 0xa4, 0x80, 0x6f, + 0x40, 0x4d, 0x0c, 0x20, 0xe6, 0x79, 0x4a, 0xfe, 0x75, 0x1e, 0x5a, 0xf3, 0x99, 0xf9, 0x48, 0x05, + 0x59, 0x10, 0x2c, 0x77, 0x49, 0x86, 0xaf, 0x00, 0x48, 0x42, 0xf1, 0xce, 0x9c, 0x4c, 0xb9, 0x6c, + 0x7b, 0xcd, 0x79, 0x77, 0x3e, 0x33, 0x1f, 0xeb, 0xcc, 0x0b, 0x9f, 0xe5, 0xd6, 0xe4, 0xe5, 0x90, + 0x4c, 0xf9, 0x5a, 0x69, 0x3f, 0x19, 0xa0, 0xe9, 0x10, 0xff, 0xe8, 0x65, 0x4f, 0x0f, 0x15, 0xfc, + 0x00, 0x54, 0x27, 0x38, 0xcc, 0xcb, 0x07, 0x7a, 0xb4, 0x1c, 0x14, 0x69, 0xb6, 0x5c, 0xe5, 0x86, + 0x1f, 0x81, 0xad, 0x24, 0x25, 0x63, 0x3a, 0x95, 0x45, 0xd4, 0x9c, 0xc7, 0xf3, 0x99, 0xd9, 0x2c, + 0x27, 0x4a, 0xd8, 0x45, 0xc9, 0xf2, 0xd0, 0xb7, 0x57, 0x53, 0xfe, 0xf7, 0x4c, 0x5b, 0x01, 0x68, + 0x3a, 0x38, 0x23, 0xaf, 0x3f, 0xbf, 0xa7, 0xa6, 0x7b, 0x27, 0xfa, 0xd1, 0x00, 0xe0, 0x0d, 0x99, + 0xfe, 0x8f, 0x4a, 0xff, 0xc5, 0x00, 0x4f, 0x0e, 0x68, 0x1c, 0x84, 0xe4, 0xa0, 0xec, 0xb3, 0xb0, + 0xc3, 0xcf, 0xc0, 0xa6, 0xd8, 0xb5, 0x52, 0xd9, 0xc3, 0xde, 0x33, 0x5b, 0xef, 0x3a, 0x3e, 0xb5, + 0xcb, 0x6d, 0xa6, 0xf7, 0x95, 0x2d, 0x78, 0xfb, 0x6c, 0x44, 0x5c, 0x49, 0x80, 0xef, 0xaf, 0x8f, + 0x5b, 0x63, 0x65, 0x84, 0xfa, 0x9f, 0x08, 0x79, 0x5a, 0x5a, 0xf7, 0x16, 0x69, 0xd7, 0x44, 0x58, + 0xbf, 0x1b, 0x00, 0xee, 0x8b, 0x75, 0x78, 0x5d, 0xdb, 0x1e, 0xa8, 0x79, 0x94, 0x0f, 0x71, 0x9a, + 0xe2, 0xf2, 0xb3, 0x40, 0xa5, 0x40, 0xb5, 0x55, 0xed, 0xc5, 0x12, 0x2d, 0x55, 0xee, 0xb2, 0x28, + 0xc1, 0x3e, 0x77, 0x28, 0x1f, 0x08, 0x9a, 0xfb, 0xb6, 0xa7, 0x4f, 0x62, 0xaa, 0x17, 0xfa, 0xc4, + 0xc2, 0xdc, 0xb8, 0xeb, 0x03, 0x71, 0x57, 0x70, 0xf7, 0x2b, 0xc4, 0xf9, 0xee, 0xec, 0xb2, 0x63, + 0x9c, 0x5f, 0x76, 0x8c, 0xbf, 0x2e, 0x3b, 0xc6, 0xc9, 0x55, 0xa7, 0x72, 0x7e, 0xd5, 0xa9, 0x5c, + 0x5c, 0x75, 0x2a, 0xdf, 0x7f, 0x11, 0x50, 0x7e, 0x94, 0x7b, 0xb6, 0xcf, 0x22, 0xa4, 0xc2, 0xec, + 0x84, 0xd8, 0xcb, 0xf4, 0x19, 0x4d, 0x3e, 0x45, 0xd3, 0xe5, 0x0f, 0x30, 0x24, 0x01, 0xf6, 0x0b, + 0x34, 0x79, 0x8d, 0x78, 0x91, 0x90, 0xcc, 0xdb, 0x92, 0xf2, 0x5e, 0xfe, 0x13, 0x00, 0x00, 0xff, + 0xff, 0xa8, 0x71, 0x5d, 0xcb, 0x2a, 0x07, 0x00, 0x00, } func (this *ChainLink) Equal(that interface{}) bool { diff --git a/x/profiles/legacy/v5/types/models_dtag_requests.pb.go b/x/profiles/legacy/v5/types/models_dtag_requests.pb.go index f50907cccf..e757f6a0c3 100644 --- a/x/profiles/legacy/v5/types/models_dtag_requests.pb.go +++ b/x/profiles/legacy/v5/types/models_dtag_requests.pb.go @@ -77,27 +77,27 @@ func init() { } var fileDescriptor_3722cfac854d7654 = []byte{ - // 309 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd0, 0xb1, 0x4e, 0xc3, 0x30, - 0x10, 0x06, 0xe0, 0x18, 0xa4, 0x0a, 0x52, 0x2a, 0x44, 0xda, 0xa1, 0x62, 0xb0, 0x51, 0x16, 0x60, - 0x68, 0x2c, 0x15, 0xb1, 0x94, 0xad, 0x62, 0x63, 0x8b, 0xca, 0xc2, 0x52, 0xb9, 0xcd, 0xd5, 0x54, - 0x4a, 0xea, 0x62, 0xbb, 0x11, 0x7d, 0x03, 0x46, 0x46, 0xc6, 0x3e, 0x0e, 0x03, 0x43, 0x47, 0xa6, - 0x08, 0x25, 0x0b, 0x73, 0x9e, 0x00, 0xc5, 0x4e, 0x41, 0x6c, 0xe7, 0xbb, 0xcf, 0xff, 0xf0, 0xbb, - 0xbd, 0x08, 0x54, 0x22, 0x14, 0x5d, 0x4a, 0x31, 0x9b, 0xc7, 0xa0, 0x68, 0xda, 0xa7, 0x89, 0x88, - 0x20, 0x56, 0xe3, 0x48, 0x33, 0x3e, 0x96, 0xf0, 0xb4, 0x02, 0xa5, 0x55, 0xb0, 0x94, 0x42, 0x0b, - 0xcf, 0xb3, 0x3c, 0xd8, 0xf1, 0x20, 0xed, 0x9f, 0x76, 0xb8, 0xe0, 0xc2, 0x9c, 0x69, 0x35, 0x59, - 0xe9, 0x7f, 0x20, 0xb7, 0x7d, 0x3b, 0x62, 0x7c, 0x24, 0xd9, 0x42, 0xcd, 0x40, 0x86, 0x36, 0xc8, - 0xbb, 0x73, 0x5b, 0x26, 0x58, 0x8b, 0xb1, 0x96, 0x2c, 0x82, 0x2e, 0x3a, 0x43, 0x17, 0x87, 0xc3, - 0xf3, 0x3c, 0x23, 0x4d, 0xe3, 0xc5, 0xa8, 0x5a, 0x97, 0x19, 0xe9, 0xac, 0x59, 0x12, 0x0f, 0xfc, - 0x7f, 0xda, 0x0f, 0x9b, 0xd5, 0xbb, 0x46, 0xde, 0xa5, 0xdb, 0x50, 0xb0, 0x88, 0x40, 0x76, 0xf7, - 0x4c, 0xca, 0x49, 0x99, 0x91, 0x96, 0xfd, 0x66, 0xf7, 0x7e, 0x58, 0x03, 0x8f, 0xba, 0x07, 0x12, - 0xa6, 0x30, 0x4f, 0x41, 0x76, 0xf7, 0x0d, 0x6e, 0x97, 0x19, 0x39, 0xb6, 0x78, 0x77, 0xf1, 0xc3, - 0x5f, 0x34, 0x38, 0x7a, 0xd9, 0x10, 0xe7, 0x6d, 0x43, 0xd0, 0xf7, 0x86, 0xa0, 0xe1, 0xfd, 0x7b, - 0x8e, 0xd1, 0x36, 0xc7, 0xe8, 0x2b, 0xc7, 0xe8, 0xb5, 0xc0, 0xce, 0xb6, 0xc0, 0xce, 0x67, 0x81, - 0x9d, 0x87, 0x1b, 0x3e, 0xd7, 0x8f, 0xab, 0x49, 0x30, 0x15, 0x09, 0xb5, 0xed, 0xf4, 0x62, 0x36, - 0x51, 0xf5, 0x4c, 0xd3, 0x6b, 0xfa, 0xfc, 0xd7, 0x6e, 0x0c, 0x9c, 0x4d, 0xd7, 0xd5, 0x52, 0xaf, - 0x97, 0xa0, 0x26, 0x0d, 0x53, 0xd6, 0xd5, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xb9, 0x72, - 0xf4, 0x87, 0x01, 0x00, 0x00, + // 312 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd0, 0xb1, 0x4e, 0xeb, 0x30, + 0x14, 0x06, 0xe0, 0xf8, 0x5e, 0xa9, 0x82, 0x94, 0x0a, 0x91, 0x76, 0xa8, 0x18, 0x6c, 0x94, 0x05, + 0x18, 0x1a, 0x4b, 0x45, 0x30, 0x94, 0xad, 0x62, 0x63, 0x8b, 0xca, 0xc2, 0x52, 0xb9, 0xcd, 0xa9, + 0xa9, 0x94, 0xd4, 0xc5, 0x76, 0x23, 0xfa, 0x06, 0x8c, 0x8c, 0x8c, 0x7d, 0x1c, 0x06, 0x86, 0x8e, + 0x4c, 0x11, 0x4a, 0x16, 0xe6, 0x3c, 0x01, 0x8a, 0x9d, 0x82, 0xd8, 0x8e, 0xcf, 0xf9, 0xfc, 0x0f, + 0xbf, 0xdb, 0x8b, 0x40, 0x25, 0x42, 0xd1, 0xa5, 0x14, 0xb3, 0x79, 0x0c, 0x8a, 0xa6, 0x7d, 0x9a, + 0x88, 0x08, 0x62, 0x35, 0x8e, 0x34, 0xe3, 0x63, 0x09, 0x8f, 0x2b, 0x50, 0x5a, 0x05, 0x4b, 0x29, + 0xb4, 0xf0, 0x3c, 0xcb, 0x83, 0x1d, 0x0f, 0xd2, 0xfe, 0x71, 0x87, 0x0b, 0x2e, 0xcc, 0x99, 0x56, + 0x93, 0x95, 0xfe, 0x3b, 0x72, 0xdb, 0x37, 0x23, 0xc6, 0x47, 0x92, 0x2d, 0xd4, 0x0c, 0x64, 0x68, + 0x83, 0xbc, 0x5b, 0xb7, 0x65, 0x82, 0xb5, 0x18, 0x6b, 0xc9, 0x22, 0xe8, 0xa2, 0x13, 0x74, 0xb6, + 0x3f, 0x3c, 0xcd, 0x33, 0xd2, 0x34, 0x5e, 0x8c, 0xaa, 0x75, 0x99, 0x91, 0xce, 0x9a, 0x25, 0xf1, + 0xc0, 0xff, 0xa3, 0xfd, 0xb0, 0x59, 0xbd, 0x6b, 0xe4, 0x9d, 0xbb, 0x0d, 0x05, 0x8b, 0x08, 0x64, + 0xf7, 0x9f, 0x49, 0x39, 0x2a, 0x33, 0xd2, 0xb2, 0xdf, 0xec, 0xde, 0x0f, 0x6b, 0xe0, 0x51, 0x77, + 0x4f, 0xc2, 0x14, 0xe6, 0x29, 0xc8, 0xee, 0x7f, 0x83, 0xdb, 0x65, 0x46, 0x0e, 0x2d, 0xde, 0x5d, + 0xfc, 0xf0, 0x07, 0x0d, 0x0e, 0x9e, 0x37, 0xc4, 0x79, 0xdd, 0x10, 0xf4, 0xb5, 0x21, 0x68, 0x78, + 0xf7, 0x96, 0x63, 0xb4, 0xcd, 0x31, 0xfa, 0xcc, 0x31, 0x7a, 0x29, 0xb0, 0xb3, 0x2d, 0xb0, 0xf3, + 0x51, 0x60, 0xe7, 0xfe, 0x9a, 0xcf, 0xf5, 0xc3, 0x6a, 0x12, 0x4c, 0x45, 0x42, 0x6d, 0x3b, 0xbd, + 0x98, 0x4d, 0x54, 0x3d, 0xd3, 0xf4, 0x8a, 0x3e, 0xfd, 0xb6, 0x1b, 0x03, 0x67, 0xd3, 0x35, 0x4d, + 0x2f, 0xa9, 0x5e, 0x2f, 0x41, 0x4d, 0x1a, 0xa6, 0xac, 0x8b, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x82, 0xc2, 0x92, 0x90, 0x87, 0x01, 0x00, 0x00, } func (this *DTagTransferRequest) Equal(that interface{}) bool { diff --git a/x/profiles/legacy/v5/types/models_params.go b/x/profiles/legacy/v5/types/models_params.go index d7bd4dbf12..147916d5d8 100644 --- a/x/profiles/legacy/v5/types/models_params.go +++ b/x/profiles/legacy/v5/types/models_params.go @@ -20,12 +20,12 @@ const ( // Default profile paramsModule var ( - DefaultMinNicknameLength = sdk.NewInt(2) - DefaultMaxNicknameLength = sdk.NewInt(1000) // Longest name on earth count 954 chars + DefaultMinNicknameLength = math.NewInt(2) + DefaultMaxNicknameLength = math.NewInt(1000) // Longest name on earth count 954 chars DefaultRegEx = `^[A-Za-z0-9_]+$` - DefaultMinDTagLength = sdk.NewInt(3) - DefaultMaxDTagLength = sdk.NewInt(30) - DefaultMaxBioLength = sdk.NewInt(1000) + DefaultMinDTagLength = math.NewInt(3) + DefaultMaxDTagLength = math.NewInt(30) + DefaultMaxBioLength = math.NewInt(1000) ) // Parameters store keys @@ -231,7 +231,7 @@ func DefaultOracleParams() OracleParams { 1, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ) } diff --git a/x/profiles/legacy/v5/types/models_params.pb.go b/x/profiles/legacy/v5/types/models_params.pb.go index acff445da5..20e01fe469 100644 --- a/x/profiles/legacy/v5/types/models_params.pb.go +++ b/x/profiles/legacy/v5/types/models_params.pb.go @@ -4,6 +4,7 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" @@ -68,8 +69,8 @@ var xxx_messageInfo_Params proto.InternalMessageInfo // NicknameParams defines the parameters related to the profiles nicknames type NicknameParams struct { - MinLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=min_length,json=minLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_length" yaml:"min_length"` - MaxLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=max_length,json=maxLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"max_length" yaml:"max_length"` + MinLength cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=min_length,json=minLength,proto3,customtype=cosmossdk.io/math.Int" json:"min_length" yaml:"min_length"` + MaxLength cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=max_length,json=maxLength,proto3,customtype=cosmossdk.io/math.Int" json:"max_length" yaml:"max_length"` } func (m *NicknameParams) Reset() { *m = NicknameParams{} } @@ -107,9 +108,9 @@ var xxx_messageInfo_NicknameParams proto.InternalMessageInfo // DTagParams defines the parameters related to profile DTags type DTagParams struct { - RegEx string `protobuf:"bytes,1,opt,name=reg_ex,json=regEx,proto3" json:"reg_ex,omitempty" yaml:"reg_ex"` - MinLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=min_length,json=minLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_length" yaml:"min_length"` - MaxLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=max_length,json=maxLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"max_length" yaml:"max_length"` + RegEx string `protobuf:"bytes,1,opt,name=reg_ex,json=regEx,proto3" json:"reg_ex,omitempty" yaml:"reg_ex"` + MinLength cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=min_length,json=minLength,proto3,customtype=cosmossdk.io/math.Int" json:"min_length" yaml:"min_length"` + MaxLength cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=max_length,json=maxLength,proto3,customtype=cosmossdk.io/math.Int" json:"max_length" yaml:"max_length"` } func (m *DTagParams) Reset() { *m = DTagParams{} } @@ -147,7 +148,7 @@ var xxx_messageInfo_DTagParams proto.InternalMessageInfo // BioParams defines the parameters related to profile biography type BioParams struct { - MaxLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=max_length,json=maxLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"max_length" yaml:"max_length"` + MaxLength cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=max_length,json=maxLength,proto3,customtype=cosmossdk.io/math.Int" json:"max_length" yaml:"max_length"` } func (m *BioParams) Reset() { *m = BioParams{} } @@ -252,51 +253,52 @@ func init() { } var fileDescriptor_1b093f5fee9c9f7d = []byte{ - // 702 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0xcb, 0x6e, 0xd3, 0x40, - 0x14, 0x86, 0x73, 0x71, 0xa3, 0x78, 0x52, 0x2e, 0xb5, 0x0a, 0x84, 0x22, 0xec, 0x68, 0x16, 0x55, - 0x36, 0xb5, 0xd5, 0x20, 0x84, 0x54, 0xc4, 0x02, 0xa7, 0x15, 0xaa, 0x04, 0xb4, 0x32, 0x20, 0x24, - 0x36, 0xd6, 0xd8, 0x99, 0xba, 0x56, 0x6c, 0x8f, 0xe5, 0x71, 0xa2, 0x74, 0xc5, 0x96, 0x25, 0x4f, - 0x80, 0x58, 0x23, 0x1e, 0xa4, 0x2b, 0xd4, 0x25, 0x62, 0x61, 0x50, 0xfa, 0x06, 0x79, 0x02, 0x34, - 0x97, 0x5c, 0x5a, 0x2a, 0x51, 0x40, 0xac, 0x72, 0x3c, 0xe7, 0xfc, 0xdf, 0x99, 0x39, 0xbf, 0x3d, - 0x01, 0xeb, 0x3d, 0x4c, 0x63, 0x42, 0xad, 0x34, 0x23, 0x07, 0x61, 0x84, 0xa9, 0x35, 0xec, 0x58, - 0x31, 0xe9, 0xe1, 0x88, 0xba, 0x29, 0xca, 0x50, 0x4c, 0xcd, 0x34, 0x23, 0x39, 0xd1, 0x34, 0x51, - 0x67, 0x4e, 0xeb, 0xcc, 0x61, 0x67, 0x6d, 0x35, 0x20, 0x01, 0xe1, 0x69, 0x8b, 0x45, 0xa2, 0x72, - 0x4d, 0xf7, 0x09, 0x27, 0x7a, 0x88, 0x62, 0x6b, 0xb8, 0xe9, 0xe1, 0x1c, 0x6d, 0x5a, 0x3e, 0x09, - 0x13, 0x91, 0x87, 0x5f, 0x2a, 0xa0, 0xb6, 0xcf, 0xd1, 0xda, 0x6b, 0x50, 0x4f, 0x42, 0xbf, 0x9f, - 0xa0, 0x18, 0x37, 0xcb, 0xad, 0x72, 0xbb, 0xd1, 0x81, 0xe6, 0xaf, 0x7d, 0xcc, 0xe7, 0xb2, 0x46, - 0xa8, 0xec, 0x5b, 0xc7, 0x85, 0x51, 0x9a, 0x14, 0xc6, 0xb5, 0x23, 0x14, 0x47, 0x5b, 0x70, 0x4a, - 0x80, 0xce, 0x0c, 0xa6, 0xed, 0x01, 0xa5, 0x97, 0xa3, 0xa0, 0x59, 0xe1, 0x50, 0xfd, 0x22, 0xe8, - 0xf6, 0x4b, 0x14, 0x48, 0xe0, 0x1d, 0x06, 0x1c, 0x17, 0x86, 0xc2, 0xd6, 0x26, 0x85, 0xd1, 0x10, - 0x60, 0x46, 0x80, 0x0e, 0x07, 0x69, 0x5d, 0x50, 0xf5, 0x42, 0xd2, 0xac, 0x72, 0xde, 0xdd, 0x8b, - 0x78, 0x76, 0x48, 0x24, 0x4e, 0x93, 0xfb, 0x03, 0x02, 0xe3, 0x85, 0x04, 0x3a, 0x4c, 0xad, 0xed, - 0x81, 0x1a, 0xc9, 0x90, 0x1f, 0xe1, 0xa6, 0xc2, 0x39, 0xad, 0x8b, 0x38, 0x7b, 0xbc, 0x42, 0xa2, - 0x6e, 0x48, 0xd4, 0x15, 0x81, 0x12, 0x6a, 0xe8, 0x48, 0xcc, 0x96, 0xf2, 0xee, 0xa3, 0x51, 0x82, - 0x45, 0x19, 0x5c, 0x3d, 0x3b, 0x22, 0xcd, 0x03, 0x20, 0x0e, 0x13, 0x37, 0xc2, 0x49, 0x90, 0x1f, - 0xf2, 0xd1, 0x2e, 0xdb, 0x5d, 0xc6, 0xfa, 0x56, 0x18, 0xeb, 0x41, 0x98, 0x1f, 0x0e, 0x3c, 0xd3, - 0x27, 0xb1, 0x25, 0xad, 0x12, 0x3f, 0x1b, 0xb4, 0xd7, 0xb7, 0xf2, 0xa3, 0x14, 0x53, 0x73, 0x37, - 0xc9, 0x27, 0x85, 0xb1, 0x22, 0xba, 0xce, 0x49, 0xd0, 0x51, 0xe3, 0x30, 0x79, 0xca, 0x63, 0xde, - 0x03, 0x8d, 0xa6, 0x3d, 0x2a, 0xff, 0xd8, 0x63, 0x46, 0x62, 0x3d, 0xd0, 0x48, 0xf4, 0x90, 0x07, - 0xfc, 0x50, 0x01, 0x60, 0x6e, 0x97, 0xd6, 0x06, 0xb5, 0x0c, 0x07, 0x2e, 0x1e, 0xf1, 0x83, 0xa9, - 0xf6, 0xca, 0x7c, 0x40, 0x62, 0x1d, 0x3a, 0x4b, 0x19, 0x0e, 0x76, 0x46, 0x1a, 0x39, 0x33, 0x06, - 0xb1, 0xc5, 0xfd, 0x3f, 0xdb, 0xe2, 0xb8, 0x30, 0xd4, 0x67, 0xd3, 0x33, 0xff, 0x76, 0x26, 0xe4, - 0xcc, 0x4c, 0xaa, 0x7f, 0xdd, 0x70, 0x3a, 0x80, 0x4b, 0x0e, 0x68, 0x00, 0xd4, 0xd9, 0xeb, 0x77, - 0xce, 0x97, 0xea, 0x7f, 0xf4, 0xe5, 0x73, 0x15, 0x2c, 0x2f, 0xbe, 0xae, 0xda, 0x23, 0xa0, 0x52, - 0x3f, 0x0b, 0xd3, 0xdc, 0x0d, 0x7b, 0xdc, 0x1c, 0xc5, 0x6e, 0x8d, 0x0b, 0xa3, 0xfe, 0x82, 0x2f, - 0xee, 0x6e, 0x4f, 0x0a, 0xe3, 0xba, 0xe0, 0xce, 0xca, 0xa0, 0x53, 0x17, 0xf1, 0x6e, 0x4f, 0xdb, - 0x04, 0x2a, 0xa2, 0x7d, 0xd7, 0x27, 0x83, 0x24, 0xe7, 0x6e, 0x29, 0xf6, 0xea, 0x5c, 0x32, 0x4b, - 0x41, 0xa7, 0x8e, 0x68, 0xbf, 0xcb, 0x42, 0x26, 0x61, 0x56, 0x08, 0x49, 0xf5, 0xbc, 0x64, 0x96, - 0x82, 0x4e, 0x3d, 0x0e, 0x13, 0x21, 0x79, 0x00, 0x1a, 0x69, 0x86, 0x53, 0x94, 0x61, 0x37, 0x40, - 0x94, 0x7f, 0x8a, 0x8a, 0x7d, 0x73, 0x52, 0x18, 0x9a, 0x10, 0x2d, 0x24, 0xa1, 0x03, 0xe4, 0xd3, - 0x13, 0x44, 0x99, 0x10, 0x8f, 0xb0, 0x3f, 0xc8, 0x85, 0x70, 0xe9, 0xbc, 0x70, 0x21, 0x09, 0x1d, - 0x20, 0x9f, 0x98, 0xf0, 0x2d, 0x00, 0x07, 0x18, 0xbb, 0x28, 0xe6, 0xbb, 0xac, 0xb5, 0xaa, 0xed, - 0x46, 0xe7, 0xb6, 0x29, 0x06, 0x6f, 0xb2, 0x6b, 0xd2, 0x94, 0xd7, 0xa4, 0xd9, 0x25, 0x61, 0x62, - 0xef, 0xc8, 0x8f, 0x5e, 0x5a, 0x30, 0x97, 0xc2, 0x4f, 0xdf, 0x8d, 0xf6, 0x25, 0x1c, 0x64, 0x14, - 0xea, 0xa8, 0x07, 0x18, 0x3f, 0xe6, 0x3a, 0x61, 0x97, 0xfd, 0xea, 0x78, 0xac, 0x97, 0x4f, 0xc6, - 0x7a, 0xf9, 0xc7, 0x58, 0x2f, 0xbf, 0x3f, 0xd5, 0x4b, 0x27, 0xa7, 0x7a, 0xe9, 0xeb, 0xa9, 0x5e, - 0x7a, 0xf3, 0x70, 0x01, 0x2a, 0xae, 0xa4, 0x8d, 0x08, 0x79, 0x54, 0xc6, 0xd6, 0xf0, 0xbe, 0x35, - 0x9a, 0xff, 0x41, 0x44, 0x38, 0x40, 0xfe, 0x11, 0x5b, 0xe4, 0xdd, 0xbc, 0x1a, 0xbf, 0xd6, 0xef, - 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xd8, 0x55, 0x93, 0x4a, 0x06, 0x00, 0x00, + // 713 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x94, 0xcb, 0x6e, 0xd3, 0x4c, + 0x14, 0xc7, 0x93, 0xc6, 0x8d, 0xe2, 0x49, 0xbf, 0x4b, 0xad, 0x16, 0x42, 0x11, 0x76, 0x34, 0x0b, + 0x94, 0x4d, 0x6d, 0x35, 0x08, 0x90, 0x8a, 0x10, 0xc2, 0x6d, 0x85, 0x2a, 0x01, 0x05, 0x03, 0x42, + 0x62, 0x51, 0x6b, 0x6c, 0x4f, 0xdd, 0x51, 0x6c, 0x8f, 0xe5, 0x71, 0xa3, 0x74, 0xc5, 0x96, 0x25, + 0x8f, 0xc0, 0x1a, 0xf1, 0x08, 0x3c, 0x40, 0x57, 0xa8, 0x4b, 0xc4, 0xc2, 0xa0, 0xf4, 0x0d, 0xb2, + 0x66, 0x81, 0x3c, 0x33, 0xb9, 0xb4, 0x54, 0x50, 0x24, 0x56, 0x3e, 0x9e, 0x73, 0xfe, 0xbf, 0x39, + 0x17, 0xfb, 0x80, 0xeb, 0x01, 0x66, 0x31, 0x65, 0x56, 0x9a, 0xd1, 0x3d, 0x12, 0x61, 0x66, 0xf5, + 0xbb, 0x56, 0x4c, 0x03, 0x1c, 0x31, 0x37, 0x45, 0x19, 0x8a, 0x99, 0x99, 0x66, 0x34, 0xa7, 0x9a, + 0x26, 0xe2, 0xcc, 0x71, 0x9c, 0xd9, 0xef, 0xae, 0x2c, 0x85, 0x34, 0xa4, 0xdc, 0x6d, 0x95, 0x96, + 0x88, 0x5c, 0xd1, 0x7d, 0xca, 0x89, 0x1e, 0x62, 0xd8, 0xea, 0xaf, 0x79, 0x38, 0x47, 0x6b, 0x96, + 0x4f, 0x49, 0x22, 0xfc, 0xf0, 0xd3, 0x1c, 0xa8, 0x3f, 0xe1, 0x68, 0xed, 0x25, 0x68, 0x24, 0xc4, + 0xef, 0x25, 0x28, 0xc6, 0xad, 0x6a, 0xbb, 0xda, 0x69, 0x76, 0xa1, 0xf9, 0xf3, 0x3d, 0xe6, 0x63, + 0x19, 0x23, 0x54, 0xf6, 0xe5, 0xa3, 0xc2, 0xa8, 0x8c, 0x0a, 0xe3, 0xbf, 0x43, 0x14, 0x47, 0xeb, + 0x70, 0x4c, 0x80, 0xce, 0x04, 0xa6, 0xed, 0x00, 0x25, 0xc8, 0x51, 0xd8, 0x9a, 0xe3, 0x50, 0xfd, + 0x3c, 0xe8, 0xe6, 0x73, 0x14, 0x4a, 0xe0, 0xd5, 0x12, 0x38, 0x2c, 0x0c, 0xa5, 0x3c, 0x1b, 0x15, + 0x46, 0x53, 0x80, 0x4b, 0x02, 0x74, 0x38, 0x48, 0xdb, 0x00, 0x35, 0x8f, 0xd0, 0x56, 0x8d, 0xf3, + 0xae, 0x9d, 0xc7, 0xb3, 0x09, 0x95, 0x38, 0x4d, 0xe6, 0x07, 0x04, 0xc6, 0x23, 0x14, 0x3a, 0xa5, + 0x5a, 0xdb, 0x01, 0x75, 0x9a, 0x21, 0x3f, 0xc2, 0x2d, 0x85, 0x73, 0xda, 0xe7, 0x71, 0x76, 0x78, + 0x84, 0x44, 0x2d, 0x4b, 0xd4, 0x3f, 0x02, 0x25, 0xd4, 0xd0, 0x91, 0x98, 0x75, 0xe5, 0xcd, 0x3b, + 0xa3, 0x02, 0x3f, 0x56, 0xc1, 0xbf, 0xa7, 0x5b, 0xa4, 0x3d, 0x05, 0x20, 0x26, 0x89, 0x1b, 0xe1, + 0x24, 0xcc, 0xf7, 0x79, 0x6b, 0x17, 0xec, 0x6e, 0xc9, 0xfa, 0x52, 0x18, 0xcb, 0x62, 0x3e, 0x2c, + 0xe8, 0x99, 0x84, 0x5a, 0x31, 0xca, 0xf7, 0xcd, 0xed, 0x24, 0x1f, 0x15, 0xc6, 0xa2, 0xb8, 0x64, + 0x2a, 0x84, 0x8e, 0x1a, 0x93, 0xe4, 0x21, 0xb7, 0x39, 0x12, 0x0d, 0xc6, 0xc8, 0xb9, 0x3f, 0x43, + 0x4e, 0x84, 0x25, 0x12, 0x0d, 0x04, 0x52, 0xa6, 0xff, 0xbd, 0x0a, 0xc0, 0x74, 0x18, 0x5a, 0x07, + 0xd4, 0x33, 0x1c, 0xba, 0x78, 0xc0, 0xd3, 0x56, 0xed, 0xc5, 0x69, 0xf9, 0xe2, 0x1c, 0x3a, 0xf3, + 0x19, 0x0e, 0xb7, 0x06, 0xda, 0xee, 0xa9, 0x22, 0x45, 0x46, 0xf7, 0x7e, 0x99, 0xd1, 0xb0, 0x30, + 0xd4, 0x47, 0xe3, 0x8a, 0x7e, 0x5b, 0xf1, 0xee, 0xa9, 0x8a, 0x6b, 0x17, 0xe5, 0x8f, 0xcb, 0xbb, + 0x60, 0xf9, 0x01, 0x50, 0x27, 0x9f, 0xce, 0x99, 0x26, 0xd7, 0xfe, 0x5e, 0x93, 0x3f, 0xd4, 0xc0, + 0xc2, 0xec, 0x97, 0xa5, 0xdd, 0x05, 0x2a, 0xf3, 0x33, 0x92, 0xe6, 0x2e, 0x09, 0x78, 0xa7, 0x15, + 0xbb, 0x3d, 0x2c, 0x8c, 0xc6, 0x33, 0x7e, 0xb8, 0xbd, 0x39, 0x2a, 0x8c, 0xff, 0x05, 0x77, 0x12, + 0x06, 0x9d, 0x86, 0xb0, 0xb7, 0x03, 0x6d, 0x0d, 0xa8, 0x88, 0xf5, 0x5c, 0x9f, 0x1e, 0x24, 0x39, + 0x6f, 0xbd, 0x62, 0x2f, 0x4d, 0x25, 0x13, 0x17, 0x74, 0x1a, 0x88, 0xf5, 0x36, 0x4a, 0xb3, 0x94, + 0x94, 0x8d, 0x16, 0x92, 0xda, 0x59, 0xc9, 0xc4, 0x05, 0x9d, 0x46, 0x4c, 0x12, 0x21, 0xb9, 0x0d, + 0x9a, 0x69, 0x86, 0x53, 0x94, 0x61, 0x37, 0x44, 0x8c, 0xff, 0x35, 0x8a, 0x7d, 0x69, 0x54, 0x18, + 0x9a, 0x10, 0xcd, 0x38, 0xa1, 0x03, 0xe4, 0xdb, 0x03, 0xc4, 0x4a, 0x21, 0x1e, 0x60, 0xff, 0x20, + 0x17, 0xc2, 0xf9, 0xb3, 0xc2, 0x19, 0x27, 0x74, 0x80, 0x7c, 0x2b, 0x85, 0xaf, 0x01, 0xd8, 0xc3, + 0xd8, 0x45, 0x31, 0xcf, 0xb2, 0xde, 0xae, 0x75, 0x9a, 0xdd, 0x2b, 0xa6, 0xe8, 0xbc, 0x59, 0x6e, + 0x34, 0x53, 0x6e, 0x34, 0x73, 0x83, 0x92, 0xc4, 0xde, 0x92, 0xff, 0xa7, 0x1c, 0xc1, 0x54, 0x0a, + 0xdf, 0x7f, 0x35, 0x3a, 0x21, 0xc9, 0xf7, 0x0f, 0x3c, 0xd3, 0xa7, 0xb1, 0x25, 0x77, 0xa2, 0x78, + 0xac, 0xb2, 0xa0, 0x67, 0xe5, 0x87, 0x29, 0x66, 0x9c, 0xc2, 0x1c, 0x75, 0x0f, 0xe3, 0xfb, 0x5c, + 0x27, 0xc6, 0x65, 0xbf, 0x38, 0x1a, 0xea, 0xd5, 0xe3, 0xa1, 0x5e, 0xfd, 0x36, 0xd4, 0xab, 0x6f, + 0x4f, 0xf4, 0xca, 0xf1, 0x89, 0x5e, 0xf9, 0x7c, 0xa2, 0x57, 0x5e, 0xdd, 0x99, 0x81, 0x8a, 0xed, + 0xb1, 0x1a, 0x21, 0x8f, 0x49, 0xdb, 0xea, 0xdf, 0xb2, 0x06, 0xd3, 0x5d, 0x1e, 0xe1, 0x10, 0xf9, + 0x87, 0x56, 0xff, 0xa6, 0xb8, 0xcd, 0xab, 0xf3, 0x0d, 0x7c, 0xe3, 0x47, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xe8, 0x1b, 0x52, 0x07, 0xf5, 0x05, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/profiles/legacy/v5/types/models_profile.go b/x/profiles/legacy/v5/types/models_profile.go index 62c8f5664b..d8daeccffa 100644 --- a/x/profiles/legacy/v5/types/models_profile.go +++ b/x/profiles/legacy/v5/types/models_profile.go @@ -14,18 +14,17 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/ghodss/yaml" "github.com/gogo/protobuf/proto" ) var ( - _ authtypes.AccountI = (*Profile)(nil) + _ sdk.AccountI = (*Profile)(nil) _ exported.VestingAccount = (*Profile)(nil) ) // NewProfile builds a new profile having the given DTag, creator and creation date -func NewProfile(dTag string, nickname, bio string, pictures Pictures, creationDate time.Time, account authtypes.AccountI) (*Profile, error) { +func NewProfile(dTag string, nickname, bio string, pictures Pictures, creationDate time.Time, account sdk.AccountI) (*Profile, error) { // Make sure myAccount is a proto.Message, e.g. a BaseAccount etc. protoAccount, ok := account.(proto.Message) if !ok { @@ -48,7 +47,7 @@ func NewProfile(dTag string, nickname, bio string, pictures Pictures, creationDa } // NewProfileFromAccount allows to build a new Profile instance from a provided DTag, and account and a creation time -func NewProfileFromAccount(dTag string, account authtypes.AccountI, creationTime time.Time) (*Profile, error) { +func NewProfileFromAccount(dTag string, account sdk.AccountI, creationTime time.Time) (*Profile, error) { return NewProfile( dTag, "", @@ -59,9 +58,9 @@ func NewProfileFromAccount(dTag string, account authtypes.AccountI, creationTime ) } -// GetAccount returns the underlying account as an authtypes.AccountI instance -func (p *Profile) GetAccount() authtypes.AccountI { - return p.Account.GetCachedValue().(authtypes.AccountI) +// GetAccount returns the underlying account as an sdk.AccountI instance +func (p *Profile) GetAccount() sdk.AccountI { + return p.Account.GetCachedValue().(sdk.AccountI) } // getVestingAccount returns the underlying account as an exported.VestingAccount instance @@ -75,7 +74,7 @@ func (p *Profile) getVestingAccount() exported.VestingAccount { // setAccount sets the given account as the underlying account instance. // This should be called after updating anything about the account (eg. after calling SetSequence). -func (p *Profile) setAccount(account authtypes.AccountI) error { +func (p *Profile) setAccount(account sdk.AccountI) error { accAny, err := codectypes.NewAnyWithValue(account) if err != nil { return err @@ -85,12 +84,12 @@ func (p *Profile) setAccount(account authtypes.AccountI) error { return nil } -// GetAddress implements authtypes.AccountI +// GetAddress implements sdk.AccountI func (p *Profile) GetAddress() sdk.AccAddress { return p.GetAccount().GetAddress() } -// SetAddress implements authtypes.AccountI +// SetAddress implements sdk.AccountI func (p *Profile) SetAddress(addr sdk.AccAddress) error { acc := p.GetAccount() err := acc.SetAddress(addr) @@ -101,12 +100,12 @@ func (p *Profile) SetAddress(addr sdk.AccAddress) error { return p.setAccount(acc) } -// GetPubKey implements authtypes.AccountI +// GetPubKey implements sdk.AccountI func (p *Profile) GetPubKey() cryptotypes.PubKey { return p.GetAccount().GetPubKey() } -// SetPubKey implements authtypes.AccountI +// SetPubKey implements sdk.AccountI func (p *Profile) SetPubKey(pubKey cryptotypes.PubKey) error { acc := p.GetAccount() err := acc.SetPubKey(pubKey) @@ -117,12 +116,12 @@ func (p *Profile) SetPubKey(pubKey cryptotypes.PubKey) error { return p.setAccount(acc) } -// GetAccountNumber implements authtypes.AccountI +// GetAccountNumber implements sdk.AccountI func (p *Profile) GetAccountNumber() uint64 { return p.GetAccount().GetAccountNumber() } -// SetAccountNumber implements authtypes.AccountI +// SetAccountNumber implements sdk.AccountI func (p *Profile) SetAccountNumber(accountNumber uint64) error { acc := p.GetAccount() err := acc.SetAccountNumber(accountNumber) @@ -133,12 +132,12 @@ func (p *Profile) SetAccountNumber(accountNumber uint64) error { return p.setAccount(acc) } -// GetSequence implements authtypes.AccountI +// GetSequence implements sdk.AccountI func (p *Profile) GetSequence() uint64 { return p.GetAccount().GetSequence() } -// SetSequence implements authtypes.AccountI +// SetSequence implements sdk.AccountI func (p *Profile) SetSequence(sequence uint64) error { acc := p.GetAccount() err := acc.SetSequence(sequence) @@ -252,7 +251,7 @@ func (p *Profile) GetDelegatedVesting() sdk.Coins { // UnpackInterfaces implements codectypes.UnpackInterfacesMessage func (p *Profile) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { if p.Account != nil { - var account authtypes.AccountI + var account sdk.AccountI err := unpacker.UnpackAny(p.Account, &account) if err != nil { return err @@ -276,7 +275,7 @@ type profilePretty struct { CreationDate time.Time `json:"creation_date" yaml:"creation_date"` } -// String implements authtypes.AccountIย implements stringer +// String implements sdk.AccountIย implements stringer func (p *Profile) String() string { out, _ := p.MarshalYAML() return out.(string) diff --git a/x/profiles/legacy/v5/types/models_profile.pb.go b/x/profiles/legacy/v5/types/models_profile.pb.go index fd18b6bab5..ef9822f02c 100644 --- a/x/profiles/legacy/v5/types/models_profile.pb.go +++ b/x/profiles/legacy/v5/types/models_profile.pb.go @@ -143,39 +143,39 @@ func init() { } var fileDescriptor_089dd63594c4b06b = []byte{ - // 503 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xb1, 0x6e, 0xdb, 0x3c, - 0x14, 0x85, 0xa5, 0xdf, 0x4e, 0xec, 0x30, 0xf9, 0xd3, 0x82, 0x35, 0x10, 0xd5, 0x08, 0x44, 0x83, - 0x43, 0x1b, 0xa0, 0x0d, 0x89, 0xb8, 0xe8, 0xe2, 0x4e, 0x11, 0xb2, 0x74, 0x73, 0x85, 0x74, 0xe9, - 0x62, 0x50, 0x32, 0xa3, 0xa8, 0x95, 0x44, 0xc3, 0xa2, 0x8d, 0xea, 0x0d, 0x3a, 0x66, 0x0c, 0xd0, - 0xc5, 0x0f, 0xd1, 0x87, 0x08, 0x3a, 0x65, 0xec, 0xa4, 0x16, 0xf6, 0xd2, 0x59, 0x4f, 0x50, 0x48, - 0x24, 0x13, 0xb4, 0xd9, 0xc8, 0x7b, 0xbe, 0x7b, 0xee, 0xd5, 0xa1, 0xc0, 0xf3, 0x29, 0xcf, 0x53, - 0x91, 0xd3, 0xd9, 0x5c, 0x5c, 0xc4, 0x09, 0xcf, 0xe9, 0x72, 0x48, 0x53, 0x31, 0xe5, 0x49, 0x3e, - 0xd1, 0x25, 0x32, 0x9b, 0x0b, 0x29, 0x20, 0x54, 0x20, 0x31, 0x20, 0x59, 0x0e, 0xfb, 0xbd, 0x48, - 0x44, 0xa2, 0x91, 0x69, 0x7d, 0x52, 0x64, 0xff, 0x69, 0x24, 0x44, 0x94, 0x70, 0xda, 0xdc, 0x82, - 0xc5, 0x05, 0x65, 0x59, 0xa1, 0x25, 0xf4, 0xaf, 0x24, 0xe3, 0x94, 0xe7, 0x92, 0xa5, 0x33, 0xd3, - 0x1b, 0x8a, 0x7a, 0xca, 0x44, 0x99, 0xaa, 0x8b, 0x92, 0xf0, 0xd7, 0x16, 0xe8, 0x8c, 0xd5, 0x70, - 0x38, 0x06, 0x1d, 0x16, 0x86, 0x62, 0x91, 0x49, 0xc7, 0x1e, 0xd8, 0x47, 0xbb, 0xc3, 0x1e, 0x51, - 0xce, 0xc4, 0x38, 0x93, 0xd3, 0xac, 0xf0, 0x06, 0xdf, 0xbf, 0x1d, 0x1f, 0x6a, 0x13, 0xb6, 0x90, - 0x97, 0x64, 0x79, 0x12, 0x70, 0xc9, 0x4e, 0xc8, 0xa9, 0x6a, 0x7e, 0xeb, 0x1b, 0x1b, 0xf8, 0x02, - 0xb4, 0xa7, 0x92, 0x45, 0xce, 0x7f, 0x03, 0xfb, 0x68, 0xc7, 0x3b, 0x58, 0x97, 0xa8, 0x7d, 0x76, - 0xce, 0xa2, 0xaa, 0x44, 0xbb, 0x05, 0x4b, 0x93, 0x11, 0xae, 0x55, 0xec, 0x37, 0x10, 0xa4, 0xa0, - 0x9b, 0xc5, 0xe1, 0xa7, 0x8c, 0xa5, 0xdc, 0x69, 0x35, 0x0d, 0x4f, 0xaa, 0x12, 0x3d, 0x52, 0xa0, - 0x51, 0xb0, 0x7f, 0x07, 0xc1, 0x01, 0x68, 0x05, 0xb1, 0x70, 0xda, 0x0d, 0xbb, 0x5f, 0x95, 0x08, - 0x28, 0x36, 0x88, 0x05, 0xf6, 0x6b, 0x09, 0xbe, 0x03, 0xdd, 0x59, 0x1c, 0xca, 0xc5, 0x9c, 0xe7, - 0xce, 0x56, 0xf3, 0x49, 0x87, 0xe4, 0x61, 0xe2, 0x64, 0xac, 0x19, 0xef, 0xe0, 0xa6, 0x44, 0xd6, - 0xfd, 0x50, 0xd3, 0x8b, 0xfd, 0x3b, 0x1b, 0xc8, 0xc0, 0xff, 0xe1, 0x9c, 0x33, 0x19, 0x8b, 0x6c, - 0x32, 0x65, 0x92, 0x3b, 0xdb, 0x8d, 0x6f, 0xff, 0x41, 0x54, 0xe7, 0xe6, 0x11, 0xbc, 0x81, 0x76, - 0xed, 0x29, 0xd7, 0xbf, 0xda, 0xf1, 0xd5, 0x4f, 0x64, 0xfb, 0x7b, 0xa6, 0x76, 0xc6, 0x24, 0x1f, - 0x75, 0xbf, 0xac, 0x90, 0x75, 0xbd, 0x42, 0x16, 0xfe, 0x08, 0xba, 0x66, 0x37, 0xf8, 0x12, 0x74, - 0xf4, 0xce, 0xcd, 0xeb, 0xec, 0x78, 0xb0, 0x2a, 0xd1, 0xbe, 0x5e, 0x54, 0x09, 0xd8, 0x37, 0x08, - 0x7c, 0x06, 0xb6, 0x42, 0xb1, 0xe4, 0x73, 0x1d, 0xfd, 0xe3, 0xaa, 0x44, 0x7b, 0x7a, 0x7c, 0x5d, - 0xc6, 0xbe, 0x92, 0x47, 0xdd, 0xeb, 0x15, 0xb2, 0x7f, 0xaf, 0x90, 0xed, 0xbd, 0xbf, 0x59, 0xbb, - 0xf6, 0xed, 0xda, 0xb5, 0x7f, 0xad, 0x5d, 0xfb, 0x6a, 0xe3, 0x5a, 0xb7, 0x1b, 0xd7, 0xfa, 0xb1, - 0x71, 0xad, 0x0f, 0x6f, 0xa2, 0x58, 0x5e, 0x2e, 0x02, 0x12, 0x8a, 0x94, 0xaa, 0xf4, 0x8e, 0x13, - 0x16, 0xe4, 0xfa, 0x4c, 0x97, 0xaf, 0xe9, 0xe7, 0xfb, 0x3f, 0x3d, 0xe1, 0x11, 0x0b, 0x8b, 0xba, - 0x28, 0x8b, 0x19, 0xcf, 0x83, 0xed, 0x26, 0x90, 0x57, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa4, - 0x50, 0xd6, 0x01, 0x13, 0x03, 0x00, 0x00, + // 504 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xb1, 0x6e, 0xd3, 0x40, + 0x18, 0xc7, 0x6d, 0x9a, 0x36, 0xe9, 0xb5, 0x14, 0x74, 0x44, 0xaa, 0x89, 0x2a, 0x5f, 0x74, 0x03, + 0x54, 0x82, 0xde, 0xa9, 0x41, 0x30, 0x84, 0xa9, 0x56, 0x17, 0xb6, 0x60, 0x95, 0x85, 0x25, 0x3a, + 0x3b, 0x57, 0xd7, 0x60, 0xfb, 0xa2, 0xf8, 0x62, 0x91, 0x37, 0x60, 0xec, 0x58, 0x89, 0x25, 0x0f, + 0xc1, 0x43, 0x54, 0x4c, 0x1d, 0x99, 0x0c, 0x4a, 0x16, 0x66, 0x3f, 0x01, 0xb2, 0xef, 0xae, 0x15, + 0x74, 0xbb, 0xfb, 0xfe, 0xbf, 0xef, 0xff, 0x7d, 0xfe, 0x9f, 0xc1, 0xf3, 0x09, 0xcf, 0x53, 0x91, + 0xd3, 0xe9, 0x4c, 0x9c, 0xc7, 0x09, 0xcf, 0x69, 0x31, 0xa0, 0xa9, 0x98, 0xf0, 0x24, 0x1f, 0xeb, + 0x12, 0x99, 0xce, 0x84, 0x14, 0x10, 0x2a, 0x90, 0x18, 0x90, 0x14, 0x83, 0x5e, 0x37, 0x12, 0x91, + 0x68, 0x64, 0x5a, 0x9f, 0x14, 0xd9, 0x7b, 0x1a, 0x09, 0x11, 0x25, 0x9c, 0x36, 0xb7, 0x60, 0x7e, + 0x4e, 0x59, 0xb6, 0xd0, 0x12, 0xfa, 0x5f, 0x92, 0x71, 0xca, 0x73, 0xc9, 0xd2, 0xa9, 0xe9, 0x0d, + 0x45, 0x3d, 0x65, 0xac, 0x4c, 0xd5, 0x45, 0x49, 0xf8, 0xdb, 0x06, 0x68, 0x8f, 0xd4, 0x70, 0x38, + 0x02, 0x6d, 0x16, 0x86, 0x62, 0x9e, 0x49, 0xc7, 0xee, 0xdb, 0x87, 0x3b, 0x83, 0x2e, 0x51, 0xce, + 0xc4, 0x38, 0x93, 0x93, 0x6c, 0xe1, 0xf5, 0x7f, 0x7c, 0x3f, 0x3a, 0xd0, 0x26, 0x6c, 0x2e, 0x2f, + 0x48, 0x71, 0x1c, 0x70, 0xc9, 0x8e, 0xc9, 0x89, 0x6a, 0x7e, 0xe7, 0x1b, 0x1b, 0xf8, 0x02, 0xb4, + 0x26, 0x92, 0x45, 0xce, 0x83, 0xbe, 0x7d, 0xb8, 0xed, 0xed, 0xaf, 0x4a, 0xd4, 0x3a, 0x3d, 0x63, + 0x51, 0x55, 0xa2, 0x9d, 0x05, 0x4b, 0x93, 0x21, 0xae, 0x55, 0xec, 0x37, 0x10, 0xa4, 0xa0, 0x93, + 0xc5, 0xe1, 0xe7, 0x8c, 0xa5, 0xdc, 0xd9, 0x68, 0x1a, 0x9e, 0x54, 0x25, 0x7a, 0xa4, 0x40, 0xa3, + 0x60, 0xff, 0x16, 0x82, 0x7d, 0xb0, 0x11, 0xc4, 0xc2, 0x69, 0x35, 0xec, 0x5e, 0x55, 0x22, 0xa0, + 0xd8, 0x20, 0x16, 0xd8, 0xaf, 0x25, 0xf8, 0x1e, 0x74, 0xa6, 0x71, 0x28, 0xe7, 0x33, 0x9e, 0x3b, + 0x9b, 0xcd, 0x27, 0x1d, 0x90, 0xfb, 0x89, 0x93, 0x91, 0x66, 0xbc, 0xfd, 0xeb, 0x12, 0x59, 0x77, + 0x43, 0x4d, 0x2f, 0xf6, 0x6f, 0x6d, 0x20, 0x03, 0x0f, 0xc3, 0x19, 0x67, 0x32, 0x16, 0xd9, 0x78, + 0xc2, 0x24, 0x77, 0xb6, 0x1a, 0xdf, 0xde, 0xbd, 0xa8, 0xce, 0xcc, 0x23, 0x78, 0x7d, 0xed, 0xda, + 0x55, 0xae, 0xff, 0xb4, 0xe3, 0xcb, 0x5f, 0xc8, 0xf6, 0x77, 0x4d, 0xed, 0x94, 0x49, 0x3e, 0xec, + 0x7c, 0x5d, 0x22, 0xeb, 0x6a, 0x89, 0x2c, 0xfc, 0x09, 0x74, 0xcc, 0x6e, 0xf0, 0x25, 0x68, 0xeb, + 0x9d, 0x9b, 0xd7, 0xd9, 0xf6, 0x60, 0x55, 0xa2, 0x3d, 0xbd, 0xa8, 0x12, 0xb0, 0x6f, 0x10, 0xf8, + 0x0c, 0x6c, 0x86, 0xa2, 0xe0, 0x33, 0x1d, 0xfd, 0xe3, 0xaa, 0x44, 0xbb, 0x7a, 0x7c, 0x5d, 0xc6, + 0xbe, 0x92, 0x87, 0x9d, 0xab, 0x25, 0xb2, 0xff, 0x2c, 0x91, 0xed, 0x7d, 0xb8, 0x5e, 0xb9, 0xf6, + 0xcd, 0xca, 0xb5, 0x7f, 0xaf, 0x5c, 0xfb, 0x72, 0xed, 0x5a, 0x37, 0x6b, 0xd7, 0xfa, 0xb9, 0x76, + 0xad, 0x8f, 0x6f, 0xa3, 0x58, 0x5e, 0xcc, 0x03, 0x12, 0x8a, 0x94, 0xaa, 0xf4, 0x8e, 0x12, 0x16, + 0xe4, 0xfa, 0x4c, 0x8b, 0x37, 0xf4, 0xcb, 0xdd, 0x9f, 0x9e, 0xf0, 0x88, 0x85, 0x0b, 0x5a, 0xbc, + 0xa6, 0x72, 0x31, 0xe5, 0x79, 0xb0, 0xd5, 0x04, 0xf2, 0xea, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x5a, 0x2b, 0x36, 0x65, 0x13, 0x03, 0x00, 0x00, } func (this *Pictures) Equal(that interface{}) bool { diff --git a/x/profiles/legacy/v6/store.go b/x/profiles/legacy/v6/store.go index 9fe09d04af..cccfba76ce 100644 --- a/x/profiles/legacy/v6/store.go +++ b/x/profiles/legacy/v6/store.go @@ -3,19 +3,18 @@ package v6 import ( "fmt" + storetypes "cosmossdk.io/store/types" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/types/tx/signing" v5types "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v5/types" - "github.com/cosmos/cosmos-sdk/store/prefix" + "cosmossdk.io/store/prefix" "github.com/cosmos/cosmos-sdk/codec" 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" "github.com/desmos-labs/desmos/v6/x/profiles/types" ) @@ -60,7 +59,7 @@ func MigrateStore(ctx sdk.Context, ak authkeeper.AccountKeeper, storeKey storety // The migration from v5 to v6 is skipped because the two types are identical (from v5 to v6 no changes were made). func migrateProfiles(ctx sdk.Context, ak authkeeper.AccountKeeper) error { var profiles []*v5types.Profile - ak.IterateAccounts(ctx, func(account authtypes.AccountI) (stop bool) { + ak.IterateAccounts(ctx, func(account sdk.AccountI) (stop bool) { if profile, ok := account.(*v5types.Profile); ok { profiles = append(profiles, profile) } @@ -90,7 +89,7 @@ func migrateProfiles(ctx sdk.Context, ak authkeeper.AccountKeeper) error { // migrateApplicationLinks migrates the application links from v5 to v7 adding the expiration date properly. // The migration from v5 to v6 is skipped because the two types are identical (from v5 to v6 no changes were made). -func migrateApplicationLinks(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateApplicationLinks(store storetypes.KVStore, cdc codec.BinaryCodec) error { appLinksStore := prefix.NewStore(store, types.ApplicationLinkPrefix) iterator := appLinksStore.Iterator(nil, nil) @@ -177,7 +176,7 @@ func convertApplicationLinkResult(v5Result *v5types.Result) *types.Result { // migrateChainLinks migrates the chain links from v5 to v7 by changing the various Protobuf interface types. // The migration from v5 to v6 is skipped because the two types are identical (from v5 to v6 no changes were made). -func migrateChainLinks(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateChainLinks(store storetypes.KVStore, cdc codec.BinaryCodec) error { appLinksStore := prefix.NewStore(store, types.ChainLinksPrefix) iterator := appLinksStore.Iterator(nil, nil) @@ -298,7 +297,7 @@ func convertChainLinkSignatureData(data *codectypes.Any, cdc codec.BinaryCodec) } // setDefaultExternalAddresses set the default external address of each chain for each owner -func setDefaultExternalAddresses(store sdk.KVStore, cdc codec.BinaryCodec) error { +func setDefaultExternalAddresses(store storetypes.KVStore, cdc codec.BinaryCodec) error { chainLinkStore := prefix.NewStore(store, types.ChainLinksPrefix) chainLinksIterator := chainLinkStore.Iterator(nil, nil) defer chainLinksIterator.Close() diff --git a/x/profiles/legacy/v6/store_test.go b/x/profiles/legacy/v6/store_test.go index cbe64973f0..799546c1ac 100644 --- a/x/profiles/legacy/v6/store_test.go +++ b/x/profiles/legacy/v6/store_test.go @@ -5,21 +5,24 @@ import ( "testing" "time" + "github.com/cosmos/cosmos-sdk/codec/address" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" + "github.com/cosmos/cosmos-sdk/runtime" v5types "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v5/types" v6 "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v6" "github.com/desmos-labs/desmos/v6/testutil/profilestesting" - dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + dbm "github.com/cosmos/cosmos-db" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" @@ -35,7 +38,7 @@ func buildContext( keys map[string]*storetypes.KVStoreKey, tKeys map[string]*storetypes.TransientStoreKey, memKeys map[string]*storetypes.MemoryStoreKey, ) sdk.Context { db := dbm.NewMemDB() - cms := store.NewCommitMultiStore(db) + cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) } @@ -58,16 +61,17 @@ func TestMigrateStore(t *testing.T) { cdc, legacyAmino := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(authtypes.StoreKey, types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(authtypes.StoreKey, types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) // Build the x/auth keeper authKeeper := authkeeper.NewAccountKeeper( cdc, - keys[authtypes.StoreKey], + runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, app.GetMaccPerms(), + address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String(), ) diff --git a/x/profiles/legacy/v7/store_test.go b/x/profiles/legacy/v7/store_test.go index 9e2fec8ce5..03f269024b 100644 --- a/x/profiles/legacy/v7/store_test.go +++ b/x/profiles/legacy/v7/store_test.go @@ -5,15 +5,16 @@ import ( v7 "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v7" - dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + dbm "github.com/cosmos/cosmos-db" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -26,7 +27,7 @@ func buildContext( keys map[string]*storetypes.KVStoreKey, tKeys map[string]*storetypes.TransientStoreKey, memKeys map[string]*storetypes.MemoryStoreKey, ) sdk.Context { db := dbm.NewMemDB() - cms := store.NewCommitMultiStore(db) + cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) } @@ -49,9 +50,9 @@ func TestMigrateStore(t *testing.T) { cdc, legacyAmino := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(authtypes.StoreKey, paramstypes.StoreKey, types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(authtypes.StoreKey, paramstypes.StoreKey, types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) // Get the params subspace paramsKeeper := paramskeeper.NewKeeper(cdc, legacyAmino, keys[paramstypes.StoreKey], tKeys[paramstypes.TStoreKey]) diff --git a/x/profiles/legacy/v8/store.go b/x/profiles/legacy/v8/store.go index 39c38cd46f..a5f4c53d50 100644 --- a/x/profiles/legacy/v8/store.go +++ b/x/profiles/legacy/v8/store.go @@ -5,9 +5,9 @@ import ( "encoding/hex" "fmt" + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" "github.com/cosmos/cosmos-sdk/codec" @@ -37,7 +37,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar // During the migration from v6 to v7 there was an error which ended up setting all chain link value types to // SIGNATURE_VALUE_TYPE_COSMOS_DIRECT. This script fixes that by setting the proper value type based on the plain // text encode that has been used when creating the signature. -func migrateChainLinks(store sdk.KVStore, cdc codec.BinaryCodec, amino *codec.LegacyAmino) error { +func migrateChainLinks(store storetypes.KVStore, cdc codec.BinaryCodec, amino *codec.LegacyAmino) error { chainLinksStore := prefix.NewStore(store, types.ChainLinksPrefix) iterator := chainLinksStore.Iterator(nil, nil) diff --git a/x/profiles/legacy/v8/store_test.go b/x/profiles/legacy/v8/store_test.go index e11d482447..e4a7e96b2f 100644 --- a/x/profiles/legacy/v8/store_test.go +++ b/x/profiles/legacy/v8/store_test.go @@ -9,14 +9,15 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" - dbm "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + dbm "github.com/cosmos/cosmos-db" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -29,7 +30,7 @@ func buildContext( keys map[string]*storetypes.KVStoreKey, tKeys map[string]*storetypes.TransientStoreKey, memKeys map[string]*storetypes.MemoryStoreKey, ) sdk.Context { db := dbm.NewMemDB() - cms := store.NewCommitMultiStore(db) + cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db) } @@ -52,9 +53,9 @@ func TestMigrateStore(t *testing.T) { cdc, legacyAmino := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(authtypes.StoreKey, types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(authtypes.StoreKey, types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) pubKey := secp256k1.GenPrivKey().PubKey() testCases := []struct { diff --git a/x/profiles/legacy/v9/store.go b/x/profiles/legacy/v9/store.go index 62f1802496..332363e274 100644 --- a/x/profiles/legacy/v9/store.go +++ b/x/profiles/legacy/v9/store.go @@ -1,8 +1,8 @@ package v9 import ( + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/profiles/types" diff --git a/x/profiles/legacy/v9/store_test.go b/x/profiles/legacy/v9/store_test.go index 99d7b91f08..955063829f 100644 --- a/x/profiles/legacy/v9/store_test.go +++ b/x/profiles/legacy/v9/store_test.go @@ -3,6 +3,7 @@ package v9_test import ( "testing" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" @@ -30,7 +31,7 @@ func (ms mockSubspace) GetParamSet(ctx sdk.Context, ps paramstypes.ParamSet) { func TestMigrate(t *testing.T) { cdc, _ := app.MakeCodecs() - keys := sdk.NewKVStoreKeys(types.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) testCases := []struct { name string diff --git a/x/profiles/module.go b/x/profiles/module.go index a278c414ef..a18585f026 100644 --- a/x/profiles/module.go +++ b/x/profiles/module.go @@ -8,9 +8,9 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/depinject" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -48,7 +48,7 @@ var ( _ module.AppModuleBasic = AppModuleBasic{} _ module.AppModuleSimulation = AppModule{} _ appmodule.AppModule = AppModule{} - _ depinject.OnePerModuleType = AppModule{} + _ appmodule.HasBeginBlocker = AppModule{} ) // AppModuleBasic defines the basic application module used by the profiles module. @@ -203,14 +203,10 @@ func (AppModule) ConsensusVersion() uint64 { } // BeginBlock returns the begin blocker for the profiles module. -func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { - BeginBlocker(ctx, am.keeper) -} - -// EndBlock returns the end blocker for the profiles module. It returns no validator -// updates. -func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return []abci.ValidatorUpdate{} +func (am AppModule) BeginBlock(ctx context.Context) error { + sdkCtx := sdk.UnwrapSDKContext(ctx) + BeginBlocker(sdkCtx, am.keeper) + return nil } // -------------------------------------------------------------------------------------------------------------------- @@ -229,7 +225,7 @@ func (AppModule) ProposalMsgs(simState module.SimulationState) []simtypes.Weight } // RegisterStoreDecoder performs a no-op. -func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { +func (am AppModule) RegisterStoreDecoder(sdr simtypes.StoreDecoderRegistry) { sdr[types.ModuleName] = simulation.NewDecodeStore(am.cdc) } diff --git a/x/profiles/simulation/operations.go b/x/profiles/simulation/operations.go index 2c6d1374eb..5771c56082 100644 --- a/x/profiles/simulation/operations.go +++ b/x/profiles/simulation/operations.go @@ -39,63 +39,63 @@ func WeightedOperations( k *keeper.Keeper, ak authkeeper.AccountKeeper, bk bankkeeper.Keeper, ) sim.WeightedOperations { var weightMsgSaveProfile int - appParams.GetOrGenerate(cdc, OpWeightMsgSaveProfile, &weightMsgSaveProfile, nil, + appParams.GetOrGenerate(OpWeightMsgSaveProfile, &weightMsgSaveProfile, nil, func(_ *rand.Rand) { weightMsgSaveProfile = params.DefaultWeightMsgSaveProfile }, ) var weightMsgDeleteProfile int - appParams.GetOrGenerate(cdc, OpWeightMsgDeleteProfile, &weightMsgDeleteProfile, nil, + appParams.GetOrGenerate(OpWeightMsgDeleteProfile, &weightMsgDeleteProfile, nil, func(_ *rand.Rand) { weightMsgDeleteProfile = params.DefaultWeightMsgDeleteProfile }, ) var weightMsgRequestDTagTransfer int - appParams.GetOrGenerate(cdc, OpWeightMsgRequestDTagTransfer, &weightMsgRequestDTagTransfer, nil, + appParams.GetOrGenerate(OpWeightMsgRequestDTagTransfer, &weightMsgRequestDTagTransfer, nil, func(_ *rand.Rand) { weightMsgRequestDTagTransfer = params.DefaultWeightMsgRequestDTagTransfer }, ) var weightMsgAcceptDTagTransfer int - appParams.GetOrGenerate(cdc, OpWeightMsgAcceptDTagTransfer, &weightMsgAcceptDTagTransfer, nil, + appParams.GetOrGenerate(OpWeightMsgAcceptDTagTransfer, &weightMsgAcceptDTagTransfer, nil, func(_ *rand.Rand) { weightMsgAcceptDTagTransfer = params.DefaultWeightMsgAcceptDTagTransfer }, ) var weightMsgRefuseDTagTransfer int - appParams.GetOrGenerate(cdc, OpWeightMsgRefuseDTagTransfer, &weightMsgRefuseDTagTransfer, nil, + appParams.GetOrGenerate(OpWeightMsgRefuseDTagTransfer, &weightMsgRefuseDTagTransfer, nil, func(r *rand.Rand) { weightMsgRefuseDTagTransfer = params.DefaultWeightMsgRefuseDTagTransfer }, ) var weightMsgCancelDTagTransfer int - appParams.GetOrGenerate(cdc, OpWeightMsgCancelDTagTransfer, &weightMsgCancelDTagTransfer, nil, + appParams.GetOrGenerate(OpWeightMsgCancelDTagTransfer, &weightMsgCancelDTagTransfer, nil, func(r *rand.Rand) { weightMsgCancelDTagTransfer = params.DefaultWeightMsgCancelDTagTransfer }, ) var weightMsgLinkChainAccount int - appParams.GetOrGenerate(cdc, OpWeightMsgLinkChainAccount, &weightMsgLinkChainAccount, nil, + appParams.GetOrGenerate(OpWeightMsgLinkChainAccount, &weightMsgLinkChainAccount, nil, func(r *rand.Rand) { weightMsgLinkChainAccount = params.DefaultWeightMsgLinkChainAccount }, ) var weightMsgUnlinkChainAccount int - appParams.GetOrGenerate(cdc, OpWeightMsgUnlinkChainAccount, &weightMsgUnlinkChainAccount, nil, + appParams.GetOrGenerate(OpWeightMsgUnlinkChainAccount, &weightMsgUnlinkChainAccount, nil, func(r *rand.Rand) { weightMsgUnlinkChainAccount = params.DefaultWeightMsgUnlinkChainAccount }, ) var weightMsgSetDefaultExternalAddress int - appParams.GetOrGenerate(cdc, OpWeightMsgLinkChainAccount, &weightMsgSetDefaultExternalAddress, nil, + appParams.GetOrGenerate(OpWeightMsgLinkChainAccount, &weightMsgSetDefaultExternalAddress, nil, func(r *rand.Rand) { weightMsgSetDefaultExternalAddress = params.DefaultWeightMsgSetDefaultExternalAddress }, diff --git a/x/profiles/simulation/utils.go b/x/profiles/simulation/utils.go index ace6bbd90d..06dc7495ba 100644 --- a/x/profiles/simulation/utils.go +++ b/x/profiles/simulation/utils.go @@ -6,6 +6,7 @@ import ( "math/rand" "time" + "cosmossdk.io/math" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -46,14 +47,14 @@ var ( } feeCoins = sdk.NewCoins( - sdk.NewCoin("band", sdk.NewInt(10)), - sdk.NewCoin("atom", sdk.NewInt(10)), - sdk.NewCoin("desmos", sdk.NewInt(10)), - sdk.NewCoin("akt", sdk.NewInt(10)), - sdk.NewCoin("dvpn", sdk.NewInt(10)), - sdk.NewCoin("daric", sdk.NewInt(10)), - sdk.NewCoin("osmo", sdk.NewInt(10)), - sdk.NewCoin("regen", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), + sdk.NewCoin("atom", math.NewInt(10)), + sdk.NewCoin("desmos", math.NewInt(10)), + sdk.NewCoin("akt", math.NewInt(10)), + sdk.NewCoin("dvpn", math.NewInt(10)), + sdk.NewCoin("daric", math.NewInt(10)), + sdk.NewCoin("osmo", math.NewInt(10)), + sdk.NewCoin("regen", math.NewInt(10)), ) ) @@ -75,7 +76,7 @@ func NewRandomProfiles(r *rand.Rand, accounts []simtypes.Account, number int) [] // NewRandomProfile return a random ProfileData from random data and the given account // //nolint:interfacer -func NewRandomProfile(r *rand.Rand, account authtypes.AccountI) *types.Profile { +func NewRandomProfile(r *rand.Rand, account sdk.AccountI) *types.Profile { profile, err := types.NewProfile( RandomDTag(r), RandomNickname(r), @@ -149,21 +150,21 @@ func GetSimAccount(address sdk.Address, accs []simtypes.Account) *simtypes.Accou // RandomNicknameParams return a random set of nickname params func RandomNicknameParams(r *rand.Rand) types.NicknameParams { - randomMin := sdk.NewInt(int64(simtypes.RandIntBetween(r, 2, 3))) - randomMax := sdk.NewInt(int64(simtypes.RandIntBetween(r, 30, 1000))) + randomMin := math.NewInt(int64(simtypes.RandIntBetween(r, 2, 3))) + randomMax := math.NewInt(int64(simtypes.RandIntBetween(r, 30, 1000))) return types.NewNicknameParams(randomMin, randomMax) } // RandomDTagParams return a random set of nickname params func RandomDTagParams(r *rand.Rand) types.DTagParams { - randomMin := sdk.NewInt(int64(simtypes.RandIntBetween(r, 3, 4))) - randomMax := sdk.NewInt(int64(simtypes.RandIntBetween(r, 30, 50))) + randomMin := math.NewInt(int64(simtypes.RandIntBetween(r, 3, 4))) + randomMax := math.NewInt(int64(simtypes.RandIntBetween(r, 30, 50))) return types.NewDTagParams("^[A-Za-z0-9_]+$", randomMin, randomMax) } // RandomBioParams return a random biography param func RandomBioParams(r *rand.Rand) types.BioParams { - randomMax := sdk.NewInt(int64(simtypes.RandIntBetween(r, 500, 1000))) + randomMax := math.NewInt(int64(simtypes.RandIntBetween(r, 500, 1000))) return types.NewBioParams(randomMax) } diff --git a/x/profiles/testutil/expected_keepers_mocks.go b/x/profiles/testutil/expected_keepers_mocks.go index d4852fd666..ed510caa9f 100644 --- a/x/profiles/testutil/expected_keepers_mocks.go +++ b/x/profiles/testutil/expected_keepers_mocks.go @@ -8,11 +8,11 @@ import ( reflect "reflect" types "github.com/cosmos/cosmos-sdk/types" - types0 "github.com/cosmos/cosmos-sdk/x/capability/types" - types1 "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - types2 "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" - types3 "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - exported "github.com/cosmos/ibc-go/v7/modules/core/exported" + types0 "github.com/cosmos/ibc-go/modules/capability/types" + types1 "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + types2 "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types" + types3 "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" + exported "github.com/cosmos/ibc-go/v8/modules/core/exported" gomock "github.com/golang/mock/gomock" ) diff --git a/x/profiles/types/account.go b/x/profiles/types/account.go index bad3ed8a95..5838d5958e 100644 --- a/x/profiles/types/account.go +++ b/x/profiles/types/account.go @@ -17,7 +17,7 @@ import ( ) var ( - _ authtypes.AccountI = (*Profile)(nil) + _ sdk.AccountI = (*Profile)(nil) _ authtypes.GenesisAccount = (*Profile)(nil) _ exported.VestingAccount = (*Profile)(nil) ) @@ -25,7 +25,7 @@ var ( // NewProfile builds a new profile having the given DTag, creator and creation date func NewProfile( dTag string, nickname, bio string, pictures Pictures, creationDate time.Time, - account authtypes.AccountI, + account sdk.AccountI, ) (*Profile, error) { // Make sure myAccount is a proto.Message, e.g. a BaseAccount etc. protoAccount, ok := account.(proto.Message) @@ -49,7 +49,7 @@ func NewProfile( } // NewProfileFromAccount allows to build a new Profile instance from a provided DTag, and account and a creation time -func NewProfileFromAccount(dTag string, account authtypes.AccountI, creationTime time.Time) (*Profile, error) { +func NewProfileFromAccount(dTag string, account sdk.AccountI, creationTime time.Time) (*Profile, error) { return NewProfile( dTag, "", @@ -60,9 +60,9 @@ func NewProfileFromAccount(dTag string, account authtypes.AccountI, creationTime ) } -// GetAccount returns the underlying account as an authtypes.AccountI instance -func (p *Profile) GetAccount() authtypes.AccountI { - return p.Account.GetCachedValue().(authtypes.AccountI) +// GetAccount returns the underlying account as an sdk.AccountI instance +func (p *Profile) GetAccount() sdk.AccountI { + return p.Account.GetCachedValue().(sdk.AccountI) } // getVestingAccount returns the underlying account as an exported.VestingAccount instance @@ -76,7 +76,7 @@ func (p *Profile) getVestingAccount() exported.VestingAccount { // setAccount sets the given account as the underlying account instance. // This should be called after updating anything about the account (eg. after calling SetSequence). -func (p *Profile) setAccount(account authtypes.AccountI) error { +func (p *Profile) setAccount(account sdk.AccountI) error { accAny, err := codectypes.NewAnyWithValue(account) if err != nil { return err @@ -86,12 +86,12 @@ func (p *Profile) setAccount(account authtypes.AccountI) error { return nil } -// GetAddress implements authtypes.AccountI +// GetAddress implements sdk.AccountI func (p *Profile) GetAddress() sdk.AccAddress { return p.GetAccount().GetAddress() } -// SetAddress implements authtypes.AccountI +// SetAddress implements sdk.AccountI func (p *Profile) SetAddress(addr sdk.AccAddress) error { acc := p.GetAccount() err := acc.SetAddress(addr) @@ -102,12 +102,12 @@ func (p *Profile) SetAddress(addr sdk.AccAddress) error { return p.setAccount(acc) } -// GetPubKey implements authtypes.AccountI +// GetPubKey implements sdk.AccountI func (p *Profile) GetPubKey() cryptotypes.PubKey { return p.GetAccount().GetPubKey() } -// SetPubKey implements authtypes.AccountI +// SetPubKey implements sdk.AccountI func (p *Profile) SetPubKey(pubKey cryptotypes.PubKey) error { acc := p.GetAccount() err := acc.SetPubKey(pubKey) @@ -118,12 +118,12 @@ func (p *Profile) SetPubKey(pubKey cryptotypes.PubKey) error { return p.setAccount(acc) } -// GetAccountNumber implements authtypes.AccountI +// GetAccountNumber implements sdk.AccountI func (p *Profile) GetAccountNumber() uint64 { return p.GetAccount().GetAccountNumber() } -// SetAccountNumber implements authtypes.AccountI +// SetAccountNumber implements sdk.AccountI func (p *Profile) SetAccountNumber(accountNumber uint64) error { acc := p.GetAccount() err := acc.SetAccountNumber(accountNumber) @@ -134,12 +134,12 @@ func (p *Profile) SetAccountNumber(accountNumber uint64) error { return p.setAccount(acc) } -// GetSequence implements authtypes.AccountI +// GetSequence implements sdk.AccountI func (p *Profile) GetSequence() uint64 { return p.GetAccount().GetSequence() } -// SetSequence implements authtypes.AccountI +// SetSequence implements sdk.AccountI func (p *Profile) SetSequence(sequence uint64) error { acc := p.GetAccount() err := acc.SetSequence(sequence) @@ -253,7 +253,7 @@ func (p *Profile) GetDelegatedVesting() sdk.Coins { // UnpackInterfaces implements codectypes.UnpackInterfacesMessage func (p *Profile) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { if p.Account != nil { - var account authtypes.AccountI + var account sdk.AccountI err := unpacker.UnpackAny(p.Account, &account) if err != nil { return err @@ -306,7 +306,7 @@ type profilePretty struct { CreationDate time.Time `json:"creation_date" yaml:"creation_date"` } -// String implements authtypes.AccountIย implements stringer +// String implements sdk.AccountIย implements stringer func (p *Profile) String() string { out, _ := p.MarshalYAML() return out.(string) diff --git a/x/profiles/types/account_test.go b/x/profiles/types/account_test.go index 112a9865ce..617ae26ce2 100644 --- a/x/profiles/types/account_test.go +++ b/x/profiles/types/account_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + "cosmossdk.io/math" codectypes "github.com/cosmos/cosmos-sdk/codec/types" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" @@ -19,7 +20,7 @@ import ( func TestProfile_TrackDelegation(t *testing.T) { // Create a profile with vesting account - vestingAccount := vestingtypes.NewContinuousVestingAccount( + vestingAccount, _ := vestingtypes.NewContinuousVestingAccount( &authtypes.BaseAccount{ Address: "cosmos1tdgrkvx2qgjk0uqsmdhm6dcz6wvwh9f8t37x0k", PubKey: codectypes.UnsafePackAny( @@ -30,7 +31,7 @@ func TestProfile_TrackDelegation(t *testing.T) { AccountNumber: 0, Sequence: 0, }, - sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(1000))), + sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(1000))), time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC).Unix(), time.Date(2100, 9, 1, 0, 0, 0, 0, time.UTC).Unix(), ) @@ -46,10 +47,10 @@ func TestProfile_TrackDelegation(t *testing.T) { ) // Execute track delegation - profile.TrackDelegation(time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC), sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(2000))), sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100)))) + profile.TrackDelegation(time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC), sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(2000))), sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(100)))) // Setup expected vesting account - expected := vestingtypes.NewContinuousVestingAccount( + expected, _ := vestingtypes.NewContinuousVestingAccount( &authtypes.BaseAccount{ Address: "cosmos1tdgrkvx2qgjk0uqsmdhm6dcz6wvwh9f8t37x0k", PubKey: codectypes.UnsafePackAny( @@ -60,18 +61,18 @@ func TestProfile_TrackDelegation(t *testing.T) { AccountNumber: 0, Sequence: 0, }, - sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(1000))), + sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(1000))), time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC).Unix(), time.Date(2100, 9, 1, 0, 0, 0, 0, time.UTC).Unix(), ) - expected.TrackDelegation(time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC), sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(2000))), sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100)))) + expected.TrackDelegation(time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC), sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(2000))), sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(100)))) require.Equal(t, expected, profile.GetAccount()) } func TestProfile_TrackUndelegation(t *testing.T) { // Create a profile with vesting account - vestingAccount := vestingtypes.NewContinuousVestingAccount( + vestingAccount, _ := vestingtypes.NewContinuousVestingAccount( &authtypes.BaseAccount{ Address: "cosmos1tdgrkvx2qgjk0uqsmdhm6dcz6wvwh9f8t37x0k", PubKey: codectypes.UnsafePackAny( @@ -82,7 +83,7 @@ func TestProfile_TrackUndelegation(t *testing.T) { AccountNumber: 0, Sequence: 0, }, - sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(1000))), + sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(1000))), time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC).Unix(), time.Date(2100, 9, 1, 0, 0, 0, 0, time.UTC).Unix(), ) @@ -98,11 +99,11 @@ func TestProfile_TrackUndelegation(t *testing.T) { ) // Execute track delegation - profile.TrackDelegation(time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC), sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(2000))), sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(200)))) - profile.TrackUndelegation(sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100)))) + profile.TrackDelegation(time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC), sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(2000))), sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(200)))) + profile.TrackUndelegation(sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(100)))) // Setup expected vesting account - expected := vestingtypes.NewContinuousVestingAccount( + expected, _ := vestingtypes.NewContinuousVestingAccount( &authtypes.BaseAccount{ Address: "cosmos1tdgrkvx2qgjk0uqsmdhm6dcz6wvwh9f8t37x0k", PubKey: codectypes.UnsafePackAny( @@ -113,12 +114,12 @@ func TestProfile_TrackUndelegation(t *testing.T) { AccountNumber: 0, Sequence: 0, }, - sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(1000))), + sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(1000))), time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC).Unix(), time.Date(2100, 9, 1, 0, 0, 0, 0, time.UTC).Unix(), ) - expected.TrackDelegation(time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC), sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(2000))), sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(200)))) - expected.TrackUndelegation(sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100)))) + expected.TrackDelegation(time.Date(2023, 9, 1, 0, 0, 0, 0, time.UTC), sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(2000))), sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(200)))) + expected.TrackUndelegation(sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(100)))) require.Equal(t, expected, profile.GetAccount()) } @@ -431,7 +432,7 @@ func TestProfileSerialization(t *testing.T) { bz, err := cdc.MarshalInterface(profile) require.NoError(t, err) - var original authtypes.AccountI + var original sdk.AccountI err = cdc.UnmarshalInterface(bz, &original) require.NoError(t, err) @@ -457,7 +458,7 @@ func TestProfileSerialization(t *testing.T) { require.NoError(t, err) // Deserialize - var serialized authtypes.AccountI + var serialized sdk.AccountI err = cdc.UnmarshalInterface(bz, &serialized) require.NoError(t, err) diff --git a/x/profiles/types/codec.go b/x/profiles/types/codec.go index 0ed05f870d..973f29b569 100644 --- a/x/profiles/types/codec.go +++ b/x/profiles/types/codec.go @@ -4,14 +4,11 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" "github.com/cosmos/cosmos-sdk/codec/types" - cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/msgservice" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" - authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" - govcodec "github.com/cosmos/cosmos-sdk/x/gov/codec" "github.com/desmos-labs/desmos/v6/types/crypto/ethsecp256k1" ) @@ -49,7 +46,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { } func RegisterInterfaces(registry types.InterfaceRegistry) { - registry.RegisterImplementations((*authtypes.AccountI)(nil), &Profile{}) + registry.RegisterImplementations((*sdk.AccountI)(nil), &Profile{}) registry.RegisterImplementations((*exported.VestingAccount)(nil), &Profile{}) registry.RegisterImplementations((*authtypes.GenesisAccount)(nil), &Profile{}) registry.RegisterInterface( @@ -87,29 +84,3 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } - -var ( - amino = codec.NewLegacyAmino() - - // AminoCdc references the global x/profiles module codec. Note, the codec should - // ONLY be used in certain instances of tests and for JSON encoding as Amino is - // still used for that purpose. - // - // The actual codec used for serialization should be provided to x/profiles and - // defined at the application level. - AminoCdc = codec.NewAminoCodec(amino) -) - -func init() { - RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) - sdk.RegisterLegacyAminoCodec(amino) - - // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be - // used to properly serialize MsgGrant and MsgExec instances - RegisterLegacyAminoCodec(authzcodec.Amino) - - // Register all Amino interfaces and concrete types on the gov Amino codec so that this can later be - // used to properly serialize MsgSubmitProposal instances - RegisterLegacyAminoCodec(govcodec.Amino) -} diff --git a/x/profiles/types/expected_keepers.go b/x/profiles/types/expected_keepers.go index d4f9985316..9f0d6b09f0 100644 --- a/x/profiles/types/expected_keepers.go +++ b/x/profiles/types/expected_keepers.go @@ -2,11 +2,11 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - connectiontypes "github.com/cosmos/ibc-go/v7/modules/core/03-connection/types" - channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" - ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + connectiontypes "github.com/cosmos/ibc-go/v8/modules/core/03-connection/types" + channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" + ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" ) // DONTCOVER diff --git a/x/profiles/types/genesis.go b/x/profiles/types/genesis.go index 26e317ca94..b77fcb70b7 100644 --- a/x/profiles/types/genesis.go +++ b/x/profiles/types/genesis.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + host "github.com/cosmos/ibc-go/v8/modules/core/24-host" ) // NewGenesisState creates a new genesis state diff --git a/x/profiles/types/genesis.pb.go b/x/profiles/types/genesis.pb.go index f0cfa85648..7521835883 100644 --- a/x/profiles/types/genesis.pb.go +++ b/x/profiles/types/genesis.pb.go @@ -140,42 +140,42 @@ var fileDescriptor_bd22d098f73f0a1c = []byte{ // 607 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x3f, 0x6f, 0xd3, 0x40, 0x18, 0xc6, 0xe3, 0xfe, 0x89, 0x94, 0x0b, 0x48, 0xf4, 0x14, 0x55, 0x26, 0xa8, 0x76, 0x48, 0x05, - 0x14, 0x50, 0x6d, 0xd1, 0x8a, 0xa5, 0x5b, 0xdd, 0x56, 0xa8, 0x02, 0x55, 0x55, 0xda, 0x89, 0xc5, - 0xba, 0xd8, 0x57, 0xf7, 0x54, 0xdb, 0x67, 0xee, 0x2e, 0x69, 0xb3, 0x33, 0x30, 0xf2, 0x05, 0x90, - 0x60, 0x63, 0x64, 0xe0, 0x3b, 0xd0, 0xb1, 0x62, 0x62, 0x8a, 0x50, 0x32, 0xb0, 0xf7, 0x13, 0x20, - 0xdf, 0x9d, 0x49, 0xa0, 0x0e, 0x4b, 0x74, 0xf6, 0xfb, 0x7b, 0xde, 0xe7, 0xb9, 0x37, 0x7e, 0x41, - 0x2b, 0xc4, 0x3c, 0xa1, 0xdc, 0xcd, 0x18, 0x3d, 0x21, 0x31, 0xe6, 0x6e, 0x7f, 0xd3, 0x8d, 0x70, - 0x8a, 0x39, 0xe1, 0x4e, 0xc6, 0xa8, 0xa0, 0x10, 0x2a, 0xc2, 0x29, 0x08, 0xa7, 0xbf, 0xd9, 0x5c, - 0x42, 0x09, 0x49, 0xa9, 0x2b, 0x7f, 0x15, 0xd6, 0x6c, 0x44, 0x34, 0xa2, 0xf2, 0xe8, 0xe6, 0x27, - 0xfd, 0xf6, 0x6e, 0x40, 0x73, 0xb1, 0xaf, 0x0a, 0xea, 0x41, 0x97, 0x1e, 0x96, 0x38, 0x27, 0x34, - 0xc4, 0x31, 0xf7, 0x33, 0xc4, 0x50, 0x52, 0x70, 0xeb, 0xb3, 0xb9, 0x50, 0xa0, 0xc8, 0x67, 0xf8, - 0x4d, 0x0f, 0x73, 0x51, 0xe0, 0x4f, 0x67, 0xe3, 0xc1, 0x29, 0x22, 0xa9, 0x1f, 0x93, 0xf4, 0xac, - 0x80, 0x1f, 0xcf, 0x86, 0x51, 0x96, 0x4d, 0xa3, 0xed, 0x6f, 0x8b, 0xe0, 0xd6, 0x0b, 0x35, 0x98, - 0x23, 0x81, 0x04, 0x86, 0x9f, 0x0c, 0xb0, 0x2c, 0x03, 0x08, 0x86, 0x52, 0x7e, 0x82, 0xd9, 0x9f, - 0x24, 0xa6, 0xd1, 0x9a, 0x5f, 0xab, 0x6f, 0x3c, 0x72, 0x6e, 0x4e, 0xce, 0xd9, 0x3d, 0x46, 0xd1, - 0xb1, 0x16, 0x74, 0x14, 0xef, 0x79, 0x97, 0x43, 0xbb, 0x32, 0x1a, 0xda, 0x8d, 0x92, 0x22, 0xbf, - 0x1e, 0xda, 0x2b, 0x03, 0x94, 0xc4, 0x5b, 0xed, 0x72, 0xb3, 0xf6, 0xe7, 0x5f, 0x5f, 0x9e, 0x18, - 0x9d, 0x46, 0x5e, 0xfd, 0x57, 0x0b, 0x7d, 0x50, 0x9f, 0xba, 0xb4, 0x39, 0x27, 0x73, 0xad, 0x94, - 0xe5, 0xda, 0xc9, 0xb1, 0x57, 0x24, 0x3d, 0xf3, 0xec, 0x3c, 0xcd, 0xf5, 0xd0, 0x86, 0xca, 0x75, - 0x4a, 0xaf, 0xad, 0x40, 0x50, 0xb0, 0x1c, 0x9e, 0x83, 0x25, 0x94, 0x65, 0x31, 0x09, 0x90, 0x20, - 0xb4, 0xb0, 0x99, 0x97, 0x36, 0xab, 0x65, 0x36, 0xdb, 0x13, 0x58, 0x9a, 0x3d, 0xd0, 0x66, 0xa6, - 0x32, 0xbb, 0xd1, 0x4b, 0x5b, 0xde, 0x41, 0x7f, 0xeb, 0x38, 0xfc, 0x60, 0x80, 0x66, 0x88, 0x4f, - 0x50, 0x2f, 0x16, 0x3e, 0xbe, 0x10, 0x98, 0xa5, 0x28, 0xf6, 0x51, 0x18, 0x32, 0xcc, 0x39, 0xe6, - 0xe6, 0x82, 0x8c, 0xe0, 0x96, 0xfe, 0x03, 0x4a, 0xb5, 0xa7, 0x45, 0xdb, 0x4a, 0xb3, 0x97, 0x0a, - 0x36, 0xf0, 0x1c, 0x1d, 0xe7, 0xbe, 0x9e, 0xf8, 0x4c, 0x03, 0x9d, 0xcb, 0x0c, 0x4b, 0x9b, 0x61, - 0x0e, 0x77, 0x40, 0x9d, 0x74, 0x03, 0x3f, 0xa3, 0x4c, 0xf8, 0x24, 0x34, 0x17, 0x5b, 0xc6, 0x5a, - 0xcd, 0x5b, 0x1d, 0x0d, 0xed, 0xda, 0xbe, 0xb7, 0x73, 0x48, 0x99, 0xd8, 0xdf, 0x9d, 0xcc, 0x78, - 0x8a, 0x6c, 0x77, 0x6a, 0xa4, 0x1b, 0x48, 0x20, 0x84, 0x07, 0xa0, 0xaa, 0x56, 0xc1, 0xac, 0xb6, - 0x8c, 0xb5, 0xfa, 0x46, 0xb3, 0xec, 0x3e, 0x87, 0x92, 0xf0, 0x9a, 0x3a, 0xfa, 0x6d, 0xd5, 0x52, - 0xe9, 0x74, 0x4c, 0xdd, 0x65, 0x6b, 0xe1, 0xdd, 0x47, 0xbb, 0xd2, 0x7e, 0x6b, 0x80, 0x7b, 0xff, - 0x19, 0x02, 0x74, 0xc0, 0x22, 0x3d, 0x4f, 0x31, 0x33, 0x0d, 0x19, 0xda, 0xfc, 0xfe, 0x75, 0xbd, - 0xa1, 0x37, 0x57, 0x73, 0x47, 0x82, 0x91, 0x34, 0xea, 0x28, 0x0c, 0xae, 0x00, 0xf5, 0x45, 0xf8, - 0x29, 0x4a, 0xb0, 0x39, 0x97, 0x8b, 0x3a, 0x35, 0xf9, 0xe6, 0x00, 0x25, 0x18, 0x2e, 0x83, 0xaa, - 0x40, 0x2c, 0xc2, 0xc2, 0x9c, 0x97, 0x25, 0xfd, 0xe4, 0xbd, 0xbc, 0x1c, 0x59, 0xc6, 0xd5, 0xc8, - 0x32, 0x7e, 0x8e, 0x2c, 0xe3, 0xfd, 0xd8, 0xaa, 0x5c, 0x8d, 0xad, 0xca, 0x8f, 0xb1, 0x55, 0x79, - 0xfd, 0x2c, 0x22, 0xe2, 0xb4, 0xd7, 0x75, 0x02, 0x9a, 0xb8, 0xea, 0xc2, 0xeb, 0x31, 0xea, 0x72, - 0x7d, 0x76, 0xfb, 0xcf, 0xdd, 0x8b, 0xc9, 0xc6, 0x8a, 0x41, 0x86, 0x79, 0xb7, 0x2a, 0x97, 0x74, - 0xf3, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xca, 0x0b, 0x97, 0x85, 0xcf, 0x04, 0x00, 0x00, + 0x14, 0x50, 0x6d, 0xd1, 0x4a, 0x0c, 0xdd, 0xea, 0xb6, 0x42, 0x15, 0xa8, 0xaa, 0xd2, 0x4e, 0x2c, + 0xd6, 0xc5, 0xbe, 0xba, 0xa7, 0xda, 0x3e, 0x73, 0x77, 0x49, 0x9b, 0x9d, 0x81, 0x91, 0x2f, 0x80, + 0x04, 0x1b, 0x23, 0x03, 0xdf, 0x81, 0x8e, 0x15, 0x13, 0x53, 0x84, 0x92, 0x81, 0xbd, 0x9f, 0x00, + 0xf9, 0xee, 0x4c, 0x02, 0x75, 0x58, 0xa2, 0xb3, 0xdf, 0xdf, 0xf3, 0x3e, 0xcf, 0xbd, 0xf1, 0x0b, + 0x5a, 0x21, 0xe6, 0x09, 0xe5, 0x6e, 0xc6, 0xe8, 0x09, 0x89, 0x31, 0x77, 0xfb, 0x9b, 0x6e, 0x84, + 0x53, 0xcc, 0x09, 0x77, 0x32, 0x46, 0x05, 0x85, 0x50, 0x11, 0x4e, 0x41, 0x38, 0xfd, 0xcd, 0xe6, + 0x12, 0x4a, 0x48, 0x4a, 0x5d, 0xf9, 0xab, 0xb0, 0x66, 0x23, 0xa2, 0x11, 0x95, 0x47, 0x37, 0x3f, + 0xe9, 0xb7, 0x77, 0x03, 0x9a, 0x8b, 0x7d, 0x55, 0x50, 0x0f, 0xba, 0xf4, 0xb0, 0xc4, 0x39, 0xa1, + 0x21, 0x8e, 0xb9, 0x9f, 0x21, 0x86, 0x92, 0x82, 0x5b, 0x9f, 0xcd, 0x85, 0x02, 0x45, 0x3e, 0xc3, + 0x6f, 0x7a, 0x98, 0x8b, 0x02, 0x7f, 0x3a, 0x1b, 0x0f, 0x4e, 0x11, 0x49, 0xfd, 0x98, 0xa4, 0x67, + 0x05, 0xfc, 0x78, 0x36, 0x8c, 0xb2, 0x6c, 0x1a, 0x6d, 0x7f, 0x5b, 0x04, 0xb7, 0x5e, 0xa8, 0xc1, + 0x1c, 0x09, 0x24, 0x30, 0xfc, 0x64, 0x80, 0x65, 0x19, 0x40, 0x30, 0x94, 0xf2, 0x13, 0xcc, 0xfe, + 0x24, 0x31, 0x8d, 0xd6, 0xfc, 0x5a, 0x7d, 0xe3, 0x91, 0x73, 0x73, 0x72, 0xce, 0xee, 0x31, 0x8a, + 0x8e, 0xb5, 0xa0, 0xa3, 0x78, 0xcf, 0xbb, 0x1c, 0xda, 0x95, 0xd1, 0xd0, 0x6e, 0x94, 0x14, 0xf9, + 0xf5, 0xd0, 0x5e, 0x19, 0xa0, 0x24, 0xde, 0x6a, 0x97, 0x9b, 0xb5, 0x3f, 0xff, 0xfa, 0xf2, 0xc4, + 0xe8, 0x34, 0xf2, 0xea, 0xbf, 0x5a, 0xe8, 0x83, 0xfa, 0xd4, 0xa5, 0xcd, 0x39, 0x99, 0x6b, 0xa5, + 0x2c, 0xd7, 0x4e, 0x8e, 0xbd, 0x22, 0xe9, 0x99, 0x67, 0xe7, 0x69, 0xae, 0x87, 0x36, 0x54, 0xae, + 0x53, 0x7a, 0x6d, 0x05, 0x82, 0x82, 0xe5, 0xf0, 0x1c, 0x2c, 0xa1, 0x2c, 0x8b, 0x49, 0x80, 0x04, + 0xa1, 0x85, 0xcd, 0xbc, 0xb4, 0x59, 0x2d, 0xb3, 0xd9, 0x9e, 0xc0, 0xd2, 0xec, 0x81, 0x36, 0x33, + 0x95, 0xd9, 0x8d, 0x5e, 0xda, 0xf2, 0x0e, 0xfa, 0x5b, 0xc7, 0xe1, 0x07, 0x03, 0x34, 0x43, 0x7c, + 0x82, 0x7a, 0xb1, 0xf0, 0xf1, 0x85, 0xc0, 0x2c, 0x45, 0xb1, 0x8f, 0xc2, 0x90, 0x61, 0xce, 0x31, + 0x37, 0x17, 0x64, 0x04, 0xb7, 0xf4, 0x1f, 0x50, 0xaa, 0x3d, 0x2d, 0xda, 0x56, 0x9a, 0xbd, 0x54, + 0xb0, 0x81, 0xe7, 0xe8, 0x38, 0xf7, 0xf5, 0xc4, 0x67, 0x1a, 0xe8, 0x5c, 0x66, 0x58, 0xda, 0x0c, + 0x73, 0xb8, 0x03, 0xea, 0xa4, 0x1b, 0xf8, 0x19, 0x65, 0xc2, 0x27, 0xa1, 0xb9, 0xd8, 0x32, 0xd6, + 0x6a, 0xde, 0xea, 0x68, 0x68, 0xd7, 0xf6, 0xbd, 0x9d, 0x43, 0xca, 0xc4, 0xfe, 0xee, 0x64, 0xc6, + 0x53, 0x64, 0xbb, 0x53, 0x23, 0xdd, 0x40, 0x02, 0x21, 0x3c, 0x00, 0x55, 0xb5, 0x0a, 0x66, 0xb5, + 0x65, 0xac, 0xd5, 0x37, 0x9a, 0x65, 0xf7, 0x39, 0x94, 0x84, 0xd7, 0xd4, 0xd1, 0x6f, 0xab, 0x96, + 0x4a, 0xa7, 0x63, 0xea, 0x2e, 0x5b, 0x0b, 0xef, 0x3e, 0xda, 0x95, 0xf6, 0x5b, 0x03, 0xdc, 0xfb, + 0xcf, 0x10, 0xa0, 0x03, 0x16, 0xe9, 0x79, 0x8a, 0x99, 0x69, 0xc8, 0xd0, 0xe6, 0xf7, 0xaf, 0xeb, + 0x0d, 0xbd, 0xb9, 0x9a, 0x3b, 0x12, 0x8c, 0xa4, 0x51, 0x47, 0x61, 0x70, 0x05, 0xa8, 0x2f, 0xc2, + 0x4f, 0x51, 0x82, 0xcd, 0xb9, 0x5c, 0xd4, 0xa9, 0xc9, 0x37, 0x07, 0x28, 0xc1, 0x70, 0x19, 0x54, + 0x05, 0x62, 0x11, 0x16, 0xe6, 0xbc, 0x2c, 0xe9, 0x27, 0xef, 0xe5, 0xe5, 0xc8, 0x32, 0xae, 0x46, + 0x96, 0xf1, 0x73, 0x64, 0x19, 0xef, 0xc7, 0x56, 0xe5, 0x6a, 0x6c, 0x55, 0x7e, 0x8c, 0xad, 0xca, + 0xeb, 0x67, 0x11, 0x11, 0xa7, 0xbd, 0xae, 0x13, 0xd0, 0xc4, 0x55, 0x17, 0x5e, 0x8f, 0x51, 0x97, + 0xeb, 0xb3, 0xdb, 0x7f, 0xee, 0x5e, 0x4c, 0x36, 0x56, 0x0c, 0x32, 0xcc, 0xbb, 0x55, 0xb9, 0xa4, + 0x9b, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x32, 0xe6, 0xc0, 0x77, 0xcf, 0x04, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/profiles/types/genesis_test.go b/x/profiles/types/genesis_test.go index 242c7efcc2..69f7f1fd50 100644 --- a/x/profiles/types/genesis_test.go +++ b/x/profiles/types/genesis_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" + "cosmossdk.io/math" "github.com/desmos-labs/desmos/v6/testutil/profilestesting" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/x/profiles/types" @@ -28,7 +28,7 @@ func TestValidateGenesis(t *testing.T) { genesis: types.NewGenesisState( nil, types.NewParams( - types.NewNicknameParams(sdk.NewInt(-1), sdk.NewInt(10)), + types.NewNicknameParams(math.NewInt(-1), math.NewInt(10)), types.DefaultDTagParams(), types.DefaultBioParams(), types.DefaultOracleParams(), diff --git a/x/profiles/types/models_app_links.pb.go b/x/profiles/types/models_app_links.pb.go index c66dab9705..9e369b7c11 100644 --- a/x/profiles/types/models_app_links.pb.go +++ b/x/profiles/types/models_app_links.pb.go @@ -459,7 +459,7 @@ var fileDescriptor_e02d86ea3253bfd9 = []byte{ // 1044 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xbf, 0x6f, 0xdb, 0xc6, 0x17, 0x17, 0x25, 0x5a, 0x96, 0xce, 0xb1, 0xad, 0x5c, 0xfc, 0xcd, 0x57, 0x15, 0x10, 0x51, 0x66, - 0xda, 0xc6, 0x71, 0x61, 0x12, 0xb1, 0x51, 0xa0, 0x70, 0xd0, 0x02, 0xa2, 0x44, 0x23, 0x6c, 0x5c, + 0xda, 0xc6, 0x71, 0x61, 0x12, 0xb1, 0x81, 0xa2, 0x70, 0xd0, 0x02, 0xa2, 0x44, 0x23, 0x6c, 0x5c, 0xdb, 0x38, 0xc9, 0x09, 0x90, 0x85, 0x38, 0x93, 0x27, 0xf5, 0x10, 0x4a, 0x54, 0x49, 0xca, 0x48, 0x5a, 0x74, 0x0f, 0x3c, 0xe5, 0x1f, 0x30, 0x10, 0xa0, 0x4b, 0xc7, 0x0e, 0x5d, 0x8b, 0x0e, 0x5d, 0x32, 0x06, 0x9d, 0x3a, 0xa9, 0x85, 0x3c, 0xb4, 0xb3, 0xf6, 0x02, 0x05, 0xef, 0x4e, 0xa6, 0x1c, @@ -521,7 +521,7 @@ var fileDescriptor_e02d86ea3253bfd9 = []byte{ 0x65, 0xe9, 0x8f, 0x61, 0x59, 0x7a, 0x79, 0x56, 0x4e, 0xbd, 0x39, 0x2b, 0xa7, 0x7e, 0x3b, 0x2b, 0xa7, 0x9e, 0xdc, 0x6b, 0xd3, 0xe8, 0xcb, 0xfe, 0x91, 0xe6, 0xf8, 0x1d, 0x9d, 0x0f, 0xf4, 0x86, 0x87, 0x8f, 0x42, 0xb1, 0xd6, 0x8f, 0x3f, 0xd6, 0x9f, 0x25, 0xff, 0x9e, 0x44, 0xcf, 0x7b, 0x24, - 0x3c, 0xca, 0xb2, 0x87, 0x7e, 0xeb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x34, 0xa1, 0x42, 0x07, + 0x3c, 0xca, 0xb2, 0x87, 0x7e, 0xeb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x4c, 0x15, 0xf5, 0xbe, 0x08, 0x00, 0x00, } diff --git a/x/profiles/types/models_chain_links.pb.go b/x/profiles/types/models_chain_links.pb.go index 70914b79e1..cfaacfb4ec 100644 --- a/x/profiles/types/models_chain_links.pb.go +++ b/x/profiles/types/models_chain_links.pb.go @@ -434,70 +434,70 @@ func init() { } var fileDescriptor_29bee920e792da29 = []byte{ - // 1005 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcb, 0x6f, 0xe3, 0x44, - 0x18, 0x8f, 0xdb, 0xb4, 0x4b, 0xa6, 0xe9, 0x6e, 0x3a, 0x04, 0x94, 0x96, 0x55, 0x5c, 0x0c, 0x5b, - 0x96, 0xa2, 0xda, 0x6a, 0xbb, 0x95, 0x50, 0xb8, 0x10, 0xa7, 0x61, 0x37, 0x6c, 0x5f, 0x72, 0xd2, - 0x22, 0x10, 0x92, 0x65, 0x27, 0x13, 0xd7, 0xaa, 0x5f, 0xb2, 0x9d, 0x28, 0xb9, 0x71, 0x5c, 0x71, - 0xda, 0x23, 0xc7, 0x4a, 0x08, 0x09, 0x89, 0xcb, 0x22, 0xed, 0x1f, 0xb1, 0xe2, 0xb4, 0xe2, 0x80, - 0xe0, 0x12, 0x50, 0x7b, 0xd8, 0x3d, 0xe7, 0xc4, 0x11, 0xcd, 0xc3, 0xb1, 0x49, 0xd3, 0x56, 0x15, - 0xe2, 0x12, 0x79, 0xe6, 0xfb, 0x7d, 0xbf, 0xef, 0xf5, 0x9b, 0x99, 0x80, 0x8f, 0x5a, 0x28, 0xb0, - 0xdd, 0x40, 0xf2, 0x7c, 0xb7, 0x6d, 0x5a, 0x28, 0x90, 0xba, 0x9b, 0x92, 0xed, 0xb6, 0x90, 0x15, - 0xa8, 0xcd, 0x63, 0xcd, 0x74, 0x54, 0xcb, 0x74, 0x4e, 0x02, 0xd1, 0xf3, 0xdd, 0xd0, 0x85, 0x90, - 0x82, 0xc5, 0x08, 0x2c, 0x76, 0x37, 0x97, 0x16, 0x34, 0xdb, 0x74, 0x5c, 0x89, 0xfc, 0x52, 0xd8, - 0x52, 0xde, 0x70, 0x0d, 0x97, 0x7c, 0x4a, 0xf8, 0x8b, 0xed, 0x2e, 0x1a, 0xae, 0x6b, 0x58, 0x48, - 0x22, 0x2b, 0xbd, 0xd3, 0x96, 0x34, 0xa7, 0xcf, 0x4c, 0xfc, 0xb8, 0x29, 0x34, 0x6d, 0x14, 0x84, - 0x9a, 0xed, 0x45, 0xbe, 0x4d, 0x17, 0x07, 0x56, 0x29, 0x29, 0x5d, 0x30, 0xd3, 0x1a, 0x5d, 0x49, - 0x4d, 0xbf, 0xef, 0x85, 0xae, 0x64, 0x77, 0xac, 0xd0, 0x0c, 0x4c, 0x43, 0xea, 0xae, 0xeb, 0x28, - 0xd4, 0xd6, 0x47, 0x1b, 0x14, 0x2e, 0xfc, 0x36, 0x0d, 0x32, 0x15, 0x5c, 0xd8, 0x8e, 0xe9, 0x9c, - 0xc0, 0x4f, 0x40, 0xba, 0x13, 0x20, 0xbf, 0xc0, 0x2d, 0x73, 0xf7, 0x33, 0xf2, 0x07, 0xc3, 0x01, - 0x3f, 0xd7, 0xd7, 0x6c, 0xab, 0x24, 0xe0, 0x5d, 0xe1, 0xd7, 0xe7, 0x6b, 0x79, 0x16, 0xab, 0xdc, - 0x6a, 0xf9, 0x28, 0x08, 0xea, 0xa1, 0x6f, 0x3a, 0x86, 0x42, 0x9c, 0x60, 0x0b, 0xdc, 0xd2, 0xe8, - 0x76, 0x61, 0x6a, 0x99, 0xbb, 0x3f, 0xb7, 0x91, 0x17, 0x69, 0x1d, 0x62, 0x54, 0x87, 0x58, 0x76, - 0xfa, 0xf2, 0x83, 0xe1, 0x80, 0xbf, 0x4d, 0x59, 0x19, 0x5c, 0xf8, 0xe5, 0xf9, 0x5a, 0xf1, 0x62, - 0x2b, 0xa3, 0x20, 0xdb, 0x5a, 0xa8, 0x29, 0x11, 0x35, 0xfc, 0x1c, 0xcc, 0x78, 0xbe, 0xeb, 0xb6, - 0x0b, 0xd3, 0x24, 0xc6, 0xa2, 0x38, 0xc1, 0xf1, 0x00, 0x03, 0xe4, 0xc5, 0x17, 0x03, 0x3e, 0x35, - 0x1c, 0xf0, 0x59, 0x1a, 0x8c, 0x78, 0x09, 0x3f, 0xbe, 0x7a, 0xb6, 0xca, 0x29, 0x94, 0x02, 0xb6, - 0x40, 0x96, 0x0e, 0xb5, 0xe9, 0x3a, 0x6d, 0xd3, 0x28, 0xa4, 0x09, 0x25, 0x3f, 0x89, 0x92, 0xf4, - 0xa8, 0x42, 0x60, 0xf2, 0x32, 0x23, 0x7e, 0x93, 0x12, 0x27, 0x29, 0x18, 0xff, 0x5c, 0x33, 0x86, - 0xc3, 0x36, 0x98, 0x6f, 0xfa, 0x48, 0x0b, 0x4d, 0xd7, 0x51, 0xf1, 0x20, 0x0b, 0x33, 0x24, 0xcc, - 0xd2, 0x85, 0xee, 0x34, 0xa2, 0x29, 0xcb, 0xf7, 0x58, 0x84, 0x3c, 0x8b, 0x90, 0x74, 0x17, 0x9e, - 0xfe, 0xc9, 0x73, 0x34, 0x4c, 0x36, 0x32, 0x60, 0xcf, 0x52, 0xf6, 0xc9, 0x29, 0x9f, 0xfa, 0xee, - 0x94, 0xe7, 0x5e, 0x9f, 0xf2, 0x9c, 0xf0, 0x29, 0x98, 0x4b, 0xe4, 0x0c, 0xdf, 0x03, 0x69, 0x47, - 0xb3, 0x11, 0x9b, 0xec, 0x9d, 0x78, 0xb2, 0x78, 0x57, 0x50, 0x88, 0x71, 0x8c, 0xe1, 0x6f, 0x0e, - 0xcc, 0x90, 0x4e, 0xc2, 0x32, 0xb8, 0xe5, 0x75, 0x74, 0xf5, 0x04, 0xf5, 0x89, 0xff, 0x65, 0x93, - 0x85, 0xf1, 0x64, 0x19, 0x5c, 0x50, 0x66, 0xbd, 0x8e, 0xfe, 0x18, 0xf5, 0xe1, 0x31, 0xc8, 0x04, - 0xa6, 0xe1, 0x68, 0x61, 0xc7, 0x47, 0xd7, 0xca, 0x23, 0x47, 0x49, 0x46, 0x0e, 0x58, 0x20, 0x77, - 0x27, 0x0c, 0xa5, 0x1e, 0x01, 0x94, 0x98, 0x1c, 0x3e, 0x00, 0xc0, 0xb3, 0xf0, 0x44, 0x42, 0xd4, - 0x0b, 0x89, 0x4a, 0x32, 0xf2, 0x5b, 0xc3, 0x01, 0xbf, 0xc0, 0x32, 0x1b, 0xd9, 0x04, 0x25, 0x43, - 0x16, 0x0d, 0xd4, 0x0b, 0xc7, 0x4a, 0xff, 0x89, 0x03, 0xf3, 0x32, 0x6a, 0x1e, 0x6f, 0x6e, 0x30, - 0x0d, 0xc2, 0x15, 0x30, 0xd3, 0xd5, 0xac, 0x4e, 0xd4, 0xc0, 0x5c, 0xac, 0x2b, 0xb2, 0x2d, 0x28, - 0xd4, 0x0c, 0x3f, 0x04, 0xb3, 0x9e, 0x8f, 0xda, 0x66, 0x8f, 0x14, 0x99, 0x91, 0x17, 0x86, 0x03, - 0x7e, 0x3e, 0x12, 0x20, 0xde, 0xc7, 0x2d, 0x21, 0x1f, 0xa5, 0x87, 0xc9, 0x90, 0xd7, 0x1f, 0x81, - 0x6f, 0x5f, 0x3d, 0x5b, 0xcd, 0xb3, 0xdb, 0xe9, 0x5f, 0xb9, 0x09, 0xdf, 0xe0, 0x6c, 0xb5, 0x00, - 0x6d, 0x7d, 0x7c, 0xc3, 0x6c, 0xff, 0x53, 0x0a, 0xc9, 0x80, 0xc2, 0x0f, 0x1c, 0x00, 0x8f, 0x50, - 0xef, 0x7f, 0xec, 0xd6, 0xf6, 0xcd, 0x53, 0x5d, 0x60, 0xa9, 0xc6, 0x89, 0x09, 0xaf, 0x39, 0x70, - 0xa7, 0x6e, 0x3a, 0x86, 0x85, 0x46, 0xda, 0x81, 0x5f, 0x03, 0x40, 0xb2, 0x51, 0xc3, 0xbe, 0x47, - 0x33, 0xbe, 0xbd, 0xb1, 0x22, 0x5e, 0x25, 0xb7, 0x23, 0x0c, 0x6f, 0xf4, 0x3d, 0x94, 0x14, 0x56, - 0xcc, 0x21, 0x28, 0x99, 0x6e, 0x84, 0x80, 0x1b, 0xe3, 0xc2, 0xcf, 0xca, 0xf9, 0x49, 0x12, 0x4f, - 0x48, 0xb8, 0x54, 0xc1, 0xb5, 0xb2, 0x3a, 0xaf, 0xd4, 0x3d, 0xae, 0xf2, 0x6d, 0x56, 0xe5, 0x58, - 0x59, 0xc2, 0xcf, 0x53, 0x20, 0x5f, 0x21, 0xb7, 0xf5, 0x2e, 0xbe, 0xf2, 0xe3, 0x7a, 0x75, 0x90, - 0xd1, 0xcd, 0x50, 0xd5, 0x7c, 0x5f, 0x8b, 0xce, 0xb3, 0x24, 0xb2, 0x7b, 0x9d, 0xbe, 0x1a, 0xe2, - 0xe8, 0x91, 0x60, 0xaf, 0x86, 0x58, 0x71, 0x6d, 0x4f, 0x6b, 0x86, 0xb2, 0x19, 0x96, 0xb1, 0x5b, - 0xb2, 0x84, 0x11, 0x97, 0xa0, 0xbc, 0xa1, 0x33, 0x3b, 0x3c, 0x01, 0x60, 0x54, 0x0e, 0x7e, 0x0e, - 0xa6, 0x2f, 0x3d, 0xef, 0x5b, 0x71, 0x07, 0x63, 0x8f, 0xeb, 0x0f, 0x7c, 0x82, 0xbe, 0xf4, 0xe8, - 0x26, 0xed, 0x7a, 0x87, 0xb5, 0x6b, 0x52, 0x6b, 0x56, 0xff, 0xe0, 0x00, 0xbc, 0x38, 0x65, 0xf8, - 0x3e, 0x58, 0xae, 0xd7, 0x1e, 0xee, 0x95, 0x1b, 0x87, 0x4a, 0x55, 0x3d, 0x2a, 0xef, 0x1c, 0x56, - 0xd5, 0xc6, 0x97, 0x07, 0x55, 0xf5, 0x70, 0xaf, 0x7e, 0x50, 0xad, 0xd4, 0x3e, 0xab, 0x55, 0xb7, - 0x73, 0x29, 0x78, 0x17, 0x14, 0x26, 0xa2, 0x94, 0xf2, 0x17, 0x39, 0x0e, 0xae, 0x00, 0x61, 0xa2, - 0xb5, 0xb2, 0x5f, 0xdf, 0xdd, 0xaf, 0xab, 0xdb, 0x35, 0xa5, 0x5a, 0x69, 0xe4, 0xa6, 0xe0, 0x3d, - 0xf0, 0xee, 0x55, 0xb8, 0xf2, 0x6e, 0x6d, 0x6f, 0x3f, 0x37, 0x0d, 0x57, 0xc1, 0xca, 0x44, 0x58, - 0xf5, 0x68, 0x57, 0x3d, 0xa8, 0x2a, 0xf5, 0xfd, 0xbd, 0xf2, 0x8e, 0x8a, 0x11, 0xb9, 0xf4, 0x52, - 0xfa, 0xc9, 0xf7, 0xc5, 0x94, 0xfc, 0xf8, 0xc5, 0x59, 0x91, 0x7b, 0x79, 0x56, 0xe4, 0xfe, 0x3a, - 0x2b, 0x72, 0x4f, 0xcf, 0x8b, 0xa9, 0x97, 0xe7, 0xc5, 0xd4, 0xef, 0xe7, 0xc5, 0xd4, 0x57, 0xeb, - 0x86, 0x19, 0x1e, 0x77, 0x74, 0xb1, 0xe9, 0xda, 0x12, 0xed, 0xce, 0x9a, 0xa5, 0xe9, 0x01, 0xfb, - 0x96, 0xba, 0x5b, 0x52, 0x2f, 0xfe, 0x3f, 0x84, 0x05, 0x1e, 0xe8, 0xb3, 0x64, 0x86, 0x9b, 0xff, - 0x04, 0x00, 0x00, 0xff, 0xff, 0xe9, 0xb8, 0x64, 0x69, 0x2f, 0x09, 0x00, 0x00, + // 1006 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0xdb, 0x54, + 0x1c, 0x8f, 0xdb, 0xb4, 0x23, 0xaf, 0xe9, 0x96, 0x3e, 0x02, 0x4a, 0xcb, 0x14, 0x17, 0xc3, 0xca, + 0x28, 0xaa, 0xad, 0xb6, 0x1b, 0x42, 0xe1, 0x42, 0x9c, 0x86, 0x2d, 0xac, 0xbf, 0xe4, 0xa4, 0x45, + 0x20, 0x24, 0xcb, 0x4e, 0x5e, 0x5c, 0xab, 0xfe, 0x25, 0xdb, 0x89, 0x92, 0x1b, 0xc7, 0x89, 0xd3, + 0x8e, 0x1c, 0x2b, 0x21, 0x24, 0x24, 0x2e, 0x43, 0xda, 0x1f, 0x31, 0x71, 0x9a, 0x38, 0x20, 0xb8, + 0x04, 0xd4, 0x1e, 0xb6, 0x73, 0x4e, 0x1c, 0xd1, 0xfb, 0xe1, 0xd8, 0xa4, 0x69, 0xab, 0x0a, 0xed, + 0x12, 0xf9, 0xbd, 0xef, 0xe7, 0xfb, 0xf9, 0xfe, 0xfa, 0xbc, 0xf7, 0x02, 0x3e, 0x6a, 0xa1, 0xc0, + 0x76, 0x03, 0xc9, 0xf3, 0xdd, 0xb6, 0x69, 0xa1, 0x40, 0xea, 0x6e, 0x4a, 0xb6, 0xdb, 0x42, 0x56, + 0xa0, 0x36, 0x8f, 0x34, 0xd3, 0x51, 0x2d, 0xd3, 0x39, 0x0e, 0x44, 0xcf, 0x77, 0x43, 0x17, 0x42, + 0x0a, 0x16, 0x23, 0xb0, 0xd8, 0xdd, 0x5c, 0x5a, 0xd0, 0x6c, 0xd3, 0x71, 0x25, 0xf2, 0x4b, 0x61, + 0x4b, 0x79, 0xc3, 0x35, 0x5c, 0xf2, 0x29, 0xe1, 0x2f, 0xb6, 0xbb, 0x68, 0xb8, 0xae, 0x61, 0x21, + 0x89, 0xac, 0xf4, 0x4e, 0x5b, 0xd2, 0x9c, 0x3e, 0x33, 0xf1, 0xe3, 0xa6, 0xd0, 0xb4, 0x51, 0x10, + 0x6a, 0xb6, 0x17, 0xf9, 0x36, 0x5d, 0x1c, 0x58, 0xa5, 0xa4, 0x74, 0xc1, 0x4c, 0x6b, 0x74, 0x25, + 0x35, 0xfd, 0xbe, 0x17, 0xba, 0x92, 0xdd, 0xb1, 0x42, 0x33, 0x30, 0x0d, 0xa9, 0xbb, 0xae, 0xa3, + 0x50, 0x5b, 0x1f, 0x6d, 0x50, 0xb8, 0xf0, 0xfb, 0x34, 0xc8, 0x54, 0x70, 0x61, 0xdb, 0xa6, 0x73, + 0x0c, 0x3f, 0x05, 0xe9, 0x4e, 0x80, 0xfc, 0x02, 0xb7, 0xcc, 0xdd, 0xcd, 0xc8, 0x1f, 0x0c, 0x07, + 0xfc, 0x5c, 0x5f, 0xb3, 0xad, 0x92, 0x80, 0x77, 0x85, 0xdf, 0x9e, 0xad, 0xe5, 0x59, 0xac, 0x72, + 0xab, 0xe5, 0xa3, 0x20, 0xa8, 0x87, 0xbe, 0xe9, 0x18, 0x0a, 0x71, 0x82, 0x2d, 0x70, 0x43, 0xa3, + 0xdb, 0x85, 0xa9, 0x65, 0xee, 0xee, 0xdc, 0x46, 0x5e, 0xa4, 0x75, 0x88, 0x51, 0x1d, 0x62, 0xd9, + 0xe9, 0xcb, 0xf7, 0x86, 0x03, 0xfe, 0x26, 0x65, 0x65, 0x70, 0xe1, 0xd7, 0x67, 0x6b, 0xc5, 0xf3, + 0xad, 0x8c, 0x82, 0x6c, 0x69, 0xa1, 0xa6, 0x44, 0xd4, 0xf0, 0x0b, 0x30, 0xe3, 0xf9, 0xae, 0xdb, + 0x2e, 0x4c, 0x93, 0x18, 0x8b, 0xe2, 0x04, 0xc7, 0x7d, 0x0c, 0x90, 0x17, 0x9f, 0x0f, 0xf8, 0xd4, + 0x70, 0xc0, 0x67, 0x69, 0x30, 0xe2, 0x25, 0xfc, 0xf4, 0xf2, 0xe9, 0x2a, 0xa7, 0x50, 0x0a, 0xd8, + 0x02, 0x59, 0x3a, 0xd4, 0xa6, 0xeb, 0xb4, 0x4d, 0xa3, 0x90, 0x26, 0x94, 0xfc, 0x24, 0x4a, 0xd2, + 0xa3, 0x0a, 0x81, 0xc9, 0xcb, 0x8c, 0xf8, 0x4d, 0x4a, 0x9c, 0xa4, 0x60, 0xfc, 0x73, 0xcd, 0x18, + 0x0e, 0xdb, 0x60, 0xbe, 0xe9, 0x23, 0x2d, 0x34, 0x5d, 0x47, 0xc5, 0x83, 0x2c, 0xcc, 0x90, 0x30, + 0x4b, 0xe7, 0xba, 0xd3, 0x88, 0xa6, 0x2c, 0xdf, 0x61, 0x11, 0xf2, 0x2c, 0x42, 0xd2, 0x5d, 0x78, + 0xf2, 0x17, 0xcf, 0xd1, 0x30, 0xd9, 0xc8, 0x80, 0x3d, 0x4b, 0xd9, 0xc7, 0x27, 0x7c, 0xea, 0xfb, + 0x13, 0x9e, 0x7b, 0x75, 0xc2, 0x73, 0xc2, 0x67, 0x60, 0x2e, 0x91, 0x33, 0x7c, 0x0f, 0xa4, 0x1d, + 0xcd, 0x46, 0x6c, 0xb2, 0xb7, 0xe2, 0xc9, 0xe2, 0x5d, 0x41, 0x21, 0xc6, 0x31, 0x86, 0x7f, 0x38, + 0x30, 0x43, 0x3a, 0x09, 0xcb, 0xe0, 0x86, 0xd7, 0xd1, 0xd5, 0x63, 0xd4, 0x27, 0xfe, 0x17, 0x4d, + 0x16, 0xc6, 0x93, 0x65, 0x70, 0x41, 0x99, 0xf5, 0x3a, 0xfa, 0x23, 0xd4, 0x87, 0x47, 0x20, 0x13, + 0x98, 0x86, 0xa3, 0x85, 0x1d, 0x1f, 0x5d, 0x29, 0x8f, 0x1c, 0x25, 0x19, 0x39, 0x60, 0x81, 0xdc, + 0x9e, 0x30, 0x94, 0x7a, 0x04, 0x50, 0x62, 0x72, 0x78, 0x0f, 0x00, 0xcf, 0xc2, 0x13, 0x09, 0x51, + 0x2f, 0x24, 0x2a, 0xc9, 0xc8, 0x6f, 0x0d, 0x07, 0xfc, 0x02, 0xcb, 0x6c, 0x64, 0x13, 0x94, 0x0c, + 0x59, 0x34, 0x50, 0x2f, 0x1c, 0x2b, 0xfd, 0x67, 0x0e, 0xcc, 0xcb, 0xa8, 0x79, 0xb4, 0xb9, 0xc1, + 0x34, 0x08, 0x57, 0xc0, 0x4c, 0x57, 0xb3, 0x3a, 0x51, 0x03, 0x73, 0xb1, 0xae, 0xc8, 0xb6, 0xa0, + 0x50, 0x33, 0xfc, 0x10, 0xcc, 0x7a, 0x3e, 0x6a, 0x9b, 0x3d, 0x52, 0x64, 0x46, 0x5e, 0x18, 0x0e, + 0xf8, 0xf9, 0x48, 0x80, 0x78, 0x1f, 0xb7, 0x84, 0x7c, 0x94, 0x1e, 0x24, 0x43, 0x5e, 0x7d, 0x04, + 0xbe, 0x7b, 0xf9, 0x74, 0x35, 0xcf, 0x6e, 0xa7, 0xff, 0xe4, 0x26, 0x7c, 0x8b, 0xb3, 0xd5, 0x02, + 0x74, 0xff, 0x93, 0x6b, 0x66, 0xfb, 0xbf, 0x52, 0x48, 0x06, 0x14, 0x7e, 0xe4, 0x00, 0x78, 0x88, + 0x7a, 0xaf, 0xb1, 0x5b, 0x5b, 0xd7, 0x4f, 0x75, 0x81, 0xa5, 0x1a, 0x27, 0x26, 0xbc, 0xe2, 0xc0, + 0xad, 0xba, 0xe9, 0x18, 0x16, 0x1a, 0x69, 0x07, 0x7e, 0x03, 0x00, 0xc9, 0x46, 0x0d, 0xfb, 0x1e, + 0xcd, 0xf8, 0xe6, 0xc6, 0x8a, 0x78, 0x99, 0xdc, 0x0e, 0x31, 0xbc, 0xd1, 0xf7, 0x50, 0x52, 0x58, + 0x31, 0x87, 0xa0, 0x64, 0xba, 0x11, 0x02, 0x6e, 0x8c, 0x0b, 0x3f, 0x2b, 0xe7, 0x27, 0x49, 0x3c, + 0x21, 0xe1, 0x52, 0x05, 0xd7, 0xca, 0xea, 0xbc, 0x54, 0xf7, 0xb8, 0xca, 0xb7, 0x59, 0x95, 0x63, + 0x65, 0x09, 0xbf, 0x4c, 0x81, 0x7c, 0x85, 0xdc, 0xd6, 0x3b, 0xf8, 0xca, 0x8f, 0xeb, 0xd5, 0x41, + 0x46, 0x37, 0x43, 0x55, 0xf3, 0x7d, 0x2d, 0x3a, 0xcf, 0x92, 0xc8, 0xee, 0x75, 0xfa, 0x6a, 0x88, + 0xa3, 0x47, 0x82, 0xbd, 0x1a, 0x62, 0xc5, 0xb5, 0x3d, 0xad, 0x19, 0xca, 0x66, 0x58, 0xc6, 0x6e, + 0xc9, 0x12, 0x46, 0x5c, 0x82, 0xf2, 0x86, 0xce, 0xec, 0xf0, 0x18, 0x80, 0x51, 0x39, 0xf8, 0x39, + 0x98, 0xbe, 0xf0, 0xbc, 0xdf, 0x8f, 0x3b, 0x18, 0x7b, 0x5c, 0x7d, 0xe0, 0x13, 0xf4, 0xa5, 0x87, + 0xd7, 0x69, 0xd7, 0x3b, 0xac, 0x5d, 0x93, 0x5a, 0xb3, 0xfa, 0x27, 0x07, 0xe0, 0xf9, 0x29, 0xc3, + 0xf7, 0xc1, 0x72, 0xbd, 0xf6, 0x60, 0xb7, 0xdc, 0x38, 0x50, 0xaa, 0xea, 0x61, 0x79, 0xfb, 0xa0, + 0xaa, 0x36, 0xbe, 0xda, 0xaf, 0xaa, 0x07, 0xbb, 0xf5, 0xfd, 0x6a, 0xa5, 0xf6, 0x79, 0xad, 0xba, + 0x95, 0x4b, 0xc1, 0xdb, 0xa0, 0x30, 0x11, 0xa5, 0x94, 0xbf, 0xcc, 0x71, 0x70, 0x05, 0x08, 0x13, + 0xad, 0x95, 0xbd, 0xfa, 0xce, 0x5e, 0x5d, 0xdd, 0xaa, 0x29, 0xd5, 0x4a, 0x23, 0x37, 0x05, 0xef, + 0x80, 0x77, 0x2f, 0xc3, 0x95, 0x77, 0x6a, 0xbb, 0x7b, 0xb9, 0x69, 0xb8, 0x0a, 0x56, 0x26, 0xc2, + 0xaa, 0x87, 0x3b, 0xea, 0x7e, 0x55, 0xa9, 0xef, 0xed, 0x96, 0xb7, 0x55, 0x8c, 0xc8, 0xa5, 0x97, + 0xd2, 0x8f, 0x7f, 0x28, 0xa6, 0xe4, 0x47, 0xcf, 0x4f, 0x8b, 0xdc, 0x8b, 0xd3, 0x22, 0xf7, 0xf7, + 0x69, 0x91, 0x7b, 0x72, 0x56, 0x4c, 0xbd, 0x38, 0x2b, 0xa6, 0xfe, 0x38, 0x2b, 0xa6, 0xbe, 0x5e, + 0x37, 0xcc, 0xf0, 0xa8, 0xa3, 0x8b, 0x4d, 0xd7, 0x96, 0x68, 0x77, 0xd6, 0x2c, 0x4d, 0x0f, 0xd8, + 0xb7, 0xd4, 0xfd, 0x58, 0xea, 0xc5, 0xff, 0x87, 0xb0, 0xc0, 0x03, 0x7d, 0x96, 0xcc, 0x70, 0xf3, + 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x11, 0x55, 0x33, 0x9b, 0x2f, 0x09, 0x00, 0x00, } func (this *ChainLink) Equal(that interface{}) bool { diff --git a/x/profiles/types/models_dtag_requests.pb.go b/x/profiles/types/models_dtag_requests.pb.go index 9494746a4e..aa773edcd0 100644 --- a/x/profiles/types/models_dtag_requests.pb.go +++ b/x/profiles/types/models_dtag_requests.pb.go @@ -98,8 +98,8 @@ var fileDescriptor_3ee5a4443f48e795 = []byte{ 0x79, 0x9f, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x61, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0x24, 0xa0, 0x75, 0x73, 0x12, 0x93, 0x8a, 0xa1, - 0x6c, 0xfd, 0x32, 0x53, 0xfd, 0x0a, 0x44, 0x44, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, - 0x83, 0xd4, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xc4, 0xa0, 0x21, 0x73, 0xc8, 0x01, 0x00, 0x00, + 0x6c, 0xfd, 0x32, 0x33, 0xfd, 0x0a, 0x44, 0x44, 0x95, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, + 0x83, 0xd4, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x4d, 0x76, 0x81, 0xc8, 0x01, 0x00, 0x00, } func (this *DTagTransferRequest) Equal(that interface{}) bool { diff --git a/x/profiles/types/models_packets.pb.go b/x/profiles/types/models_packets.pb.go index 8fe0a0d612..304109a1bb 100644 --- a/x/profiles/types/models_packets.pb.go +++ b/x/profiles/types/models_packets.pb.go @@ -129,35 +129,35 @@ var fileDescriptor_ecd3778626d03f03 = []byte{ // 497 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x52, 0x3f, 0x6f, 0xd3, 0x4c, 0x18, 0xb7, 0xdf, 0x37, 0x20, 0xd5, 0x05, 0x44, 0x9c, 0x20, 0x25, 0x19, 0xec, 0xc8, 0x52, 0xd5, - 0x0a, 0x14, 0x9f, 0x20, 0x82, 0xa1, 0x4c, 0x71, 0x19, 0x90, 0x60, 0xa8, 0xc2, 0xc6, 0x40, 0x74, - 0xb1, 0x2f, 0xee, 0x29, 0xf6, 0x3d, 0x96, 0xef, 0x12, 0x25, 0xdf, 0x80, 0x91, 0x8f, 0xc0, 0xc8, - 0xc8, 0xd0, 0x0f, 0x51, 0x31, 0xa0, 0x8a, 0x89, 0x29, 0x42, 0xc9, 0xc0, 0xde, 0x4f, 0x80, 0x7c, - 0x77, 0xa1, 0x0e, 0x35, 0x62, 0xb1, 0xce, 0xf7, 0xfc, 0xfe, 0x3c, 0xcf, 0xef, 0x1e, 0xeb, 0x30, - 0x22, 0x3c, 0x05, 0x8e, 0xb2, 0x1c, 0x26, 0x34, 0x21, 0x1c, 0xcd, 0xfb, 0x28, 0x85, 0x88, 0x24, - 0x7c, 0x94, 0xe1, 0x70, 0x4a, 0x04, 0xf7, 0xb3, 0x1c, 0x04, 0xd8, 0xb6, 0x02, 0xfa, 0x5b, 0xa0, - 0x3f, 0xef, 0x77, 0xea, 0x38, 0xa5, 0x0c, 0x90, 0xfc, 0x2a, 0x58, 0xa7, 0x19, 0x43, 0x0c, 0xf2, - 0x88, 0x8a, 0x93, 0xbe, 0x6d, 0xc7, 0x00, 0x71, 0x42, 0x90, 0xfc, 0x1b, 0xcf, 0x26, 0x08, 0xb3, - 0xe5, 0xb6, 0x14, 0x42, 0xa1, 0x3b, 0x52, 0x1c, 0xf5, 0xa3, 0x4b, 0x8f, 0xfe, 0xde, 0x5b, 0x78, - 0x86, 0x29, 0x1b, 0x25, 0x94, 0x4d, 0x35, 0xd8, 0xfb, 0x5a, 0xb3, 0x3a, 0xaf, 0x29, 0x9b, 0x9e, - 0x14, 0x95, 0x41, 0x18, 0xc2, 0x8c, 0x89, 0x53, 0x39, 0xc1, 0x0b, 0x2c, 0xb0, 0xbd, 0xb0, 0xee, - 0x71, 0x98, 0xe5, 0x21, 0x19, 0xe1, 0x28, 0xca, 0x09, 0xe7, 0x2d, 0xb3, 0x6b, 0x1e, 0xed, 0x3f, - 0x69, 0xfa, 0xaa, 0x35, 0x7f, 0xdb, 0x9a, 0x3f, 0x60, 0xcb, 0xe0, 0xf9, 0xd5, 0xca, 0x7d, 0xb0, - 0xc4, 0x69, 0x72, 0xec, 0xed, 0xb2, 0xbc, 0x2f, 0xe7, 0x3d, 0xe7, 0x66, 0x12, 0xfe, 0x40, 0x95, - 0x0b, 0xab, 0xe1, 0x5d, 0x45, 0xd1, 0x57, 0xf6, 0x3b, 0xeb, 0x8e, 0xd6, 0xc8, 0x72, 0x80, 0x49, - 0xeb, 0x3f, 0xe9, 0xdb, 0xf6, 0x2b, 0x54, 0x4e, 0x0b, 0x40, 0xd0, 0xbd, 0x58, 0xb9, 0xc6, 0xd5, - 0xca, 0x6d, 0xec, 0x34, 0x20, 0xc9, 0xde, 0xa7, 0x9f, 0x9f, 0x1f, 0x9a, 0xc3, 0x7d, 0x75, 0x27, - 0xe1, 0xf6, 0xc2, 0x6a, 0x68, 0x88, 0x0a, 0x25, 0x04, 0x36, 0xa1, 0x71, 0xeb, 0x7f, 0x69, 0xe3, - 0x56, 0xd9, 0xc8, 0x88, 0x4e, 0x24, 0x2c, 0x38, 0xd4, 0x66, 0x9d, 0x1d, 0xb3, 0xb2, 0x92, 0xf6, - 0xac, 0xab, 0x52, 0x89, 0x6b, 0xc7, 0x56, 0x23, 0x22, 0x5c, 0x50, 0x86, 0x05, 0x05, 0xf6, 0x3b, - 0xd8, 0x5a, 0xd7, 0x3c, 0xda, 0x0b, 0x9e, 0x5d, 0x8b, 0x56, 0x80, 0xbc, 0x6f, 0xe7, 0xbd, 0xa6, - 0x7e, 0x6c, 0x1d, 0xd4, 0x1b, 0x91, 0x53, 0x16, 0x0f, 0xed, 0x12, 0x7a, 0x1b, 0x61, 0x6a, 0xd5, - 0xcb, 0x1a, 0x2a, 0xc7, 0x5b, 0xff, 0xca, 0xf1, 0x40, 0x8f, 0xd6, 0xba, 0xd9, 0x45, 0x39, 0xcc, - 0xfb, 0xa5, 0x82, 0x24, 0x1e, 0xd7, 0xde, 0x7f, 0x74, 0x0d, 0xef, 0xa5, 0xd5, 0xae, 0xde, 0xa7, - 0x41, 0x38, 0xb5, 0x0f, 0x2a, 0xd7, 0x69, 0xef, 0x8f, 0xb7, 0x57, 0x4a, 0xc1, 0xab, 0x8b, 0xb5, - 0x63, 0x5e, 0xae, 0x1d, 0xf3, 0xc7, 0xda, 0x31, 0x3f, 0x6c, 0x1c, 0xe3, 0x72, 0xe3, 0x18, 0xdf, - 0x37, 0x8e, 0xf1, 0xf6, 0x71, 0x4c, 0xc5, 0xd9, 0x6c, 0xec, 0x87, 0x90, 0x22, 0x35, 0x47, 0x2f, - 0xc1, 0x63, 0xae, 0xcf, 0x68, 0xfe, 0x14, 0x2d, 0xae, 0xb7, 0x5f, 0x2c, 0x33, 0xc2, 0xc7, 0xb7, - 0xe5, 0xa2, 0xf6, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0xd4, 0xc4, 0xae, 0x9f, 0xb9, 0x03, 0x00, + 0x0a, 0x14, 0x9f, 0x20, 0x52, 0x87, 0x32, 0xc5, 0x65, 0x40, 0x82, 0xa1, 0x0a, 0x1b, 0x03, 0xd1, + 0xc5, 0xbe, 0xb8, 0xa7, 0xd8, 0xf7, 0x58, 0xbe, 0x4b, 0x94, 0x7c, 0x03, 0x46, 0x3e, 0x02, 0x23, + 0x23, 0x43, 0x3f, 0x44, 0xc5, 0x80, 0x2a, 0x26, 0xa6, 0x08, 0x25, 0x03, 0x7b, 0x3f, 0x01, 0xf2, + 0xdd, 0x85, 0x3a, 0xd4, 0x88, 0xc5, 0x3a, 0xdf, 0xf3, 0xfb, 0xf3, 0x3c, 0xbf, 0x7b, 0xac, 0xc3, + 0x88, 0xf0, 0x14, 0x38, 0xca, 0x72, 0x98, 0xd0, 0x84, 0x70, 0x34, 0xef, 0xa3, 0x14, 0x22, 0x92, + 0xf0, 0x51, 0x86, 0xc3, 0x29, 0x11, 0xdc, 0xcf, 0x72, 0x10, 0x60, 0xdb, 0x0a, 0xe8, 0x6f, 0x81, + 0xfe, 0xbc, 0xdf, 0xa9, 0xe3, 0x94, 0x32, 0x40, 0xf2, 0xab, 0x60, 0x9d, 0x66, 0x0c, 0x31, 0xc8, + 0x23, 0x2a, 0x4e, 0xfa, 0xb6, 0x1d, 0x03, 0xc4, 0x09, 0x41, 0xf2, 0x6f, 0x3c, 0x9b, 0x20, 0xcc, + 0x96, 0xdb, 0x52, 0x08, 0x85, 0xee, 0x48, 0x71, 0xd4, 0x8f, 0x2e, 0x3d, 0xf9, 0x7b, 0x6f, 0xe1, + 0x39, 0xa6, 0x6c, 0x94, 0x50, 0x36, 0xd5, 0x60, 0xef, 0x6b, 0xcd, 0xea, 0xbc, 0xa6, 0x6c, 0x7a, + 0x5a, 0x54, 0x06, 0x61, 0x08, 0x33, 0x26, 0xce, 0xe4, 0x04, 0x2f, 0xb0, 0xc0, 0xf6, 0xc2, 0x7a, + 0xc0, 0x61, 0x96, 0x87, 0x64, 0x84, 0xa3, 0x28, 0x27, 0x9c, 0xb7, 0xcc, 0xae, 0x79, 0xb4, 0xff, + 0xac, 0xe9, 0xab, 0xd6, 0xfc, 0x6d, 0x6b, 0xfe, 0x80, 0x2d, 0x83, 0xe7, 0xd7, 0x2b, 0xf7, 0xd1, + 0x12, 0xa7, 0xc9, 0x89, 0xb7, 0xcb, 0xf2, 0xbe, 0x5c, 0xf4, 0x9c, 0xdb, 0x49, 0xf8, 0x03, 0x55, + 0x2e, 0xac, 0x86, 0xf7, 0x15, 0x45, 0x5f, 0xd9, 0xef, 0xac, 0x7b, 0x5a, 0x23, 0xcb, 0x01, 0x26, + 0xad, 0xff, 0xa4, 0x6f, 0xdb, 0xaf, 0x50, 0x39, 0x2b, 0x00, 0x41, 0xf7, 0x72, 0xe5, 0x1a, 0xd7, + 0x2b, 0xb7, 0xb1, 0xd3, 0x80, 0x24, 0x7b, 0x9f, 0x7e, 0x7e, 0x7e, 0x6c, 0x0e, 0xf7, 0xd5, 0x9d, + 0x84, 0xdb, 0x0b, 0xab, 0xa1, 0x21, 0x2a, 0x94, 0x10, 0xd8, 0x84, 0xc6, 0xad, 0xff, 0xa5, 0x8d, + 0x5b, 0x65, 0x23, 0x23, 0x3a, 0x95, 0xb0, 0xe0, 0x50, 0x9b, 0x75, 0x76, 0xcc, 0xca, 0x4a, 0xda, + 0xb3, 0xae, 0x4a, 0x25, 0xae, 0x1d, 0x5b, 0x8d, 0x88, 0x70, 0x41, 0x19, 0x16, 0x14, 0xd8, 0xef, + 0x60, 0x6b, 0x5d, 0xf3, 0x68, 0x2f, 0x38, 0xbe, 0x11, 0xad, 0x00, 0x79, 0xdf, 0x2e, 0x7a, 0x4d, + 0xfd, 0xd8, 0x3a, 0xa8, 0x37, 0x22, 0xa7, 0x2c, 0x1e, 0xda, 0x25, 0xf4, 0x36, 0xc2, 0xd4, 0xaa, + 0x97, 0x35, 0x54, 0x8e, 0x77, 0xfe, 0x95, 0xe3, 0x81, 0x1e, 0xad, 0x75, 0xbb, 0x8b, 0x72, 0x98, + 0x0f, 0x4b, 0x05, 0x49, 0x3c, 0xa9, 0xbd, 0xff, 0xe8, 0x1a, 0xde, 0x4b, 0xab, 0x5d, 0xbd, 0x4f, + 0x83, 0x70, 0x6a, 0x1f, 0x54, 0xae, 0xd3, 0xde, 0x1f, 0x6f, 0xaf, 0x94, 0x82, 0x57, 0x97, 0x6b, + 0xc7, 0xbc, 0x5a, 0x3b, 0xe6, 0x8f, 0xb5, 0x63, 0x7e, 0xd8, 0x38, 0xc6, 0xd5, 0xc6, 0x31, 0xbe, + 0x6f, 0x1c, 0xe3, 0xed, 0xd3, 0x98, 0x8a, 0xf3, 0xd9, 0xd8, 0x0f, 0x21, 0x45, 0x6a, 0x8e, 0x5e, + 0x82, 0xc7, 0x5c, 0x9f, 0xd1, 0xfc, 0x18, 0x2d, 0x6e, 0xb6, 0x5f, 0x2c, 0x33, 0xc2, 0xc7, 0x77, + 0xe5, 0xa2, 0xf6, 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x29, 0xf9, 0x6d, 0xb9, 0x03, 0x00, 0x00, } diff --git a/x/profiles/types/models_params.go b/x/profiles/types/models_params.go index 5af8dbcd77..e00fd8b23d 100644 --- a/x/profiles/types/models_params.go +++ b/x/profiles/types/models_params.go @@ -18,12 +18,12 @@ const ( // Default profile paramsModule var ( - DefaultMinNicknameLength = sdk.NewInt(2) - DefaultMaxNicknameLength = sdk.NewInt(1000) // Longest name on earth count 954 chars + DefaultMinNicknameLength = math.NewInt(2) + DefaultMaxNicknameLength = math.NewInt(1000) // Longest name on earth count 954 chars DefaultRegEx = `^[A-Za-z0-9_]+$` - DefaultMinDTagLength = sdk.NewInt(3) - DefaultMaxDTagLength = sdk.NewInt(30) - DefaultMaxBioLength = sdk.NewInt(1000) + DefaultMinDTagLength = math.NewInt(3) + DefaultMaxDTagLength = math.NewInt(30) + DefaultMaxBioLength = math.NewInt(1000) DefaultAppLinksValidityDuration = time.Hour * 24 * 365 // 1 year ) @@ -207,7 +207,7 @@ func DefaultOracleParams() OracleParams { 1, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ) } diff --git a/x/profiles/types/models_params.pb.go b/x/profiles/types/models_params.pb.go index 0cf0b43a55..c1269b2771 100644 --- a/x/profiles/types/models_params.pb.go +++ b/x/profiles/types/models_params.pb.go @@ -4,6 +4,7 @@ package types import ( + cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" @@ -74,8 +75,8 @@ var xxx_messageInfo_Params proto.InternalMessageInfo // NicknameParams defines the parameters related to the profiles nicknames type NicknameParams struct { - MinLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=min_length,json=minLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_length" yaml:"min_length"` - MaxLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=max_length,json=maxLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"max_length" yaml:"max_length"` + MinLength cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=min_length,json=minLength,proto3,customtype=cosmossdk.io/math.Int" json:"min_length" yaml:"min_length"` + MaxLength cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=max_length,json=maxLength,proto3,customtype=cosmossdk.io/math.Int" json:"max_length" yaml:"max_length"` } func (m *NicknameParams) Reset() { *m = NicknameParams{} } @@ -113,9 +114,9 @@ var xxx_messageInfo_NicknameParams proto.InternalMessageInfo // DTagParams defines the parameters related to profile DTags type DTagParams struct { - RegEx string `protobuf:"bytes,1,opt,name=reg_ex,json=regEx,proto3" json:"reg_ex,omitempty" yaml:"reg_ex"` - MinLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=min_length,json=minLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"min_length" yaml:"min_length"` - MaxLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=max_length,json=maxLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"max_length" yaml:"max_length"` + RegEx string `protobuf:"bytes,1,opt,name=reg_ex,json=regEx,proto3" json:"reg_ex,omitempty" yaml:"reg_ex"` + MinLength cosmossdk_io_math.Int `protobuf:"bytes,2,opt,name=min_length,json=minLength,proto3,customtype=cosmossdk.io/math.Int" json:"min_length" yaml:"min_length"` + MaxLength cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=max_length,json=maxLength,proto3,customtype=cosmossdk.io/math.Int" json:"max_length" yaml:"max_length"` } func (m *DTagParams) Reset() { *m = DTagParams{} } @@ -153,7 +154,7 @@ var xxx_messageInfo_DTagParams proto.InternalMessageInfo // BioParams defines the parameters related to profile biography type BioParams struct { - MaxLength github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=max_length,json=maxLength,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"max_length" yaml:"max_length"` + MaxLength cosmossdk_io_math.Int `protobuf:"bytes,3,opt,name=max_length,json=maxLength,proto3,customtype=cosmossdk.io/math.Int" json:"max_length" yaml:"max_length"` } func (m *BioParams) Reset() { *m = BioParams{} } @@ -298,61 +299,61 @@ func init() { } var fileDescriptor_924c89959f3aa975 = []byte{ - // 858 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x95, 0x4d, 0x6f, 0xe3, 0x44, - 0x18, 0xc7, 0xe3, 0x3a, 0x8d, 0x92, 0x49, 0x59, 0x36, 0xd6, 0x0a, 0x65, 0x2b, 0xd6, 0x0e, 0x3e, - 0xac, 0x42, 0xa5, 0xb5, 0x95, 0xad, 0x10, 0x52, 0x25, 0x0e, 0xeb, 0x16, 0x41, 0xc5, 0xf2, 0x22, - 0x53, 0x2e, 0x80, 0xb0, 0xc6, 0xf6, 0xc4, 0x3b, 0x8a, 0xed, 0x31, 0x1e, 0x27, 0x4a, 0xf8, 0x04, - 0xc0, 0x89, 0x0b, 0x12, 0xe2, 0xc4, 0x71, 0xc5, 0xa9, 0xdf, 0x81, 0xcb, 0x1e, 0xf7, 0x88, 0xf6, - 0xe0, 0x45, 0xe9, 0xa1, 0x9c, 0xf3, 0x09, 0xd0, 0xbc, 0x38, 0x2f, 0x6d, 0x91, 0x5a, 0xd0, 0x5e, - 0x92, 0xf1, 0xcc, 0xf3, 0xff, 0x3d, 0x7f, 0x3f, 0x8f, 0x67, 0x06, 0xdc, 0x0f, 0x11, 0x4d, 0x08, - 0xb5, 0xb3, 0x9c, 0x0c, 0x71, 0x8c, 0xa8, 0x3d, 0xd9, 0xb7, 0x13, 0x12, 0xa2, 0x98, 0x7a, 0x19, - 0xcc, 0x61, 0x42, 0xad, 0x2c, 0x27, 0x05, 0xd1, 0x34, 0x11, 0x67, 0x55, 0x71, 0xd6, 0x64, 0x7f, - 0xb7, 0x03, 0x13, 0x9c, 0x12, 0x9b, 0xff, 0x8a, 0xb0, 0xdd, 0x3b, 0x11, 0x89, 0x08, 0x1f, 0xda, - 0x6c, 0x24, 0x67, 0xf5, 0x80, 0xf0, 0x24, 0x3e, 0xa4, 0xc8, 0x9e, 0x0c, 0x7c, 0x54, 0xc0, 0x81, - 0x1d, 0x10, 0x9c, 0x56, 0xeb, 0x11, 0x21, 0x51, 0x8c, 0x6c, 0xfe, 0xe4, 0x8f, 0x87, 0x76, 0x38, - 0xce, 0x61, 0x81, 0x89, 0x5c, 0x37, 0x5f, 0xa8, 0xa0, 0xf1, 0x19, 0x77, 0xa3, 0x7d, 0x0d, 0x9a, - 0x29, 0x0e, 0x46, 0x29, 0x4c, 0x50, 0x57, 0xe9, 0x29, 0xfd, 0xf6, 0x43, 0xd3, 0xba, 0x6c, 0xcd, - 0xfa, 0x44, 0xc6, 0x08, 0x95, 0xf3, 0xe6, 0xb3, 0xd2, 0xa8, 0x2d, 0x4a, 0xe3, 0xf5, 0x19, 0x4c, - 0xe2, 0x03, 0xb3, 0x22, 0x98, 0x4f, 0xcf, 0x4f, 0xf7, 0x14, 0x77, 0x49, 0xd4, 0x4e, 0x40, 0x3d, - 0x2c, 0x60, 0xd4, 0xdd, 0xe2, 0x64, 0xfd, 0x2a, 0xf2, 0xd1, 0x09, 0x8c, 0x24, 0xb5, 0xc7, 0xa8, - 0xf3, 0xd2, 0xa8, 0xb3, 0xb9, 0x45, 0x69, 0xb4, 0x05, 0x9d, 0x11, 0x24, 0x99, 0xd3, 0xb4, 0x43, - 0xa0, 0xfa, 0x98, 0x74, 0x55, 0x0e, 0xbd, 0x77, 0x15, 0xd4, 0xc1, 0x44, 0x32, 0x35, 0xe9, 0x14, - 0x08, 0x96, 0x8f, 0x89, 0xe9, 0x32, 0xb5, 0x76, 0x02, 0x1a, 0x24, 0x87, 0x41, 0x8c, 0xba, 0x75, - 0xce, 0xe9, 0x5d, 0xc5, 0xf9, 0x94, 0x47, 0x48, 0xd4, 0xae, 0x44, 0xbd, 0x26, 0x50, 0x42, 0x2d, - 0x8d, 0x49, 0x96, 0xf6, 0x0d, 0x68, 0xc1, 0x2c, 0xf3, 0x62, 0x9c, 0x8e, 0x68, 0x77, 0xfb, 0xdf, - 0xeb, 0xf9, 0x28, 0xcb, 0x1e, 0xb3, 0x18, 0x89, 0xbe, 0x27, 0xd1, 0xb7, 0x05, 0x7a, 0x89, 0xa8, - 0x0a, 0x0a, 0x65, 0xf8, 0xc1, 0x5b, 0xdf, 0xff, 0x66, 0xd4, 0x7e, 0x3c, 0x3f, 0xdd, 0xeb, 0xca, - 0xef, 0x6c, 0xba, 0xfa, 0xd2, 0x04, 0xcb, 0xfc, 0x5b, 0x01, 0xb7, 0x36, 0xdb, 0xa5, 0x45, 0x00, - 0x24, 0x38, 0xf5, 0x62, 0x94, 0x46, 0xc5, 0x13, 0xde, 0xe6, 0x1d, 0xe7, 0x43, 0x96, 0xf2, 0x45, - 0x69, 0xdc, 0x8f, 0x70, 0xf1, 0x64, 0xec, 0x5b, 0x01, 0x49, 0x6c, 0xf9, 0x59, 0x89, 0xbf, 0x07, - 0x34, 0x1c, 0xd9, 0xc5, 0x2c, 0x43, 0xd4, 0x3a, 0x4e, 0x8b, 0x45, 0x69, 0x74, 0x84, 0xb9, 0x15, - 0x49, 0xba, 0x6b, 0x25, 0x38, 0x7d, 0xcc, 0x27, 0x78, 0x22, 0x38, 0xad, 0x12, 0x6d, 0xfd, 0xcf, - 0x44, 0x4b, 0xd2, 0x32, 0x11, 0x9c, 0x8a, 0x44, 0x07, 0x75, 0x56, 0x07, 0xf3, 0xe9, 0x16, 0x00, - 0xab, 0xef, 0x47, 0xeb, 0x83, 0x46, 0x8e, 0x22, 0x0f, 0x4d, 0xf9, 0x2b, 0xb6, 0x9c, 0xce, 0xaa, - 0x59, 0x62, 0xde, 0x74, 0xb7, 0x73, 0x14, 0xbd, 0x3f, 0xd5, 0x8a, 0x8d, 0x82, 0x08, 0x9f, 0x5f, - 0xdc, 0xcc, 0xe7, 0xbc, 0x34, 0x5a, 0x1f, 0x57, 0x2f, 0x7e, 0xbd, 0xea, 0x14, 0x1b, 0xd5, 0x51, - 0xff, 0x73, 0xd6, 0xaa, 0x0a, 0x37, 0x29, 0xd5, 0x77, 0xa0, 0xb5, 0xdc, 0x14, 0x17, 0xda, 0xa4, - 0xbe, 0xea, 0x36, 0xfd, 0xa1, 0x82, 0x9d, 0xf5, 0x9d, 0xa4, 0xbd, 0x07, 0x5a, 0x34, 0xc8, 0x71, - 0x56, 0x78, 0x38, 0xe4, 0xbd, 0xaa, 0x3b, 0xbd, 0x79, 0x69, 0x34, 0x3f, 0xe7, 0x93, 0xc7, 0x47, - 0xab, 0x9d, 0xb0, 0x0c, 0x33, 0xdd, 0xa6, 0x18, 0x1f, 0x87, 0xda, 0x00, 0xb4, 0x20, 0x1d, 0x79, - 0x01, 0x19, 0xa7, 0x05, 0x6f, 0x5e, 0xdd, 0xb9, 0xb3, 0xb6, 0x79, 0xaa, 0x25, 0xd3, 0x6d, 0x42, - 0x3a, 0x3a, 0x64, 0x43, 0x26, 0x61, 0x9d, 0x11, 0x12, 0xf5, 0xa2, 0x64, 0xb9, 0x64, 0xba, 0xcd, - 0x04, 0xa7, 0x42, 0xf2, 0x2e, 0x68, 0x67, 0x39, 0xca, 0x60, 0x8e, 0xbc, 0x08, 0x52, 0x7e, 0x4a, - 0xd4, 0x9d, 0x37, 0x16, 0xa5, 0xa1, 0x09, 0xd1, 0xda, 0xa2, 0xe9, 0x02, 0xf9, 0xf4, 0x01, 0xa4, - 0x4c, 0x88, 0xa6, 0x28, 0x18, 0x17, 0x42, 0xb8, 0x7d, 0x51, 0xb8, 0xb6, 0x68, 0xba, 0x40, 0x3e, - 0x31, 0xe1, 0xcf, 0x0a, 0x00, 0x43, 0x84, 0x3c, 0x98, 0x70, 0x9b, 0x8d, 0x9e, 0xda, 0x6f, 0x3f, - 0xbc, 0x6b, 0x89, 0xf2, 0x5b, 0xec, 0xb0, 0xb7, 0xe4, 0x61, 0x6f, 0x1d, 0x12, 0x9c, 0x3a, 0x5f, - 0xc9, 0x53, 0x43, 0x36, 0x62, 0x25, 0x35, 0x7f, 0x7f, 0x69, 0xf4, 0xaf, 0xd1, 0x47, 0x46, 0xa1, - 0xbf, 0x9e, 0x9f, 0xee, 0xed, 0xc4, 0x28, 0x82, 0xc1, 0xcc, 0x63, 0x77, 0x08, 0x95, 0x5d, 0x1c, - 0x22, 0xf4, 0x88, 0xd3, 0x64, 0x17, 0x7f, 0x50, 0xc0, 0xad, 0xcd, 0x63, 0x4b, 0xfb, 0x16, 0x74, - 0x26, 0x30, 0xc6, 0x21, 0x2e, 0x66, 0x5e, 0x75, 0xc5, 0xc8, 0x5b, 0xe4, 0xae, 0x25, 0xee, 0x20, - 0xab, 0xba, 0x83, 0xac, 0x23, 0x19, 0xe0, 0xbc, 0x2d, 0x6d, 0x77, 0x85, 0xed, 0x4b, 0x04, 0xf3, - 0x97, 0x97, 0x86, 0x22, 0x4c, 0xdc, 0xae, 0x16, 0x2b, 0xb1, 0xf0, 0xe2, 0x7c, 0xf4, 0x6c, 0xae, - 0x2b, 0xcf, 0xe7, 0xba, 0xf2, 0xd7, 0x5c, 0x57, 0x7e, 0x3a, 0xd3, 0x6b, 0xcf, 0xcf, 0xf4, 0xda, - 0x9f, 0x67, 0x7a, 0xed, 0xcb, 0xc1, 0xda, 0x6b, 0x8b, 0x23, 0xf2, 0x41, 0x0c, 0x7d, 0x2a, 0xc7, - 0xf6, 0xe4, 0x9d, 0xf5, 0x13, 0x93, 0x57, 0xc1, 0x6f, 0x70, 0x8b, 0xfb, 0xff, 0x04, 0x00, 0x00, - 0xff, 0xff, 0x5a, 0x4c, 0x54, 0xac, 0xbb, 0x07, 0x00, 0x00, + // 862 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0xcf, 0x6f, 0xe3, 0x44, + 0x14, 0xc7, 0xe3, 0x3a, 0x8d, 0x92, 0x49, 0x59, 0x36, 0xd6, 0x82, 0xb2, 0x15, 0x6b, 0x07, 0x1f, + 0x50, 0xa8, 0xb4, 0xb6, 0xb2, 0x95, 0x58, 0xa9, 0x12, 0x87, 0xba, 0x41, 0xa8, 0xa2, 0xfc, 0x90, + 0xa9, 0x38, 0x00, 0xc2, 0x1a, 0xdb, 0x13, 0x77, 0x14, 0xdb, 0x63, 0x3c, 0x4e, 0x94, 0xfc, 0x03, + 0x08, 0x38, 0x71, 0x41, 0x42, 0x9c, 0x38, 0x22, 0x4e, 0xfd, 0x1f, 0x90, 0x50, 0x8f, 0x3d, 0xa2, + 0x1e, 0x5c, 0x94, 0x1e, 0x7a, 0xcf, 0x5f, 0x80, 0x3c, 0x33, 0xce, 0x8f, 0xb6, 0xa0, 0x56, 0xda, + 0x4b, 0x3b, 0x9e, 0x79, 0xdf, 0x8f, 0xbf, 0xef, 0xcd, 0xcb, 0x33, 0x78, 0xc7, 0x47, 0x34, 0x22, + 0xd4, 0x4c, 0x52, 0x32, 0xc0, 0x21, 0xa2, 0xe6, 0x78, 0xd7, 0x8c, 0x88, 0x8f, 0x42, 0xea, 0x24, + 0x30, 0x85, 0x11, 0x35, 0x92, 0x94, 0x64, 0x44, 0x51, 0x78, 0x9c, 0x51, 0xc6, 0x19, 0xe3, 0xdd, + 0xed, 0x16, 0x8c, 0x70, 0x4c, 0x4c, 0xf6, 0x97, 0x87, 0x6d, 0x3f, 0x09, 0x48, 0x40, 0xd8, 0xd2, + 0x2c, 0x56, 0x62, 0x57, 0xf5, 0x08, 0x7b, 0x89, 0x0b, 0x29, 0x32, 0xc7, 0x3d, 0x17, 0x65, 0xb0, + 0x67, 0x7a, 0x04, 0xc7, 0xe5, 0x79, 0x40, 0x48, 0x10, 0x22, 0x93, 0x3d, 0xb9, 0xa3, 0x81, 0xe9, + 0x8f, 0x52, 0x98, 0x61, 0x22, 0xce, 0xf5, 0x0b, 0x19, 0xd4, 0x3e, 0x63, 0x6e, 0x94, 0xaf, 0x41, + 0x3d, 0xc6, 0xde, 0x30, 0x86, 0x11, 0x6a, 0x4b, 0x1d, 0xa9, 0xdb, 0x7c, 0xa1, 0x1b, 0xb7, 0xad, + 0x19, 0x9f, 0x88, 0x18, 0xae, 0xb2, 0xde, 0x3a, 0xcb, 0xb5, 0xca, 0x3c, 0xd7, 0x5e, 0x9f, 0xc2, + 0x28, 0xdc, 0xd3, 0x4b, 0x82, 0xfe, 0xfb, 0xf5, 0xe9, 0x8e, 0x64, 0x2f, 0x88, 0xca, 0x31, 0xa8, + 0xfa, 0x19, 0x0c, 0xda, 0x1b, 0x8c, 0xac, 0xde, 0x45, 0xee, 0x1f, 0xc3, 0x40, 0x50, 0x3b, 0x05, + 0x75, 0x96, 0x6b, 0xd5, 0x62, 0x6f, 0x9e, 0x6b, 0x4d, 0x4e, 0x2f, 0x08, 0x82, 0xcc, 0x68, 0xca, + 0x01, 0x90, 0x5d, 0x4c, 0xda, 0x32, 0x83, 0x3e, 0xbb, 0x0b, 0x6a, 0x61, 0x22, 0x98, 0x8a, 0x70, + 0x0a, 0x38, 0xcb, 0xc5, 0x44, 0xb7, 0x0b, 0xb5, 0x72, 0x0c, 0x6a, 0x24, 0x85, 0x5e, 0x88, 0xda, + 0x55, 0xc6, 0xe9, 0xdc, 0xc5, 0xf9, 0x94, 0x45, 0x08, 0xd4, 0xb6, 0x40, 0xbd, 0xc6, 0x51, 0x5c, + 0x2d, 0x8c, 0x09, 0x96, 0xf2, 0x0d, 0x68, 0xc0, 0x24, 0x71, 0x42, 0x1c, 0x0f, 0x69, 0x7b, 0xf3, + 0xbf, 0xeb, 0xb9, 0x9f, 0x24, 0x47, 0x45, 0x8c, 0x40, 0x3f, 0x13, 0xe8, 0xc7, 0x1c, 0xbd, 0x40, + 0x94, 0x05, 0x85, 0x22, 0x7c, 0xef, 0xed, 0xef, 0x7f, 0xd3, 0x2a, 0x3f, 0x5e, 0x9f, 0xee, 0xb4, + 0x45, 0x9f, 0x4d, 0x96, 0x9d, 0xc6, 0x59, 0xfa, 0x5f, 0x12, 0x78, 0xb4, 0x7e, 0x5d, 0xca, 0x17, + 0x00, 0x44, 0x38, 0x76, 0x42, 0x14, 0x07, 0xd9, 0x09, 0xbb, 0xe6, 0x2d, 0xeb, 0x65, 0xf1, 0xca, + 0x8b, 0x5c, 0x7b, 0x83, 0xf7, 0x12, 0xf5, 0x87, 0x06, 0x26, 0x66, 0x04, 0xb3, 0x13, 0xe3, 0x30, + 0xce, 0xe6, 0xb9, 0xd6, 0xe2, 0x5e, 0x96, 0x42, 0x61, 0xa6, 0x11, 0xe1, 0xf8, 0x88, 0x6d, 0x30, + 0x2e, 0x9c, 0x94, 0xdc, 0x8d, 0x87, 0x71, 0x17, 0xc2, 0x05, 0x17, 0x4e, 0x38, 0x77, 0xaf, 0x5a, + 0x64, 0xa9, 0x7f, 0xb7, 0x01, 0xc0, 0xb2, 0x3b, 0x94, 0x2e, 0xa8, 0xa5, 0x28, 0x70, 0xd0, 0x84, + 0x25, 0xd0, 0xb0, 0x5a, 0xcb, 0xab, 0xe0, 0xfb, 0xba, 0xbd, 0x99, 0xa2, 0xe0, 0x83, 0x89, 0xe2, + 0xad, 0xa5, 0xcb, 0x6d, 0xf5, 0xff, 0xd7, 0xd6, 0x2c, 0xd7, 0x1a, 0x1f, 0x97, 0x69, 0xdd, 0x2f, + 0x77, 0x6f, 0x2d, 0x77, 0xf9, 0xbe, 0x2f, 0x29, 0x73, 0x7c, 0x48, 0x21, 0x30, 0x68, 0x2c, 0x1a, + 0xfa, 0x46, 0xcd, 0xe5, 0x57, 0x5c, 0xf3, 0x3f, 0x65, 0xb0, 0xb5, 0xda, 0xf4, 0xca, 0xfb, 0xa0, + 0x41, 0xbd, 0x14, 0x27, 0x99, 0x83, 0x7d, 0x56, 0xf8, 0xaa, 0xd5, 0x99, 0xe5, 0x5a, 0xfd, 0x73, + 0xb6, 0x79, 0xd8, 0x5f, 0x36, 0xed, 0x22, 0x4c, 0xb7, 0xeb, 0x7c, 0x7d, 0xe8, 0x2b, 0x3d, 0xd0, + 0x80, 0x74, 0xe8, 0x78, 0x64, 0x14, 0x67, 0xec, 0x26, 0xaa, 0xd6, 0x93, 0x95, 0x3e, 0x2f, 0x8f, + 0x74, 0xbb, 0x0e, 0xe9, 0xf0, 0xa0, 0x58, 0x16, 0x92, 0xa2, 0xee, 0x5c, 0x22, 0xdf, 0x94, 0x2c, + 0x8e, 0x74, 0xbb, 0x1e, 0xe1, 0x98, 0x4b, 0x5e, 0x82, 0x66, 0x92, 0xa2, 0x04, 0xa6, 0xc8, 0x09, + 0x20, 0x65, 0x3f, 0xe8, 0xaa, 0xf5, 0xe6, 0x3c, 0xd7, 0x14, 0x2e, 0x5a, 0x39, 0xd4, 0x6d, 0x20, + 0x9e, 0x3e, 0x84, 0xb4, 0x10, 0xa2, 0x09, 0xf2, 0x46, 0x19, 0x17, 0x6e, 0xde, 0x14, 0xae, 0x1c, + 0xea, 0x36, 0x10, 0x4f, 0x85, 0xf0, 0x67, 0x09, 0x80, 0x01, 0x42, 0x0e, 0x8c, 0x98, 0xcd, 0x5a, + 0x47, 0xee, 0x36, 0x5f, 0x3c, 0x35, 0x78, 0xfd, 0x8d, 0x62, 0x2e, 0x1b, 0x62, 0x2e, 0x1b, 0x07, + 0x04, 0xc7, 0xd6, 0x57, 0xe2, 0x07, 0x2e, 0x2e, 0x62, 0x29, 0xd5, 0xff, 0xb8, 0xd4, 0xba, 0x01, + 0xce, 0x4e, 0x46, 0xae, 0xe1, 0x91, 0xc8, 0x14, 0x93, 0x9d, 0xff, 0x7b, 0x4e, 0xfd, 0xa1, 0x99, + 0x4d, 0x13, 0x44, 0x19, 0x85, 0xfe, 0x7a, 0x7d, 0xba, 0xb3, 0x15, 0xa2, 0x00, 0x7a, 0x53, 0xa7, + 0x18, 0xf7, 0x54, 0xdc, 0xe2, 0x00, 0xa1, 0x7d, 0x46, 0x13, 0xb7, 0xf8, 0x83, 0x04, 0x1e, 0xad, + 0x4f, 0x18, 0xe5, 0x5b, 0xd0, 0x1a, 0xc3, 0x10, 0xfb, 0x38, 0x9b, 0x3a, 0xe5, 0xd7, 0x40, 0x0c, + 0xfc, 0xa7, 0x06, 0xff, 0x5c, 0x18, 0xe5, 0xe7, 0xc2, 0xe8, 0x8b, 0x00, 0xeb, 0x5d, 0x61, 0xbb, + 0xcd, 0x6d, 0xdf, 0x22, 0xe8, 0xbf, 0x5c, 0x6a, 0x12, 0x37, 0xf1, 0xb8, 0x3c, 0x2c, 0xc5, 0xdc, + 0x8b, 0xf5, 0xd1, 0xd9, 0x4c, 0x95, 0xce, 0x67, 0xaa, 0xf4, 0xcf, 0x4c, 0x95, 0x7e, 0xba, 0x52, + 0x2b, 0xe7, 0x57, 0x6a, 0xe5, 0xef, 0x2b, 0xb5, 0xf2, 0x65, 0x6f, 0x25, 0x6d, 0x3e, 0xcd, 0x9e, + 0x87, 0xd0, 0xa5, 0x62, 0x6d, 0x8e, 0xdf, 0x5b, 0x1d, 0x6e, 0xac, 0x0a, 0x6e, 0x8d, 0x59, 0xdc, + 0xfd, 0x37, 0x00, 0x00, 0xff, 0xff, 0x48, 0x9f, 0xf5, 0x9e, 0x66, 0x07, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/profiles/types/models_params_test.go b/x/profiles/types/models_params_test.go index 6ffcfa95d1..4236093767 100644 --- a/x/profiles/types/models_params_test.go +++ b/x/profiles/types/models_params_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - sdkmath "cosmossdk.io/math" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -20,7 +20,7 @@ func TestValidateParams(t *testing.T) { { name: "invalid nickname param returns error", params: types.NewParams( - types.NewNicknameParams(sdk.NewInt(1), sdk.NewInt(1000)), + types.NewNicknameParams(math.NewInt(1), math.NewInt(1000)), types.DefaultDTagParams(), types.DefaultBioParams(), types.DefaultOracleParams(), @@ -32,7 +32,7 @@ func TestValidateParams(t *testing.T) { name: "invalid DTag param returns error", params: types.NewParams( types.DefaultNicknameParams(), - types.NewDTagParams("regEx", sdk.NewInt(3), sdk.NewInt(-30)), + types.NewDTagParams("regEx", math.NewInt(3), math.NewInt(-30)), types.DefaultBioParams(), types.DefaultOracleParams(), types.DefaultAppLinksParams(), @@ -44,7 +44,7 @@ func TestValidateParams(t *testing.T) { params: types.NewParams( types.DefaultNicknameParams(), types.DefaultDTagParams(), - types.NewBioParams(sdk.NewInt(-1000)), + types.NewBioParams(math.NewInt(-1000)), types.DefaultOracleParams(), types.DefaultAppLinksParams(), ), @@ -113,27 +113,27 @@ func TestValidateNicknameParams(t *testing.T) { }{ { name: "invalid max returns error - nil min", - params: types.NicknameParams{MinLength: sdkmath.Int{}, MaxLength: sdk.NewInt(10)}, + params: types.NicknameParams{MinLength: math.Int{}, MaxLength: math.NewInt(10)}, shouldErr: true, }, { name: "invalid min returns error", - params: types.NewNicknameParams(sdk.NewInt(1), sdk.NewInt(1000)), + params: types.NewNicknameParams(math.NewInt(1), math.NewInt(1000)), shouldErr: true, }, { name: "invalid max returns error - nil max", - params: types.NicknameParams{MinLength: sdk.NewInt(2), MaxLength: sdkmath.Int{}}, + params: types.NicknameParams{MinLength: math.NewInt(2), MaxLength: math.Int{}}, shouldErr: true, }, { name: "invalid max returns error - lower than min", - params: types.NewNicknameParams(sdk.NewInt(2), sdk.NewInt(-10)), + params: types.NewNicknameParams(math.NewInt(2), math.NewInt(-10)), shouldErr: true, }, { name: "valid values return no error", - params: types.NewNicknameParams(sdk.NewInt(2), sdk.NewInt(10)), + params: types.NewNicknameParams(math.NewInt(2), math.NewInt(10)), shouldErr: false, }, } @@ -160,22 +160,22 @@ func TestValidateDTagParams(t *testing.T) { }{ { name: "empty regex returns error", - params: types.NewDTagParams("", sdk.NewInt(3), sdk.NewInt(30)), + params: types.NewDTagParams("", math.NewInt(3), math.NewInt(30)), shouldErr: true, }, { name: "invalid min returns error", - params: types.NewDTagParams("regExParam", sdk.NewInt(1), sdk.NewInt(30)), + params: types.NewDTagParams("regExParam", math.NewInt(1), math.NewInt(30)), shouldErr: true, }, { name: "invalid max returns error - lower than min", - params: types.NewDTagParams("regExParam", sdk.NewInt(3), sdk.NewInt(-30)), + params: types.NewDTagParams("regExParam", math.NewInt(3), math.NewInt(-30)), shouldErr: true, }, { name: "valid params return no error", - params: types.NewDTagParams("regExParam", sdk.NewInt(3), sdk.NewInt(30)), + params: types.NewDTagParams("regExParam", math.NewInt(3), math.NewInt(30)), shouldErr: false, }, } @@ -202,12 +202,12 @@ func TestValidateBioParams(t *testing.T) { }{ { name: "invalid value returns error", - params: types.NewBioParams(sdk.NewInt(-1000)), + params: types.NewBioParams(math.NewInt(-1000)), shouldErr: true, }, { name: "valid value returns no error", - params: types.NewBioParams(sdk.NewInt(1000)), + params: types.NewBioParams(math.NewInt(1000)), shouldErr: false, }, } @@ -240,7 +240,7 @@ func TestValidateOracleParams(t *testing.T) { 6, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), shouldErr: true, }, @@ -252,7 +252,7 @@ func TestValidateOracleParams(t *testing.T) { 0, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), shouldErr: true, }, @@ -264,7 +264,7 @@ func TestValidateOracleParams(t *testing.T) { 6, 0, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), shouldErr: true, }, @@ -276,7 +276,7 @@ func TestValidateOracleParams(t *testing.T) { 6, 50_000, 0, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), shouldErr: true, }, @@ -288,7 +288,7 @@ func TestValidateOracleParams(t *testing.T) { 6, 50_000, 200_000, - sdk.NewCoin("bank", sdk.NewInt(0)), + sdk.NewCoin("bank", math.NewInt(0)), ), shouldErr: true, }, @@ -300,7 +300,7 @@ func TestValidateOracleParams(t *testing.T) { 6, 50_000, 200_000, - sdk.NewCoin("band", sdk.NewInt(10)), + sdk.NewCoin("band", math.NewInt(10)), ), shouldErr: false, }, diff --git a/x/profiles/types/models_profile.pb.go b/x/profiles/types/models_profile.pb.go index 5a06e4c1e0..eccf35eea7 100644 --- a/x/profiles/types/models_profile.pb.go +++ b/x/profiles/types/models_profile.pb.go @@ -144,40 +144,40 @@ func init() { } var fileDescriptor_0064ca3ec5b2e1f8 = []byte{ - // 515 bytes of a gzipped FileDescriptorProto + // 516 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x93, 0xbf, 0x6f, 0xd3, 0x40, 0x14, 0xc7, 0x6d, 0x92, 0x36, 0xe9, 0xb5, 0x14, 0x38, 0x22, 0x61, 0xa2, 0xc8, 0x17, 0x59, 0x02, - 0x2a, 0xa0, 0x77, 0x0a, 0x11, 0x4b, 0xb6, 0x5a, 0x5d, 0x10, 0x4b, 0x64, 0x55, 0x0c, 0x2c, 0xd1, - 0xd9, 0xb9, 0xb8, 0x86, 0xd8, 0x17, 0xc5, 0x97, 0x88, 0xfc, 0x07, 0x8c, 0x1d, 0x3b, 0x66, 0x41, - 0x62, 0x64, 0xe0, 0x8f, 0xa8, 0x98, 0x3a, 0x32, 0x19, 0x94, 0x0c, 0x30, 0xe7, 0x2f, 0x40, 0xbe, - 0x1f, 0xad, 0x68, 0x97, 0xe8, 0xdd, 0xfb, 0x7e, 0xde, 0xf7, 0xbd, 0xbc, 0x27, 0x83, 0x67, 0x43, - 0x96, 0xa7, 0x3c, 0x27, 0x93, 0x29, 0x1f, 0x25, 0x63, 0x96, 0x93, 0x79, 0x97, 0xa4, 0x7c, 0xc8, - 0xc6, 0xf9, 0x40, 0xa7, 0xf0, 0x64, 0xca, 0x05, 0x87, 0x50, 0x81, 0xd8, 0x80, 0x78, 0xde, 0x6d, - 0x3e, 0xa0, 0x69, 0x92, 0x71, 0x22, 0x7f, 0x15, 0xd6, 0x6c, 0xc4, 0x3c, 0xe6, 0x32, 0x24, 0x65, - 0xa4, 0xb3, 0x8f, 0x63, 0xce, 0xe3, 0x31, 0x23, 0xf2, 0x15, 0xce, 0x46, 0x84, 0x66, 0x0b, 0x2d, - 0xa1, 0x9b, 0x92, 0x48, 0x52, 0x96, 0x0b, 0x9a, 0x4e, 0x4c, 0x6d, 0xc4, 0xcb, 0xc6, 0x03, 0x65, - 0xaa, 0x1e, 0x4a, 0xf2, 0xbe, 0x54, 0x40, 0xad, 0xaf, 0xe6, 0x81, 0x7d, 0x50, 0xa3, 0x51, 0xc4, - 0x67, 0x99, 0x70, 0xec, 0xb6, 0x7d, 0xb0, 0xfb, 0xaa, 0x81, 0x95, 0x33, 0x36, 0xce, 0xf8, 0x28, - 0x5b, 0xf8, 0xed, 0x1f, 0xdf, 0x0f, 0x5b, 0xda, 0x84, 0xce, 0xc4, 0x29, 0x9e, 0x77, 0x42, 0x26, - 0x68, 0x07, 0x1f, 0xa9, 0xe2, 0x37, 0x81, 0xb1, 0x81, 0x2f, 0x40, 0x75, 0x28, 0x68, 0xec, 0xdc, - 0x69, 0xdb, 0x07, 0x3b, 0xfe, 0xa3, 0x55, 0x81, 0xaa, 0xc7, 0x27, 0x34, 0xde, 0x14, 0x68, 0x77, - 0x41, 0xd3, 0x71, 0xcf, 0x2b, 0x55, 0x2f, 0x90, 0x10, 0x24, 0xa0, 0x9e, 0x25, 0xd1, 0xc7, 0x8c, - 0xa6, 0xcc, 0xa9, 0xc8, 0x82, 0x87, 0x9b, 0x02, 0xdd, 0x53, 0xa0, 0x51, 0xbc, 0xe0, 0x0a, 0x82, - 0x6d, 0x50, 0x09, 0x13, 0xee, 0x54, 0x25, 0xbb, 0xbf, 0x29, 0x10, 0x50, 0x6c, 0x98, 0x70, 0x2f, - 0x28, 0x25, 0xf8, 0x0e, 0xd4, 0x27, 0x49, 0x24, 0x66, 0x53, 0x96, 0x3b, 0x5b, 0xf2, 0x2f, 0xb5, - 0xf0, 0xed, 0x23, 0xe0, 0xbe, 0x66, 0xfc, 0xd6, 0x45, 0x81, 0xac, 0xeb, 0xa6, 0xa6, 0xd6, 0xfb, - 0xfa, 0xe7, 0xdb, 0x73, 0x3b, 0xb8, 0xf2, 0x82, 0x23, 0x70, 0x37, 0x9a, 0x32, 0x2a, 0x12, 0x9e, - 0x0d, 0x86, 0x54, 0x30, 0x67, 0x5b, 0x9a, 0x37, 0x6f, 0xed, 0xeb, 0xc4, 0x5c, 0xc2, 0x7f, 0xa2, - 0xad, 0x1b, 0xca, 0xfa, 0xbf, 0x72, 0xef, 0xec, 0x17, 0xb2, 0x55, 0x8f, 0x3d, 0x23, 0x1c, 0x53, - 0xc1, 0x7a, 0xf5, 0xcf, 0x4b, 0x64, 0x9d, 0x2f, 0x91, 0xe5, 0x7d, 0x00, 0x75, 0x33, 0x25, 0x7c, - 0x09, 0x6a, 0x7a, 0x7a, 0x79, 0xa7, 0x1d, 0x1f, 0x6e, 0x0a, 0xb4, 0xaf, 0x47, 0x56, 0x82, 0x17, - 0x18, 0x04, 0x3e, 0x05, 0x5b, 0x11, 0x9f, 0xb3, 0xa9, 0x3e, 0xc2, 0xfd, 0x4d, 0x81, 0xf6, 0xf4, - 0x0c, 0x65, 0xda, 0x0b, 0x94, 0xdc, 0xab, 0x9f, 0x2f, 0x91, 0xfd, 0x77, 0x89, 0x6c, 0xff, 0xed, - 0xc5, 0xca, 0xb5, 0x2f, 0x57, 0xae, 0xfd, 0x7b, 0xe5, 0xda, 0x67, 0x6b, 0xd7, 0xba, 0x5c, 0xbb, - 0xd6, 0xcf, 0xb5, 0x6b, 0xbd, 0xef, 0xc4, 0x89, 0x38, 0x9d, 0x85, 0x38, 0xe2, 0x29, 0x51, 0x7b, - 0x3c, 0x1c, 0xd3, 0x30, 0xd7, 0x31, 0x99, 0xbf, 0x26, 0x9f, 0xae, 0x3f, 0x03, 0xb1, 0x98, 0xb0, - 0x3c, 0xdc, 0x96, 0xbb, 0xe8, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x07, 0x17, 0x0a, 0xbc, 0x26, - 0x03, 0x00, 0x00, + 0x2a, 0xa0, 0x77, 0x0a, 0x91, 0x18, 0xb2, 0xd5, 0xea, 0x82, 0x58, 0x22, 0xab, 0x62, 0x60, 0x89, + 0xce, 0xce, 0xc5, 0x35, 0xc4, 0xbe, 0x28, 0xbe, 0x44, 0xe4, 0x3f, 0x60, 0xec, 0xd8, 0x31, 0x0b, + 0x12, 0x23, 0x03, 0x7f, 0x44, 0xc5, 0xd4, 0x91, 0xc9, 0xa0, 0x64, 0x80, 0x39, 0x7f, 0x01, 0xf2, + 0xfd, 0x68, 0x45, 0xbb, 0x44, 0xef, 0xde, 0xf7, 0xf3, 0xbe, 0xef, 0xe5, 0x3d, 0x19, 0x3c, 0x1b, + 0xb2, 0x3c, 0xe5, 0x39, 0x99, 0x4c, 0xf9, 0x28, 0x19, 0xb3, 0x9c, 0xcc, 0xbb, 0x24, 0xe5, 0x43, + 0x36, 0xce, 0x07, 0x3a, 0x85, 0x27, 0x53, 0x2e, 0x38, 0x84, 0x0a, 0xc4, 0x06, 0xc4, 0xf3, 0x6e, + 0xf3, 0x01, 0x4d, 0x93, 0x8c, 0x13, 0xf9, 0xab, 0xb0, 0x66, 0x23, 0xe6, 0x31, 0x97, 0x21, 0x29, + 0x23, 0x9d, 0x7d, 0x1c, 0x73, 0x1e, 0x8f, 0x19, 0x91, 0xaf, 0x70, 0x36, 0x22, 0x34, 0x5b, 0x68, + 0x09, 0xdd, 0x94, 0x44, 0x92, 0xb2, 0x5c, 0xd0, 0x74, 0x62, 0x6a, 0x23, 0x5e, 0x36, 0x1e, 0x28, + 0x53, 0xf5, 0x50, 0x92, 0xf7, 0xa5, 0x02, 0x6a, 0x7d, 0x35, 0x0f, 0xec, 0x83, 0x1a, 0x8d, 0x22, + 0x3e, 0xcb, 0x84, 0x63, 0xb7, 0xed, 0x83, 0xdd, 0x57, 0x0d, 0xac, 0x9c, 0xb1, 0x71, 0xc6, 0x47, + 0xd9, 0xc2, 0x6f, 0xff, 0xf8, 0x7e, 0xd8, 0xd2, 0x26, 0x74, 0x26, 0x4e, 0xf1, 0xbc, 0x13, 0x32, + 0x41, 0x3b, 0xf8, 0x48, 0x15, 0xbf, 0x09, 0x8c, 0x0d, 0x7c, 0x01, 0xaa, 0x43, 0x41, 0x63, 0xe7, + 0x4e, 0xdb, 0x3e, 0xd8, 0xf1, 0x1f, 0xad, 0x0a, 0x54, 0x3d, 0x3e, 0xa1, 0xf1, 0xa6, 0x40, 0xbb, + 0x0b, 0x9a, 0x8e, 0x7b, 0x5e, 0xa9, 0x7a, 0x81, 0x84, 0x20, 0x01, 0xf5, 0x2c, 0x89, 0x3e, 0x66, + 0x34, 0x65, 0x4e, 0x45, 0x16, 0x3c, 0xdc, 0x14, 0xe8, 0x9e, 0x02, 0x8d, 0xe2, 0x05, 0x57, 0x10, + 0x6c, 0x83, 0x4a, 0x98, 0x70, 0xa7, 0x2a, 0xd9, 0xfd, 0x4d, 0x81, 0x80, 0x62, 0xc3, 0x84, 0x7b, + 0x41, 0x29, 0xc1, 0x77, 0xa0, 0x3e, 0x49, 0x22, 0x31, 0x9b, 0xb2, 0xdc, 0xd9, 0x92, 0x7f, 0xa9, + 0x85, 0x6f, 0x1f, 0x01, 0xf7, 0x35, 0xe3, 0xb7, 0x2e, 0x0a, 0x64, 0x5d, 0x37, 0x35, 0xb5, 0xde, + 0xd7, 0x3f, 0xdf, 0x9e, 0xdb, 0xc1, 0x95, 0x17, 0x1c, 0x81, 0xbb, 0xd1, 0x94, 0x51, 0x91, 0xf0, + 0x6c, 0x30, 0xa4, 0x82, 0x39, 0xdb, 0xd2, 0xbc, 0x79, 0x6b, 0x5f, 0x27, 0xe6, 0x12, 0xfe, 0x13, + 0x6d, 0xdd, 0x50, 0xd6, 0xff, 0x95, 0x7b, 0x67, 0xbf, 0x90, 0xad, 0x7a, 0xec, 0x19, 0xe1, 0x98, + 0x0a, 0xd6, 0xab, 0x7f, 0x5e, 0x22, 0xeb, 0x7c, 0x89, 0x2c, 0xef, 0x03, 0xa8, 0x9b, 0x29, 0xe1, + 0x4b, 0x50, 0xd3, 0xd3, 0xcb, 0x3b, 0xed, 0xf8, 0x70, 0x53, 0xa0, 0x7d, 0x3d, 0xb2, 0x12, 0xbc, + 0xc0, 0x20, 0xf0, 0x29, 0xd8, 0x8a, 0xf8, 0x9c, 0x4d, 0xf5, 0x11, 0xee, 0x6f, 0x0a, 0xb4, 0xa7, + 0x67, 0x28, 0xd3, 0x5e, 0xa0, 0xe4, 0x5e, 0xfd, 0x7c, 0x89, 0xec, 0xbf, 0x4b, 0x64, 0xfb, 0x6f, + 0x2f, 0x56, 0xae, 0x7d, 0xb9, 0x72, 0xed, 0xdf, 0x2b, 0xd7, 0x3e, 0x5b, 0xbb, 0xd6, 0xe5, 0xda, + 0xb5, 0x7e, 0xae, 0x5d, 0xeb, 0x7d, 0x27, 0x4e, 0xc4, 0xe9, 0x2c, 0xc4, 0x11, 0x4f, 0x89, 0xda, + 0xe3, 0xe1, 0x98, 0x86, 0xb9, 0x8e, 0xc9, 0xfc, 0x35, 0xf9, 0x74, 0xfd, 0x19, 0x88, 0xc5, 0x84, + 0xe5, 0xe1, 0xb6, 0xdc, 0x45, 0xf7, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xfa, 0x5d, 0x4e, + 0x26, 0x03, 0x00, 0x00, } func (this *Pictures) Equal(that interface{}) bool { diff --git a/x/profiles/types/msg_server.pb.go b/x/profiles/types/msg_server.pb.go index b2baf3c369..6d67de0454 100644 --- a/x/profiles/types/msg_server.pb.go +++ b/x/profiles/types/msg_server.pb.go @@ -6,13 +6,20 @@ package types import ( context "context" fmt "fmt" + _ "github.com/cosmos/cosmos-proto" + types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" + _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + types1 "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" 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. @@ -26,566 +33,5641 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package +// MsgSaveProfile represents a message to save a profile. +type MsgSaveProfile struct { + // DTag of the profile. If it shouldn't be changed, [do-no-modify] can be used + // instead. + DTag string `protobuf:"bytes,1,opt,name=dtag,proto3" json:"dtag,omitempty" yaml:"dtag"` + // Nickname of the profile. If it shouldn't be changed, [do-no-modify] can be + // used instead. + Nickname string `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname,omitempty" yaml:"nickname"` + // Bio of the profile. If it shouldn't be changed, [do-no-modify] can be used + // instead. + Bio string `protobuf:"bytes,3,opt,name=bio,proto3" json:"bio,omitempty" yaml:"bio"` + // URL to the profile picture. If it shouldn't be changed, [do-no-modify] can + // be used instead. + ProfilePicture string `protobuf:"bytes,4,opt,name=profile_picture,json=profilePicture,proto3" json:"profile_picture,omitempty" yaml:"profile_picture"` + // URL to the profile cover. If it shouldn't be changed, [do-no-modify] can be + // used instead. + CoverPicture string `protobuf:"bytes,5,opt,name=cover_picture,json=coverPicture,proto3" json:"cover_picture,omitempty" yaml:"cover_picture"` + // Address of the user associated to the profile + Creator string `protobuf:"bytes,6,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` +} + +func (m *MsgSaveProfile) Reset() { *m = MsgSaveProfile{} } +func (m *MsgSaveProfile) String() string { return proto.CompactTextString(m) } +func (*MsgSaveProfile) ProtoMessage() {} +func (*MsgSaveProfile) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{0} +} +func (m *MsgSaveProfile) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgSaveProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgSaveProfile.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 *MsgSaveProfile) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSaveProfile.Merge(m, src) +} +func (m *MsgSaveProfile) XXX_Size() int { + return m.Size() +} +func (m *MsgSaveProfile) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSaveProfile.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgSaveProfile proto.InternalMessageInfo + +func (m *MsgSaveProfile) GetDTag() string { + if m != nil { + return m.DTag + } + return "" +} + +func (m *MsgSaveProfile) GetNickname() string { + if m != nil { + return m.Nickname + } + return "" +} + +func (m *MsgSaveProfile) GetBio() string { + if m != nil { + return m.Bio + } + return "" +} + +func (m *MsgSaveProfile) GetProfilePicture() string { + if m != nil { + return m.ProfilePicture + } + return "" +} + +func (m *MsgSaveProfile) GetCoverPicture() string { + if m != nil { + return m.CoverPicture + } + return "" +} + +func (m *MsgSaveProfile) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +// MsgSaveProfileResponse defines the Msg/SaveProfile response type. +type MsgSaveProfileResponse struct { +} + +func (m *MsgSaveProfileResponse) Reset() { *m = MsgSaveProfileResponse{} } +func (m *MsgSaveProfileResponse) String() string { return proto.CompactTextString(m) } +func (*MsgSaveProfileResponse) ProtoMessage() {} +func (*MsgSaveProfileResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{1} +} +func (m *MsgSaveProfileResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgSaveProfileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgSaveProfileResponse.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 *MsgSaveProfileResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSaveProfileResponse.Merge(m, src) +} +func (m *MsgSaveProfileResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgSaveProfileResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSaveProfileResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgSaveProfileResponse proto.InternalMessageInfo + +// MsgDeleteProfile represents the message used to delete an existing profile. +type MsgDeleteProfile struct { + // Address associated to the profile to be deleted + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` +} + +func (m *MsgDeleteProfile) Reset() { *m = MsgDeleteProfile{} } +func (m *MsgDeleteProfile) String() string { return proto.CompactTextString(m) } +func (*MsgDeleteProfile) ProtoMessage() {} +func (*MsgDeleteProfile) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{2} +} +func (m *MsgDeleteProfile) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgDeleteProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgDeleteProfile.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 *MsgDeleteProfile) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDeleteProfile.Merge(m, src) +} +func (m *MsgDeleteProfile) XXX_Size() int { + return m.Size() +} +func (m *MsgDeleteProfile) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDeleteProfile.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgDeleteProfile proto.InternalMessageInfo + +func (m *MsgDeleteProfile) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +// MsgDeleteProfileResponse defines the Msg/DeleteProfile response type. +type MsgDeleteProfileResponse struct { +} + +func (m *MsgDeleteProfileResponse) Reset() { *m = MsgDeleteProfileResponse{} } +func (m *MsgDeleteProfileResponse) String() string { return proto.CompactTextString(m) } +func (*MsgDeleteProfileResponse) ProtoMessage() {} +func (*MsgDeleteProfileResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{3} +} +func (m *MsgDeleteProfileResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgDeleteProfileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgDeleteProfileResponse.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 *MsgDeleteProfileResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDeleteProfileResponse.Merge(m, src) +} +func (m *MsgDeleteProfileResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgDeleteProfileResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDeleteProfileResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgDeleteProfileResponse proto.InternalMessageInfo + +// MsgRequestDTagTransfer represents the message used to request the DTag +// transfer to another user. +type MsgRequestDTagTransfer struct { + // Receiver contains the address of the request receiver that owns the DTag to + // transfer if the request is accepted + Receiver string `protobuf:"bytes,1,opt,name=receiver,proto3" json:"receiver,omitempty" yaml:"receiver"` + // Sender contains the address of the request sender that will receive the + // receiver DTag if the requet is accepted + Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` +} + +func (m *MsgRequestDTagTransfer) Reset() { *m = MsgRequestDTagTransfer{} } +func (m *MsgRequestDTagTransfer) String() string { return proto.CompactTextString(m) } +func (*MsgRequestDTagTransfer) ProtoMessage() {} +func (*MsgRequestDTagTransfer) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{4} +} +func (m *MsgRequestDTagTransfer) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgRequestDTagTransfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgRequestDTagTransfer.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 *MsgRequestDTagTransfer) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRequestDTagTransfer.Merge(m, src) +} +func (m *MsgRequestDTagTransfer) XXX_Size() int { + return m.Size() +} +func (m *MsgRequestDTagTransfer) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRequestDTagTransfer.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgRequestDTagTransfer proto.InternalMessageInfo + +func (m *MsgRequestDTagTransfer) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +func (m *MsgRequestDTagTransfer) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +// MsgRequestDTagTransferResponse defines the Msg/RequestDTagTransfer response +// type. +type MsgRequestDTagTransferResponse struct { +} + +func (m *MsgRequestDTagTransferResponse) Reset() { *m = MsgRequestDTagTransferResponse{} } +func (m *MsgRequestDTagTransferResponse) String() string { return proto.CompactTextString(m) } +func (*MsgRequestDTagTransferResponse) ProtoMessage() {} +func (*MsgRequestDTagTransferResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{5} +} +func (m *MsgRequestDTagTransferResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgRequestDTagTransferResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgRequestDTagTransferResponse.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 *MsgRequestDTagTransferResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRequestDTagTransferResponse.Merge(m, src) +} +func (m *MsgRequestDTagTransferResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgRequestDTagTransferResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRequestDTagTransferResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgRequestDTagTransferResponse proto.InternalMessageInfo + +// MsgCancelDTagTransferRequest represents the message used to cancel a DTag +// transfer request. +type MsgCancelDTagTransferRequest struct { + // Receiver contains the address of the request receiver + Receiver string `protobuf:"bytes,1,opt,name=receiver,proto3" json:"receiver,omitempty" yaml:"receiver"` + // Sender contains the address of the requets sender + Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` +} + +func (m *MsgCancelDTagTransferRequest) Reset() { *m = MsgCancelDTagTransferRequest{} } +func (m *MsgCancelDTagTransferRequest) String() string { return proto.CompactTextString(m) } +func (*MsgCancelDTagTransferRequest) ProtoMessage() {} +func (*MsgCancelDTagTransferRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{6} +} +func (m *MsgCancelDTagTransferRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgCancelDTagTransferRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgCancelDTagTransferRequest.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 *MsgCancelDTagTransferRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgCancelDTagTransferRequest.Merge(m, src) +} +func (m *MsgCancelDTagTransferRequest) XXX_Size() int { + return m.Size() +} +func (m *MsgCancelDTagTransferRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgCancelDTagTransferRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgCancelDTagTransferRequest proto.InternalMessageInfo + +func (m *MsgCancelDTagTransferRequest) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +func (m *MsgCancelDTagTransferRequest) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +// MsgCancelDTagTransferRequestResponse represents the +// Msg/CancelDTagTransferRequest response type. +type MsgCancelDTagTransferRequestResponse struct { +} + +func (m *MsgCancelDTagTransferRequestResponse) Reset() { *m = MsgCancelDTagTransferRequestResponse{} } +func (m *MsgCancelDTagTransferRequestResponse) String() string { return proto.CompactTextString(m) } +func (*MsgCancelDTagTransferRequestResponse) ProtoMessage() {} +func (*MsgCancelDTagTransferRequestResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{7} +} +func (m *MsgCancelDTagTransferRequestResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgCancelDTagTransferRequestResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgCancelDTagTransferRequestResponse.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 *MsgCancelDTagTransferRequestResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgCancelDTagTransferRequestResponse.Merge(m, src) +} +func (m *MsgCancelDTagTransferRequestResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgCancelDTagTransferRequestResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgCancelDTagTransferRequestResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgCancelDTagTransferRequestResponse proto.InternalMessageInfo + +// MsgAcceptDTagTransferRequest represents the message used to accept a DTag +// transfer request. +type MsgAcceptDTagTransferRequest struct { + // NewDTag represents the DTag that the request receiver will obtain if they + // accept the request + NewDTag string `protobuf:"bytes,1,opt,name=new_dtag,json=newDtag,proto3" json:"new_dtag,omitempty" yaml:"new_dtag"` + // Sender represents the request sender + Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` + // Receiver represents the request receiver + Receiver string `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty" yaml:"receiver"` +} + +func (m *MsgAcceptDTagTransferRequest) Reset() { *m = MsgAcceptDTagTransferRequest{} } +func (m *MsgAcceptDTagTransferRequest) String() string { return proto.CompactTextString(m) } +func (*MsgAcceptDTagTransferRequest) ProtoMessage() {} +func (*MsgAcceptDTagTransferRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{8} +} +func (m *MsgAcceptDTagTransferRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgAcceptDTagTransferRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgAcceptDTagTransferRequest.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 *MsgAcceptDTagTransferRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgAcceptDTagTransferRequest.Merge(m, src) +} +func (m *MsgAcceptDTagTransferRequest) XXX_Size() int { + return m.Size() +} +func (m *MsgAcceptDTagTransferRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgAcceptDTagTransferRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgAcceptDTagTransferRequest proto.InternalMessageInfo + +func (m *MsgAcceptDTagTransferRequest) GetNewDTag() string { + if m != nil { + return m.NewDTag + } + return "" +} + +func (m *MsgAcceptDTagTransferRequest) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +func (m *MsgAcceptDTagTransferRequest) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +// MsgAcceptDTagTransferRequestResponse defines the +// Msg/AcceptDTagTransferRequest response. +type MsgAcceptDTagTransferRequestResponse struct { +} + +func (m *MsgAcceptDTagTransferRequestResponse) Reset() { *m = MsgAcceptDTagTransferRequestResponse{} } +func (m *MsgAcceptDTagTransferRequestResponse) String() string { return proto.CompactTextString(m) } +func (*MsgAcceptDTagTransferRequestResponse) ProtoMessage() {} +func (*MsgAcceptDTagTransferRequestResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{9} +} +func (m *MsgAcceptDTagTransferRequestResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgAcceptDTagTransferRequestResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgAcceptDTagTransferRequestResponse.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 *MsgAcceptDTagTransferRequestResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgAcceptDTagTransferRequestResponse.Merge(m, src) +} +func (m *MsgAcceptDTagTransferRequestResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgAcceptDTagTransferRequestResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgAcceptDTagTransferRequestResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgAcceptDTagTransferRequestResponse proto.InternalMessageInfo + +// MsgRefuseDTagTransferRequest represents the message used to refuse a DTag +// transfer request. +type MsgRefuseDTagTransferRequest struct { + // Sender represents the request sender + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` + // Receiver represents the request receiver + Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty" yaml:"receiver"` +} + +func (m *MsgRefuseDTagTransferRequest) Reset() { *m = MsgRefuseDTagTransferRequest{} } +func (m *MsgRefuseDTagTransferRequest) String() string { return proto.CompactTextString(m) } +func (*MsgRefuseDTagTransferRequest) ProtoMessage() {} +func (*MsgRefuseDTagTransferRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{10} +} +func (m *MsgRefuseDTagTransferRequest) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgRefuseDTagTransferRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgRefuseDTagTransferRequest.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 *MsgRefuseDTagTransferRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRefuseDTagTransferRequest.Merge(m, src) +} +func (m *MsgRefuseDTagTransferRequest) XXX_Size() int { + return m.Size() +} +func (m *MsgRefuseDTagTransferRequest) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRefuseDTagTransferRequest.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgRefuseDTagTransferRequest proto.InternalMessageInfo + +func (m *MsgRefuseDTagTransferRequest) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +func (m *MsgRefuseDTagTransferRequest) GetReceiver() string { + if m != nil { + return m.Receiver + } + return "" +} + +// MsgRefuseDTagTransferRequestResponse defines the +// Msg/RefuseDTagTransferRequest response. +type MsgRefuseDTagTransferRequestResponse struct { +} + +func (m *MsgRefuseDTagTransferRequestResponse) Reset() { *m = MsgRefuseDTagTransferRequestResponse{} } +func (m *MsgRefuseDTagTransferRequestResponse) String() string { return proto.CompactTextString(m) } +func (*MsgRefuseDTagTransferRequestResponse) ProtoMessage() {} +func (*MsgRefuseDTagTransferRequestResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{11} +} +func (m *MsgRefuseDTagTransferRequestResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgRefuseDTagTransferRequestResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgRefuseDTagTransferRequestResponse.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 *MsgRefuseDTagTransferRequestResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRefuseDTagTransferRequestResponse.Merge(m, src) +} +func (m *MsgRefuseDTagTransferRequestResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgRefuseDTagTransferRequestResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRefuseDTagTransferRequestResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgRefuseDTagTransferRequestResponse proto.InternalMessageInfo + +// MsgLinkChainAccount represents a message to link an account to a profile. +type MsgLinkChainAccount struct { + // ChainAddress contains the details of the external chain address to be + // linked + ChainAddress *types.Any `protobuf:"bytes,1,opt,name=chain_address,json=chainAddress,proto3" json:"chain_address,omitempty" yaml:"source_address"` + // Proof contains the proof of ownership of the external chain address + Proof Proof `protobuf:"bytes,2,opt,name=proof,proto3" json:"proof" yaml:"source_proof"` + // ChainConfig contains the configuration of the external chain + ChainConfig ChainConfig `protobuf:"bytes,3,opt,name=chain_config,json=chainConfig,proto3" json:"chain_config" yaml:"source_chain_config"` + // Signer represents the Desmos address associated with the + // profile to which link the external account + Signer string `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty" yaml:"signer"` +} + +func (m *MsgLinkChainAccount) Reset() { *m = MsgLinkChainAccount{} } +func (m *MsgLinkChainAccount) String() string { return proto.CompactTextString(m) } +func (*MsgLinkChainAccount) ProtoMessage() {} +func (*MsgLinkChainAccount) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{12} +} +func (m *MsgLinkChainAccount) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgLinkChainAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgLinkChainAccount.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 *MsgLinkChainAccount) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgLinkChainAccount.Merge(m, src) +} +func (m *MsgLinkChainAccount) XXX_Size() int { + return m.Size() +} +func (m *MsgLinkChainAccount) XXX_DiscardUnknown() { + xxx_messageInfo_MsgLinkChainAccount.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgLinkChainAccount proto.InternalMessageInfo + +func (m *MsgLinkChainAccount) GetChainAddress() *types.Any { + if m != nil { + return m.ChainAddress + } + return nil +} + +func (m *MsgLinkChainAccount) GetProof() Proof { + if m != nil { + return m.Proof + } + return Proof{} +} + +func (m *MsgLinkChainAccount) GetChainConfig() ChainConfig { + if m != nil { + return m.ChainConfig + } + return ChainConfig{} +} + +func (m *MsgLinkChainAccount) GetSigner() string { + if m != nil { + return m.Signer + } + return "" +} + +// MsgLinkChainAccountResponse defines the Msg/LinkAccount response type. +type MsgLinkChainAccountResponse struct { +} + +func (m *MsgLinkChainAccountResponse) Reset() { *m = MsgLinkChainAccountResponse{} } +func (m *MsgLinkChainAccountResponse) String() string { return proto.CompactTextString(m) } +func (*MsgLinkChainAccountResponse) ProtoMessage() {} +func (*MsgLinkChainAccountResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{13} +} +func (m *MsgLinkChainAccountResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgLinkChainAccountResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgLinkChainAccountResponse.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 *MsgLinkChainAccountResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgLinkChainAccountResponse.Merge(m, src) +} +func (m *MsgLinkChainAccountResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgLinkChainAccountResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgLinkChainAccountResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgLinkChainAccountResponse proto.InternalMessageInfo + +// MsgUnlinkChainAccount represents a message to unlink an account from a +// profile. +type MsgUnlinkChainAccount struct { + // Owner represents the Desmos profile from which to remove the link + Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` + // ChainName represents the name of the chain to which the link to remove is + // associated + ChainName string `protobuf:"bytes,2,opt,name=chain_name,json=chainName,proto3" json:"chain_name,omitempty" yaml:"chain_name"` + // Target represents the external address to be removed + Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty" yaml:"target"` +} + +func (m *MsgUnlinkChainAccount) Reset() { *m = MsgUnlinkChainAccount{} } +func (m *MsgUnlinkChainAccount) String() string { return proto.CompactTextString(m) } +func (*MsgUnlinkChainAccount) ProtoMessage() {} +func (*MsgUnlinkChainAccount) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{14} +} +func (m *MsgUnlinkChainAccount) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUnlinkChainAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUnlinkChainAccount.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 *MsgUnlinkChainAccount) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUnlinkChainAccount.Merge(m, src) +} +func (m *MsgUnlinkChainAccount) XXX_Size() int { + return m.Size() +} +func (m *MsgUnlinkChainAccount) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUnlinkChainAccount.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUnlinkChainAccount proto.InternalMessageInfo + +func (m *MsgUnlinkChainAccount) GetOwner() string { + if m != nil { + return m.Owner + } + return "" +} + +func (m *MsgUnlinkChainAccount) GetChainName() string { + if m != nil { + return m.ChainName + } + return "" +} + +func (m *MsgUnlinkChainAccount) GetTarget() string { + if m != nil { + return m.Target + } + return "" +} + +// MsgUnlinkChainAccountResponse defines the Msg/UnlinkAccount response type. +type MsgUnlinkChainAccountResponse struct { +} + +func (m *MsgUnlinkChainAccountResponse) Reset() { *m = MsgUnlinkChainAccountResponse{} } +func (m *MsgUnlinkChainAccountResponse) String() string { return proto.CompactTextString(m) } +func (*MsgUnlinkChainAccountResponse) ProtoMessage() {} +func (*MsgUnlinkChainAccountResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{15} +} +func (m *MsgUnlinkChainAccountResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUnlinkChainAccountResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUnlinkChainAccountResponse.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 *MsgUnlinkChainAccountResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUnlinkChainAccountResponse.Merge(m, src) +} +func (m *MsgUnlinkChainAccountResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgUnlinkChainAccountResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUnlinkChainAccountResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUnlinkChainAccountResponse proto.InternalMessageInfo + +// MsgSetDefaultExternalAddress represents the message used to set a default +// address for a specific chain +type MsgSetDefaultExternalAddress struct { + // Name of the chain for which to set the default address + ChainName string `protobuf:"bytes,1,opt,name=chain_name,json=chainName,proto3" json:"chain_name,omitempty"` + // Address to be set as the default one + Target string `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"` + // User signing the message + Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` +} + +func (m *MsgSetDefaultExternalAddress) Reset() { *m = MsgSetDefaultExternalAddress{} } +func (m *MsgSetDefaultExternalAddress) String() string { return proto.CompactTextString(m) } +func (*MsgSetDefaultExternalAddress) ProtoMessage() {} +func (*MsgSetDefaultExternalAddress) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{16} +} +func (m *MsgSetDefaultExternalAddress) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgSetDefaultExternalAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgSetDefaultExternalAddress.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 *MsgSetDefaultExternalAddress) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSetDefaultExternalAddress.Merge(m, src) +} +func (m *MsgSetDefaultExternalAddress) XXX_Size() int { + return m.Size() +} +func (m *MsgSetDefaultExternalAddress) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSetDefaultExternalAddress.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgSetDefaultExternalAddress proto.InternalMessageInfo + +func (m *MsgSetDefaultExternalAddress) GetChainName() string { + if m != nil { + return m.ChainName + } + return "" +} + +func (m *MsgSetDefaultExternalAddress) GetTarget() string { + if m != nil { + return m.Target + } + return "" +} + +func (m *MsgSetDefaultExternalAddress) GetSigner() string { + if m != nil { + return m.Signer + } + return "" +} + +// MsgSetDefaultExternalAddressResponse represents the +// Msg/SetDefaultExternalAddress response type +type MsgSetDefaultExternalAddressResponse struct { +} + +func (m *MsgSetDefaultExternalAddressResponse) Reset() { *m = MsgSetDefaultExternalAddressResponse{} } +func (m *MsgSetDefaultExternalAddressResponse) String() string { return proto.CompactTextString(m) } +func (*MsgSetDefaultExternalAddressResponse) ProtoMessage() {} +func (*MsgSetDefaultExternalAddressResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{17} +} +func (m *MsgSetDefaultExternalAddressResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgSetDefaultExternalAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgSetDefaultExternalAddressResponse.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 *MsgSetDefaultExternalAddressResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSetDefaultExternalAddressResponse.Merge(m, src) +} +func (m *MsgSetDefaultExternalAddressResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgSetDefaultExternalAddressResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSetDefaultExternalAddressResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgSetDefaultExternalAddressResponse proto.InternalMessageInfo + +// MsgLinkApplication defines a msg to connect a profile with a +// centralized application account (eg. Twitter, GitHub, etc). +type MsgLinkApplication struct { + // The sender of the connection request + Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` + // LinkData contains the data related to the application to which connect + LinkData Data `protobuf:"bytes,2,opt,name=link_data,json=linkData,proto3" json:"link_data" yaml:"link_data"` + // Hex encoded call data that will be sent to the data source in order to + // verify the link + CallData string `protobuf:"bytes,3,opt,name=call_data,json=callData,proto3" json:"call_data,omitempty" yaml:"call_data"` + // The port on which the packet will be sent + SourcePort string `protobuf:"bytes,4,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty" yaml:"source_port"` + // The channel by which the packet will be sent + SourceChannel string `protobuf:"bytes,5,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty" yaml:"source_channel"` + // Timeout height relative to the current block height. + // The timeout is disabled when set to 0. + TimeoutHeight types1.Height `protobuf:"bytes,6,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height" yaml:"timeout_height"` + // Timeout timestamp (in nanoseconds) relative to the current block timestamp. + // The timeout is disabled when set to 0. + TimeoutTimestamp uint64 `protobuf:"varint,7,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty" yaml:"timeout_timestamp"` +} + +func (m *MsgLinkApplication) Reset() { *m = MsgLinkApplication{} } +func (m *MsgLinkApplication) String() string { return proto.CompactTextString(m) } +func (*MsgLinkApplication) ProtoMessage() {} +func (*MsgLinkApplication) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{18} +} +func (m *MsgLinkApplication) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgLinkApplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgLinkApplication.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 *MsgLinkApplication) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgLinkApplication.Merge(m, src) +} +func (m *MsgLinkApplication) XXX_Size() int { + return m.Size() +} +func (m *MsgLinkApplication) XXX_DiscardUnknown() { + xxx_messageInfo_MsgLinkApplication.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgLinkApplication proto.InternalMessageInfo + +func (m *MsgLinkApplication) GetSender() string { + if m != nil { + return m.Sender + } + return "" +} + +func (m *MsgLinkApplication) GetLinkData() Data { + if m != nil { + return m.LinkData + } + return Data{} +} + +func (m *MsgLinkApplication) GetCallData() string { + if m != nil { + return m.CallData + } + return "" +} + +func (m *MsgLinkApplication) GetSourcePort() string { + if m != nil { + return m.SourcePort + } + return "" +} + +func (m *MsgLinkApplication) GetSourceChannel() string { + if m != nil { + return m.SourceChannel + } + return "" +} + +func (m *MsgLinkApplication) GetTimeoutHeight() types1.Height { + if m != nil { + return m.TimeoutHeight + } + return types1.Height{} +} + +func (m *MsgLinkApplication) GetTimeoutTimestamp() uint64 { + if m != nil { + return m.TimeoutTimestamp + } + return 0 +} + +// MsgLinkApplicationResponse defines the Msg/LinkApplication +// response type. +type MsgLinkApplicationResponse struct { +} + +func (m *MsgLinkApplicationResponse) Reset() { *m = MsgLinkApplicationResponse{} } +func (m *MsgLinkApplicationResponse) String() string { return proto.CompactTextString(m) } +func (*MsgLinkApplicationResponse) ProtoMessage() {} +func (*MsgLinkApplicationResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{19} +} +func (m *MsgLinkApplicationResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgLinkApplicationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgLinkApplicationResponse.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 *MsgLinkApplicationResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgLinkApplicationResponse.Merge(m, src) +} +func (m *MsgLinkApplicationResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgLinkApplicationResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgLinkApplicationResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgLinkApplicationResponse proto.InternalMessageInfo + +// MsgUnlinkApplication defines a msg to delete an application link from a user +// profile +type MsgUnlinkApplication struct { + // Application represents the name of the application to unlink + Application string `protobuf:"bytes,1,opt,name=application,proto3" json:"application,omitempty" yaml:"application"` + // Username represents the username inside the application to unlink + Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty" yaml:"username"` + // Signer represents the Desmos account to which the application should be + // unlinked + Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty" yaml:"signer"` +} + +func (m *MsgUnlinkApplication) Reset() { *m = MsgUnlinkApplication{} } +func (m *MsgUnlinkApplication) String() string { return proto.CompactTextString(m) } +func (*MsgUnlinkApplication) ProtoMessage() {} +func (*MsgUnlinkApplication) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{20} +} +func (m *MsgUnlinkApplication) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUnlinkApplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUnlinkApplication.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 *MsgUnlinkApplication) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUnlinkApplication.Merge(m, src) +} +func (m *MsgUnlinkApplication) XXX_Size() int { + return m.Size() +} +func (m *MsgUnlinkApplication) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUnlinkApplication.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUnlinkApplication proto.InternalMessageInfo + +func (m *MsgUnlinkApplication) GetApplication() string { + if m != nil { + return m.Application + } + return "" +} + +func (m *MsgUnlinkApplication) GetUsername() string { + if m != nil { + return m.Username + } + return "" +} + +func (m *MsgUnlinkApplication) GetSigner() string { + if m != nil { + return m.Signer + } + return "" +} + +// MsgUnlinkApplicationResponse defines the Msg/UnlinkApplication response +// type. +type MsgUnlinkApplicationResponse struct { +} + +func (m *MsgUnlinkApplicationResponse) Reset() { *m = MsgUnlinkApplicationResponse{} } +func (m *MsgUnlinkApplicationResponse) String() string { return proto.CompactTextString(m) } +func (*MsgUnlinkApplicationResponse) ProtoMessage() {} +func (*MsgUnlinkApplicationResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_869194438e2ecf0d, []int{21} +} +func (m *MsgUnlinkApplicationResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUnlinkApplicationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUnlinkApplicationResponse.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 *MsgUnlinkApplicationResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUnlinkApplicationResponse.Merge(m, src) +} +func (m *MsgUnlinkApplicationResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgUnlinkApplicationResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUnlinkApplicationResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUnlinkApplicationResponse proto.InternalMessageInfo + +// MsgUpdateParams is the Msg/UpdateParams request type. +// +// Since: Desmos 5.0.0 +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 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_869194438e2ecf0d, []int{22} +} +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: Desmos 5.0.0 +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_869194438e2ecf0d, []int{23} +} +func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUpdateParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUpdateParamsResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MsgUpdateParamsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateParamsResponse.Merge(m, src) +} +func (m *MsgUpdateParamsResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateParamsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo + +func init() { + proto.RegisterType((*MsgSaveProfile)(nil), "desmos.profiles.v3.MsgSaveProfile") + proto.RegisterType((*MsgSaveProfileResponse)(nil), "desmos.profiles.v3.MsgSaveProfileResponse") + proto.RegisterType((*MsgDeleteProfile)(nil), "desmos.profiles.v3.MsgDeleteProfile") + proto.RegisterType((*MsgDeleteProfileResponse)(nil), "desmos.profiles.v3.MsgDeleteProfileResponse") + proto.RegisterType((*MsgRequestDTagTransfer)(nil), "desmos.profiles.v3.MsgRequestDTagTransfer") + proto.RegisterType((*MsgRequestDTagTransferResponse)(nil), "desmos.profiles.v3.MsgRequestDTagTransferResponse") + proto.RegisterType((*MsgCancelDTagTransferRequest)(nil), "desmos.profiles.v3.MsgCancelDTagTransferRequest") + proto.RegisterType((*MsgCancelDTagTransferRequestResponse)(nil), "desmos.profiles.v3.MsgCancelDTagTransferRequestResponse") + proto.RegisterType((*MsgAcceptDTagTransferRequest)(nil), "desmos.profiles.v3.MsgAcceptDTagTransferRequest") + proto.RegisterType((*MsgAcceptDTagTransferRequestResponse)(nil), "desmos.profiles.v3.MsgAcceptDTagTransferRequestResponse") + proto.RegisterType((*MsgRefuseDTagTransferRequest)(nil), "desmos.profiles.v3.MsgRefuseDTagTransferRequest") + proto.RegisterType((*MsgRefuseDTagTransferRequestResponse)(nil), "desmos.profiles.v3.MsgRefuseDTagTransferRequestResponse") + proto.RegisterType((*MsgLinkChainAccount)(nil), "desmos.profiles.v3.MsgLinkChainAccount") + proto.RegisterType((*MsgLinkChainAccountResponse)(nil), "desmos.profiles.v3.MsgLinkChainAccountResponse") + proto.RegisterType((*MsgUnlinkChainAccount)(nil), "desmos.profiles.v3.MsgUnlinkChainAccount") + proto.RegisterType((*MsgUnlinkChainAccountResponse)(nil), "desmos.profiles.v3.MsgUnlinkChainAccountResponse") + proto.RegisterType((*MsgSetDefaultExternalAddress)(nil), "desmos.profiles.v3.MsgSetDefaultExternalAddress") + proto.RegisterType((*MsgSetDefaultExternalAddressResponse)(nil), "desmos.profiles.v3.MsgSetDefaultExternalAddressResponse") + proto.RegisterType((*MsgLinkApplication)(nil), "desmos.profiles.v3.MsgLinkApplication") + proto.RegisterType((*MsgLinkApplicationResponse)(nil), "desmos.profiles.v3.MsgLinkApplicationResponse") + proto.RegisterType((*MsgUnlinkApplication)(nil), "desmos.profiles.v3.MsgUnlinkApplication") + proto.RegisterType((*MsgUnlinkApplicationResponse)(nil), "desmos.profiles.v3.MsgUnlinkApplicationResponse") + proto.RegisterType((*MsgUpdateParams)(nil), "desmos.profiles.v3.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "desmos.profiles.v3.MsgUpdateParamsResponse") +} + func init() { proto.RegisterFile("desmos/profiles/v3/msg_server.proto", fileDescriptor_869194438e2ecf0d) } -var fileDescriptor_869194438e2ecf0d = []byte{ - // 511 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x3f, 0x6f, 0xd3, 0x40, - 0x18, 0xc6, 0x1b, 0x21, 0x18, 0xae, 0x20, 0xe0, 0x18, 0x10, 0x37, 0x78, 0xa0, 0x85, 0xd2, 0x16, - 0xec, 0xa6, 0x11, 0x12, 0x6b, 0x68, 0x98, 0xa0, 0x52, 0x95, 0xb6, 0x0b, 0x12, 0x0a, 0x97, 0xcb, - 0x1b, 0xd7, 0xea, 0xe5, 0xee, 0xb8, 0x3b, 0x5b, 0x65, 0x63, 0x63, 0x84, 0x8f, 0xc2, 0xc7, 0x60, - 0xec, 0xc8, 0x88, 0x92, 0x81, 0xaf, 0x81, 0x12, 0x27, 0xc6, 0x6e, 0xfb, 0x16, 0x67, 0x4a, 0x64, - 0xff, 0x9e, 0x3f, 0x7a, 0x24, 0xbf, 0x64, 0x6d, 0x00, 0x6e, 0xa4, 0x5d, 0x64, 0xac, 0x1e, 0x26, - 0x12, 0x5c, 0x94, 0xb5, 0xa2, 0x91, 0x8b, 0x7b, 0x0e, 0x6c, 0x06, 0x36, 0x34, 0x56, 0x7b, 0x4d, - 0x69, 0x0e, 0x85, 0x0b, 0x28, 0xcc, 0x5a, 0xec, 0xa1, 0xd0, 0x33, 0xe1, 0xc8, 0xc5, 0x51, 0xd6, - 0x9c, 0xfe, 0xe4, 0x30, 0x7b, 0x72, 0xb5, 0xa3, 0xeb, 0xcd, 0x1f, 0xcc, 0xb1, 0x6d, 0x0c, 0x1b, - 0x78, 0x1e, 0xf7, 0x2c, 0x7c, 0x4a, 0xc1, 0x79, 0x37, 0x87, 0x37, 0x31, 0x58, 0x9c, 0xf0, 0x44, - 0xf5, 0x64, 0xa2, 0x4e, 0x17, 0xe8, 0x06, 0x86, 0x72, 0x63, 0x2a, 0xe0, 0x3a, 0xda, 0x93, 0x5b, - 0x3e, 0x9a, 0x53, 0xbb, 0xdf, 0x56, 0xc9, 0x8d, 0x7d, 0x17, 0xd3, 0x0f, 0x64, 0xf5, 0x90, 0x67, - 0x70, 0x90, 0xc3, 0xf4, 0x71, 0x78, 0x79, 0x92, 0x70, 0xdf, 0xc5, 0x25, 0x86, 0x6d, 0xfd, 0x9f, - 0xe9, 0x82, 0x33, 0x5a, 0x39, 0xa0, 0x82, 0xdc, 0xe9, 0x80, 0x04, 0x5f, 0x04, 0xac, 0x23, 0xe2, - 0x0a, 0xc5, 0x9e, 0xd7, 0xa1, 0x8a, 0x90, 0x94, 0x3c, 0xe8, 0xe6, 0xbb, 0x76, 0x8e, 0x78, 0x7c, - 0x64, 0xb9, 0x72, 0x43, 0xb0, 0x14, 0xeb, 0x79, 0x05, 0xcb, 0x76, 0xeb, 0xb3, 0x45, 0xec, 0xd7, - 0x06, 0x79, 0xb4, 0xc7, 0x95, 0x00, 0x59, 0x7d, 0x3d, 0x53, 0xd0, 0x1d, 0xc4, 0x11, 0x55, 0xb0, - 0x57, 0xcb, 0x2a, 0x2a, 0x4d, 0xda, 0x42, 0x80, 0xf1, 0xcb, 0x34, 0x41, 0x15, 0x68, 0x13, 0x54, - 0x51, 0x69, 0xd2, 0x85, 0x61, 0xea, 0x60, 0x99, 0x26, 0xa8, 0x02, 0x6d, 0x82, 0x2a, 0x8a, 0x26, - 0x92, 0xdc, 0x7b, 0x97, 0xa8, 0xd3, 0xbd, 0xe9, 0x87, 0xd4, 0x16, 0x42, 0xa7, 0xca, 0xd3, 0x0d, - 0xc4, 0xed, 0x22, 0xc8, 0xa2, 0x9a, 0x60, 0x91, 0x66, 0x09, 0x3d, 0x56, 0xf2, 0x62, 0xde, 0x26, - 0x62, 0x73, 0x19, 0x65, 0xcd, 0xda, 0x68, 0x65, 0xeb, 0x43, 0xf0, 0x1d, 0x18, 0xf2, 0x54, 0xfa, - 0x37, 0x67, 0x1e, 0xac, 0xe2, 0xb2, 0x3d, 0x18, 0x58, 0x70, 0x0e, 0xdd, 0x1a, 0x55, 0xa0, 0x5b, - 0xa3, 0x8a, 0xa2, 0x49, 0x42, 0xee, 0x4e, 0x97, 0x69, 0x1b, 0x23, 0x13, 0xc1, 0x7d, 0xa2, 0x15, - 0x7d, 0x7a, 0xcd, 0x82, 0x25, 0x8e, 0x85, 0xf5, 0xb8, 0x22, 0x4a, 0x93, 0xfb, 0xf9, 0x24, 0xe5, - 0xb0, 0x67, 0xd7, 0x8e, 0x57, 0x8e, 0xdb, 0xa9, 0x4b, 0x16, 0x81, 0x1f, 0xc9, 0xed, 0x63, 0x33, - 0xe0, 0x1e, 0x0e, 0x66, 0xe7, 0x93, 0xae, 0x61, 0x0e, 0x25, 0x88, 0x6d, 0xd7, 0x80, 0x16, 0x09, - 0xec, 0xe6, 0x97, 0x3f, 0x3f, 0xb6, 0x1a, 0xaf, 0xdf, 0xfe, 0x1c, 0x07, 0x8d, 0xf3, 0x71, 0xd0, - 0xf8, 0x3d, 0x0e, 0x1a, 0xdf, 0x27, 0xc1, 0xca, 0xf9, 0x24, 0x58, 0xf9, 0x35, 0x09, 0x56, 0xde, - 0x37, 0xe3, 0xc4, 0x9f, 0xa4, 0xfd, 0x50, 0xe8, 0x51, 0x94, 0xfb, 0xbe, 0x90, 0xbc, 0xef, 0xe6, - 0xff, 0xa3, 0xec, 0x65, 0x74, 0xf6, 0xef, 0xda, 0xfb, 0xcf, 0x06, 0x5c, 0xff, 0xd6, 0xec, 0xca, - 0xb7, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0xcf, 0xcf, 0x27, 0x5b, 0x07, 0x07, 0x00, 0x00, +var fileDescriptor_869194438e2ecf0d = []byte{ + // 1672 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcb, 0x6f, 0xdb, 0xc8, + 0x19, 0x37, 0xe3, 0xf7, 0xc8, 0x4f, 0xfa, 0x25, 0x33, 0xb6, 0xe8, 0x4e, 0x02, 0xc7, 0x8f, 0x5a, + 0xf2, 0x23, 0x4d, 0x53, 0x15, 0x29, 0x6a, 0xd9, 0x45, 0x5b, 0xb4, 0x0e, 0x5c, 0xc6, 0xbd, 0x14, + 0x28, 0x54, 0x8a, 0x1a, 0xd3, 0x84, 0x29, 0x8e, 0x4a, 0x52, 0x72, 0x7c, 0x2b, 0x72, 0x29, 0xd0, + 0x4b, 0xfb, 0x07, 0xf4, 0xd6, 0x4b, 0x8f, 0x39, 0xe4, 0xb0, 0x87, 0xc5, 0x9e, 0x83, 0x3d, 0x05, + 0x7b, 0xda, 0x13, 0x77, 0xd7, 0xc1, 0x22, 0xe7, 0xd5, 0x5f, 0xb0, 0x98, 0x07, 0x29, 0x92, 0xe2, + 0xd8, 0xde, 0x24, 0x7b, 0x91, 0x38, 0xdf, 0xf7, 0xfb, 0x5e, 0xbf, 0xf9, 0xe6, 0x05, 0xee, 0xd5, + 0x91, 0xd7, 0xc0, 0x5e, 0xa9, 0xe9, 0xe2, 0x53, 0xcb, 0x46, 0x5e, 0xa9, 0xbd, 0x57, 0x6a, 0x78, + 0x66, 0xd5, 0x43, 0x6e, 0x1b, 0xb9, 0xc5, 0xa6, 0x8b, 0x7d, 0x2c, 0xcb, 0x0c, 0x54, 0x0c, 0x41, + 0xc5, 0xf6, 0x9e, 0xb2, 0x68, 0x62, 0x6c, 0xda, 0xa8, 0x44, 0x11, 0xb5, 0xd6, 0x69, 0x49, 0x77, + 0x2e, 0x19, 0x5c, 0x99, 0x35, 0xb1, 0x89, 0xe9, 0x67, 0x89, 0x7c, 0x71, 0xe9, 0x82, 0x81, 0x69, + 0xa4, 0x86, 0x67, 0x96, 0xda, 0x3b, 0xe4, 0x8f, 0x2b, 0xa6, 0xf5, 0x86, 0xe5, 0xe0, 0x12, 0xfd, + 0xe5, 0xa2, 0x45, 0x86, 0xad, 0x32, 0x27, 0x6c, 0xc0, 0x55, 0xaa, 0x55, 0x33, 0x4a, 0x06, 0x76, + 0x51, 0xc9, 0xb0, 0x2d, 0xe4, 0xf8, 0xc4, 0x17, 0xfb, 0xe2, 0x80, 0xf5, 0xac, 0x8a, 0x70, 0x1d, + 0xd9, 0x5e, 0x55, 0x6f, 0x36, 0xab, 0xb6, 0xe5, 0x9c, 0x87, 0xbe, 0x36, 0xc5, 0x50, 0xe3, 0x4c, + 0xb7, 0x9c, 0x04, 0x78, 0x55, 0x0c, 0x6e, 0xea, 0xae, 0xde, 0xe0, 0x38, 0xf8, 0xa2, 0x1f, 0x4c, + 0x1c, 0x79, 0xe6, 0x33, 0xbd, 0x8d, 0x8e, 0x19, 0x54, 0xde, 0x04, 0x03, 0x75, 0x5f, 0x37, 0xf3, + 0xd2, 0x8a, 0xb4, 0x36, 0x5a, 0x59, 0xb8, 0x0a, 0xd4, 0x81, 0xc3, 0x13, 0xdd, 0xec, 0x04, 0x6a, + 0xee, 0x52, 0x6f, 0xd8, 0x65, 0x48, 0xb4, 0x50, 0xa3, 0x20, 0xb9, 0x04, 0x46, 0x1c, 0xcb, 0x38, + 0x77, 0xf4, 0x06, 0xca, 0xdf, 0xa1, 0x06, 0x33, 0x9d, 0x40, 0x9d, 0x64, 0xc0, 0x50, 0x03, 0xb5, + 0x08, 0x24, 0xaf, 0x80, 0xfe, 0x9a, 0x85, 0xf3, 0xfd, 0x14, 0x3b, 0xd1, 0x09, 0x54, 0xc0, 0xb0, + 0x35, 0x0b, 0x43, 0x8d, 0xa8, 0xe4, 0x03, 0x30, 0xc9, 0xb3, 0xae, 0x36, 0x2d, 0xc3, 0x6f, 0xb9, + 0x28, 0x3f, 0x40, 0xd1, 0x4a, 0x27, 0x50, 0xe7, 0x19, 0x3a, 0x05, 0x80, 0xda, 0x04, 0x97, 0x1c, + 0x33, 0x81, 0xfc, 0x04, 0x8c, 0x1b, 0xb8, 0x8d, 0xdc, 0xc8, 0xc5, 0x20, 0x75, 0x91, 0xef, 0x04, + 0xea, 0x2c, 0x73, 0x91, 0x50, 0x43, 0x6d, 0x8c, 0x8e, 0x43, 0xf3, 0x43, 0x30, 0x6c, 0xb8, 0x48, + 0xf7, 0xb1, 0x9b, 0x1f, 0xa2, 0x86, 0x1b, 0x9d, 0x40, 0x9d, 0xe0, 0x86, 0x4c, 0x01, 0xbf, 0x78, + 0xb5, 0x35, 0xcb, 0x27, 0x7b, 0xbf, 0x5e, 0x77, 0x91, 0xe7, 0x3d, 0xf3, 0x5d, 0xcb, 0x31, 0xb5, + 0xd0, 0xb4, 0xbc, 0xfa, 0xe2, 0xdd, 0xcb, 0x8d, 0x70, 0xf4, 0xaf, 0x77, 0x2f, 0x37, 0xe6, 0xf8, + 0xac, 0x24, 0x19, 0x87, 0x79, 0x30, 0x9f, 0x94, 0x68, 0xc8, 0x6b, 0x62, 0xc7, 0x43, 0xf0, 0x85, + 0x04, 0xa6, 0x8e, 0x3c, 0xf3, 0x10, 0xd9, 0xc8, 0x8f, 0x26, 0x28, 0x96, 0x9c, 0xf4, 0xfe, 0xc9, + 0xad, 0xa5, 0x93, 0x5b, 0xe8, 0x26, 0x97, 0x88, 0x07, 0x15, 0x90, 0x4f, 0xcb, 0xa2, 0x04, 0xff, + 0x27, 0xd1, 0xdc, 0x35, 0xf4, 0xf7, 0x16, 0xf2, 0x7c, 0xd2, 0x27, 0x27, 0xae, 0xee, 0x78, 0xa7, + 0xc8, 0x25, 0xad, 0xe1, 0x22, 0x03, 0x59, 0x6d, 0x14, 0xe6, 0x19, 0x6b, 0x8d, 0x50, 0x03, 0xb5, + 0x08, 0x24, 0xaf, 0x83, 0x21, 0x0f, 0x39, 0x75, 0xe4, 0xf2, 0x4e, 0x9a, 0xee, 0x04, 0xea, 0x38, + 0x83, 0x33, 0x39, 0xd4, 0x38, 0xa0, 0xbc, 0x45, 0x92, 0xe7, 0x03, 0x92, 0xfb, 0x72, 0x37, 0xf7, + 0x8c, 0x54, 0xe0, 0x0a, 0x28, 0x64, 0x6b, 0xa2, 0x3a, 0xbe, 0x92, 0xc0, 0xd2, 0x91, 0x67, 0x1e, + 0xe8, 0x8e, 0x81, 0xec, 0x24, 0x82, 0x1a, 0xc9, 0xbf, 0xed, 0xa9, 0x66, 0x33, 0xa3, 0x1a, 0x21, + 0xed, 0xdd, 0x2a, 0xf7, 0x53, 0x55, 0xae, 0xf7, 0x54, 0x29, 0x74, 0x12, 0x56, 0xbf, 0x97, 0xaa, + 0xfe, 0x5e, 0xb7, 0x7a, 0x61, 0x01, 0x70, 0x15, 0xdc, 0xbf, 0x4e, 0x1f, 0x31, 0xf1, 0xdf, 0x3b, + 0x94, 0x89, 0x7d, 0xc3, 0x40, 0x4d, 0x3f, 0x8b, 0x89, 0x5f, 0x80, 0x11, 0x07, 0x5d, 0x54, 0x63, + 0x7b, 0x44, 0xe1, 0x2a, 0x50, 0x87, 0x9f, 0xa2, 0x0b, 0xbe, 0x4d, 0x84, 0xab, 0x9f, 0x83, 0xa0, + 0x36, 0xec, 0xa0, 0x8b, 0x43, 0xb2, 0x5b, 0x7c, 0x78, 0xed, 0x89, 0x79, 0xe8, 0xff, 0x80, 0x79, + 0x28, 0xff, 0x8c, 0x90, 0x18, 0x0d, 0x53, 0x34, 0x0a, 0xab, 0xe7, 0x34, 0x0a, 0xf5, 0x11, 0x8d, + 0xdf, 0xb0, 0x86, 0xd2, 0xd0, 0x69, 0xcb, 0x43, 0x59, 0x34, 0x76, 0xb9, 0x90, 0x3e, 0x06, 0x17, + 0x77, 0x7e, 0x34, 0x2e, 0x84, 0x25, 0x70, 0x2e, 0x84, 0xfa, 0x88, 0x8b, 0x4f, 0xfb, 0xc1, 0xcc, + 0x91, 0x67, 0xfe, 0xd1, 0x72, 0xce, 0x0f, 0xc8, 0x49, 0xb5, 0x6f, 0x18, 0xb8, 0xe5, 0xf8, 0x72, + 0x1b, 0x8c, 0xb3, 0x93, 0x4b, 0x67, 0x79, 0x51, 0x26, 0x72, 0xbb, 0xb3, 0x45, 0x76, 0x5a, 0x17, + 0xc3, 0xd3, 0xba, 0xb8, 0xef, 0x5c, 0x56, 0x7e, 0xd9, 0x09, 0xd4, 0x39, 0xce, 0x0f, 0x6e, 0xb9, + 0x06, 0x0a, 0xad, 0xe0, 0xe7, 0xaf, 0xb6, 0x0a, 0xbd, 0x67, 0x7e, 0x58, 0xec, 0xa1, 0xee, 0xeb, + 0xda, 0x18, 0x8d, 0xc3, 0x25, 0xf2, 0x9f, 0xc0, 0x60, 0xd3, 0xc5, 0xf8, 0x94, 0x92, 0x96, 0xdb, + 0x5d, 0x2c, 0x66, 0x58, 0x1f, 0x13, 0x40, 0x65, 0xe5, 0x75, 0xa0, 0xf6, 0x75, 0x02, 0x75, 0x26, + 0x11, 0x98, 0x1a, 0xc3, 0xff, 0xbf, 0x7b, 0xb9, 0x21, 0x69, 0xcc, 0x93, 0x7c, 0x0e, 0x58, 0x88, + 0xaa, 0x81, 0x9d, 0x53, 0xcb, 0xa4, 0xad, 0x99, 0xdb, 0x55, 0xb3, 0x3c, 0x53, 0x0a, 0x0e, 0x28, + 0xac, 0xf2, 0x80, 0xfb, 0x57, 0x12, 0xfe, 0xe3, 0x9e, 0x78, 0x98, 0x9c, 0xd1, 0xb5, 0xa2, 0xad, + 0x63, 0x99, 0x0e, 0x72, 0xf9, 0xc1, 0x18, 0x6f, 0x1d, 0x2a, 0xbf, 0xae, 0x75, 0x28, 0xa0, 0xbc, + 0xc1, 0xb6, 0x10, 0x3a, 0x20, 0xf3, 0xad, 0x74, 0xe7, 0x3b, 0x3d, 0x4d, 0x70, 0x19, 0xdc, 0xcd, + 0x10, 0x47, 0xb3, 0xfb, 0xad, 0x04, 0xe6, 0x8e, 0x3c, 0xf3, 0xcf, 0x8e, 0x9d, 0x9e, 0xdf, 0x5f, + 0x81, 0x41, 0x7c, 0xe1, 0x44, 0x1d, 0xbe, 0xd6, 0x09, 0xd4, 0x31, 0x96, 0x26, 0x15, 0x8b, 0xb3, + 0x64, 0x66, 0xf2, 0x43, 0x00, 0x18, 0x15, 0xb1, 0xeb, 0xc5, 0x5c, 0x27, 0x50, 0xa7, 0xf9, 0x59, + 0x17, 0xe9, 0xa0, 0x36, 0x4a, 0x07, 0x4f, 0xc9, 0x0d, 0x63, 0x1d, 0x0c, 0xf9, 0xba, 0x6b, 0x22, + 0x9f, 0xef, 0x0f, 0xb1, 0x63, 0x84, 0xc9, 0xa1, 0xc6, 0x01, 0xe5, 0x4d, 0xc2, 0x02, 0x0b, 0x46, + 0x48, 0x58, 0xea, 0x92, 0xd0, 0x5b, 0x0d, 0x54, 0xc1, 0x72, 0xa6, 0xa2, 0xdb, 0xe6, 0x6c, 0xc9, + 0x3f, 0x43, 0xfe, 0x21, 0x3a, 0xd5, 0x5b, 0xb6, 0xff, 0x9b, 0xe7, 0x3e, 0x72, 0x1d, 0xdd, 0x0e, + 0xfb, 0x6e, 0x39, 0x51, 0x0f, 0x25, 0x25, 0x9e, 0xf8, 0x7c, 0x94, 0x38, 0x2d, 0x35, 0xcc, 0x52, + 0xde, 0x8e, 0xa6, 0x9b, 0x15, 0x94, 0xbf, 0x71, 0x76, 0xf7, 0x52, 0xb3, 0x1b, 0x5b, 0xcd, 0xc2, + 0xec, 0xf8, 0x6a, 0x16, 0xea, 0xa3, 0x32, 0x3f, 0x19, 0x00, 0x32, 0xef, 0x87, 0xfd, 0x66, 0xd3, + 0xb6, 0x0c, 0xdd, 0xb7, 0xb0, 0xf3, 0x31, 0xf6, 0xb3, 0x13, 0x30, 0x4a, 0xc8, 0xad, 0xd6, 0x75, + 0x5f, 0xe7, 0x6b, 0x33, 0x9f, 0xb5, 0x82, 0xc8, 0x92, 0xae, 0x2c, 0xf3, 0xa5, 0x33, 0xc5, 0x62, + 0x44, 0x86, 0x7c, 0xc1, 0x8c, 0x10, 0x01, 0x01, 0xca, 0x3b, 0x60, 0xd4, 0xd0, 0x6d, 0x9b, 0x79, + 0x65, 0x0c, 0xce, 0x76, 0xed, 0x22, 0x15, 0xd4, 0x46, 0xc8, 0x37, 0x35, 0xf9, 0x39, 0xc8, 0x85, + 0x4b, 0x1d, 0xbb, 0x3e, 0x5f, 0x65, 0xf3, 0x9d, 0x40, 0x95, 0x93, 0xfb, 0x00, 0x76, 0x7d, 0xa8, + 0x01, 0x36, 0x3a, 0xc6, 0xae, 0x2f, 0xff, 0x1a, 0x4c, 0x74, 0xd7, 0xb0, 0xe3, 0x20, 0x9b, 0xdf, + 0x3b, 0x17, 0x7b, 0x36, 0x2f, 0xae, 0x87, 0xda, 0x38, 0x13, 0x1c, 0xb0, 0xb1, 0x8c, 0xc0, 0x84, + 0x6f, 0x35, 0x10, 0x6e, 0xf9, 0xd5, 0x33, 0x64, 0x99, 0x67, 0x3e, 0xbd, 0x80, 0xe6, 0x76, 0x95, + 0xa2, 0x55, 0x33, 0x8a, 0xe4, 0x29, 0x51, 0xe4, 0x0f, 0x88, 0xf6, 0x4e, 0xf1, 0x77, 0x14, 0x51, + 0x81, 0x9c, 0x0a, 0x1e, 0x21, 0x69, 0xcf, 0xf9, 0x18, 0xe7, 0x52, 0x66, 0x22, 0xff, 0x1e, 0x4c, + 0x87, 0x30, 0xf2, 0xef, 0xf9, 0x7a, 0xa3, 0x99, 0x1f, 0x5e, 0x91, 0xd6, 0x06, 0x2a, 0x4b, 0x9d, + 0x40, 0xcd, 0x27, 0x3d, 0x45, 0x10, 0xa8, 0x4d, 0x71, 0xd9, 0x49, 0x28, 0x2a, 0xaf, 0xa7, 0x6e, + 0x23, 0x8b, 0xc9, 0xad, 0x24, 0xd6, 0x23, 0x70, 0x09, 0x28, 0xbd, 0xd2, 0xa8, 0xb1, 0xbe, 0x93, + 0xc0, 0x6c, 0xb4, 0xc2, 0xe2, 0xad, 0xf5, 0x18, 0xe4, 0xf4, 0xee, 0x90, 0xf7, 0x57, 0x6c, 0x3a, + 0x62, 0x4a, 0xa8, 0xc5, 0xa1, 0xe4, 0x0e, 0xda, 0xf2, 0x48, 0x17, 0x67, 0x3d, 0x4f, 0x42, 0x0d, + 0xd4, 0x22, 0x50, 0x6c, 0x6b, 0xed, 0x7f, 0xdf, 0xad, 0x75, 0x33, 0xb5, 0xf8, 0xee, 0xa6, 0x77, + 0x95, 0x38, 0x23, 0x05, 0xba, 0x65, 0xf4, 0xc8, 0x23, 0x4e, 0x3e, 0x93, 0xc0, 0x24, 0x01, 0x34, + 0xeb, 0xba, 0x8f, 0x8e, 0xe9, 0xcb, 0x4d, 0x7e, 0x04, 0x46, 0xf5, 0x96, 0x7f, 0x86, 0x5d, 0xcb, + 0xbf, 0xe4, 0x64, 0x88, 0xb7, 0x84, 0x2e, 0x54, 0x7e, 0x02, 0x86, 0xd8, 0xdb, 0x8f, 0xaf, 0x2d, + 0x25, 0xf3, 0xdc, 0xa3, 0x88, 0xca, 0x28, 0x69, 0x29, 0xd6, 0x39, 0xdc, 0xa8, 0xfc, 0x90, 0xd4, + 0xd5, 0x75, 0x47, 0x4a, 0xfb, 0x09, 0x2f, 0xed, 0x79, 0xf7, 0x9d, 0x99, 0x4a, 0x16, 0x2e, 0x82, + 0x85, 0x94, 0x28, 0xac, 0x6d, 0xf7, 0xdf, 0x39, 0xd0, 0x7f, 0xe4, 0x99, 0xf2, 0x5f, 0x41, 0x2e, + 0xfe, 0xfe, 0x84, 0x59, 0x69, 0x25, 0xdf, 0x47, 0xca, 0xc6, 0xcd, 0x98, 0x30, 0x8c, 0x6c, 0x80, + 0xf1, 0xe4, 0xfb, 0xe9, 0xbe, 0xc0, 0x38, 0x81, 0x52, 0x7e, 0x7a, 0x1b, 0x54, 0x14, 0xa4, 0x05, + 0x66, 0xb2, 0xde, 0x40, 0xa2, 0x3c, 0x33, 0xb0, 0xca, 0xee, 0xed, 0xb1, 0x51, 0xd8, 0x7f, 0x4a, + 0x60, 0x51, 0xfc, 0x66, 0xd9, 0x16, 0x78, 0x14, 0x5a, 0x28, 0x8f, 0x7f, 0xa8, 0x45, 0x22, 0x13, + 0xf1, 0x9b, 0x41, 0x94, 0x89, 0xd0, 0x42, 0x98, 0xc9, 0x8d, 0x37, 0x6f, 0x9a, 0x89, 0xf8, 0xda, + 0xbd, 0x2d, 0x64, 0x59, 0x60, 0x21, 0xcc, 0xe4, 0xc6, 0x7b, 0xaf, 0x6c, 0x83, 0xa9, 0x9e, 0x3b, + 0xef, 0x03, 0x81, 0xb7, 0x34, 0x50, 0x29, 0xdd, 0x12, 0x18, 0x45, 0x73, 0x81, 0x9c, 0x71, 0x07, + 0x5b, 0x17, 0xb8, 0xe9, 0x85, 0x2a, 0x3b, 0xb7, 0x86, 0x26, 0xb8, 0x16, 0xdf, 0x77, 0x44, 0x5c, + 0x0b, 0x2d, 0x84, 0x5c, 0xdf, 0x78, 0x2b, 0x91, 0x2d, 0x30, 0x99, 0xbe, 0x91, 0xac, 0x5e, 0xc3, + 0x60, 0x0c, 0xa7, 0x14, 0x6f, 0x87, 0x8b, 0x42, 0x61, 0x30, 0xdd, 0x7b, 0x46, 0xad, 0x5d, 0x4b, + 0x5e, 0x3c, 0xdc, 0xf6, 0x6d, 0x91, 0x51, 0xc0, 0xbf, 0x81, 0xb1, 0xc4, 0x01, 0x70, 0x4f, 0xe4, + 0x21, 0x06, 0x52, 0x36, 0x6f, 0x01, 0x0a, 0x23, 0x28, 0x83, 0xff, 0x20, 0x5b, 0x7d, 0xe5, 0x0f, + 0xaf, 0xaf, 0x0a, 0xd2, 0x9b, 0xab, 0x82, 0xf4, 0xf5, 0x55, 0x41, 0xfa, 0xcf, 0xdb, 0x42, 0xdf, + 0x9b, 0xb7, 0x85, 0xbe, 0x2f, 0xdf, 0x16, 0xfa, 0xfe, 0xb2, 0x63, 0x5a, 0xfe, 0x59, 0xab, 0x56, + 0x34, 0x70, 0xa3, 0xc4, 0xfc, 0x6e, 0xd9, 0x7a, 0xcd, 0xe3, 0xdf, 0xa5, 0xf6, 0xa3, 0xf8, 0x19, + 0xe0, 0x5f, 0x36, 0x91, 0x57, 0x1b, 0xa2, 0xcf, 0xb7, 0xbd, 0xef, 0x03, 0x00, 0x00, 0xff, 0xff, + 0x9a, 0x79, 0x64, 0x44, 0xb5, 0x15, 0x00, 0x00, +} + +// Reference imports to suppress errors if they are not otherwise used. +var _ context.Context +var _ grpc.ClientConn + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the grpc package it is being compiled against. +const _ = grpc.SupportPackageIsVersion4 + +// MsgClient is the client API for Msg service. +// +// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +type MsgClient interface { + // SaveProfile defines the method to save a profile + SaveProfile(ctx context.Context, in *MsgSaveProfile, opts ...grpc.CallOption) (*MsgSaveProfileResponse, error) + // DeleteProfile defines the method to delete an existing profile + DeleteProfile(ctx context.Context, in *MsgDeleteProfile, opts ...grpc.CallOption) (*MsgDeleteProfileResponse, error) + // RequestDTagTransfer defines the method to request another user to transfer + // their DTag to you + RequestDTagTransfer(ctx context.Context, in *MsgRequestDTagTransfer, opts ...grpc.CallOption) (*MsgRequestDTagTransferResponse, error) + // CancelDTagTransferRequest defines the method to cancel an outgoing DTag + // transfer request + CancelDTagTransferRequest(ctx context.Context, in *MsgCancelDTagTransferRequest, opts ...grpc.CallOption) (*MsgCancelDTagTransferRequestResponse, error) + // AcceptDTagTransferRequest defines the method to accept an incoming DTag + // transfer request + AcceptDTagTransferRequest(ctx context.Context, in *MsgAcceptDTagTransferRequest, opts ...grpc.CallOption) (*MsgAcceptDTagTransferRequestResponse, error) + // RefuseDTagTransferRequest defines the method to refuse an incoming DTag + // transfer request + RefuseDTagTransferRequest(ctx context.Context, in *MsgRefuseDTagTransferRequest, opts ...grpc.CallOption) (*MsgRefuseDTagTransferRequestResponse, error) + // LinkChainAccount defines a method to link an external chain account to a + // profile + LinkChainAccount(ctx context.Context, in *MsgLinkChainAccount, opts ...grpc.CallOption) (*MsgLinkChainAccountResponse, error) + // UnlinkChainAccount defines a method to unlink an external chain account + // from a profile + UnlinkChainAccount(ctx context.Context, in *MsgUnlinkChainAccount, opts ...grpc.CallOption) (*MsgUnlinkChainAccountResponse, error) + // SetDefaultExternalAddress allows to set a specific external address as the + // default one for a given chain + SetDefaultExternalAddress(ctx context.Context, in *MsgSetDefaultExternalAddress, opts ...grpc.CallOption) (*MsgSetDefaultExternalAddressResponse, error) + // LinkApplication defines a method to create a centralized application + // link + LinkApplication(ctx context.Context, in *MsgLinkApplication, opts ...grpc.CallOption) (*MsgLinkApplicationResponse, error) + // UnlinkApplication defines a method to remove a centralized application + UnlinkApplication(ctx context.Context, in *MsgUnlinkApplication, opts ...grpc.CallOption) (*MsgUnlinkApplicationResponse, error) + // UpdateParams defines a (governance) operation for updating the module + // parameters. + // The authority defaults to the x/gov module account. + // + // Since: Desmos 5.0.0 + UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) +} + +type msgClient struct { + cc grpc1.ClientConn +} + +func NewMsgClient(cc grpc1.ClientConn) MsgClient { + return &msgClient{cc} +} + +func (c *msgClient) SaveProfile(ctx context.Context, in *MsgSaveProfile, opts ...grpc.CallOption) (*MsgSaveProfileResponse, error) { + out := new(MsgSaveProfileResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/SaveProfile", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) DeleteProfile(ctx context.Context, in *MsgDeleteProfile, opts ...grpc.CallOption) (*MsgDeleteProfileResponse, error) { + out := new(MsgDeleteProfileResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/DeleteProfile", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) RequestDTagTransfer(ctx context.Context, in *MsgRequestDTagTransfer, opts ...grpc.CallOption) (*MsgRequestDTagTransferResponse, error) { + out := new(MsgRequestDTagTransferResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/RequestDTagTransfer", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) CancelDTagTransferRequest(ctx context.Context, in *MsgCancelDTagTransferRequest, opts ...grpc.CallOption) (*MsgCancelDTagTransferRequestResponse, error) { + out := new(MsgCancelDTagTransferRequestResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/CancelDTagTransferRequest", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) AcceptDTagTransferRequest(ctx context.Context, in *MsgAcceptDTagTransferRequest, opts ...grpc.CallOption) (*MsgAcceptDTagTransferRequestResponse, error) { + out := new(MsgAcceptDTagTransferRequestResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/AcceptDTagTransferRequest", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) RefuseDTagTransferRequest(ctx context.Context, in *MsgRefuseDTagTransferRequest, opts ...grpc.CallOption) (*MsgRefuseDTagTransferRequestResponse, error) { + out := new(MsgRefuseDTagTransferRequestResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/RefuseDTagTransferRequest", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) LinkChainAccount(ctx context.Context, in *MsgLinkChainAccount, opts ...grpc.CallOption) (*MsgLinkChainAccountResponse, error) { + out := new(MsgLinkChainAccountResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/LinkChainAccount", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) UnlinkChainAccount(ctx context.Context, in *MsgUnlinkChainAccount, opts ...grpc.CallOption) (*MsgUnlinkChainAccountResponse, error) { + out := new(MsgUnlinkChainAccountResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/UnlinkChainAccount", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) SetDefaultExternalAddress(ctx context.Context, in *MsgSetDefaultExternalAddress, opts ...grpc.CallOption) (*MsgSetDefaultExternalAddressResponse, error) { + out := new(MsgSetDefaultExternalAddressResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/SetDefaultExternalAddress", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) LinkApplication(ctx context.Context, in *MsgLinkApplication, opts ...grpc.CallOption) (*MsgLinkApplicationResponse, error) { + out := new(MsgLinkApplicationResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/LinkApplication", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) UnlinkApplication(ctx context.Context, in *MsgUnlinkApplication, opts ...grpc.CallOption) (*MsgUnlinkApplicationResponse, error) { + out := new(MsgUnlinkApplicationResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/UnlinkApplication", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { + out := new(MsgUpdateParamsResponse) + err := c.cc.Invoke(ctx, "/desmos.profiles.v3.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 { + // SaveProfile defines the method to save a profile + SaveProfile(context.Context, *MsgSaveProfile) (*MsgSaveProfileResponse, error) + // DeleteProfile defines the method to delete an existing profile + DeleteProfile(context.Context, *MsgDeleteProfile) (*MsgDeleteProfileResponse, error) + // RequestDTagTransfer defines the method to request another user to transfer + // their DTag to you + RequestDTagTransfer(context.Context, *MsgRequestDTagTransfer) (*MsgRequestDTagTransferResponse, error) + // CancelDTagTransferRequest defines the method to cancel an outgoing DTag + // transfer request + CancelDTagTransferRequest(context.Context, *MsgCancelDTagTransferRequest) (*MsgCancelDTagTransferRequestResponse, error) + // AcceptDTagTransferRequest defines the method to accept an incoming DTag + // transfer request + AcceptDTagTransferRequest(context.Context, *MsgAcceptDTagTransferRequest) (*MsgAcceptDTagTransferRequestResponse, error) + // RefuseDTagTransferRequest defines the method to refuse an incoming DTag + // transfer request + RefuseDTagTransferRequest(context.Context, *MsgRefuseDTagTransferRequest) (*MsgRefuseDTagTransferRequestResponse, error) + // LinkChainAccount defines a method to link an external chain account to a + // profile + LinkChainAccount(context.Context, *MsgLinkChainAccount) (*MsgLinkChainAccountResponse, error) + // UnlinkChainAccount defines a method to unlink an external chain account + // from a profile + UnlinkChainAccount(context.Context, *MsgUnlinkChainAccount) (*MsgUnlinkChainAccountResponse, error) + // SetDefaultExternalAddress allows to set a specific external address as the + // default one for a given chain + SetDefaultExternalAddress(context.Context, *MsgSetDefaultExternalAddress) (*MsgSetDefaultExternalAddressResponse, error) + // LinkApplication defines a method to create a centralized application + // link + LinkApplication(context.Context, *MsgLinkApplication) (*MsgLinkApplicationResponse, error) + // UnlinkApplication defines a method to remove a centralized application + UnlinkApplication(context.Context, *MsgUnlinkApplication) (*MsgUnlinkApplicationResponse, error) + // UpdateParams defines a (governance) operation for updating the module + // parameters. + // The authority defaults to the x/gov module account. + // + // Since: Desmos 5.0.0 + UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) +} + +// UnimplementedMsgServer can be embedded to have forward compatible implementations. +type UnimplementedMsgServer struct { +} + +func (*UnimplementedMsgServer) SaveProfile(ctx context.Context, req *MsgSaveProfile) (*MsgSaveProfileResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SaveProfile not implemented") +} +func (*UnimplementedMsgServer) DeleteProfile(ctx context.Context, req *MsgDeleteProfile) (*MsgDeleteProfileResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeleteProfile not implemented") +} +func (*UnimplementedMsgServer) RequestDTagTransfer(ctx context.Context, req *MsgRequestDTagTransfer) (*MsgRequestDTagTransferResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RequestDTagTransfer not implemented") +} +func (*UnimplementedMsgServer) CancelDTagTransferRequest(ctx context.Context, req *MsgCancelDTagTransferRequest) (*MsgCancelDTagTransferRequestResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CancelDTagTransferRequest not implemented") +} +func (*UnimplementedMsgServer) AcceptDTagTransferRequest(ctx context.Context, req *MsgAcceptDTagTransferRequest) (*MsgAcceptDTagTransferRequestResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method AcceptDTagTransferRequest not implemented") +} +func (*UnimplementedMsgServer) RefuseDTagTransferRequest(ctx context.Context, req *MsgRefuseDTagTransferRequest) (*MsgRefuseDTagTransferRequestResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RefuseDTagTransferRequest not implemented") +} +func (*UnimplementedMsgServer) LinkChainAccount(ctx context.Context, req *MsgLinkChainAccount) (*MsgLinkChainAccountResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method LinkChainAccount not implemented") +} +func (*UnimplementedMsgServer) UnlinkChainAccount(ctx context.Context, req *MsgUnlinkChainAccount) (*MsgUnlinkChainAccountResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UnlinkChainAccount not implemented") +} +func (*UnimplementedMsgServer) SetDefaultExternalAddress(ctx context.Context, req *MsgSetDefaultExternalAddress) (*MsgSetDefaultExternalAddressResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetDefaultExternalAddress not implemented") +} +func (*UnimplementedMsgServer) LinkApplication(ctx context.Context, req *MsgLinkApplication) (*MsgLinkApplicationResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method LinkApplication not implemented") +} +func (*UnimplementedMsgServer) UnlinkApplication(ctx context.Context, req *MsgUnlinkApplication) (*MsgUnlinkApplicationResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UnlinkApplication not implemented") +} +func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented") +} + +func RegisterMsgServer(s grpc1.Server, srv MsgServer) { + s.RegisterService(&_Msg_serviceDesc, srv) +} + +func _Msg_SaveProfile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgSaveProfile) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).SaveProfile(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/SaveProfile", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).SaveProfile(ctx, req.(*MsgSaveProfile)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_DeleteProfile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgDeleteProfile) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).DeleteProfile(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/DeleteProfile", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).DeleteProfile(ctx, req.(*MsgDeleteProfile)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_RequestDTagTransfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgRequestDTagTransfer) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).RequestDTagTransfer(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/RequestDTagTransfer", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).RequestDTagTransfer(ctx, req.(*MsgRequestDTagTransfer)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_CancelDTagTransferRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgCancelDTagTransferRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).CancelDTagTransferRequest(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/CancelDTagTransferRequest", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).CancelDTagTransferRequest(ctx, req.(*MsgCancelDTagTransferRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_AcceptDTagTransferRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgAcceptDTagTransferRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).AcceptDTagTransferRequest(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/AcceptDTagTransferRequest", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).AcceptDTagTransferRequest(ctx, req.(*MsgAcceptDTagTransferRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_RefuseDTagTransferRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgRefuseDTagTransferRequest) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).RefuseDTagTransferRequest(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/RefuseDTagTransferRequest", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).RefuseDTagTransferRequest(ctx, req.(*MsgRefuseDTagTransferRequest)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_LinkChainAccount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgLinkChainAccount) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).LinkChainAccount(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/LinkChainAccount", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).LinkChainAccount(ctx, req.(*MsgLinkChainAccount)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_UnlinkChainAccount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgUnlinkChainAccount) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).UnlinkChainAccount(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/UnlinkChainAccount", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).UnlinkChainAccount(ctx, req.(*MsgUnlinkChainAccount)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_SetDefaultExternalAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgSetDefaultExternalAddress) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).SetDefaultExternalAddress(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/SetDefaultExternalAddress", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).SetDefaultExternalAddress(ctx, req.(*MsgSetDefaultExternalAddress)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_LinkApplication_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgLinkApplication) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).LinkApplication(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/LinkApplication", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).LinkApplication(ctx, req.(*MsgLinkApplication)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_UnlinkApplication_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgUnlinkApplication) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).UnlinkApplication(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/desmos.profiles.v3.Msg/UnlinkApplication", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).UnlinkApplication(ctx, req.(*MsgUnlinkApplication)) + } + return interceptor(ctx, in, info, handler) } -// Reference imports to suppress errors if they are not otherwise used. -var _ context.Context -var _ grpc.ClientConn +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: "/desmos.profiles.v3.Msg/UpdateParams", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParams)) + } + return interceptor(ctx, in, info, handler) +} -// This is a compile-time assertion to ensure that this generated file -// is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +var _Msg_serviceDesc = grpc.ServiceDesc{ + ServiceName: "desmos.profiles.v3.Msg", + HandlerType: (*MsgServer)(nil), + Methods: []grpc.MethodDesc{ + { + MethodName: "SaveProfile", + Handler: _Msg_SaveProfile_Handler, + }, + { + MethodName: "DeleteProfile", + Handler: _Msg_DeleteProfile_Handler, + }, + { + MethodName: "RequestDTagTransfer", + Handler: _Msg_RequestDTagTransfer_Handler, + }, + { + MethodName: "CancelDTagTransferRequest", + Handler: _Msg_CancelDTagTransferRequest_Handler, + }, + { + MethodName: "AcceptDTagTransferRequest", + Handler: _Msg_AcceptDTagTransferRequest_Handler, + }, + { + MethodName: "RefuseDTagTransferRequest", + Handler: _Msg_RefuseDTagTransferRequest_Handler, + }, + { + MethodName: "LinkChainAccount", + Handler: _Msg_LinkChainAccount_Handler, + }, + { + MethodName: "UnlinkChainAccount", + Handler: _Msg_UnlinkChainAccount_Handler, + }, + { + MethodName: "SetDefaultExternalAddress", + Handler: _Msg_SetDefaultExternalAddress_Handler, + }, + { + MethodName: "LinkApplication", + Handler: _Msg_LinkApplication_Handler, + }, + { + MethodName: "UnlinkApplication", + Handler: _Msg_UnlinkApplication_Handler, + }, + { + MethodName: "UpdateParams", + Handler: _Msg_UpdateParams_Handler, + }, + }, + Streams: []grpc.StreamDesc{}, + Metadata: "desmos/profiles/v3/msg_server.proto", +} -// 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 { - // SaveProfile defines the method to save a profile - SaveProfile(ctx context.Context, in *MsgSaveProfile, opts ...grpc.CallOption) (*MsgSaveProfileResponse, error) - // DeleteProfile defines the method to delete an existing profile - DeleteProfile(ctx context.Context, in *MsgDeleteProfile, opts ...grpc.CallOption) (*MsgDeleteProfileResponse, error) - // RequestDTagTransfer defines the method to request another user to transfer - // their DTag to you - RequestDTagTransfer(ctx context.Context, in *MsgRequestDTagTransfer, opts ...grpc.CallOption) (*MsgRequestDTagTransferResponse, error) - // CancelDTagTransferRequest defines the method to cancel an outgoing DTag - // transfer request - CancelDTagTransferRequest(ctx context.Context, in *MsgCancelDTagTransferRequest, opts ...grpc.CallOption) (*MsgCancelDTagTransferRequestResponse, error) - // AcceptDTagTransferRequest defines the method to accept an incoming DTag - // transfer request - AcceptDTagTransferRequest(ctx context.Context, in *MsgAcceptDTagTransferRequest, opts ...grpc.CallOption) (*MsgAcceptDTagTransferRequestResponse, error) - // RefuseDTagTransferRequest defines the method to refuse an incoming DTag - // transfer request - RefuseDTagTransferRequest(ctx context.Context, in *MsgRefuseDTagTransferRequest, opts ...grpc.CallOption) (*MsgRefuseDTagTransferRequestResponse, error) - // LinkChainAccount defines a method to link an external chain account to a - // profile - LinkChainAccount(ctx context.Context, in *MsgLinkChainAccount, opts ...grpc.CallOption) (*MsgLinkChainAccountResponse, error) - // UnlinkChainAccount defines a method to unlink an external chain account - // from a profile - UnlinkChainAccount(ctx context.Context, in *MsgUnlinkChainAccount, opts ...grpc.CallOption) (*MsgUnlinkChainAccountResponse, error) - // SetDefaultExternalAddress allows to set a specific external address as the - // default one for a given chain - SetDefaultExternalAddress(ctx context.Context, in *MsgSetDefaultExternalAddress, opts ...grpc.CallOption) (*MsgSetDefaultExternalAddressResponse, error) - // LinkApplication defines a method to create a centralized application - // link - LinkApplication(ctx context.Context, in *MsgLinkApplication, opts ...grpc.CallOption) (*MsgLinkApplicationResponse, error) - // UnlinkApplication defines a method to remove a centralized application - UnlinkApplication(ctx context.Context, in *MsgUnlinkApplication, opts ...grpc.CallOption) (*MsgUnlinkApplicationResponse, error) - // UpdateParams defines a (governance) operation for updating the module - // parameters. - // The authority defaults to the x/gov module account. - // - // Since: Desmos 5.0.0 - UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) +func (m *MsgSaveProfile) 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 *MsgSaveProfile) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgSaveProfile) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Creator) > 0 { + i -= len(m.Creator) + copy(dAtA[i:], m.Creator) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0x32 + } + if len(m.CoverPicture) > 0 { + i -= len(m.CoverPicture) + copy(dAtA[i:], m.CoverPicture) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.CoverPicture))) + i-- + dAtA[i] = 0x2a + } + if len(m.ProfilePicture) > 0 { + i -= len(m.ProfilePicture) + copy(dAtA[i:], m.ProfilePicture) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.ProfilePicture))) + i-- + dAtA[i] = 0x22 + } + if len(m.Bio) > 0 { + i -= len(m.Bio) + copy(dAtA[i:], m.Bio) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Bio))) + i-- + dAtA[i] = 0x1a + } + if len(m.Nickname) > 0 { + i -= len(m.Nickname) + copy(dAtA[i:], m.Nickname) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Nickname))) + i-- + dAtA[i] = 0x12 + } + if len(m.DTag) > 0 { + i -= len(m.DTag) + copy(dAtA[i:], m.DTag) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.DTag))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgSaveProfileResponse) 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 *MsgSaveProfileResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgSaveProfileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgDeleteProfile) 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 *MsgDeleteProfile) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgDeleteProfile) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Creator) > 0 { + i -= len(m.Creator) + copy(dAtA[i:], m.Creator) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgDeleteProfileResponse) 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 *MsgDeleteProfileResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgDeleteProfileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgRequestDTagTransfer) 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 *MsgRequestDTagTransfer) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgRequestDTagTransfer) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0x12 + } + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Receiver))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgRequestDTagTransferResponse) 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 *MsgRequestDTagTransferResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgRequestDTagTransferResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgCancelDTagTransferRequest) 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 *MsgCancelDTagTransferRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgCancelDTagTransferRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0x12 + } + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Receiver))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgCancelDTagTransferRequestResponse) 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 *MsgCancelDTagTransferRequestResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgCancelDTagTransferRequestResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgAcceptDTagTransferRequest) 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 *MsgAcceptDTagTransferRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgAcceptDTagTransferRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Receiver))) + i-- + dAtA[i] = 0x1a + } + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0x12 + } + if len(m.NewDTag) > 0 { + i -= len(m.NewDTag) + copy(dAtA[i:], m.NewDTag) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.NewDTag))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgAcceptDTagTransferRequestResponse) 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 *MsgAcceptDTagTransferRequestResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgAcceptDTagTransferRequestResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgRefuseDTagTransferRequest) 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 *MsgRefuseDTagTransferRequest) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgRefuseDTagTransferRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Receiver) > 0 { + i -= len(m.Receiver) + copy(dAtA[i:], m.Receiver) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Receiver))) + i-- + dAtA[i] = 0x12 + } + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil } -type msgClient struct { - cc grpc1.ClientConn +func (m *MsgRefuseDTagTransferRequestResponse) 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 NewMsgClient(cc grpc1.ClientConn) MsgClient { - return &msgClient{cc} +func (m *MsgRefuseDTagTransferRequestResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) } -func (c *msgClient) SaveProfile(ctx context.Context, in *MsgSaveProfile, opts ...grpc.CallOption) (*MsgSaveProfileResponse, error) { - out := new(MsgSaveProfileResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/SaveProfile", in, out, opts...) +func (m *MsgRefuseDTagTransferRequestResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgLinkChainAccount) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) DeleteProfile(ctx context.Context, in *MsgDeleteProfile, opts ...grpc.CallOption) (*MsgDeleteProfileResponse, error) { - out := new(MsgDeleteProfileResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/DeleteProfile", in, out, opts...) +func (m *MsgLinkChainAccount) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgLinkChainAccount) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Signer) > 0 { + i -= len(m.Signer) + copy(dAtA[i:], m.Signer) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Signer))) + i-- + dAtA[i] = 0x22 + } + { + size, err := m.ChainConfig.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMsgServer(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + { + size, err := m.Proof.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMsgServer(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if m.ChainAddress != nil { + { + size, err := m.ChainAddress.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMsgServer(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgLinkChainAccountResponse) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) RequestDTagTransfer(ctx context.Context, in *MsgRequestDTagTransfer, opts ...grpc.CallOption) (*MsgRequestDTagTransferResponse, error) { - out := new(MsgRequestDTagTransferResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/RequestDTagTransfer", in, out, opts...) +func (m *MsgLinkChainAccountResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgLinkChainAccountResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgUnlinkChainAccount) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) CancelDTagTransferRequest(ctx context.Context, in *MsgCancelDTagTransferRequest, opts ...grpc.CallOption) (*MsgCancelDTagTransferRequestResponse, error) { - out := new(MsgCancelDTagTransferRequestResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/CancelDTagTransferRequest", in, out, opts...) +func (m *MsgUnlinkChainAccount) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUnlinkChainAccount) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Target) > 0 { + i -= len(m.Target) + copy(dAtA[i:], m.Target) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Target))) + i-- + dAtA[i] = 0x1a + } + if len(m.ChainName) > 0 { + i -= len(m.ChainName) + copy(dAtA[i:], m.ChainName) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.ChainName))) + i-- + dAtA[i] = 0x12 + } + if len(m.Owner) > 0 { + i -= len(m.Owner) + copy(dAtA[i:], m.Owner) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Owner))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgUnlinkChainAccountResponse) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) AcceptDTagTransferRequest(ctx context.Context, in *MsgAcceptDTagTransferRequest, opts ...grpc.CallOption) (*MsgAcceptDTagTransferRequestResponse, error) { - out := new(MsgAcceptDTagTransferRequestResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/AcceptDTagTransferRequest", in, out, opts...) +func (m *MsgUnlinkChainAccountResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUnlinkChainAccountResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgSetDefaultExternalAddress) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) RefuseDTagTransferRequest(ctx context.Context, in *MsgRefuseDTagTransferRequest, opts ...grpc.CallOption) (*MsgRefuseDTagTransferRequestResponse, error) { - out := new(MsgRefuseDTagTransferRequestResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/RefuseDTagTransferRequest", in, out, opts...) +func (m *MsgSetDefaultExternalAddress) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgSetDefaultExternalAddress) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Signer) > 0 { + i -= len(m.Signer) + copy(dAtA[i:], m.Signer) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Signer))) + i-- + dAtA[i] = 0x1a + } + if len(m.Target) > 0 { + i -= len(m.Target) + copy(dAtA[i:], m.Target) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Target))) + i-- + dAtA[i] = 0x12 + } + if len(m.ChainName) > 0 { + i -= len(m.ChainName) + copy(dAtA[i:], m.ChainName) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.ChainName))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgSetDefaultExternalAddressResponse) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) LinkChainAccount(ctx context.Context, in *MsgLinkChainAccount, opts ...grpc.CallOption) (*MsgLinkChainAccountResponse, error) { - out := new(MsgLinkChainAccountResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/LinkChainAccount", in, out, opts...) +func (m *MsgSetDefaultExternalAddressResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgSetDefaultExternalAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgLinkApplication) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) UnlinkChainAccount(ctx context.Context, in *MsgUnlinkChainAccount, opts ...grpc.CallOption) (*MsgUnlinkChainAccountResponse, error) { - out := new(MsgUnlinkChainAccountResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/UnlinkChainAccount", in, out, opts...) +func (m *MsgLinkApplication) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgLinkApplication) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.TimeoutTimestamp != 0 { + i = encodeVarintMsgServer(dAtA, i, uint64(m.TimeoutTimestamp)) + i-- + dAtA[i] = 0x38 + } + { + size, err := m.TimeoutHeight.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMsgServer(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x32 + if len(m.SourceChannel) > 0 { + i -= len(m.SourceChannel) + copy(dAtA[i:], m.SourceChannel) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.SourceChannel))) + i-- + dAtA[i] = 0x2a + } + if len(m.SourcePort) > 0 { + i -= len(m.SourcePort) + copy(dAtA[i:], m.SourcePort) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.SourcePort))) + i-- + dAtA[i] = 0x22 + } + if len(m.CallData) > 0 { + i -= len(m.CallData) + copy(dAtA[i:], m.CallData) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.CallData))) + i-- + dAtA[i] = 0x1a + } + { + size, err := m.LinkData.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintMsgServer(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.Sender) > 0 { + i -= len(m.Sender) + copy(dAtA[i:], m.Sender) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Sender))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgLinkApplicationResponse) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) SetDefaultExternalAddress(ctx context.Context, in *MsgSetDefaultExternalAddress, opts ...grpc.CallOption) (*MsgSetDefaultExternalAddressResponse, error) { - out := new(MsgSetDefaultExternalAddressResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/SetDefaultExternalAddress", in, out, opts...) +func (m *MsgLinkApplicationResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgLinkApplicationResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgUnlinkApplication) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) LinkApplication(ctx context.Context, in *MsgLinkApplication, opts ...grpc.CallOption) (*MsgLinkApplicationResponse, error) { - out := new(MsgLinkApplicationResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/LinkApplication", in, out, opts...) +func (m *MsgUnlinkApplication) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUnlinkApplication) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Signer) > 0 { + i -= len(m.Signer) + copy(dAtA[i:], m.Signer) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Signer))) + i-- + dAtA[i] = 0x1a + } + if len(m.Username) > 0 { + i -= len(m.Username) + copy(dAtA[i:], m.Username) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Username))) + i-- + dAtA[i] = 0x12 + } + if len(m.Application) > 0 { + i -= len(m.Application) + copy(dAtA[i:], m.Application) + i = encodeVarintMsgServer(dAtA, i, uint64(len(m.Application))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgUnlinkApplicationResponse) 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 out, nil + return dAtA[:n], nil } -func (c *msgClient) UnlinkApplication(ctx context.Context, in *MsgUnlinkApplication, opts ...grpc.CallOption) (*MsgUnlinkApplicationResponse, error) { - out := new(MsgUnlinkApplicationResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/UnlinkApplication", in, out, opts...) +func (m *MsgUnlinkApplicationResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUnlinkApplicationResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgUpdateParams) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) if err != nil { return nil, err } - return out, nil + return dAtA[:n], nil } -func (c *msgClient) UpdateParams(ctx context.Context, in *MsgUpdateParams, opts ...grpc.CallOption) (*MsgUpdateParamsResponse, error) { - out := new(MsgUpdateParamsResponse) - err := c.cc.Invoke(ctx, "/desmos.profiles.v3.Msg/UpdateParams", in, out, opts...) +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 = encodeVarintMsgServer(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.Authority) > 0 { + i -= len(m.Authority) + copy(dAtA[i:], m.Authority) + i = encodeVarintMsgServer(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 out, nil + return dAtA[:n], nil } -// MsgServer is the server API for Msg service. -type MsgServer interface { - // SaveProfile defines the method to save a profile - SaveProfile(context.Context, *MsgSaveProfile) (*MsgSaveProfileResponse, error) - // DeleteProfile defines the method to delete an existing profile - DeleteProfile(context.Context, *MsgDeleteProfile) (*MsgDeleteProfileResponse, error) - // RequestDTagTransfer defines the method to request another user to transfer - // their DTag to you - RequestDTagTransfer(context.Context, *MsgRequestDTagTransfer) (*MsgRequestDTagTransferResponse, error) - // CancelDTagTransferRequest defines the method to cancel an outgoing DTag - // transfer request - CancelDTagTransferRequest(context.Context, *MsgCancelDTagTransferRequest) (*MsgCancelDTagTransferRequestResponse, error) - // AcceptDTagTransferRequest defines the method to accept an incoming DTag - // transfer request - AcceptDTagTransferRequest(context.Context, *MsgAcceptDTagTransferRequest) (*MsgAcceptDTagTransferRequestResponse, error) - // RefuseDTagTransferRequest defines the method to refuse an incoming DTag - // transfer request - RefuseDTagTransferRequest(context.Context, *MsgRefuseDTagTransferRequest) (*MsgRefuseDTagTransferRequestResponse, error) - // LinkChainAccount defines a method to link an external chain account to a - // profile - LinkChainAccount(context.Context, *MsgLinkChainAccount) (*MsgLinkChainAccountResponse, error) - // UnlinkChainAccount defines a method to unlink an external chain account - // from a profile - UnlinkChainAccount(context.Context, *MsgUnlinkChainAccount) (*MsgUnlinkChainAccountResponse, error) - // SetDefaultExternalAddress allows to set a specific external address as the - // default one for a given chain - SetDefaultExternalAddress(context.Context, *MsgSetDefaultExternalAddress) (*MsgSetDefaultExternalAddressResponse, error) - // LinkApplication defines a method to create a centralized application - // link - LinkApplication(context.Context, *MsgLinkApplication) (*MsgLinkApplicationResponse, error) - // UnlinkApplication defines a method to remove a centralized application - UnlinkApplication(context.Context, *MsgUnlinkApplication) (*MsgUnlinkApplicationResponse, error) - // UpdateParams defines a (governance) operation for updating the module - // parameters. - // The authority defaults to the x/gov module account. - // - // Since: Desmos 5.0.0 - UpdateParams(context.Context, *MsgUpdateParams) (*MsgUpdateParamsResponse, error) +func (m *MsgUpdateParamsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) } -// UnimplementedMsgServer can be embedded to have forward compatible implementations. -type UnimplementedMsgServer struct { +func (m *MsgUpdateParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil } -func (*UnimplementedMsgServer) SaveProfile(ctx context.Context, req *MsgSaveProfile) (*MsgSaveProfileResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SaveProfile not implemented") +func encodeVarintMsgServer(dAtA []byte, offset int, v uint64) int { + offset -= sovMsgServer(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base } -func (*UnimplementedMsgServer) DeleteProfile(ctx context.Context, req *MsgDeleteProfile) (*MsgDeleteProfileResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method DeleteProfile not implemented") +func (m *MsgSaveProfile) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.DTag) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.Nickname) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.Bio) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.ProfilePicture) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.CoverPicture) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n } -func (*UnimplementedMsgServer) RequestDTagTransfer(ctx context.Context, req *MsgRequestDTagTransfer) (*MsgRequestDTagTransferResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method RequestDTagTransfer not implemented") + +func (m *MsgSaveProfileResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n } -func (*UnimplementedMsgServer) CancelDTagTransferRequest(ctx context.Context, req *MsgCancelDTagTransferRequest) (*MsgCancelDTagTransferRequestResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CancelDTagTransferRequest not implemented") + +func (m *MsgDeleteProfile) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n } -func (*UnimplementedMsgServer) AcceptDTagTransferRequest(ctx context.Context, req *MsgAcceptDTagTransferRequest) (*MsgAcceptDTagTransferRequestResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method AcceptDTagTransferRequest not implemented") + +func (m *MsgDeleteProfileResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n } -func (*UnimplementedMsgServer) RefuseDTagTransferRequest(ctx context.Context, req *MsgRefuseDTagTransferRequest) (*MsgRefuseDTagTransferRequestResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method RefuseDTagTransferRequest not implemented") + +func (m *MsgRequestDTagTransfer) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n } -func (*UnimplementedMsgServer) LinkChainAccount(ctx context.Context, req *MsgLinkChainAccount) (*MsgLinkChainAccountResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method LinkChainAccount not implemented") + +func (m *MsgRequestDTagTransferResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n } -func (*UnimplementedMsgServer) UnlinkChainAccount(ctx context.Context, req *MsgUnlinkChainAccount) (*MsgUnlinkChainAccountResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method UnlinkChainAccount not implemented") + +func (m *MsgCancelDTagTransferRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n } -func (*UnimplementedMsgServer) SetDefaultExternalAddress(ctx context.Context, req *MsgSetDefaultExternalAddress) (*MsgSetDefaultExternalAddressResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method SetDefaultExternalAddress not implemented") + +func (m *MsgCancelDTagTransferRequestResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n } -func (*UnimplementedMsgServer) LinkApplication(ctx context.Context, req *MsgLinkApplication) (*MsgLinkApplicationResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method LinkApplication not implemented") + +func (m *MsgAcceptDTagTransferRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.NewDTag) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n } -func (*UnimplementedMsgServer) UnlinkApplication(ctx context.Context, req *MsgUnlinkApplication) (*MsgUnlinkApplicationResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method UnlinkApplication not implemented") + +func (m *MsgAcceptDTagTransferRequestResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n } -func (*UnimplementedMsgServer) UpdateParams(ctx context.Context, req *MsgUpdateParams) (*MsgUpdateParamsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateParams not implemented") + +func (m *MsgRefuseDTagTransferRequest) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.Receiver) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n } -func RegisterMsgServer(s grpc1.Server, srv MsgServer) { - s.RegisterService(&_Msg_serviceDesc, srv) +func (m *MsgRefuseDTagTransferRequestResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n } -func _Msg_SaveProfile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgSaveProfile) - if err := dec(in); err != nil { - return nil, err +func (m *MsgLinkChainAccount) Size() (n int) { + if m == nil { + return 0 } - if interceptor == nil { - return srv.(MsgServer).SaveProfile(ctx, in) + var l int + _ = l + if m.ChainAddress != nil { + l = m.ChainAddress.Size() + n += 1 + l + sovMsgServer(uint64(l)) } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/SaveProfile", + l = m.Proof.Size() + n += 1 + l + sovMsgServer(uint64(l)) + l = m.ChainConfig.Size() + n += 1 + l + sovMsgServer(uint64(l)) + l = len(m.Signer) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n +} + +func (m *MsgLinkChainAccountResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgUnlinkChainAccount) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Owner) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.ChainName) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.Target) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n +} + +func (m *MsgUnlinkChainAccountResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgSetDefaultExternalAddress) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ChainName) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).SaveProfile(ctx, req.(*MsgSaveProfile)) + l = len(m.Target) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) } - return interceptor(ctx, in, info, handler) + l = len(m.Signer) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n } -func _Msg_DeleteProfile_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgDeleteProfile) - if err := dec(in); err != nil { - return nil, err +func (m *MsgSetDefaultExternalAddressResponse) Size() (n int) { + if m == nil { + return 0 } - if interceptor == nil { - return srv.(MsgServer).DeleteProfile(ctx, in) + var l int + _ = l + return n +} + +func (m *MsgLinkApplication) Size() (n int) { + if m == nil { + return 0 } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/DeleteProfile", + var l int + _ = l + l = len(m.Sender) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).DeleteProfile(ctx, req.(*MsgDeleteProfile)) + l = m.LinkData.Size() + n += 1 + l + sovMsgServer(uint64(l)) + l = len(m.CallData) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) } - return interceptor(ctx, in, info, handler) + l = len(m.SourcePort) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = len(m.SourceChannel) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + l = m.TimeoutHeight.Size() + n += 1 + l + sovMsgServer(uint64(l)) + if m.TimeoutTimestamp != 0 { + n += 1 + sovMsgServer(uint64(m.TimeoutTimestamp)) + } + return n } -func _Msg_RequestDTagTransfer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgRequestDTagTransfer) - if err := dec(in); err != nil { - return nil, err +func (m *MsgLinkApplicationResponse) Size() (n int) { + if m == nil { + return 0 } - if interceptor == nil { - return srv.(MsgServer).RequestDTagTransfer(ctx, in) + var l int + _ = l + return n +} + +func (m *MsgUnlinkApplication) Size() (n int) { + if m == nil { + return 0 } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/RequestDTagTransfer", + var l int + _ = l + l = len(m.Application) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).RequestDTagTransfer(ctx, req.(*MsgRequestDTagTransfer)) + l = len(m.Username) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) } - return interceptor(ctx, in, info, handler) + l = len(m.Signer) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) + } + return n } -func _Msg_CancelDTagTransferRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgCancelDTagTransferRequest) - if err := dec(in); err != nil { - return nil, err +func (m *MsgUnlinkApplicationResponse) Size() (n int) { + if m == nil { + return 0 } - if interceptor == nil { - return srv.(MsgServer).CancelDTagTransferRequest(ctx, in) + var l int + _ = l + return n +} + +func (m *MsgUpdateParams) Size() (n int) { + if m == nil { + return 0 } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/CancelDTagTransferRequest", + var l int + _ = l + l = len(m.Authority) + if l > 0 { + n += 1 + l + sovMsgServer(uint64(l)) } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).CancelDTagTransferRequest(ctx, req.(*MsgCancelDTagTransferRequest)) + l = m.Params.Size() + n += 1 + l + sovMsgServer(uint64(l)) + return n +} + +func (m *MsgUpdateParamsResponse) Size() (n int) { + if m == nil { + return 0 } - return interceptor(ctx, in, info, handler) + var l int + _ = l + return n } -func _Msg_AcceptDTagTransferRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgAcceptDTagTransferRequest) - if err := dec(in); err != nil { - return nil, err +func sovMsgServer(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozMsgServer(x uint64) (n int) { + return sovMsgServer(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *MsgSaveProfile) 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 ErrIntOverflowMsgServer + } + 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: MsgSaveProfile: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgSaveProfile: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DTag", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DTag = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Nickname", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Nickname = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Bio", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Bio = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ProfilePicture", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ProfilePicture = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CoverPicture", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CoverPicture = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Creator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - if interceptor == nil { - return srv.(MsgServer).AcceptDTagTransferRequest(ctx, in) + + if iNdEx > l { + return io.ErrUnexpectedEOF } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/AcceptDTagTransferRequest", + return nil +} +func (m *MsgSaveProfileResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgSaveProfileResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgSaveProfileResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).AcceptDTagTransferRequest(ctx, req.(*MsgAcceptDTagTransferRequest)) + + if iNdEx > l { + return io.ErrUnexpectedEOF } - return interceptor(ctx, in, info, handler) + return nil } +func (m *MsgDeleteProfile) 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 ErrIntOverflowMsgServer + } + 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: MsgDeleteProfile: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgDeleteProfile: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Creator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } -func _Msg_RefuseDTagTransferRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgRefuseDTagTransferRequest) - if err := dec(in); err != nil { - return nil, err + if iNdEx > l { + return io.ErrUnexpectedEOF } - if interceptor == nil { - return srv.(MsgServer).RefuseDTagTransferRequest(ctx, in) + return nil +} +func (m *MsgDeleteProfileResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgDeleteProfileResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgDeleteProfileResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/RefuseDTagTransferRequest", + + if iNdEx > l { + return io.ErrUnexpectedEOF } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).RefuseDTagTransferRequest(ctx, req.(*MsgRefuseDTagTransferRequest)) + return nil +} +func (m *MsgRequestDTagTransfer) 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 ErrIntOverflowMsgServer + } + 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: MsgRequestDTagTransfer: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgRequestDTagTransfer: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Receiver = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - return interceptor(ctx, in, info, handler) + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil } +func (m *MsgRequestDTagTransferResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgRequestDTagTransferResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgRequestDTagTransferResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } -func _Msg_LinkChainAccount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgLinkChainAccount) - if err := dec(in); err != nil { - return nil, err + if iNdEx > l { + return io.ErrUnexpectedEOF } - if interceptor == nil { - return srv.(MsgServer).LinkChainAccount(ctx, in) + return nil +} +func (m *MsgCancelDTagTransferRequest) 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 ErrIntOverflowMsgServer + } + 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: MsgCancelDTagTransferRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgCancelDTagTransferRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Receiver = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/LinkChainAccount", + + if iNdEx > l { + return io.ErrUnexpectedEOF } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).LinkChainAccount(ctx, req.(*MsgLinkChainAccount)) + return nil +} +func (m *MsgCancelDTagTransferRequestResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgCancelDTagTransferRequestResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgCancelDTagTransferRequestResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - return interceptor(ctx, in, info, handler) + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil } +func (m *MsgAcceptDTagTransferRequest) 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 ErrIntOverflowMsgServer + } + 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: MsgAcceptDTagTransferRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgAcceptDTagTransferRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NewDTag", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NewDTag = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Receiver = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } -func _Msg_UnlinkChainAccount_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUnlinkChainAccount) - if err := dec(in); err != nil { - return nil, err + if iNdEx > l { + return io.ErrUnexpectedEOF } - if interceptor == nil { - return srv.(MsgServer).UnlinkChainAccount(ctx, in) + return nil +} +func (m *MsgAcceptDTagTransferRequestResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgAcceptDTagTransferRequestResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgAcceptDTagTransferRequestResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/UnlinkChainAccount", + + if iNdEx > l { + return io.ErrUnexpectedEOF } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UnlinkChainAccount(ctx, req.(*MsgUnlinkChainAccount)) + return nil +} +func (m *MsgRefuseDTagTransferRequest) 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 ErrIntOverflowMsgServer + } + 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: MsgRefuseDTagTransferRequest: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgRefuseDTagTransferRequest: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Receiver = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - return interceptor(ctx, in, info, handler) + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil } +func (m *MsgRefuseDTagTransferRequestResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgRefuseDTagTransferRequestResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgRefuseDTagTransferRequestResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } -func _Msg_SetDefaultExternalAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgSetDefaultExternalAddress) - if err := dec(in); err != nil { - return nil, err + if iNdEx > l { + return io.ErrUnexpectedEOF } - if interceptor == nil { - return srv.(MsgServer).SetDefaultExternalAddress(ctx, in) + return nil +} +func (m *MsgLinkChainAccount) 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 ErrIntOverflowMsgServer + } + 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: MsgLinkChainAccount: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgLinkChainAccount: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainAddress", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthMsgServer + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ChainAddress == nil { + m.ChainAddress = &types.Any{} + } + if err := m.ChainAddress.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Proof", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthMsgServer + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Proof.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainConfig", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthMsgServer + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.ChainConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Signer = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/SetDefaultExternalAddress", + + if iNdEx > l { + return io.ErrUnexpectedEOF } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).SetDefaultExternalAddress(ctx, req.(*MsgSetDefaultExternalAddress)) + return nil +} +func (m *MsgLinkChainAccountResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgLinkChainAccountResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgLinkChainAccountResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - return interceptor(ctx, in, info, handler) + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil } +func (m *MsgUnlinkChainAccount) 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 ErrIntOverflowMsgServer + } + 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: MsgUnlinkChainAccount: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUnlinkChainAccount: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Owner = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainName", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Target", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Target = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } -func _Msg_LinkApplication_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgLinkApplication) - if err := dec(in); err != nil { - return nil, err + if iNdEx > l { + return io.ErrUnexpectedEOF } - if interceptor == nil { - return srv.(MsgServer).LinkApplication(ctx, in) + return nil +} +func (m *MsgUnlinkChainAccountResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgUnlinkChainAccountResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUnlinkChainAccountResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/LinkApplication", + + if iNdEx > l { + return io.ErrUnexpectedEOF } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).LinkApplication(ctx, req.(*MsgLinkApplication)) + return nil +} +func (m *MsgSetDefaultExternalAddress) 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 ErrIntOverflowMsgServer + } + 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: MsgSetDefaultExternalAddress: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgSetDefaultExternalAddress: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ChainName", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ChainName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Target", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Target = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Signer = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - return interceptor(ctx, in, info, handler) + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil } +func (m *MsgSetDefaultExternalAddressResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgSetDefaultExternalAddressResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgSetDefaultExternalAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } -func _Msg_UnlinkApplication_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUnlinkApplication) - if err := dec(in); err != nil { - return nil, err + if iNdEx > l { + return io.ErrUnexpectedEOF } - if interceptor == nil { - return srv.(MsgServer).UnlinkApplication(ctx, in) + return nil +} +func (m *MsgLinkApplication) 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 ErrIntOverflowMsgServer + } + 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: MsgLinkApplication: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgLinkApplication: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Sender = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LinkData", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthMsgServer + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.LinkData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CallData", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.CallData = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SourcePort", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SourcePort = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SourceChannel", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SourceChannel = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TimeoutHeight", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthMsgServer + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.TimeoutHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TimeoutTimestamp", wireType) + } + m.TimeoutTimestamp = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TimeoutTimestamp |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/UnlinkApplication", + + if iNdEx > l { + return io.ErrUnexpectedEOF } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UnlinkApplication(ctx, req.(*MsgUnlinkApplication)) + return nil +} +func (m *MsgLinkApplicationResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgLinkApplicationResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgLinkApplicationResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - return interceptor(ctx, in, info, handler) + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil } +func (m *MsgUnlinkApplication) 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 ErrIntOverflowMsgServer + } + 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: MsgUnlinkApplication: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUnlinkApplication: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Application", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Application = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Username", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Username = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Signer = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } -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 iNdEx > l { + return io.ErrUnexpectedEOF } - if interceptor == nil { - return srv.(MsgServer).UpdateParams(ctx, in) + return nil +} +func (m *MsgUnlinkApplicationResponse) 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 ErrIntOverflowMsgServer + } + 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: MsgUnlinkApplicationResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUnlinkApplicationResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/desmos.profiles.v3.Msg/UpdateParams", + + if iNdEx > l { + return io.ErrUnexpectedEOF } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateParams(ctx, req.(*MsgUpdateParams)) + return nil +} +func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMsgServer + } + 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 ErrIntOverflowMsgServer + } + 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 ErrInvalidLengthMsgServer + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + 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 ErrIntOverflowMsgServer + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthMsgServer + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthMsgServer + } + 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 := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } } - return interceptor(ctx, in, info, handler) + + 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 ErrIntOverflowMsgServer + } + 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 := skipMsgServer(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthMsgServer + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } -var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "desmos.profiles.v3.Msg", - HandlerType: (*MsgServer)(nil), - Methods: []grpc.MethodDesc{ - { - MethodName: "SaveProfile", - Handler: _Msg_SaveProfile_Handler, - }, - { - MethodName: "DeleteProfile", - Handler: _Msg_DeleteProfile_Handler, - }, - { - MethodName: "RequestDTagTransfer", - Handler: _Msg_RequestDTagTransfer_Handler, - }, - { - MethodName: "CancelDTagTransferRequest", - Handler: _Msg_CancelDTagTransferRequest_Handler, - }, - { - MethodName: "AcceptDTagTransferRequest", - Handler: _Msg_AcceptDTagTransferRequest_Handler, - }, - { - MethodName: "RefuseDTagTransferRequest", - Handler: _Msg_RefuseDTagTransferRequest_Handler, - }, - { - MethodName: "LinkChainAccount", - Handler: _Msg_LinkChainAccount_Handler, - }, - { - MethodName: "UnlinkChainAccount", - Handler: _Msg_UnlinkChainAccount_Handler, - }, - { - MethodName: "SetDefaultExternalAddress", - Handler: _Msg_SetDefaultExternalAddress_Handler, - }, - { - MethodName: "LinkApplication", - Handler: _Msg_LinkApplication_Handler, - }, - { - MethodName: "UnlinkApplication", - Handler: _Msg_UnlinkApplication_Handler, - }, - { - MethodName: "UpdateParams", - Handler: _Msg_UpdateParams_Handler, - }, - }, - Streams: []grpc.StreamDesc{}, - Metadata: "desmos/profiles/v3/msg_server.proto", + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil } +func skipMsgServer(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, ErrIntOverflowMsgServer + } + 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, ErrIntOverflowMsgServer + } + 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, ErrIntOverflowMsgServer + } + 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, ErrInvalidLengthMsgServer + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupMsgServer + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthMsgServer + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthMsgServer = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowMsgServer = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupMsgServer = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/profiles/types/msgs_app_links.go b/x/profiles/types/msgs_app_links.go index e6a585be2a..dfd0312c65 100644 --- a/x/profiles/types/msgs_app_links.go +++ b/x/profiles/types/msgs_app_links.go @@ -7,8 +7,8 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - host "github.com/cosmos/ibc-go/v7/modules/core/24-host" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" + host "github.com/cosmos/ibc-go/v8/modules/core/24-host" ) // NewMsgLinkApplication creates a new MsgLinkApplication instance @@ -69,11 +69,6 @@ func (msg *MsgLinkApplication) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg. -func (msg *MsgLinkApplication) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgLinkApplication) GetSigners() []sdk.AccAddress { valAddr, err := sdk.AccAddressFromBech32(msg.Sender) @@ -126,11 +121,6 @@ func (msg *MsgUnlinkApplication) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg. -func (msg *MsgUnlinkApplication) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgUnlinkApplication) GetSigners() []sdk.AccAddress { valAddr, err := sdk.AccAddressFromBech32(msg.Signer) diff --git a/x/profiles/types/msgs_app_links.pb.go b/x/profiles/types/msgs_app_links.pb.go deleted file mode 100644 index 14f8e5e43c..0000000000 --- a/x/profiles/types/msgs_app_links.pb.go +++ /dev/null @@ -1,1177 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: desmos/profiles/v3/msgs_app_links.proto - -package types - -import ( - fmt "fmt" - _ "github.com/cosmos/cosmos-proto" - _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/cosmos-sdk/types/tx/amino" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - types "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// MsgLinkApplication defines a msg to connect a profile with a -// centralized application account (eg. Twitter, GitHub, etc). -type MsgLinkApplication struct { - // The sender of the connection request - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` - // LinkData contains the data related to the application to which connect - LinkData Data `protobuf:"bytes,2,opt,name=link_data,json=linkData,proto3" json:"link_data" yaml:"link_data"` - // Hex encoded call data that will be sent to the data source in order to - // verify the link - CallData string `protobuf:"bytes,3,opt,name=call_data,json=callData,proto3" json:"call_data,omitempty" yaml:"call_data"` - // The port on which the packet will be sent - SourcePort string `protobuf:"bytes,4,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty" yaml:"source_port"` - // The channel by which the packet will be sent - SourceChannel string `protobuf:"bytes,5,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty" yaml:"source_channel"` - // Timeout height relative to the current block height. - // The timeout is disabled when set to 0. - TimeoutHeight types.Height `protobuf:"bytes,6,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height" yaml:"timeout_height"` - // Timeout timestamp (in nanoseconds) relative to the current block timestamp. - // The timeout is disabled when set to 0. - TimeoutTimestamp uint64 `protobuf:"varint,7,opt,name=timeout_timestamp,json=timeoutTimestamp,proto3" json:"timeout_timestamp,omitempty" yaml:"timeout_timestamp"` -} - -func (m *MsgLinkApplication) Reset() { *m = MsgLinkApplication{} } -func (m *MsgLinkApplication) String() string { return proto.CompactTextString(m) } -func (*MsgLinkApplication) ProtoMessage() {} -func (*MsgLinkApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_29dfbdba444598ee, []int{0} -} -func (m *MsgLinkApplication) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgLinkApplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgLinkApplication.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 *MsgLinkApplication) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgLinkApplication.Merge(m, src) -} -func (m *MsgLinkApplication) XXX_Size() int { - return m.Size() -} -func (m *MsgLinkApplication) XXX_DiscardUnknown() { - xxx_messageInfo_MsgLinkApplication.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgLinkApplication proto.InternalMessageInfo - -func (m *MsgLinkApplication) GetSender() string { - if m != nil { - return m.Sender - } - return "" -} - -func (m *MsgLinkApplication) GetLinkData() Data { - if m != nil { - return m.LinkData - } - return Data{} -} - -func (m *MsgLinkApplication) GetCallData() string { - if m != nil { - return m.CallData - } - return "" -} - -func (m *MsgLinkApplication) GetSourcePort() string { - if m != nil { - return m.SourcePort - } - return "" -} - -func (m *MsgLinkApplication) GetSourceChannel() string { - if m != nil { - return m.SourceChannel - } - return "" -} - -func (m *MsgLinkApplication) GetTimeoutHeight() types.Height { - if m != nil { - return m.TimeoutHeight - } - return types.Height{} -} - -func (m *MsgLinkApplication) GetTimeoutTimestamp() uint64 { - if m != nil { - return m.TimeoutTimestamp - } - return 0 -} - -// MsgLinkApplicationResponse defines the Msg/LinkApplication -// response type. -type MsgLinkApplicationResponse struct { -} - -func (m *MsgLinkApplicationResponse) Reset() { *m = MsgLinkApplicationResponse{} } -func (m *MsgLinkApplicationResponse) String() string { return proto.CompactTextString(m) } -func (*MsgLinkApplicationResponse) ProtoMessage() {} -func (*MsgLinkApplicationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_29dfbdba444598ee, []int{1} -} -func (m *MsgLinkApplicationResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgLinkApplicationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgLinkApplicationResponse.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 *MsgLinkApplicationResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgLinkApplicationResponse.Merge(m, src) -} -func (m *MsgLinkApplicationResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgLinkApplicationResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgLinkApplicationResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgLinkApplicationResponse proto.InternalMessageInfo - -// MsgUnlinkApplication defines a msg to delete an application link from a user -// profile -type MsgUnlinkApplication struct { - // Application represents the name of the application to unlink - Application string `protobuf:"bytes,1,opt,name=application,proto3" json:"application,omitempty" yaml:"application"` - // Username represents the username inside the application to unlink - Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty" yaml:"username"` - // Signer represents the Desmos account to which the application should be - // unlinked - Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty" yaml:"signer"` -} - -func (m *MsgUnlinkApplication) Reset() { *m = MsgUnlinkApplication{} } -func (m *MsgUnlinkApplication) String() string { return proto.CompactTextString(m) } -func (*MsgUnlinkApplication) ProtoMessage() {} -func (*MsgUnlinkApplication) Descriptor() ([]byte, []int) { - return fileDescriptor_29dfbdba444598ee, []int{2} -} -func (m *MsgUnlinkApplication) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUnlinkApplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUnlinkApplication.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 *MsgUnlinkApplication) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUnlinkApplication.Merge(m, src) -} -func (m *MsgUnlinkApplication) XXX_Size() int { - return m.Size() -} -func (m *MsgUnlinkApplication) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUnlinkApplication.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUnlinkApplication proto.InternalMessageInfo - -func (m *MsgUnlinkApplication) GetApplication() string { - if m != nil { - return m.Application - } - return "" -} - -func (m *MsgUnlinkApplication) GetUsername() string { - if m != nil { - return m.Username - } - return "" -} - -func (m *MsgUnlinkApplication) GetSigner() string { - if m != nil { - return m.Signer - } - return "" -} - -// MsgUnlinkApplicationResponse defines the Msg/UnlinkApplication response -// type. -type MsgUnlinkApplicationResponse struct { -} - -func (m *MsgUnlinkApplicationResponse) Reset() { *m = MsgUnlinkApplicationResponse{} } -func (m *MsgUnlinkApplicationResponse) String() string { return proto.CompactTextString(m) } -func (*MsgUnlinkApplicationResponse) ProtoMessage() {} -func (*MsgUnlinkApplicationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_29dfbdba444598ee, []int{3} -} -func (m *MsgUnlinkApplicationResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUnlinkApplicationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUnlinkApplicationResponse.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 *MsgUnlinkApplicationResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUnlinkApplicationResponse.Merge(m, src) -} -func (m *MsgUnlinkApplicationResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgUnlinkApplicationResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUnlinkApplicationResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUnlinkApplicationResponse proto.InternalMessageInfo - -func init() { - proto.RegisterType((*MsgLinkApplication)(nil), "desmos.profiles.v3.MsgLinkApplication") - proto.RegisterType((*MsgLinkApplicationResponse)(nil), "desmos.profiles.v3.MsgLinkApplicationResponse") - proto.RegisterType((*MsgUnlinkApplication)(nil), "desmos.profiles.v3.MsgUnlinkApplication") - proto.RegisterType((*MsgUnlinkApplicationResponse)(nil), "desmos.profiles.v3.MsgUnlinkApplicationResponse") -} - -func init() { - proto.RegisterFile("desmos/profiles/v3/msgs_app_links.proto", fileDescriptor_29dfbdba444598ee) -} - -var fileDescriptor_29dfbdba444598ee = []byte{ - // 633 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0x3d, 0x6f, 0x13, 0x3f, - 0x18, 0xcf, 0xfd, 0xff, 0xa5, 0x34, 0xae, 0x5a, 0xda, 0x23, 0xc0, 0x35, 0x94, 0xbb, 0xca, 0x0b, - 0x6d, 0x51, 0xcf, 0x0a, 0x15, 0x02, 0x75, 0xa2, 0x81, 0x01, 0x04, 0x95, 0xd0, 0x51, 0x16, 0x96, - 0xc8, 0xb9, 0x33, 0x17, 0xab, 0x77, 0xf6, 0xe9, 0xec, 0x44, 0x74, 0x65, 0x64, 0xe2, 0x63, 0x30, - 0x76, 0x60, 0xe0, 0x23, 0x74, 0xac, 0x98, 0x98, 0x4e, 0xa8, 0x1d, 0x3a, 0x73, 0x9f, 0x00, 0x9d, - 0xed, 0xbc, 0x91, 0x8a, 0x25, 0x7e, 0x9e, 0xdf, 0x8b, 0x1d, 0x3f, 0xfe, 0x25, 0xe0, 0x7e, 0x44, - 0x44, 0xca, 0x05, 0xca, 0x72, 0xfe, 0x81, 0x26, 0x44, 0xa0, 0xc1, 0x2e, 0x4a, 0x45, 0x2c, 0x3a, - 0x38, 0xcb, 0x3a, 0x09, 0x65, 0x47, 0xc2, 0xcf, 0x72, 0x2e, 0xb9, 0x6d, 0x6b, 0xa1, 0x3f, 0x14, - 0xfa, 0x83, 0xdd, 0xe6, 0xd6, 0x55, 0x66, 0x1e, 0x91, 0x64, 0xc6, 0xde, 0x5c, 0xc5, 0x29, 0x65, - 0x1c, 0xa9, 0x4f, 0x03, 0x35, 0x62, 0x1e, 0x73, 0x55, 0xa2, 0xaa, 0x32, 0xe8, 0x9d, 0x90, 0xab, - 0x3d, 0x53, 0x11, 0xa3, 0x41, 0xab, 0x5a, 0x0c, 0xb1, 0xa6, 0x89, 0x8e, 0x76, 0xe8, 0xc6, 0x50, - 0x1e, 0xed, 0x86, 0x28, 0xe4, 0x39, 0x41, 0x61, 0x42, 0x09, 0x93, 0x95, 0x51, 0x57, 0x5a, 0x00, - 0xbf, 0xcf, 0x01, 0xfb, 0x40, 0xc4, 0xaf, 0x29, 0x3b, 0xda, 0xcf, 0xb2, 0x84, 0x86, 0x58, 0x52, - 0xce, 0xec, 0x7d, 0x30, 0x2f, 0x08, 0x8b, 0x48, 0xee, 0x58, 0x1b, 0xd6, 0x66, 0xbd, 0xbd, 0x55, - 0x16, 0xde, 0xd2, 0x31, 0x4e, 0x93, 0x3d, 0xa8, 0x71, 0xf8, 0xe3, 0xdb, 0x4e, 0xc3, 0x1c, 0xb5, - 0x1f, 0x45, 0x39, 0x11, 0xe2, 0xad, 0xcc, 0x29, 0x8b, 0x03, 0x63, 0xb4, 0x0f, 0x41, 0xbd, 0xba, - 0x66, 0x27, 0xc2, 0x12, 0x3b, 0xff, 0x6d, 0x58, 0x9b, 0x8b, 0x0f, 0x1d, 0x7f, 0x76, 0x54, 0xfe, - 0x73, 0x2c, 0x71, 0xfb, 0xde, 0x69, 0xe1, 0xd5, 0xca, 0xc2, 0x5b, 0xd1, 0x67, 0x8c, 0x8c, 0xf0, - 0xeb, 0xe5, 0xc9, 0xb6, 0x15, 0x2c, 0x54, 0x40, 0x25, 0xb4, 0x5b, 0xa0, 0x1e, 0xe2, 0x24, 0xd1, - 0xbb, 0xfe, 0xaf, 0xbe, 0x5b, 0x63, 0xec, 0x1b, 0x51, 0x30, 0x58, 0xa8, 0x6a, 0x65, 0x79, 0x0c, - 0x16, 0x05, 0xef, 0xe7, 0x21, 0xe9, 0x64, 0x3c, 0x97, 0xce, 0x9c, 0x32, 0xdd, 0x2e, 0x0b, 0xcf, - 0x36, 0x17, 0x1a, 0x93, 0x30, 0x00, 0xba, 0x7b, 0xc3, 0x73, 0x69, 0x3f, 0x05, 0xcb, 0x86, 0x0b, - 0x7b, 0x98, 0x31, 0x92, 0x38, 0xd7, 0x94, 0x77, 0xad, 0x2c, 0xbc, 0x5b, 0x53, 0x5e, 0xc3, 0xc3, - 0x60, 0x49, 0x03, 0xcf, 0x74, 0x6f, 0x13, 0xb0, 0x2c, 0x69, 0x4a, 0x78, 0x5f, 0x76, 0x7a, 0x84, - 0xc6, 0x3d, 0xe9, 0xcc, 0xab, 0x41, 0x34, 0x7d, 0xda, 0x0d, 0xfd, 0xea, 0x5d, 0x7c, 0xf3, 0x1a, - 0x83, 0x96, 0xff, 0x42, 0x29, 0xda, 0xd0, 0x8c, 0xc2, 0x9c, 0x30, 0xed, 0x37, 0xf3, 0x58, 0x32, - 0xa8, 0xb6, 0xd8, 0x2f, 0xc1, 0xea, 0x50, 0x56, 0xad, 0x42, 0xe2, 0x34, 0x73, 0xae, 0x6f, 0x58, - 0x9b, 0x73, 0xed, 0xf5, 0xb2, 0xf0, 0x9c, 0xe9, 0x9d, 0x46, 0x12, 0x18, 0xac, 0x18, 0xec, 0x70, - 0x08, 0xed, 0x6d, 0x7d, 0xba, 0x3c, 0xd9, 0x36, 0x4f, 0xf8, 0xf9, 0xf2, 0x64, 0x7b, 0xcd, 0x04, - 0x79, 0x36, 0x23, 0x70, 0x1d, 0x34, 0x67, 0xd1, 0x80, 0x88, 0x8c, 0x33, 0x41, 0xe0, 0x6f, 0x0b, - 0x34, 0x0e, 0x44, 0xfc, 0x8e, 0x25, 0x7f, 0x45, 0xeb, 0x09, 0x58, 0xc4, 0xe3, 0xd6, 0xe4, 0x6b, - 0xe2, 0x39, 0x26, 0x48, 0x18, 0x4c, 0x4a, 0x6d, 0x04, 0x16, 0xfa, 0x82, 0xe4, 0x0c, 0xa7, 0x44, - 0x05, 0xaa, 0xde, 0xbe, 0x59, 0x16, 0xde, 0x0d, 0x6d, 0x1b, 0x32, 0x30, 0x18, 0x89, 0x54, 0x8a, - 0x69, 0xcc, 0x48, 0x6e, 0x92, 0x32, 0x99, 0x62, 0x85, 0xff, 0x2b, 0xc5, 0x4a, 0xb0, 0xf7, 0x40, - 0xcf, 0x43, 0x35, 0xd5, 0x3c, 0xee, 0x8e, 0xe7, 0x31, 0x73, 0x35, 0xe8, 0x82, 0xf5, 0xab, 0xf0, - 0xe1, 0x4c, 0xda, 0xaf, 0x4e, 0xcf, 0x5d, 0xeb, 0xec, 0xdc, 0xb5, 0x7e, 0x9d, 0xbb, 0xd6, 0x97, - 0x0b, 0xb7, 0x76, 0x76, 0xe1, 0xd6, 0x7e, 0x5e, 0xb8, 0xb5, 0xf7, 0xad, 0x98, 0xca, 0x5e, 0xbf, - 0xeb, 0x87, 0x3c, 0x45, 0xfa, 0x84, 0x9d, 0x04, 0x77, 0x85, 0xa9, 0xd1, 0xe0, 0x11, 0xfa, 0x38, - 0xfe, 0x2f, 0x91, 0xc7, 0x19, 0x11, 0xdd, 0x79, 0xf5, 0x03, 0xde, 0xfd, 0x13, 0x00, 0x00, 0xff, - 0xff, 0xd6, 0x3c, 0x43, 0xd3, 0xa8, 0x04, 0x00, 0x00, -} - -func (m *MsgLinkApplication) 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 *MsgLinkApplication) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgLinkApplication) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.TimeoutTimestamp != 0 { - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(m.TimeoutTimestamp)) - i-- - dAtA[i] = 0x38 - } - { - size, err := m.TimeoutHeight.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x32 - if len(m.SourceChannel) > 0 { - i -= len(m.SourceChannel) - copy(dAtA[i:], m.SourceChannel) - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(len(m.SourceChannel))) - i-- - dAtA[i] = 0x2a - } - if len(m.SourcePort) > 0 { - i -= len(m.SourcePort) - copy(dAtA[i:], m.SourcePort) - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(len(m.SourcePort))) - i-- - dAtA[i] = 0x22 - } - if len(m.CallData) > 0 { - i -= len(m.CallData) - copy(dAtA[i:], m.CallData) - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(len(m.CallData))) - i-- - dAtA[i] = 0x1a - } - { - size, err := m.LinkData.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgLinkApplicationResponse) 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 *MsgLinkApplicationResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgLinkApplicationResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *MsgUnlinkApplication) 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 *MsgUnlinkApplication) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgUnlinkApplication) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Signer) > 0 { - i -= len(m.Signer) - copy(dAtA[i:], m.Signer) - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(len(m.Signer))) - i-- - dAtA[i] = 0x1a - } - if len(m.Username) > 0 { - i -= len(m.Username) - copy(dAtA[i:], m.Username) - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(len(m.Username))) - i-- - dAtA[i] = 0x12 - } - if len(m.Application) > 0 { - i -= len(m.Application) - copy(dAtA[i:], m.Application) - i = encodeVarintMsgsAppLinks(dAtA, i, uint64(len(m.Application))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgUnlinkApplicationResponse) 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 *MsgUnlinkApplicationResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgUnlinkApplicationResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func encodeVarintMsgsAppLinks(dAtA []byte, offset int, v uint64) int { - offset -= sovMsgsAppLinks(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *MsgLinkApplication) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovMsgsAppLinks(uint64(l)) - } - l = m.LinkData.Size() - n += 1 + l + sovMsgsAppLinks(uint64(l)) - l = len(m.CallData) - if l > 0 { - n += 1 + l + sovMsgsAppLinks(uint64(l)) - } - l = len(m.SourcePort) - if l > 0 { - n += 1 + l + sovMsgsAppLinks(uint64(l)) - } - l = len(m.SourceChannel) - if l > 0 { - n += 1 + l + sovMsgsAppLinks(uint64(l)) - } - l = m.TimeoutHeight.Size() - n += 1 + l + sovMsgsAppLinks(uint64(l)) - if m.TimeoutTimestamp != 0 { - n += 1 + sovMsgsAppLinks(uint64(m.TimeoutTimestamp)) - } - return n -} - -func (m *MsgLinkApplicationResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *MsgUnlinkApplication) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Application) - if l > 0 { - n += 1 + l + sovMsgsAppLinks(uint64(l)) - } - l = len(m.Username) - if l > 0 { - n += 1 + l + sovMsgsAppLinks(uint64(l)) - } - l = len(m.Signer) - if l > 0 { - n += 1 + l + sovMsgsAppLinks(uint64(l)) - } - return n -} - -func (m *MsgUnlinkApplicationResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func sovMsgsAppLinks(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozMsgsAppLinks(x uint64) (n int) { - return sovMsgsAppLinks(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *MsgLinkApplication) 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 ErrIntOverflowMsgsAppLinks - } - 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: MsgLinkApplication: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgLinkApplication: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - 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 ErrInvalidLengthMsgsAppLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field LinkData", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthMsgsAppLinks - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.LinkData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CallData", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - 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 ErrInvalidLengthMsgsAppLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CallData = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SourcePort", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - 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 ErrInvalidLengthMsgsAppLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SourcePort = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SourceChannel", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - 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 ErrInvalidLengthMsgsAppLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SourceChannel = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutHeight", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthMsgsAppLinks - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.TimeoutHeight.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 7: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field TimeoutTimestamp", wireType) - } - m.TimeoutTimestamp = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.TimeoutTimestamp |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipMsgsAppLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgLinkApplicationResponse) 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 ErrIntOverflowMsgsAppLinks - } - 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: MsgLinkApplicationResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgLinkApplicationResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsAppLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgUnlinkApplication) 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 ErrIntOverflowMsgsAppLinks - } - 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: MsgUnlinkApplication: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUnlinkApplication: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Application", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - 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 ErrInvalidLengthMsgsAppLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Application = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Username", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - 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 ErrInvalidLengthMsgsAppLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Username = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsAppLinks - } - 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 ErrInvalidLengthMsgsAppLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Signer = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsAppLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgUnlinkApplicationResponse) 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 ErrIntOverflowMsgsAppLinks - } - 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: MsgUnlinkApplicationResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUnlinkApplicationResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsAppLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsAppLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipMsgsAppLinks(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, ErrIntOverflowMsgsAppLinks - } - 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, ErrIntOverflowMsgsAppLinks - } - 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, ErrIntOverflowMsgsAppLinks - } - 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, ErrInvalidLengthMsgsAppLinks - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupMsgsAppLinks - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthMsgsAppLinks - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthMsgsAppLinks = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMsgsAppLinks = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupMsgsAppLinks = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/profiles/types/msgs_app_links_test.go b/x/profiles/types/msgs_app_links_test.go index 89bfb7f432..8ede6e94a6 100644 --- a/x/profiles/types/msgs_app_links_test.go +++ b/x/profiles/types/msgs_app_links_test.go @@ -4,7 +4,7 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/x/profiles/types" @@ -133,11 +133,6 @@ func TestMsgLinkApplication_ValidateBasic(t *testing.T) { } } -func TestMsgLinkApplication_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgLinkApplication","value":{"call_data":"7B22757365726E616D65223A22526963636172646F4D222C22676973745F6964223A223732306530303732333930613930316262383065353966643630643766646564227D","link_data":{"application":"twitter","username":"twitteruser"},"sender":"cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773","source_channel":"channel-0","source_port":"ibc-profiles","timeout_height":{"revision_height":"1000"}}}` - require.Equal(t, expected, string(msgLinkApplication.GetSignBytes())) -} - func TestMsgLinkApplication_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgLinkApplication.Sender) require.Equal(t, []sdk.AccAddress{addr}, msgLinkApplication.GetSigners()) @@ -213,11 +208,6 @@ func TestMsgUnlinkApplication_ValidateBasic(t *testing.T) { } } -func TestMsgUnlinkApplication_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgUnlinkApplication","value":{"application":"twitter","signer":"cosmos10nsdxxdvy9qka3zv0lzw8z9cnu6kanld8jh773","username":"twitteruser"}}` - require.Equal(t, expected, string(msgUnlinkApplication.GetSignBytes())) -} - func TestMsgUnlinkApplication_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgUnlinkApplication.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgUnlinkApplication.GetSigners()) diff --git a/x/profiles/types/msgs_chain_links.go b/x/profiles/types/msgs_chain_links.go index a9ed86c68a..88a275c9aa 100644 --- a/x/profiles/types/msgs_chain_links.go +++ b/x/profiles/types/msgs_chain_links.go @@ -55,11 +55,6 @@ func (msg *MsgLinkChainAccount) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgLinkChainAccount) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // UnpackInterfaces implements codectypes.UnpackInterfacesMessage func (msg *MsgLinkChainAccount) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { var address AddressData @@ -114,11 +109,6 @@ func (msg *MsgUnlinkChainAccount) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgUnlinkChainAccount) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgUnlinkChainAccount) GetSigners() []sdk.AccAddress { signer, _ := sdk.AccAddressFromBech32(msg.Owner) @@ -161,11 +151,6 @@ func (msg *MsgSetDefaultExternalAddress) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgSetDefaultExternalAddress) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgSetDefaultExternalAddress) GetSigners() []sdk.AccAddress { signer, _ := sdk.AccAddressFromBech32(msg.Signer) diff --git a/x/profiles/types/msgs_chain_links.pb.go b/x/profiles/types/msgs_chain_links.pb.go deleted file mode 100644 index 74de33c36e..0000000000 --- a/x/profiles/types/msgs_chain_links.pb.go +++ /dev/null @@ -1,1440 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: desmos/profiles/v3/msgs_chain_links.proto - -package types - -import ( - fmt "fmt" - _ "github.com/cosmos/cosmos-proto" - types "github.com/cosmos/cosmos-sdk/codec/types" - _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/cosmos-sdk/types/tx/amino" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// MsgLinkChainAccount represents a message to link an account to a profile. -type MsgLinkChainAccount struct { - // ChainAddress contains the details of the external chain address to be - // linked - ChainAddress *types.Any `protobuf:"bytes,1,opt,name=chain_address,json=chainAddress,proto3" json:"chain_address,omitempty" yaml:"source_address"` - // Proof contains the proof of ownership of the external chain address - Proof Proof `protobuf:"bytes,2,opt,name=proof,proto3" json:"proof" yaml:"source_proof"` - // ChainConfig contains the configuration of the external chain - ChainConfig ChainConfig `protobuf:"bytes,3,opt,name=chain_config,json=chainConfig,proto3" json:"chain_config" yaml:"source_chain_config"` - // Signer represents the Desmos address associated with the - // profile to which link the external account - Signer string `protobuf:"bytes,4,opt,name=signer,proto3" json:"signer,omitempty" yaml:"signer"` -} - -func (m *MsgLinkChainAccount) Reset() { *m = MsgLinkChainAccount{} } -func (m *MsgLinkChainAccount) String() string { return proto.CompactTextString(m) } -func (*MsgLinkChainAccount) ProtoMessage() {} -func (*MsgLinkChainAccount) Descriptor() ([]byte, []int) { - return fileDescriptor_52cd1f5b825f2f4e, []int{0} -} -func (m *MsgLinkChainAccount) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgLinkChainAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgLinkChainAccount.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 *MsgLinkChainAccount) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgLinkChainAccount.Merge(m, src) -} -func (m *MsgLinkChainAccount) XXX_Size() int { - return m.Size() -} -func (m *MsgLinkChainAccount) XXX_DiscardUnknown() { - xxx_messageInfo_MsgLinkChainAccount.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgLinkChainAccount proto.InternalMessageInfo - -func (m *MsgLinkChainAccount) GetChainAddress() *types.Any { - if m != nil { - return m.ChainAddress - } - return nil -} - -func (m *MsgLinkChainAccount) GetProof() Proof { - if m != nil { - return m.Proof - } - return Proof{} -} - -func (m *MsgLinkChainAccount) GetChainConfig() ChainConfig { - if m != nil { - return m.ChainConfig - } - return ChainConfig{} -} - -func (m *MsgLinkChainAccount) GetSigner() string { - if m != nil { - return m.Signer - } - return "" -} - -// MsgLinkChainAccountResponse defines the Msg/LinkAccount response type. -type MsgLinkChainAccountResponse struct { -} - -func (m *MsgLinkChainAccountResponse) Reset() { *m = MsgLinkChainAccountResponse{} } -func (m *MsgLinkChainAccountResponse) String() string { return proto.CompactTextString(m) } -func (*MsgLinkChainAccountResponse) ProtoMessage() {} -func (*MsgLinkChainAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_52cd1f5b825f2f4e, []int{1} -} -func (m *MsgLinkChainAccountResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgLinkChainAccountResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgLinkChainAccountResponse.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 *MsgLinkChainAccountResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgLinkChainAccountResponse.Merge(m, src) -} -func (m *MsgLinkChainAccountResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgLinkChainAccountResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgLinkChainAccountResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgLinkChainAccountResponse proto.InternalMessageInfo - -// MsgUnlinkChainAccount represents a message to unlink an account from a -// profile. -type MsgUnlinkChainAccount struct { - // Owner represents the Desmos profile from which to remove the link - Owner string `protobuf:"bytes,1,opt,name=owner,proto3" json:"owner,omitempty" yaml:"owner"` - // ChainName represents the name of the chain to which the link to remove is - // associated - ChainName string `protobuf:"bytes,2,opt,name=chain_name,json=chainName,proto3" json:"chain_name,omitempty" yaml:"chain_name"` - // Target represents the external address to be removed - Target string `protobuf:"bytes,3,opt,name=target,proto3" json:"target,omitempty" yaml:"target"` -} - -func (m *MsgUnlinkChainAccount) Reset() { *m = MsgUnlinkChainAccount{} } -func (m *MsgUnlinkChainAccount) String() string { return proto.CompactTextString(m) } -func (*MsgUnlinkChainAccount) ProtoMessage() {} -func (*MsgUnlinkChainAccount) Descriptor() ([]byte, []int) { - return fileDescriptor_52cd1f5b825f2f4e, []int{2} -} -func (m *MsgUnlinkChainAccount) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUnlinkChainAccount) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUnlinkChainAccount.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 *MsgUnlinkChainAccount) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUnlinkChainAccount.Merge(m, src) -} -func (m *MsgUnlinkChainAccount) XXX_Size() int { - return m.Size() -} -func (m *MsgUnlinkChainAccount) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUnlinkChainAccount.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUnlinkChainAccount proto.InternalMessageInfo - -func (m *MsgUnlinkChainAccount) GetOwner() string { - if m != nil { - return m.Owner - } - return "" -} - -func (m *MsgUnlinkChainAccount) GetChainName() string { - if m != nil { - return m.ChainName - } - return "" -} - -func (m *MsgUnlinkChainAccount) GetTarget() string { - if m != nil { - return m.Target - } - return "" -} - -// MsgUnlinkChainAccountResponse defines the Msg/UnlinkAccount response type. -type MsgUnlinkChainAccountResponse struct { -} - -func (m *MsgUnlinkChainAccountResponse) Reset() { *m = MsgUnlinkChainAccountResponse{} } -func (m *MsgUnlinkChainAccountResponse) String() string { return proto.CompactTextString(m) } -func (*MsgUnlinkChainAccountResponse) ProtoMessage() {} -func (*MsgUnlinkChainAccountResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_52cd1f5b825f2f4e, []int{3} -} -func (m *MsgUnlinkChainAccountResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUnlinkChainAccountResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUnlinkChainAccountResponse.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 *MsgUnlinkChainAccountResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUnlinkChainAccountResponse.Merge(m, src) -} -func (m *MsgUnlinkChainAccountResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgUnlinkChainAccountResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUnlinkChainAccountResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUnlinkChainAccountResponse proto.InternalMessageInfo - -// MsgSetDefaultExternalAddress represents the message used to set a default -// address for a specific chain -type MsgSetDefaultExternalAddress struct { - // Name of the chain for which to set the default address - ChainName string `protobuf:"bytes,1,opt,name=chain_name,json=chainName,proto3" json:"chain_name,omitempty"` - // Address to be set as the default one - Target string `protobuf:"bytes,2,opt,name=target,proto3" json:"target,omitempty"` - // User signing the message - Signer string `protobuf:"bytes,3,opt,name=signer,proto3" json:"signer,omitempty"` -} - -func (m *MsgSetDefaultExternalAddress) Reset() { *m = MsgSetDefaultExternalAddress{} } -func (m *MsgSetDefaultExternalAddress) String() string { return proto.CompactTextString(m) } -func (*MsgSetDefaultExternalAddress) ProtoMessage() {} -func (*MsgSetDefaultExternalAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_52cd1f5b825f2f4e, []int{4} -} -func (m *MsgSetDefaultExternalAddress) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgSetDefaultExternalAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgSetDefaultExternalAddress.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 *MsgSetDefaultExternalAddress) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSetDefaultExternalAddress.Merge(m, src) -} -func (m *MsgSetDefaultExternalAddress) XXX_Size() int { - return m.Size() -} -func (m *MsgSetDefaultExternalAddress) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSetDefaultExternalAddress.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgSetDefaultExternalAddress proto.InternalMessageInfo - -func (m *MsgSetDefaultExternalAddress) GetChainName() string { - if m != nil { - return m.ChainName - } - return "" -} - -func (m *MsgSetDefaultExternalAddress) GetTarget() string { - if m != nil { - return m.Target - } - return "" -} - -func (m *MsgSetDefaultExternalAddress) GetSigner() string { - if m != nil { - return m.Signer - } - return "" -} - -// MsgSetDefaultExternalAddressResponse represents the -// Msg/SetDefaultExternalAddress response type -type MsgSetDefaultExternalAddressResponse struct { -} - -func (m *MsgSetDefaultExternalAddressResponse) Reset() { *m = MsgSetDefaultExternalAddressResponse{} } -func (m *MsgSetDefaultExternalAddressResponse) String() string { return proto.CompactTextString(m) } -func (*MsgSetDefaultExternalAddressResponse) ProtoMessage() {} -func (*MsgSetDefaultExternalAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_52cd1f5b825f2f4e, []int{5} -} -func (m *MsgSetDefaultExternalAddressResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgSetDefaultExternalAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgSetDefaultExternalAddressResponse.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 *MsgSetDefaultExternalAddressResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSetDefaultExternalAddressResponse.Merge(m, src) -} -func (m *MsgSetDefaultExternalAddressResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgSetDefaultExternalAddressResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSetDefaultExternalAddressResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgSetDefaultExternalAddressResponse proto.InternalMessageInfo - -func init() { - proto.RegisterType((*MsgLinkChainAccount)(nil), "desmos.profiles.v3.MsgLinkChainAccount") - proto.RegisterType((*MsgLinkChainAccountResponse)(nil), "desmos.profiles.v3.MsgLinkChainAccountResponse") - proto.RegisterType((*MsgUnlinkChainAccount)(nil), "desmos.profiles.v3.MsgUnlinkChainAccount") - proto.RegisterType((*MsgUnlinkChainAccountResponse)(nil), "desmos.profiles.v3.MsgUnlinkChainAccountResponse") - proto.RegisterType((*MsgSetDefaultExternalAddress)(nil), "desmos.profiles.v3.MsgSetDefaultExternalAddress") - proto.RegisterType((*MsgSetDefaultExternalAddressResponse)(nil), "desmos.profiles.v3.MsgSetDefaultExternalAddressResponse") -} - -func init() { - proto.RegisterFile("desmos/profiles/v3/msgs_chain_links.proto", fileDescriptor_52cd1f5b825f2f4e) -} - -var fileDescriptor_52cd1f5b825f2f4e = []byte{ - // 636 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x4f, 0x4f, 0x13, 0x41, - 0x1c, 0xed, 0x8a, 0x90, 0x74, 0x80, 0x03, 0x0b, 0x68, 0xa9, 0xb0, 0x4b, 0x56, 0xa3, 0x50, 0xc2, - 0xae, 0x58, 0xbd, 0x60, 0x62, 0xd2, 0x05, 0x4f, 0x8a, 0xd1, 0x25, 0x5e, 0xbc, 0x34, 0xd3, 0xed, - 0x74, 0xd8, 0xb0, 0x3b, 0xd3, 0xec, 0x6c, 0x2b, 0xbd, 0x7a, 0xf4, 0xe4, 0xc7, 0xf0, 0xc8, 0x81, - 0x23, 0x1f, 0x80, 0x78, 0x22, 0x9e, 0x3c, 0x6d, 0x4c, 0x1b, 0xd3, 0x7b, 0x3f, 0x81, 0xd9, 0x99, - 0xd9, 0x2e, 0x85, 0x45, 0x2f, 0x30, 0xbf, 0x7f, 0xef, 0xf7, 0x7e, 0xef, 0xb5, 0x05, 0x9b, 0x4d, - 0xc4, 0x02, 0xca, 0xac, 0x76, 0x48, 0x5b, 0x9e, 0x8f, 0x98, 0xd5, 0xad, 0x5a, 0x01, 0xc3, 0xac, - 0xee, 0x1e, 0x41, 0x8f, 0xd4, 0x7d, 0x8f, 0x1c, 0x33, 0xb3, 0x1d, 0xd2, 0x88, 0xaa, 0xaa, 0x68, - 0x35, 0xd3, 0x56, 0xb3, 0x5b, 0x2d, 0x2f, 0xc0, 0xc0, 0x23, 0xd4, 0xe2, 0x7f, 0x45, 0x5b, 0x79, - 0x09, 0x53, 0x4c, 0xf9, 0xd3, 0x4a, 0x5e, 0x32, 0xbb, 0x82, 0x29, 0xc5, 0x3e, 0xb2, 0x78, 0xd4, - 0xe8, 0xb4, 0x2c, 0x48, 0x7a, 0x69, 0xc9, 0xa5, 0x09, 0x6e, 0x5d, 0xcc, 0x88, 0x40, 0x96, 0xee, - 0x8b, 0x28, 0x61, 0x64, 0x75, 0x77, 0x92, 0x7f, 0xb2, 0xb0, 0x95, 0x47, 0x9b, 0x36, 0x91, 0x9f, - 0x43, 0xdc, 0x38, 0x9f, 0x02, 0x8b, 0x07, 0x0c, 0xbf, 0xf5, 0xc8, 0xf1, 0x5e, 0x52, 0xac, 0xb9, - 0x2e, 0xed, 0x90, 0x48, 0xed, 0x82, 0x79, 0xd1, 0x0c, 0x9b, 0xcd, 0x10, 0x31, 0x56, 0x52, 0xd6, - 0x95, 0x8d, 0xd9, 0x67, 0x4b, 0xa6, 0xe0, 0x6a, 0xa6, 0x5c, 0xcd, 0x1a, 0xe9, 0xd9, 0x2f, 0x47, - 0xb1, 0xbe, 0xdc, 0x83, 0x81, 0xbf, 0x6b, 0x30, 0xda, 0x09, 0x5d, 0x94, 0x4e, 0x19, 0x3f, 0xce, - 0xb6, 0xb5, 0x9b, 0xd2, 0x98, 0x35, 0x51, 0xde, 0x87, 0x11, 0x74, 0xe6, 0xf8, 0x1e, 0x99, 0x51, - 0x3f, 0x80, 0xe9, 0x76, 0x48, 0x69, 0xab, 0x74, 0x87, 0xef, 0x5b, 0x31, 0x73, 0xa6, 0xdf, 0x27, - 0x0d, 0xf6, 0xfa, 0x45, 0xac, 0x17, 0x46, 0xb1, 0xbe, 0x38, 0xb1, 0x98, 0x0f, 0x1b, 0xdf, 0x87, - 0xa7, 0x15, 0xc5, 0x11, 0x48, 0xea, 0x31, 0x10, 0x2b, 0xea, 0x2e, 0x25, 0x2d, 0x0f, 0x97, 0xa6, - 0x38, 0xb2, 0x9e, 0x87, 0xcc, 0x25, 0xd8, 0xe3, 0x6d, 0xf6, 0x13, 0x89, 0x5f, 0x9e, 0xc0, 0xbf, - 0x8a, 0x24, 0xd7, 0xcc, 0xba, 0xd9, 0x94, 0x5a, 0x03, 0x33, 0xcc, 0xc3, 0x04, 0x85, 0xa5, 0xbb, - 0xeb, 0xca, 0x46, 0xd1, 0xde, 0x1c, 0xc5, 0xfa, 0xbc, 0x44, 0xe0, 0x79, 0xe3, 0xe7, 0xd9, 0xf6, - 0x92, 0x34, 0x52, 0x1e, 0x7d, 0x18, 0x85, 0x1e, 0xc1, 0x8e, 0x1c, 0xdc, 0xad, 0x7c, 0x19, 0x9e, - 0x56, 0x64, 0xf0, 0x75, 0x78, 0x5a, 0x29, 0x4b, 0x3f, 0x73, 0x6c, 0x32, 0xd6, 0xc0, 0x83, 0x9c, - 0xb4, 0x83, 0x58, 0x9b, 0x12, 0x86, 0x8c, 0x3f, 0x0a, 0x58, 0x3e, 0x60, 0xf8, 0x23, 0xf1, 0xaf, - 0xfb, 0xfb, 0x0a, 0x4c, 0xd3, 0xcf, 0x09, 0x4d, 0x85, 0xd3, 0xdc, 0x18, 0xc5, 0xfa, 0x9c, 0xa0, - 0xc9, 0xd3, 0xb7, 0xb3, 0x14, 0x63, 0xea, 0x73, 0x00, 0x84, 0x14, 0x04, 0x06, 0x88, 0x9b, 0x55, - 0xb4, 0x97, 0x47, 0xb1, 0xbe, 0x20, 0x40, 0xb2, 0x9a, 0xe1, 0x14, 0x79, 0xf0, 0x0e, 0x06, 0x48, - 0xdd, 0x04, 0x33, 0x11, 0x0c, 0x31, 0x8a, 0xb8, 0x09, 0x45, 0x7b, 0x21, 0x53, 0x47, 0xe4, 0x0d, - 0x47, 0x36, 0xec, 0x6e, 0x25, 0x2a, 0x88, 0x65, 0x89, 0x08, 0xab, 0x99, 0x08, 0x37, 0xaf, 0x31, - 0x74, 0xb0, 0x96, 0x5b, 0x18, 0x0b, 0x71, 0xae, 0x80, 0xd5, 0x03, 0x86, 0x0f, 0x51, 0xb4, 0x8f, - 0x5a, 0xb0, 0xe3, 0x47, 0xaf, 0x4f, 0x22, 0x14, 0x12, 0xe8, 0xa7, 0x9f, 0xbb, 0xb5, 0x89, 0x7b, - 0xb8, 0x28, 0x57, 0x89, 0xdf, 0x1b, 0x13, 0xe7, 0xa7, 0xa6, 0x2c, 0xd5, 0xa7, 0x63, 0xbb, 0xc5, - 0x41, 0xa5, 0xff, 0xba, 0x5b, 0xbd, 0xe6, 0xee, 0xc3, 0xec, 0xb0, 0x5b, 0xd9, 0x19, 0x8f, 0xc1, - 0xa3, 0x7f, 0xd5, 0xd3, 0x33, 0xed, 0x37, 0x17, 0x7d, 0x4d, 0xb9, 0xec, 0x6b, 0xca, 0xef, 0xbe, - 0xa6, 0x7c, 0x1b, 0x68, 0x85, 0xcb, 0x81, 0x56, 0xf8, 0x35, 0xd0, 0x0a, 0x9f, 0x76, 0xb0, 0x17, - 0x1d, 0x75, 0x1a, 0xa6, 0x4b, 0x03, 0x4b, 0x6c, 0xdc, 0xf6, 0x61, 0x83, 0xc9, 0xb7, 0xd5, 0x7d, - 0x61, 0x9d, 0x64, 0x3f, 0x18, 0x51, 0xaf, 0x8d, 0x58, 0x63, 0x86, 0x7f, 0xc7, 0xab, 0x7f, 0x03, - 0x00, 0x00, 0xff, 0xff, 0xd5, 0x0e, 0x60, 0x35, 0x07, 0x05, 0x00, 0x00, -} - -func (m *MsgLinkChainAccount) 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 *MsgLinkChainAccount) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgLinkChainAccount) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Signer) > 0 { - i -= len(m.Signer) - copy(dAtA[i:], m.Signer) - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(len(m.Signer))) - i-- - dAtA[i] = 0x22 - } - { - size, err := m.ChainConfig.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1a - { - size, err := m.Proof.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - if m.ChainAddress != nil { - { - size, err := m.ChainAddress.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgLinkChainAccountResponse) 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 *MsgLinkChainAccountResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgLinkChainAccountResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *MsgUnlinkChainAccount) 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 *MsgUnlinkChainAccount) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgUnlinkChainAccount) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Target) > 0 { - i -= len(m.Target) - copy(dAtA[i:], m.Target) - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(len(m.Target))) - i-- - dAtA[i] = 0x1a - } - if len(m.ChainName) > 0 { - i -= len(m.ChainName) - copy(dAtA[i:], m.ChainName) - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(len(m.ChainName))) - i-- - dAtA[i] = 0x12 - } - if len(m.Owner) > 0 { - i -= len(m.Owner) - copy(dAtA[i:], m.Owner) - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(len(m.Owner))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgUnlinkChainAccountResponse) 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 *MsgUnlinkChainAccountResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgUnlinkChainAccountResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *MsgSetDefaultExternalAddress) 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 *MsgSetDefaultExternalAddress) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgSetDefaultExternalAddress) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Signer) > 0 { - i -= len(m.Signer) - copy(dAtA[i:], m.Signer) - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(len(m.Signer))) - i-- - dAtA[i] = 0x1a - } - if len(m.Target) > 0 { - i -= len(m.Target) - copy(dAtA[i:], m.Target) - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(len(m.Target))) - i-- - dAtA[i] = 0x12 - } - if len(m.ChainName) > 0 { - i -= len(m.ChainName) - copy(dAtA[i:], m.ChainName) - i = encodeVarintMsgsChainLinks(dAtA, i, uint64(len(m.ChainName))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgSetDefaultExternalAddressResponse) 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 *MsgSetDefaultExternalAddressResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgSetDefaultExternalAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func encodeVarintMsgsChainLinks(dAtA []byte, offset int, v uint64) int { - offset -= sovMsgsChainLinks(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *MsgLinkChainAccount) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ChainAddress != nil { - l = m.ChainAddress.Size() - n += 1 + l + sovMsgsChainLinks(uint64(l)) - } - l = m.Proof.Size() - n += 1 + l + sovMsgsChainLinks(uint64(l)) - l = m.ChainConfig.Size() - n += 1 + l + sovMsgsChainLinks(uint64(l)) - l = len(m.Signer) - if l > 0 { - n += 1 + l + sovMsgsChainLinks(uint64(l)) - } - return n -} - -func (m *MsgLinkChainAccountResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *MsgUnlinkChainAccount) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Owner) - if l > 0 { - n += 1 + l + sovMsgsChainLinks(uint64(l)) - } - l = len(m.ChainName) - if l > 0 { - n += 1 + l + sovMsgsChainLinks(uint64(l)) - } - l = len(m.Target) - if l > 0 { - n += 1 + l + sovMsgsChainLinks(uint64(l)) - } - return n -} - -func (m *MsgUnlinkChainAccountResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *MsgSetDefaultExternalAddress) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.ChainName) - if l > 0 { - n += 1 + l + sovMsgsChainLinks(uint64(l)) - } - l = len(m.Target) - if l > 0 { - n += 1 + l + sovMsgsChainLinks(uint64(l)) - } - l = len(m.Signer) - if l > 0 { - n += 1 + l + sovMsgsChainLinks(uint64(l)) - } - return n -} - -func (m *MsgSetDefaultExternalAddressResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func sovMsgsChainLinks(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozMsgsChainLinks(x uint64) (n int) { - return sovMsgsChainLinks(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *MsgLinkChainAccount) 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 ErrIntOverflowMsgsChainLinks - } - 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: MsgLinkChainAccount: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgLinkChainAccount: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainAddress", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.ChainAddress == nil { - m.ChainAddress = &types.Any{} - } - if err := m.ChainAddress.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Proof", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.Proof.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainConfig", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.ChainConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - 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 ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Signer = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsChainLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgLinkChainAccountResponse) 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 ErrIntOverflowMsgsChainLinks - } - 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: MsgLinkChainAccountResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgLinkChainAccountResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsChainLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgUnlinkChainAccount) 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 ErrIntOverflowMsgsChainLinks - } - 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: MsgUnlinkChainAccount: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUnlinkChainAccount: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Owner", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - 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 ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Owner = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - 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 ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChainName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Target", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - 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 ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Target = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsChainLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgUnlinkChainAccountResponse) 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 ErrIntOverflowMsgsChainLinks - } - 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: MsgUnlinkChainAccountResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUnlinkChainAccountResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsChainLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgSetDefaultExternalAddress) 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 ErrIntOverflowMsgsChainLinks - } - 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: MsgSetDefaultExternalAddress: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSetDefaultExternalAddress: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainName", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - 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 ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ChainName = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Target", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - 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 ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Target = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Signer", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsChainLinks - } - 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 ErrInvalidLengthMsgsChainLinks - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Signer = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsChainLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgSetDefaultExternalAddressResponse) 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 ErrIntOverflowMsgsChainLinks - } - 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: MsgSetDefaultExternalAddressResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSetDefaultExternalAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsChainLinks(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsChainLinks - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipMsgsChainLinks(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, ErrIntOverflowMsgsChainLinks - } - 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, ErrIntOverflowMsgsChainLinks - } - 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, ErrIntOverflowMsgsChainLinks - } - 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, ErrInvalidLengthMsgsChainLinks - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupMsgsChainLinks - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthMsgsChainLinks - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthMsgsChainLinks = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMsgsChainLinks = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupMsgsChainLinks = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/profiles/types/msgs_chain_links_test.go b/x/profiles/types/msgs_chain_links_test.go index d1ee7887c6..d1ea9b438b 100644 --- a/x/profiles/types/msgs_chain_links_test.go +++ b/x/profiles/types/msgs_chain_links_test.go @@ -98,11 +98,6 @@ func TestMsgLinkChainAccount_ValidateBasic(t *testing.T) { } } -func TestMsgLinkChainAccount_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgLinkChainAccount","value":{"chain_address":{"type":"desmos/Bech32Address","value":{"prefix":"cosmos","value":"cosmos1xmquc944hzu6n6qtljcexkuhhz76mucxtgm5x0"}},"chain_config":{"name":"cosmos"},"proof":{"plain_text":"74657874","pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A+RxOqvS0RYdF/NU3xSolfmfZc7YUKu4fvJLbnCCQBY3"},"signature":{"type":"desmos/SingleSignature","value":{"signature":"rREquzDlJAx7nSG0zFQh12z6381Zd8yiYlI7X1vHWUV9SqbVwetiI9sQS0eqHyIkaL6OtbsnYrlxYirFuWNRtQ==","value_type":1}}},"signer":"cosmos1u9hgsqfpe3snftr7p7fsyja3wtlmj2sgf2w9yl"}}` - require.Equal(t, expected, string(msgChainLinkAccount.GetSignBytes())) -} - func TestMsgLinkChainAccount_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgChainLinkAccount.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgChainLinkAccount.GetSigners()) @@ -178,12 +173,6 @@ func TestMsgUnlinkChainAccount_ValidateBasic(t *testing.T) { } } -func TestMsgUnlinkChainAccount_GetSignBytes(t *testing.T) { - actual := msgUnlinkChainAccount.GetSignBytes() - expected := `{"type":"desmos/MsgUnlinkChainAccount","value":{"chain_name":"cosmos","owner":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns","target":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"}}` - require.Equal(t, expected, string(actual)) -} - func TestMsgUnlinkChainAccount_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgUnlinkChainAccount.Owner) require.Equal(t, []sdk.AccAddress{addr}, msgUnlinkChainAccount.GetSigners()) @@ -259,12 +248,6 @@ func TestMsgSetDefaultExternalAddress_ValidateBasic(t *testing.T) { } } -func TestMsgSetDefaultExternalAddress_GetSignBytes(t *testing.T) { - actual := msgSetDefaultExternalAddress.GetSignBytes() - expected := `{"type":"desmos/MsgSetDefaultExternalAddress","value":{"chain_name":"cosmos","signer":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","target":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"}}` - require.Equal(t, expected, string(actual)) -} - func TestMsgSetDefaultExternalAddress_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgSetDefaultExternalAddress.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgSetDefaultExternalAddress.GetSigners()) diff --git a/x/profiles/types/msgs_dtag_requests.go b/x/profiles/types/msgs_dtag_requests.go index c631ca7f5b..7aed6259ce 100644 --- a/x/profiles/types/msgs_dtag_requests.go +++ b/x/profiles/types/msgs_dtag_requests.go @@ -45,11 +45,6 @@ func (msg *MsgRequestDTagTransfer) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgRequestDTagTransfer) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgRequestDTagTransfer) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Sender) @@ -90,11 +85,6 @@ func (msg *MsgCancelDTagTransferRequest) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgCancelDTagTransferRequest) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgCancelDTagTransferRequest) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Sender) @@ -140,11 +130,6 @@ func (msg *MsgAcceptDTagTransferRequest) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgAcceptDTagTransferRequest) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgAcceptDTagTransferRequest) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Receiver) @@ -185,11 +170,6 @@ func (msg *MsgRefuseDTagTransferRequest) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgRefuseDTagTransferRequest) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgRefuseDTagTransferRequest) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Receiver) diff --git a/x/profiles/types/msgs_dtag_requests.pb.go b/x/profiles/types/msgs_dtag_requests.pb.go deleted file mode 100644 index d9398b23dc..0000000000 --- a/x/profiles/types/msgs_dtag_requests.pb.go +++ /dev/null @@ -1,1610 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: desmos/profiles/v3/msgs_dtag_requests.proto - -package types - -import ( - fmt "fmt" - _ "github.com/cosmos/cosmos-proto" - _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/cosmos-sdk/types/tx/amino" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// MsgRequestDTagTransfer represents the message used to request the DTag -// transfer to another user. -type MsgRequestDTagTransfer struct { - // Receiver contains the address of the request receiver that owns the DTag to - // transfer if the request is accepted - Receiver string `protobuf:"bytes,1,opt,name=receiver,proto3" json:"receiver,omitempty" yaml:"receiver"` - // Sender contains the address of the request sender that will receive the - // receiver DTag if the requet is accepted - Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` -} - -func (m *MsgRequestDTagTransfer) Reset() { *m = MsgRequestDTagTransfer{} } -func (m *MsgRequestDTagTransfer) String() string { return proto.CompactTextString(m) } -func (*MsgRequestDTagTransfer) ProtoMessage() {} -func (*MsgRequestDTagTransfer) Descriptor() ([]byte, []int) { - return fileDescriptor_00569a18db7c139d, []int{0} -} -func (m *MsgRequestDTagTransfer) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgRequestDTagTransfer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgRequestDTagTransfer.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 *MsgRequestDTagTransfer) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRequestDTagTransfer.Merge(m, src) -} -func (m *MsgRequestDTagTransfer) XXX_Size() int { - return m.Size() -} -func (m *MsgRequestDTagTransfer) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRequestDTagTransfer.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgRequestDTagTransfer proto.InternalMessageInfo - -func (m *MsgRequestDTagTransfer) GetReceiver() string { - if m != nil { - return m.Receiver - } - return "" -} - -func (m *MsgRequestDTagTransfer) GetSender() string { - if m != nil { - return m.Sender - } - return "" -} - -// MsgRequestDTagTransferResponse defines the Msg/RequestDTagTransfer response -// type. -type MsgRequestDTagTransferResponse struct { -} - -func (m *MsgRequestDTagTransferResponse) Reset() { *m = MsgRequestDTagTransferResponse{} } -func (m *MsgRequestDTagTransferResponse) String() string { return proto.CompactTextString(m) } -func (*MsgRequestDTagTransferResponse) ProtoMessage() {} -func (*MsgRequestDTagTransferResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00569a18db7c139d, []int{1} -} -func (m *MsgRequestDTagTransferResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgRequestDTagTransferResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgRequestDTagTransferResponse.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 *MsgRequestDTagTransferResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRequestDTagTransferResponse.Merge(m, src) -} -func (m *MsgRequestDTagTransferResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgRequestDTagTransferResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRequestDTagTransferResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgRequestDTagTransferResponse proto.InternalMessageInfo - -// MsgCancelDTagTransferRequest represents the message used to cancel a DTag -// transfer request. -type MsgCancelDTagTransferRequest struct { - // Receiver contains the address of the request receiver - Receiver string `protobuf:"bytes,1,opt,name=receiver,proto3" json:"receiver,omitempty" yaml:"receiver"` - // Sender contains the address of the requets sender - Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` -} - -func (m *MsgCancelDTagTransferRequest) Reset() { *m = MsgCancelDTagTransferRequest{} } -func (m *MsgCancelDTagTransferRequest) String() string { return proto.CompactTextString(m) } -func (*MsgCancelDTagTransferRequest) ProtoMessage() {} -func (*MsgCancelDTagTransferRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00569a18db7c139d, []int{2} -} -func (m *MsgCancelDTagTransferRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgCancelDTagTransferRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgCancelDTagTransferRequest.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 *MsgCancelDTagTransferRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgCancelDTagTransferRequest.Merge(m, src) -} -func (m *MsgCancelDTagTransferRequest) XXX_Size() int { - return m.Size() -} -func (m *MsgCancelDTagTransferRequest) XXX_DiscardUnknown() { - xxx_messageInfo_MsgCancelDTagTransferRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgCancelDTagTransferRequest proto.InternalMessageInfo - -func (m *MsgCancelDTagTransferRequest) GetReceiver() string { - if m != nil { - return m.Receiver - } - return "" -} - -func (m *MsgCancelDTagTransferRequest) GetSender() string { - if m != nil { - return m.Sender - } - return "" -} - -// MsgCancelDTagTransferRequestResponse represents the -// Msg/CancelDTagTransferRequest response type. -type MsgCancelDTagTransferRequestResponse struct { -} - -func (m *MsgCancelDTagTransferRequestResponse) Reset() { *m = MsgCancelDTagTransferRequestResponse{} } -func (m *MsgCancelDTagTransferRequestResponse) String() string { return proto.CompactTextString(m) } -func (*MsgCancelDTagTransferRequestResponse) ProtoMessage() {} -func (*MsgCancelDTagTransferRequestResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00569a18db7c139d, []int{3} -} -func (m *MsgCancelDTagTransferRequestResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgCancelDTagTransferRequestResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgCancelDTagTransferRequestResponse.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 *MsgCancelDTagTransferRequestResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgCancelDTagTransferRequestResponse.Merge(m, src) -} -func (m *MsgCancelDTagTransferRequestResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgCancelDTagTransferRequestResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgCancelDTagTransferRequestResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgCancelDTagTransferRequestResponse proto.InternalMessageInfo - -// MsgAcceptDTagTransferRequest represents the message used to accept a DTag -// transfer request. -type MsgAcceptDTagTransferRequest struct { - // NewDTag represents the DTag that the request receiver will obtain if they - // accept the request - NewDTag string `protobuf:"bytes,1,opt,name=new_dtag,json=newDtag,proto3" json:"new_dtag,omitempty" yaml:"new_dtag"` - // Sender represents the request sender - Sender string `protobuf:"bytes,2,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` - // Receiver represents the request receiver - Receiver string `protobuf:"bytes,3,opt,name=receiver,proto3" json:"receiver,omitempty" yaml:"receiver"` -} - -func (m *MsgAcceptDTagTransferRequest) Reset() { *m = MsgAcceptDTagTransferRequest{} } -func (m *MsgAcceptDTagTransferRequest) String() string { return proto.CompactTextString(m) } -func (*MsgAcceptDTagTransferRequest) ProtoMessage() {} -func (*MsgAcceptDTagTransferRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00569a18db7c139d, []int{4} -} -func (m *MsgAcceptDTagTransferRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgAcceptDTagTransferRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgAcceptDTagTransferRequest.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 *MsgAcceptDTagTransferRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgAcceptDTagTransferRequest.Merge(m, src) -} -func (m *MsgAcceptDTagTransferRequest) XXX_Size() int { - return m.Size() -} -func (m *MsgAcceptDTagTransferRequest) XXX_DiscardUnknown() { - xxx_messageInfo_MsgAcceptDTagTransferRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgAcceptDTagTransferRequest proto.InternalMessageInfo - -func (m *MsgAcceptDTagTransferRequest) GetNewDTag() string { - if m != nil { - return m.NewDTag - } - return "" -} - -func (m *MsgAcceptDTagTransferRequest) GetSender() string { - if m != nil { - return m.Sender - } - return "" -} - -func (m *MsgAcceptDTagTransferRequest) GetReceiver() string { - if m != nil { - return m.Receiver - } - return "" -} - -// MsgAcceptDTagTransferRequestResponse defines the -// Msg/AcceptDTagTransferRequest response. -type MsgAcceptDTagTransferRequestResponse struct { -} - -func (m *MsgAcceptDTagTransferRequestResponse) Reset() { *m = MsgAcceptDTagTransferRequestResponse{} } -func (m *MsgAcceptDTagTransferRequestResponse) String() string { return proto.CompactTextString(m) } -func (*MsgAcceptDTagTransferRequestResponse) ProtoMessage() {} -func (*MsgAcceptDTagTransferRequestResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00569a18db7c139d, []int{5} -} -func (m *MsgAcceptDTagTransferRequestResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgAcceptDTagTransferRequestResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgAcceptDTagTransferRequestResponse.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 *MsgAcceptDTagTransferRequestResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgAcceptDTagTransferRequestResponse.Merge(m, src) -} -func (m *MsgAcceptDTagTransferRequestResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgAcceptDTagTransferRequestResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgAcceptDTagTransferRequestResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgAcceptDTagTransferRequestResponse proto.InternalMessageInfo - -// MsgRefuseDTagTransferRequest represents the message used to refuse a DTag -// transfer request. -type MsgRefuseDTagTransferRequest struct { - // Sender represents the request sender - Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` - // Receiver represents the request receiver - Receiver string `protobuf:"bytes,2,opt,name=receiver,proto3" json:"receiver,omitempty" yaml:"receiver"` -} - -func (m *MsgRefuseDTagTransferRequest) Reset() { *m = MsgRefuseDTagTransferRequest{} } -func (m *MsgRefuseDTagTransferRequest) String() string { return proto.CompactTextString(m) } -func (*MsgRefuseDTagTransferRequest) ProtoMessage() {} -func (*MsgRefuseDTagTransferRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_00569a18db7c139d, []int{6} -} -func (m *MsgRefuseDTagTransferRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgRefuseDTagTransferRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgRefuseDTagTransferRequest.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 *MsgRefuseDTagTransferRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRefuseDTagTransferRequest.Merge(m, src) -} -func (m *MsgRefuseDTagTransferRequest) XXX_Size() int { - return m.Size() -} -func (m *MsgRefuseDTagTransferRequest) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRefuseDTagTransferRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgRefuseDTagTransferRequest proto.InternalMessageInfo - -func (m *MsgRefuseDTagTransferRequest) GetSender() string { - if m != nil { - return m.Sender - } - return "" -} - -func (m *MsgRefuseDTagTransferRequest) GetReceiver() string { - if m != nil { - return m.Receiver - } - return "" -} - -// MsgRefuseDTagTransferRequestResponse defines the -// Msg/RefuseDTagTransferRequest response. -type MsgRefuseDTagTransferRequestResponse struct { -} - -func (m *MsgRefuseDTagTransferRequestResponse) Reset() { *m = MsgRefuseDTagTransferRequestResponse{} } -func (m *MsgRefuseDTagTransferRequestResponse) String() string { return proto.CompactTextString(m) } -func (*MsgRefuseDTagTransferRequestResponse) ProtoMessage() {} -func (*MsgRefuseDTagTransferRequestResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_00569a18db7c139d, []int{7} -} -func (m *MsgRefuseDTagTransferRequestResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgRefuseDTagTransferRequestResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgRefuseDTagTransferRequestResponse.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 *MsgRefuseDTagTransferRequestResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRefuseDTagTransferRequestResponse.Merge(m, src) -} -func (m *MsgRefuseDTagTransferRequestResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgRefuseDTagTransferRequestResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRefuseDTagTransferRequestResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgRefuseDTagTransferRequestResponse proto.InternalMessageInfo - -func init() { - proto.RegisterType((*MsgRequestDTagTransfer)(nil), "desmos.profiles.v3.MsgRequestDTagTransfer") - proto.RegisterType((*MsgRequestDTagTransferResponse)(nil), "desmos.profiles.v3.MsgRequestDTagTransferResponse") - proto.RegisterType((*MsgCancelDTagTransferRequest)(nil), "desmos.profiles.v3.MsgCancelDTagTransferRequest") - proto.RegisterType((*MsgCancelDTagTransferRequestResponse)(nil), "desmos.profiles.v3.MsgCancelDTagTransferRequestResponse") - proto.RegisterType((*MsgAcceptDTagTransferRequest)(nil), "desmos.profiles.v3.MsgAcceptDTagTransferRequest") - proto.RegisterType((*MsgAcceptDTagTransferRequestResponse)(nil), "desmos.profiles.v3.MsgAcceptDTagTransferRequestResponse") - proto.RegisterType((*MsgRefuseDTagTransferRequest)(nil), "desmos.profiles.v3.MsgRefuseDTagTransferRequest") - proto.RegisterType((*MsgRefuseDTagTransferRequestResponse)(nil), "desmos.profiles.v3.MsgRefuseDTagTransferRequestResponse") -} - -func init() { - proto.RegisterFile("desmos/profiles/v3/msgs_dtag_requests.proto", fileDescriptor_00569a18db7c139d) -} - -var fileDescriptor_00569a18db7c139d = []byte{ - // 494 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xb1, 0x6e, 0xd3, 0x40, - 0x18, 0xc7, 0xe3, 0x20, 0xb5, 0xc5, 0x12, 0x42, 0x35, 0x15, 0x94, 0x0a, 0x9c, 0xca, 0x20, 0x44, - 0x5b, 0x25, 0xa7, 0x2a, 0xea, 0x40, 0xb6, 0x94, 0x4a, 0x0c, 0xa8, 0x0c, 0xa6, 0x13, 0x4b, 0xe4, - 0xd8, 0x5f, 0x0e, 0x4b, 0xf1, 0x9d, 0xb9, 0xef, 0xe2, 0xd0, 0x95, 0x91, 0x89, 0x07, 0x60, 0xe3, - 0x05, 0x3a, 0xf0, 0x10, 0x8c, 0x15, 0x13, 0x53, 0x80, 0x64, 0xe8, 0xde, 0x27, 0x40, 0xb9, 0x3b, - 0x27, 0x34, 0xb5, 0x59, 0x68, 0x97, 0xe4, 0xfb, 0xee, 0xff, 0x3f, 0xdf, 0xfd, 0x7f, 0x77, 0x3a, - 0x7b, 0x27, 0x02, 0x4c, 0x38, 0x92, 0x54, 0xf0, 0x5e, 0xdc, 0x07, 0x24, 0x59, 0x93, 0x24, 0x48, - 0xb1, 0x13, 0xc9, 0x80, 0x76, 0x04, 0xbc, 0x1b, 0x00, 0x4a, 0x6c, 0xa4, 0x82, 0x4b, 0xee, 0x38, - 0xda, 0xdc, 0xc8, 0xcd, 0x8d, 0xac, 0xb9, 0xb1, 0x1a, 0x24, 0x31, 0xe3, 0x44, 0xfd, 0x6a, 0xdb, - 0xc6, 0x1a, 0xe5, 0x94, 0xab, 0x92, 0x4c, 0x2b, 0x33, 0x7a, 0x2f, 0xe4, 0x6a, 0xa5, 0x04, 0x29, - 0xc9, 0x76, 0xa7, 0x7f, 0x46, 0xb8, 0xaf, 0x85, 0x8e, 0x9e, 0xa1, 0x1b, 0x2d, 0x79, 0x5f, 0x2c, - 0xfb, 0xee, 0x21, 0x52, 0x5f, 0x6f, 0xe3, 0xe0, 0x28, 0xa0, 0x47, 0x22, 0x60, 0xd8, 0x03, 0xe1, - 0x10, 0x7b, 0x45, 0x40, 0x08, 0x71, 0x06, 0x62, 0xdd, 0xda, 0xb4, 0x9e, 0xde, 0xdc, 0xbf, 0x73, - 0x3e, 0xaa, 0xdd, 0x3e, 0x0e, 0x92, 0x7e, 0xcb, 0xcb, 0x15, 0xcf, 0x9f, 0x99, 0x9c, 0x2d, 0x7b, - 0x09, 0x81, 0x45, 0x20, 0xd6, 0xab, 0xca, 0xbe, 0x7a, 0x3e, 0xaa, 0xdd, 0xd2, 0x76, 0x3d, 0xee, - 0xf9, 0xc6, 0xd0, 0xaa, 0x7f, 0x38, 0x3b, 0xd9, 0x36, 0xcd, 0xc7, 0xb3, 0x93, 0xed, 0x87, 0x06, - 0x52, 0xf1, 0x56, 0xbc, 0x4d, 0xdb, 0x2d, 0x56, 0x7c, 0xc0, 0x94, 0x33, 0x04, 0xef, 0xa7, 0x65, - 0x3f, 0x38, 0x44, 0xfa, 0x3c, 0x60, 0x21, 0xf4, 0x2f, 0x3a, 0xd4, 0x24, 0xe7, 0xc5, 0xa5, 0x34, - 0x3b, 0x05, 0x69, 0xbe, 0x7f, 0xad, 0xaf, 0x19, 0x3e, 0xed, 0x28, 0x12, 0x80, 0xf8, 0x5a, 0x8a, - 0x98, 0xd1, 0xbf, 0x52, 0xb6, 0x17, 0x52, 0x6e, 0x5d, 0x4a, 0x59, 0xfa, 0x91, 0x3c, 0x7d, 0x73, - 0x21, 0xfd, 0xa3, 0x79, 0xfa, 0xd2, 0x00, 0xde, 0x13, 0xfb, 0xf1, 0xbf, 0xf4, 0x19, 0x89, 0xcf, - 0x55, 0x45, 0xa2, 0x1d, 0x86, 0x90, 0xca, 0x22, 0x12, 0xcf, 0xec, 0x15, 0x06, 0x43, 0x75, 0xfd, - 0x0c, 0x09, 0x77, 0x3c, 0xaa, 0x2d, 0xbf, 0x82, 0xe1, 0xd4, 0x3d, 0x87, 0x92, 0x9b, 0x3c, 0x7f, - 0x99, 0xc1, 0xf0, 0x40, 0x06, 0xf4, 0x0a, 0xb2, 0x5f, 0x38, 0x87, 0x1b, 0xff, 0x71, 0x0e, 0xad, - 0xbd, 0x29, 0xc4, 0x59, 0xbb, 0x80, 0xb1, 0x34, 0xbd, 0xc1, 0x58, 0xaa, 0xcf, 0x30, 0xfe, 0xd6, - 0x17, 0xca, 0x87, 0xde, 0x00, 0xa1, 0x08, 0xe3, 0x9c, 0x85, 0x75, 0x15, 0x2c, 0xaa, 0xd7, 0xc6, - 0xa2, 0x34, 0x82, 0x61, 0x51, 0xaa, 0xe7, 0x2c, 0xf6, 0x5f, 0x7e, 0x1b, 0xbb, 0xd6, 0xe9, 0xd8, - 0xb5, 0x7e, 0x8d, 0x5d, 0xeb, 0xd3, 0xc4, 0xad, 0x9c, 0x4e, 0xdc, 0xca, 0x8f, 0x89, 0x5b, 0x79, - 0xb3, 0x4b, 0x63, 0xf9, 0x76, 0xd0, 0x6d, 0x84, 0x3c, 0x21, 0x7a, 0xc5, 0x7a, 0x3f, 0xe8, 0xa2, - 0xa9, 0x49, 0xb6, 0x47, 0xde, 0xcf, 0x1f, 0x3e, 0x79, 0x9c, 0x02, 0x76, 0x97, 0xd4, 0xc3, 0xd3, - 0xfc, 0x13, 0x00, 0x00, 0xff, 0xff, 0xd8, 0x18, 0x6c, 0xcc, 0x18, 0x05, 0x00, 0x00, -} - -func (m *MsgRequestDTagTransfer) 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 *MsgRequestDTagTransfer) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgRequestDTagTransfer) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintMsgsDtagRequests(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0x12 - } - if len(m.Receiver) > 0 { - i -= len(m.Receiver) - copy(dAtA[i:], m.Receiver) - i = encodeVarintMsgsDtagRequests(dAtA, i, uint64(len(m.Receiver))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgRequestDTagTransferResponse) 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 *MsgRequestDTagTransferResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgRequestDTagTransferResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *MsgCancelDTagTransferRequest) 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 *MsgCancelDTagTransferRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgCancelDTagTransferRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintMsgsDtagRequests(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0x12 - } - if len(m.Receiver) > 0 { - i -= len(m.Receiver) - copy(dAtA[i:], m.Receiver) - i = encodeVarintMsgsDtagRequests(dAtA, i, uint64(len(m.Receiver))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgCancelDTagTransferRequestResponse) 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 *MsgCancelDTagTransferRequestResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgCancelDTagTransferRequestResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *MsgAcceptDTagTransferRequest) 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 *MsgAcceptDTagTransferRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgAcceptDTagTransferRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Receiver) > 0 { - i -= len(m.Receiver) - copy(dAtA[i:], m.Receiver) - i = encodeVarintMsgsDtagRequests(dAtA, i, uint64(len(m.Receiver))) - i-- - dAtA[i] = 0x1a - } - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintMsgsDtagRequests(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0x12 - } - if len(m.NewDTag) > 0 { - i -= len(m.NewDTag) - copy(dAtA[i:], m.NewDTag) - i = encodeVarintMsgsDtagRequests(dAtA, i, uint64(len(m.NewDTag))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgAcceptDTagTransferRequestResponse) 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 *MsgAcceptDTagTransferRequestResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgAcceptDTagTransferRequestResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *MsgRefuseDTagTransferRequest) 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 *MsgRefuseDTagTransferRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgRefuseDTagTransferRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Receiver) > 0 { - i -= len(m.Receiver) - copy(dAtA[i:], m.Receiver) - i = encodeVarintMsgsDtagRequests(dAtA, i, uint64(len(m.Receiver))) - i-- - dAtA[i] = 0x12 - } - if len(m.Sender) > 0 { - i -= len(m.Sender) - copy(dAtA[i:], m.Sender) - i = encodeVarintMsgsDtagRequests(dAtA, i, uint64(len(m.Sender))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgRefuseDTagTransferRequestResponse) 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 *MsgRefuseDTagTransferRequestResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgRefuseDTagTransferRequestResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func encodeVarintMsgsDtagRequests(dAtA []byte, offset int, v uint64) int { - offset -= sovMsgsDtagRequests(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *MsgRequestDTagTransfer) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Receiver) - if l > 0 { - n += 1 + l + sovMsgsDtagRequests(uint64(l)) - } - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovMsgsDtagRequests(uint64(l)) - } - return n -} - -func (m *MsgRequestDTagTransferResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *MsgCancelDTagTransferRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Receiver) - if l > 0 { - n += 1 + l + sovMsgsDtagRequests(uint64(l)) - } - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovMsgsDtagRequests(uint64(l)) - } - return n -} - -func (m *MsgCancelDTagTransferRequestResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *MsgAcceptDTagTransferRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.NewDTag) - if l > 0 { - n += 1 + l + sovMsgsDtagRequests(uint64(l)) - } - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovMsgsDtagRequests(uint64(l)) - } - l = len(m.Receiver) - if l > 0 { - n += 1 + l + sovMsgsDtagRequests(uint64(l)) - } - return n -} - -func (m *MsgAcceptDTagTransferRequestResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *MsgRefuseDTagTransferRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Sender) - if l > 0 { - n += 1 + l + sovMsgsDtagRequests(uint64(l)) - } - l = len(m.Receiver) - if l > 0 { - n += 1 + l + sovMsgsDtagRequests(uint64(l)) - } - return n -} - -func (m *MsgRefuseDTagTransferRequestResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func sovMsgsDtagRequests(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozMsgsDtagRequests(x uint64) (n int) { - return sovMsgsDtagRequests(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *MsgRequestDTagTransfer) 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 ErrIntOverflowMsgsDtagRequests - } - 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: MsgRequestDTagTransfer: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRequestDTagTransfer: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsDtagRequests - } - 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 ErrInvalidLengthMsgsDtagRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Receiver = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsDtagRequests - } - 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 ErrInvalidLengthMsgsDtagRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsDtagRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgRequestDTagTransferResponse) 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 ErrIntOverflowMsgsDtagRequests - } - 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: MsgRequestDTagTransferResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRequestDTagTransferResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsDtagRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgCancelDTagTransferRequest) 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 ErrIntOverflowMsgsDtagRequests - } - 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: MsgCancelDTagTransferRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCancelDTagTransferRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsDtagRequests - } - 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 ErrInvalidLengthMsgsDtagRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Receiver = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsDtagRequests - } - 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 ErrInvalidLengthMsgsDtagRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsDtagRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgCancelDTagTransferRequestResponse) 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 ErrIntOverflowMsgsDtagRequests - } - 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: MsgCancelDTagTransferRequestResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCancelDTagTransferRequestResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsDtagRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgAcceptDTagTransferRequest) 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 ErrIntOverflowMsgsDtagRequests - } - 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: MsgAcceptDTagTransferRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgAcceptDTagTransferRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field NewDTag", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsDtagRequests - } - 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 ErrInvalidLengthMsgsDtagRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.NewDTag = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsDtagRequests - } - 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 ErrInvalidLengthMsgsDtagRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsDtagRequests - } - 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 ErrInvalidLengthMsgsDtagRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Receiver = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsDtagRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgAcceptDTagTransferRequestResponse) 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 ErrIntOverflowMsgsDtagRequests - } - 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: MsgAcceptDTagTransferRequestResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgAcceptDTagTransferRequestResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsDtagRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgRefuseDTagTransferRequest) 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 ErrIntOverflowMsgsDtagRequests - } - 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: MsgRefuseDTagTransferRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRefuseDTagTransferRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Sender", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsDtagRequests - } - 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 ErrInvalidLengthMsgsDtagRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Sender = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Receiver", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsDtagRequests - } - 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 ErrInvalidLengthMsgsDtagRequests - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Receiver = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsDtagRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgRefuseDTagTransferRequestResponse) 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 ErrIntOverflowMsgsDtagRequests - } - 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: MsgRefuseDTagTransferRequestResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRefuseDTagTransferRequestResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsDtagRequests(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsDtagRequests - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipMsgsDtagRequests(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, ErrIntOverflowMsgsDtagRequests - } - 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, ErrIntOverflowMsgsDtagRequests - } - 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, ErrIntOverflowMsgsDtagRequests - } - 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, ErrInvalidLengthMsgsDtagRequests - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupMsgsDtagRequests - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthMsgsDtagRequests - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthMsgsDtagRequests = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMsgsDtagRequests = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupMsgsDtagRequests = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/profiles/types/msgs_dtag_requests_test.go b/x/profiles/types/msgs_dtag_requests_test.go index 34c6bc5418..823a864ce9 100644 --- a/x/profiles/types/msgs_dtag_requests_test.go +++ b/x/profiles/types/msgs_dtag_requests_test.go @@ -68,11 +68,6 @@ func TestMsgRequestDTagTransfer_ValidateBasic(t *testing.T) { } } -func TestMsgRequestDTagTransfer_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRequestDTagTransfer","value":{"receiver":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","sender":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"}}` - require.Equal(t, expected, string(msgRequestTransferDTag.GetSignBytes())) -} - func TestMsgRequestDTagTransfer_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRequestTransferDTag.Sender) require.Equal(t, []sdk.AccAddress{addr}, msgRequestTransferDTag.GetSigners()) @@ -157,11 +152,6 @@ func TestMsgAcceptDTagTransferRequest_ValidateBasic(t *testing.T) { } } -func TestMsgAcceptDTagTransferRequest_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgAcceptDTagTransferRequest","value":{"new_dtag":"dtag","receiver":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns","sender":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"}}` - require.Equal(t, expected, string(msgAcceptDTagTransfer.GetSignBytes())) -} - func TestMsgAcceptDTagTransferRequest_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgAcceptDTagTransfer.Receiver) require.Equal(t, []sdk.AccAddress{addr}, msgAcceptDTagTransfer.GetSigners()) @@ -236,11 +226,6 @@ func TestMsgRejectDTagTransferRequest_ValidateBasic(t *testing.T) { } } -func TestMsgRejectDTagTransferRequest_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRefuseDTagTransferRequest","value":{"receiver":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns","sender":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"}}` - require.Equal(t, expected, string(msgRejectDTagTransfer.GetSignBytes())) -} - func TestMsgRejectDTagTransferRequest_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRejectDTagTransfer.Receiver) require.Equal(t, []sdk.AccAddress{addr}, msgRejectDTagTransfer.GetSigners()) @@ -312,11 +297,6 @@ func TestMsgCancelDTagTransferRequest_ValidateBasic(t *testing.T) { } } -func TestMsgCancelDTagTransferRequest_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgCancelDTagTransferRequest","value":{"receiver":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","sender":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"}}` - require.Equal(t, expected, string(msgCancelDTagTransferReq.GetSignBytes())) -} - func TestMsgCancelDTagTransferRequest_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgCancelDTagTransferReq.Sender) require.Equal(t, []sdk.AccAddress{addr}, msgCancelDTagTransferReq.GetSigners()) diff --git a/x/profiles/types/msgs_params.go b/x/profiles/types/msgs_params.go index 1dd1cfeb45..723d833534 100644 --- a/x/profiles/types/msgs_params.go +++ b/x/profiles/types/msgs_params.go @@ -2,12 +2,10 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" ) var ( - _ sdk.Msg = &MsgUpdateParams{} - _ legacytx.LegacyMsg = &MsgUpdateParams{} + _ sdk.Msg = &MsgUpdateParams{} ) func NewMsgUpdateParams(params Params, authority string) *MsgUpdateParams { @@ -42,8 +40,3 @@ func (msg *MsgUpdateParams) GetSigners() []sdk.AccAddress { authority := sdk.MustAccAddressFromBech32(msg.Authority) return []sdk.AccAddress{authority} } - -// GetSigners implements legacytx.LegacyMsg -func (msg *MsgUpdateParams) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} diff --git a/x/profiles/types/msgs_params.pb.go b/x/profiles/types/msgs_params.pb.go deleted file mode 100644 index 20fe430d16..0000000000 --- a/x/profiles/types/msgs_params.pb.go +++ /dev/null @@ -1,515 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: desmos/profiles/v3/msgs_params.proto - -package types - -import ( - fmt "fmt" - _ "github.com/cosmos/cosmos-proto" - _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/cosmos-sdk/types/tx/amino" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// MsgUpdateParams is the Msg/UpdateParams request type. -// -// Since: Desmos 5.0.0 -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 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_218946f21050b13e, []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: Desmos 5.0.0 -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_218946f21050b13e, []int{1} -} -func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgUpdateParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgUpdateParamsResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MsgUpdateParamsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateParamsResponse.Merge(m, src) -} -func (m *MsgUpdateParamsResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateParamsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo - -func init() { - proto.RegisterType((*MsgUpdateParams)(nil), "desmos.profiles.v3.MsgUpdateParams") - proto.RegisterType((*MsgUpdateParamsResponse)(nil), "desmos.profiles.v3.MsgUpdateParamsResponse") -} - -func init() { - proto.RegisterFile("desmos/profiles/v3/msgs_params.proto", fileDescriptor_218946f21050b13e) -} - -var fileDescriptor_218946f21050b13e = []byte{ - // 325 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x49, 0x49, 0x2d, 0xce, - 0xcd, 0x2f, 0xd6, 0x2f, 0x28, 0xca, 0x4f, 0xcb, 0xcc, 0x49, 0x2d, 0xd6, 0x2f, 0x33, 0xd6, 0xcf, - 0x2d, 0x4e, 0x2f, 0x8e, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x12, 0x82, 0xa8, 0xd2, 0x83, 0xa9, 0xd2, 0x2b, 0x33, 0x96, 0x12, 0x4c, 0xcc, 0xcd, 0xcc, - 0xcb, 0xd7, 0x07, 0x93, 0x10, 0x65, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0xa6, 0x3e, 0x88, - 0x05, 0x15, 0x95, 0x4c, 0xce, 0x07, 0x69, 0x8e, 0x87, 0x48, 0x40, 0x38, 0x50, 0x29, 0x71, 0x08, - 0x0f, 0x64, 0xa3, 0x7e, 0x99, 0x21, 0x88, 0x82, 0x4a, 0xa8, 0x61, 0x73, 0x56, 0x7e, 0x4a, 0x6a, - 0x0e, 0xaa, 0xc3, 0x94, 0xf6, 0x31, 0x72, 0xf1, 0xfb, 0x16, 0xa7, 0x87, 0x16, 0xa4, 0x24, 0x96, - 0xa4, 0x06, 0x80, 0x65, 0x84, 0xcc, 0xb8, 0x38, 0x13, 0x4b, 0x4b, 0x32, 0xf2, 0x8b, 0x32, 0x4b, - 0x2a, 0x25, 0x18, 0x15, 0x18, 0x35, 0x38, 0x9d, 0x24, 0x2e, 0x6d, 0xd1, 0x15, 0x81, 0xda, 0xec, - 0x98, 0x92, 0x52, 0x94, 0x5a, 0x5c, 0x1c, 0x5c, 0x52, 0x94, 0x99, 0x97, 0x1e, 0x84, 0x50, 0x2a, - 0x64, 0xcb, 0xc5, 0x06, 0x31, 0x5b, 0x82, 0x49, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x4a, 0x0f, 0xd3, - 0xd7, 0x7a, 0x10, 0x3b, 0x9c, 0x38, 0x4f, 0xdc, 0x93, 0x67, 0x58, 0xf1, 0x7c, 0x83, 0x16, 0x63, - 0x10, 0x54, 0x93, 0x95, 0x49, 0xd3, 0xf3, 0x0d, 0x5a, 0x08, 0xe3, 0xba, 0x9e, 0x6f, 0xd0, 0x52, - 0x84, 0xfa, 0xa2, 0x02, 0xe1, 0x0f, 0x34, 0xc7, 0x2a, 0x49, 0x72, 0x89, 0xa3, 0x09, 0x05, 0xa5, - 0x16, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x3a, 0x79, 0x9f, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, - 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, - 0x1c, 0x43, 0x94, 0x61, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x3e, 0xc4, - 0x0a, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x28, 0x5b, 0xbf, 0xcc, 0x14, 0xd9, 0xc6, 0x92, 0xca, 0x82, - 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x78, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x21, 0xa6, 0x03, - 0xf7, 0xf0, 0x01, 0x00, 0x00, -} - -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 = encodeVarintMsgsParams(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - if len(m.Authority) > 0 { - i -= len(m.Authority) - copy(dAtA[i:], m.Authority) - i = encodeVarintMsgsParams(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 encodeVarintMsgsParams(dAtA []byte, offset int, v uint64) int { - offset -= sovMsgsParams(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 + sovMsgsParams(uint64(l)) - } - l = m.Params.Size() - n += 1 + l + sovMsgsParams(uint64(l)) - return n -} - -func (m *MsgUpdateParamsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func sovMsgsParams(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozMsgsParams(x uint64) (n int) { - return sovMsgsParams(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 ErrIntOverflowMsgsParams - } - 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 ErrIntOverflowMsgsParams - } - 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 ErrInvalidLengthMsgsParams - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsParams - } - 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 ErrIntOverflowMsgsParams - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthMsgsParams - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthMsgsParams - } - 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 := skipMsgsParams(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsParams - } - 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 ErrIntOverflowMsgsParams - } - 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 := skipMsgsParams(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsParams - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipMsgsParams(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, ErrIntOverflowMsgsParams - } - 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, ErrIntOverflowMsgsParams - } - 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, ErrIntOverflowMsgsParams - } - 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, ErrInvalidLengthMsgsParams - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupMsgsParams - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthMsgsParams - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthMsgsParams = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMsgsParams = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupMsgsParams = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/profiles/types/msgs_params_test.go b/x/profiles/types/msgs_params_test.go index 022555bb9c..a4ad8a1bd9 100644 --- a/x/profiles/types/msgs_params_test.go +++ b/x/profiles/types/msgs_params_test.go @@ -55,11 +55,6 @@ func TestMsgUpdateParams_ValidateBasic(t *testing.T) { } } -func TestMsgUpdateParams_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/x/profiles/MsgUpdateParams","value":{"authority":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","params":{"app_links":{"validity_duration":"31536000000000000"},"bio":{"max_length":"1000"},"dtag":{"max_length":"30","min_length":"3","reg_ex":"^[A-Za-z0-9_]+$"},"nickname":{"max_length":"1000","min_length":"2"},"oracle":{"ask_count":"1","execute_gas":"200000","fee_amount":[{"amount":"10","denom":"band"}],"min_count":"1","prepare_gas":"50000"}}}}` - require.Equal(t, expected, string(msgUpdateParams.GetSignBytes())) -} - func TestMsgUpdateParams_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgUpdateParams.Authority) require.Equal(t, []sdk.AccAddress{addr}, msgUpdateParams.GetSigners()) diff --git a/x/profiles/types/msgs_profile.go b/x/profiles/types/msgs_profile.go index 63f224575a..e374ba8dc8 100644 --- a/x/profiles/types/msgs_profile.go +++ b/x/profiles/types/msgs_profile.go @@ -40,11 +40,6 @@ func (msg *MsgSaveProfile) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgSaveProfile) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgSaveProfile) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Creator) @@ -76,11 +71,6 @@ func (msg *MsgDeleteProfile) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgDeleteProfile) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgDeleteProfile) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Creator) diff --git a/x/profiles/types/msgs_profile.pb.go b/x/profiles/types/msgs_profile.pb.go deleted file mode 100644 index a9e6ebd7ab..0000000000 --- a/x/profiles/types/msgs_profile.pb.go +++ /dev/null @@ -1,1018 +0,0 @@ -// Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: desmos/profiles/v3/msgs_profile.proto - -package types - -import ( - fmt "fmt" - _ "github.com/cosmos/cosmos-proto" - _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/cosmos-sdk/types/tx/amino" - _ "github.com/cosmos/gogoproto/gogoproto" - proto "github.com/cosmos/gogoproto/proto" - io "io" - math "math" - math_bits "math/bits" -) - -// Reference imports to suppress errors if they are not otherwise used. -var _ = proto.Marshal -var _ = fmt.Errorf -var _ = math.Inf - -// This is a compile-time assertion to ensure that this generated file -// is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package - -// MsgSaveProfile represents a message to save a profile. -type MsgSaveProfile struct { - // DTag of the profile. If it shouldn't be changed, [do-no-modify] can be used - // instead. - DTag string `protobuf:"bytes,1,opt,name=dtag,proto3" json:"dtag,omitempty" yaml:"dtag"` - // Nickname of the profile. If it shouldn't be changed, [do-no-modify] can be - // used instead. - Nickname string `protobuf:"bytes,2,opt,name=nickname,proto3" json:"nickname,omitempty" yaml:"nickname"` - // Bio of the profile. If it shouldn't be changed, [do-no-modify] can be used - // instead. - Bio string `protobuf:"bytes,3,opt,name=bio,proto3" json:"bio,omitempty" yaml:"bio"` - // URL to the profile picture. If it shouldn't be changed, [do-no-modify] can - // be used instead. - ProfilePicture string `protobuf:"bytes,4,opt,name=profile_picture,json=profilePicture,proto3" json:"profile_picture,omitempty" yaml:"profile_picture"` - // URL to the profile cover. If it shouldn't be changed, [do-no-modify] can be - // used instead. - CoverPicture string `protobuf:"bytes,5,opt,name=cover_picture,json=coverPicture,proto3" json:"cover_picture,omitempty" yaml:"cover_picture"` - // Address of the user associated to the profile - Creator string `protobuf:"bytes,6,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` -} - -func (m *MsgSaveProfile) Reset() { *m = MsgSaveProfile{} } -func (m *MsgSaveProfile) String() string { return proto.CompactTextString(m) } -func (*MsgSaveProfile) ProtoMessage() {} -func (*MsgSaveProfile) Descriptor() ([]byte, []int) { - return fileDescriptor_5ea75cf4ca5bb3a3, []int{0} -} -func (m *MsgSaveProfile) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgSaveProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgSaveProfile.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 *MsgSaveProfile) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSaveProfile.Merge(m, src) -} -func (m *MsgSaveProfile) XXX_Size() int { - return m.Size() -} -func (m *MsgSaveProfile) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSaveProfile.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgSaveProfile proto.InternalMessageInfo - -func (m *MsgSaveProfile) GetDTag() string { - if m != nil { - return m.DTag - } - return "" -} - -func (m *MsgSaveProfile) GetNickname() string { - if m != nil { - return m.Nickname - } - return "" -} - -func (m *MsgSaveProfile) GetBio() string { - if m != nil { - return m.Bio - } - return "" -} - -func (m *MsgSaveProfile) GetProfilePicture() string { - if m != nil { - return m.ProfilePicture - } - return "" -} - -func (m *MsgSaveProfile) GetCoverPicture() string { - if m != nil { - return m.CoverPicture - } - return "" -} - -func (m *MsgSaveProfile) GetCreator() string { - if m != nil { - return m.Creator - } - return "" -} - -// MsgSaveProfileResponse defines the Msg/SaveProfile response type. -type MsgSaveProfileResponse struct { -} - -func (m *MsgSaveProfileResponse) Reset() { *m = MsgSaveProfileResponse{} } -func (m *MsgSaveProfileResponse) String() string { return proto.CompactTextString(m) } -func (*MsgSaveProfileResponse) ProtoMessage() {} -func (*MsgSaveProfileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5ea75cf4ca5bb3a3, []int{1} -} -func (m *MsgSaveProfileResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgSaveProfileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgSaveProfileResponse.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 *MsgSaveProfileResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgSaveProfileResponse.Merge(m, src) -} -func (m *MsgSaveProfileResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgSaveProfileResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgSaveProfileResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgSaveProfileResponse proto.InternalMessageInfo - -// MsgDeleteProfile represents the message used to delete an existing profile. -type MsgDeleteProfile struct { - // Address associated to the profile to be deleted - Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty" yaml:"creator"` -} - -func (m *MsgDeleteProfile) Reset() { *m = MsgDeleteProfile{} } -func (m *MsgDeleteProfile) String() string { return proto.CompactTextString(m) } -func (*MsgDeleteProfile) ProtoMessage() {} -func (*MsgDeleteProfile) Descriptor() ([]byte, []int) { - return fileDescriptor_5ea75cf4ca5bb3a3, []int{2} -} -func (m *MsgDeleteProfile) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgDeleteProfile) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgDeleteProfile.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 *MsgDeleteProfile) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgDeleteProfile.Merge(m, src) -} -func (m *MsgDeleteProfile) XXX_Size() int { - return m.Size() -} -func (m *MsgDeleteProfile) XXX_DiscardUnknown() { - xxx_messageInfo_MsgDeleteProfile.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgDeleteProfile proto.InternalMessageInfo - -func (m *MsgDeleteProfile) GetCreator() string { - if m != nil { - return m.Creator - } - return "" -} - -// MsgDeleteProfileResponse defines the Msg/DeleteProfile response type. -type MsgDeleteProfileResponse struct { -} - -func (m *MsgDeleteProfileResponse) Reset() { *m = MsgDeleteProfileResponse{} } -func (m *MsgDeleteProfileResponse) String() string { return proto.CompactTextString(m) } -func (*MsgDeleteProfileResponse) ProtoMessage() {} -func (*MsgDeleteProfileResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_5ea75cf4ca5bb3a3, []int{3} -} -func (m *MsgDeleteProfileResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MsgDeleteProfileResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MsgDeleteProfileResponse.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 *MsgDeleteProfileResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgDeleteProfileResponse.Merge(m, src) -} -func (m *MsgDeleteProfileResponse) XXX_Size() int { - return m.Size() -} -func (m *MsgDeleteProfileResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgDeleteProfileResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_MsgDeleteProfileResponse proto.InternalMessageInfo - -func init() { - proto.RegisterType((*MsgSaveProfile)(nil), "desmos.profiles.v3.MsgSaveProfile") - proto.RegisterType((*MsgSaveProfileResponse)(nil), "desmos.profiles.v3.MsgSaveProfileResponse") - proto.RegisterType((*MsgDeleteProfile)(nil), "desmos.profiles.v3.MsgDeleteProfile") - proto.RegisterType((*MsgDeleteProfileResponse)(nil), "desmos.profiles.v3.MsgDeleteProfileResponse") -} - -func init() { - proto.RegisterFile("desmos/profiles/v3/msgs_profile.proto", fileDescriptor_5ea75cf4ca5bb3a3) -} - -var fileDescriptor_5ea75cf4ca5bb3a3 = []byte{ - // 464 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x31, 0x6f, 0x13, 0x31, - 0x18, 0x86, 0x73, 0x24, 0x14, 0x30, 0x90, 0xc2, 0x11, 0x1a, 0x93, 0xe1, 0xae, 0xb2, 0x04, 0xaa, - 0x82, 0x1a, 0xab, 0x8a, 0x58, 0x2a, 0x31, 0x50, 0xb2, 0xa1, 0x4a, 0xd5, 0x95, 0x89, 0x25, 0xf2, - 0x5d, 0x8c, 0xb1, 0xc8, 0x9d, 0x4f, 0xb6, 0x7b, 0xa2, 0x6b, 0x46, 0x26, 0x7e, 0x4a, 0x07, 0x7e, - 0x04, 0x63, 0xc5, 0xc4, 0x74, 0x42, 0xc9, 0xd0, 0xfd, 0x7e, 0x01, 0x8a, 0xed, 0x4b, 0x48, 0xc6, - 0x2e, 0x89, 0xfd, 0xbe, 0xcf, 0xfb, 0x7d, 0xdf, 0xf9, 0x7c, 0xe0, 0xe5, 0x84, 0xaa, 0x54, 0x28, - 0x9c, 0x4b, 0xf1, 0x99, 0x4f, 0xa9, 0xc2, 0xc5, 0x10, 0xa7, 0x8a, 0xa9, 0xb1, 0x13, 0x06, 0xb9, - 0x14, 0x5a, 0xf8, 0xbe, 0xc5, 0x06, 0x35, 0x36, 0x28, 0x86, 0xbd, 0xa7, 0x24, 0xe5, 0x99, 0xc0, - 0xe6, 0xd7, 0x62, 0xbd, 0x0e, 0x13, 0x4c, 0x98, 0x25, 0x5e, 0xae, 0x9c, 0xda, 0x4d, 0x84, 0xe9, - 0x91, 0x2a, 0x86, 0x8b, 0xa3, 0xe5, 0x9f, 0x33, 0x5e, 0x58, 0x63, 0x6c, 0x13, 0x76, 0x63, 0x2d, - 0x34, 0x6b, 0x82, 0xf6, 0xa9, 0x62, 0xe7, 0xa4, 0xa0, 0x67, 0xb6, 0xa7, 0xff, 0x1a, 0xb4, 0x26, - 0x9a, 0x30, 0xe8, 0xed, 0x7b, 0x07, 0x0f, 0x4e, 0xba, 0xf3, 0x32, 0x6c, 0x8d, 0x3e, 0x12, 0x56, - 0x95, 0xe1, 0xc3, 0x4b, 0x92, 0x4e, 0x8f, 0xd1, 0xd2, 0x45, 0x91, 0x81, 0x7c, 0x0c, 0xee, 0x67, - 0x3c, 0xf9, 0x9a, 0x91, 0x94, 0xc2, 0x3b, 0x26, 0xf0, 0xac, 0x2a, 0xc3, 0x5d, 0x0b, 0xd6, 0x0e, - 0x8a, 0x56, 0x90, 0xbf, 0x0f, 0x9a, 0x31, 0x17, 0xb0, 0x69, 0xd8, 0x76, 0x55, 0x86, 0xc0, 0xb2, - 0x31, 0x17, 0x28, 0x5a, 0x5a, 0xfe, 0x7b, 0xb0, 0xeb, 0x1e, 0x7f, 0x9c, 0xf3, 0x44, 0x5f, 0x48, - 0x0a, 0x5b, 0x86, 0xee, 0x55, 0x65, 0xb8, 0x67, 0xe9, 0x2d, 0x00, 0x45, 0x6d, 0xa7, 0x9c, 0x59, - 0xc1, 0x7f, 0x0b, 0x1e, 0x27, 0xa2, 0xa0, 0x72, 0x55, 0xe2, 0xae, 0x29, 0x01, 0xab, 0x32, 0xec, - 0xd8, 0x12, 0x1b, 0x36, 0x8a, 0x1e, 0x99, 0x7d, 0x1d, 0x1f, 0x81, 0x7b, 0x89, 0xa4, 0x44, 0x0b, - 0x09, 0x77, 0x4c, 0xb0, 0x5f, 0x95, 0x61, 0xdb, 0x05, 0xad, 0x81, 0x7e, 0xff, 0x3c, 0xec, 0xb8, - 0xb3, 0x7c, 0x37, 0x99, 0x48, 0xaa, 0xd4, 0xb9, 0x96, 0x3c, 0x63, 0x51, 0x1d, 0x3d, 0x7e, 0x35, - 0xbb, 0xb9, 0xea, 0xd7, 0xbb, 0xef, 0x37, 0x57, 0xfd, 0xe7, 0xee, 0x16, 0x6c, 0x9e, 0x38, 0x82, - 0x60, 0x6f, 0x53, 0x89, 0xa8, 0xca, 0x45, 0xa6, 0x28, 0x9a, 0x79, 0xe0, 0xc9, 0xa9, 0x62, 0x23, - 0x3a, 0xa5, 0x7a, 0xf5, 0x82, 0xfe, 0x1b, 0xce, 0xbb, 0xfd, 0x70, 0x07, 0xdb, 0xc3, 0x75, 0xd7, - 0xc3, 0x6d, 0xf4, 0x43, 0x3d, 0x00, 0xb7, 0xb5, 0x7a, 0xc0, 0x93, 0x0f, 0xbf, 0xe6, 0x81, 0x77, - 0x3d, 0x0f, 0xbc, 0xbf, 0xf3, 0xc0, 0xfb, 0xb1, 0x08, 0x1a, 0xd7, 0x8b, 0xa0, 0xf1, 0x67, 0x11, - 0x34, 0x3e, 0x1d, 0x31, 0xae, 0xbf, 0x5c, 0xc4, 0x83, 0x44, 0xa4, 0xd8, 0x56, 0x3e, 0x9c, 0x92, - 0x58, 0xb9, 0x35, 0x2e, 0xde, 0xe0, 0x6f, 0xeb, 0xaf, 0x41, 0x5f, 0xe6, 0x54, 0xc5, 0x3b, 0xe6, - 0x4e, 0x0e, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x93, 0x57, 0x84, 0xa6, 0x2d, 0x03, 0x00, 0x00, -} - -func (m *MsgSaveProfile) 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 *MsgSaveProfile) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgSaveProfile) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Creator) > 0 { - i -= len(m.Creator) - copy(dAtA[i:], m.Creator) - i = encodeVarintMsgsProfile(dAtA, i, uint64(len(m.Creator))) - i-- - dAtA[i] = 0x32 - } - if len(m.CoverPicture) > 0 { - i -= len(m.CoverPicture) - copy(dAtA[i:], m.CoverPicture) - i = encodeVarintMsgsProfile(dAtA, i, uint64(len(m.CoverPicture))) - i-- - dAtA[i] = 0x2a - } - if len(m.ProfilePicture) > 0 { - i -= len(m.ProfilePicture) - copy(dAtA[i:], m.ProfilePicture) - i = encodeVarintMsgsProfile(dAtA, i, uint64(len(m.ProfilePicture))) - i-- - dAtA[i] = 0x22 - } - if len(m.Bio) > 0 { - i -= len(m.Bio) - copy(dAtA[i:], m.Bio) - i = encodeVarintMsgsProfile(dAtA, i, uint64(len(m.Bio))) - i-- - dAtA[i] = 0x1a - } - if len(m.Nickname) > 0 { - i -= len(m.Nickname) - copy(dAtA[i:], m.Nickname) - i = encodeVarintMsgsProfile(dAtA, i, uint64(len(m.Nickname))) - i-- - dAtA[i] = 0x12 - } - if len(m.DTag) > 0 { - i -= len(m.DTag) - copy(dAtA[i:], m.DTag) - i = encodeVarintMsgsProfile(dAtA, i, uint64(len(m.DTag))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgSaveProfileResponse) 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 *MsgSaveProfileResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgSaveProfileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func (m *MsgDeleteProfile) 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 *MsgDeleteProfile) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgDeleteProfile) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Creator) > 0 { - i -= len(m.Creator) - copy(dAtA[i:], m.Creator) - i = encodeVarintMsgsProfile(dAtA, i, uint64(len(m.Creator))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *MsgDeleteProfileResponse) 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 *MsgDeleteProfileResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MsgDeleteProfileResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - -func encodeVarintMsgsProfile(dAtA []byte, offset int, v uint64) int { - offset -= sovMsgsProfile(v) - base := offset - for v >= 1<<7 { - dAtA[offset] = uint8(v&0x7f | 0x80) - v >>= 7 - offset++ - } - dAtA[offset] = uint8(v) - return base -} -func (m *MsgSaveProfile) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.DTag) - if l > 0 { - n += 1 + l + sovMsgsProfile(uint64(l)) - } - l = len(m.Nickname) - if l > 0 { - n += 1 + l + sovMsgsProfile(uint64(l)) - } - l = len(m.Bio) - if l > 0 { - n += 1 + l + sovMsgsProfile(uint64(l)) - } - l = len(m.ProfilePicture) - if l > 0 { - n += 1 + l + sovMsgsProfile(uint64(l)) - } - l = len(m.CoverPicture) - if l > 0 { - n += 1 + l + sovMsgsProfile(uint64(l)) - } - l = len(m.Creator) - if l > 0 { - n += 1 + l + sovMsgsProfile(uint64(l)) - } - return n -} - -func (m *MsgSaveProfileResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func (m *MsgDeleteProfile) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Creator) - if l > 0 { - n += 1 + l + sovMsgsProfile(uint64(l)) - } - return n -} - -func (m *MsgDeleteProfileResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - -func sovMsgsProfile(x uint64) (n int) { - return (math_bits.Len64(x|1) + 6) / 7 -} -func sozMsgsProfile(x uint64) (n int) { - return sovMsgsProfile(uint64((x << 1) ^ uint64((int64(x) >> 63)))) -} -func (m *MsgSaveProfile) 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 ErrIntOverflowMsgsProfile - } - 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: MsgSaveProfile: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSaveProfile: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DTag", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsProfile - } - 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 ErrInvalidLengthMsgsProfile - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsProfile - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.DTag = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Nickname", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsProfile - } - 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 ErrInvalidLengthMsgsProfile - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsProfile - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Nickname = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Bio", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsProfile - } - 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 ErrInvalidLengthMsgsProfile - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsProfile - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Bio = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProfilePicture", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsProfile - } - 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 ErrInvalidLengthMsgsProfile - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsProfile - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProfilePicture = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CoverPicture", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsProfile - } - 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 ErrInvalidLengthMsgsProfile - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsProfile - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.CoverPicture = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsProfile - } - 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 ErrInvalidLengthMsgsProfile - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsProfile - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Creator = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsProfile(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsProfile - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgSaveProfileResponse) 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 ErrIntOverflowMsgsProfile - } - 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: MsgSaveProfileResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgSaveProfileResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsProfile(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsProfile - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgDeleteProfile) 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 ErrIntOverflowMsgsProfile - } - 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: MsgDeleteProfile: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgDeleteProfile: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Creator", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowMsgsProfile - } - 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 ErrInvalidLengthMsgsProfile - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthMsgsProfile - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Creator = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipMsgsProfile(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsProfile - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MsgDeleteProfileResponse) 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 ErrIntOverflowMsgsProfile - } - 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: MsgDeleteProfileResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MsgDeleteProfileResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipMsgsProfile(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthMsgsProfile - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func skipMsgsProfile(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, ErrIntOverflowMsgsProfile - } - 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, ErrIntOverflowMsgsProfile - } - 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, ErrIntOverflowMsgsProfile - } - 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, ErrInvalidLengthMsgsProfile - } - iNdEx += length - case 3: - depth++ - case 4: - if depth == 0 { - return 0, ErrUnexpectedEndOfGroupMsgsProfile - } - depth-- - case 5: - iNdEx += 4 - default: - return 0, fmt.Errorf("proto: illegal wireType %d", wireType) - } - if iNdEx < 0 { - return 0, ErrInvalidLengthMsgsProfile - } - if depth == 0 { - return iNdEx, nil - } - } - return 0, io.ErrUnexpectedEOF -} - -var ( - ErrInvalidLengthMsgsProfile = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowMsgsProfile = fmt.Errorf("proto: integer overflow") - ErrUnexpectedEndOfGroupMsgsProfile = fmt.Errorf("proto: unexpected end of group") -) diff --git a/x/profiles/types/msgs_profile_test.go b/x/profiles/types/msgs_profile_test.go index f5120d8120..8c2b21d8bf 100644 --- a/x/profiles/types/msgs_profile_test.go +++ b/x/profiles/types/msgs_profile_test.go @@ -66,11 +66,6 @@ func TestMsgSaveProfile_ValidateBasic(t *testing.T) { } } -func TestMsgSaveProfile_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgSaveProfile","value":{"bio":"biography","cover_picture":"https://shorturl.at/cgpyF","creator":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns","dtag":"monk","nickname":"nickname","profile_picture":"https://shorturl.at/adnX3"}}` - require.Equal(t, expected, string(msgEditProfile.GetSignBytes())) -} - func TestMsgSaveProfile_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgEditProfile.Creator) require.Equal(t, []sdk.AccAddress{addr}, msgEditProfile.GetSigners()) @@ -122,11 +117,6 @@ func TestMsgDeleteProfile_ValidateBasic(t *testing.T) { } } -func TestMsgDeleteProfile_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgDeleteProfile","value":{"creator":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"}}` - require.Equal(t, expected, string(msgDeleteProfile.GetSignBytes())) -} - func TestMsgDeleteProfile_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgDeleteProfile.Creator) require.Equal(t, []sdk.AccAddress{addr}, msgDeleteProfile.GetSigners()) diff --git a/x/profiles/types/query.pb.go b/x/profiles/types/query.pb.go index e9410e055e..97df489d6a 100644 --- a/x/profiles/types/query.pb.go +++ b/x/profiles/types/query.pb.go @@ -29,46 +29,46 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("desmos/profiles/v3/query.proto", fileDescriptor_bcbdebc2a1cf2f2b) } var fileDescriptor_bcbdebc2a1cf2f2b = []byte{ - // 615 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x4f, 0x6b, 0x13, 0x4f, - 0x18, 0xc7, 0xbb, 0x3f, 0xf8, 0x55, 0x18, 0x04, 0xe5, 0x01, 0x41, 0x43, 0xdc, 0x62, 0x35, 0x7f, - 0x48, 0xb3, 0xbb, 0x4d, 0x43, 0x8b, 0x11, 0x3d, 0xb4, 0x8d, 0x87, 0xa2, 0x60, 0x95, 0x9e, 0xbc, - 0x84, 0x49, 0x32, 0xd9, 0x2e, 0x6e, 0x66, 0xb6, 0x3b, 0x9b, 0xd8, 0x50, 0x72, 0xf1, 0xe6, 0xa5, - 0x08, 0xde, 0x3d, 0xf9, 0x12, 0x7c, 0x0f, 0x7a, 0x11, 0x0b, 0x5e, 0x3c, 0x4a, 0xe2, 0x0b, 0x91, - 0xcc, 0xce, 0x24, 0x1a, 0x77, 0x92, 0x34, 0xb7, 0x25, 0xf3, 0xfd, 0x3e, 0xcf, 0xe7, 0x3b, 0xcf, - 0xc3, 0x04, 0x99, 0x4d, 0xc2, 0xdb, 0x8c, 0x3b, 0x41, 0xc8, 0x5a, 0x9e, 0x4f, 0xb8, 0xd3, 0x2d, - 0x3b, 0x27, 0x1d, 0x12, 0xf6, 0xec, 0x20, 0x64, 0x11, 0x03, 0x88, 0xcf, 0x6d, 0x75, 0x6e, 0x77, - 0xcb, 0xa9, 0xb4, 0xcb, 0x98, 0xeb, 0x13, 0x07, 0x07, 0x9e, 0x83, 0x29, 0x65, 0x11, 0x8e, 0x3c, - 0x46, 0x79, 0xec, 0x48, 0x65, 0x75, 0x15, 0x6b, 0xf2, 0x17, 0xa9, 0x2b, 0x6a, 0x75, 0xcd, 0x08, - 0xbb, 0xb5, 0x90, 0x9c, 0x74, 0x08, 0x8f, 0x54, 0xd5, 0x8c, 0xbe, 0x2a, 0x0e, 0x71, 0x5b, 0xc9, - 0x0a, 0x5a, 0x59, 0xe3, 0x18, 0x7b, 0xb4, 0xe6, 0x7b, 0xf4, 0x95, 0xd2, 0xe6, 0xb5, 0x5a, 0x1c, - 0x04, 0x7f, 0x2a, 0xb7, 0xce, 0xaf, 0xa2, 0xff, 0x9f, 0x8f, 0x4e, 0xe0, 0xad, 0x81, 0xae, 0x1c, - 0xc6, 0x7a, 0xc8, 0xd9, 0xff, 0xde, 0x8d, 0x2d, 0x64, 0x52, 0xf1, 0x22, 0x8e, 0x90, 0xca, 0xcf, - 0x17, 0xf2, 0x80, 0x51, 0x4e, 0xd6, 0x37, 0xde, 0x7c, 0xff, 0xf5, 0xfe, 0xbf, 0x0c, 0xdc, 0x75, - 0x12, 0xd8, 0xc6, 0xdf, 0x67, 0x1d, 0x4e, 0xc2, 0x3e, 0x7c, 0x33, 0x50, 0xfa, 0x80, 0x36, 0x58, - 0xdb, 0xa3, 0x6e, 0xf5, 0x08, 0xbb, 0x47, 0x21, 0xa6, 0xbc, 0x45, 0x42, 0xd9, 0x96, 0xc3, 0x43, - 0x6d, 0xdf, 0x59, 0x36, 0x45, 0xfd, 0x68, 0x49, 0xb7, 0x8c, 0xb2, 0x25, 0xa2, 0x14, 0xa1, 0x90, - 0x14, 0x65, 0x34, 0x61, 0x2b, 0x92, 0x56, 0x4b, 0x8d, 0x1a, 0xce, 0x0d, 0x84, 0xf6, 0x47, 0x73, - 0x7a, 0x3a, 0xba, 0x7c, 0x28, 0x68, 0x09, 0x26, 0x22, 0x45, 0xbb, 0xb1, 0x90, 0x56, 0xb2, 0xe5, - 0x04, 0xdb, 0x1d, 0x58, 0x4b, 0x62, 0x13, 0x8b, 0x62, 0x89, 0xf1, 0xc3, 0x47, 0x03, 0x5d, 0x1b, - 0xfb, 0x9f, 0xbd, 0xa6, 0x24, 0xe4, 0xe0, 0xcc, 0xef, 0x14, 0x2b, 0x15, 0xda, 0xe6, 0xe2, 0x06, - 0xc9, 0x67, 0x0b, 0xbe, 0x3c, 0x64, 0xe7, 0xf0, 0x39, 0x2c, 0x46, 0xfa, 0x6c, 0xa0, 0x9b, 0x55, - 0xd2, 0xc2, 0x1d, 0x3f, 0x7a, 0x7c, 0x1a, 0x91, 0x90, 0x62, 0x7f, 0xb7, 0xd9, 0x0c, 0x09, 0xe7, - 0x84, 0xc3, 0x7d, 0x6d, 0x7b, 0x9d, 0x45, 0x81, 0x57, 0x96, 0x70, 0xca, 0x04, 0x3b, 0x22, 0xc1, - 0x26, 0xd8, 0x89, 0xd3, 0x8f, 0xdd, 0x16, 0x91, 0x76, 0x0b, 0x8f, 0x61, 0x3f, 0x18, 0xe8, 0xfa, - 0x6e, 0x10, 0xf8, 0x5e, 0x43, 0xbc, 0x29, 0xf1, 0x1e, 0xe8, 0x2f, 0x70, 0x5a, 0xaa, 0xc8, 0x4b, - 0x97, 0x70, 0x48, 0xe2, 0x8c, 0x20, 0x5e, 0x83, 0xdb, 0x49, 0xc4, 0x38, 0x08, 0xe4, 0x46, 0x7c, - 0x35, 0xd0, 0xad, 0xa9, 0x1a, 0x7b, 0xbd, 0x7d, 0xdf, 0x23, 0x34, 0x3a, 0xa8, 0x42, 0x65, 0xd1, - 0xbe, 0x13, 0x8f, 0x42, 0x7e, 0xb0, 0x8c, 0x55, 0xb2, 0x57, 0x04, 0x7b, 0x19, 0x4a, 0x33, 0xd9, - 0x9d, 0x86, 0xf0, 0x71, 0xe7, 0x2c, 0xfe, 0xa8, 0x79, 0xcd, 0x3e, 0x7c, 0x32, 0xd0, 0x8d, 0xa9, - 0x06, 0x72, 0xcf, 0xb7, 0x17, 0x05, 0xfa, 0x7b, 0xdb, 0x77, 0x2e, 0x6b, 0x93, 0x19, 0x8a, 0x22, - 0x43, 0x16, 0xee, 0xcd, 0xce, 0x20, 0x37, 0xbe, 0x8f, 0x56, 0x0f, 0xc5, 0xbb, 0x0f, 0x59, 0xfd, - 0xe3, 0x2a, 0x04, 0x8a, 0x2b, 0x37, 0x57, 0x27, 0x41, 0xd6, 0x05, 0x48, 0x1a, 0x52, 0x89, 0x6f, - 0xb0, 0xd0, 0xee, 0x3d, 0xf9, 0x32, 0x30, 0x8d, 0x8b, 0x81, 0x69, 0xfc, 0x1c, 0x98, 0xc6, 0xbb, - 0xa1, 0xb9, 0x72, 0x31, 0x34, 0x57, 0x7e, 0x0c, 0xcd, 0x95, 0x97, 0x25, 0xd7, 0x8b, 0x8e, 0x3b, - 0x75, 0xbb, 0xc1, 0xda, 0xd2, 0x6f, 0xf9, 0xb8, 0xce, 0x55, 0xad, 0xee, 0xb6, 0x73, 0x3a, 0x29, - 0x18, 0xf5, 0x02, 0xc2, 0xeb, 0xab, 0xe2, 0x4f, 0xa6, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x4b, - 0x59, 0x27, 0x33, 0x8b, 0x07, 0x00, 0x00, + // 614 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x95, 0x4f, 0x6b, 0x13, 0x41, + 0x18, 0xc6, 0xbb, 0x82, 0x15, 0x06, 0x41, 0x79, 0x41, 0xd0, 0x50, 0xb7, 0x58, 0xcd, 0x1f, 0xd2, + 0xec, 0x6e, 0xd3, 0x60, 0x30, 0xa2, 0x87, 0xb6, 0xf1, 0x50, 0x14, 0xac, 0xd2, 0x93, 0x97, 0x30, + 0x49, 0x26, 0xdb, 0xc5, 0xcd, 0xcc, 0x76, 0x67, 0x13, 0x1b, 0x4a, 0x2e, 0xde, 0xbc, 0x14, 0xc1, + 0xbb, 0x27, 0x3f, 0x82, 0xdf, 0x41, 0x2f, 0x62, 0xc1, 0x8b, 0x47, 0x49, 0xfc, 0x20, 0x92, 0xd9, + 0x99, 0x44, 0xe3, 0x4e, 0x92, 0xe6, 0xb6, 0x64, 0x9e, 0xe7, 0x7d, 0x7f, 0xcf, 0xbc, 0x2f, 0x13, + 0x64, 0x36, 0x09, 0x6f, 0x33, 0xee, 0x04, 0x21, 0x6b, 0x79, 0x3e, 0xe1, 0x4e, 0xb7, 0xe4, 0x1c, + 0x77, 0x48, 0xd8, 0xb3, 0x83, 0x90, 0x45, 0x0c, 0x20, 0x3e, 0xb7, 0xd5, 0xb9, 0xdd, 0x2d, 0xa5, + 0xd6, 0x5c, 0xc6, 0x5c, 0x9f, 0x38, 0x38, 0xf0, 0x1c, 0x4c, 0x29, 0x8b, 0x70, 0xe4, 0x31, 0xca, + 0x63, 0x47, 0x2a, 0xa3, 0xab, 0x58, 0x93, 0xbf, 0x48, 0x5d, 0x41, 0xab, 0x6b, 0x46, 0xd8, 0xad, + 0x85, 0xe4, 0xb8, 0x43, 0x78, 0xa4, 0xaa, 0xa6, 0xf5, 0x55, 0x71, 0x88, 0xdb, 0x4a, 0x96, 0xd7, + 0xca, 0x1a, 0x47, 0xd8, 0xa3, 0x35, 0xdf, 0xa3, 0xaf, 0x95, 0x36, 0xa7, 0xd5, 0xe2, 0x20, 0xf8, + 0x5b, 0xb9, 0x7d, 0x76, 0x15, 0x5d, 0x7e, 0x31, 0x3a, 0x81, 0x77, 0x06, 0xba, 0x72, 0x10, 0xeb, + 0x21, 0x6b, 0xff, 0x7f, 0x37, 0xb6, 0x90, 0x49, 0xc5, 0xcb, 0x38, 0x42, 0x2a, 0x37, 0x5f, 0xc8, + 0x03, 0x46, 0x39, 0xd9, 0xd8, 0x7c, 0xfb, 0xe3, 0xf7, 0x87, 0x4b, 0x69, 0xb8, 0xeb, 0x24, 0xb0, + 0x8d, 0xbf, 0x4f, 0x3b, 0x9c, 0x84, 0x7d, 0xf8, 0x6e, 0xa0, 0xb5, 0x7d, 0xda, 0x60, 0x6d, 0x8f, + 0xba, 0xd5, 0x43, 0xec, 0x1e, 0x86, 0x98, 0xf2, 0x16, 0x09, 0x65, 0x5b, 0x0e, 0x8f, 0xb4, 0x7d, + 0x67, 0xd9, 0x14, 0xf5, 0xe3, 0x25, 0xdd, 0x32, 0xca, 0xb6, 0x88, 0x52, 0x80, 0x7c, 0x52, 0x94, + 0xd1, 0x84, 0xad, 0x48, 0x5a, 0x2d, 0x35, 0x6a, 0x38, 0x33, 0x10, 0xda, 0x1b, 0xcd, 0xe9, 0xd9, + 0xe8, 0xf2, 0x21, 0xaf, 0x25, 0x98, 0x88, 0x14, 0xed, 0xe6, 0x42, 0x5a, 0xc9, 0x96, 0x15, 0x6c, + 0x77, 0x60, 0x3d, 0x89, 0x4d, 0x2c, 0x8a, 0x25, 0xc6, 0x0f, 0x9f, 0x0c, 0x74, 0x6d, 0xec, 0x7f, + 0xfe, 0x86, 0x92, 0x90, 0x83, 0x33, 0xbf, 0x53, 0xac, 0x54, 0x68, 0x5b, 0x8b, 0x1b, 0x24, 0x9f, + 0x2d, 0xf8, 0x72, 0x90, 0x99, 0xc3, 0xe7, 0xb0, 0x18, 0xe9, 0x8b, 0x81, 0x6e, 0x56, 0x49, 0x0b, + 0x77, 0xfc, 0xe8, 0xc9, 0x49, 0x44, 0x42, 0x8a, 0xfd, 0x9d, 0x66, 0x33, 0x24, 0x9c, 0x13, 0x0e, + 0x0f, 0xb4, 0xed, 0x75, 0x16, 0x05, 0x5e, 0x59, 0xc2, 0x29, 0x13, 0x94, 0x45, 0x82, 0x2d, 0xb0, + 0x13, 0xa7, 0x1f, 0xbb, 0x2d, 0x22, 0xed, 0x16, 0x1e, 0xc3, 0x7e, 0x34, 0xd0, 0xf5, 0x9d, 0x20, + 0xf0, 0xbd, 0x86, 0x78, 0x53, 0xe2, 0x3d, 0xd0, 0x5f, 0xe0, 0xb4, 0x54, 0x91, 0x17, 0x2f, 0xe0, + 0x90, 0xc4, 0x69, 0x41, 0xbc, 0x0e, 0xb7, 0x93, 0x88, 0x71, 0x10, 0xc8, 0x8d, 0xf8, 0x66, 0xa0, + 0x5b, 0x53, 0x35, 0x76, 0x7b, 0x7b, 0xbe, 0x47, 0x68, 0xb4, 0x5f, 0x85, 0xca, 0xa2, 0x7d, 0x27, + 0x1e, 0x85, 0xfc, 0x70, 0x19, 0xab, 0x64, 0xaf, 0x08, 0xf6, 0x12, 0x14, 0x67, 0xb2, 0x3b, 0x0d, + 0xe1, 0xe3, 0xce, 0x69, 0xfc, 0x51, 0xf3, 0x9a, 0x7d, 0xf8, 0x6c, 0xa0, 0x1b, 0x53, 0x0d, 0xe4, + 0x9e, 0xdf, 0x5f, 0x14, 0xe8, 0xdf, 0x6d, 0x2f, 0x5f, 0xd4, 0x26, 0x33, 0x14, 0x44, 0x86, 0x0c, + 0xdc, 0x9b, 0x9d, 0x41, 0x6e, 0x7c, 0x1f, 0xad, 0x1e, 0x88, 0x77, 0x1f, 0x32, 0xfa, 0xc7, 0x55, + 0x08, 0x14, 0x57, 0x76, 0xae, 0x4e, 0x82, 0x6c, 0x08, 0x90, 0x35, 0x48, 0x25, 0xbe, 0xc1, 0x42, + 0xbb, 0xfb, 0xf4, 0xeb, 0xc0, 0x34, 0xce, 0x07, 0xa6, 0xf1, 0x6b, 0x60, 0x1a, 0xef, 0x87, 0xe6, + 0xca, 0xf9, 0xd0, 0x5c, 0xf9, 0x39, 0x34, 0x57, 0x5e, 0x15, 0x5d, 0x2f, 0x3a, 0xea, 0xd4, 0xed, + 0x06, 0x6b, 0x4b, 0xbf, 0xe5, 0xe3, 0x3a, 0x57, 0xb5, 0xba, 0x65, 0xe7, 0x64, 0x52, 0x30, 0xea, + 0x05, 0x84, 0xd7, 0x57, 0xc5, 0x9f, 0x4c, 0xe9, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb3, 0xb4, + 0x70, 0xc1, 0x8b, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/profiles/types/query_app_links.pb.go b/x/profiles/types/query_app_links.pb.go index 09c6f26903..a3d286bfdc 100644 --- a/x/profiles/types/query_app_links.pb.go +++ b/x/profiles/types/query_app_links.pb.go @@ -457,41 +457,41 @@ func init() { } var fileDescriptor_b3b6ad0478f8a288 = []byte{ - // 542 bytes of a gzipped FileDescriptorProto + // 541 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xc1, 0x6e, 0xd3, 0x4c, 0x10, 0xce, 0x26, 0xf9, 0xab, 0x66, 0x73, 0xfa, 0xad, 0x1e, 0x8c, 0x0b, 0x26, 0x18, 0x51, 0x42, - 0x45, 0x77, 0x95, 0x46, 0x3c, 0x40, 0x4d, 0x04, 0xaa, 0x40, 0x02, 0xcc, 0x8d, 0x4b, 0xb4, 0x8e, - 0x17, 0xb3, 0xc2, 0xf6, 0xba, 0x5e, 0x3b, 0x90, 0x47, 0xe0, 0xc6, 0x63, 0xc0, 0x05, 0x71, 0xe0, - 0x21, 0x7a, 0xac, 0x7a, 0xe2, 0x84, 0x50, 0x72, 0xe0, 0xca, 0x23, 0x20, 0xef, 0x6e, 0x9b, 0x34, - 0x98, 0x44, 0x20, 0xc4, 0x25, 0x5a, 0xcf, 0xcc, 0x37, 0xf3, 0x7d, 0xb3, 0x5f, 0x16, 0x76, 0x03, - 0x2a, 0x62, 0x2e, 0x70, 0x9a, 0xf1, 0xe7, 0x2c, 0xa2, 0x02, 0x8f, 0xfb, 0xf8, 0xa8, 0xa0, 0xd9, - 0x64, 0x48, 0xd2, 0x74, 0x18, 0xb1, 0xe4, 0xa5, 0x40, 0x69, 0xc6, 0x73, 0x6e, 0x18, 0xaa, 0x12, - 0x9d, 0x55, 0xa2, 0x71, 0xdf, 0xfa, 0x9f, 0xc4, 0x2c, 0xe1, 0x58, 0xfe, 0xaa, 0x32, 0x6b, 0x2b, - 0xe4, 0x21, 0x97, 0x47, 0x5c, 0x9e, 0x74, 0xf4, 0xd2, 0x88, 0x97, 0xe0, 0xa1, 0x4a, 0xa8, 0x0f, - 0x9d, 0xba, 0x55, 0xc1, 0x20, 0xe6, 0x01, 0x8d, 0xc4, 0x32, 0x05, 0x6b, 0x57, 0x01, 0xb1, 0x4f, - 0x04, 0x55, 0x2c, 0xf1, 0xb8, 0xe7, 0xd3, 0x9c, 0xf4, 0x70, 0x4a, 0x42, 0x96, 0x90, 0x9c, 0xf1, - 0x44, 0xd5, 0x3a, 0xa7, 0x00, 0x5e, 0x7e, 0x52, 0x96, 0x1c, 0xa4, 0x69, 0xc4, 0x46, 0x32, 0xf5, - 0xb0, 0xec, 0xe5, 0xd1, 0xa3, 0x82, 0x8a, 0xdc, 0xb8, 0x0d, 0x9b, 0x85, 0xa0, 0x99, 0x09, 0x3a, - 0xa0, 0xdb, 0x72, 0xcd, 0xd3, 0x4f, 0x7b, 0x5b, 0x9a, 0xd7, 0x41, 0x10, 0x64, 0x54, 0x88, 0xa7, - 0x79, 0xc6, 0x92, 0xd0, 0x93, 0x55, 0x46, 0x07, 0xb6, 0xc9, 0xbc, 0x91, 0x59, 0x2f, 0x41, 0xde, - 0x62, 0xc8, 0xb0, 0xe0, 0x66, 0x59, 0x99, 0x90, 0x98, 0x9a, 0x0d, 0x99, 0x3e, 0xff, 0x36, 0xee, - 0x41, 0x38, 0x27, 0x68, 0x36, 0x3b, 0xa0, 0xdb, 0xde, 0xdf, 0x41, 0x7a, 0x5c, 0xa9, 0x06, 0x49, - 0x35, 0x48, 0xab, 0x41, 0x8f, 0x49, 0x48, 0x35, 0x4f, 0x6f, 0x01, 0xe9, 0x7c, 0x00, 0xf0, 0xca, - 0x2f, 0x44, 0x89, 0x94, 0x27, 0x82, 0x1a, 0x03, 0xf8, 0x9f, 0xdc, 0x98, 0x09, 0x3a, 0x8d, 0x6e, - 0x7b, 0xff, 0x3a, 0xfa, 0xf9, 0xd6, 0xd0, 0x12, 0xd8, 0x6d, 0x1d, 0x7f, 0xb9, 0x5a, 0x7b, 0xf7, - 0xed, 0xe3, 0x2e, 0xf0, 0x14, 0xd8, 0xb8, 0x7f, 0x81, 0x6f, 0x5d, 0xf2, 0xbd, 0xb9, 0x96, 0xaf, - 0xa2, 0x70, 0x81, 0xf0, 0x00, 0xde, 0xa8, 0xe2, 0xeb, 0x4e, 0xee, 0x46, 0x8c, 0x26, 0xf9, 0xe1, - 0xe0, 0xec, 0x36, 0xb6, 0x61, 0x6b, 0x24, 0x43, 0x43, 0x16, 0xa8, 0x2b, 0xf1, 0x36, 0x55, 0xe0, - 0x30, 0x70, 0x22, 0xb8, 0xb3, 0xae, 0x8b, 0x96, 0xef, 0xc2, 0x66, 0xa9, 0x40, 0x76, 0xf8, 0x7d, - 0xf5, 0x12, 0xeb, 0xbc, 0x07, 0xf0, 0x5a, 0xd5, 0xb8, 0x47, 0xaf, 0x12, 0x9a, 0x9d, 0xdb, 0x67, - 0xc9, 0x10, 0x60, 0xb5, 0x21, 0xea, 0x2b, 0x0d, 0xd1, 0xf8, 0x63, 0x43, 0x7c, 0xaf, 0x43, 0x67, - 0x15, 0x57, 0xbd, 0x96, 0x02, 0x6e, 0x70, 0x19, 0xd1, 0xb6, 0xf0, 0xaa, 0x16, 0xb3, 0xbe, 0x0f, - 0xaa, 0xca, 0x0e, 0x68, 0x4e, 0x58, 0x24, 0x16, 0xf7, 0xa8, 0x87, 0xfd, 0x35, 0x1b, 0x59, 0x6f, - 0x00, 0xdc, 0x5e, 0x31, 0xfb, 0x5f, 0xfe, 0x97, 0xdd, 0x07, 0xc7, 0x53, 0x1b, 0x9c, 0x4c, 0x6d, - 0xf0, 0x75, 0x6a, 0x83, 0xb7, 0x33, 0xbb, 0x76, 0x32, 0xb3, 0x6b, 0x9f, 0x67, 0x76, 0xed, 0x59, - 0x2f, 0x64, 0xf9, 0x8b, 0xc2, 0x47, 0x23, 0x1e, 0x63, 0xb5, 0xdf, 0xbd, 0x88, 0xf8, 0x42, 0x9f, - 0xf1, 0xf8, 0x0e, 0x7e, 0x3d, 0x7f, 0xe5, 0xf2, 0x49, 0x4a, 0x85, 0xbf, 0x21, 0x1f, 0xab, 0xfe, - 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x00, 0x96, 0xfb, 0x87, 0x05, 0x00, 0x00, + 0x45, 0x77, 0x95, 0x46, 0xe2, 0x5e, 0x13, 0x81, 0x2a, 0x90, 0x00, 0x73, 0xe3, 0x12, 0xad, 0xe3, + 0xc5, 0xac, 0xb0, 0xbd, 0xae, 0xd7, 0x0e, 0xe4, 0x11, 0xb8, 0xf1, 0x18, 0x70, 0x41, 0x1c, 0x78, + 0x88, 0x1e, 0xab, 0x9e, 0x38, 0x21, 0x94, 0x1c, 0xb8, 0xf2, 0x08, 0xc8, 0xbb, 0xdb, 0x26, 0x0d, + 0x26, 0x11, 0x08, 0x71, 0x89, 0xd6, 0x33, 0xf3, 0xcd, 0x7c, 0xdf, 0xec, 0x97, 0x85, 0xdd, 0x80, + 0x8a, 0x98, 0x0b, 0x9c, 0x66, 0xfc, 0x39, 0x8b, 0xa8, 0xc0, 0xe3, 0x3e, 0x3e, 0x2a, 0x68, 0x36, + 0x19, 0x92, 0x34, 0x1d, 0x46, 0x2c, 0x79, 0x29, 0x50, 0x9a, 0xf1, 0x9c, 0x1b, 0x86, 0xaa, 0x44, + 0x67, 0x95, 0x68, 0xdc, 0xb7, 0xfe, 0x27, 0x31, 0x4b, 0x38, 0x96, 0xbf, 0xaa, 0xcc, 0xda, 0x0a, + 0x79, 0xc8, 0xe5, 0x11, 0x97, 0x27, 0x1d, 0xbd, 0x34, 0xe2, 0x25, 0x78, 0xa8, 0x12, 0xea, 0x43, + 0xa7, 0x6e, 0x55, 0x30, 0x88, 0x79, 0x40, 0x23, 0xb1, 0x4c, 0xc1, 0xda, 0x55, 0x40, 0xec, 0x13, + 0x41, 0x15, 0x4b, 0x3c, 0xee, 0xf9, 0x34, 0x27, 0x3d, 0x9c, 0x92, 0x90, 0x25, 0x24, 0x67, 0x3c, + 0x51, 0xb5, 0xce, 0x29, 0x80, 0x97, 0x9f, 0x94, 0x25, 0x07, 0x69, 0x1a, 0xb1, 0x91, 0x4c, 0x3d, + 0x2c, 0x7b, 0x79, 0xf4, 0xa8, 0xa0, 0x22, 0x37, 0x6e, 0xc3, 0x66, 0x21, 0x68, 0x66, 0x82, 0x0e, + 0xe8, 0xb6, 0x5c, 0xf3, 0xf4, 0xd3, 0xde, 0x96, 0xe6, 0x75, 0x10, 0x04, 0x19, 0x15, 0xe2, 0x69, + 0x9e, 0xb1, 0x24, 0xf4, 0x64, 0x95, 0xd1, 0x81, 0x6d, 0x32, 0x6f, 0x64, 0xd6, 0x4b, 0x90, 0xb7, + 0x18, 0x32, 0x2c, 0xb8, 0x59, 0x56, 0x26, 0x24, 0xa6, 0x66, 0x43, 0xa6, 0xcf, 0xbf, 0x8d, 0x7b, + 0x10, 0xce, 0x09, 0x9a, 0xcd, 0x0e, 0xe8, 0xb6, 0xf7, 0x77, 0x90, 0x1e, 0x57, 0xaa, 0x41, 0x52, + 0x0d, 0xd2, 0x6a, 0xd0, 0x63, 0x12, 0x52, 0xcd, 0xd3, 0x5b, 0x40, 0x3a, 0x1f, 0x00, 0xbc, 0xf2, + 0x0b, 0x51, 0x22, 0xe5, 0x89, 0xa0, 0xc6, 0x00, 0xfe, 0x27, 0x37, 0x66, 0x82, 0x4e, 0xa3, 0xdb, + 0xde, 0xbf, 0x8e, 0x7e, 0xbe, 0x35, 0xb4, 0x04, 0x76, 0x5b, 0xc7, 0x5f, 0xae, 0xd6, 0xde, 0x7d, + 0xfb, 0xb8, 0x0b, 0x3c, 0x05, 0x36, 0xee, 0x5f, 0xe0, 0x5b, 0x97, 0x7c, 0x6f, 0xae, 0xe5, 0xab, + 0x28, 0x5c, 0x20, 0x3c, 0x80, 0x37, 0xaa, 0xf8, 0xba, 0x93, 0xbb, 0x11, 0xa3, 0x49, 0x7e, 0x38, + 0x38, 0xbb, 0x8d, 0x6d, 0xd8, 0x1a, 0xc9, 0xd0, 0x90, 0x05, 0xea, 0x4a, 0xbc, 0x4d, 0x15, 0x38, + 0x0c, 0x9c, 0x08, 0xee, 0xac, 0xeb, 0xa2, 0xe5, 0xbb, 0xb0, 0x59, 0x2a, 0x90, 0x1d, 0x7e, 0x5f, + 0xbd, 0xc4, 0x3a, 0xef, 0x01, 0xbc, 0x56, 0x35, 0xee, 0xd1, 0xab, 0x84, 0x66, 0xe7, 0xf6, 0x59, + 0x32, 0x04, 0x58, 0x6d, 0x88, 0xfa, 0x4a, 0x43, 0x34, 0xfe, 0xd8, 0x10, 0xdf, 0xeb, 0xd0, 0x59, + 0xc5, 0x55, 0xaf, 0xa5, 0x80, 0x1b, 0x5c, 0x46, 0xb4, 0x2d, 0xbc, 0xaa, 0xc5, 0xac, 0xef, 0x83, + 0xaa, 0xb2, 0x03, 0x9a, 0x13, 0x16, 0x89, 0xc5, 0x3d, 0xea, 0x61, 0x7f, 0xcd, 0x46, 0xd6, 0x1b, + 0x00, 0xb7, 0x57, 0xcc, 0xfe, 0x97, 0xff, 0x65, 0xf7, 0xc1, 0xf1, 0xd4, 0x06, 0x27, 0x53, 0x1b, + 0x7c, 0x9d, 0xda, 0xe0, 0xed, 0xcc, 0xae, 0x9d, 0xcc, 0xec, 0xda, 0xe7, 0x99, 0x5d, 0x7b, 0xd6, + 0x0b, 0x59, 0xfe, 0xa2, 0xf0, 0xd1, 0x88, 0xc7, 0x58, 0xed, 0x77, 0x2f, 0x22, 0xbe, 0xd0, 0x67, + 0x3c, 0xbe, 0x83, 0x5f, 0xcf, 0x5f, 0xb9, 0x7c, 0x92, 0x52, 0xe1, 0x6f, 0xc8, 0xc7, 0xaa, 0xff, + 0x23, 0x00, 0x00, 0xff, 0xff, 0xce, 0xed, 0xc1, 0x09, 0x87, 0x05, 0x00, 0x00, } func (m *QueryApplicationLinksRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/profiles/types/query_chain_links.pb.go b/x/profiles/types/query_chain_links.pb.go index d6456860c4..12dc07fc2e 100644 --- a/x/profiles/types/query_chain_links.pb.go +++ b/x/profiles/types/query_chain_links.pb.go @@ -486,38 +486,38 @@ var fileDescriptor_17ef8689aa5884e9 = []byte{ // 540 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0xbf, 0x6f, 0x13, 0x31, 0x14, 0xc7, 0xe3, 0xb4, 0x8d, 0x14, 0x77, 0xe2, 0x54, 0xca, 0x11, 0xe8, 0x11, 0x45, 0xfc, 0x88, - 0x02, 0xb5, 0x95, 0x46, 0xac, 0x48, 0x84, 0x52, 0x06, 0x10, 0x3f, 0xc2, 0xc6, 0x12, 0x39, 0xc9, - 0xeb, 0xd5, 0xe2, 0xce, 0x4e, 0xcf, 0x4e, 0x68, 0x25, 0xfe, 0x08, 0xfe, 0x00, 0x26, 0x26, 0xc6, - 0x0e, 0xac, 0x8c, 0x48, 0x1d, 0x23, 0x26, 0x26, 0x84, 0x92, 0x81, 0x7f, 0x03, 0x9d, 0x6d, 0xd2, - 0x9e, 0x12, 0x1a, 0x09, 0x55, 0x88, 0xe5, 0x64, 0x3f, 0x7f, 0x9f, 0xdf, 0xe7, 0x7d, 0xed, 0x33, - 0xae, 0xf5, 0x40, 0xc5, 0x52, 0xd1, 0x7e, 0x22, 0x77, 0x79, 0x04, 0x8a, 0x0e, 0x1b, 0x74, 0x7f, - 0x00, 0xc9, 0x61, 0xbb, 0xbb, 0xc7, 0xb8, 0x68, 0x47, 0x5c, 0xbc, 0x56, 0xa4, 0x9f, 0x48, 0x2d, - 0x3d, 0xcf, 0x6a, 0xc9, 0x6f, 0x2d, 0x19, 0x36, 0x4a, 0x17, 0x58, 0xcc, 0x85, 0xa4, 0xe6, 0x6b, - 0x65, 0xa5, 0xb5, 0x50, 0x86, 0xd2, 0x0c, 0x69, 0x3a, 0x72, 0xd1, 0xcb, 0x5d, 0x99, 0x26, 0xb7, - 0xed, 0x82, 0x9d, 0xb8, 0xa5, 0xdb, 0x73, 0x18, 0x62, 0xd9, 0x83, 0x48, 0xcd, 0x42, 0x94, 0x6a, - 0x36, 0x95, 0x76, 0x98, 0x02, 0x4b, 0x4a, 0x87, 0xf5, 0x0e, 0x68, 0x56, 0xa7, 0x7d, 0x16, 0x72, - 0xc1, 0x34, 0x97, 0xc2, 0x6a, 0x2b, 0x5f, 0x10, 0x5e, 0x7f, 0x91, 0x4a, 0x1e, 0xa4, 0xdb, 0x3c, - 0x49, 0x77, 0x69, 0xc1, 0xfe, 0x00, 0x94, 0xf6, 0xee, 0xe0, 0xe5, 0x81, 0x82, 0xc4, 0x47, 0x65, - 0x54, 0x2d, 0x36, 0xfd, 0xaf, 0x9f, 0x36, 0xd7, 0x1c, 0xd3, 0xfd, 0x5e, 0x2f, 0x01, 0xa5, 0x5e, - 0xea, 0x84, 0x8b, 0xb0, 0x65, 0x54, 0xde, 0x06, 0xc6, 0x96, 0x44, 0xb0, 0x18, 0xfc, 0x7c, 0x9a, - 0xd3, 0x2a, 0x9a, 0xc8, 0x53, 0x16, 0x83, 0xb7, 0x8e, 0x0b, 0x9a, 0x25, 0x21, 0x68, 0x7f, 0xc9, - 0x2c, 0xb9, 0x99, 0xb7, 0x83, 0xf1, 0x09, 0x93, 0xbf, 0x5c, 0x46, 0xd5, 0xd5, 0xad, 0x9b, 0xc4, - 0xd5, 0x49, 0x1b, 0x20, 0xa6, 0x01, 0xe2, 0x1a, 0x20, 0xcf, 0x59, 0x08, 0x0e, 0xb0, 0x75, 0x2a, - 0xb3, 0xf2, 0x01, 0xe1, 0x4b, 0x33, 0x7d, 0xa8, 0xbe, 0x14, 0x0a, 0xbc, 0x7b, 0x78, 0xc5, 0xd8, - 0xe3, 0xa3, 0xf2, 0x52, 0x75, 0x75, 0x6b, 0x83, 0xcc, 0x1e, 0x12, 0x99, 0xa6, 0x35, 0x8b, 0xc7, - 0xdf, 0xaf, 0xe5, 0x3e, 0xfe, 0x3c, 0xaa, 0xa1, 0x96, 0x4d, 0xf3, 0x1e, 0x65, 0x18, 0xf3, 0x86, - 0xf1, 0xd6, 0x42, 0x46, 0x5b, 0x3c, 0x03, 0xf9, 0x1e, 0xe1, 0x2b, 0x59, 0xc8, 0x67, 0x6f, 0x04, - 0x24, 0x53, 0xc7, 0xb3, 0x1e, 0xa2, 0x3f, 0x7b, 0x98, 0x3f, 0xc3, 0xc3, 0xa5, 0xbf, 0xf6, 0x70, - 0x94, 0xc7, 0x57, 0xe7, 0xe3, 0x39, 0x23, 0x39, 0x2e, 0x48, 0x13, 0x71, 0x4e, 0xee, 0xcc, 0x73, - 0xf2, 0xac, 0x1d, 0x48, 0x36, 0xbe, 0x0d, 0x9a, 0xf1, 0x48, 0x9d, 0xb6, 0xdc, 0x15, 0x38, 0x37, - 0xcf, 0x4b, 0x6f, 0xf1, 0xc5, 0xb9, 0x45, 0xff, 0xc9, 0xf5, 0xae, 0x7c, 0x46, 0xf8, 0xba, 0x31, - 0x64, 0x1b, 0x76, 0xd9, 0x20, 0xd2, 0x0f, 0x0f, 0x34, 0x24, 0x82, 0x45, 0xae, 0x04, 0x4c, 0x8f, - 0x9e, 0xe0, 0x15, 0xd3, 0xf9, 0x42, 0x1c, 0x2b, 0x5b, 0xc4, 0x73, 0x5e, 0x57, 0xe2, 0x08, 0xe1, - 0x1b, 0x0b, 0xf8, 0xff, 0xb3, 0x9f, 0xac, 0xf9, 0xf8, 0x78, 0x1c, 0xa0, 0xd1, 0x38, 0x40, 0x3f, - 0xc6, 0x01, 0x7a, 0x37, 0x09, 0x72, 0xa3, 0x49, 0x90, 0xfb, 0x36, 0x09, 0x72, 0xaf, 0xea, 0x21, - 0xd7, 0x7b, 0x83, 0x0e, 0xe9, 0xca, 0x98, 0x5a, 0xba, 0xcd, 0x88, 0x75, 0x94, 0x1b, 0xd3, 0xe1, - 0x5d, 0x7a, 0x70, 0xf2, 0xc0, 0xea, 0xc3, 0x3e, 0xa8, 0x4e, 0xc1, 0xbc, 0x92, 0x8d, 0x5f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xde, 0xab, 0x4e, 0x9e, 0x04, 0x06, 0x00, 0x00, + 0x02, 0xb5, 0x95, 0x46, 0x62, 0x44, 0x22, 0x94, 0x32, 0x80, 0xf8, 0x11, 0x36, 0x96, 0xc8, 0x49, + 0x5e, 0xaf, 0x16, 0x77, 0x76, 0x7a, 0x76, 0x42, 0x2b, 0xf1, 0x47, 0xf0, 0x07, 0x30, 0x31, 0x31, + 0x76, 0x60, 0x65, 0x44, 0xea, 0x18, 0x31, 0x31, 0x21, 0x94, 0x0c, 0xfc, 0x1b, 0xe8, 0x6c, 0x93, + 0xf6, 0x94, 0xd0, 0x48, 0xa8, 0x42, 0x2c, 0x27, 0xfb, 0xf9, 0xfb, 0xfc, 0x3e, 0xef, 0x6b, 0x9f, + 0x71, 0xad, 0x07, 0x2a, 0x96, 0x8a, 0xf6, 0x13, 0xb9, 0xcb, 0x23, 0x50, 0x74, 0xd8, 0xa0, 0xfb, + 0x03, 0x48, 0x0e, 0xdb, 0xdd, 0x3d, 0xc6, 0x45, 0x3b, 0xe2, 0xe2, 0xb5, 0x22, 0xfd, 0x44, 0x6a, + 0xe9, 0x79, 0x56, 0x4b, 0x7e, 0x6b, 0xc9, 0xb0, 0x51, 0xba, 0xc0, 0x62, 0x2e, 0x24, 0x35, 0x5f, + 0x2b, 0x2b, 0xad, 0x85, 0x32, 0x94, 0x66, 0x48, 0xd3, 0x91, 0x8b, 0x5e, 0xee, 0xca, 0x34, 0xb9, + 0x6d, 0x17, 0xec, 0xc4, 0x2d, 0xdd, 0x9e, 0xc3, 0x10, 0xcb, 0x1e, 0x44, 0x6a, 0x16, 0xa2, 0x54, + 0xb3, 0xa9, 0xb4, 0xc3, 0x14, 0x58, 0x52, 0x3a, 0xac, 0x77, 0x40, 0xb3, 0x3a, 0xed, 0xb3, 0x90, + 0x0b, 0xa6, 0xb9, 0x14, 0x56, 0x5b, 0xf9, 0x82, 0xf0, 0xfa, 0x8b, 0x54, 0xf2, 0x20, 0xdd, 0xe6, + 0x49, 0xba, 0x4b, 0x0b, 0xf6, 0x07, 0xa0, 0xb4, 0x77, 0x07, 0x2f, 0x0f, 0x14, 0x24, 0x3e, 0x2a, + 0xa3, 0x6a, 0xb1, 0xe9, 0x7f, 0xfd, 0xb4, 0xb9, 0xe6, 0x98, 0xee, 0xf7, 0x7a, 0x09, 0x28, 0xf5, + 0x52, 0x27, 0x5c, 0x84, 0x2d, 0xa3, 0xf2, 0x36, 0x30, 0xb6, 0x24, 0x82, 0xc5, 0xe0, 0xe7, 0xd3, + 0x9c, 0x56, 0xd1, 0x44, 0x9e, 0xb2, 0x18, 0xbc, 0x75, 0x5c, 0xd0, 0x2c, 0x09, 0x41, 0xfb, 0x4b, + 0x66, 0xc9, 0xcd, 0xbc, 0x1d, 0x8c, 0x4f, 0x98, 0xfc, 0xe5, 0x32, 0xaa, 0xae, 0x6e, 0xdd, 0x24, + 0xae, 0x4e, 0xda, 0x00, 0x31, 0x0d, 0x10, 0xd7, 0x00, 0x79, 0xce, 0x42, 0x70, 0x80, 0xad, 0x53, + 0x99, 0x95, 0x0f, 0x08, 0x5f, 0x9a, 0xe9, 0x43, 0xf5, 0xa5, 0x50, 0xe0, 0xdd, 0xc3, 0x2b, 0xc6, + 0x1e, 0x1f, 0x95, 0x97, 0xaa, 0xab, 0x5b, 0x1b, 0x64, 0xf6, 0x90, 0xc8, 0x34, 0xad, 0x59, 0x3c, + 0xfe, 0x7e, 0x2d, 0xf7, 0xf1, 0xe7, 0x51, 0x0d, 0xb5, 0x6c, 0x9a, 0xf7, 0x28, 0xc3, 0x98, 0x37, + 0x8c, 0xb7, 0x16, 0x32, 0xda, 0xe2, 0x19, 0xc8, 0xf7, 0x08, 0x5f, 0xc9, 0x42, 0x3e, 0x7b, 0x23, + 0x20, 0x99, 0x3a, 0x9e, 0xf5, 0x10, 0xfd, 0xd9, 0xc3, 0xfc, 0x19, 0x1e, 0x2e, 0xfd, 0xb5, 0x87, + 0xa3, 0x3c, 0xbe, 0x3a, 0x1f, 0xcf, 0x19, 0xc9, 0x71, 0x41, 0x9a, 0x88, 0x73, 0x72, 0x67, 0x9e, + 0x93, 0x67, 0xed, 0x40, 0xb2, 0xf1, 0x6d, 0xd0, 0x8c, 0x47, 0xea, 0xb4, 0xe5, 0xae, 0xc0, 0xb9, + 0x79, 0x5e, 0x7a, 0x8b, 0x2f, 0xce, 0x2d, 0xfa, 0x4f, 0xae, 0x77, 0xe5, 0x33, 0xc2, 0xd7, 0x8d, + 0x21, 0xdb, 0xb0, 0xcb, 0x06, 0x91, 0x7e, 0x78, 0xa0, 0x21, 0x11, 0x2c, 0x72, 0x25, 0x60, 0x7a, + 0xf4, 0x04, 0xaf, 0x98, 0xce, 0x17, 0xe2, 0x58, 0xd9, 0x22, 0x9e, 0xf3, 0xba, 0x12, 0x47, 0x08, + 0xdf, 0x58, 0xc0, 0xff, 0x9f, 0xfd, 0x64, 0xcd, 0xc7, 0xc7, 0xe3, 0x00, 0x8d, 0xc6, 0x01, 0xfa, + 0x31, 0x0e, 0xd0, 0xbb, 0x49, 0x90, 0x1b, 0x4d, 0x82, 0xdc, 0xb7, 0x49, 0x90, 0x7b, 0x55, 0x0f, + 0xb9, 0xde, 0x1b, 0x74, 0x48, 0x57, 0xc6, 0xd4, 0xd2, 0x6d, 0x46, 0xac, 0xa3, 0xdc, 0x98, 0x0e, + 0xef, 0xd2, 0x83, 0x93, 0x07, 0x56, 0x1f, 0xf6, 0x41, 0x75, 0x0a, 0xe6, 0x95, 0x6c, 0xfc, 0x0a, + 0x00, 0x00, 0xff, 0xff, 0x26, 0x46, 0x19, 0x6c, 0x04, 0x06, 0x00, 0x00, } func (m *QueryChainLinksRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/profiles/types/query_dtag_requests.pb.go b/x/profiles/types/query_dtag_requests.pb.go index 67b78f7a35..8b35bba8d7 100644 --- a/x/profiles/types/query_dtag_requests.pb.go +++ b/x/profiles/types/query_dtag_requests.pb.go @@ -145,30 +145,30 @@ var fileDescriptor_ba6e00c149c010bd = []byte{ // 408 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x8e, 0xd3, 0x40, 0x10, 0x86, 0xbd, 0x20, 0xa1, 0x3b, 0x5f, 0x85, 0x75, 0x85, 0x49, 0xe1, 0x44, 0x57, 0x70, 0xe6, - 0x44, 0x76, 0x95, 0x0b, 0x34, 0x74, 0x44, 0x08, 0x84, 0x90, 0x10, 0x98, 0xab, 0x68, 0xa2, 0xb5, - 0x3d, 0x59, 0x56, 0x8a, 0x77, 0x9d, 0xdd, 0x8d, 0x45, 0xde, 0x80, 0x92, 0x47, 0x48, 0x49, 0x89, - 0x10, 0x8f, 0x40, 0x91, 0x32, 0xa2, 0xa2, 0x42, 0x28, 0x29, 0xe0, 0x31, 0x90, 0xbd, 0x4b, 0x12, - 0x09, 0x4b, 0xd0, 0xd8, 0xe3, 0x99, 0xff, 0x9f, 0xf9, 0x46, 0x63, 0xff, 0x6e, 0x0e, 0xba, 0x90, - 0x9a, 0x94, 0x4a, 0x4e, 0xf8, 0x14, 0x34, 0xa9, 0x86, 0x64, 0x36, 0x07, 0xb5, 0x18, 0xe7, 0x86, - 0xb2, 0xb1, 0x82, 0xd9, 0x1c, 0xb4, 0xd1, 0xb8, 0x54, 0xd2, 0xc8, 0x20, 0xb0, 0x6a, 0xfc, 0x47, - 0x8d, 0xab, 0x61, 0xe7, 0x26, 0x2d, 0xb8, 0x90, 0xa4, 0x79, 0x5a, 0x59, 0xe7, 0x94, 0x49, 0x26, - 0x9b, 0x90, 0xd4, 0x91, 0xcb, 0xde, 0xca, 0x64, 0x6d, 0x1e, 0xdb, 0x82, 0xfd, 0x70, 0xa5, 0x7e, - 0x0b, 0x45, 0x21, 0x73, 0x98, 0xea, 0x36, 0x8c, 0xce, 0x85, 0x35, 0x93, 0x94, 0x6a, 0xb0, 0xb4, - 0xa4, 0x1a, 0xa4, 0x60, 0xe8, 0x80, 0x94, 0x94, 0x71, 0x41, 0x0d, 0x97, 0xc2, 0x6a, 0xcf, 0x3e, - 0x21, 0x3f, 0x7e, 0x59, 0x4b, 0x9e, 0x8a, 0x4c, 0x16, 0x5c, 0xb0, 0x47, 0x57, 0x94, 0x5d, 0x29, - 0x2a, 0xf4, 0x04, 0x54, 0xe2, 0xfa, 0xba, 0x77, 0x70, 0xcf, 0x3f, 0x52, 0x90, 0x01, 0xaf, 0x40, - 0x85, 0xa8, 0x87, 0xe2, 0xe3, 0x51, 0xf8, 0xf5, 0x73, 0xff, 0xd4, 0xb1, 0x3e, 0xcc, 0x73, 0x05, - 0x5a, 0xbf, 0x32, 0x8a, 0x0b, 0x96, 0xec, 0x94, 0xc1, 0x63, 0xdf, 0xdf, 0x8f, 0x0d, 0xaf, 0xf5, - 0x50, 0x7c, 0x72, 0x79, 0x1b, 0x3b, 0x53, 0xcd, 0x88, 0x1b, 0x46, 0xec, 0x18, 0xf1, 0x0b, 0xca, - 0xc0, 0x4d, 0x4c, 0x0e, 0x9c, 0x0f, 0x8e, 0xde, 0x2d, 0xbb, 0xde, 0xaf, 0x65, 0xd7, 0x3b, 0xfb, - 0x82, 0xfc, 0x3b, 0xff, 0x01, 0xad, 0x4b, 0x29, 0x34, 0x04, 0xcf, 0x6b, 0x6a, 0x9b, 0x0b, 0x51, - 0xef, 0x7a, 0x7c, 0x72, 0x79, 0x8e, 0xff, 0x3e, 0x14, 0x6e, 0xe9, 0x31, 0x3a, 0x5e, 0x7d, 0xef, - 0x7a, 0x1f, 0x7e, 0x7e, 0xbc, 0x40, 0xc9, 0xae, 0x47, 0xf0, 0xa4, 0x65, 0x9f, 0xf3, 0x7f, 0xee, - 0x63, 0x61, 0x0e, 0x17, 0x1a, 0x3d, 0x5b, 0x6d, 0x22, 0xb4, 0xde, 0x44, 0xe8, 0xc7, 0x26, 0x42, - 0xef, 0xb7, 0x91, 0xb7, 0xde, 0x46, 0xde, 0xb7, 0x6d, 0xe4, 0xbd, 0x1e, 0x30, 0x6e, 0xde, 0xcc, - 0x53, 0x9c, 0xc9, 0x82, 0x58, 0xd4, 0xfe, 0x94, 0xa6, 0xda, 0xc5, 0xa4, 0xba, 0x4f, 0xde, 0xee, - 0x7f, 0x06, 0xb3, 0x28, 0x41, 0xa7, 0x37, 0x9a, 0x7b, 0x0e, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, - 0x71, 0x9d, 0x89, 0xac, 0xb2, 0x02, 0x00, 0x00, + 0x44, 0x76, 0x95, 0x0b, 0xa2, 0xa0, 0x23, 0x42, 0x20, 0x84, 0x84, 0xc0, 0x5c, 0x45, 0x13, 0xad, + 0xed, 0xc9, 0xb2, 0x52, 0xbc, 0xeb, 0xec, 0x6e, 0x2c, 0xf2, 0x06, 0x94, 0x3c, 0x42, 0x4a, 0x4a, + 0x84, 0x78, 0x04, 0x8a, 0x94, 0x11, 0x15, 0x15, 0x42, 0x49, 0x01, 0x8f, 0x81, 0xec, 0x5d, 0x92, + 0x48, 0x58, 0x82, 0xc6, 0x1e, 0xcf, 0xfc, 0xff, 0xcc, 0x37, 0x1a, 0xfb, 0x77, 0x73, 0xd0, 0x85, + 0xd4, 0xa4, 0x54, 0x72, 0xc2, 0xa7, 0xa0, 0x49, 0x35, 0x24, 0xb3, 0x39, 0xa8, 0xc5, 0x38, 0x37, + 0x94, 0x8d, 0x15, 0xcc, 0xe6, 0xa0, 0x8d, 0xc6, 0xa5, 0x92, 0x46, 0x06, 0x81, 0x55, 0xe3, 0x3f, + 0x6a, 0x5c, 0x0d, 0x3b, 0x37, 0x69, 0xc1, 0x85, 0x24, 0xcd, 0xd3, 0xca, 0x3a, 0xa7, 0x4c, 0x32, + 0xd9, 0x84, 0xa4, 0x8e, 0x5c, 0xf6, 0x56, 0x26, 0x6b, 0xf3, 0xd8, 0x16, 0xec, 0x87, 0x2b, 0xf5, + 0x5b, 0x28, 0x0a, 0x99, 0xc3, 0x54, 0xb7, 0x61, 0x74, 0x2e, 0xac, 0x99, 0xa4, 0x54, 0x83, 0xa5, + 0x25, 0xd5, 0x20, 0x05, 0x43, 0x07, 0xa4, 0xa4, 0x8c, 0x0b, 0x6a, 0xb8, 0x14, 0x56, 0x7b, 0xf6, + 0x09, 0xf9, 0xf1, 0xcb, 0x5a, 0xf2, 0x54, 0x64, 0xb2, 0xe0, 0x82, 0x3d, 0xba, 0xa2, 0xec, 0x4a, + 0x51, 0xa1, 0x27, 0xa0, 0x12, 0xd7, 0xd7, 0xbd, 0x83, 0x7b, 0xfe, 0x91, 0x82, 0x0c, 0x78, 0x05, + 0x2a, 0x44, 0x3d, 0x14, 0x1f, 0x8f, 0xc2, 0xaf, 0x9f, 0xfb, 0xa7, 0x8e, 0xf5, 0x61, 0x9e, 0x2b, + 0xd0, 0xfa, 0x95, 0x51, 0x5c, 0xb0, 0x64, 0xa7, 0x0c, 0x1e, 0xfb, 0xfe, 0x7e, 0x6c, 0x78, 0xad, + 0x87, 0xe2, 0x93, 0xcb, 0xdb, 0xd8, 0x99, 0x6a, 0x46, 0xdc, 0x30, 0x62, 0xc7, 0x88, 0x5f, 0x50, + 0x06, 0x6e, 0x62, 0x72, 0xe0, 0x7c, 0x70, 0xf4, 0x6e, 0xd9, 0xf5, 0x7e, 0x2d, 0xbb, 0xde, 0xd9, + 0x17, 0xe4, 0xdf, 0xf9, 0x0f, 0x68, 0x5d, 0x4a, 0xa1, 0x21, 0x78, 0x5e, 0x53, 0xdb, 0x5c, 0x88, + 0x7a, 0xd7, 0xe3, 0x93, 0xcb, 0x73, 0xfc, 0xf7, 0xa1, 0x70, 0x4b, 0x8f, 0xd1, 0xf1, 0xea, 0x7b, + 0xd7, 0xfb, 0xf0, 0xf3, 0xe3, 0x05, 0x4a, 0x76, 0x3d, 0x82, 0x27, 0x2d, 0xfb, 0x9c, 0xff, 0x73, + 0x1f, 0x0b, 0x73, 0xb8, 0xd0, 0xe8, 0xd9, 0x6a, 0x13, 0xa1, 0xf5, 0x26, 0x42, 0x3f, 0x36, 0x11, + 0x7a, 0xbf, 0x8d, 0xbc, 0xf5, 0x36, 0xf2, 0xbe, 0x6d, 0x23, 0xef, 0xf5, 0x80, 0x71, 0xf3, 0x66, + 0x9e, 0xe2, 0x4c, 0x16, 0xc4, 0xa2, 0xf6, 0xa7, 0x34, 0xd5, 0x2e, 0x26, 0xd5, 0x7d, 0xf2, 0x76, + 0xff, 0x33, 0x98, 0x45, 0x09, 0x3a, 0xbd, 0xd1, 0xdc, 0x73, 0xf8, 0x3b, 0x00, 0x00, 0xff, 0xff, + 0x89, 0x70, 0xde, 0x5e, 0xb2, 0x02, 0x00, 0x00, } func (m *QueryIncomingDTagTransferRequestsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/profiles/types/query_params.pb.go b/x/profiles/types/query_params.pb.go index 8a4a9dab8e..76fd9bef03 100644 --- a/x/profiles/types/query_params.pb.go +++ b/x/profiles/types/query_params.pb.go @@ -130,8 +130,8 @@ var fileDescriptor_9afa8e27b0a00e24 = []byte{ 0xde, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0x65, 0x98, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0x31, 0x52, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xca, - 0xd6, 0x2f, 0x33, 0xd5, 0xaf, 0x40, 0xf8, 0xa4, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, - 0x7e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x71, 0x3e, 0x72, 0x5a, 0x4d, 0x01, 0x00, 0x00, + 0xd6, 0x2f, 0x33, 0xd3, 0xaf, 0x40, 0xf8, 0xa4, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, + 0x7e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x89, 0xd3, 0x25, 0xa8, 0x4d, 0x01, 0x00, 0x00, } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/profiles/types/query_profile.go b/x/profiles/types/query_profile.go index fc8dde61a9..3a015a89f4 100644 --- a/x/profiles/types/query_profile.go +++ b/x/profiles/types/query_profile.go @@ -4,7 +4,7 @@ package types import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) // NewQueryProfileRequest returns a new QueryProfileRequest containing the given data @@ -17,7 +17,7 @@ func NewQueryProfileRequest(user string) *QueryProfileRequest { // UnpackInterfaces implements codectypes.UnpackInterfacesMessage func (r *QueryProfileResponse) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { if r.Profile != nil { - var profile authtypes.AccountI + var profile sdk.AccountI return unpacker.UnpackAny(r.Profile, &profile) } return nil diff --git a/x/profiles/types/query_profile.pb.go b/x/profiles/types/query_profile.pb.go index 4ce39cd197..61c6de0a01 100644 --- a/x/profiles/types/query_profile.pb.go +++ b/x/profiles/types/query_profile.pb.go @@ -137,9 +137,9 @@ var fileDescriptor_7c0e029b5401ec84 = []byte{ 0x34, 0xaf, 0xc4, 0x33, 0x08, 0x66, 0x8c, 0x93, 0xf7, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x19, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, - 0x42, 0x4f, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xca, 0xd6, 0x2f, 0x33, 0xd5, 0xaf, 0x40, 0x04, 0x7b, + 0x42, 0x4f, 0x37, 0x27, 0x31, 0xa9, 0x18, 0xca, 0xd6, 0x2f, 0x33, 0xd3, 0xaf, 0x40, 0x04, 0x7b, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x15, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xaa, 0xd2, 0x74, 0x9c, 0x96, 0x01, 0x00, 0x00, + 0x52, 0x3f, 0x23, 0x6e, 0x96, 0x01, 0x00, 0x00, } func (m *QueryProfileRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/profiles/wasm/common_test.go b/x/profiles/wasm/common_test.go index 98429ca90e..fefe20ce5c 100644 --- a/x/profiles/wasm/common_test.go +++ b/x/profiles/wasm/common_test.go @@ -4,12 +4,15 @@ import ( "encoding/json" "testing" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + db "github.com/cosmos/cosmos-db" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" + "github.com/cosmos/cosmos-sdk/codec/address" + "github.com/cosmos/cosmos-sdk/runtime" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -155,12 +158,12 @@ func TestTestSuite(t *testing.T) { func (suite *TestSuite) SetupTest() { // Define the store keys - keys := sdk.NewKVStoreKeys(authtypes.StoreKey, types.StoreKey) + keys := storetypes.NewKVStoreKeys(authtypes.StoreKey, types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } @@ -174,9 +177,10 @@ func (suite *TestSuite) SetupTest() { suite.ak = authkeeper.NewAccountKeeper( suite.cdc, - keys[authtypes.StoreKey], + runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, app.GetMaccPerms(), + address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String(), ) diff --git a/x/profiles/wasm/msg_parser_test.go b/x/profiles/wasm/msg_parser_test.go index 613633391f..a56b618fd1 100644 --- a/x/profiles/wasm/msg_parser_test.go +++ b/x/profiles/wasm/msg_parser_test.go @@ -5,7 +5,7 @@ import ( "testing" sdk "github.com/cosmos/cosmos-sdk/types" - clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" + clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" diff --git a/x/profiles/wasm/querier.go b/x/profiles/wasm/querier.go index bf855b2846..44900de39b 100644 --- a/x/profiles/wasm/querier.go +++ b/x/profiles/wasm/querier.go @@ -60,7 +60,7 @@ func (querier ProfilesWasmQuerier) handleProfileRequest(ctx sdk.Context, request if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.profilesKeeper.Profile(sdk.WrapSDKContext(ctx), &req) + res, err := querier.profilesKeeper.Profile(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -77,7 +77,7 @@ func (querier ProfilesWasmQuerier) handleIncomingDTagRequest(ctx sdk.Context, re if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.profilesKeeper.IncomingDTagTransferRequests(sdk.WrapSDKContext(ctx), &req) + res, err := querier.profilesKeeper.IncomingDTagTransferRequests(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -94,7 +94,7 @@ func (querier ProfilesWasmQuerier) handleChainLinksRequest(ctx sdk.Context, requ if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.profilesKeeper.ChainLinks(sdk.WrapSDKContext(ctx), &req) + res, err := querier.profilesKeeper.ChainLinks(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -112,7 +112,7 @@ func (querier ProfilesWasmQuerier) handleChainLinkOwnersRequest(ctx sdk.Context, if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.profilesKeeper.ChainLinkOwners(sdk.WrapSDKContext(ctx), &req) + res, err := querier.profilesKeeper.ChainLinkOwners(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -130,7 +130,7 @@ func (querier ProfilesWasmQuerier) handleDefaultExternalAddressesRequest(ctx sdk if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.profilesKeeper.DefaultExternalAddresses(sdk.WrapSDKContext(ctx), &req) + res, err := querier.profilesKeeper.DefaultExternalAddresses(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -148,7 +148,7 @@ func (querier ProfilesWasmQuerier) handleApplicationLinksRequest(ctx sdk.Context if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.profilesKeeper.ApplicationLinks(sdk.WrapSDKContext(ctx), &req) + res, err := querier.profilesKeeper.ApplicationLinks(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -166,7 +166,7 @@ func (querier ProfilesWasmQuerier) handleApplicationLinkByClientIDRequest(ctx sd return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } res, err := querier.profilesKeeper.ApplicationLinkByClientID( - sdk.WrapSDKContext(ctx), + ctx, &req, ) if err != nil { @@ -186,7 +186,7 @@ func (querier ProfilesWasmQuerier) handleApplicationLinkOwnersRequest(ctx sdk.Co return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } res, err := querier.profilesKeeper.ApplicationLinkOwners( - sdk.WrapSDKContext(ctx), + ctx, &req, ) if err != nil { diff --git a/x/reactions/client/cli/cli_test.go b/x/reactions/client/cli/cli_test.go index 6ad58d65fc..db0334e11f 100644 --- a/x/reactions/client/cli/cli_test.go +++ b/x/reactions/client/cli/cli_test.go @@ -9,6 +9,7 @@ import ( "testing" "time" + "cosmossdk.io/math" "github.com/desmos-labs/desmos/v6/app" cliutils "github.com/desmos-labs/desmos/v6/x/reactions/client/utils" @@ -541,7 +542,7 @@ func (s *IntegrationTestSuite) TestCmdAddReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: true, }, @@ -554,7 +555,7 @@ func (s *IntegrationTestSuite) TestCmdAddReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: true, }, @@ -566,7 +567,7 @@ func (s *IntegrationTestSuite) TestCmdAddReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -579,7 +580,7 @@ func (s *IntegrationTestSuite) TestCmdAddReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -632,7 +633,7 @@ func (s *IntegrationTestSuite) TestGetCmdRemoveReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: true, }, @@ -643,7 +644,7 @@ func (s *IntegrationTestSuite) TestGetCmdRemoveReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -696,7 +697,7 @@ func (s *IntegrationTestSuite) TestGetCmdAddRegisteredReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: true, }, @@ -707,7 +708,7 @@ func (s *IntegrationTestSuite) TestGetCmdAddRegisteredReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -761,7 +762,7 @@ func (s *IntegrationTestSuite) TestGetCmdEditRegisteredReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: true, }, @@ -773,7 +774,7 @@ func (s *IntegrationTestSuite) TestGetCmdEditRegisteredReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: true, }, @@ -786,7 +787,7 @@ func (s *IntegrationTestSuite) TestGetCmdEditRegisteredReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -839,7 +840,7 @@ func (s *IntegrationTestSuite) TestGetCmdRemoveRegisteredReaction() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -905,7 +906,7 @@ func (s *IntegrationTestSuite) TestCmdSetParams() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, diff --git a/x/reactions/client/utils/cli.pb.go b/x/reactions/client/utils/cli.pb.go index 8bff6ca329..56e79efeaa 100644 --- a/x/reactions/client/utils/cli.pb.go +++ b/x/reactions/client/utils/cli.pb.go @@ -107,9 +107,9 @@ var fileDescriptor_aecb29e08714fd3f = []byte{ 0x09, 0x0e, 0x8b, 0xf8, 0xd2, 0xa0, 0xf2, 0x50, 0xa9, 0xe0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4c, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, - 0x87, 0x58, 0xa4, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0x65, 0xeb, 0x97, 0x99, 0xea, 0x57, 0x20, 0x05, + 0x87, 0x58, 0xa4, 0x9b, 0x93, 0x98, 0x54, 0x0c, 0x65, 0xeb, 0x97, 0x99, 0xe9, 0x57, 0x20, 0x05, 0x27, 0x34, 0xda, 0x4a, 0x4b, 0x32, 0x73, 0x8a, 0x93, 0xd8, 0xc0, 0x41, 0x6a, 0x0c, 0x08, 0x00, - 0x00, 0xff, 0xff, 0xbe, 0x50, 0xa6, 0x3f, 0xe1, 0x01, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xe4, 0xa3, 0x20, 0x52, 0xe1, 0x01, 0x00, 0x00, } func (m *SetReactionsParamsJSON) Marshal() (dAtA []byte, err error) { diff --git a/x/reactions/keeper/alias_functions.go b/x/reactions/keeper/alias_functions.go index ad3aafd98d..2702567e33 100644 --- a/x/reactions/keeper/alias_functions.go +++ b/x/reactions/keeper/alias_functions.go @@ -1,6 +1,7 @@ package keeper import ( + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" poststypes "github.com/desmos-labs/desmos/v6/x/posts/types" @@ -44,7 +45,7 @@ func (k Keeper) GetPost(ctx sdk.Context, subspaceID uint64, postID uint64) (post // IterateRegisteredReactions iterates over all the registered reactions and performs the provided function func (k Keeper) IterateRegisteredReactions(ctx sdk.Context, fn func(reaction types.RegisteredReaction) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.RegisteredReactionPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.RegisteredReactionPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -71,7 +72,7 @@ func (k Keeper) GetRegisteredReactions(ctx sdk.Context) []types.RegisteredReacti // IterateSubspaceRegisteredReactions iterates over all the given subspace registered reactions and performs the provided function func (k Keeper) IterateSubspaceRegisteredReactions(ctx sdk.Context, subspaceID uint64, fn func(reaction types.RegisteredReaction) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspaceRegisteredReactionsPrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspaceRegisteredReactionsPrefix(subspaceID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -100,7 +101,7 @@ func (k Keeper) GetSubspaceRegisteredReactions(ctx sdk.Context, subspaceID uint6 // IterateReactions iterates over all the reactions and performs the provided function func (k Keeper) IterateReactions(ctx sdk.Context, fn func(reaction types.Reaction) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.ReactionPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.ReactionPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -127,7 +128,7 @@ func (k Keeper) GetReactions(ctx sdk.Context) []types.Reaction { // IterateSubspaceReactions iterates over all the given subspace reactions and performs the provided function func (k Keeper) IterateSubspaceReactions(ctx sdk.Context, subspaceID uint64, fn func(reaction types.Reaction) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspaceReactionsPrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspaceReactionsPrefix(subspaceID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -154,7 +155,7 @@ func (k Keeper) GetSubspaceReactions(ctx sdk.Context, subspaceID uint64) []types // IteratePostReactions iterates over all the given post reactions and performs the provided function func (k Keeper) IteratePostReactions(ctx sdk.Context, subspaceID uint64, postID uint64, fn func(reaction types.Reaction) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.PostReactionsPrefix(subspaceID, postID)) + iterator := storetypes.KVStorePrefixIterator(store, types.PostReactionsPrefix(subspaceID, postID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -185,7 +186,7 @@ func (k Keeper) HasReacted(ctx sdk.Context, subspaceID uint64, postID uint64, us // IterateReactionsParams iterates over all the stored subspace reactions params and performs the provided function func (k Keeper) IterateReactionsParams(ctx sdk.Context, fn func(params types.SubspaceReactionsParams) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.ReactionsParamsPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.ReactionsParamsPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { diff --git a/x/reactions/keeper/common_test.go b/x/reactions/keeper/common_test.go index 2623e7fb26..99aa76589a 100644 --- a/x/reactions/keeper/common_test.go +++ b/x/reactions/keeper/common_test.go @@ -6,11 +6,12 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/golang/mock/gomock" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" @@ -43,13 +44,13 @@ type KeeperTestSuite struct { func (suite *KeeperTestSuite) SetupTest() { // Define the store keys - keys := sdk.NewMemoryStoreKeys(types.StoreKey) + keys := storetypes.NewMemoryStoreKeys(types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/reactions/keeper/grpc_query.go b/x/reactions/keeper/grpc_query.go index c7bd9b2695..d972ef2a0a 100644 --- a/x/reactions/keeper/grpc_query.go +++ b/x/reactions/keeper/grpc_query.go @@ -4,7 +4,7 @@ import ( "context" "cosmossdk.io/errors" - "github.com/cosmos/cosmos-sdk/store/prefix" + "cosmossdk.io/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/x/reactions/keeper/grpc_query_test.go b/x/reactions/keeper/grpc_query_test.go index 2d092a6d39..f227f5386c 100644 --- a/x/reactions/keeper/grpc_query_test.go +++ b/x/reactions/keeper/grpc_query_test.go @@ -100,7 +100,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Reactions() { tc.store(ctx) } - res, err := suite.k.Reactions(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Reactions(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -165,7 +165,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Reaction() { tc.store(ctx) } - res, err := suite.k.Reaction(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Reaction(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -264,7 +264,7 @@ func (suite *KeeperTestSuite) TestQueryServer_RegisteredReactions() { tc.store(ctx) } - res, err := suite.k.RegisteredReactions(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.RegisteredReactions(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -322,7 +322,7 @@ func (suite *KeeperTestSuite) TestQueryServer_RegisteredReaction() { tc.store(ctx) } - res, err := suite.k.RegisteredReaction(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.RegisteredReaction(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -378,7 +378,7 @@ func (suite *KeeperTestSuite) TestQueryServer_ReactionsParams() { tc.store(ctx) } - res, err := suite.k.ReactionsParams(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.ReactionsParams(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { diff --git a/x/reactions/keeper/keeper.go b/x/reactions/keeper/keeper.go index 2f77c5e789..305a64f808 100644 --- a/x/reactions/keeper/keeper.go +++ b/x/reactions/keeper/keeper.go @@ -1,9 +1,9 @@ package keeper import ( - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/reactions/types" diff --git a/x/reactions/keeper/msg_server_test.go b/x/reactions/keeper/msg_server_test.go index 4be4145ff2..c595a80215 100644 --- a/x/reactions/keeper/msg_server_test.go +++ b/x/reactions/keeper/msg_server_test.go @@ -541,7 +541,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AddReaction() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.AddReaction(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.AddReaction(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -805,7 +805,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RemoveReaction() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.RemoveReaction(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.RemoveReaction(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -983,7 +983,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AddRegisteredReaction() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.AddRegisteredReaction(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.AddRegisteredReaction(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1168,7 +1168,7 @@ func (suite *KeeperTestSuite) TestMsgServer_EditRegisteredReaction() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.EditRegisteredReaction(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.EditRegisteredReaction(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1305,7 +1305,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RemoveRegisteredReaction() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.RemoveRegisteredReaction(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.RemoveRegisteredReaction(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1443,7 +1443,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SetReactionsParams() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.SetReactionsParams(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.SetReactionsParams(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { diff --git a/x/reactions/legacy/v2/store.go b/x/reactions/legacy/v2/store.go index 900437aa84..01393e5d76 100644 --- a/x/reactions/legacy/v2/store.go +++ b/x/reactions/legacy/v2/store.go @@ -1,8 +1,8 @@ package v2 import ( + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" poststypes "github.com/desmos-labs/desmos/v6/x/posts/types" diff --git a/x/reactions/legacy/v2/store_test.go b/x/reactions/legacy/v2/store_test.go index baff771618..944501c347 100644 --- a/x/reactions/legacy/v2/store_test.go +++ b/x/reactions/legacy/v2/store_test.go @@ -4,6 +4,8 @@ import ( "testing" "time" + "github.com/cosmos/cosmos-sdk/codec/address" + "github.com/cosmos/cosmos-sdk/runtime" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -11,9 +13,10 @@ import ( profileskeeper "github.com/desmos-labs/desmos/v6/x/profiles/keeper" profilestypes "github.com/desmos-labs/desmos/v6/x/profiles/types" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -31,11 +34,19 @@ func TestMigrateStore(t *testing.T) { cdc, legacyAminoCdc := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(paramstypes.StoreKey, relationshipstypes.StoreKey, subspacestypes.StoreKey, poststypes.StoreKey, types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) - - authKeeper := authkeeper.NewAccountKeeper(cdc, keys[authtypes.StoreKey], authtypes.ProtoBaseAccount, app.GetMaccPerms(), "cosmos", authtypes.NewModuleAddress("gov").String()) + keys := storetypes.NewKVStoreKeys(paramstypes.StoreKey, relationshipstypes.StoreKey, subspacestypes.StoreKey, poststypes.StoreKey, types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + + authKeeper := authkeeper.NewAccountKeeper( + cdc, + runtime.NewKVStoreService(keys[authtypes.StoreKey]), + authtypes.ProtoBaseAccount, + app.GetMaccPerms(), + address.NewBech32Codec("cosmos"), + "cosmos", + authtypes.NewModuleAddress("gov").String(), + ) sk := subspaceskeeper.NewKeeper(cdc, keys[subspacestypes.StoreKey], nil, nil, "authority") rk := relationshipskeeper.NewKeeper(cdc, keys[relationshipstypes.StoreKey], sk) diff --git a/x/reactions/legacy/v3/store.go b/x/reactions/legacy/v3/store.go index 0b2f3ffd3c..b9e7c5842b 100644 --- a/x/reactions/legacy/v3/store.go +++ b/x/reactions/legacy/v3/store.go @@ -1,9 +1,9 @@ package v3 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" poststypes "github.com/desmos-labs/desmos/v6/x/posts/types" @@ -79,7 +79,7 @@ func FixMissingNextReactionIDs(ctx sdk.Context, storeKey storetypes.StoreKey, pk } // Get max reaction ID of the post - iter := sdk.KVStorePrefixIterator(store, types.PostReactionsPrefix(post.SubspaceID, post.ID)) + iter := storetypes.KVStorePrefixIterator(store, types.PostReactionsPrefix(post.SubspaceID, post.ID)) maxReactionID := uint32(0) for ; iter.Valid(); iter.Next() { var reaction types.Reaction diff --git a/x/reactions/legacy/v3/store_test.go b/x/reactions/legacy/v3/store_test.go index 83edfc2e1f..c6f11c6b1c 100644 --- a/x/reactions/legacy/v3/store_test.go +++ b/x/reactions/legacy/v3/store_test.go @@ -4,6 +4,7 @@ import ( "testing" "time" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" @@ -20,7 +21,7 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(types.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) // Mocks initializations ctrl := gomock.NewController(t) diff --git a/x/reactions/module.go b/x/reactions/module.go index d44026994f..273d4efaca 100644 --- a/x/reactions/module.go +++ b/x/reactions/module.go @@ -8,9 +8,9 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/depinject" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -48,7 +48,6 @@ var ( _ module.AppModuleBasic = AppModuleBasic{} _ module.AppModuleSimulation = AppModule{} _ appmodule.AppModule = AppModule{} - _ depinject.OnePerModuleType = AppModule{} ) // AppModuleBasic defines the basic application module used by the reactions module. @@ -185,16 +184,6 @@ func (AppModule) ConsensusVersion() uint64 { return consensusVersion } -// BeginBlock returns the begin blocker for the reactions module. -func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) { -} - -// EndBlock returns the end blocker for the reactions module. It returns no validator -// updates. -func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return []abci.ValidatorUpdate{} -} - // -------------------------------------------------------------------------------------------------------------------- // AppModuleSimulation defines the module simulation functions used by the reactions module. @@ -206,7 +195,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { } // RegisterStoreDecoder performs a no-op. -func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { +func (am AppModule) RegisterStoreDecoder(sdr simtypes.StoreDecoderRegistry) { sdr[types.ModuleName] = simulation.NewDecodeStore(am.cdc) } diff --git a/x/reactions/simulation/operations.go b/x/reactions/simulation/operations.go index ab34021fde..1bbdc549fd 100644 --- a/x/reactions/simulation/operations.go +++ b/x/reactions/simulation/operations.go @@ -38,42 +38,42 @@ func WeightedOperations( ) sim.WeightedOperations { var weightMsgAddReaction int - appParams.GetOrGenerate(cdc, OpWeightMsgAddReaction, &weightMsgAddReaction, nil, + appParams.GetOrGenerate(OpWeightMsgAddReaction, &weightMsgAddReaction, nil, func(_ *rand.Rand) { weightMsgAddReaction = params.DefaultWeightMsgAddReaction }, ) var weightMsgRemoveReaction int - appParams.GetOrGenerate(cdc, OpWeightMsgRemoveReaction, &weightMsgRemoveReaction, nil, + appParams.GetOrGenerate(OpWeightMsgRemoveReaction, &weightMsgRemoveReaction, nil, func(_ *rand.Rand) { weightMsgRemoveReaction = params.DefaultWeightMsgRemoveReaction }, ) var weightMsgAddRegisteredReaction int - appParams.GetOrGenerate(cdc, OpWeightMsgAddRegisteredReaction, &weightMsgAddRegisteredReaction, nil, + appParams.GetOrGenerate(OpWeightMsgAddRegisteredReaction, &weightMsgAddRegisteredReaction, nil, func(_ *rand.Rand) { weightMsgAddRegisteredReaction = params.DefaultWeightMsgAddRegisteredReaction }, ) var weightMsgEditRegisteredReaction int - appParams.GetOrGenerate(cdc, OpWeightMsgEditRegisteredReaction, &weightMsgEditRegisteredReaction, nil, + appParams.GetOrGenerate(OpWeightMsgEditRegisteredReaction, &weightMsgEditRegisteredReaction, nil, func(_ *rand.Rand) { weightMsgEditRegisteredReaction = params.DefaultWeightMsgEditRegisteredReaction }, ) var weightMsgRemoveRegisteredReaction int - appParams.GetOrGenerate(cdc, OpWeightMsgRemoveRegisteredReaction, &weightMsgRemoveRegisteredReaction, nil, + appParams.GetOrGenerate(OpWeightMsgRemoveRegisteredReaction, &weightMsgRemoveRegisteredReaction, nil, func(_ *rand.Rand) { weightMsgRemoveRegisteredReaction = params.DefaultWeightMsgRemoveRegisteredReaction }, ) var weightMsgSetReactionsParams int - appParams.GetOrGenerate(cdc, OpWeightMsgSetReactionsParams, &weightMsgSetReactionsParams, nil, + appParams.GetOrGenerate(OpWeightMsgSetReactionsParams, &weightMsgSetReactionsParams, nil, func(_ *rand.Rand) { weightMsgSetReactionsParams = params.DefaultWeightMsgSetReactionsParams }, diff --git a/x/reactions/types/codec.go b/x/reactions/types/codec.go index ec8479ca62..28b15e7e40 100644 --- a/x/reactions/types/codec.go +++ b/x/reactions/types/codec.go @@ -4,10 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" "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" - authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" ) func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { @@ -42,25 +40,3 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } - -var ( - amino = codec.NewLegacyAmino() - - // AminoCdc references the global x/reactions module codec. Note, the codec should - // ONLY be used in certain instances of tests and for JSON encoding as Amino is - // still used for that purpose. - // - // The actual codec used for serialization should be provided to x/reactions and - // defined at the application level. - AminoCdc = codec.NewAminoCodec(amino) -) - -func init() { - RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) - sdk.RegisterLegacyAminoCodec(amino) - - // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be - // used to properly serialize MsgGrant and MsgExec instances - RegisterLegacyAminoCodec(authzcodec.Amino) -} diff --git a/x/reactions/types/genesis.pb.go b/x/reactions/types/genesis.pb.go index f7320ef90a..108ef019cf 100644 --- a/x/reactions/types/genesis.pb.go +++ b/x/reactions/types/genesis.pb.go @@ -227,34 +227,34 @@ var fileDescriptor_81b04d309ae6ac6f = []byte{ // 481 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4f, 0x8b, 0xd3, 0x40, 0x18, 0x87, 0x3b, 0xdb, 0x5a, 0xed, 0xbb, 0x76, 0x75, 0xb3, 0x45, 0xc2, 0x82, 0x49, 0xad, 0xa0, - 0x45, 0x34, 0xc3, 0xae, 0x78, 0xf1, 0x18, 0xaa, 0x12, 0x58, 0x64, 0xc9, 0x5e, 0xc4, 0x4b, 0x99, - 0x34, 0x43, 0x0c, 0x6c, 0x3a, 0x61, 0x66, 0xb6, 0xb8, 0xdf, 0xc2, 0xa3, 0x27, 0xe9, 0xd1, 0xa3, - 0x1f, 0x63, 0x8f, 0x05, 0x2f, 0x9e, 0x8a, 0xa4, 0x07, 0xfd, 0x18, 0x92, 0xc9, 0x9f, 0x46, 0x12, - 0x85, 0xbd, 0x84, 0x61, 0xde, 0xf7, 0x7d, 0xe6, 0xc9, 0xfc, 0x18, 0x78, 0xe0, 0x53, 0x11, 0x31, - 0x81, 0x39, 0x25, 0x33, 0x19, 0xb2, 0xb9, 0xc0, 0x8b, 0x23, 0x1c, 0xd0, 0x39, 0x15, 0xa1, 0xb0, - 0x62, 0xce, 0x24, 0xd3, 0x0e, 0xb2, 0x16, 0xab, 0x6c, 0xb1, 0x16, 0x47, 0x87, 0xfb, 0x24, 0x0a, - 0xe7, 0x0c, 0xab, 0x6f, 0xd6, 0x77, 0x38, 0x08, 0x58, 0xc0, 0xd4, 0x12, 0xa7, 0xab, 0x7c, 0x77, - 0xd8, 0x74, 0x40, 0xc4, 0x7c, 0x7a, 0x9e, 0xf3, 0x47, 0xdf, 0xdb, 0x70, 0xfb, 0x4d, 0x76, 0xe2, - 0x99, 0x24, 0x92, 0x6a, 0xef, 0x60, 0x4f, 0x5c, 0x78, 0x22, 0x26, 0x33, 0x2a, 0xa6, 0x3e, 0x91, - 0x44, 0x47, 0xc3, 0xf6, 0x78, 0xf7, 0xf8, 0x91, 0xd5, 0x60, 0x62, 0x9d, 0xe5, 0xad, 0x13, 0x22, - 0xc9, 0xab, 0xb9, 0xe4, 0x97, 0x76, 0xef, 0x6a, 0x6d, 0xb6, 0xbe, 0xfe, 0xfa, 0xf6, 0x04, 0xb9, - 0xfd, 0x12, 0x94, 0x96, 0x35, 0x0a, 0x03, 0x4e, 0x83, 0x50, 0x48, 0xca, 0xa9, 0x3f, 0x2d, 0x31, - 0xfa, 0x8e, 0xe2, 0x3f, 0x6e, 0xe4, 0xbb, 0xe5, 0x80, 0x9b, 0x6f, 0x57, 0x0f, 0x38, 0xe0, 0xb5, - 0xb2, 0xd0, 0x4e, 0x00, 0x62, 0x26, 0x64, 0x2e, 0xdf, 0x56, 0xf0, 0x51, 0x23, 0xfc, 0x94, 0x09, - 0xd9, 0x28, 0xde, 0x53, 0x00, 0x25, 0xfd, 0x1a, 0x7a, 0x5b, 0xd3, 0x8e, 0x82, 0xdd, 0xff, 0x87, - 0x69, 0xdd, 0x6f, 0x3b, 0xaa, 0x79, 0x70, 0x77, 0x7b, 0xad, 0x31, 0xe1, 0x24, 0x12, 0xfa, 0x0d, - 0x85, 0x7b, 0xfa, 0xdf, 0x8b, 0x2d, 0xff, 0xeb, 0x54, 0xcd, 0x54, 0xe9, 0x77, 0x4a, 0x60, 0x56, - 0x7b, 0x79, 0xeb, 0xf3, 0xd2, 0x44, 0xbf, 0x97, 0x26, 0x1a, 0x7d, 0x41, 0xb0, 0x5f, 0x8b, 0x46, - 0xc3, 0xb0, 0x5b, 0x8c, 0x4c, 0x43, 0x5f, 0x47, 0x43, 0x34, 0xee, 0xd8, 0x7b, 0xc9, 0xda, 0x84, - 0xa2, 0xd7, 0x99, 0xb8, 0x50, 0xb4, 0x38, 0xbe, 0xf6, 0x16, 0xee, 0x35, 0x24, 0x96, 0xce, 0xee, - 0x0c, 0xd1, 0xb8, 0x6f, 0xeb, 0xc9, 0xda, 0x1c, 0xd4, 0x23, 0x72, 0x26, 0xee, 0xa0, 0x9e, 0x8c, - 0xe3, 0x57, 0x04, 0x97, 0x08, 0xfa, 0x7f, 0x5d, 0xff, 0xf5, 0xe5, 0x1e, 0xc2, 0xcd, 0x34, 0xa6, - 0xc2, 0xa6, 0x63, 0x43, 0xb2, 0x36, 0xbb, 0x29, 0xd4, 0x99, 0xb8, 0xdd, 0xb4, 0xe4, 0xf8, 0x29, - 0xb5, 0xaa, 0xdd, 0x56, 0xda, 0x8a, 0x5a, 0x91, 0x05, 0xde, 0xa0, 0x68, 0x9f, 0x5c, 0x25, 0x06, - 0x5a, 0x25, 0x06, 0xfa, 0x99, 0x18, 0xe8, 0xd3, 0xc6, 0x68, 0xad, 0x36, 0x46, 0xeb, 0xc7, 0xc6, - 0x68, 0xbd, 0x3f, 0x0e, 0x42, 0xf9, 0xe1, 0xc2, 0xb3, 0x66, 0x2c, 0xc2, 0x59, 0x76, 0xcf, 0xce, - 0x89, 0x27, 0xf2, 0x35, 0x5e, 0xbc, 0xc0, 0x1f, 0x2b, 0x2f, 0x4e, 0x5e, 0xc6, 0x54, 0x78, 0x5d, - 0xf5, 0xdc, 0x9e, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x7f, 0x5a, 0x8b, 0xf3, 0x03, 0x00, + 0x45, 0x34, 0xc3, 0xae, 0xe0, 0xc1, 0x63, 0xa8, 0x4a, 0x60, 0x91, 0x25, 0x7b, 0x11, 0x2f, 0x65, + 0xd2, 0x0c, 0x31, 0xb0, 0xe9, 0x84, 0x99, 0xd9, 0xe2, 0x7e, 0x0b, 0x8f, 0x9e, 0xa4, 0x47, 0x8f, + 0x7e, 0x8c, 0x3d, 0x16, 0xbc, 0x78, 0x2a, 0x92, 0x1e, 0xf4, 0x63, 0x48, 0x26, 0x7f, 0x1a, 0x49, + 0x14, 0xf6, 0x12, 0x86, 0x79, 0xdf, 0xf7, 0x99, 0x27, 0xf3, 0x63, 0xe0, 0x81, 0x4f, 0x45, 0xc4, + 0x04, 0xe6, 0x94, 0xcc, 0x64, 0xc8, 0xe6, 0x02, 0x2f, 0x8e, 0x70, 0x40, 0xe7, 0x54, 0x84, 0xc2, + 0x8a, 0x39, 0x93, 0x4c, 0x3b, 0xc8, 0x5a, 0xac, 0xb2, 0xc5, 0x5a, 0x1c, 0x1d, 0xee, 0x93, 0x28, + 0x9c, 0x33, 0xac, 0xbe, 0x59, 0xdf, 0xe1, 0x20, 0x60, 0x01, 0x53, 0x4b, 0x9c, 0xae, 0xf2, 0xdd, + 0x61, 0xd3, 0x01, 0x11, 0xf3, 0xe9, 0x79, 0xce, 0x1f, 0x7d, 0x6f, 0xc3, 0xed, 0x37, 0xd9, 0x89, + 0x67, 0x92, 0x48, 0xaa, 0xbd, 0x83, 0x3d, 0x71, 0xe1, 0x89, 0x98, 0xcc, 0xa8, 0x98, 0xfa, 0x44, + 0x12, 0x1d, 0x0d, 0xdb, 0xe3, 0xdd, 0xe3, 0x47, 0x56, 0x83, 0x89, 0x75, 0x96, 0xb7, 0x4e, 0x88, + 0x24, 0xaf, 0xe6, 0x92, 0x5f, 0xda, 0xbd, 0xab, 0xb5, 0xd9, 0xfa, 0xfa, 0xeb, 0xdb, 0x13, 0xe4, + 0xf6, 0x4b, 0x50, 0x5a, 0xd6, 0x28, 0x0c, 0x38, 0x0d, 0x42, 0x21, 0x29, 0xa7, 0xfe, 0xb4, 0xc4, + 0xe8, 0x3b, 0x8a, 0xff, 0xb8, 0x91, 0xef, 0x96, 0x03, 0x6e, 0xbe, 0x5d, 0x3d, 0xe0, 0x80, 0xd7, + 0xca, 0x42, 0x3b, 0x01, 0x88, 0x99, 0x90, 0xb9, 0x7c, 0x5b, 0xc1, 0x47, 0x8d, 0xf0, 0x53, 0x26, + 0x64, 0xa3, 0x78, 0x4f, 0x01, 0x94, 0xf4, 0x6b, 0xe8, 0x6d, 0x4d, 0x3b, 0x0a, 0x76, 0xff, 0x1f, + 0xa6, 0x75, 0xbf, 0xed, 0xa8, 0xe6, 0xc1, 0xdd, 0xed, 0xb5, 0xc6, 0x84, 0x93, 0x48, 0xe8, 0x37, + 0x14, 0xee, 0xe9, 0x7f, 0x2f, 0xb6, 0xfc, 0xaf, 0x53, 0x35, 0x53, 0xa5, 0xdf, 0x29, 0x81, 0x59, + 0xed, 0xe5, 0xad, 0xcf, 0x4b, 0x13, 0xfd, 0x5e, 0x9a, 0x68, 0xf4, 0x05, 0xc1, 0x7e, 0x2d, 0x1a, + 0x0d, 0xc3, 0x6e, 0x31, 0x32, 0x0d, 0x7d, 0x1d, 0x0d, 0xd1, 0xb8, 0x63, 0xef, 0x25, 0x6b, 0x13, + 0x8a, 0x5e, 0x67, 0xe2, 0x42, 0xd1, 0xe2, 0xf8, 0xda, 0x5b, 0xb8, 0xd7, 0x90, 0x58, 0x3a, 0xbb, + 0x33, 0x44, 0xe3, 0xbe, 0xad, 0x27, 0x6b, 0x73, 0x50, 0x8f, 0xc8, 0x99, 0xb8, 0x83, 0x7a, 0x32, + 0x8e, 0x5f, 0x11, 0x5c, 0x22, 0xe8, 0xff, 0x75, 0xfd, 0xd7, 0x97, 0x7b, 0x08, 0x37, 0xd3, 0x98, + 0x0a, 0x9b, 0x8e, 0x0d, 0xc9, 0xda, 0xec, 0xa6, 0x50, 0x67, 0xe2, 0x76, 0xd3, 0x92, 0xe3, 0xa7, + 0xd4, 0xaa, 0x76, 0x5b, 0x69, 0x2b, 0x6a, 0x45, 0x16, 0x78, 0x83, 0xa2, 0x7d, 0x72, 0x95, 0x18, + 0x68, 0x95, 0x18, 0xe8, 0x67, 0x62, 0xa0, 0x4f, 0x1b, 0xa3, 0xb5, 0xda, 0x18, 0xad, 0x1f, 0x1b, + 0xa3, 0xf5, 0xfe, 0x38, 0x08, 0xe5, 0x87, 0x0b, 0xcf, 0x9a, 0xb1, 0x08, 0x67, 0xd9, 0x3d, 0x3b, + 0x27, 0x9e, 0xc8, 0xd7, 0x78, 0xf1, 0x02, 0x7f, 0xac, 0xbc, 0x38, 0x79, 0x19, 0x53, 0xe1, 0x75, + 0xd5, 0x73, 0x7b, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x34, 0x52, 0xce, 0x38, 0xf3, 0x03, 0x00, 0x00, } diff --git a/x/reactions/types/models.pb.go b/x/reactions/types/models.pb.go index 3e4744fa9c..d435d85559 100644 --- a/x/reactions/types/models.pb.go +++ b/x/reactions/types/models.pb.go @@ -465,56 +465,56 @@ func init() { func init() { proto.RegisterFile("desmos/reactions/v1/models.proto", fileDescriptor_b88c682704b8a018) } var fileDescriptor_b88c682704b8a018 = []byte{ - // 783 bytes of a gzipped FileDescriptorProto + // 784 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x55, 0xcf, 0x6f, 0xe3, 0x44, 0x14, 0x8e, 0xbd, 0x6d, 0x36, 0x99, 0x6c, 0x16, 0x3a, 0xc9, 0xb2, 0xd9, 0x8a, 0xc6, 0x61, 0x16, - 0x89, 0x80, 0x88, 0xad, 0x0d, 0xf4, 0x40, 0x25, 0x24, 0x6a, 0x58, 0xa4, 0x4a, 0x7b, 0xa8, 0x5c, - 0x04, 0x12, 0x17, 0x6b, 0x92, 0x99, 0x3a, 0x96, 0x6c, 0x4f, 0xe4, 0x71, 0xa2, 0xe4, 0x6f, 0x80, - 0x03, 0x47, 0x8e, 0x3d, 0x72, 0x41, 0xe2, 0xd0, 0x0b, 0xff, 0x41, 0xc5, 0xa9, 0xe2, 0xc4, 0x05, - 0x83, 0xd2, 0x03, 0x9c, 0xfd, 0x17, 0xa0, 0xcc, 0x8c, 0xf3, 0x43, 0x09, 0xd5, 0x56, 0xea, 0x25, - 0x9a, 0x79, 0xef, 0x7b, 0xef, 0x7d, 0xef, 0xf3, 0xa7, 0x09, 0x68, 0x11, 0xca, 0x43, 0xc6, 0xad, - 0x98, 0xe2, 0x7e, 0xe2, 0xb3, 0x88, 0x5b, 0xe3, 0x17, 0x56, 0xc8, 0x08, 0x0d, 0xb8, 0x39, 0x8c, - 0x59, 0xc2, 0x60, 0x4d, 0x22, 0xcc, 0x05, 0xc2, 0x1c, 0xbf, 0xd8, 0xdf, 0xc3, 0xa1, 0x1f, 0x31, - 0x4b, 0xfc, 0x4a, 0xdc, 0x7e, 0xdd, 0x63, 0x1e, 0x13, 0x47, 0x6b, 0x7e, 0x52, 0xd1, 0x67, 0x1e, - 0x63, 0x5e, 0x40, 0x2d, 0x71, 0xeb, 0x8d, 0xce, 0x2d, 0x1c, 0x4d, 0xf3, 0x54, 0x9f, 0xcd, 0x1b, - 0xbb, 0xb2, 0x46, 0x5e, 0x64, 0x0a, 0xfd, 0xa9, 0x83, 0x92, 0xa3, 0xe6, 0xc1, 0x97, 0xa0, 0xc2, - 0x47, 0x3d, 0x3e, 0xc4, 0x7d, 0xea, 0xfa, 0xa4, 0xa1, 0xb5, 0xb4, 0xf6, 0x8e, 0xfd, 0xee, 0x2c, - 0x35, 0xc0, 0x99, 0x0a, 0x9f, 0x7c, 0x91, 0xa5, 0x06, 0x9c, 0xe2, 0x30, 0x38, 0x42, 0x2b, 0x50, - 0xe4, 0x80, 0xfc, 0x76, 0x42, 0xe0, 0x21, 0x78, 0x38, 0x64, 0x3c, 0x99, 0xb7, 0xd0, 0x45, 0x8b, - 0xb7, 0x67, 0xa9, 0x51, 0x3c, 0x65, 0x3c, 0x11, 0xe5, 0x8f, 0x65, 0xb9, 0x82, 0x20, 0xa7, 0x38, - 0x3f, 0x9d, 0x10, 0xf8, 0x1c, 0xe8, 0x3e, 0x69, 0x3c, 0x68, 0x69, 0xed, 0xaa, 0x5d, 0x9b, 0xa5, + 0x89, 0x80, 0x88, 0xad, 0x0d, 0x2c, 0x12, 0x95, 0x90, 0xa8, 0x61, 0x91, 0x2a, 0xf5, 0x50, 0xb9, + 0x08, 0x24, 0x2e, 0xd6, 0x24, 0x33, 0x75, 0x2c, 0xd9, 0x9e, 0xc8, 0xe3, 0x44, 0xc9, 0xdf, 0x00, + 0x07, 0x8e, 0x1c, 0x7b, 0xe4, 0x82, 0xc4, 0xa1, 0x17, 0xfe, 0x83, 0x8a, 0x53, 0xc5, 0x89, 0x0b, + 0x06, 0xa5, 0x07, 0x38, 0xfb, 0x2f, 0x40, 0x99, 0x19, 0xe7, 0x87, 0x12, 0x2a, 0x2a, 0xf5, 0x12, + 0xcd, 0xbc, 0xf7, 0xbd, 0xf7, 0xbe, 0xf7, 0xf9, 0xd3, 0x04, 0xb4, 0x08, 0xe5, 0x21, 0xe3, 0x56, + 0x4c, 0x71, 0x3f, 0xf1, 0x59, 0xc4, 0xad, 0xf1, 0x0b, 0x2b, 0x64, 0x84, 0x06, 0xdc, 0x1c, 0xc6, + 0x2c, 0x61, 0xb0, 0x26, 0x11, 0xe6, 0x02, 0x61, 0x8e, 0x5f, 0xec, 0xef, 0xe1, 0xd0, 0x8f, 0x98, + 0x25, 0x7e, 0x25, 0x6e, 0xbf, 0xee, 0x31, 0x8f, 0x89, 0xa3, 0x35, 0x3f, 0xa9, 0xe8, 0x33, 0x8f, + 0x31, 0x2f, 0xa0, 0x96, 0xb8, 0xf5, 0x46, 0xe7, 0x16, 0x8e, 0xa6, 0x79, 0xaa, 0xcf, 0xe6, 0x8d, + 0x5d, 0x59, 0x23, 0x2f, 0x32, 0x85, 0xfe, 0xd0, 0x41, 0xc9, 0x51, 0xf3, 0xe0, 0x2b, 0x50, 0xe1, + 0xa3, 0x1e, 0x1f, 0xe2, 0x3e, 0x75, 0x7d, 0xd2, 0xd0, 0x5a, 0x5a, 0x7b, 0xc7, 0x7e, 0x7b, 0x96, + 0x1a, 0xe0, 0x4c, 0x85, 0x8f, 0x3f, 0xcf, 0x52, 0x03, 0x4e, 0x71, 0x18, 0x1c, 0xa2, 0x15, 0x28, + 0x72, 0x40, 0x7e, 0x3b, 0x26, 0xf0, 0x25, 0x78, 0x38, 0x64, 0x3c, 0x99, 0xb7, 0xd0, 0x45, 0x8b, + 0x37, 0x67, 0xa9, 0x51, 0x3c, 0x65, 0x3c, 0x11, 0xe5, 0x8f, 0x65, 0xb9, 0x82, 0x20, 0xa7, 0x38, + 0x3f, 0x1d, 0x13, 0xf8, 0x1c, 0xe8, 0x3e, 0x69, 0x3c, 0x68, 0x69, 0xed, 0xaa, 0x5d, 0x9b, 0xa5, 0x86, 0x2e, 0xd0, 0x65, 0x89, 0x9e, 0x03, 0x75, 0x9f, 0x40, 0x0c, 0x76, 0xc7, 0x38, 0x18, 0xd1, - 0xc6, 0x4e, 0x4b, 0x6b, 0x57, 0xba, 0x75, 0x53, 0x6e, 0x6d, 0xe6, 0x5b, 0x9b, 0xc7, 0xd1, 0xd4, - 0x3e, 0xcc, 0x52, 0xe3, 0x91, 0xac, 0x13, 0x60, 0xf4, 0xdb, 0x65, 0xe7, 0x9d, 0x2d, 0xe2, 0x9a, - 0xf9, 0xe6, 0x5f, 0xcf, 0x51, 0x8e, 0xec, 0x0c, 0x8f, 0x41, 0x11, 0x8f, 0x92, 0x01, 0x8b, 0x1b, - 0xbb, 0x2d, 0xad, 0x5d, 0xb6, 0xdf, 0xcf, 0x52, 0xa3, 0x2a, 0xbb, 0xc9, 0x38, 0xfa, 0xfd, 0xb2, - 0x53, 0x57, 0x2a, 0x1e, 0x13, 0x12, 0x53, 0xce, 0xcf, 0x92, 0xd8, 0x8f, 0x3c, 0x47, 0x15, 0x1e, - 0x95, 0x7e, 0xbc, 0x30, 0xb4, 0x7f, 0x2f, 0x0c, 0x0d, 0xfd, 0xaa, 0x81, 0xa7, 0x0e, 0xf5, 0x7c, - 0x9e, 0xd0, 0x98, 0x92, 0xb5, 0x79, 0x90, 0x81, 0xb7, 0xe2, 0x45, 0xca, 0xcd, 0x89, 0xe5, 0xca, - 0x57, 0xed, 0x4f, 0x66, 0xa9, 0x51, 0xdf, 0x2c, 0x16, 0xb2, 0x1c, 0x48, 0x42, 0xdb, 0xeb, 0x91, - 0x53, 0x8f, 0x37, 0xcb, 0xc8, 0x51, 0x27, 0xa7, 0xf5, 0x5a, 0x7a, 0xa0, 0x3e, 0xa8, 0x7e, 0x19, - 0x53, 0xfa, 0x15, 0x9d, 0x24, 0x92, 0xf0, 0x73, 0xb0, 0x93, 0xd0, 0x49, 0x22, 0xe8, 0x95, 0xed, - 0x37, 0xb2, 0xd4, 0xa8, 0x48, 0x1a, 0xf3, 0x28, 0x72, 0x44, 0xf2, 0xae, 0x43, 0xbe, 0xd3, 0x01, - 0xdc, 0xdc, 0xf1, 0xbe, 0xac, 0x28, 0x3d, 0xa5, 0xdf, 0xee, 0xa9, 0xcf, 0xc0, 0x63, 0x3e, 0x60, - 0x71, 0x32, 0xc0, 0x11, 0x71, 0xfb, 0x8c, 0x50, 0x61, 0xc2, 0xb2, 0xfd, 0x2c, 0x4b, 0x8d, 0x27, - 0x6a, 0xc0, 0x5a, 0x1e, 0x39, 0xd5, 0x45, 0xe0, 0x73, 0x46, 0x28, 0xfc, 0x14, 0x54, 0x89, 0xcf, - 0x87, 0x01, 0x9e, 0xba, 0x4b, 0x77, 0x96, 0xed, 0x46, 0x96, 0x1a, 0x75, 0xd9, 0x60, 0x2d, 0x8d, - 0x9c, 0x47, 0xea, 0x2e, 0x34, 0x58, 0xb1, 0xcb, 0x5f, 0x3a, 0x78, 0x9a, 0x2f, 0x98, 0x6b, 0xc1, - 0x4f, 0x71, 0x8c, 0x43, 0x7e, 0x5f, 0x92, 0x7c, 0xaf, 0x81, 0xda, 0x16, 0xdb, 0x08, 0x91, 0x2a, - 0xdd, 0xae, 0xb9, 0xfd, 0x93, 0x6d, 0x75, 0xb0, 0x24, 0x66, 0xbf, 0x77, 0x95, 0x1a, 0x85, 0x2c, - 0x35, 0xf6, 0xff, 0xd7, 0x93, 0xe8, 0xa7, 0x7f, 0x7e, 0xf9, 0x40, 0x73, 0xe0, 0xa6, 0x2b, 0x21, - 0x01, 0xe5, 0xf3, 0x98, 0x52, 0x57, 0x18, 0xeb, 0x81, 0xe0, 0xd0, 0xde, 0xca, 0x61, 0xcd, 0x8a, - 0x6a, 0xf2, 0x81, 0x9a, 0xfc, 0xa6, 0x9c, 0xbc, 0x68, 0xa4, 0xe6, 0x95, 0xce, 0x55, 0xcd, 0x8a, - 0xc2, 0x3f, 0x6b, 0xa0, 0xb6, 0xa5, 0x15, 0xfc, 0x10, 0x3c, 0xa4, 0x11, 0xee, 0x05, 0x54, 0x2a, - 0x5b, 0xb2, 0xe1, 0xf2, 0xa9, 0x52, 0x09, 0xe4, 0xe4, 0x10, 0xf8, 0x31, 0x00, 0x21, 0x9e, 0xb8, - 0x01, 0x8d, 0xbc, 0x64, 0xa0, 0xfc, 0xf5, 0x24, 0x4b, 0x8d, 0x3d, 0x59, 0xb0, 0xcc, 0x21, 0xa7, - 0x1c, 0xe2, 0xc9, 0x2b, 0x71, 0x86, 0x6d, 0x50, 0x8c, 0xa9, 0xe7, 0xd2, 0x89, 0x32, 0xd8, 0xde, - 0xf2, 0x65, 0x91, 0x71, 0xe4, 0xec, 0xc6, 0xd4, 0x7b, 0x39, 0x59, 0xe1, 0xfb, 0x0d, 0x38, 0xb8, - 0x55, 0xfd, 0xbb, 0x11, 0x5f, 0x36, 0xb6, 0x5f, 0x5d, 0xcd, 0x9a, 0xda, 0xf5, 0xac, 0xa9, 0xfd, - 0x3d, 0x6b, 0x6a, 0x3f, 0xdc, 0x34, 0x0b, 0xd7, 0x37, 0xcd, 0xc2, 0x1f, 0x37, 0xcd, 0xc2, 0xb7, + 0xc6, 0x4e, 0x4b, 0x6b, 0x57, 0xba, 0x75, 0x53, 0x6e, 0x6d, 0xe6, 0x5b, 0x9b, 0x47, 0xd1, 0xd4, + 0x7e, 0x99, 0xa5, 0xc6, 0x23, 0x59, 0x27, 0xc0, 0xe8, 0xd7, 0xcb, 0xce, 0x5b, 0x5b, 0xc4, 0x35, + 0xf3, 0xcd, 0xbf, 0x9a, 0xa3, 0x1c, 0xd9, 0x19, 0x1e, 0x81, 0x22, 0x1e, 0x25, 0x03, 0x16, 0x37, + 0x76, 0x5b, 0x5a, 0xbb, 0x6c, 0xbf, 0x9b, 0xa5, 0x46, 0x55, 0x76, 0x93, 0x71, 0xf4, 0xdb, 0x65, + 0xa7, 0xae, 0x54, 0x3c, 0x22, 0x24, 0xa6, 0x9c, 0x9f, 0x25, 0xb1, 0x1f, 0x79, 0x8e, 0x2a, 0x3c, + 0x2c, 0xfd, 0x70, 0x61, 0x68, 0xff, 0x5c, 0x18, 0x1a, 0xfa, 0x45, 0x03, 0x4f, 0x1d, 0xea, 0xf9, + 0x3c, 0xa1, 0x31, 0x25, 0x6b, 0xf3, 0x20, 0x03, 0x6f, 0xc4, 0x8b, 0x94, 0x9b, 0x13, 0xcb, 0x95, + 0xaf, 0xda, 0x1f, 0xcf, 0x52, 0xa3, 0xbe, 0x59, 0x2c, 0x64, 0x39, 0x90, 0x84, 0xb6, 0xd7, 0x23, + 0xa7, 0x1e, 0x6f, 0x96, 0x91, 0xc3, 0x4e, 0x4e, 0xeb, 0x7f, 0xe9, 0x81, 0xfa, 0xa0, 0xfa, 0x45, + 0x4c, 0xe9, 0x97, 0x74, 0x92, 0x48, 0xc2, 0xcf, 0xc1, 0x4e, 0x42, 0x27, 0x89, 0xa0, 0x57, 0xb6, + 0x5f, 0xcb, 0x52, 0xa3, 0x22, 0x69, 0xcc, 0xa3, 0xc8, 0x11, 0xc9, 0xbb, 0x0e, 0xf9, 0x56, 0x07, + 0x70, 0x73, 0xc7, 0xfb, 0xb2, 0xa2, 0xf4, 0x94, 0x7e, 0xbb, 0xa7, 0x3e, 0x05, 0x8f, 0xf9, 0x80, + 0xc5, 0xc9, 0x00, 0x47, 0xc4, 0xed, 0x33, 0x42, 0x85, 0x09, 0xcb, 0xf6, 0xb3, 0x2c, 0x35, 0x9e, + 0xa8, 0x01, 0x6b, 0x79, 0xe4, 0x54, 0x17, 0x81, 0xcf, 0x18, 0xa1, 0xf0, 0x13, 0x50, 0x25, 0x3e, + 0x1f, 0x06, 0x78, 0xea, 0x2e, 0xdd, 0x59, 0xb6, 0x1b, 0x59, 0x6a, 0xd4, 0x65, 0x83, 0xb5, 0x34, + 0x72, 0x1e, 0xa9, 0xbb, 0xd0, 0x60, 0xc5, 0x2e, 0x7f, 0xea, 0xe0, 0x69, 0xbe, 0x60, 0xae, 0x05, + 0x3f, 0xc5, 0x31, 0x0e, 0xf9, 0x7d, 0x49, 0xf2, 0x9d, 0x06, 0x6a, 0x5b, 0x6c, 0x23, 0x44, 0xaa, + 0x74, 0xbb, 0xe6, 0xf6, 0x4f, 0xb6, 0xd5, 0xc1, 0x92, 0x98, 0xfd, 0xce, 0x55, 0x6a, 0x14, 0xb2, + 0xd4, 0xd8, 0xff, 0x4f, 0x4f, 0xa2, 0x1f, 0xff, 0xfe, 0xf9, 0x3d, 0xcd, 0x81, 0x9b, 0xae, 0x84, + 0x04, 0x94, 0xcf, 0x63, 0x4a, 0x5d, 0x61, 0xac, 0x07, 0x82, 0x43, 0x7b, 0x2b, 0x87, 0x35, 0x2b, + 0xaa, 0xc9, 0x07, 0x6a, 0xf2, 0xeb, 0x72, 0xf2, 0xa2, 0x91, 0x9a, 0x57, 0x3a, 0x57, 0x35, 0x2b, + 0x0a, 0xff, 0xa4, 0x81, 0xda, 0x96, 0x56, 0xf0, 0x7d, 0xf0, 0x90, 0x46, 0xb8, 0x17, 0x50, 0xa9, + 0x6c, 0xc9, 0x86, 0xcb, 0xa7, 0x4a, 0x25, 0x90, 0x93, 0x43, 0xe0, 0x87, 0x00, 0x84, 0x78, 0xe2, + 0x06, 0x34, 0xf2, 0x92, 0x81, 0xf2, 0xd7, 0x93, 0x2c, 0x35, 0xf6, 0x64, 0xc1, 0x32, 0x87, 0x9c, + 0x72, 0x88, 0x27, 0x27, 0xe2, 0x0c, 0xdb, 0xa0, 0x18, 0x53, 0xcf, 0xa5, 0x13, 0x65, 0xb0, 0xbd, + 0xe5, 0xcb, 0x22, 0xe3, 0xc8, 0xd9, 0x8d, 0xa9, 0xf7, 0x6a, 0xb2, 0xc2, 0xf7, 0x6b, 0x70, 0x70, + 0xab, 0xfa, 0x77, 0x23, 0xbe, 0x6c, 0x6c, 0x9f, 0x5c, 0xcd, 0x9a, 0xda, 0xf5, 0xac, 0xa9, 0xfd, + 0x35, 0x6b, 0x6a, 0xdf, 0xdf, 0x34, 0x0b, 0xd7, 0x37, 0xcd, 0xc2, 0xef, 0x37, 0xcd, 0xc2, 0x37, 0x5d, 0xcf, 0x4f, 0x06, 0xa3, 0x9e, 0xd9, 0x67, 0xa1, 0x25, 0xbf, 0x44, 0x27, 0xc0, 0x3d, 0xae, - 0xce, 0xd6, 0xf8, 0xd0, 0x9a, 0xac, 0xfc, 0x8b, 0x25, 0xd3, 0x21, 0xe5, 0xbd, 0xa2, 0x78, 0x80, - 0x3f, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x01, 0x0b, 0xc6, 0x15, 0xe6, 0x06, 0x00, 0x00, + 0xce, 0xd6, 0xf8, 0x23, 0x6b, 0xb2, 0xf2, 0x2f, 0x96, 0x4c, 0x87, 0x94, 0xf7, 0x8a, 0xe2, 0x01, + 0xfe, 0xe0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x26, 0x52, 0xa6, 0xe6, 0x06, 0x00, 0x00, } func (this *Reaction) Equal(that interface{}) bool { diff --git a/x/reactions/types/msgs.go b/x/reactions/types/msgs.go index 9e299e9241..df9aa82fd5 100644 --- a/x/reactions/types/msgs.go +++ b/x/reactions/types/msgs.go @@ -66,11 +66,6 @@ func (msg *MsgAddReaction) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgAddReaction) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgAddReaction) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.User) @@ -123,11 +118,6 @@ func (msg *MsgRemoveReaction) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgRemoveReaction) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgRemoveReaction) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.User) @@ -179,11 +169,6 @@ func (msg *MsgAddRegisteredReaction) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgAddRegisteredReaction) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgAddRegisteredReaction) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.User) @@ -244,11 +229,6 @@ func (msg *MsgEditRegisteredReaction) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgEditRegisteredReaction) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgEditRegisteredReaction) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.User) @@ -297,11 +277,6 @@ func (msg *MsgRemoveRegisteredReaction) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgRemoveRegisteredReaction) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgRemoveRegisteredReaction) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.User) @@ -353,11 +328,6 @@ func (msg *MsgSetReactionsParams) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgSetReactionsParams) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgSetReactionsParams) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.User) diff --git a/x/reactions/types/msgs.pb.go b/x/reactions/types/msgs.pb.go index 1314b6364a..094efa16dd 100644 --- a/x/reactions/types/msgs.pb.go +++ b/x/reactions/types/msgs.pb.go @@ -739,65 +739,65 @@ func init() { proto.RegisterFile("desmos/reactions/v1/msgs.proto", fileDescripto var fileDescriptor_de4e0bd9e58b59f1 = []byte{ // 962 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x57, 0x4f, 0x8f, 0xdb, 0x44, - 0x14, 0x5f, 0x27, 0xbb, 0x0b, 0x3b, 0xe9, 0xae, 0xa8, 0x9b, 0x5d, 0xb2, 0x6e, 0x37, 0x4e, 0x27, - 0xd0, 0x46, 0x41, 0xb1, 0xdb, 0xa0, 0x20, 0x28, 0x42, 0x62, 0x03, 0x45, 0x8a, 0x44, 0xa4, 0xca, - 0x8b, 0x7a, 0xe0, 0x62, 0x39, 0x99, 0x59, 0xc7, 0x52, 0x9c, 0x89, 0x3c, 0x4e, 0xb4, 0x39, 0x20, - 0x55, 0x1c, 0x38, 0x20, 0x0e, 0x48, 0x7c, 0x09, 0x8e, 0x7b, 0xe8, 0x11, 0x0e, 0x48, 0x1c, 0x2a, - 0x0e, 0xa8, 0x82, 0x4b, 0x4f, 0x16, 0xca, 0x1e, 0xf6, 0x9e, 0x4f, 0x80, 0x62, 0x8f, 0x9d, 0x38, - 0xb6, 0xcb, 0x6e, 0xd2, 0x95, 0x50, 0x2f, 0xd1, 0xcc, 0xbc, 0xdf, 0xfb, 0xf7, 0x7b, 0xef, 0x8d, - 0x27, 0x20, 0x8f, 0x30, 0x35, 0x09, 0x95, 0x2d, 0xac, 0xb5, 0x6d, 0x83, 0xf4, 0xa8, 0x3c, 0xbc, + 0x14, 0x5f, 0x27, 0xbb, 0x0b, 0x3b, 0xe9, 0xae, 0xa8, 0x9b, 0x2c, 0x59, 0xb7, 0x1b, 0xa7, 0x13, + 0x68, 0xa3, 0xa0, 0xd8, 0x6d, 0xd0, 0x56, 0x50, 0x84, 0xc4, 0x06, 0x8a, 0x14, 0x89, 0x48, 0x95, + 0x17, 0xf5, 0xc0, 0xc5, 0x72, 0x32, 0xb3, 0x8e, 0xa5, 0x38, 0x13, 0x79, 0x9c, 0x68, 0x73, 0x40, + 0xaa, 0x38, 0x70, 0x40, 0x1c, 0x90, 0xf8, 0x12, 0x1c, 0xf7, 0xd0, 0x23, 0x1c, 0x90, 0x38, 0x54, + 0x1c, 0x50, 0x05, 0x97, 0x9e, 0x2c, 0x94, 0x3d, 0xec, 0x3d, 0x9f, 0x00, 0xc5, 0x1e, 0x3b, 0x71, + 0x6c, 0x97, 0xdd, 0xa4, 0x2b, 0x21, 0x2e, 0xd1, 0xcc, 0xbc, 0xdf, 0xfb, 0xf7, 0x7b, 0xef, 0x8d, + 0x27, 0xa0, 0x80, 0x30, 0x35, 0x09, 0x95, 0x2d, 0xac, 0xb5, 0x6d, 0x83, 0xf4, 0xa8, 0x3c, 0xbc, 0x2f, 0x9b, 0x54, 0xa7, 0x52, 0xdf, 0x22, 0x36, 0xe1, 0x6f, 0x78, 0x72, 0x29, 0x90, 0x4b, 0xc3, 0xfb, 0xc2, 0x75, 0xcd, 0x34, 0x7a, 0x44, 0x76, 0x7f, 0x3d, 0x9c, 0x90, 0xd5, 0x89, 0x4e, 0xdc, - 0xa5, 0x3c, 0x5d, 0xb1, 0xd3, 0x7d, 0x9d, 0x10, 0xbd, 0x8b, 0x65, 0x77, 0xd7, 0x1a, 0x1c, 0xcb, + 0xa5, 0x3c, 0x5d, 0xb1, 0xd3, 0x3d, 0x9d, 0x10, 0xbd, 0x8b, 0x65, 0x77, 0xd7, 0x1a, 0x1c, 0xcb, 0x5a, 0x6f, 0xc4, 0x44, 0x6f, 0xb7, 0x89, 0xeb, 0xd8, 0xa4, 0x3a, 0x73, 0xe9, 0xeb, 0x78, 0x02, - 0xd5, 0x33, 0xe6, 0x6d, 0x98, 0xa8, 0x10, 0x1b, 0x2c, 0x41, 0xb8, 0xcb, 0x10, 0xf0, 0xef, 0x14, - 0xd8, 0x69, 0x52, 0xfd, 0x10, 0x21, 0x85, 0x61, 0xf8, 0x87, 0x20, 0x43, 0x07, 0x2d, 0xda, 0xd7, - 0xda, 0x58, 0x35, 0x50, 0x8e, 0x2b, 0x70, 0xa5, 0xf5, 0xfa, 0x3b, 0x63, 0x47, 0x04, 0x47, 0xec, - 0xb8, 0xf1, 0xf9, 0xc4, 0x11, 0xf9, 0x91, 0x66, 0x76, 0x1f, 0xc0, 0x39, 0x28, 0x54, 0x80, 0xbf, - 0x6b, 0x20, 0xbe, 0x06, 0xde, 0xe8, 0x13, 0x6a, 0x4f, 0x4d, 0xa4, 0x5c, 0x13, 0xb7, 0xc6, 0x8e, - 0xb8, 0xf9, 0x88, 0x50, 0xdb, 0x55, 0xdf, 0xf1, 0xd4, 0x19, 0x04, 0x2a, 0x9b, 0xd3, 0x55, 0x03, - 0xf1, 0x1a, 0xd8, 0x18, 0x6a, 0xdd, 0x01, 0xce, 0xa5, 0x0b, 0x5c, 0x29, 0x53, 0xcd, 0x4a, 0x1e, - 0x23, 0x92, 0xcf, 0x88, 0x74, 0xd8, 0x1b, 0xd5, 0x6b, 0x13, 0x47, 0xbc, 0xe6, 0x19, 0x70, 0xc1, - 0xf0, 0x8f, 0xa7, 0x95, 0xdb, 0x31, 0xc4, 0x4b, 0x7e, 0x52, 0x8f, 0xa7, 0x28, 0xc5, 0xb3, 0xcc, - 0x7f, 0x0c, 0xd6, 0x07, 0x14, 0x5b, 0xb9, 0xf5, 0x02, 0x57, 0xda, 0xaa, 0xdf, 0x9d, 0x38, 0x62, - 0xc6, 0xb3, 0x35, 0x3d, 0x85, 0x7f, 0x3d, 0xad, 0x64, 0x19, 0x89, 0x87, 0x08, 0x59, 0x98, 0xd2, - 0x23, 0xdb, 0x32, 0x7a, 0xba, 0xe2, 0x2a, 0x3d, 0x28, 0x7e, 0x7b, 0x7e, 0x5a, 0x76, 0x97, 0xdf, - 0x9f, 0x9f, 0x96, 0x77, 0x19, 0xc1, 0x61, 0x0a, 0xa1, 0x0a, 0xf6, 0xc2, 0x27, 0x0a, 0xa6, 0x7d, - 0xd2, 0xa3, 0x78, 0x4a, 0xae, 0x1f, 0xa0, 0x4f, 0xee, 0xb6, 0x47, 0xae, 0x0f, 0x9d, 0x27, 0x77, - 0x0e, 0x0a, 0x15, 0xe0, 0xef, 0x1a, 0x08, 0xfe, 0x9a, 0x02, 0xd7, 0x9b, 0x54, 0x57, 0xb0, 0x49, - 0x86, 0xf8, 0x7f, 0x52, 0xb9, 0x85, 0xd4, 0xd2, 0xcb, 0xa5, 0xb6, 0x5a, 0x75, 0xee, 0x84, 0xaa, - 0x93, 0x9b, 0x55, 0x27, 0xcc, 0x14, 0xbc, 0x09, 0xf6, 0x23, 0x87, 0x7e, 0x8d, 0xe0, 0x9f, 0x29, - 0x90, 0xf3, 0xcb, 0xa7, 0x1b, 0xd4, 0xc6, 0x16, 0x7e, 0xe5, 0xd3, 0xf1, 0x29, 0xd8, 0xa1, 0x1d, - 0x62, 0xd9, 0x1d, 0xad, 0x87, 0xd4, 0x36, 0x41, 0xd8, 0xa5, 0x7a, 0xab, 0xbe, 0x3f, 0x71, 0xc4, - 0x5d, 0xa6, 0x1b, 0x92, 0x43, 0x65, 0x3b, 0x38, 0xf8, 0x8c, 0x20, 0xcc, 0x7f, 0x02, 0xb6, 0x91, - 0x41, 0xfb, 0x5d, 0x6d, 0xa4, 0xce, 0x06, 0x66, 0xab, 0x9e, 0x9b, 0x38, 0x62, 0xd6, 0x33, 0x10, - 0x12, 0x43, 0xe5, 0x1a, 0xdb, 0x3f, 0x5e, 0x7d, 0x08, 0x2a, 0x21, 0x9a, 0xc5, 0x85, 0x21, 0x58, - 0xe4, 0x0c, 0xfe, 0xc4, 0x81, 0x42, 0x92, 0x30, 0x98, 0x0c, 0x02, 0xf6, 0xac, 0x40, 0xaa, 0x46, - 0x87, 0xe4, 0xa3, 0xb1, 0x23, 0x66, 0xa3, 0xfa, 0x2e, 0xdb, 0x07, 0x7e, 0x4f, 0xc5, 0xe9, 0x43, - 0x25, 0x6b, 0x45, 0xd5, 0x10, 0xfc, 0x2d, 0xed, 0x36, 0xc1, 0x43, 0x64, 0xd8, 0x57, 0x57, 0xe7, + 0xd5, 0x33, 0xe6, 0x6d, 0x98, 0xa8, 0x18, 0x1b, 0x2c, 0x41, 0xb8, 0xcb, 0x10, 0xf0, 0xaf, 0x14, + 0xd8, 0x69, 0x52, 0xfd, 0x10, 0x21, 0x85, 0x61, 0xf8, 0x47, 0x20, 0x43, 0x07, 0x2d, 0xda, 0xd7, + 0xda, 0x58, 0x35, 0x50, 0x9e, 0x2b, 0x72, 0xe5, 0xf5, 0xfa, 0x3b, 0x63, 0x47, 0x04, 0x47, 0xec, + 0xb8, 0xf1, 0xd9, 0xc4, 0x11, 0xf9, 0x91, 0x66, 0x76, 0x1f, 0xc2, 0x39, 0x28, 0x54, 0x80, 0xbf, + 0x6b, 0x20, 0xfe, 0x00, 0xbc, 0xd1, 0x27, 0xd4, 0x9e, 0x9a, 0x48, 0xb9, 0x26, 0x6e, 0x8d, 0x1d, + 0x71, 0xf3, 0x31, 0xa1, 0xb6, 0xab, 0xbe, 0xe3, 0xa9, 0x33, 0x08, 0x54, 0x36, 0xa7, 0xab, 0x06, + 0xe2, 0x35, 0xb0, 0x31, 0xd4, 0xba, 0x03, 0x9c, 0x4f, 0x17, 0xb9, 0x72, 0xa6, 0x96, 0x95, 0x3c, + 0x46, 0x24, 0x9f, 0x11, 0xe9, 0xb0, 0x37, 0xaa, 0x1f, 0x4c, 0x1c, 0xf1, 0x9a, 0x67, 0xc0, 0x05, + 0xc3, 0xdf, 0x9f, 0x55, 0x6f, 0xc7, 0x10, 0x2f, 0xf9, 0x49, 0x3d, 0x99, 0xa2, 0x14, 0xcf, 0x32, + 0xff, 0x11, 0x58, 0x1f, 0x50, 0x6c, 0xe5, 0xd7, 0x8b, 0x5c, 0x79, 0xab, 0x7e, 0x77, 0xe2, 0x88, + 0x19, 0xcf, 0xd6, 0xf4, 0x14, 0xfe, 0xf9, 0xac, 0x9a, 0x65, 0x24, 0x1e, 0x22, 0x64, 0x61, 0x4a, + 0x8f, 0x6c, 0xcb, 0xe8, 0xe9, 0x8a, 0xab, 0xf4, 0xb0, 0xf4, 0xcd, 0xf9, 0x69, 0xc5, 0x5d, 0x7e, + 0x77, 0x7e, 0x5a, 0xc9, 0x31, 0x82, 0xc3, 0x14, 0x42, 0x15, 0xec, 0x86, 0x4f, 0x14, 0x4c, 0xfb, + 0xa4, 0x47, 0xf1, 0x94, 0x5c, 0x3f, 0x40, 0x9f, 0xdc, 0x6d, 0x8f, 0x5c, 0x1f, 0x3a, 0x4f, 0xee, + 0x1c, 0x14, 0x2a, 0xc0, 0xdf, 0x35, 0x10, 0xfc, 0x25, 0x05, 0xae, 0x37, 0xa9, 0xae, 0x60, 0x93, + 0x0c, 0xf1, 0x7f, 0xa4, 0x72, 0x0b, 0xa9, 0xa5, 0x97, 0x4b, 0x6d, 0xb5, 0xea, 0xdc, 0x09, 0x55, + 0x27, 0x3f, 0xab, 0x4e, 0x98, 0x29, 0x78, 0x13, 0xec, 0x45, 0x0e, 0xfd, 0x1a, 0xc1, 0x3f, 0x52, + 0x20, 0xef, 0x97, 0x4f, 0x37, 0xa8, 0x8d, 0x2d, 0xfc, 0xda, 0xa7, 0xe3, 0x13, 0xb0, 0x43, 0x3b, + 0xc4, 0xb2, 0x3b, 0x5a, 0x0f, 0xa9, 0x6d, 0x82, 0xb0, 0x4b, 0xf5, 0x56, 0x7d, 0x6f, 0xe2, 0x88, + 0x39, 0xa6, 0x1b, 0x92, 0x43, 0x65, 0x3b, 0x38, 0xf8, 0x94, 0x20, 0xcc, 0x7f, 0x0c, 0xb6, 0x91, + 0x41, 0xfb, 0x5d, 0x6d, 0xa4, 0xce, 0x06, 0x66, 0xab, 0x9e, 0x9f, 0x38, 0x62, 0xd6, 0x33, 0x10, + 0x12, 0x43, 0xe5, 0x1a, 0xdb, 0x3f, 0x59, 0x7d, 0x08, 0xaa, 0x21, 0x9a, 0xc5, 0x85, 0x21, 0x58, + 0xe4, 0x0c, 0xfe, 0xc8, 0x81, 0x62, 0x92, 0x30, 0x98, 0x0c, 0x02, 0x76, 0xad, 0x40, 0xaa, 0x46, + 0x87, 0xe4, 0xc3, 0xb1, 0x23, 0x66, 0xa3, 0xfa, 0x2e, 0xdb, 0xfb, 0x7e, 0x4f, 0xc5, 0xe9, 0x43, + 0x25, 0x6b, 0x45, 0xd5, 0x10, 0xfc, 0x35, 0xed, 0x36, 0xc1, 0x23, 0x64, 0xd8, 0x57, 0x57, 0xe7, 0xe4, 0xac, 0x52, 0x57, 0x92, 0x55, 0x4c, 0x63, 0xa5, 0x57, 0x6d, 0xac, 0xf5, 0xa5, 0x1a, 0x6b, - 0x63, 0x99, 0xc6, 0x92, 0x42, 0x8d, 0x55, 0x98, 0x35, 0x56, 0x7c, 0x95, 0x60, 0x11, 0xdc, 0x4e, - 0x14, 0x06, 0xf3, 0xfc, 0x7b, 0x0a, 0xdc, 0x9c, 0x9b, 0xf6, 0xd7, 0xa6, 0xd4, 0x3e, 0xd3, 0xe9, - 0x65, 0x98, 0xbe, 0x17, 0x62, 0x1a, 0x46, 0x6f, 0xca, 0x08, 0xd7, 0xef, 0x82, 0xe2, 0x4b, 0xc4, - 0x01, 0xdb, 0xbf, 0xa4, 0xc1, 0x6e, 0x93, 0xea, 0x47, 0xd8, 0xf6, 0x45, 0xf4, 0x91, 0x66, 0x69, - 0x26, 0x7d, 0x55, 0x3c, 0xff, 0xc0, 0x81, 0x1b, 0x31, 0x44, 0xb9, 0x2c, 0x67, 0xaa, 0x55, 0x29, - 0xfe, 0x1d, 0xb0, 0x18, 0xaf, 0xdb, 0xac, 0x5e, 0x60, 0xf5, 0xbb, 0xcf, 0x1c, 0x71, 0x6d, 0xe2, - 0x88, 0x42, 0x62, 0x15, 0xe0, 0xcf, 0xe7, 0xa7, 0x65, 0x4e, 0xe1, 0xa3, 0x75, 0xe0, 0x11, 0xd8, - 0x3a, 0xb6, 0x30, 0x56, 0x6d, 0x7c, 0x62, 0xb3, 0x47, 0x4b, 0x29, 0x36, 0x86, 0x2f, 0x2c, 0x8c, - 0xbf, 0xc2, 0x27, 0xf6, 0xbc, 0xe7, 0x03, 0xe6, 0xf9, 0x2d, 0xcf, 0x73, 0x60, 0x88, 0xf9, 0x7b, - 0xf3, 0x98, 0xe9, 0xac, 0x76, 0x5d, 0x97, 0x43, 0xb5, 0xbe, 0x35, 0xab, 0x75, 0xb4, 0x48, 0x50, - 0x04, 0x07, 0xb1, 0x02, 0xbf, 0xbe, 0xd5, 0x17, 0x1b, 0x20, 0xdd, 0xa4, 0x3a, 0xaf, 0x82, 0xcc, - 0xfc, 0xab, 0xb1, 0x18, 0x9b, 0x73, 0xf8, 0x15, 0x24, 0xbc, 0x77, 0x01, 0x50, 0xf0, 0x41, 0xe8, + 0x63, 0x99, 0xc6, 0x92, 0x42, 0x8d, 0x55, 0x9c, 0x35, 0x56, 0x7c, 0x95, 0x60, 0x09, 0xdc, 0x4e, + 0x14, 0x06, 0xf3, 0xfc, 0x5b, 0x0a, 0xdc, 0x9c, 0x9b, 0xf6, 0xff, 0x4d, 0xa9, 0x7d, 0xa6, 0xd3, + 0xcb, 0x30, 0x7d, 0x2f, 0xc4, 0x34, 0x8c, 0xde, 0x94, 0x11, 0xae, 0xdf, 0x05, 0xa5, 0x57, 0x88, + 0x03, 0xb6, 0x7f, 0x4e, 0x83, 0x5c, 0x93, 0xea, 0x47, 0xd8, 0xf6, 0x45, 0xf4, 0xb1, 0x66, 0x69, + 0x26, 0x7d, 0x5d, 0x3c, 0x7f, 0xcf, 0x81, 0x1b, 0x31, 0x44, 0xb9, 0x2c, 0x67, 0x6a, 0x35, 0x29, + 0xfe, 0x1d, 0xb0, 0x18, 0xaf, 0xdb, 0xac, 0x5e, 0x60, 0xf5, 0xbb, 0xcf, 0x1d, 0x71, 0x6d, 0xe2, + 0x88, 0x42, 0x62, 0x15, 0xe0, 0x4f, 0xe7, 0xa7, 0x15, 0x4e, 0xe1, 0xa3, 0x75, 0xe0, 0x11, 0xd8, + 0x3a, 0xb6, 0x30, 0x56, 0x6d, 0x7c, 0x62, 0xb3, 0x47, 0x4b, 0x39, 0x36, 0x86, 0xcf, 0x2d, 0x8c, + 0xbf, 0xc4, 0x27, 0xf6, 0xbc, 0xe7, 0x7d, 0xe6, 0xf9, 0x2d, 0xcf, 0x73, 0x60, 0x88, 0xf9, 0x7b, + 0xf3, 0x98, 0xe9, 0xac, 0x76, 0x5d, 0x57, 0x42, 0xb5, 0xbe, 0x35, 0xab, 0x75, 0xb4, 0x48, 0x50, + 0x04, 0xfb, 0xb1, 0x02, 0xbf, 0xbe, 0xb5, 0x97, 0x1b, 0x20, 0xdd, 0xa4, 0x3a, 0xaf, 0x82, 0xcc, + 0xfc, 0xab, 0xb1, 0x14, 0x9b, 0x73, 0xf8, 0x15, 0x24, 0xbc, 0x77, 0x01, 0x50, 0xf0, 0x41, 0xe8, 0x80, 0x9d, 0x85, 0xf7, 0xcd, 0x9d, 0x24, 0xf5, 0x30, 0x4e, 0x90, 0x2e, 0x86, 0x0b, 0x3c, 0x7d, - 0x03, 0x76, 0xe3, 0x3f, 0xf6, 0x95, 0x97, 0xc6, 0xbb, 0x08, 0x17, 0x6a, 0x97, 0x82, 0x07, 0xee, - 0x9f, 0x70, 0x60, 0x2f, 0xe1, 0x2b, 0x94, 0x98, 0x49, 0x3c, 0x5e, 0xf8, 0xe0, 0x72, 0xf8, 0x20, - 0x84, 0xef, 0x38, 0x90, 0x4b, 0xbc, 0x1f, 0xef, 0xfd, 0x17, 0x9d, 0x91, 0x30, 0x3e, 0xbc, 0xac, - 0x46, 0x10, 0x88, 0x0d, 0xf8, 0x98, 0x9b, 0xa3, 0x9c, 0x64, 0x2f, 0x8a, 0x15, 0xaa, 0x17, 0xc7, - 0xfa, 0x5e, 0x85, 0x8d, 0x27, 0xd3, 0x71, 0xab, 0x7f, 0xf9, 0x6c, 0x9c, 0xe7, 0x9e, 0x8f, 0xf3, - 0xdc, 0x3f, 0xe3, 0x3c, 0xf7, 0xe3, 0x59, 0x7e, 0xed, 0xf9, 0x59, 0x7e, 0xed, 0xc5, 0x59, 0x7e, - 0xed, 0xeb, 0xaa, 0x6e, 0xd8, 0x9d, 0x41, 0x4b, 0x6a, 0x13, 0x53, 0xf6, 0xcc, 0x57, 0xba, 0x5a, - 0x8b, 0xb2, 0xb5, 0x3c, 0xac, 0xc9, 0x27, 0x73, 0x7f, 0xb2, 0xec, 0x51, 0x1f, 0xd3, 0xd6, 0xa6, - 0xfb, 0x97, 0xe5, 0xfd, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x9d, 0x29, 0x51, 0xf7, 0x32, 0x0e, + 0x0d, 0x72, 0xf1, 0x1f, 0xfb, 0xea, 0x2b, 0xe3, 0x5d, 0x84, 0x0b, 0x07, 0x97, 0x82, 0x07, 0xee, + 0x9f, 0x72, 0x60, 0x37, 0xe1, 0x2b, 0x94, 0x98, 0x49, 0x3c, 0x5e, 0x78, 0x70, 0x39, 0x7c, 0x10, + 0xc2, 0xb7, 0x1c, 0xc8, 0x27, 0xde, 0x8f, 0xf7, 0xfe, 0x8d, 0xce, 0x48, 0x18, 0x1f, 0x5c, 0x56, + 0x23, 0x08, 0xc4, 0x06, 0x7c, 0xcc, 0xcd, 0x51, 0x49, 0xb2, 0x17, 0xc5, 0x0a, 0xb5, 0x8b, 0x63, + 0x7d, 0xaf, 0xc2, 0xc6, 0xd3, 0xe9, 0xb8, 0xd5, 0xbf, 0x78, 0x3e, 0x2e, 0x70, 0x2f, 0xc6, 0x05, + 0xee, 0xef, 0x71, 0x81, 0xfb, 0xe1, 0xac, 0xb0, 0xf6, 0xe2, 0xac, 0xb0, 0xf6, 0xf2, 0xac, 0xb0, + 0xf6, 0x55, 0x4d, 0x37, 0xec, 0xce, 0xa0, 0x25, 0xb5, 0x89, 0x29, 0x7b, 0xe6, 0xab, 0x5d, 0xad, + 0x45, 0xd9, 0x5a, 0x1e, 0x3e, 0x90, 0x4f, 0xe6, 0xfe, 0x64, 0xd9, 0xa3, 0x3e, 0xa6, 0xad, 0x4d, + 0xf7, 0x2f, 0xcb, 0xfb, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x5e, 0x04, 0xc5, 0x44, 0x32, 0x0e, 0x00, 0x00, } diff --git a/x/reactions/types/msgs_test.go b/x/reactions/types/msgs_test.go index 073dd80996..d928f24116 100644 --- a/x/reactions/types/msgs_test.go +++ b/x/reactions/types/msgs_test.go @@ -89,11 +89,6 @@ func TestMsgAddReaction_ValidateBasic(t *testing.T) { } } -func TestMsgAddReaction_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgAddReaction","value":{"post_id":"1","subspace_id":"1","user":"cosmos1qewk97fp49vzssrfnc997jpztc5nzr7xsd8zdc","value":{"type":"desmos/RegisteredReactionValue","value":{"registered_reaction_id":1}}}}` - require.Equal(t, expected, string(msgAddReaction.GetSignBytes())) -} - func TestMsgAddReaction_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgAddReaction.User) require.Equal(t, []sdk.AccAddress{addr}, msgAddReaction.GetSigners()) @@ -181,11 +176,6 @@ func TestMsgRemoveReaction_ValidateBasic(t *testing.T) { } } -func TestMsgRemoveReaction_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRemoveReaction","value":{"post_id":"1","reaction_id":1,"subspace_id":"1","user":"cosmos1qewk97fp49vzssrfnc997jpztc5nzr7xsd8zdc"}}` - require.Equal(t, expected, string(msgRemoveReaction.GetSignBytes())) -} - func TestMsgRemoveReaction_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRemoveReaction.User) require.Equal(t, []sdk.AccAddress{addr}, msgRemoveReaction.GetSigners()) @@ -273,11 +263,6 @@ func TestMsgAddRegisteredReaction_ValidateBasic(t *testing.T) { } } -func TestMsgAddRegisteredReaction_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgAddRegisteredReaction","value":{"display_value":"https://example.com?images=hello.png","shorthand_code":":hello:","subspace_id":"1","user":"cosmos1qewk97fp49vzssrfnc997jpztc5nzr7xsd8zdc"}}` - require.Equal(t, expected, string(msgAddRegisteredReaction.GetSignBytes())) -} - func TestMsgAddRegisteredReaction_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgAddRegisteredReaction.User) require.Equal(t, []sdk.AccAddress{addr}, msgAddRegisteredReaction.GetSigners()) @@ -381,11 +366,6 @@ func TestMsgEditRegisteredReaction_ValidateBasic(t *testing.T) { } } -func TestMsgEditRegisteredReaction_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgEditRegisteredReaction","value":{"display_value":"https://example.com?images=hello.png","registered_reaction_id":1,"shorthand_code":":hello:","subspace_id":"1","user":"cosmos1qewk97fp49vzssrfnc997jpztc5nzr7xsd8zdc"}}` - require.Equal(t, expected, string(msgEditRegisteredReaction.GetSignBytes())) -} - func TestMsgEditRegisteredReaction_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgEditRegisteredReaction.User) require.Equal(t, []sdk.AccAddress{addr}, msgEditRegisteredReaction.GetSigners()) @@ -459,11 +439,6 @@ func TestMsgRemoveRegisteredReaction_ValidateBasic(t *testing.T) { } } -func TestMsgRemoveRegisteredReaction_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRemoveRegisteredReaction","value":{"registered_reaction_id":1,"subspace_id":"1","user":"cosmos1qewk97fp49vzssrfnc997jpztc5nzr7xsd8zdc"}}` - require.Equal(t, expected, string(msgRemoveRegisteredReaction.GetSignBytes())) -} - func TestMsgRemoveRegisteredReaction_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRemoveRegisteredReaction.User) require.Equal(t, []sdk.AccAddress{addr}, msgRemoveRegisteredReaction.GetSigners()) @@ -541,11 +516,6 @@ func TestMsgSetReactionsParams_ValidateBasic(t *testing.T) { } } -func TestMsgSetReactionsParams_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgSetReactionsParams","value":{"free_text":{"enabled":true,"max_length":100,"reg_ex":"[a-zA-Z]"},"registered_reaction":{"enabled":true},"subspace_id":"1","user":"cosmos1qewk97fp49vzssrfnc997jpztc5nzr7xsd8zdc"}}` - require.Equal(t, expected, string(msgSetReactionsParams.GetSignBytes())) -} - func TestMsgSetReactionsParams_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgSetReactionsParams.User) require.Equal(t, []sdk.AccAddress{addr}, msgSetReactionsParams.GetSigners()) diff --git a/x/reactions/types/query.pb.go b/x/reactions/types/query.pb.go index a957290ee3..14bb18abfb 100644 --- a/x/reactions/types/query.pb.go +++ b/x/reactions/types/query.pb.go @@ -592,56 +592,56 @@ func init() { func init() { proto.RegisterFile("desmos/reactions/v1/query.proto", fileDescriptor_a605cb95b392783f) } var fileDescriptor_a605cb95b392783f = []byte{ - // 779 bytes of a gzipped FileDescriptorProto + // 781 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcf, 0x6b, 0x13, 0x4d, - 0x18, 0xce, 0xa4, 0xfd, 0xda, 0xe6, 0x0d, 0x1f, 0x1f, 0xdf, 0x24, 0x6a, 0x8c, 0x35, 0x09, 0x39, - 0xd8, 0x18, 0xdb, 0x1d, 0x93, 0xb6, 0x27, 0x41, 0x68, 0x95, 0x6a, 0x40, 0x6c, 0x9b, 0x8a, 0x82, - 0x28, 0x65, 0x93, 0x1d, 0xd6, 0x85, 0x66, 0x67, 0xbb, 0xb3, 0x09, 0x96, 0xd2, 0x8b, 0x07, 0x0f, - 0x9e, 0x04, 0xff, 0x09, 0xbd, 0x09, 0xf6, 0xee, 0xd1, 0x5e, 0x84, 0x52, 0x2f, 0x3d, 0x89, 0xb6, - 0x82, 0xff, 0x86, 0xec, 0xee, 0x6c, 0x7e, 0x6c, 0x36, 0x36, 0xdb, 0xf6, 0x12, 0x76, 0x66, 0xde, - 0x1f, 0xcf, 0xf3, 0xcc, 0x33, 0x2f, 0x81, 0xac, 0x42, 0x79, 0x83, 0x71, 0x62, 0x52, 0xb9, 0x6e, - 0x69, 0x4c, 0xe7, 0xa4, 0x55, 0x22, 0x9b, 0x4d, 0x6a, 0x6e, 0x49, 0x86, 0xc9, 0x2c, 0x86, 0x13, - 0x6e, 0x80, 0xd4, 0x0e, 0x90, 0x5a, 0xa5, 0xf4, 0xff, 0x72, 0x43, 0xd3, 0x19, 0x71, 0x7e, 0xdd, - 0xb8, 0x74, 0x52, 0x65, 0x2a, 0x73, 0x3e, 0x89, 0xfd, 0x25, 0x76, 0x27, 0x55, 0xc6, 0xd4, 0x0d, - 0x4a, 0x64, 0x43, 0x23, 0xb2, 0xae, 0x33, 0x4b, 0x76, 0x6b, 0xb8, 0xa7, 0x97, 0xeb, 0xcc, 0xae, - 0xbd, 0xee, 0xa6, 0xb9, 0x0b, 0x71, 0x54, 0x74, 0x57, 0xa4, 0x26, 0x73, 0xea, 0xe2, 0x21, 0xad, - 0x52, 0x8d, 0x5a, 0x72, 0x89, 0x18, 0xb2, 0xaa, 0xe9, 0x4e, 0x1d, 0x11, 0x9b, 0x0b, 0xe2, 0xd0, - 0x60, 0x0a, 0xdd, 0x10, 0xd5, 0xf2, 0x5f, 0x10, 0x5c, 0x58, 0xb5, 0x8b, 0x54, 0xbd, 0x90, 0x2a, - 0xdd, 0x6c, 0x52, 0x6e, 0xe1, 0x2c, 0xc4, 0x79, 0xb3, 0xc6, 0x0d, 0xb9, 0x4e, 0xd7, 0x35, 0x25, - 0x85, 0x72, 0xa8, 0x30, 0x5a, 0x05, 0x6f, 0xab, 0xa2, 0xe0, 0x4b, 0x30, 0x6e, 0x30, 0x6e, 0xd9, - 0x87, 0x51, 0xe7, 0x70, 0xcc, 0x5e, 0x56, 0x14, 0x3c, 0x0d, 0xa3, 0x4d, 0x4e, 0xcd, 0xd4, 0x48, - 0x0e, 0x15, 0x62, 0x8b, 0xa9, 0x83, 0xdd, 0x99, 0xa4, 0x60, 0xb0, 0xa0, 0x28, 0x26, 0xe5, 0x7c, - 0xcd, 0x32, 0x35, 0x5d, 0xad, 0x3a, 0x51, 0x78, 0x09, 0xa0, 0x83, 0x3b, 0x35, 0x9a, 0x43, 0x85, - 0x78, 0xf9, 0x9a, 0x24, 0x12, 0x6c, 0x92, 0x92, 0x2b, 0xba, 0x20, 0x29, 0xad, 0xc8, 0x2a, 0x15, - 0x18, 0xab, 0x5d, 0x99, 0xf9, 0x0f, 0x08, 0x2e, 0xfa, 0x99, 0x70, 0x83, 0xe9, 0x9c, 0xe2, 0x25, - 0x88, 0xb5, 0x15, 0x48, 0xa1, 0xdc, 0x48, 0x21, 0x5e, 0xbe, 0x2a, 0x05, 0xdc, 0x9e, 0xe4, 0xa5, - 0x2e, 0xc6, 0xf6, 0xbe, 0x67, 0x23, 0xef, 0x7f, 0x7f, 0x2c, 0xa2, 0x6a, 0x27, 0x15, 0xdf, 0xeb, - 0x81, 0x1a, 0x75, 0xa0, 0x4e, 0x9d, 0x08, 0xd5, 0x05, 0xd1, 0x83, 0x75, 0x13, 0x92, 0x3d, 0x50, - 0xcf, 0xae, 0x79, 0x16, 0xe2, 0x1e, 0x4e, 0xfb, 0xd0, 0x96, 0xfe, 0xdf, 0x2a, 0x78, 0x5b, 0x15, - 0x25, 0xff, 0xdc, 0x77, 0xcf, 0x6d, 0x71, 0xee, 0xc2, 0x84, 0x17, 0xe6, 0x34, 0x0c, 0xa3, 0x4d, - 0x3b, 0x33, 0xff, 0x06, 0x41, 0x56, 0xd4, 0x57, 0x35, 0x6e, 0x51, 0x93, 0x2a, 0xe1, 0x1d, 0xd5, - 0x6b, 0x85, 0x91, 0x53, 0x5b, 0xe1, 0x00, 0x41, 0x6e, 0x30, 0x18, 0xc1, 0x9b, 0x42, 0xd2, 0x6c, - 0x1f, 0xaf, 0xfb, 0xfd, 0x31, 0x35, 0x40, 0x03, 0x7f, 0xbd, 0x6e, 0x35, 0x12, 0x66, 0x7f, 0xbb, - 0xf3, 0xf3, 0x4c, 0x0d, 0x32, 0x03, 0x38, 0x0d, 0xad, 0xaf, 0xcf, 0x24, 0xd1, 0x3e, 0x93, 0xbc, - 0x1e, 0x7c, 0x8b, 0x6d, 0xdd, 0xea, 0x90, 0x08, 0xd0, 0x4d, 0x58, 0xe7, 0x34, 0xb2, 0xe1, 0x7e, - 0xd9, 0xf2, 0xb7, 0xe1, 0x4a, 0xef, 0x5b, 0x5e, 0x91, 0x4d, 0xb9, 0x31, 0xb4, 0x93, 0xf2, 0x0c, - 0x26, 0x83, 0xf3, 0x05, 0x89, 0x65, 0x18, 0x33, 0x9c, 0x1d, 0x81, 0x7b, 0x3a, 0x10, 0xf7, 0x9a, - 0x28, 0xe8, 0xab, 0xd2, 0x0d, 0x5e, 0x94, 0x29, 0xff, 0x1c, 0x87, 0x7f, 0x9c, 0x8e, 0x78, 0x17, - 0x41, 0xac, 0x73, 0xfd, 0xc5, 0xc0, 0xc2, 0x81, 0x13, 0x37, 0x7d, 0x63, 0xa8, 0x58, 0x97, 0x41, - 0xfe, 0xe1, 0xab, 0x6f, 0xbf, 0xde, 0x45, 0xef, 0xe3, 0x25, 0x12, 0x34, 0xe3, 0x3d, 0x29, 0x38, - 0xd9, 0xee, 0x12, 0x6a, 0x87, 0xd8, 0xd3, 0x82, 0x93, 0x6d, 0x31, 0x43, 0x76, 0x3a, 0x49, 0xf8, - 0x33, 0x82, 0x09, 0xaf, 0x0b, 0xbe, 0x7e, 0x32, 0x12, 0x0f, 0x74, 0x71, 0x98, 0x50, 0x81, 0xf9, - 0x99, 0x83, 0xf9, 0x31, 0x7e, 0x74, 0x3e, 0x98, 0xc9, 0x76, 0x97, 0x9b, 0x77, 0xf0, 0x57, 0x04, - 0x89, 0x80, 0x07, 0x8f, 0xe7, 0xfe, 0x86, 0x70, 0xd0, 0xb0, 0x4a, 0xcf, 0x87, 0xcc, 0x12, 0x14, - 0x2b, 0x0e, 0xc5, 0x3b, 0x78, 0x21, 0x14, 0xc5, 0xce, 0x0b, 0x98, 0xe9, 0xdc, 0xc8, 0x21, 0x02, - 0xdc, 0xdf, 0x0a, 0xcf, 0x86, 0x01, 0xe6, 0xb1, 0x99, 0x0b, 0x97, 0x24, 0xc8, 0x3c, 0x71, 0xc8, - 0xac, 0xe2, 0xe5, 0x33, 0x93, 0xf1, 0x5d, 0xd5, 0x27, 0x04, 0xff, 0xf9, 0x1e, 0x15, 0xbe, 0x39, - 0x84, 0xfb, 0x7b, 0xa6, 0x40, 0xba, 0x14, 0x22, 0x43, 0x30, 0xba, 0xe5, 0x30, 0x9a, 0xc7, 0xb3, - 0xe1, 0x1c, 0xe8, 0x3e, 0xfb, 0x07, 0x7b, 0x47, 0x19, 0xb4, 0x7f, 0x94, 0x41, 0x3f, 0x8e, 0x32, - 0xe8, 0xed, 0x71, 0x26, 0xb2, 0x7f, 0x9c, 0x89, 0x1c, 0x1e, 0x67, 0x22, 0x4f, 0xcb, 0xaa, 0x66, - 0xbd, 0x68, 0xd6, 0xa4, 0x3a, 0x6b, 0x88, 0xc2, 0x33, 0x1b, 0x72, 0x8d, 0x7b, 0x4d, 0x5a, 0xf3, - 0xe4, 0x65, 0x57, 0x27, 0x6b, 0xcb, 0xa0, 0xbc, 0x36, 0xe6, 0xfc, 0x01, 0x9b, 0xfd, 0x13, 0x00, - 0x00, 0xff, 0xff, 0xfb, 0xa0, 0x1c, 0x9a, 0x68, 0x0a, 0x00, 0x00, + 0x18, 0xce, 0xa4, 0xfd, 0xda, 0xe6, 0x0d, 0x1f, 0x1f, 0xdf, 0x24, 0xdf, 0x67, 0x8c, 0x35, 0x09, + 0x39, 0xd8, 0x18, 0xdb, 0x1d, 0x93, 0xb6, 0x5e, 0x04, 0xa1, 0x55, 0xaa, 0x01, 0xb1, 0x6d, 0x2a, + 0x0a, 0xa2, 0x94, 0x4d, 0x76, 0x58, 0x17, 0x9a, 0x9d, 0xed, 0xce, 0x26, 0x58, 0x4a, 0x2f, 0x1e, + 0x3c, 0x78, 0x12, 0xfc, 0x27, 0xf4, 0x26, 0xd8, 0xbb, 0x47, 0x7b, 0x11, 0x4a, 0xbd, 0xf4, 0x24, + 0xda, 0x0a, 0xfe, 0x1b, 0xb2, 0xbb, 0xb3, 0xf9, 0xb1, 0xd9, 0xd8, 0x6c, 0xdb, 0x4b, 0xd8, 0x99, + 0x79, 0x7f, 0x3c, 0xcf, 0x33, 0xcf, 0xbc, 0x04, 0xb2, 0x0a, 0xe5, 0x0d, 0xc6, 0x89, 0x49, 0xe5, + 0xba, 0xa5, 0x31, 0x9d, 0x93, 0x56, 0x89, 0x6c, 0x36, 0xa9, 0xb9, 0x25, 0x19, 0x26, 0xb3, 0x18, + 0x4e, 0xb8, 0x01, 0x52, 0x3b, 0x40, 0x6a, 0x95, 0xd2, 0xff, 0xca, 0x0d, 0x4d, 0x67, 0xc4, 0xf9, + 0x75, 0xe3, 0xd2, 0x49, 0x95, 0xa9, 0xcc, 0xf9, 0x24, 0xf6, 0x97, 0xd8, 0x9d, 0x54, 0x19, 0x53, + 0x37, 0x28, 0x91, 0x0d, 0x8d, 0xc8, 0xba, 0xce, 0x2c, 0xd9, 0xad, 0xe1, 0x9e, 0x5e, 0xac, 0x33, + 0xbb, 0xf6, 0xba, 0x9b, 0xe6, 0x2e, 0xc4, 0x51, 0xd1, 0x5d, 0x91, 0x9a, 0xcc, 0xa9, 0x8b, 0x87, + 0xb4, 0x4a, 0x35, 0x6a, 0xc9, 0x25, 0x62, 0xc8, 0xaa, 0xa6, 0x3b, 0x75, 0x44, 0x6c, 0x2e, 0x88, + 0x43, 0x83, 0x29, 0x74, 0x43, 0x54, 0xcb, 0x7f, 0x46, 0xf0, 0xdf, 0xaa, 0x5d, 0xa4, 0xea, 0x85, + 0x54, 0xe9, 0x66, 0x93, 0x72, 0x0b, 0x67, 0x21, 0xce, 0x9b, 0x35, 0x6e, 0xc8, 0x75, 0xba, 0xae, + 0x29, 0x29, 0x94, 0x43, 0x85, 0xd1, 0x2a, 0x78, 0x5b, 0x15, 0x05, 0x5f, 0x80, 0x71, 0x83, 0x71, + 0xcb, 0x3e, 0x8c, 0x3a, 0x87, 0x63, 0xf6, 0xb2, 0xa2, 0xe0, 0x69, 0x18, 0x6d, 0x72, 0x6a, 0xa6, + 0x46, 0x72, 0xa8, 0x10, 0x5b, 0x4c, 0x1d, 0xec, 0xce, 0x24, 0x05, 0x83, 0x05, 0x45, 0x31, 0x29, + 0xe7, 0x6b, 0x96, 0xa9, 0xe9, 0x6a, 0xd5, 0x89, 0xc2, 0x4b, 0x00, 0x1d, 0xdc, 0xa9, 0xd1, 0x1c, + 0x2a, 0xc4, 0xcb, 0x57, 0x24, 0x91, 0x60, 0x93, 0x94, 0x5c, 0xd1, 0x05, 0x49, 0x69, 0x45, 0x56, + 0xa9, 0xc0, 0x58, 0xed, 0xca, 0xcc, 0xbf, 0x47, 0xf0, 0xbf, 0x9f, 0x09, 0x37, 0x98, 0xce, 0x29, + 0x5e, 0x82, 0x58, 0x5b, 0x81, 0x14, 0xca, 0x8d, 0x14, 0xe2, 0xe5, 0xcb, 0x52, 0xc0, 0xed, 0x49, + 0x5e, 0xea, 0x62, 0x6c, 0xef, 0x5b, 0x36, 0xf2, 0xee, 0xd7, 0x87, 0x22, 0xaa, 0x76, 0x52, 0xf1, + 0xdd, 0x1e, 0xa8, 0x51, 0x07, 0xea, 0xd4, 0x89, 0x50, 0x5d, 0x10, 0x3d, 0x58, 0x37, 0x21, 0xd9, + 0x03, 0xf5, 0xec, 0x9a, 0x67, 0x21, 0xee, 0xe1, 0xb4, 0x0f, 0x6d, 0xe9, 0xff, 0xae, 0x82, 0xb7, + 0x55, 0x51, 0xf2, 0xcf, 0x7c, 0xf7, 0xdc, 0x16, 0xe7, 0x0e, 0x4c, 0x78, 0x61, 0x4e, 0xc3, 0x30, + 0xda, 0xb4, 0x33, 0xf3, 0xaf, 0x11, 0x64, 0x45, 0x7d, 0x55, 0xe3, 0x16, 0x35, 0xa9, 0x12, 0xde, + 0x51, 0xbd, 0x56, 0x18, 0x39, 0xb5, 0x15, 0x0e, 0x10, 0xe4, 0x06, 0x83, 0x11, 0xbc, 0x29, 0x24, + 0xcd, 0xf6, 0xf1, 0xba, 0xdf, 0x1f, 0x53, 0x03, 0x34, 0xf0, 0xd7, 0xeb, 0x56, 0x23, 0x61, 0xf6, + 0xb7, 0x3b, 0x3f, 0xcf, 0xd4, 0x20, 0x33, 0x80, 0xd3, 0xd0, 0xfa, 0xfa, 0x4c, 0x12, 0xed, 0x33, + 0xc9, 0xab, 0xc1, 0xb7, 0xd8, 0xd6, 0xad, 0x0e, 0x89, 0x00, 0xdd, 0x84, 0x75, 0x4e, 0x23, 0x1b, + 0xee, 0x97, 0x2d, 0x7f, 0x0b, 0x2e, 0xf5, 0xbe, 0xe5, 0x15, 0xd9, 0x94, 0x1b, 0x43, 0x3b, 0x29, + 0xcf, 0x60, 0x32, 0x38, 0x5f, 0x90, 0x58, 0x86, 0x31, 0xc3, 0xd9, 0x11, 0xb8, 0xa7, 0x03, 0x71, + 0xaf, 0x89, 0x82, 0xbe, 0x2a, 0xdd, 0xe0, 0x45, 0x99, 0xf2, 0x8f, 0x71, 0xf8, 0xcb, 0xe9, 0x88, + 0x77, 0x11, 0xc4, 0x3a, 0xd7, 0x5f, 0x0c, 0x2c, 0x1c, 0x38, 0x71, 0xd3, 0xd7, 0x86, 0x8a, 0x75, + 0x19, 0xe4, 0x1f, 0xbc, 0xfc, 0xfa, 0xf3, 0x6d, 0xf4, 0x1e, 0x5e, 0x22, 0x41, 0x33, 0xde, 0x93, + 0x82, 0x93, 0xed, 0x2e, 0xa1, 0x76, 0x88, 0x3d, 0x2d, 0x38, 0xd9, 0x16, 0x33, 0x64, 0xa7, 0x93, + 0x84, 0x3f, 0x21, 0x98, 0xf0, 0xba, 0xe0, 0xab, 0x27, 0x23, 0xf1, 0x40, 0x17, 0x87, 0x09, 0x15, + 0x98, 0x9f, 0x3a, 0x98, 0x1f, 0xe1, 0x87, 0xe7, 0x83, 0x99, 0x6c, 0x77, 0xb9, 0x79, 0x07, 0x7f, + 0x41, 0x90, 0x08, 0x78, 0xf0, 0x78, 0xee, 0x4f, 0x08, 0x07, 0x0d, 0xab, 0xf4, 0x7c, 0xc8, 0x2c, + 0x41, 0xb1, 0xe2, 0x50, 0xbc, 0x8d, 0x17, 0x42, 0x51, 0xec, 0xbc, 0x80, 0x99, 0xce, 0x8d, 0x1c, + 0x22, 0xc0, 0xfd, 0xad, 0xf0, 0x6c, 0x18, 0x60, 0x1e, 0x9b, 0xb9, 0x70, 0x49, 0x82, 0xcc, 0x63, + 0x87, 0xcc, 0x2a, 0x5e, 0x3e, 0x33, 0x19, 0xdf, 0x55, 0x7d, 0x44, 0xf0, 0x8f, 0xef, 0x51, 0xe1, + 0xeb, 0x43, 0xb8, 0xbf, 0x67, 0x0a, 0xa4, 0x4b, 0x21, 0x32, 0x04, 0xa3, 0x9b, 0x0e, 0xa3, 0x79, + 0x3c, 0x1b, 0xce, 0x81, 0xee, 0xb3, 0xbf, 0xbf, 0x77, 0x94, 0x41, 0xfb, 0x47, 0x19, 0xf4, 0xfd, + 0x28, 0x83, 0xde, 0x1c, 0x67, 0x22, 0xfb, 0xc7, 0x99, 0xc8, 0xe1, 0x71, 0x26, 0xf2, 0xa4, 0xac, + 0x6a, 0xd6, 0xf3, 0x66, 0x4d, 0xaa, 0xb3, 0x86, 0x28, 0x3c, 0xb3, 0x21, 0xd7, 0xb8, 0xd7, 0xa4, + 0x75, 0x83, 0xbc, 0xe8, 0xea, 0x64, 0x6d, 0x19, 0x94, 0xd7, 0xc6, 0x9c, 0x3f, 0x60, 0xb3, 0xbf, + 0x03, 0x00, 0x00, 0xff, 0xff, 0x38, 0x8d, 0x88, 0x29, 0x68, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/reactions/wasm/common_test.go b/x/reactions/wasm/common_test.go index 17122b482a..610d7de265 100644 --- a/x/reactions/wasm/common_test.go +++ b/x/reactions/wasm/common_test.go @@ -4,12 +4,13 @@ import ( "encoding/json" "testing" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" @@ -97,13 +98,13 @@ type Testsuite struct { func (suite *Testsuite) SetupTest() { // Define the store keys - keys := sdk.NewMemoryStoreKeys(types.StoreKey) + keys := storetypes.NewMemoryStoreKeys(types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/reactions/wasm/querier.go b/x/reactions/wasm/querier.go index cc57d29f08..912dfeaa45 100644 --- a/x/reactions/wasm/querier.go +++ b/x/reactions/wasm/querier.go @@ -52,7 +52,7 @@ func (querier ReactionsWasmQuerier) handleReactionsRequest(ctx sdk.Context, data if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.reactionskeeper.Reactions(sdk.WrapSDKContext(ctx), &req) + res, err := querier.reactionskeeper.Reactions(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -65,7 +65,7 @@ func (querier ReactionsWasmQuerier) handleReactionRequest(ctx sdk.Context, data if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.reactionskeeper.Reaction(sdk.WrapSDKContext(ctx), &req) + res, err := querier.reactionskeeper.Reaction(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -78,7 +78,7 @@ func (querier ReactionsWasmQuerier) handleRegisteredReactionsRequest(ctx sdk.Con if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.reactionskeeper.RegisteredReactions(sdk.WrapSDKContext(ctx), &req) + res, err := querier.reactionskeeper.RegisteredReactions(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -91,7 +91,7 @@ func (querier ReactionsWasmQuerier) handleRegisteredReactionRequest(ctx sdk.Cont if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.reactionskeeper.RegisteredReaction(sdk.WrapSDKContext(ctx), &req) + res, err := querier.reactionskeeper.RegisteredReaction(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -104,7 +104,7 @@ func (querier ReactionsWasmQuerier) handleReactionsParamsRequest(ctx sdk.Context if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.reactionskeeper.ReactionsParams(sdk.WrapSDKContext(ctx), &req) + res, err := querier.reactionskeeper.ReactionsParams(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } diff --git a/x/relationships/client/cli/cli_test.go b/x/relationships/client/cli/cli_test.go index 5434b33318..b4caed926a 100644 --- a/x/relationships/client/cli/cli_test.go +++ b/x/relationships/client/cli/cli_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + "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" @@ -333,7 +334,7 @@ func (s *IntegrationTestSuite) TestCmdCreateRelationship() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -402,7 +403,7 @@ func (s *IntegrationTestSuite) TestCmdDeleteRelationship() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -471,7 +472,7 @@ func (s *IntegrationTestSuite) TestCmdBlockUser() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -485,7 +486,7 @@ func (s *IntegrationTestSuite) TestCmdBlockUser() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -554,7 +555,7 @@ func (s *IntegrationTestSuite) TestCmdUnblockUser() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -567,7 +568,7 @@ func (s *IntegrationTestSuite) TestCmdUnblockUser() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, diff --git a/x/relationships/keeper/alias_functions.go b/x/relationships/keeper/alias_functions.go index 575d5862f7..d974ff86ae 100644 --- a/x/relationships/keeper/alias_functions.go +++ b/x/relationships/keeper/alias_functions.go @@ -1,6 +1,7 @@ package keeper import ( + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/relationships/types" @@ -10,7 +11,7 @@ import ( func (k Keeper) IterateRelationships(ctx sdk.Context, fn func(index int64, relationship types.Relationship) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.RelationshipsStorePrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.RelationshipsStorePrefix) defer iterator.Close() i := int64(0) @@ -32,7 +33,7 @@ func (k Keeper) IterateRelationships(ctx sdk.Context, fn func(index int64, relat func (k Keeper) IterateSubspaceRelationships(ctx sdk.Context, subspaceID uint64, fn func(index int64, relationship types.Relationship) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspaceRelationshipsPrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspaceRelationshipsPrefix(subspaceID)) defer iterator.Close() i := int64(0) @@ -50,7 +51,7 @@ func (k Keeper) IterateSubspaceRelationships(ctx sdk.Context, subspaceID uint64, // IterateUsersBlocks iterates through the list of user blocks and performs the given function func (k Keeper) IterateUsersBlocks(ctx sdk.Context, fn func(index int64, block types.UserBlock) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.UsersBlocksStorePrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.UsersBlocksStorePrefix) defer iterator.Close() i := int64(0) @@ -67,7 +68,7 @@ func (k Keeper) IterateUsersBlocks(ctx sdk.Context, fn func(index int64, block t // IterateSubspaceUsersBlocks iterates through the list of user blocks stored for a subspace and performs the given function func (k Keeper) IterateSubspaceUsersBlocks(ctx sdk.Context, subspaceID uint64, fn func(index int64, block types.UserBlock) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspaceBlocksPrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspaceBlocksPrefix(subspaceID)) defer iterator.Close() i := int64(0) diff --git a/x/relationships/keeper/common_test.go b/x/relationships/keeper/common_test.go index 5a562847b4..d30a36be82 100644 --- a/x/relationships/keeper/common_test.go +++ b/x/relationships/keeper/common_test.go @@ -7,11 +7,12 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" @@ -40,13 +41,13 @@ type KeeperTestSuite struct { func (suite *KeeperTestSuite) SetupTest() { // Define the store keys - keys := sdk.NewKVStoreKeys(types.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/relationships/keeper/grpc_query.go b/x/relationships/keeper/grpc_query.go index 5a944d672e..8066e8955c 100644 --- a/x/relationships/keeper/grpc_query.go +++ b/x/relationships/keeper/grpc_query.go @@ -3,7 +3,7 @@ package keeper import ( "context" - "github.com/cosmos/cosmos-sdk/store/prefix" + "cosmossdk.io/store/prefix" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/relationships/keeper/grpc_query_test.go b/x/relationships/keeper/grpc_query_test.go index 8a42af37aa..fa6fbda2d6 100644 --- a/x/relationships/keeper/grpc_query_test.go +++ b/x/relationships/keeper/grpc_query_test.go @@ -141,7 +141,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Relationships() { tc.store(ctx) } - res, err := suite.k.Relationships(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.Relationships(ctx, tc.req) suite.Require().NoError(err) suite.Require().NotNil(res) suite.Require().Equal(tc.expRelationships, res.Relationships) @@ -298,7 +298,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Blocks() { tc.store(ctx) } - res, err := suite.k.Blocks(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.Blocks(ctx, tc.req) suite.Require().NoError(err) suite.Require().NotNil(res) suite.Require().Equal(tc.expBlocks, res.Blocks) diff --git a/x/relationships/keeper/keeper.go b/x/relationships/keeper/keeper.go index 1a6827c509..bf5746cf87 100644 --- a/x/relationships/keeper/keeper.go +++ b/x/relationships/keeper/keeper.go @@ -1,9 +1,9 @@ package keeper import ( - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/relationships/types" diff --git a/x/relationships/keeper/msg_server_test.go b/x/relationships/keeper/msg_server_test.go index 064d2546ca..003b6573b6 100644 --- a/x/relationships/keeper/msg_server_test.go +++ b/x/relationships/keeper/msg_server_test.go @@ -111,7 +111,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CreateRelationship() { } service := keeper.NewMsgServerImpl(suite.k) - _, err := service.CreateRelationship(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.CreateRelationship(ctx, tc.msg) if tc.shouldErr { suite.Error(err) @@ -209,7 +209,7 @@ func (suite *KeeperTestSuite) TestMsgServer_DeleteRelationship() { } service := keeper.NewMsgServerImpl(suite.k) - _, err := service.DeleteRelationship(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.DeleteRelationship(ctx, tc.msg) if tc.shouldErr { suite.Error(err) @@ -312,7 +312,7 @@ func (suite *KeeperTestSuite) TestMsgServer_BlockUser() { } service := keeper.NewMsgServerImpl(suite.k) - _, err := service.BlockUser(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.BlockUser(ctx, tc.msg) if tc.shouldErr { suite.Error(err) @@ -412,7 +412,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UnblockUser() { } service := keeper.NewMsgServerImpl(suite.k) - _, err := service.UnblockUser(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.UnblockUser(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) diff --git a/x/relationships/legacy/v1/store.go b/x/relationships/legacy/v1/store.go index 9e9d10c660..f51fd7513b 100644 --- a/x/relationships/legacy/v1/store.go +++ b/x/relationships/legacy/v1/store.go @@ -1,8 +1,8 @@ package v1 import ( + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" subspacestypes "github.com/desmos-labs/desmos/v6/x/subspaces/types" @@ -37,7 +37,7 @@ func MigrateStore(ctx sdk.Context, pk profilesv4.Keeper, relationshipsStoreKey s } // migrateUserBlocks migrates the user blocks stored to the new type, converting the subspace from string to uint64 -func migrateUserBlocks(ctx sdk.Context, pk profilesv4.Keeper, store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateUserBlocks(ctx sdk.Context, pk profilesv4.Keeper, store storetypes.KVStore, cdc codec.BinaryCodec) error { for _, v230Block := range pk.GetBlocks(ctx) { // Get the subspace id subspaceID, err := subspacestypes.ParseSubspaceID(v230Block.SubspaceID) @@ -60,7 +60,7 @@ func migrateUserBlocks(ctx sdk.Context, pk profilesv4.Keeper, store sdk.KVStore, } // migrateRelationships migrates the relationships stored to the new type, converting the subspace from string to uint64 -func migrateRelationships(ctx sdk.Context, pk profilesv4.Keeper, store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateRelationships(ctx sdk.Context, pk profilesv4.Keeper, store storetypes.KVStore, cdc codec.BinaryCodec) error { for _, v230Relationship := range pk.GetRelationships(ctx) { // Get the subspace id subspaceID, err := subspacestypes.ParseSubspaceID(v230Relationship.SubspaceID) diff --git a/x/relationships/legacy/v1/store_test.go b/x/relationships/legacy/v1/store_test.go index ae7a56bffe..3292e35b5b 100644 --- a/x/relationships/legacy/v1/store_test.go +++ b/x/relationships/legacy/v1/store_test.go @@ -5,6 +5,7 @@ import ( v4types "github.com/desmos-labs/desmos/v6/x/profiles/legacy/v4/types" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -17,7 +18,7 @@ import ( func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() - storeKey := sdk.NewKVStoreKey(types.StoreKey) + storeKey := storetypes.NewKVStoreKey(types.StoreKey) testCases := []struct { name string store func(ctx sdk.Context) @@ -83,7 +84,7 @@ func TestMigrateStore(t *testing.T) { for _, tc := range testCases { tc := tc t.Run(tc.name, func(t *testing.T) { - ctx := testutil.DefaultContext(storeKey, sdk.NewTransientStoreKey("test")) + ctx := testutil.DefaultContext(storeKey, storetypes.NewTransientStoreKey("test")) if tc.store != nil { tc.store(ctx) } diff --git a/x/relationships/legacy/v2/store.go b/x/relationships/legacy/v2/store.go index c591765de7..e27fe4a53c 100644 --- a/x/relationships/legacy/v2/store.go +++ b/x/relationships/legacy/v2/store.go @@ -1,9 +1,9 @@ package v2 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" v1 "github.com/desmos-labs/desmos/v6/x/relationships/legacy/v1" @@ -32,7 +32,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar } // migrateRelationships migrates all the relationships from using the old key to using the new key -func migrateRelationships(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateRelationships(store storetypes.KVStore, cdc codec.BinaryCodec) error { prefixStore := prefix.NewStore(store, v1.RelationshipsStorePrefix) iterator := prefixStore.Iterator(nil, nil) @@ -68,7 +68,7 @@ func migrateRelationships(store sdk.KVStore, cdc codec.BinaryCodec) error { } // migrateUserBlocks migrates all the user blocks from using the old key to using the new key -func migrateUserBlocks(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateUserBlocks(store storetypes.KVStore, cdc codec.BinaryCodec) error { prefixStore := prefix.NewStore(store, v1.UsersBlocksStorePrefix) iterator := prefixStore.Iterator(nil, nil) diff --git a/x/relationships/legacy/v2/store_test.go b/x/relationships/legacy/v2/store_test.go index 0829dddf44..739fd8afc7 100644 --- a/x/relationships/legacy/v2/store_test.go +++ b/x/relationships/legacy/v2/store_test.go @@ -5,6 +5,7 @@ import ( v2 "github.com/desmos-labs/desmos/v6/x/relationships/legacy/v2" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -16,7 +17,7 @@ import ( func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() - storeKey := sdk.NewKVStoreKey(types.StoreKey) + storeKey := storetypes.NewKVStoreKey(types.StoreKey) testCases := []struct { name string store func(ctx sdk.Context) @@ -96,7 +97,7 @@ func TestMigrateStore(t *testing.T) { for _, tc := range testCases { tc := tc t.Run(tc.name, func(t *testing.T) { - ctx := testutil.DefaultContext(storeKey, sdk.NewTransientStoreKey("test")) + ctx := testutil.DefaultContext(storeKey, storetypes.NewTransientStoreKey("test")) if tc.store != nil { tc.store(ctx) } diff --git a/x/relationships/module.go b/x/relationships/module.go index 7a50f51341..75dbf15c5b 100644 --- a/x/relationships/module.go +++ b/x/relationships/module.go @@ -8,9 +8,9 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/depinject" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/client" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" @@ -44,7 +44,6 @@ var ( _ module.AppModuleBasic = AppModuleBasic{} _ module.AppModuleSimulation = AppModule{} _ appmodule.AppModule = AppModule{} - _ depinject.OnePerModuleType = AppModule{} ) // AppModuleBasic defines the basic application module used by the relationships module. @@ -170,16 +169,6 @@ func (AppModule) ConsensusVersion() uint64 { return consensusVersion } -// BeginBlock returns the begin blocker for the relationships module. -func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) { -} - -// EndBlock returns the end blocker for the relationships module. It returns no validator -// updates. -func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return []abci.ValidatorUpdate{} -} - // -------------------------------------------------------------------------------------------------------------------- // AppModuleSimulation defines the module simulation functions used by the relationships module. @@ -191,7 +180,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { } // RegisterStoreDecoder performs a no-op. -func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { +func (am AppModule) RegisterStoreDecoder(sdr simtypes.StoreDecoderRegistry) { sdr[types.ModuleName] = simulation.NewDecodeStore(am.cdc) } diff --git a/x/relationships/simulation/operations.go b/x/relationships/simulation/operations.go index 8a8c477785..2b8083844c 100644 --- a/x/relationships/simulation/operations.go +++ b/x/relationships/simulation/operations.go @@ -35,28 +35,28 @@ func WeightedOperations( k keeper.Keeper, sk types.SubspacesKeeper, ak authkeeper.AccountKeeper, bk bankkeeper.Keeper, ) sim.WeightedOperations { var weightMsgCreateRelationship int - appParams.GetOrGenerate(cdc, OpWeightMsgCreateRelationship, &weightMsgCreateRelationship, nil, + appParams.GetOrGenerate(OpWeightMsgCreateRelationship, &weightMsgCreateRelationship, nil, func(_ *rand.Rand) { weightMsgCreateRelationship = params.DefaultWeightMsgCreateRelationship }, ) var weightMsgDeleteRelationship int - appParams.GetOrGenerate(cdc, OpWeightMsgDeleteRelationship, &weightMsgDeleteRelationship, nil, + appParams.GetOrGenerate(OpWeightMsgDeleteRelationship, &weightMsgDeleteRelationship, nil, func(_ *rand.Rand) { weightMsgDeleteRelationship = params.DefaultWeightMsgDeleteRelationship }, ) var weightMsgBlockUser int - appParams.GetOrGenerate(cdc, OpWeightMsgBlockUser, &weightMsgBlockUser, nil, + appParams.GetOrGenerate(OpWeightMsgBlockUser, &weightMsgBlockUser, nil, func(_ *rand.Rand) { weightMsgBlockUser = params.DefaultWeightMsgBlockUser }, ) var weightMsgUnblockUser int - appParams.GetOrGenerate(cdc, OpWeightMsgUnBlockUser, &weightMsgUnblockUser, nil, + appParams.GetOrGenerate(OpWeightMsgUnBlockUser, &weightMsgUnblockUser, nil, func(_ *rand.Rand) { weightMsgBlockUser = params.DefaultWeightMsgUnblockUser }, diff --git a/x/relationships/types/codec.go b/x/relationships/types/codec.go index 53277d2052..1af66a2df4 100644 --- a/x/relationships/types/codec.go +++ b/x/relationships/types/codec.go @@ -4,10 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" "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" - authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" ) func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { @@ -27,25 +25,3 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } - -var ( - amino = codec.NewLegacyAmino() - - // AminoCdc references the global x/relationships module codec. Note, the codec should - // ONLY be used in certain instances of tests and for JSON encoding as Amino is - // still used for that purpose. - // - // The actual codec used for serialization should be provided to x/relationships and - // defined at the application level. - AminoCdc = codec.NewAminoCodec(amino) -) - -func init() { - RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) - sdk.RegisterLegacyAminoCodec(amino) - - // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be - // used to properly serialize MsgGrant and MsgExec instances - RegisterLegacyAminoCodec(authzcodec.Amino) -} diff --git a/x/relationships/types/genesis.pb.go b/x/relationships/types/genesis.pb.go index bcb3f37575..48eb4320dc 100644 --- a/x/relationships/types/genesis.pb.go +++ b/x/relationships/types/genesis.pb.go @@ -88,9 +88,9 @@ var fileDescriptor_4d7b018c2a5c3e4d = []byte{ 0xf1, 0x50, 0xd3, 0xac, 0x58, 0x3a, 0x16, 0xc8, 0x33, 0x38, 0x05, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x59, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, - 0xae, 0x3e, 0xc4, 0x46, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x28, 0x5b, 0xbf, 0xcc, 0x54, 0xbf, 0x02, + 0xae, 0x3e, 0xc4, 0x46, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x28, 0x5b, 0xbf, 0xcc, 0x4c, 0xbf, 0x02, 0x2d, 0xe8, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xe1, 0x66, 0x0c, 0x08, 0x00, 0x00, - 0xff, 0xff, 0xab, 0xac, 0x30, 0x5f, 0xc8, 0x01, 0x00, 0x00, + 0xff, 0xff, 0xd8, 0x95, 0x18, 0x4c, 0xc8, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/relationships/types/models.pb.go b/x/relationships/types/models.pb.go index 4d57318aac..821f410975 100644 --- a/x/relationships/types/models.pb.go +++ b/x/relationships/types/models.pb.go @@ -175,32 +175,32 @@ func init() { } var fileDescriptor_9096e6e86fd356f7 = []byte{ - // 394 bytes of a gzipped FileDescriptorProto + // 393 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x92, 0x3f, 0xcf, 0xd2, 0x40, 0x1c, 0xc7, 0x39, 0x24, 0x28, 0x27, 0x9a, 0x58, 0x49, 0x44, 0x86, 0x96, 0x34, 0x0c, 0x68, 0x42, - 0x2f, 0xc4, 0xe8, 0xc0, 0x66, 0x83, 0x03, 0x9b, 0x29, 0x71, 0x71, 0x21, 0x6d, 0xef, 0x52, 0x1a, - 0xdb, 0x5e, 0x73, 0x77, 0x10, 0x79, 0x17, 0x26, 0x2e, 0x8e, 0xbc, 0x08, 0x5f, 0x84, 0x23, 0x71, - 0x72, 0x6a, 0x4c, 0x59, 0x9c, 0x3b, 0x3a, 0x3d, 0x69, 0xef, 0xc8, 0x03, 0x3c, 0xff, 0x86, 0x67, - 0xfb, 0xdd, 0x7d, 0x3f, 0xfd, 0x34, 0xdf, 0xcb, 0x0f, 0x0e, 0x30, 0xe1, 0x31, 0xe5, 0x88, 0x91, - 0xc8, 0x15, 0x21, 0x4d, 0xf8, 0x32, 0x4c, 0x39, 0x5a, 0x8f, 0x51, 0x4c, 0x31, 0x89, 0xb8, 0x95, - 0x32, 0x2a, 0xa8, 0xf6, 0x42, 0x52, 0xd6, 0x09, 0x65, 0xad, 0xc7, 0xbd, 0x4e, 0x40, 0x03, 0x5a, - 0x31, 0xa8, 0x9c, 0x24, 0xde, 0x7b, 0xe9, 0xd3, 0x12, 0x5f, 0xc8, 0x40, 0x1e, 0x64, 0x64, 0xfe, - 0x07, 0xb0, 0xed, 0x1c, 0x59, 0xb4, 0x29, 0x7c, 0xe8, 0x33, 0xe2, 0x0a, 0xca, 0xba, 0xa0, 0x0f, - 0x86, 0x2d, 0xfb, 0x75, 0x91, 0x19, 0x4f, 0x37, 0x6e, 0x1c, 0x4d, 0x4c, 0x15, 0x98, 0xbf, 0x7f, - 0x8e, 0x3a, 0xca, 0xf2, 0x1e, 0x63, 0x46, 0x38, 0x9f, 0x0b, 0x16, 0x26, 0x81, 0x73, 0xf8, 0x54, - 0x9b, 0xc3, 0xb6, 0x4f, 0x57, 0x89, 0x20, 0x2c, 0x75, 0x99, 0xd8, 0x74, 0xeb, 0x95, 0x0a, 0x15, - 0x99, 0xf1, 0x5c, 0xa9, 0x8e, 0xd2, 0x9b, 0x7d, 0x27, 0x12, 0xed, 0x03, 0x7c, 0xcc, 0x57, 0x1e, - 0x4f, 0x5d, 0x9f, 0x2c, 0x42, 0xdc, 0x7d, 0xd0, 0x07, 0xc3, 0x86, 0x3d, 0xc8, 0x33, 0x03, 0xce, - 0xd5, 0xf5, 0x6c, 0x5a, 0x64, 0x86, 0x26, 0xff, 0x70, 0x84, 0x9a, 0x0e, 0x3c, 0x9c, 0x66, 0x78, - 0xf2, 0xe8, 0xc7, 0xd6, 0x00, 0xff, 0xb6, 0x06, 0x30, 0xbf, 0xd7, 0x61, 0xeb, 0x13, 0x27, 0xcc, - 0x8e, 0xa8, 0xff, 0xa5, 0x6c, 0xee, 0x95, 0x03, 0xb9, 0xa6, 0xb9, 0x0a, 0x6e, 0x69, 0xae, 0x88, - 0x4b, 0x0b, 0x56, 0xa5, 0xaf, 0x58, 0xf0, 0x9d, 0x16, 0xac, 0xbd, 0x82, 0x4d, 0x46, 0x5c, 0x4e, - 0x93, 0xaa, 0x65, 0xcb, 0x7e, 0x56, 0x64, 0xc6, 0x13, 0x29, 0x91, 0xf7, 0xa6, 0xa3, 0x80, 0xf3, - 0x57, 0x69, 0xdc, 0xf7, 0x55, 0xec, 0x8f, 0xbf, 0x72, 0x1d, 0xec, 0x72, 0x1d, 0xfc, 0xcd, 0x75, - 0xf0, 0x6d, 0xaf, 0xd7, 0x76, 0x7b, 0xbd, 0xf6, 0x67, 0xaf, 0xd7, 0x3e, 0xbf, 0x0b, 0x42, 0xb1, - 0x5c, 0x79, 0x96, 0x4f, 0x63, 0x24, 0x37, 0x70, 0x14, 0xb9, 0x1e, 0x57, 0x33, 0x5a, 0xbf, 0x45, - 0x5f, 0xcf, 0x16, 0x57, 0x6c, 0x52, 0xc2, 0xbd, 0x66, 0xb5, 0x6b, 0x6f, 0x2e, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x29, 0x1e, 0x5b, 0xe6, 0xdd, 0x02, 0x00, 0x00, + 0x2f, 0xc4, 0x84, 0x81, 0xcd, 0x06, 0x07, 0x36, 0x53, 0xe2, 0xe2, 0x42, 0xda, 0xde, 0xa5, 0x34, + 0xb6, 0xbd, 0xe6, 0xee, 0x20, 0xf2, 0x2e, 0x4c, 0x5c, 0x1c, 0x79, 0x11, 0xbe, 0x08, 0x47, 0xe2, + 0xe4, 0xd4, 0x98, 0xb2, 0x38, 0x77, 0x74, 0x32, 0xed, 0x1d, 0x11, 0x78, 0xfe, 0x0d, 0xcf, 0xf6, + 0xbb, 0xfb, 0x7e, 0xfa, 0x69, 0xbe, 0x97, 0x1f, 0x1c, 0x60, 0xc2, 0x63, 0xca, 0x11, 0x23, 0x91, + 0x2b, 0x42, 0x9a, 0xf0, 0x55, 0x98, 0x72, 0xb4, 0x19, 0xa3, 0x98, 0x62, 0x12, 0x71, 0x2b, 0x65, + 0x54, 0x50, 0xed, 0x85, 0xa4, 0xac, 0x33, 0xca, 0xda, 0x8c, 0x7b, 0x9d, 0x80, 0x06, 0xb4, 0x62, + 0x50, 0x39, 0x49, 0xbc, 0xf7, 0xd2, 0xa7, 0x25, 0xbe, 0x94, 0x81, 0x3c, 0xc8, 0xc8, 0xfc, 0x0b, + 0x60, 0xdb, 0x39, 0xb1, 0x68, 0x33, 0xf8, 0xd0, 0x67, 0xc4, 0x15, 0x94, 0x75, 0x41, 0x1f, 0x0c, + 0x5b, 0xf6, 0xeb, 0x22, 0x33, 0x9e, 0x6e, 0xdd, 0x38, 0x9a, 0x9a, 0x2a, 0x30, 0x7f, 0x7e, 0x1f, + 0x75, 0x94, 0xe5, 0x2d, 0xc6, 0x8c, 0x70, 0xbe, 0x10, 0x2c, 0x4c, 0x02, 0xe7, 0xf8, 0xa9, 0xb6, + 0x80, 0x6d, 0x9f, 0xae, 0x13, 0x41, 0x58, 0xea, 0x32, 0xb1, 0xed, 0xd6, 0x2b, 0x15, 0x2a, 0x32, + 0xe3, 0xb9, 0x52, 0x9d, 0xa4, 0x37, 0xfb, 0xce, 0x24, 0xda, 0x3b, 0xf8, 0x98, 0xaf, 0x3d, 0x9e, + 0xba, 0x3e, 0x59, 0x86, 0xb8, 0xfb, 0xa0, 0x0f, 0x86, 0x0d, 0x7b, 0x90, 0x67, 0x06, 0x5c, 0xa8, + 0xeb, 0xf9, 0xac, 0xc8, 0x0c, 0x4d, 0xfe, 0xe1, 0x04, 0x35, 0x1d, 0x78, 0x3c, 0xcd, 0xf1, 0xf4, + 0xd1, 0xb7, 0x9d, 0x01, 0xfe, 0xec, 0x0c, 0x60, 0x7e, 0xad, 0xc3, 0xd6, 0x07, 0x4e, 0x98, 0x1d, + 0x51, 0xff, 0x53, 0xd9, 0xdc, 0x2b, 0x07, 0x72, 0x4d, 0x73, 0x15, 0xdc, 0xd2, 0x5c, 0x11, 0xff, + 0x2d, 0x58, 0x95, 0xbe, 0x62, 0xc1, 0x77, 0x5a, 0xb0, 0xf6, 0x0a, 0x36, 0x19, 0x71, 0x39, 0x4d, + 0xaa, 0x96, 0x2d, 0xfb, 0x59, 0x91, 0x19, 0x4f, 0xa4, 0x44, 0xde, 0x9b, 0x8e, 0x02, 0x2e, 0x5f, + 0xa5, 0x71, 0xdf, 0x57, 0xb1, 0xdf, 0xff, 0xc8, 0x75, 0xb0, 0xcf, 0x75, 0xf0, 0x3b, 0xd7, 0xc1, + 0x97, 0x83, 0x5e, 0xdb, 0x1f, 0xf4, 0xda, 0xaf, 0x83, 0x5e, 0xfb, 0x38, 0x09, 0x42, 0xb1, 0x5a, + 0x7b, 0x96, 0x4f, 0x63, 0x24, 0x37, 0x70, 0x14, 0xb9, 0x1e, 0x57, 0x33, 0xda, 0x4c, 0xd0, 0xe7, + 0x8b, 0xc5, 0x15, 0xdb, 0x94, 0x70, 0xaf, 0x59, 0xed, 0xda, 0x9b, 0x7f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x5a, 0x27, 0x73, 0xf5, 0xdd, 0x02, 0x00, 0x00, } func (this *Relationship) Equal(that interface{}) bool { diff --git a/x/relationships/types/msgs.go b/x/relationships/types/msgs.go index 4ac2911191..971ef2919d 100644 --- a/x/relationships/types/msgs.go +++ b/x/relationships/types/msgs.go @@ -46,11 +46,6 @@ func (msg *MsgCreateRelationship) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgCreateRelationship) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgCreateRelationship) GetSigners() []sdk.AccAddress { sender, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -99,11 +94,6 @@ func (msg *MsgDeleteRelationship) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgDeleteRelationship) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgDeleteRelationship) GetSigners() []sdk.AccAddress { sender, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -149,11 +139,6 @@ func (msg *MsgBlockUser) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgBlockUser) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgBlockUser) GetSigners() []sdk.AccAddress { blocker, _ := sdk.AccAddressFromBech32(msg.Blocker) @@ -198,11 +183,6 @@ func (msg *MsgUnblockUser) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgUnblockUser) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgUnblockUser) GetSigners() []sdk.AccAddress { blocker, _ := sdk.AccAddressFromBech32(msg.Blocker) diff --git a/x/relationships/types/msgs.pb.go b/x/relationships/types/msgs.pb.go index 90b1f38a28..2c66548cf5 100644 --- a/x/relationships/types/msgs.pb.go +++ b/x/relationships/types/msgs.pb.go @@ -465,45 +465,45 @@ func init() { } var fileDescriptor_96a11e032a59b620 = []byte{ - // 605 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x95, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0xeb, 0xb4, 0x14, 0xe5, 0x5a, 0x2a, 0xd5, 0x4d, 0xdb, 0x60, 0x81, 0x5d, 0x59, 0x05, - 0xda, 0x88, 0xd8, 0x2a, 0x88, 0x0e, 0xdd, 0x1a, 0xc2, 0xd0, 0x21, 0x12, 0x4a, 0xd4, 0x85, 0xa5, - 0xb2, 0xe3, 0xd3, 0xd5, 0x22, 0xf6, 0x59, 0x7e, 0x4e, 0x44, 0x24, 0x06, 0xc4, 0x08, 0x0b, 0x7f, - 0x04, 0x7f, 0x40, 0x84, 0xf8, 0x23, 0x18, 0x2b, 0xc4, 0xc0, 0x14, 0xa1, 0x64, 0xc8, 0x9e, 0xbf, - 0x00, 0xc5, 0x77, 0xfe, 0x91, 0x9f, 0x14, 0xc4, 0xc0, 0xc0, 0x12, 0xdd, 0xbd, 0xf7, 0xbd, 0xef, - 0x7b, 0xf7, 0x71, 0xfc, 0x8c, 0x54, 0x0b, 0x83, 0x43, 0x41, 0xf7, 0x71, 0xc3, 0x08, 0x6c, 0xea, - 0xc2, 0xa5, 0xed, 0x81, 0xde, 0x3a, 0xd2, 0x1d, 0x20, 0xa0, 0x79, 0x3e, 0x0d, 0xa8, 0xb8, 0xcb, - 0x34, 0xda, 0x98, 0x46, 0x6b, 0x1d, 0x49, 0x9b, 0x86, 0x63, 0xbb, 0x54, 0x0f, 0x7f, 0x99, 0x56, - 0xca, 0x11, 0x4a, 0x68, 0xb8, 0xd4, 0x47, 0x2b, 0x1e, 0xdd, 0xad, 0xd3, 0xb0, 0x8a, 0x03, 0x84, - 0x7b, 0xf3, 0xc4, 0x6d, 0x96, 0xb8, 0x60, 0x27, 0xd8, 0x86, 0xa5, 0xd4, 0x8f, 0x19, 0xb4, 0x5d, - 0x01, 0xf2, 0xd4, 0xc7, 0x46, 0x80, 0xab, 0xa9, 0xd2, 0xe2, 0x29, 0x5a, 0x05, 0x9b, 0xb8, 0xd8, - 0xcf, 0x0b, 0x7b, 0xc2, 0x41, 0xb6, 0x74, 0x38, 0xec, 0x2a, 0xb7, 0xda, 0x86, 0xd3, 0x38, 0x51, - 0x59, 0x5c, 0xfd, 0xfa, 0xb9, 0x98, 0xe3, 0x66, 0xa7, 0x96, 0xe5, 0x63, 0x80, 0x5a, 0xe0, 0xdb, - 0x2e, 0xa9, 0xf2, 0x83, 0x62, 0x0d, 0xad, 0xd7, 0x69, 0xd3, 0x0d, 0xb0, 0xef, 0x19, 0x7e, 0xd0, - 0xce, 0x67, 0x42, 0x23, 0x7d, 0xd8, 0x55, 0xb6, 0x98, 0x51, 0x3a, 0x3b, 0xdf, 0x6e, 0xcc, 0x44, - 0x7c, 0x86, 0xd6, 0xa0, 0x69, 0x82, 0x67, 0xd4, 0xf1, 0x85, 0x6d, 0xe5, 0x97, 0xf7, 0x84, 0x83, - 0x95, 0xd2, 0x7e, 0xaf, 0xab, 0xa0, 0x1a, 0x0f, 0x9f, 0x95, 0x87, 0x5d, 0x45, 0xe4, 0xad, 0x26, - 0x52, 0xb5, 0x8a, 0xa2, 0xdd, 0x99, 0x75, 0xf2, 0xf0, 0xed, 0xa0, 0x53, 0xe0, 0x8d, 0xbe, 0x1b, - 0x74, 0x0a, 0x77, 0xf8, 0x23, 0x9a, 0x09, 0x43, 0x55, 0xd0, 0xdd, 0x99, 0x89, 0x2a, 0x06, 0x8f, - 0xba, 0x80, 0x23, 0x8e, 0x65, 0xdc, 0xc0, 0xff, 0x39, 0x72, 0x8e, 0xd3, 0x30, 0x38, 0xc7, 0xe9, - 0x44, 0xcc, 0xf1, 0x53, 0x06, 0xad, 0x57, 0x80, 0x94, 0x1a, 0xb4, 0xfe, 0xf2, 0x1c, 0xb0, 0x2f, - 0x96, 0xd1, 0x4d, 0x73, 0xb4, 0x89, 0xf9, 0x15, 0x86, 0x5d, 0x65, 0x83, 0x35, 0xc5, 0x13, 0xf3, - 0x6f, 0x1c, 0x1d, 0x4d, 0x5c, 0x2c, 0x0e, 0x6f, 0xca, 0xc5, 0xfa, 0xa5, 0x8b, 0x25, 0x1e, 0xa2, - 0x55, 0x1f, 0x1b, 0x40, 0xdd, 0x90, 0x56, 0xb6, 0xb4, 0x99, 0x3c, 0x4a, 0x16, 0x57, 0xab, 0x5c, - 0x30, 0x49, 0x77, 0xe5, 0x0f, 0xe9, 0xee, 0x8f, 0xe8, 0x46, 0xb7, 0x18, 0xe1, 0xdd, 0x4a, 0xf0, - 0xc6, 0x8c, 0xd4, 0x1d, 0x94, 0x4b, 0xef, 0x63, 0x98, 0xef, 0x33, 0x68, 0xa3, 0x02, 0xe4, 0xdc, - 0x35, 0xff, 0x49, 0x9c, 0x7f, 0x89, 0xd1, 0xfd, 0x49, 0x46, 0xdb, 0x09, 0xa3, 0xd4, 0xd5, 0xd5, - 0x3c, 0xda, 0x19, 0x8f, 0x44, 0x9c, 0x1e, 0x7d, 0x5b, 0x46, 0xcb, 0x15, 0x20, 0xe2, 0x6b, 0x24, - 0xce, 0x18, 0x84, 0x9a, 0x36, 0x67, 0x32, 0x6b, 0x33, 0x47, 0x82, 0x74, 0xfc, 0x7b, 0xfa, 0xa8, - 0x8b, 0x51, 0xf5, 0x19, 0xe3, 0x63, 0x61, 0xf5, 0x69, 0xfd, 0xe2, 0xea, 0xf3, 0x5f, 0x3c, 0xd1, - 0x40, 0xd9, 0xe4, 0xa5, 0xbb, 0xb7, 0xc8, 0x24, 0x96, 0x49, 0xc5, 0x6b, 0xc9, 0xe2, 0x12, 0x04, - 0xad, 0xa5, 0xff, 0x8a, 0x0f, 0x16, 0x9d, 0x4e, 0x09, 0x25, 0xfd, 0x9a, 0xc2, 0xa8, 0x90, 0x74, - 0xe3, 0xcd, 0xa0, 0x53, 0x10, 0x4a, 0xcf, 0xbf, 0xf4, 0x64, 0xe1, 0xaa, 0x27, 0x0b, 0x3f, 0x7a, - 0xb2, 0xf0, 0xa1, 0x2f, 0x2f, 0x5d, 0xf5, 0xe5, 0xa5, 0xef, 0x7d, 0x79, 0xe9, 0xc5, 0x31, 0xb1, - 0x83, 0xcb, 0xa6, 0xa9, 0xd5, 0xa9, 0xa3, 0x33, 0xef, 0x62, 0xc3, 0x30, 0x81, 0xaf, 0xf5, 0xd6, - 0x13, 0xfd, 0xd5, 0xc4, 0xb7, 0x3a, 0x68, 0x7b, 0x18, 0xcc, 0xd5, 0xf0, 0xa3, 0xf9, 0xf8, 0x67, - 0x00, 0x00, 0x00, 0xff, 0xff, 0x97, 0x37, 0x7a, 0xd8, 0xd0, 0x07, 0x00, 0x00, + // 604 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x95, 0xbd, 0x6e, 0xd3, 0x50, + 0x14, 0xc7, 0xe3, 0xa4, 0x04, 0xe5, 0xb6, 0x54, 0xaa, 0x9b, 0xb6, 0xc1, 0x02, 0xbb, 0xb2, 0x0a, + 0xb4, 0x11, 0xb1, 0x55, 0x90, 0x32, 0x74, 0x6b, 0x08, 0x43, 0x87, 0x48, 0x28, 0x51, 0x17, 0x96, + 0xca, 0x8e, 0xaf, 0x6e, 0x2d, 0x62, 0x5f, 0xcb, 0xc7, 0x89, 0x88, 0xc4, 0x80, 0x18, 0x61, 0xe1, + 0x21, 0x78, 0x80, 0x08, 0xf1, 0x10, 0x8c, 0x15, 0x62, 0x60, 0x8a, 0x50, 0x32, 0x64, 0xcf, 0x13, + 0xa0, 0xd8, 0xd7, 0x1f, 0xf9, 0xa4, 0x20, 0x06, 0x86, 0x2e, 0xd1, 0xbd, 0xe7, 0xfc, 0xef, 0xff, + 0x9c, 0xfb, 0x73, 0x7c, 0x8c, 0x64, 0x03, 0x83, 0x45, 0x41, 0x75, 0x71, 0x4b, 0xf3, 0x4c, 0x6a, + 0xc3, 0xa5, 0xe9, 0x80, 0xda, 0x39, 0x56, 0x2d, 0x20, 0xa0, 0x38, 0x2e, 0xf5, 0x28, 0xbf, 0x17, + 0x68, 0x94, 0x29, 0x8d, 0xd2, 0x39, 0x16, 0xb6, 0x34, 0xcb, 0xb4, 0xa9, 0xea, 0xff, 0x06, 0x5a, + 0x21, 0x4f, 0x28, 0xa1, 0xfe, 0x52, 0x9d, 0xac, 0x58, 0x74, 0xaf, 0x49, 0xfd, 0x2a, 0x16, 0x10, + 0xe6, 0xcd, 0x12, 0x77, 0x83, 0xc4, 0x45, 0x70, 0x22, 0xd8, 0x04, 0x29, 0xf9, 0x53, 0x1a, 0xed, + 0xd4, 0x80, 0x3c, 0x73, 0xb1, 0xe6, 0xe1, 0x7a, 0xa2, 0x34, 0x7f, 0x8a, 0xb2, 0x60, 0x12, 0x1b, + 0xbb, 0x05, 0x6e, 0x9f, 0x3b, 0xcc, 0x55, 0x8e, 0xc6, 0x7d, 0xe9, 0x4e, 0x57, 0xb3, 0x5a, 0x27, + 0x72, 0x10, 0x97, 0xbf, 0x7d, 0x29, 0xe5, 0x99, 0xd9, 0xa9, 0x61, 0xb8, 0x18, 0xa0, 0xe1, 0xb9, + 0xa6, 0x4d, 0xea, 0xec, 0x20, 0xdf, 0x40, 0x1b, 0x4d, 0xda, 0xb6, 0x3d, 0xec, 0x3a, 0x9a, 0xeb, + 0x75, 0x0b, 0x69, 0xdf, 0x48, 0x1d, 0xf7, 0xa5, 0xed, 0xc0, 0x28, 0x99, 0x5d, 0x6e, 0x37, 0x65, + 0xc2, 0x3f, 0x47, 0xeb, 0xd0, 0xd6, 0xc1, 0xd1, 0x9a, 0xf8, 0xc2, 0x34, 0x0a, 0x99, 0x7d, 0xee, + 0x70, 0xad, 0x72, 0x30, 0xe8, 0x4b, 0xa8, 0xc1, 0xc2, 0x67, 0xd5, 0x71, 0x5f, 0xe2, 0x59, 0xab, + 0xb1, 0x54, 0xae, 0xa3, 0x70, 0x77, 0x66, 0x9c, 0x3c, 0x7e, 0x37, 0xea, 0x15, 0x59, 0xa3, 0xef, + 0x47, 0xbd, 0xe2, 0x3d, 0xf6, 0x88, 0x16, 0xc2, 0x90, 0x25, 0x74, 0x7f, 0x61, 0xa2, 0x8e, 0xc1, + 0xa1, 0x36, 0xe0, 0x90, 0x63, 0x15, 0xb7, 0xf0, 0x0d, 0x47, 0xc6, 0x71, 0x1e, 0x06, 0xe3, 0x38, + 0x9f, 0x88, 0x38, 0x7e, 0x4e, 0xa3, 0x8d, 0x1a, 0x90, 0x4a, 0x8b, 0x36, 0x5f, 0x9d, 0x03, 0x76, + 0xf9, 0x2a, 0xba, 0xad, 0x4f, 0x36, 0x11, 0xbf, 0xe2, 0xb8, 0x2f, 0x6d, 0x06, 0x4d, 0xb1, 0xc4, + 0xf2, 0x1b, 0x87, 0x47, 0x63, 0x17, 0x83, 0xc1, 0x9b, 0x73, 0x31, 0x7e, 0xeb, 0x62, 0xf0, 0x47, + 0x28, 0xeb, 0x62, 0x0d, 0xa8, 0xed, 0xd3, 0xca, 0x55, 0xb6, 0xe2, 0x47, 0x19, 0xc4, 0xe5, 0x3a, + 0x13, 0xcc, 0xd2, 0x5d, 0xfb, 0x4b, 0xba, 0x07, 0x13, 0xba, 0xe1, 0x2d, 0x26, 0x78, 0xb7, 0x63, + 0xbc, 0x11, 0x23, 0x79, 0x17, 0xe5, 0x93, 0xfb, 0x08, 0xe6, 0x87, 0x34, 0xda, 0xac, 0x01, 0x39, + 0xb7, 0xf5, 0xff, 0x12, 0xe7, 0x3f, 0x62, 0xf4, 0x70, 0x96, 0xd1, 0x4e, 0xcc, 0x28, 0x71, 0x75, + 0xb9, 0x80, 0x76, 0xa7, 0x23, 0x21, 0xa7, 0x27, 0xdf, 0x33, 0x28, 0x53, 0x03, 0xc2, 0xbf, 0x41, + 0xfc, 0x82, 0x41, 0xa8, 0x28, 0x4b, 0x26, 0xb3, 0xb2, 0x70, 0x24, 0x08, 0xe5, 0x3f, 0xd3, 0x87, + 0x5d, 0x4c, 0xaa, 0x2f, 0x18, 0x1f, 0x2b, 0xab, 0xcf, 0xeb, 0x57, 0x57, 0x5f, 0xfe, 0xe2, 0xf1, + 0x1a, 0xca, 0xc5, 0x2f, 0xdd, 0x83, 0x55, 0x26, 0x91, 0x4c, 0x28, 0x5d, 0x4b, 0x16, 0x95, 0x20, + 0x68, 0x3d, 0xf9, 0x57, 0x7c, 0xb4, 0xea, 0x74, 0x42, 0x28, 0xa8, 0xd7, 0x14, 0x86, 0x85, 0x84, + 0x5b, 0x6f, 0x47, 0xbd, 0x22, 0x57, 0x79, 0xf1, 0x75, 0x20, 0x72, 0x57, 0x03, 0x91, 0xfb, 0x39, + 0x10, 0xb9, 0x8f, 0x43, 0x31, 0x75, 0x35, 0x14, 0x53, 0x3f, 0x86, 0x62, 0xea, 0x65, 0x99, 0x98, + 0xde, 0x65, 0x5b, 0x57, 0x9a, 0xd4, 0x52, 0x03, 0xef, 0x52, 0x4b, 0xd3, 0x81, 0xad, 0xd5, 0x4e, + 0x59, 0x7d, 0x3d, 0xf3, 0xad, 0xf6, 0xba, 0x0e, 0x06, 0x3d, 0xeb, 0x7f, 0x34, 0x9f, 0xfe, 0x0a, + 0x00, 0x00, 0xff, 0xff, 0xe4, 0x0e, 0x52, 0xcb, 0xd0, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/relationships/types/msgs_test.go b/x/relationships/types/msgs_test.go index 5dff67f297..1d3a20659f 100644 --- a/x/relationships/types/msgs_test.go +++ b/x/relationships/types/msgs_test.go @@ -78,11 +78,6 @@ func TestMsgCreateRelationship_ValidateBasic(t *testing.T) { } } -func TestMsgCreateRelationship_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgCreateRelationship","value":{"counterparty":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","signer":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns","subspace_id":"1"}}` - require.Equal(t, expected, string(msgCreateRelationship.GetSignBytes())) -} - func TestMsgCreateRelationship_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgCreateRelationship.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgCreateRelationship.GetSigners()) @@ -158,11 +153,6 @@ func TestMsgDeleteRelationships_ValidateBasic(t *testing.T) { } } -func TestMsgDeleteRelationships_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgDeleteRelationship","value":{"counterparty":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","signer":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns","subspace_id":"1"}}` - require.Equal(t, expected, string(msgDeleteRelationships.GetSignBytes())) -} - func TestMsgDeleteRelationships_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgDeleteRelationships.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgDeleteRelationships.GetSigners()) @@ -242,11 +232,6 @@ func TestMsgBlockUser_ValidateBasic(t *testing.T) { } } -func TestMsgBlockUser_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgBlockUser","value":{"blocked":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","blocker":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns","reason":"reason"}}` - require.Equal(t, expected, string(msgBlockUser.GetSignBytes())) -} - func TestMsgBlockUser_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgBlockUser.Blocker) require.Equal(t, []sdk.AccAddress{addr}, msgBlockUser.GetSigners()) @@ -326,11 +311,6 @@ func TestMsgUnblockUser_ValidateBasic(t *testing.T) { } } -func TestMsgUnblockUser_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgUnblockUser","value":{"blocked":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","blocker":"cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"}}` - require.Equal(t, expected, string(msgUnblockUser.GetSignBytes())) -} - func TestMsgUnblockUser_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgUnblockUser.Blocker) require.Equal(t, []sdk.AccAddress{addr}, msgUnblockUser.GetSigners()) diff --git a/x/relationships/types/query.pb.go b/x/relationships/types/query.pb.go index d6911b2ee2..e667aae906 100644 --- a/x/relationships/types/query.pb.go +++ b/x/relationships/types/query.pb.go @@ -249,41 +249,41 @@ var fileDescriptor_10005dbd2b21ca8c = []byte{ // 582 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xbf, 0x6f, 0xd3, 0x40, 0x18, 0xf5, 0xa5, 0x21, 0xd0, 0x0b, 0x1d, 0x38, 0x2a, 0xe1, 0x46, 0xc8, 0x09, 0x01, 0xda, 0xa8, - 0xb4, 0x77, 0x4a, 0x2a, 0x18, 0x10, 0x0b, 0x91, 0x00, 0xb1, 0x15, 0x23, 0x18, 0x58, 0xaa, 0x73, - 0x7c, 0x72, 0x2d, 0x12, 0x9f, 0xeb, 0x3b, 0x47, 0x64, 0x65, 0x62, 0x60, 0x40, 0xe2, 0x1f, 0xe8, - 0x82, 0xd4, 0x91, 0x81, 0x95, 0x81, 0xad, 0x63, 0x05, 0x0b, 0x13, 0x42, 0x09, 0x12, 0x6c, 0xec, - 0x4c, 0x28, 0x77, 0x17, 0x35, 0x46, 0x98, 0x04, 0x09, 0x96, 0xc8, 0x3f, 0xde, 0x7b, 0x7e, 0xef, - 0x7b, 0x5f, 0x0e, 0x5e, 0xf4, 0x99, 0xe8, 0x71, 0x41, 0x12, 0xd6, 0xa5, 0x32, 0xe4, 0x91, 0xd8, - 0x0d, 0x63, 0x41, 0xfa, 0x4d, 0xb2, 0x97, 0xb2, 0x64, 0x80, 0xe3, 0x84, 0x4b, 0x8e, 0xce, 0x69, - 0x10, 0xce, 0x80, 0x70, 0xbf, 0x59, 0x39, 0x43, 0x7b, 0x61, 0xc4, 0x89, 0xfa, 0xd5, 0xd8, 0xca, - 0x72, 0xc0, 0x03, 0xae, 0x2e, 0xc9, 0xf8, 0xca, 0x3c, 0x3d, 0x1f, 0x70, 0x1e, 0x74, 0x19, 0xa1, - 0x71, 0x48, 0x68, 0x14, 0x71, 0xa9, 0x75, 0xcc, 0xdb, 0x95, 0x0e, 0x1f, 0xeb, 0xef, 0x68, 0x9a, - 0xbe, 0x31, 0xaf, 0xd6, 0xf5, 0x1d, 0xf1, 0xa8, 0x60, 0xda, 0x13, 0xe9, 0x37, 0x3d, 0x26, 0x69, - 0x93, 0xc4, 0x34, 0x08, 0x23, 0xa5, 0x63, 0xb0, 0x97, 0xf2, 0xb2, 0xf4, 0xb8, 0xcf, 0xba, 0x46, - 0xb1, 0xfe, 0x03, 0xc0, 0x95, 0x7b, 0x63, 0x21, 0x77, 0x1a, 0xe6, 0xb2, 0xbd, 0x94, 0x09, 0x89, - 0xaa, 0xb0, 0x2c, 0x52, 0x4f, 0xc4, 0xb4, 0xc3, 0x76, 0x42, 0xdf, 0x06, 0x35, 0xd0, 0x28, 0xba, - 0x70, 0xf2, 0xe8, 0xae, 0x8f, 0x36, 0x60, 0x31, 0x15, 0x2c, 0xb1, 0x0b, 0x35, 0xd0, 0x58, 0x6c, - 0xdb, 0xef, 0xdf, 0x6c, 0x2e, 0x1b, 0xc3, 0x37, 0x7d, 0x3f, 0x61, 0x42, 0xdc, 0x97, 0x49, 0x18, - 0x05, 0xae, 0x42, 0xa1, 0x1b, 0xf0, 0x74, 0x87, 0xa7, 0x91, 0x64, 0x49, 0x4c, 0x13, 0x39, 0xb0, - 0x17, 0x66, 0xb0, 0x32, 0x68, 0x74, 0x1b, 0xc2, 0xe3, 0x90, 0x76, 0xb1, 0x06, 0x1a, 0xe5, 0xd6, - 0x2a, 0x36, 0xc4, 0xf1, 0x44, 0xb0, 0x6e, 0xc9, 0x4c, 0x04, 0x6f, 0xd3, 0x80, 0x99, 0x20, 0xee, - 0x14, 0xf3, 0xfa, 0xa9, 0x67, 0xfb, 0x55, 0xeb, 0xdb, 0x7e, 0xd5, 0xaa, 0xbf, 0x05, 0xb0, 0xf2, - 0xbb, 0xf0, 0x22, 0xe6, 0x91, 0x60, 0xe8, 0x21, 0x5c, 0xca, 0x0c, 0xcf, 0x06, 0xb5, 0x85, 0x46, - 0xb9, 0x75, 0x19, 0xe7, 0x2c, 0x00, 0x9e, 0x96, 0x69, 0x2f, 0x1e, 0x7e, 0xaa, 0x5a, 0x07, 0x5f, - 0x5f, 0xaf, 0x03, 0x37, 0x2b, 0x83, 0xee, 0x64, 0x82, 0x14, 0x54, 0x90, 0xb5, 0x99, 0x41, 0xb4, - 0xa9, 0xe9, 0x24, 0xf5, 0xef, 0x00, 0x22, 0xe5, 0xbf, 0xdd, 0xe5, 0x9d, 0xc7, 0xf3, 0xb7, 0xd6, - 0x82, 0x27, 0xbd, 0x31, 0x63, 0x8e, 0xe2, 0x26, 0xc0, 0x63, 0x8e, 0x3f, 0xb3, 0xb6, 0x09, 0xf0, - 0x3f, 0x34, 0xf6, 0x0a, 0xc0, 0xb3, 0x99, 0xc4, 0xa6, 0xaa, 0x5b, 0xb0, 0xa4, 0x3e, 0x3a, 0xe9, - 0xa8, 0x9e, 0xdb, 0xd1, 0x03, 0xc1, 0x12, 0x45, 0x9e, 0x2e, 0xc8, 0x90, 0xff, 0x59, 0x33, 0xad, - 0x77, 0x05, 0x78, 0x42, 0xf9, 0x44, 0x07, 0x00, 0x2e, 0x65, 0xd6, 0x0b, 0xb5, 0x72, 0xbd, 0xe5, - 0xfe, 0x11, 0x2b, 0x5b, 0x7f, 0xc5, 0xd1, 0x86, 0xea, 0xf8, 0xe9, 0x87, 0x2f, 0x2f, 0x0b, 0x0d, - 0xb4, 0x4a, 0xf2, 0x8e, 0x82, 0xec, 0x5e, 0x3e, 0x07, 0xb0, 0xa4, 0xe7, 0x8a, 0xae, 0xfc, 0xf9, - 0x7b, 0x99, 0x7d, 0xab, 0x6c, 0xcc, 0x07, 0x36, 0xae, 0xd6, 0x94, 0xab, 0x0b, 0xa8, 0x9a, 0xeb, - 0x4a, 0x97, 0xd1, 0xde, 0x3e, 0x1c, 0x3a, 0xe0, 0x68, 0xe8, 0x80, 0xcf, 0x43, 0x07, 0xbc, 0x18, - 0x39, 0xd6, 0xd1, 0xc8, 0xb1, 0x3e, 0x8e, 0x1c, 0xeb, 0xd1, 0xb5, 0x20, 0x94, 0xbb, 0xa9, 0x87, - 0x3b, 0xbc, 0x67, 0x44, 0x36, 0xbb, 0xd4, 0x13, 0x13, 0xc1, 0xfe, 0x55, 0xf2, 0xe4, 0x17, 0x55, - 0x39, 0x88, 0x99, 0xf0, 0x4a, 0xea, 0xcc, 0xdb, 0xfa, 0x19, 0x00, 0x00, 0xff, 0xff, 0x55, 0x09, - 0x38, 0x42, 0xe7, 0x05, 0x00, 0x00, + 0xb4, 0x77, 0x4a, 0x2a, 0x75, 0x40, 0x2c, 0x44, 0x02, 0xc4, 0x56, 0x8c, 0x60, 0x60, 0xa9, 0xce, + 0xf1, 0xc9, 0xb5, 0x48, 0x7c, 0xae, 0xef, 0x1c, 0x91, 0x95, 0x89, 0x81, 0x01, 0x89, 0x7f, 0xa0, + 0x0b, 0x52, 0x47, 0x06, 0x56, 0x06, 0xb6, 0x8e, 0x15, 0x2c, 0x4c, 0x08, 0x25, 0x48, 0xb0, 0xb1, + 0x33, 0xa1, 0xdc, 0x5d, 0xd4, 0x18, 0x61, 0x12, 0x24, 0x58, 0x22, 0xff, 0x78, 0xef, 0xf9, 0xbd, + 0xef, 0x7d, 0x39, 0x78, 0xd9, 0x67, 0xa2, 0xc7, 0x05, 0x49, 0x58, 0x97, 0xca, 0x90, 0x47, 0x62, + 0x2f, 0x8c, 0x05, 0xe9, 0x37, 0xc9, 0x7e, 0xca, 0x92, 0x01, 0x8e, 0x13, 0x2e, 0x39, 0xba, 0xa0, + 0x41, 0x38, 0x03, 0xc2, 0xfd, 0x66, 0xe5, 0x1c, 0xed, 0x85, 0x11, 0x27, 0xea, 0x57, 0x63, 0x2b, + 0xcb, 0x01, 0x0f, 0xb8, 0xba, 0x24, 0xe3, 0x2b, 0xf3, 0xf4, 0x62, 0xc0, 0x79, 0xd0, 0x65, 0x84, + 0xc6, 0x21, 0xa1, 0x51, 0xc4, 0xa5, 0xd6, 0x31, 0x6f, 0x57, 0x3a, 0x7c, 0xac, 0xbf, 0xab, 0x69, + 0xfa, 0xc6, 0xbc, 0x5a, 0xd7, 0x77, 0xc4, 0xa3, 0x82, 0x69, 0x4f, 0xa4, 0xdf, 0xf4, 0x98, 0xa4, + 0x4d, 0x12, 0xd3, 0x20, 0x8c, 0x94, 0x8e, 0xc1, 0x5e, 0xc9, 0xcb, 0xd2, 0xe3, 0x3e, 0xeb, 0x1a, + 0xc5, 0xfa, 0x0f, 0x00, 0x57, 0xee, 0x8d, 0x85, 0xdc, 0x69, 0x98, 0xcb, 0xf6, 0x53, 0x26, 0x24, + 0xaa, 0xc2, 0xb2, 0x48, 0x3d, 0x11, 0xd3, 0x0e, 0xdb, 0x0d, 0x7d, 0x1b, 0xd4, 0x40, 0xa3, 0xe8, + 0xc2, 0xc9, 0xa3, 0xbb, 0x3e, 0xda, 0x80, 0xc5, 0x54, 0xb0, 0xc4, 0x2e, 0xd4, 0x40, 0x63, 0xb1, + 0x6d, 0xbf, 0x7f, 0xb3, 0xb9, 0x6c, 0x0c, 0xdf, 0xf4, 0xfd, 0x84, 0x09, 0x71, 0x5f, 0x26, 0x61, + 0x14, 0xb8, 0x0a, 0x85, 0x6e, 0xc0, 0xb3, 0x1d, 0x9e, 0x46, 0x92, 0x25, 0x31, 0x4d, 0xe4, 0xc0, + 0x5e, 0x98, 0xc1, 0xca, 0xa0, 0xd1, 0x6d, 0x08, 0x4f, 0x42, 0xda, 0xc5, 0x1a, 0x68, 0x94, 0x5b, + 0xab, 0xd8, 0x10, 0xc7, 0x13, 0xc1, 0xba, 0x25, 0x33, 0x11, 0xbc, 0x43, 0x03, 0x66, 0x82, 0xb8, + 0x53, 0xcc, 0xeb, 0x67, 0x9e, 0x1d, 0x54, 0xad, 0x6f, 0x07, 0x55, 0xab, 0xfe, 0x16, 0xc0, 0xca, + 0xef, 0xc2, 0x8b, 0x98, 0x47, 0x82, 0xa1, 0x87, 0x70, 0x29, 0x33, 0x3c, 0x1b, 0xd4, 0x16, 0x1a, + 0xe5, 0xd6, 0x55, 0x9c, 0xb3, 0x00, 0x78, 0x5a, 0xa6, 0xbd, 0x78, 0xf4, 0xa9, 0x6a, 0x1d, 0x7e, + 0x7d, 0xbd, 0x0e, 0xdc, 0xac, 0x0c, 0xba, 0x93, 0x09, 0x52, 0x50, 0x41, 0xd6, 0x66, 0x06, 0xd1, + 0xa6, 0xa6, 0x93, 0xd4, 0xbf, 0x03, 0x88, 0x94, 0xff, 0x76, 0x97, 0x77, 0x1e, 0xcf, 0xdf, 0x5a, + 0x0b, 0x9e, 0xf6, 0xc6, 0x8c, 0x39, 0x8a, 0x9b, 0x00, 0x4f, 0x38, 0xfe, 0xcc, 0xda, 0x26, 0xc0, + 0xff, 0xd0, 0xd8, 0x2b, 0x00, 0xcf, 0x67, 0x12, 0x9b, 0xaa, 0x6e, 0xc1, 0x92, 0xfa, 0xe8, 0xa4, + 0xa3, 0x7a, 0x6e, 0x47, 0x0f, 0x04, 0x4b, 0x14, 0x79, 0xba, 0x20, 0x43, 0xfe, 0x67, 0xcd, 0xb4, + 0xde, 0x15, 0xe0, 0x29, 0xe5, 0x13, 0x1d, 0x02, 0xb8, 0x94, 0x59, 0x2f, 0xd4, 0xca, 0xf5, 0x96, + 0xfb, 0x47, 0xac, 0x6c, 0xfd, 0x15, 0x47, 0x1b, 0xaa, 0xe3, 0xa7, 0x1f, 0xbe, 0xbc, 0x2c, 0x34, + 0xd0, 0x2a, 0xc9, 0x3b, 0x0a, 0xb2, 0x7b, 0xf9, 0x1c, 0xc0, 0x92, 0x9e, 0x2b, 0xba, 0xf6, 0xe7, + 0xef, 0x65, 0xf6, 0xad, 0xb2, 0x31, 0x1f, 0xd8, 0xb8, 0x5a, 0x53, 0xae, 0x2e, 0xa1, 0x6a, 0xae, + 0x2b, 0x5d, 0x46, 0x7b, 0xe7, 0x68, 0xe8, 0x80, 0xe3, 0xa1, 0x03, 0x3e, 0x0f, 0x1d, 0xf0, 0x62, + 0xe4, 0x58, 0xc7, 0x23, 0xc7, 0xfa, 0x38, 0x72, 0xac, 0x47, 0xdb, 0x41, 0x28, 0xf7, 0x52, 0x0f, + 0x77, 0x78, 0xcf, 0x88, 0x6c, 0x76, 0xa9, 0x27, 0x26, 0x82, 0xfd, 0x6d, 0xf2, 0xe4, 0x17, 0x55, + 0x39, 0x88, 0x99, 0xf0, 0x4a, 0xea, 0xcc, 0xdb, 0xfa, 0x19, 0x00, 0x00, 0xff, 0xff, 0x26, 0x30, + 0x10, 0x51, 0xe7, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/relationships/wasm/common_test.go b/x/relationships/wasm/common_test.go index 421f8234b4..6de0b7f386 100644 --- a/x/relationships/wasm/common_test.go +++ b/x/relationships/wasm/common_test.go @@ -4,11 +4,12 @@ import ( "encoding/json" "testing" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + db "github.com/cosmos/cosmos-db" "github.com/stretchr/testify/suite" "github.com/desmos-labs/desmos/v6/app" @@ -72,13 +73,13 @@ type TestSuite struct { func (suite *TestSuite) SetupTest() { // Define the store keys - keys := sdk.NewKVStoreKeys(types.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/relationships/wasm/querier.go b/x/relationships/wasm/querier.go index 9b9e3e57fb..adec1895e8 100644 --- a/x/relationships/wasm/querier.go +++ b/x/relationships/wasm/querier.go @@ -49,7 +49,7 @@ func (querier RelationshipsWasmQuerier) handleRelationshipsRequest(ctx sdk.Conte if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.relationshipsKeeper.Relationships(sdk.WrapSDKContext(ctx), &req) + res, err := querier.relationshipsKeeper.Relationships(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -66,7 +66,7 @@ func (querier RelationshipsWasmQuerier) handleBlocksRequest(ctx sdk.Context, req if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.relationshipsKeeper.Blocks(sdk.WrapSDKContext(ctx), &req) + res, err := querier.relationshipsKeeper.Blocks(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } diff --git a/x/reports/client/cli/cli_test.go b/x/reports/client/cli/cli_test.go index cbf5abc213..1155cf65ae 100644 --- a/x/reports/client/cli/cli_test.go +++ b/x/reports/client/cli/cli_test.go @@ -8,6 +8,7 @@ import ( "testing" "time" + "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" @@ -520,7 +521,7 @@ func (s *IntegrationTestSuite) TestCmdCreateReport() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: true, }, @@ -533,7 +534,7 @@ func (s *IntegrationTestSuite) TestCmdCreateReport() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -547,7 +548,7 @@ func (s *IntegrationTestSuite) TestCmdCreateReport() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -600,7 +601,7 @@ func (s *IntegrationTestSuite) TestCmdDeleteReport() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -653,7 +654,7 @@ func (s *IntegrationTestSuite) TestCmdSupportStandardReason() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -706,7 +707,7 @@ func (s *IntegrationTestSuite) TGetCmdAddReason() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, diff --git a/x/reports/keeper/alias_functions.go b/x/reports/keeper/alias_functions.go index 70d5496c83..226abdec35 100644 --- a/x/reports/keeper/alias_functions.go +++ b/x/reports/keeper/alias_functions.go @@ -5,6 +5,7 @@ import ( poststypes "github.com/desmos-labs/desmos/v6/x/posts/types" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/reports/types" @@ -61,7 +62,7 @@ func (k Keeper) GetStandardReason(ctx sdk.Context, id uint32) (reason types.Stan // IterateReasons iterates over all the stored reasons and performs the provided function func (k Keeper) IterateReasons(ctx sdk.Context, fn func(reason types.Reason) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.ReasonPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.ReasonPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -78,7 +79,7 @@ func (k Keeper) IterateReasons(ctx sdk.Context, fn func(reason types.Reason) (st // IterateSubspaceReasons iterates over all the given subspace reasons and performs the provided function func (k Keeper) IterateSubspaceReasons(ctx sdk.Context, subspaceID uint64, fn func(reason types.Reason) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspaceReasonsPrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspaceReasonsPrefix(subspaceID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -107,7 +108,7 @@ func (k Keeper) GetSubspaceReasons(ctx sdk.Context, subspaceID uint64) []types.R // IterateReports iterates over all reports and performs the provided function func (k Keeper) IterateReports(ctx sdk.Context, fn func(report types.Report) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.ReportPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.ReportPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -124,7 +125,7 @@ func (k Keeper) IterateReports(ctx sdk.Context, fn func(report types.Report) (st // IterateSubspaceReports iterates over all the given subspace reports and performs the provided function func (k Keeper) IterateSubspaceReports(ctx sdk.Context, subspaceID uint64, fn func(report types.Report) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspaceReportsPrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspaceReportsPrefix(subspaceID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -151,7 +152,7 @@ func (k Keeper) GetSubspaceReports(ctx sdk.Context, subspaceID uint64) []types.R // IteratePostReports iterates over all the reports for the given post and performs the provided function func (k Keeper) IteratePostReports(ctx sdk.Context, subspaceID uint64, postID uint64, fn func(report types.Report) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.PostReportsPrefix(subspaceID, postID)) + iterator := storetypes.KVStorePrefixIterator(store, types.PostReportsPrefix(subspaceID, postID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { diff --git a/x/reports/keeper/common_test.go b/x/reports/keeper/common_test.go index 45cacd3332..b22eaed3cc 100644 --- a/x/reports/keeper/common_test.go +++ b/x/reports/keeper/common_test.go @@ -6,12 +6,13 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/golang/mock/gomock" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" @@ -39,12 +40,12 @@ type KeeperTestSuite struct { func (suite *KeeperTestSuite) SetupTest() { // Define store keys - keys := sdk.NewMemoryStoreKeys(types.StoreKey) + keys := storetypes.NewMemoryStoreKeys(types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/reports/keeper/grpc_query.go b/x/reports/keeper/grpc_query.go index 563760ed8b..e8fa2c2fc5 100644 --- a/x/reports/keeper/grpc_query.go +++ b/x/reports/keeper/grpc_query.go @@ -6,7 +6,7 @@ import ( "fmt" "cosmossdk.io/errors" - "github.com/cosmos/cosmos-sdk/store/prefix" + "cosmossdk.io/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/x/reports/keeper/grpc_query_test.go b/x/reports/keeper/grpc_query_test.go index f8f04b921a..dd4525d34f 100644 --- a/x/reports/keeper/grpc_query_test.go +++ b/x/reports/keeper/grpc_query_test.go @@ -248,7 +248,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Reports() { tc.store(ctx) } - res, err := suite.k.Reports(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Reports(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -317,7 +317,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Report() { tc.store(ctx) } - res, err := suite.k.Report(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Report(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -411,7 +411,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Reasons() { tc.store(ctx) } - res, err := suite.k.Reasons(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Reasons(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -474,7 +474,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Reason() { tc.store(ctx) } - res, err := suite.k.Reason(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Reason(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -525,7 +525,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Params() { tc.store(ctx) } - res, err := suite.k.Params(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Params(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { diff --git a/x/reports/keeper/keeper.go b/x/reports/keeper/keeper.go index a1327287c7..e7b16b480d 100644 --- a/x/reports/keeper/keeper.go +++ b/x/reports/keeper/keeper.go @@ -1,9 +1,9 @@ package keeper import ( - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/reports/types" diff --git a/x/reports/keeper/msg_server_test.go b/x/reports/keeper/msg_server_test.go index df6c8d8d8a..e419246bd1 100644 --- a/x/reports/keeper/msg_server_test.go +++ b/x/reports/keeper/msg_server_test.go @@ -412,7 +412,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CreateReport() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.CreateReport(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.CreateReport(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -653,7 +653,7 @@ func (suite *KeeperTestSuite) TestMsgServer_DeleteReport() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.DeleteReport(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.DeleteReport(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -824,7 +824,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SupportStandardReason() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.SupportStandardReason(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.SupportStandardReason(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1001,7 +1001,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AddReason() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.AddReason(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.AddReason(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1135,7 +1135,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RemoveReason() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.RemoveReason(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.RemoveReason(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1186,7 +1186,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateParams() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.UpdateParams(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.UpdateParams(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) diff --git a/x/reports/legacy/v2/store.go b/x/reports/legacy/v2/store.go index 128e833c02..998d741c70 100644 --- a/x/reports/legacy/v2/store.go +++ b/x/reports/legacy/v2/store.go @@ -1,7 +1,7 @@ package v2 import ( - storetypes "github.com/cosmos/cosmos-sdk/store/types" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/reports/types" diff --git a/x/reports/legacy/v2/store_test.go b/x/reports/legacy/v2/store_test.go index b70c977c86..da362577da 100644 --- a/x/reports/legacy/v2/store_test.go +++ b/x/reports/legacy/v2/store_test.go @@ -4,9 +4,10 @@ import ( "testing" "time" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -37,9 +38,9 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(paramstypes.StoreKey, subspacestypes.StoreKey, types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) paramsSubspace := newMockSubspace(types.Params{}) diff --git a/x/reports/legacy/v3/store.go b/x/reports/legacy/v3/store.go index 06a3764dde..53722ac4f4 100644 --- a/x/reports/legacy/v3/store.go +++ b/x/reports/legacy/v3/store.go @@ -1,8 +1,8 @@ package v3 import ( + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/reports/types" diff --git a/x/reports/legacy/v3/store_test.go b/x/reports/legacy/v3/store_test.go index 9e04e47137..2e5265098d 100644 --- a/x/reports/legacy/v3/store_test.go +++ b/x/reports/legacy/v3/store_test.go @@ -3,6 +3,7 @@ package v3_test import ( "testing" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" @@ -34,7 +35,7 @@ func (ms mockSubspace) SetParamSet(ctx sdk.Context, ps paramstypes.ParamSet) { func TestMigrate(t *testing.T) { cdc, _ := app.MakeCodecs() - keys := sdk.NewKVStoreKeys(types.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) testCases := []struct { name string diff --git a/x/reports/module.go b/x/reports/module.go index c4024674ac..1743f24074 100644 --- a/x/reports/module.go +++ b/x/reports/module.go @@ -8,11 +8,11 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/depinject" + storetypes "cosmossdk.io/store/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -49,7 +49,6 @@ var ( _ module.AppModuleBasic = AppModuleBasic{} _ module.AppModuleSimulation = AppModule{} _ appmodule.AppModule = AppModule{} - _ depinject.OnePerModuleType = AppModule{} ) // AppModuleBasic defines the basic application module used by the reports module. @@ -185,16 +184,6 @@ func (AppModule) ConsensusVersion() uint64 { return consensusVersion } -// BeginBlock returns the begin blocker for the reports module. -func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) { -} - -// EndBlock returns the end blocker for the reports module. It returns no validator -// updates. -func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return []abci.ValidatorUpdate{} -} - // -------------------------------------------------------------------------------------------------------------------- // AppModuleSimulation defines the module simulation functions used by the reports module. @@ -211,7 +200,7 @@ func (AppModule) ProposalMsgs(simState module.SimulationState) []simtypes.Weight } // RegisterStoreDecoder performs a no-op. -func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { +func (am AppModule) RegisterStoreDecoder(sdr simtypes.StoreDecoderRegistry) { sdr[types.ModuleName] = simulation.NewDecodeStore(am.cdc) } diff --git a/x/reports/simulation/operations.go b/x/reports/simulation/operations.go index d83981692b..7f559734b9 100644 --- a/x/reports/simulation/operations.go +++ b/x/reports/simulation/operations.go @@ -37,35 +37,35 @@ func WeightedOperations( ) sim.WeightedOperations { var weightMsgCreateReport int - appParams.GetOrGenerate(cdc, OpWeightMsgCreateReport, &weightMsgCreateReport, nil, + appParams.GetOrGenerate(OpWeightMsgCreateReport, &weightMsgCreateReport, nil, func(_ *rand.Rand) { weightMsgCreateReport = params.DefaultWeightMsgCreateReport }, ) var weightMsgDeleteReport int - appParams.GetOrGenerate(cdc, OpWeightMsgDeleteReport, &weightMsgDeleteReport, nil, + appParams.GetOrGenerate(OpWeightMsgDeleteReport, &weightMsgDeleteReport, nil, func(_ *rand.Rand) { weightMsgDeleteReport = params.DefaultWeightMsgDeleteReport }, ) var weightMsgSupportStandardReason int - appParams.GetOrGenerate(cdc, OpWeightMsgSupportStandardReason, &weightMsgSupportStandardReason, nil, + appParams.GetOrGenerate(OpWeightMsgSupportStandardReason, &weightMsgSupportStandardReason, nil, func(_ *rand.Rand) { weightMsgSupportStandardReason = params.DefaultWeightMsgSupportStandardReason }, ) var weightMsgAddReason int - appParams.GetOrGenerate(cdc, OpWeightMsgAddReason, &weightMsgAddReason, nil, + appParams.GetOrGenerate(OpWeightMsgAddReason, &weightMsgAddReason, nil, func(_ *rand.Rand) { weightMsgAddReason = params.DefaultWeightMsgAddReason }, ) var weightMsgRemoveReason int - appParams.GetOrGenerate(cdc, OpWeightMsgRemoveReason, &weightMsgRemoveReason, nil, + appParams.GetOrGenerate(OpWeightMsgRemoveReason, &weightMsgRemoveReason, nil, func(_ *rand.Rand) { weightMsgRemoveReason = params.DefaultWeightMsgRemoveReason }, diff --git a/x/reports/types/codec.go b/x/reports/types/codec.go index a5f31da98f..2bc4499fd3 100644 --- a/x/reports/types/codec.go +++ b/x/reports/types/codec.go @@ -4,11 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" "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" - authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" - govcodec "github.com/cosmos/cosmos-sdk/x/gov/codec" ) func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { @@ -45,29 +42,3 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } - -var ( - amino = codec.NewLegacyAmino() - - // AminoCdc references the global x/reports module codec. Note, the codec should - // ONLY be used in certain instances of tests and for JSON encoding as Amino is - // still used for that purpose. - // - // The actual codec used for serialization should be provided to x/reports and - // defined at the application level. - AminoCdc = codec.NewAminoCodec(amino) -) - -func init() { - RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) - sdk.RegisterLegacyAminoCodec(amino) - - // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be - // used to properly serialize MsgGrant and MsgExec instances - RegisterLegacyAminoCodec(authzcodec.Amino) - - // Register all Amino interfaces and concrete types on the gov Amino codec so that this can later be - // used to properly serialize MsgSubmitProposal instances - RegisterLegacyAminoCodec(govcodec.Amino) -} diff --git a/x/reports/types/genesis.pb.go b/x/reports/types/genesis.pb.go index 52033135ef..7aef9c01f5 100644 --- a/x/reports/types/genesis.pb.go +++ b/x/reports/types/genesis.pb.go @@ -140,29 +140,29 @@ var fileDescriptor_e4c495c10dc36e45 = []byte{ // 396 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x3f, 0x6b, 0xdb, 0x40, 0x18, 0xc6, 0x75, 0xb6, 0x71, 0xed, 0xf3, 0x1f, 0xb0, 0xe8, 0xa0, 0x7a, 0x90, 0x84, 0xe9, 0xe0, - 0x16, 0xaa, 0xab, 0x5b, 0xba, 0x94, 0xd2, 0x41, 0x38, 0x04, 0x67, 0x0a, 0x32, 0x64, 0xc8, 0x62, - 0x4e, 0xd6, 0xa1, 0x08, 0x2c, 0x9d, 0xd0, 0x9d, 0x4d, 0xfc, 0x0d, 0x32, 0x66, 0xce, 0x94, 0x31, - 0x64, 0xca, 0xc7, 0xf0, 0xe8, 0x31, 0x93, 0x09, 0xf2, 0x90, 0xaf, 0x11, 0x74, 0x27, 0x19, 0x13, - 0x27, 0x59, 0xc4, 0xc3, 0xbd, 0xbf, 0xe7, 0xd1, 0xfb, 0xc0, 0x0b, 0x0d, 0x8f, 0xb0, 0x90, 0x32, - 0x94, 0x90, 0x98, 0x26, 0x9c, 0xa1, 0xc5, 0x00, 0xf9, 0x24, 0x22, 0x2c, 0x60, 0x56, 0x9c, 0x50, - 0x4e, 0xd5, 0x8e, 0x04, 0xac, 0x1c, 0xb0, 0x16, 0x83, 0x6e, 0x07, 0x87, 0x41, 0x44, 0x91, 0xf8, - 0x4a, 0xaa, 0xfb, 0xd9, 0xa7, 0x3e, 0x15, 0x12, 0x65, 0x2a, 0x7f, 0xd5, 0x0f, 0xc3, 0x43, 0xea, - 0x91, 0x59, 0x9e, 0xdd, 0xbb, 0x2f, 0xc1, 0xe6, 0xb1, 0xfc, 0xdb, 0x98, 0x63, 0x4e, 0xd4, 0x33, - 0xd8, 0x66, 0x73, 0x97, 0xc5, 0x78, 0x4a, 0xd8, 0xc4, 0xc3, 0x1c, 0x6b, 0xc0, 0x2c, 0xf7, 0x1b, - 0xbf, 0xbe, 0x5a, 0x07, 0x5b, 0x58, 0xe3, 0x1c, 0x1c, 0x62, 0x8e, 0x8f, 0x22, 0x9e, 0x2c, 0xed, - 0xfa, 0x6a, 0x63, 0x28, 0x77, 0xcf, 0x0f, 0xdf, 0x81, 0xd3, 0xda, 0xc5, 0x64, 0x63, 0xf5, 0x3f, - 0xfc, 0x94, 0x10, 0xcc, 0x68, 0xc4, 0xb4, 0x92, 0x08, 0xfc, 0xf2, 0x46, 0xa0, 0x23, 0x88, 0xfd, - 0x94, 0xc2, 0x24, 0xfd, 0x02, 0xd4, 0xca, 0x1f, 0xf8, 0x33, 0xf9, 0xca, 0x2f, 0xa6, 0xea, 0x3f, - 0x58, 0x8d, 0x71, 0x82, 0x43, 0xa6, 0x55, 0x4c, 0xf0, 0x8e, 0xfd, 0x54, 0x00, 0xfb, 0xf6, 0xdc, - 0xf3, 0xb7, 0x72, 0x75, 0x6b, 0x28, 0xbd, 0x1b, 0x00, 0x3b, 0x07, 0x9d, 0x55, 0x04, 0x1b, 0x45, - 0xd5, 0x49, 0xe0, 0x69, 0xc0, 0x04, 0xfd, 0x8a, 0xdd, 0x4e, 0x37, 0x06, 0x2c, 0xd8, 0xd1, 0xd0, - 0x81, 0x05, 0x32, 0xf2, 0xd4, 0x6f, 0xb0, 0x2e, 0x5b, 0x65, 0x78, 0xc9, 0x04, 0xfd, 0x96, 0xdd, - 0x4c, 0x37, 0x46, 0x4d, 0xb6, 0x1f, 0x0d, 0x9d, 0x9a, 0x1c, 0x17, 0x68, 0xb6, 0x5f, 0x86, 0x96, - 0x45, 0x72, 0x8e, 0x66, 0x8f, 0x12, 0x15, 0xca, 0xb3, 0x4f, 0x56, 0xa9, 0x0e, 0xd6, 0xa9, 0x0e, - 0x9e, 0x52, 0x1d, 0x5c, 0x6f, 0x75, 0x65, 0xbd, 0xd5, 0x95, 0xc7, 0xad, 0xae, 0x9c, 0xff, 0xf4, - 0x03, 0x7e, 0x31, 0x77, 0xad, 0x29, 0x0d, 0x91, 0x2c, 0xfd, 0x63, 0x86, 0x5d, 0x96, 0x6b, 0xb4, - 0xf8, 0x83, 0x2e, 0x77, 0xf7, 0xc1, 0x97, 0x31, 0x61, 0x6e, 0x55, 0x1c, 0xc7, 0xef, 0x97, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x8d, 0xe1, 0x8d, 0x61, 0x9b, 0x02, 0x00, 0x00, + 0x16, 0xaa, 0xab, 0x5b, 0xe8, 0x50, 0x4a, 0x07, 0xe1, 0x10, 0x9c, 0x29, 0xc8, 0x90, 0x21, 0x8b, + 0x39, 0x59, 0x87, 0x22, 0xb0, 0x74, 0x42, 0x77, 0x36, 0xf1, 0x37, 0xc8, 0x98, 0x39, 0x53, 0xc6, + 0x90, 0x29, 0x1f, 0xc3, 0xa3, 0xc7, 0x4c, 0x26, 0xc8, 0x43, 0xbe, 0x46, 0xd0, 0x9d, 0x64, 0x4c, + 0x9c, 0x64, 0x11, 0x0f, 0xf7, 0xfe, 0x9e, 0x47, 0xef, 0x03, 0x2f, 0x34, 0x3c, 0xc2, 0x42, 0xca, + 0x50, 0x42, 0x62, 0x9a, 0x70, 0x86, 0x16, 0x03, 0xe4, 0x93, 0x88, 0xb0, 0x80, 0x59, 0x71, 0x42, + 0x39, 0x55, 0x3b, 0x12, 0xb0, 0x72, 0xc0, 0x5a, 0x0c, 0xba, 0x1d, 0x1c, 0x06, 0x11, 0x45, 0xe2, + 0x2b, 0xa9, 0xee, 0x67, 0x9f, 0xfa, 0x54, 0x48, 0x94, 0xa9, 0xfc, 0x55, 0x3f, 0x0c, 0x0f, 0xa9, + 0x47, 0x66, 0x79, 0x76, 0xef, 0xbe, 0x04, 0x9b, 0xc7, 0xf2, 0x6f, 0x63, 0x8e, 0x39, 0x51, 0xcf, + 0x60, 0x9b, 0xcd, 0x5d, 0x16, 0xe3, 0x29, 0x61, 0x13, 0x0f, 0x73, 0xac, 0x01, 0xb3, 0xdc, 0x6f, + 0xfc, 0xfa, 0x6a, 0x1d, 0x6c, 0x61, 0x8d, 0x73, 0x70, 0x88, 0x39, 0x3e, 0x8a, 0x78, 0xb2, 0xb4, + 0xeb, 0xab, 0x8d, 0xa1, 0xdc, 0x3d, 0x3f, 0x7c, 0x07, 0x4e, 0x6b, 0x17, 0x93, 0x8d, 0xd5, 0xff, + 0xf0, 0x53, 0x42, 0x30, 0xa3, 0x11, 0xd3, 0x4a, 0x22, 0xf0, 0xcb, 0x1b, 0x81, 0x8e, 0x20, 0xf6, + 0x53, 0x0a, 0x93, 0xf4, 0x0b, 0x50, 0x2b, 0x7f, 0xe0, 0xcf, 0xe4, 0x2b, 0xbf, 0x98, 0xaa, 0xff, + 0x60, 0x35, 0xc6, 0x09, 0x0e, 0x99, 0x56, 0x31, 0xc1, 0x3b, 0xf6, 0x53, 0x01, 0xec, 0xdb, 0x73, + 0xcf, 0xdf, 0xca, 0xd5, 0xad, 0xa1, 0xf4, 0x6e, 0x00, 0xec, 0x1c, 0x74, 0x56, 0x11, 0x6c, 0x14, + 0x55, 0x27, 0x81, 0xa7, 0x01, 0x13, 0xf4, 0x2b, 0x76, 0x3b, 0xdd, 0x18, 0xb0, 0x60, 0x47, 0x43, + 0x07, 0x16, 0xc8, 0xc8, 0x53, 0xbf, 0xc1, 0xba, 0x6c, 0x95, 0xe1, 0x25, 0x13, 0xf4, 0x5b, 0x76, + 0x33, 0xdd, 0x18, 0x35, 0xd9, 0x7e, 0x34, 0x74, 0x6a, 0x72, 0x5c, 0xa0, 0xd9, 0x7e, 0x19, 0x5a, + 0x16, 0xc9, 0x39, 0x9a, 0x3d, 0x4a, 0x54, 0x28, 0xcf, 0x3e, 0x59, 0xa5, 0x3a, 0x58, 0xa7, 0x3a, + 0x78, 0x4a, 0x75, 0x70, 0xbd, 0xd5, 0x95, 0xf5, 0x56, 0x57, 0x1e, 0xb7, 0xba, 0x72, 0xfe, 0xd3, + 0x0f, 0xf8, 0xc5, 0xdc, 0xb5, 0xa6, 0x34, 0x44, 0xb2, 0xf4, 0x8f, 0x19, 0x76, 0x59, 0xae, 0xd1, + 0xe2, 0x0f, 0xba, 0xdc, 0xdd, 0x07, 0x5f, 0xc6, 0x84, 0xb9, 0x55, 0x71, 0x1c, 0xbf, 0x5f, 0x02, + 0x00, 0x00, 0xff, 0xff, 0xde, 0x57, 0x60, 0x54, 0x9b, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/reports/types/models.pb.go b/x/reports/types/models.pb.go index 3aa17a656e..e323435315 100644 --- a/x/reports/types/models.pb.go +++ b/x/reports/types/models.pb.go @@ -419,54 +419,54 @@ func init() { func init() { proto.RegisterFile("desmos/reports/v1/models.proto", fileDescriptor_908cff0b05e14c5f) } var fileDescriptor_908cff0b05e14c5f = []byte{ - // 737 bytes of a gzipped FileDescriptorProto + // 738 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x4f, 0xdb, 0x48, 0x14, 0xce, 0x24, 0x21, 0xc0, 0x84, 0xf0, 0xc3, 0x1b, 0x2d, 0x5e, 0xb4, 0xb2, 0xb3, 0x5e, 0x76, - 0x37, 0x4b, 0x8b, 0x5d, 0x40, 0x48, 0x55, 0x7a, 0xc2, 0xa2, 0xaa, 0xc2, 0x09, 0x19, 0x7a, 0xe9, - 0x25, 0x9a, 0x64, 0x06, 0xd7, 0x52, 0x9c, 0x89, 0x66, 0x26, 0xa8, 0xf9, 0x17, 0xaa, 0x1e, 0x38, - 0xf6, 0x48, 0x7b, 0xea, 0x91, 0x03, 0x7f, 0x04, 0xea, 0x09, 0xf5, 0xd4, 0x93, 0x8b, 0xc2, 0x81, - 0x9e, 0xf3, 0x17, 0x54, 0xf6, 0x8c, 0x21, 0x80, 0x50, 0x4b, 0xd5, 0x8b, 0x35, 0xf3, 0xbe, 0xef, - 0xbd, 0x37, 0xf3, 0xbd, 0x6f, 0x0c, 0x0d, 0x4c, 0x78, 0x48, 0xb9, 0xc3, 0x48, 0x97, 0x32, 0xc1, - 0x9d, 0xfd, 0x15, 0x27, 0xa4, 0x98, 0xb4, 0xb9, 0xdd, 0x65, 0x54, 0x50, 0x6d, 0x4e, 0xe2, 0xb6, - 0xc2, 0xed, 0xfd, 0x95, 0x85, 0x39, 0x14, 0x06, 0x1d, 0xea, 0x24, 0x5f, 0xc9, 0x5a, 0x28, 0xfb, - 0xd4, 0xa7, 0xc9, 0xd2, 0x89, 0x57, 0x2a, 0xfa, 0x87, 0x4f, 0xa9, 0xdf, 0x26, 0x4e, 0xb2, 0x6b, - 0xf6, 0xf6, 0x1c, 0xd4, 0xe9, 0x2b, 0xc8, 0xbc, 0x09, 0x89, 0x20, 0x24, 0x5c, 0xa0, 0xb0, 0x9b, - 0xe6, 0xb6, 0x68, 0xdc, 0xb7, 0x21, 0x8b, 0xca, 0x8d, 0x84, 0xac, 0x37, 0x79, 0x58, 0xf0, 0x92, - 0xe3, 0x68, 0x4f, 0x61, 0x91, 0xf7, 0x9a, 0xbc, 0x8b, 0x5a, 0xa4, 0x11, 0x60, 0x1d, 0x54, 0x40, - 0x35, 0xef, 0x2e, 0x0e, 0x22, 0x13, 0xee, 0xa8, 0x70, 0x7d, 0x73, 0x18, 0x99, 0x5a, 0x1f, 0x85, - 0xed, 0x9a, 0x35, 0x42, 0xb5, 0x3c, 0x98, 0xee, 0xea, 0x58, 0xfb, 0x1b, 0x66, 0x03, 0xac, 0x67, - 0x93, 0xec, 0xdf, 0x06, 0x91, 0x99, 0x4d, 0xb2, 0x26, 0x65, 0x56, 0x4c, 0xce, 0x06, 0x58, 0xdb, - 0x82, 0x45, 0x46, 0x10, 0xa7, 0x1d, 0xde, 0x08, 0x30, 0xd7, 0x73, 0x95, 0x5c, 0xb5, 0xe4, 0xfe, - 0x1f, 0xf7, 0xf2, 0x64, 0xb8, 0xbe, 0xc9, 0xaf, 0x7a, 0x8d, 0x50, 0xad, 0x0f, 0x17, 0x47, 0x4b, - 0xc0, 0x83, 0x2a, 0x54, 0xc7, 0x5c, 0x7b, 0x08, 0xc7, 0x43, 0xc2, 0x39, 0xf2, 0x89, 0x9e, 0xaf, - 0x80, 0xea, 0xa4, 0xab, 0x0d, 0x23, 0x73, 0x5a, 0x66, 0x2a, 0xc0, 0xf2, 0x52, 0x8a, 0xf6, 0x0c, - 0x4e, 0x48, 0xf9, 0x09, 0xd3, 0xc7, 0x12, 0xfa, 0x83, 0x61, 0x64, 0xce, 0xa4, 0x8d, 0x24, 0x62, - 0x7d, 0x3a, 0x5e, 0x2e, 0x2b, 0x9d, 0x36, 0x30, 0x66, 0x84, 0xf3, 0x1d, 0xc1, 0x82, 0x8e, 0xef, - 0x5d, 0x26, 0x6b, 0x08, 0x16, 0x04, 0x62, 0x3e, 0x11, 0x7a, 0xa1, 0x02, 0xaa, 0xc5, 0xd5, 0xb2, - 0x2d, 0xc7, 0x60, 0xa7, 0x63, 0xb0, 0x37, 0x3a, 0x7d, 0x77, 0x6d, 0x18, 0x99, 0x25, 0x59, 0x5c, - 0xb2, 0xad, 0x8f, 0xc7, 0xcb, 0xc6, 0x2d, 0x1f, 0xd8, 0x72, 0x06, 0xbb, 0x09, 0xc5, 0x53, 0x85, - 0xb5, 0x3d, 0x58, 0x6a, 0x31, 0x82, 0x44, 0x40, 0x3b, 0x0d, 0x8c, 0x04, 0xd1, 0xc7, 0x93, 0x4e, - 0x0b, 0xb7, 0x3a, 0xed, 0xa6, 0x03, 0x77, 0xff, 0x39, 0x89, 0xcc, 0xcc, 0x30, 0x32, 0xcb, 0xb2, - 0xe7, 0xb5, 0x74, 0xeb, 0xe0, 0x8b, 0x09, 0xa4, 0x7e, 0x53, 0x29, 0xb0, 0x89, 0x04, 0xa9, 0x4d, - 0xbc, 0x3d, 0x34, 0xc1, 0xd7, 0x43, 0x13, 0x58, 0x3d, 0x08, 0x9f, 0x73, 0xc2, 0xe4, 0x39, 0xb4, - 0x27, 0x30, 0xdf, 0xe3, 0x84, 0x25, 0x56, 0x98, 0x74, 0xff, 0x1b, 0x46, 0x66, 0x51, 0x96, 0x8d, - 0xa3, 0x77, 0x6b, 0x94, 0x24, 0xd5, 0x96, 0xd2, 0xa2, 0xdf, 0xbf, 0xb0, 0x45, 0x21, 0xdc, 0xa6, - 0x5c, 0xed, 0xb4, 0x75, 0x38, 0xde, 0xa5, 0x5c, 0x5c, 0x99, 0xf0, 0xcf, 0x41, 0x64, 0x16, 0x62, - 0x42, 0x62, 0x25, 0x35, 0x5a, 0x45, 0xb1, 0xbc, 0x42, 0xbc, 0xaa, 0xe3, 0x7b, 0x35, 0x3c, 0x03, - 0xb1, 0xed, 0x63, 0x0b, 0xfd, 0x7a, 0xdb, 0x97, 0xee, 0xb6, 0xfd, 0xbf, 0x70, 0x4c, 0x04, 0xa2, - 0x4d, 0xf4, 0x5c, 0xa2, 0xe8, 0xec, 0x30, 0x32, 0xa7, 0x94, 0x39, 0xe2, 0xb0, 0xe5, 0x49, 0x58, - 0x7b, 0x0c, 0x8b, 0x98, 0xf0, 0x16, 0x0b, 0xba, 0xf1, 0x8c, 0x94, 0xad, 0x7f, 0xbf, 0x3a, 0xc5, - 0x08, 0x68, 0x79, 0xa3, 0xd4, 0x91, 0x51, 0xbe, 0x07, 0xb0, 0xb0, 0x8d, 0x18, 0x0a, 0xb9, 0xc6, - 0xe0, 0x2c, 0x17, 0xa8, 0x83, 0x11, 0xc3, 0x0d, 0xf5, 0x70, 0x74, 0x50, 0xc9, 0x55, 0x8b, 0xab, - 0x7f, 0xd9, 0xb7, 0x85, 0xda, 0x51, 0x54, 0xa9, 0x8f, 0xbb, 0xa8, 0x1c, 0x35, 0xaf, 0x04, 0xb8, - 0x51, 0x48, 0x3d, 0xc8, 0x19, 0x7e, 0x2d, 0x8b, 0xd7, 0x16, 0xd3, 0x83, 0xbc, 0xbe, 0x38, 0x5a, - 0x9a, 0x57, 0x3f, 0xc6, 0x57, 0x97, 0xbf, 0x46, 0x79, 0x32, 0xeb, 0x1d, 0x80, 0xd3, 0xd7, 0xfb, - 0x29, 0x21, 0xc1, 0x0f, 0x0a, 0x99, 0xbd, 0x97, 0x90, 0xb9, 0x9f, 0x10, 0xd2, 0xdd, 0x3a, 0x19, - 0x18, 0xe0, 0x74, 0x60, 0x80, 0xb3, 0x81, 0x01, 0x0e, 0xce, 0x8d, 0xcc, 0xe9, 0xb9, 0x91, 0xf9, - 0x7c, 0x6e, 0x64, 0x5e, 0x3c, 0xf2, 0x03, 0xf1, 0xb2, 0xd7, 0xb4, 0x5b, 0x34, 0x74, 0xe4, 0x0d, - 0x97, 0xdb, 0xa8, 0xc9, 0xd5, 0xda, 0xd9, 0x5f, 0x1f, 0xb9, 0xb0, 0xe8, 0x77, 0x09, 0x6f, 0x16, - 0x92, 0x27, 0xbb, 0xf6, 0x2d, 0x00, 0x00, 0xff, 0xff, 0xbf, 0x02, 0x11, 0x81, 0x2a, 0x06, 0x00, - 0x00, + 0x37, 0x4b, 0x8b, 0x5d, 0x40, 0xad, 0xaa, 0xf4, 0x84, 0x45, 0x55, 0x85, 0x13, 0x32, 0xf4, 0xd2, + 0x4b, 0x34, 0xc9, 0x0c, 0xae, 0xa5, 0x38, 0x13, 0xcd, 0x4c, 0x50, 0xf3, 0x2f, 0x54, 0x3d, 0x70, + 0xec, 0x91, 0xf6, 0xd4, 0x23, 0x07, 0xfe, 0x08, 0xd4, 0x13, 0xea, 0xa9, 0x27, 0x17, 0x85, 0x03, + 0x3d, 0xe7, 0x2f, 0xa8, 0xec, 0x19, 0x43, 0x00, 0xa1, 0x96, 0xaa, 0x17, 0x6b, 0xe6, 0x7d, 0xdf, + 0x7b, 0x6f, 0xe6, 0x7b, 0xdf, 0x18, 0x1a, 0x98, 0xf0, 0x90, 0x72, 0x87, 0x91, 0x2e, 0x65, 0x82, + 0x3b, 0x7b, 0x2b, 0x4e, 0x48, 0x31, 0x69, 0x73, 0xbb, 0xcb, 0xa8, 0xa0, 0xda, 0x9c, 0xc4, 0x6d, + 0x85, 0xdb, 0x7b, 0x2b, 0x0b, 0x73, 0x28, 0x0c, 0x3a, 0xd4, 0x49, 0xbe, 0x92, 0xb5, 0x50, 0xf6, + 0xa9, 0x4f, 0x93, 0xa5, 0x13, 0xaf, 0x54, 0xf4, 0x0f, 0x9f, 0x52, 0xbf, 0x4d, 0x9c, 0x64, 0xd7, + 0xec, 0xed, 0x3a, 0xa8, 0xd3, 0x57, 0x90, 0x79, 0x1d, 0x12, 0x41, 0x48, 0xb8, 0x40, 0x61, 0x37, + 0xcd, 0x6d, 0xd1, 0xb8, 0x6f, 0x43, 0x16, 0x95, 0x1b, 0x09, 0x59, 0x6f, 0xf2, 0xb0, 0xe0, 0x25, + 0xc7, 0xd1, 0x9e, 0xc2, 0x22, 0xef, 0x35, 0x79, 0x17, 0xb5, 0x48, 0x23, 0xc0, 0x3a, 0xa8, 0x80, + 0x6a, 0xde, 0x5d, 0x1c, 0x44, 0x26, 0xdc, 0x56, 0xe1, 0xfa, 0xc6, 0x30, 0x32, 0xb5, 0x3e, 0x0a, + 0xdb, 0x35, 0x6b, 0x84, 0x6a, 0x79, 0x30, 0xdd, 0xd5, 0xb1, 0xf6, 0x37, 0xcc, 0x06, 0x58, 0xcf, + 0x26, 0xd9, 0xbf, 0x0d, 0x22, 0x33, 0x9b, 0x64, 0x4d, 0xca, 0xac, 0x98, 0x9c, 0x0d, 0xb0, 0xb6, + 0x09, 0x8b, 0x8c, 0x20, 0x4e, 0x3b, 0xbc, 0x11, 0x60, 0xae, 0xe7, 0x2a, 0xb9, 0x6a, 0xc9, 0xfd, + 0x3f, 0xee, 0xe5, 0xc9, 0x70, 0x7d, 0x83, 0x5f, 0xf6, 0x1a, 0xa1, 0x5a, 0x1f, 0xce, 0x0f, 0x97, + 0x80, 0x07, 0x55, 0xa8, 0x8e, 0xb9, 0x76, 0x1f, 0x8e, 0x87, 0x84, 0x73, 0xe4, 0x13, 0x3d, 0x5f, + 0x01, 0xd5, 0x49, 0x57, 0x1b, 0x46, 0xe6, 0xb4, 0xcc, 0x54, 0x80, 0xe5, 0xa5, 0x14, 0xed, 0x19, + 0x9c, 0x90, 0xf2, 0x13, 0xa6, 0x8f, 0x25, 0xf4, 0x7b, 0xc3, 0xc8, 0x9c, 0x49, 0x1b, 0x49, 0xc4, + 0xfa, 0x74, 0xb4, 0x5c, 0x56, 0x3a, 0xad, 0x63, 0xcc, 0x08, 0xe7, 0xdb, 0x82, 0x05, 0x1d, 0xdf, + 0xbb, 0x48, 0xd6, 0x10, 0x2c, 0x08, 0xc4, 0x7c, 0x22, 0xf4, 0x42, 0x05, 0x54, 0x8b, 0xab, 0x65, + 0x5b, 0x8e, 0xc1, 0x4e, 0xc7, 0x60, 0xaf, 0x77, 0xfa, 0xee, 0xda, 0x30, 0x32, 0x4b, 0xb2, 0xb8, + 0x64, 0x5b, 0x1f, 0x8f, 0x96, 0x8d, 0x1b, 0x3e, 0xb0, 0xe5, 0x0c, 0x76, 0x12, 0x8a, 0xa7, 0x0a, + 0x6b, 0xbb, 0xb0, 0xd4, 0x62, 0x04, 0x89, 0x80, 0x76, 0x1a, 0x18, 0x09, 0xa2, 0x8f, 0x27, 0x9d, + 0x16, 0x6e, 0x74, 0xda, 0x49, 0x07, 0xee, 0xfe, 0x73, 0x1c, 0x99, 0x99, 0x61, 0x64, 0x96, 0x65, + 0xcf, 0x2b, 0xe9, 0xd6, 0xfe, 0x17, 0x13, 0x48, 0xfd, 0xa6, 0x52, 0x60, 0x03, 0x09, 0x52, 0x9b, + 0x78, 0x7b, 0x60, 0x82, 0xaf, 0x07, 0x26, 0xb0, 0x7a, 0x10, 0x3e, 0xe7, 0x84, 0xc9, 0x73, 0x68, + 0x4f, 0x60, 0xbe, 0xc7, 0x09, 0x4b, 0xac, 0x30, 0xe9, 0xfe, 0x37, 0x8c, 0xcc, 0xa2, 0x2c, 0x1b, + 0x47, 0x6f, 0xd7, 0x28, 0x49, 0xaa, 0x2d, 0xa5, 0x45, 0xbf, 0x7f, 0x61, 0x8b, 0x42, 0xb8, 0x45, + 0xb9, 0xda, 0x69, 0x0f, 0xe1, 0x78, 0x97, 0x72, 0x71, 0x69, 0xc2, 0x3f, 0x07, 0x91, 0x59, 0x88, + 0x09, 0x89, 0x95, 0xd4, 0x68, 0x15, 0xc5, 0xf2, 0x0a, 0xf1, 0xaa, 0x8e, 0xef, 0xd4, 0xf0, 0x14, + 0xc4, 0xb6, 0x8f, 0x2d, 0xf4, 0xeb, 0x6d, 0x5f, 0xba, 0xdd, 0xf6, 0xff, 0xc2, 0x31, 0x11, 0x88, + 0x36, 0xd1, 0x73, 0x89, 0xa2, 0xb3, 0xc3, 0xc8, 0x9c, 0x52, 0xe6, 0x88, 0xc3, 0x96, 0x27, 0x61, + 0xed, 0x31, 0x2c, 0x62, 0xc2, 0x5b, 0x2c, 0xe8, 0xc6, 0x33, 0x52, 0xb6, 0xfe, 0xfd, 0xf2, 0x14, + 0x23, 0xa0, 0xe5, 0x8d, 0x52, 0x47, 0x46, 0xf9, 0x1e, 0xc0, 0xc2, 0x16, 0x62, 0x28, 0xe4, 0x1a, + 0x83, 0xb3, 0x5c, 0xa0, 0x0e, 0x46, 0x0c, 0x37, 0xd4, 0xc3, 0xd1, 0x41, 0x25, 0x57, 0x2d, 0xae, + 0xfe, 0x65, 0xdf, 0x14, 0x6a, 0x5b, 0x51, 0xa5, 0x3e, 0xee, 0xa2, 0x72, 0xd4, 0xbc, 0x12, 0xe0, + 0x5a, 0x21, 0xf5, 0x20, 0x67, 0xf8, 0x95, 0x2c, 0x5e, 0x5b, 0x4c, 0x0f, 0xf2, 0xfa, 0xfc, 0x70, + 0x69, 0x5e, 0xfd, 0x18, 0x5f, 0x5d, 0xfc, 0x1a, 0xe5, 0xc9, 0xac, 0x77, 0x00, 0x4e, 0x5f, 0xed, + 0xa7, 0x84, 0x04, 0x3f, 0x28, 0x64, 0xf6, 0x4e, 0x42, 0xe6, 0x7e, 0x42, 0x48, 0x77, 0xf3, 0x78, + 0x60, 0x80, 0x93, 0x81, 0x01, 0x4e, 0x07, 0x06, 0xd8, 0x3f, 0x33, 0x32, 0x27, 0x67, 0x46, 0xe6, + 0xf3, 0x99, 0x91, 0x79, 0xf1, 0xc0, 0x0f, 0xc4, 0xcb, 0x5e, 0xd3, 0x6e, 0xd1, 0xd0, 0x91, 0x37, + 0x5c, 0x6e, 0xa3, 0x26, 0x57, 0x6b, 0x67, 0xef, 0xd1, 0xc8, 0x85, 0x45, 0xbf, 0x4b, 0x78, 0xb3, + 0x90, 0x3c, 0xd9, 0xb5, 0x6f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xec, 0xb4, 0xfc, 0xb4, 0x2a, 0x06, + 0x00, 0x00, } func (this *Report) Equal(that interface{}) bool { diff --git a/x/reports/types/msgs.go b/x/reports/types/msgs.go index 0be7b1e5c9..ae5211eb9a 100644 --- a/x/reports/types/msgs.go +++ b/x/reports/types/msgs.go @@ -82,11 +82,6 @@ func (msg *MsgCreateReport) ValidateBasic() error { return msg.Target.GetCachedValue().(ReportTarget).Validate() } -// GetSignBytes encodes the message for signing -func (msg *MsgCreateReport) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgCreateReport) GetSigners() []sdk.AccAddress { sender, _ := sdk.AccAddressFromBech32(msg.Reporter) @@ -130,11 +125,6 @@ func (msg *MsgDeleteReport) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgDeleteReport) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgDeleteReport) GetSigners() []sdk.AccAddress { sender, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -178,11 +168,6 @@ func (msg *MsgSupportStandardReason) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgSupportStandardReason) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgSupportStandardReason) GetSigners() []sdk.AccAddress { sender, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -230,11 +215,6 @@ func (msg *MsgAddReason) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgAddReason) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgAddReason) GetSigners() []sdk.AccAddress { sender, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -281,11 +261,6 @@ func (msg *MsgRemoveReason) ValidateBasic() error { return nil } -// GetSignBytes encodes the message for signing -func (msg *MsgRemoveReason) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} - // GetSigners defines whose signature is required func (msg *MsgRemoveReason) GetSigners() []sdk.AccAddress { sender, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -329,8 +304,3 @@ func (msg *MsgUpdateParams) GetSigners() []sdk.AccAddress { authority := sdk.MustAccAddressFromBech32(msg.Authority) return []sdk.AccAddress{authority} } - -// GetSigners implements legacytx.LegacyMsg -func (msg *MsgUpdateParams) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(msg)) -} diff --git a/x/reports/types/msgs.pb.go b/x/reports/types/msgs.pb.go index c255411011..4dae67041d 100644 --- a/x/reports/types/msgs.pb.go +++ b/x/reports/types/msgs.pb.go @@ -729,37 +729,37 @@ var fileDescriptor_c7165cc8d939a535 = []byte{ // 1015 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xbf, 0x6f, 0xdb, 0x46, 0x14, 0x36, 0xe5, 0x1f, 0x8d, 0xce, 0x72, 0xa3, 0xb0, 0x6a, 0x22, 0x0b, 0x85, 0x28, 0x5c, 0xda, - 0x54, 0x71, 0x6a, 0xb2, 0x8e, 0xd1, 0xa2, 0x30, 0xda, 0xc1, 0xac, 0x8a, 0x42, 0x01, 0x0c, 0x14, + 0x54, 0x71, 0x6a, 0xb2, 0x8e, 0x81, 0xa0, 0x30, 0xda, 0xc1, 0xac, 0x8a, 0x42, 0x01, 0x0c, 0x14, 0x74, 0xbc, 0x74, 0x88, 0x40, 0x89, 0x17, 0x9a, 0x80, 0xc8, 0x23, 0x78, 0x94, 0x51, 0x6d, 0x45, 0xc6, 0x4e, 0xf9, 0x0f, 0xba, 0x66, 0xf4, 0x10, 0x74, 0xea, 0xd0, 0x31, 0xe8, 0x14, 0x74, 0xea, 0xc4, 0x16, 0xf2, 0xe0, 0x5d, 0x7f, 0x41, 0xc1, 0xbb, 0x23, 0x79, 0x94, 0x49, 0x18, 0x2e, 0x94, - 0x45, 0xd0, 0xbd, 0xf7, 0xdd, 0x77, 0xf7, 0xbe, 0xf7, 0xe3, 0x08, 0x3e, 0xb2, 0x10, 0x71, 0x31, + 0x45, 0xd0, 0xbd, 0xf7, 0xdd, 0x77, 0xf7, 0xbe, 0xf7, 0xe3, 0x08, 0x3e, 0xb1, 0x10, 0x71, 0x31, 0xd1, 0x02, 0xe4, 0xe3, 0x20, 0x24, 0xda, 0xd9, 0x9e, 0xe6, 0x12, 0x9b, 0xa8, 0x7e, 0x80, 0x43, 0x2c, 0xdf, 0x61, 0x5e, 0x95, 0x7b, 0xd5, 0xb3, 0xbd, 0xd6, 0x1d, 0xd3, 0x75, 0x3c, 0xac, 0xd1, 0x5f, 0x86, 0x6a, 0x35, 0x6c, 0x6c, 0x63, 0xfa, 0x57, 0x8b, 0xff, 0x71, 0xeb, 0xb6, 0x8d, 0xb1, - 0x3d, 0x46, 0x1a, 0x5d, 0x0d, 0x27, 0xcf, 0x35, 0xd3, 0x9b, 0x72, 0x97, 0xb2, 0xe8, 0x0a, 0x1d, + 0x3d, 0x46, 0x1a, 0x5d, 0x0d, 0x27, 0x2f, 0x34, 0xd3, 0x9b, 0x72, 0x97, 0xb2, 0xe8, 0x0a, 0x1d, 0x17, 0x91, 0xd0, 0x74, 0xfd, 0x64, 0xef, 0x08, 0xc7, 0xe7, 0x0e, 0x18, 0x29, 0x5b, 0x70, 0xd7, 0x3d, 0xb6, 0x8a, 0x6f, 0xc9, 0x2f, 0xcb, 0x1d, 0xed, 0x82, 0x48, 0xb0, 0x85, 0xc6, 0x7c, 0x23, - 0x7c, 0xb5, 0x0a, 0x6e, 0x1f, 0x11, 0xfb, 0xdb, 0x00, 0x99, 0x21, 0x32, 0x28, 0x48, 0xfe, 0x0e, + 0x7c, 0xbd, 0x0a, 0x6e, 0x1f, 0x11, 0xfb, 0xdb, 0x00, 0x99, 0x21, 0x32, 0x28, 0x48, 0xfe, 0x0e, 0x6c, 0x92, 0xc9, 0x90, 0xf8, 0xe6, 0x08, 0x0d, 0x1c, 0xab, 0x29, 0x75, 0xa4, 0xee, 0x9a, 0xfe, - 0xf1, 0x2c, 0x52, 0xc0, 0x31, 0x37, 0xf7, 0x7b, 0xf3, 0x48, 0x91, 0xa7, 0xa6, 0x3b, 0x3e, 0x80, - 0x02, 0x14, 0x1a, 0x20, 0x59, 0xf5, 0x2d, 0xf9, 0x09, 0xd8, 0x0c, 0x90, 0x49, 0xb0, 0x47, 0x06, + 0xe9, 0x2c, 0x52, 0xc0, 0x31, 0x37, 0xf7, 0x7b, 0xf3, 0x48, 0x91, 0xa7, 0xa6, 0x3b, 0x3e, 0x80, + 0x02, 0x14, 0x1a, 0x20, 0x59, 0xf5, 0x2d, 0xf9, 0x29, 0xd8, 0x0c, 0x90, 0x49, 0xb0, 0x47, 0x06, 0x8e, 0x45, 0x9a, 0x95, 0xce, 0x6a, 0x77, 0x4b, 0x7f, 0x18, 0xd3, 0x18, 0xcc, 0xdc, 0xef, 0x91, - 0x8c, 0x46, 0x80, 0xc2, 0x57, 0x97, 0xe7, 0x3b, 0x92, 0x01, 0xb8, 0xa9, 0x6f, 0x11, 0xf9, 0x33, - 0xf0, 0x9e, 0x8b, 0x08, 0x31, 0x6d, 0xd4, 0x5c, 0xed, 0x48, 0xdd, 0xaa, 0x2e, 0xcf, 0x23, 0xe5, - 0x7d, 0xb6, 0x93, 0x3b, 0xa0, 0x91, 0x40, 0xe4, 0xef, 0xc1, 0x2d, 0x16, 0x2f, 0x0a, 0x9a, 0x6b, - 0x14, 0xfe, 0x68, 0x1e, 0x29, 0xb7, 0x93, 0x83, 0x98, 0x07, 0xfe, 0xf5, 0x7a, 0xb7, 0xc1, 0x45, + 0x8c, 0x46, 0x80, 0xc2, 0xd7, 0x97, 0xe7, 0x3b, 0x92, 0x01, 0xb8, 0xa9, 0x6f, 0x11, 0xf9, 0x0b, + 0xf0, 0x81, 0x8b, 0x08, 0x31, 0x6d, 0xd4, 0x5c, 0xed, 0x48, 0xdd, 0xaa, 0x2e, 0xcf, 0x23, 0xe5, + 0x43, 0xb6, 0x93, 0x3b, 0xa0, 0x91, 0x40, 0xe4, 0xef, 0xc1, 0x2d, 0x16, 0x2f, 0x0a, 0x9a, 0x6b, + 0x14, 0xfe, 0x68, 0x1e, 0x29, 0xb7, 0x93, 0x83, 0x98, 0x07, 0xfe, 0xf5, 0x66, 0xb7, 0xc1, 0x45, 0x3c, 0xb4, 0xac, 0x00, 0x11, 0x72, 0x1c, 0x06, 0x8e, 0x67, 0x1b, 0xe9, 0x66, 0xd9, 0x04, 0x1b, 0xa1, 0x19, 0xd8, 0x28, 0x6c, 0xae, 0x77, 0xa4, 0xee, 0xe6, 0xe3, 0x86, 0xca, 0x72, 0xa4, 0x26, - 0x39, 0x52, 0x0f, 0xbd, 0xa9, 0xbe, 0x3f, 0x8f, 0x94, 0x2d, 0x46, 0xce, 0xd0, 0xf0, 0xcf, 0xd7, - 0xbb, 0xed, 0x2b, 0x45, 0xa2, 0x32, 0x79, 0x9f, 0x52, 0x88, 0xc1, 0x89, 0x0f, 0xba, 0x2f, 0x2e, + 0x39, 0x52, 0x0f, 0xbd, 0xa9, 0xbe, 0x3f, 0x8f, 0x94, 0x2d, 0x46, 0xce, 0xd0, 0xf0, 0xcf, 0x37, + 0xbb, 0xed, 0x2b, 0x45, 0xa2, 0x32, 0x79, 0x9f, 0x51, 0x88, 0xc1, 0x89, 0x0f, 0xba, 0x2f, 0x2f, 0xcf, 0x77, 0xd2, 0x13, 0x7f, 0xb9, 0x3c, 0xdf, 0xb9, 0xcb, 0x53, 0xb6, 0x90, 0x16, 0xf8, 0x87, 0x04, 0xee, 0x2d, 0xd8, 0x0c, 0x44, 0x7c, 0xec, 0x11, 0x24, 0x7f, 0x03, 0xaa, 0x8c, 0x22, 0x4b, 0x58, 0x67, 0x16, 0x29, 0xb7, 0x18, 0x8c, 0xa6, 0xab, 0x2e, 0x86, 0x4f, 0x93, 0xc5, 0x4f, 0xed, - 0x5b, 0xf2, 0x73, 0xb0, 0x35, 0x8a, 0x69, 0x1d, 0xec, 0x0d, 0x2c, 0x33, 0x44, 0xcd, 0x0a, 0x0d, - 0xb7, 0x75, 0x25, 0xdc, 0xa7, 0x49, 0x49, 0xea, 0x9f, 0xbc, 0x89, 0x94, 0x95, 0x79, 0xa4, 0x34, - 0x18, 0x6d, 0x6e, 0x3b, 0x7c, 0xf9, 0x8f, 0x22, 0xb1, 0x24, 0xd6, 0x12, 0x47, 0x2f, 0xb6, 0xbf, - 0xa8, 0xd0, 0x6a, 0xeb, 0xa1, 0x31, 0x5a, 0x76, 0xb5, 0xe5, 0x14, 0xa8, 0xdc, 0x58, 0x81, 0x43, + 0x5b, 0xf2, 0x0b, 0xb0, 0x35, 0x8a, 0x69, 0x1d, 0xec, 0x0d, 0x2c, 0x33, 0x44, 0xcd, 0x0a, 0x0d, + 0xb7, 0x75, 0x25, 0xdc, 0x67, 0x49, 0x49, 0xea, 0x9f, 0xbd, 0x8d, 0x94, 0x95, 0x79, 0xa4, 0x34, + 0x18, 0x6d, 0x6e, 0x3b, 0x7c, 0xf5, 0x8f, 0x22, 0xb1, 0x24, 0xd6, 0x12, 0x47, 0x2f, 0xb6, 0xbf, + 0xac, 0xd0, 0x6a, 0xeb, 0xa1, 0x31, 0x5a, 0x76, 0xb5, 0xe5, 0x14, 0xa8, 0xdc, 0x58, 0x81, 0x43, 0xb0, 0x41, 0x1c, 0xdb, 0x43, 0x01, 0xaf, 0xaf, 0x87, 0x59, 0x4e, 0x99, 0xbd, 0xbc, 0x5c, 0xf8, 0xc6, 0x83, 0x07, 0x71, 0x26, 0xf9, 0x62, 0x21, 0x8f, 0x62, 0xc0, 0x70, 0x9b, 0xa6, 0x51, 0x34, 0x25, 0x69, 0x84, 0xbf, 0x55, 0x40, 0xf3, 0x88, 0xd8, 0xc7, 0x13, 0x3f, 0x36, 0x1f, 0x87, 0xa6, @@ -771,26 +771,26 @@ var fileDescriptor_c7165cc8d939a535 = []byte{ 0x5a, 0x4b, 0x4e, 0xcb, 0x03, 0xb0, 0x1e, 0x3a, 0xe1, 0x98, 0xb5, 0x5e, 0x55, 0xaf, 0xcf, 0x23, 0xa5, 0xc6, 0x67, 0x4a, 0x6c, 0x86, 0x06, 0x73, 0xcb, 0x5f, 0x81, 0x4d, 0x0b, 0x91, 0x51, 0xe0, 0xf8, 0x71, 0x57, 0x71, 0x89, 0xef, 0x66, 0x07, 0x08, 0x4e, 0x68, 0x88, 0x50, 0x21, 0x2f, 0x6b, - 0xff, 0x37, 0x2f, 0xf7, 0x17, 0xf2, 0xf2, 0x41, 0x96, 0x97, 0x54, 0x10, 0x78, 0x02, 0x1a, 0xe2, + 0xff, 0x37, 0x2f, 0xf7, 0x17, 0xf2, 0xf2, 0x51, 0x96, 0x97, 0x54, 0x10, 0x78, 0x02, 0x1a, 0xe2, 0x3a, 0x3f, 0xa3, 0x92, 0x7a, 0x63, 0xea, 0xf3, 0x0e, 0x4d, 0xeb, 0xac, 0x2e, 0x8a, 0x9f, 0x74, 0x28, 0x2b, 0xab, 0x64, 0x76, 0x18, 0xc8, 0xc5, 0x67, 0x68, 0xb9, 0xda, 0xe7, 0x6e, 0x56, 0xb9, - 0xe9, 0xcd, 0xde, 0xf1, 0xec, 0x10, 0x03, 0xe6, 0xb3, 0x43, 0x34, 0xa5, 0xb3, 0xe3, 0x77, 0x89, - 0xea, 0x73, 0xe2, 0xc7, 0x13, 0xf8, 0x07, 0x33, 0x30, 0x5d, 0x22, 0x7f, 0x09, 0xaa, 0xe6, 0x24, - 0x3c, 0xc5, 0x81, 0x13, 0x4e, 0xa9, 0x3a, 0x55, 0xbd, 0x59, 0x7a, 0x97, 0x0c, 0x2a, 0x7f, 0x0d, - 0x36, 0x7c, 0xca, 0xc0, 0x1f, 0x82, 0x6d, 0xf5, 0xea, 0x6b, 0xc6, 0x8e, 0xd0, 0xab, 0xf1, 0x3b, - 0xc0, 0x66, 0x3d, 0xdf, 0x73, 0xb0, 0x1f, 0x07, 0x93, 0xb1, 0xc5, 0xf1, 0x74, 0x78, 0x3c, 0x3f, - 0xa5, 0x1f, 0x22, 0x0b, 0x57, 0xe5, 0x91, 0x89, 0xa6, 0x24, 0xb2, 0xc7, 0xd1, 0x1a, 0x58, 0x3d, - 0x22, 0xb6, 0xfc, 0x0c, 0xd4, 0x72, 0xdf, 0x29, 0xb0, 0xe0, 0x56, 0x0b, 0x0f, 0x64, 0x6b, 0xe7, - 0x7a, 0x4c, 0x5a, 0xa0, 0xcf, 0x40, 0x2d, 0xf7, 0x32, 0x95, 0xf0, 0x8b, 0x98, 0x32, 0xfe, 0xa2, - 0xe9, 0x2e, 0x4f, 0xc1, 0x87, 0xc5, 0x93, 0xfd, 0x51, 0x31, 0x49, 0x21, 0xb8, 0xb5, 0x7f, 0x03, - 0x70, 0x7a, 0xf4, 0x09, 0xa8, 0x66, 0x13, 0x4b, 0x29, 0x66, 0x48, 0x01, 0xad, 0x4f, 0xaf, 0x01, - 0x88, 0x8a, 0xe5, 0xfa, 0xb1, 0x44, 0x31, 0x11, 0x53, 0xa6, 0x58, 0x51, 0x4d, 0xc7, 0xfc, 0xb9, - 0x7a, 0x2e, 0xe1, 0x17, 0x31, 0x65, 0xfc, 0x45, 0x95, 0xd5, 0x5a, 0xff, 0x39, 0x2e, 0x5c, 0xfd, - 0xc9, 0x9b, 0x59, 0x5b, 0x7a, 0x3b, 0x6b, 0x4b, 0xff, 0xce, 0xda, 0xd2, 0xcb, 0x8b, 0xf6, 0xca, - 0xdb, 0x8b, 0xf6, 0xca, 0xdf, 0x17, 0xed, 0x95, 0x1f, 0x3f, 0xb7, 0x9d, 0xf0, 0x74, 0x32, 0x54, - 0x47, 0xd8, 0xd5, 0x18, 0xed, 0xee, 0xd8, 0x1c, 0x12, 0xfe, 0x5f, 0x3b, 0xfb, 0x42, 0xa8, 0xe8, - 0x70, 0xea, 0x23, 0x32, 0xdc, 0xa0, 0xdf, 0x4a, 0xfb, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x53, - 0x17, 0xae, 0xd7, 0x43, 0x0c, 0x00, 0x00, + 0xe9, 0xcd, 0xde, 0xf3, 0xec, 0x10, 0x03, 0xe6, 0xb3, 0x43, 0x34, 0xa5, 0xb3, 0xe3, 0x77, 0x89, + 0xea, 0x73, 0xe2, 0xc7, 0x13, 0xf8, 0x07, 0x33, 0x30, 0x5d, 0x22, 0x3f, 0x01, 0x55, 0x73, 0x12, + 0x9e, 0xe2, 0xc0, 0x09, 0xa7, 0x54, 0x9d, 0xaa, 0xde, 0x2c, 0xbd, 0x4b, 0x06, 0x95, 0xbf, 0x06, + 0x1b, 0x3e, 0x65, 0xe0, 0x0f, 0xc1, 0xb6, 0x7a, 0xf5, 0x35, 0x63, 0x47, 0xe8, 0xd5, 0xf8, 0x1d, + 0x60, 0xb3, 0x9e, 0xef, 0x39, 0xd8, 0x8f, 0x83, 0xc9, 0xd8, 0xe2, 0x78, 0x3a, 0x3c, 0x9e, 0x9f, + 0xd2, 0x0f, 0x91, 0x85, 0xab, 0xf2, 0xc8, 0x44, 0x53, 0x12, 0xd9, 0xe3, 0x68, 0x0d, 0xac, 0x1e, + 0x11, 0x5b, 0x7e, 0x0e, 0x6a, 0xb9, 0xef, 0x14, 0x58, 0x70, 0xab, 0x85, 0x07, 0xb2, 0xb5, 0x73, + 0x3d, 0x26, 0x2d, 0xd0, 0xe7, 0xa0, 0x96, 0x7b, 0x99, 0x4a, 0xf8, 0x45, 0x4c, 0x19, 0x7f, 0xd1, + 0x74, 0x97, 0xa7, 0xe0, 0xe3, 0xe2, 0xc9, 0xfe, 0xa8, 0x98, 0xa4, 0x10, 0xdc, 0xda, 0xbf, 0x01, + 0x38, 0x3d, 0xfa, 0x04, 0x54, 0xb3, 0x89, 0xa5, 0x14, 0x33, 0xa4, 0x80, 0xd6, 0xe7, 0xd7, 0x00, + 0x44, 0xc5, 0x72, 0xfd, 0x58, 0xa2, 0x98, 0x88, 0x29, 0x53, 0xac, 0xa8, 0xa6, 0x63, 0xfe, 0x5c, + 0x3d, 0x97, 0xf0, 0x8b, 0x98, 0x32, 0xfe, 0xa2, 0xca, 0x6a, 0xad, 0xff, 0x1c, 0x17, 0xae, 0xfe, + 0xf4, 0xed, 0xac, 0x2d, 0xbd, 0x9b, 0xb5, 0xa5, 0x7f, 0x67, 0x6d, 0xe9, 0xd5, 0x45, 0x7b, 0xe5, + 0xdd, 0x45, 0x7b, 0xe5, 0xef, 0x8b, 0xf6, 0xca, 0x8f, 0x5f, 0xda, 0x4e, 0x78, 0x3a, 0x19, 0xaa, + 0x23, 0xec, 0x6a, 0x8c, 0x76, 0x77, 0x6c, 0x0e, 0x09, 0xff, 0xaf, 0x9d, 0x3d, 0x11, 0x2a, 0x3a, + 0x9c, 0xfa, 0x88, 0x0c, 0x37, 0xe8, 0xb7, 0xd2, 0xfe, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x00, + 0xa1, 0x43, 0xe2, 0x43, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/reports/types/msgs_test.go b/x/reports/types/msgs_test.go index 2577d96294..0cb57604f7 100644 --- a/x/reports/types/msgs_test.go +++ b/x/reports/types/msgs_test.go @@ -106,11 +106,6 @@ func TestMsgCreateReport_ValidateBasic(t *testing.T) { } } -func TestMsgCreateReport_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgCreateReport","value":{"message":"This post is spam","reasons_ids":[1],"reporter":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","subspace_id":"1","target":{"type":"desmos/PostTarget","value":{"post_id":"1"}}}}` - require.Equal(t, expected, string(msgCreateReport.GetSignBytes())) -} - func TestMsgCreateReport_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgCreateReport.Reporter) require.Equal(t, []sdk.AccAddress{addr}, msgCreateReport.GetSigners()) @@ -185,11 +180,6 @@ func TestMsgDeleteReport_ValidateBasic(t *testing.T) { } } -func TestMsgDeleteReport_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgDeleteReport","value":{"report_id":"1","signer":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","subspace_id":"1"}}` - require.Equal(t, expected, string(msgDeleteReport.GetSignBytes())) -} - func TestMsgDeleteReport_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgDeleteReport.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgDeleteReport.GetSigners()) @@ -264,11 +254,6 @@ func TestMsgSupportStandardReason_ValidateBasic(t *testing.T) { } } -func TestMsgSupportStandardReason_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgSupportStandardReason","value":{"signer":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","standard_reason_id":1,"subspace_id":"1"}}` - require.Equal(t, expected, string(msgSupportStandardReason.GetSignBytes())) -} - func TestMsgSupportStandardReason_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgSupportStandardReason.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgSupportStandardReason.GetSigners()) @@ -347,11 +332,6 @@ func TestMsgAddReason_ValidateBasic(t *testing.T) { } } -func TestMsgAddReason_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgAddReason","value":{"description":"This post is spam or the user is a spammer","signer":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","subspace_id":"1","title":"Spam"}}` - require.Equal(t, expected, string(msgAddReason.GetSignBytes())) -} - func TestMsgAddReason_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgAddReason.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgAddReason.GetSigners()) @@ -426,11 +406,6 @@ func TestMsgRemoveReason_ValidateBasic(t *testing.T) { } } -func TestMsgRemoveReason_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRemoveReason","value":{"reason_id":1,"signer":"cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47","subspace_id":"1"}}` - require.Equal(t, expected, string(msgRemoveReason.GetSignBytes())) -} - func TestMsgRemoveReason_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRemoveReason.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgRemoveReason.GetSigners()) @@ -484,11 +459,6 @@ func TestMsgUpdateParams_ValidateBasic(t *testing.T) { } } -func TestMsgUpdateParams_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/x/reports/MsgUpdateParams","value":{"authority":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","params":{"standard_reasons":null}}}` - require.Equal(t, expected, string(msgUpdateParams.GetSignBytes())) -} - func TestMsgUpdateParams_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgUpdateParams.Authority) require.Equal(t, []sdk.AccAddress{addr}, msgUpdateParams.GetSigners()) diff --git a/x/reports/types/query.pb.go b/x/reports/types/query.pb.go index 33783853f5..467cb6397f 100644 --- a/x/reports/types/query.pb.go +++ b/x/reports/types/query.pb.go @@ -569,7 +569,7 @@ var fileDescriptor_f0e9c7b1802c3e20 = []byte{ // 826 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6b, 0x13, 0x4b, 0x1c, 0xcf, 0xa6, 0x6d, 0xfa, 0x3a, 0xa5, 0xef, 0xbd, 0xce, 0xcb, 0x7b, 0xa4, 0xe9, 0x73, 0x13, - 0x17, 0x4c, 0x43, 0xa5, 0xbb, 0x26, 0x55, 0x84, 0x1e, 0xc4, 0xe6, 0xa0, 0x54, 0x10, 0x6a, 0xf4, + 0x17, 0x4c, 0x43, 0xa5, 0xbb, 0x26, 0x15, 0x85, 0x1e, 0xc4, 0xe6, 0xa0, 0x54, 0x10, 0x6a, 0xf4, 0x24, 0x68, 0x99, 0x74, 0xc7, 0x35, 0x90, 0xec, 0x6c, 0x77, 0x36, 0xc1, 0x58, 0x0a, 0xe2, 0x5f, 0x20, 0x08, 0x5e, 0xbd, 0x7a, 0x11, 0x3c, 0xf4, 0x8f, 0x28, 0x9e, 0x8a, 0x5e, 0xf4, 0x12, 0xa4, 0x15, 0xbc, 0xe7, 0xe6, 0x4d, 0x76, 0xbe, 0xb3, 0xc9, 0xae, 0x69, 0x37, 0x6a, 0xd5, 0x4b, 0x98, @@ -618,7 +618,7 @@ var fileDescriptor_f0e9c7b1802c3e20 = []byte{ 0xc9, 0xa1, 0x9a, 0xd8, 0x3f, 0x54, 0x13, 0xef, 0x0e, 0xd5, 0xc4, 0xed, 0x73, 0x56, 0xdd, 0xbb, 0xdf, 0xaa, 0xe9, 0x9b, 0xac, 0x29, 0xcb, 0x97, 0x1a, 0xa4, 0xc6, 0x83, 0x56, 0xed, 0x0b, 0xc6, 0x83, 0x7e, 0x3f, 0xaf, 0xe3, 0x50, 0x5e, 0x4b, 0x89, 0xbf, 0x33, 0xcb, 0x5f, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x7b, 0x10, 0xd5, 0x98, 0x3b, 0x0a, 0x00, 0x00, + 0xff, 0xff, 0x28, 0xa6, 0x38, 0xad, 0x3b, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/reports/wasm/common_test.go b/x/reports/wasm/common_test.go index 4d77b1712b..f7e26c1336 100644 --- a/x/reports/wasm/common_test.go +++ b/x/reports/wasm/common_test.go @@ -6,12 +6,13 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" @@ -87,12 +88,12 @@ type Testsuite struct { func (suite *Testsuite) SetupTest() { // Define store keys - keys := sdk.NewMemoryStoreKeys(types.StoreKey) + keys := storetypes.NewMemoryStoreKeys(types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/reports/wasm/querier.go b/x/reports/wasm/querier.go index 1b46c52883..866d0c75f1 100644 --- a/x/reports/wasm/querier.go +++ b/x/reports/wasm/querier.go @@ -50,7 +50,7 @@ func (querier ReportsWasmQuerier) handleReportsRequest(ctx sdk.Context, data jso if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.reportskeeper.Reports(sdk.WrapSDKContext(ctx), &req) + res, err := querier.reportskeeper.Reports(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -63,7 +63,7 @@ func (querier ReportsWasmQuerier) handleReportRequest(ctx sdk.Context, data json if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.reportskeeper.Report(sdk.WrapSDKContext(ctx), &req) + res, err := querier.reportskeeper.Report(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -76,7 +76,7 @@ func (querier ReportsWasmQuerier) handleReasonsRequest(ctx sdk.Context, data jso if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.reportskeeper.Reasons(sdk.WrapSDKContext(ctx), &req) + res, err := querier.reportskeeper.Reasons(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -89,7 +89,7 @@ func (querier ReportsWasmQuerier) handleReasonRequest(ctx sdk.Context, data json if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.reportskeeper.Reason(sdk.WrapSDKContext(ctx), &req) + res, err := querier.reportskeeper.Reason(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } diff --git a/x/subspaces/abci_test.go b/x/subspaces/abci_test.go index a0ec89e322..d6c2d21bff 100644 --- a/x/subspaces/abci_test.go +++ b/x/subspaces/abci_test.go @@ -4,13 +4,15 @@ import ( "testing" "time" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/math" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" + "cosmossdk.io/x/feegrant" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + db "github.com/cosmos/cosmos-db" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -21,13 +23,13 @@ import ( func TestBeginBlocker(t *testing.T) { // Define store keys - keys := sdk.NewMemoryStoreKeys( + keys := storetypes.NewMemoryStoreKeys( types.StoreKey, ) // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } @@ -60,7 +62,7 @@ func TestBeginBlocker(t *testing.T) { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), Expiration: &expiration, }, )) @@ -87,7 +89,7 @@ func TestBeginBlocker(t *testing.T) { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), Expiration: &expiration, }, )) diff --git a/x/subspaces/ante/common_test.go b/x/subspaces/ante/common_test.go index f532c55635..b082149432 100644 --- a/x/subspaces/ante/common_test.go +++ b/x/subspaces/ante/common_test.go @@ -3,12 +3,14 @@ package ante_test import ( "testing" + "cosmossdk.io/math" "github.com/golang/mock/gomock" "github.com/desmos-labs/desmos/v6/app" "github.com/desmos-labs/desmos/v6/x/subspaces/ante" "github.com/desmos-labs/desmos/v6/x/subspaces/ante/testutil" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/client" sdktestutil "github.com/cosmos/cosmos-sdk/testutil" sdk "github.com/cosmos/cosmos-sdk/types" @@ -43,8 +45,8 @@ func (suite *AnteTestSuite) SetupTest() { suite.ctrl = gomock.NewController(suite.T()) suite.ctx = sdktestutil. - DefaultContext(sdk.NewKVStoreKey("kv_test"), sdk.NewTransientStoreKey("transient_test")). - WithMinGasPrices(sdk.NewDecCoins(sdk.NewDecCoin("stake", sdk.NewInt(1)))). + DefaultContext(storetypes.NewKVStoreKey("kv_test"), storetypes.NewTransientStoreKey("transient_test")). + WithMinGasPrices(sdk.NewDecCoins(sdk.NewDecCoin("stake", math.NewInt(1)))). WithIsCheckTx(true) suite.bk = testutil.NewMockBankKeeper(suite.ctrl) diff --git a/x/subspaces/ante/fee.go b/x/subspaces/ante/fee.go index 7add9e52c9..f717badc92 100644 --- a/x/subspaces/ante/fee.go +++ b/x/subspaces/ante/fee.go @@ -1,6 +1,7 @@ package ante import ( + "bytes" "fmt" "cosmossdk.io/errors" @@ -108,13 +109,12 @@ func GetTxSubspaceID(tx sdk.Tx) (uint64, bool) { // tryHandleSubspaceTx handles the fee deduction for a single-subspace transaction, // and returns if the process succeeded or not func (dfd DeductFeeDecorator) tryHandleSubspaceTx(ctx sdk.Context, tx sdk.FeeTx, subspaceID uint64, fees sdk.Coins) (newCtx sdk.Context, success bool, err error) { - feePayer := tx.FeePayer() + deductFeesFrom := tx.FeePayer() feeGranter := tx.FeeGranter() - deductFeesFrom := feePayer // If the fee granter is not set, or it's not equal to the subspace treasury, // then use auth.DeductFeeDecorator to deal with fees - if feeGranter == nil || !feeGranter.Equals(types.GetTreasuryAddress(subspaceID)) { + if !bytes.Equal(feeGranter, types.GetTreasuryAddress(subspaceID)) { return ctx, false, nil } @@ -123,7 +123,7 @@ func (dfd DeductFeeDecorator) tryHandleSubspaceTx(ctx sdk.Context, tx sdk.FeeTx, } // Try using the granted fee grant to deduct the fee. If we can't, it means no grant exists - used := dfd.sk.UseGrantedFees(ctx, subspaceID, feePayer, fees, tx.GetMsgs()) + used := dfd.sk.UseGrantedFees(ctx, subspaceID, deductFeesFrom, fees, tx.GetMsgs()) if !used { return ctx, false, nil } @@ -147,7 +147,7 @@ func (dfd DeductFeeDecorator) tryHandleSubspaceTx(ctx sdk.Context, tx sdk.FeeTx, sdk.NewEvent( sdk.EventTypeTx, sdk.NewAttribute(sdk.AttributeKeyFee, fees.String()), - sdk.NewAttribute(sdk.AttributeKeyFeePayer, deductFeesFrom.String()), + sdk.NewAttribute(sdk.AttributeKeyFeePayer, sdk.AccAddress(deductFeesFrom).String()), ), }) return ctx, true, err diff --git a/x/subspaces/ante/fee_test.go b/x/subspaces/ante/fee_test.go index b8a2d6fe38..4758102154 100644 --- a/x/subspaces/ante/fee_test.go +++ b/x/subspaces/ante/fee_test.go @@ -3,6 +3,7 @@ package ante_test import ( "fmt" + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -13,7 +14,7 @@ import ( ) func (suite *AnteTestSuite) TestAnte_Ante() { - feeAmount := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))) + feeAmount := sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(100))) signer := sdk.MustAccAddressFromBech32("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5") granter := types.GetTreasuryAddress(1) nonTreasuryGranter := sdk.MustAccAddressFromBech32("cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53") diff --git a/x/subspaces/ante/testutil/expected_keepers_mocks.go b/x/subspaces/ante/testutil/expected_keepers_mocks.go index f69b935f6e..c5fdb60f91 100644 --- a/x/subspaces/ante/testutil/expected_keepers_mocks.go +++ b/x/subspaces/ante/testutil/expected_keepers_mocks.go @@ -5,6 +5,7 @@ package testutil import ( + context "context" reflect "reflect" types "github.com/cosmos/cosmos-sdk/types" @@ -37,10 +38,10 @@ func (m *MockAccountKeeper) EXPECT() *MockAccountKeeperMockRecorder { } // GetAccount mocks base method. -func (m *MockAccountKeeper) GetAccount(ctx types.Context, addr types.AccAddress) types0.AccountI { +func (m *MockAccountKeeper) GetAccount(ctx context.Context, addr types.AccAddress) types.AccountI { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAccount", ctx, addr) - ret0, _ := ret[0].(types0.AccountI) + ret0, _ := ret[0].(types.AccountI) return ret0 } @@ -65,7 +66,7 @@ func (mr *MockAccountKeeperMockRecorder) GetModuleAddress(moduleName interface{} } // GetParams mocks base method. -func (m *MockAccountKeeper) GetParams(ctx types.Context) types0.Params { +func (m *MockAccountKeeper) GetParams(ctx context.Context) types0.Params { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetParams", ctx) ret0, _ := ret[0].(types0.Params) @@ -79,7 +80,7 @@ func (mr *MockAccountKeeperMockRecorder) GetParams(ctx interface{}) *gomock.Call } // SetAccount mocks base method. -func (m *MockAccountKeeper) SetAccount(ctx types.Context, acc types0.AccountI) { +func (m *MockAccountKeeper) SetAccount(ctx context.Context, acc types.AccountI) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetAccount", ctx, acc) } @@ -114,7 +115,7 @@ func (m *MockBankKeeper) EXPECT() *MockBankKeeperMockRecorder { } // IsSendEnabledCoins mocks base method. -func (m *MockBankKeeper) IsSendEnabledCoins(ctx types.Context, coins ...types.Coin) error { +func (m *MockBankKeeper) IsSendEnabledCoins(ctx context.Context, coins ...types.Coin) error { m.ctrl.T.Helper() varargs := []interface{}{ctx} for _, a := range coins { @@ -133,7 +134,7 @@ func (mr *MockBankKeeperMockRecorder) IsSendEnabledCoins(ctx interface{}, coins } // SendCoins mocks base method. -func (m *MockBankKeeper) SendCoins(ctx types.Context, from, to types.AccAddress, amt types.Coins) error { +func (m *MockBankKeeper) SendCoins(ctx context.Context, from, to types.AccAddress, amt types.Coins) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendCoins", ctx, from, to, amt) ret0, _ := ret[0].(error) @@ -147,7 +148,7 @@ func (mr *MockBankKeeperMockRecorder) SendCoins(ctx, from, to, amt interface{}) } // SendCoinsFromAccountToModule mocks base method. -func (m *MockBankKeeper) SendCoinsFromAccountToModule(ctx types.Context, senderAddr types.AccAddress, recipientModule string, amt types.Coins) error { +func (m *MockBankKeeper) SendCoinsFromAccountToModule(ctx context.Context, senderAddr types.AccAddress, recipientModule string, amt types.Coins) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendCoinsFromAccountToModule", ctx, senderAddr, recipientModule, amt) ret0, _ := ret[0].(error) diff --git a/x/subspaces/ante/tx_checker_test.go b/x/subspaces/ante/tx_checker_test.go index 4db9bda2fc..94b046f769 100644 --- a/x/subspaces/ante/tx_checker_test.go +++ b/x/subspaces/ante/tx_checker_test.go @@ -3,6 +3,7 @@ package ante_test import ( "testing" + "cosmossdk.io/math" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/ante" @@ -30,7 +31,7 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { }{ { name: "standard tx returns no error", - fees: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(100))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(nonSubspaceMsg) @@ -42,7 +43,7 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { }, { name: "standard tx with insufficient fees returns error", - fees: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))), + fees: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(nonSubspaceMsg) @@ -54,7 +55,7 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { }, { name: "standard tx with subspace fees returns error", - fees: sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(100))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(nonSubspaceMsg) @@ -71,7 +72,7 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { GetSubspace(gomock.Any(), uint64(1)). Return(types.Subspace{}, false) }, - fees: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(100))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(msg) @@ -88,7 +89,7 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { GetSubspace(gomock.Any(), uint64(1)). Return(types.Subspace{}, false) }, - fees: sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(100))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(msg) @@ -100,7 +101,7 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { }, { name: "manage subspace tx with subspace fees returns error", - fees: sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(100))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(manageSubspaceMsg) @@ -112,7 +113,7 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { }, { name: "manage subspace tx returns no error", - fees: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(100))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(manageSubspaceMsg) @@ -129,12 +130,12 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { GetSubspace(gomock.Any(), uint64(1)). Return( types.Subspace{ - AdditionalFeeTokens: sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(1))), + AdditionalFeeTokens: sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(1))), }, true, ) }, - fees: sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(100))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(msg) @@ -151,12 +152,12 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { GetSubspace(gomock.Any(), uint64(1)). Return( types.Subspace{ - AdditionalFeeTokens: sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(1))), + AdditionalFeeTokens: sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(1))), }, true, ) }, - fees: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(100))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(msg) @@ -173,12 +174,12 @@ func (suite *AnteTestSuite) TestCheckTxFeeWithSubspaceMinPrices() { GetSubspace(gomock.Any(), uint64(1)). Return( types.Subspace{ - AdditionalFeeTokens: sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(1))), + AdditionalFeeTokens: sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(1))), }, true, ) }, - fees: sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(100))), buildTx: func(fees sdk.Coins) sdk.Tx { txBuilder := suite.clientCtx.TxConfig.NewTxBuilder() txBuilder.SetMsgs(msg) @@ -218,17 +219,17 @@ func TestAnte_MergeMinPrices(t *testing.T) { }{ { name: "merge existing coin does not update amount properly", - original: sdk.NewDecCoins(sdk.NewDecCoin("udsm", sdk.NewInt(1000))), - others: sdk.NewDecCoins(sdk.NewDecCoin("udsm", sdk.NewInt(5000))), - result: sdk.NewDecCoins(sdk.NewDecCoin("udsm", sdk.NewInt(1000))), + original: sdk.NewDecCoins(sdk.NewDecCoin("udsm", math.NewInt(1000))), + others: sdk.NewDecCoins(sdk.NewDecCoin("udsm", math.NewInt(5000))), + result: sdk.NewDecCoins(sdk.NewDecCoin("udsm", math.NewInt(1000))), }, { name: "merge non-existing coin properly", - original: sdk.NewDecCoins(sdk.NewDecCoin("udsm", sdk.NewInt(1000))), - others: sdk.NewDecCoins(sdk.NewDecCoin("minttoken", sdk.NewInt(5000))), + original: sdk.NewDecCoins(sdk.NewDecCoin("udsm", math.NewInt(1000))), + others: sdk.NewDecCoins(sdk.NewDecCoin("minttoken", math.NewInt(5000))), result: sdk.NewDecCoins( - sdk.NewDecCoin("udsm", sdk.NewInt(1000)), - sdk.NewDecCoin("minttoken", sdk.NewInt(5000)), + sdk.NewDecCoin("udsm", math.NewInt(1000)), + sdk.NewDecCoin("minttoken", math.NewInt(5000)), ), }, } diff --git a/x/subspaces/ante/types/expected_keepers.go b/x/subspaces/ante/types/expected_keepers.go index fab1bc0898..637648dbbf 100644 --- a/x/subspaces/ante/types/expected_keepers.go +++ b/x/subspaces/ante/types/expected_keepers.go @@ -1,6 +1,8 @@ package types import ( + "context" + sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -11,19 +13,19 @@ import ( // AccountKeeper represents the expected keeper used to interact with x/auth type AccountKeeper interface { - GetParams(ctx sdk.Context) authtypes.Params - GetAccount(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI - SetAccount(ctx sdk.Context, acc authtypes.AccountI) + GetParams(ctx context.Context) authtypes.Params + GetAccount(ctx context.Context, addr sdk.AccAddress) sdk.AccountI + SetAccount(ctx context.Context, acc sdk.AccountI) GetModuleAddress(moduleName string) sdk.AccAddress } // BankKeeper represents the expected keeper used to interact with x/bank type BankKeeper interface { - SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error + SendCoinsFromAccountToModule(ctx context.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error // Required by auth AnteHandler - IsSendEnabledCoins(ctx sdk.Context, coins ...sdk.Coin) error - SendCoins(ctx sdk.Context, from, to sdk.AccAddress, amt sdk.Coins) error + IsSendEnabledCoins(ctx context.Context, coins ...sdk.Coin) error + SendCoins(ctx context.Context, from, to sdk.AccAddress, amt sdk.Coins) error } // SubspacesKeeper represents the expected keeper used to interact with x/subspaces diff --git a/x/subspaces/authz/authz.go b/x/subspaces/authz/authz.go index 444c73c106..3fcb2e652a 100644 --- a/x/subspaces/authz/authz.go +++ b/x/subspaces/authz/authz.go @@ -1,6 +1,8 @@ package authz import ( + "context" + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -31,12 +33,13 @@ func (a GenericSubspaceAuthorization) MsgTypeURL() string { } // Accept implements Authorization.Accept. -func (a GenericSubspaceAuthorization) Accept(ctx sdk.Context, msg sdk.Msg) (authz.AcceptResponse, error) { +func (a GenericSubspaceAuthorization) Accept(ctx context.Context, msg sdk.Msg) (authz.AcceptResponse, error) { switch msg := msg.(type) { case types.SubspaceMsg: for _, subspaceID := range a.SubspacesIDs { - ctx.GasMeter().ConsumeGas(gasCostPerIteration, "generic subspace authorization") + sdkCtx := sdk.UnwrapSDKContext(ctx) + sdkCtx.GasMeter().ConsumeGas(gasCostPerIteration, "generic subspace authorization") if subspaceID == msg.GetSubspaceID() { return authz.AcceptResponse{Accept: true}, nil } diff --git a/x/subspaces/authz/authz.pb.go b/x/subspaces/authz/authz.pb.go index 90c27b14ae..a467bd5547 100644 --- a/x/subspaces/authz/authz.pb.go +++ b/x/subspaces/authz/authz.pb.go @@ -107,9 +107,9 @@ var fileDescriptor_a9e0e1d4a7397c6c = []byte{ 0x52, 0x4b, 0x12, 0x0d, 0xf5, 0x50, 0x6c, 0x75, 0xf2, 0x39, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xa3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, - 0x48, 0xd0, 0xe8, 0xe6, 0x24, 0x26, 0x15, 0x43, 0xd9, 0xfa, 0x65, 0xa6, 0xfa, 0x15, 0x48, 0x41, - 0x0a, 0xb6, 0x23, 0x89, 0x0d, 0xec, 0x57, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0xe7, - 0x28, 0xb3, 0x73, 0x01, 0x00, 0x00, + 0x48, 0xd0, 0xe8, 0xe6, 0x24, 0x26, 0x15, 0x43, 0xd9, 0xfa, 0x65, 0x66, 0xfa, 0x15, 0x48, 0x41, + 0x0a, 0xb6, 0x23, 0x89, 0x0d, 0xec, 0x57, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x79, 0xca, + 0xbc, 0x00, 0x73, 0x01, 0x00, 0x00, } func (m *GenericSubspaceAuthorization) Marshal() (dAtA []byte, err error) { diff --git a/x/subspaces/authz/authz_test.go b/x/subspaces/authz/authz_test.go index c00f55bef0..b5bdf46c5f 100644 --- a/x/subspaces/authz/authz_test.go +++ b/x/subspaces/authz/authz_test.go @@ -3,7 +3,7 @@ package authz_test import ( "testing" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" cosmosauthz "github.com/cosmos/cosmos-sdk/x/authz" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" diff --git a/x/subspaces/authz/codec.go b/x/subspaces/authz/codec.go index d053edbf07..fcb3c965e9 100644 --- a/x/subspaces/authz/codec.go +++ b/x/subspaces/authz/codec.go @@ -4,7 +4,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/x/authz" - authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" ) // RegisterLegacyAminoCodec registers the necessary interfaces and concrete types @@ -20,9 +19,3 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { &GenericSubspaceAuthorization{}, ) } - -func init() { - // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be - // used to properly serialize MsgGrant and MsgExec instances - RegisterLegacyAminoCodec(authzcodec.Amino) -} diff --git a/x/subspaces/client/cli/cli_test.go b/x/subspaces/client/cli/cli_test.go index cf4530d59f..d803b3be93 100644 --- a/x/subspaces/client/cli/cli_test.go +++ b/x/subspaces/client/cli/cli_test.go @@ -8,9 +8,10 @@ import ( "testing" "time" + "cosmossdk.io/math" + "cosmossdk.io/x/feegrant" + feegrantcli "cosmossdk.io/x/feegrant/client/cli" authzcli "github.com/cosmos/cosmos-sdk/x/authz/client/cli" - "github.com/cosmos/cosmos-sdk/x/feegrant" - feegrantcli "github.com/cosmos/cosmos-sdk/x/feegrant/client/cli" "github.com/stretchr/testify/suite" poststypes "github.com/desmos-labs/desmos/v6/x/posts/types" @@ -123,25 +124,25 @@ func (s *IntegrationTestSuite) SetupSuite() { 1, "cosmos1a0cj0j6ujn2xap8p40y6648d0w2npytw3xvenm", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), types.NewGrant( 1, "cosmos1a0cj0j6ujn2xap8p40y6648d0w2npytw3xvenm", types.NewUserGrantee("cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), types.NewGrant( 1, "cosmos1a0cj0j6ujn2xap8p40y6648d0w2npytw3xvenm", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), types.NewGrant( 2, "cosmos1a0cj0j6ujn2xap8p40y6648d0w2npytw3xvenm", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), }, ) @@ -622,7 +623,7 @@ func (s *IntegrationTestSuite) TestCmdQueryUserAllowances() { 1, "cosmos1a0cj0j6ujn2xap8p40y6648d0w2npytw3xvenm", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), }, }, @@ -641,7 +642,7 @@ func (s *IntegrationTestSuite) TestCmdQueryUserAllowances() { 1, "cosmos1a0cj0j6ujn2xap8p40y6648d0w2npytw3xvenm", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), }, }, @@ -707,7 +708,7 @@ func (s *IntegrationTestSuite) TestCmdQueryGroupAllowances() { 1, "cosmos1a0cj0j6ujn2xap8p40y6648d0w2npytw3xvenm", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), }, }, @@ -726,7 +727,7 @@ func (s *IntegrationTestSuite) TestCmdQueryGroupAllowances() { 1, "cosmos1a0cj0j6ujn2xap8p40y6648d0w2npytw3xvenm", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), }, }, @@ -780,7 +781,7 @@ func (s *IntegrationTestSuite) TestCmdCreateSubspace() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -794,7 +795,7 @@ func (s *IntegrationTestSuite) TestCmdCreateSubspace() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -855,7 +856,7 @@ func (s *IntegrationTestSuite) TestCmdEditSubspace() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -899,7 +900,7 @@ func (s *IntegrationTestSuite) TestCmdDeleteSubspace() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -956,7 +957,7 @@ func (s *IntegrationTestSuite) TestCmdCreateSection() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1011,7 +1012,7 @@ func (s *IntegrationTestSuite) TestCmdEditSection() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1064,7 +1065,7 @@ func (s *IntegrationTestSuite) TestCmdMoveSection() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1117,7 +1118,7 @@ func (s *IntegrationTestSuite) TestCmdDeleteSection() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1170,7 +1171,7 @@ func (s *IntegrationTestSuite) TestCmdCreateUserGroup() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1220,7 +1221,7 @@ func (s *IntegrationTestSuite) TestCmdEditUserGroup() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1233,7 +1234,7 @@ func (s *IntegrationTestSuite) TestCmdEditUserGroup() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1279,7 +1280,7 @@ func (s *IntegrationTestSuite) TestCmdMoveUserGroup() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1328,7 +1329,7 @@ func (s *IntegrationTestSuite) TestCmdSetUserGroupPermissions() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1340,7 +1341,7 @@ func (s *IntegrationTestSuite) TestCmdSetUserGroupPermissions() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1389,7 +1390,7 @@ func (s *IntegrationTestSuite) TestCmdDeleteUserGroup() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1443,7 +1444,7 @@ func (s *IntegrationTestSuite) TestCmdAddUserToUserGroup() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1497,7 +1498,7 @@ func (s *IntegrationTestSuite) TestCmdRemoveUserFromUserGroup() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1553,7 +1554,7 @@ func (s *IntegrationTestSuite) TestCmdSetPermissions() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1628,7 +1629,7 @@ func (s *IntegrationTestSuite) TestCmdGrantTreasuryAuthorization() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1702,7 +1703,7 @@ func (s *IntegrationTestSuite) TestCmdGrantTreasuryAuthorization_SendAuthorizati fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1717,7 +1718,7 @@ func (s *IntegrationTestSuite) TestCmdGrantTreasuryAuthorization_SendAuthorizati fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1760,7 +1761,7 @@ func (s *IntegrationTestSuite) TestCmdGrantTreasuryAuthorization_GenericAuthoriz fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1855,7 +1856,7 @@ func (s *IntegrationTestSuite) TestCmdGrantTreasuryAuthorization_StakeAuthorizat fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1871,7 +1872,7 @@ func (s *IntegrationTestSuite) TestCmdGrantTreasuryAuthorization_StakeAuthorizat fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1887,7 +1888,7 @@ func (s *IntegrationTestSuite) TestCmdGrantTreasuryAuthorization_StakeAuthorizat fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -1946,7 +1947,7 @@ func (s *IntegrationTestSuite) TestCmdRevokeTreasuryAuthorization() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -2052,7 +2053,7 @@ func (s *IntegrationTestSuite) TestCmdGrantAllowance() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -2068,7 +2069,7 @@ func (s *IntegrationTestSuite) TestCmdGrantAllowance() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, ), shouldErr: false, @@ -2086,7 +2087,7 @@ func (s *IntegrationTestSuite) TestCmdGrantAllowance() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, ), shouldErr: false, @@ -2102,7 +2103,7 @@ func (s *IntegrationTestSuite) TestCmdGrantAllowance() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, ), shouldErr: false, @@ -2170,7 +2171,7 @@ func (s *IntegrationTestSuite) TestCmdRevokeAllowance() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, diff --git a/x/subspaces/client/cli/tx.go b/x/subspaces/client/cli/tx.go index 0d233a093b..4bdc87bc21 100644 --- a/x/subspaces/client/cli/tx.go +++ b/x/subspaces/client/cli/tx.go @@ -5,10 +5,10 @@ import ( "strings" "time" + "cosmossdk.io/x/feegrant" + feegrantcli "cosmossdk.io/x/feegrant/client/cli" "github.com/cosmos/cosmos-sdk/x/authz" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" - feegrantcli "github.com/cosmos/cosmos-sdk/x/feegrant/client/cli" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/spf13/pflag" diff --git a/x/subspaces/keeper/alias_functions.go b/x/subspaces/keeper/alias_functions.go index fb8de1a5eb..fd8898abd9 100644 --- a/x/subspaces/keeper/alias_functions.go +++ b/x/subspaces/keeper/alias_functions.go @@ -3,6 +3,7 @@ package keeper import ( "bytes" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" @@ -26,7 +27,7 @@ func (k Keeper) createAccountIfNotExists(ctx sdk.Context, user string) { // IterateSubspaces iterates through the subspaces set and performs the given function func (k Keeper) IterateSubspaces(ctx sdk.Context, fn func(subspace types.Subspace) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspacePrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspacePrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -55,7 +56,7 @@ func (k Keeper) GetAllSubspaces(ctx sdk.Context) []types.Subspace { // IterateSections iterates over all the sections stored and performs the provided function func (k Keeper) IterateSections(ctx sdk.Context, fn func(section types.Section) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SectionsPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.SectionsPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -81,7 +82,7 @@ func (k Keeper) GetAllSections(ctx sdk.Context) []types.Section { // IterateSubspaceSections iterates over all the sections for the given subspace and performs the provided function func (k Keeper) IterateSubspaceSections(ctx sdk.Context, subspaceID uint64, fn func(section types.Section) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspaceSectionsPrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspaceSectionsPrefix(subspaceID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -139,7 +140,7 @@ func (k Keeper) IterateSectionChildren(ctx sdk.Context, subspaceID uint64, secti // IterateUserGroups iterates over all the users groups stored func (k Keeper) IterateUserGroups(ctx sdk.Context, fn func(group types.UserGroup) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.GroupsPrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.GroupsPrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -165,7 +166,7 @@ func (k Keeper) GetAllUserGroups(ctx sdk.Context) []types.UserGroup { // IterateSubspaceUserGroups allows iterating over all the groups that are part of the subspace having the given id func (k Keeper) IterateSubspaceUserGroups(ctx sdk.Context, subspaceID uint64, fn func(group types.UserGroup) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspaceGroupsPrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspaceGroupsPrefix(subspaceID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -191,7 +192,7 @@ func (k Keeper) GetSubspaceUserGroups(ctx sdk.Context, subspaceID uint64) []type // IterateSectionUserGroups iterates over all the user groups for the given section and performs the provided function func (k Keeper) IterateSectionUserGroups(ctx sdk.Context, subspaceID uint64, sectionID uint32, fn func(group types.UserGroup) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SectionGroupsPrefix(subspaceID, sectionID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SectionGroupsPrefix(subspaceID, sectionID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -223,7 +224,7 @@ func (k Keeper) IterateUserGroupsMembers(ctx sdk.Context, fn func(entry types.Us store := ctx.KVStore(k.storeKey) prefix := types.GroupsMembersPrefix - iterator := sdk.KVStorePrefixIterator(store, prefix) + iterator := storetypes.KVStorePrefixIterator(store, prefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -240,7 +241,7 @@ func (k Keeper) IterateUserGroupMembers(ctx sdk.Context, subspaceID uint64, grou store := ctx.KVStore(k.storeKey) prefix := types.GroupMembersPrefix(subspaceID, groupID) - iterator := sdk.KVStorePrefixIterator(store, prefix) + iterator := storetypes.KVStorePrefixIterator(store, prefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -270,7 +271,7 @@ func (k Keeper) IterateUserPermissions(ctx sdk.Context, fn func(entry types.User store := ctx.KVStore(k.storeKey) prefix := types.UserPermissionsStorePrefix - iterator := sdk.KVStorePrefixIterator(store, prefix) + iterator := storetypes.KVStorePrefixIterator(store, prefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -289,7 +290,7 @@ func (k Keeper) IterateSubspaceUserPermissions(ctx sdk.Context, subspaceID uint6 store := ctx.KVStore(k.storeKey) prefix := types.SubspacePermissionsPrefix(subspaceID) - iterator := sdk.KVStorePrefixIterator(store, prefix) + iterator := storetypes.KVStorePrefixIterator(store, prefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -318,7 +319,7 @@ func (k Keeper) IterateSectionUserPermissions(ctx sdk.Context, subspaceID uint64 store := ctx.KVStore(k.storeKey) prefix := types.SectionPermissionsPrefix(subspaceID, sectionID) - iterator := sdk.KVStorePrefixIterator(store, prefix) + iterator := storetypes.KVStorePrefixIterator(store, prefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -352,7 +353,7 @@ func (k Keeper) GetAllGrants(ctx sdk.Context) []types.Grant { // IterateUserGrants iterates through the user grants and performs the given function func (k Keeper) IterateUserGrants(ctx sdk.Context, fn func(grant types.Grant) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.UserAllowancePrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.UserAllowancePrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -368,7 +369,7 @@ func (k Keeper) IterateUserGrants(ctx sdk.Context, fn func(grant types.Grant) (s // IterateSubspaceUserGrants iterates over all the user grants inside the subspace with the given id func (k Keeper) IterateSubspaceUserGrants(ctx sdk.Context, subspaceID uint64, fn func(grant types.Grant) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.SubspaceUserAllowancePrefix(subspaceID)) + iterator := storetypes.KVStorePrefixIterator(store, types.SubspaceUserAllowancePrefix(subspaceID)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -407,7 +408,7 @@ func (k Keeper) GetSubspaceUserGrants(ctx sdk.Context, subspaceID uint64) []type // IterateUserGroupsGrants iterates through the group grants and performs the given function func (k Keeper) IterateUserGroupsGrants(ctx sdk.Context, fn func(grant types.Grant) (stop bool)) { store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.GroupAllowancePrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.GroupAllowancePrefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -424,7 +425,7 @@ func (k Keeper) IterateUserGroupsGrants(ctx sdk.Context, fn func(grant types.Gra func (k Keeper) IterateSubspaceUserGroupGrants(ctx sdk.Context, subspaceID uint64, fn func(grant types.Grant) (stop bool)) { store := ctx.KVStore(k.storeKey) prefix := types.SubspaceGroupAllowancePrefix(subspaceID) - iterator := sdk.KVStorePrefixIterator(store, prefix) + iterator := storetypes.KVStorePrefixIterator(store, prefix) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { diff --git a/x/subspaces/keeper/common_test.go b/x/subspaces/keeper/common_test.go index 2004ab75fe..79cfe5e0be 100644 --- a/x/subspaces/keeper/common_test.go +++ b/x/subspaces/keeper/common_test.go @@ -6,13 +6,16 @@ import ( "github.com/desmos-labs/desmos/v6/x/subspaces/keeper" "github.com/desmos-labs/desmos/v6/x/subspaces/types" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + "github.com/cosmos/cosmos-sdk/codec/address" + "github.com/cosmos/cosmos-sdk/runtime" 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" @@ -41,12 +44,12 @@ func TestKeeperTestSuite(t *testing.T) { func (suite *KeeperTestSuite) SetupTest() { // Define store keys - keys := sdk.NewMemoryStoreKeys(types.StoreKey, authtypes.StoreKey, authzkeeper.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey, authtypes.StoreKey, authzkeeper.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } @@ -61,13 +64,14 @@ func (suite *KeeperTestSuite) SetupTest() { // Dependencies initialization suite.ak = authkeeper.NewAccountKeeper( suite.cdc, - keys[authtypes.StoreKey], + runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, app.GetMaccPerms(), + address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String(), ) - suite.authzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], suite.cdc, &baseapp.MsgServiceRouter{}, suite.ak) + suite.authzKeeper = authzkeeper.NewKeeper(runtime.NewKVStoreService(keys[authzkeeper.StoreKey]), suite.cdc, &baseapp.MsgServiceRouter{}, suite.ak) // Define keeper suite.k = keeper.NewKeeper(suite.cdc, suite.storeKey, suite.ak, suite.authzKeeper, authtypes.NewModuleAddress("gov").String()) @@ -75,7 +79,7 @@ func (suite *KeeperTestSuite) SetupTest() { func (suite *KeeperTestSuite) getAllGrantsInExpiringQueue(ctx sdk.Context) []types.Grant { store := ctx.KVStore(suite.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.ExpiringAllowanceQueuePrefix) + iterator := storetypes.KVStorePrefixIterator(store, types.ExpiringAllowanceQueuePrefix) defer iterator.Close() var grants []types.Grant diff --git a/x/subspaces/keeper/feegrant_test.go b/x/subspaces/keeper/feegrant_test.go index a9e7ea97d0..e1c351cd17 100644 --- a/x/subspaces/keeper/feegrant_test.go +++ b/x/subspaces/keeper/feegrant_test.go @@ -3,8 +3,9 @@ package keeper_test import ( "time" + "cosmossdk.io/math" + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/desmos-labs/desmos/v6/x/subspaces/types" ) @@ -22,7 +23,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), check: func(ctx sdk.Context) { grant, found := suite.k.GetUserGrant(ctx, 1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5") @@ -33,7 +34,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), grant) // Check if account is set properly @@ -48,14 +49,14 @@ func (suite *KeeperTestSuite) TestKeeper_SaveGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1)))}, )) }, grant: types.NewGrant( 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), check: func(ctx sdk.Context) { grant, found := suite.k.GetUserGrant(ctx, 1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5") @@ -66,7 +67,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), grant) // Check if account is set properly @@ -80,7 +81,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), check: func(ctx sdk.Context) { grant, found := suite.k.GetGroupGrant(ctx, 1, 1) @@ -91,7 +92,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), grant) }, }, @@ -102,14 +103,14 @@ func (suite *KeeperTestSuite) TestKeeper_SaveGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1)))}, )) }, grant: types.NewGrant( 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), check: func(ctx sdk.Context) { grant, found := suite.k.GetGroupGrant(ctx, 1, 1) @@ -120,7 +121,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), grant) }, }, @@ -159,7 +160,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, ), check: func(ctx sdk.Context) { @@ -176,7 +177,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &newExpiration, }, ), @@ -199,7 +200,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, )) @@ -209,7 +210,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, ), check: func(ctx sdk.Context) { @@ -227,7 +228,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, )) @@ -237,7 +238,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &newExpiration, }, ), @@ -267,7 +268,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, )) }, @@ -276,7 +277,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, ), check: func(ctx sdk.Context) { @@ -294,7 +295,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), }, )) }, @@ -303,7 +304,7 @@ func (suite *KeeperTestSuite) TestKeeper_SaveAllowanceToExpirationQueue() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &newExpiration, }, ), @@ -359,7 +360,7 @@ func (suite *KeeperTestSuite) TestKeeper_HasUserGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1)))}, )) }, subspaceID: 1, @@ -404,7 +405,7 @@ func (suite *KeeperTestSuite) TestKeeper_GetUserGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1)))}, )) }, subspaceID: 1, @@ -414,7 +415,7 @@ func (suite *KeeperTestSuite) TestKeeper_GetUserGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1)))}, ), }, } @@ -463,7 +464,7 @@ func (suite *KeeperTestSuite) TestKeeper_DeleteUserGrant() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), Expiration: &expiration, }, )) @@ -520,7 +521,7 @@ func (suite *KeeperTestSuite) TestKeeper_HasGroupGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1)))}, )) }, subspaceID: 1, @@ -568,7 +569,7 @@ func (suite *KeeperTestSuite) TestKeeper_GetGroupGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1)))}, )) }, subspaceID: 1, @@ -579,7 +580,7 @@ func (suite *KeeperTestSuite) TestKeeper_GetGroupGrant() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1)))}, ), }, } @@ -628,7 +629,7 @@ func (suite *KeeperTestSuite) TestKeeper_DeleteGroupGrant() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), Expiration: &expiration, }, )) @@ -679,7 +680,7 @@ func (suite *KeeperTestSuite) TestKeeper_RemoveExpiredAllowances() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), Expiration: &expiration, }, )) @@ -704,7 +705,7 @@ func (suite *KeeperTestSuite) TestKeeper_RemoveExpiredAllowances() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), Expiration: &expiration, }, )) @@ -755,7 +756,7 @@ func (suite *KeeperTestSuite) TestKeeper_UseUserGrantedFees() { name: "not existing grant returns false", subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), expUsed: false, }, { @@ -765,12 +766,12 @@ func (suite *KeeperTestSuite) TestKeeper_UseUserGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(101))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(101))), expUsed: false, }, { @@ -780,12 +781,12 @@ func (suite *KeeperTestSuite) TestKeeper_UseUserGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(10))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(10))), expUsed: true, check: func(ctx sdk.Context) { grant, found := suite.k.GetUserGrant(ctx, 1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5") @@ -794,7 +795,7 @@ func (suite *KeeperTestSuite) TestKeeper_UseUserGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(90)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(90)))}, ), grant) }, }, @@ -805,12 +806,12 @@ func (suite *KeeperTestSuite) TestKeeper_UseUserGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), expUsed: true, check: func(ctx sdk.Context) { suite.Require().False(suite.k.HasUserGrant(ctx, 1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5")) @@ -852,7 +853,7 @@ func (suite *KeeperTestSuite) TestKeeper_UseGroupGrantedFees() { name: "not existing grant returns false", subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), expUsed: false, }, { @@ -862,12 +863,12 @@ func (suite *KeeperTestSuite) TestKeeper_UseGroupGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), expUsed: false, }, { @@ -878,12 +879,12 @@ func (suite *KeeperTestSuite) TestKeeper_UseGroupGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(101))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(101))), expUsed: false, }, { @@ -894,12 +895,12 @@ func (suite *KeeperTestSuite) TestKeeper_UseGroupGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(10))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(10))), expUsed: true, check: func(ctx sdk.Context) { grant, found := suite.k.GetGroupGrant(ctx, 1, 1) @@ -907,7 +908,7 @@ func (suite *KeeperTestSuite) TestKeeper_UseGroupGrantedFees() { suite.Require().Equal(types.NewGrant(1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(90)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(90)))}, ), grant) }, }, @@ -919,12 +920,12 @@ func (suite *KeeperTestSuite) TestKeeper_UseGroupGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), expUsed: true, check: func(ctx sdk.Context) { suite.Require().False(suite.k.HasGroupGrant(ctx, 1, 1)) @@ -964,7 +965,7 @@ func (suite *KeeperTestSuite) TestKeeper_UseGrantedFees() { name: "not existing grant returns false", subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), expUsed: false, }, { @@ -974,12 +975,12 @@ func (suite *KeeperTestSuite) TestKeeper_UseGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(10))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(10))), expUsed: true, }, { @@ -990,12 +991,12 @@ func (suite *KeeperTestSuite) TestKeeper_UseGrantedFees() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, subspaceID: 1, grantee: "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", - fees: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(10))), + fees: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(10))), expUsed: true, }, } diff --git a/x/subspaces/keeper/genesis_test.go b/x/subspaces/keeper/genesis_test.go index a396e6df41..45b0c0615e 100644 --- a/x/subspaces/keeper/genesis_test.go +++ b/x/subspaces/keeper/genesis_test.go @@ -3,8 +3,9 @@ package keeper_test import ( "time" + "cosmossdk.io/math" + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/desmos-labs/desmos/v6/x/subspaces/types" ) @@ -320,7 +321,7 @@ func (suite *KeeperTestSuite) TestKeeper_ExportGenesis() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, )) @@ -330,7 +331,7 @@ func (suite *KeeperTestSuite) TestKeeper_ExportGenesis() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69"), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, )) @@ -366,7 +367,7 @@ func (suite *KeeperTestSuite) TestKeeper_ExportGenesis() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, ), @@ -375,7 +376,7 @@ func (suite *KeeperTestSuite) TestKeeper_ExportGenesis() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69"), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, ), @@ -414,7 +415,7 @@ func (suite *KeeperTestSuite) TestKeeper_ExportGenesis() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, )) @@ -423,7 +424,7 @@ func (suite *KeeperTestSuite) TestKeeper_ExportGenesis() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(2), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, )) @@ -470,7 +471,7 @@ func (suite *KeeperTestSuite) TestKeeper_ExportGenesis() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, ), @@ -479,7 +480,7 @@ func (suite *KeeperTestSuite) TestKeeper_ExportGenesis() { "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(2), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, ), @@ -658,7 +659,7 @@ func (suite *KeeperTestSuite) TestKeeper_InitGenesis() { "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", types.NewUserGrantee("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, ), @@ -672,7 +673,7 @@ func (suite *KeeperTestSuite) TestKeeper_InitGenesis() { "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", types.NewUserGrantee("cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns"), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, ), stored) @@ -694,7 +695,7 @@ func (suite *KeeperTestSuite) TestKeeper_InitGenesis() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, ), @@ -708,7 +709,7 @@ func (suite *KeeperTestSuite) TestKeeper_InitGenesis() { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), Expiration: &expiration, }, ), stored) diff --git a/x/subspaces/keeper/groups_test.go b/x/subspaces/keeper/groups_test.go index 559c6cb385..0eabbdd39d 100644 --- a/x/subspaces/keeper/groups_test.go +++ b/x/subspaces/keeper/groups_test.go @@ -1,8 +1,8 @@ package keeper_test import ( + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/desmos-labs/desmos/v6/x/subspaces/types" ) diff --git a/x/subspaces/keeper/grpc_query.go b/x/subspaces/keeper/grpc_query.go index 0a74c8e818..92586a8fe1 100644 --- a/x/subspaces/keeper/grpc_query.go +++ b/x/subspaces/keeper/grpc_query.go @@ -7,7 +7,7 @@ import ( "github.com/desmos-labs/desmos/v6/x/subspaces/types" "cosmossdk.io/errors" - "github.com/cosmos/cosmos-sdk/store/prefix" + "cosmossdk.io/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/x/subspaces/keeper/grpc_query_test.go b/x/subspaces/keeper/grpc_query_test.go index 95db61aa03..bdcbfa12e5 100644 --- a/x/subspaces/keeper/grpc_query_test.go +++ b/x/subspaces/keeper/grpc_query_test.go @@ -5,9 +5,10 @@ import ( "github.com/desmos-labs/desmos/v6/x/subspaces/types" + "cosmossdk.io/math" + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/cosmos/cosmos-sdk/x/feegrant" ) func (suite *KeeperTestSuite) TestQueryServer_Subspaces() { @@ -80,7 +81,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Subspaces() { tc.store(ctx) } - res, err := suite.k.Subspaces(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.Subspaces(ctx, tc.req) suite.Require().NoError(err) suite.Require().Equal(tc.expSubspaces, res.Subspaces) }) @@ -139,7 +140,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Subspace() { tc.store(ctx) } - response, err := suite.k.Subspace(sdk.WrapSDKContext(ctx), tc.request) + response, err := suite.k.Subspace(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -268,7 +269,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Sections() { tc.store(ctx) } - res, err := suite.k.Sections(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.Sections(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -351,7 +352,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Section() { tc.store(ctx) } - res, err := suite.k.Section(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.Section(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -500,7 +501,7 @@ func (suite *KeeperTestSuite) TestQueryServer_UserGroups() { tc.store(ctx) } - res, err := suite.k.UserGroups(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.UserGroups(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -568,7 +569,7 @@ func (suite *KeeperTestSuite) TestQueryServer_UserGroup() { tc.store(ctx) } - res, err := suite.k.UserGroup(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.UserGroup(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -653,7 +654,7 @@ func (suite *KeeperTestSuite) TestQueryServer_UserGroupMembers() { tc.store(ctx) } - res, err := suite.k.UserGroupMembers(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.UserGroupMembers(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -779,7 +780,7 @@ func (suite *KeeperTestSuite) TestQueryServer_UserPermissions() { tc.store(ctx) } - res, err := suite.k.UserPermissions(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.UserPermissions(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -818,14 +819,14 @@ func (suite *KeeperTestSuite) TestQueryServer_UserAllowances() { 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) suite.k.SaveGrant(ctx, types.NewGrant( 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, req: types.NewQueryUserAllowancesRequest(1, "", nil), @@ -835,13 +836,13 @@ func (suite *KeeperTestSuite) TestQueryServer_UserAllowances() { 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), types.NewGrant( 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), }, }, @@ -853,14 +854,14 @@ func (suite *KeeperTestSuite) TestQueryServer_UserAllowances() { suite.k.SaveGrant(ctx, types.NewGrant(1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) suite.k.SaveGrant(ctx, types.NewGrant( 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, req: types.NewQueryUserAllowancesRequest(1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", nil), @@ -870,7 +871,7 @@ func (suite *KeeperTestSuite) TestQueryServer_UserAllowances() { 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), }, }, @@ -884,7 +885,7 @@ func (suite *KeeperTestSuite) TestQueryServer_UserAllowances() { tc.store(ctx) } - res, err := suite.k.UserAllowances(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.UserAllowances(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { @@ -925,13 +926,13 @@ func (suite *KeeperTestSuite) TestQueryServer_GroupAllowances() { 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) suite.k.SaveGrant(ctx, types.NewGrant( 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(2), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, req: types.NewQueryGroupAllowancesRequest(1, 0, nil), @@ -940,12 +941,12 @@ func (suite *KeeperTestSuite) TestQueryServer_GroupAllowances() { types.NewGrant(1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), types.NewGrant(1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(2), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), }, }, @@ -961,13 +962,13 @@ func (suite *KeeperTestSuite) TestQueryServer_GroupAllowances() { 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) suite.k.SaveGrant(ctx, types.NewGrant( 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(2), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, req: types.NewQueryGroupAllowancesRequest(1, 1, nil), @@ -977,7 +978,7 @@ func (suite *KeeperTestSuite) TestQueryServer_GroupAllowances() { 1, "cosmos1cjf97gpzwmaf30pzvaargfgr884mpp5ak8f7ns", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), }, }, @@ -991,7 +992,7 @@ func (suite *KeeperTestSuite) TestQueryServer_GroupAllowances() { tc.store(ctx) } - res, err := suite.k.GroupAllowances(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.GroupAllowances(ctx, tc.req) if tc.shouldErr { suite.Require().Error(err) } else { diff --git a/x/subspaces/keeper/invariants_test.go b/x/subspaces/keeper/invariants_test.go index 03a9f66d7a..37ac18f6bb 100644 --- a/x/subspaces/keeper/invariants_test.go +++ b/x/subspaces/keeper/invariants_test.go @@ -6,8 +6,8 @@ import ( "github.com/desmos-labs/desmos/v6/x/subspaces/keeper" "github.com/desmos-labs/desmos/v6/x/subspaces/types" + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" ) func (suite *KeeperTestSuite) TestValidSubspacesInvariant() { diff --git a/x/subspaces/keeper/keeper.go b/x/subspaces/keeper/keeper.go index 960f09707f..dccf3d7b79 100644 --- a/x/subspaces/keeper/keeper.go +++ b/x/subspaces/keeper/keeper.go @@ -1,9 +1,9 @@ package keeper import ( - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/subspaces/types" diff --git a/x/subspaces/keeper/msg_server_test.go b/x/subspaces/keeper/msg_server_test.go index 5e4cf1315f..73e9b7c8a8 100644 --- a/x/subspaces/keeper/msg_server_test.go +++ b/x/subspaces/keeper/msg_server_test.go @@ -3,10 +3,11 @@ package keeper_test import ( "time" + "cosmossdk.io/math" + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/desmos-labs/desmos/v6/x/subspaces/keeper" "github.com/desmos-labs/desmos/v6/x/subspaces/types" @@ -148,7 +149,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CreateSubspace() { // Run the fist subspace creation message msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.CreateSubspace(sdk.WrapSDKContext(ctx), types.NewMsgCreateSubspace( + _, err := msgServer.CreateSubspace(ctx, types.NewMsgCreateSubspace( "Test subspace", "This is a test subspace", "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", @@ -211,7 +212,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CreateSubspace() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - res, err := service.CreateSubspace(sdk.WrapSDKContext(ctx), tc.msg) + res, err := service.CreateSubspace(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -391,7 +392,7 @@ func (suite *KeeperTestSuite) TestMsgServer_EditSubspace() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.EditSubspace(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.EditSubspace(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -502,7 +503,7 @@ func (suite *KeeperTestSuite) TestMsgServer_DeleteSubspace() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.DeleteSubspace(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.DeleteSubspace(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -746,7 +747,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CreateSection() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.CreateSection(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.CreateSection(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -940,7 +941,7 @@ func (suite *KeeperTestSuite) TestMsgServer_EditSection() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.EditSection(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.EditSection(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1195,7 +1196,7 @@ func (suite *KeeperTestSuite) TestMsgServer_MoveSection() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.MoveSection(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.MoveSection(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1335,7 +1336,7 @@ func (suite *KeeperTestSuite) TestMsgServer_DeleteSection() { } msgServer := keeper.NewMsgServerImpl(suite.k) - _, err := msgServer.DeleteSection(sdk.WrapSDKContext(ctx), tc.msg) + _, err := msgServer.DeleteSection(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -1569,7 +1570,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CreateUserGroup() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - res, err := service.CreateUserGroup(sdk.WrapSDKContext(ctx), tc.msg) + res, err := service.CreateUserGroup(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -1768,7 +1769,7 @@ func (suite *KeeperTestSuite) TestMsgServer_EditUserGroup() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.EditUserGroup(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.EditUserGroup(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -2075,7 +2076,7 @@ func (suite *KeeperTestSuite) TestMsgServer_MoveUserGroup() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.MoveUserGroup(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.MoveUserGroup(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -2338,7 +2339,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SetUserGroupPermissions() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.SetUserGroupPermissions(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.SetUserGroupPermissions(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -2481,7 +2482,7 @@ func (suite *KeeperTestSuite) TestMsgServer_DeleteUserGroup() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.DeleteUserGroup(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.DeleteUserGroup(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -2661,7 +2662,7 @@ func (suite *KeeperTestSuite) TestMsgServer_AddUserToGroup() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.AddUserToUserGroup(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.AddUserToUserGroup(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -2840,7 +2841,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RemoveUserFromGroup() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.RemoveUserFromUserGroup(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.RemoveUserFromUserGroup(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -3005,7 +3006,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SetUserPermissions() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.SetUserPermissions(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.SetUserPermissions(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -3034,7 +3035,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateSubspaceFeeTokens() { name: "invalid authority return error", msg: types.NewMsgUpdateSubspaceFeeTokens( 1, - sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(10))), + sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(10))), "invalid", ), shouldErr: true, @@ -3043,7 +3044,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateSubspaceFeeTokens() { name: "subspace not found returns error", msg: types.NewMsgUpdateSubspaceFeeTokens( 1, - sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(10))), + sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(10))), authtypes.NewModuleAddress("gov").String(), ), shouldErr: true, @@ -3064,7 +3065,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateSubspaceFeeTokens() { }, msg: types.NewMsgUpdateSubspaceFeeTokens( 1, - sdk.Coins{{Denom: "minttoken", Amount: sdk.NewInt(-10)}}, + sdk.Coins{{Denom: "minttoken", Amount: math.NewInt(-10)}}, authtypes.NewModuleAddress("gov").String(), ), shouldErr: true, @@ -3085,7 +3086,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateSubspaceFeeTokens() { }, msg: types.NewMsgUpdateSubspaceFeeTokens( 1, - sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(10))), + sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(10))), authtypes.NewModuleAddress("gov").String(), ), shouldErr: true, @@ -3106,7 +3107,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateSubspaceFeeTokens() { }, msg: types.NewMsgUpdateSubspaceFeeTokens( 1, - sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(10))), + sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(10))), authtypes.NewModuleAddress("gov").String(), ), shouldErr: false, @@ -3127,7 +3128,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateSubspaceFeeTokens() { "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", time.Date(2020, 1, 1, 12, 00, 00, 000, time.UTC), - sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(10))), + sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(10))), ) suite.Require().Equal(expected, subspace) @@ -3145,7 +3146,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateSubspaceFeeTokens() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.UpdateSubspaceFeeTokens(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.UpdateSubspaceFeeTokens(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -3328,7 +3329,7 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantTreasuryAuthorization() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - res, err := service.GrantTreasuryAuthorization(sdk.WrapSDKContext(ctx), tc.msg) + res, err := service.GrantTreasuryAuthorization(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -3552,7 +3553,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RevokeTreasuryAuthorization() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - res, err := service.RevokeTreasuryAuthorization(sdk.WrapSDKContext(ctx), tc.msg) + res, err := service.RevokeTreasuryAuthorization(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -3589,7 +3590,7 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), shouldErr: true, }, @@ -3611,7 +3612,7 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), shouldErr: true, }, @@ -3640,14 +3641,14 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, msg: types.NewMsgGrantAllowance( 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), shouldErr: true, }, @@ -3676,7 +3677,7 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), shouldErr: true, }, @@ -3714,14 +3715,14 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, msg: types.NewMsgGrantAllowance( 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), shouldErr: true, }, @@ -3750,7 +3751,7 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), shouldErr: false, expEvents: sdk.Events{ @@ -3768,7 +3769,7 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), grant) }, }, @@ -3806,7 +3807,7 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), shouldErr: false, expEvents: sdk.Events{ @@ -3823,7 +3824,7 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { suite.Require().Equal(types.NewGrant(1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, ), grant) }, }, @@ -3839,7 +3840,7 @@ func (suite *KeeperTestSuite) TestMsgServer_GrantAllowance() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.GrantAllowance(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.GrantAllowance(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) @@ -3966,7 +3967,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RevokeAllowance() { 1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, msg: types.NewMsgRevokeAllowance( @@ -4011,7 +4012,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RevokeAllowance() { suite.k.SaveGrant(ctx, types.NewGrant(1, "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))}, )) }, msg: types.NewMsgRevokeAllowance( @@ -4044,7 +4045,7 @@ func (suite *KeeperTestSuite) TestMsgServer_RevokeAllowance() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.RevokeAllowance(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.RevokeAllowance(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) diff --git a/x/subspaces/keeper/subspaces_test.go b/x/subspaces/keeper/subspaces_test.go index 2a211d1ed9..cdba80dddd 100644 --- a/x/subspaces/keeper/subspaces_test.go +++ b/x/subspaces/keeper/subspaces_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "time" + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/desmos-labs/desmos/v6/x/subspaces/types" ) diff --git a/x/subspaces/legacy/v2/authz.go b/x/subspaces/legacy/v2/authz.go index b74127827d..1a2020f98e 100644 --- a/x/subspaces/legacy/v2/authz.go +++ b/x/subspaces/legacy/v2/authz.go @@ -3,6 +3,8 @@ package v2 // DONTCOVER import ( + "context" + "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -33,12 +35,13 @@ func (a GenericSubspaceAuthorization) MsgTypeURL() string { } // Accept implements Authorization.Accept. -func (a GenericSubspaceAuthorization) Accept(ctx sdk.Context, msg sdk.Msg) (authz.AcceptResponse, error) { +func (a GenericSubspaceAuthorization) Accept(ctx context.Context, msg sdk.Msg) (authz.AcceptResponse, error) { switch msg := msg.(type) { case types.SubspaceMsg: for _, subspaceID := range a.SubspacesIDs { - ctx.GasMeter().ConsumeGas(gasCostPerIteration, "generic subspace authorization") + sdkCtx := sdk.UnwrapSDKContext(ctx) + sdkCtx.GasMeter().ConsumeGas(gasCostPerIteration, "generic subspace authorization") if subspaceID == msg.GetSubspaceID() { return authz.AcceptResponse{Accept: true}, nil } diff --git a/x/subspaces/legacy/v2/authz.pb.go b/x/subspaces/legacy/v2/authz.pb.go index 061d5ab2a7..2b7a022fd3 100644 --- a/x/subspaces/legacy/v2/authz.pb.go +++ b/x/subspaces/legacy/v2/authz.pb.go @@ -105,9 +105,9 @@ var fileDescriptor_21914b81942bd86e = []byte{ 0x52, 0x4b, 0x12, 0x0d, 0xf5, 0x50, 0x2c, 0x74, 0x0a, 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, 0xb3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, - 0x48, 0x10, 0xe8, 0xe6, 0x24, 0x26, 0x15, 0x43, 0xd9, 0xfa, 0x65, 0xa6, 0xfa, 0x15, 0x48, 0x41, + 0x48, 0x10, 0xe8, 0xe6, 0x24, 0x26, 0x15, 0x43, 0xd9, 0xfa, 0x65, 0x66, 0xfa, 0x15, 0x48, 0x41, 0x97, 0x93, 0x9a, 0x9e, 0x98, 0x5c, 0xa9, 0x5f, 0x66, 0x94, 0xc4, 0x06, 0xf6, 0xaa, 0x31, 0x20, - 0x00, 0x00, 0xff, 0xff, 0x44, 0x61, 0x9f, 0x0e, 0x5f, 0x01, 0x00, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x37, 0x58, 0xb7, 0x1d, 0x5f, 0x01, 0x00, 0x00, } func (m *GenericSubspaceAuthorization) Marshal() (dAtA []byte, err error) { diff --git a/x/subspaces/legacy/v2/models.pb.go b/x/subspaces/legacy/v2/models.pb.go index 52cd07bbd3..aa6a1d93e0 100644 --- a/x/subspaces/legacy/v2/models.pb.go +++ b/x/subspaces/legacy/v2/models.pb.go @@ -398,7 +398,7 @@ var fileDescriptor_58f218b6c9069791 = []byte{ // 656 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x3f, 0x6f, 0xd3, 0x40, 0x18, 0xc6, 0xed, 0xfc, 0x69, 0xd2, 0x73, 0x43, 0xdb, 0x6b, 0x41, 0x56, 0x06, 0x5f, 0x74, 0x05, - 0x54, 0x15, 0xb0, 0xd5, 0xa0, 0xa2, 0xd2, 0x09, 0x85, 0x22, 0xda, 0xad, 0x3a, 0x60, 0x61, 0xa9, + 0x54, 0x15, 0xb0, 0xd5, 0x20, 0xaa, 0xd2, 0x09, 0x85, 0x22, 0xda, 0xad, 0x3a, 0x60, 0x61, 0xa9, 0x9c, 0xf8, 0x6a, 0x2c, 0xd9, 0xb9, 0xc8, 0x67, 0x07, 0xfa, 0x05, 0x80, 0xb1, 0x23, 0x62, 0xea, 0xc8, 0xc8, 0xc7, 0xe8, 0xd8, 0x91, 0xc9, 0xa0, 0x64, 0x80, 0xd9, 0x9f, 0x00, 0xf9, 0xce, 0x4e, 0x4d, 0xa9, 0x44, 0x59, 0xa2, 0xd7, 0xf7, 0xfc, 0xde, 0xf7, 0x9c, 0xe7, 0xb9, 0x33, 0xe8, 0x38, @@ -428,15 +428,15 @@ var fileDescriptor_58f218b6c9069791 = []byte{ 0x6e, 0x98, 0x57, 0xdc, 0x14, 0xf3, 0x72, 0x93, 0x99, 0x59, 0xbc, 0xa7, 0x10, 0xd1, 0x09, 0x9f, 0x82, 0xba, 0x9b, 0xd9, 0x2d, 0x1c, 0xd2, 0xba, 0xf7, 0xae, 0x37, 0x42, 0x24, 0xb4, 0xa7, 0x10, 0xd9, 0xdb, 0xf6, 0x41, 0x2d, 0x1b, 0x9a, 0xd9, 0x38, 0x7b, 0x9d, 0x3f, 0x6c, 0xcc, 0x56, 0x71, - 0xbe, 0xe3, 0x16, 0x00, 0x17, 0xff, 0x30, 0x0f, 0xe6, 0x66, 0x9a, 0xa0, 0xe5, 0xcb, 0x5e, 0x60, - 0x52, 0x02, 0x77, 0x9a, 0x1f, 0x4f, 0x91, 0x92, 0x39, 0xd1, 0xf6, 0x41, 0x5d, 0x9e, 0x90, 0xc7, - 0xa0, 0x29, 0xf6, 0x2f, 0x8e, 0x47, 0xab, 0x67, 0x4c, 0x12, 0xd4, 0x10, 0xa2, 0x48, 0x39, 0xbf, - 0x33, 0x05, 0x84, 0x49, 0x43, 0x94, 0xfb, 0x0e, 0x34, 0xfe, 0x7e, 0x89, 0xab, 0x77, 0xbb, 0xa8, - 0x7a, 0x75, 0x50, 0xe5, 0x71, 0xd0, 0x3b, 0x38, 0x9b, 0x18, 0xea, 0xf9, 0xc4, 0x50, 0x7f, 0x4c, - 0x0c, 0xf5, 0x64, 0x6a, 0x28, 0xe7, 0x53, 0x43, 0xf9, 0x36, 0x35, 0x94, 0xd7, 0x8f, 0x5c, 0x2f, + 0xbe, 0xe3, 0x23, 0x00, 0x2e, 0xfe, 0x61, 0x1e, 0xcc, 0xcd, 0x34, 0x41, 0xcb, 0x97, 0xbd, 0xc0, + 0xa4, 0x04, 0xee, 0x34, 0x3f, 0x9e, 0x22, 0x25, 0x73, 0xa2, 0xed, 0x83, 0xba, 0x3c, 0x21, 0x8f, + 0x41, 0x53, 0xec, 0x5f, 0x1c, 0x8f, 0x56, 0xcf, 0x98, 0x24, 0xa8, 0x21, 0x44, 0x91, 0x72, 0x7e, + 0x67, 0x0a, 0x08, 0x93, 0x86, 0x28, 0xf7, 0x1d, 0x68, 0xfc, 0xfd, 0x12, 0x57, 0xef, 0x76, 0x51, + 0xf5, 0xea, 0xa0, 0xca, 0xe3, 0xa0, 0x77, 0x70, 0x36, 0x31, 0xd4, 0xf3, 0x89, 0xa1, 0xfe, 0x98, + 0x18, 0xea, 0xc9, 0xd4, 0x50, 0xce, 0xa7, 0x86, 0xf2, 0x6d, 0x6a, 0x28, 0xaf, 0xb7, 0x5c, 0x2f, 0x7a, 0x13, 0xf7, 0xcd, 0x01, 0x0b, 0x2c, 0x69, 0xe3, 0x03, 0xdf, 0xee, 0xf3, 0xbc, 0xb6, 0xc6, 0x5b, 0xd6, 0xbb, 0xd2, 0x67, 0xce, 0xa7, 0xae, 0x3d, 0x38, 0xb6, 0xc6, 0xdd, 0xfe, 0x9c, 0xb8, - 0x4a, 0x0f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x6a, 0xa7, 0x2e, 0x35, 0x0b, 0x05, 0x00, 0x00, + 0x4a, 0x0f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x19, 0x9e, 0x06, 0x26, 0x0b, 0x05, 0x00, 0x00, } func (this *Subspace) Equal(that interface{}) bool { diff --git a/x/subspaces/legacy/v2/store.go b/x/subspaces/legacy/v2/store.go index dc08b53213..14cef9f990 100644 --- a/x/subspaces/legacy/v2/store.go +++ b/x/subspaces/legacy/v2/store.go @@ -1,9 +1,9 @@ package v2 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -23,7 +23,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar } // fixGroupsPermissions iterates over all the group permissions and sanitizes their values -func fixGroupsPermissions(store sdk.KVStore, cdc codec.BinaryCodec) error { +func fixGroupsPermissions(store storetypes.KVStore, cdc codec.BinaryCodec) error { groupsStore := prefix.NewStore(store, GroupsPrefix) iterator := groupsStore.Iterator(nil, nil) @@ -62,7 +62,7 @@ type userPermissionDetails struct { } // fixUsersPermissions iterates over all the users permissions and sanitizes their values -func fixUsersPermissions(store sdk.KVStore) { +func fixUsersPermissions(store storetypes.KVStore) { permissionsStore := prefix.NewStore(store, UserPermissionsStorePrefix) iterator := permissionsStore.Iterator(nil, nil) diff --git a/x/subspaces/legacy/v2/store_test.go b/x/subspaces/legacy/v2/store_test.go index cc99989421..d637098e26 100644 --- a/x/subspaces/legacy/v2/store_test.go +++ b/x/subspaces/legacy/v2/store_test.go @@ -3,9 +3,10 @@ package v2_test import ( "testing" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -18,9 +19,9 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) testCases := []struct { name string diff --git a/x/subspaces/legacy/v3/store.go b/x/subspaces/legacy/v3/store.go index c2f7977ca2..849884a03a 100644 --- a/x/subspaces/legacy/v3/store.go +++ b/x/subspaces/legacy/v3/store.go @@ -5,9 +5,9 @@ import ( poststypes "github.com/desmos-labs/desmos/v6/x/posts/types" + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" v2 "github.com/desmos-labs/desmos/v6/x/subspaces/legacy/v2" @@ -43,7 +43,7 @@ func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.Binar } // setupSubspacesSections sets the NextSectionID to 1 for all the current subspaces and creates the default sections -func setupSubspacesSections(store sdk.KVStore, cdc codec.BinaryCodec) error { +func setupSubspacesSections(store storetypes.KVStore, cdc codec.BinaryCodec) error { subspacesStore := prefix.NewStore(store, types.SubspacePrefix) iterator := subspacesStore.Iterator(nil, nil) defer iterator.Close() @@ -66,7 +66,7 @@ func setupSubspacesSections(store sdk.KVStore, cdc codec.BinaryCodec) error { } // migrateUserGroupsPermissions migrates all the user groups permissions from the old system to the new one -func migrateUserGroupsPermissions(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateUserGroupsPermissions(store storetypes.KVStore, cdc codec.BinaryCodec) error { groupsStore := prefix.NewStore(store, v2.GroupsPrefix) iterator := groupsStore.Iterator(nil, nil) defer iterator.Close() @@ -96,7 +96,7 @@ func migrateUserGroupsPermissions(store sdk.KVStore, cdc codec.BinaryCodec) erro } // migrateUserPermissions migrates all the user permissions from the old system to the new one -func migrateUserPermissions(store sdk.KVStore, cdc codec.BinaryCodec) error { +func migrateUserPermissions(store storetypes.KVStore, cdc codec.BinaryCodec) error { permissionsStore := prefix.NewStore(store, v2.UserPermissionsStorePrefix) iterator := permissionsStore.Iterator(nil, nil) defer iterator.Close() diff --git a/x/subspaces/legacy/v3/store_test.go b/x/subspaces/legacy/v3/store_test.go index e1cce4cd85..d2f6d51da8 100644 --- a/x/subspaces/legacy/v3/store_test.go +++ b/x/subspaces/legacy/v3/store_test.go @@ -8,9 +8,10 @@ import ( v3 "github.com/desmos-labs/desmos/v6/x/subspaces/legacy/v3" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -23,9 +24,9 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(types.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) testCases := []struct { name string diff --git a/x/subspaces/legacy/v4/store_test.go b/x/subspaces/legacy/v4/store_test.go index d14c8b9295..3ca916543f 100644 --- a/x/subspaces/legacy/v4/store_test.go +++ b/x/subspaces/legacy/v4/store_test.go @@ -4,14 +4,16 @@ import ( "testing" "time" + "github.com/cosmos/cosmos-sdk/runtime" authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" subspacesauthz "github.com/desmos-labs/desmos/v6/x/subspaces/authz" v4 "github.com/desmos-labs/desmos/v6/x/subspaces/legacy/v4" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -24,12 +26,12 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(authzkeeper.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(authzkeeper.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) // Build the authz keeper - authzKeeper := authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], cdc, nil, nil) + authzKeeper := authzkeeper.NewKeeper(runtime.NewKVStoreService(keys[authzkeeper.StoreKey]), cdc, nil, nil) testCases := []struct { name string diff --git a/x/subspaces/legacy/v5/expected_keepers.go b/x/subspaces/legacy/v5/expected_keepers.go index 6d9f3c21be..1ac153c58c 100644 --- a/x/subspaces/legacy/v5/expected_keepers.go +++ b/x/subspaces/legacy/v5/expected_keepers.go @@ -1,14 +1,15 @@ package v5 import ( + "context" + sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) // DONTCOVER type AccountKeeper interface { - NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI - HasAccount(ctx sdk.Context, addr sdk.AccAddress) bool - SetAccount(ctx sdk.Context, acc authtypes.AccountI) + NewAccountWithAddress(ctx context.Context, addr sdk.AccAddress) sdk.AccountI + HasAccount(ctx context.Context, addr sdk.AccAddress) bool + SetAccount(ctx context.Context, acc sdk.AccountI) } diff --git a/x/subspaces/legacy/v5/store.go b/x/subspaces/legacy/v5/store.go index f5253b6e1b..b0dc400e34 100644 --- a/x/subspaces/legacy/v5/store.go +++ b/x/subspaces/legacy/v5/store.go @@ -1,9 +1,9 @@ package v5 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/subspaces/legacy/v5/store_test.go b/x/subspaces/legacy/v5/store_test.go index 7c982398d5..ac5ec1986b 100644 --- a/x/subspaces/legacy/v5/store_test.go +++ b/x/subspaces/legacy/v5/store_test.go @@ -4,11 +4,14 @@ import ( "testing" "time" + storetypes "cosmossdk.io/store/types" + "github.com/cosmos/cosmos-sdk/codec/address" + "github.com/cosmos/cosmos-sdk/runtime" 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" - capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" + capabilitytypes "github.com/cosmos/ibc-go/modules/capability/types" "github.com/stretchr/testify/require" @@ -22,16 +25,17 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(types.StoreKey, authtypes.StoreKey, paramstypes.StoreKey) - tKeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey, authtypes.StoreKey, paramstypes.StoreKey) + tKeys := storetypes.NewTransientStoreKeys(paramstypes.TStoreKey) + memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) // Build the x/auth keeper authKeeper := authkeeper.NewAccountKeeper( cdc, - keys[authtypes.StoreKey], + runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, app.GetMaccPerms(), + address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String(), ) diff --git a/x/subspaces/legacy/v6/store.go b/x/subspaces/legacy/v6/store.go index c3a9e5e9b4..c6f7832d84 100644 --- a/x/subspaces/legacy/v6/store.go +++ b/x/subspaces/legacy/v6/store.go @@ -1,9 +1,9 @@ package v5 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/subspaces/types" diff --git a/x/subspaces/legacy/v6/store_test.go b/x/subspaces/legacy/v6/store_test.go index 1ec4769693..52985b56e9 100644 --- a/x/subspaces/legacy/v6/store_test.go +++ b/x/subspaces/legacy/v6/store_test.go @@ -3,6 +3,7 @@ package v5_test import ( "testing" + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -17,7 +18,7 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(types.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) testCases := []struct { name string diff --git a/x/subspaces/legacy/v7/store.go b/x/subspaces/legacy/v7/store.go index 63d393fa27..9e4ce8b941 100644 --- a/x/subspaces/legacy/v7/store.go +++ b/x/subspaces/legacy/v7/store.go @@ -1,9 +1,9 @@ package v7 import ( + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/subspaces/types" diff --git a/x/subspaces/legacy/v7/store_test.go b/x/subspaces/legacy/v7/store_test.go index a686ff39a7..bcfd324fe8 100644 --- a/x/subspaces/legacy/v7/store_test.go +++ b/x/subspaces/legacy/v7/store_test.go @@ -4,10 +4,11 @@ import ( "testing" "time" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + "cosmossdk.io/math" + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/stretchr/testify/require" @@ -35,7 +36,7 @@ func TestMigrateStore(t *testing.T) { cdc, _ := app.MakeCodecs() // Build all the necessary keys - keys := sdk.NewKVStoreKeys(types.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey) expiration := time.Date(2100, 7, 7, 0, 0, 0, 0, time.UTC) @@ -53,7 +54,7 @@ func TestMigrateStore(t *testing.T) { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), Expiration: &expiration, }, ) @@ -74,7 +75,7 @@ func TestMigrateStore(t *testing.T) { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewUserGrantee("cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), }, ) ctx.KVStore(keys[types.StoreKey]).Set(types.UserAllowanceKey(1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5"), cdc.MustMarshal(&grant)) @@ -92,7 +93,7 @@ func TestMigrateStore(t *testing.T) { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), Expiration: &expiration, }, ) @@ -113,7 +114,7 @@ func TestMigrateStore(t *testing.T) { "cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53", types.NewGroupGrantee(1), &feegrant.BasicAllowance{ - SpendLimit: sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(1))), + SpendLimit: sdk.NewCoins(sdk.NewCoin("test", math.NewInt(1))), }, ) ctx.KVStore(keys[types.StoreKey]).Set(types.GroupAllowanceKey(1, 1), cdc.MustMarshal(&grant)) diff --git a/x/subspaces/module.go b/x/subspaces/module.go index f26bd4d791..143b9d0db4 100644 --- a/x/subspaces/module.go +++ b/x/subspaces/module.go @@ -9,11 +9,11 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/depinject" + storetypes "cosmossdk.io/store/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -47,8 +47,8 @@ var ( _ module.AppModule = AppModule{} _ module.AppModuleBasic = AppModuleBasic{} _ module.AppModuleSimulation = AppModule{} + _ appmodule.HasBeginBlocker = AppModule{} _ appmodule.AppModule = AppModule{} - _ depinject.OnePerModuleType = AppModule{} ) // AppModuleBasic defines the basic application module used by the subspaces module. @@ -199,14 +199,10 @@ func (AppModule) ConsensusVersion() uint64 { } // BeginBlock returns the begin blocker for the subspaces module. -func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { - BeginBlocker(ctx, am.keeper) -} - -// EndBlock returns the end blocker for the subspaces module. It returns no validator -// updates. -func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return []abci.ValidatorUpdate{} +func (am AppModule) BeginBlock(ctx context.Context) error { + sdkCtx := sdk.UnwrapSDKContext(ctx) + BeginBlocker(sdkCtx, am.keeper) + return nil } // -------------------------------------------------------------------------------------------------------------------- @@ -225,7 +221,7 @@ func (am AppModule) ProposalMsgs(simState module.SimulationState) []simtypes.Wei } // RegisterStoreDecoder performs a no-op. -func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { +func (am AppModule) RegisterStoreDecoder(sdr simtypes.StoreDecoderRegistry) { sdr[types.ModuleName] = simulation.NewDecodeStore(am.cdc) } diff --git a/x/subspaces/simulation/decoder_test.go b/x/subspaces/simulation/decoder_test.go index 44b8563c6b..3cfd4d71ab 100644 --- a/x/subspaces/simulation/decoder_test.go +++ b/x/subspaces/simulation/decoder_test.go @@ -7,8 +7,8 @@ import ( "github.com/desmos-labs/desmos/v6/x/subspaces/simulation" + "cosmossdk.io/x/feegrant" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" diff --git a/x/subspaces/simulation/genesis.go b/x/subspaces/simulation/genesis.go index ef9e4ec724..16ec84af10 100644 --- a/x/subspaces/simulation/genesis.go +++ b/x/subspaces/simulation/genesis.go @@ -7,8 +7,8 @@ import ( "math/rand" "time" + "cosmossdk.io/x/feegrant" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/cosmos/cosmos-sdk/x/feegrant" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" diff --git a/x/subspaces/simulation/operations.go b/x/subspaces/simulation/operations.go index e7575487d9..6c425f05a6 100644 --- a/x/subspaces/simulation/operations.go +++ b/x/subspaces/simulation/operations.go @@ -50,132 +50,132 @@ func WeightedOperations( ) sim.WeightedOperations { var weightMsgCreateSubspace int - appParams.GetOrGenerate(cdc, OpWeightMsgCreateSubspace, &weightMsgCreateSubspace, nil, + appParams.GetOrGenerate(OpWeightMsgCreateSubspace, &weightMsgCreateSubspace, nil, func(_ *rand.Rand) { weightMsgCreateSubspace = params.DefaultWeightMsgCreateSubspace }, ) var weightMsgEditSubspace int - appParams.GetOrGenerate(cdc, OpWeightMsgEditSubspace, &weightMsgEditSubspace, nil, + appParams.GetOrGenerate(OpWeightMsgEditSubspace, &weightMsgEditSubspace, nil, func(_ *rand.Rand) { weightMsgEditSubspace = params.DefaultWeightMsgEditSubspace }, ) var weightMsgDeleteSubspace int - appParams.GetOrGenerate(cdc, OpWeightMsgDeleteSubspace, &weightMsgDeleteSubspace, nil, + appParams.GetOrGenerate(OpWeightMsgDeleteSubspace, &weightMsgDeleteSubspace, nil, func(_ *rand.Rand) { weightMsgDeleteSubspace = params.DefaultWeightMsgDeleteSubspace }, ) var weightMsgCreateSection int - appParams.GetOrGenerate(cdc, OpWeightMsgCreateSection, &weightMsgCreateSection, nil, + appParams.GetOrGenerate(OpWeightMsgCreateSection, &weightMsgCreateSection, nil, func(_ *rand.Rand) { weightMsgCreateSection = params.DefaultWeightMsgCreateSection }, ) var weightMsgEditSection int - appParams.GetOrGenerate(cdc, OpWeightMsgEditSection, &weightMsgEditSection, nil, + appParams.GetOrGenerate(OpWeightMsgEditSection, &weightMsgEditSection, nil, func(_ *rand.Rand) { weightMsgEditSection = params.DefaultWeightMsgEditSection }, ) var weightMsgMoveSection int - appParams.GetOrGenerate(cdc, OpWeightMsgMoveSection, &weightMsgMoveSection, nil, + appParams.GetOrGenerate(OpWeightMsgMoveSection, &weightMsgMoveSection, nil, func(_ *rand.Rand) { weightMsgMoveSection = params.DefaultWeightMsgMoveSection }, ) var weightMsgDeleteSection int - appParams.GetOrGenerate(cdc, OpWeightMsgDeleteSection, &weightMsgDeleteSection, nil, + appParams.GetOrGenerate(OpWeightMsgDeleteSection, &weightMsgDeleteSection, nil, func(_ *rand.Rand) { weightMsgDeleteSection = params.DefaultWeightMsgDeleteSection }, ) var weightMsgCreateUserGroup int - appParams.GetOrGenerate(cdc, OpWeightMsgCreateUserGroup, &weightMsgCreateUserGroup, nil, + appParams.GetOrGenerate(OpWeightMsgCreateUserGroup, &weightMsgCreateUserGroup, nil, func(_ *rand.Rand) { weightMsgCreateUserGroup = params.DefaultWeightMsgCreateUserGroup }, ) var weightMsgEditUserGroup int - appParams.GetOrGenerate(cdc, OpWeightMsgEditUserGroup, &weightMsgEditUserGroup, nil, + appParams.GetOrGenerate(OpWeightMsgEditUserGroup, &weightMsgEditUserGroup, nil, func(_ *rand.Rand) { weightMsgEditUserGroup = params.DefaultWeightMsgEditUserGroup }, ) var weightMsgMoveUserGroup int - appParams.GetOrGenerate(cdc, OpWeightMsgMoveUserGroup, &weightMsgMoveUserGroup, nil, + appParams.GetOrGenerate(OpWeightMsgMoveUserGroup, &weightMsgMoveUserGroup, nil, func(_ *rand.Rand) { weightMsgMoveUserGroup = params.DefaultWeightMsgMoveUserGroup }) var weightMsgSetUserGroupPermissions int - appParams.GetOrGenerate(cdc, OpWeightMsgSetUserGroupPermissions, &weightMsgSetUserGroupPermissions, nil, + appParams.GetOrGenerate(OpWeightMsgSetUserGroupPermissions, &weightMsgSetUserGroupPermissions, nil, func(_ *rand.Rand) { weightMsgSetUserGroupPermissions = params.DefaultWeightMsgSetUserGroupPermissions }, ) var weightMsgDeleteUserGroup int - appParams.GetOrGenerate(cdc, OpWeightMsgDeleteUserGroup, &weightMsgDeleteUserGroup, nil, + appParams.GetOrGenerate(OpWeightMsgDeleteUserGroup, &weightMsgDeleteUserGroup, nil, func(_ *rand.Rand) { weightMsgDeleteUserGroup = params.DefaultWeightMsgDeleteUserGroup }, ) var weightMsgAddUserToUserGroup int - appParams.GetOrGenerate(cdc, OpWeightMsgAddUserToUserGroup, &weightMsgAddUserToUserGroup, nil, + appParams.GetOrGenerate(OpWeightMsgAddUserToUserGroup, &weightMsgAddUserToUserGroup, nil, func(_ *rand.Rand) { weightMsgAddUserToUserGroup = params.DefaultWeightMsgAddUserToUserGroup }, ) var weightMsgRemoveUserFromUserGroup int - appParams.GetOrGenerate(cdc, OpWeightMsgRemoveUserFromUserGroup, &weightMsgRemoveUserFromUserGroup, nil, + appParams.GetOrGenerate(OpWeightMsgRemoveUserFromUserGroup, &weightMsgRemoveUserFromUserGroup, nil, func(_ *rand.Rand) { weightMsgRemoveUserFromUserGroup = params.DefaultWeightMsgRemoveUserFromUserGroup }, ) var weightMsgSetUserPermissions int - appParams.GetOrGenerate(cdc, OpWeightMsgSetUserPermissions, &weightMsgSetUserPermissions, nil, + appParams.GetOrGenerate(OpWeightMsgSetUserPermissions, &weightMsgSetUserPermissions, nil, func(_ *rand.Rand) { weightMsgSetUserPermissions = params.DefaultWeightMsgSetUserPermissions }, ) var weightMsgGrantTreasuryAuthorization int - appParams.GetOrGenerate(cdc, OpWeightMsgGrantTreasuryAuthorization, &weightMsgGrantTreasuryAuthorization, nil, + appParams.GetOrGenerate(OpWeightMsgGrantTreasuryAuthorization, &weightMsgGrantTreasuryAuthorization, nil, func(_ *rand.Rand) { weightMsgGrantTreasuryAuthorization = params.DefaultWeightMsgGrantTreasuryAuthorization }, ) var weightMsgRevokeTreasuryAuthorization int - appParams.GetOrGenerate(cdc, OpWeightMsgRevokeTreasuryAuthorization, &weightMsgRevokeTreasuryAuthorization, nil, + appParams.GetOrGenerate(OpWeightMsgRevokeTreasuryAuthorization, &weightMsgRevokeTreasuryAuthorization, nil, func(_ *rand.Rand) { weightMsgRevokeTreasuryAuthorization = params.DefaultWeightMsgRevokeTreasuryAuthorization }, ) var weightMsgGrantUserAllowance int - appParams.GetOrGenerate(cdc, OpWeightMsgGrantAllowance, &weightMsgGrantUserAllowance, nil, + appParams.GetOrGenerate(OpWeightMsgGrantAllowance, &weightMsgGrantUserAllowance, nil, func(_ *rand.Rand) { weightMsgGrantUserAllowance = params.DefaultWeightMsgGrantAllowance }, ) var weightMsgRevokeAllowance int - appParams.GetOrGenerate(cdc, OpWeightMsgRevokeAllowance, &weightMsgRevokeAllowance, nil, + appParams.GetOrGenerate(OpWeightMsgRevokeAllowance, &weightMsgRevokeAllowance, nil, func(_ *rand.Rand) { weightMsgRevokeAllowance = params.DefaultWeightMsgRevokeAllowance }, diff --git a/x/subspaces/simulation/operations_feegrant.go b/x/subspaces/simulation/operations_feegrant.go index 411aabcda0..b11974be43 100644 --- a/x/subspaces/simulation/operations_feegrant.go +++ b/x/subspaces/simulation/operations_feegrant.go @@ -3,12 +3,12 @@ package simulation import ( "math/rand" + "cosmossdk.io/x/feegrant" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/desmos-labs/desmos/v6/testutil/simtesting" "github.com/desmos-labs/desmos/v6/x/subspaces/keeper" diff --git a/x/subspaces/simulation/utils.go b/x/subspaces/simulation/utils.go index 82778fed7e..7dbbae8fc6 100644 --- a/x/subspaces/simulation/utils.go +++ b/x/subspaces/simulation/utils.go @@ -6,10 +6,9 @@ import ( "math/rand" "time" + "cosmossdk.io/math" poststypes "github.com/desmos-labs/desmos/v6/x/posts/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -105,7 +104,7 @@ func RandomAddress(r *rand.Rand, addresses []string) string { } // RandomAuthAccount returns a random account from the slice given -func RandomAuthAccount(r *rand.Rand, accounts []authtypes.AccountI) authtypes.AccountI { +func RandomAuthAccount(r *rand.Rand, accounts []sdk.AccountI) sdk.AccountI { return accounts[r.Intn(len(accounts))] } @@ -129,7 +128,7 @@ func GenerateRandomFeeTokens(r *rand.Rand) sdk.Coins { coins := make(sdk.Coins, r.Intn(10)) for i := range coins { - coins[i] = sdk.NewCoin(simtypes.RandStringOfLength(r, 10), sdk.NewInt(r.Int63n(1000000))) + coins[i] = sdk.NewCoin(simtypes.RandStringOfLength(r, 10), math.NewInt(r.Int63n(1000000))) } return coins.Sort() diff --git a/x/subspaces/testutil/expected_keepers_mocks.go b/x/subspaces/testutil/expected_keepers_mocks.go index a2e5ba7bd1..9cf5604483 100644 --- a/x/subspaces/testutil/expected_keepers_mocks.go +++ b/x/subspaces/testutil/expected_keepers_mocks.go @@ -5,11 +5,11 @@ package testutil import ( + context "context" reflect "reflect" time "time" types "github.com/cosmos/cosmos-sdk/types" - types0 "github.com/cosmos/cosmos-sdk/x/auth/types" authz "github.com/cosmos/cosmos-sdk/x/authz" gomock "github.com/golang/mock/gomock" ) @@ -38,7 +38,7 @@ func (m *MockAccountKeeper) EXPECT() *MockAccountKeeperMockRecorder { } // HasAccount mocks base method. -func (m *MockAccountKeeper) HasAccount(ctx types.Context, addr types.AccAddress) bool { +func (m *MockAccountKeeper) HasAccount(ctx context.Context, addr types.AccAddress) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HasAccount", ctx, addr) ret0, _ := ret[0].(bool) @@ -52,10 +52,10 @@ func (mr *MockAccountKeeperMockRecorder) HasAccount(ctx, addr interface{}) *gomo } // NewAccountWithAddress mocks base method. -func (m *MockAccountKeeper) NewAccountWithAddress(ctx types.Context, addr types.AccAddress) types0.AccountI { +func (m *MockAccountKeeper) NewAccountWithAddress(ctx context.Context, addr types.AccAddress) types.AccountI { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "NewAccountWithAddress", ctx, addr) - ret0, _ := ret[0].(types0.AccountI) + ret0, _ := ret[0].(types.AccountI) return ret0 } @@ -66,7 +66,7 @@ func (mr *MockAccountKeeperMockRecorder) NewAccountWithAddress(ctx, addr interfa } // SetAccount mocks base method. -func (m *MockAccountKeeper) SetAccount(ctx types.Context, acc types0.AccountI) { +func (m *MockAccountKeeper) SetAccount(ctx context.Context, acc types.AccountI) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetAccount", ctx, acc) } @@ -101,7 +101,7 @@ func (m *MockAuthzKeeper) EXPECT() *MockAuthzKeeperMockRecorder { } // DeleteGrant mocks base method. -func (m *MockAuthzKeeper) DeleteGrant(ctx types.Context, grantee, granter types.AccAddress, msgType string) error { +func (m *MockAuthzKeeper) DeleteGrant(ctx context.Context, grantee, granter types.AccAddress, msgType string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteGrant", ctx, grantee, granter, msgType) ret0, _ := ret[0].(error) @@ -115,7 +115,7 @@ func (mr *MockAuthzKeeperMockRecorder) DeleteGrant(ctx, grantee, granter, msgTyp } // SaveGrant mocks base method. -func (m *MockAuthzKeeper) SaveGrant(ctx types.Context, grantee, granter types.AccAddress, authorization authz.Authorization, expiration *time.Time) error { +func (m *MockAuthzKeeper) SaveGrant(ctx context.Context, grantee, granter types.AccAddress, authorization authz.Authorization, expiration *time.Time) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SaveGrant", ctx, grantee, granter, authorization, expiration) ret0, _ := ret[0].(error) diff --git a/x/subspaces/types/codec.go b/x/subspaces/types/codec.go index 0afc5cb745..3ec8c6f58e 100644 --- a/x/subspaces/types/codec.go +++ b/x/subspaces/types/codec.go @@ -4,11 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" "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" - authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" - govcodec "github.com/cosmos/cosmos-sdk/x/gov/codec" ) func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { @@ -77,29 +74,3 @@ func RegisterInterfaces(registry types.InterfaceRegistry) { msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } - -var ( - amino = codec.NewLegacyAmino() - - // AminoCodec references the global x/subspaces module codec. Note, the codec should - // ONLY be used in certain instances of tests and for JSON encoding as Amino is - // still used for that purpose. - // - // The actual codec used for serialization should be provided to x/subspaces and - // defined at the application level. - AminoCodec = codec.NewAminoCodec(amino) -) - -func init() { - RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) - sdk.RegisterLegacyAminoCodec(amino) - - // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be - // used to properly serialize MsgGrant and MsgExec instances - RegisterLegacyAminoCodec(authzcodec.Amino) - - // Register all Amino interfaces and concrete types on the gov Amino codec so that this can later be - // used to properly serialize MsgSubmitProposal instances - RegisterLegacyAminoCodec(govcodec.Amino) -} diff --git a/x/subspaces/types/expected_keepers.go b/x/subspaces/types/expected_keepers.go index 45b797f69d..9cbb74b134 100644 --- a/x/subspaces/types/expected_keepers.go +++ b/x/subspaces/types/expected_keepers.go @@ -1,22 +1,22 @@ package types import ( + context "context" "time" sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" authztypes "github.com/cosmos/cosmos-sdk/x/authz" ) // DONTCOVER type AccountKeeper interface { - NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI - HasAccount(ctx sdk.Context, addr sdk.AccAddress) bool - SetAccount(ctx sdk.Context, acc authtypes.AccountI) + NewAccountWithAddress(ctx context.Context, addr sdk.AccAddress) sdk.AccountI + HasAccount(ctx context.Context, addr sdk.AccAddress) bool + SetAccount(ctx context.Context, acc sdk.AccountI) } type AuthzKeeper interface { - SaveGrant(ctx sdk.Context, grantee, granter sdk.AccAddress, authorization authztypes.Authorization, expiration *time.Time) error - DeleteGrant(ctx sdk.Context, grantee sdk.AccAddress, granter sdk.AccAddress, msgType string) error + SaveGrant(ctx context.Context, grantee, granter sdk.AccAddress, authorization authztypes.Authorization, expiration *time.Time) error + DeleteGrant(ctx context.Context, grantee sdk.AccAddress, granter sdk.AccAddress, msgType string) error } diff --git a/x/subspaces/types/genesis.pb.go b/x/subspaces/types/genesis.pb.go index 452839eb16..d47fc4a0ec 100644 --- a/x/subspaces/types/genesis.pb.go +++ b/x/subspaces/types/genesis.pb.go @@ -260,42 +260,42 @@ var fileDescriptor_94a00ef70ca23c28 = []byte{ // 602 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0x4f, 0x8b, 0xd3, 0x40, 0x18, 0xc6, 0x9b, 0xfd, 0xd7, 0x76, 0xb2, 0xdd, 0xda, 0xb4, 0x42, 0x2c, 0x9a, 0x74, 0x57, 0x90, - 0x2a, 0x6e, 0x02, 0x5b, 0x3c, 0x28, 0x78, 0xb0, 0x76, 0x2d, 0x15, 0x15, 0x69, 0xf1, 0xa0, 0x97, - 0x90, 0x36, 0x43, 0x0c, 0x34, 0x99, 0x92, 0x77, 0x52, 0xba, 0x1f, 0x42, 0xf0, 0xe8, 0x71, 0x6f, - 0x7a, 0xf4, 0xe0, 0xc5, 0x6f, 0xb0, 0xc7, 0xc5, 0x93, 0xa7, 0x20, 0xe9, 0x41, 0x3f, 0x86, 0x64, - 0x92, 0xa6, 0xe3, 0x1a, 0x17, 0xbc, 0x94, 0x99, 0xf7, 0x7d, 0x9e, 0x5f, 0x9e, 0xe9, 0xbc, 0x09, - 0xda, 0xb7, 0x30, 0xb8, 0x04, 0x74, 0x08, 0xc6, 0x30, 0x33, 0x27, 0x18, 0xf4, 0x79, 0x47, 0xb7, - 0xb1, 0x87, 0xc1, 0x01, 0x6d, 0xe6, 0x13, 0x4a, 0xa4, 0x7a, 0x22, 0xd1, 0x32, 0x89, 0x36, 0xef, - 0x34, 0x6b, 0xa6, 0xeb, 0x78, 0x44, 0x67, 0xbf, 0x89, 0xae, 0xd9, 0xb0, 0x89, 0x4d, 0xd8, 0x52, - 0x8f, 0x57, 0x69, 0xf5, 0xda, 0x84, 0xc4, 0x6e, 0x23, 0x69, 0x24, 0x9b, 0xb4, 0xd5, 0xca, 0x7b, - 0xb6, 0x4b, 0x2c, 0x3c, 0x4d, 0x15, 0x07, 0xef, 0xb6, 0xd1, 0x6e, 0x3f, 0x09, 0x33, 0xa2, 0x26, - 0xc5, 0xd2, 0x31, 0xaa, 0x3b, 0x9e, 0x43, 0x1d, 0x73, 0x6a, 0xac, 0x5c, 0x86, 0x63, 0xc9, 0x42, - 0x4b, 0x68, 0x6f, 0x75, 0xaf, 0x46, 0xa1, 0x5a, 0x1b, 0x24, 0xed, 0x51, 0xda, 0x1d, 0xf4, 0x86, - 0x35, 0xe7, 0x42, 0xc9, 0x92, 0x46, 0x68, 0x2f, 0x7b, 0xa8, 0x61, 0x99, 0xd4, 0x94, 0x37, 0x5a, - 0x9b, 0x6d, 0xf1, 0x68, 0x5f, 0xcb, 0x39, 0xab, 0xb6, 0x32, 0xf6, 0x4c, 0x6a, 0x76, 0xcb, 0x67, - 0xa1, 0x5a, 0xf8, 0xf4, 0xf3, 0xf3, 0x1d, 0x61, 0x58, 0xc9, 0x54, 0x71, 0x47, 0x7a, 0x82, 0xca, - 0x59, 0x41, 0xde, 0x64, 0xbc, 0x1b, 0x97, 0xf2, 0x78, 0xd6, 0xda, 0x2a, 0x3d, 0x46, 0x25, 0xc0, - 0x13, 0xea, 0x10, 0x0f, 0xe4, 0x2d, 0x86, 0xb9, 0x9e, 0x8f, 0x49, 0x44, 0x3c, 0x25, 0x33, 0x4a, - 0xaf, 0xd1, 0x95, 0x00, 0xb0, 0x6f, 0xcc, 0xb0, 0xef, 0x3a, 0x00, 0x0c, 0xb6, 0xcd, 0x60, 0x37, - 0x73, 0x61, 0xaf, 0x00, 0xfb, 0x2f, 0x33, 0x2d, 0xcf, 0xac, 0x06, 0x7f, 0xb4, 0x40, 0x7a, 0x8a, - 0x44, 0x86, 0xb6, 0x7d, 0x12, 0xcc, 0x40, 0xde, 0x61, 0x54, 0xe5, 0x9f, 0xd4, 0x7e, 0x2c, 0xe3, - 0x81, 0x28, 0x58, 0x55, 0x41, 0xb2, 0x50, 0x9d, 0x63, 0x19, 0x2e, 0x76, 0xc7, 0xd8, 0x07, 0xb9, - 0xc8, 0x98, 0xb7, 0x2f, 0x67, 0x3e, 0x67, 0xe2, 0x63, 0x8f, 0xfa, 0x27, 0x3c, 0xbe, 0xb6, 0xc6, - 0x27, 0x0a, 0x90, 0x1e, 0xa2, 0x1d, 0xdb, 0x37, 0x3d, 0x0a, 0x72, 0x89, 0x81, 0x9b, 0xb9, 0xe0, - 0x7e, 0x2c, 0xe1, 0x49, 0xa9, 0xe9, 0x41, 0xe9, 0xc3, 0xa9, 0x2a, 0xfc, 0x3a, 0x55, 0x85, 0x83, - 0xaf, 0x02, 0xda, 0xe5, 0xa7, 0x41, 0xd2, 0x91, 0xf8, 0xf7, 0x1c, 0xee, 0x45, 0xa1, 0x8a, 0xb8, - 0x01, 0x44, 0xb0, 0x9e, 0xbc, 0x0e, 0xaa, 0x78, 0x78, 0x41, 0x93, 0x03, 0xc7, 0x96, 0x8d, 0x96, - 0xd0, 0xae, 0x74, 0xab, 0x51, 0xa8, 0x8a, 0x2f, 0xf0, 0x82, 0xb2, 0xe0, 0x83, 0xde, 0x50, 0xf4, - 0xb2, 0x8d, 0x25, 0xdd, 0x47, 0x55, 0x66, 0x4a, 0x6f, 0x37, 0xb6, 0x6d, 0x32, 0x5b, 0x2d, 0x0a, - 0xd5, 0x4a, 0x6c, 0x4b, 0x67, 0x61, 0xd0, 0x1b, 0x32, 0xfc, 0x6a, 0x6b, 0x71, 0xd9, 0x3f, 0x0a, - 0xa8, 0x91, 0xf7, 0xdf, 0xfd, 0xff, 0x19, 0x6e, 0xa1, 0xd2, 0x85, 0xf8, 0x62, 0x14, 0xaa, 0xc5, - 0x55, 0xf4, 0xa2, 0x9d, 0xc6, 0xbe, 0x8b, 0xb6, 0xe2, 0xbb, 0x60, 0x59, 0xcb, 0x5d, 0xf9, 0xdb, - 0x97, 0xc3, 0x46, 0xfa, 0xfe, 0x3f, 0xb2, 0x2c, 0x1f, 0x03, 0x8c, 0xa8, 0xef, 0x78, 0xf6, 0x90, - 0xa9, 0xd6, 0x49, 0xbb, 0xcf, 0xce, 0x22, 0x45, 0x38, 0x8f, 0x14, 0xe1, 0x47, 0xa4, 0x08, 0xef, - 0x97, 0x4a, 0xe1, 0x7c, 0xa9, 0x14, 0xbe, 0x2f, 0x95, 0xc2, 0x9b, 0x23, 0xdb, 0xa1, 0x6f, 0x83, - 0xb1, 0x36, 0x21, 0xae, 0x9e, 0x5c, 0xe1, 0xe1, 0xd4, 0x1c, 0x43, 0xba, 0xd6, 0xe7, 0xf7, 0xf4, - 0x05, 0xf7, 0x35, 0xa1, 0x27, 0x33, 0x0c, 0xe3, 0x1d, 0xf6, 0x29, 0xe9, 0xfc, 0x0e, 0x00, 0x00, - 0xff, 0xff, 0x23, 0xe8, 0xc4, 0x25, 0xea, 0x04, 0x00, 0x00, + 0x2a, 0x6e, 0x02, 0x5b, 0x10, 0x14, 0x3c, 0x58, 0xbb, 0x96, 0x8a, 0x8a, 0xb4, 0x78, 0xd0, 0x4b, + 0x48, 0x9b, 0x21, 0x06, 0x9a, 0x4c, 0xc9, 0x3b, 0x29, 0xdd, 0x0f, 0x21, 0x78, 0xf4, 0xb8, 0x37, + 0x3d, 0x7a, 0xf0, 0xe2, 0x37, 0xd8, 0xe3, 0xe2, 0xc9, 0x53, 0x90, 0xf4, 0xa0, 0x1f, 0x43, 0x32, + 0x49, 0xd3, 0x71, 0x8d, 0x0b, 0x5e, 0xca, 0xcc, 0xfb, 0x3e, 0xcf, 0x2f, 0xcf, 0x74, 0xde, 0x04, + 0xed, 0x5b, 0x18, 0x5c, 0x02, 0x3a, 0x04, 0x63, 0x98, 0x99, 0x13, 0x0c, 0xfa, 0xbc, 0xa3, 0xdb, + 0xd8, 0xc3, 0xe0, 0x80, 0x36, 0xf3, 0x09, 0x25, 0x52, 0x3d, 0x91, 0x68, 0x99, 0x44, 0x9b, 0x77, + 0x9a, 0x35, 0xd3, 0x75, 0x3c, 0xa2, 0xb3, 0xdf, 0x44, 0xd7, 0x6c, 0xd8, 0xc4, 0x26, 0x6c, 0xa9, + 0xc7, 0xab, 0xb4, 0x7a, 0x6d, 0x42, 0x62, 0xb7, 0x91, 0x34, 0x92, 0x4d, 0xda, 0x6a, 0xe5, 0x3d, + 0xdb, 0x25, 0x16, 0x9e, 0xa6, 0x8a, 0x83, 0x77, 0xdb, 0x68, 0xb7, 0x9f, 0x84, 0x19, 0x51, 0x93, + 0x62, 0xe9, 0x18, 0xd5, 0x1d, 0xcf, 0xa1, 0x8e, 0x39, 0x35, 0x56, 0x2e, 0xc3, 0xb1, 0x64, 0xa1, + 0x25, 0xb4, 0xb7, 0xba, 0x57, 0xa3, 0x50, 0xad, 0x0d, 0x92, 0xf6, 0x28, 0xed, 0x0e, 0x7a, 0xc3, + 0x9a, 0x73, 0xa1, 0x64, 0x49, 0x23, 0xb4, 0x97, 0x3d, 0xd4, 0xb0, 0x4c, 0x6a, 0xca, 0x1b, 0xad, + 0xcd, 0xb6, 0x78, 0xb4, 0xaf, 0xe5, 0x9c, 0x55, 0x5b, 0x19, 0x7b, 0x26, 0x35, 0xbb, 0xe5, 0xb3, + 0x50, 0x2d, 0x7c, 0xfa, 0xf9, 0xf9, 0x8e, 0x30, 0xac, 0x64, 0xaa, 0xb8, 0x23, 0x3d, 0x41, 0xe5, + 0xac, 0x20, 0x6f, 0x32, 0xde, 0x8d, 0x4b, 0x79, 0x3c, 0x6b, 0x6d, 0x95, 0x1e, 0xa3, 0x12, 0xe0, + 0x09, 0x75, 0x88, 0x07, 0xf2, 0x16, 0xc3, 0x5c, 0xcf, 0xc7, 0x24, 0x22, 0x9e, 0x92, 0x19, 0xa5, + 0xd7, 0xe8, 0x4a, 0x00, 0xd8, 0x37, 0x66, 0xd8, 0x77, 0x1d, 0x00, 0x06, 0xdb, 0x66, 0xb0, 0x9b, + 0xb9, 0xb0, 0x57, 0x80, 0xfd, 0x97, 0x99, 0x96, 0x67, 0x56, 0x83, 0x3f, 0x5a, 0x20, 0x3d, 0x45, + 0x22, 0x43, 0xdb, 0x3e, 0x09, 0x66, 0x20, 0xef, 0x30, 0xaa, 0xf2, 0x4f, 0x6a, 0x3f, 0x96, 0xf1, + 0x40, 0x14, 0xac, 0xaa, 0x20, 0x59, 0xa8, 0xce, 0xb1, 0x0c, 0x17, 0xbb, 0x63, 0xec, 0x83, 0x5c, + 0x64, 0xcc, 0xdb, 0x97, 0x33, 0x9f, 0x33, 0xf1, 0xb1, 0x47, 0xfd, 0x13, 0x1e, 0x5f, 0x5b, 0xe3, + 0x13, 0x05, 0x48, 0x0f, 0xd1, 0x8e, 0xed, 0x9b, 0x1e, 0x05, 0xb9, 0xc4, 0xc0, 0xcd, 0x5c, 0x70, + 0x3f, 0x96, 0xf0, 0xa4, 0xd4, 0xf4, 0xa0, 0xf4, 0xe1, 0x54, 0x15, 0x7e, 0x9d, 0xaa, 0xc2, 0xc1, + 0x57, 0x01, 0xed, 0xf2, 0xd3, 0x20, 0xe9, 0x48, 0xfc, 0x7b, 0x0e, 0xf7, 0xa2, 0x50, 0x45, 0xdc, + 0x00, 0x22, 0x58, 0x4f, 0x5e, 0x07, 0x55, 0x3c, 0xbc, 0xa0, 0xc9, 0x81, 0x63, 0xcb, 0x46, 0x4b, + 0x68, 0x57, 0xba, 0xd5, 0x28, 0x54, 0xc5, 0x17, 0x78, 0x41, 0x59, 0xf0, 0x41, 0x6f, 0x28, 0x7a, + 0xd9, 0xc6, 0x92, 0xee, 0xa3, 0x2a, 0x33, 0xa5, 0xb7, 0x1b, 0xdb, 0x36, 0x99, 0xad, 0x16, 0x85, + 0x6a, 0x25, 0xb6, 0xa5, 0xb3, 0x30, 0xe8, 0x0d, 0x19, 0x7e, 0xb5, 0xb5, 0xb8, 0xec, 0x1f, 0x05, + 0xd4, 0xc8, 0xfb, 0xef, 0xfe, 0xff, 0x0c, 0xb7, 0x50, 0xe9, 0x42, 0x7c, 0x31, 0x0a, 0xd5, 0xe2, + 0x2a, 0x7a, 0xd1, 0x4e, 0x63, 0xdf, 0x45, 0x5b, 0xf1, 0x5d, 0xb0, 0xac, 0xe5, 0xae, 0xfc, 0xed, + 0xcb, 0x61, 0x23, 0x7d, 0xff, 0x1f, 0x59, 0x96, 0x8f, 0x01, 0x46, 0xd4, 0x77, 0x3c, 0x7b, 0xc8, + 0x54, 0xeb, 0xa4, 0xdd, 0x67, 0x67, 0x91, 0x22, 0x9c, 0x47, 0x8a, 0xf0, 0x23, 0x52, 0x84, 0xf7, + 0x4b, 0xa5, 0x70, 0xbe, 0x54, 0x0a, 0xdf, 0x97, 0x4a, 0xe1, 0xcd, 0x91, 0xed, 0xd0, 0xb7, 0xc1, + 0x58, 0x9b, 0x10, 0x57, 0x4f, 0xae, 0xf0, 0x70, 0x6a, 0x8e, 0x21, 0x5d, 0xeb, 0xf3, 0x7b, 0xfa, + 0x82, 0xfb, 0x9a, 0xd0, 0x93, 0x19, 0x86, 0xf1, 0x0e, 0xfb, 0x94, 0x74, 0x7e, 0x07, 0x00, 0x00, + 0xff, 0xff, 0xe0, 0xc5, 0x50, 0x96, 0xea, 0x04, 0x00, 0x00, } func (this *GenesisState) Equal(that interface{}) bool { diff --git a/x/subspaces/types/genesis_test.go b/x/subspaces/types/genesis_test.go index 5bd6c9e562..26fd6ec94a 100644 --- a/x/subspaces/types/genesis_test.go +++ b/x/subspaces/types/genesis_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + "cosmossdk.io/x/feegrant" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/desmos-labs/desmos/v6/x/subspaces/types" diff --git a/x/subspaces/types/models.pb.go b/x/subspaces/types/models.pb.go index c021071cae..be916afc3f 100644 --- a/x/subspaces/types/models.pb.go +++ b/x/subspaces/types/models.pb.go @@ -564,7 +564,7 @@ var fileDescriptor_ca57465af0d8b734 = []byte{ // 981 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x6f, 0x1b, 0x45, 0x18, 0xce, 0xfa, 0x23, 0xb6, 0x67, 0xf3, 0x41, 0x37, 0x01, 0x6d, 0x03, 0xf2, 0x58, 0x5b, 0xaa, - 0x5a, 0xa1, 0xd9, 0x55, 0x12, 0x21, 0x41, 0x50, 0x91, 0x62, 0x42, 0xad, 0x48, 0x1c, 0xaa, 0x4d, + 0x5a, 0xa1, 0xd9, 0x55, 0x12, 0x09, 0x41, 0x50, 0x91, 0x62, 0x42, 0xad, 0x48, 0x1c, 0xaa, 0x4d, 0xb9, 0x70, 0xb1, 0xc6, 0xbb, 0x93, 0x65, 0x55, 0xef, 0x8e, 0xd9, 0x59, 0xa7, 0xf8, 0xca, 0x2f, 0xe8, 0x11, 0x21, 0x21, 0xf5, 0x88, 0x38, 0xf5, 0x50, 0xfe, 0x43, 0xc5, 0xa9, 0xe2, 0x84, 0x38, 0x6c, 0x91, 0x73, 0x28, 0x07, 0x4e, 0x16, 0x3f, 0x00, 0xcd, 0xd7, 0x7a, 0x53, 0xec, 0x10, 0xa4, @@ -622,8 +622,8 @@ var fileDescriptor_ca57465af0d8b734 = []byte{ 0xca, 0x35, 0x3b, 0x9f, 0x3d, 0x9b, 0x34, 0xb5, 0xe7, 0x93, 0xa6, 0xf6, 0xfb, 0xa4, 0xa9, 0x3d, 0x3a, 0x6f, 0x2e, 0x3d, 0x3f, 0x6f, 0x2e, 0xfd, 0x7a, 0xde, 0x5c, 0xfa, 0x62, 0xaf, 0xf0, 0x88, 0x08, 0x86, 0x9d, 0x01, 0xea, 0x53, 0x39, 0x76, 0xce, 0xde, 0x77, 0xbe, 0x2e, 0xfc, 0xba, 0xe2, - 0x8f, 0x4a, 0x7f, 0x99, 0x37, 0x66, 0xff, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8e, 0x50, 0x84, - 0xc4, 0x7e, 0x09, 0x00, 0x00, + 0x8f, 0x4a, 0x7f, 0x99, 0x37, 0x66, 0xff, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x7d, 0x10, + 0x77, 0x7e, 0x09, 0x00, 0x00, } func (this *Subspace) Equal(that interface{}) bool { diff --git a/x/subspaces/types/models_feegrant.go b/x/subspaces/types/models_feegrant.go index 1cdc91540f..2b6a809ad9 100644 --- a/x/subspaces/types/models_feegrant.go +++ b/x/subspaces/types/models_feegrant.go @@ -5,10 +5,10 @@ import ( "time" errors "cosmossdk.io/errors" + feegranttypes "cosmossdk.io/x/feegrant" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant" proto "github.com/gogo/protobuf/proto" ) diff --git a/x/subspaces/types/models_feegrant_test.go b/x/subspaces/types/models_feegrant_test.go index 6f918011f3..57f42df615 100644 --- a/x/subspaces/types/models_feegrant_test.go +++ b/x/subspaces/types/models_feegrant_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + "cosmossdk.io/x/feegrant" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/x/subspaces/types" diff --git a/x/subspaces/types/models_test.go b/x/subspaces/types/models_test.go index e8feaddd62..211449d9d7 100644 --- a/x/subspaces/types/models_test.go +++ b/x/subspaces/types/models_test.go @@ -6,6 +6,7 @@ import ( "testing" "time" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -154,7 +155,7 @@ func TestSubspace_Validate(t *testing.T) { "cosmos1s0he0z3g92zwsxdj83h0ky9w463sx7gq9mqtgn", "cosmos1s0he0z3g92zwsxdj83h0ky9w463sx7gq9mqtgn", time.Date(2020, 1, 1, 12, 00, 00, 000, time.UTC), - sdk.Coins{{Denom: "minttoken", Amount: sdk.NewInt(-10)}}, + sdk.Coins{{Denom: "minttoken", Amount: math.NewInt(-10)}}, ), shouldErr: true, }, @@ -653,8 +654,8 @@ func TestAdditionalFeeTokensUpdate_Update(t *testing.T) { ) updated := types.NewAdditionalFeeTokensUpdate( - sdk.NewCoin("minttoken", sdk.NewInt(10)), - sdk.NewCoin("ustar", sdk.NewInt(10)), + sdk.NewCoin("minttoken", math.NewInt(10)), + sdk.NewCoin("ustar", math.NewInt(10)), ).Update(subspace) require.Equal(t, types.NewSubspace( @@ -666,8 +667,8 @@ func TestAdditionalFeeTokensUpdate_Update(t *testing.T) { "cosmos1s0he0z3g92zwsxdj83h0ky9w463sx7gq9mqtgn", time.Date(2020, 1, 1, 12, 00, 00, 000, time.UTC), sdk.NewCoins( - sdk.NewCoin("minttoken", sdk.NewInt(10)), - sdk.NewCoin("ustar", sdk.NewInt(10)), + sdk.NewCoin("minttoken", math.NewInt(10)), + sdk.NewCoin("ustar", math.NewInt(10)), ), ), updated) } diff --git a/x/subspaces/types/msg_feegrant_test.go b/x/subspaces/types/msg_feegrant_test.go index d6f5e35acf..971ca1f466 100644 --- a/x/subspaces/types/msg_feegrant_test.go +++ b/x/subspaces/types/msg_feegrant_test.go @@ -3,9 +3,9 @@ package types_test import ( "testing" + "cosmossdk.io/x/feegrant" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/x/subspaces/types" @@ -104,11 +104,6 @@ func TestMsgGrantAllowance_ValidateBasic(t *testing.T) { } } -func TestMsgGrantAllowance_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgGrantAllowance","value":{"allowance":{"spend_limit":[]},"grantee":{"type":"desmos/UserGrantee","value":{"user":"cosmos1lv3e0l66rr68k5l74mnrv4j9kyny6cz27pvnez"}},"granter":"cosmos1vkuuth0rak58x36m7wuzj7ztttxh26fhqcfxm0","subspace_id":"1"}}` - require.Equal(t, expected, string(msgGrantAllowance.GetSignBytes())) -} - func TestMsgGrantAllowance_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgGrantAllowance.Granter) require.Equal(t, []sdk.AccAddress{addr}, msgGrantAllowance.GetSigners()) @@ -182,11 +177,6 @@ func TestMsgRevokeAllowance_ValidateBasic(t *testing.T) { } } -func TestMsgRevokeAllowance_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRevokeAllowance","value":{"grantee":{"type":"desmos/UserGrantee","value":{"user":"cosmos1lv3e0l66rr68k5l74mnrv4j9kyny6cz27pvnez"}},"granter":"cosmos1vkuuth0rak58x36m7wuzj7ztttxh26fhqcfxm0","subspace_id":"1"}}` - require.Equal(t, expected, string(msgRevokeAllowance.GetSignBytes())) -} - func TestMsgRevokeAllowance_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRevokeAllowance.Granter) require.Equal(t, []sdk.AccAddress{addr}, msgRevokeAllowance.GetSigners()) diff --git a/x/subspaces/types/msgs.go b/x/subspaces/types/msgs.go index 20f0572a55..1e13cfa041 100644 --- a/x/subspaces/types/msgs.go +++ b/x/subspaces/types/msgs.go @@ -7,7 +7,6 @@ import ( "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" ) // SubspaceMsg represents a generic message that is related to a subspace @@ -103,11 +102,6 @@ func (msg *MsgCreateSubspace) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgCreateSubspace) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgCreateSubspace) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Creator) @@ -153,11 +147,6 @@ func (msg *MsgEditSubspace) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgEditSubspace) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgEditSubspace) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -197,11 +186,6 @@ func (msg *MsgDeleteSubspace) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgDeleteSubspace) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgDeleteSubspace) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -254,11 +238,6 @@ func (msg *MsgCreateSection) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgCreateSection) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgCreateSection) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Creator) @@ -311,11 +290,6 @@ func (msg *MsgEditSection) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgEditSection) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgEditSection) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Editor) @@ -366,11 +340,6 @@ func (msg *MsgMoveSection) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgMoveSection) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgMoveSection) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -415,11 +384,6 @@ func (msg *MsgDeleteSection) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgDeleteSection) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgDeleteSection) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -487,11 +451,6 @@ func (msg *MsgCreateUserGroup) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgCreateUserGroup) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgCreateUserGroup) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Creator) @@ -540,11 +499,6 @@ func (msg *MsgEditUserGroup) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgEditUserGroup) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgEditUserGroup) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -595,11 +549,6 @@ func (msg *MsgMoveUserGroup) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgMoveUserGroup) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgMoveUserGroup) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -650,11 +599,6 @@ func (msg *MsgSetUserGroupPermissions) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgSetUserGroupPermissions) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgSetUserGroupPermissions) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -699,11 +643,6 @@ func (msg *MsgDeleteUserGroup) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgDeleteUserGroup) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgDeleteUserGroup) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -759,11 +698,6 @@ func (msg *MsgAddUserToUserGroup) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgAddUserToUserGroup) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgAddUserToUserGroup) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -819,11 +753,6 @@ func (msg *MsgRemoveUserFromUserGroup) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgRemoveUserFromUserGroup) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgRemoveUserFromUserGroup) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -885,11 +814,6 @@ func (msg *MsgSetUserPermissions) ValidateBasic() error { return nil } -// GetSignBytes implements sdk.Msg -func (msg *MsgSetUserPermissions) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgSetUserPermissions) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Signer) @@ -902,8 +826,7 @@ func (msg *MsgSetUserPermissions) IsManageSubspaceMsg() {} // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgUpdateSubspaceFeeTokens{} - _ legacytx.LegacyMsg = &MsgUpdateSubspaceFeeTokens{} + _ sdk.Msg = &MsgUpdateSubspaceFeeTokens{} ) // NewMsgUpdateSubspaceFeeTokens creates a new MsgUpdateSubspaceFeeTokens instance @@ -944,11 +867,6 @@ func (msg *MsgUpdateSubspaceFeeTokens) ValidateBasic() error { return nil } -// GetSignBytes implements legacytx.LegacyMsg -func (msg *MsgUpdateSubspaceFeeTokens) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgUpdateSubspaceFeeTokens) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Authority) diff --git a/x/subspaces/types/msgs.pb.go b/x/subspaces/types/msgs.pb.go index 266c382e50..a9a1400458 100644 --- a/x/subspaces/types/msgs.pb.go +++ b/x/subspaces/types/msgs.pb.go @@ -2363,11 +2363,11 @@ var fileDescriptor_35d68359a074bdd9 = []byte{ // 2006 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x6f, 0x23, 0x49, 0x15, 0x1f, 0x7f, 0x64, 0x32, 0x29, 0xe7, 0x63, 0xa6, 0xe7, 0x23, 0xb6, 0x67, 0x70, 0x87, 0xde, - 0x71, 0xe2, 0x98, 0x8d, 0xad, 0x24, 0xec, 0xb2, 0xeb, 0x15, 0x48, 0xf6, 0x66, 0x77, 0x14, 0xb1, - 0xd9, 0x5d, 0x79, 0x32, 0x42, 0x02, 0x21, 0xab, 0xed, 0xae, 0x74, 0x5a, 0xb1, 0xbb, 0xad, 0xae, - 0x76, 0x82, 0xf7, 0x84, 0x80, 0x03, 0x20, 0x24, 0x38, 0x23, 0xc1, 0x85, 0x0b, 0xe2, 0x94, 0xc3, - 0xf2, 0x37, 0xb0, 0xe2, 0x80, 0x16, 0x4e, 0x9c, 0xbc, 0xc8, 0x91, 0xc8, 0xdd, 0x17, 0xae, 0xa8, - 0xab, 0xaa, 0xab, 0xab, 0xdb, 0x2e, 0xc7, 0xf1, 0x7a, 0x20, 0x68, 0xb8, 0xc4, 0xdd, 0xaf, 0x7e, + 0x71, 0xe2, 0x98, 0x8d, 0xad, 0x24, 0x30, 0xec, 0x7a, 0x05, 0x92, 0xbd, 0xd9, 0x1d, 0x45, 0x6c, + 0x76, 0x57, 0x9e, 0x8c, 0x90, 0x40, 0xc8, 0x6a, 0xbb, 0x2b, 0x9d, 0x56, 0xec, 0x6e, 0xab, 0xab, + 0x9d, 0xe0, 0x3d, 0x21, 0xe0, 0x00, 0x08, 0x09, 0xce, 0x48, 0x70, 0xe1, 0x82, 0x38, 0xe5, 0xb0, + 0xfc, 0x0d, 0xac, 0x38, 0xa0, 0x85, 0x13, 0x27, 0x2f, 0x72, 0x24, 0x72, 0xf7, 0x85, 0x2b, 0xea, + 0xaa, 0xea, 0xea, 0xea, 0xb6, 0xcb, 0x71, 0xbc, 0x5e, 0x08, 0x9a, 0xbd, 0xc4, 0xdd, 0xaf, 0x7e, 0xf5, 0xaa, 0xea, 0xf7, 0x5e, 0xbd, 0x57, 0xfd, 0x2a, 0x20, 0xa3, 0x41, 0xd4, 0xb2, 0x50, 0x11, 0x75, 0xea, 0xa8, 0xad, 0x36, 0x20, 0x2a, 0x9e, 0xee, 0x16, 0x5b, 0x48, 0x47, 0x85, 0xb6, 0x6d, 0x39, 0x96, 0x74, 0x9f, 0xb4, 0x17, 0x58, 0x7b, 0xe1, 0x74, 0x37, 0x7d, 0x4f, 0x6d, 0x19, 0xa6, @@ -2375,92 +2375,92 @@ var fileDescriptor_35d68359a074bdd9 = []byte{ 0xe9, 0x96, 0xa5, 0x37, 0x61, 0x11, 0xbf, 0xd5, 0x3b, 0x47, 0x45, 0xd5, 0xec, 0xd2, 0xa6, 0x4c, 0xc3, 0xc2, 0x03, 0xd7, 0x55, 0x04, 0x8b, 0xa7, 0xdb, 0x75, 0xe8, 0xa8, 0xdb, 0xc5, 0x86, 0x65, 0x98, 0x5e, 0x57, 0xd2, 0x5e, 0x23, 0x3a, 0xc9, 0x0b, 0x6d, 0x5a, 0xa5, 0x5d, 0x5b, 0x48, 0x2f, - 0x9e, 0x6e, 0xbb, 0x3f, 0xb4, 0x61, 0x8d, 0x36, 0xa8, 0x1d, 0xe7, 0xf8, 0x13, 0xa6, 0x14, 0xbf, - 0x11, 0x84, 0xf2, 0xbb, 0x28, 0xb8, 0x77, 0x80, 0xf4, 0x77, 0x6d, 0xa8, 0x3a, 0xf0, 0x39, 0x5d, + 0x9e, 0x6e, 0xbb, 0x3f, 0xb4, 0x61, 0x8d, 0x36, 0xa8, 0x1d, 0xe7, 0xf8, 0x23, 0xa6, 0x14, 0xbf, + 0x11, 0x84, 0xf2, 0xfb, 0x28, 0xb8, 0x77, 0x80, 0xf4, 0xb7, 0x6d, 0xa8, 0x3a, 0xf0, 0x05, 0x5d, 0x93, 0xf4, 0x1a, 0x88, 0x9b, 0x6a, 0x0b, 0x26, 0x23, 0x6b, 0x91, 0xdc, 0x42, 0x65, 0x65, 0xd0, - 0x93, 0x13, 0x5d, 0xb5, 0xd5, 0x2c, 0x29, 0xae, 0x54, 0xa9, 0xe2, 0x46, 0xe9, 0x2d, 0x90, 0xd0, + 0x93, 0x13, 0x5d, 0xb5, 0xd5, 0x2c, 0x29, 0xae, 0x54, 0xa9, 0xe2, 0x46, 0xe9, 0x0d, 0x90, 0xd0, 0x20, 0x6a, 0xd8, 0x46, 0xdb, 0x31, 0x2c, 0x33, 0x19, 0xc5, 0xd8, 0x47, 0x83, 0x9e, 0x2c, 0x11, - 0x2c, 0xd7, 0xa8, 0x54, 0x79, 0xa8, 0xf4, 0x2d, 0x30, 0x67, 0x9d, 0x99, 0xd0, 0x4e, 0xc6, 0x70, - 0x9f, 0xdc, 0xa0, 0x27, 0x2f, 0x92, 0x3e, 0x58, 0xac, 0xfc, 0xed, 0xd3, 0xad, 0x07, 0x74, 0x81, - 0x65, 0x4d, 0xb3, 0x21, 0x42, 0xcf, 0x1d, 0xdb, 0x30, 0xf5, 0x2a, 0xe9, 0x26, 0xed, 0x81, 0xf9, + 0x2c, 0xd7, 0xa8, 0x54, 0x79, 0xa8, 0xf4, 0x6d, 0x30, 0x67, 0x9d, 0x99, 0xd0, 0x4e, 0xc6, 0x70, + 0x9f, 0xdc, 0xa0, 0x27, 0x2f, 0x92, 0x3e, 0x58, 0xac, 0xfc, 0xfd, 0xe3, 0xad, 0x07, 0x74, 0x81, + 0x65, 0x4d, 0xb3, 0x21, 0x42, 0x2f, 0x1c, 0xdb, 0x30, 0xf5, 0x2a, 0xe9, 0x26, 0xed, 0x81, 0xf9, 0x86, 0x3b, 0x61, 0xcb, 0x4e, 0xc6, 0xb1, 0x86, 0xfc, 0xa0, 0x27, 0x2f, 0x13, 0x0d, 0xb4, 0x41, - 0xac, 0xc3, 0xeb, 0x5a, 0xda, 0xfc, 0xd1, 0xe5, 0x79, 0xde, 0x7b, 0xfb, 0xf9, 0xe5, 0x79, 0x3e, + 0xac, 0xc3, 0xeb, 0x5a, 0xda, 0xfc, 0xf1, 0xe5, 0x79, 0xde, 0x7b, 0xfb, 0xc5, 0xe5, 0x79, 0x3e, 0x49, 0x4d, 0x3f, 0xc4, 0x87, 0x52, 0x07, 0xa9, 0x21, 0x61, 0x15, 0xa2, 0xb6, 0x65, 0x22, 0x28, - 0xbd, 0x07, 0x12, 0x9e, 0x33, 0xd4, 0x0c, 0x0d, 0x73, 0x16, 0xaf, 0x3c, 0xed, 0xf7, 0x64, 0xe0, + 0xbd, 0x03, 0x12, 0x9e, 0x33, 0xd4, 0x0c, 0x0d, 0x73, 0x16, 0xaf, 0x3c, 0xed, 0xf7, 0x64, 0xe0, 0x41, 0xf7, 0xf7, 0x7c, 0x56, 0x38, 0xa8, 0x52, 0x05, 0xde, 0xdb, 0xbe, 0xa6, 0xf4, 0xa3, 0x60, - 0xe5, 0x00, 0xe9, 0xef, 0x69, 0x86, 0xc3, 0xec, 0x30, 0x1b, 0xd5, 0xcc, 0x9c, 0xd1, 0x6b, 0x98, + 0xe5, 0x00, 0xe9, 0xef, 0x68, 0x86, 0xc3, 0xec, 0x30, 0x1b, 0xd5, 0xcc, 0x9c, 0xd1, 0x6b, 0x98, 0x33, 0x36, 0x85, 0x39, 0xe3, 0xd3, 0x99, 0xb3, 0x0c, 0x6e, 0x23, 0x43, 0x77, 0x15, 0xcc, 0x61, 0x05, 0x9b, 0x83, 0x9e, 0xbc, 0x44, 0x97, 0x84, 0xe5, 0x62, 0x0d, 0xb4, 0x63, 0x69, 0xdd, 0xb5, 0x25, 0x7d, 0x71, 0x4d, 0xf9, 0xc8, 0x37, 0x25, 0x4f, 0xa8, 0x92, 0x02, 0xab, 0x21, 0x91, 0x67, - 0x46, 0xe5, 0x4f, 0x11, 0xbc, 0x13, 0xf6, 0x60, 0x13, 0x72, 0x3b, 0x61, 0x46, 0x16, 0xf0, 0x97, + 0x46, 0xe5, 0xcf, 0x11, 0xbc, 0x13, 0xf6, 0x60, 0x13, 0x72, 0x3b, 0x61, 0x46, 0x16, 0xf0, 0x97, 0x18, 0x9d, 0x76, 0x89, 0xb9, 0xd0, 0x12, 0x39, 0x6f, 0x0d, 0xce, 0x59, 0x79, 0x8c, 0xbd, 0x35, - 0x28, 0x64, 0xcb, 0xbc, 0x8c, 0x82, 0xbb, 0xbe, 0x2f, 0xc3, 0x06, 0xb6, 0xe0, 0xff, 0x86, 0x9f, - 0x7d, 0x13, 0x2c, 0xb4, 0x55, 0x1b, 0x9a, 0x8e, 0x3b, 0x47, 0xd7, 0xd7, 0x96, 0x2a, 0x6b, 0xfd, - 0x9e, 0x7c, 0xe7, 0x63, 0x2c, 0xc4, 0x33, 0xbc, 0x4b, 0x74, 0x30, 0x98, 0x52, 0xbd, 0x43, 0x9e, + 0x28, 0x64, 0xcb, 0xbc, 0x8c, 0x82, 0xbb, 0xbe, 0x2f, 0xc3, 0x06, 0xb6, 0xe0, 0xff, 0x87, 0x9f, + 0x7d, 0x0b, 0x2c, 0xb4, 0x55, 0x1b, 0x9a, 0x8e, 0x3b, 0x47, 0xd7, 0xd7, 0x96, 0x2a, 0x6b, 0xfd, + 0x9e, 0x7c, 0xe7, 0x43, 0x2c, 0xc4, 0x33, 0xbc, 0x4b, 0x74, 0x30, 0x98, 0x52, 0xbd, 0x43, 0x9e, 0xf7, 0x35, 0x3e, 0x6a, 0xcc, 0x4d, 0x1f, 0x35, 0x72, 0xe1, 0xa8, 0xb1, 0x3a, 0x14, 0x35, 0x08, - 0xa9, 0xca, 0xf7, 0x41, 0x32, 0x2c, 0x63, 0x31, 0xa3, 0x0c, 0x00, 0x22, 0x22, 0x8f, 0xef, 0xa5, + 0xa9, 0xca, 0x0f, 0x40, 0x32, 0x2c, 0x63, 0x31, 0xa3, 0x0c, 0x00, 0x22, 0x22, 0x8f, 0xef, 0xa5, 0x8a, 0xd2, 0xef, 0xc9, 0x0b, 0x14, 0x88, 0x17, 0x73, 0x8f, 0xd2, 0xcd, 0x80, 0x4a, 0x75, 0x81, 0xbe, 0xec, 0x6b, 0xca, 0x45, 0x14, 0x2c, 0x7b, 0xbe, 0x3c, 0x5b, 0x33, 0x06, 0x27, 0x17, 0x9d, 0x62, 0x72, 0xcc, 0x13, 0x62, 0xd7, 0xf0, 0x84, 0xf8, 0xe4, 0x9e, 0x50, 0x06, 0xb7, 0xa1, 0x66, 0xf8, 0x96, 0xe4, 0xb6, 0x13, 0x91, 0x8f, 0xd9, 0x4e, 0x04, 0x50, 0xca, 0xe2, 0xed, 0x44, 0x5e, - 0x5c, 0x33, 0x3e, 0x0c, 0x45, 0x0c, 0x6a, 0xc4, 0x24, 0x78, 0x14, 0x94, 0xb0, 0x8d, 0xf4, 0x57, - 0xc2, 0xff, 0x81, 0x75, 0x0a, 0x6f, 0x1e, 0xff, 0xdf, 0x06, 0x4b, 0x26, 0x3c, 0xab, 0xf9, 0xdb, - 0x25, 0x86, 0xb5, 0x6c, 0xf4, 0x7b, 0x72, 0xe2, 0x43, 0x78, 0xc6, 0xed, 0x98, 0x07, 0xd4, 0x2e, + 0x5c, 0x33, 0x3e, 0x0c, 0x45, 0x0c, 0x6a, 0xc4, 0x24, 0x78, 0x14, 0x94, 0xb0, 0x8d, 0xf4, 0x37, + 0xc2, 0xff, 0x81, 0x75, 0x0a, 0x6f, 0x1e, 0xff, 0xdf, 0x01, 0x4b, 0x26, 0x3c, 0xab, 0xf9, 0xdb, + 0x25, 0x86, 0xb5, 0x6c, 0xf4, 0x7b, 0x72, 0xe2, 0x7d, 0x78, 0xc6, 0xed, 0x98, 0x07, 0xd4, 0x2e, 0x3c, 0x5a, 0xa9, 0x26, 0x4c, 0x06, 0xe2, 0x83, 0x57, 0x7c, 0xda, 0xe0, 0x95, 0x0d, 0x05, 0x2f, - 0x8e, 0x6d, 0x8e, 0x40, 0xca, 0x36, 0x27, 0x61, 0x6c, 0xff, 0x94, 0x84, 0x2d, 0x1a, 0xd4, 0x6e, + 0x8e, 0x6d, 0x8e, 0x40, 0xca, 0x36, 0x27, 0x61, 0x6c, 0xff, 0x8c, 0x84, 0x2d, 0x1a, 0xd4, 0x6e, 0x1c, 0xdf, 0x3e, 0x45, 0xb1, 0x69, 0x29, 0xda, 0x08, 0x51, 0xb4, 0x3a, 0x14, 0xdf, 0x29, 0x49, - 0x69, 0x1c, 0x57, 0x02, 0x32, 0x46, 0xd3, 0x6f, 0xe2, 0x40, 0x62, 0x41, 0xe7, 0x05, 0x82, 0xf6, - 0x33, 0xdb, 0xea, 0xb4, 0x5f, 0x9d, 0xc0, 0xf0, 0x11, 0xb8, 0xaf, 0xc1, 0x23, 0xb5, 0xd3, 0x74, + 0x69, 0x1c, 0x57, 0x02, 0x32, 0x46, 0xd3, 0x6f, 0xe3, 0x40, 0x62, 0x41, 0xe7, 0x25, 0x82, 0xf6, + 0x73, 0xdb, 0xea, 0xb4, 0x5f, 0x9d, 0xc0, 0xf0, 0x01, 0xb8, 0xaf, 0xc1, 0x23, 0xb5, 0xd3, 0x74, 0x6a, 0x6d, 0x68, 0xb7, 0x0c, 0x84, 0x0c, 0xcb, 0x44, 0xc9, 0xb9, 0xb5, 0x58, 0x6e, 0xa1, 0x92, - 0x19, 0xf4, 0xe4, 0xb4, 0xa7, 0x61, 0x08, 0xa4, 0x54, 0x25, 0x2a, 0xfd, 0xd8, 0x17, 0x4a, 0xdf, - 0x03, 0x2b, 0x86, 0x69, 0x38, 0x86, 0xda, 0xac, 0xb5, 0x60, 0xab, 0x0e, 0x6d, 0x94, 0xbc, 0x8d, + 0x19, 0xf4, 0xe4, 0xb4, 0xa7, 0x61, 0x08, 0xa4, 0x54, 0x25, 0x2a, 0xfd, 0xd0, 0x17, 0x4a, 0xdf, + 0x07, 0x2b, 0x86, 0x69, 0x38, 0x86, 0xda, 0xac, 0xb5, 0x60, 0xab, 0x0e, 0x6d, 0x94, 0xbc, 0x8d, 0x95, 0xed, 0x0c, 0x7a, 0xf2, 0x23, 0xa2, 0x2c, 0x04, 0x10, 0x9b, 0x7a, 0x99, 0x22, 0x0f, 0x08, 0x90, 0xcf, 0x48, 0xf3, 0xd3, 0x67, 0xa4, 0x7c, 0x38, 0x23, 0xa5, 0xc2, 0x19, 0x89, 0x39, 0x82, - 0xf2, 0x1d, 0x90, 0x1e, 0x96, 0xb2, 0xac, 0xf4, 0x36, 0xb8, 0xa3, 0xbb, 0x02, 0x3f, 0x27, 0x65, + 0xf2, 0x5d, 0x90, 0x1e, 0x96, 0xb2, 0xac, 0xf4, 0x26, 0xb8, 0xa3, 0xbb, 0x02, 0x3f, 0x27, 0x65, 0xfa, 0x3d, 0x79, 0x1e, 0x83, 0xb0, 0x6d, 0x57, 0xc8, 0xdc, 0x3c, 0x90, 0x52, 0x9d, 0xc7, 0x8f, - 0xfb, 0x9a, 0xf2, 0x05, 0xd9, 0x9f, 0x6e, 0xa0, 0x9c, 0xb9, 0xdb, 0xf1, 0xd3, 0x8a, 0x5e, 0x6b, - 0x5a, 0xff, 0x81, 0x3c, 0xf4, 0x65, 0x4f, 0xae, 0x63, 0xb6, 0x7d, 0x80, 0x4c, 0xba, 0xed, 0x03, - 0x32, 0x3e, 0x17, 0xdd, 0xa5, 0x81, 0xf3, 0x26, 0xb1, 0xff, 0x11, 0x58, 0x76, 0xf3, 0x0a, 0x17, - 0x33, 0x48, 0x1a, 0xda, 0xec, 0xf7, 0xe4, 0xc5, 0x0f, 0xe1, 0x19, 0x1f, 0x36, 0x1e, 0xfa, 0x79, + 0xfb, 0x9a, 0xf2, 0x19, 0xd9, 0x9f, 0x6e, 0xa0, 0x9c, 0xb9, 0xdb, 0xf1, 0xd3, 0x8a, 0x5e, 0x6b, + 0x5a, 0xff, 0x85, 0x3c, 0xf4, 0x79, 0x4f, 0xae, 0x63, 0xb6, 0x7d, 0x80, 0x4c, 0xba, 0xed, 0x03, + 0x32, 0x3e, 0x17, 0xdd, 0xa5, 0x81, 0xf3, 0x26, 0xb1, 0xff, 0x01, 0x58, 0x76, 0xf3, 0x0a, 0x17, + 0x33, 0x48, 0x1a, 0xda, 0xec, 0xf7, 0xe4, 0xc5, 0xf7, 0xe1, 0x19, 0x1f, 0x36, 0x1e, 0xfa, 0x79, 0x88, 0x0f, 0x1d, 0x8b, 0xa6, 0x0f, 0x9b, 0x49, 0x26, 0x1a, 0xc3, 0x77, 0x80, 0x3e, 0xca, 0x77, - 0x40, 0xc6, 0xf8, 0xfe, 0x4b, 0x14, 0xef, 0xa3, 0xe7, 0xd0, 0xb7, 0x05, 0x1f, 0x34, 0xfe, 0xfb, - 0xcc, 0xbf, 0x05, 0x12, 0x7c, 0xfc, 0x8b, 0xe1, 0x90, 0xc5, 0xb9, 0x74, 0x20, 0xee, 0xf1, 0xd0, + 0x40, 0xc6, 0xf8, 0xfe, 0x6b, 0x14, 0xef, 0xa3, 0x17, 0xd0, 0xb7, 0x05, 0x1f, 0x34, 0xfe, 0xf7, + 0xcc, 0xbf, 0x01, 0x12, 0x7c, 0xfc, 0x8b, 0xe1, 0x90, 0xc5, 0xb9, 0x74, 0x20, 0xee, 0xf1, 0xd0, 0x59, 0x50, 0xbc, 0x1d, 0xa2, 0xf8, 0xab, 0x3e, 0xc5, 0x02, 0xc6, 0x94, 0xa7, 0x40, 0x11, 0xb7, - 0x32, 0xda, 0x7f, 0x12, 0xc5, 0xd9, 0x8d, 0xa4, 0xbe, 0x9b, 0xe4, 0xe8, 0x33, 0x48, 0xff, 0x9b, + 0x32, 0xda, 0x7f, 0x1a, 0xc5, 0xd9, 0x8d, 0xa4, 0xbe, 0x9b, 0xe4, 0xe8, 0x33, 0x48, 0xff, 0x9b, 0x21, 0xd2, 0x52, 0xe1, 0xf4, 0xef, 0x7b, 0xe6, 0x13, 0xec, 0x7c, 0x21, 0xa9, 0xff, 0x1d, 0x1b, - 0x05, 0x0f, 0x0f, 0x90, 0x5e, 0xd6, 0x34, 0xb7, 0xed, 0xd0, 0xba, 0x49, 0x3c, 0xbd, 0x03, 0xe2, + 0x05, 0x0f, 0x0f, 0x90, 0x5e, 0xd6, 0x34, 0xb7, 0xed, 0xd0, 0xba, 0x49, 0x3c, 0xbd, 0x05, 0xe2, 0x1d, 0xc4, 0x58, 0xda, 0xf0, 0xc3, 0xb1, 0x2b, 0x15, 0x73, 0x84, 0x3b, 0xcd, 0xc2, 0x33, 0x5f, 0x0f, 0x91, 0xfc, 0xc4, 0x27, 0x79, 0x98, 0x2f, 0x45, 0x06, 0x5f, 0x19, 0xd9, 0xc0, 0x87, 0x5d, - 0xd7, 0x12, 0x55, 0xd8, 0xa2, 0x51, 0xe2, 0x7d, 0xdb, 0x6a, 0xfd, 0x9f, 0xef, 0x89, 0x22, 0x81, - 0x80, 0x34, 0x1a, 0x09, 0x04, 0xad, 0x8c, 0xf9, 0x9f, 0xc5, 0xb0, 0x93, 0xd3, 0x80, 0xf1, 0x12, - 0x62, 0xef, 0x0c, 0x8e, 0xba, 0x5f, 0x8a, 0xfc, 0x50, 0x00, 0x8f, 0x4f, 0x13, 0xc0, 0xe7, 0x5e, - 0xc2, 0x36, 0x19, 0x66, 0x9c, 0x6e, 0x93, 0xe1, 0x06, 0x66, 0xac, 0xdf, 0xc6, 0x70, 0x65, 0xed, - 0x99, 0xad, 0x9a, 0x4e, 0xb9, 0xd9, 0xb4, 0xce, 0x54, 0x73, 0x76, 0x95, 0xb5, 0x3d, 0x30, 0xaf, - 0xbb, 0x8a, 0x59, 0x69, 0x8d, 0x3b, 0x43, 0xd3, 0x86, 0x31, 0x67, 0x68, 0x8a, 0x90, 0x54, 0x4f, - 0x0b, 0x39, 0x2a, 0x26, 0x76, 0x1e, 0x14, 0x48, 0xa5, 0xbe, 0xe0, 0x55, 0xea, 0x0b, 0x65, 0xb3, - 0x5b, 0xd9, 0x0e, 0xeb, 0x86, 0xca, 0x9f, 0x3f, 0xdd, 0x7a, 0x3c, 0xe2, 0x4a, 0xa0, 0xf0, 0x8c, - 0xb4, 0x7b, 0x43, 0x40, 0xc9, 0x04, 0x0b, 0xaa, 0xb7, 0x78, 0xbc, 0xa3, 0x44, 0x83, 0x94, 0xfc, - 0x3a, 0x16, 0xeb, 0xe0, 0x0e, 0xa3, 0xd0, 0x25, 0x1c, 0x41, 0x88, 0x75, 0x16, 0x68, 0x3d, 0xbf, - 0xc0, 0x38, 0xdd, 0xaf, 0xfa, 0x43, 0xd0, 0xf2, 0x36, 0x5d, 0x60, 0xa8, 0x60, 0x18, 0x34, 0x05, - 0x2d, 0x18, 0x06, 0x85, 0xcc, 0x7a, 0xe7, 0x24, 0xe9, 0x56, 0xe1, 0xa9, 0x75, 0x02, 0x5f, 0x59, - 0xf3, 0xd1, 0xaf, 0x2c, 0x8e, 0xce, 0x14, 0x1f, 0xcb, 0x02, 0xdc, 0xd0, 0x04, 0x1d, 0x92, 0x32, - 0x42, 0xff, 0x15, 0xc5, 0x1b, 0x06, 0x8f, 0x70, 0x68, 0x43, 0x15, 0x75, 0xec, 0x6e, 0xb9, 0xe3, - 0x1c, 0x5b, 0xb6, 0xf1, 0x89, 0x3a, 0xcb, 0xba, 0xc6, 0x6c, 0xb8, 0xdd, 0x0b, 0x72, 0x3b, 0x42, - 0x0b, 0xbc, 0x52, 0x0b, 0x94, 0x3e, 0x00, 0x73, 0xf8, 0x91, 0x7a, 0xfe, 0xe3, 0x02, 0x85, 0x93, - 0xbb, 0x28, 0xcf, 0x93, 0x31, 0x27, 0x95, 0xd4, 0x67, 0x3d, 0xf9, 0x96, 0x7f, 0x89, 0x80, 0xfb, - 0x29, 0xbf, 0xbf, 0x3c, 0xcf, 0x47, 0xaa, 0x44, 0x49, 0xe9, 0x8d, 0xb0, 0x31, 0x9e, 0x86, 0x7c, - 0x7b, 0x24, 0xaf, 0xca, 0x06, 0xc8, 0x8e, 0x05, 0x30, 0x13, 0xfd, 0x33, 0x0a, 0x32, 0xcc, 0x82, - 0xaf, 0x8c, 0x8d, 0xde, 0x06, 0x8b, 0x2d, 0xa4, 0xd7, 0x9c, 0x6e, 0x1b, 0xd6, 0x3a, 0x76, 0x93, - 0xa6, 0xfd, 0xd5, 0x41, 0x4f, 0xbe, 0x4f, 0x54, 0xf1, 0xad, 0x4a, 0x15, 0xb4, 0x90, 0x7e, 0xd8, - 0x6d, 0xc3, 0x17, 0x76, 0xb3, 0xf4, 0x66, 0xd8, 0x20, 0xd9, 0xf0, 0xee, 0x18, 0x6d, 0x91, 0x1c, - 0x58, 0x1f, 0x8f, 0xe0, 0x33, 0xbe, 0xbb, 0xa9, 0x5e, 0xb4, 0x35, 0xee, 0x0e, 0xee, 0x7d, 0x08, - 0x0f, 0xad, 0x13, 0x38, 0xbb, 0xb4, 0xff, 0xc7, 0x08, 0x78, 0xa8, 0x6a, 0x9a, 0xe1, 0x0e, 0xad, - 0x36, 0x6b, 0x47, 0x10, 0xd6, 0x1c, 0x3c, 0x40, 0x32, 0xba, 0x16, 0xcb, 0x25, 0x76, 0x52, 0x9e, - 0xdf, 0xd6, 0x55, 0x04, 0x99, 0xdb, 0xbe, 0x6b, 0x19, 0x66, 0xe5, 0x88, 0x7a, 0xed, 0x13, 0x1a, - 0xba, 0x47, 0x69, 0x51, 0xfe, 0xf0, 0x85, 0x9c, 0xd3, 0x0d, 0xe7, 0xb8, 0x53, 0x2f, 0x34, 0xac, - 0x16, 0xbd, 0xc5, 0xa5, 0x3f, 0x5b, 0x48, 0x3b, 0x29, 0xba, 0xf4, 0x22, 0xac, 0x10, 0xfd, 0xfa, - 0xf2, 0x3c, 0xbf, 0xd8, 0x84, 0xba, 0xda, 0xe8, 0xd6, 0x1a, 0xae, 0x80, 0x6c, 0x81, 0xfb, 0xbe, - 0x66, 0x7f, 0xf9, 0x6f, 0x82, 0x05, 0x95, 0xd0, 0xe6, 0x74, 0xa9, 0x0b, 0x24, 0x85, 0x06, 0xf7, + 0xd7, 0x12, 0x55, 0xd8, 0xa2, 0x51, 0xe2, 0x5d, 0xdb, 0x6a, 0x7d, 0xc9, 0xf7, 0x44, 0x91, 0x40, + 0x40, 0x1a, 0x8d, 0x04, 0x82, 0x56, 0xc6, 0xfc, 0xcf, 0x63, 0xd8, 0xc9, 0x69, 0xc0, 0xf8, 0x02, + 0x62, 0xef, 0x0c, 0x8e, 0xba, 0x9f, 0x8b, 0xfc, 0x50, 0x00, 0x8f, 0x4f, 0x13, 0xc0, 0xe7, 0xbe, + 0x80, 0x6d, 0x32, 0xcc, 0x38, 0xdd, 0x26, 0xc3, 0x0d, 0xcc, 0x58, 0xbf, 0x8b, 0xe1, 0xca, 0xda, + 0x73, 0x5b, 0x35, 0x9d, 0x72, 0xb3, 0x69, 0x9d, 0xa9, 0xe6, 0xec, 0x2a, 0x6b, 0x7b, 0x60, 0x5e, + 0x77, 0x15, 0xb3, 0xd2, 0x1a, 0x77, 0x86, 0xa6, 0x0d, 0x63, 0xce, 0xd0, 0x14, 0x21, 0xa9, 0x9e, + 0x16, 0x72, 0x54, 0x4c, 0xec, 0x3c, 0x28, 0x90, 0x4a, 0x7d, 0xc1, 0xab, 0xd4, 0x17, 0xca, 0x66, + 0xb7, 0xb2, 0x1d, 0xd6, 0x0d, 0x95, 0xbf, 0x7c, 0xbc, 0xf5, 0x78, 0xc4, 0x95, 0x40, 0xe1, 0x39, + 0x69, 0xf7, 0x86, 0x80, 0x92, 0x09, 0x16, 0x54, 0x6f, 0xf1, 0x78, 0x47, 0x89, 0x06, 0x29, 0xf9, + 0x75, 0x2c, 0xd6, 0xc1, 0x1d, 0x46, 0xa1, 0x4b, 0x38, 0x82, 0x10, 0xeb, 0x2c, 0xd0, 0x7a, 0x7e, + 0x81, 0x71, 0xba, 0x5f, 0xf5, 0x87, 0xa0, 0xe5, 0x6d, 0xba, 0xc0, 0x50, 0xc1, 0x30, 0x68, 0x0a, + 0x5a, 0x30, 0x0c, 0x0a, 0x99, 0xf5, 0xce, 0x49, 0xd2, 0xad, 0xc2, 0x53, 0xeb, 0x04, 0xbe, 0xb2, + 0xe6, 0xa3, 0x5f, 0x59, 0x1c, 0x9d, 0x29, 0x3e, 0x96, 0x05, 0xb8, 0xa1, 0x09, 0x3a, 0x24, 0x65, + 0x84, 0xfe, 0x3b, 0x8a, 0x37, 0x0c, 0x1e, 0xe1, 0xd0, 0x86, 0x2a, 0xea, 0xd8, 0xdd, 0x72, 0xc7, + 0x39, 0xb6, 0x6c, 0xe3, 0x23, 0x75, 0x96, 0x75, 0x8d, 0xd9, 0x70, 0xbb, 0x17, 0xe4, 0x76, 0x84, + 0x16, 0x78, 0xa5, 0x16, 0x28, 0xbd, 0x07, 0xe6, 0xf0, 0x23, 0xf5, 0xfc, 0xc7, 0x05, 0x0a, 0x27, + 0x77, 0x51, 0x9e, 0x27, 0x63, 0x4e, 0x2a, 0xa9, 0x4f, 0x7a, 0xf2, 0x2d, 0xff, 0x12, 0x01, 0xf7, + 0x53, 0xfe, 0x70, 0x79, 0x9e, 0x8f, 0x54, 0x89, 0x92, 0xd2, 0x37, 0xc2, 0xc6, 0x78, 0x1a, 0xf2, + 0xed, 0x91, 0xbc, 0x2a, 0x1b, 0x20, 0x3b, 0x16, 0xc0, 0x4c, 0xf4, 0xaf, 0x28, 0xc8, 0x30, 0x0b, + 0xbe, 0x32, 0x36, 0x7a, 0x13, 0x2c, 0xb6, 0x90, 0x5e, 0x73, 0xba, 0x6d, 0x58, 0xeb, 0xd8, 0x4d, + 0x9a, 0xf6, 0x57, 0x07, 0x3d, 0xf9, 0x3e, 0x51, 0xc5, 0xb7, 0x2a, 0x55, 0xd0, 0x42, 0xfa, 0x61, + 0xb7, 0x0d, 0x5f, 0xda, 0xcd, 0xd2, 0xb3, 0xb0, 0x41, 0xb2, 0xe1, 0xdd, 0x31, 0xda, 0x22, 0x39, + 0xb0, 0x3e, 0x1e, 0xc1, 0x67, 0x7c, 0x77, 0x53, 0xbd, 0x6c, 0x6b, 0xdc, 0x1d, 0xdc, 0xbb, 0x10, + 0x1e, 0x5a, 0x27, 0x70, 0x76, 0x69, 0xff, 0x4f, 0x11, 0xf0, 0x50, 0xd5, 0x34, 0xc3, 0x1d, 0x5a, + 0x6d, 0xd6, 0x8e, 0x20, 0xac, 0x39, 0x78, 0x80, 0x64, 0x74, 0x2d, 0x96, 0x4b, 0xec, 0xa4, 0x3c, + 0xbf, 0xad, 0xab, 0x08, 0x32, 0xb7, 0x7d, 0xdb, 0x32, 0xcc, 0xca, 0x11, 0xf5, 0xda, 0x27, 0x34, + 0x74, 0x8f, 0xd2, 0xa2, 0xfc, 0xf1, 0x33, 0x39, 0xa7, 0x1b, 0xce, 0x71, 0xa7, 0x5e, 0x68, 0x58, + 0x2d, 0x7a, 0x8b, 0x4b, 0x7f, 0xb6, 0x90, 0x76, 0x52, 0x74, 0xe9, 0x45, 0x58, 0x21, 0xfa, 0xcd, + 0xe5, 0x79, 0x7e, 0xb1, 0x09, 0x75, 0xb5, 0xd1, 0xad, 0x35, 0x5c, 0x01, 0xd9, 0x02, 0xf7, 0x7d, + 0xcd, 0xfe, 0xf2, 0x9f, 0x81, 0x05, 0x95, 0xd0, 0xe6, 0x74, 0xa9, 0x0b, 0x24, 0x85, 0x06, 0xf7, 0xa1, 0xa5, 0xaf, 0xbb, 0x76, 0xf3, 0xdf, 0x43, 0x67, 0x34, 0x01, 0xd9, 0xf4, 0x8c, 0x26, 0x68, 0xf5, 0x2c, 0xb6, 0x33, 0xb8, 0x07, 0x62, 0x07, 0x48, 0x97, 0x8e, 0xc1, 0x72, 0xe8, 0x7a, 0x79, 0xbd, 0x30, 0x2a, 0xe4, 0x0e, 0xdd, 0xb0, 0xa6, 0x0b, 0x93, 0xe1, 0x58, 0xfd, 0xaa, 0x0e, 0x16, @@ -2472,21 +2472,21 @@ var fileDescriptor_35d68359a074bdd9 = []byte{ 0x30, 0x7d, 0x15, 0x51, 0x23, 0x6b, 0xeb, 0xd2, 0x09, 0x58, 0x09, 0xd7, 0xd5, 0x37, 0xc6, 0x53, 0xcd, 0x80, 0xe9, 0xe2, 0x84, 0x40, 0x7e, 0x4d, 0xc1, 0x5a, 0x6a, 0x76, 0x1c, 0xe5, 0xfe, 0x40, 0x5b, 0x13, 0xc1, 0xf8, 0x61, 0x82, 0x45, 0xc3, 0xec, 0x38, 0xe2, 0x27, 0x18, 0x66, 0x64, 0xbd, - 0x4c, 0xfa, 0x71, 0x04, 0xac, 0x8a, 0x8a, 0x65, 0x42, 0x6a, 0x04, 0x1d, 0xd2, 0xdf, 0xb8, 0x66, + 0x4c, 0xfa, 0x49, 0x04, 0xac, 0x8a, 0x8a, 0x65, 0x42, 0x6a, 0x04, 0x1d, 0xd2, 0xdf, 0xbc, 0x66, 0x07, 0xde, 0x80, 0xe1, 0xd2, 0xd1, 0xc6, 0x78, 0x17, 0x98, 0xc0, 0x80, 0x82, 0x32, 0x8c, 0xe4, 0x00, 0x69, 0x44, 0x09, 0x26, 0x2f, 0x52, 0x33, 0x8c, 0x4d, 0xef, 0x4c, 0x8e, 0x0d, 0x10, 0x2d, 0x2a, 0x47, 0x08, 0x97, 0x20, 0xe8, 0x20, 0x26, 0xfa, 0x8a, 0xaf, 0x73, 0x77, 0xed, 0x23, 0xbe, - 0xcc, 0xf3, 0x57, 0xd8, 0x8d, 0xb7, 0xf1, 0xce, 0xe4, 0x58, 0x36, 0xea, 0x2f, 0x22, 0x20, 0x3d, - 0xe6, 0x50, 0x2d, 0x54, 0x29, 0xee, 0x93, 0x2e, 0x5d, 0xbf, 0x0f, 0x9b, 0xce, 0x2f, 0x23, 0xe0, - 0xf1, 0xb8, 0x03, 0xe4, 0xae, 0x98, 0x5d, 0x61, 0xa7, 0xf4, 0x3b, 0x53, 0x74, 0xe2, 0x53, 0x57, + 0xcc, 0xf3, 0x57, 0xd8, 0x8d, 0xb7, 0xf1, 0xce, 0xe4, 0x58, 0x36, 0xea, 0x2f, 0x23, 0x20, 0x3d, + 0xe6, 0x50, 0x2d, 0x54, 0x29, 0xee, 0x93, 0x2e, 0x5d, 0xbf, 0x0f, 0x9b, 0xce, 0xaf, 0x22, 0xe0, + 0xf1, 0xb8, 0x03, 0xe4, 0xae, 0x98, 0x5d, 0x61, 0xa7, 0xf4, 0x5b, 0x53, 0x74, 0xe2, 0x53, 0x57, 0xe8, 0x1b, 0x7c, 0x7d, 0xec, 0xfa, 0x18, 0x4e, 0x9c, 0xba, 0x46, 0x7f, 0x33, 0xba, 0x3b, 0x2d, 0xfc, 0xbd, 0xb8, 0x31, 0x7e, 0xe6, 0xfe, 0x58, 0xc5, 0x09, 0x81, 0x01, 0x9f, 0x17, 0x1d, 0x0b, - 0x85, 0xca, 0x04, 0x1d, 0xc4, 0x3e, 0x7f, 0xc5, 0x69, 0x27, 0x3d, 0xf7, 0x43, 0xf7, 0x74, 0x56, - 0xf9, 0xe0, 0xb3, 0x7e, 0x26, 0xf2, 0x79, 0x3f, 0x13, 0xf9, 0x47, 0x3f, 0x13, 0xf9, 0xd5, 0x45, - 0xe6, 0xd6, 0xe7, 0x17, 0x99, 0x5b, 0x7f, 0xbf, 0xc8, 0xdc, 0xfa, 0xee, 0x0e, 0x77, 0xee, 0x23, - 0x63, 0x6c, 0x35, 0xd5, 0x3a, 0xa2, 0xcf, 0xc5, 0xd3, 0x37, 0x8a, 0x3f, 0xe0, 0xfe, 0xe9, 0x10, - 0x9f, 0x03, 0xeb, 0xb7, 0xf1, 0xe7, 0xeb, 0xee, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x48, 0x2c, - 0xb9, 0x50, 0x95, 0x28, 0x00, 0x00, + 0x85, 0xca, 0x04, 0x1d, 0xc4, 0x3e, 0x7f, 0xc5, 0x69, 0x27, 0x3d, 0xf7, 0x23, 0xf7, 0x74, 0x56, + 0x79, 0xef, 0x93, 0x7e, 0x26, 0xf2, 0x69, 0x3f, 0x13, 0xf9, 0x67, 0x3f, 0x13, 0xf9, 0xf5, 0x45, + 0xe6, 0xd6, 0xa7, 0x17, 0x99, 0x5b, 0xff, 0xb8, 0xc8, 0xdc, 0xfa, 0xde, 0x0e, 0x77, 0xee, 0x23, + 0x63, 0x6c, 0x35, 0xd5, 0x3a, 0xa2, 0xcf, 0xc5, 0xd3, 0x67, 0xc5, 0x1f, 0x72, 0xff, 0x74, 0x88, + 0xcf, 0x81, 0xf5, 0xdb, 0xf8, 0xf3, 0x75, 0xf7, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x01, + 0x2d, 0xe3, 0x95, 0x28, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/subspaces/types/msgs_feegrant.go b/x/subspaces/types/msgs_feegrant.go index ca6baa74fc..dc02a92631 100644 --- a/x/subspaces/types/msgs_feegrant.go +++ b/x/subspaces/types/msgs_feegrant.go @@ -4,11 +4,10 @@ import ( "fmt" "cosmossdk.io/errors" + feegranttypes "cosmossdk.io/x/feegrant" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" - feegranttypes "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/gogo/protobuf/proto" ) @@ -16,9 +15,6 @@ var ( _ sdk.Msg = &MsgGrantAllowance{} _ sdk.Msg = &MsgRevokeAllowance{} - _ legacytx.LegacyMsg = &MsgGrantAllowance{} - _ legacytx.LegacyMsg = &MsgRevokeAllowance{} - _ ManageSubspaceMsg = &MsgGrantAllowance{} _ ManageSubspaceMsg = &MsgRevokeAllowance{} @@ -101,11 +97,6 @@ func (msg *MsgGrantAllowance) Route() string { return RouterKey } -// GetSignBytes implements legacytx.LegacyMsg -func (msg *MsgGrantAllowance) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetUnpackedAllowance gets the unpacked allowance from the cached value of the allowance func (msg *MsgGrantAllowance) GetUnpackedAllowance() (feegranttypes.FeeAllowanceI, error) { allowance, ok := msg.Allowance.GetCachedValue().(feegranttypes.FeeAllowanceI) @@ -178,11 +169,6 @@ func (msg *MsgRevokeAllowance) Route() string { return RouterKey } -// GetSignBytes implements legacytx.LegacyMsg -func (msg *MsgRevokeAllowance) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // UnpackInterfaces implements codectypes.UnpackInterfacesMessage func (msg *MsgRevokeAllowance) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { var grantee Grantee diff --git a/x/subspaces/types/msgs_test.go b/x/subspaces/types/msgs_test.go index aea5d4862a..25817a3861 100644 --- a/x/subspaces/types/msgs_test.go +++ b/x/subspaces/types/msgs_test.go @@ -3,6 +3,7 @@ package types_test import ( "testing" + "cosmossdk.io/math" "github.com/desmos-labs/desmos/v6/x/subspaces/types" sdk "github.com/cosmos/cosmos-sdk/types" @@ -79,11 +80,6 @@ func TestMsgCreateSubspace_ValidateBasic(t *testing.T) { } } -func TestMsgCreateSubspace_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgCreateSubspace","value":{"creator":"cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69","description":"This is a test subspace","name":"Test subspace","owner":"cosmos1lv3e0l66rr68k5l74mnrv4j9kyny6cz27pvnez"}}` - require.Equal(t, expected, string(msgCreateSubspace.GetSignBytes())) -} - func TestMsgCreateSubspace_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgCreateSubspace.Creator) require.Equal(t, []sdk.AccAddress{addr}, msgCreateSubspace.GetSigners()) @@ -154,11 +150,6 @@ func TestMsgEditSubspace_ValidateBasic(t *testing.T) { } } -func TestMsgEditSubspace_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgEditSubspace","value":{"description":"This is a new description","name":"This is a new name","owner":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1"}}` - require.Equal(t, expected, string(msgEditSubspace.GetSignBytes())) -} - func TestMsgEditSubspace_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgEditSubspace.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgEditSubspace.GetSigners()) @@ -214,11 +205,6 @@ func TestMsgDeleteSubspace_ValidateBasic(t *testing.T) { } } -func TestMsgDeleteSubspace_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgDeleteSubspace","value":{"signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1"}}` - require.Equal(t, expected, string(msgDeleteSubspace.GetSignBytes())) -} - func TestMsgDeleteSubspace_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgDeleteSubspace.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgDeleteSubspace.GetSigners()) @@ -300,11 +286,6 @@ func TestMsgCreateSection_ValidateBasic(t *testing.T) { } } -func TestMsgCreateSection_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgCreateSection","value":{"creator":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","description":"This is a test section","name":"Test section","subspace_id":"1"}}` - require.Equal(t, expected, string(msgCreateSection.GetSignBytes())) -} - func TestMsgCreateSection_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgCreateSection.Creator) require.Equal(t, []sdk.AccAddress{addr}, msgCreateSection.GetSigners()) @@ -386,11 +367,6 @@ func TestMsgEditSection_ValidateBasic(t *testing.T) { } } -func TestMsgEditSection_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgEditSection","value":{"description":"This is a test section","editor":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","name":"Test section","section_id":1,"subspace_id":"1"}}` - require.Equal(t, expected, string(msgEditSection.GetSignBytes())) -} - func TestMsgEditSection_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgEditSection.Editor) require.Equal(t, []sdk.AccAddress{addr}, msgEditSection.GetSigners()) @@ -468,11 +444,6 @@ func TestMsgMoveSection_ValidateBasic(t *testing.T) { } } -func TestMsgMoveSection_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgMoveSection","value":{"new_parent_id":1,"section_id":1,"signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1"}}` - require.Equal(t, expected, string(msgMoveSection.GetSignBytes())) -} - func TestMsgMoveSection_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgMoveSection.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgMoveSection.GetSigners()) @@ -546,11 +517,6 @@ func TestMsgDeleteSection_ValidateBasic(t *testing.T) { } } -func TestMsgDeleteSection_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgDeleteSection","value":{"section_id":1,"signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1"}}` - require.Equal(t, expected, string(msgDeleteSection.GetSignBytes())) -} - func TestMsgDeleteSection_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgDeleteSection.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgDeleteSection.GetSigners()) @@ -666,11 +632,6 @@ func TestMsgCreateUserGroup_ValidateBasic(t *testing.T) { } } -func TestMsgCreateUserGroup_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgCreateUserGroup","value":{"creator":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","default_permissions":["EDIT_SUBSPACE"],"description":"Description","initial_members":["cosmos16yhs7fgqnf6fjm4tftv66g2smtmee62wyg780l"],"name":"Group","subspace_id":"1"}}` - require.Equal(t, expected, string(msgCreateUserGroup.GetSignBytes())) -} - func TestMsgCreateUserGroup_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgCreateUserGroup.Creator) require.Equal(t, []sdk.AccAddress{addr}, msgCreateUserGroup.GetSigners()) @@ -741,11 +702,6 @@ func TestMsgEditUserGroup_ValidateBasic(t *testing.T) { } } -func TestMsgEditUserGroup_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgEditUserGroup","value":{"description":"Description","group_id":1,"name":"Group","signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1"}}` - require.Equal(t, expected, string(msgEditUserGroup.GetSignBytes())) -} - func TestMsgEditUserGroup_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgEditUserGroup.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgEditUserGroup.GetSigners()) @@ -823,11 +779,6 @@ func TestMsgMoveUserGroup_ValidateBasic(t *testing.T) { } } -func TestMsgMoveUserGroup_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgMoveUserGroup","value":{"group_id":1,"new_section_id":2,"signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1"}}` - require.Equal(t, expected, string(msgMoveUserGroup.GetSignBytes())) -} - func TestMsgMoveUserGroup_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgMoveUserGroup.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgMoveUserGroup.GetSigners()) @@ -905,11 +856,6 @@ func TestMsgSetUserGroupPermissions_ValidateBasic(t *testing.T) { } } -func TestMsgSetUserGroupPermissions_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgSetUserGroupPermissions","value":{"group_id":1,"permissions":["EDIT_SUBSPACE"],"signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1"}}` - require.Equal(t, expected, string(msgSetUserGroupPermissions.GetSignBytes())) -} - func TestMsgSetUserGroupPermissions_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgSetUserGroupPermissions.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgSetUserGroupPermissions.GetSigners()) @@ -983,11 +929,6 @@ func TestMsgDeleteUserGroup_ValidateBasic(t *testing.T) { } } -func TestMsgDeleteUserGroup_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgDeleteUserGroup","value":{"group_id":1,"signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1"}}` - require.Equal(t, expected, string(msgDeleteUserGroup.GetSignBytes())) -} - func TestMsgDeleteUserGroup_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgDeleteUserGroup.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgDeleteUserGroup.GetSigners()) @@ -1075,11 +1016,6 @@ func TestMsgAddUserToUserGroup_ValidateBasic(t *testing.T) { } } -func TestMsgAddUserToUserGroup_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgAddUserToUserGroup","value":{"group_id":1,"signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1","user":"cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"}}` - require.Equal(t, expected, string(msgAddUserToGroup.GetSignBytes())) -} - func TestMsgAddUserToUserGroup_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgAddUserToGroup.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgAddUserToGroup.GetSigners()) @@ -1167,11 +1103,6 @@ func TestMsgRemoveUserFromUserGroup_ValidateBasic(t *testing.T) { } } -func TestMsgRemoveUserFromUserGroup_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRemoveUserFromUserGroup","value":{"group_id":1,"signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1","user":"cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"}}` - require.Equal(t, expected, string(msgRemoveUserFromUserGroup.GetSignBytes())) -} - func TestMsgRemoveUserFromUserGroup_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRemoveUserFromUserGroup.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgRemoveUserFromUserGroup.GetSigners()) @@ -1263,11 +1194,6 @@ func TestMsgSetUserPermissions_ValidateBasic(t *testing.T) { } } -func TestMsgSetUserPermissions_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgSetUserPermissions","value":{"permissions":["EDIT_SUBSPACE"],"signer":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1","user":"cosmos1x5pjlvufs4znnhhkwe8v4tw3kz30f3lxgwza53"}}` - require.Equal(t, expected, string(msgSetUserPermissions.GetSignBytes())) -} - func TestMsgSetUserPermissions_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgSetUserPermissions.Signer) require.Equal(t, []sdk.AccAddress{addr}, msgSetUserPermissions.GetSigners()) @@ -1277,7 +1203,7 @@ func TestMsgSetUserPermissions_GetSigners(t *testing.T) { var msgUpdateSubspaceFeeTokens = types.NewMsgUpdateSubspaceFeeTokens( 1, - sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(10))), + sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(10))), "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", ) @@ -1299,7 +1225,7 @@ func TestMsgUpdateSubspaceFeeTokens_ValidateBasic(t *testing.T) { name: "invalid subspace id returns error", msg: types.NewMsgUpdateSubspaceFeeTokens( 0, - sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(10))), + sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(10))), "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", ), shouldErr: true, @@ -1308,7 +1234,7 @@ func TestMsgUpdateSubspaceFeeTokens_ValidateBasic(t *testing.T) { name: "invalid additional fee tokens returns error", msg: types.NewMsgUpdateSubspaceFeeTokens( 1, - sdk.Coins{{Denom: "minttoken", Amount: sdk.NewInt(-10)}}, + sdk.Coins{{Denom: "minttoken", Amount: math.NewInt(-10)}}, "cosmos1m0czrla04f7rp3zg7d", ), shouldErr: true, @@ -1317,7 +1243,7 @@ func TestMsgUpdateSubspaceFeeTokens_ValidateBasic(t *testing.T) { name: "invalid authority returns error", msg: types.NewMsgUpdateSubspaceFeeTokens( 1, - sdk.NewCoins(sdk.NewCoin("minttoken", sdk.NewInt(10))), + sdk.NewCoins(sdk.NewCoin("minttoken", math.NewInt(10))), "cosmos1m0czrla04f7rp3zg7d", ), shouldErr: true, @@ -1341,11 +1267,6 @@ func TestMsgUpdateSubspaceFeeTokens_ValidateBasic(t *testing.T) { } } -func TestMsgUpdateSubspaceFeeTokens_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgUpdateSubspaceFeeTokens","value":{"additional_fee_tokens":[{"amount":"10","denom":"minttoken"}],"authority":"cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5","subspace_id":"1"}}` - require.Equal(t, expected, string(msgUpdateSubspaceFeeTokens.GetSignBytes())) -} - func TestMsgUpdateSubspaceFeeTokens_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgUpdateSubspaceFeeTokens.Authority) require.Equal(t, []sdk.AccAddress{addr}, msgUpdateSubspaceFeeTokens.GetSigners()) diff --git a/x/subspaces/types/msgs_treasury.go b/x/subspaces/types/msgs_treasury.go index 2d01cd516c..b554a1e785 100644 --- a/x/subspaces/types/msgs_treasury.go +++ b/x/subspaces/types/msgs_treasury.go @@ -8,7 +8,6 @@ import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" "github.com/cosmos/cosmos-sdk/x/authz" ) @@ -16,9 +15,6 @@ var ( _ sdk.Msg = &MsgGrantTreasuryAuthorization{} _ sdk.Msg = &MsgRevokeTreasuryAuthorization{} - _ legacytx.LegacyMsg = &MsgGrantTreasuryAuthorization{} - _ legacytx.LegacyMsg = &MsgRevokeTreasuryAuthorization{} - _ ManageSubspaceMsg = &MsgGrantTreasuryAuthorization{} _ ManageSubspaceMsg = &MsgRevokeTreasuryAuthorization{} @@ -63,11 +59,6 @@ func (msg *MsgGrantTreasuryAuthorization) ValidateBasic() error { return msg.Grant.ValidateBasic() } -// GetSignBytes implements legacytx.LegacyMsg -func (msg *MsgGrantTreasuryAuthorization) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgGrantTreasuryAuthorization) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Granter) @@ -122,11 +113,6 @@ func (msg *MsgRevokeTreasuryAuthorization) ValidateBasic() error { return nil } -// GetSignBytes implements legacytx.LegacyMsg -func (msg *MsgRevokeTreasuryAuthorization) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCodec.MustMarshalJSON(msg)) -} - // GetSigners implements sdk.Msg func (msg *MsgRevokeTreasuryAuthorization) GetSigners() []sdk.AccAddress { addr, _ := sdk.AccAddressFromBech32(msg.Granter) diff --git a/x/subspaces/types/msgs_treasury_test.go b/x/subspaces/types/msgs_treasury_test.go index a1bddc03f2..6d2bf91864 100644 --- a/x/subspaces/types/msgs_treasury_test.go +++ b/x/subspaces/types/msgs_treasury_test.go @@ -98,11 +98,6 @@ func TestMsgGrantTreasuryAuthorization_ValidateBasic(t *testing.T) { } } -func TestMsgGrantTreasuryAuthorization_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgGrantTreasuryAuthorization","value":{"grant":{"authorization":{"spend_limit":[{"amount":"100","denom":"steak"}]},"expiration":"2100-01-11T00:00:00Z"},"grantee":"cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69","granter":"cosmos1lv3e0l66rr68k5l74mnrv4j9kyny6cz27pvnez","subspace_id":"1"}}` - require.Equal(t, expected, string(msgGrantTreasuryAuthorization.GetSignBytes())) -} - func TestMsgGrantTreasuryAuthorization_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgGrantTreasuryAuthorization.Granter) require.Equal(t, []sdk.AccAddress{addr}, msgGrantTreasuryAuthorization.GetSigners()) @@ -200,11 +195,6 @@ func TestMsgRevokeTreasuryAuthorization_ValidateBasic(t *testing.T) { } } -func TestMsgRevokeTreasuryAuthorization_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgRevokeTreasuryAuthorization","value":{"grantee":"cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69","granter":"cosmos1lv3e0l66rr68k5l74mnrv4j9kyny6cz27pvnez","msg_type_url":"/cosmos.bank.v1betat1.MsgSend","subspace_id":"1"}}` - require.Equal(t, expected, string(msgRevokeTreasuryAuthorization.GetSignBytes())) -} - func TestMsgRevokeTreasuryAuthorization_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgRevokeTreasuryAuthorization.Granter) require.Equal(t, []sdk.AccAddress{addr}, msgRevokeTreasuryAuthorization.GetSigners()) diff --git a/x/subspaces/types/query.pb.go b/x/subspaces/types/query.pb.go index 759af790f2..580bc2b030 100644 --- a/x/subspaces/types/query.pb.go +++ b/x/subspaces/types/query.pb.go @@ -1265,91 +1265,91 @@ func init() { func init() { proto.RegisterFile("desmos/subspaces/v3/query.proto", fileDescriptor_ca70010567dbc47d) } var fileDescriptor_ca70010567dbc47d = []byte{ - // 1332 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcb, 0x6f, 0x1b, 0x45, - 0x18, 0xf7, 0xe4, 0x51, 0xc7, 0x63, 0xf5, 0x35, 0x4d, 0x43, 0xd8, 0x24, 0x76, 0xb4, 0x12, 0x6d, - 0x9a, 0x34, 0xde, 0xc6, 0x69, 0x44, 0x49, 0x05, 0x49, 0xdc, 0x90, 0x87, 0x04, 0x55, 0x71, 0xd5, - 0x03, 0x08, 0x14, 0xad, 0xe3, 0x91, 0xb1, 0x64, 0x7b, 0x5d, 0xcf, 0x3a, 0x10, 0x45, 0x11, 0x08, - 0x71, 0xe0, 0xc0, 0x01, 0x09, 0x09, 0x2e, 0x1c, 0x72, 0x00, 0x09, 0x24, 0x0e, 0x1c, 0x10, 0x20, - 0x0e, 0x70, 0x2d, 0x17, 0xa8, 0xe8, 0xa5, 0x27, 0x83, 0x12, 0x24, 0xb8, 0x70, 0xc9, 0x5f, 0x80, - 0x76, 0xf6, 0x9b, 0xdd, 0xd9, 0xf5, 0xc6, 0x59, 0x3b, 0x16, 0x70, 0x89, 0xbc, 0x33, 0xdf, 0xe3, - 0xf7, 0xfd, 0xe6, 0x37, 0x8f, 0x2f, 0x38, 0x99, 0xa7, 0xac, 0x6c, 0x30, 0x8d, 0xd5, 0x73, 0xac, - 0xaa, 0x6f, 0x52, 0xa6, 0x6d, 0xcd, 0x6a, 0xf7, 0xeb, 0xb4, 0xb6, 0x9d, 0xaa, 0xd6, 0x0c, 0xd3, - 0x20, 0x17, 0x6c, 0x83, 0x94, 0x63, 0x90, 0xda, 0x9a, 0x55, 0xce, 0xeb, 0xe5, 0x62, 0xc5, 0xd0, - 0xf8, 0x5f, 0xdb, 0x4e, 0x19, 0x2c, 0x18, 0x05, 0x83, 0xff, 0xd4, 0xac, 0x5f, 0x30, 0x3a, 0x5a, - 0x30, 0x8c, 0x42, 0x89, 0x6a, 0x7a, 0xb5, 0xa8, 0xe9, 0x95, 0x8a, 0x61, 0xea, 0x66, 0xd1, 0xa8, - 0x30, 0x98, 0x7d, 0x72, 0xd3, 0xb0, 0x62, 0x6f, 0xd8, 0x6e, 0xf6, 0x07, 0x4c, 0x4d, 0xda, 0x5f, - 0x5a, 0x4e, 0x67, 0xd4, 0xc6, 0xa3, 0x6d, 0xcd, 0xe4, 0xa8, 0xa9, 0xcf, 0x68, 0x55, 0xbd, 0x50, - 0xac, 0xf0, 0x38, 0x60, 0x3b, 0x1e, 0x54, 0x43, 0xd9, 0xc8, 0xd3, 0x12, 0x44, 0x53, 0x37, 0xf0, - 0xc5, 0x97, 0xac, 0x18, 0x77, 0x85, 0x45, 0x96, 0xde, 0xaf, 0x53, 0x66, 0x92, 0x15, 0x8c, 0xdd, - 0x70, 0xc3, 0x68, 0x1c, 0x4d, 0xc4, 0xd3, 0x97, 0x52, 0x80, 0xc4, 0xca, 0x9d, 0xb2, 0xb9, 0x80, - 0xdc, 0xa9, 0x3b, 0x7a, 0x81, 0x82, 0x6f, 0x56, 0xf2, 0x54, 0xbf, 0x40, 0x78, 0xc8, 0x9f, 0x81, - 0x55, 0x8d, 0x0a, 0xa3, 0x64, 0x05, 0xc7, 0x1c, 0x60, 0xc3, 0x68, 0xbc, 0x77, 0x22, 0x9e, 0x1e, - 0x4b, 0x05, 0x90, 0x9a, 0x12, 0xae, 0x99, 0xd8, 0x83, 0x46, 0x32, 0xf2, 0xf9, 0x9f, 0x5f, 0x4d, - 0xa2, 0xac, 0xeb, 0x4a, 0x56, 0x3d, 0x50, 0x7b, 0x38, 0xd4, 0xcb, 0xc7, 0x42, 0xb5, 0x41, 0x78, - 0xb0, 0xbe, 0x8c, 0x07, 0x3d, 0x50, 0x05, 0x17, 0x4f, 0xe3, 0xb8, 0xc8, 0xb6, 0x51, 0xcc, 0x73, - 0x32, 0xfa, 0x32, 0x43, 0x87, 0x8d, 0x24, 0xd9, 0xd6, 0xcb, 0xa5, 0x79, 0x55, 0x9a, 0x54, 0xb3, - 0x58, 0x7c, 0xad, 0xe7, 0xe7, 0x07, 0xde, 0xdb, 0x4b, 0x46, 0xfe, 0xda, 0x4b, 0x46, 0xd4, 0xd7, - 0x7c, 0x3c, 0x3b, 0x24, 0x2c, 0xe3, 0x01, 0xe1, 0x00, 0x2c, 0x87, 0xe7, 0xc0, 0xf1, 0x54, 0xdf, - 0x12, 0xc8, 0xe9, 0x26, 0x97, 0x91, 0x40, 0x9e, 0x0c, 0x40, 0x2e, 0x23, 0xf4, 0x2d, 0x73, 0x4f, - 0xc7, 0xcb, 0xfc, 0x19, 0x12, 0x05, 0x3a, 0x08, 0xa0, 0xc0, 0x5b, 0x78, 0x80, 0xc1, 0x18, 0x2c, - 0xf2, 0x68, 0x70, 0x81, 0xb6, 0x91, 0xb7, 0x3e, 0x70, 0xec, 0xde, 0x12, 0xdf, 0xc3, 0x17, 0x64, - 0x98, 0xa1, 0x79, 0x1a, 0xc3, 0x18, 0xc0, 0x58, 0xf3, 0x16, 0x80, 0xd3, 0xd9, 0x18, 0x8c, 0xac, - 0xe7, 0x5d, 0xe5, 0x88, 0xb0, 0x50, 0xfc, 0x12, 0x8e, 0x82, 0x11, 0x2c, 0x6e, 0xe8, 0xda, 0x85, - 0x9f, 0xfa, 0x9d, 0xd8, 0x40, 0xf7, 0x18, 0xad, 0xad, 0xd6, 0x8c, 0x7a, 0x95, 0x9d, 0x54, 0x97, - 0xc7, 0x54, 0xe3, 0x13, 0x45, 0xef, 0x49, 0x44, 0xf1, 0x44, 0x13, 0x74, 0x87, 0x99, 0x53, 0x05, - 0x3e, 0x02, 0xa2, 0x48, 0x04, 0x12, 0xe3, 0x38, 0xca, 0xd4, 0x80, 0x63, 0xf7, 0x44, 0xf1, 0xb6, - 0x10, 0xaf, 0x93, 0xee, 0xc4, 0x0c, 0xa7, 0xf0, 0x00, 0x47, 0xe9, 0xf0, 0x9b, 0xb9, 0x70, 0xd8, - 0x48, 0x9e, 0xb5, 0xbd, 0xc4, 0x8c, 0x9a, 0x8d, 0xf2, 0x9f, 0x5c, 0x40, 0x43, 0x7e, 0x04, 0x40, - 0xd4, 0x02, 0xee, 0xe7, 0x46, 0x20, 0xa0, 0x36, 0x78, 0xb2, 0xfd, 0xd4, 0x5f, 0x10, 0x1e, 0xf5, - 0xc6, 0x7e, 0x91, 0x96, 0x73, 0xb4, 0xc6, 0xfe, 0xed, 0x22, 0xbb, 0xa6, 0xab, 0x4f, 0x10, 0x1e, - 0x3b, 0xa2, 0x22, 0x20, 0x2d, 0x8d, 0xa3, 0x65, 0x7b, 0x88, 0xcb, 0x2b, 0x96, 0x19, 0xfe, 0xf5, - 0xeb, 0xe9, 0x41, 0xc8, 0xb4, 0x94, 0xcf, 0xd7, 0x28, 0x63, 0x77, 0xcd, 0x5a, 0xb1, 0x52, 0xc8, - 0x0a, 0xc3, 0xee, 0xc9, 0xe9, 0x11, 0xc2, 0x23, 0x0e, 0xbc, 0x3b, 0xb4, 0x56, 0x2e, 0x32, 0x26, - 0x1f, 0xca, 0x1d, 0xf3, 0x7d, 0xbd, 0x79, 0xdb, 0x66, 0x2e, 0x1e, 0x36, 0x92, 0xe7, 0xc1, 0xcf, - 0x99, 0x53, 0xe5, 0xdd, 0x7c, 0x13, 0xf7, 0xd5, 0x19, 0xad, 0x71, 0xbe, 0x63, 0x99, 0xcb, 0x87, - 0x8d, 0x64, 0xdc, 0xb6, 0xb7, 0x46, 0xd5, 0x23, 0x79, 0xe1, 0x4e, 0xd2, 0x0d, 0xf6, 0x8d, 0x2c, - 0x23, 0x4f, 0x55, 0xc0, 0xf9, 0x0d, 0x1c, 0xaf, 0xba, 0xc3, 0xc0, 0xbb, 0x54, 0x96, 0x34, 0xa9, - 0x66, 0x65, 0x53, 0xf2, 0x2a, 0x8e, 0xe6, 0xa9, 0xa9, 0x17, 0x4b, 0x6c, 0xb8, 0x87, 0x1f, 0x06, - 0x4f, 0x05, 0x8a, 0xdc, 0x4d, 0xba, 0xcc, 0xad, 0x33, 0x23, 0x96, 0xd6, 0x0f, 0x1b, 0xc9, 0x33, - 0x76, 0x02, 0x88, 0xa1, 0xc2, 0x01, 0x2a, 0x3e, 0x7f, 0xeb, 0xc5, 0xe7, 0xfc, 0xae, 0x27, 0x3d, - 0xf0, 0xc9, 0xa2, 0x44, 0x6a, 0x3c, 0x3d, 0x19, 0x0a, 0x2f, 0xdf, 0xa5, 0x6b, 0x11, 0x9b, 0x59, - 0x72, 0x4b, 0xec, 0xeb, 0x3e, 0x1e, 0x62, 0x2a, 0x5c, 0x08, 0xae, 0xf6, 0xb5, 0x08, 0xec, 0x6d, - 0xe5, 0x5d, 0x84, 0xfb, 0xac, 0xa8, 0xce, 0x22, 0xa3, 0x0e, 0x16, 0x99, 0xcc, 0x61, 0xec, 0x2e, - 0x07, 0x5f, 0x82, 0x98, 0xac, 0x2b, 0x77, 0x4e, 0xcd, 0x4a, 0x86, 0x8e, 0x36, 0x90, 0x52, 0xc2, - 0xfd, 0x1c, 0x18, 0x79, 0x46, 0x3a, 0x11, 0x10, 0xd7, 0x67, 0x62, 0xbf, 0x91, 0x8c, 0xf2, 0xc9, - 0xf5, 0xe5, 0x96, 0x87, 0x43, 0xa2, 0x19, 0x44, 0x70, 0x36, 0xf7, 0x57, 0xa6, 0x1f, 0xf7, 0xb2, - 0x7a, 0x59, 0xfd, 0x1b, 0x61, 0xc5, 0x91, 0xe6, 0x52, 0xa9, 0x64, 0xbc, 0xa1, 0x57, 0xa4, 0xa7, - 0x6c, 0xc7, 0xfb, 0x6d, 0x19, 0x47, 0x0b, 0x35, 0xbd, 0x62, 0x52, 0xca, 0x05, 0x10, 0xcb, 0x4c, - 0xba, 0x62, 0x83, 0x89, 0xa3, 0xa9, 0x15, 0xae, 0xdd, 0x3a, 0xf5, 0xbc, 0x5b, 0x71, 0x24, 0xb0, - 0x5e, 0xd8, 0x89, 0xb7, 0xad, 0xbb, 0x55, 0xaf, 0x98, 0xe2, 0x6e, 0x55, 0x02, 0xb5, 0xb5, 0x6a, - 0x99, 0x64, 0x14, 0xd8, 0x43, 0xa7, 0xa5, 0xb2, 0xc4, 0x16, 0x82, 0x28, 0xdd, 0x3b, 0x19, 0x1f, - 0x0b, 0xe0, 0x5c, 0x10, 0x5d, 0x5c, 0xa9, 0xff, 0xe8, 0x26, 0x92, 0xd6, 0xe4, 0x5b, 0x71, 0x3c, - 0x36, 0x95, 0xf6, 0x3f, 0x5f, 0x94, 0xf4, 0xcf, 0xa7, 0x71, 0x3f, 0x47, 0x4e, 0xde, 0x47, 0x38, - 0xe6, 0xb4, 0x69, 0x24, 0xf8, 0x50, 0x0b, 0xec, 0x16, 0x95, 0xa9, 0x50, 0xb6, 0x76, 0x72, 0xf5, - 0xd2, 0x3b, 0x8f, 0xfe, 0xf8, 0xb0, 0x67, 0x9c, 0x24, 0xb4, 0xa0, 0xf6, 0xd4, 0xed, 0xeb, 0x3e, - 0x46, 0x78, 0x40, 0x78, 0x93, 0x2b, 0xc7, 0x67, 0x10, 0x60, 0x26, 0xc3, 0x98, 0x02, 0x96, 0xeb, - 0x1c, 0x4b, 0x8a, 0x5c, 0x6d, 0x8d, 0x45, 0xdb, 0x91, 0xa4, 0xb7, 0x4b, 0x3e, 0xb2, 0x90, 0x89, - 0xde, 0xa4, 0x15, 0x32, 0x6f, 0x3b, 0xd6, 0x12, 0x99, 0xaf, 0x6f, 0x52, 0x67, 0x39, 0xb2, 0x69, - 0x32, 0x15, 0x88, 0xcc, 0x83, 0x47, 0x73, 0xfa, 0xa4, 0x3d, 0x84, 0xa3, 0x10, 0x89, 0x4c, 0x1c, - 0x9b, 0x4c, 0xc0, 0xba, 0x12, 0xc2, 0x12, 0x50, 0x2d, 0x72, 0x54, 0xf3, 0xe4, 0x46, 0x1b, 0xa8, - 0xb4, 0x1d, 0xf7, 0x26, 0xdd, 0x25, 0x9f, 0x22, 0x8c, 0xdd, 0x7e, 0x80, 0xb4, 0x50, 0x4e, 0x53, - 0xc3, 0xa3, 0x5c, 0x0d, 0x67, 0x0c, 0x58, 0x6f, 0x72, 0xac, 0x73, 0x64, 0xb6, 0x9d, 0xb5, 0xd5, - 0xa0, 0xb9, 0xf8, 0x12, 0xe1, 0x98, 0x13, 0xb3, 0xd5, 0x5e, 0xf0, 0xf7, 0x0c, 0xca, 0x54, 0x28, - 0x5b, 0xc0, 0xb8, 0xc2, 0x31, 0x2e, 0x92, 0xe7, 0x3a, 0xc0, 0xa8, 0xed, 0x88, 0x93, 0x6d, 0x97, - 0xfc, 0x84, 0xf0, 0x39, 0xff, 0x6b, 0x98, 0xcc, 0x84, 0x40, 0xe2, 0xed, 0x05, 0x94, 0x74, 0x3b, - 0x2e, 0x50, 0xc3, 0x6d, 0x5e, 0xc3, 0x1a, 0x59, 0x39, 0x59, 0x0d, 0x9a, 0x78, 0x88, 0xff, 0x88, - 0xf0, 0x59, 0xdf, 0x23, 0x93, 0x5c, 0x6b, 0x8d, 0xab, 0xf9, 0x95, 0xad, 0xcc, 0xb4, 0xe1, 0x01, - 0x85, 0xac, 0xf2, 0x42, 0x96, 0xc8, 0x42, 0x5b, 0x85, 0x48, 0x2f, 0x59, 0x6d, 0xc7, 0x7a, 0x4f, - 0xed, 0x92, 0xef, 0x11, 0x3e, 0xe3, 0xbd, 0x9b, 0x89, 0xd6, 0x1a, 0x4e, 0xd3, 0x5d, 0xa8, 0x5c, - 0x0b, 0xef, 0x00, 0xf0, 0x9f, 0xe7, 0xf0, 0x17, 0xc8, 0xb3, 0x6d, 0xc1, 0xd7, 0x9d, 0x40, 0x9a, - 0x05, 0x9e, 0x91, 0x1f, 0x10, 0x3e, 0xeb, 0xbb, 0xc4, 0x5a, 0xd1, 0x1f, 0x7c, 0x95, 0xb7, 0xa2, - 0xff, 0x88, 0x1b, 0xb2, 0xc3, 0xbd, 0x20, 0xe1, 0xb7, 0x25, 0x95, 0x79, 0xe1, 0xc1, 0x7e, 0x02, - 0x3d, 0xdc, 0x4f, 0xa0, 0xdf, 0xf7, 0x13, 0xe8, 0x83, 0x83, 0x44, 0xe4, 0xe1, 0x41, 0x22, 0xf2, - 0xf8, 0x20, 0x11, 0x79, 0x25, 0x5d, 0x28, 0x9a, 0xaf, 0xd7, 0x73, 0xa9, 0x4d, 0xa3, 0x0c, 0x39, - 0xa6, 0x4b, 0x7a, 0x8e, 0x89, 0x7c, 0x5b, 0x73, 0xda, 0x9b, 0x52, 0x1e, 0x73, 0xbb, 0x4a, 0x59, - 0xee, 0x14, 0xff, 0x47, 0xe9, 0xec, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x77, 0xd6, 0xde, 0xcd, - 0x10, 0x16, 0x00, 0x00, + // 1334 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x1b, 0xc5, + 0x1b, 0xf6, 0xe4, 0xa3, 0x8e, 0xc7, 0xea, 0xd7, 0x24, 0xcd, 0x2f, 0xbf, 0x4d, 0x62, 0x47, 0x2b, + 0xd1, 0xa6, 0x49, 0xe3, 0x6d, 0x9c, 0x16, 0x4a, 0x2a, 0x48, 0xe2, 0x86, 0x7c, 0x48, 0x50, 0x15, + 0x57, 0x3d, 0x80, 0x40, 0xd1, 0x3a, 0x1e, 0x19, 0x4b, 0xb6, 0xd7, 0xf5, 0xac, 0x03, 0x51, 0x14, + 0x81, 0x10, 0x07, 0x0e, 0x1c, 0x90, 0x90, 0xe0, 0xc2, 0x21, 0x07, 0x90, 0x40, 0xe2, 0xc0, 0x01, + 0x01, 0xe2, 0x00, 0xd7, 0x72, 0x81, 0x8a, 0x5e, 0x7a, 0x32, 0x28, 0x41, 0x82, 0x0b, 0x97, 0xfc, + 0x05, 0x68, 0x67, 0xdf, 0xd9, 0x9d, 0x5d, 0x6f, 0x9c, 0xb5, 0x63, 0x01, 0x97, 0xc8, 0x3b, 0xf3, + 0x7e, 0x3c, 0xef, 0x33, 0xcf, 0x7c, 0xbc, 0xc1, 0xc9, 0x3c, 0x65, 0x65, 0x83, 0x69, 0xac, 0x9e, + 0x63, 0x55, 0x7d, 0x93, 0x32, 0x6d, 0x6b, 0x4e, 0xbb, 0x5f, 0xa7, 0xb5, 0xed, 0x54, 0xb5, 0x66, + 0x98, 0x06, 0x19, 0xb4, 0x0d, 0x52, 0x8e, 0x41, 0x6a, 0x6b, 0x4e, 0x39, 0xaf, 0x97, 0x8b, 0x15, + 0x43, 0xe3, 0x7f, 0x6d, 0x3b, 0x65, 0xa8, 0x60, 0x14, 0x0c, 0xfe, 0x53, 0xb3, 0x7e, 0xc1, 0xe8, + 0x58, 0xc1, 0x30, 0x0a, 0x25, 0xaa, 0xe9, 0xd5, 0xa2, 0xa6, 0x57, 0x2a, 0x86, 0xa9, 0x9b, 0x45, + 0xa3, 0xc2, 0x60, 0xf6, 0xff, 0x9b, 0x86, 0x15, 0x7b, 0xc3, 0x76, 0xb3, 0x3f, 0x60, 0x6a, 0xca, + 0xfe, 0xd2, 0x72, 0x3a, 0xa3, 0x36, 0x1e, 0x6d, 0x6b, 0x36, 0x47, 0x4d, 0x7d, 0x56, 0xab, 0xea, + 0x85, 0x62, 0x85, 0xc7, 0x01, 0xdb, 0x89, 0xa0, 0x1a, 0xca, 0x46, 0x9e, 0x96, 0x20, 0x9a, 0xba, + 0x81, 0x2f, 0xbc, 0x68, 0xc5, 0xb8, 0x2b, 0x2c, 0xb2, 0xf4, 0x7e, 0x9d, 0x32, 0x93, 0xac, 0x60, + 0xec, 0x86, 0x1b, 0x41, 0x13, 0x68, 0x32, 0x9e, 0xbe, 0x98, 0x02, 0x24, 0x56, 0xee, 0x94, 0xcd, + 0x05, 0xe4, 0x4e, 0xdd, 0xd1, 0x0b, 0x14, 0x7c, 0xb3, 0x92, 0xa7, 0xfa, 0x39, 0xc2, 0xc3, 0xfe, + 0x0c, 0xac, 0x6a, 0x54, 0x18, 0x25, 0x2b, 0x38, 0xe6, 0x00, 0x1b, 0x41, 0x13, 0xbd, 0x93, 0xf1, + 0xf4, 0x78, 0x2a, 0x80, 0xd4, 0x94, 0x70, 0xcd, 0xc4, 0x1e, 0x34, 0x92, 0x91, 0xcf, 0xfe, 0xf8, + 0x72, 0x0a, 0x65, 0x5d, 0x57, 0xb2, 0xea, 0x81, 0xda, 0xc3, 0xa1, 0x5e, 0x3a, 0x16, 0xaa, 0x0d, + 0xc2, 0x83, 0xf5, 0x25, 0x3c, 0xe4, 0x81, 0x2a, 0xb8, 0x78, 0x0a, 0xc7, 0x45, 0xb6, 0x8d, 0x62, + 0x9e, 0x93, 0xd1, 0x97, 0x19, 0x3e, 0x6c, 0x24, 0xc9, 0xb6, 0x5e, 0x2e, 0xcd, 0xab, 0xd2, 0xa4, + 0x9a, 0xc5, 0xe2, 0x6b, 0x3d, 0x3f, 0x3f, 0xf0, 0xee, 0x5e, 0x32, 0xf2, 0xe7, 0x5e, 0x32, 0xa2, + 0xbe, 0xea, 0xe3, 0xd9, 0x21, 0x61, 0x19, 0x0f, 0x08, 0x07, 0x60, 0x39, 0x3c, 0x07, 0x8e, 0xa7, + 0xfa, 0xa6, 0x40, 0x4e, 0x37, 0xb9, 0x8c, 0x04, 0xf2, 0x64, 0x00, 0x72, 0x19, 0xa1, 0x6f, 0x99, + 0x7b, 0x3a, 0x5e, 0xe6, 0x4f, 0x91, 0x28, 0xd0, 0x41, 0x00, 0x05, 0xde, 0xc2, 0x03, 0x0c, 0xc6, + 0x60, 0x91, 0xc7, 0x82, 0x0b, 0xb4, 0x8d, 0xbc, 0xf5, 0x81, 0x63, 0xf7, 0x96, 0xf8, 0x1e, 0x1e, + 0x94, 0x61, 0x86, 0xe6, 0x69, 0x1c, 0x63, 0x00, 0x63, 0xcd, 0x5b, 0x00, 0x4e, 0x67, 0x63, 0x30, + 0xb2, 0x9e, 0x77, 0x95, 0x23, 0xc2, 0x42, 0xf1, 0x4b, 0x38, 0x0a, 0x46, 0xb0, 0xb8, 0xa1, 0x6b, + 0x17, 0x7e, 0xea, 0xb7, 0x62, 0x03, 0xdd, 0x63, 0xb4, 0xb6, 0x5a, 0x33, 0xea, 0x55, 0x76, 0x52, + 0x5d, 0x1e, 0x53, 0x8d, 0x4f, 0x14, 0xbd, 0x27, 0x11, 0xc5, 0xff, 0x9a, 0xa0, 0x3b, 0xcc, 0x9c, + 0x2a, 0xf0, 0x11, 0x10, 0x45, 0x22, 0x90, 0x18, 0xc7, 0x51, 0xa6, 0x06, 0x1c, 0xbb, 0x27, 0x8a, + 0xb7, 0x84, 0x78, 0x9d, 0x74, 0x27, 0x66, 0x38, 0x85, 0x07, 0x38, 0x4a, 0x87, 0xdf, 0xcc, 0xe0, + 0x61, 0x23, 0x79, 0xd6, 0xf6, 0x12, 0x33, 0x6a, 0x36, 0xca, 0x7f, 0x72, 0x01, 0x0d, 0xfb, 0x11, + 0x00, 0x51, 0x0b, 0xb8, 0x9f, 0x1b, 0x81, 0x80, 0xda, 0xe0, 0xc9, 0xf6, 0x53, 0x7f, 0x46, 0x78, + 0xcc, 0x1b, 0xfb, 0x05, 0x5a, 0xce, 0xd1, 0x1a, 0xfb, 0xa7, 0x8b, 0xec, 0x9a, 0xae, 0x3e, 0x46, + 0x78, 0xfc, 0x88, 0x8a, 0x80, 0xb4, 0x34, 0x8e, 0x96, 0xed, 0x21, 0x2e, 0xaf, 0x58, 0x66, 0xe4, + 0x97, 0xaf, 0x66, 0x86, 0x20, 0xd3, 0x52, 0x3e, 0x5f, 0xa3, 0x8c, 0xdd, 0x35, 0x6b, 0xc5, 0x4a, + 0x21, 0x2b, 0x0c, 0xbb, 0x27, 0xa7, 0x47, 0x08, 0x8f, 0x3a, 0xf0, 0xee, 0xd0, 0x5a, 0xb9, 0xc8, + 0x98, 0x7c, 0x28, 0x77, 0xcc, 0xf7, 0xb5, 0xe6, 0x6d, 0x9b, 0xb9, 0x70, 0xd8, 0x48, 0x9e, 0x07, + 0x3f, 0x67, 0x4e, 0x95, 0x77, 0xf3, 0x4d, 0xdc, 0x57, 0x67, 0xb4, 0xc6, 0xf9, 0x8e, 0x65, 0x2e, + 0x1d, 0x36, 0x92, 0x71, 0xdb, 0xde, 0x1a, 0x55, 0x8f, 0xe4, 0x85, 0x3b, 0x49, 0x37, 0xd8, 0xd7, + 0xb2, 0x8c, 0x3c, 0x55, 0x01, 0xe7, 0x37, 0x70, 0xbc, 0xea, 0x0e, 0x03, 0xef, 0x52, 0x59, 0xd2, + 0xa4, 0x9a, 0x95, 0x4d, 0xc9, 0x2b, 0x38, 0x9a, 0xa7, 0xa6, 0x5e, 0x2c, 0xb1, 0x91, 0x1e, 0x7e, + 0x18, 0x3c, 0x11, 0x28, 0x72, 0x37, 0xe9, 0x32, 0xb7, 0xce, 0x8c, 0x5a, 0x5a, 0x3f, 0x6c, 0x24, + 0xcf, 0xd8, 0x09, 0x20, 0x86, 0x0a, 0x07, 0xa8, 0xf8, 0xfc, 0xb5, 0x17, 0x9f, 0xf3, 0xbb, 0x9e, + 0xf4, 0xc0, 0x27, 0x8b, 0x12, 0xa9, 0xf1, 0xf4, 0x54, 0x28, 0xbc, 0x7c, 0x97, 0xae, 0x45, 0x6c, + 0x66, 0xc9, 0x2d, 0xb1, 0xaf, 0xfb, 0x78, 0x88, 0xe9, 0x70, 0x21, 0xb8, 0xda, 0xd7, 0x22, 0xb0, + 0xb7, 0x95, 0x77, 0x10, 0xee, 0xb3, 0xa2, 0x3a, 0x8b, 0x8c, 0x3a, 0x58, 0x64, 0x72, 0x1d, 0x63, + 0x77, 0x39, 0xf8, 0x12, 0xc4, 0x64, 0x5d, 0xb9, 0x73, 0x6a, 0x56, 0x32, 0x74, 0xb4, 0x81, 0x94, + 0x12, 0xee, 0xe7, 0xc0, 0xc8, 0xd3, 0xd2, 0x89, 0x80, 0xb8, 0x3e, 0x13, 0xfb, 0x8d, 0x64, 0x94, + 0x4f, 0xae, 0x2f, 0xb7, 0x3c, 0x1c, 0x12, 0xcd, 0x20, 0x82, 0xb3, 0xb9, 0xbf, 0x32, 0xfd, 0xb8, + 0x97, 0xd5, 0xcb, 0xea, 0x5f, 0x08, 0x2b, 0x8e, 0x34, 0x97, 0x4a, 0x25, 0xe3, 0x75, 0xbd, 0x22, + 0x3d, 0x65, 0x3b, 0xde, 0x6f, 0xcb, 0x38, 0x5a, 0xa8, 0xe9, 0x15, 0x93, 0x52, 0x2e, 0x80, 0x58, + 0x66, 0xca, 0x15, 0x1b, 0x4c, 0x1c, 0x4d, 0xad, 0x70, 0xed, 0xd6, 0xa9, 0xe7, 0xdd, 0x8a, 0xa3, + 0x81, 0xf5, 0xc2, 0x4e, 0xbc, 0x6d, 0xdd, 0xad, 0x7a, 0xc5, 0x14, 0x77, 0xab, 0x12, 0xa8, 0xad, + 0x55, 0xcb, 0x24, 0xa3, 0xc0, 0x1e, 0x3a, 0x2d, 0x95, 0x25, 0xb6, 0x10, 0x44, 0xe9, 0xde, 0xc9, + 0xf8, 0x58, 0x00, 0xe7, 0x82, 0xe8, 0xe2, 0x4a, 0xfd, 0x4b, 0x37, 0x91, 0xb4, 0x26, 0xdf, 0x88, + 0xe3, 0xb1, 0xa9, 0xb4, 0xff, 0xf8, 0xa2, 0xa4, 0x7f, 0x3a, 0x8d, 0xfb, 0x39, 0x72, 0xf2, 0x1e, + 0xc2, 0x31, 0xa7, 0x4d, 0x23, 0xc1, 0x87, 0x5a, 0x60, 0xb7, 0xa8, 0x4c, 0x87, 0xb2, 0xb5, 0x93, + 0xab, 0x17, 0xdf, 0x7e, 0xf4, 0xfb, 0x07, 0x3d, 0x13, 0x24, 0xa1, 0x05, 0xb5, 0xa7, 0x6e, 0x5f, + 0xf7, 0x11, 0xc2, 0x03, 0xc2, 0x9b, 0x5c, 0x3e, 0x3e, 0x83, 0x00, 0x33, 0x15, 0xc6, 0x14, 0xb0, + 0x5c, 0xe3, 0x58, 0x52, 0xe4, 0x4a, 0x6b, 0x2c, 0xda, 0x8e, 0x24, 0xbd, 0x5d, 0xf2, 0xa1, 0x85, + 0x4c, 0xf4, 0x26, 0xad, 0x90, 0x79, 0xdb, 0xb1, 0x96, 0xc8, 0x7c, 0x7d, 0x93, 0x3a, 0xc7, 0x91, + 0xcd, 0x90, 0xe9, 0x40, 0x64, 0x1e, 0x3c, 0x9a, 0xd3, 0x27, 0xed, 0x21, 0x1c, 0x85, 0x48, 0x64, + 0xf2, 0xd8, 0x64, 0x02, 0xd6, 0xe5, 0x10, 0x96, 0x80, 0x6a, 0x91, 0xa3, 0x9a, 0x27, 0x37, 0xda, + 0x40, 0xa5, 0xed, 0xb8, 0x37, 0xe9, 0x2e, 0xf9, 0x04, 0x61, 0xec, 0xf6, 0x03, 0xa4, 0x85, 0x72, + 0x9a, 0x1a, 0x1e, 0xe5, 0x4a, 0x38, 0x63, 0xc0, 0x7a, 0x93, 0x63, 0xbd, 0x4e, 0xe6, 0xda, 0x59, + 0x5b, 0x0d, 0x9a, 0x8b, 0x2f, 0x10, 0x8e, 0x39, 0x31, 0x5b, 0xed, 0x05, 0x7f, 0xcf, 0xa0, 0x4c, + 0x87, 0xb2, 0x05, 0x8c, 0x2b, 0x1c, 0xe3, 0x22, 0x79, 0xb6, 0x03, 0x8c, 0xda, 0x8e, 0x38, 0xd9, + 0x76, 0xc9, 0x8f, 0x08, 0x9f, 0xf3, 0xbf, 0x86, 0xc9, 0x6c, 0x08, 0x24, 0xde, 0x5e, 0x40, 0x49, + 0xb7, 0xe3, 0x02, 0x35, 0xdc, 0xe6, 0x35, 0xac, 0x91, 0x95, 0x93, 0xd5, 0xa0, 0x89, 0x87, 0xf8, + 0x0f, 0x08, 0x9f, 0xf5, 0x3d, 0x32, 0xc9, 0xd5, 0xd6, 0xb8, 0x9a, 0x5f, 0xd9, 0xca, 0x6c, 0x1b, + 0x1e, 0x50, 0xc8, 0x2a, 0x2f, 0x64, 0x89, 0x2c, 0xb4, 0x55, 0x88, 0xf4, 0x92, 0xd5, 0x76, 0xac, + 0xf7, 0xd4, 0x2e, 0xf9, 0x0e, 0xe1, 0x33, 0xde, 0xbb, 0x99, 0x68, 0xad, 0xe1, 0x34, 0xdd, 0x85, + 0xca, 0xd5, 0xf0, 0x0e, 0x00, 0xff, 0x39, 0x0e, 0x7f, 0x81, 0x3c, 0xd3, 0x16, 0x7c, 0xdd, 0x09, + 0xa4, 0x59, 0xe0, 0x19, 0xf9, 0x1e, 0xe1, 0xb3, 0xbe, 0x4b, 0xac, 0x15, 0xfd, 0xc1, 0x57, 0x79, + 0x2b, 0xfa, 0x8f, 0xb8, 0x21, 0x3b, 0xdc, 0x0b, 0x12, 0x7e, 0x5b, 0x52, 0x99, 0xe7, 0x1f, 0xec, + 0x27, 0xd0, 0xc3, 0xfd, 0x04, 0xfa, 0x6d, 0x3f, 0x81, 0xde, 0x3f, 0x48, 0x44, 0x1e, 0x1e, 0x24, + 0x22, 0x8f, 0x0f, 0x12, 0x91, 0x97, 0xd3, 0x85, 0xa2, 0xf9, 0x5a, 0x3d, 0x97, 0xda, 0x34, 0xca, + 0x90, 0x63, 0xa6, 0xa4, 0xe7, 0x98, 0xc8, 0xb7, 0xf5, 0xa4, 0xf6, 0x86, 0x94, 0xc7, 0xdc, 0xae, + 0x52, 0x96, 0x3b, 0xc5, 0xff, 0x51, 0x3a, 0xf7, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xfb, + 0x4a, 0x7e, 0x10, 0x16, 0x00, 0x00, } func (this *PermissionDetail) Equal(that interface{}) bool { diff --git a/x/subspaces/wasm/common_test.go b/x/subspaces/wasm/common_test.go index 4f80329104..58822c5411 100644 --- a/x/subspaces/wasm/common_test.go +++ b/x/subspaces/wasm/common_test.go @@ -4,12 +4,15 @@ import ( "encoding/json" "testing" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + "github.com/cosmos/cosmos-sdk/codec/address" + "github.com/cosmos/cosmos-sdk/runtime" 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" @@ -165,12 +168,12 @@ type TestSuite struct { func (suite *TestSuite) SetupTest() { // Define store keys - keys := sdk.NewMemoryStoreKeys(types.StoreKey, authtypes.StoreKey) + keys := storetypes.NewKVStoreKeys(types.StoreKey, authtypes.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } @@ -185,9 +188,10 @@ func (suite *TestSuite) SetupTest() { // Define keeper suite.ak = authkeeper.NewAccountKeeper( suite.cdc, - keys[authtypes.StoreKey], + runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, app.GetMaccPerms(), + address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String(), ) diff --git a/x/subspaces/wasm/msg_parser_test.go b/x/subspaces/wasm/msg_parser_test.go index ffc1fb1309..be4eeec6ee 100644 --- a/x/subspaces/wasm/msg_parser_test.go +++ b/x/subspaces/wasm/msg_parser_test.go @@ -5,9 +5,10 @@ import ( "testing" "time" + "cosmossdk.io/math" + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/authz" - "github.com/cosmos/cosmos-sdk/x/feegrant" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/app" @@ -285,7 +286,7 @@ func TestMsgsParser_ParseCustomMsgs(t *testing.T) { 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", types.NewUserGrantee("cosmos1vkuuth0rak58x36m7wuzj7ztttxh26fhqcfxm0"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10)))}, )), shouldErr: false, expMsgs: []sdk.Msg{ @@ -293,7 +294,7 @@ func TestMsgsParser_ParseCustomMsgs(t *testing.T) { 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", types.NewUserGrantee("cosmos1vkuuth0rak58x36m7wuzj7ztttxh26fhqcfxm0"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10)))}, ), }, }, diff --git a/x/subspaces/wasm/querier.go b/x/subspaces/wasm/querier.go index 255387308c..5306f0e2ec 100644 --- a/x/subspaces/wasm/querier.go +++ b/x/subspaces/wasm/querier.go @@ -58,7 +58,7 @@ func (querier SubspacesWasmQuerier) handleSubspacesRequest(ctx sdk.Context, data if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.subspacesKeeper.Subspaces(sdk.WrapSDKContext(ctx), &req) + res, err := querier.subspacesKeeper.Subspaces(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -71,7 +71,7 @@ func (querier SubspacesWasmQuerier) handleSubspaceRequest(ctx sdk.Context, data if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.subspacesKeeper.Subspace(sdk.WrapSDKContext(ctx), &req) + res, err := querier.subspacesKeeper.Subspace(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -84,7 +84,7 @@ func (querier SubspacesWasmQuerier) handleUserGroupsRequest(ctx sdk.Context, dat if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.subspacesKeeper.UserGroups(sdk.WrapSDKContext(ctx), &req) + res, err := querier.subspacesKeeper.UserGroups(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -97,7 +97,7 @@ func (querier SubspacesWasmQuerier) handleUserGroupRequest(ctx sdk.Context, data if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.subspacesKeeper.UserGroup(sdk.WrapSDKContext(ctx), &req) + res, err := querier.subspacesKeeper.UserGroup(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -110,7 +110,7 @@ func (querier SubspacesWasmQuerier) handleUserGroupMembersRequest(ctx sdk.Contex if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.subspacesKeeper.UserGroupMembers(sdk.WrapSDKContext(ctx), &req) + res, err := querier.subspacesKeeper.UserGroupMembers(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -123,7 +123,7 @@ func (querier SubspacesWasmQuerier) handleUserPermissionsRequest(ctx sdk.Context if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.subspacesKeeper.UserPermissions(sdk.WrapSDKContext(ctx), &req) + res, err := querier.subspacesKeeper.UserPermissions(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -136,7 +136,7 @@ func (querier SubspacesWasmQuerier) handleUserAllowancesRequest(ctx sdk.Context, if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.subspacesKeeper.UserAllowances(sdk.WrapSDKContext(ctx), &req) + res, err := querier.subspacesKeeper.UserAllowances(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } @@ -149,7 +149,7 @@ func (querier SubspacesWasmQuerier) handleGroupAllowancesRequest(ctx sdk.Context if err != nil { return nil, errors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error()) } - res, err := querier.subspacesKeeper.GroupAllowances(sdk.WrapSDKContext(ctx), &req) + res, err := querier.subspacesKeeper.GroupAllowances(ctx, &req) if err != nil { return nil, errors.Wrap(sdkerrors.ErrInvalidRequest, err.Error()) } diff --git a/x/subspaces/wasm/querier_test.go b/x/subspaces/wasm/querier_test.go index ee2ea70434..13dd193f3c 100644 --- a/x/subspaces/wasm/querier_test.go +++ b/x/subspaces/wasm/querier_test.go @@ -4,9 +4,10 @@ import ( "encoding/json" "time" + "cosmossdk.io/math" + "cosmossdk.io/x/feegrant" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/cosmos/cosmos-sdk/x/feegrant" poststypes "github.com/desmos-labs/desmos/v6/x/posts/types" profilestypes "github.com/desmos-labs/desmos/v6/x/profiles/types" @@ -263,7 +264,7 @@ func (suite *TestSuite) TestSubspacesWasmQuerier_QueryCustom() { 1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", types.NewUserGrantee("cosmos1nv9kkuads7f627q2zf4k9kwdudx709rjck3s7e"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10)))}, )) }, shouldErr: false, @@ -274,7 +275,7 @@ func (suite *TestSuite) TestSubspacesWasmQuerier_QueryCustom() { 1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", types.NewUserGrantee("cosmos1nv9kkuads7f627q2zf4k9kwdudx709rjck3s7e"), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10)))}, ), }, Pagination: &query.PageResponse{NextKey: nil, Total: 1}, @@ -303,7 +304,7 @@ func (suite *TestSuite) TestSubspacesWasmQuerier_QueryCustom() { 1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10)))}, )) }, shouldErr: false, @@ -314,7 +315,7 @@ func (suite *TestSuite) TestSubspacesWasmQuerier_QueryCustom() { 1, "cosmos1m0czrla04f7rp3zg7dsgc4kla54q7pc4xt00l5", types.NewGroupGrantee(1), - &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10)))}, + &feegrant.BasicAllowance{SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", math.NewInt(10)))}, ), }, Pagination: &query.PageResponse{NextKey: nil, Total: 1}, diff --git a/x/supply/client/cli/cli_test.go b/x/supply/client/cli/cli_test.go index 8eadb9a1ad..d8cdfe1e3f 100644 --- a/x/supply/client/cli/cli_test.go +++ b/x/supply/client/cli/cli_test.go @@ -7,10 +7,10 @@ import ( "fmt" "testing" + "cosmossdk.io/math" tmcli "github.com/cometbft/cometbft/libs/cli" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" "github.com/cosmos/cosmos-sdk/testutil/network" - sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" @@ -86,7 +86,7 @@ func (s *IntegrationTestSuite) TestCmdQueryTotalSupply() { fmt.Sprintf("--%s=json", tmcli.OutputFlag), }, shouldErr: false, - expectedOutput: types.QueryTotalResponse{TotalSupply: sdk.NewInt(1000000020)}, + expectedOutput: types.QueryTotalResponse{TotalSupply: math.NewInt(1000000020)}, }, { name: "total supply returned correctly with divider_exponent conversion applied", @@ -96,7 +96,7 @@ func (s *IntegrationTestSuite) TestCmdQueryTotalSupply() { fmt.Sprintf("--%s=json", tmcli.OutputFlag), }, shouldErr: false, - expectedOutput: types.QueryTotalResponse{TotalSupply: sdk.NewInt(10000000)}, + expectedOutput: types.QueryTotalResponse{TotalSupply: math.NewInt(10000000)}, }, } @@ -145,7 +145,7 @@ func (s *IntegrationTestSuite) TestCmdQueryCirculatingSupply() { fmt.Sprintf("--%s=json", tmcli.OutputFlag), }, shouldErr: false, - expectedOutput: types.QueryCirculatingResponse{CirculatingSupply: sdk.NewInt(1000000020)}, + expectedOutput: types.QueryCirculatingResponse{CirculatingSupply: math.NewInt(1000000020)}, }, { name: "circulating supply returned correctly with divider_exponent conversion applied", @@ -155,7 +155,7 @@ func (s *IntegrationTestSuite) TestCmdQueryCirculatingSupply() { fmt.Sprintf("--%s=json", tmcli.OutputFlag), }, shouldErr: false, - expectedOutput: types.QueryCirculatingResponse{CirculatingSupply: sdk.NewInt(10000000)}, + expectedOutput: types.QueryCirculatingResponse{CirculatingSupply: math.NewInt(10000000)}, }, } diff --git a/x/supply/keeper/common_test.go b/x/supply/keeper/common_test.go index f329fd12ce..7e1c7157dc 100644 --- a/x/supply/keeper/common_test.go +++ b/x/supply/keeper/common_test.go @@ -2,15 +2,19 @@ package keeper_test import ( "testing" + "time" - db "github.com/cometbft/cometbft-db" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + db "github.com/cosmos/cosmos-db" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/codec/address" "github.com/cosmos/cosmos-sdk/crypto/hd" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" + "github.com/cosmos/cosmos-sdk/runtime" 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" @@ -46,11 +50,11 @@ func (suite *KeeperTestSuite) SetupTest() { maccPerms := app.GetMaccPerms() // Define store keys - keys := sdk.NewMemoryStoreKeys(authtypes.StoreKey, banktypes.StoreKey, distributiontypes.StoreKey, stakingtypes.StoreKey) + keys := storetypes.NewKVStoreKeys(authtypes.StoreKey, banktypes.StoreKey, distributiontypes.StoreKey, stakingtypes.StoreKey) // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } @@ -69,44 +73,48 @@ func (suite *KeeperTestSuite) SetupTest() { // Dependencies initialization suite.ak = authkeeper.NewAccountKeeper( suite.cdc, - keys[authtypes.StoreKey], + runtime.NewKVStoreService(keys[authtypes.StoreKey]), authtypes.ProtoBaseAccount, maccPerms, + address.NewBech32Codec("cosmos"), "cosmos", authtypes.NewModuleAddress("gov").String(), ) moduleAcc := authtypes.NewEmptyModuleAccount(banktypes.ModuleName, authtypes.Burner, authtypes.Minter, authtypes.Staking) - - suite.ak.SetModuleAccount(suite.ctx, moduleAcc) + maccI := (suite.ak.NewAccount(suite.ctx, moduleAcc)).(sdk.ModuleAccountI) // set the account number + suite.ak.SetModuleAccount(suite.ctx, maccI) suite.bk = bankkeeper.NewBaseKeeper( suite.cdc, - keys[banktypes.StoreKey], + runtime.NewKVStoreService(keys[banktypes.StoreKey]), suite.ak, nil, authtypes.NewModuleAddress("gov").String(), + log.NewNopLogger(), ) suite.sk = stakingkeeper.NewKeeper( suite.cdc, - keys[stakingtypes.StoreKey], + runtime.NewKVStoreService(keys[stakingtypes.StoreKey]), suite.ak, suite.bk, authtypes.NewModuleAddress("gov").String(), + address.NewBech32Codec("cosmosvaloper"), + address.NewBech32Codec("cosmosvalcons"), ) suite.dk = distributionkeeper.NewKeeper( suite.cdc, - keys[distributiontypes.StoreKey], + runtime.NewKVStoreService(keys[distributiontypes.StoreKey]), suite.ak, suite.bk, suite.sk, authtypes.FeeCollectorName, authtypes.NewModuleAddress("gov").String(), ) - suite.dk.SetFeePool(suite.ctx, distributiontypes.InitialFeePool()) + suite.dk.FeePool.Set(suite.ctx, distributiontypes.InitialFeePool()) // Define keeper suite.k = keeper.NewKeeper(suite.cdc, suite.ak, suite.bk, suite.dk) @@ -126,13 +134,14 @@ func (suite *KeeperTestSuite) setupSupply(ctx sdk.Context, totalSupply sdk.Coins suite.Require().NoError(suite.bk.MintCoins(ctx, moduleAcc.GetName(), totalSupply)) // Create a vesting account - vestingAccount := vestingtypes.NewContinuousVestingAccount( + vestingAccount, err := vestingtypes.NewContinuousVestingAccount( suite.createBaseAccount(), vestedSupply, 0, - 12324125423, + time.Date(2100, 1, 1, 0, 0, 0, 0, time.UTC).Unix(), ) - suite.ak.SetAccount(ctx, vestingAccount) + suite.Require().NoError(err) + suite.ak.SetAccount(ctx, suite.ak.NewAccount(ctx, vestingAccount)) // Send supply coins to the vesting account suite.Require().NoError(suite.bk.SendCoinsFromModuleToAccount( diff --git a/x/supply/keeper/grpc_query_test.go b/x/supply/keeper/grpc_query_test.go index b996d409bc..7702dcf9f5 100644 --- a/x/supply/keeper/grpc_query_test.go +++ b/x/supply/keeper/grpc_query_test.go @@ -18,25 +18,25 @@ func (suite *KeeperTestSuite) TestQueryServer_Total() { name: "valid query returns properly", store: func(ctx sdk.Context) { suite.setupSupply(ctx, - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1_000_000_000_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(200_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(300_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(1_000_000_000_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(200_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(300_000))), ) }, req: types.NewQueryTotalRequest(sdk.DefaultBondDenom, 6), - expSupply: sdk.NewInt(1_000_000), + expSupply: math.NewInt(1_000_000), }, { name: "valid query returns properly - divider equals to 0", store: func(ctx sdk.Context) { suite.setupSupply(ctx, - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1_000_000_000_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(200_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(300_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(1_000_000_000_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(200_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(300_000))), ) }, req: types.NewQueryTotalRequest(sdk.DefaultBondDenom, 0), - expSupply: sdk.NewInt(1_000_000_000_000), + expSupply: math.NewInt(1_000_000_000_000), }, } @@ -48,7 +48,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Total() { tc.store(ctx) } - res, err := suite.k.Total(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.Total(ctx, tc.req) suite.Require().NoError(err) suite.Require().Equal(tc.expSupply, res.TotalSupply) }) @@ -66,25 +66,25 @@ func (suite *KeeperTestSuite) TestQueryServer_Circulating() { name: "valid query returns properly", store: func(ctx sdk.Context) { suite.setupSupply(ctx, - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1_000_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(200_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(300_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(1_000_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(200_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(300_000))), ) }, req: types.NewQueryCirculatingRequest(sdk.DefaultBondDenom, 3), - expSupply: sdk.NewInt(500), + expSupply: math.NewInt(500), }, { name: "valid query returns properly - divider equals to 0", store: func(ctx sdk.Context) { suite.setupSupply(ctx, - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1_000_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(200_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(300_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(1_000_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(200_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(300_000))), ) }, req: types.NewQueryCirculatingRequest(sdk.DefaultBondDenom, 0), - expSupply: sdk.NewInt(500_000), + expSupply: math.NewInt(500_000), }, } @@ -96,7 +96,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Circulating() { tc.store(ctx) } - res, err := suite.k.Circulating(sdk.WrapSDKContext(ctx), tc.req) + res, err := suite.k.Circulating(ctx, tc.req) suite.Require().NoError(err) suite.Require().Equal(tc.expSupply, res.CirculatingSupply) }) diff --git a/x/supply/keeper/keeper.go b/x/supply/keeper/keeper.go index f279a61582..5a79e1518d 100644 --- a/x/supply/keeper/keeper.go +++ b/x/supply/keeper/keeper.go @@ -1,12 +1,13 @@ package keeper import ( + "fmt" + + "cosmossdk.io/log" "cosmossdk.io/math" - "github.com/cometbft/cometbft/libs/log" "github.com/cosmos/cosmos-sdk/codec" 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" "github.com/cosmos/cosmos-sdk/x/auth/vesting/exported" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" distributionkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper" @@ -52,13 +53,18 @@ func (k Keeper) GetCirculatingSupply(ctx sdk.Context, coinDenom string, divider totalSupply := k.bk.GetSupply(ctx, coinDenom) // Get the community pool denom amount - communityPoolDenomAmount := k.dk.GetFeePoolCommunityCoins(ctx).AmountOf(coinDenom) + communityPool, err := k.dk.FeePool.Get(ctx) + if err != nil { + panic(err) + } + + communityPoolDenomAmount := communityPool.CommunityPool.AmountOf(coinDenom) // Subtract community pool amount from the total supply circulatingSupply = totalSupply.Amount.Sub(communityPoolDenomAmount.RoundInt()) // Subtract all vesting account locked tokens amount from the circulating supply - k.ak.IterateAccounts(ctx, func(account authtypes.AccountI) (stop bool) { + k.ak.IterateAccounts(ctx, func(account sdk.AccountI) (stop bool) { if vestingAcc, ok := account.(exported.VestingAccount); ok { circulatingSupply = subtractVestingAccountDenomAmounts(circulatingSupply, vestingAcc, coinDenom) } @@ -81,5 +87,7 @@ func subtractVestingAccountDenomAmounts(circulatingSupply math.Int, originalVestingAmount := originalVesting.AmountOf(denom) delegatedFreeAmount := delegatedFree.AmountOf(denom) + fmt.Println(originalVestingAmount, delegatedFreeAmount) + return circulatingSupply.Sub(originalVestingAmount).Sub(delegatedFreeAmount) } diff --git a/x/supply/keeper/keeper_test.go b/x/supply/keeper/keeper_test.go index ef50f19b2b..3fcc3afdd3 100644 --- a/x/supply/keeper/keeper_test.go +++ b/x/supply/keeper/keeper_test.go @@ -17,14 +17,14 @@ func (suite *KeeperTestSuite) TestKeeper_GetTotalSupply() { name: "total supply is computed properly", store: func(ctx sdk.Context) { suite.setupSupply(ctx, - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1_000_000_000_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(200_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(300_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(1_000_000_000_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(200_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(300_000))), ) }, denom: sdk.DefaultBondDenom, - divider: sdk.NewInt(1_000_000), - expSupply: sdk.NewInt(1_000_000), + divider: math.NewInt(1_000_000), + expSupply: math.NewInt(1_000_000), }, } @@ -54,14 +54,14 @@ func (suite *KeeperTestSuite) TestKeeper_GetCirculatingSupply() { name: "circulating supply is computed properly", store: func(ctx sdk.Context) { suite.setupSupply(ctx, - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(1_000_000_000_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(200_000_000_000))), - sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(300_000_000_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(1_000_000_000_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(200_000_000_000))), + sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(300_000_000_000))), ) }, denom: sdk.DefaultBondDenom, - divider: sdk.NewInt(1_000_000), - expSupply: sdk.NewInt(500_000), + divider: math.NewInt(1_000_000), + expSupply: math.NewInt(500_000), }, } diff --git a/x/supply/module.go b/x/supply/module.go index db41837ea8..f595490683 100644 --- a/x/supply/module.go +++ b/x/supply/module.go @@ -29,11 +29,9 @@ import ( ) var ( - _ module.AppModule = AppModule{} _ module.AppModuleBasic = AppModuleBasic{} _ module.AppModuleSimulation = AppModule{} _ appmodule.AppModule = AppModule{} - _ depinject.OnePerModuleType = AppModule{} ) // AppModuleBasic defines the basic application module used by the supply module. @@ -131,15 +129,6 @@ func (am AppModule) ExportGenesis(_ sdk.Context, _ codec.JSONCodec) json.RawMess // ConsensusVersion implements AppModule/ConsensusVersion. func (AppModule) ConsensusVersion() uint64 { return 1 } -// BeginBlock returns the begin blocker for the supply module. -func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {} - -// EndBlock returns the end blocker for the supply module. It returns no validator -// updates. -func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return nil -} - // -------------------------------------------------------------------------------------------------------------------- // AppModuleSimulation functions @@ -148,7 +137,7 @@ func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Valid func (AppModule) GenerateGenesisState(_ *module.SimulationState) {} // RegisterStoreDecoder registers a decoder for supply module's types -func (am AppModule) RegisterStoreDecoder(_ sdk.StoreDecoderRegistry) {} +func (am AppModule) RegisterStoreDecoder(_ simtypes.StoreDecoderRegistry) {} // WeightedOperations returns the all the supply module operations with their respective weights. func (am AppModule) WeightedOperations(_ module.SimulationState) []simtypes.WeightedOperation { diff --git a/x/supply/types/query.go b/x/supply/types/query.go index 6775fe38f0..d94d4e7337 100644 --- a/x/supply/types/query.go +++ b/x/supply/types/query.go @@ -4,8 +4,6 @@ import ( math "math" cosmosmath "cosmossdk.io/math" - - sdk "github.com/cosmos/cosmos-sdk/types" ) // NewQueryTotalRequest returns a QueryTotalRequest instance @@ -27,5 +25,5 @@ func NewQueryCirculatingRequest(denom string, dividerExponent uint64) *QueryCirc // NewDividerPoweredByExponent takes the given exponent using it to power 10 to calculate the correct // divider func NewDividerPoweredByExponent(exponent uint64) cosmosmath.Int { - return sdk.NewInt(int64(math.Pow10(int(exponent)))) + return cosmosmath.NewInt(int64(math.Pow10(int(exponent)))) } diff --git a/x/supply/types/query.pb.go b/x/supply/types/query.pb.go index 930ea35c8e..ce6d7f1db9 100644 --- a/x/supply/types/query.pb.go +++ b/x/supply/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" @@ -74,7 +74,7 @@ var xxx_messageInfo_QueryTotalRequest proto.InternalMessageInfo // QueryTotalResponse is the response type for the Query/Total RPC method type QueryTotalResponse struct { - TotalSupply github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=total_supply,json=totalSupply,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"total_supply"` + TotalSupply cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=total_supply,json=totalSupply,proto3,customtype=cosmossdk.io/math.Int" json:"total_supply"` } func (m *QueryTotalResponse) Reset() { *m = QueryTotalResponse{} } @@ -156,7 +156,7 @@ var xxx_messageInfo_QueryCirculatingRequest proto.InternalMessageInfo // QueryCirculatingResponse is the response type for the Query/Circulating RPC // method type QueryCirculatingResponse struct { - CirculatingSupply github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=circulating_supply,json=circulatingSupply,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"circulating_supply"` + CirculatingSupply cosmossdk_io_math.Int `protobuf:"bytes,1,opt,name=circulating_supply,json=circulatingSupply,proto3,customtype=cosmossdk.io/math.Int" json:"circulating_supply"` } func (m *QueryCirculatingResponse) Reset() { *m = QueryCirculatingResponse{} } @@ -202,35 +202,35 @@ func init() { func init() { proto.RegisterFile("desmos/supply/v1/query.proto", fileDescriptor_821941a4adac8710) } var fileDescriptor_821941a4adac8710 = []byte{ - // 439 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x93, 0x4f, 0xab, 0xd3, 0x40, - 0x14, 0xc5, 0x33, 0xc5, 0x8a, 0xce, 0x13, 0x7c, 0x6f, 0x78, 0x60, 0x09, 0x8f, 0xa4, 0xd6, 0x3f, - 0x6d, 0x85, 0xce, 0x50, 0xc5, 0x8d, 0xcb, 0x8a, 0x8b, 0x2e, 0x1b, 0x5d, 0x09, 0x5a, 0xd2, 0x64, - 0x88, 0xc1, 0x74, 0x26, 0xcd, 0x4c, 0x42, 0x4b, 0x71, 0xa3, 0x1b, 0x97, 0x42, 0x77, 0xae, 0xfa, - 0x71, 0xba, 0x2c, 0xb8, 0x11, 0x17, 0x45, 0x5a, 0x17, 0x7e, 0x0c, 0xe9, 0x4c, 0x8a, 0xa1, 0x41, - 0x11, 0xe4, 0xad, 0x92, 0xdc, 0x3b, 0xfc, 0xee, 0x39, 0xe7, 0x4e, 0xe0, 0x85, 0x4f, 0xc5, 0x98, - 0x0b, 0x22, 0xd2, 0x38, 0x8e, 0x66, 0x24, 0xeb, 0x92, 0x49, 0x4a, 0x93, 0x19, 0x8e, 0x13, 0x2e, - 0x39, 0x3a, 0xd5, 0x5d, 0xac, 0xbb, 0x38, 0xeb, 0x9a, 0xe7, 0x01, 0x0f, 0xb8, 0x6a, 0x92, 0xfd, - 0x9b, 0x3e, 0x67, 0x5e, 0x04, 0x9c, 0x07, 0x11, 0x25, 0x6e, 0x1c, 0x12, 0x97, 0x31, 0x2e, 0x5d, - 0x19, 0x72, 0x26, 0x74, 0xb7, 0xf1, 0x1a, 0x9e, 0x0d, 0xf6, 0xd0, 0x17, 0x5c, 0xba, 0x91, 0x43, - 0x27, 0x29, 0x15, 0x12, 0x9d, 0xc3, 0xaa, 0x4f, 0x19, 0x1f, 0xd7, 0x40, 0x1d, 0xb4, 0xae, 0x3b, - 0xfa, 0x03, 0xb5, 0xe1, 0xa9, 0x1f, 0x66, 0xa1, 0x4f, 0x93, 0x21, 0x9d, 0xc6, 0x9c, 0x51, 0x26, - 0x6b, 0x95, 0x3a, 0x68, 0x5d, 0x71, 0x6e, 0xe6, 0xf5, 0x67, 0x79, 0xf9, 0xc9, 0xb5, 0x8f, 0x4b, - 0xdb, 0xf8, 0xb9, 0xb4, 0x8d, 0xc6, 0x04, 0xa2, 0x22, 0x5f, 0xc4, 0x9c, 0x09, 0x8a, 0x06, 0xf0, - 0x86, 0xdc, 0x17, 0x86, 0x5a, 0xbc, 0x9e, 0xd3, 0xc3, 0xab, 0x8d, 0x6d, 0x7c, 0xdb, 0xd8, 0xf7, - 0x83, 0x50, 0xbe, 0x49, 0x47, 0xd8, 0xe3, 0x63, 0xe2, 0x71, 0x15, 0x81, 0x7e, 0x74, 0x84, 0xff, - 0x96, 0xc8, 0x59, 0x4c, 0x05, 0xee, 0x33, 0xe9, 0x9c, 0x28, 0xc6, 0x73, 0x85, 0x28, 0x8c, 0xf4, - 0xe1, 0x2d, 0x35, 0xf2, 0x69, 0x98, 0x78, 0x69, 0xe4, 0xca, 0x90, 0x05, 0x97, 0x60, 0xec, 0x03, - 0x80, 0xb5, 0xf2, 0x98, 0xdc, 0xdf, 0x2b, 0x88, 0xbc, 0xdf, 0xe5, 0xff, 0x73, 0x79, 0x56, 0x20, - 0x1d, 0x7b, 0x7d, 0xf8, 0xb9, 0x02, 0xab, 0x4a, 0x05, 0x9a, 0xc3, 0xaa, 0xca, 0x18, 0xdd, 0xc1, - 0xc7, 0x17, 0x03, 0x97, 0x36, 0x6c, 0xde, 0xfd, 0xfb, 0x21, 0x6d, 0xa3, 0xd1, 0x7c, 0xff, 0xe5, - 0xc7, 0xa2, 0x72, 0x1b, 0xd9, 0xa4, 0x74, 0x13, 0x55, 0xf4, 0x64, 0xae, 0x02, 0x7c, 0x87, 0x16, - 0x00, 0x9e, 0x14, 0x72, 0x40, 0xed, 0x3f, 0xe0, 0xcb, 0x2b, 0x31, 0x1f, 0xfc, 0xcb, 0xd1, 0x5c, - 0x4f, 0x47, 0xe9, 0x69, 0xa2, 0x7b, 0x65, 0x3d, 0x85, 0x90, 0x0e, 0xaa, 0x7a, 0xfd, 0xd5, 0xd6, - 0x02, 0xeb, 0xad, 0x05, 0xbe, 0x6f, 0x2d, 0xf0, 0x69, 0x67, 0x19, 0xeb, 0x9d, 0x65, 0x7c, 0xdd, - 0x59, 0xc6, 0x4b, 0x52, 0xc8, 0x5e, 0xa3, 0x3a, 0x91, 0x3b, 0x12, 0x07, 0x6c, 0xf6, 0x98, 0x4c, - 0x0f, 0x6c, 0xb5, 0x88, 0xd1, 0x55, 0xf5, 0xb7, 0x3c, 0xfa, 0x15, 0x00, 0x00, 0xff, 0xff, 0xee, - 0x69, 0xcb, 0x28, 0x93, 0x03, 0x00, 0x00, + // 436 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x4f, 0x6b, 0xd4, 0x40, + 0x14, 0x4f, 0x16, 0x57, 0x74, 0x2a, 0xd8, 0x0e, 0x15, 0x97, 0x50, 0x93, 0xba, 0x2a, 0x6d, 0x85, + 0xce, 0x50, 0x05, 0x0f, 0x9e, 0xa4, 0xe2, 0xa1, 0xe0, 0xc5, 0xe8, 0xc9, 0x83, 0x35, 0x9b, 0x0c, + 0xe9, 0x60, 0x32, 0x2f, 0xcd, 0x4c, 0x42, 0x97, 0xe2, 0xc5, 0x93, 0x47, 0x61, 0x6f, 0x9e, 0xf6, + 0xe3, 0xec, 0x71, 0xc1, 0x8b, 0x78, 0x58, 0x64, 0xd7, 0x83, 0x1f, 0x43, 0x32, 0x93, 0xc5, 0xb0, + 0x41, 0xd1, 0x43, 0x6f, 0xc9, 0xfb, 0xf3, 0xfb, 0xf7, 0x12, 0xb4, 0x15, 0x31, 0x99, 0x82, 0xa4, + 0xb2, 0xc8, 0xb2, 0x64, 0x48, 0xcb, 0x03, 0x7a, 0x5a, 0xb0, 0x7c, 0x48, 0xb2, 0x1c, 0x14, 0xe0, + 0x75, 0xd3, 0x25, 0xa6, 0x4b, 0xca, 0x03, 0x67, 0x33, 0x86, 0x18, 0x74, 0x93, 0x56, 0x4f, 0x66, + 0xce, 0xd9, 0x8a, 0x01, 0xe2, 0x84, 0xd1, 0x20, 0xe3, 0x34, 0x10, 0x02, 0x54, 0xa0, 0x38, 0x08, + 0x69, 0xba, 0xfd, 0x37, 0x68, 0xe3, 0x45, 0x05, 0xfa, 0x0a, 0x54, 0x90, 0xf8, 0xec, 0xb4, 0x60, + 0x52, 0xe1, 0x4d, 0xd4, 0x8d, 0x98, 0x80, 0xb4, 0x67, 0x6f, 0xdb, 0xbb, 0x57, 0x7d, 0xf3, 0x82, + 0xf7, 0xd0, 0x7a, 0xc4, 0x4b, 0x1e, 0xb1, 0xfc, 0x98, 0x9d, 0x65, 0x20, 0x98, 0x50, 0xbd, 0xce, + 0xb6, 0xbd, 0x7b, 0xc9, 0xbf, 0x5e, 0xd7, 0x9f, 0xd5, 0xe5, 0xc7, 0x57, 0x3e, 0x8e, 0x3d, 0xeb, + 0xe7, 0xd8, 0xb3, 0xfa, 0x6f, 0x11, 0x6e, 0xe2, 0xcb, 0x0c, 0x84, 0x64, 0xf8, 0x09, 0xba, 0xa6, + 0xaa, 0xc2, 0xb1, 0x11, 0x6f, 0x78, 0x0e, 0x6f, 0x4d, 0x66, 0x9e, 0xf5, 0x6d, 0xe6, 0xdd, 0x08, + 0xa1, 0x72, 0x26, 0xa3, 0x77, 0x84, 0x03, 0x4d, 0x03, 0x75, 0x42, 0x8e, 0x84, 0xf2, 0xd7, 0xf4, + 0xca, 0x4b, 0xbd, 0xd1, 0x60, 0x88, 0xd0, 0x4d, 0xcd, 0xf0, 0x94, 0xe7, 0x61, 0x91, 0x04, 0x8a, + 0x8b, 0xf8, 0x02, 0x7c, 0xe4, 0xa8, 0xd7, 0x66, 0xa9, 0xdd, 0x3c, 0x47, 0x38, 0xfc, 0x5d, 0xfe, + 0x2f, 0x4f, 0x1b, 0x8d, 0xc5, 0x55, 0x67, 0x0f, 0x3e, 0x77, 0x50, 0x57, 0x93, 0xe2, 0x73, 0xd4, + 0xd5, 0x01, 0xe2, 0x3b, 0x64, 0xf5, 0xea, 0xa4, 0x75, 0x3e, 0xe7, 0xee, 0xdf, 0x87, 0x8c, 0xea, + 0xfe, 0xce, 0x87, 0x2f, 0x3f, 0x46, 0x9d, 0xdb, 0xd8, 0xa3, 0xad, 0xcf, 0x4c, 0x07, 0x4d, 0xcf, + 0x75, 0x5c, 0xef, 0xf1, 0xc8, 0x46, 0x6b, 0x0d, 0xdb, 0x78, 0xef, 0x0f, 0xf0, 0xed, 0x03, 0x38, + 0xf7, 0xff, 0x65, 0xb4, 0xd6, 0xb3, 0xaf, 0xf5, 0xec, 0xe0, 0x7b, 0x6d, 0x3d, 0x8d, 0x90, 0x96, + 0xaa, 0x0e, 0x8f, 0x26, 0x73, 0xd7, 0x9e, 0xce, 0x5d, 0xfb, 0xfb, 0xdc, 0xb5, 0x3f, 0x2d, 0x5c, + 0x6b, 0xba, 0x70, 0xad, 0xaf, 0x0b, 0xd7, 0x7a, 0x4d, 0x63, 0xae, 0x4e, 0x8a, 0x01, 0x09, 0x21, + 0xad, 0xa1, 0xf6, 0x93, 0x60, 0x20, 0x97, 0xb0, 0xe5, 0x23, 0x7a, 0xb6, 0xc4, 0x56, 0xc3, 0x8c, + 0xc9, 0xc1, 0x65, 0xfd, 0x2b, 0x3c, 0xfc, 0x15, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x15, 0x12, 0x42, + 0x70, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/supply/types/query_test.go b/x/supply/types/query_test.go index 539cbccae4..73e8044b5d 100644 --- a/x/supply/types/query_test.go +++ b/x/supply/types/query_test.go @@ -4,7 +4,6 @@ import ( "testing" "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" "github.com/desmos-labs/desmos/v6/x/supply/types" @@ -19,52 +18,52 @@ func Test_NewDividerFromRawInt(t *testing.T) { { name: "raw divider equal to zero return 1", rawDivider: 0, - expectedInt: sdk.NewInt(1), + expectedInt: math.NewInt(1), }, { name: "raw divider equal to 2 return 100", rawDivider: 2, - expectedInt: sdk.NewInt(100), + expectedInt: math.NewInt(100), }, { name: "raw divider equal to 3 return 1000", rawDivider: 3, - expectedInt: sdk.NewInt(1000), + expectedInt: math.NewInt(1000), }, { name: "raw divider equal to 4 return 10000", rawDivider: 4, - expectedInt: sdk.NewInt(10000), + expectedInt: math.NewInt(10000), }, { name: "raw divider equal to 5 return 100000", rawDivider: 5, - expectedInt: sdk.NewInt(100000), + expectedInt: math.NewInt(100000), }, { name: "raw divider equal to 6 return 1000000", rawDivider: 6, - expectedInt: sdk.NewInt(1000000), + expectedInt: math.NewInt(1000000), }, { name: "raw divider equal to 6 return 1000000", rawDivider: 7, - expectedInt: sdk.NewInt(10000000), + expectedInt: math.NewInt(10000000), }, { name: "raw divider equal to 6 return 1000000", rawDivider: 8, - expectedInt: sdk.NewInt(100000000), + expectedInt: math.NewInt(100000000), }, { name: "raw divider equal to 6 return 1000000", rawDivider: 9, - expectedInt: sdk.NewInt(1000000000), + expectedInt: math.NewInt(1000000000), }, { name: "raw divider equal to 6 return 1000000", rawDivider: 10, - expectedInt: sdk.NewInt(10000000000), + expectedInt: math.NewInt(10000000000), }, } diff --git a/x/tokenfactory/client/cli/cli_test.go b/x/tokenfactory/client/cli/cli_test.go index 60fe894412..9be84cbd6b 100644 --- a/x/tokenfactory/client/cli/cli_test.go +++ b/x/tokenfactory/client/cli/cli_test.go @@ -10,6 +10,7 @@ import ( "testing" "time" + "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" @@ -232,7 +233,7 @@ func (s *IntegrationTestSuite) TestCmdCreateDenom() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -295,7 +296,7 @@ func (s *IntegrationTestSuite) TestCmdMint() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -358,7 +359,7 @@ func (s *IntegrationTestSuite) TestCmdBurn() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, @@ -443,7 +444,7 @@ func (s *IntegrationTestSuite) TestCmdSetDenomMetadata() { fmt.Sprintf("--%s=%s", flags.FlagFrom, val.Address.String()), fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation), fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync), - fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()), + fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, math.NewInt(10))).String()), }, shouldErr: false, respType: &sdk.TxResponse{}, diff --git a/x/tokenfactory/keeper/common_test.go b/x/tokenfactory/keeper/common_test.go index d9d3c49e21..010b891dfe 100644 --- a/x/tokenfactory/keeper/common_test.go +++ b/x/tokenfactory/keeper/common_test.go @@ -5,13 +5,14 @@ import ( "github.com/golang/mock/gomock" - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - db "github.com/cometbft/cometbft-db" + "cosmossdk.io/store" + "cosmossdk.io/store/metrics" + storetypes "cosmossdk.io/store/types" + db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/stretchr/testify/suite" @@ -40,12 +41,12 @@ type KeeperTestSuite struct { func (suite *KeeperTestSuite) SetupTest() { // Define store keys - keys := sdk.NewMemoryStoreKeys(types.StoreKey) + keys := storetypes.NewMemoryStoreKeys(types.StoreKey) suite.storeKey = keys[types.StoreKey] // Create an in-memory db memDB := db.NewMemDB() - ms := store.NewCommitMultiStore(memDB) + ms := store.NewCommitMultiStore(memDB, log.NewNopLogger(), metrics.NewNoOpMetrics()) for _, key := range keys { ms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, memDB) } diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index e0765824c4..2aa12b3642 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -3,6 +3,7 @@ package keeper_test import ( "fmt" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/golang/mock/gomock" @@ -74,12 +75,12 @@ func (suite *KeeperTestSuite) TestKeeper_CreateDenom() { gomock.Any(), sdk.MustAccAddressFromBech32("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), ). Return(fmt.Errorf("send coin to module error")) }, store: func(ctx sdk.Context) { - suite.k.SetParams(ctx, types.NewParams(sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))))) + suite.k.SetParams(ctx, types.NewParams(sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))))) }, subdenom: "uminttoken", creator: "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", @@ -101,16 +102,16 @@ func (suite *KeeperTestSuite) TestKeeper_CreateDenom() { gomock.Any(), sdk.MustAccAddressFromBech32("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), ). Return(nil) suite.bk.EXPECT(). - BurnCoins(gomock.Any(), types.ModuleName, sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))). + BurnCoins(gomock.Any(), types.ModuleName, sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))). Return(fmt.Errorf("bank burn coins error")) }, store: func(ctx sdk.Context) { - suite.k.SetParams(ctx, types.NewParams(sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))))) + suite.k.SetParams(ctx, types.NewParams(sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))))) }, subdenom: "uminttoken", creator: "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47", @@ -132,12 +133,12 @@ func (suite *KeeperTestSuite) TestKeeper_CreateDenom() { gomock.Any(), sdk.MustAccAddressFromBech32("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))), ). Return(nil) suite.bk.EXPECT(). - BurnCoins(gomock.Any(), types.ModuleName, sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))). + BurnCoins(gomock.Any(), types.ModuleName, sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))). Return(nil) suite.bk.EXPECT(). @@ -150,7 +151,7 @@ func (suite *KeeperTestSuite) TestKeeper_CreateDenom() { }) }, store: func(ctx sdk.Context) { - suite.k.SetParams(ctx, types.NewParams(sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100))))) + suite.k.SetParams(ctx, types.NewParams(sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100))))) }, check: func(ctx sdk.Context) { suite.Require().Equal( diff --git a/x/tokenfactory/keeper/creators.go b/x/tokenfactory/keeper/creators.go index ae78a52199..7a710ed6a4 100644 --- a/x/tokenfactory/keeper/creators.go +++ b/x/tokenfactory/keeper/creators.go @@ -1,6 +1,7 @@ package keeper import ( + storetypes "cosmossdk.io/store/types" sdk "github.com/cosmos/cosmos-sdk/types" ) @@ -22,6 +23,6 @@ func (k Keeper) GetDenomsFromCreator(ctx sdk.Context, creator string) []string { return denoms } -func (k Keeper) GetAllDenomsIterator(ctx sdk.Context) sdk.Iterator { +func (k Keeper) GetAllDenomsIterator(ctx sdk.Context) storetypes.Iterator { return k.GetCreatorsPrefixStore(ctx).Iterator(nil, nil) } diff --git a/x/tokenfactory/keeper/grpc_query_test.go b/x/tokenfactory/keeper/grpc_query_test.go index ca9faa01f5..bddecf8fcf 100644 --- a/x/tokenfactory/keeper/grpc_query_test.go +++ b/x/tokenfactory/keeper/grpc_query_test.go @@ -34,7 +34,7 @@ func (suite *KeeperTestSuite) TestQueryServer_Params() { tc.store(ctx) } - res, err := suite.k.Params(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.Params(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { @@ -73,7 +73,7 @@ func (suite *KeeperTestSuite) TestQueryServer_SubspaceDenoms() { tc.store(ctx) } - res, err := suite.k.SubspaceDenoms(sdk.WrapSDKContext(ctx), tc.request) + res, err := suite.k.SubspaceDenoms(ctx, tc.request) if tc.shouldErr { suite.Require().Error(err) } else { diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 4af3b17a20..c689eaeaf3 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -1,10 +1,10 @@ package keeper import ( - "github.com/cometbft/cometbft/libs/log" + "cosmossdk.io/log" + "cosmossdk.io/store/prefix" + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" - "github.com/cosmos/cosmos-sdk/store/prefix" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/tokenfactory/types" @@ -58,19 +58,19 @@ func (k Keeper) createModuleAccount(ctx sdk.Context) { } // GetDenomPrefixStore returns the substore for a specific denom -func (k Keeper) GetDenomPrefixStore(ctx sdk.Context, denom string) sdk.KVStore { +func (k Keeper) GetDenomPrefixStore(ctx sdk.Context, denom string) storetypes.KVStore { store := ctx.KVStore(k.storeKey) return prefix.NewStore(store, types.GetDenomPrefixStore(denom)) } // GetCreatorPrefixStore returns the substore for a specific creator address -func (k Keeper) GetCreatorPrefixStore(ctx sdk.Context, creator string) sdk.KVStore { +func (k Keeper) GetCreatorPrefixStore(ctx sdk.Context, creator string) storetypes.KVStore { store := ctx.KVStore(k.storeKey) return prefix.NewStore(store, types.GetCreatorPrefix(creator)) } // GetCreatorsPrefixStore returns the substore that contains a list of creators -func (k Keeper) GetCreatorsPrefixStore(ctx sdk.Context) sdk.KVStore { +func (k Keeper) GetCreatorsPrefixStore(ctx sdk.Context) storetypes.KVStore { store := ctx.KVStore(k.storeKey) return prefix.NewStore(store, types.GetCreatorsPrefix()) } diff --git a/x/tokenfactory/keeper/msg_server_test.go b/x/tokenfactory/keeper/msg_server_test.go index 66ba9bb3cc..ea0ee53de6 100644 --- a/x/tokenfactory/keeper/msg_server_test.go +++ b/x/tokenfactory/keeper/msg_server_test.go @@ -4,6 +4,7 @@ import ( "fmt" "time" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" @@ -192,7 +193,7 @@ func (suite *KeeperTestSuite) TestMsgServer_CreateDenom() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.CreateDenom(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.CreateDenom(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -227,7 +228,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { msg: types.NewMsgMint( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), shouldErr: true, }, @@ -260,7 +261,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { msg: types.NewMsgMint( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), shouldErr: true, }, @@ -298,7 +299,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { MintCoins( gomock.Any(), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(fmt.Errorf("error")) }, @@ -310,7 +311,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { msg: types.NewMsgMint( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), shouldErr: true, }, @@ -348,7 +349,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { MintCoins( gomock.Any(), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(nil) @@ -357,7 +358,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { gomock.Any(), types.ModuleName, sdk.MustAccAddressFromBech32("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(fmt.Errorf("error")) }, @@ -369,7 +370,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { msg: types.NewMsgMint( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), shouldErr: true, }, @@ -407,7 +408,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { MintCoins( gomock.Any(), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(nil) @@ -416,7 +417,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { gomock.Any(), types.ModuleName, sdk.MustAccAddressFromBech32("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(nil) }, @@ -428,7 +429,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { msg: types.NewMsgMint( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), expResponse: &types.MsgMintResponse{}, expEvents: sdk.Events{ @@ -436,7 +437,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { types.EventTypeMint, sdk.NewAttribute(types.AttributeKeySubspaceID, "1"), sdk.NewAttribute(types.AttributeMintToAddress, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), - sdk.NewAttribute(types.AttributeAmount, sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)).String()), + sdk.NewAttribute(types.AttributeAmount, sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)).String()), ), }, }, @@ -454,7 +455,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Mint() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.Mint(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.Mint(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -486,7 +487,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { msg: types.NewMsgBurn( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), shouldErr: true, }, @@ -519,7 +520,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { msg: types.NewMsgBurn( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), shouldErr: true, }, @@ -558,7 +559,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { gomock.Any(), sdk.MustAccAddressFromBech32("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(fmt.Errorf("error")) }, @@ -570,7 +571,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { msg: types.NewMsgBurn( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), shouldErr: true, }, @@ -609,7 +610,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { gomock.Any(), sdk.MustAccAddressFromBech32("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(nil) @@ -617,7 +618,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { BurnCoins( gomock.Any(), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(fmt.Errorf("error")) }, @@ -629,7 +630,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { msg: types.NewMsgBurn( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), shouldErr: true, }, @@ -668,7 +669,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { gomock.Any(), sdk.MustAccAddressFromBech32("cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(nil) @@ -676,7 +677,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { BurnCoins( gomock.Any(), types.ModuleName, - sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100))), + sdk.NewCoins(sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100))), ). Return(nil) }, @@ -688,7 +689,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { msg: types.NewMsgBurn( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)), + sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)), ), expResponse: &types.MsgBurnResponse{}, expEvents: sdk.Events{ @@ -696,7 +697,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { types.EventTypeBurn, sdk.NewAttribute(types.AttributeKeySubspaceID, "1"), sdk.NewAttribute(types.AttributeBurnFromAddress, "cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47"), - sdk.NewAttribute(types.AttributeAmount, sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", sdk.NewInt(100)).String()), + sdk.NewAttribute(types.AttributeAmount, sdk.NewCoin("factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken", math.NewInt(100)).String()), ), }, }, @@ -714,7 +715,7 @@ func (suite *KeeperTestSuite) TestMsgServer_Burn() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.Burn(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.Burn(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -862,7 +863,7 @@ func (suite *KeeperTestSuite) TestMsgServer_SetDenomMetadata() { } msgServer := keeper.NewMsgServerImpl(suite.k) - res, err := msgServer.SetDenomMetadata(sdk.WrapSDKContext(ctx), tc.msg) + res, err := msgServer.SetDenomMetadata(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) } else { @@ -894,13 +895,13 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateParams() { { name: "set params properly", msg: types.NewMsgUpdateParams( - types.NewParams(sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))), + types.NewParams(sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))), authtypes.NewModuleAddress("gov").String(), ), shouldErr: false, check: func(ctx sdk.Context) { suite.Require().Equal( - types.NewParams(sdk.NewCoins(sdk.NewCoin("test", sdk.NewInt(100)))), + types.NewParams(sdk.NewCoins(sdk.NewCoin("test", math.NewInt(100)))), suite.k.GetParams(ctx), ) }, @@ -920,7 +921,7 @@ func (suite *KeeperTestSuite) TestMsgServer_UpdateParams() { // Run the message service := keeper.NewMsgServerImpl(suite.k) - _, err := service.UpdateParams(sdk.WrapSDKContext(ctx), tc.msg) + _, err := service.UpdateParams(ctx, tc.msg) if tc.shouldErr { suite.Require().Error(err) diff --git a/x/tokenfactory/keeper/params_test.go b/x/tokenfactory/keeper/params_test.go index 25c13b4c44..63dd48fb1f 100644 --- a/x/tokenfactory/keeper/params_test.go +++ b/x/tokenfactory/keeper/params_test.go @@ -1,6 +1,7 @@ package keeper_test import ( + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/desmos-labs/desmos/v6/x/tokenfactory/types" @@ -26,10 +27,10 @@ func (suite *KeeperTestSuite) TestKeeper_SetParams() { store: func(ctx sdk.Context) { suite.k.SetParams(ctx, types.DefaultParams()) }, - params: types.NewParams(sdk.NewCoins(sdk.NewCoin("udsm", sdk.NewInt(100)))), + params: types.NewParams(sdk.NewCoins(sdk.NewCoin("udsm", math.NewInt(100)))), check: func(ctx sdk.Context) { stored := suite.k.GetParams(ctx) - suite.Require().Equal(types.NewParams(sdk.NewCoins(sdk.NewCoin("udsm", sdk.NewInt(100)))), stored) + suite.Require().Equal(types.NewParams(sdk.NewCoins(sdk.NewCoin("udsm", math.NewInt(100)))), stored) }, }, } @@ -59,9 +60,9 @@ func (suite *KeeperTestSuite) TestKeeper_GetParams() { { name: "params are returned properly", store: func(ctx sdk.Context) { - suite.k.SetParams(ctx, types.NewParams(sdk.NewCoins(sdk.NewCoin("udsm", sdk.NewInt(100))))) + suite.k.SetParams(ctx, types.NewParams(sdk.NewCoins(sdk.NewCoin("udsm", math.NewInt(100))))) }, - expParams: types.NewParams(sdk.NewCoins(sdk.NewCoin("udsm", sdk.NewInt(100)))), + expParams: types.NewParams(sdk.NewCoins(sdk.NewCoin("udsm", math.NewInt(100)))), }, } diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index d3f43fdc01..f209d9e47b 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -8,11 +8,11 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/depinject" + storetypes "cosmossdk.io/store/types" abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -42,11 +42,9 @@ const ( // type check to ensure the interface is properly implemented var ( - _ module.AppModule = AppModule{} _ module.AppModuleBasic = AppModuleBasic{} _ module.AppModuleSimulation = AppModule{} _ appmodule.AppModule = AppModule{} - _ depinject.OnePerModuleType = AppModule{} ) // AppModuleBasic defines the basic application module used by the tokenfactory module. @@ -165,16 +163,6 @@ func (AppModule) ConsensusVersion() uint64 { return consensusVersion } -// BeginBlock returns the begin blocker for the tokenfactory module. -func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) { -} - -// EndBlock returns the end blocker for the tokenfactory module. It returns no validator -// updates. -func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.ValidatorUpdate { - return []abci.ValidatorUpdate{} -} - // -------------------------------------------------------------------------------------------------------------------- // AppModuleSimulation defines the module simulation functions used by the tokenfactory module. @@ -186,7 +174,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { } // RegisterStoreDecoder performs a no-op. -func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { +func (am AppModule) RegisterStoreDecoder(sdr simtypes.StoreDecoderRegistry) { sdr[types.ModuleName] = simulation.NewDecodeStore(am.cdc) } diff --git a/x/tokenfactory/simulation/operations.go b/x/tokenfactory/simulation/operations.go index 6913cda62d..e4e4622762 100644 --- a/x/tokenfactory/simulation/operations.go +++ b/x/tokenfactory/simulation/operations.go @@ -46,28 +46,28 @@ func WeightedOperations( ) sim.WeightedOperations { var weightMsgCreateDenom int - appParams.GetOrGenerate(cdc, OpWeightMsgCreateDenom, &weightMsgCreateDenom, nil, + appParams.GetOrGenerate(OpWeightMsgCreateDenom, &weightMsgCreateDenom, nil, func(_ *rand.Rand) { weightMsgCreateDenom = DefaultWeightMsgCreateDenom }, ) var weightMsgMint int - appParams.GetOrGenerate(cdc, OpWeightMsgMint, &weightMsgMint, nil, + appParams.GetOrGenerate(OpWeightMsgMint, &weightMsgMint, nil, func(_ *rand.Rand) { weightMsgMint = DefaultWeightMsgMint }, ) var weightMsgBurn int - appParams.GetOrGenerate(cdc, OpWeightMsgBurn, &weightMsgBurn, nil, + appParams.GetOrGenerate(OpWeightMsgBurn, &weightMsgBurn, nil, func(_ *rand.Rand) { weightMsgBurn = DefaultWeightMsgBurn }, ) var weightMsgSetDenomMetadata int - appParams.GetOrGenerate(cdc, OpWeightMsgSetDenomMetadata, &weightMsgSetDenomMetadata, nil, + appParams.GetOrGenerate(OpWeightMsgSetDenomMetadata, &weightMsgSetDenomMetadata, nil, func(_ *rand.Rand) { weightMsgSetDenomMetadata = DefaultWeightMsgSetDenomMetadata }, @@ -212,7 +212,7 @@ func randomMintFields( } denom := RandomDenom(r, denoms) amount = sdk.NewCoin(denom, simtypes.RandomAmount(r, math.NewInt(1000))) - if amount.Amount.Equal(sdk.NewInt(0)) { + if amount.Amount.Equal(math.NewInt(0)) { // Skip because amount with zero is invalid skip = true return @@ -282,7 +282,7 @@ func randomBurnFields( // Get a amount to burn balance := bk.SpendableCoin(ctx, sdk.MustAccAddressFromBech32(subspace.Treasury), denom) amount = sdk.NewCoin(denom, simtypes.RandomAmount(r, balance.Amount)) - if amount.Amount.Equal(sdk.NewInt(0)) { + if amount.Amount.Equal(math.NewInt(0)) { // Skip because amount with zero is invalid skip = true return diff --git a/x/tokenfactory/simulation/proposal.go b/x/tokenfactory/simulation/proposal.go index b932a95f9c..a3887b49f9 100644 --- a/x/tokenfactory/simulation/proposal.go +++ b/x/tokenfactory/simulation/proposal.go @@ -3,6 +3,7 @@ package simulation import ( "math/rand" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" @@ -37,7 +38,7 @@ func SimulateMsgUpdateParams(r *rand.Rand, _ sdk.Context, _ []simtypes.Account) var authority sdk.AccAddress = address.Module("gov") params := types.NewParams(sdk.NewCoins( - sdk.NewCoin(sdk.DefaultBondDenom, simtypes.RandomAmount(r, sdk.NewInt(100)))), + sdk.NewCoin(sdk.DefaultBondDenom, simtypes.RandomAmount(r, math.NewInt(100)))), ) return &types.MsgUpdateParams{ diff --git a/x/tokenfactory/testutil/expected_keepers_mocks.go b/x/tokenfactory/testutil/expected_keepers_mocks.go index cba114dd2f..dd5ce8010d 100644 --- a/x/tokenfactory/testutil/expected_keepers_mocks.go +++ b/x/tokenfactory/testutil/expected_keepers_mocks.go @@ -5,12 +5,12 @@ package testutil import ( + context "context" reflect "reflect" types "github.com/cosmos/cosmos-sdk/types" - types0 "github.com/cosmos/cosmos-sdk/x/auth/types" - types1 "github.com/cosmos/cosmos-sdk/x/bank/types" - types2 "github.com/desmos-labs/desmos/v6/x/subspaces/types" + types0 "github.com/cosmos/cosmos-sdk/x/bank/types" + types1 "github.com/desmos-labs/desmos/v6/x/subspaces/types" gomock "github.com/golang/mock/gomock" ) @@ -38,7 +38,7 @@ func (m *MockBankKeeper) EXPECT() *MockBankKeeperMockRecorder { } // BurnCoins mocks base method. -func (m *MockBankKeeper) BurnCoins(ctx types.Context, moduleName string, amt types.Coins) error { +func (m *MockBankKeeper) BurnCoins(ctx context.Context, moduleName string, amt types.Coins) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "BurnCoins", ctx, moduleName, amt) ret0, _ := ret[0].(error) @@ -52,10 +52,10 @@ func (mr *MockBankKeeperMockRecorder) BurnCoins(ctx, moduleName, amt interface{} } // GetDenomMetaData mocks base method. -func (m *MockBankKeeper) GetDenomMetaData(ctx types.Context, denom string) (types1.Metadata, bool) { +func (m *MockBankKeeper) GetDenomMetaData(ctx context.Context, denom string) (types0.Metadata, bool) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetDenomMetaData", ctx, denom) - ret0, _ := ret[0].(types1.Metadata) + ret0, _ := ret[0].(types0.Metadata) ret1, _ := ret[1].(bool) return ret0, ret1 } @@ -67,7 +67,7 @@ func (mr *MockBankKeeperMockRecorder) GetDenomMetaData(ctx, denom interface{}) * } // HasBalance mocks base method. -func (m *MockBankKeeper) HasBalance(ctx types.Context, addr types.AccAddress, amt types.Coin) bool { +func (m *MockBankKeeper) HasBalance(ctx context.Context, addr types.AccAddress, amt types.Coin) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HasBalance", ctx, addr, amt) ret0, _ := ret[0].(bool) @@ -81,7 +81,7 @@ func (mr *MockBankKeeperMockRecorder) HasBalance(ctx, addr, amt interface{}) *go } // HasSupply mocks base method. -func (m *MockBankKeeper) HasSupply(ctx types.Context, denom string) bool { +func (m *MockBankKeeper) HasSupply(ctx context.Context, denom string) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HasSupply", ctx, denom) ret0, _ := ret[0].(bool) @@ -95,7 +95,7 @@ func (mr *MockBankKeeperMockRecorder) HasSupply(ctx, denom interface{}) *gomock. } // MintCoins mocks base method. -func (m *MockBankKeeper) MintCoins(ctx types.Context, moduleName string, amt types.Coins) error { +func (m *MockBankKeeper) MintCoins(ctx context.Context, moduleName string, amt types.Coins) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "MintCoins", ctx, moduleName, amt) ret0, _ := ret[0].(error) @@ -109,7 +109,7 @@ func (mr *MockBankKeeperMockRecorder) MintCoins(ctx, moduleName, amt interface{} } // SendCoins mocks base method. -func (m *MockBankKeeper) SendCoins(ctx types.Context, fromAddr, toAddr types.AccAddress, amt types.Coins) error { +func (m *MockBankKeeper) SendCoins(ctx context.Context, fromAddr, toAddr types.AccAddress, amt types.Coins) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendCoins", ctx, fromAddr, toAddr, amt) ret0, _ := ret[0].(error) @@ -123,7 +123,7 @@ func (mr *MockBankKeeperMockRecorder) SendCoins(ctx, fromAddr, toAddr, amt inter } // SendCoinsFromAccountToModule mocks base method. -func (m *MockBankKeeper) SendCoinsFromAccountToModule(ctx types.Context, senderAddr types.AccAddress, recipientModule string, amt types.Coins) error { +func (m *MockBankKeeper) SendCoinsFromAccountToModule(ctx context.Context, senderAddr types.AccAddress, recipientModule string, amt types.Coins) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendCoinsFromAccountToModule", ctx, senderAddr, recipientModule, amt) ret0, _ := ret[0].(error) @@ -137,7 +137,7 @@ func (mr *MockBankKeeperMockRecorder) SendCoinsFromAccountToModule(ctx, senderAd } // SendCoinsFromModuleToAccount mocks base method. -func (m *MockBankKeeper) SendCoinsFromModuleToAccount(ctx types.Context, senderModule string, recipientAddr types.AccAddress, amt types.Coins) error { +func (m *MockBankKeeper) SendCoinsFromModuleToAccount(ctx context.Context, senderModule string, recipientAddr types.AccAddress, amt types.Coins) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SendCoinsFromModuleToAccount", ctx, senderModule, recipientAddr, amt) ret0, _ := ret[0].(error) @@ -151,7 +151,7 @@ func (mr *MockBankKeeperMockRecorder) SendCoinsFromModuleToAccount(ctx, senderMo } // SetDenomMetaData mocks base method. -func (m *MockBankKeeper) SetDenomMetaData(ctx types.Context, denomMetaData types1.Metadata) { +func (m *MockBankKeeper) SetDenomMetaData(ctx context.Context, denomMetaData types0.Metadata) { m.ctrl.T.Helper() m.ctrl.Call(m, "SetDenomMetaData", ctx, denomMetaData) } @@ -186,10 +186,10 @@ func (m *MockAccountKeeper) EXPECT() *MockAccountKeeperMockRecorder { } // GetAccount mocks base method. -func (m *MockAccountKeeper) GetAccount(arg0 types.Context, arg1 types.AccAddress) types0.AccountI { +func (m *MockAccountKeeper) GetAccount(arg0 context.Context, arg1 types.AccAddress) types.AccountI { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAccount", arg0, arg1) - ret0, _ := ret[0].(types0.AccountI) + ret0, _ := ret[0].(types.AccountI) return ret0 } @@ -200,10 +200,10 @@ func (mr *MockAccountKeeperMockRecorder) GetAccount(arg0, arg1 interface{}) *gom } // GetModuleAccount mocks base method. -func (m *MockAccountKeeper) GetModuleAccount(ctx types.Context, moduleName string) types0.ModuleAccountI { +func (m *MockAccountKeeper) GetModuleAccount(ctx context.Context, moduleName string) types.ModuleAccountI { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetModuleAccount", ctx, moduleName) - ret0, _ := ret[0].(types0.ModuleAccountI) + ret0, _ := ret[0].(types.ModuleAccountI) return ret0 } @@ -237,10 +237,10 @@ func (m *MockSubspacesKeeper) EXPECT() *MockSubspacesKeeperMockRecorder { } // GetAllSubspaces mocks base method. -func (m *MockSubspacesKeeper) GetAllSubspaces(ctx types.Context) []types2.Subspace { +func (m *MockSubspacesKeeper) GetAllSubspaces(ctx types.Context) []types1.Subspace { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetAllSubspaces", ctx) - ret0, _ := ret[0].([]types2.Subspace) + ret0, _ := ret[0].([]types1.Subspace) return ret0 } @@ -251,10 +251,10 @@ func (mr *MockSubspacesKeeperMockRecorder) GetAllSubspaces(ctx interface{}) *gom } // GetSubspace mocks base method. -func (m *MockSubspacesKeeper) GetSubspace(ctx types.Context, subspaceID uint64) (types2.Subspace, bool) { +func (m *MockSubspacesKeeper) GetSubspace(ctx types.Context, subspaceID uint64) (types1.Subspace, bool) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetSubspace", ctx, subspaceID) - ret0, _ := ret[0].(types2.Subspace) + ret0, _ := ret[0].(types1.Subspace) ret1, _ := ret[1].(bool) return ret0, ret1 } @@ -266,7 +266,7 @@ func (mr *MockSubspacesKeeperMockRecorder) GetSubspace(ctx, subspaceID interface } // GetUsersWithRootPermissions mocks base method. -func (m *MockSubspacesKeeper) GetUsersWithRootPermissions(ctx types.Context, subspaceID uint64, permission types2.Permissions) []string { +func (m *MockSubspacesKeeper) GetUsersWithRootPermissions(ctx types.Context, subspaceID uint64, permission types1.Permissions) []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetUsersWithRootPermissions", ctx, subspaceID, permission) ret0, _ := ret[0].([]string) @@ -280,7 +280,7 @@ func (mr *MockSubspacesKeeperMockRecorder) GetUsersWithRootPermissions(ctx, subs } // HasPermission mocks base method. -func (m *MockSubspacesKeeper) HasPermission(ctx types.Context, subspaceID uint64, sectionID uint32, user string, permission types2.Permission) bool { +func (m *MockSubspacesKeeper) HasPermission(ctx types.Context, subspaceID uint64, sectionID uint32, user string, permission types1.Permission) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "HasPermission", ctx, subspaceID, sectionID, user, permission) ret0, _ := ret[0].(bool) diff --git a/x/tokenfactory/types/codec.go b/x/tokenfactory/types/codec.go index 6143e5b122..934b6d5c39 100644 --- a/x/tokenfactory/types/codec.go +++ b/x/tokenfactory/types/codec.go @@ -4,11 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/legacy" codectypes "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" - authzcodec "github.com/cosmos/cosmos-sdk/x/authz/codec" - govcodec "github.com/cosmos/cosmos-sdk/x/gov/codec" ) func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { @@ -19,6 +16,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { legacy.RegisterAminoMsg(cdc, &MsgUpdateParams{}, "desmos/x/tokenfactory/MsgUpdateParams") cdc.RegisterConcrete(&Params{}, "desmos/x/tokenfactory/Params", nil) + } func RegisterInterfaces(registry codectypes.InterfaceRegistry) { @@ -33,29 +31,3 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) } - -var ( - amino = codec.NewLegacyAmino() - - // AminoCdc references the global x/tokenfactory module codec. Note, the codec should - // ONLY be used in certain instances of tests and for JSON encoding as Amino is - // still used for that purpose. - // - // The actual codec used for serialization should be provided to x/tokenfactory and - // defined at the application level. - AminoCdc = codec.NewAminoCodec(amino) -) - -func init() { - RegisterLegacyAminoCodec(amino) - cryptocodec.RegisterCrypto(amino) - sdk.RegisterLegacyAminoCodec(amino) - - // Register all Amino interfaces and concrete types on the authz Amino codec so that this can later be - // used to properly serialize MsgGrant and MsgExec instances - RegisterLegacyAminoCodec(authzcodec.Amino) - - // Register all Amino interfaces and concrete types on the gov Amino codec so that this can later be - // used to properly serialize MsgSubmitProposal instances - RegisterLegacyAminoCodec(govcodec.Amino) -} diff --git a/x/tokenfactory/types/denoms.go b/x/tokenfactory/types/denoms.go index 97929529d3..4393d0cde6 100644 --- a/x/tokenfactory/types/denoms.go +++ b/x/tokenfactory/types/denoms.go @@ -1,12 +1,13 @@ package types import ( + context "context" fmt "fmt" "strings" "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ) const ( @@ -71,8 +72,8 @@ func DeconstructDenom(denom string) (creator string, subdenom string, err error) // NewTokenFactoryDenomMintCoinsRestriction creates and returns a MintingRestrictionFn that only allows minting of // valid tokenfactory denoms -func NewTokenFactoryDenomMintCoinsRestriction() bankkeeper.MintingRestrictionFn { - return func(ctx sdk.Context, coinsToMint sdk.Coins) error { +func NewTokenFactoryDenomMintCoinsRestriction() banktypes.MintingRestrictionFn { + return func(ctx context.Context, coinsToMint sdk.Coins) error { for _, coin := range coinsToMint { _, _, err := DeconstructDenom(coin.Denom) if err != nil { diff --git a/x/tokenfactory/types/expected_keepers.go b/x/tokenfactory/types/expected_keepers.go index 2d90341cef..b9d9e85fee 100644 --- a/x/tokenfactory/types/expected_keepers.go +++ b/x/tokenfactory/types/expected_keepers.go @@ -1,8 +1,9 @@ package types import ( + context "context" + sdk "github.com/cosmos/cosmos-sdk/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" subspacestypes "github.com/desmos-labs/desmos/v6/x/subspaces/types" @@ -11,24 +12,24 @@ import ( // BankKeeper represents a keeper that deals with x/bank type BankKeeper interface { // Methods imported from bank should be defined here - GetDenomMetaData(ctx sdk.Context, denom string) (banktypes.Metadata, bool) - SetDenomMetaData(ctx sdk.Context, denomMetaData banktypes.Metadata) + GetDenomMetaData(ctx context.Context, denom string) (banktypes.Metadata, bool) + SetDenomMetaData(ctx context.Context, denomMetaData banktypes.Metadata) - HasSupply(ctx sdk.Context, denom string) bool + HasSupply(ctx context.Context, denom string) bool - SendCoinsFromModuleToAccount(ctx sdk.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error - SendCoinsFromAccountToModule(ctx sdk.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error - MintCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error - BurnCoins(ctx sdk.Context, moduleName string, amt sdk.Coins) error + SendCoinsFromModuleToAccount(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error + SendCoinsFromAccountToModule(ctx context.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error + MintCoins(ctx context.Context, moduleName string, amt sdk.Coins) error + BurnCoins(ctx context.Context, moduleName string, amt sdk.Coins) error - SendCoins(ctx sdk.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error - HasBalance(ctx sdk.Context, addr sdk.AccAddress, amt sdk.Coin) bool + SendCoins(ctx context.Context, fromAddr sdk.AccAddress, toAddr sdk.AccAddress, amt sdk.Coins) error + HasBalance(ctx context.Context, addr sdk.AccAddress, amt sdk.Coin) bool } // AccountKeeper represents a keeper that deals with x/auth type AccountKeeper interface { - GetAccount(sdk.Context, sdk.AccAddress) authtypes.AccountI - GetModuleAccount(ctx sdk.Context, moduleName string) authtypes.ModuleAccountI + GetAccount(context.Context, sdk.AccAddress) sdk.AccountI + GetModuleAccount(ctx context.Context, moduleName string) sdk.ModuleAccountI } // SubspacesKeeper represents a keeper that deals with x/subspaces diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go index 902ab70893..d279f44036 100644 --- a/x/tokenfactory/types/genesis.pb.go +++ b/x/tokenfactory/types/genesis.pb.go @@ -165,9 +165,9 @@ var fileDescriptor_2113244c6f53484c = []byte{ 0xb5, 0x62, 0x79, 0xb1, 0x40, 0x9e, 0xd1, 0xc9, 0xff, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x4c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x21, - 0x8e, 0xd2, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0xb2, 0xf5, 0xcb, 0x4c, 0xf5, 0x2b, 0x50, 0xa3, 0xb9, + 0x8e, 0xd2, 0xcd, 0x49, 0x4c, 0x2a, 0x86, 0xb2, 0xf5, 0xcb, 0xcc, 0xf4, 0x2b, 0x50, 0xa3, 0xb9, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0xc7, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xda, 0x8c, 0xad, 0xb1, 0x96, 0x02, 0x00, 0x00, + 0xc2, 0xa9, 0x0c, 0xf5, 0x96, 0x02, 0x00, 0x00, } func (this *GenesisDenom) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/models.pb.go b/x/tokenfactory/types/models.pb.go index 5d78541ab5..9ced9047f8 100644 --- a/x/tokenfactory/types/models.pb.go +++ b/x/tokenfactory/types/models.pb.go @@ -94,9 +94,9 @@ var fileDescriptor_f8313056804a58ae = []byte{ 0xb4, 0x59, 0xb1, 0xbc, 0x58, 0x20, 0xcf, 0xe8, 0xe4, 0x7f, 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, 0xa6, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, - 0x10, 0xdf, 0xe8, 0xe6, 0x24, 0x26, 0x15, 0x43, 0xd9, 0xfa, 0x65, 0xa6, 0xfa, 0x15, 0xa8, 0x61, + 0x10, 0xdf, 0xe8, 0xe6, 0x24, 0x26, 0x15, 0x43, 0xd9, 0xfa, 0x65, 0x66, 0xfa, 0x15, 0xa8, 0x61, 0x50, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x76, 0xb7, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, - 0x7d, 0xc1, 0x0d, 0x07, 0x27, 0x01, 0x00, 0x00, + 0x65, 0xe4, 0xac, 0x43, 0x27, 0x01, 0x00, 0x00, } func (this *DenomAuthorityMetadata) Equal(that interface{}) bool { diff --git a/x/tokenfactory/types/msgs.go b/x/tokenfactory/types/msgs.go index 32cc348b4f..aa95b19b7f 100644 --- a/x/tokenfactory/types/msgs.go +++ b/x/tokenfactory/types/msgs.go @@ -2,15 +2,14 @@ package types import ( "cosmossdk.io/errors" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" ) var ( - _ sdk.Msg = &MsgCreateDenom{} - _ legacytx.LegacyMsg = &MsgCreateDenom{} + _ sdk.Msg = &MsgCreateDenom{} ) // NewMsgCreateDenom creates a new MsgCreateDenom instance @@ -53,16 +52,10 @@ func (msg MsgCreateDenom) Route() string { return RouterKey } // Type implements legacytx.LegacyMsg func (msg MsgCreateDenom) Type() string { return ActionCreateDenom } -// GetSignBytes implements legacytx.LegacyMsg -func (msg MsgCreateDenom) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&msg)) -} - // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgMint{} - _ legacytx.LegacyMsg = &MsgMint{} + _ sdk.Msg = &MsgMint{} ) // NewMsgMint creates a new MsgMint instance @@ -85,7 +78,7 @@ func (msg MsgMint) ValidateBasic() error { return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address: %s", err) } - if !msg.Amount.IsValid() || msg.Amount.Amount.Equal(sdk.ZeroInt()) { + if !msg.Amount.IsValid() || msg.Amount.Amount.Equal(math.ZeroInt()) { return errors.Wrap(sdkerrors.ErrInvalidCoins, msg.Amount.String()) } @@ -104,16 +97,10 @@ func (msg MsgMint) Route() string { return RouterKey } // Type implements legacytx.LegacyMsg func (msg MsgMint) Type() string { return ActionMint } -// MsgMint implements legacytx.LegacyMsg -func (msg MsgMint) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&msg)) -} - // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgBurn{} - _ legacytx.LegacyMsg = &MsgBurn{} + _ sdk.Msg = &MsgBurn{} ) // NewMsgCreateDenom creates a new MsgBurn instance @@ -136,7 +123,7 @@ func (msg MsgBurn) ValidateBasic() error { return errors.Wrapf(sdkerrors.ErrInvalidAddress, "Invalid sender address: %s", err) } - if !msg.Amount.IsValid() || msg.Amount.Amount.Equal(sdk.ZeroInt()) { + if !msg.Amount.IsValid() || msg.Amount.Amount.Equal(math.ZeroInt()) { return errors.Wrap(sdkerrors.ErrInvalidCoins, msg.Amount.String()) } @@ -155,16 +142,10 @@ func (msg MsgBurn) Route() string { return RouterKey } // Type implements legacytx.LegacyMsg func (msg MsgBurn) Type() string { return ActionBurn } -// GetSignBytes implements legacytx.LegacyMsg -func (msg MsgBurn) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&msg)) -} - // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgSetDenomMetadata{} - _ legacytx.LegacyMsg = &MsgSetDenomMetadata{} + _ sdk.Msg = &MsgSetDenomMetadata{} ) // NewMsgCreateDenom creates a new MsgSetDenomMetadata instance @@ -208,16 +189,10 @@ func (msg MsgSetDenomMetadata) Route() string { return RouterKey } // Type implements legacytx.LegacyMsg func (msg MsgSetDenomMetadata) Type() string { return ActionSetDenomMetadata } -// GetSignBytes implements legacytx.LegacyMsg -func (msg MsgSetDenomMetadata) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&msg)) -} - // -------------------------------------------------------------------------------------------------------------------- var ( - _ sdk.Msg = &MsgUpdateParams{} - _ legacytx.LegacyMsg = &MsgUpdateParams{} + _ sdk.Msg = &MsgUpdateParams{} ) // NewMsgUpdateParams creates a new MsgUpdateParams instance @@ -249,8 +224,3 @@ func (msg MsgUpdateParams) Route() string { return RouterKey } // Type implements legacytx.LegacyMsg func (msg MsgUpdateParams) Type() string { return ActionUpdateParams } - -// GetSignBytes implements legacytx.LegacyMsg -func (msg MsgUpdateParams) GetSignBytes() []byte { - return sdk.MustSortJSON(AminoCdc.MustMarshalJSON(&msg)) -} diff --git a/x/tokenfactory/types/msgs.pb.go b/x/tokenfactory/types/msgs.pb.go index f8d4ae1840..2d7a83aaa7 100644 --- a/x/tokenfactory/types/msgs.pb.go +++ b/x/tokenfactory/types/msgs.pb.go @@ -584,55 +584,55 @@ var fileDescriptor_68f1b81d31b98ba4 = []byte{ // 820 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x96, 0xcf, 0x4f, 0xdb, 0x48, 0x14, 0xc7, 0x63, 0x60, 0xb3, 0x30, 0xe1, 0xa7, 0x61, 0xf9, 0xe1, 0x5d, 0x6c, 0xd6, 0xcb, 0xee, - 0xb2, 0xd9, 0xc5, 0x56, 0x40, 0x68, 0xa5, 0xdc, 0x30, 0xf4, 0x40, 0xa5, 0xa8, 0x28, 0xb4, 0x42, - 0xaa, 0x2a, 0x45, 0x93, 0x78, 0x6a, 0xac, 0x60, 0x4f, 0xe4, 0x99, 0x84, 0xe6, 0x56, 0xf5, 0xc8, - 0xa9, 0xe7, 0x9e, 0x7b, 0xa8, 0x7a, 0xca, 0xa1, 0x7f, 0x40, 0x8f, 0x1c, 0x51, 0x4f, 0x3d, 0xa5, - 0x55, 0x38, 0x44, 0xea, 0x31, 0x97, 0x5e, 0x2b, 0x8f, 0xc7, 0x8e, 0x13, 0x20, 0x85, 0x1b, 0x87, - 0x5e, 0x60, 0x3c, 0xef, 0xfb, 0x7e, 0xcc, 0x67, 0x9e, 0x9f, 0x03, 0x7e, 0x37, 0x11, 0x71, 0x30, - 0xd1, 0x29, 0x2e, 0x23, 0xf7, 0x29, 0x2c, 0x51, 0xec, 0xd5, 0xf5, 0x5a, 0x46, 0x77, 0x88, 0x45, - 0xb4, 0x8a, 0x87, 0x29, 0x16, 0xe7, 0x03, 0x89, 0x16, 0x97, 0x68, 0xb5, 0x8c, 0x34, 0x03, 0x1d, - 0xdb, 0xc5, 0x3a, 0xfb, 0x1b, 0x48, 0xa5, 0x39, 0x0b, 0x5b, 0x98, 0x2d, 0x75, 0x7f, 0xc5, 0x77, - 0xe5, 0x12, 0x66, 0x39, 0x8a, 0x90, 0x20, 0xbd, 0x96, 0x29, 0x22, 0x0a, 0x33, 0x7a, 0x09, 0xdb, - 0xee, 0x25, 0xbb, 0x5b, 0x8e, 0xec, 0xfe, 0x03, 0xb7, 0x2f, 0x05, 0xf6, 0x42, 0x10, 0x38, 0x78, - 0xe0, 0xa6, 0x05, 0xee, 0xea, 0x10, 0x8b, 0x57, 0xcd, 0x0d, 0x7f, 0x5c, 0x73, 0xae, 0x0a, 0xf4, - 0xa0, 0xc3, 0xbd, 0xd5, 0x8e, 0x00, 0x26, 0x73, 0xc4, 0xda, 0xf1, 0x10, 0xa4, 0x68, 0x17, 0xb9, - 0xd8, 0x11, 0xef, 0x81, 0x14, 0xa9, 0x16, 0x49, 0x05, 0x96, 0x50, 0xc1, 0x36, 0x17, 0x85, 0x15, - 0x61, 0x6d, 0xc4, 0x58, 0x6d, 0x35, 0x15, 0x70, 0xc0, 0xb7, 0xf7, 0x76, 0x3b, 0x4d, 0x45, 0xac, - 0x43, 0xe7, 0x38, 0xab, 0xc6, 0xa4, 0x6a, 0x1e, 0x84, 0x4f, 0x7b, 0xa6, 0xb8, 0x0d, 0x92, 0x04, - 0xb9, 0x26, 0xf2, 0x16, 0x87, 0x56, 0x84, 0xb5, 0x31, 0xe3, 0x9f, 0x4e, 0x53, 0x99, 0xe0, 0x3e, - 0x6c, 0x5f, 0xfd, 0xf0, 0x6e, 0x7d, 0x8e, 0x1f, 0x65, 0xdb, 0x34, 0x3d, 0x44, 0xc8, 0x01, 0xf5, - 0x6c, 0xd7, 0xca, 0x73, 0x47, 0x51, 0x07, 0xa3, 0xa4, 0x5a, 0x34, 0xfd, 0xaa, 0x16, 0x87, 0x59, - 0x90, 0xd9, 0x4e, 0x53, 0x99, 0x8a, 0x12, 0x33, 0x8b, 0x9a, 0x8f, 0x44, 0xd9, 0x3f, 0x5f, 0xb4, - 0x1b, 0x69, 0xee, 0x7d, 0xda, 0x6e, 0xa4, 0x7f, 0xe1, 0x08, 0x7a, 0x4f, 0xa8, 0x3e, 0x01, 0xf3, - 0xbd, 0x3b, 0x79, 0x44, 0x2a, 0xd8, 0x25, 0x48, 0x34, 0xc0, 0x94, 0x8b, 0x4e, 0x0a, 0x0c, 0x59, - 0x21, 0x48, 0x2c, 0xb0, 0xc4, 0x52, 0xa7, 0xa9, 0xcc, 0x07, 0x89, 0xfb, 0x04, 0x6a, 0x7e, 0xc2, - 0x45, 0x27, 0x0f, 0xfd, 0x8d, 0x20, 0xfa, 0xfb, 0x21, 0xf0, 0x73, 0x8e, 0x58, 0x39, 0xdb, 0xa5, - 0x77, 0x88, 0xe5, 0xa9, 0x00, 0x92, 0xd0, 0xc1, 0x55, 0x97, 0x32, 0x94, 0xa9, 0x8d, 0x25, 0x8d, - 0xeb, 0xfd, 0x9e, 0xd4, 0x78, 0xcf, 0x69, 0x3b, 0xd8, 0x76, 0x8d, 0xc3, 0xb3, 0xa6, 0x92, 0xe8, - 0xa6, 0x08, 0xdc, 0xd4, 0xb7, 0x9f, 0x94, 0x35, 0xcb, 0xa6, 0x47, 0xd5, 0xa2, 0x56, 0xc2, 0x0e, - 0x6f, 0x42, 0xfe, 0x6f, 0x9d, 0x98, 0x65, 0x9d, 0xd6, 0x2b, 0x88, 0xb0, 0x08, 0xe4, 0x55, 0xbb, - 0x91, 0x1e, 0x3f, 0x46, 0x16, 0x2c, 0xd5, 0x0b, 0x7e, 0x9b, 0x93, 0x37, 0xed, 0x46, 0x5a, 0xc8, - 0xf3, 0x0a, 0xb2, 0x72, 0xdf, 0x3d, 0x4d, 0x76, 0xef, 0xc9, 0xc7, 0xa6, 0xce, 0x80, 0x29, 0xbe, - 0x0c, 0x6f, 0x26, 0xa4, 0x6a, 0x54, 0x3d, 0xf7, 0x07, 0xd5, 0x5b, 0x53, 0xf5, 0xb1, 0x71, 0xaa, - 0xfe, 0x32, 0xa2, 0xfa, 0x7a, 0x08, 0xcc, 0xe6, 0x88, 0x75, 0x80, 0x28, 0xeb, 0xdd, 0x1c, 0xa2, - 0xd0, 0x84, 0x14, 0xde, 0x21, 0xc2, 0x87, 0x60, 0xd4, 0xe1, 0x55, 0x71, 0xc4, 0xcb, 0x5d, 0xc4, - 0x6e, 0x39, 0x42, 0x1c, 0x96, 0x6e, 0xfc, 0xc6, 0x31, 0xf3, 0x31, 0x11, 0x3a, 0xab, 0x01, 0xab, - 0x28, 0x58, 0x36, 0xdd, 0x47, 0x4b, 0xea, 0xd2, 0xea, 0xc7, 0xa1, 0x2e, 0x83, 0x5f, 0xaf, 0xd8, - 0x8e, 0x28, 0x7e, 0x11, 0x18, 0xd9, 0x47, 0x15, 0x13, 0x52, 0xb4, 0xcf, 0xc6, 0xab, 0x78, 0x1f, - 0x8c, 0xc1, 0x2a, 0x3d, 0xc2, 0x9e, 0x4d, 0xeb, 0x7c, 0x86, 0xfc, 0xd7, 0x69, 0x2a, 0xd3, 0xfc, - 0xf2, 0x43, 0xd3, 0xf5, 0x00, 0xba, 0xee, 0x62, 0x1e, 0x24, 0x83, 0xa1, 0xcd, 0x30, 0xa6, 0x36, - 0x64, 0xed, 0xea, 0xef, 0x91, 0x16, 0xe4, 0x36, 0xa4, 0xde, 0x4e, 0x0b, 0x7c, 0x39, 0x00, 0x1e, - 0x29, 0xfb, 0xbf, 0x7f, 0xfc, 0x6e, 0x0e, 0x9f, 0xc0, 0x2a, 0x27, 0xf0, 0x2c, 0xf6, 0xc9, 0xa8, + 0xb2, 0xd9, 0xc5, 0x56, 0x40, 0xdb, 0x4a, 0xb9, 0x61, 0xe8, 0x81, 0x4a, 0x51, 0x51, 0x68, 0x85, + 0x54, 0x55, 0x8a, 0x26, 0xf1, 0xd4, 0x58, 0xc1, 0x9e, 0xc8, 0x33, 0x09, 0xcd, 0xad, 0xea, 0x91, + 0x53, 0xcf, 0x3d, 0xf7, 0x50, 0xf5, 0x94, 0x43, 0xff, 0x80, 0x1e, 0x39, 0xa2, 0x9e, 0x7a, 0x4a, + 0xab, 0x70, 0x88, 0xd4, 0x63, 0x2e, 0xbd, 0x56, 0x1e, 0x8f, 0x1d, 0x27, 0x40, 0x0a, 0x37, 0x0e, + 0xbd, 0xc0, 0x78, 0xde, 0xf7, 0xfd, 0x98, 0xcf, 0x3c, 0x3f, 0x07, 0xfc, 0x6e, 0x22, 0xe2, 0x60, + 0xa2, 0x53, 0x5c, 0x46, 0xee, 0x53, 0x58, 0xa2, 0xd8, 0xab, 0xeb, 0xb5, 0x8c, 0xee, 0x10, 0x8b, + 0x68, 0x15, 0x0f, 0x53, 0x2c, 0xce, 0x07, 0x12, 0x2d, 0x2e, 0xd1, 0x6a, 0x19, 0x69, 0x06, 0x3a, + 0xb6, 0x8b, 0x75, 0xf6, 0x37, 0x90, 0x4a, 0x73, 0x16, 0xb6, 0x30, 0x5b, 0xea, 0xfe, 0x8a, 0xef, + 0xca, 0x25, 0xcc, 0x72, 0x14, 0x21, 0x41, 0x7a, 0x2d, 0x53, 0x44, 0x14, 0x66, 0xf4, 0x12, 0xb6, + 0xdd, 0x0b, 0x76, 0xb7, 0x1c, 0xd9, 0xfd, 0x07, 0x6e, 0x5f, 0x0a, 0xec, 0x85, 0x20, 0x70, 0xf0, + 0xc0, 0x4d, 0x0b, 0xdc, 0xd5, 0x21, 0x16, 0xaf, 0x9a, 0x1b, 0xfe, 0xb8, 0xe2, 0x5c, 0x15, 0xe8, + 0x41, 0x87, 0x7b, 0xab, 0x1d, 0x01, 0x4c, 0xe6, 0x88, 0xb5, 0xed, 0x21, 0x48, 0xd1, 0x0e, 0x72, + 0xb1, 0x23, 0xde, 0x03, 0x29, 0x52, 0x2d, 0x92, 0x0a, 0x2c, 0xa1, 0x82, 0x6d, 0x2e, 0x0a, 0x2b, + 0xc2, 0xda, 0x88, 0xb1, 0xda, 0x6a, 0x2a, 0x60, 0x9f, 0x6f, 0xef, 0xee, 0x74, 0x9a, 0x8a, 0x58, + 0x87, 0xce, 0x51, 0x56, 0x8d, 0x49, 0xd5, 0x3c, 0x08, 0x9f, 0x76, 0x4d, 0x71, 0x0b, 0x24, 0x09, + 0x72, 0x4d, 0xe4, 0x2d, 0x0e, 0xad, 0x08, 0x6b, 0x63, 0xc6, 0x3f, 0x9d, 0xa6, 0x32, 0xc1, 0x7d, + 0xd8, 0xbe, 0xfa, 0xe1, 0xdd, 0xfa, 0x1c, 0x3f, 0xca, 0x96, 0x69, 0x7a, 0x88, 0x90, 0x7d, 0xea, + 0xd9, 0xae, 0x95, 0xe7, 0x8e, 0xa2, 0x0e, 0x46, 0x49, 0xb5, 0x68, 0xfa, 0x55, 0x2d, 0x0e, 0xb3, + 0x20, 0xb3, 0x9d, 0xa6, 0x32, 0x15, 0x25, 0x66, 0x16, 0x35, 0x1f, 0x89, 0xb2, 0x7f, 0xbe, 0x68, + 0x37, 0xd2, 0xdc, 0xfb, 0xa4, 0xdd, 0x48, 0xff, 0xc2, 0x11, 0xf4, 0x9e, 0x50, 0x7d, 0x02, 0xe6, + 0x7b, 0x77, 0xf2, 0x88, 0x54, 0xb0, 0x4b, 0x90, 0x68, 0x80, 0x29, 0x17, 0x1d, 0x17, 0x18, 0xb2, + 0x42, 0x90, 0x58, 0x60, 0x89, 0xa5, 0x4e, 0x53, 0x99, 0x0f, 0x12, 0xf7, 0x09, 0xd4, 0xfc, 0x84, + 0x8b, 0x8e, 0x1f, 0xfa, 0x1b, 0x41, 0xf4, 0xf7, 0x43, 0xe0, 0xe7, 0x1c, 0xb1, 0x72, 0xb6, 0x4b, + 0x6f, 0x11, 0xcb, 0x13, 0x01, 0x24, 0xa1, 0x83, 0xab, 0x2e, 0x65, 0x28, 0x53, 0x1b, 0x4b, 0x1a, + 0xd7, 0xfb, 0x3d, 0xa9, 0xf1, 0x9e, 0xd3, 0xb6, 0xb1, 0xed, 0x1a, 0x07, 0xa7, 0x4d, 0x25, 0xd1, + 0x4d, 0x11, 0xb8, 0xa9, 0x6f, 0x3f, 0x29, 0x6b, 0x96, 0x4d, 0x0f, 0xab, 0x45, 0xad, 0x84, 0x1d, + 0xde, 0x84, 0xfc, 0xdf, 0x3a, 0x31, 0xcb, 0x3a, 0xad, 0x57, 0x10, 0x61, 0x11, 0xc8, 0xab, 0x76, + 0x23, 0x3d, 0x7e, 0x84, 0x2c, 0x58, 0xaa, 0x17, 0xfc, 0x36, 0x27, 0x6f, 0xda, 0x8d, 0xb4, 0x90, + 0xe7, 0x15, 0x64, 0xe5, 0xbe, 0x7b, 0x9a, 0xec, 0xde, 0x93, 0x8f, 0x4d, 0x9d, 0x01, 0x53, 0x7c, + 0x19, 0xde, 0x4c, 0x48, 0xd5, 0xa8, 0x7a, 0xee, 0x0f, 0xaa, 0x37, 0xa6, 0xea, 0x63, 0xe3, 0x54, + 0xfd, 0x65, 0x44, 0xf5, 0xf5, 0x10, 0x98, 0xcd, 0x11, 0x6b, 0x1f, 0x51, 0xd6, 0xbb, 0x39, 0x44, + 0xa1, 0x09, 0x29, 0xbc, 0x45, 0x84, 0x0f, 0xc0, 0xa8, 0xc3, 0xab, 0xe2, 0x88, 0x97, 0xbb, 0x88, + 0xdd, 0x72, 0x84, 0x38, 0x2c, 0xdd, 0xf8, 0x8d, 0x63, 0xe6, 0x63, 0x22, 0x74, 0x56, 0x03, 0x56, + 0x51, 0xb0, 0x6c, 0xba, 0x8f, 0x96, 0xd4, 0xa5, 0xd5, 0x8f, 0x43, 0x5d, 0x06, 0xbf, 0x5e, 0xb2, + 0x1d, 0x51, 0xfc, 0x22, 0x30, 0xb2, 0x8f, 0x2a, 0x26, 0xa4, 0x68, 0x8f, 0x8d, 0x57, 0xf1, 0x3e, + 0x18, 0x83, 0x55, 0x7a, 0x88, 0x3d, 0x9b, 0xd6, 0xf9, 0x0c, 0xf9, 0xaf, 0xd3, 0x54, 0xa6, 0xf9, + 0xe5, 0x87, 0xa6, 0xab, 0x01, 0x74, 0xdd, 0xc5, 0x3c, 0x48, 0x06, 0x43, 0x9b, 0x61, 0x4c, 0x6d, + 0xc8, 0xda, 0xe5, 0xdf, 0x23, 0x2d, 0xc8, 0x6d, 0x48, 0xbd, 0x9d, 0x16, 0xf8, 0x72, 0x00, 0x3c, + 0x52, 0xf6, 0xae, 0x7f, 0xfc, 0x6e, 0x0e, 0x9f, 0xc0, 0x2a, 0x27, 0xf0, 0x2c, 0xf6, 0xc9, 0xa8, 0xeb, 0x7d, 0x07, 0x53, 0x97, 0xc0, 0x42, 0xdf, 0x56, 0xc8, 0x61, 0xe3, 0xeb, 0x30, 0x18, 0xce, - 0x11, 0x4b, 0x44, 0x20, 0x15, 0xff, 0xa0, 0xfc, 0x75, 0x5d, 0xb9, 0xbd, 0x43, 0x58, 0xd2, 0x6e, - 0xa6, 0x8b, 0x86, 0xf5, 0x3e, 0x18, 0x61, 0x43, 0x56, 0x19, 0xe0, 0xe7, 0x0b, 0xa4, 0xbf, 0xbf, + 0x11, 0x4b, 0x44, 0x20, 0x15, 0xff, 0xa0, 0xfc, 0x75, 0x55, 0xb9, 0xbd, 0x43, 0x58, 0xd2, 0xae, + 0xa7, 0x8b, 0x86, 0xf5, 0x1e, 0x18, 0x61, 0x43, 0x56, 0x19, 0xe0, 0xe7, 0x0b, 0xa4, 0xbf, 0xbf, 0x23, 0x88, 0x47, 0x64, 0x03, 0x66, 0x50, 0x44, 0x5f, 0x30, 0x30, 0x62, 0xfc, 0x05, 0x13, 0x29, - 0x98, 0xbe, 0xf4, 0x72, 0xfd, 0x3b, 0xc0, 0xb9, 0x5f, 0x2c, 0x6d, 0xde, 0x42, 0x1c, 0x65, 0x3d, - 0x02, 0xe3, 0x3d, 0xcd, 0x38, 0xa8, 0xdc, 0xb8, 0x50, 0xd2, 0x6f, 0x28, 0x0c, 0x33, 0x49, 0x3f, - 0x3d, 0xf7, 0xbb, 0xca, 0x78, 0x70, 0xd6, 0x92, 0x85, 0xf3, 0x96, 0x2c, 0x7c, 0x6e, 0xc9, 0xc2, - 0xcb, 0x0b, 0x39, 0x71, 0x7e, 0x21, 0x27, 0x3e, 0x5e, 0xc8, 0x89, 0xc7, 0x5b, 0xb1, 0xe1, 0x16, - 0xc4, 0x5e, 0x3f, 0x86, 0x45, 0xc2, 0xd7, 0x7a, 0x6d, 0xab, 0xa7, 0xdd, 0xbc, 0x7a, 0x30, 0xef, - 0x8a, 0x49, 0xf6, 0xf3, 0x64, 0xf3, 0x5b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xdd, 0x24, 0x04, + 0x98, 0xbe, 0xf0, 0x72, 0xfd, 0x3b, 0xc0, 0xb9, 0x5f, 0x2c, 0x6d, 0xde, 0x40, 0x1c, 0x65, 0x3d, + 0x04, 0xe3, 0x3d, 0xcd, 0x38, 0xa8, 0xdc, 0xb8, 0x50, 0xd2, 0xaf, 0x29, 0x0c, 0x33, 0x49, 0x3f, + 0x3d, 0xf7, 0xbb, 0xca, 0x78, 0x70, 0xda, 0x92, 0x85, 0xb3, 0x96, 0x2c, 0x7c, 0x6e, 0xc9, 0xc2, + 0xcb, 0x73, 0x39, 0x71, 0x76, 0x2e, 0x27, 0x3e, 0x9e, 0xcb, 0x89, 0xc7, 0xff, 0xc7, 0x86, 0x5b, + 0x10, 0x7b, 0xfd, 0x08, 0x16, 0x09, 0x5f, 0xeb, 0xb5, 0x3b, 0x3d, 0xed, 0xe6, 0xd5, 0x83, 0x79, + 0x57, 0x4c, 0xb2, 0x9f, 0x27, 0x9b, 0xdf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x22, 0xf8, 0x85, 0x40, 0x9d, 0x09, 0x00, 0x00, } diff --git a/x/tokenfactory/types/msgs_test.go b/x/tokenfactory/types/msgs_test.go index f539127769..42053627cf 100644 --- a/x/tokenfactory/types/msgs_test.go +++ b/x/tokenfactory/types/msgs_test.go @@ -3,6 +3,7 @@ package types_test import ( "testing" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/stretchr/testify/require" @@ -76,11 +77,6 @@ func TestMsgCreateDenom_ValidateBasic(t *testing.T) { } } -func TestMsgCreateDenom_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgCreateDenom","value":{"sender":"cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69","subdenom":"minttoken","subspace_id":"1"}}` - require.Equal(t, expected, string(msgCreateDenom.GetSignBytes())) -} - func TestMsgCreateDenom_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgCreateDenom.Sender) require.Equal(t, []sdk.AccAddress{addr}, msgCreateDenom.GetSigners()) @@ -91,7 +87,7 @@ func TestMsgCreateDenom_GetSigners(t *testing.T) { var msgMint = types.NewMsgMint( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("uminttoken", sdk.NewInt(100)), + sdk.NewCoin("uminttoken", math.NewInt(100)), ) func TestMsgMint_Route(t *testing.T) { @@ -131,7 +127,7 @@ func TestMsgMint_ValidateBasic(t *testing.T) { msg: types.NewMsgMint( msgMint.SubspaceID, msgMint.Sender, - sdk.Coin{Denom: "%invalid%", Amount: sdk.NewInt(100)}, + sdk.Coin{Denom: "%invalid%", Amount: math.NewInt(100)}, ), shouldErr: true, }, @@ -154,11 +150,6 @@ func TestMsgMint_ValidateBasic(t *testing.T) { } } -func TestMsgMint_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgMint","value":{"amount":{"amount":"100","denom":"uminttoken"},"sender":"cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69","subspace_id":"1"}}` - require.Equal(t, expected, string(msgMint.GetSignBytes())) -} - func TestMsgMint_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgMint.Sender) require.Equal(t, []sdk.AccAddress{addr}, msgMint.GetSigners()) @@ -169,7 +160,7 @@ func TestMsgMint_GetSigners(t *testing.T) { var msgBurn = types.NewMsgBurn( 1, "cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69", - sdk.NewCoin("uminttoken", sdk.NewInt(100)), + sdk.NewCoin("uminttoken", math.NewInt(100)), ) func TestMsgBurn_Route(t *testing.T) { @@ -209,7 +200,7 @@ func TestMsgBurn_ValidateBasic(t *testing.T) { msg: types.NewMsgBurn( msgBurn.SubspaceID, msgBurn.Sender, - sdk.Coin{Denom: "%invalid%", Amount: sdk.NewInt(100)}, + sdk.Coin{Denom: "%invalid%", Amount: math.NewInt(100)}, ), shouldErr: true, }, @@ -232,11 +223,6 @@ func TestMsgBurn_ValidateBasic(t *testing.T) { } } -func TestMsgBurn_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgBurn","value":{"amount":{"amount":"100","denom":"uminttoken"},"sender":"cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69","subspace_id":"1"}}` - require.Equal(t, expected, string(msgBurn.GetSignBytes())) -} - func TestMsgBurn_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgBurn.Sender) require.Equal(t, []sdk.AccAddress{addr}, msgBurn.GetSigners()) @@ -338,11 +324,6 @@ func TestMsgSetDenomMetadata_ValidateBasic(t *testing.T) { } } -func TestMsgSetDenomMetadata_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/MsgSetDenomMetadata","value":{"metadata":{"base":"factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken","denom_units":[{"denom":"factory/cosmos1y54exmx84cqtasvjnskf9f63djuuj68p7hqf47/uminttoken"},{"aliases":["minttoken"],"denom":"minttoken","exponent":6}],"description":"The custom token of the test subspace.","display":"minttoken","name":"Mint Token","symbol":"MTK"},"sender":"cosmos1qzskhrcjnkdz2ln4yeafzsdwht8ch08j4wed69","subspace_id":"1"}}` - require.Equal(t, expected, string(msgSetDenomMetadata.GetSignBytes())) -} - func TestMsgSetDenomMetadata_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgSetDenomMetadata.Sender) require.Equal(t, []sdk.AccAddress{addr}, msgSetDenomMetadata.GetSigners()) @@ -396,11 +377,6 @@ func TestMsgUpdateParams_ValidateBasic(t *testing.T) { } } -func TestMsgUpdateParams_GetSignBytes(t *testing.T) { - expected := `{"type":"desmos/x/tokenfactory/MsgUpdateParams","value":{"authority":"cosmos13t6y2nnugtshwuy0zkrq287a95lyy8vzleaxmd","params":{"denom_creation_fee":[{"amount":"10000000000","denom":"stake"}]}}}` - require.Equal(t, expected, string(msgUpdateParams.GetSignBytes())) -} - func TestMsgUpdateParams_GetSigners(t *testing.T) { addr, _ := sdk.AccAddressFromBech32(msgUpdateParams.Authority) require.Equal(t, []sdk.AccAddress{addr}, msgUpdateParams.GetSigners()) diff --git a/x/tokenfactory/types/params.pb.go b/x/tokenfactory/types/params.pb.go index 33525842bf..5140810385 100644 --- a/x/tokenfactory/types/params.pb.go +++ b/x/tokenfactory/types/params.pb.go @@ -104,9 +104,9 @@ var fileDescriptor_6c27c1e949d7adf4 = []byte{ 0x96, 0x9a, 0x6a, 0xa5, 0xd8, 0xf5, 0x7c, 0x83, 0x96, 0x0c, 0x34, 0x10, 0x2b, 0x50, 0x83, 0x11, 0xe2, 0x23, 0x27, 0xff, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x45, - 0x72, 0x0e, 0xc4, 0x08, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x28, 0x5b, 0xbf, 0xcc, 0x14, 0xdd, 0x44, - 0xb0, 0x0b, 0x93, 0xd8, 0xc0, 0x81, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x0e, 0x20, 0x70, - 0x7e, 0xbc, 0x01, 0x00, 0x00, + 0x72, 0x0e, 0xc4, 0x08, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x28, 0x5b, 0xbf, 0xcc, 0x0c, 0xdd, 0x44, + 0xb0, 0x0b, 0x93, 0xd8, 0xc0, 0x81, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x16, 0x05, 0xd1, + 0x3a, 0xbc, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/tokenfactory/types/params_test.go b/x/tokenfactory/types/params_test.go index 145dcd605a..a47f7ff849 100644 --- a/x/tokenfactory/types/params_test.go +++ b/x/tokenfactory/types/params_test.go @@ -3,6 +3,7 @@ package types_test import ( "testing" + "cosmossdk.io/math" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" @@ -17,12 +18,12 @@ func TestParams_Validate(t *testing.T) { }{ { name: "invalid coins return error", - params: types.NewParams(sdk.Coins{sdk.Coin{Denom: "%invalid%", Amount: sdk.NewInt(100)}}), + params: types.NewParams(sdk.Coins{sdk.Coin{Denom: "%invalid%", Amount: math.NewInt(100)}}), shouldErr: true, }, { name: "valid params return no error", - params: types.NewParams(sdk.NewCoins(sdk.Coin{Denom: "udsm", Amount: sdk.NewInt(100)})), + params: types.NewParams(sdk.NewCoins(sdk.Coin{Denom: "udsm", Amount: math.NewInt(100)})), shouldErr: false, }, { diff --git a/x/tokenfactory/types/query.pb.go b/x/tokenfactory/types/query.pb.go index 73e7b740b2..7e0e430952 100644 --- a/x/tokenfactory/types/query.pb.go +++ b/x/tokenfactory/types/query.pb.go @@ -243,9 +243,9 @@ var fileDescriptor_20df78bdaaed00dd = []byte{ 0x52, 0xcc, 0xd5, 0xea, 0x43, 0x42, 0xd4, 0xc9, 0xff, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x4c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xa1, 0x66, - 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0xec, 0x29, 0x33, 0xd5, 0xaf, 0x40, 0xb5, 0xac, 0xa4, 0xb2, - 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x9c, 0x6c, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5c, 0xd4, - 0x12, 0x8c, 0x60, 0x03, 0x00, 0x00, + 0xeb, 0xe6, 0x24, 0x26, 0x15, 0xc3, 0xec, 0x29, 0x33, 0xd3, 0xaf, 0x40, 0xb5, 0xac, 0xa4, 0xb2, + 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x9c, 0x6c, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x44, 0xf1, + 0xb3, 0xc8, 0x60, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used.