From 213252dea66a327dab56c3ddb396480a0d05ff2f Mon Sep 17 00:00:00 2001 From: Hanjun Kim Date: Thu, 30 May 2024 00:38:38 +0900 Subject: [PATCH] refactor: change module params remove SetParams in some modules, because their parameters are empty. it's still possible to rollback this behavior in the future --- app/app.go | 38 +- go.mod | 2 +- go.sum | 4 +- proto/stride/stakeibc/gov.proto | 29 - proto/stride/stakeibc/tx.proto | 22 +- x/icacallbacks/keeper/keeper.go | 20 +- x/icacallbacks/keeper/params.go | 1 - x/records/keeper/keeper.go | 10 - x/records/keeper/params.go | 1 - .../client/cli/tx_add_validators_proposal.go | 112 --- .../client/cli/tx_toggle_lsm_proposal.go | 109 --- x/stakeibc/client/proposal_handler.go | 12 - x/stakeibc/genesis.go | 4 +- x/stakeibc/keeper/claim.go | 5 +- x/stakeibc/keeper/delegation.go | 2 +- x/stakeibc/keeper/gov.go | 34 - x/stakeibc/keeper/hooks.go | 9 +- x/stakeibc/keeper/keeper.go | 22 +- x/stakeibc/keeper/msg_server.go | 21 +- x/stakeibc/keeper/params.go | 16 +- x/stakeibc/keeper/transfer.go | 2 +- x/stakeibc/types/tx.pb.go | 677 +++++++++++++----- 22 files changed, 592 insertions(+), 560 deletions(-) delete mode 100644 proto/stride/stakeibc/gov.proto delete mode 100644 x/stakeibc/client/cli/tx_add_validators_proposal.go delete mode 100644 x/stakeibc/client/cli/tx_toggle_lsm_proposal.go delete mode 100644 x/stakeibc/client/proposal_handler.go delete mode 100644 x/stakeibc/keeper/gov.go diff --git a/app/app.go b/app/app.go index 32a573ad..64f3509b 100644 --- a/app/app.go +++ b/app/app.go @@ -68,8 +68,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/group" groupkeeper "github.com/cosmos/cosmos-sdk/x/group/keeper" groupmodule "github.com/cosmos/cosmos-sdk/x/group/module" - paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" - paramstypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/cosmos/gogoproto/proto" // ibc imports @@ -251,7 +249,6 @@ type MilkyWayApp struct { BankKeeper *bankkeeper.Keeper CapabilityKeeper *capabilitykeeper.Keeper UpgradeKeeper *upgradekeeper.Keeper - ParamsKeeper *paramskeeper.Keeper GroupKeeper *groupkeeper.Keeper ConsensusParamsKeeper *consensusparamkeeper.Keeper IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly @@ -337,11 +334,10 @@ func NewMilkyWayApp( auctiontypes.StoreKey, packetforwardtypes.StoreKey, oracletypes.StoreKey, tokenfactorytypes.StoreKey, ibchookstypes.StoreKey, forwardingtypes.StoreKey, marketmaptypes.StoreKey, - paramstypes.StoreKey, ratelimittypes.StoreKey, epochstypes.StoreKey, icqtypes.StoreKey, icacallbackstypes.StoreKey, recordstypes.StoreKey, stakeibctypes.StoreKey, ) - tkeys := storetypes.NewTransientStoreKeys(forwardingtypes.TransientStoreKey, paramstypes.TStoreKey) + tkeys := storetypes.NewTransientStoreKeys(forwardingtypes.TransientStoreKey) memKeys := storetypes.NewMemoryStoreKeys(capabilitytypes.MemStoreKey) // register streaming services @@ -370,14 +366,6 @@ func NewMilkyWayApp( panic(err) } - paramsKeeper := initParamsKeeper( - appCodec, - legacyAmino, - keys[paramstypes.StoreKey], - tkeys[paramstypes.TStoreKey], - ) - app.ParamsKeeper = ¶msKeeper - // set the BaseApp's parameter store consensusParamsKeeper := consensusparamkeeper.NewKeeper(appCodec, runtime.NewKVStoreService(keys[consensusparamtypes.StoreKey]), authorityAddr, runtime.EventService{}) app.ConsensusParamsKeeper = &consensusParamsKeeper @@ -544,7 +532,6 @@ func NewMilkyWayApp( app.RateLimitKeeper = *ratelimitkeeper.NewKeeper( appCodec, keys[ratelimittypes.StoreKey], - app.GetSubspace(ratelimittypes.ModuleName), authorityAddr, app.BankKeeper, app.IBCKeeper.ChannelKeeper, @@ -562,7 +549,6 @@ func NewMilkyWayApp( appCodec, keys[icacallbackstypes.StoreKey], keys[icacallbackstypes.MemStoreKey], - app.GetSubspace(icacallbackstypes.ModuleName), *app.IBCKeeper, ) @@ -637,7 +623,6 @@ func NewMilkyWayApp( appCodec, keys[recordstypes.StoreKey], keys[recordstypes.MemStoreKey], - app.GetSubspace(recordstypes.ModuleName), app.AccountKeeper, *app.TransferKeeper, *app.IBCKeeper, @@ -708,7 +693,7 @@ func NewMilkyWayApp( appCodec, keys[stakeibctypes.StoreKey], keys[stakeibctypes.MemStoreKey], - app.GetSubspace(stakeibctypes.ModuleName), + runtime.NewKVStoreService(keys[stakeibctypes.StoreKey]), authorityAddr, app.AccountKeeper, app.BankKeeper, @@ -1312,14 +1297,6 @@ func (app *MilkyWayApp) GetMemKey(storeKey string) *storetypes.MemoryStoreKey { return app.memKeys[storeKey] } -// GetSubspace returns a param subspace for a given module name. -// -// NOTE: This is solely to be used for testing purposes. -func (app *MilkyWayApp) GetSubspace(moduleName string) paramstypes.Subspace { - subspace, _ := app.ParamsKeeper.GetSubspace(moduleName) - return subspace -} - // RegisterAPIRoutes registers all application module routes with the provided // API server. func (app *MilkyWayApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APIConfig) { @@ -1520,14 +1497,3 @@ func (app *MilkyWayApp) Close() error { return nil } - -// initParamsKeeper init params keeper and its subspaces -func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino, key, tkey storetypes.StoreKey) paramskeeper.Keeper { - paramsKeeper := paramskeeper.NewKeeper(appCodec, legacyAmino, key, tkey) - - paramsKeeper.Subspace(ratelimittypes.ModuleName) - paramsKeeper.Subspace(recordstypes.ModuleName) - paramsKeeper.Subspace(stakeibctypes.ModuleName) - - return paramsKeeper -} diff --git a/go.mod b/go.mod index 35bab52d..f88055b5 100644 --- a/go.mod +++ b/go.mod @@ -403,6 +403,6 @@ replace ( // MilkyWay custom replace ( - github.com/Stride-Labs/ibc-rate-limiting => github.com/milkyway-labs/ibc-rate-limiting v0.0.0-20240509215339-45e398477ad5 + github.com/Stride-Labs/ibc-rate-limiting => github.com/milkyway-labs/ibc-rate-limiting v0.0.0-20240529144041-70ebeac5863b github.com/cosmos/relayer/v2 => github.com/milkyway-labs/relayer/v2 v2.0.0-20240510185220-0492766a512d ) diff --git a/go.sum b/go.sum index b03c0469..dc8da426 100644 --- a/go.sum +++ b/go.sum @@ -1091,8 +1091,8 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5 github.com/mgechev/revive v1.3.7 h1:502QY0vQGe9KtYJ9FpxMz9rL+Fc/P13CI5POL4uHCcE= github.com/mgechev/revive v1.3.7/go.mod h1:RJ16jUbF0OWC3co/+XTxmFNgEpUPwnnA0BRllX2aDNA= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/milkyway-labs/ibc-rate-limiting v0.0.0-20240509215339-45e398477ad5 h1:1QBEsR4IX53rUHE3EB4VzWiGfEyB+owTivjJU4+zYAM= -github.com/milkyway-labs/ibc-rate-limiting v0.0.0-20240509215339-45e398477ad5/go.mod h1:YAf80eEQ4bdg5qXP4EI8eCxzhhWfqwiy9DoP8JXXg60= +github.com/milkyway-labs/ibc-rate-limiting v0.0.0-20240529144041-70ebeac5863b h1:5OjDS9hKDyXPPd9XJwFcxrpFDUcaEZf9L14zj0fzbwo= +github.com/milkyway-labs/ibc-rate-limiting v0.0.0-20240529144041-70ebeac5863b/go.mod h1:YAf80eEQ4bdg5qXP4EI8eCxzhhWfqwiy9DoP8JXXg60= github.com/milkyway-labs/relayer/v2 v2.0.0-20240510185220-0492766a512d h1:2nNoD9y1Ucp9swVydBI4JrW/pyGp5cbo5IXAlFzlmyc= github.com/milkyway-labs/relayer/v2 v2.0.0-20240510185220-0492766a512d/go.mod h1:h4Ng2QsVpxExIq5S+WvLr8slDb9MSBh82gQS4DeMwDo= github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= diff --git a/proto/stride/stakeibc/gov.proto b/proto/stride/stakeibc/gov.proto deleted file mode 100644 index 361ba84a..00000000 --- a/proto/stride/stakeibc/gov.proto +++ /dev/null @@ -1,29 +0,0 @@ -syntax = "proto3"; -package stride.stakeibc; -import "gogoproto/gogo.proto"; -import "stride/stakeibc/validator.proto"; -option go_package = "github.com/milkyway-labs/milkyway/x/stakeibc/types"; - -message AddValidatorsProposal { - option (gogoproto.equal) = true; - option (gogoproto.goproto_getters) = false; - option (gogoproto.goproto_stringer) = false; - - string title = 1; - string description = 2; - string host_zone = 3; - repeated Validator validators = 4; - string deposit = 5 [ (gogoproto.moretags) = "yaml:\"deposit\"" ]; -} - -message ToggleLSMProposal { - option (gogoproto.equal) = true; - option (gogoproto.goproto_getters) = false; - option (gogoproto.goproto_stringer) = false; - - string title = 1; - string description = 2; - string host_zone = 3; - bool enabled = 4; - string deposit = 5 [ (gogoproto.moretags) = "yaml:\"deposit\"" ]; -} \ No newline at end of file diff --git a/proto/stride/stakeibc/tx.proto b/proto/stride/stakeibc/tx.proto index ae966863..84046fe2 100644 --- a/proto/stride/stakeibc/tx.proto +++ b/proto/stride/stakeibc/tx.proto @@ -9,6 +9,7 @@ import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; import "cosmos/msg/v1/msg.proto"; import "amino/amino.proto"; +import "stride/stakeibc/params.proto"; // Msg defines the Msg service. service Msg { @@ -429,4 +430,23 @@ message MsgUpdateHostZoneParams { // Max messages that can be sent in a single ICA message uint64 max_messages_per_ica_tx = 3; } -message MsgUpdateHostZoneParamsResponse {} \ No newline at end of file +message MsgUpdateHostZoneParamsResponse {} + +// MsgUpdateParams is the Msg/UpdateParams request type. +message MsgUpdateParams { + option (cosmos.msg.v1.signer) = "authority"; + option (amino.name) = "stride/x/stakeibc/MsgUpdateParams"; + + // authority is the address that controls the module (defaults to x/gov unless + // overwritten). + string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; + // params defines the x/staking 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. +message MsgUpdateParamsResponse {} \ No newline at end of file diff --git a/x/icacallbacks/keeper/keeper.go b/x/icacallbacks/keeper/keeper.go index bfcbf9a1..8948e4ea 100644 --- a/x/icacallbacks/keeper/keeper.go +++ b/x/icacallbacks/keeper/keeper.go @@ -3,21 +3,15 @@ package keeper import ( "fmt" + errorsmod "cosmossdk.io/errors" "cosmossdk.io/log" - + storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - - errorsmod "cosmossdk.io/errors" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - + channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" "github.com/milkyway-labs/milkyway/x/icacallbacks/types" - - channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - - storetypes "cosmossdk.io/store/types" ) type ( @@ -25,7 +19,6 @@ type ( cdc codec.BinaryCodec storeKey storetypes.StoreKey memKey storetypes.StoreKey - paramstore paramtypes.Subspace icacallbacks map[string]types.ICACallback IBCKeeper ibckeeper.Keeper } @@ -35,19 +28,12 @@ func NewKeeper( cdc codec.BinaryCodec, storeKey, memKey storetypes.StoreKey, - ps paramtypes.Subspace, ibcKeeper ibckeeper.Keeper, ) *Keeper { - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(types.ParamKeyTable()) - } - return &Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, - paramstore: ps, icacallbacks: make(map[string]types.ICACallback), IBCKeeper: ibcKeeper, } diff --git a/x/icacallbacks/keeper/params.go b/x/icacallbacks/keeper/params.go index fd54cd40..8c524f34 100644 --- a/x/icacallbacks/keeper/params.go +++ b/x/icacallbacks/keeper/params.go @@ -13,5 +13,4 @@ func (k Keeper) GetParams(ctx sdk.Context) types.Params { // SetParams set the params func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) } diff --git a/x/records/keeper/keeper.go b/x/records/keeper/keeper.go index 9e484021..c9c97196 100644 --- a/x/records/keeper/keeper.go +++ b/x/records/keeper/keeper.go @@ -7,12 +7,10 @@ import ( storetypes "cosmossdk.io/store/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" ibctransferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" icacallbackskeeper "github.com/milkyway-labs/milkyway/x/icacallbacks/keeper" - "github.com/milkyway-labs/milkyway/x/records/types" ) @@ -22,7 +20,6 @@ type ( Cdc codec.BinaryCodec storeKey storetypes.StoreKey memKey storetypes.StoreKey - paramstore paramtypes.Subspace AccountKeeper types.AccountKeeper TransferKeeper ibctransferkeeper.Keeper IBCKeeper ibckeeper.Keeper @@ -34,22 +31,15 @@ func NewKeeper( Cdc codec.BinaryCodec, storeKey, memKey storetypes.StoreKey, - ps paramtypes.Subspace, AccountKeeper types.AccountKeeper, TransferKeeper ibctransferkeeper.Keeper, ibcKeeper ibckeeper.Keeper, ICACallbacksKeeper icacallbackskeeper.Keeper, ) *Keeper { - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(types.ParamKeyTable()) - } - return &Keeper{ Cdc: Cdc, storeKey: storeKey, memKey: memKey, - paramstore: ps, AccountKeeper: AccountKeeper, TransferKeeper: TransferKeeper, IBCKeeper: ibcKeeper, diff --git a/x/records/keeper/params.go b/x/records/keeper/params.go index 5ca5d461..a9800bd5 100644 --- a/x/records/keeper/params.go +++ b/x/records/keeper/params.go @@ -13,5 +13,4 @@ func (k Keeper) GetParams(ctx sdk.Context) types.Params { // SetParams set the params func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) } diff --git a/x/stakeibc/client/cli/tx_add_validators_proposal.go b/x/stakeibc/client/cli/tx_add_validators_proposal.go deleted file mode 100644 index 75687e3e..00000000 --- a/x/stakeibc/client/cli/tx_add_validators_proposal.go +++ /dev/null @@ -1,112 +0,0 @@ -package cli - -import ( - "fmt" - "os" - "strings" - - "github.com/cosmos/cosmos-sdk/codec" - - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/tx" - sdk "github.com/cosmos/cosmos-sdk/types" - - errorsmod "cosmossdk.io/errors" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/version" - govcli "github.com/cosmos/cosmos-sdk/x/gov/client/cli" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/spf13/cobra" - - "github.com/milkyway-labs/milkyway/x/stakeibc/types" -) - -func parseAddValidatorsProposalFile(cdc codec.JSONCodec, proposalFile string) (proposal types.AddValidatorsProposal, err error) { - contents, err := os.ReadFile(proposalFile) - if err != nil { - return proposal, err - } - - if err = cdc.UnmarshalJSON(contents, &proposal); err != nil { - return proposal, err - } - - proposal.Title = fmt.Sprintf("Add validators to %s", proposal.HostZone) - - return proposal, nil -} - -func CmdAddValidatorsProposal() *cobra.Command { - cmd := &cobra.Command{ - Use: "add-validators [proposal-file]", - Short: "Submit an add-validator proposal", - Long: strings.TrimSpace( - fmt.Sprintf(`Submit an add-validators proposal along with an initial deposit. -The proposal details must be supplied via a JSON file. - -Example: -$ %s tx gov submit-legacy-proposal add-validators --from= - -Where proposal.json contains: -{ - "description": "Proposal to add Imperator because they contribute in XYZ ways!", - "hostZone": "GAIA", - "validators": [ - { - "name": "Imperator", - "address": "cosmosvaloper1v5y0tg0jllvxf5c3afml8s3awue0ymju89frut", - }, - ], - "deposit": "64000000ustrd" -} -`, version.AppName), - ), - Args: cobra.ExactArgs(1), - RunE: func(cmd *cobra.Command, args []string) (err error) { - clientCtx, err := client.GetClientTxContext(cmd) - if err != nil { - return err - } - - proposal, err := parseAddValidatorsProposalFile(clientCtx.Codec, args[0]) - if err != nil { - return err - } - - from := clientCtx.GetFromAddress() - - depositFromFlags, err := cmd.Flags().GetString(govcli.FlagDeposit) - if err != nil { - return err - } - - // if deposit from flags is not empty, it overrides the deposit from proposal - if depositFromFlags != "" { - proposal.Deposit = depositFromFlags - } - deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit) - if err != nil { - return err - } - - strideDenom, err := sdk.GetBaseDenom() - if err != nil { - return err - } - - if len(deposit) != 1 || deposit.GetDenomByIndex(0) != strideDenom { - return errorsmod.Wrapf(sdkerrors.ErrInvalidCoins, "Deposit token denom must be %s", strideDenom) - } - - msg, err := govtypes.NewMsgSubmitProposal(&proposal, deposit, from) - if err != nil { - return err - } - return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) - }, - } - - cmd.Flags().String(govcli.FlagDeposit, "", "deposit of proposal") - - return cmd -} diff --git a/x/stakeibc/client/cli/tx_toggle_lsm_proposal.go b/x/stakeibc/client/cli/tx_toggle_lsm_proposal.go deleted file mode 100644 index a97ffe3d..00000000 --- a/x/stakeibc/client/cli/tx_toggle_lsm_proposal.go +++ /dev/null @@ -1,109 +0,0 @@ -package cli - -import ( - "fmt" - "os" - "strings" - - errorsmod "cosmossdk.io/errors" - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/tx" - "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/cosmos/cosmos-sdk/version" - govcli "github.com/cosmos/cosmos-sdk/x/gov/client/cli" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - "github.com/spf13/cobra" - - "github.com/milkyway-labs/milkyway/x/stakeibc/types" -) - -func parseToggleLSMProposalFile(cdc codec.JSONCodec, proposalFile string) (proposal types.ToggleLSMProposal, err error) { - contents, err := os.ReadFile(proposalFile) - if err != nil { - return proposal, err - } - - if err = cdc.UnmarshalJSON(contents, &proposal); err != nil { - return proposal, err - } - - action := "Disable" - if proposal.Enabled { - action = "Enable" - } - proposal.Title = fmt.Sprintf("%s LSMLiquidStakes for %s", action, proposal.HostZone) - - return proposal, nil -} - -func CmdToggleLSMProposal() *cobra.Command { - cmd := &cobra.Command{ - Use: "toggle-lsm [proposal-file]", - Short: "Submit an toggle-lsm proposal", - Long: strings.TrimSpace( - fmt.Sprintf(`Submit an toggle-lsm proposal which will either enable or disable -LSMLiquidStakes for the host zone. - -Example: -$ %s tx gov submit-legacy-proposal toggle-lsm --from= - -Where proposal.json contains: -{ - "description": "Proposal to enable LSM for Osmosis", - "hostZone": "osmosis-1", - "enabled": true, - "deposit": "64000000ustrd" -} -`, version.AppName), - ), - Args: cobra.ExactArgs(1), - RunE: func(cmd *cobra.Command, args []string) (err error) { - clientCtx, err := client.GetClientTxContext(cmd) - if err != nil { - return err - } - - proposal, err := parseToggleLSMProposalFile(clientCtx.Codec, args[0]) - if err != nil { - return err - } - - from := clientCtx.GetFromAddress() - - depositFromFlags, err := cmd.Flags().GetString(govcli.FlagDeposit) - if err != nil { - return err - } - - // if deposit from flags is not empty, it overrides the deposit from proposal - if depositFromFlags != "" { - proposal.Deposit = depositFromFlags - } - deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit) - if err != nil { - return err - } - - strideDenom, err := sdk.GetBaseDenom() - if err != nil { - return err - } - - if len(deposit) != 1 || deposit.GetDenomByIndex(0) != strideDenom { - return errorsmod.Wrapf(sdkerrors.ErrInvalidCoins, "Deposit token denom must be %s", strideDenom) - } - - msg, err := govtypes.NewMsgSubmitProposal(&proposal, deposit, from) - if err != nil { - return err - } - return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) - }, - } - - cmd.Flags().String(govcli.FlagDeposit, "", "deposit of proposal") - - return cmd -} diff --git a/x/stakeibc/client/proposal_handler.go b/x/stakeibc/client/proposal_handler.go deleted file mode 100644 index bd795853..00000000 --- a/x/stakeibc/client/proposal_handler.go +++ /dev/null @@ -1,12 +0,0 @@ -package client - -import ( - "github.com/milkyway-labs/milkyway/x/stakeibc/client/cli" - - govclient "github.com/cosmos/cosmos-sdk/x/gov/client" -) - -var ( - AddValidatorsProposalHandler = govclient.NewProposalHandler(cli.CmdAddValidatorsProposal) - ToggleLSMProposalHandler = govclient.NewProposalHandler(cli.CmdToggleLSMProposal) -) diff --git a/x/stakeibc/genesis.go b/x/stakeibc/genesis.go index 535c7de8..14874dd0 100644 --- a/x/stakeibc/genesis.go +++ b/x/stakeibc/genesis.go @@ -17,7 +17,9 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) k.SetEpochTracker(ctx, epochTracker) } - k.SetParams(ctx, genState.Params) + if err := k.SetParams(ctx, genState.Params); err != nil { + panic(err) + } } // ExportGenesis returns the capability module's exported genesis. diff --git a/x/stakeibc/keeper/claim.go b/x/stakeibc/keeper/claim.go index f6baf234..7a286fc5 100644 --- a/x/stakeibc/keeper/claim.go +++ b/x/stakeibc/keeper/claim.go @@ -4,14 +4,13 @@ import ( "context" "fmt" - recordstypes "github.com/milkyway-labs/milkyway/x/records/types" - errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" bankTypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/gogoproto/proto" epochstypes "github.com/milkyway-labs/milkyway/x/epochs/types" + recordstypes "github.com/milkyway-labs/milkyway/x/records/types" "github.com/milkyway-labs/milkyway/x/stakeibc/types" ) @@ -128,7 +127,7 @@ func (k Keeper) GetRedemptionTransferMsg(ctx sdk.Context, userRedemptionRecord * k.Logger(ctx).Error(errMsg) return nil, errorsmod.Wrap(types.ErrEpochNotFound, errMsg) } - icaTimeOutNanos := k.GetParam(ctx, types.KeyICATimeoutNanos) + icaTimeOutNanos := k.GetParams(ctx).IcaTimeoutNanos nextEpochStarttime := epochTracker.NextEpochStartTime timeout := nextEpochStarttime + icaTimeOutNanos diff --git a/x/stakeibc/keeper/delegation.go b/x/stakeibc/keeper/delegation.go index 7adf857d..c0175154 100644 --- a/x/stakeibc/keeper/delegation.go +++ b/x/stakeibc/keeper/delegation.go @@ -102,7 +102,7 @@ func (k Keeper) StakeExistingDepositsOnHostZones(ctx sdk.Context, epochNumber ui } // limit the number of staking deposits to process per epoch - maxDepositRecordsToStake := utils.Min(len(stakeDepositRecords), cast.ToInt(k.GetParam(ctx, types.KeyMaxStakeICACallsPerEpoch))) + maxDepositRecordsToStake := utils.Min(len(stakeDepositRecords), cast.ToInt(k.GetParams(ctx).MaxStakeIcaCallsPerEpoch)) if maxDepositRecordsToStake < len(stakeDepositRecords) { k.Logger(ctx).Info(fmt.Sprintf(" MaxStakeICACallsPerEpoch limit reached - Only staking %d out of %d deposit records", maxDepositRecordsToStake, len(stakeDepositRecords))) } diff --git a/x/stakeibc/keeper/gov.go b/x/stakeibc/keeper/gov.go deleted file mode 100644 index 4d634733..00000000 --- a/x/stakeibc/keeper/gov.go +++ /dev/null @@ -1,34 +0,0 @@ -package keeper - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/milkyway-labs/milkyway/x/stakeibc/types" -) - -func (k Keeper) AddValidatorsProposal(ctx sdk.Context, msg *types.AddValidatorsProposal) error { - for _, validator := range msg.Validators { - if err := k.AddValidatorToHostZone(ctx, msg.HostZone, *validator, true); err != nil { - return err - } - } - - // Confirm none of the validator's exceed the weight cap - if err := k.CheckValidatorWeightsBelowCap(ctx, msg.HostZone); err != nil { - return err - } - - return nil -} - -func (k Keeper) ToggleLSMProposal(ctx sdk.Context, msg *types.ToggleLSMProposal) error { - hostZone, found := k.GetHostZone(ctx, msg.HostZone) - if !found { - return types.ErrHostZoneNotFound.Wrap(msg.HostZone) - } - - hostZone.LsmLiquidStakeEnabled = msg.Enabled - k.SetHostZone(ctx, hostZone) - - return nil -} diff --git a/x/stakeibc/keeper/hooks.go b/x/stakeibc/keeper/hooks.go index 55f4e8cc..544c17cc 100644 --- a/x/stakeibc/keeper/hooks.go +++ b/x/stakeibc/keeper/hooks.go @@ -36,10 +36,11 @@ func (k Keeper) BeforeEpochStart(ctx sdk.Context, epochInfo epochstypes.EpochInf // Stride Epoch - Process Deposits and Delegations if epochInfo.Identifier == epochstypes.STRIDE_EPOCH { // Get cadence intervals - redemptionRateInterval := k.GetParam(ctx, types.KeyRedemptionRateInterval) - depositInterval := k.GetParam(ctx, types.KeyDepositInterval) - delegationInterval := k.GetParam(ctx, types.KeyDelegateInterval) - reinvestInterval := k.GetParam(ctx, types.KeyReinvestInterval) + params := k.GetParams(ctx) + redemptionRateInterval := params.RedemptionRateInterval + depositInterval := params.DepositInterval + delegationInterval := params.DelegateInterval + reinvestInterval := params.ReinvestInterval // Claim accrued staking rewards at the beginning of the epoch k.ClaimAccruedStakingRewards(ctx) diff --git a/x/stakeibc/keeper/keeper.go b/x/stakeibc/keeper/keeper.go index ff6c50bd..a0ca83aa 100644 --- a/x/stakeibc/keeper/keeper.go +++ b/x/stakeibc/keeper/keeper.go @@ -3,6 +3,8 @@ package keeper import ( "fmt" + "cosmossdk.io/collections" + corestoretypes "cosmossdk.io/core/store" errorsmod "cosmossdk.io/errors" "cosmossdk.io/log" sdkmath "cosmossdk.io/math" @@ -11,7 +13,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" icacontrollerkeeper "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts/controller/keeper" ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" "github.com/spf13/cast" @@ -28,7 +29,6 @@ type ( cdc codec.Codec storeKey storetypes.StoreKey memKey storetypes.StoreKey - paramstore paramtypes.Subspace authority string ICAControllerKeeper icacontrollerkeeper.Keeper IBCKeeper ibckeeper.Keeper @@ -39,6 +39,7 @@ type ( ICACallbacksKeeper icacallbackskeeper.Keeper hooks types.StakeIBCHooks RatelimitKeeper types.RatelimitKeeper + params collections.Item[types.Params] } ) @@ -46,7 +47,7 @@ func NewKeeper( cdc codec.Codec, storeKey, memKey storetypes.StoreKey, - ps paramtypes.Subspace, + storeService corestoretypes.KVStoreService, authority string, accountKeeper types.AccountKeeper, bankKeeper bankkeeper.Keeper, @@ -57,16 +58,11 @@ func NewKeeper( ICACallbacksKeeper icacallbackskeeper.Keeper, RatelimitKeeper types.RatelimitKeeper, ) Keeper { - // set KeyTable if it has not already been set - if !ps.HasKeyTable() { - ps = ps.WithKeyTable(types.ParamKeyTable()) - } - + sb := collections.NewSchemaBuilder(storeService) return Keeper{ cdc: cdc, storeKey: storeKey, memKey: memKey, - paramstore: ps, authority: authority, AccountKeeper: accountKeeper, bankKeeper: bankKeeper, @@ -76,6 +72,7 @@ func NewKeeper( RecordsKeeper: RecordsKeeper, ICACallbacksKeeper: ICACallbacksKeeper, RatelimitKeeper: RatelimitKeeper, + params: collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)), } } @@ -106,7 +103,7 @@ func (k Keeper) GetICATimeoutNanos(ctx sdk.Context, epochType string) (uint64, e return 0, errorsmod.Wrapf(sdkerrors.ErrInvalidRequest, "Failed to get epoch tracker for %s", epochType) } // BUFFER by 5% of the epoch length - bufferSizeParam := k.GetParam(ctx, types.KeyBufferSize) + bufferSizeParam := k.GetParams(ctx).BufferSize bufferSize := epochTracker.Duration / bufferSizeParam // buffer size should not be negative or longer than the epoch duration if bufferSize > epochTracker.Duration { @@ -124,14 +121,15 @@ func (k Keeper) GetICATimeoutNanos(ctx sdk.Context, epochType string) (uint64, e func (k Keeper) GetOuterSafetyBounds(ctx sdk.Context, zone types.HostZone) (sdkmath.LegacyDec, sdkmath.LegacyDec) { // Fetch the wide bounds - minSafetyThresholdInt := k.GetParam(ctx, types.KeyDefaultMinRedemptionRateThreshold) + params := k.GetParams(ctx) + minSafetyThresholdInt := params.DefaultMinRedemptionRateThreshold minSafetyThreshold := sdkmath.LegacyNewDec(int64(minSafetyThresholdInt)).Quo(sdkmath.LegacyNewDec(100)) if !zone.MinRedemptionRate.IsNil() && zone.MinRedemptionRate.IsPositive() { minSafetyThreshold = zone.MinRedemptionRate } - maxSafetyThresholdInt := k.GetParam(ctx, types.KeyDefaultMaxRedemptionRateThreshold) + maxSafetyThresholdInt := params.DefaultMaxRedemptionRateThreshold maxSafetyThreshold := sdkmath.LegacyNewDec(int64(maxSafetyThresholdInt)).Quo(sdkmath.LegacyNewDec(100)) if !zone.MaxRedemptionRate.IsNil() && zone.MaxRedemptionRate.IsPositive() { diff --git a/x/stakeibc/keeper/msg_server.go b/x/stakeibc/keeper/msg_server.go index 82f720b7..3ace4c73 100644 --- a/x/stakeibc/keeper/msg_server.go +++ b/x/stakeibc/keeper/msg_server.go @@ -407,7 +407,7 @@ func (k msgServer) ClearBalance(goCtx context.Context, msg *types.MsgClearBalanc return nil, errorsmod.Wrapf(err, "failed to parse coin (%s)", coinString) } // KeyICATimeoutNanos are for our Stride ICA calls, KeyFeeTransferTimeoutNanos is for the IBC transfer - feeTransferTimeoutNanos := k.GetParam(ctx, types.KeyFeeTransferTimeoutNanos) + feeTransferTimeoutNanos := k.GetParams(ctx).FeeTransferTimeoutNanos timeoutTimestamp := cast.ToUint64(ctx.BlockTime().UnixNano()) + feeTransferTimeoutNanos msgs := []proto.Message{ &ibctransfertypes.MsgTransfer{ @@ -422,7 +422,7 @@ func (k msgServer) ClearBalance(goCtx context.Context, msg *types.MsgClearBalanc connectionId := zone.GetConnectionId() - icaTimeoutNanos := k.GetParam(ctx, types.KeyICATimeoutNanos) + icaTimeoutNanos := k.GetParams(ctx).IcaTimeoutNanos icaTimeoutNanos = cast.ToUint64(ctx.BlockTime().UnixNano()) + icaTimeoutNanos _, err = k.SubmitTxs(ctx, connectionId, msgs, types.ICAAccountType_FEE, icaTimeoutNanos, "", nil) @@ -1228,3 +1228,20 @@ func (k msgServer) ToggleTradeController( return &types.MsgToggleTradeControllerResponse{}, nil } + +func (ms msgServer) UpdateParams(goCtx context.Context, msg *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) { + if ms.GetAuthority() != msg.Authority { + return nil, errorsmod.Wrapf(govtypes.ErrInvalidSigner, "invalid authority; expected %s, got %s", ms.GetAuthority(), msg.Authority) + } + + if err := msg.Params.Validate(); err != nil { + return nil, err + } + + ctx := sdk.UnwrapSDKContext(goCtx) + if err := ms.SetParams(ctx, msg.Params); err != nil { + return nil, err + } + + return &types.MsgUpdateParamsResponse{}, nil +} diff --git a/x/stakeibc/keeper/params.go b/x/stakeibc/keeper/params.go index 817835ac..2a5ba0d9 100644 --- a/x/stakeibc/keeper/params.go +++ b/x/stakeibc/keeper/params.go @@ -8,17 +8,15 @@ import ( // GetParams get all parameters as types.Params func (k Keeper) GetParams(ctx sdk.Context) (params types.Params) { - k.paramstore.GetParamSet(ctx, ¶ms) + var err error + params, err = k.params.Get(ctx) + if err != nil { + return types.Params{} + } return params } // SetParams set the params -func (k Keeper) SetParams(ctx sdk.Context, params types.Params) { - k.paramstore.SetParamSet(ctx, ¶ms) -} - -func (k *Keeper) GetParam(ctx sdk.Context, key []byte) uint64 { - var out uint64 - k.paramstore.Get(ctx, key, &out) - return out +func (k Keeper) SetParams(ctx sdk.Context, params types.Params) error { + return k.params.Set(ctx, params) } diff --git a/x/stakeibc/keeper/transfer.go b/x/stakeibc/keeper/transfer.go index 3fe1f4f6..9bc35d67 100644 --- a/x/stakeibc/keeper/transfer.go +++ b/x/stakeibc/keeper/transfer.go @@ -30,7 +30,7 @@ func (k Keeper) TransferExistingDepositsToHostZones(ctx sdk.Context, epochNumber return isTransferRecord && isBeforeCurrentEpoch }) - ibcTransferTimeoutNanos := k.GetParam(ctx, types.KeyIBCTransferTimeoutNanos) + ibcTransferTimeoutNanos := k.GetParams(ctx).IbcTransferTimeoutNanos for _, depositRecord := range transferDepositRecords { k.Logger(ctx).Info(utils.LogWithHostZone(depositRecord.HostZoneId, diff --git a/x/stakeibc/types/tx.pb.go b/x/stakeibc/types/tx.pb.go index 2c87d6da..420062c0 100644 --- a/x/stakeibc/types/tx.pb.go +++ b/x/stakeibc/types/tx.pb.go @@ -2296,6 +2296,102 @@ func (m *MsgUpdateHostZoneParamsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateHostZoneParamsResponse proto.InternalMessageInfo +// MsgUpdateParams is the Msg/UpdateParams request type. +type MsgUpdateParams struct { + // authority is the address that controls the module (defaults to x/gov unless + // overwritten). + Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` + // params defines the x/staking 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_9b7e09c9ad51cd54, []int{43} +} +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. +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_9b7e09c9ad51cd54, []int{44} +} +func (m *MsgUpdateParamsResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUpdateParamsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUpdateParamsResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MsgUpdateParamsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateParamsResponse.Merge(m, src) +} +func (m *MsgUpdateParamsResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgUpdateParamsResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateParamsResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUpdateParamsResponse proto.InternalMessageInfo + func init() { proto.RegisterEnum("stride.stakeibc.AuthzPermissionChange", AuthzPermissionChange_name, AuthzPermissionChange_value) proto.RegisterType((*MsgUpdateInnerRedemptionRateBounds)(nil), "stride.stakeibc.MsgUpdateInnerRedemptionRateBounds") @@ -2341,173 +2437,178 @@ func init() { proto.RegisterType((*MsgToggleTradeControllerResponse)(nil), "stride.stakeibc.MsgToggleTradeControllerResponse") proto.RegisterType((*MsgUpdateHostZoneParams)(nil), "stride.stakeibc.MsgUpdateHostZoneParams") proto.RegisterType((*MsgUpdateHostZoneParamsResponse)(nil), "stride.stakeibc.MsgUpdateHostZoneParamsResponse") + proto.RegisterType((*MsgUpdateParams)(nil), "stride.stakeibc.MsgUpdateParams") + proto.RegisterType((*MsgUpdateParamsResponse)(nil), "stride.stakeibc.MsgUpdateParamsResponse") } func init() { proto.RegisterFile("stride/stakeibc/tx.proto", fileDescriptor_9b7e09c9ad51cd54) } var fileDescriptor_9b7e09c9ad51cd54 = []byte{ - // 2562 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xcd, 0x6f, 0xdc, 0xc6, - 0x15, 0xd7, 0x5a, 0xdf, 0x4f, 0x92, 0xb5, 0xa2, 0x24, 0x6b, 0x45, 0x47, 0x5a, 0x89, 0x72, 0x5a, - 0x45, 0x89, 0xb4, 0x95, 0xe4, 0xb4, 0xcd, 0x26, 0x0d, 0xaa, 0xaf, 0xa6, 0x6a, 0xac, 0xc4, 0xa0, - 0x94, 0x04, 0x08, 0x10, 0xb0, 0xb3, 0xe4, 0x78, 0x97, 0x30, 0xc9, 0xd9, 0x92, 0x5c, 0x69, 0x95, - 0x43, 0x50, 0xf4, 0x54, 0x14, 0x28, 0x50, 0xa0, 0xe8, 0x3d, 0xc8, 0xb1, 0x28, 0x50, 0x03, 0x0d, - 0x5a, 0xa0, 0x7f, 0x41, 0x82, 0xa2, 0x68, 0x90, 0x53, 0x51, 0x14, 0x4a, 0x60, 0x1f, 0x5c, 0xf4, - 0xe8, 0x73, 0x0f, 0xc5, 0xcc, 0x90, 0x5c, 0x92, 0x3b, 0xdc, 0x5d, 0xa9, 0x36, 0xd0, 0x8b, 0xed, - 0x79, 0xf3, 0x9b, 0xf7, 0x35, 0xf3, 0x1e, 0xdf, 0x7b, 0x6b, 0x28, 0x78, 0xbe, 0x6b, 0x1a, 0xb8, - 0xe4, 0xf9, 0xe8, 0x3e, 0x36, 0x2b, 0x7a, 0xc9, 0x6f, 0x6e, 0xd4, 0x5d, 0xe2, 0x13, 0x69, 0x92, - 0xef, 0x6c, 0x84, 0x3b, 0x72, 0x31, 0x0d, 0x3d, 0x45, 0x96, 0x69, 0x20, 0x9f, 0xb8, 0xfc, 0x84, - 0x3c, 0x53, 0x25, 0x55, 0xc2, 0xfe, 0x59, 0xa2, 0xff, 0x0a, 0xa8, 0xf3, 0x3a, 0xf1, 0x6c, 0xe2, - 0x69, 0x7c, 0x83, 0x2f, 0x82, 0xad, 0x45, 0xbe, 0x2a, 0x55, 0x90, 0x87, 0x4b, 0xa7, 0x9b, 0x15, - 0xec, 0xa3, 0xcd, 0x92, 0x4e, 0x4c, 0x27, 0xd8, 0x9f, 0x0b, 0xf6, 0x6d, 0xaf, 0x5a, 0x3a, 0xdd, - 0xa4, 0x7f, 0x05, 0x1b, 0x53, 0xc8, 0x36, 0x1d, 0x52, 0x62, 0x7f, 0x72, 0x92, 0xf2, 0x9f, 0x6b, - 0xa0, 0x1c, 0x79, 0xd5, 0x77, 0xea, 0x06, 0xf2, 0xf1, 0xa1, 0xe3, 0x60, 0x57, 0xc5, 0x06, 0xb6, - 0xeb, 0xbe, 0x49, 0x1c, 0x15, 0xf9, 0x78, 0x97, 0x34, 0x1c, 0xc3, 0x93, 0x0a, 0x30, 0xac, 0xbb, - 0x98, 0x2a, 0x5d, 0xc8, 0x2d, 0xe5, 0x56, 0x47, 0xd5, 0x70, 0x29, 0xcd, 0xc3, 0x88, 0x5e, 0x43, - 0xa6, 0xa3, 0x99, 0x46, 0xe1, 0x5a, 0xb0, 0x45, 0xd7, 0x87, 0x86, 0x64, 0xc1, 0xbc, 0x4d, 0x37, - 0x28, 0x57, 0xcd, 0x8d, 0xd8, 0x6a, 0x2e, 0xf2, 0x71, 0xa1, 0x9f, 0x62, 0x77, 0x37, 0x3f, 0xbb, - 0x28, 0xf6, 0xfd, 0xe3, 0xa2, 0x78, 0x93, 0xab, 0xec, 0x19, 0xf7, 0x37, 0x4c, 0x52, 0xb2, 0x91, - 0x5f, 0xdb, 0xb8, 0x83, 0xab, 0x48, 0x3f, 0xdf, 0xc7, 0xfa, 0x97, 0x9f, 0xae, 0x43, 0x60, 0xff, - 0x3e, 0xd6, 0xd5, 0x1b, 0xb6, 0xe9, 0x08, 0x14, 0x65, 0xd2, 0x50, 0x33, 0x43, 0xda, 0xc0, 0xd5, - 0xa5, 0xa1, 0xa6, 0x40, 0x5a, 0xf9, 0xe0, 0x67, 0x8f, 0x1f, 0xac, 0x85, 0x4e, 0xf8, 0xc5, 0xe3, - 0x07, 0x6b, 0xb7, 0x83, 0x6b, 0x6e, 0xb6, 0x2e, 0xba, 0xbb, 0x5f, 0x95, 0x97, 0x60, 0xad, 0x3b, - 0x4a, 0xc5, 0x5e, 0x9d, 0x38, 0x1e, 0x56, 0xfe, 0x90, 0x83, 0xeb, 0x47, 0x5e, 0xf5, 0x8e, 0xf9, - 0x93, 0x86, 0x69, 0x1c, 0x53, 0x31, 0x1d, 0x2e, 0xe6, 0x65, 0x18, 0x42, 0x36, 0x69, 0x38, 0x3e, - 0xbf, 0x96, 0xdd, 0x85, 0xc0, 0xf8, 0xd9, 0x76, 0xe3, 0x0f, 0x1d, 0x5f, 0x0d, 0xc0, 0xd2, 0x02, - 0x40, 0x8d, 0x78, 0xbe, 0x66, 0x60, 0x87, 0xd8, 0xfc, 0x96, 0xd4, 0x51, 0x4a, 0xd9, 0xa7, 0x84, - 0xf2, 0x66, 0xda, 0xee, 0x25, 0xa1, 0xdd, 0x31, 0x15, 0x15, 0x02, 0x37, 0x92, 0x94, 0xd0, 0x1e, - 0xe9, 0x1d, 0x18, 0xf1, 0x7c, 0xcd, 0x27, 0xf7, 0xb1, 0xc3, 0xb4, 0x1f, 0xdb, 0x9a, 0xdf, 0x08, - 0x7c, 0x4f, 0xdf, 0xf6, 0x46, 0xf0, 0xb6, 0x37, 0xf6, 0x88, 0xe9, 0xec, 0x16, 0xa9, 0xfe, 0xbf, - 0xfd, 0xaa, 0x38, 0xd7, 0xae, 0x3f, 0xdd, 0xf7, 0xd4, 0x61, 0xcf, 0x3f, 0xa1, 0xac, 0x94, 0xcf, - 0x73, 0x30, 0x45, 0x25, 0x1e, 0x1f, 0x3d, 0x53, 0x4f, 0xad, 0xc3, 0xb4, 0xe5, 0xd9, 0x5c, 0x7d, - 0xcd, 0xac, 0xe8, 0x09, 0x97, 0xe5, 0x2d, 0xcf, 0x66, 0xda, 0x1c, 0x56, 0x74, 0xee, 0xb9, 0xdb, - 0x69, 0xcf, 0xad, 0x88, 0x3d, 0x97, 0xd0, 0x5a, 0x79, 0x0b, 0xe6, 0xdb, 0x88, 0x91, 0xff, 0x36, - 0x61, 0xc6, 0x77, 0x91, 0xe3, 0x21, 0x9d, 0xbd, 0x74, 0x9d, 0xd8, 0x75, 0x0b, 0xfb, 0x98, 0xd9, - 0x37, 0xa2, 0x4e, 0xc7, 0xf6, 0xf6, 0x82, 0x2d, 0xe5, 0x2f, 0x39, 0x98, 0x3c, 0xf2, 0xaa, 0x7b, - 0x16, 0x46, 0xee, 0x2e, 0xb2, 0x90, 0xa3, 0xe3, 0xab, 0x05, 0x77, 0xcb, 0x69, 0xfd, 0x97, 0x71, - 0x1a, 0x95, 0x55, 0x43, 0x8e, 0x83, 0x2d, 0x1e, 0x93, 0x6a, 0xb8, 0x2c, 0x6f, 0xa5, 0xfd, 0xb3, - 0x2c, 0xf4, 0x4f, 0x5c, 0x73, 0x65, 0x1e, 0xe6, 0x52, 0xa4, 0x28, 0x56, 0xfe, 0xca, 0x63, 0x85, - 0xc6, 0x13, 0xb6, 0x9f, 0xd1, 0x0b, 0xb8, 0x09, 0x2c, 0x32, 0xb4, 0x0f, 0x89, 0x13, 0x24, 0x34, - 0x75, 0x84, 0x12, 0xde, 0x27, 0x0e, 0x96, 0x64, 0x18, 0x71, 0xb1, 0x8e, 0xcd, 0x53, 0xec, 0x06, - 0xa6, 0x46, 0xeb, 0x5e, 0xa3, 0x28, 0xa6, 0xbc, 0x52, 0x60, 0x51, 0x14, 0xa3, 0x44, 0x96, 0xfe, - 0x6d, 0x08, 0xa6, 0xd9, 0x56, 0xd5, 0xf4, 0x7c, 0xec, 0xfe, 0x30, 0x54, 0xe0, 0x7b, 0x30, 0xa1, - 0x13, 0xc7, 0xc1, 0xfc, 0x71, 0x84, 0x37, 0xb8, 0x5b, 0x78, 0x72, 0x51, 0x9c, 0x39, 0x47, 0xb6, - 0x55, 0x56, 0x12, 0xdb, 0x8a, 0x3a, 0xde, 0x5a, 0x1f, 0x1a, 0x92, 0x02, 0xe3, 0x15, 0xac, 0xd7, - 0xb6, 0xb7, 0xea, 0x2e, 0xbe, 0x67, 0x36, 0x0b, 0xe3, 0xcc, 0x86, 0x04, 0x4d, 0xba, 0x9d, 0x48, - 0x16, 0x3c, 0xc9, 0xce, 0x3e, 0xb9, 0x28, 0x4e, 0x71, 0xfe, 0xad, 0x3d, 0x25, 0x96, 0x43, 0xa4, - 0x4d, 0x18, 0x6d, 0x85, 0xcb, 0x20, 0x3b, 0x34, 0xf3, 0xe4, 0xa2, 0x98, 0xe7, 0x87, 0xa2, 0x2d, - 0x45, 0x1d, 0x31, 0x83, 0xe0, 0x89, 0x5f, 0xdd, 0x50, 0xf2, 0xea, 0xde, 0x02, 0xfe, 0xce, 0xef, - 0x61, 0x57, 0x0b, 0x9e, 0x12, 0xb5, 0x15, 0x18, 0xdb, 0xc5, 0x27, 0x17, 0x45, 0x99, 0xb3, 0x15, - 0x80, 0x14, 0x75, 0x2a, 0xa4, 0xee, 0x71, 0xe2, 0xa1, 0x21, 0xfd, 0x00, 0xf2, 0x0d, 0xa7, 0x42, - 0x1c, 0xc3, 0x74, 0xaa, 0x5a, 0x1d, 0xbb, 0x26, 0x31, 0x0a, 0x63, 0x4b, 0xb9, 0xd5, 0x81, 0xdd, - 0x9b, 0x4f, 0x2e, 0x8a, 0x73, 0x9c, 0x59, 0x1a, 0xa1, 0xa8, 0x93, 0x11, 0xe9, 0x2e, 0xa3, 0x48, - 0x08, 0xa6, 0xe9, 0xc7, 0x2f, 0xfd, 0x21, 0x9a, 0xb8, 0xea, 0x87, 0x68, 0xca, 0x36, 0x9d, 0xd4, - 0x17, 0x8f, 0x8a, 0x40, 0xcd, 0x36, 0x11, 0xd7, 0xaf, 0x2e, 0x02, 0x35, 0x53, 0x22, 0xbe, 0x03, - 0x05, 0x9a, 0xe3, 0x2c, 0x96, 0x7c, 0x34, 0xf6, 0x36, 0x35, 0xec, 0xa0, 0x8a, 0x85, 0x8d, 0xc2, - 0x24, 0xcb, 0x32, 0xb3, 0x96, 0x67, 0xc7, 0x72, 0xd3, 0x01, 0xdf, 0x94, 0x0e, 0xa0, 0xa8, 0x13, - 0xdb, 0x6e, 0x38, 0xa6, 0x7f, 0xae, 0xd5, 0x09, 0xb1, 0x34, 0xdf, 0xc5, 0xc8, 0x6b, 0xb8, 0xe7, - 0x1a, 0x32, 0x0c, 0x17, 0x7b, 0x5e, 0x21, 0xcf, 0x2e, 0xf2, 0xb9, 0x08, 0x76, 0x97, 0x10, 0xeb, - 0x24, 0x00, 0xed, 0x70, 0x8c, 0x74, 0x1b, 0xe6, 0xa8, 0x89, 0x36, 0xf6, 0x3c, 0x54, 0xc5, 0x1e, - 0x75, 0xb7, 0x66, 0xea, 0x48, 0xf3, 0x9b, 0x85, 0x29, 0x7a, 0x29, 0x2a, 0xf5, 0xc0, 0x51, 0xb0, - 0x7b, 0x17, 0xbb, 0x87, 0x3a, 0x3a, 0x69, 0x96, 0x5f, 0xff, 0xf9, 0xc7, 0xc5, 0xbe, 0x7f, 0x7d, - 0x5c, 0xec, 0x4b, 0x87, 0xd9, 0xf3, 0x19, 0x61, 0x96, 0x8c, 0x1c, 0x65, 0x01, 0x6e, 0x0a, 0xc8, - 0xf1, 0xd4, 0x32, 0xcf, 0xd2, 0x0e, 0x32, 0xed, 0x77, 0x1c, 0x03, 0x5b, 0xb8, 0x8a, 0x7c, 0x6c, - 0xb0, 0x74, 0xdf, 0xa9, 0x54, 0x5a, 0x82, 0xf1, 0x28, 0x5d, 0xb4, 0x32, 0x2a, 0x84, 0x19, 0xe3, - 0xd0, 0x90, 0x66, 0x60, 0x10, 0xd7, 0x89, 0x5e, 0x63, 0xc9, 0x64, 0x40, 0xe5, 0x8b, 0x44, 0x26, - 0x19, 0x4c, 0x65, 0x92, 0xd7, 0xd2, 0x26, 0xbe, 0x98, 0x91, 0x35, 0x45, 0xba, 0xfe, 0x68, 0x60, - 0x64, 0x20, 0x3f, 0xa8, 0xac, 0xc0, 0x72, 0x26, 0x24, 0x32, 0xfa, 0xf7, 0xb9, 0x20, 0x01, 0x55, - 0x78, 0xa2, 0x7d, 0x37, 0xac, 0x62, 0x3b, 0x59, 0x9c, 0x48, 0x90, 0xd7, 0x52, 0x09, 0x72, 0x05, - 0x26, 0x9c, 0x86, 0xad, 0xb9, 0x21, 0xc7, 0xc0, 0xe8, 0x71, 0xa7, 0x61, 0x47, 0x52, 0xca, 0xaf, - 0xa4, 0xed, 0x5b, 0xcd, 0xb8, 0xc2, 0x36, 0xb5, 0x94, 0x25, 0x58, 0x14, 0xef, 0x44, 0x36, 0xfd, - 0x39, 0x07, 0xf9, 0x23, 0xaf, 0xba, 0x63, 0x18, 0xff, 0xbb, 0x35, 0x65, 0x80, 0xa8, 0xb0, 0xf7, - 0x0a, 0xfd, 0x4b, 0xfd, 0xab, 0x63, 0x5b, 0xf2, 0x46, 0xaa, 0x19, 0xd8, 0x88, 0xe4, 0xa8, 0x31, - 0x74, 0x79, 0x3b, 0x6d, 0xa4, 0x22, 0x34, 0x32, 0xa1, 0xa7, 0x22, 0x43, 0x21, 0x4d, 0x8b, 0x0c, - 0xfb, 0x00, 0x26, 0x23, 0xea, 0x7b, 0xd8, 0xac, 0xd6, 0x7c, 0x69, 0x0b, 0x86, 0xc3, 0xc0, 0xcb, - 0xf1, 0xef, 0xc0, 0x97, 0x9f, 0xae, 0xcf, 0x04, 0xd1, 0x1f, 0x84, 0xdb, 0xb1, 0xef, 0x9a, 0x4e, - 0x55, 0x0d, 0x81, 0xd2, 0x0d, 0x18, 0x3a, 0x63, 0xa7, 0x99, 0xb5, 0x03, 0x6a, 0xb0, 0x52, 0xbe, - 0x0a, 0x02, 0xa0, 0x86, 0x9c, 0x2a, 0x4e, 0x09, 0xba, 0xb2, 0x03, 0x8f, 0x60, 0x2a, 0x72, 0x89, - 0xc6, 0x05, 0x85, 0x7e, 0x5c, 0xca, 0xf6, 0x23, 0x17, 0xaa, 0xe6, 0x4f, 0x53, 0x5a, 0xf4, 0x1c, - 0x18, 0x42, 0x1b, 0xc2, 0x90, 0x10, 0x6e, 0x46, 0x5e, 0xfe, 0x53, 0x0e, 0xa4, 0x23, 0xaf, 0xba, - 0x8f, 0x69, 0x65, 0x15, 0xa1, 0xae, 0x6a, 0xff, 0x36, 0x8c, 0x9c, 0x22, 0x8b, 0x65, 0xc7, 0xa0, - 0xa4, 0xea, 0x70, 0x43, 0xa7, 0xc8, 0xa2, 0x94, 0xf2, 0xcb, 0x69, 0x2b, 0x6f, 0x09, 0xad, 0x4c, - 0xa9, 0xa8, 0x3c, 0x07, 0x72, 0x3b, 0x35, 0xb2, 0xeb, 0x9f, 0xb9, 0x20, 0xff, 0x79, 0x3e, 0x71, - 0xf1, 0xa1, 0xe3, 0x63, 0x97, 0x55, 0x7d, 0x3b, 0xba, 0x1e, 0xd5, 0x70, 0x97, 0xae, 0x17, 0x57, - 0xd2, 0xd5, 0x08, 0xaf, 0x97, 0x92, 0x35, 0xc7, 0x0a, 0x4c, 0x20, 0x2e, 0x44, 0x23, 0x67, 0x4e, - 0x54, 0x38, 0x8d, 0x07, 0xc4, 0xb7, 0x29, 0xad, 0xfc, 0x7a, 0xda, 0xe6, 0xf5, 0x8c, 0x94, 0x20, - 0x56, 0x5f, 0x79, 0x1e, 0x56, 0x3a, 0x6c, 0x47, 0x5e, 0xf8, 0x63, 0x0e, 0x96, 0xa2, 0xde, 0x2c, - 0x72, 0xd2, 0x71, 0x0d, 0xb9, 0xd8, 0x3b, 0x68, 0xea, 0x35, 0xf6, 0x7d, 0xbc, 0x92, 0x2b, 0x0a, - 0x40, 0xef, 0x8f, 0xd4, 0x71, 0x70, 0xd1, 0x6a, 0xb8, 0x2c, 0xef, 0xa5, 0x4d, 0xdb, 0xea, 0xd0, - 0x55, 0x66, 0xe8, 0xa4, 0xac, 0xc1, 0x6a, 0x37, 0x4c, 0x64, 0xe4, 0x27, 0x3c, 0xab, 0xef, 0x21, - 0xcb, 0xac, 0xd0, 0xe2, 0x61, 0x9f, 0x67, 0x7f, 0x93, 0x38, 0x4f, 0xdb, 0xb4, 0x1e, 0x13, 0xb9, - 0x40, 0x93, 0x20, 0x91, 0x0b, 0x76, 0x22, 0x33, 0x3e, 0x62, 0x0d, 0x9f, 0x8a, 0xbd, 0x86, 0x8d, - 0xa3, 0xfa, 0xf7, 0x2a, 0x06, 0xf4, 0xda, 0xa5, 0x25, 0x45, 0x29, 0x37, 0x59, 0x3e, 0x4c, 0x12, - 0x23, 0xe5, 0xfe, 0x3d, 0xcc, 0xea, 0xf3, 0x3d, 0xca, 0x13, 0x9f, 0xb8, 0xc8, 0xc0, 0x2a, 0x69, - 0xf8, 0x58, 0xfa, 0x36, 0x8c, 0xa2, 0x86, 0x5f, 0x23, 0xae, 0xe9, 0x9f, 0x77, 0xcd, 0xc9, 0x2d, - 0xa8, 0xa4, 0xc0, 0x04, 0xcb, 0x22, 0x29, 0x13, 0xc6, 0x28, 0x71, 0x2f, 0xb8, 0x87, 0x5d, 0x58, - 0xe4, 0x7a, 0x6b, 0x3e, 0xd1, 0x5c, 0x7c, 0x86, 0x5c, 0x43, 0x13, 0x85, 0x9f, 0xcc, 0x51, 0x27, - 0x44, 0x65, 0x98, 0xbd, 0x78, 0x30, 0x7e, 0x1f, 0x16, 0x5a, 0x3c, 0x7c, 0xaa, 0x77, 0x8a, 0x05, - 0x0f, 0xce, 0xf9, 0x90, 0x05, 0x33, 0x2d, 0xc1, 0xe1, 0x10, 0x78, 0x0b, 0xd0, 0xd2, 0x41, 0x54, - 0xaa, 0xf3, 0x92, 0x66, 0x81, 0x22, 0x43, 0x3d, 0x4e, 0xda, 0xca, 0xf2, 0x37, 0x61, 0x25, 0x64, - 0x11, 0x2a, 0x23, 0xe2, 0xc5, 0x9b, 0x83, 0x45, 0x0e, 0x0d, 0x54, 0x6a, 0x67, 0xf6, 0x06, 0x2c, - 0x07, 0x2c, 0x88, 0xc6, 0x15, 0x14, 0xb0, 0x1a, 0xe6, 0xe5, 0x29, 0x03, 0x9e, 0x10, 0x7a, 0xab, - 0xed, 0x8c, 0x4a, 0x30, 0x13, 0x68, 0xc5, 0x3a, 0x16, 0x8d, 0x38, 0x8c, 0x5f, 0x61, 0x84, 0x9d, - 0x9d, 0xe2, 0x7b, 0xac, 0x83, 0x79, 0xdb, 0xa1, 0x1c, 0xa4, 0x6d, 0xb8, 0x91, 0x3e, 0xc0, 0xd7, - 0x85, 0x51, 0x76, 0x64, 0x3a, 0x71, 0x84, 0x3b, 0x43, 0xda, 0x84, 0xd9, 0xf4, 0x21, 0xa6, 0x15, - 0x6f, 0x72, 0x54, 0x29, 0x71, 0x86, 0x99, 0x2c, 0xad, 0xc3, 0x74, 0xab, 0xf9, 0x6a, 0x1d, 0x18, - 0xe3, 0xb3, 0x89, 0xa8, 0x15, 0x0b, 0xe1, 0x2f, 0x82, 0x94, 0x84, 0x33, 0x2b, 0x78, 0xc7, 0x37, - 0x19, 0x43, 0x33, 0x1b, 0xe6, 0x60, 0x98, 0x15, 0xf4, 0xa6, 0xc1, 0xba, 0x99, 0x01, 0x75, 0x88, - 0x2e, 0x0f, 0x0d, 0xa9, 0x0c, 0x32, 0x2d, 0xd6, 0x91, 0x65, 0x91, 0x33, 0x6c, 0x68, 0xde, 0x19, - 0xaa, 0x6b, 0x16, 0xf1, 0xbc, 0x58, 0x5b, 0xc2, 0xe6, 0x69, 0x3b, 0x1c, 0x70, 0x7c, 0x86, 0xea, - 0x77, 0x88, 0xe7, 0xb1, 0x44, 0x7a, 0x00, 0x93, 0xb4, 0x5d, 0x62, 0x67, 0x82, 0x56, 0x7c, 0xb2, - 0x97, 0x56, 0x7c, 0xc2, 0x36, 0x1d, 0xca, 0x68, 0x87, 0x77, 0xe4, 0x94, 0x0d, 0x6a, 0x26, 0xd8, - 0xe4, 0x7b, 0x63, 0x83, 0x9a, 0x2d, 0x36, 0xe5, 0xef, 0xd2, 0x2c, 0xd0, 0x0a, 0xb9, 0xec, 0xd6, - 0x21, 0x1d, 0xd4, 0x41, 0xeb, 0x90, 0x26, 0x47, 0xb9, 0xe0, 0xf3, 0x1c, 0xcb, 0x05, 0xfc, 0xcb, - 0xfb, 0x14, 0x72, 0xc1, 0x32, 0x8c, 0xc7, 0x9f, 0x46, 0x98, 0x0a, 0x62, 0x2f, 0xa2, 0xdb, 0x40, - 0xaf, 0x67, 0x53, 0xd3, 0x3a, 0x07, 0xa6, 0xa6, 0xc9, 0x91, 0xa9, 0xbf, 0xeb, 0x67, 0xa6, 0xf2, - 0xef, 0xd0, 0xff, 0x83, 0xa9, 0xf1, 0x87, 0x3b, 0x70, 0x89, 0x87, 0x3b, 0x78, 0xd9, 0x87, 0x3b, - 0xf4, 0x74, 0x1e, 0xee, 0xf0, 0xb3, 0x7c, 0xb8, 0xe9, 0x6b, 0x09, 0x6e, 0x33, 0x4d, 0x6e, 0x0d, - 0x99, 0xae, 0xb1, 0x4f, 0xdc, 0x31, 0xf6, 0xf7, 0xe2, 0xfd, 0x3a, 0xed, 0xae, 0x7c, 0x4c, 0x9b, - 0x8b, 0xc4, 0xa7, 0xb6, 0x53, 0xe9, 0xda, 0x43, 0x15, 0xb1, 0x0f, 0x63, 0x2e, 0x63, 0x1c, 0xff, - 0xa9, 0x60, 0xa5, 0x87, 0x81, 0x86, 0x0a, 0xfc, 0x1c, 0xbb, 0x19, 0x0d, 0x16, 0xe2, 0x73, 0x0b, - 0xfa, 0x57, 0x30, 0xac, 0x0d, 0x1c, 0x3c, 0xd0, 0x8b, 0x83, 0xe7, 0xad, 0xd6, 0x70, 0xc3, 0x38, - 0xe6, 0x13, 0xe6, 0xc0, 0xd9, 0x3d, 0xb6, 0x18, 0x62, 0x9f, 0x05, 0x2d, 0x86, 0x78, 0x33, 0x72, - 0xfb, 0x6f, 0xae, 0xb1, 0x2e, 0xef, 0x84, 0x54, 0xab, 0x16, 0x0e, 0x3f, 0xb0, 0xbe, 0x4b, 0x2c, - 0x0b, 0xbb, 0x4f, 0xdb, 0xeb, 0xc7, 0x30, 0x55, 0xc7, 0xae, 0x6d, 0x7a, 0x1e, 0x1b, 0x26, 0xb3, - 0xde, 0x87, 0xf9, 0xfe, 0xfa, 0xd6, 0x37, 0xda, 0x1a, 0xb0, 0x9d, 0x86, 0x5f, 0xfb, 0xf0, 0x6e, - 0x04, 0xe7, 0x9d, 0x92, 0x9a, 0xaf, 0xa7, 0x28, 0xb4, 0x08, 0x0b, 0xdb, 0xce, 0x60, 0xde, 0x1b, - 0x2c, 0xcb, 0xaf, 0xa6, 0xbd, 0xb7, 0x26, 0xf4, 0x9e, 0xd0, 0x74, 0x45, 0x61, 0xb5, 0xb9, 0x70, - 0x2f, 0xf2, 0xdd, 0xd7, 0x39, 0x36, 0x1d, 0xe6, 0x4f, 0x3a, 0xac, 0xca, 0xee, 0x22, 0x17, 0xd9, - 0xde, 0x95, 0x93, 0x50, 0x07, 0xf7, 0x75, 0x18, 0x55, 0xf5, 0x67, 0x8f, 0xaa, 0x5e, 0x6b, 0x0f, - 0xd8, 0x17, 0x3a, 0x04, 0x6c, 0xd2, 0x0c, 0x65, 0x19, 0x8a, 0x19, 0x5b, 0xa1, 0x17, 0xd6, 0x36, - 0x60, 0x56, 0x78, 0x57, 0xd2, 0x28, 0x0c, 0xbe, 0xa1, 0xee, 0xbc, 0x75, 0x92, 0xef, 0x93, 0x00, - 0x86, 0xd4, 0x83, 0x77, 0xdf, 0x7e, 0xf3, 0x20, 0x9f, 0xdb, 0xfa, 0x44, 0x82, 0xfe, 0x23, 0xaf, - 0x2a, 0xbd, 0x07, 0x63, 0xf1, 0x5f, 0x4f, 0x8a, 0x6d, 0x2f, 0x20, 0xf9, 0x9b, 0x8e, 0xfc, 0xcd, - 0x2e, 0x80, 0xe8, 0x47, 0x8b, 0x1f, 0xc3, 0xf5, 0xd4, 0x2f, 0x33, 0x8a, 0xf0, 0x68, 0x02, 0x23, - 0xaf, 0x75, 0xc7, 0x44, 0x12, 0xde, 0x83, 0xb1, 0xf8, 0xd8, 0x5f, 0xa8, 0x7a, 0x0c, 0x20, 0x56, - 0x5d, 0x30, 0x69, 0x97, 0xee, 0x41, 0xbe, 0x6d, 0xca, 0x7e, 0x4b, 0x7c, 0x38, 0x89, 0x92, 0x5f, - 0xea, 0x05, 0x15, 0xc9, 0x69, 0xc2, 0x8d, 0x8c, 0xe1, 0xa2, 0xd0, 0x0d, 0x62, 0xac, 0xbc, 0xd5, - 0x3b, 0x36, 0x92, 0x4c, 0x60, 0x5a, 0x34, 0xe1, 0xcb, 0xf0, 0x50, 0x1b, 0x50, 0x2e, 0xf5, 0x08, - 0x8c, 0x04, 0x7e, 0x00, 0x13, 0xc9, 0xf1, 0xdb, 0xb2, 0x88, 0x43, 0x02, 0x22, 0xbf, 0xd0, 0x15, - 0x12, 0xb1, 0x3f, 0x83, 0x59, 0xe1, 0x10, 0x27, 0xc3, 0x91, 0xc2, 0x79, 0x4f, 0x86, 0x23, 0x3b, - 0xce, 0x86, 0x24, 0x1d, 0x26, 0xd3, 0x73, 0xa1, 0x15, 0x11, 0x9b, 0x14, 0x48, 0x7e, 0xb1, 0x07, - 0x50, 0x24, 0xe4, 0x23, 0x28, 0x64, 0x0e, 0x69, 0x32, 0x5e, 0x9c, 0x18, 0x2d, 0xdf, 0xbe, 0x0c, - 0x3a, 0x92, 0xff, 0xcb, 0x1c, 0x2c, 0x74, 0x9e, 0x8f, 0x6c, 0x8a, 0xf8, 0x76, 0x3c, 0x22, 0xbf, - 0x72, 0xe9, 0x23, 0xf1, 0xd7, 0x2b, 0x9a, 0x64, 0x08, 0x5f, 0xaf, 0x00, 0x28, 0x7e, 0xbd, 0x1d, - 0xe6, 0x0e, 0xd2, 0xfb, 0x30, 0x9e, 0xf8, 0x25, 0x75, 0x49, 0x1c, 0x72, 0x2d, 0x84, 0xbc, 0xda, - 0x0d, 0x11, 0xf1, 0xfe, 0x75, 0x0e, 0x8a, 0xdd, 0xfe, 0x5b, 0xc6, 0x76, 0xb6, 0xaf, 0x32, 0x0f, - 0xc9, 0xaf, 0x5e, 0xe1, 0x50, 0x3c, 0x7b, 0xa7, 0xc6, 0x2c, 0x4a, 0xc6, 0xd3, 0x89, 0x61, 0xc4, - 0xd9, 0x5b, 0x3c, 0x2e, 0xa1, 0x49, 0xb6, 0x6d, 0x54, 0x22, 0x4c, 0xb2, 0x69, 0x94, 0x38, 0xc9, - 0x66, 0xb5, 0x62, 0x54, 0x4e, 0x5b, 0x1b, 0x76, 0x2b, 0x3b, 0xfa, 0xba, 0xc9, 0xc9, 0xea, 0x83, - 0xa8, 0x9c, 0xb6, 0x1e, 0xe8, 0x56, 0xf6, 0x15, 0x74, 0x93, 0x93, 0x55, 0xa1, 0xd3, 0x8f, 0x46, - 0x46, 0x75, 0x2e, 0xf4, 0xbe, 0x18, 0x2b, 0xce, 0x75, 0x9d, 0x8b, 0x54, 0xa9, 0x01, 0xb3, 0xe2, - 0x02, 0x55, 0x98, 0xa8, 0x85, 0x50, 0x79, 0xb3, 0x67, 0x68, 0x24, 0xd6, 0x85, 0x19, 0x61, 0x6d, - 0xb7, 0x9a, 0xed, 0xb6, 0x24, 0x52, 0xfe, 0x56, 0xaf, 0xc8, 0x50, 0xa6, 0x3c, 0xf8, 0xd3, 0xc7, - 0x0f, 0xd6, 0x72, 0xbb, 0x77, 0x3e, 0x7b, 0xb8, 0x98, 0xfb, 0xe2, 0xe1, 0x62, 0xee, 0xeb, 0x87, - 0x8b, 0xb9, 0x5f, 0x3d, 0x5a, 0xec, 0xfb, 0xe2, 0xd1, 0x62, 0xdf, 0xdf, 0x1f, 0x2d, 0xf6, 0xbd, - 0xbf, 0x55, 0x35, 0xfd, 0x5a, 0xa3, 0xb2, 0xa1, 0x13, 0xbb, 0x64, 0x9b, 0xd6, 0xfd, 0xf3, 0x33, - 0x74, 0xbe, 0x6e, 0xa1, 0x8a, 0x17, 0xad, 0xe2, 0x75, 0x9d, 0x7f, 0x5e, 0xc7, 0x5e, 0x65, 0x88, - 0xfd, 0x57, 0xac, 0xed, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x30, 0x27, 0xbb, 0x86, 0x55, 0x26, - 0x00, 0x00, + // 2622 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x5a, 0xdf, 0x6b, 0xe4, 0xd6, + 0xf5, 0xf7, 0xac, 0x7f, 0x1f, 0xdb, 0xeb, 0xb1, 0x6c, 0xaf, 0xc7, 0xb3, 0xb1, 0xc7, 0x96, 0x37, + 0xdf, 0xaf, 0xe3, 0x64, 0x3d, 0xb5, 0x77, 0xd3, 0x36, 0x93, 0x34, 0xd4, 0xbf, 0x9a, 0xba, 0x59, + 0x27, 0x8b, 0xec, 0x24, 0x10, 0x08, 0xea, 0x1d, 0xe9, 0x66, 0x46, 0xac, 0xa4, 0x3b, 0x95, 0x34, + 0xf6, 0x38, 0x0f, 0xa1, 0xf4, 0xa9, 0x14, 0x0a, 0x85, 0xd2, 0xf7, 0x90, 0xa7, 0x52, 0x0a, 0x0d, + 0x34, 0xb4, 0xd0, 0xfe, 0x03, 0x09, 0xa5, 0x34, 0xe4, 0xa9, 0x94, 0xe2, 0x84, 0xe4, 0x21, 0xa5, + 0x8f, 0xfb, 0xdc, 0x87, 0x72, 0x7f, 0x48, 0x23, 0x69, 0xae, 0x66, 0xc6, 0xce, 0x2e, 0xf4, 0xc5, + 0xb6, 0xce, 0x3d, 0xf7, 0x9c, 0xf3, 0x39, 0xf7, 0x9e, 0xa3, 0x73, 0x8e, 0x0c, 0x05, 0x3f, 0xf0, + 0x2c, 0x13, 0x97, 0xfd, 0x00, 0x3d, 0xc0, 0x56, 0xd5, 0x28, 0x07, 0xad, 0xcd, 0x86, 0x47, 0x02, + 0xa2, 0x4c, 0xf3, 0x95, 0xcd, 0x70, 0xa5, 0x58, 0x4a, 0xb3, 0x9e, 0x22, 0xdb, 0x32, 0x51, 0x40, + 0x3c, 0xbe, 0xa3, 0x38, 0x57, 0x23, 0x35, 0xc2, 0xfe, 0x2c, 0xd3, 0xbf, 0x04, 0x75, 0xd1, 0x20, + 0xbe, 0x43, 0x7c, 0x9d, 0x2f, 0xf0, 0x07, 0xb1, 0xb4, 0xcc, 0x9f, 0xca, 0x55, 0xe4, 0xe3, 0xf2, + 0xe9, 0x56, 0x15, 0x07, 0x68, 0xab, 0x6c, 0x10, 0xcb, 0x15, 0xeb, 0x0b, 0x62, 0xdd, 0xf1, 0x6b, + 0xe5, 0xd3, 0x2d, 0xfa, 0x4b, 0x2c, 0xcc, 0x20, 0xc7, 0x72, 0x49, 0x99, 0xfd, 0x14, 0xa4, 0x27, + 0xd2, 0xd6, 0x35, 0x90, 0x87, 0x1c, 0xa1, 0x49, 0xfd, 0xcf, 0x35, 0x50, 0x8f, 0xfc, 0xda, 0x6b, + 0x0d, 0x13, 0x05, 0xf8, 0xd0, 0x75, 0xb1, 0xa7, 0x61, 0x13, 0x3b, 0x8d, 0xc0, 0x22, 0xae, 0x86, + 0x02, 0xbc, 0x4b, 0x9a, 0xae, 0xe9, 0x2b, 0x05, 0x18, 0x35, 0x3c, 0x4c, 0x21, 0x15, 0x72, 0x2b, + 0xb9, 0xf5, 0x71, 0x2d, 0x7c, 0x54, 0x16, 0x61, 0xcc, 0xa8, 0x23, 0xcb, 0xd5, 0x2d, 0xb3, 0x70, + 0x4d, 0x2c, 0xd1, 0xe7, 0x43, 0x53, 0xb1, 0x61, 0xd1, 0xa1, 0x0b, 0x54, 0xaa, 0xee, 0x45, 0x62, + 0x75, 0x0f, 0x05, 0xb8, 0x30, 0x48, 0x79, 0x77, 0xb7, 0x3e, 0xba, 0x28, 0x0d, 0xfc, 0xe3, 0xa2, + 0x74, 0x93, 0x03, 0xf2, 0xcd, 0x07, 0x9b, 0x16, 0x29, 0x3b, 0x28, 0xa8, 0x6f, 0xde, 0xc3, 0x35, + 0x64, 0x9c, 0xef, 0x63, 0xe3, 0xd3, 0x0f, 0x6f, 0x83, 0xf0, 0xce, 0x3e, 0x36, 0xb4, 0x1b, 0x8e, + 0xe5, 0x4a, 0x0c, 0x65, 0xda, 0x50, 0x2b, 0x43, 0xdb, 0xd0, 0xd5, 0xb5, 0xa1, 0x96, 0x44, 0x5b, + 0xe5, 0xe0, 0x27, 0x5f, 0x7d, 0xb0, 0x11, 0x3a, 0xe1, 0x67, 0x5f, 0x7d, 0xb0, 0x71, 0x57, 0xb8, + 0xb9, 0xd5, 0x76, 0x74, 0x6f, 0xbf, 0xaa, 0xcf, 0xc0, 0x46, 0x6f, 0x2e, 0x0d, 0xfb, 0x0d, 0xe2, + 0xfa, 0x58, 0xfd, 0x7d, 0x0e, 0xae, 0x1f, 0xf9, 0xb5, 0x7b, 0xd6, 0x8f, 0x9a, 0x96, 0x79, 0x4c, + 0xd5, 0x74, 0x39, 0x98, 0x67, 0x61, 0x04, 0x39, 0xa4, 0xe9, 0x06, 0xfc, 0x58, 0x76, 0x97, 0x04, + 0xf8, 0xf9, 0x4e, 0xf0, 0x87, 0x6e, 0xa0, 0x09, 0x66, 0x65, 0x09, 0xa0, 0x4e, 0xfc, 0x40, 0x37, + 0xb1, 0x4b, 0x1c, 0x7e, 0x4a, 0xda, 0x38, 0xa5, 0xec, 0x53, 0x42, 0x65, 0x2b, 0x8d, 0x7b, 0x45, + 0x8a, 0x3b, 0x66, 0xa2, 0x4a, 0xe0, 0x46, 0x92, 0x12, 0xe2, 0x51, 0x5e, 0x83, 0x31, 0x3f, 0xd0, + 0x03, 0xf2, 0x00, 0xbb, 0xcc, 0xfa, 0x89, 0xed, 0xc5, 0x4d, 0xe1, 0x7b, 0x7a, 0xf3, 0x37, 0xc5, + 0xcd, 0xdf, 0xdc, 0x23, 0x96, 0xbb, 0x5b, 0xa2, 0xf6, 0xff, 0xe6, 0xb3, 0xd2, 0x42, 0xa7, 0xfd, + 0x74, 0xdd, 0xd7, 0x46, 0xfd, 0xe0, 0x84, 0x8a, 0x52, 0x3f, 0xce, 0xc1, 0x0c, 0xd5, 0x78, 0x7c, + 0xf4, 0x58, 0x3d, 0x75, 0x1b, 0x66, 0x6d, 0xdf, 0xe1, 0xe6, 0xeb, 0x56, 0xd5, 0x48, 0xb8, 0x2c, + 0x6f, 0xfb, 0x0e, 0xb3, 0xe6, 0xb0, 0x6a, 0x70, 0xcf, 0xdd, 0x4d, 0x7b, 0x6e, 0x4d, 0xee, 0xb9, + 0x84, 0xd5, 0xea, 0x2b, 0xb0, 0xd8, 0x41, 0x8c, 0xfc, 0xb7, 0x05, 0x73, 0x81, 0x87, 0x5c, 0x1f, + 0x19, 0xec, 0xa6, 0x1b, 0xc4, 0x69, 0xd8, 0x38, 0xc0, 0x0c, 0xdf, 0x98, 0x36, 0x1b, 0x5b, 0xdb, + 0x13, 0x4b, 0xea, 0x5f, 0x72, 0x30, 0x7d, 0xe4, 0xd7, 0xf6, 0x6c, 0x8c, 0xbc, 0x5d, 0x64, 0x23, + 0xd7, 0xc0, 0x57, 0x0b, 0xee, 0xb6, 0xd3, 0x06, 0x2f, 0xe3, 0x34, 0xaa, 0xab, 0x8e, 0x5c, 0x17, + 0xdb, 0x3c, 0x26, 0xb5, 0xf0, 0xb1, 0xb2, 0x9d, 0xf6, 0xcf, 0xaa, 0xd4, 0x3f, 0x71, 0xcb, 0xd5, + 0x45, 0x58, 0x48, 0x91, 0xa2, 0x58, 0xf9, 0x2b, 0x8f, 0x15, 0x1a, 0x4f, 0xd8, 0x79, 0x4c, 0x37, + 0xe0, 0x26, 0xb0, 0xc8, 0xd0, 0xdf, 0x21, 0xae, 0x48, 0x68, 0xda, 0x18, 0x25, 0xbc, 0x49, 0x5c, + 0xac, 0x14, 0x61, 0xcc, 0xc3, 0x06, 0xb6, 0x4e, 0xb1, 0x27, 0xa0, 0x46, 0xcf, 0xfd, 0x46, 0x51, + 0xcc, 0x78, 0xb5, 0xc0, 0xa2, 0x28, 0x46, 0x89, 0x90, 0xfe, 0x6d, 0x04, 0x66, 0xd9, 0x52, 0xcd, + 0xf2, 0x03, 0xec, 0x7d, 0x3f, 0x34, 0xe0, 0x3b, 0x30, 0x65, 0x10, 0xd7, 0xc5, 0xfc, 0x72, 0x84, + 0x27, 0xb8, 0x5b, 0x78, 0x78, 0x51, 0x9a, 0x3b, 0x47, 0x8e, 0x5d, 0x51, 0x13, 0xcb, 0xaa, 0x36, + 0xd9, 0x7e, 0x3e, 0x34, 0x15, 0x15, 0x26, 0xab, 0xd8, 0xa8, 0xdf, 0xd9, 0x6e, 0x78, 0xf8, 0x6d, + 0xab, 0x55, 0x98, 0x64, 0x18, 0x12, 0x34, 0xe5, 0x6e, 0x22, 0x59, 0xf0, 0x24, 0x3b, 0xff, 0xf0, + 0xa2, 0x34, 0xc3, 0xe5, 0xb7, 0xd7, 0xd4, 0x58, 0x0e, 0x51, 0xb6, 0x60, 0xbc, 0x1d, 0x2e, 0xc3, + 0x6c, 0xd3, 0xdc, 0xc3, 0x8b, 0x52, 0x9e, 0x6f, 0x8a, 0x96, 0x54, 0x6d, 0xcc, 0x12, 0xc1, 0x13, + 0x3f, 0xba, 0x91, 0xe4, 0xd1, 0xbd, 0x02, 0xfc, 0x9e, 0xbf, 0x8d, 0x3d, 0x5d, 0x5c, 0x25, 0x8a, + 0x15, 0x98, 0xd8, 0xe5, 0x87, 0x17, 0xa5, 0x22, 0x17, 0x2b, 0x61, 0x52, 0xb5, 0x99, 0x90, 0xba, + 0xc7, 0x89, 0x87, 0xa6, 0xf2, 0x3d, 0xc8, 0x37, 0xdd, 0x2a, 0x71, 0x4d, 0xcb, 0xad, 0xe9, 0x0d, + 0xec, 0x59, 0xc4, 0x2c, 0x4c, 0xac, 0xe4, 0xd6, 0x87, 0x76, 0x6f, 0x3e, 0xbc, 0x28, 0x2d, 0x70, + 0x61, 0x69, 0x0e, 0x55, 0x9b, 0x8e, 0x48, 0xf7, 0x19, 0x45, 0x41, 0x30, 0x4b, 0x5f, 0x7e, 0xe9, + 0x17, 0xd1, 0xd4, 0x55, 0x5f, 0x44, 0x33, 0x8e, 0xe5, 0xa6, 0xde, 0x78, 0x54, 0x05, 0x6a, 0x75, + 0xa8, 0xb8, 0x7e, 0x75, 0x15, 0xa8, 0x95, 0x52, 0xf1, 0x2d, 0x28, 0xd0, 0x1c, 0x67, 0xb3, 0xe4, + 0xa3, 0xb3, 0xbb, 0xa9, 0x63, 0x17, 0x55, 0x6d, 0x6c, 0x16, 0xa6, 0x59, 0x96, 0x99, 0xb7, 0x7d, + 0x27, 0x96, 0x9b, 0x0e, 0xf8, 0xa2, 0x72, 0x00, 0x25, 0x83, 0x38, 0x4e, 0xd3, 0xb5, 0x82, 0x73, + 0xbd, 0x41, 0x88, 0xad, 0x07, 0x1e, 0x46, 0x7e, 0xd3, 0x3b, 0xd7, 0x91, 0x69, 0x7a, 0xd8, 0xf7, + 0x0b, 0x79, 0x76, 0x90, 0x4f, 0x44, 0x6c, 0xf7, 0x09, 0xb1, 0x4f, 0x04, 0xd3, 0x0e, 0xe7, 0x51, + 0xee, 0xc2, 0x02, 0x85, 0xe8, 0x60, 0xdf, 0x47, 0x35, 0xec, 0x53, 0x77, 0xeb, 0x96, 0x81, 0xf4, + 0xa0, 0x55, 0x98, 0xa1, 0x87, 0xa2, 0x51, 0x0f, 0x1c, 0x89, 0xd5, 0xfb, 0xd8, 0x3b, 0x34, 0xd0, + 0x49, 0xab, 0xf2, 0xe2, 0x4f, 0xdf, 0x2b, 0x0d, 0xfc, 0xeb, 0xbd, 0xd2, 0x40, 0x3a, 0xcc, 0x9e, + 0xcc, 0x08, 0xb3, 0x64, 0xe4, 0xa8, 0x4b, 0x70, 0x53, 0x42, 0x8e, 0xa7, 0x96, 0x45, 0x96, 0x76, + 0x90, 0xe5, 0xbc, 0xe6, 0x9a, 0xd8, 0xc6, 0x35, 0x14, 0x60, 0x93, 0xa5, 0xfb, 0x6e, 0xa5, 0xd2, + 0x0a, 0x4c, 0x46, 0xe9, 0xa2, 0x9d, 0x51, 0x21, 0xcc, 0x18, 0x87, 0xa6, 0x32, 0x07, 0xc3, 0xb8, + 0x41, 0x8c, 0x3a, 0x4b, 0x26, 0x43, 0x1a, 0x7f, 0x48, 0x64, 0x92, 0xe1, 0x54, 0x26, 0x79, 0x21, + 0x0d, 0xf1, 0xe9, 0x8c, 0xac, 0x29, 0xb3, 0xf5, 0x07, 0x43, 0x63, 0x43, 0xf9, 0x61, 0x75, 0x0d, + 0x56, 0x33, 0x59, 0x22, 0xd0, 0xbf, 0xcb, 0x89, 0x04, 0x54, 0xe5, 0x89, 0xf6, 0xf5, 0xb0, 0xc6, + 0xed, 0x86, 0x38, 0x91, 0x20, 0xaf, 0xa5, 0x12, 0xe4, 0x1a, 0x4c, 0xb9, 0x4d, 0x47, 0xf7, 0x42, + 0x89, 0x02, 0xf4, 0xa4, 0xdb, 0x74, 0x22, 0x2d, 0x95, 0xe7, 0xd2, 0xf8, 0xd6, 0x33, 0x8e, 0xb0, + 0xc3, 0x2c, 0x75, 0x05, 0x96, 0xe5, 0x2b, 0x11, 0xa6, 0x3f, 0xe5, 0x20, 0x7f, 0xe4, 0xd7, 0x76, + 0x4c, 0xf3, 0xeb, 0xa3, 0xa9, 0x00, 0x44, 0x65, 0xbf, 0x5f, 0x18, 0x5c, 0x19, 0x5c, 0x9f, 0xd8, + 0x2e, 0x6e, 0xa6, 0x5a, 0x85, 0xcd, 0x48, 0x8f, 0x16, 0xe3, 0xae, 0xdc, 0x49, 0x83, 0x54, 0xa5, + 0x20, 0x13, 0x76, 0xaa, 0x45, 0x28, 0xa4, 0x69, 0x11, 0xb0, 0xb7, 0x60, 0x3a, 0xa2, 0xbe, 0x81, + 0xad, 0x5a, 0x3d, 0x50, 0xb6, 0x61, 0x34, 0x0c, 0xbc, 0x1c, 0x7f, 0x0f, 0x7c, 0xfa, 0xe1, 0xed, + 0x39, 0x11, 0xfd, 0x22, 0xdc, 0x8e, 0x03, 0xcf, 0x72, 0x6b, 0x5a, 0xc8, 0xa8, 0xdc, 0x80, 0x91, + 0x33, 0xb6, 0x9b, 0xa1, 0x1d, 0xd2, 0xc4, 0x93, 0xfa, 0x99, 0x08, 0x80, 0x3a, 0x72, 0x6b, 0x38, + 0xa5, 0xe8, 0xca, 0x0e, 0x3c, 0x82, 0x99, 0xc8, 0x25, 0x3a, 0x57, 0x14, 0xfa, 0x71, 0x25, 0xdb, + 0x8f, 0x5c, 0xa9, 0x96, 0x3f, 0x4d, 0x59, 0xd1, 0x77, 0x60, 0x48, 0x31, 0x84, 0x21, 0x21, 0x5d, + 0x8c, 0xbc, 0xfc, 0xc7, 0x1c, 0x28, 0x47, 0x7e, 0x6d, 0x1f, 0xd3, 0xca, 0x2a, 0xe2, 0xba, 0x2a, + 0xfe, 0x3b, 0x30, 0x76, 0x8a, 0x6c, 0x96, 0x1d, 0x45, 0x49, 0xd5, 0xe5, 0x84, 0x4e, 0x91, 0x4d, + 0x29, 0x95, 0x67, 0xd3, 0x28, 0x6f, 0x49, 0x51, 0xa6, 0x4c, 0x54, 0x9f, 0x80, 0x62, 0x27, 0x35, + 0xc2, 0xf5, 0xcf, 0x9c, 0xc8, 0x7f, 0x7e, 0x40, 0x3c, 0x7c, 0xe8, 0x06, 0xd8, 0x63, 0x55, 0xdf, + 0x8e, 0x61, 0x44, 0x35, 0xdc, 0xa5, 0xeb, 0xc5, 0xb5, 0x74, 0x35, 0xc2, 0xeb, 0xa5, 0x64, 0xcd, + 0xb1, 0x06, 0x53, 0x88, 0x2b, 0xd1, 0xc9, 0x99, 0x1b, 0x15, 0x4e, 0x93, 0x82, 0xf8, 0x2a, 0xa5, + 0x55, 0x5e, 0x4c, 0x63, 0xbe, 0x9d, 0x91, 0x12, 0xe4, 0xe6, 0xab, 0x4f, 0xc2, 0x5a, 0x97, 0xe5, + 0xc8, 0x0b, 0x7f, 0xc8, 0xc1, 0x4a, 0xd4, 0x9b, 0x45, 0x4e, 0x3a, 0xae, 0x23, 0x0f, 0xfb, 0x07, + 0x2d, 0xa3, 0xce, 0xde, 0x8f, 0x57, 0x72, 0x45, 0x01, 0xe8, 0xf9, 0x91, 0x06, 0x16, 0x07, 0xad, + 0x85, 0x8f, 0x95, 0xbd, 0x34, 0xb4, 0xed, 0x2e, 0x5d, 0x65, 0x86, 0x4d, 0xea, 0x06, 0xac, 0xf7, + 0xe2, 0x89, 0x40, 0xbe, 0xcf, 0xb3, 0xfa, 0x1e, 0xb2, 0xad, 0x2a, 0x2d, 0x1e, 0xf6, 0x79, 0xf6, + 0xb7, 0x88, 0xfb, 0xa8, 0xa1, 0xf5, 0x99, 0xc8, 0x25, 0x96, 0x88, 0x44, 0x2e, 0x59, 0x89, 0x60, + 0xbc, 0xcb, 0x1a, 0x3e, 0x0d, 0xfb, 0x4d, 0x07, 0x47, 0xf5, 0xef, 0x55, 0x00, 0xf4, 0xdb, 0xa5, + 0x25, 0x55, 0xa9, 0x37, 0x59, 0x3e, 0x4c, 0x12, 0x23, 0xe3, 0xfe, 0x3d, 0xca, 0xea, 0xf3, 0x3d, + 0x2a, 0x13, 0x9f, 0x78, 0xc8, 0xc4, 0x1a, 0x69, 0x06, 0x58, 0xf9, 0x26, 0x8c, 0xa3, 0x66, 0x50, + 0x27, 0x9e, 0x15, 0x9c, 0xf7, 0xcc, 0xc9, 0x6d, 0x56, 0x45, 0x85, 0x29, 0x96, 0x45, 0x52, 0x10, + 0x26, 0x28, 0x71, 0x4f, 0x9c, 0xc3, 0x2e, 0x2c, 0x73, 0xbb, 0xf5, 0x80, 0xe8, 0x1e, 0x3e, 0x43, + 0x9e, 0xa9, 0xcb, 0xc2, 0xaf, 0xc8, 0xb9, 0x4e, 0x88, 0xc6, 0x78, 0xf6, 0xe2, 0xc1, 0xf8, 0x5d, + 0x58, 0x6a, 0xcb, 0x08, 0xa8, 0xdd, 0x29, 0x11, 0x3c, 0x38, 0x17, 0x43, 0x11, 0x0c, 0x5a, 0x42, + 0xc2, 0x21, 0xf0, 0x16, 0xa0, 0x6d, 0x83, 0xac, 0x54, 0xe7, 0x25, 0xcd, 0x12, 0xe5, 0x0c, 0xed, + 0x38, 0xe9, 0x28, 0xcb, 0x5f, 0x86, 0xb5, 0x50, 0x44, 0x68, 0x8c, 0x4c, 0x16, 0x6f, 0x0e, 0x96, + 0x39, 0xab, 0x30, 0xa9, 0x53, 0xd8, 0x4b, 0xb0, 0x2a, 0x44, 0x10, 0x9d, 0x1b, 0x28, 0x11, 0x35, + 0xca, 0xcb, 0x53, 0xc6, 0x78, 0x42, 0xe8, 0xa9, 0x76, 0x0a, 0x2a, 0xc3, 0x9c, 0xb0, 0x8a, 0x75, + 0x2c, 0x3a, 0x71, 0x99, 0xbc, 0xc2, 0x18, 0xdb, 0x3b, 0xc3, 0xd7, 0x58, 0x07, 0xf3, 0xaa, 0x4b, + 0x25, 0x28, 0x77, 0xe0, 0x46, 0x7a, 0x03, 0x7f, 0x2e, 0x8c, 0xb3, 0x2d, 0xb3, 0x89, 0x2d, 0xdc, + 0x19, 0xca, 0x16, 0xcc, 0xa7, 0x37, 0x31, 0xab, 0x78, 0x93, 0xa3, 0x29, 0x89, 0x3d, 0x0c, 0xb2, + 0x72, 0x1b, 0x66, 0xdb, 0xcd, 0x57, 0x7b, 0xc3, 0x04, 0x9f, 0x4d, 0x44, 0xad, 0x58, 0xc8, 0xfe, + 0x34, 0x28, 0x49, 0x76, 0x86, 0x82, 0x77, 0x7c, 0xd3, 0x31, 0x6e, 0x86, 0x61, 0x01, 0x46, 0x59, + 0x41, 0x6f, 0x99, 0xac, 0x9b, 0x19, 0xd2, 0x46, 0xe8, 0xe3, 0xa1, 0xa9, 0x54, 0xa0, 0x48, 0x8b, + 0x75, 0x64, 0xdb, 0xe4, 0x0c, 0x9b, 0xba, 0x7f, 0x86, 0x1a, 0xba, 0x4d, 0x7c, 0x3f, 0xd6, 0x96, + 0xb0, 0x79, 0xda, 0x0e, 0x67, 0x38, 0x3e, 0x43, 0x8d, 0x7b, 0xc4, 0xf7, 0x59, 0x22, 0x3d, 0x80, + 0x69, 0xda, 0x2e, 0xb1, 0x3d, 0xa2, 0x15, 0x9f, 0xee, 0xa7, 0x15, 0x9f, 0x72, 0x2c, 0x97, 0x0a, + 0xda, 0xe1, 0x1d, 0x39, 0x15, 0x83, 0x5a, 0x09, 0x31, 0xf9, 0xfe, 0xc4, 0xa0, 0x56, 0x5b, 0x4c, + 0xe5, 0xdb, 0x34, 0x0b, 0xb4, 0x43, 0x2e, 0xbb, 0x75, 0x48, 0x07, 0xb5, 0x68, 0x1d, 0xd2, 0xe4, + 0x28, 0x17, 0x7c, 0x9c, 0x63, 0xb9, 0x80, 0xbf, 0x79, 0x1f, 0x41, 0x2e, 0x58, 0x85, 0xc9, 0xf8, + 0xd5, 0x08, 0x53, 0x41, 0xec, 0x46, 0xf4, 0x1a, 0xe8, 0xf5, 0x0d, 0x35, 0x6d, 0xb3, 0x80, 0x9a, + 0x26, 0x47, 0x50, 0x7f, 0x3b, 0xc8, 0xa0, 0xf2, 0xf7, 0xd0, 0xff, 0x02, 0xd4, 0xf8, 0xc5, 0x1d, + 0xba, 0xc4, 0xc5, 0x1d, 0xbe, 0xec, 0xc5, 0x1d, 0x79, 0x34, 0x17, 0x77, 0xf4, 0x71, 0x5e, 0xdc, + 0xf4, 0xb1, 0x88, 0xd3, 0x4c, 0x93, 0xdb, 0x43, 0xa6, 0x6b, 0xec, 0x15, 0x77, 0x8c, 0x83, 0xbd, + 0x78, 0xbf, 0x4e, 0xbb, 0xab, 0x00, 0xd3, 0xe6, 0x22, 0xf1, 0xaa, 0xed, 0x56, 0xba, 0xf6, 0x51, + 0x45, 0xec, 0xc3, 0x84, 0xc7, 0x04, 0xc7, 0x3f, 0x15, 0xac, 0xf5, 0x31, 0xd0, 0xd0, 0x80, 0xef, + 0x63, 0x27, 0xa3, 0xc3, 0x52, 0x7c, 0x6e, 0x41, 0x7f, 0x89, 0x61, 0xad, 0x70, 0xf0, 0x50, 0x3f, + 0x0e, 0x5e, 0xb4, 0xdb, 0xc3, 0x0d, 0xf3, 0x98, 0x4f, 0x98, 0x85, 0xb3, 0xfb, 0x6c, 0x31, 0xe4, + 0x3e, 0x13, 0x2d, 0x86, 0x7c, 0x31, 0x72, 0xfb, 0xaf, 0xae, 0xb1, 0x2e, 0xef, 0x84, 0xd4, 0x6a, + 0x36, 0x0e, 0x5f, 0xb0, 0x81, 0x47, 0x6c, 0x1b, 0x7b, 0x8f, 0xda, 0xeb, 0xc7, 0x30, 0xd3, 0xc0, + 0x9e, 0x63, 0xf9, 0x3e, 0x1b, 0x26, 0xb3, 0xde, 0x87, 0xf9, 0xfe, 0xfa, 0xf6, 0xff, 0x75, 0x34, + 0x60, 0x3b, 0xcd, 0xa0, 0xfe, 0xce, 0xfd, 0x88, 0x9d, 0x77, 0x4a, 0x5a, 0xbe, 0x91, 0xa2, 0xd0, + 0x22, 0x2c, 0x6c, 0x3b, 0xc5, 0xbc, 0x57, 0x3c, 0x56, 0x9e, 0x4f, 0x7b, 0x6f, 0x43, 0xea, 0x3d, + 0x29, 0x74, 0x55, 0x65, 0xb5, 0xb9, 0x74, 0x2d, 0xf2, 0xdd, 0xe7, 0x39, 0x36, 0x1d, 0xe6, 0x57, + 0x3a, 0xac, 0xca, 0xee, 0xb3, 0x8f, 0x5f, 0x57, 0x4e, 0x42, 0x5d, 0xdc, 0xd7, 0x65, 0x54, 0x35, + 0x98, 0x3d, 0xaa, 0x7a, 0xa1, 0x33, 0x60, 0x9f, 0xea, 0x12, 0xb0, 0x49, 0x18, 0xea, 0x2a, 0x94, + 0x32, 0x96, 0x22, 0x2f, 0xfc, 0x99, 0x0f, 0xfc, 0x39, 0xcf, 0xd7, 0x44, 0x5f, 0x81, 0x11, 0xfe, + 0xf1, 0x90, 0x61, 0x9f, 0xd8, 0x5e, 0xe8, 0xb8, 0x16, 0x5c, 0xc1, 0xee, 0x38, 0x8d, 0xa9, 0x5f, + 0x7f, 0xf5, 0xc1, 0x46, 0x4e, 0x13, 0x3b, 0x78, 0x61, 0x9d, 0x04, 0xba, 0xda, 0x05, 0xa8, 0x00, + 0xb8, 0x18, 0x3b, 0xc2, 0x24, 0xb0, 0x8d, 0x4d, 0x98, 0x97, 0x5e, 0x42, 0x65, 0x1c, 0x86, 0x5f, + 0xd2, 0x76, 0x5e, 0x39, 0xc9, 0x0f, 0x28, 0x00, 0x23, 0xda, 0xc1, 0xeb, 0xaf, 0xbe, 0x7c, 0x90, + 0xcf, 0x6d, 0xbf, 0xaf, 0xc0, 0xe0, 0x91, 0x5f, 0x53, 0xde, 0x80, 0x89, 0xf8, 0x67, 0xa1, 0x52, + 0x07, 0x86, 0xe4, 0xc7, 0xaa, 0xe2, 0xff, 0xf7, 0x60, 0x88, 0xbe, 0xc6, 0xfc, 0x10, 0xae, 0xa7, + 0x3e, 0x39, 0xa9, 0xd2, 0xad, 0x09, 0x9e, 0xe2, 0x46, 0x6f, 0x9e, 0x48, 0xc3, 0x1b, 0x30, 0x11, + 0xff, 0x9e, 0x21, 0x35, 0x3d, 0xc6, 0x20, 0x37, 0x5d, 0xf2, 0x09, 0x41, 0x79, 0x1b, 0xf2, 0x1d, + 0x9f, 0x0f, 0x6e, 0xc9, 0x37, 0x27, 0xb9, 0x8a, 0xcf, 0xf4, 0xc3, 0x15, 0xe9, 0x69, 0xc1, 0x8d, + 0x8c, 0xa9, 0xa9, 0xd4, 0x0d, 0x72, 0xde, 0xe2, 0x76, 0xff, 0xbc, 0x91, 0x66, 0x02, 0xb3, 0xb2, + 0xd1, 0x65, 0x86, 0x87, 0x3a, 0x18, 0x8b, 0xe5, 0x3e, 0x19, 0x23, 0x85, 0x6f, 0xc1, 0x54, 0x72, + 0xae, 0xb8, 0x2a, 0x93, 0x90, 0x60, 0x29, 0x3e, 0xd5, 0x93, 0x25, 0x12, 0x7f, 0x06, 0xf3, 0xd2, + 0xe9, 0x54, 0x86, 0x23, 0xa5, 0x83, 0xac, 0x0c, 0x47, 0x76, 0x1d, 0x7a, 0x29, 0x06, 0x4c, 0xa7, + 0x07, 0x5e, 0x6b, 0x32, 0x31, 0x29, 0xa6, 0xe2, 0xd3, 0x7d, 0x30, 0x45, 0x4a, 0xde, 0x85, 0x42, + 0xe6, 0xf4, 0x29, 0xe3, 0xc6, 0xc9, 0xb9, 0x8b, 0x77, 0x2f, 0xc3, 0x1d, 0xe9, 0xff, 0x79, 0x0e, + 0x96, 0xba, 0x0f, 0x7e, 0xb6, 0x64, 0x72, 0xbb, 0x6e, 0x29, 0x3e, 0x77, 0xe9, 0x2d, 0xf1, 0xdb, + 0x2b, 0x1b, 0xd1, 0x48, 0x6f, 0xaf, 0x84, 0x51, 0x7e, 0x7b, 0xbb, 0x0c, 0x54, 0x94, 0x37, 0x61, + 0x32, 0xf1, 0x89, 0x78, 0x45, 0x1e, 0x72, 0x6d, 0x8e, 0xe2, 0x7a, 0x2f, 0x8e, 0x48, 0xf6, 0x2f, + 0x73, 0x50, 0xea, 0xf5, 0xff, 0x26, 0x77, 0xb2, 0x7d, 0x95, 0xb9, 0xa9, 0xf8, 0xfc, 0x15, 0x36, + 0xc5, 0xb3, 0x77, 0x6a, 0x7e, 0xa4, 0x66, 0x5c, 0x9d, 0x18, 0x8f, 0x3c, 0x7b, 0xcb, 0xe7, 0x40, + 0x34, 0xc9, 0x76, 0xcc, 0x80, 0xa4, 0x49, 0x36, 0xcd, 0x25, 0x4f, 0xb2, 0x59, 0x3d, 0x26, 0xd5, + 0xd3, 0xd1, 0x5f, 0xde, 0xca, 0x8e, 0xbe, 0x5e, 0x7a, 0xb2, 0x1a, 0x3c, 0xaa, 0xa7, 0xa3, 0xb9, + 0xbb, 0x95, 0x7d, 0x04, 0xbd, 0xf4, 0x64, 0xb5, 0x1e, 0xf4, 0xa5, 0x91, 0xd1, 0x76, 0x48, 0xbd, + 0x2f, 0xe7, 0x95, 0xe7, 0xba, 0xee, 0xd5, 0xb7, 0xd2, 0x84, 0x79, 0x79, 0xe5, 0x2d, 0x4d, 0xd4, + 0x52, 0xd6, 0xe2, 0x56, 0xdf, 0xac, 0x91, 0x5a, 0x0f, 0xe6, 0xa4, 0x45, 0xeb, 0x7a, 0xb6, 0xdb, + 0x92, 0x9c, 0xc5, 0x6f, 0xf4, 0xcb, 0x19, 0xea, 0x2c, 0x0e, 0xff, 0x98, 0x56, 0x6b, 0xbb, 0xf7, + 0x3e, 0xfa, 0x62, 0x39, 0xf7, 0xc9, 0x17, 0xcb, 0xb9, 0xcf, 0xbf, 0x58, 0xce, 0xfd, 0xe2, 0xcb, + 0xe5, 0x81, 0x4f, 0xbe, 0x5c, 0x1e, 0xf8, 0xfb, 0x97, 0xcb, 0x03, 0x6f, 0x6e, 0xd7, 0xac, 0xa0, + 0xde, 0xac, 0x6e, 0x1a, 0xc4, 0x29, 0x3b, 0x96, 0xfd, 0xe0, 0xfc, 0x0c, 0x9d, 0xdf, 0xb6, 0x51, + 0xd5, 0x8f, 0x9e, 0xe2, 0x75, 0x5c, 0x70, 0xde, 0xc0, 0x7e, 0x75, 0x84, 0xfd, 0x8f, 0xd9, 0x9d, + 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x10, 0xa2, 0x94, 0x4c, 0x27, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5045,6 +5146,69 @@ func (m *MsgUpdateHostZoneParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int return len(dAtA) - i, nil } +func (m *MsgUpdateParams) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MsgUpdateParams) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUpdateParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + { + size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + if len(m.Authority) > 0 { + i -= len(m.Authority) + copy(dAtA[i:], m.Authority) + i = encodeVarintTx(dAtA, i, uint64(len(m.Authority))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgUpdateParamsResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MsgUpdateParamsResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUpdateParamsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + func encodeVarintTx(dAtA []byte, offset int, v uint64) int { offset -= sovTx(v) base := offset @@ -5802,6 +5966,30 @@ func (m *MsgUpdateHostZoneParamsResponse) Size() (n int) { return n } +func (m *MsgUpdateParams) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Authority) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + l = m.Params.Size() + n += 1 + l + sovTx(uint64(l)) + return n +} + +func (m *MsgUpdateParamsResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -11018,6 +11206,171 @@ func (m *MsgUpdateHostZoneParamsResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *MsgUpdateParams) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgUpdateParams: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUpdateParams: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Authority", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Authority = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Params", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Params.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MsgUpdateParamsResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgUpdateParamsResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUpdateParamsResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0