diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index 7b4ebcb080..a71a81b8ca 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -12,6 +12,7 @@ import "interchain_security/ccv/v1/wire.proto"; import "tendermint/crypto/keys.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/staking/v1beta1/staking.proto"; +import "cosmos/base/query/v1beta1/pagination.proto"; service Query { // ConsumerGenesis queries the genesis state needed to start a consumer chain @@ -28,7 +29,7 @@ service Query { rpc QueryConsumerChains(QueryConsumerChainsRequest) returns (QueryConsumerChainsResponse) { option (google.api.http).get = - "/interchain_security/ccv/provider/consumer_chains/{phase}/{limit}"; + "/interchain_security/ccv/provider/consumer_chains/{phase}"; } // QueryValidatorConsumerAddr queries the address @@ -158,12 +159,14 @@ message QueryConsumerChainsRequest { // The phase of the consumer chains returned (optional) // Registered=1|Initialized=2|Launched=3|Stopped=4|Deleted=5 ConsumerPhase phase = 1; - // The limit of consumer chains returned (optional) - // default is 100 - int32 limit = 2; + + cosmos.base.query.v1beta1.PageRequest pagination = 2; } -message QueryConsumerChainsResponse { repeated Chain chains = 1; } +message QueryConsumerChainsResponse { + repeated Chain chains = 1; + cosmos.base.query.v1beta1.PageResponse pagination = 2; +} message Chain { string chain_id = 1; @@ -372,10 +375,11 @@ message QueryConsumerChainRequest { } message QueryConsumerChainResponse { - string chain_id = 1; - string owner_address = 2; - string phase = 3; - ConsumerMetadata metadata = 4 [ (gogoproto.nullable) = false ]; - ConsumerInitializationParameters init_params = 5; - PowerShapingParameters power_shaping_params = 6; + string consumer_id = 1; + string chain_id = 2; + string owner_address = 3; + string phase = 4; + ConsumerMetadata metadata = 5 [ (gogoproto.nullable) = false ]; + ConsumerInitializationParameters init_params = 6; + PowerShapingParameters power_shaping_params = 7; } diff --git a/x/ccv/provider/client/cli/query.go b/x/ccv/provider/client/cli/query.go index 143cbb6d4a..ef4b398624 100644 --- a/x/ccv/provider/client/cli/query.go +++ b/x/ccv/provider/client/cli/query.go @@ -102,7 +102,7 @@ func CmdConsumerChains() *cobra.Command { if err != nil { return err } - req.Limit = int32(limit) + req.Pagination.Limit = uint64(limit) } res, err := queryClient.QueryConsumerChains(cmd.Context(), req) diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index cebc952d60..4da34a6c35 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -3,6 +3,7 @@ package keeper import ( "bytes" "context" + "encoding/binary" "fmt" "sort" @@ -10,8 +11,10 @@ import ( "google.golang.org/grpc/status" errorsmod "cosmossdk.io/errors" + "cosmossdk.io/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/query" "github.com/cosmos/interchain-security/v6/x/ccv/provider/types" ccvtypes "github.com/cosmos/interchain-security/v6/x/ccv/types" @@ -48,37 +51,35 @@ func (k Keeper) QueryConsumerChains(goCtx context.Context, req *types.QueryConsu } ctx := sdk.UnwrapSDKContext(goCtx) + var chains []*types.Chain - consumerIds := []string{} - for _, consumerID := range k.GetAllConsumerIds(ctx) { - phase := k.GetConsumerPhase(ctx, consumerID) - if req.Phase != types.CONSUMER_PHASE_UNSPECIFIED && req.Phase != phase { - // ignore consumer chain - continue + store := ctx.KVStore(k.storeKey) + storePrefix := types.ConsumerIdToPhaseKeyPrefix() + consumerPhaseStore := prefix.NewStore(store, []byte{storePrefix}) + pageRes, err := query.Paginate(consumerPhaseStore, req.Pagination, func(key, value []byte) error { + consumerId, err := types.ParseStringIdWithLenKey(storePrefix, append([]byte{storePrefix}, key...)) + if err != nil { + status.Error(codes.Internal, err.Error()) } - consumerIds = append(consumerIds, consumerID) - } - // set limit to default value - limit := 100 - if req.Limit != 0 { - // update limit if specified - limit = int(req.Limit) - } - if len(consumerIds) > limit { - consumerIds = consumerIds[:limit] - } + phase := types.ConsumerPhase(binary.BigEndian.Uint32(value)) + if req.Phase != types.CONSUMER_PHASE_UNSPECIFIED && req.Phase != phase { + return nil + } - chains := make([]*types.Chain, len(consumerIds)) - for i, cID := range consumerIds { - c, err := k.GetConsumerChain(ctx, cID) + c, err := k.GetConsumerChain(ctx, consumerId) if err != nil { - return nil, status.Error(codes.Internal, err.Error()) + return status.Error(codes.Internal, err.Error()) } - chains[i] = &c + chains = append(chains, &c) + return nil + }) + + if err != nil { + return nil, status.Error(codes.Internal, err.Error()) } - return &types.QueryConsumerChainsResponse{Chains: chains}, nil + return &types.QueryConsumerChainsResponse{Chains: chains, Pagination: pageRes}, nil } // GetConsumerChain returns a Chain data structure with all the necessary fields @@ -588,6 +589,7 @@ func (k Keeper) QueryConsumerChain(goCtx context.Context, req *types.QueryConsum return &types.QueryConsumerChainResponse{ ChainId: chainId, + ConsumerId: consumerId, OwnerAddress: ownerAddress, Phase: phase.String(), Metadata: metadata, diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index c2cabfe8b1..6530087235 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -17,6 +17,7 @@ import ( "github.com/cometbft/cometbft/proto/tendermint/crypto" + sdkquery "github.com/cosmos/cosmos-sdk/types/query" cryptotestutil "github.com/cosmos/interchain-security/v6/testutil/crypto" testkeeper "github.com/cosmos/interchain-security/v6/testutil/keeper" "github.com/cosmos/interchain-security/v6/x/ccv/provider/keeper" @@ -558,6 +559,7 @@ func TestQueryConsumerChain(t *testing.T) { expRes := types.QueryConsumerChainResponse{ ChainId: chainId, + ConsumerId: consumerId, OwnerAddress: providerKeeper.GetAuthority(), Metadata: types.ConsumerMetadata{Name: chainId}, Phase: types.CONSUMER_PHASE_REGISTERED.String(), @@ -663,7 +665,7 @@ func TestQueryConsumerChains(t *testing.T) { name string setup func(ctx sdk.Context, pk keeper.Keeper) phase_filter types.ConsumerPhase - limit int32 + limit uint64 expConsumers []*types.Chain }{ { @@ -675,7 +677,7 @@ func TestQueryConsumerChains(t *testing.T) { name: "expect an amount of consumer equal to the limit", setup: func(ctx sdk.Context, pk keeper.Keeper) {}, expConsumers: consumers[:3], - limit: int32(3), + limit: 3, }, { name: "expect registered consumers when phase filter is set to Registered", @@ -720,14 +722,19 @@ func TestQueryConsumerChains(t *testing.T) { tc.setup(ctx, pk) req := types.QueryConsumerChainsRequest{ Phase: tc.phase_filter, - Limit: tc.limit, + Pagination: &sdkquery.PageRequest{ + Limit: tc.limit, + }, } expectedResponse := types.QueryConsumerChainsResponse{ Chains: tc.expConsumers, } res, err := pk.QueryConsumerChains(ctx, &req) require.NoError(t, err) - require.Equal(t, &expectedResponse, res, tc.name) + require.Equal(t, expectedResponse.GetChains(), res.GetChains(), tc.name) + if tc.limit != 0 { + require.Len(t, res.GetChains(), int(tc.limit), tc.name) + } }) } } diff --git a/x/ccv/provider/types/keys.go b/x/ccv/provider/types/keys.go index 62869dcebf..8dc78a5421 100644 --- a/x/ccv/provider/types/keys.go +++ b/x/ccv/provider/types/keys.go @@ -685,6 +685,11 @@ func ConsumerIdToPhaseKey(consumerId string) []byte { return StringIdWithLenKey(mustGetKeyPrefix(ConsumerIdToPhaseKeyName), consumerId) } +// ConsumerIdToPhaseKeyPrefix returns the key prefix used to iterate over all the consumer ids and their phases. +func ConsumerIdToPhaseKeyPrefix() byte { + return mustGetKeyPrefix(ConsumerIdToPhaseKeyName) +} + // ConsumerIdToRemovalTimeKeyPrefix returns the key prefix for storing the removal times of consumer chains // that are about to be removed func ConsumerIdToRemovalTimeKeyPrefix() byte { @@ -813,8 +818,8 @@ func StringIdWithLenKey(prefix byte, stringId string) []byte { func ParseStringIdWithLenKey(prefix byte, bz []byte) (string, error) { expectedPrefix := []byte{prefix} prefixL := len(expectedPrefix) - if prefix := bz[:prefixL]; !bytes.Equal(prefix, expectedPrefix) { - return "", fmt.Errorf("invalid prefix; expected: %X, got: %X", expectedPrefix, prefix) + if prefixBz := bz[:prefixL]; !bytes.Equal(prefixBz, expectedPrefix) { + return "", fmt.Errorf("invalid prefix; expected: %X, got: %X, input %X -- len %d", expectedPrefix, prefixBz, prefix, prefixL) } stringIdL := sdk.BigEndianToUint64(bz[prefixL : prefixL+8]) stringId := string(bz[prefixL+8 : prefixL+8+int(stringIdL)]) diff --git a/x/ccv/provider/types/query.pb.go b/x/ccv/provider/types/query.pb.go index 222aefabd0..c0c30c8289 100644 --- a/x/ccv/provider/types/query.pb.go +++ b/x/ccv/provider/types/query.pb.go @@ -9,6 +9,7 @@ import ( fmt "fmt" crypto "github.com/cometbft/cometbft/proto/tendermint/crypto" _ "github.com/cosmos/cosmos-proto" + query "github.com/cosmos/cosmos-sdk/types/query" types1 "github.com/cosmos/cosmos-sdk/x/staking/types" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" @@ -129,10 +130,8 @@ func (m *QueryConsumerGenesisResponse) GetGenesisState() types.ConsumerGenesisSt type QueryConsumerChainsRequest struct { // The phase of the consumer chains returned (optional) // Registered=1|Initialized=2|Launched=3|Stopped=4|Deleted=5 - Phase ConsumerPhase `protobuf:"varint,1,opt,name=phase,proto3,enum=interchain_security.ccv.provider.v1.ConsumerPhase" json:"phase,omitempty"` - // The limit of consumer chains returned (optional) - // default is 100 - Limit int32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` + Phase ConsumerPhase `protobuf:"varint,1,opt,name=phase,proto3,enum=interchain_security.ccv.provider.v1.ConsumerPhase" json:"phase,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryConsumerChainsRequest) Reset() { *m = QueryConsumerChainsRequest{} } @@ -175,15 +174,16 @@ func (m *QueryConsumerChainsRequest) GetPhase() ConsumerPhase { return CONSUMER_PHASE_UNSPECIFIED } -func (m *QueryConsumerChainsRequest) GetLimit() int32 { +func (m *QueryConsumerChainsRequest) GetPagination() *query.PageRequest { if m != nil { - return m.Limit + return m.Pagination } - return 0 + return nil } type QueryConsumerChainsResponse struct { - Chains []*Chain `protobuf:"bytes,1,rep,name=chains,proto3" json:"chains,omitempty"` + Chains []*Chain `protobuf:"bytes,1,rep,name=chains,proto3" json:"chains,omitempty"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryConsumerChainsResponse) Reset() { *m = QueryConsumerChainsResponse{} } @@ -226,6 +226,13 @@ func (m *QueryConsumerChainsResponse) GetChains() []*Chain { return nil } +func (m *QueryConsumerChainsResponse) GetPagination() *query.PageResponse { + if m != nil { + return m.Pagination + } + return nil +} + type Chain struct { ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` @@ -1709,12 +1716,13 @@ func (m *QueryConsumerChainRequest) GetConsumerId() string { } type QueryConsumerChainResponse struct { - ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - OwnerAddress string `protobuf:"bytes,2,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"` - Phase string `protobuf:"bytes,3,opt,name=phase,proto3" json:"phase,omitempty"` - Metadata ConsumerMetadata `protobuf:"bytes,4,opt,name=metadata,proto3" json:"metadata"` - InitParams *ConsumerInitializationParameters `protobuf:"bytes,5,opt,name=init_params,json=initParams,proto3" json:"init_params,omitempty"` - PowerShapingParams *PowerShapingParameters `protobuf:"bytes,6,opt,name=power_shaping_params,json=powerShapingParams,proto3" json:"power_shaping_params,omitempty"` + ConsumerId string `protobuf:"bytes,1,opt,name=consumer_id,json=consumerId,proto3" json:"consumer_id,omitempty"` + ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + OwnerAddress string `protobuf:"bytes,3,opt,name=owner_address,json=ownerAddress,proto3" json:"owner_address,omitempty"` + Phase string `protobuf:"bytes,4,opt,name=phase,proto3" json:"phase,omitempty"` + Metadata ConsumerMetadata `protobuf:"bytes,5,opt,name=metadata,proto3" json:"metadata"` + InitParams *ConsumerInitializationParameters `protobuf:"bytes,6,opt,name=init_params,json=initParams,proto3" json:"init_params,omitempty"` + PowerShapingParams *PowerShapingParameters `protobuf:"bytes,7,opt,name=power_shaping_params,json=powerShapingParams,proto3" json:"power_shaping_params,omitempty"` } func (m *QueryConsumerChainResponse) Reset() { *m = QueryConsumerChainResponse{} } @@ -1750,6 +1758,13 @@ func (m *QueryConsumerChainResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryConsumerChainResponse proto.InternalMessageInfo +func (m *QueryConsumerChainResponse) GetConsumerId() string { + if m != nil { + return m.ConsumerId + } + return "" +} + func (m *QueryConsumerChainResponse) GetChainId() string { if m != nil { return m.ChainId @@ -1833,157 +1848,159 @@ func init() { } var fileDescriptor_422512d7b7586cd7 = []byte{ - // 2386 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x5a, 0xcd, 0x73, 0xdb, 0xc6, - 0x15, 0x17, 0xa8, 0x0f, 0x53, 0x2b, 0x4b, 0x89, 0xd7, 0xb2, 0x4d, 0x53, 0xb6, 0x28, 0xc3, 0xf1, - 0x8c, 0x62, 0xc7, 0x84, 0xa4, 0x4e, 0xbe, 0x9c, 0xfa, 0x43, 0xa4, 0x25, 0x9b, 0xe3, 0xd8, 0x56, - 0x20, 0xc5, 0x99, 0x71, 0xea, 0xa2, 0x10, 0xb0, 0x21, 0xb7, 0x02, 0x01, 0x18, 0xbb, 0xa4, 0xcd, - 0xaa, 0xba, 0xf4, 0x94, 0x43, 0x3b, 0x93, 0x4c, 0xa7, 0xe7, 0x66, 0xfa, 0x17, 0x74, 0x3a, 0x99, - 0xfe, 0x0d, 0xb9, 0x35, 0x4d, 0x2f, 0x9d, 0xce, 0xd4, 0xed, 0xd8, 0xed, 0x4c, 0x7b, 0xe8, 0xa1, - 0x69, 0x7b, 0xef, 0xec, 0x62, 0x01, 0x12, 0x30, 0x48, 0x02, 0x92, 0x6e, 0xc4, 0xee, 0x7b, 0xbf, - 0xf7, 0xb1, 0x6f, 0xdf, 0xbe, 0xf7, 0x24, 0xa0, 0x60, 0x9b, 0x22, 0xcf, 0x68, 0xe8, 0xd8, 0xd6, - 0x08, 0x32, 0x5a, 0x1e, 0xa6, 0x1d, 0xc5, 0x30, 0xda, 0x8a, 0xeb, 0x39, 0x6d, 0x6c, 0x22, 0x4f, - 0x69, 0x2f, 0x2b, 0x8f, 0x5b, 0xc8, 0xeb, 0x94, 0x5d, 0xcf, 0xa1, 0x0e, 0x3c, 0x9f, 0xc0, 0x50, - 0x36, 0x8c, 0x76, 0x39, 0x60, 0x28, 0xb7, 0x97, 0x8b, 0x67, 0xea, 0x8e, 0x53, 0xb7, 0x90, 0xa2, - 0xbb, 0x58, 0xd1, 0x6d, 0xdb, 0xa1, 0x3a, 0xc5, 0x8e, 0x4d, 0x7c, 0x88, 0xe2, 0x6c, 0xdd, 0xa9, - 0x3b, 0xfc, 0xa7, 0xc2, 0x7e, 0x89, 0xd5, 0x92, 0xe0, 0xe1, 0x5f, 0xdb, 0xad, 0x4f, 0x14, 0x8a, - 0x9b, 0x88, 0x50, 0xbd, 0xe9, 0x0a, 0x82, 0x95, 0x34, 0xaa, 0x86, 0x5a, 0xf8, 0x3c, 0x4b, 0xfd, - 0x78, 0xda, 0xcb, 0x0a, 0x69, 0xe8, 0x1e, 0x32, 0x35, 0xc3, 0xb1, 0x49, 0xab, 0x19, 0x72, 0x5c, - 0x18, 0xc0, 0xf1, 0x04, 0x7b, 0x48, 0x90, 0x9d, 0xa1, 0xc8, 0x36, 0x91, 0xd7, 0xc4, 0x36, 0x55, - 0x0c, 0xaf, 0xe3, 0x52, 0x47, 0xd9, 0x41, 0x9d, 0xc0, 0xc2, 0xd3, 0x86, 0x43, 0x9a, 0x0e, 0xd1, - 0x7c, 0x23, 0xfd, 0x0f, 0xb1, 0xf5, 0x9a, 0xff, 0xa5, 0x10, 0xaa, 0xef, 0x60, 0xbb, 0xae, 0xb4, - 0x97, 0xb7, 0x11, 0xd5, 0x97, 0x83, 0x6f, 0x9f, 0x4a, 0xbe, 0x06, 0xe6, 0x3e, 0x60, 0x4e, 0xaf, - 0x0a, 0xe5, 0x6e, 0x21, 0x1b, 0x11, 0x4c, 0x54, 0xf4, 0xb8, 0x85, 0x08, 0x85, 0x25, 0x30, 0x15, - 0xa8, 0xad, 0x61, 0xb3, 0x20, 0x2d, 0x48, 0x8b, 0x93, 0x2a, 0x08, 0x96, 0x6a, 0xa6, 0xbc, 0x0b, - 0xce, 0x24, 0xf3, 0x13, 0xd7, 0xb1, 0x09, 0x82, 0x1f, 0x83, 0xe9, 0xba, 0xbf, 0xa4, 0x11, 0xaa, - 0x53, 0xc4, 0x21, 0xa6, 0x56, 0x96, 0xca, 0xfd, 0x4e, 0xb7, 0xbd, 0x5c, 0x8e, 0x61, 0x6d, 0x32, - 0xbe, 0xca, 0xd8, 0x57, 0xcf, 0x4a, 0x23, 0xea, 0xd1, 0x7a, 0xcf, 0x9a, 0xfc, 0x63, 0x50, 0x8c, - 0x08, 0xaf, 0x32, 0xb8, 0x50, 0xf7, 0xdb, 0x60, 0xdc, 0x6d, 0xe8, 0xc4, 0x17, 0x39, 0xb3, 0xb2, - 0x52, 0x4e, 0x11, 0x50, 0xa1, 0xec, 0x0d, 0xc6, 0xa9, 0xfa, 0x00, 0x70, 0x16, 0x8c, 0x5b, 0xb8, - 0x89, 0x69, 0x21, 0xb7, 0x20, 0x2d, 0x8e, 0xab, 0xfe, 0x87, 0xac, 0xc7, 0x5c, 0x17, 0x48, 0x17, - 0x96, 0x57, 0xc0, 0x04, 0x97, 0x45, 0x0a, 0xd2, 0xc2, 0xe8, 0xe2, 0xd4, 0xca, 0xc5, 0x74, 0xf2, - 0xd9, 0xb6, 0x2a, 0x38, 0xe5, 0xff, 0x8d, 0x82, 0x71, 0xbe, 0x02, 0x4f, 0x83, 0xbc, 0xcf, 0x19, - 0x9e, 0xc2, 0x11, 0xfe, 0x5d, 0x33, 0xe1, 0x1c, 0x98, 0x34, 0x2c, 0x8c, 0x6c, 0xca, 0xf6, 0x72, - 0x7c, 0x2f, 0xef, 0x2f, 0xd4, 0x4c, 0x78, 0x1c, 0x8c, 0x53, 0xc7, 0xd5, 0xee, 0x15, 0x46, 0x17, - 0xa4, 0xc5, 0x69, 0x75, 0x8c, 0x3a, 0xee, 0x3d, 0x78, 0x11, 0xc0, 0x26, 0xb6, 0x35, 0xd7, 0x79, - 0xc2, 0x8e, 0xd5, 0xd6, 0x7c, 0x8a, 0xb1, 0x05, 0x69, 0x71, 0x54, 0x9d, 0x69, 0x62, 0x7b, 0x83, - 0x6d, 0xd4, 0xec, 0x2d, 0x46, 0xbb, 0x04, 0x66, 0xdb, 0xba, 0x85, 0x4d, 0x9d, 0x3a, 0x1e, 0x11, - 0x2c, 0x86, 0xee, 0x16, 0xc6, 0x39, 0x1e, 0xec, 0xee, 0x71, 0xa6, 0xaa, 0xee, 0xc2, 0x8b, 0xe0, - 0x58, 0xb8, 0xaa, 0x11, 0x44, 0x39, 0xf9, 0x04, 0x27, 0x7f, 0x25, 0xdc, 0xd8, 0x44, 0x94, 0xd1, - 0x9e, 0x01, 0x93, 0xba, 0x65, 0x39, 0x4f, 0x2c, 0x4c, 0x68, 0xe1, 0xc8, 0xc2, 0xe8, 0xe2, 0xa4, - 0xda, 0x5d, 0x80, 0x45, 0x90, 0x37, 0x91, 0xdd, 0xe1, 0x9b, 0x79, 0xbe, 0x19, 0x7e, 0xb3, 0x33, - 0xf1, 0x4f, 0x77, 0x92, 0x5b, 0x2c, 0x4e, 0xea, 0x23, 0x90, 0x6f, 0x22, 0xaa, 0x9b, 0x3a, 0xd5, - 0x0b, 0x80, 0x47, 0xda, 0x9b, 0x99, 0x8e, 0xfd, 0xae, 0x60, 0x16, 0xe1, 0x16, 0x82, 0x31, 0x27, - 0x33, 0x97, 0xb1, 0xcb, 0x83, 0x0a, 0x53, 0x0b, 0xd2, 0xe2, 0x98, 0x9a, 0x6f, 0x62, 0x7b, 0x93, - 0x7d, 0xc3, 0x32, 0x38, 0xce, 0x95, 0xd6, 0xb0, 0xad, 0x1b, 0x14, 0xb7, 0x91, 0xd6, 0xd6, 0x2d, - 0x52, 0x38, 0xba, 0x20, 0x2d, 0xe6, 0xd5, 0x63, 0x7c, 0xab, 0x26, 0x76, 0x1e, 0xe8, 0x16, 0x89, - 0xdf, 0xaa, 0xe9, 0x97, 0x6e, 0xd5, 0xcf, 0x24, 0x70, 0x8e, 0xc7, 0xd6, 0x83, 0xc0, 0x5f, 0x81, - 0x82, 0xab, 0xa6, 0xe9, 0x05, 0x01, 0x7e, 0x15, 0xbc, 0x1a, 0xd8, 0xa0, 0xe9, 0xa6, 0xe9, 0x21, - 0x42, 0xfc, 0xd8, 0xa8, 0xc0, 0x6f, 0x9f, 0x95, 0x66, 0x3a, 0x7a, 0xd3, 0xba, 0x22, 0x8b, 0x0d, - 0x59, 0x7d, 0x25, 0xa0, 0x5d, 0xf5, 0x57, 0xe2, 0x5a, 0xe4, 0xe2, 0x5a, 0x5c, 0xc9, 0x7f, 0xfa, - 0x45, 0x69, 0xe4, 0x1f, 0x5f, 0x94, 0x46, 0xe4, 0xfb, 0x40, 0x1e, 0xa4, 0x8e, 0x88, 0xf8, 0xd7, - 0xc1, 0xab, 0x21, 0x60, 0x44, 0x1f, 0xf5, 0x15, 0xa3, 0x87, 0x9e, 0x69, 0xf3, 0xb2, 0x81, 0x1b, - 0x3d, 0xda, 0xf5, 0x18, 0x98, 0x0c, 0x98, 0x6c, 0x60, 0x4c, 0xc8, 0x81, 0x0c, 0x8c, 0xaa, 0xd3, - 0x35, 0x30, 0xd9, 0xe1, 0x2f, 0x39, 0x57, 0x9e, 0x03, 0xa7, 0x39, 0xe0, 0x56, 0xc3, 0x73, 0x28, - 0xb5, 0x10, 0x4f, 0x58, 0xc2, 0x2e, 0xf9, 0xf7, 0x92, 0x48, 0x5c, 0xb1, 0x5d, 0x21, 0xa6, 0x04, - 0xa6, 0x88, 0xa5, 0x93, 0x86, 0xd6, 0x44, 0x14, 0x79, 0x5c, 0xc2, 0xa8, 0x0a, 0xf8, 0xd2, 0x5d, - 0xb6, 0x02, 0x57, 0xc0, 0x89, 0x1e, 0x02, 0x8d, 0x07, 0x98, 0x6e, 0x1b, 0x88, 0x9b, 0x38, 0xaa, - 0x1e, 0xef, 0x92, 0xae, 0x06, 0x5b, 0xf0, 0xfb, 0xa0, 0x60, 0xa3, 0xa7, 0x54, 0xf3, 0x90, 0x6b, - 0x21, 0x1b, 0x93, 0x86, 0x66, 0xe8, 0xb6, 0xc9, 0x8c, 0x45, 0x3c, 0x37, 0x4c, 0xad, 0x14, 0xcb, - 0xfe, 0xc3, 0x58, 0x0e, 0x1e, 0xc6, 0xf2, 0x56, 0xf0, 0x30, 0x56, 0xf2, 0xec, 0x3a, 0x7c, 0xf6, - 0x97, 0x92, 0xa4, 0x9e, 0x64, 0x28, 0x6a, 0x00, 0x52, 0x0d, 0x30, 0xe4, 0x37, 0xc0, 0x45, 0x6e, - 0x92, 0x8a, 0xea, 0x98, 0x50, 0xe4, 0x21, 0x33, 0x88, 0x11, 0x15, 0x3d, 0xd1, 0x3d, 0xf3, 0x26, - 0xb2, 0x9d, 0x66, 0x90, 0x9b, 0xe5, 0x35, 0x70, 0x29, 0x15, 0xb5, 0xf0, 0xc8, 0x49, 0x30, 0x61, - 0xf2, 0x15, 0x9e, 0x4b, 0x27, 0x55, 0xf1, 0x25, 0xbf, 0x0f, 0x5e, 0xe7, 0x30, 0xab, 0x96, 0xb5, - 0xa1, 0x63, 0x8f, 0x3c, 0xd0, 0x2d, 0x86, 0xc3, 0x0e, 0xa1, 0xd2, 0xe9, 0x22, 0xa6, 0x7c, 0xcb, - 0x7e, 0x29, 0x09, 0x1b, 0x86, 0xc0, 0x09, 0xa5, 0x1e, 0x83, 0x63, 0xae, 0x8e, 0x3d, 0x76, 0xd7, - 0xd9, 0xdb, 0xce, 0x23, 0x42, 0xe4, 0xfa, 0xf5, 0x54, 0x49, 0x87, 0xc9, 0xf0, 0x45, 0x30, 0x09, - 0x61, 0xc4, 0xd9, 0x5d, 0x5f, 0xcc, 0xb8, 0x11, 0x12, 0xf9, 0xbf, 0x12, 0x38, 0x37, 0x94, 0x0b, - 0xae, 0xf7, 0xcd, 0x0b, 0x73, 0xdf, 0x3e, 0x2b, 0x9d, 0xf2, 0xaf, 0x4d, 0x9c, 0x22, 0x21, 0x41, - 0xac, 0x27, 0x5c, 0xbf, 0x5c, 0x1c, 0x27, 0x4e, 0x91, 0x70, 0x0f, 0xaf, 0x83, 0xa3, 0x21, 0xd5, - 0x0e, 0xea, 0x88, 0x70, 0x3b, 0x53, 0xee, 0x56, 0x36, 0x65, 0xbf, 0xb2, 0x29, 0x6f, 0xb4, 0xb6, - 0x2d, 0x6c, 0xdc, 0x41, 0x1d, 0x35, 0x3c, 0xaa, 0x3b, 0xa8, 0x23, 0xcf, 0x02, 0xc8, 0xcf, 0x65, - 0x43, 0xf7, 0xf4, 0x6e, 0x0c, 0xfd, 0x00, 0x1c, 0x8f, 0xac, 0x8a, 0x63, 0xa9, 0x81, 0x09, 0x97, - 0xaf, 0x88, 0x52, 0xe3, 0x52, 0xca, 0xb3, 0x60, 0x2c, 0x22, 0xed, 0x0b, 0x00, 0xf9, 0xae, 0x88, - 0x87, 0xc8, 0x0b, 0x7f, 0xdf, 0xa5, 0xc8, 0xac, 0xd9, 0x61, 0xa6, 0x48, 0x5f, 0x2b, 0x3d, 0x16, - 0x41, 0x3f, 0x0c, 0x2e, 0x2c, 0x20, 0xce, 0xf6, 0xbe, 0xbc, 0xb1, 0xf3, 0x42, 0xc1, 0x5d, 0x98, - 0xeb, 0x79, 0x82, 0xa3, 0x07, 0x88, 0x88, 0xbc, 0x0a, 0xe6, 0x23, 0x22, 0xf7, 0xa1, 0xf5, 0xe7, - 0x47, 0xc0, 0x42, 0x1f, 0x8c, 0xf0, 0xd7, 0x41, 0x9f, 0xa2, 0x78, 0x84, 0xe4, 0x32, 0x46, 0x08, - 0x2c, 0x80, 0x71, 0x5e, 0x9a, 0xf0, 0xd8, 0x1a, 0xad, 0xe4, 0x0a, 0x92, 0xea, 0x2f, 0xc0, 0x77, - 0xc1, 0x98, 0xc7, 0x72, 0xdc, 0x18, 0xd7, 0xe6, 0x02, 0x3b, 0xdf, 0x3f, 0x3d, 0x2b, 0xcd, 0xf9, - 0xc5, 0x31, 0x31, 0x77, 0xca, 0xd8, 0x51, 0x9a, 0x3a, 0x6d, 0x94, 0xdf, 0x47, 0x75, 0xdd, 0xe8, - 0xdc, 0x44, 0x46, 0x41, 0x52, 0x39, 0x0b, 0xbc, 0x00, 0x66, 0x42, 0xad, 0x7c, 0xf4, 0x71, 0x9e, - 0x5f, 0xa7, 0x83, 0x55, 0x5e, 0xf2, 0xc0, 0x47, 0xa0, 0x10, 0x92, 0x19, 0x4e, 0xb3, 0x89, 0x09, - 0xc1, 0x8e, 0xad, 0x71, 0xa9, 0x13, 0x5c, 0xea, 0xf9, 0x14, 0x52, 0xd5, 0x93, 0x01, 0x48, 0x35, - 0xc4, 0x50, 0x99, 0x16, 0x8f, 0x40, 0x21, 0x74, 0x6d, 0x1c, 0xfe, 0x48, 0x06, 0xf8, 0x00, 0x24, - 0x06, 0x7f, 0x07, 0x4c, 0x99, 0x88, 0x18, 0x1e, 0x76, 0x59, 0xe7, 0x54, 0xc8, 0x73, 0xcf, 0x9f, - 0x2f, 0x8b, 0x56, 0x22, 0x68, 0x16, 0x44, 0xf3, 0x50, 0xbe, 0xd9, 0x25, 0x15, 0x77, 0xa5, 0x97, - 0x1b, 0x3e, 0x02, 0xa7, 0x43, 0x5d, 0x1d, 0x17, 0x79, 0xbc, 0x04, 0x0c, 0xe2, 0x81, 0x17, 0x6a, - 0x95, 0x73, 0xdf, 0x7c, 0x79, 0xf9, 0xac, 0x40, 0x0f, 0xe3, 0x47, 0xc4, 0xc1, 0x26, 0xf5, 0xb0, - 0x5d, 0x57, 0x4f, 0x05, 0x18, 0xf7, 0x05, 0x44, 0x10, 0x26, 0x27, 0xc1, 0xc4, 0x0f, 0x75, 0x6c, - 0x21, 0x93, 0xd7, 0x76, 0x79, 0x55, 0x7c, 0xc1, 0x2b, 0x60, 0x82, 0x35, 0x17, 0x2d, 0xc2, 0x2b, - 0xb3, 0x99, 0x15, 0xb9, 0x9f, 0xfa, 0x15, 0xc7, 0x36, 0x37, 0x39, 0xa5, 0x2a, 0x38, 0xe0, 0x16, - 0x08, 0xa3, 0x51, 0xa3, 0xce, 0x0e, 0xb2, 0xfd, 0xba, 0x6d, 0xb2, 0x72, 0x49, 0x78, 0xf5, 0xc4, - 0xcb, 0x5e, 0xad, 0xd9, 0xf4, 0x9b, 0x2f, 0x2f, 0x03, 0x21, 0xa4, 0x66, 0x53, 0x75, 0x26, 0xc0, - 0xd8, 0xe2, 0x10, 0x2c, 0x74, 0x42, 0x54, 0x3f, 0x74, 0xa6, 0xfd, 0xd0, 0x09, 0x56, 0xfd, 0xd0, - 0x79, 0x0b, 0x9c, 0x12, 0xb7, 0x17, 0x11, 0xcd, 0x68, 0x79, 0x1e, 0xab, 0xe2, 0x91, 0xeb, 0x18, - 0x8d, 0xc2, 0x0c, 0xb7, 0xf0, 0x44, 0xb8, 0x5d, 0xf5, 0x77, 0xd7, 0xd8, 0xa6, 0xfc, 0xa9, 0x04, - 0x4a, 0x7d, 0xef, 0xb5, 0x48, 0x1f, 0x08, 0x80, 0x6e, 0x66, 0x10, 0xef, 0xd2, 0x5a, 0xaa, 0x5c, - 0x38, 0xec, 0xb6, 0xab, 0x3d, 0xc0, 0xf2, 0x63, 0xb0, 0x94, 0xd0, 0x05, 0x85, 0xb4, 0xb7, 0x75, - 0xb2, 0xe5, 0x88, 0x2f, 0x74, 0x38, 0x85, 0xab, 0xfc, 0x00, 0x2c, 0x67, 0x10, 0x29, 0xdc, 0x71, - 0xae, 0x27, 0xc5, 0x60, 0x33, 0x48, 0x9e, 0x53, 0xdd, 0x44, 0xc7, 0x8b, 0xd2, 0x4b, 0xc9, 0x65, - 0x6e, 0xf4, 0xce, 0xa4, 0x4d, 0x9d, 0x89, 0x76, 0xe6, 0xd2, 0xdb, 0x59, 0x07, 0x6f, 0xa4, 0x53, - 0x47, 0x98, 0xf8, 0xb6, 0x48, 0x75, 0x52, 0xfa, 0xac, 0xc0, 0x19, 0x64, 0x59, 0x64, 0xf8, 0x8a, - 0xe5, 0x18, 0x3b, 0xe4, 0x43, 0x9b, 0x62, 0xeb, 0x1e, 0x7a, 0xea, 0xc7, 0x5a, 0xf0, 0xda, 0x3e, - 0x14, 0x05, 0x7b, 0x32, 0x8d, 0xd0, 0xe0, 0x4d, 0x70, 0x6a, 0x9b, 0xef, 0x6b, 0x2d, 0x46, 0xa0, - 0xf1, 0x8a, 0xd3, 0x8f, 0x67, 0x89, 0xf7, 0x4c, 0xb3, 0xdb, 0x09, 0xec, 0xf2, 0xaa, 0xa8, 0xbe, - 0xab, 0xa1, 0xeb, 0xd6, 0x3d, 0xa7, 0x59, 0x15, 0x3d, 0x6c, 0xe0, 0xee, 0x48, 0x9f, 0x2b, 0x45, - 0xfb, 0x5c, 0x79, 0x1d, 0x9c, 0x1f, 0x08, 0xd1, 0x2d, 0xad, 0x07, 0xbf, 0x76, 0xdf, 0x15, 0x75, - 0x7b, 0x24, 0xb6, 0x52, 0xbf, 0x95, 0xbf, 0x1a, 0x4d, 0x9a, 0x48, 0x84, 0xd2, 0x07, 0x34, 0xf1, - 0xe7, 0xc1, 0xb4, 0xf3, 0xc4, 0x8e, 0xc7, 0x89, 0x7a, 0x94, 0x2f, 0x06, 0xf9, 0x2f, 0xec, 0x79, - 0x47, 0xfb, 0xf5, 0xbc, 0x63, 0x87, 0xd9, 0xf3, 0x7e, 0x02, 0xa6, 0xb0, 0x8d, 0xa9, 0x26, 0xca, - 0xa9, 0x71, 0x8e, 0xbd, 0x96, 0x09, 0xbb, 0x66, 0x63, 0x8a, 0x75, 0x0b, 0xff, 0x88, 0xcf, 0xe5, - 0x78, 0x91, 0xc5, 0xda, 0x12, 0xa2, 0x02, 0x86, 0xec, 0x17, 0x5d, 0xb0, 0x09, 0x66, 0xfd, 0xb9, - 0x02, 0x69, 0xe8, 0x2e, 0xb6, 0xeb, 0x81, 0xc0, 0x09, 0x2e, 0xf0, 0xbd, 0x74, 0xf5, 0x1b, 0x03, - 0xd8, 0xf4, 0xf9, 0x7b, 0xc4, 0x40, 0x37, 0xbe, 0x4e, 0x56, 0xfe, 0x79, 0x16, 0x8c, 0xf3, 0x43, - 0x82, 0x7f, 0x97, 0xc0, 0x6c, 0xd2, 0xf4, 0x0a, 0xde, 0xc8, 0x9e, 0x27, 0xa3, 0x83, 0xb3, 0xe2, - 0xea, 0x01, 0x10, 0xfc, 0x68, 0x91, 0x6f, 0xff, 0xe4, 0x0f, 0x7f, 0xfb, 0x79, 0xae, 0x02, 0x6f, - 0x0c, 0x1f, 0x9d, 0x86, 0x51, 0x29, 0xc6, 0x63, 0xca, 0x6e, 0x4f, 0x9c, 0xee, 0xc1, 0x17, 0x92, - 0x28, 0x95, 0xa3, 0x19, 0x13, 0x5e, 0xcf, 0xae, 0x64, 0x64, 0xc4, 0x56, 0xbc, 0xb1, 0x7f, 0x00, - 0x61, 0x64, 0x8d, 0x1b, 0x59, 0x85, 0xab, 0x19, 0x8c, 0xf4, 0x87, 0x63, 0xca, 0x2e, 0x0f, 0xff, - 0x3d, 0x65, 0x97, 0x8f, 0xe3, 0xf6, 0xe0, 0xe7, 0x39, 0x71, 0xf9, 0x12, 0xa7, 0x14, 0x70, 0x3d, - 0xbd, 0xae, 0x83, 0xa6, 0x2e, 0xc5, 0x5b, 0x07, 0xc6, 0x11, 0xa6, 0x6f, 0x73, 0xd3, 0xbf, 0x07, - 0x1f, 0xa6, 0x18, 0x8d, 0x87, 0xf3, 0xb4, 0x48, 0xbb, 0x15, 0x3d, 0x66, 0x65, 0x37, 0xfe, 0xd8, - 0x24, 0xf9, 0xa4, 0xb7, 0x47, 0xd8, 0x97, 0x4f, 0x12, 0x06, 0x35, 0xfb, 0xf2, 0x49, 0xd2, 0x84, - 0x65, 0x7f, 0x3e, 0x89, 0x98, 0x1d, 0xf7, 0x49, 0xbc, 0x3f, 0xdd, 0x83, 0xbf, 0x93, 0x44, 0x3b, - 0x19, 0x99, 0xbe, 0xc0, 0x6b, 0xe9, 0x6d, 0x48, 0x1a, 0xea, 0x14, 0xaf, 0xef, 0x9b, 0x5f, 0xd8, - 0xfe, 0x0e, 0xb7, 0x7d, 0x05, 0x2e, 0x0d, 0xb7, 0x9d, 0x0a, 0x00, 0x7f, 0xa6, 0x0e, 0x7f, 0x91, - 0x13, 0xaf, 0xdf, 0xe0, 0x71, 0x0a, 0xbc, 0x9f, 0x5e, 0xc5, 0x54, 0x63, 0x9c, 0xe2, 0xc6, 0xe1, - 0x01, 0x0a, 0x27, 0xdc, 0xe1, 0x4e, 0x58, 0x83, 0xd5, 0xe1, 0x4e, 0xf0, 0x42, 0xc4, 0xee, 0xad, - 0xf0, 0x38, 0xa6, 0xe6, 0x8f, 0x87, 0xe0, 0x4f, 0x73, 0xa2, 0xb0, 0x18, 0x38, 0xd0, 0x81, 0xf7, - 0xd2, 0x5b, 0x91, 0x66, 0xd0, 0x54, 0xbc, 0x7f, 0x68, 0x78, 0xc2, 0x29, 0x6b, 0xdc, 0x29, 0xd7, - 0xe1, 0xd5, 0xe1, 0x4e, 0x11, 0x51, 0xae, 0xb9, 0x0c, 0x35, 0xf6, 0x0c, 0xfc, 0x46, 0x02, 0x53, - 0x3d, 0x13, 0x13, 0xf8, 0x76, 0x7a, 0x3d, 0x23, 0x93, 0x97, 0xe2, 0x3b, 0xd9, 0x19, 0x85, 0x25, - 0x4b, 0xdc, 0x92, 0x8b, 0x70, 0x71, 0xb8, 0x25, 0x7e, 0x11, 0xd0, 0x8d, 0xed, 0xc1, 0x53, 0x93, - 0x2c, 0xb1, 0x9d, 0x6a, 0x9c, 0x93, 0x25, 0xb6, 0xd3, 0x0d, 0x74, 0xb2, 0xc4, 0xb6, 0xc3, 0x40, - 0x34, 0x6c, 0x6b, 0xdd, 0x4e, 0x2b, 0x76, 0x98, 0xbf, 0xcd, 0x89, 0xd9, 0x67, 0x9a, 0x2e, 0x08, - 0x7e, 0xb8, 0xdf, 0x87, 0x7a, 0x60, 0x23, 0x57, 0x7c, 0x70, 0xd8, 0xb0, 0xc2, 0x53, 0x0f, 0xb9, - 0xa7, 0xb6, 0xa0, 0x9a, 0xb9, 0x2a, 0xd0, 0x5c, 0xe4, 0x75, 0x9d, 0x96, 0xf4, 0x24, 0xfe, 0x3a, - 0x07, 0x5e, 0x4b, 0xd3, 0x56, 0xc1, 0x8d, 0x03, 0x3c, 0xf4, 0x89, 0x0d, 0x63, 0xf1, 0x83, 0x43, - 0x44, 0x14, 0x9e, 0x32, 0xb8, 0xa7, 0x1e, 0xc1, 0x8f, 0xb3, 0x78, 0x2a, 0x3a, 0x45, 0x1a, 0x5e, - 0x45, 0xfc, 0x5b, 0x02, 0xa7, 0xfa, 0x0c, 0x05, 0x60, 0xf5, 0x20, 0x23, 0x85, 0xc0, 0x31, 0x37, - 0x0f, 0x06, 0x92, 0xfd, 0x7e, 0x85, 0x16, 0xf7, 0xbd, 0x5f, 0xff, 0x92, 0x44, 0x27, 0x98, 0xd4, - 0xf0, 0xc2, 0x0c, 0x83, 0x94, 0x01, 0x4d, 0x75, 0x71, 0xfd, 0xa0, 0x30, 0xc2, 0xf2, 0x55, 0x6e, - 0xf9, 0x7b, 0xf0, 0xdd, 0xe1, 0x96, 0xf7, 0xe9, 0xcf, 0xe1, 0x7f, 0xa4, 0xd8, 0x9f, 0xb3, 0xa3, - 0x1d, 0x34, 0xbc, 0x95, 0xfd, 0x88, 0x12, 0xdb, 0xf8, 0xe2, 0xed, 0x83, 0x03, 0x65, 0xb7, 0xba, - 0xe7, 0x68, 0x95, 0xdd, 0x70, 0x8a, 0xb0, 0x07, 0xff, 0x1c, 0xd4, 0x82, 0x91, 0xf4, 0x94, 0xa5, - 0x16, 0x4c, 0x1a, 0x14, 0x14, 0xaf, 0xef, 0x9b, 0x5f, 0x98, 0xb6, 0xce, 0x4d, 0xbb, 0x01, 0xaf, - 0x65, 0x4d, 0x80, 0xd1, 0x28, 0xae, 0x7c, 0xf4, 0xd5, 0xf3, 0x79, 0xe9, 0xeb, 0xe7, 0xf3, 0xd2, - 0x5f, 0x9f, 0xcf, 0x4b, 0x9f, 0xbd, 0x98, 0x1f, 0xf9, 0xfa, 0xc5, 0xfc, 0xc8, 0x1f, 0x5f, 0xcc, - 0x8f, 0x3c, 0xbc, 0x5a, 0xc7, 0xb4, 0xd1, 0xda, 0x2e, 0x1b, 0x4e, 0x53, 0xfc, 0xdf, 0x48, 0x8f, - 0xa8, 0xcb, 0xa1, 0xa8, 0xf6, 0x5b, 0xca, 0xd3, 0x58, 0xed, 0xd9, 0x71, 0x11, 0xd9, 0x9e, 0xe0, - 0x7f, 0x24, 0xfc, 0xce, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x8f, 0x78, 0xcc, 0xd7, 0x23, - 0x00, 0x00, + // 2421 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x5a, 0xcd, 0x73, 0x1c, 0x47, + 0x15, 0xd7, 0xac, 0x3e, 0xbc, 0x6a, 0x59, 0x4a, 0xdc, 0x96, 0xed, 0xf5, 0xca, 0xd6, 0xca, 0xe3, + 0x18, 0x14, 0x39, 0x9e, 0x91, 0x44, 0xe5, 0xcb, 0xc1, 0x1f, 0x5a, 0x59, 0xb2, 0x55, 0x8e, 0x6d, + 0x65, 0xa4, 0x38, 0x55, 0x0e, 0x66, 0x68, 0xcd, 0x74, 0x56, 0x8d, 0x66, 0x67, 0xc6, 0xd3, 0xad, + 0xb5, 0x17, 0x97, 0x2f, 0x9c, 0x72, 0x80, 0xaa, 0xa4, 0x28, 0xce, 0xe4, 0xcc, 0x81, 0xa2, 0xa8, + 0x14, 0xff, 0x00, 0x97, 0xdc, 0x08, 0xe1, 0x42, 0x41, 0x61, 0xc0, 0x86, 0x2a, 0x2e, 0x1c, 0x08, + 0x70, 0xa7, 0xba, 0xa7, 0x67, 0x76, 0x67, 0x3c, 0xd2, 0xce, 0x48, 0xba, 0xed, 0x74, 0xbf, 0xf7, + 0x7b, 0x1f, 0xfd, 0xfa, 0xf5, 0x7b, 0x4f, 0x02, 0x3a, 0x71, 0x19, 0x0e, 0xac, 0x4d, 0x44, 0x5c, + 0x93, 0x62, 0x6b, 0x3b, 0x20, 0xac, 0xad, 0x5b, 0x56, 0x4b, 0xf7, 0x03, 0xaf, 0x45, 0x6c, 0x1c, + 0xe8, 0xad, 0x39, 0xfd, 0xc1, 0x36, 0x0e, 0xda, 0x9a, 0x1f, 0x78, 0xcc, 0x83, 0x67, 0x33, 0x18, + 0x34, 0xcb, 0x6a, 0x69, 0x11, 0x83, 0xd6, 0x9a, 0xab, 0x9e, 0x6a, 0x78, 0x5e, 0xc3, 0xc1, 0x3a, + 0xf2, 0x89, 0x8e, 0x5c, 0xd7, 0x63, 0x88, 0x11, 0xcf, 0xa5, 0x21, 0x44, 0x75, 0xbc, 0xe1, 0x35, + 0x3c, 0xf1, 0x53, 0xe7, 0xbf, 0xe4, 0x6a, 0x4d, 0xf2, 0x88, 0xaf, 0x8d, 0xed, 0x8f, 0x74, 0x46, + 0x9a, 0x98, 0x32, 0xd4, 0xf4, 0x25, 0xc1, 0x7c, 0x1e, 0x55, 0x63, 0x2d, 0x42, 0x9e, 0xd9, 0x9d, + 0x78, 0x5a, 0x73, 0x3a, 0xdd, 0x44, 0x01, 0xb6, 0x4d, 0xcb, 0x73, 0xe9, 0x76, 0x33, 0xe6, 0x38, + 0xb7, 0x0b, 0xc7, 0x43, 0x12, 0x60, 0x49, 0x76, 0x8a, 0x61, 0xd7, 0xc6, 0x41, 0x93, 0xb8, 0x4c, + 0xb7, 0x82, 0xb6, 0xcf, 0x3c, 0x7d, 0x0b, 0xb7, 0x23, 0x0b, 0x4f, 0x5a, 0x1e, 0x6d, 0x7a, 0xd4, + 0x0c, 0x8d, 0x0c, 0x3f, 0xe4, 0xd6, 0x2b, 0xe1, 0x97, 0x4e, 0x19, 0xda, 0x22, 0x6e, 0x43, 0x6f, + 0xcd, 0x6d, 0x60, 0x86, 0xe6, 0xa2, 0x6f, 0x49, 0x35, 0x23, 0xa9, 0x36, 0x10, 0xc5, 0xa1, 0xfb, + 0x63, 0x42, 0x1f, 0x35, 0x88, 0x2b, 0xfc, 0x19, 0xd2, 0xaa, 0x97, 0xc1, 0xc4, 0x7b, 0x9c, 0x62, + 0x51, 0x1a, 0x72, 0x1d, 0xbb, 0x98, 0x12, 0x6a, 0xe0, 0x07, 0xdb, 0x98, 0x32, 0x58, 0x03, 0x23, + 0x91, 0x89, 0x26, 0xb1, 0x2b, 0xca, 0x94, 0x32, 0x3d, 0x6c, 0x80, 0x68, 0x69, 0xc5, 0x56, 0x1f, + 0x83, 0x53, 0xd9, 0xfc, 0xd4, 0xf7, 0x5c, 0x8a, 0xe1, 0x87, 0x60, 0xb4, 0x11, 0x2e, 0x99, 0x94, + 0x21, 0x86, 0x05, 0xc4, 0xc8, 0xfc, 0xac, 0xb6, 0x53, 0x24, 0xb4, 0xe6, 0xb4, 0x14, 0xd6, 0x1a, + 0xe7, 0xab, 0x0f, 0x7c, 0xf1, 0xb4, 0xd6, 0x67, 0x1c, 0x6e, 0x74, 0xad, 0xa9, 0xbf, 0x50, 0x40, + 0x35, 0x21, 0x7d, 0x91, 0xe3, 0xc5, 0xca, 0xdf, 0x00, 0x83, 0xfe, 0x26, 0xa2, 0xa1, 0xcc, 0xb1, + 0xf9, 0x79, 0x2d, 0x47, 0xf4, 0xc5, 0xc2, 0x57, 0x39, 0xa7, 0x11, 0x02, 0xc0, 0x65, 0x00, 0x3a, + 0x9e, 0xab, 0x94, 0x84, 0x09, 0xdf, 0xd0, 0xe4, 0xd1, 0x70, 0x37, 0x6b, 0x61, 0x94, 0x4b, 0x37, + 0x6b, 0xab, 0xa8, 0x81, 0xa5, 0x16, 0x46, 0x17, 0xa7, 0xfa, 0x73, 0x25, 0xe5, 0xee, 0x48, 0x61, + 0xe9, 0xad, 0x3a, 0x18, 0x12, 0xea, 0xd1, 0x8a, 0x32, 0xd5, 0x3f, 0x3d, 0x32, 0x3f, 0x93, 0x4f, + 0x65, 0xbe, 0x6d, 0x48, 0x4e, 0x78, 0x3d, 0x43, 0xd7, 0x6f, 0xf6, 0xd4, 0x35, 0x54, 0x20, 0xa1, + 0xec, 0xff, 0xfa, 0xc1, 0xa0, 0x80, 0x86, 0x27, 0x41, 0x39, 0x54, 0x21, 0x0e, 0x81, 0x43, 0xe2, + 0x7b, 0xc5, 0x86, 0x13, 0x60, 0xd8, 0x72, 0x08, 0x76, 0x19, 0xdf, 0x2b, 0x89, 0xbd, 0x72, 0xb8, + 0xb0, 0x62, 0xc3, 0xa3, 0x60, 0x90, 0x79, 0xbe, 0x79, 0xbb, 0xd2, 0x3f, 0xa5, 0x4c, 0x8f, 0x1a, + 0x03, 0xcc, 0xf3, 0x6f, 0xc3, 0x19, 0x00, 0x9b, 0xc4, 0x35, 0x7d, 0xef, 0x21, 0x8f, 0x29, 0xd7, + 0x0c, 0x29, 0x06, 0xa6, 0x94, 0xe9, 0x7e, 0x63, 0xac, 0x49, 0xdc, 0x55, 0xbe, 0xb1, 0xe2, 0xae, + 0x73, 0xda, 0x59, 0x30, 0xde, 0x42, 0x0e, 0xb1, 0x11, 0xf3, 0x02, 0x2a, 0x59, 0x2c, 0xe4, 0x57, + 0x06, 0x05, 0x1e, 0xec, 0xec, 0x09, 0xa6, 0x45, 0xe4, 0xc3, 0x19, 0x70, 0x24, 0x5e, 0x35, 0x29, + 0x66, 0x82, 0x7c, 0x48, 0x90, 0xbf, 0x14, 0x6f, 0xac, 0x61, 0xc6, 0x69, 0x4f, 0x81, 0x61, 0xe4, + 0x38, 0xde, 0x43, 0x87, 0x50, 0x56, 0x39, 0x34, 0xd5, 0x3f, 0x3d, 0x6c, 0x74, 0x16, 0x60, 0x15, + 0x94, 0x6d, 0xec, 0xb6, 0xc5, 0x66, 0x59, 0x6c, 0xc6, 0xdf, 0x70, 0x3c, 0x8a, 0xac, 0x61, 0x61, + 0xb1, 0x8c, 0x92, 0x0f, 0x40, 0xb9, 0x89, 0x19, 0xb2, 0x11, 0x43, 0x15, 0x20, 0xfc, 0xfe, 0x7a, + 0xa1, 0x90, 0xbb, 0x25, 0x99, 0x65, 0xac, 0xc7, 0x60, 0xdc, 0xc9, 0xdc, 0x65, 0xfc, 0x96, 0xe3, + 0xca, 0xc8, 0x94, 0x32, 0x3d, 0x60, 0x94, 0x9b, 0xc4, 0x5d, 0xe3, 0xdf, 0x50, 0x03, 0x47, 0x85, + 0xd2, 0x26, 0x71, 0x91, 0xc5, 0x48, 0x0b, 0x9b, 0x2d, 0xe4, 0xd0, 0xca, 0xe1, 0x29, 0x65, 0xba, + 0x6c, 0x1c, 0x11, 0x5b, 0x2b, 0x72, 0xe7, 0x2e, 0x72, 0x68, 0xfa, 0x4a, 0x8f, 0xbe, 0x70, 0xa5, + 0x7f, 0xac, 0x80, 0x33, 0x22, 0x48, 0xef, 0x46, 0xfe, 0x8a, 0x14, 0x5c, 0xb0, 0xed, 0x20, 0xba, + 0x5c, 0x97, 0xc0, 0xcb, 0x91, 0x0d, 0x26, 0xb2, 0xed, 0x00, 0x53, 0x1a, 0xc6, 0x46, 0x1d, 0x7e, + 0xfd, 0xb4, 0x36, 0xd6, 0x46, 0x4d, 0xe7, 0xa2, 0x2a, 0x37, 0x54, 0xe3, 0xa5, 0x88, 0x76, 0x21, + 0x5c, 0x49, 0x6b, 0x51, 0x4a, 0x6b, 0x71, 0xb1, 0xfc, 0xf1, 0x67, 0xb5, 0xbe, 0x7f, 0x7e, 0x56, + 0xeb, 0x53, 0xef, 0x00, 0x75, 0x37, 0x75, 0xe4, 0xd5, 0x79, 0x15, 0xbc, 0x1c, 0x03, 0x26, 0xf4, + 0x31, 0x5e, 0xb2, 0xba, 0xe8, 0xb9, 0x36, 0x2f, 0x1a, 0xb8, 0xda, 0xa5, 0x5d, 0x97, 0x81, 0xd9, + 0x80, 0xd9, 0x06, 0xa6, 0x84, 0xec, 0xcb, 0xc0, 0xa4, 0x3a, 0x1d, 0x03, 0xb3, 0x1d, 0xfe, 0x82, + 0x73, 0xd5, 0x09, 0x70, 0x52, 0x00, 0xae, 0x6f, 0x06, 0x1e, 0x63, 0x0e, 0x16, 0xd9, 0x52, 0xda, + 0xa5, 0xfe, 0x2e, 0x4a, 0x9a, 0xa9, 0x5d, 0x29, 0xa6, 0x06, 0x46, 0xa8, 0x83, 0xe8, 0xa6, 0xd9, + 0xc4, 0x0c, 0x07, 0x42, 0x42, 0xbf, 0x01, 0xc4, 0xd2, 0x2d, 0xbe, 0x02, 0xe7, 0xc1, 0xb1, 0x2e, + 0x02, 0x53, 0x04, 0x18, 0x72, 0x2d, 0x2c, 0x4c, 0xec, 0x37, 0x8e, 0x76, 0x48, 0x17, 0xa2, 0x2d, + 0xf8, 0x5d, 0x50, 0x71, 0xf1, 0x23, 0x66, 0x06, 0xd8, 0x77, 0xb0, 0x4b, 0xe8, 0xa6, 0x69, 0x21, + 0xd7, 0xe6, 0xc6, 0x62, 0x91, 0x1b, 0x46, 0xe6, 0xab, 0x5a, 0xf8, 0x82, 0x6b, 0xd1, 0x0b, 0xae, + 0xad, 0x47, 0x2f, 0x78, 0xbd, 0xcc, 0xaf, 0xc3, 0x27, 0x7f, 0xa9, 0x29, 0xc6, 0x71, 0x8e, 0x62, + 0x44, 0x20, 0x8b, 0x11, 0x86, 0xfa, 0x1a, 0x98, 0x11, 0x26, 0x19, 0xb8, 0x41, 0x28, 0xc3, 0x01, + 0xb6, 0xa3, 0x18, 0x31, 0xf0, 0x43, 0x14, 0xd8, 0xd7, 0xb0, 0xeb, 0x35, 0xa3, 0x77, 0x41, 0x5d, + 0x02, 0xe7, 0x73, 0x51, 0x4b, 0x8f, 0x1c, 0x07, 0x43, 0xb6, 0x58, 0x11, 0x49, 0x79, 0xd8, 0x90, + 0x5f, 0xea, 0xbb, 0xe0, 0x55, 0x01, 0xb3, 0xe0, 0x38, 0xab, 0x88, 0x04, 0xf4, 0x2e, 0x72, 0x38, + 0x0e, 0x3f, 0x84, 0x7a, 0xbb, 0x83, 0x98, 0xf3, 0x21, 0xfd, 0x99, 0x22, 0x6d, 0xe8, 0x01, 0x27, + 0x95, 0x7a, 0x00, 0x8e, 0xf8, 0x88, 0x04, 0xfc, 0xae, 0xf3, 0x22, 0x44, 0x44, 0x84, 0x7c, 0x34, + 0x96, 0x73, 0x25, 0x1d, 0x2e, 0x23, 0x14, 0xc1, 0x25, 0xc4, 0x11, 0xe7, 0x76, 0x7c, 0x31, 0xe6, + 0x27, 0x48, 0xd4, 0xff, 0x2a, 0xe0, 0x4c, 0x4f, 0x2e, 0xb8, 0xbc, 0x63, 0x5e, 0x98, 0xf8, 0xfa, + 0x69, 0xed, 0x44, 0x78, 0x6d, 0xd2, 0x14, 0x19, 0x09, 0x62, 0x39, 0xe3, 0xfa, 0x95, 0xd2, 0x38, + 0x69, 0x8a, 0x8c, 0x7b, 0x78, 0x05, 0x1c, 0x8e, 0xa9, 0xb6, 0x70, 0x5b, 0x86, 0xdb, 0x29, 0xad, + 0x53, 0x82, 0x69, 0x61, 0x09, 0xa6, 0xad, 0x6e, 0x6f, 0x38, 0xc4, 0xba, 0x89, 0xdb, 0x46, 0x7c, + 0x54, 0x37, 0x71, 0x5b, 0x1d, 0x07, 0x50, 0x9c, 0xcb, 0x2a, 0x0a, 0x50, 0x27, 0x86, 0xbe, 0x07, + 0x8e, 0x26, 0x56, 0xe5, 0xb1, 0xac, 0x80, 0x21, 0x5f, 0xac, 0xc8, 0x3a, 0xe7, 0x7c, 0xce, 0xb3, + 0xe0, 0x2c, 0x32, 0xed, 0x4b, 0x00, 0xf5, 0x96, 0x8c, 0x87, 0x44, 0xa9, 0x70, 0xc7, 0x67, 0xd8, + 0x5e, 0x71, 0xe3, 0x4c, 0x91, 0xbf, 0x50, 0x7b, 0x20, 0x83, 0xbe, 0x17, 0x5c, 0x5c, 0x89, 0x9c, + 0xee, 0x7e, 0x79, 0x53, 0xe7, 0x85, 0xa3, 0xbb, 0x30, 0xd1, 0xf5, 0x04, 0x27, 0x0f, 0x10, 0x53, + 0x75, 0x01, 0x4c, 0x26, 0x44, 0xee, 0x41, 0xeb, 0x4f, 0x0f, 0x81, 0xa9, 0x1d, 0x30, 0xe2, 0x5f, + 0xfb, 0x7d, 0x8a, 0xd2, 0x11, 0x52, 0x2a, 0x18, 0x21, 0xb0, 0x02, 0x06, 0x45, 0x69, 0x22, 0x62, + 0xab, 0xbf, 0x5e, 0xaa, 0x28, 0x46, 0xb8, 0x00, 0xdf, 0x06, 0x03, 0x01, 0xcf, 0x71, 0x03, 0x42, + 0x9b, 0x73, 0xfc, 0x7c, 0xff, 0xf8, 0xb4, 0x36, 0x11, 0x16, 0x63, 0xd4, 0xde, 0xd2, 0x88, 0xa7, + 0x37, 0x11, 0xdb, 0xd4, 0xde, 0xc5, 0x0d, 0x64, 0xb5, 0xaf, 0x61, 0xab, 0xa2, 0x18, 0x82, 0x05, + 0x9e, 0x03, 0x63, 0xb1, 0x56, 0x21, 0xfa, 0xa0, 0xc8, 0xaf, 0xa3, 0xd1, 0xaa, 0x28, 0x79, 0xe0, + 0x7d, 0x50, 0x89, 0xc9, 0x2c, 0xaf, 0xd9, 0x24, 0x94, 0x12, 0xcf, 0x35, 0x85, 0xd4, 0x21, 0x21, + 0xf5, 0x6c, 0x0e, 0xa9, 0xc6, 0xf1, 0x08, 0x64, 0x31, 0xc6, 0x30, 0xb8, 0x16, 0xf7, 0x41, 0x25, + 0x76, 0x6d, 0x1a, 0xfe, 0x50, 0x01, 0xf8, 0x08, 0x24, 0x05, 0x7f, 0x13, 0x8c, 0xd8, 0x98, 0x5a, + 0x01, 0xf1, 0x45, 0xb1, 0x5a, 0x16, 0x9e, 0x3f, 0x1b, 0x15, 0xab, 0x51, 0x57, 0x13, 0x55, 0xaa, + 0xd7, 0x3a, 0xa4, 0xf2, 0xae, 0x74, 0x73, 0xc3, 0xfb, 0xe0, 0x64, 0xac, 0xab, 0xe7, 0xe3, 0x40, + 0x94, 0x80, 0x51, 0x3c, 0x88, 0x42, 0xad, 0x7e, 0xe6, 0xab, 0xcf, 0x2f, 0x9c, 0x96, 0xe8, 0x71, + 0xfc, 0xc8, 0x38, 0x58, 0x63, 0x01, 0x71, 0x1b, 0xc6, 0x89, 0x08, 0xe3, 0x8e, 0x84, 0x88, 0xc2, + 0xe4, 0x38, 0x18, 0xfa, 0x3e, 0x22, 0x0e, 0xb6, 0x45, 0x6d, 0x57, 0x36, 0xe4, 0x17, 0xbc, 0x08, + 0x86, 0x78, 0x67, 0xb3, 0x4d, 0x45, 0x65, 0x36, 0x36, 0xaf, 0xee, 0xa4, 0x7e, 0xdd, 0x73, 0xed, + 0x35, 0x41, 0x69, 0x48, 0x0e, 0xb8, 0x0e, 0xe2, 0x68, 0x34, 0x99, 0xb7, 0x85, 0xdd, 0xb0, 0x6e, + 0x1b, 0xae, 0x9f, 0x97, 0x5e, 0x3d, 0xf6, 0xa2, 0x57, 0x57, 0x5c, 0xf6, 0xd5, 0xe7, 0x17, 0x80, + 0x14, 0xb2, 0xe2, 0x32, 0x63, 0x2c, 0xc2, 0x58, 0x17, 0x10, 0x3c, 0x74, 0x62, 0xd4, 0x30, 0x74, + 0x46, 0xc3, 0xd0, 0x89, 0x56, 0xc3, 0xd0, 0x79, 0x03, 0x9c, 0x90, 0xb7, 0x17, 0x53, 0xd3, 0xda, + 0x0e, 0x02, 0x5e, 0xc5, 0x63, 0xdf, 0xb3, 0x36, 0x2b, 0x63, 0xc2, 0xc2, 0x63, 0xf1, 0xf6, 0x62, + 0xb8, 0xbb, 0xc4, 0x37, 0xd5, 0x8f, 0x15, 0x50, 0xdb, 0xf1, 0x5e, 0xcb, 0xf4, 0x81, 0x01, 0xe8, + 0x64, 0x06, 0xf9, 0x2e, 0x2d, 0xe5, 0xca, 0x85, 0xbd, 0x6e, 0xbb, 0xd1, 0x05, 0xac, 0x3e, 0x00, + 0xb3, 0x19, 0xed, 0x54, 0x4c, 0x7b, 0x03, 0xd1, 0x75, 0x4f, 0x7e, 0xe1, 0x83, 0x29, 0x5c, 0xd5, + 0xbb, 0x60, 0xae, 0x80, 0x48, 0xe9, 0x8e, 0x33, 0x5d, 0x29, 0x86, 0xd8, 0x51, 0xf2, 0x1c, 0xe9, + 0x24, 0x3a, 0x51, 0x94, 0x9e, 0xcf, 0x2e, 0x73, 0x93, 0x77, 0x26, 0x6f, 0xea, 0xcc, 0xb4, 0xb3, + 0x94, 0xdf, 0xce, 0x06, 0x78, 0x2d, 0x9f, 0x3a, 0xd2, 0xc4, 0x37, 0x65, 0xaa, 0x53, 0xf2, 0x67, + 0x05, 0xc1, 0xa0, 0xaa, 0x32, 0xc3, 0xd7, 0x1d, 0xcf, 0xda, 0xa2, 0xef, 0xbb, 0x8c, 0x38, 0xb7, + 0xf1, 0xa3, 0x30, 0xd6, 0xa2, 0xd7, 0xf6, 0x9e, 0x2c, 0xd8, 0xb3, 0x69, 0xa4, 0x06, 0xaf, 0x83, + 0x13, 0x1b, 0x62, 0xdf, 0xdc, 0xe6, 0x04, 0xa6, 0xa8, 0x38, 0xc3, 0x78, 0x56, 0x44, 0xcf, 0x34, + 0xbe, 0x91, 0xc1, 0xae, 0x2e, 0xc8, 0xea, 0x7b, 0x31, 0x76, 0xdd, 0x72, 0xe0, 0x35, 0x17, 0x65, + 0x0f, 0x1b, 0xb9, 0x3b, 0xd1, 0xe7, 0x2a, 0xc9, 0x3e, 0x57, 0x5d, 0x06, 0x67, 0x77, 0x85, 0xe8, + 0x94, 0xd6, 0xbb, 0xbf, 0x76, 0xdf, 0x96, 0x75, 0x7b, 0x22, 0xb6, 0x72, 0xbf, 0x95, 0xbf, 0xe9, + 0xcf, 0x9a, 0x86, 0xe4, 0x96, 0x9e, 0xe8, 0xf2, 0x4b, 0xc9, 0x2e, 0xff, 0x2c, 0x18, 0xf5, 0x1e, + 0xba, 0x5d, 0x81, 0xd4, 0x2f, 0xf6, 0x0f, 0x8b, 0xc5, 0x28, 0x41, 0xc6, 0x4d, 0xf1, 0xc0, 0x4e, + 0x4d, 0xf1, 0xe0, 0x41, 0x36, 0xc5, 0x1f, 0x81, 0x11, 0xe2, 0x12, 0x66, 0xca, 0x7a, 0x6b, 0x48, + 0x60, 0x2f, 0x15, 0xc2, 0x5e, 0x71, 0x09, 0x23, 0xc8, 0x21, 0x3f, 0x10, 0x03, 0x0f, 0x51, 0x85, + 0xf1, 0xbe, 0x85, 0x1a, 0x80, 0x23, 0x87, 0x55, 0x19, 0x6c, 0x82, 0xf1, 0x70, 0xf0, 0x40, 0x37, + 0x91, 0x4f, 0xdc, 0x46, 0x24, 0xf0, 0x90, 0x10, 0xf8, 0x4e, 0xbe, 0x02, 0x8f, 0x03, 0xac, 0x85, + 0xfc, 0x5d, 0x62, 0xa0, 0x9f, 0x5e, 0xa7, 0xf3, 0x7f, 0x3b, 0x0d, 0x06, 0xc5, 0x29, 0xc2, 0x7f, + 0x28, 0x60, 0x3c, 0x6b, 0xb6, 0x06, 0xaf, 0x16, 0x4f, 0xa4, 0xc9, 0xb1, 0x5e, 0x75, 0x61, 0x1f, + 0x08, 0x61, 0x38, 0xa9, 0x37, 0x7e, 0xf8, 0xfb, 0xbf, 0xff, 0xa4, 0x54, 0x87, 0x57, 0x7b, 0x0f, + 0x81, 0xe3, 0xb0, 0x93, 0xc3, 0x3b, 0xfd, 0x71, 0x57, 0x20, 0x3e, 0x81, 0x7f, 0x52, 0x64, 0x2d, + 0x9d, 0x4c, 0xa9, 0xf0, 0x4a, 0x71, 0x25, 0x13, 0xf3, 0xbf, 0xea, 0xd5, 0xbd, 0x03, 0x48, 0x23, + 0x17, 0x84, 0x91, 0xef, 0xc0, 0xb7, 0x0b, 0x18, 0x19, 0x8e, 0xe1, 0xf4, 0xc7, 0x22, 0xfc, 0x9f, + 0xc0, 0x4f, 0x4b, 0xf2, 0x56, 0x66, 0x8e, 0x2f, 0xe0, 0x72, 0x7e, 0x1d, 0x77, 0x1b, 0xc7, 0x54, + 0xaf, 0xef, 0x1b, 0x47, 0x9a, 0xbc, 0x21, 0x4c, 0xfe, 0x0e, 0xbc, 0x97, 0x63, 0xb8, 0x1f, 0x0f, + 0xda, 0x12, 0x7d, 0x58, 0xf2, 0x78, 0xf5, 0xc7, 0xe9, 0x57, 0x28, 0xcb, 0x27, 0xdd, 0xcd, 0xc3, + 0x9e, 0x7c, 0x92, 0x31, 0xc1, 0xd9, 0x93, 0x4f, 0xb2, 0x46, 0x2f, 0x7b, 0xf3, 0x49, 0xc2, 0xec, + 0xb4, 0x4f, 0xd2, 0x8d, 0xeb, 0x13, 0xf8, 0x5b, 0x45, 0xf6, 0x99, 0x89, 0xb1, 0x0c, 0xbc, 0x9c, + 0xdf, 0x86, 0xac, 0x69, 0x4f, 0xf5, 0xca, 0x9e, 0xf9, 0xa5, 0xed, 0x6f, 0x09, 0xdb, 0xe7, 0xe1, + 0x6c, 0x6f, 0xdb, 0x99, 0x04, 0x08, 0x27, 0xfd, 0xf0, 0xa7, 0x25, 0xf9, 0x2c, 0xee, 0x3e, 0x67, + 0x81, 0x77, 0xf2, 0xab, 0x98, 0x6b, 0xbe, 0x53, 0x5d, 0x3d, 0x38, 0x40, 0xe9, 0x84, 0x9b, 0xc2, + 0x09, 0x4b, 0x70, 0xb1, 0xb7, 0x13, 0x82, 0x18, 0xb1, 0x73, 0x2b, 0x02, 0x81, 0x69, 0x86, 0x73, + 0x23, 0xf8, 0xa3, 0x92, 0xac, 0x38, 0x76, 0x9d, 0xf4, 0xc0, 0xdb, 0xf9, 0xad, 0xc8, 0x33, 0x81, + 0xaa, 0xde, 0x39, 0x30, 0x3c, 0xe9, 0x94, 0x25, 0xe1, 0x94, 0x2b, 0xf0, 0x52, 0x6f, 0xa7, 0xc8, + 0x28, 0x37, 0x7d, 0x8e, 0x9a, 0x4a, 0xff, 0xbf, 0x52, 0xc0, 0x48, 0xd7, 0x28, 0x05, 0xbe, 0x99, + 0x5f, 0xcf, 0xc4, 0x48, 0xa6, 0xfa, 0x56, 0x71, 0x46, 0x69, 0xc9, 0xac, 0xb0, 0x64, 0x06, 0x4e, + 0xf7, 0xb6, 0x24, 0x7c, 0xfc, 0x3b, 0xb1, 0xbd, 0xfb, 0x38, 0xa5, 0x48, 0x6c, 0xe7, 0x9a, 0xf3, + 0x14, 0x89, 0xed, 0x7c, 0x93, 0x9e, 0x22, 0xb1, 0xed, 0x71, 0x10, 0x93, 0xb8, 0x66, 0xa7, 0x05, + 0x4b, 0x1d, 0xe6, 0xaf, 0x4b, 0x72, 0x28, 0x9a, 0xa7, 0x3d, 0x82, 0xef, 0xef, 0xf5, 0x81, 0xde, + 0xb5, 0xc3, 0xab, 0xde, 0x3d, 0x68, 0x58, 0xe9, 0xa9, 0x7b, 0xc2, 0x53, 0xeb, 0xd0, 0x28, 0x5c, + 0x0d, 0x98, 0x3e, 0x0e, 0x3a, 0x4e, 0xcb, 0x7a, 0x12, 0x7f, 0x59, 0x02, 0xaf, 0xe4, 0xe9, 0xb7, + 0xe0, 0xea, 0x3e, 0x1e, 0xfa, 0xcc, 0x4e, 0xb2, 0xfa, 0xde, 0x01, 0x22, 0x4a, 0x4f, 0x59, 0xc2, + 0x53, 0xf7, 0xe1, 0x87, 0x45, 0x3c, 0x95, 0x1c, 0x2f, 0xf5, 0xae, 0x22, 0xfe, 0xad, 0x80, 0x13, + 0x3b, 0x4c, 0x0b, 0xe0, 0xe2, 0x7e, 0x66, 0x0d, 0x91, 0x63, 0xae, 0xed, 0x0f, 0xa4, 0xf8, 0xfd, + 0x8a, 0x2d, 0xde, 0xf1, 0x7e, 0xfd, 0x4b, 0x91, 0x2d, 0x62, 0x56, 0x27, 0x0c, 0x0b, 0x4c, 0x58, + 0x76, 0xe9, 0xb6, 0xab, 0xcb, 0xfb, 0x85, 0x29, 0x5e, 0x3d, 0xef, 0xd0, 0xb8, 0xc3, 0xff, 0xa4, + 0xff, 0x60, 0x9e, 0x6c, 0xad, 0xe1, 0xf5, 0xe2, 0x47, 0x94, 0xd9, 0xdf, 0x57, 0x6f, 0xec, 0x1f, + 0x68, 0x1f, 0x3d, 0x03, 0xb1, 0xf5, 0xc7, 0xf1, 0x78, 0xe1, 0x09, 0xfc, 0x73, 0x54, 0x0b, 0x26, + 0xd2, 0x53, 0x91, 0x5a, 0x30, 0x6b, 0x82, 0x50, 0xbd, 0xb2, 0x67, 0x7e, 0x69, 0xda, 0xb2, 0x30, + 0xed, 0x2a, 0xbc, 0x5c, 0x34, 0x01, 0x26, 0xa3, 0xb8, 0xfe, 0xc1, 0x17, 0xcf, 0x26, 0x95, 0x2f, + 0x9f, 0x4d, 0x2a, 0x7f, 0x7d, 0x36, 0xa9, 0x7c, 0xf2, 0x7c, 0xb2, 0xef, 0xcb, 0xe7, 0x93, 0x7d, + 0x7f, 0x78, 0x3e, 0xd9, 0x77, 0xef, 0x52, 0x83, 0xb0, 0xcd, 0xed, 0x0d, 0xcd, 0xf2, 0x9a, 0xf2, + 0x3f, 0x5f, 0xba, 0x44, 0x5d, 0x88, 0x45, 0xb5, 0xde, 0xd0, 0x1f, 0xa5, 0x6a, 0xcf, 0xb6, 0x8f, + 0xe9, 0xc6, 0x90, 0xf8, 0xeb, 0xe1, 0xb7, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x55, 0x10, 0x5d, + 0x50, 0x99, 0x24, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2713,10 +2730,17 @@ func (m *QueryConsumerChainsRequest) MarshalToSizedBuffer(dAtA []byte) (int, err _ = i var l int _ = l - if m.Limit != 0 { - i = encodeVarintQuery(dAtA, i, uint64(m.Limit)) + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x10 + dAtA[i] = 0x12 } if m.Phase != 0 { i = encodeVarintQuery(dAtA, i, uint64(m.Phase)) @@ -2746,6 +2770,18 @@ func (m *QueryConsumerChainsResponse) MarshalToSizedBuffer(dAtA []byte) (int, er _ = i var l int _ = l + if m.Pagination != nil { + { + size, err := m.Pagination.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } if len(m.Chains) > 0 { for iNdEx := len(m.Chains) - 1; iNdEx >= 0; iNdEx-- { { @@ -3054,12 +3090,12 @@ func (m *QueryThrottleStateResponse) MarshalToSizedBuffer(dAtA []byte) (int, err _ = i var l int _ = l - n3, err3 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.NextReplenishCandidate, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.NextReplenishCandidate):]) - if err3 != nil { - return 0, err3 + n5, err5 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.NextReplenishCandidate, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.NextReplenishCandidate):]) + if err5 != nil { + return 0, err5 } - i -= n3 - i = encodeVarintQuery(dAtA, i, uint64(n3)) + i -= n5 + i = encodeVarintQuery(dAtA, i, uint64(n5)) i-- dAtA[i] = 0x1a if m.SlashMeterAllowance != 0 { @@ -3873,7 +3909,7 @@ func (m *QueryConsumerChainResponse) MarshalToSizedBuffer(dAtA []byte) (int, err i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x32 + dAtA[i] = 0x3a } if m.InitParams != nil { { @@ -3885,7 +3921,7 @@ func (m *QueryConsumerChainResponse) MarshalToSizedBuffer(dAtA []byte) (int, err i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x32 } { size, err := m.Metadata.MarshalToSizedBuffer(dAtA[:i]) @@ -3896,26 +3932,33 @@ func (m *QueryConsumerChainResponse) MarshalToSizedBuffer(dAtA []byte) (int, err i = encodeVarintQuery(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a if len(m.Phase) > 0 { i -= len(m.Phase) copy(dAtA[i:], m.Phase) i = encodeVarintQuery(dAtA, i, uint64(len(m.Phase))) i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } if len(m.OwnerAddress) > 0 { i -= len(m.OwnerAddress) copy(dAtA[i:], m.OwnerAddress) i = encodeVarintQuery(dAtA, i, uint64(len(m.OwnerAddress))) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a } if len(m.ChainId) > 0 { i -= len(m.ChainId) copy(dAtA[i:], m.ChainId) i = encodeVarintQuery(dAtA, i, uint64(len(m.ChainId))) i-- + dAtA[i] = 0x12 + } + if len(m.ConsumerId) > 0 { + i -= len(m.ConsumerId) + copy(dAtA[i:], m.ConsumerId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ConsumerId))) + i-- dAtA[i] = 0xa } return len(dAtA) - i, nil @@ -3965,8 +4008,9 @@ func (m *QueryConsumerChainsRequest) Size() (n int) { if m.Phase != 0 { n += 1 + sovQuery(uint64(m.Phase)) } - if m.Limit != 0 { - n += 1 + sovQuery(uint64(m.Limit)) + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) } return n } @@ -3983,6 +4027,10 @@ func (m *QueryConsumerChainsResponse) Size() (n int) { n += 1 + l + sovQuery(uint64(l)) } } + if m.Pagination != nil { + l = m.Pagination.Size() + n += 1 + l + sovQuery(uint64(l)) + } return n } @@ -4449,6 +4497,10 @@ func (m *QueryConsumerChainResponse) Size() (n int) { } var l int _ = l + l = len(m.ConsumerId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } l = len(m.ChainId) if l > 0 { n += 1 + l + sovQuery(uint64(l)) @@ -4694,10 +4746,10 @@ func (m *QueryConsumerChainsRequest) Unmarshal(dAtA []byte) error { } } case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Limit", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) } - m.Limit = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -4707,11 +4759,28 @@ func (m *QueryConsumerChainsRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Limit |= int32(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageRequest{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -4796,6 +4865,42 @@ func (m *QueryConsumerChainsResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Pagination", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Pagination == nil { + m.Pagination = &query.PageResponse{} + } + if err := m.Pagination.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) @@ -7873,6 +7978,38 @@ func (m *QueryConsumerChainResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsumerId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ConsumerId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) } @@ -7904,7 +8041,7 @@ func (m *QueryConsumerChainResponse) Unmarshal(dAtA []byte) error { } m.ChainId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field OwnerAddress", wireType) } @@ -7936,7 +8073,7 @@ func (m *QueryConsumerChainResponse) Unmarshal(dAtA []byte) error { } m.OwnerAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Phase", wireType) } @@ -7968,7 +8105,7 @@ func (m *QueryConsumerChainResponse) Unmarshal(dAtA []byte) error { } m.Phase = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Metadata", wireType) } @@ -8001,7 +8138,7 @@ func (m *QueryConsumerChainResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field InitParams", wireType) } @@ -8037,7 +8174,7 @@ func (m *QueryConsumerChainResponse) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 6: + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field PowerShapingParams", wireType) } diff --git a/x/ccv/provider/types/query.pb.gw.go b/x/ccv/provider/types/query.pb.gw.go index e6fdfc5f76..f332e03b69 100644 --- a/x/ccv/provider/types/query.pb.gw.go +++ b/x/ccv/provider/types/query.pb.gw.go @@ -87,6 +87,10 @@ func local_request_Query_QueryConsumerGenesis_0(ctx context.Context, marshaler r } +var ( + filter_Query_QueryConsumerChains_0 = &utilities.DoubleArray{Encoding: map[string]int{"phase": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} +) + func request_Query_QueryConsumerChains_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryConsumerChainsRequest var metadata runtime.ServerMetadata @@ -112,15 +116,11 @@ func request_Query_QueryConsumerChains_0(ctx context.Context, marshaler runtime. protoReq.Phase = ConsumerPhase(e) - val, ok = pathParams["limit"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "limit") + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - - protoReq.Limit, err = runtime.Int32(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "limit", err) + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_QueryConsumerChains_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } msg, err := client.QueryConsumerChains(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) @@ -153,15 +153,11 @@ func local_request_Query_QueryConsumerChains_0(ctx context.Context, marshaler ru protoReq.Phase = ConsumerPhase(e) - val, ok = pathParams["limit"] - if !ok { - return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "limit") + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } - - protoReq.Limit, err = runtime.Int32(val) - - if err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "limit", err) + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_QueryConsumerChains_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } msg, err := server.QueryConsumerChains(ctx, &protoReq) @@ -1491,7 +1487,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie var ( pattern_Query_QueryConsumerGenesis_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"interchain_security", "ccv", "provider", "consumer_genesis", "consumer_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_QueryConsumerChains_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"interchain_security", "ccv", "provider", "consumer_chains", "phase", "limit"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_QueryConsumerChains_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4}, []string{"interchain_security", "ccv", "provider", "consumer_chains", "phase"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_QueryValidatorConsumerAddr_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 1, 0, 4, 1, 5, 4, 1, 0, 4, 1, 5, 5}, []string{"interchain_security", "ccv", "provider", "validator_consumer_addr", "consumer_id", "provider_address"}, "", runtime.AssumeColonVerbOpt(false)))