diff --git a/CHANGELOG.md b/CHANGELOG.md index e78cb13ce..fe41a8a51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Improvements +- [#470](https://github.com/babylonlabs-io/babylon/pull/470) Return full consumer info and remove DB object +usage in `x/btcstkconsumer` queries - [#483](https://github.com/babylonlabs-io/babylon/pull/483) Upgrade wasmd and wasmvm to latest versions (related to security advisories CWA-2025-001 and CWA-2025-002) - [#464](https://github.com/babylonlabs-io/babylon/pull/464) Update security email. Fix site / repository refs diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml index 7206053f4..85d1d4b10 100644 --- a/client/docs/swagger-ui/swagger.yaml +++ b/client/docs/swagger-ui/swagger.yaml @@ -9829,10 +9829,47 @@ paths: schema: type: object properties: - consumer_ids: + consumer_registers: type: array items: - type: string + type: object + properties: + consumer_id: + type: string + title: >- + consumer_id is the ID of the consumer + + - for Cosmos SDK chains, the consumer ID will be the IBC + client ID + + - for ETH L2 chains, the consumer ID will be the chain + ID of the ETH L2 + chain + consumer_name: + type: string + title: consumer_name is the name of the consumer + consumer_description: + type: string + title: >- + consumer_description is a description for the consumer + (can be empty) + cosmos_channel_id: + type: string + title: |- + cosmos_channel_id is the IBC channel ID for the consumer + set only for Cosmos integration + eth_l2_finality_contract_address: + type: string + title: >- + eth_l2_finality_contract_address is the address of the + finality contract + + set only for ETH L2 integration + title: >- + ConsumerRegisterResponse contains the information for a + registered consumer + + The struct is used in the query responses title: >- consumer_ids are IDs of the consumers in ascending alphabetical order @@ -10133,7 +10170,7 @@ paths: schema: type: object properties: - consumers_register: + consumer_registers: type: array items: type: object @@ -10157,33 +10194,23 @@ paths: title: >- consumer_description is a description for the consumer (can be empty) - cosmos_consumer_metadata: - type: object - properties: - channel_id: - type: string - title: >- - channel_id defines the IBC channel ID for the - consumer chain + cosmos_channel_id: + type: string + title: |- + cosmos_channel_id is the IBC channel ID for the consumer + set only for Cosmos integration + eth_l2_finality_contract_address: + type: string title: >- - CosmosConsumerMetadata is the metadata for the Cosmos - integration - eth_l2_consumer_metadata: - type: object - properties: - finality_contract_address: - type: string - title: >- - finality_contract_address is the address of the - finality contract for + eth_l2_finality_contract_address is the address of the + finality contract - the ETH L2 integration - title: >- - ETHL2ConsumerMetadata is the metadata for the ETH L2 - integration + set only for ETH L2 integration title: >- - ConsumerRegister is the registration information of a - consumer + ConsumerRegisterResponse contains the information for a + registered consumer + + The struct is used in the query responses description: >- QueryConsumersRegistryResponse is response type for the Query/ConsumersRegistry RPC method. @@ -21464,7 +21491,7 @@ definitions: transition and the time (in both timestamp and block height) of this transition. description: RawCheckpointWithMetaResponse wraps the raw checkpoint with metadata. - babylon.btcstkconsumer.v1.ConsumerRegister: + babylon.btcstkconsumer.v1.ConsumerRegisterResponse: type: object properties: consumer_id: @@ -21483,41 +21510,23 @@ definitions: consumer_description: type: string title: consumer_description is a description for the consumer (can be empty) - cosmos_consumer_metadata: - type: object - properties: - channel_id: - type: string - title: channel_id defines the IBC channel ID for the consumer chain - title: CosmosConsumerMetadata is the metadata for the Cosmos integration - eth_l2_consumer_metadata: - type: object - properties: - finality_contract_address: - type: string - title: >- - finality_contract_address is the address of the finality contract - for - - the ETH L2 integration - title: ETHL2ConsumerMetadata is the metadata for the ETH L2 integration - title: ConsumerRegister is the registration information of a consumer - babylon.btcstkconsumer.v1.CosmosConsumerMetadata: - type: object - properties: - channel_id: - type: string - title: channel_id defines the IBC channel ID for the consumer chain - title: CosmosConsumerMetadata is the metadata for the Cosmos integration - babylon.btcstkconsumer.v1.ETHL2ConsumerMetadata: - type: object - properties: - finality_contract_address: + cosmos_channel_id: type: string title: |- - finality_contract_address is the address of the finality contract for - the ETH L2 integration - title: ETHL2ConsumerMetadata is the metadata for the ETH L2 integration + cosmos_channel_id is the IBC channel ID for the consumer + set only for Cosmos integration + eth_l2_finality_contract_address: + type: string + title: >- + eth_l2_finality_contract_address is the address of the finality + contract + + set only for ETH L2 integration + title: >- + ConsumerRegisterResponse contains the information for a registered + consumer + + The struct is used in the query responses babylon.btcstkconsumer.v1.FinalityProviderResponse: type: object properties: @@ -21626,10 +21635,47 @@ definitions: babylon.btcstkconsumer.v1.QueryConsumerRegistryListResponse: type: object properties: - consumer_ids: + consumer_registers: type: array items: - type: string + type: object + properties: + consumer_id: + type: string + title: >- + consumer_id is the ID of the consumer + + - for Cosmos SDK chains, the consumer ID will be the IBC client + ID + + - for ETH L2 chains, the consumer ID will be the chain ID of the + ETH L2 + chain + consumer_name: + type: string + title: consumer_name is the name of the consumer + consumer_description: + type: string + title: >- + consumer_description is a description for the consumer (can be + empty) + cosmos_channel_id: + type: string + title: |- + cosmos_channel_id is the IBC channel ID for the consumer + set only for Cosmos integration + eth_l2_finality_contract_address: + type: string + title: >- + eth_l2_finality_contract_address is the address of the finality + contract + + set only for ETH L2 integration + title: >- + ConsumerRegisterResponse contains the information for a registered + consumer + + The struct is used in the query responses title: consumer_ids are IDs of the consumers in ascending alphabetical order pagination: title: pagination defines the pagination in the response @@ -21664,7 +21710,7 @@ definitions: babylon.btcstkconsumer.v1.QueryConsumersRegistryResponse: type: object properties: - consumers_register: + consumer_registers: type: array items: type: object @@ -21688,27 +21734,23 @@ definitions: title: >- consumer_description is a description for the consumer (can be empty) - cosmos_consumer_metadata: - type: object - properties: - channel_id: - type: string - title: channel_id defines the IBC channel ID for the consumer chain + cosmos_channel_id: + type: string + title: |- + cosmos_channel_id is the IBC channel ID for the consumer + set only for Cosmos integration + eth_l2_finality_contract_address: + type: string title: >- - CosmosConsumerMetadata is the metadata for the Cosmos - integration - eth_l2_consumer_metadata: - type: object - properties: - finality_contract_address: - type: string - title: >- - finality_contract_address is the address of the finality - contract for + eth_l2_finality_contract_address is the address of the finality + contract + + set only for ETH L2 integration + title: >- + ConsumerRegisterResponse contains the information for a registered + consumer - the ETH L2 integration - title: ETHL2ConsumerMetadata is the metadata for the ETH L2 integration - title: ConsumerRegister is the registration information of a consumer + The struct is used in the query responses description: >- QueryConsumersRegistryResponse is response type for the Query/ConsumersRegistry RPC method. diff --git a/proto/babylon/btcstkconsumer/v1/query.proto b/proto/babylon/btcstkconsumer/v1/query.proto index d932d9819..ee2145476 100644 --- a/proto/babylon/btcstkconsumer/v1/query.proto +++ b/proto/babylon/btcstkconsumer/v1/query.proto @@ -9,7 +9,6 @@ import "cosmos/staking/v1beta1/staking.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "babylon/btcstaking/v1/btcstaking.proto"; import "babylon/btcstaking/v1/pop.proto"; -import "babylon/btcstkconsumer/v1/btcstkconsumer.proto"; import "babylon/btcstkconsumer/v1/params.proto"; option go_package = "github.com/babylonlabs-io/babylon/x/btcstkconsumer/types"; @@ -65,8 +64,8 @@ message QueryConsumerRegistryListRequest { // QueryConsumerRegistryListResponse is response type for the Query/ConsumerRegistryList RPC method message QueryConsumerRegistryListResponse { - // consumer_ids are IDs of the consumers in ascending alphabetical order - repeated string consumer_ids = 1; + // consumer_registers are the registered consumers in ascending alphabetical order + repeated ConsumerRegisterResponse consumer_registers = 1; // pagination defines the pagination in the response cosmos.base.query.v1beta1.PageResponse pagination = 2; } @@ -76,7 +75,7 @@ message QueryConsumersRegistryRequest { repeated string consumer_ids = 1; } // QueryConsumersRegistryResponse is response type for the Query/ConsumersRegistry RPC method. message QueryConsumersRegistryResponse { - repeated babylon.btcstkconsumer.v1.ConsumerRegister consumers_register = 1; + repeated ConsumerRegisterResponse consumer_registers = 1; } // QueryFinalityProvidersRequest is the request type for the @@ -153,3 +152,23 @@ message QueryFinalityProviderConsumerRequest { message QueryFinalityProviderConsumerResponse { string consumer_id = 1; } + +// ConsumerRegisterResponse contains the information for a registered consumer +// The struct is used in the query responses +message ConsumerRegisterResponse { + // consumer_id is the ID of the consumer + // - for Cosmos SDK chains, the consumer ID will be the IBC client ID + // - for ETH L2 chains, the consumer ID will be the chain ID of the ETH L2 + // chain + string consumer_id = 1; + // consumer_name is the name of the consumer + string consumer_name = 2; + // consumer_description is a description for the consumer (can be empty) + string consumer_description = 3; + // cosmos_channel_id is the IBC channel ID for the consumer + // set only for Cosmos integration + string cosmos_channel_id = 4; + // eth_l2_finality_contract_address is the address of the finality contract + // set only for ETH L2 integration + string eth_l2_finality_contract_address = 5 [(cosmos_proto.scalar) = "cosmos.AddressString"]; +} \ No newline at end of file diff --git a/x/btcstkconsumer/keeper/grpc_query.go b/x/btcstkconsumer/keeper/grpc_query.go index 81aa1b8df..0051e80f4 100644 --- a/x/btcstkconsumer/keeper/grpc_query.go +++ b/x/btcstkconsumer/keeper/grpc_query.go @@ -26,11 +26,15 @@ func (k Keeper) ConsumerRegistryList(c context.Context, req *types.QueryConsumer ctx := sdk.UnwrapSDKContext(c) - consumerIDs := []string{} + consumerRegisters := []*types.ConsumerRegisterResponse{} store := k.consumerRegistryStore(ctx) pageRes, err := query.Paginate(store, req.Pagination, func(key, value []byte) error { consumerID := string(key) - consumerIDs = append(consumerIDs, consumerID) + consumerRegister, err := k.GetConsumerRegister(ctx, consumerID) + if err != nil { + return err + } + consumerRegisters = append(consumerRegisters, consumerRegister.ToResponse()) return nil }) if err != nil { @@ -38,8 +42,8 @@ func (k Keeper) ConsumerRegistryList(c context.Context, req *types.QueryConsumer } resp := &types.QueryConsumerRegistryListResponse{ - ConsumerIds: consumerIDs, - Pagination: pageRes, + ConsumerRegisters: consumerRegisters, + Pagination: pageRes, } return resp, nil } @@ -66,17 +70,17 @@ func (k Keeper) ConsumersRegistry(c context.Context, req *types.QueryConsumersRe } ctx := sdk.UnwrapSDKContext(c) - var consumersRegister []*types.ConsumerRegister + consumersRegisters := []*types.ConsumerRegisterResponse{} for _, consumerID := range req.ConsumerIds { consumerRegister, err := k.GetConsumerRegister(ctx, consumerID) if err != nil { return nil, err } - consumersRegister = append(consumersRegister, consumerRegister) + consumersRegisters = append(consumersRegisters, consumerRegister.ToResponse()) } - resp := &types.QueryConsumersRegistryResponse{ConsumersRegister: consumersRegister} + resp := &types.QueryConsumersRegistryResponse{ConsumerRegisters: consumersRegisters} return resp, nil } diff --git a/x/btcstkconsumer/keeper/grpc_query_test.go b/x/btcstkconsumer/keeper/grpc_query_test.go index a14351a9f..07622e546 100644 --- a/x/btcstkconsumer/keeper/grpc_query_test.go +++ b/x/btcstkconsumer/keeper/grpc_query_test.go @@ -53,11 +53,11 @@ func FuzzConsumerRegistryList(f *testing.F) { }, }) require.NoError(t, err) - actualConsumerIDs := resp.ConsumerIds + actualConsumerRegisters := resp.ConsumerRegisters - require.Equal(t, limit, uint64(len(actualConsumerIDs))) + require.Equal(t, limit, uint64(len(actualConsumerRegisters))) for i := uint64(0); i < limit; i++ { - require.Contains(t, allConsumerIDs, actualConsumerIDs[i]) + require.Contains(t, allConsumerIDs, actualConsumerRegisters[i].ConsumerId) } }) } @@ -98,7 +98,7 @@ func FuzzConsumersRegistry(f *testing.F) { }) require.NoError(t, err) - for i, respData := range resp.ConsumersRegister { + for i, respData := range resp.ConsumerRegisters { require.Equal(t, consumersRegister[i].consumerID, respData.ConsumerId) } }) diff --git a/x/btcstkconsumer/types/chain_register.go b/x/btcstkconsumer/types/consumer_register.go similarity index 70% rename from x/btcstkconsumer/types/chain_register.go rename to x/btcstkconsumer/types/consumer_register.go index ea3223c32..c5c8c292a 100644 --- a/x/btcstkconsumer/types/chain_register.go +++ b/x/btcstkconsumer/types/consumer_register.go @@ -47,3 +47,20 @@ func (cr *ConsumerRegister) Type() ConsumerType { } return ConsumerType_ETH_L2 } + +func (cr *ConsumerRegister) ToResponse() *ConsumerRegisterResponse { + resp := &ConsumerRegisterResponse{ + ConsumerId: cr.ConsumerId, + ConsumerName: cr.ConsumerName, + ConsumerDescription: cr.ConsumerDescription, + } + if cr.ConsumerMetadata != nil { + switch md := cr.ConsumerMetadata.(type) { + case *ConsumerRegister_CosmosConsumerMetadata: + resp.CosmosChannelId = md.CosmosConsumerMetadata.ChannelId + case *ConsumerRegister_EthL2ConsumerMetadata: + resp.EthL2FinalityContractAddress = md.EthL2ConsumerMetadata.FinalityContractAddress + } + } + return resp +} diff --git a/x/btcstkconsumer/types/query.pb.go b/x/btcstkconsumer/types/query.pb.go index 9acd0cb4f..1bb035f08 100644 --- a/x/btcstkconsumer/types/query.pb.go +++ b/x/btcstkconsumer/types/query.pb.go @@ -167,8 +167,8 @@ func (m *QueryConsumerRegistryListRequest) GetPagination() *query.PageRequest { // QueryConsumerRegistryListResponse is response type for the Query/ConsumerRegistryList RPC method type QueryConsumerRegistryListResponse struct { - // consumer_ids are IDs of the consumers in ascending alphabetical order - ConsumerIds []string `protobuf:"bytes,1,rep,name=consumer_ids,json=consumerIds,proto3" json:"consumer_ids,omitempty"` + // consumer_registers are the registered consumers in ascending alphabetical order + ConsumerRegisters []*ConsumerRegisterResponse `protobuf:"bytes,1,rep,name=consumer_registers,json=consumerRegisters,proto3" json:"consumer_registers,omitempty"` // pagination defines the pagination in the response Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -206,9 +206,9 @@ func (m *QueryConsumerRegistryListResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryConsumerRegistryListResponse proto.InternalMessageInfo -func (m *QueryConsumerRegistryListResponse) GetConsumerIds() []string { +func (m *QueryConsumerRegistryListResponse) GetConsumerRegisters() []*ConsumerRegisterResponse { if m != nil { - return m.ConsumerIds + return m.ConsumerRegisters } return nil } @@ -267,7 +267,7 @@ func (m *QueryConsumersRegistryRequest) GetConsumerIds() []string { // QueryConsumersRegistryResponse is response type for the Query/ConsumersRegistry RPC method. type QueryConsumersRegistryResponse struct { - ConsumersRegister []*ConsumerRegister `protobuf:"bytes,1,rep,name=consumers_register,json=consumersRegister,proto3" json:"consumers_register,omitempty"` + ConsumerRegisters []*ConsumerRegisterResponse `protobuf:"bytes,1,rep,name=consumer_registers,json=consumerRegisters,proto3" json:"consumer_registers,omitempty"` } func (m *QueryConsumersRegistryResponse) Reset() { *m = QueryConsumersRegistryResponse{} } @@ -303,9 +303,9 @@ func (m *QueryConsumersRegistryResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryConsumersRegistryResponse proto.InternalMessageInfo -func (m *QueryConsumersRegistryResponse) GetConsumersRegister() []*ConsumerRegister { +func (m *QueryConsumersRegistryResponse) GetConsumerRegisters() []*ConsumerRegisterResponse { if m != nil { - return m.ConsumersRegister + return m.ConsumerRegisters } return nil } @@ -731,6 +731,94 @@ func (m *QueryFinalityProviderConsumerResponse) GetConsumerId() string { return "" } +// ConsumerRegisterResponse contains the information for a registered consumer +// The struct is used in the query responses +type ConsumerRegisterResponse struct { + // consumer_id is the ID of the consumer + // - for Cosmos SDK chains, the consumer ID will be the IBC client ID + // - for ETH L2 chains, the consumer ID will be the chain ID of the ETH L2 + // chain + ConsumerId string `protobuf:"bytes,1,opt,name=consumer_id,json=consumerId,proto3" json:"consumer_id,omitempty"` + // consumer_name is the name of the consumer + ConsumerName string `protobuf:"bytes,2,opt,name=consumer_name,json=consumerName,proto3" json:"consumer_name,omitempty"` + // consumer_description is a description for the consumer (can be empty) + ConsumerDescription string `protobuf:"bytes,3,opt,name=consumer_description,json=consumerDescription,proto3" json:"consumer_description,omitempty"` + // cosmos_channel_id is the IBC channel ID for the consumer + // set only for Cosmos integration + CosmosChannelId string `protobuf:"bytes,4,opt,name=cosmos_channel_id,json=cosmosChannelId,proto3" json:"cosmos_channel_id,omitempty"` + // eth_l2_finality_contract_address is the address of the finality contract + // set only for ETH L2 integration + EthL2FinalityContractAddress string `protobuf:"bytes,5,opt,name=eth_l2_finality_contract_address,json=ethL2FinalityContractAddress,proto3" json:"eth_l2_finality_contract_address,omitempty"` +} + +func (m *ConsumerRegisterResponse) Reset() { *m = ConsumerRegisterResponse{} } +func (m *ConsumerRegisterResponse) String() string { return proto.CompactTextString(m) } +func (*ConsumerRegisterResponse) ProtoMessage() {} +func (*ConsumerRegisterResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_4e6c48e60b6a8bd8, []int{13} +} +func (m *ConsumerRegisterResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ConsumerRegisterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ConsumerRegisterResponse.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 *ConsumerRegisterResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConsumerRegisterResponse.Merge(m, src) +} +func (m *ConsumerRegisterResponse) XXX_Size() int { + return m.Size() +} +func (m *ConsumerRegisterResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ConsumerRegisterResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ConsumerRegisterResponse proto.InternalMessageInfo + +func (m *ConsumerRegisterResponse) GetConsumerId() string { + if m != nil { + return m.ConsumerId + } + return "" +} + +func (m *ConsumerRegisterResponse) GetConsumerName() string { + if m != nil { + return m.ConsumerName + } + return "" +} + +func (m *ConsumerRegisterResponse) GetConsumerDescription() string { + if m != nil { + return m.ConsumerDescription + } + return "" +} + +func (m *ConsumerRegisterResponse) GetCosmosChannelId() string { + if m != nil { + return m.CosmosChannelId + } + return "" +} + +func (m *ConsumerRegisterResponse) GetEthL2FinalityContractAddress() string { + if m != nil { + return m.EthL2FinalityContractAddress + } + return "" +} + func init() { proto.RegisterType((*QueryParamsRequest)(nil), "babylon.btcstkconsumer.v1.QueryParamsRequest") proto.RegisterType((*QueryParamsResponse)(nil), "babylon.btcstkconsumer.v1.QueryParamsResponse") @@ -745,6 +833,7 @@ func init() { proto.RegisterType((*FinalityProviderResponse)(nil), "babylon.btcstkconsumer.v1.FinalityProviderResponse") proto.RegisterType((*QueryFinalityProviderConsumerRequest)(nil), "babylon.btcstkconsumer.v1.QueryFinalityProviderConsumerRequest") proto.RegisterType((*QueryFinalityProviderConsumerResponse)(nil), "babylon.btcstkconsumer.v1.QueryFinalityProviderConsumerResponse") + proto.RegisterType((*ConsumerRegisterResponse)(nil), "babylon.btcstkconsumer.v1.ConsumerRegisterResponse") } func init() { @@ -752,78 +841,84 @@ func init() { } var fileDescriptor_4e6c48e60b6a8bd8 = []byte{ - // 1128 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4b, 0x6f, 0x1b, 0x45, - 0x1c, 0xcf, 0xe6, 0x61, 0xf0, 0xb8, 0x95, 0xe2, 0x21, 0xaa, 0x5c, 0x53, 0x9c, 0x64, 0xfb, 0xc0, - 0x94, 0x7a, 0x17, 0x27, 0x91, 0x48, 0xd5, 0x96, 0x87, 0xe3, 0xb6, 0x09, 0xa4, 0xaa, 0x59, 0x38, - 0x95, 0xc3, 0xb2, 0x8f, 0xf1, 0x7a, 0xb1, 0xbd, 0xb3, 0xdd, 0x19, 0x9b, 0x58, 0x25, 0x07, 0x38, - 0x71, 0x03, 0xc1, 0x97, 0xe0, 0x84, 0x38, 0xf4, 0x43, 0xf4, 0x40, 0x51, 0x55, 0x0e, 0x40, 0x0f, - 0x11, 0x4a, 0x90, 0xb8, 0xf0, 0x21, 0xd0, 0xce, 0xce, 0x3a, 0xde, 0xf5, 0x63, 0x13, 0x8b, 0x4b, - 0xe4, 0x99, 0xff, 0xeb, 0xf7, 0xfb, 0xfd, 0x67, 0xe6, 0xbf, 0x01, 0x97, 0x75, 0x4d, 0xef, 0xb5, - 0xb0, 0x23, 0xeb, 0xd4, 0x20, 0xb4, 0x69, 0x60, 0x87, 0x74, 0xda, 0xc8, 0x93, 0xbb, 0x65, 0xf9, - 0x61, 0x07, 0x79, 0x3d, 0xc9, 0xf5, 0x30, 0xc5, 0xf0, 0x3c, 0x77, 0x93, 0xa2, 0x6e, 0x52, 0xb7, - 0x9c, 0xcf, 0x6a, 0x6d, 0xdb, 0xc1, 0x32, 0xfb, 0x1b, 0x78, 0xe7, 0x97, 0x2c, 0x6c, 0x61, 0xf6, - 0x53, 0xf6, 0x7f, 0xf1, 0xdd, 0x0b, 0x16, 0xc6, 0x56, 0x0b, 0xc9, 0x9a, 0x6b, 0xcb, 0x9a, 0xe3, - 0x60, 0xaa, 0x51, 0x1b, 0x3b, 0x84, 0x5b, 0xcf, 0x1b, 0x98, 0xb4, 0x31, 0x51, 0x83, 0xb0, 0x60, - 0xc1, 0x4d, 0x97, 0x82, 0x95, 0x4c, 0xa8, 0xd6, 0xb4, 0x1d, 0x4b, 0xee, 0x96, 0x75, 0x44, 0xb5, - 0x72, 0xb8, 0xe6, 0x5e, 0x57, 0xb9, 0x97, 0xae, 0x11, 0x14, 0x60, 0xef, 0x3b, 0xba, 0x9a, 0x65, - 0x3b, 0xac, 0x1a, 0xf7, 0xbd, 0x12, 0x61, 0x1d, 0x66, 0x1d, 0x58, 0x71, 0xbf, 0xe5, 0xd1, 0x7e, - 0x2e, 0x76, 0xb9, 0x83, 0x34, 0x5e, 0xbe, 0x98, 0x52, 0xa3, 0x0a, 0x47, 0xfc, 0x5d, 0xcd, 0xd3, - 0xda, 0x9c, 0xb2, 0xb8, 0x04, 0xe0, 0x47, 0x3e, 0x85, 0x1a, 0xdb, 0x54, 0xd0, 0xc3, 0x0e, 0x22, - 0x54, 0xfc, 0x14, 0xbc, 0x12, 0xd9, 0x25, 0x2e, 0x76, 0x08, 0x82, 0x55, 0x90, 0x0a, 0x82, 0x73, - 0xc2, 0x8a, 0x50, 0xcc, 0xac, 0xad, 0x4a, 0x63, 0xbb, 0x25, 0x05, 0xa1, 0x95, 0xf4, 0x93, 0x83, - 0xe5, 0x99, 0x1f, 0xff, 0xf9, 0xf9, 0xaa, 0xa0, 0xf0, 0x58, 0xf1, 0x73, 0xb0, 0xc2, 0x92, 0x6f, - 0x71, 0x6f, 0x05, 0x59, 0x36, 0xa1, 0x5e, 0x6f, 0xd7, 0x26, 0x94, 0x03, 0x80, 0x77, 0x00, 0x38, - 0xd6, 0x92, 0x57, 0xbb, 0x22, 0xf1, 0x66, 0xf9, 0xc2, 0x4b, 0xc1, 0xa1, 0xe1, 0xc2, 0x4b, 0x35, - 0xcd, 0x42, 0x3c, 0x56, 0x19, 0x88, 0x14, 0xbf, 0x15, 0xc0, 0xea, 0x84, 0x62, 0x9c, 0xd7, 0x2a, - 0x38, 0x13, 0x42, 0x57, 0x6d, 0xd3, 0x67, 0x37, 0x57, 0x4c, 0x2b, 0x99, 0x70, 0x6f, 0xc7, 0x24, - 0xf0, 0x6e, 0x04, 0xd0, 0x2c, 0x03, 0xf4, 0x7a, 0x22, 0xa0, 0x20, 0x7f, 0x04, 0x51, 0x05, 0xbc, - 0x16, 0x01, 0x44, 0x42, 0x44, 0x21, 0xf5, 0x64, 0x30, 0xe2, 0x97, 0xa0, 0x30, 0x2e, 0x07, 0x67, - 0xf4, 0x00, 0xc0, 0x30, 0x80, 0xa8, 0x1e, 0xb3, 0x22, 0x8f, 0xa5, 0xca, 0xac, 0xbd, 0x39, 0xa1, - 0x6b, 0x51, 0x99, 0x90, 0xa7, 0x64, 0x8d, 0x68, 0x0d, 0xe4, 0x89, 0xdf, 0x08, 0x9c, 0xc2, 0x1d, - 0xdb, 0xd1, 0x5a, 0x36, 0xed, 0xd5, 0x3c, 0xdc, 0xb5, 0x4d, 0xe6, 0x12, 0x50, 0x58, 0x06, 0x99, - 0x01, 0x0a, 0xac, 0x7d, 0x69, 0x05, 0x1c, 0x33, 0x88, 0xb5, 0x77, 0x76, 0xea, 0xf6, 0x3e, 0x15, - 0xb8, 0x12, 0x23, 0xa0, 0x70, 0x25, 0x74, 0x00, 0xeb, 0xdc, 0xe8, 0x5f, 0xf9, 0xc0, 0xca, 0x95, - 0x58, 0x9f, 0xa0, 0x44, 0x3c, 0x63, 0xbf, 0x99, 0xd9, 0x7a, 0xbc, 0xd6, 0xff, 0x77, 0x38, 0x74, - 0x70, 0x61, 0x24, 0x9d, 0x13, 0x0b, 0xbb, 0x0a, 0xce, 0xd6, 0x5d, 0x55, 0xa7, 0x86, 0xea, 0x36, - 0xd5, 0x06, 0xda, 0x63, 0x60, 0xd2, 0x0a, 0xa8, 0xbb, 0x15, 0x6a, 0xd4, 0x9a, 0xdb, 0x68, 0x4f, - 0xfc, 0x6a, 0x5c, 0xfb, 0xfa, 0x92, 0x7d, 0x06, 0xb2, 0x43, 0x92, 0xf1, 0x3b, 0x38, 0x95, 0x62, - 0x8b, 0x71, 0xc5, 0xc4, 0x9f, 0xe6, 0x41, 0x6e, 0x6c, 0xf9, 0xdb, 0x20, 0x63, 0x22, 0x62, 0x78, - 0xb6, 0x3b, 0x70, 0xf9, 0x2f, 0x86, 0x72, 0x86, 0xef, 0x66, 0xa8, 0x65, 0xf5, 0xd8, 0x55, 0x19, - 0x8c, 0x83, 0xf7, 0x00, 0x30, 0x70, 0xbb, 0x6d, 0x13, 0x12, 0x36, 0x25, 0x5d, 0x29, 0xbd, 0x38, - 0x58, 0x7e, 0x35, 0x48, 0x44, 0xcc, 0xa6, 0x64, 0x63, 0xb9, 0xad, 0xd1, 0x86, 0xb4, 0x8b, 0x2c, - 0xcd, 0xe8, 0x55, 0x91, 0xf1, 0xfc, 0x71, 0x09, 0xf0, 0x3a, 0x55, 0x64, 0x28, 0x03, 0x09, 0xe0, - 0x35, 0x30, 0xaf, 0x99, 0xa6, 0x97, 0x9b, 0x63, 0x89, 0x72, 0xcf, 0x1f, 0x97, 0x96, 0xb8, 0xe7, - 0xfb, 0xa6, 0xe9, 0x21, 0x42, 0x3e, 0xa6, 0x9e, 0xed, 0x58, 0x0a, 0xf3, 0x82, 0xf7, 0x41, 0x2a, - 0x68, 0x42, 0x6e, 0x7e, 0x45, 0x28, 0x9e, 0xa9, 0x6c, 0xbe, 0x38, 0x58, 0xde, 0xb0, 0x6c, 0xda, - 0xe8, 0xe8, 0x92, 0x81, 0xdb, 0x32, 0x57, 0xb1, 0xa5, 0xe9, 0xa4, 0x64, 0xe3, 0x70, 0x29, 0xd3, - 0x9e, 0x8b, 0x88, 0x54, 0xd9, 0xa9, 0xad, 0x6f, 0xbc, 0x55, 0xeb, 0xe8, 0x1f, 0xa2, 0x9e, 0xb2, - 0xa0, 0xfb, 0x8d, 0x83, 0xb7, 0xc0, 0x9c, 0x8b, 0xdd, 0xdc, 0x02, 0x13, 0x23, 0x76, 0x83, 0x43, - 0x41, 0xa4, 0x9a, 0x87, 0x71, 0xfd, 0x7e, 0xbd, 0x86, 0x09, 0x41, 0x0c, 0x75, 0xe5, 0x93, 0x2d, - 0xc5, 0x8f, 0x83, 0x1b, 0xe0, 0x1c, 0x69, 0x69, 0xa4, 0x81, 0x4c, 0x95, 0x87, 0xaa, 0x0d, 0x64, - 0x5b, 0x0d, 0x9a, 0x4b, 0xad, 0x08, 0xc5, 0x79, 0x65, 0x89, 0x5b, 0x2b, 0x81, 0x71, 0x9b, 0xd9, - 0xe0, 0x35, 0x00, 0xfb, 0x51, 0xd4, 0x08, 0x23, 0x5e, 0x5a, 0x11, 0x8a, 0x67, 0x95, 0xc5, 0x30, - 0x82, 0x1a, 0xdc, 0xfb, 0x1c, 0x48, 0x71, 0x8f, 0x97, 0x59, 0x4e, 0xbe, 0xf2, 0x1f, 0xb4, 0x2e, - 0xa6, 0xb6, 0x63, 0xa9, 0x2e, 0xfe, 0x02, 0x79, 0xb9, 0x34, 0xb3, 0x66, 0x82, 0xbd, 0x9a, 0xbf, - 0x15, 0x3f, 0xd7, 0x20, 0x7e, 0xae, 0xc5, 0x1d, 0x70, 0x69, 0xe4, 0x99, 0x3d, 0x7e, 0xaf, 0xc2, - 0xc7, 0x33, 0x76, 0xfe, 0x85, 0xa1, 0xf3, 0xbf, 0x0d, 0x2e, 0x27, 0xa4, 0xe2, 0xe7, 0x30, 0xe9, - 0xb2, 0xad, 0xfd, 0x9e, 0x06, 0x0b, 0x2c, 0x15, 0xfc, 0x5e, 0x00, 0xa9, 0x60, 0xe0, 0xc1, 0xd2, - 0x84, 0x1b, 0x32, 0x3c, 0x69, 0xf3, 0xd2, 0x49, 0xdd, 0x03, 0x50, 0xe2, 0x1b, 0x5f, 0xff, 0xf6, - 0xf7, 0x0f, 0xb3, 0x17, 0xe1, 0xaa, 0x9c, 0x34, 0xe0, 0xe1, 0x2f, 0x02, 0x58, 0x1a, 0x35, 0xf6, - 0xe0, 0x8d, 0xa4, 0x9a, 0x13, 0x26, 0x73, 0xfe, 0xe6, 0x74, 0xc1, 0x1c, 0xfe, 0x75, 0x06, 0x7f, - 0x1d, 0x96, 0x27, 0xc0, 0xef, 0x8b, 0xee, 0xf1, 0x0c, 0x6a, 0xcb, 0x47, 0xfd, 0xab, 0x00, 0xb2, - 0x43, 0x03, 0x0f, 0x6e, 0x9e, 0x14, 0x4e, 0x7c, 0xce, 0xe6, 0xaf, 0x4f, 0x11, 0xc9, 0x59, 0x54, - 0x19, 0x8b, 0x77, 0xe0, 0xcd, 0x13, 0xb0, 0x20, 0x7d, 0x1a, 0xf2, 0xa3, 0xc1, 0xb9, 0xbe, 0x0f, - 0xff, 0x15, 0x86, 0x1f, 0xc1, 0xb0, 0x26, 0x7c, 0x37, 0x09, 0x5d, 0xc2, 0x4d, 0xc8, 0xbf, 0x37, - 0x7d, 0x02, 0xce, 0xf2, 0x1e, 0x63, 0x79, 0x17, 0xde, 0x9e, 0xc0, 0x72, 0x68, 0x4e, 0xa8, 0x7d, - 0xeb, 0xa3, 0xc8, 0x45, 0xdc, 0x87, 0x4f, 0x05, 0x90, 0x1d, 0x1a, 0xd3, 0xc9, 0xfd, 0x1b, 0xf7, - 0x91, 0x91, 0xdc, 0xbf, 0xb1, 0xdf, 0x04, 0xe2, 0x16, 0x63, 0x76, 0x0b, 0xde, 0x38, 0x0d, 0x33, - 0x12, 0xe9, 0xdf, 0x3e, 0xfc, 0x53, 0x00, 0x8b, 0xf1, 0x12, 0xf0, 0xed, 0xd3, 0x82, 0x0a, 0xd9, - 0x6c, 0x9e, 0x3e, 0x90, 0x93, 0x51, 0x18, 0x99, 0x5d, 0xf8, 0xc1, 0x69, 0xc8, 0x44, 0xb9, 0xc4, - 0x7b, 0x55, 0x51, 0x9e, 0x1c, 0x16, 0x84, 0x67, 0x87, 0x05, 0xe1, 0xaf, 0xc3, 0x82, 0xf0, 0xdd, - 0x51, 0x61, 0xe6, 0xd9, 0x51, 0x61, 0xe6, 0x8f, 0xa3, 0xc2, 0xcc, 0x83, 0xcd, 0xe4, 0x21, 0xb6, - 0x17, 0x07, 0xc0, 0xa6, 0x9a, 0x9e, 0x62, 0xff, 0x70, 0xac, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, - 0xc7, 0xfb, 0x59, 0xe4, 0x09, 0x0e, 0x00, 0x00, + // 1225 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x4f, 0x73, 0xdb, 0x44, + 0x14, 0x8f, 0xd2, 0xd4, 0xe0, 0x75, 0x3b, 0xc4, 0x5b, 0x4f, 0xc7, 0x35, 0xc1, 0x71, 0x94, 0xb6, + 0x84, 0xd0, 0x48, 0x38, 0xc9, 0x0c, 0xe9, 0xb4, 0xe5, 0x8f, 0x93, 0xb6, 0x09, 0xa4, 0xd4, 0x08, + 0x4e, 0x70, 0x50, 0x57, 0xf2, 0x5a, 0x16, 0xb1, 0xb5, 0xaa, 0x76, 0x13, 0xe2, 0xe9, 0xe4, 0x00, + 0xc3, 0x81, 0x23, 0x03, 0x9f, 0x80, 0x1b, 0x27, 0x86, 0x43, 0x3f, 0x44, 0x0f, 0x94, 0xc9, 0x94, + 0x03, 0xd0, 0x43, 0x86, 0x49, 0x98, 0xe1, 0xc2, 0x87, 0x60, 0xb4, 0x5a, 0xd9, 0x96, 0xfc, 0x47, + 0x49, 0x86, 0xe1, 0x92, 0x68, 0xf7, 0xfd, 0xde, 0xdb, 0xf7, 0xfb, 0xed, 0xdb, 0xdd, 0x67, 0x70, + 0xc5, 0x40, 0x46, 0xbb, 0x49, 0x1c, 0xd5, 0x60, 0x26, 0x65, 0x5b, 0x26, 0x71, 0xe8, 0x76, 0x0b, + 0x7b, 0xea, 0x4e, 0x59, 0x7d, 0xb8, 0x8d, 0xbd, 0xb6, 0xe2, 0x7a, 0x84, 0x11, 0x78, 0x49, 0xc0, + 0x94, 0x28, 0x4c, 0xd9, 0x29, 0x17, 0xb2, 0xa8, 0x65, 0x3b, 0x44, 0xe5, 0x7f, 0x03, 0x74, 0x21, + 0x67, 0x11, 0x8b, 0xf0, 0x4f, 0xd5, 0xff, 0x12, 0xb3, 0x53, 0x16, 0x21, 0x56, 0x13, 0xab, 0xc8, + 0xb5, 0x55, 0xe4, 0x38, 0x84, 0x21, 0x66, 0x13, 0x87, 0x0a, 0xeb, 0x25, 0x93, 0xd0, 0x16, 0xa1, + 0x7a, 0xe0, 0x16, 0x0c, 0x84, 0xe9, 0x72, 0x30, 0x52, 0x29, 0x43, 0x5b, 0xb6, 0x63, 0xa9, 0x3b, + 0x65, 0x03, 0x33, 0x54, 0x0e, 0xc7, 0x02, 0x35, 0x2f, 0x50, 0x06, 0xa2, 0x38, 0xc8, 0xbd, 0x03, + 0x74, 0x91, 0x65, 0x3b, 0x7c, 0x35, 0x81, 0xbd, 0x1a, 0x61, 0x1d, 0x46, 0xed, 0x19, 0x09, 0xdc, + 0xf4, 0x60, 0x9c, 0x4b, 0xdc, 0x81, 0x81, 0x22, 0xf2, 0xb9, 0xc8, 0x43, 0x2d, 0x41, 0x41, 0xce, + 0x01, 0xf8, 0xa1, 0x9f, 0x52, 0x95, 0x4f, 0x6a, 0xf8, 0xe1, 0x36, 0xa6, 0x4c, 0xfe, 0x14, 0x5c, + 0x88, 0xcc, 0x52, 0x97, 0x38, 0x14, 0xc3, 0x35, 0x90, 0x0a, 0x9c, 0xf3, 0x52, 0x49, 0x9a, 0xcb, + 0x2c, 0xce, 0x28, 0x43, 0xd5, 0x57, 0x02, 0xd7, 0x4a, 0xfa, 0xc9, 0xc1, 0xf4, 0xd8, 0x0f, 0x7f, + 0xff, 0x34, 0x2f, 0x69, 0xc2, 0x57, 0xfe, 0x0c, 0x94, 0x78, 0xf0, 0x55, 0x81, 0xd6, 0xb0, 0x65, + 0x53, 0xe6, 0xb5, 0x37, 0x6d, 0xca, 0x44, 0x02, 0xf0, 0x0e, 0x00, 0x5d, 0x6d, 0xc4, 0x6a, 0x57, + 0x15, 0x21, 0xbe, 0x2f, 0xa4, 0x12, 0x14, 0x81, 0x10, 0x52, 0xa9, 0x22, 0x0b, 0x0b, 0x5f, 0xad, + 0xc7, 0x53, 0xde, 0x97, 0xc0, 0xcc, 0x88, 0xc5, 0x04, 0x2f, 0x03, 0xc0, 0x30, 0x75, 0xdd, 0xe3, + 0x00, 0xec, 0xf9, 0x1c, 0xcf, 0xcc, 0x65, 0x16, 0x97, 0x46, 0x70, 0x8c, 0x06, 0xf5, 0xff, 0x07, + 0x01, 0xb5, 0xac, 0x19, 0xb3, 0x50, 0x78, 0x37, 0xc2, 0x68, 0x9c, 0x33, 0x7a, 0x35, 0x91, 0x91, + 0x88, 0xd7, 0x4b, 0xa9, 0x02, 0x5e, 0x89, 0x30, 0xa2, 0x21, 0xa5, 0x50, 0xbb, 0x19, 0x70, 0xae, + 0xc3, 0xc6, 0xae, 0x05, 0x3c, 0xd2, 0x5a, 0x26, 0x9c, 0xdb, 0xa8, 0x51, 0xf9, 0x2b, 0x09, 0x14, + 0x87, 0x05, 0xf9, 0xff, 0x34, 0x91, 0xbf, 0x96, 0x04, 0x97, 0x3b, 0xb6, 0x83, 0x9a, 0x36, 0x6b, + 0x57, 0x3d, 0xb2, 0x63, 0xd7, 0x78, 0x3a, 0x01, 0x97, 0x69, 0x90, 0xe9, 0xe1, 0xc2, 0x0b, 0x21, + 0xad, 0x81, 0x2e, 0x95, 0x58, 0xa1, 0x8c, 0x9f, 0xba, 0x50, 0x9e, 0x86, 0x8a, 0x0c, 0x48, 0xa5, + 0xab, 0x48, 0x5d, 0x18, 0xfd, 0xcb, 0x20, 0xb0, 0x1e, 0x43, 0x91, 0x78, 0xc4, 0xae, 0x22, 0xf5, + 0xf8, 0x5a, 0xff, 0x5d, 0x95, 0x18, 0x60, 0x6a, 0x20, 0x9d, 0x63, 0x0b, 0x3b, 0x03, 0xce, 0xd7, + 0x5d, 0xdd, 0x60, 0xa6, 0xee, 0x6e, 0xe9, 0x0d, 0xbc, 0xcb, 0x93, 0x49, 0x6b, 0xa0, 0xee, 0x56, + 0x98, 0x59, 0xdd, 0x5a, 0xc7, 0xbb, 0xf2, 0x17, 0xc3, 0xb6, 0xaf, 0x23, 0xd9, 0x03, 0x90, 0xed, + 0x93, 0x4c, 0x9c, 0xe6, 0x53, 0x29, 0x36, 0x19, 0x57, 0x4c, 0xfe, 0x71, 0x02, 0xe4, 0x87, 0x2e, + 0x7f, 0x1b, 0x64, 0x6a, 0x98, 0x9a, 0x9e, 0xed, 0xf6, 0x5c, 0x23, 0xb3, 0xa1, 0x9c, 0xe1, 0x8d, + 0x1a, 0x6a, 0xb9, 0xd6, 0x85, 0x6a, 0xbd, 0x7e, 0xf0, 0x1e, 0x00, 0x26, 0x69, 0xb5, 0x6c, 0x4a, + 0xc3, 0x4d, 0x49, 0x57, 0x16, 0x9e, 0x1f, 0x4c, 0xbf, 0x1c, 0x04, 0xa2, 0xb5, 0x2d, 0xc5, 0x26, + 0x6a, 0x0b, 0xb1, 0x86, 0xb2, 0x89, 0x2d, 0x64, 0xb6, 0xd7, 0xb0, 0xf9, 0xec, 0xf1, 0x02, 0x10, + 0xeb, 0xac, 0x61, 0x53, 0xeb, 0x09, 0x00, 0xaf, 0x81, 0x09, 0x54, 0xab, 0x79, 0xf9, 0x33, 0x3c, + 0x50, 0xfe, 0xd9, 0xe3, 0x85, 0x9c, 0x40, 0xbe, 0x5b, 0xab, 0x79, 0x98, 0xd2, 0x8f, 0x98, 0x67, + 0x3b, 0x96, 0xc6, 0x51, 0xf0, 0x3e, 0x48, 0x05, 0x9b, 0x90, 0x9f, 0x28, 0x49, 0x73, 0xe7, 0x2a, + 0x2b, 0xcf, 0x0f, 0xa6, 0x97, 0x2d, 0x9b, 0x35, 0xb6, 0x0d, 0xc5, 0x24, 0x2d, 0x55, 0xa8, 0xd8, + 0x44, 0x06, 0x5d, 0xb0, 0x49, 0x38, 0x54, 0x59, 0xdb, 0xc5, 0x54, 0xa9, 0x6c, 0x54, 0x97, 0x96, + 0xdf, 0xa8, 0x6e, 0x1b, 0xef, 0xe3, 0xb6, 0x76, 0xd6, 0xf0, 0x37, 0x0e, 0xde, 0x02, 0x67, 0x5c, + 0xe2, 0xe6, 0xcf, 0x72, 0x31, 0x5e, 0x8f, 0xee, 0x42, 0x28, 0x88, 0x52, 0xf5, 0x08, 0xa9, 0xdf, + 0xaf, 0x57, 0x09, 0xa5, 0x98, 0x67, 0x5d, 0xf9, 0x78, 0x55, 0xf3, 0xfd, 0xe0, 0x32, 0xb8, 0x48, + 0x9b, 0x88, 0x36, 0x70, 0x4d, 0x17, 0xae, 0x7a, 0x03, 0xdb, 0x56, 0x83, 0xe5, 0x53, 0x25, 0x69, + 0x6e, 0x42, 0xcb, 0x09, 0x6b, 0x25, 0x30, 0xae, 0x73, 0x1b, 0xbc, 0x06, 0x60, 0xc7, 0x8b, 0x99, + 0xa1, 0xc7, 0x0b, 0x25, 0x69, 0xee, 0xbc, 0x36, 0x19, 0x7a, 0x30, 0x53, 0xa0, 0x2f, 0x82, 0x94, + 0x40, 0xbc, 0xc8, 0x63, 0x8a, 0x91, 0x7f, 0xb3, 0xed, 0x10, 0x66, 0x3b, 0x96, 0xee, 0x92, 0xcf, + 0xb1, 0x97, 0x4f, 0x73, 0x6b, 0x26, 0x98, 0xab, 0xfa, 0x53, 0xf1, 0xba, 0x06, 0xf1, 0xba, 0x96, + 0x37, 0xc0, 0xe5, 0x81, 0x35, 0xdb, 0xbd, 0xb7, 0xc2, 0x5b, 0x34, 0x56, 0xff, 0x52, 0x5f, 0xfd, + 0xaf, 0x83, 0x2b, 0x09, 0xa1, 0x44, 0x1d, 0x26, 0x1d, 0x36, 0xf9, 0xfb, 0x71, 0x90, 0x1f, 0x76, + 0x71, 0x26, 0x1f, 0xd5, 0x59, 0x70, 0xbe, 0x03, 0x70, 0x50, 0x0b, 0x8b, 0xa3, 0xda, 0x79, 0x05, + 0x3e, 0x40, 0x2d, 0x0c, 0xcb, 0x20, 0xd7, 0x01, 0xf5, 0x1e, 0x0a, 0x5e, 0x85, 0xda, 0x85, 0xd0, + 0xd6, 0x73, 0x08, 0xe0, 0x3c, 0xc8, 0x8a, 0xde, 0xc7, 0x6c, 0x20, 0xc7, 0xc1, 0x4d, 0x7f, 0xf9, + 0x09, 0x8e, 0x7f, 0x29, 0x30, 0xac, 0x06, 0xf3, 0x1b, 0x35, 0xf8, 0x00, 0x94, 0x30, 0x6b, 0xe8, + 0xcd, 0x45, 0xbd, 0x73, 0xe0, 0x4d, 0xe2, 0x30, 0x0f, 0x99, 0x4c, 0x47, 0x41, 0x59, 0xf3, 0x92, + 0x1b, 0x55, 0xf0, 0x53, 0x98, 0x35, 0x36, 0x17, 0x43, 0x35, 0x57, 0x85, 0xbb, 0xc0, 0x2c, 0xfe, + 0x96, 0x06, 0x67, 0xb9, 0xdc, 0xf0, 0x5b, 0x09, 0xa4, 0x82, 0xf6, 0x02, 0x2e, 0x8c, 0xb8, 0x45, + 0xfa, 0xfb, 0x9a, 0x82, 0x72, 0x5c, 0x78, 0x20, 0xbd, 0xfc, 0xda, 0x97, 0xbf, 0xfe, 0xf5, 0xdd, + 0xf8, 0x2c, 0x9c, 0x51, 0x93, 0xda, 0x29, 0xf8, 0xb3, 0x04, 0x72, 0x83, 0x9a, 0x0c, 0x78, 0x23, + 0x69, 0xcd, 0x11, 0x7d, 0x50, 0xe1, 0xe6, 0xe9, 0x9c, 0x45, 0xfa, 0xd7, 0x79, 0xfa, 0x4b, 0xb0, + 0x3c, 0x22, 0xfd, 0xd8, 0x23, 0xef, 0xb5, 0xf5, 0xa6, 0x9f, 0xf5, 0x2f, 0x12, 0xc8, 0xf6, 0x35, + 0x07, 0x70, 0xe5, 0xb8, 0xe9, 0xc4, 0x9b, 0x92, 0xc2, 0xf5, 0x53, 0x78, 0x0a, 0x16, 0x6b, 0x9c, + 0xc5, 0x5b, 0xf0, 0xe6, 0x31, 0x58, 0xd0, 0x0e, 0x0d, 0xf5, 0x51, 0x6f, 0x13, 0xb4, 0x07, 0xff, + 0x91, 0xfa, 0x1f, 0x8a, 0x70, 0x4d, 0xf8, 0x76, 0x52, 0x76, 0x09, 0xb7, 0x45, 0xe1, 0x9d, 0xd3, + 0x07, 0x10, 0x2c, 0xef, 0x71, 0x96, 0x77, 0xe1, 0xed, 0x11, 0x2c, 0xfb, 0xde, 0x52, 0xbd, 0x63, + 0x7d, 0x14, 0xb9, 0xac, 0xf6, 0xe0, 0x53, 0x09, 0x64, 0xfb, 0x5a, 0x99, 0xe4, 0xfd, 0x1b, 0xd6, + 0x88, 0x25, 0xef, 0xdf, 0xd0, 0xbe, 0x49, 0x5e, 0xe5, 0xcc, 0x6e, 0xc1, 0x1b, 0x27, 0x61, 0x46, + 0x23, 0xfb, 0xb7, 0x07, 0xff, 0x90, 0xc0, 0x64, 0x7c, 0x09, 0xf8, 0xe6, 0x49, 0x93, 0x0a, 0xd9, + 0xac, 0x9c, 0xdc, 0x51, 0x90, 0xd1, 0x38, 0x99, 0x4d, 0xf8, 0xde, 0x49, 0xc8, 0x44, 0xb9, 0xc4, + 0xf7, 0xaa, 0xa2, 0x3d, 0x39, 0x2c, 0x4a, 0xfb, 0x87, 0x45, 0xe9, 0xcf, 0xc3, 0xa2, 0xf4, 0xcd, + 0x51, 0x71, 0x6c, 0xff, 0xa8, 0x38, 0xf6, 0xfb, 0x51, 0x71, 0xec, 0x93, 0x95, 0xe4, 0x87, 0x7e, + 0x37, 0x9e, 0x00, 0x7f, 0xf9, 0x8d, 0x14, 0xff, 0x79, 0xb7, 0xf4, 0x6f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x8e, 0x23, 0x2e, 0x4a, 0x47, 0x0f, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1221,11 +1316,16 @@ func (m *QueryConsumerRegistryListResponse) MarshalToSizedBuffer(dAtA []byte) (i i-- dAtA[i] = 0x12 } - if len(m.ConsumerIds) > 0 { - for iNdEx := len(m.ConsumerIds) - 1; iNdEx >= 0; iNdEx-- { - i -= len(m.ConsumerIds[iNdEx]) - copy(dAtA[i:], m.ConsumerIds[iNdEx]) - i = encodeVarintQuery(dAtA, i, uint64(len(m.ConsumerIds[iNdEx]))) + if len(m.ConsumerRegisters) > 0 { + for iNdEx := len(m.ConsumerRegisters) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.ConsumerRegisters[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } i-- dAtA[i] = 0xa } @@ -1285,10 +1385,10 @@ func (m *QueryConsumersRegistryResponse) MarshalToSizedBuffer(dAtA []byte) (int, _ = i var l int _ = l - if len(m.ConsumersRegister) > 0 { - for iNdEx := len(m.ConsumersRegister) - 1; iNdEx >= 0; iNdEx-- { + if len(m.ConsumerRegisters) > 0 { + for iNdEx := len(m.ConsumerRegisters) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.ConsumersRegister[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ConsumerRegisters[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -1630,6 +1730,64 @@ func (m *QueryFinalityProviderConsumerResponse) MarshalToSizedBuffer(dAtA []byte return len(dAtA) - i, nil } +func (m *ConsumerRegisterResponse) 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 *ConsumerRegisterResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ConsumerRegisterResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.EthL2FinalityContractAddress) > 0 { + i -= len(m.EthL2FinalityContractAddress) + copy(dAtA[i:], m.EthL2FinalityContractAddress) + i = encodeVarintQuery(dAtA, i, uint64(len(m.EthL2FinalityContractAddress))) + i-- + dAtA[i] = 0x2a + } + if len(m.CosmosChannelId) > 0 { + i -= len(m.CosmosChannelId) + copy(dAtA[i:], m.CosmosChannelId) + i = encodeVarintQuery(dAtA, i, uint64(len(m.CosmosChannelId))) + i-- + dAtA[i] = 0x22 + } + if len(m.ConsumerDescription) > 0 { + i -= len(m.ConsumerDescription) + copy(dAtA[i:], m.ConsumerDescription) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ConsumerDescription))) + i-- + dAtA[i] = 0x1a + } + if len(m.ConsumerName) > 0 { + i -= len(m.ConsumerName) + copy(dAtA[i:], m.ConsumerName) + i = encodeVarintQuery(dAtA, i, uint64(len(m.ConsumerName))) + 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 +} + func encodeVarintQuery(dAtA []byte, offset int, v uint64) int { offset -= sovQuery(v) base := offset @@ -1680,9 +1838,9 @@ func (m *QueryConsumerRegistryListResponse) Size() (n int) { } var l int _ = l - if len(m.ConsumerIds) > 0 { - for _, s := range m.ConsumerIds { - l = len(s) + if len(m.ConsumerRegisters) > 0 { + for _, e := range m.ConsumerRegisters { + l = e.Size() n += 1 + l + sovQuery(uint64(l)) } } @@ -1714,8 +1872,8 @@ func (m *QueryConsumersRegistryResponse) Size() (n int) { } var l int _ = l - if len(m.ConsumersRegister) > 0 { - for _, e := range m.ConsumersRegister { + if len(m.ConsumerRegisters) > 0 { + for _, e := range m.ConsumerRegisters { l = e.Size() n += 1 + l + sovQuery(uint64(l)) } @@ -1860,6 +2018,35 @@ func (m *QueryFinalityProviderConsumerResponse) Size() (n int) { return n } +func (m *ConsumerRegisterResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ConsumerId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.ConsumerName) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.ConsumerDescription) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.CosmosChannelId) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + l = len(m.EthL2FinalityContractAddress) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + func sovQuery(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -2116,9 +2303,9 @@ func (m *QueryConsumerRegistryListResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ConsumerIds", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ConsumerRegisters", wireType) } - var stringLen uint64 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -2128,23 +2315,25 @@ func (m *QueryConsumerRegistryListResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.ConsumerIds = append(m.ConsumerIds, string(dAtA[iNdEx:postIndex])) + m.ConsumerRegisters = append(m.ConsumerRegisters, &ConsumerRegisterResponse{}) + if err := m.ConsumerRegisters[len(m.ConsumerRegisters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex case 2: if wireType != 2 { @@ -2316,7 +2505,7 @@ func (m *QueryConsumersRegistryResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ConsumersRegister", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ConsumerRegisters", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2343,8 +2532,8 @@ func (m *QueryConsumersRegistryResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ConsumersRegister = append(m.ConsumersRegister, &ConsumerRegister{}) - if err := m.ConsumersRegister[len(m.ConsumersRegister)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.ConsumerRegisters = append(m.ConsumerRegisters, &ConsumerRegisterResponse{}) + if err := m.ConsumerRegisters[len(m.ConsumerRegisters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3304,6 +3493,216 @@ func (m *QueryFinalityProviderConsumerResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *ConsumerRegisterResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: ConsumerRegisterResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ConsumerRegisterResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + 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 ConsumerName", 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.ConsumerName = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsumerDescription", 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.ConsumerDescription = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CosmosChannelId", 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.CosmosChannelId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EthL2FinalityContractAddress", 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.EthL2FinalityContractAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipQuery(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthQuery + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipQuery(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0