From 2e2881278c92149a3e5fc1e282ae18ef3b2978a5 Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Fri, 11 Oct 2024 10:10:46 +0300 Subject: [PATCH 1/6] wip --- proto/babylon/finality/v1/query.proto | 15 +- x/finality/keeper/grpc_query.go | 30 +- x/finality/keeper/keeper.go | 4 +- x/finality/types/query.pb.go | 526 ++++++++++++++++++++------ 4 files changed, 459 insertions(+), 116 deletions(-) diff --git a/proto/babylon/finality/v1/query.proto b/proto/babylon/finality/v1/query.proto index e65c86312..71fc4e1a6 100644 --- a/proto/babylon/finality/v1/query.proto +++ b/proto/babylon/finality/v1/query.proto @@ -6,6 +6,7 @@ import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; import "babylon/finality/v1/params.proto"; import "babylon/finality/v1/finality.proto"; +import "google/protobuf/timestamp.proto"; option go_package = "github.com/babylonlabs-io/babylon/x/finality/types"; @@ -229,11 +230,19 @@ message QuerySigningInfoRequest { string fp_btc_pk_hex = 1; } +// SigningInfoResponse defines the API response containing a finality provider's signing info +// for monitoring their liveness activity. +message SigningInfoResponse { + string fp_btc_pk_hex = 1; + int64 start_height = 2; + int64 missed_blocks_counter = 3; + google.protobuf.Timestamp jailed_until = 4; +} + // QuerySigningInfoResponse is the response type for the Query/SigningInfo RPC // method message QuerySigningInfoResponse { - // fp_signing_info is the signing info of requested finality provider BTC public key - FinalityProviderSigningInfo fp_signing_info = 1 [(gogoproto.nullable) = false]; + SigningInfoResponse signing_info = 1 [(gogoproto.nullable) = false]; } // QuerySigningInfosRequest is the request type for the Query/SigningInfos RPC @@ -246,6 +255,6 @@ message QuerySigningInfosRequest { // method message QuerySigningInfosResponse { // info is the signing info of all finality providers with signing info - repeated FinalityProviderSigningInfo fp_signing_infos = 1 [(gogoproto.nullable) = false]; + repeated SigningInfoResponse signing_infos = 1 [(gogoproto.nullable) = false]; cosmos.base.query.v1beta1.PageResponse pagination = 2; } diff --git a/x/finality/keeper/grpc_query.go b/x/finality/keeper/grpc_query.go index 1478f8f26..9b8f061c2 100644 --- a/x/finality/keeper/grpc_query.go +++ b/x/finality/keeper/grpc_query.go @@ -11,6 +11,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "google.golang.org/protobuf/types/known/timestamppb" bbn "github.com/babylonlabs-io/babylon/types" "github.com/babylonlabs-io/babylon/x/finality/types" @@ -246,7 +247,7 @@ func (k Keeper) SigningInfo(ctx context.Context, req *types.QuerySigningInfoRequ return nil, status.Errorf(codes.NotFound, "SigningInfo not found for the finality provider %s", req.FpBtcPkHex) } - return &types.QuerySigningInfoResponse{FpSigningInfo: signingInfo}, nil + return &types.QuerySigningInfoResponse{SigningInfo: k.convertToSigningInfoResponse(signingInfo)}, nil } // SigningInfos returns signing-infos of all finality providers. @@ -271,5 +272,30 @@ func (k Keeper) SigningInfos(ctx context.Context, req *types.QuerySigningInfosRe if err != nil { return nil, err } - return &types.QuerySigningInfosResponse{FpSigningInfos: signInfos, Pagination: pageRes}, nil + return &types.QuerySigningInfosResponse{SigningInfos: convertToSigningInfosResponse(signInfos), Pagination: pageRes}, nil +} + +func (k Keeper) convertToSigningInfoResponse(info types.FinalityProviderSigningInfo) types.SigningInfoResponse { + return types.SigningInfoResponse{ + FpBtcPkHex: info.FpBtcPk.MarshalHex(), + StartHeight: info.StartHeight, + MissedBlocksCounter: info.MissedBlocksCounter, + JailedUntil: timestamppb.New(info.JailedUntil), + } + +} + +func convertToSigningInfoResponse(signInfos []slashingtypes.ValidatorSigningInfo) []*types.SigningInfo { + response := make([]*types.SigningInfo, len(signInfos)) + for i, info := range signInfos { + response[i] = &types.SigningInfo{ + Address: info.Address, + StartHeight: info.StartHeight, + IndexOffset: info.IndexOffset, + JailedUntil: info.JailedUntil, + Tombstoned: info.Tombstoned, + MissedBlocksCounter: info.MissedBlocksCounter, + } + } + return response } diff --git a/x/finality/keeper/keeper.go b/x/finality/keeper/keeper.go index d569896f9..ace900eee 100644 --- a/x/finality/keeper/keeper.go +++ b/x/finality/keeper/keeper.go @@ -7,10 +7,10 @@ import ( "cosmossdk.io/collections" corestoretypes "cosmossdk.io/core/store" "cosmossdk.io/log" + "github.com/babylonlabs-io/babylon/x/finality/types" "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/babylonlabs-io/babylon/x/finality/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) type ( diff --git a/x/finality/types/query.pb.go b/x/finality/types/query.pb.go index b3dd8afb0..030d2ff7d 100644 --- a/x/finality/types/query.pb.go +++ b/x/finality/types/query.pb.go @@ -15,6 +15,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" @@ -978,18 +979,87 @@ func (m *QuerySigningInfoRequest) GetFpBtcPkHex() string { return "" } +// SigningInfoResponse defines the API response containing a finality provider's signing info +// for monitoring their liveness activity. +type SigningInfoResponse struct { + FpBtcPkHex string `protobuf:"bytes,1,opt,name=fp_btc_pk_hex,json=fpBtcPkHex,proto3" json:"fp_btc_pk_hex,omitempty"` + StartHeight int64 `protobuf:"varint,2,opt,name=start_height,json=startHeight,proto3" json:"start_height,omitempty"` + MissedBlocksCounter int64 `protobuf:"varint,3,opt,name=missed_blocks_counter,json=missedBlocksCounter,proto3" json:"missed_blocks_counter,omitempty"` + JailedUntil *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=jailed_until,json=jailedUntil,proto3" json:"jailed_until,omitempty"` +} + +func (m *SigningInfoResponse) Reset() { *m = SigningInfoResponse{} } +func (m *SigningInfoResponse) String() string { return proto.CompactTextString(m) } +func (*SigningInfoResponse) ProtoMessage() {} +func (*SigningInfoResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_32bddab77af6fdae, []int{18} +} +func (m *SigningInfoResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *SigningInfoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_SigningInfoResponse.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 *SigningInfoResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SigningInfoResponse.Merge(m, src) +} +func (m *SigningInfoResponse) XXX_Size() int { + return m.Size() +} +func (m *SigningInfoResponse) XXX_DiscardUnknown() { + xxx_messageInfo_SigningInfoResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_SigningInfoResponse proto.InternalMessageInfo + +func (m *SigningInfoResponse) GetFpBtcPkHex() string { + if m != nil { + return m.FpBtcPkHex + } + return "" +} + +func (m *SigningInfoResponse) GetStartHeight() int64 { + if m != nil { + return m.StartHeight + } + return 0 +} + +func (m *SigningInfoResponse) GetMissedBlocksCounter() int64 { + if m != nil { + return m.MissedBlocksCounter + } + return 0 +} + +func (m *SigningInfoResponse) GetJailedUntil() *timestamppb.Timestamp { + if m != nil { + return m.JailedUntil + } + return nil +} + // QuerySigningInfoResponse is the response type for the Query/SigningInfo RPC // method type QuerySigningInfoResponse struct { - // fp_signing_info is the signing info of requested finality provider BTC public key - FpSigningInfo FinalityProviderSigningInfo `protobuf:"bytes,1,opt,name=fp_signing_info,json=fpSigningInfo,proto3" json:"fp_signing_info"` + SigningInfo SigningInfoResponse `protobuf:"bytes,1,opt,name=signing_info,json=signingInfo,proto3" json:"signing_info"` } func (m *QuerySigningInfoResponse) Reset() { *m = QuerySigningInfoResponse{} } func (m *QuerySigningInfoResponse) String() string { return proto.CompactTextString(m) } func (*QuerySigningInfoResponse) ProtoMessage() {} func (*QuerySigningInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_32bddab77af6fdae, []int{18} + return fileDescriptor_32bddab77af6fdae, []int{19} } func (m *QuerySigningInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1018,11 +1088,11 @@ func (m *QuerySigningInfoResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QuerySigningInfoResponse proto.InternalMessageInfo -func (m *QuerySigningInfoResponse) GetFpSigningInfo() FinalityProviderSigningInfo { +func (m *QuerySigningInfoResponse) GetSigningInfo() SigningInfoResponse { if m != nil { - return m.FpSigningInfo + return m.SigningInfo } - return FinalityProviderSigningInfo{} + return SigningInfoResponse{} } // QuerySigningInfosRequest is the request type for the Query/SigningInfos RPC @@ -1035,7 +1105,7 @@ func (m *QuerySigningInfosRequest) Reset() { *m = QuerySigningInfosReque func (m *QuerySigningInfosRequest) String() string { return proto.CompactTextString(m) } func (*QuerySigningInfosRequest) ProtoMessage() {} func (*QuerySigningInfosRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_32bddab77af6fdae, []int{19} + return fileDescriptor_32bddab77af6fdae, []int{20} } func (m *QuerySigningInfosRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1075,15 +1145,15 @@ func (m *QuerySigningInfosRequest) GetPagination() *query.PageRequest { // method type QuerySigningInfosResponse struct { // info is the signing info of all finality providers with signing info - FpSigningInfos []FinalityProviderSigningInfo `protobuf:"bytes,1,rep,name=fp_signing_infos,json=fpSigningInfos,proto3" json:"fp_signing_infos"` - Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` + SigningInfos []SigningInfoResponse `protobuf:"bytes,1,rep,name=signing_infos,json=signingInfos,proto3" json:"signing_infos"` + Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QuerySigningInfosResponse) Reset() { *m = QuerySigningInfosResponse{} } func (m *QuerySigningInfosResponse) String() string { return proto.CompactTextString(m) } func (*QuerySigningInfosResponse) ProtoMessage() {} func (*QuerySigningInfosResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_32bddab77af6fdae, []int{20} + return fileDescriptor_32bddab77af6fdae, []int{21} } func (m *QuerySigningInfosResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1112,9 +1182,9 @@ func (m *QuerySigningInfosResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QuerySigningInfosResponse proto.InternalMessageInfo -func (m *QuerySigningInfosResponse) GetFpSigningInfos() []FinalityProviderSigningInfo { +func (m *QuerySigningInfosResponse) GetSigningInfos() []SigningInfoResponse { if m != nil { - return m.FpSigningInfos + return m.SigningInfos } return nil } @@ -1148,6 +1218,7 @@ func init() { proto.RegisterType((*QueryListEvidencesRequest)(nil), "babylon.finality.v1.QueryListEvidencesRequest") proto.RegisterType((*QueryListEvidencesResponse)(nil), "babylon.finality.v1.QueryListEvidencesResponse") proto.RegisterType((*QuerySigningInfoRequest)(nil), "babylon.finality.v1.QuerySigningInfoRequest") + proto.RegisterType((*SigningInfoResponse)(nil), "babylon.finality.v1.SigningInfoResponse") proto.RegisterType((*QuerySigningInfoResponse)(nil), "babylon.finality.v1.QuerySigningInfoResponse") proto.RegisterType((*QuerySigningInfosRequest)(nil), "babylon.finality.v1.QuerySigningInfosRequest") proto.RegisterType((*QuerySigningInfosResponse)(nil), "babylon.finality.v1.QuerySigningInfosResponse") @@ -1156,91 +1227,97 @@ func init() { func init() { proto.RegisterFile("babylon/finality/v1/query.proto", fileDescriptor_32bddab77af6fdae) } var fileDescriptor_32bddab77af6fdae = []byte{ - // 1338 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0xdf, 0x6f, 0xd3, 0xd6, - 0x17, 0xef, 0x6d, 0x69, 0xa1, 0xa7, 0x09, 0x94, 0x4b, 0xe1, 0xdb, 0x6f, 0x18, 0x69, 0x30, 0xac, - 0xb0, 0x02, 0x36, 0x4d, 0x19, 0x03, 0xb6, 0x09, 0xc8, 0x46, 0x47, 0xb4, 0x92, 0x05, 0x33, 0x21, - 0x8d, 0x87, 0x79, 0x76, 0x7a, 0x93, 0x58, 0x8d, 0x7d, 0x4d, 0x6c, 0x47, 0xcd, 0x10, 0xd2, 0x34, - 0x69, 0x3c, 0x4c, 0x9b, 0x34, 0x69, 0x2f, 0xdb, 0x03, 0x0f, 0x9b, 0xa6, 0xbd, 0xec, 0xff, 0x98, - 0x78, 0x44, 0x6c, 0x0f, 0x13, 0xd2, 0xd0, 0x04, 0xfb, 0x43, 0xa6, 0xdc, 0x7b, 0x9d, 0xd8, 0x89, - 0xf3, 0x83, 0x2e, 0xda, 0x5b, 0x7c, 0x7c, 0x7e, 0x7c, 0xce, 0xe7, 0x1c, 0x9f, 0x73, 0x5a, 0x58, - 0x32, 0x74, 0xa3, 0x59, 0xa3, 0xb6, 0x52, 0x36, 0x6d, 0xbd, 0x66, 0x7a, 0x4d, 0xa5, 0xb1, 0xaa, - 0xdc, 0xf5, 0x49, 0xbd, 0x29, 0x3b, 0x75, 0xea, 0x51, 0x7c, 0x40, 0x28, 0xc8, 0x81, 0x82, 0xdc, - 0x58, 0x4d, 0x2d, 0x54, 0x68, 0x85, 0xb2, 0xf7, 0x4a, 0xeb, 0x17, 0x57, 0x4d, 0xbd, 0x52, 0xa1, - 0xb4, 0x52, 0x23, 0x8a, 0xee, 0x98, 0x8a, 0x6e, 0xdb, 0xd4, 0xd3, 0x3d, 0x93, 0xda, 0xae, 0x78, - 0xbb, 0x52, 0xa2, 0xae, 0x45, 0x5d, 0xc5, 0xd0, 0x5d, 0xc2, 0x23, 0x28, 0x8d, 0x55, 0x83, 0x78, - 0xfa, 0xaa, 0xe2, 0xe8, 0x15, 0xd3, 0x66, 0xca, 0x42, 0x37, 0x13, 0x87, 0xca, 0xd1, 0xeb, 0xba, - 0x15, 0x78, 0x93, 0xe2, 0x34, 0xda, 0x10, 0x99, 0x8e, 0xb4, 0x00, 0xf8, 0x66, 0x2b, 0x4e, 0x91, - 0x19, 0xaa, 0xe4, 0xae, 0x4f, 0x5c, 0x4f, 0x2a, 0xc2, 0x81, 0x88, 0xd4, 0x75, 0xa8, 0xed, 0x12, - 0x7c, 0x11, 0x66, 0x78, 0x80, 0x45, 0x94, 0x41, 0x27, 0xe7, 0xb2, 0x87, 0xe5, 0x98, 0xc4, 0x65, - 0x6e, 0x94, 0xdb, 0xf5, 0xe8, 0xd9, 0xd2, 0x84, 0x2a, 0x0c, 0xa4, 0xaf, 0x11, 0x64, 0x98, 0xcb, - 0x0d, 0xd3, 0xf5, 0x8a, 0xbe, 0x51, 0x33, 0x4b, 0xaa, 0x6e, 0x6f, 0x52, 0xcb, 0x26, 0x6e, 0x10, - 0x16, 0x1f, 0x85, 0x64, 0xd9, 0xd1, 0x0c, 0xaf, 0xa4, 0x39, 0x5b, 0x5a, 0x95, 0x6c, 0xb3, 0x30, - 0xb3, 0x2a, 0x94, 0x9d, 0x9c, 0x57, 0x2a, 0x6e, 0x5d, 0x27, 0xdb, 0x78, 0x1d, 0xa0, 0xc3, 0xc4, - 0xe2, 0x24, 0x83, 0xb1, 0x2c, 0x73, 0xda, 0xe4, 0x16, 0x6d, 0x32, 0x2f, 0x8c, 0xa0, 0x4d, 0x2e, - 0xea, 0x15, 0x22, 0xdc, 0xab, 0x21, 0x4b, 0xe9, 0xc9, 0x24, 0x1c, 0x1d, 0x80, 0x47, 0x24, 0xfc, - 0x13, 0x82, 0x84, 0xe3, 0x1b, 0x5a, 0x5d, 0xb7, 0x37, 0x35, 0x4b, 0x77, 0x16, 0x51, 0x66, 0xea, - 0xe4, 0x5c, 0x76, 0x3d, 0x36, 0xef, 0xa1, 0xee, 0xe4, 0xa2, 0x6f, 0xb4, 0xa4, 0x37, 0x74, 0xe7, - 0x9a, 0xed, 0xd5, 0x9b, 0xb9, 0x4b, 0x4f, 0x9f, 0x2d, 0x9d, 0xaf, 0x98, 0x5e, 0xd5, 0x37, 0xe4, - 0x12, 0xb5, 0x14, 0xe1, 0xb5, 0xa6, 0x1b, 0xee, 0x19, 0x93, 0x06, 0x8f, 0x8a, 0xd7, 0x74, 0x88, - 0x2b, 0xdf, 0x2a, 0x55, 0x6d, 0x5a, 0xaf, 0x0b, 0x1f, 0x2a, 0x38, 0x6d, 0x67, 0xf8, 0xbd, 0x18, - 0x52, 0x4e, 0x0c, 0x25, 0x85, 0x83, 0x0a, 0xb3, 0x92, 0x7a, 0x1b, 0xf6, 0x75, 0x61, 0xc4, 0xf3, - 0x30, 0xb5, 0x45, 0x9a, 0xac, 0x12, 0xbb, 0xd4, 0xd6, 0x4f, 0xbc, 0x00, 0xd3, 0x0d, 0xbd, 0xe6, - 0x13, 0x16, 0x28, 0xa1, 0xf2, 0x87, 0x4b, 0x93, 0x17, 0x90, 0xd4, 0x80, 0x83, 0xc2, 0xfc, 0x1d, - 0x6a, 0x59, 0xa6, 0xd7, 0xe6, 0x31, 0x03, 0x09, 0xdb, 0xb7, 0xb4, 0x80, 0x4a, 0xe1, 0x0d, 0x6c, - 0xdf, 0x12, 0xfa, 0x38, 0x0d, 0x50, 0x62, 0x36, 0x16, 0xb1, 0x3d, 0xe1, 0x39, 0x24, 0xc1, 0x87, - 0x61, 0x96, 0x38, 0xb4, 0x54, 0xd5, 0x6c, 0xdf, 0x5a, 0x9c, 0x62, 0xe6, 0x7b, 0x98, 0xa0, 0xe0, - 0x5b, 0xd2, 0x97, 0x08, 0x8e, 0x84, 0xd9, 0x0f, 0x23, 0xf8, 0xcf, 0x3b, 0xeb, 0xf7, 0x49, 0x48, - 0xf7, 0x03, 0x23, 0xe8, 0xd8, 0x86, 0x03, 0xed, 0xae, 0xe2, 0x39, 0x86, 0x9a, 0x2b, 0x3f, 0xb4, - 0xb9, 0x7a, 0x3d, 0xca, 0x11, 0x69, 0x50, 0x3b, 0x75, 0xde, 0xe9, 0x12, 0x8f, 0xaf, 0x53, 0x68, - 0x57, 0xa9, 0x07, 0xf4, 0xcb, 0x95, 0x70, 0xbf, 0xcc, 0x65, 0x57, 0xe2, 0x87, 0x46, 0x5c, 0x5a, - 0xe1, 0xde, 0x3a, 0x05, 0xfb, 0x19, 0x07, 0xb9, 0x1a, 0x2d, 0x6d, 0x05, 0x65, 0x3d, 0x04, 0x33, - 0x55, 0x62, 0x56, 0xaa, 0x9e, 0x88, 0x27, 0x9e, 0xa4, 0x1b, 0x62, 0xaa, 0x09, 0x65, 0x41, 0xfb, - 0x1b, 0x30, 0x6d, 0xb4, 0x04, 0x62, 0x7a, 0x1d, 0x8d, 0x05, 0x92, 0xb7, 0x37, 0xc9, 0x36, 0xd9, - 0xe4, 0x96, 0x5c, 0x5f, 0xfa, 0x01, 0xc1, 0xa1, 0x76, 0x01, 0xd8, 0x9b, 0xf6, 0xc8, 0xba, 0x0c, - 0x33, 0xae, 0xa7, 0x7b, 0x3e, 0x1f, 0x89, 0x7b, 0xb3, 0x27, 0xfa, 0x56, 0xcf, 0x14, 0x4e, 0x6f, - 0x31, 0x75, 0x55, 0x98, 0x8d, 0xad, 0xed, 0x1e, 0x22, 0xf8, 0x5f, 0x0f, 0xc6, 0xce, 0xdc, 0x66, - 0x89, 0xb8, 0xa2, 0xc5, 0x46, 0xc8, 0x5c, 0x18, 0x8c, 0xad, 0x61, 0xa4, 0x35, 0xf8, 0x3f, 0x83, - 0x77, 0x9b, 0x7a, 0xc4, 0xbd, 0xea, 0x5d, 0x67, 0x85, 0x1a, 0x56, 0x47, 0x0a, 0xa9, 0x38, 0x23, - 0x91, 0xd6, 0x4d, 0xd8, 0xcd, 0xbf, 0x68, 0x9e, 0x57, 0x22, 0x77, 0xe1, 0xe9, 0xb3, 0xa5, 0x73, - 0xa3, 0xce, 0xd3, 0x5c, 0xbe, 0xb8, 0x76, 0xee, 0x6c, 0xd1, 0x37, 0xde, 0x27, 0x4d, 0x75, 0xc6, - 0x68, 0x8d, 0x01, 0x57, 0xba, 0x08, 0x0b, 0x2c, 0xe0, 0xb5, 0x86, 0xb9, 0x49, 0xec, 0x12, 0x19, - 0x7d, 0x7e, 0x48, 0x2a, 0x1c, 0xec, 0x32, 0x6d, 0xb3, 0xbf, 0x87, 0x08, 0x99, 0xe8, 0xbc, 0x23, - 0xb1, 0xfc, 0xb7, 0x0d, 0xdb, 0xea, 0xd2, 0x03, 0x24, 0x58, 0x6b, 0x15, 0x35, 0x78, 0x1f, 0x5a, - 0x97, 0x09, 0xd7, 0xd3, 0xeb, 0x9e, 0x16, 0xe1, 0x6e, 0x8e, 0xc9, 0x38, 0x55, 0x63, 0xeb, 0xae, - 0x1f, 0x91, 0xa8, 0x44, 0x17, 0x10, 0x91, 0xe2, 0x9b, 0x30, 0x1b, 0x60, 0x0e, 0x7a, 0x6c, 0x48, - 0x8e, 0x1d, 0xfd, 0xf1, 0xb5, 0xd8, 0x5b, 0xe2, 0x0b, 0xb8, 0x65, 0x56, 0x6c, 0xd3, 0xae, 0xe4, - 0xed, 0x32, 0x7d, 0x89, 0xfa, 0x7d, 0x0a, 0x8b, 0xbd, 0xd6, 0x22, 0xbf, 0x8f, 0x61, 0x5f, 0xd9, - 0xd1, 0x5c, 0xfe, 0x46, 0x33, 0xed, 0x32, 0x15, 0x95, 0x3c, 0x1b, 0x9b, 0xe5, 0xba, 0xf8, 0x5d, - 0xac, 0xd3, 0x56, 0x96, 0xf5, 0x90, 0x4b, 0x71, 0x16, 0x25, 0xcb, 0x4e, 0x48, 0x28, 0x19, 0xbd, - 0xb1, 0xdb, 0x55, 0x8e, 0x96, 0x10, 0xed, 0xb8, 0x84, 0xbf, 0x06, 0xbd, 0x14, 0x0d, 0x22, 0x32, - 0xfc, 0x04, 0xe6, 0xbb, 0x32, 0x0c, 0x0a, 0xb9, 0xd3, 0x14, 0xf7, 0x46, 0x52, 0x1c, 0x5f, 0x99, - 0x57, 0x2e, 0xf3, 0xe1, 0x1e, 0x9d, 0xa7, 0x78, 0x3f, 0x24, 0x0b, 0x1f, 0x14, 0xb4, 0xf5, 0x7c, - 0xe1, 0xea, 0x46, 0xfe, 0xce, 0xb5, 0x77, 0xe7, 0x27, 0x70, 0x12, 0x66, 0x3b, 0x8f, 0x08, 0xef, - 0x86, 0xa9, 0xab, 0x85, 0x8f, 0xe6, 0x27, 0xb3, 0x5f, 0x24, 0x61, 0x9a, 0x31, 0x81, 0x3f, 0x43, - 0x30, 0xc3, 0xcf, 0x55, 0xdc, 0x7f, 0x70, 0x47, 0x6f, 0xe3, 0xd4, 0xc9, 0xe1, 0x8a, 0x1c, 0xb4, - 0x74, 0xec, 0xf3, 0xdf, 0xfe, 0xfe, 0x76, 0xf2, 0x08, 0x3e, 0xac, 0xf4, 0x3f, 0xd5, 0xf1, 0x9f, - 0x08, 0x16, 0xe2, 0x8e, 0x46, 0xfc, 0xfa, 0xcb, 0x1e, 0x99, 0x1c, 0xde, 0xf9, 0x9d, 0xdd, 0xa6, - 0xd2, 0x6d, 0x06, 0xb6, 0x88, 0x0b, 0xca, 0xa0, 0xbf, 0x1a, 0x34, 0x47, 0xd4, 0xdb, 0x55, 0xee, - 0x45, 0x3e, 0xa8, 0xfb, 0x8a, 0xc3, 0x3c, 0xb3, 0xa3, 0x86, 0xbb, 0xd6, 0x6a, 0xa6, 0xeb, 0xe1, - 0x27, 0x08, 0xf6, 0xf7, 0xdc, 0x2d, 0x38, 0xfb, 0x52, 0x47, 0x0e, 0xcf, 0x6c, 0x6d, 0x07, 0x87, - 0x91, 0xf4, 0x21, 0x4b, 0xab, 0x80, 0x37, 0xfe, 0x45, 0x5a, 0x91, 0x43, 0x8d, 0x25, 0xf5, 0x00, - 0xc1, 0x34, 0x6b, 0x3e, 0xbc, 0xdc, 0x1f, 0x54, 0xf8, 0x52, 0x49, 0x9d, 0x18, 0xaa, 0x27, 0x00, - 0x9f, 0x66, 0x80, 0x97, 0xf1, 0xf1, 0x58, 0xc0, 0x7c, 0x2b, 0x2b, 0xf7, 0xf8, 0xc4, 0xbf, 0x8f, - 0xbf, 0x42, 0x00, 0x9d, 0x85, 0x8f, 0x4f, 0x0d, 0xa6, 0x28, 0x72, 0xba, 0xa4, 0x4e, 0x8f, 0xa6, - 0x3c, 0x52, 0x33, 0x8b, 0x6b, 0xe1, 0x21, 0x82, 0x64, 0x64, 0x57, 0x63, 0xb9, 0x7f, 0x90, 0xb8, - 0x4b, 0x20, 0xa5, 0x8c, 0xac, 0x2f, 0x70, 0x9d, 0x62, 0xb8, 0x5e, 0xc5, 0xc7, 0x62, 0x71, 0x35, - 0x5a, 0x36, 0x1d, 0xba, 0x7e, 0x41, 0xb0, 0x27, 0x58, 0x41, 0xf8, 0xb5, 0xfe, 0xa1, 0xba, 0xd6, - 0x7f, 0x6a, 0x65, 0x14, 0x55, 0x01, 0xe8, 0x3a, 0x03, 0x94, 0xc3, 0x57, 0x76, 0xda, 0x71, 0xc1, - 0x66, 0xc4, 0xdf, 0x21, 0x48, 0x46, 0xf6, 0xed, 0x20, 0x36, 0xe3, 0x2e, 0x84, 0x41, 0x6c, 0xc6, - 0x2e, 0x72, 0x69, 0x99, 0x81, 0xcf, 0xe0, 0x74, 0x2c, 0xf8, 0xce, 0xce, 0xfe, 0x19, 0xc1, 0x5c, - 0x68, 0xba, 0xe3, 0x01, 0xbd, 0xd4, 0xbb, 0x8d, 0x53, 0x67, 0x46, 0xd4, 0x16, 0xa0, 0x2e, 0x31, - 0x50, 0xe7, 0x70, 0x36, 0x16, 0x54, 0x64, 0x67, 0x75, 0x93, 0x89, 0xbf, 0x47, 0x90, 0x88, 0xac, - 0xa1, 0xd1, 0x62, 0xb7, 0x19, 0x94, 0x47, 0x55, 0x17, 0x58, 0x57, 0x18, 0xd6, 0xe3, 0x58, 0x1a, - 0x8e, 0x35, 0xb7, 0xf1, 0xe8, 0x79, 0x1a, 0x3d, 0x7e, 0x9e, 0x46, 0x7f, 0x3d, 0x4f, 0xa3, 0x6f, - 0x5e, 0xa4, 0x27, 0x1e, 0xbf, 0x48, 0x4f, 0xfc, 0xf1, 0x22, 0x3d, 0x71, 0x27, 0x3b, 0xfc, 0x88, - 0xdd, 0xee, 0x38, 0x66, 0xf7, 0xac, 0x31, 0xc3, 0xfe, 0xa1, 0xb3, 0xf6, 0x4f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xb3, 0x40, 0x11, 0x10, 0xae, 0x12, 0x00, 0x00, + // 1429 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5f, 0x6f, 0x13, 0xc7, + 0x16, 0xcf, 0x24, 0x24, 0x90, 0x13, 0xfb, 0xde, 0x30, 0x09, 0xdc, 0x5c, 0x73, 0x71, 0xc2, 0xc2, + 0x0d, 0x69, 0x80, 0xdd, 0xc6, 0xa1, 0x14, 0x68, 0x11, 0x60, 0x0a, 0x25, 0x6a, 0x70, 0xcd, 0x86, + 0x22, 0x95, 0x97, 0xd5, 0xae, 0x3d, 0x71, 0xb6, 0xf1, 0xee, 0x2c, 0xde, 0x59, 0x2b, 0x16, 0x42, + 0xaa, 0x2a, 0x95, 0x87, 0xaa, 0x95, 0x2a, 0xf5, 0xa5, 0x7d, 0xe0, 0xa1, 0x55, 0xd5, 0x97, 0x7e, + 0x82, 0x7e, 0x03, 0x9e, 0x2a, 0x44, 0xfb, 0x50, 0x21, 0x15, 0x55, 0xd0, 0x0f, 0x52, 0x79, 0x66, + 0xd6, 0xde, 0x75, 0xd6, 0x7f, 0x92, 0x46, 0x7d, 0xf3, 0xce, 0x9c, 0x73, 0xe6, 0x77, 0x7e, 0xe7, + 0xcc, 0x99, 0x9f, 0x61, 0xd6, 0x32, 0xad, 0x46, 0x95, 0xba, 0xda, 0xba, 0xed, 0x9a, 0x55, 0x9b, + 0x35, 0xb4, 0xfa, 0x92, 0x76, 0x3f, 0x20, 0xb5, 0x86, 0xea, 0xd5, 0x28, 0xa3, 0x78, 0x4a, 0x1a, + 0xa8, 0xa1, 0x81, 0x5a, 0x5f, 0xca, 0x4c, 0x57, 0x68, 0x85, 0xf2, 0x7d, 0xad, 0xf9, 0x4b, 0x98, + 0x66, 0xfe, 0x57, 0xa1, 0xb4, 0x52, 0x25, 0x9a, 0xe9, 0xd9, 0x9a, 0xe9, 0xba, 0x94, 0x99, 0xcc, + 0xa6, 0xae, 0x2f, 0x77, 0x17, 0x4b, 0xd4, 0x77, 0xa8, 0xaf, 0x59, 0xa6, 0x4f, 0xc4, 0x09, 0x5a, + 0x7d, 0xc9, 0x22, 0xcc, 0x5c, 0xd2, 0x3c, 0xb3, 0x62, 0xbb, 0xdc, 0x58, 0xda, 0xce, 0x25, 0xa1, + 0xf2, 0xcc, 0x9a, 0xe9, 0x84, 0xd1, 0x94, 0x24, 0x8b, 0x16, 0x44, 0x61, 0x33, 0x2b, 0xf1, 0xf0, + 0x2f, 0x2b, 0x58, 0xd7, 0x98, 0xed, 0x10, 0x9f, 0x99, 0x8e, 0x27, 0x0c, 0x94, 0x69, 0xc0, 0xb7, + 0x9b, 0x40, 0x8a, 0x3c, 0xb2, 0x4e, 0xee, 0x07, 0xc4, 0x67, 0x4a, 0x11, 0xa6, 0x62, 0xab, 0xbe, + 0x47, 0x5d, 0x9f, 0xe0, 0x0b, 0x30, 0x26, 0x10, 0xcc, 0xa0, 0x39, 0xb4, 0x30, 0x91, 0x3b, 0xa2, + 0x26, 0x30, 0xa3, 0x0a, 0xa7, 0xfc, 0xbe, 0x27, 0x2f, 0x66, 0x87, 0x74, 0xe9, 0xa0, 0x7c, 0x81, + 0x60, 0x8e, 0x87, 0x5c, 0xb5, 0x7d, 0x56, 0x0c, 0xac, 0xaa, 0x5d, 0xd2, 0x4d, 0xb7, 0x4c, 0x1d, + 0x97, 0xf8, 0xe1, 0xb1, 0xf8, 0x18, 0xa4, 0xd7, 0x3d, 0xc3, 0x62, 0x25, 0xc3, 0xdb, 0x34, 0x36, + 0xc8, 0x16, 0x3f, 0x66, 0x5c, 0x87, 0x75, 0x2f, 0xcf, 0x4a, 0xc5, 0xcd, 0x9b, 0x64, 0x0b, 0xdf, + 0x00, 0x68, 0x53, 0x35, 0x33, 0xcc, 0x61, 0xcc, 0xab, 0x82, 0x57, 0xb5, 0xc9, 0xab, 0x2a, 0x2a, + 0x27, 0x79, 0x55, 0x8b, 0x66, 0x85, 0xc8, 0xf0, 0x7a, 0xc4, 0x53, 0x79, 0x36, 0x0c, 0xc7, 0x7a, + 0xe0, 0x91, 0x09, 0x7f, 0x8f, 0x20, 0xe5, 0x05, 0x96, 0x51, 0x33, 0xdd, 0xb2, 0xe1, 0x98, 0xde, + 0x0c, 0x9a, 0x1b, 0x59, 0x98, 0xc8, 0xdd, 0x48, 0xcc, 0xbb, 0x6f, 0x38, 0xb5, 0x18, 0x58, 0xcd, + 0xd5, 0x5b, 0xa6, 0x77, 0xdd, 0x65, 0xb5, 0x46, 0xfe, 0xe2, 0xf3, 0x17, 0xb3, 0xe7, 0x2a, 0x36, + 0xdb, 0x08, 0x2c, 0xb5, 0x44, 0x1d, 0x4d, 0x46, 0xad, 0x9a, 0x96, 0x7f, 0xc6, 0xa6, 0xe1, 0xa7, + 0xc6, 0x1a, 0x1e, 0xf1, 0xd5, 0xb5, 0xd2, 0x86, 0x4b, 0x6b, 0x35, 0x19, 0x43, 0x07, 0xaf, 0x15, + 0x0c, 0xbf, 0x9b, 0x40, 0xca, 0xc9, 0xbe, 0xa4, 0x08, 0x50, 0x51, 0x56, 0x32, 0x97, 0xe0, 0xdf, + 0x1d, 0x18, 0xf1, 0x24, 0x8c, 0x6c, 0x92, 0x06, 0xaf, 0xc4, 0x3e, 0xbd, 0xf9, 0x13, 0x4f, 0xc3, + 0x68, 0xdd, 0xac, 0x06, 0x84, 0x1f, 0x94, 0xd2, 0xc5, 0xc7, 0xc5, 0xe1, 0xf3, 0x48, 0xa9, 0xc3, + 0x21, 0xe9, 0x7e, 0x8d, 0x3a, 0x8e, 0xcd, 0x5a, 0x3c, 0xce, 0x41, 0xca, 0x0d, 0x1c, 0x23, 0xa4, + 0x52, 0x46, 0x03, 0x37, 0x70, 0xa4, 0x3d, 0xce, 0x02, 0x94, 0xb8, 0x8f, 0x43, 0x5c, 0x26, 0x23, + 0x47, 0x56, 0xf0, 0x11, 0x18, 0x27, 0x1e, 0x2d, 0x6d, 0x18, 0x6e, 0xe0, 0xcc, 0x8c, 0x70, 0xf7, + 0x03, 0x7c, 0xa1, 0x10, 0x38, 0xca, 0x67, 0x08, 0x8e, 0x46, 0xd9, 0x8f, 0x22, 0xf8, 0xc7, 0x3b, + 0xeb, 0xd7, 0x61, 0xc8, 0x76, 0x03, 0x23, 0xe9, 0xd8, 0x82, 0xa9, 0x56, 0x57, 0x89, 0x1c, 0x23, + 0xcd, 0xb5, 0xd2, 0xb7, 0xb9, 0xb6, 0x47, 0x54, 0x63, 0xab, 0x61, 0xed, 0xf4, 0x49, 0xaf, 0x63, + 0x79, 0xef, 0x3a, 0x85, 0x76, 0x94, 0xba, 0x47, 0xbf, 0x5c, 0x89, 0xf6, 0xcb, 0x44, 0x6e, 0x31, + 0x79, 0x68, 0x24, 0xa5, 0x15, 0xed, 0xad, 0x53, 0x70, 0x90, 0x73, 0x90, 0xaf, 0xd2, 0xd2, 0x66, + 0x58, 0xd6, 0xc3, 0x30, 0xb6, 0x41, 0xec, 0xca, 0x06, 0x93, 0xe7, 0xc9, 0x2f, 0xe5, 0x96, 0x9c, + 0x6a, 0xd2, 0x58, 0xd2, 0xfe, 0x26, 0x8c, 0x5a, 0xcd, 0x05, 0x39, 0xbd, 0x8e, 0x25, 0x02, 0x59, + 0x71, 0xcb, 0x64, 0x8b, 0x94, 0x85, 0xa7, 0xb0, 0x57, 0xbe, 0x45, 0x70, 0xb8, 0x55, 0x00, 0xbe, + 0xd3, 0x1a, 0x59, 0x97, 0x61, 0xcc, 0x67, 0x26, 0x0b, 0xc4, 0x48, 0xfc, 0x57, 0xee, 0x64, 0xd7, + 0xea, 0xd9, 0x32, 0xe8, 0x1a, 0x37, 0xd7, 0xa5, 0xdb, 0x9e, 0xb5, 0xdd, 0x63, 0x04, 0xff, 0xd9, + 0x86, 0xb1, 0x3d, 0xb7, 0x79, 0x22, 0xbe, 0x6c, 0xb1, 0x01, 0x32, 0x97, 0x0e, 0x7b, 0xd6, 0x30, + 0xca, 0x32, 0xfc, 0x97, 0xc3, 0xbb, 0x4b, 0x19, 0xf1, 0xaf, 0xb2, 0x9b, 0xbc, 0x50, 0xfd, 0xea, + 0x48, 0x21, 0x93, 0xe4, 0x24, 0xd3, 0xba, 0x0d, 0xfb, 0xc5, 0x8d, 0x16, 0x79, 0xa5, 0xf2, 0xe7, + 0x9f, 0xbf, 0x98, 0x3d, 0x3b, 0xe8, 0x3c, 0xcd, 0xaf, 0x14, 0x97, 0xcf, 0xbe, 0x5e, 0x0c, 0xac, + 0xf7, 0x48, 0x43, 0x1f, 0xb3, 0x9a, 0x63, 0xc0, 0x57, 0x2e, 0xc0, 0x34, 0x3f, 0xf0, 0x7a, 0xdd, + 0x2e, 0x13, 0xb7, 0x44, 0x06, 0x9f, 0x1f, 0x8a, 0x0e, 0x87, 0x3a, 0x5c, 0x5b, 0xec, 0x1f, 0x20, + 0x72, 0x4d, 0x76, 0xde, 0xd1, 0x44, 0xfe, 0x5b, 0x8e, 0x2d, 0x73, 0xe5, 0x11, 0x92, 0xac, 0x35, + 0x8b, 0x1a, 0xee, 0x47, 0x9e, 0xcb, 0x94, 0xcf, 0xcc, 0x1a, 0x33, 0x62, 0xdc, 0x4d, 0xf0, 0x35, + 0x41, 0xd5, 0x9e, 0x75, 0xd7, 0x77, 0x48, 0x56, 0xa2, 0x03, 0x88, 0x4c, 0xf1, 0x2d, 0x18, 0x0f, + 0x31, 0x87, 0x3d, 0xd6, 0x27, 0xc7, 0xb6, 0xfd, 0xde, 0xb5, 0xd8, 0xdb, 0xf2, 0x06, 0xac, 0xd9, + 0x15, 0xd7, 0x76, 0x2b, 0x2b, 0xee, 0x3a, 0xdd, 0x41, 0xfd, 0x7e, 0x46, 0x30, 0x15, 0xf3, 0x94, + 0xb9, 0x0d, 0xf0, 0x74, 0x74, 0x16, 0xa2, 0x99, 0xc3, 0x48, 0xbc, 0x10, 0x39, 0x38, 0xe4, 0xd8, + 0xbe, 0x4f, 0xca, 0x86, 0xb8, 0x58, 0x46, 0x89, 0x06, 0x2e, 0x23, 0x35, 0xfe, 0x96, 0x8d, 0xe8, + 0x53, 0x62, 0x53, 0xdc, 0xdb, 0x6b, 0x62, 0x0b, 0x5f, 0x82, 0xd4, 0x47, 0xa6, 0x5d, 0x25, 0x65, + 0x23, 0x70, 0x99, 0x5d, 0x9d, 0xd9, 0xc7, 0xa9, 0xc9, 0xa8, 0x42, 0xd3, 0xa9, 0xa1, 0xa6, 0x53, + 0xef, 0x84, 0x9a, 0x4e, 0x9f, 0x10, 0xf6, 0x1f, 0x34, 0xcd, 0x15, 0x07, 0x66, 0xb6, 0xd3, 0xd1, + 0xba, 0x3a, 0x29, 0x5f, 0x2c, 0x1b, 0xb6, 0xbb, 0x4e, 0x65, 0x5f, 0x2e, 0x24, 0xd6, 0x2c, 0xc1, + 0x5f, 0x8a, 0xbb, 0x09, 0xbf, 0xbd, 0xa5, 0x58, 0xdb, 0x8f, 0x6b, 0x75, 0x6a, 0xbc, 0x0d, 0xd1, + 0xae, 0xdb, 0xf0, 0xa7, 0xf0, 0x3e, 0xc4, 0x0f, 0x91, 0x49, 0xad, 0x41, 0x3a, 0x9a, 0x54, 0xd8, + 0x89, 0x3b, 0xcd, 0x2a, 0x15, 0xc9, 0x6a, 0xef, 0xba, 0x73, 0xf1, 0xb2, 0x78, 0x93, 0xe2, 0xcf, + 0x00, 0x3e, 0x08, 0xe9, 0xc2, 0xfb, 0x05, 0xe3, 0xc6, 0x4a, 0xe1, 0xea, 0xea, 0xca, 0xbd, 0xeb, + 0xef, 0x4c, 0x0e, 0xe1, 0x34, 0x8c, 0xb7, 0x3f, 0x11, 0xde, 0x0f, 0x23, 0x57, 0x0b, 0x1f, 0x4e, + 0x0e, 0xe7, 0x3e, 0x4d, 0xc3, 0x28, 0x4f, 0x1e, 0x7f, 0x8c, 0x60, 0x4c, 0xa8, 0x6c, 0xdc, 0xfd, + 0xbd, 0x89, 0x4b, 0xfa, 0xcc, 0x42, 0x7f, 0x43, 0x01, 0x5a, 0x39, 0xfe, 0xc9, 0x2f, 0x7f, 0x7e, + 0x35, 0x7c, 0x14, 0x1f, 0xd1, 0xba, 0xff, 0x05, 0xc1, 0xbf, 0x23, 0x98, 0x4e, 0xd2, 0xba, 0xf8, + 0x8d, 0x9d, 0x6a, 0x63, 0x01, 0xef, 0xdc, 0xee, 0x24, 0xb5, 0x72, 0x97, 0x83, 0x2d, 0xe2, 0x82, + 0xd6, 0xeb, 0xdf, 0x90, 0xe1, 0xd5, 0x68, 0x73, 0xde, 0xd4, 0x7c, 0xed, 0x41, 0xec, 0x32, 0x3f, + 0xd4, 0x3c, 0x1e, 0x99, 0x6b, 0x31, 0x11, 0xda, 0xa8, 0xda, 0x3e, 0xc3, 0xcf, 0x10, 0x1c, 0xdc, + 0x26, 0xb7, 0x70, 0x6e, 0x47, 0xda, 0x4c, 0x64, 0xb6, 0xbc, 0x0b, 0x3d, 0xa7, 0xdc, 0xe1, 0x69, + 0x15, 0xf0, 0xea, 0xdf, 0x48, 0x2b, 0xa6, 0x2f, 0x79, 0x52, 0x8f, 0x10, 0x8c, 0xf2, 0xe6, 0xc3, + 0xf3, 0xdd, 0x41, 0x45, 0x05, 0x56, 0xe6, 0x64, 0x5f, 0x3b, 0x09, 0xf8, 0x34, 0x07, 0x3c, 0x8f, + 0x4f, 0x24, 0x02, 0x16, 0x33, 0x4f, 0x7b, 0x20, 0xe6, 0xe3, 0x43, 0xfc, 0x39, 0x02, 0x68, 0xeb, + 0x14, 0x7c, 0xaa, 0x37, 0x45, 0x31, 0xc5, 0x95, 0x39, 0x3d, 0x98, 0xf1, 0x40, 0xcd, 0x2c, 0x45, + 0xce, 0x63, 0x04, 0xe9, 0x98, 0xc4, 0xc0, 0x6a, 0xf7, 0x43, 0x92, 0x04, 0x4c, 0x46, 0x1b, 0xd8, + 0x5e, 0xe2, 0x3a, 0xc5, 0x71, 0xfd, 0x1f, 0x1f, 0x4f, 0xc4, 0x55, 0x6f, 0xfa, 0xb4, 0xe9, 0xfa, + 0x11, 0xc1, 0x81, 0xf0, 0xe5, 0xc4, 0xaf, 0x75, 0x3f, 0xaa, 0x43, 0xb5, 0x64, 0x16, 0x07, 0x31, + 0x95, 0x80, 0x6e, 0x72, 0x40, 0x79, 0x7c, 0x65, 0xb7, 0x1d, 0x17, 0x3e, 0xe8, 0xf8, 0x6b, 0x04, + 0xe9, 0x98, 0x4c, 0xe8, 0xc5, 0x66, 0x92, 0xb0, 0xe9, 0xc5, 0x66, 0xa2, 0xfe, 0x50, 0xe6, 0x39, + 0xf8, 0x39, 0x9c, 0x4d, 0x04, 0xdf, 0x96, 0x1a, 0x3f, 0x20, 0x98, 0x88, 0x0c, 0x7e, 0xdc, 0xa3, + 0x97, 0xb6, 0x8b, 0x88, 0xcc, 0x99, 0x01, 0xad, 0x25, 0xa8, 0x8b, 0x1c, 0xd4, 0x59, 0x9c, 0x4b, + 0x04, 0x15, 0x7b, 0xa9, 0x3a, 0xc9, 0xc4, 0xdf, 0x20, 0x48, 0x45, 0xdf, 0x38, 0x3c, 0xd8, 0xd9, + 0x2d, 0x06, 0xd5, 0x41, 0xcd, 0x25, 0xd6, 0x45, 0x8e, 0xf5, 0x04, 0x56, 0xfa, 0x63, 0xcd, 0xaf, + 0x3e, 0x79, 0x99, 0x45, 0x4f, 0x5f, 0x66, 0xd1, 0x1f, 0x2f, 0xb3, 0xe8, 0xcb, 0x57, 0xd9, 0xa1, + 0xa7, 0xaf, 0xb2, 0x43, 0xbf, 0xbd, 0xca, 0x0e, 0xdd, 0xcb, 0xf5, 0xd7, 0xde, 0x5b, 0xed, 0xc0, + 0x5c, 0x86, 0x5b, 0x63, 0x5c, 0xc6, 0x2c, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0xde, 0xd0, 0x12, + 0xac, 0x86, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2374,6 +2451,58 @@ func (m *QuerySigningInfoRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) return len(dAtA) - i, nil } +func (m *SigningInfoResponse) 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 *SigningInfoResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SigningInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.JailedUntil != nil { + { + size, err := m.JailedUntil.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if m.MissedBlocksCounter != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.MissedBlocksCounter)) + i-- + dAtA[i] = 0x18 + } + if m.StartHeight != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.StartHeight)) + i-- + dAtA[i] = 0x10 + } + if len(m.FpBtcPkHex) > 0 { + i -= len(m.FpBtcPkHex) + copy(dAtA[i:], m.FpBtcPkHex) + i = encodeVarintQuery(dAtA, i, uint64(len(m.FpBtcPkHex))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *QuerySigningInfoResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2395,7 +2524,7 @@ func (m *QuerySigningInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error var l int _ = l { - size, err := m.FpSigningInfo.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.SigningInfo.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2474,10 +2603,10 @@ func (m *QuerySigningInfosResponse) MarshalToSizedBuffer(dAtA []byte) (int, erro i-- dAtA[i] = 0x12 } - if len(m.FpSigningInfos) > 0 { - for iNdEx := len(m.FpSigningInfos) - 1; iNdEx >= 0; iNdEx-- { + if len(m.SigningInfos) > 0 { + for iNdEx := len(m.SigningInfos) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.FpSigningInfos[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.SigningInfos[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -2788,13 +2917,36 @@ func (m *QuerySigningInfoRequest) Size() (n int) { return n } +func (m *SigningInfoResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.FpBtcPkHex) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } + if m.StartHeight != 0 { + n += 1 + sovQuery(uint64(m.StartHeight)) + } + if m.MissedBlocksCounter != 0 { + n += 1 + sovQuery(uint64(m.MissedBlocksCounter)) + } + if m.JailedUntil != nil { + l = m.JailedUntil.Size() + n += 1 + l + sovQuery(uint64(l)) + } + return n +} + func (m *QuerySigningInfoResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = m.FpSigningInfo.Size() + l = m.SigningInfo.Size() n += 1 + l + sovQuery(uint64(l)) return n } @@ -2818,8 +2970,8 @@ func (m *QuerySigningInfosResponse) Size() (n int) { } var l int _ = l - if len(m.FpSigningInfos) > 0 { - for _, e := range m.FpSigningInfos { + if len(m.SigningInfos) > 0 { + for _, e := range m.SigningInfos { l = e.Size() n += 1 + l + sovQuery(uint64(l)) } @@ -4740,6 +4892,162 @@ func (m *QuerySigningInfoRequest) Unmarshal(dAtA []byte) error { } return nil } +func (m *SigningInfoResponse) 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: SigningInfoResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SigningInfoResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field FpBtcPkHex", 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.FpBtcPkHex = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field StartHeight", wireType) + } + m.StartHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.StartHeight |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MissedBlocksCounter", wireType) + } + m.MissedBlocksCounter = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MissedBlocksCounter |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field JailedUntil", 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.JailedUntil == nil { + m.JailedUntil = ×tamppb.Timestamp{} + } + if err := m.JailedUntil.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + 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 (m *QuerySigningInfoResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -4771,7 +5079,7 @@ func (m *QuerySigningInfoResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FpSigningInfo", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SigningInfo", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4798,7 +5106,7 @@ func (m *QuerySigningInfoResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.FpSigningInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.SigningInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -4940,7 +5248,7 @@ func (m *QuerySigningInfosResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FpSigningInfos", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SigningInfos", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -4967,8 +5275,8 @@ func (m *QuerySigningInfosResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.FpSigningInfos = append(m.FpSigningInfos, FinalityProviderSigningInfo{}) - if err := m.FpSigningInfos[len(m.FpSigningInfos)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.SigningInfos = append(m.SigningInfos, SigningInfoResponse{}) + if err := m.SigningInfos[len(m.SigningInfos)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex From ad295750dc0995fb2fdcb94b5a09968455519c61 Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Mon, 14 Oct 2024 14:34:18 +0300 Subject: [PATCH 2/6] finish converter and fix errors --- proto/babylon/finality/v1/query.proto | 3 +- x/finality/keeper/grpc_query.go | 19 +-- x/finality/keeper/grpc_query_test.go | 10 +- x/finality/types/query.pb.go | 230 +++++++++++++------------- 4 files changed, 125 insertions(+), 137 deletions(-) diff --git a/proto/babylon/finality/v1/query.proto b/proto/babylon/finality/v1/query.proto index 71fc4e1a6..d5d65eeac 100644 --- a/proto/babylon/finality/v1/query.proto +++ b/proto/babylon/finality/v1/query.proto @@ -7,6 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "babylon/finality/v1/params.proto"; import "babylon/finality/v1/finality.proto"; import "google/protobuf/timestamp.proto"; +import "amino/amino.proto"; option go_package = "github.com/babylonlabs-io/babylon/x/finality/types"; @@ -236,7 +237,7 @@ message SigningInfoResponse { string fp_btc_pk_hex = 1; int64 start_height = 2; int64 missed_blocks_counter = 3; - google.protobuf.Timestamp jailed_until = 4; + google.protobuf.Timestamp jailed_until = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } // QuerySigningInfoResponse is the response type for the Query/SigningInfo RPC diff --git a/x/finality/keeper/grpc_query.go b/x/finality/keeper/grpc_query.go index 9b8f061c2..462d5de99 100644 --- a/x/finality/keeper/grpc_query.go +++ b/x/finality/keeper/grpc_query.go @@ -11,7 +11,6 @@ import ( "github.com/cosmos/cosmos-sdk/types/query" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "google.golang.org/protobuf/types/known/timestamppb" bbn "github.com/babylonlabs-io/babylon/types" "github.com/babylonlabs-io/babylon/x/finality/types" @@ -272,7 +271,7 @@ func (k Keeper) SigningInfos(ctx context.Context, req *types.QuerySigningInfosRe if err != nil { return nil, err } - return &types.QuerySigningInfosResponse{SigningInfos: convertToSigningInfosResponse(signInfos), Pagination: pageRes}, nil + return &types.QuerySigningInfosResponse{SigningInfos: k.convertToSigningInfosResponse(signInfos), Pagination: pageRes}, nil } func (k Keeper) convertToSigningInfoResponse(info types.FinalityProviderSigningInfo) types.SigningInfoResponse { @@ -280,22 +279,14 @@ func (k Keeper) convertToSigningInfoResponse(info types.FinalityProviderSigningI FpBtcPkHex: info.FpBtcPk.MarshalHex(), StartHeight: info.StartHeight, MissedBlocksCounter: info.MissedBlocksCounter, - JailedUntil: timestamppb.New(info.JailedUntil), + JailedUntil: info.JailedUntil, } - } -func convertToSigningInfoResponse(signInfos []slashingtypes.ValidatorSigningInfo) []*types.SigningInfo { - response := make([]*types.SigningInfo, len(signInfos)) +func (k Keeper) convertToSigningInfosResponse(signInfos []types.FinalityProviderSigningInfo) []types.SigningInfoResponse { + response := make([]types.SigningInfoResponse, len(signInfos)) for i, info := range signInfos { - response[i] = &types.SigningInfo{ - Address: info.Address, - StartHeight: info.StartHeight, - IndexOffset: info.IndexOffset, - JailedUntil: info.JailedUntil, - Tombstoned: info.Tombstoned, - MissedBlocksCounter: info.MissedBlocksCounter, - } + response[i] = k.convertToSigningInfoResponse(info) } return response } diff --git a/x/finality/keeper/grpc_query_test.go b/x/finality/keeper/grpc_query_test.go index 8f15e20a0..df7399e5f 100644 --- a/x/finality/keeper/grpc_query_test.go +++ b/x/finality/keeper/grpc_query_test.go @@ -405,9 +405,9 @@ func FuzzSigningInfo(f *testing.F) { req := &types.QuerySigningInfoRequest{FpBtcPkHex: fpPk} resp, err := fKeeper.SigningInfo(ctx, req) require.NoError(t, err) - require.Equal(t, fpSigningInfos[fpPk].StartHeight, resp.FpSigningInfo.StartHeight) - require.Equal(t, fpSigningInfos[fpPk].MissedBlocksCounter, resp.FpSigningInfo.MissedBlocksCounter) - require.Equal(t, fpPk, resp.FpSigningInfo.FpBtcPk.MarshalHex()) + require.Equal(t, fpSigningInfos[fpPk].StartHeight, resp.SigningInfo.StartHeight) + require.Equal(t, fpSigningInfos[fpPk].MissedBlocksCounter, resp.SigningInfo.MissedBlocksCounter) + require.Equal(t, fpPk, resp.SigningInfo.FpBtcPkHex) } // perform a query for signing info of non-exist finality provider @@ -428,9 +428,9 @@ func FuzzSigningInfo(f *testing.F) { } resp, err := fKeeper.SigningInfos(ctx, req) require.NoError(t, err) - require.LessOrEqual(t, len(resp.FpSigningInfos), int(limit)) // check if pagination takes effect + require.LessOrEqual(t, len(resp.FpBtcPkHex), int(limit)) // check if pagination takes effect require.EqualValues(t, resp.Pagination.Total, numSigningInfo) // ensure evidences before startHeight are not included - for _, si := range resp.FpSigningInfos { + for _, si := range resp.SigningInfo { require.Equal(t, fpSigningInfos[si.FpBtcPk.MarshalHex()].MissedBlocksCounter, si.MissedBlocksCounter) require.Equal(t, fpSigningInfos[si.FpBtcPk.MarshalHex()].FpBtcPk.MarshalHex(), si.FpBtcPk.MarshalHex()) require.Equal(t, fpSigningInfos[si.FpBtcPk.MarshalHex()].StartHeight, si.StartHeight) diff --git a/x/finality/types/query.pb.go b/x/finality/types/query.pb.go index 030d2ff7d..d12c7aad2 100644 --- a/x/finality/types/query.pb.go +++ b/x/finality/types/query.pb.go @@ -8,23 +8,27 @@ import ( fmt "fmt" github_com_babylonlabs_io_babylon_types "github.com/babylonlabs-io/babylon/types" query "github.com/cosmos/cosmos-sdk/types/query" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" + github_com_cosmos_gogoproto_types "github.com/cosmos/gogoproto/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - timestamppb "google.golang.org/protobuf/types/known/timestamppb" + _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" + time "time" ) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +var _ = time.Kitchen // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. @@ -982,10 +986,10 @@ func (m *QuerySigningInfoRequest) GetFpBtcPkHex() string { // SigningInfoResponse defines the API response containing a finality provider's signing info // for monitoring their liveness activity. type SigningInfoResponse struct { - FpBtcPkHex string `protobuf:"bytes,1,opt,name=fp_btc_pk_hex,json=fpBtcPkHex,proto3" json:"fp_btc_pk_hex,omitempty"` - StartHeight int64 `protobuf:"varint,2,opt,name=start_height,json=startHeight,proto3" json:"start_height,omitempty"` - MissedBlocksCounter int64 `protobuf:"varint,3,opt,name=missed_blocks_counter,json=missedBlocksCounter,proto3" json:"missed_blocks_counter,omitempty"` - JailedUntil *timestamppb.Timestamp `protobuf:"bytes,4,opt,name=jailed_until,json=jailedUntil,proto3" json:"jailed_until,omitempty"` + FpBtcPkHex string `protobuf:"bytes,1,opt,name=fp_btc_pk_hex,json=fpBtcPkHex,proto3" json:"fp_btc_pk_hex,omitempty"` + StartHeight int64 `protobuf:"varint,2,opt,name=start_height,json=startHeight,proto3" json:"start_height,omitempty"` + MissedBlocksCounter int64 `protobuf:"varint,3,opt,name=missed_blocks_counter,json=missedBlocksCounter,proto3" json:"missed_blocks_counter,omitempty"` + JailedUntil time.Time `protobuf:"bytes,4,opt,name=jailed_until,json=jailedUntil,proto3,stdtime" json:"jailed_until"` } func (m *SigningInfoResponse) Reset() { *m = SigningInfoResponse{} } @@ -1042,11 +1046,11 @@ func (m *SigningInfoResponse) GetMissedBlocksCounter() int64 { return 0 } -func (m *SigningInfoResponse) GetJailedUntil() *timestamppb.Timestamp { +func (m *SigningInfoResponse) GetJailedUntil() time.Time { if m != nil { return m.JailedUntil } - return nil + return time.Time{} } // QuerySigningInfoResponse is the response type for the Query/SigningInfo RPC @@ -1227,97 +1231,98 @@ func init() { func init() { proto.RegisterFile("babylon/finality/v1/query.proto", fileDescriptor_32bddab77af6fdae) } var fileDescriptor_32bddab77af6fdae = []byte{ - // 1429 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x5f, 0x6f, 0x13, 0xc7, - 0x16, 0xcf, 0x24, 0x24, 0x90, 0x13, 0xfb, 0xde, 0x30, 0x09, 0xdc, 0x5c, 0x73, 0x71, 0xc2, 0xc2, - 0x0d, 0x69, 0x80, 0xdd, 0xc6, 0xa1, 0x14, 0x68, 0x11, 0x60, 0x0a, 0x25, 0x6a, 0x70, 0xcd, 0x86, - 0x22, 0x95, 0x97, 0xd5, 0xae, 0x3d, 0x71, 0xb6, 0xf1, 0xee, 0x2c, 0xde, 0x59, 0x2b, 0x16, 0x42, - 0xaa, 0x2a, 0x95, 0x87, 0xaa, 0x95, 0x2a, 0xf5, 0xa5, 0x7d, 0xe0, 0xa1, 0x55, 0xd5, 0x97, 0x7e, - 0x82, 0x7e, 0x03, 0x9e, 0x2a, 0x44, 0xfb, 0x50, 0x21, 0x15, 0x55, 0xd0, 0x0f, 0x52, 0x79, 0x66, - 0xd6, 0xde, 0x75, 0xd6, 0x7f, 0x92, 0x46, 0x7d, 0xf3, 0xce, 0x9c, 0x73, 0xe6, 0x77, 0x7e, 0xe7, - 0xcc, 0x99, 0x9f, 0x61, 0xd6, 0x32, 0xad, 0x46, 0x95, 0xba, 0xda, 0xba, 0xed, 0x9a, 0x55, 0x9b, - 0x35, 0xb4, 0xfa, 0x92, 0x76, 0x3f, 0x20, 0xb5, 0x86, 0xea, 0xd5, 0x28, 0xa3, 0x78, 0x4a, 0x1a, - 0xa8, 0xa1, 0x81, 0x5a, 0x5f, 0xca, 0x4c, 0x57, 0x68, 0x85, 0xf2, 0x7d, 0xad, 0xf9, 0x4b, 0x98, - 0x66, 0xfe, 0x57, 0xa1, 0xb4, 0x52, 0x25, 0x9a, 0xe9, 0xd9, 0x9a, 0xe9, 0xba, 0x94, 0x99, 0xcc, - 0xa6, 0xae, 0x2f, 0x77, 0x17, 0x4b, 0xd4, 0x77, 0xa8, 0xaf, 0x59, 0xa6, 0x4f, 0xc4, 0x09, 0x5a, - 0x7d, 0xc9, 0x22, 0xcc, 0x5c, 0xd2, 0x3c, 0xb3, 0x62, 0xbb, 0xdc, 0x58, 0xda, 0xce, 0x25, 0xa1, - 0xf2, 0xcc, 0x9a, 0xe9, 0x84, 0xd1, 0x94, 0x24, 0x8b, 0x16, 0x44, 0x61, 0x33, 0x2b, 0xf1, 0xf0, - 0x2f, 0x2b, 0x58, 0xd7, 0x98, 0xed, 0x10, 0x9f, 0x99, 0x8e, 0x27, 0x0c, 0x94, 0x69, 0xc0, 0xb7, - 0x9b, 0x40, 0x8a, 0x3c, 0xb2, 0x4e, 0xee, 0x07, 0xc4, 0x67, 0x4a, 0x11, 0xa6, 0x62, 0xab, 0xbe, - 0x47, 0x5d, 0x9f, 0xe0, 0x0b, 0x30, 0x26, 0x10, 0xcc, 0xa0, 0x39, 0xb4, 0x30, 0x91, 0x3b, 0xa2, - 0x26, 0x30, 0xa3, 0x0a, 0xa7, 0xfc, 0xbe, 0x27, 0x2f, 0x66, 0x87, 0x74, 0xe9, 0xa0, 0x7c, 0x81, - 0x60, 0x8e, 0x87, 0x5c, 0xb5, 0x7d, 0x56, 0x0c, 0xac, 0xaa, 0x5d, 0xd2, 0x4d, 0xb7, 0x4c, 0x1d, - 0x97, 0xf8, 0xe1, 0xb1, 0xf8, 0x18, 0xa4, 0xd7, 0x3d, 0xc3, 0x62, 0x25, 0xc3, 0xdb, 0x34, 0x36, - 0xc8, 0x16, 0x3f, 0x66, 0x5c, 0x87, 0x75, 0x2f, 0xcf, 0x4a, 0xc5, 0xcd, 0x9b, 0x64, 0x0b, 0xdf, - 0x00, 0x68, 0x53, 0x35, 0x33, 0xcc, 0x61, 0xcc, 0xab, 0x82, 0x57, 0xb5, 0xc9, 0xab, 0x2a, 0x2a, - 0x27, 0x79, 0x55, 0x8b, 0x66, 0x85, 0xc8, 0xf0, 0x7a, 0xc4, 0x53, 0x79, 0x36, 0x0c, 0xc7, 0x7a, - 0xe0, 0x91, 0x09, 0x7f, 0x8f, 0x20, 0xe5, 0x05, 0x96, 0x51, 0x33, 0xdd, 0xb2, 0xe1, 0x98, 0xde, - 0x0c, 0x9a, 0x1b, 0x59, 0x98, 0xc8, 0xdd, 0x48, 0xcc, 0xbb, 0x6f, 0x38, 0xb5, 0x18, 0x58, 0xcd, - 0xd5, 0x5b, 0xa6, 0x77, 0xdd, 0x65, 0xb5, 0x46, 0xfe, 0xe2, 0xf3, 0x17, 0xb3, 0xe7, 0x2a, 0x36, - 0xdb, 0x08, 0x2c, 0xb5, 0x44, 0x1d, 0x4d, 0x46, 0xad, 0x9a, 0x96, 0x7f, 0xc6, 0xa6, 0xe1, 0xa7, - 0xc6, 0x1a, 0x1e, 0xf1, 0xd5, 0xb5, 0xd2, 0x86, 0x4b, 0x6b, 0x35, 0x19, 0x43, 0x07, 0xaf, 0x15, - 0x0c, 0xbf, 0x9b, 0x40, 0xca, 0xc9, 0xbe, 0xa4, 0x08, 0x50, 0x51, 0x56, 0x32, 0x97, 0xe0, 0xdf, - 0x1d, 0x18, 0xf1, 0x24, 0x8c, 0x6c, 0x92, 0x06, 0xaf, 0xc4, 0x3e, 0xbd, 0xf9, 0x13, 0x4f, 0xc3, - 0x68, 0xdd, 0xac, 0x06, 0x84, 0x1f, 0x94, 0xd2, 0xc5, 0xc7, 0xc5, 0xe1, 0xf3, 0x48, 0xa9, 0xc3, - 0x21, 0xe9, 0x7e, 0x8d, 0x3a, 0x8e, 0xcd, 0x5a, 0x3c, 0xce, 0x41, 0xca, 0x0d, 0x1c, 0x23, 0xa4, - 0x52, 0x46, 0x03, 0x37, 0x70, 0xa4, 0x3d, 0xce, 0x02, 0x94, 0xb8, 0x8f, 0x43, 0x5c, 0x26, 0x23, - 0x47, 0x56, 0xf0, 0x11, 0x18, 0x27, 0x1e, 0x2d, 0x6d, 0x18, 0x6e, 0xe0, 0xcc, 0x8c, 0x70, 0xf7, - 0x03, 0x7c, 0xa1, 0x10, 0x38, 0xca, 0x67, 0x08, 0x8e, 0x46, 0xd9, 0x8f, 0x22, 0xf8, 0xc7, 0x3b, - 0xeb, 0xd7, 0x61, 0xc8, 0x76, 0x03, 0x23, 0xe9, 0xd8, 0x82, 0xa9, 0x56, 0x57, 0x89, 0x1c, 0x23, - 0xcd, 0xb5, 0xd2, 0xb7, 0xb9, 0xb6, 0x47, 0x54, 0x63, 0xab, 0x61, 0xed, 0xf4, 0x49, 0xaf, 0x63, - 0x79, 0xef, 0x3a, 0x85, 0x76, 0x94, 0xba, 0x47, 0xbf, 0x5c, 0x89, 0xf6, 0xcb, 0x44, 0x6e, 0x31, - 0x79, 0x68, 0x24, 0xa5, 0x15, 0xed, 0xad, 0x53, 0x70, 0x90, 0x73, 0x90, 0xaf, 0xd2, 0xd2, 0x66, - 0x58, 0xd6, 0xc3, 0x30, 0xb6, 0x41, 0xec, 0xca, 0x06, 0x93, 0xe7, 0xc9, 0x2f, 0xe5, 0x96, 0x9c, - 0x6a, 0xd2, 0x58, 0xd2, 0xfe, 0x26, 0x8c, 0x5a, 0xcd, 0x05, 0x39, 0xbd, 0x8e, 0x25, 0x02, 0x59, - 0x71, 0xcb, 0x64, 0x8b, 0x94, 0x85, 0xa7, 0xb0, 0x57, 0xbe, 0x45, 0x70, 0xb8, 0x55, 0x00, 0xbe, - 0xd3, 0x1a, 0x59, 0x97, 0x61, 0xcc, 0x67, 0x26, 0x0b, 0xc4, 0x48, 0xfc, 0x57, 0xee, 0x64, 0xd7, - 0xea, 0xd9, 0x32, 0xe8, 0x1a, 0x37, 0xd7, 0xa5, 0xdb, 0x9e, 0xb5, 0xdd, 0x63, 0x04, 0xff, 0xd9, - 0x86, 0xb1, 0x3d, 0xb7, 0x79, 0x22, 0xbe, 0x6c, 0xb1, 0x01, 0x32, 0x97, 0x0e, 0x7b, 0xd6, 0x30, - 0xca, 0x32, 0xfc, 0x97, 0xc3, 0xbb, 0x4b, 0x19, 0xf1, 0xaf, 0xb2, 0x9b, 0xbc, 0x50, 0xfd, 0xea, - 0x48, 0x21, 0x93, 0xe4, 0x24, 0xd3, 0xba, 0x0d, 0xfb, 0xc5, 0x8d, 0x16, 0x79, 0xa5, 0xf2, 0xe7, - 0x9f, 0xbf, 0x98, 0x3d, 0x3b, 0xe8, 0x3c, 0xcd, 0xaf, 0x14, 0x97, 0xcf, 0xbe, 0x5e, 0x0c, 0xac, - 0xf7, 0x48, 0x43, 0x1f, 0xb3, 0x9a, 0x63, 0xc0, 0x57, 0x2e, 0xc0, 0x34, 0x3f, 0xf0, 0x7a, 0xdd, - 0x2e, 0x13, 0xb7, 0x44, 0x06, 0x9f, 0x1f, 0x8a, 0x0e, 0x87, 0x3a, 0x5c, 0x5b, 0xec, 0x1f, 0x20, - 0x72, 0x4d, 0x76, 0xde, 0xd1, 0x44, 0xfe, 0x5b, 0x8e, 0x2d, 0x73, 0xe5, 0x11, 0x92, 0xac, 0x35, - 0x8b, 0x1a, 0xee, 0x47, 0x9e, 0xcb, 0x94, 0xcf, 0xcc, 0x1a, 0x33, 0x62, 0xdc, 0x4d, 0xf0, 0x35, - 0x41, 0xd5, 0x9e, 0x75, 0xd7, 0x77, 0x48, 0x56, 0xa2, 0x03, 0x88, 0x4c, 0xf1, 0x2d, 0x18, 0x0f, - 0x31, 0x87, 0x3d, 0xd6, 0x27, 0xc7, 0xb6, 0xfd, 0xde, 0xb5, 0xd8, 0xdb, 0xf2, 0x06, 0xac, 0xd9, - 0x15, 0xd7, 0x76, 0x2b, 0x2b, 0xee, 0x3a, 0xdd, 0x41, 0xfd, 0x7e, 0x46, 0x30, 0x15, 0xf3, 0x94, - 0xb9, 0x0d, 0xf0, 0x74, 0x74, 0x16, 0xa2, 0x99, 0xc3, 0x48, 0xbc, 0x10, 0x39, 0x38, 0xe4, 0xd8, - 0xbe, 0x4f, 0xca, 0x86, 0xb8, 0x58, 0x46, 0x89, 0x06, 0x2e, 0x23, 0x35, 0xfe, 0x96, 0x8d, 0xe8, - 0x53, 0x62, 0x53, 0xdc, 0xdb, 0x6b, 0x62, 0x0b, 0x5f, 0x82, 0xd4, 0x47, 0xa6, 0x5d, 0x25, 0x65, - 0x23, 0x70, 0x99, 0x5d, 0x9d, 0xd9, 0xc7, 0xa9, 0xc9, 0xa8, 0x42, 0xd3, 0xa9, 0xa1, 0xa6, 0x53, - 0xef, 0x84, 0x9a, 0x4e, 0x9f, 0x10, 0xf6, 0x1f, 0x34, 0xcd, 0x15, 0x07, 0x66, 0xb6, 0xd3, 0xd1, - 0xba, 0x3a, 0x29, 0x5f, 0x2c, 0x1b, 0xb6, 0xbb, 0x4e, 0x65, 0x5f, 0x2e, 0x24, 0xd6, 0x2c, 0xc1, - 0x5f, 0x8a, 0xbb, 0x09, 0xbf, 0xbd, 0xa5, 0x58, 0xdb, 0x8f, 0x6b, 0x75, 0x6a, 0xbc, 0x0d, 0xd1, - 0xae, 0xdb, 0xf0, 0xa7, 0xf0, 0x3e, 0xc4, 0x0f, 0x91, 0x49, 0xad, 0x41, 0x3a, 0x9a, 0x54, 0xd8, - 0x89, 0x3b, 0xcd, 0x2a, 0x15, 0xc9, 0x6a, 0xef, 0xba, 0x73, 0xf1, 0xb2, 0x78, 0x93, 0xe2, 0xcf, - 0x00, 0x3e, 0x08, 0xe9, 0xc2, 0xfb, 0x05, 0xe3, 0xc6, 0x4a, 0xe1, 0xea, 0xea, 0xca, 0xbd, 0xeb, - 0xef, 0x4c, 0x0e, 0xe1, 0x34, 0x8c, 0xb7, 0x3f, 0x11, 0xde, 0x0f, 0x23, 0x57, 0x0b, 0x1f, 0x4e, - 0x0e, 0xe7, 0x3e, 0x4d, 0xc3, 0x28, 0x4f, 0x1e, 0x7f, 0x8c, 0x60, 0x4c, 0xa8, 0x6c, 0xdc, 0xfd, - 0xbd, 0x89, 0x4b, 0xfa, 0xcc, 0x42, 0x7f, 0x43, 0x01, 0x5a, 0x39, 0xfe, 0xc9, 0x2f, 0x7f, 0x7e, - 0x35, 0x7c, 0x14, 0x1f, 0xd1, 0xba, 0xff, 0x05, 0xc1, 0xbf, 0x23, 0x98, 0x4e, 0xd2, 0xba, 0xf8, - 0x8d, 0x9d, 0x6a, 0x63, 0x01, 0xef, 0xdc, 0xee, 0x24, 0xb5, 0x72, 0x97, 0x83, 0x2d, 0xe2, 0x82, - 0xd6, 0xeb, 0xdf, 0x90, 0xe1, 0xd5, 0x68, 0x73, 0xde, 0xd4, 0x7c, 0xed, 0x41, 0xec, 0x32, 0x3f, - 0xd4, 0x3c, 0x1e, 0x99, 0x6b, 0x31, 0x11, 0xda, 0xa8, 0xda, 0x3e, 0xc3, 0xcf, 0x10, 0x1c, 0xdc, - 0x26, 0xb7, 0x70, 0x6e, 0x47, 0xda, 0x4c, 0x64, 0xb6, 0xbc, 0x0b, 0x3d, 0xa7, 0xdc, 0xe1, 0x69, - 0x15, 0xf0, 0xea, 0xdf, 0x48, 0x2b, 0xa6, 0x2f, 0x79, 0x52, 0x8f, 0x10, 0x8c, 0xf2, 0xe6, 0xc3, - 0xf3, 0xdd, 0x41, 0x45, 0x05, 0x56, 0xe6, 0x64, 0x5f, 0x3b, 0x09, 0xf8, 0x34, 0x07, 0x3c, 0x8f, - 0x4f, 0x24, 0x02, 0x16, 0x33, 0x4f, 0x7b, 0x20, 0xe6, 0xe3, 0x43, 0xfc, 0x39, 0x02, 0x68, 0xeb, - 0x14, 0x7c, 0xaa, 0x37, 0x45, 0x31, 0xc5, 0x95, 0x39, 0x3d, 0x98, 0xf1, 0x40, 0xcd, 0x2c, 0x45, - 0xce, 0x63, 0x04, 0xe9, 0x98, 0xc4, 0xc0, 0x6a, 0xf7, 0x43, 0x92, 0x04, 0x4c, 0x46, 0x1b, 0xd8, - 0x5e, 0xe2, 0x3a, 0xc5, 0x71, 0xfd, 0x1f, 0x1f, 0x4f, 0xc4, 0x55, 0x6f, 0xfa, 0xb4, 0xe9, 0xfa, - 0x11, 0xc1, 0x81, 0xf0, 0xe5, 0xc4, 0xaf, 0x75, 0x3f, 0xaa, 0x43, 0xb5, 0x64, 0x16, 0x07, 0x31, - 0x95, 0x80, 0x6e, 0x72, 0x40, 0x79, 0x7c, 0x65, 0xb7, 0x1d, 0x17, 0x3e, 0xe8, 0xf8, 0x6b, 0x04, - 0xe9, 0x98, 0x4c, 0xe8, 0xc5, 0x66, 0x92, 0xb0, 0xe9, 0xc5, 0x66, 0xa2, 0xfe, 0x50, 0xe6, 0x39, - 0xf8, 0x39, 0x9c, 0x4d, 0x04, 0xdf, 0x96, 0x1a, 0x3f, 0x20, 0x98, 0x88, 0x0c, 0x7e, 0xdc, 0xa3, - 0x97, 0xb6, 0x8b, 0x88, 0xcc, 0x99, 0x01, 0xad, 0x25, 0xa8, 0x8b, 0x1c, 0xd4, 0x59, 0x9c, 0x4b, - 0x04, 0x15, 0x7b, 0xa9, 0x3a, 0xc9, 0xc4, 0xdf, 0x20, 0x48, 0x45, 0xdf, 0x38, 0x3c, 0xd8, 0xd9, - 0x2d, 0x06, 0xd5, 0x41, 0xcd, 0x25, 0xd6, 0x45, 0x8e, 0xf5, 0x04, 0x56, 0xfa, 0x63, 0xcd, 0xaf, - 0x3e, 0x79, 0x99, 0x45, 0x4f, 0x5f, 0x66, 0xd1, 0x1f, 0x2f, 0xb3, 0xe8, 0xcb, 0x57, 0xd9, 0xa1, - 0xa7, 0xaf, 0xb2, 0x43, 0xbf, 0xbd, 0xca, 0x0e, 0xdd, 0xcb, 0xf5, 0xd7, 0xde, 0x5b, 0xed, 0xc0, - 0x5c, 0x86, 0x5b, 0x63, 0x5c, 0xc6, 0x2c, 0xff, 0x15, 0x00, 0x00, 0xff, 0xff, 0xde, 0xd0, 0x12, - 0xac, 0x86, 0x13, 0x00, 0x00, + // 1453 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xdf, 0x6f, 0x14, 0xd5, + 0x17, 0xef, 0x6d, 0x69, 0xa1, 0xa7, 0xbb, 0xdf, 0x6f, 0x7b, 0x5b, 0xb0, 0x2e, 0xb2, 0x2d, 0x03, + 0x96, 0x5a, 0x60, 0xc6, 0x6e, 0x11, 0x01, 0x35, 0xc0, 0x22, 0x48, 0x63, 0x59, 0x97, 0x29, 0x92, + 0xc8, 0xcb, 0x64, 0x66, 0xf7, 0x76, 0x3b, 0x76, 0x67, 0xee, 0xb0, 0x33, 0xb3, 0xe9, 0x86, 0x90, + 0x18, 0x13, 0x79, 0x30, 0x9a, 0x90, 0xf8, 0xa2, 0x0f, 0x3c, 0x68, 0x8c, 0x31, 0xf1, 0xc5, 0x57, + 0xff, 0x03, 0x1e, 0x09, 0xfa, 0x60, 0x48, 0x40, 0x03, 0x26, 0xfe, 0x1b, 0x66, 0xee, 0xbd, 0xb3, + 0x3b, 0xb3, 0x9d, 0xfd, 0xd1, 0xda, 0xf8, 0xd2, 0x74, 0xee, 0x3d, 0xe7, 0xdc, 0xcf, 0xf9, 0x9c, + 0x73, 0xcf, 0xfd, 0x2c, 0xcc, 0x18, 0xba, 0xd1, 0xa8, 0x52, 0x5b, 0x59, 0x33, 0x6d, 0xbd, 0x6a, + 0x7a, 0x0d, 0xa5, 0xbe, 0xa8, 0xdc, 0xf6, 0x49, 0xad, 0x21, 0x3b, 0x35, 0xea, 0x51, 0x3c, 0x29, + 0x0c, 0xe4, 0xd0, 0x40, 0xae, 0x2f, 0x66, 0xa6, 0x2a, 0xb4, 0x42, 0xd9, 0xbe, 0x12, 0xfc, 0xc7, + 0x4d, 0x33, 0xaf, 0x54, 0x28, 0xad, 0x54, 0x89, 0xa2, 0x3b, 0xa6, 0xa2, 0xdb, 0x36, 0xf5, 0x74, + 0xcf, 0xa4, 0xb6, 0x2b, 0x76, 0x17, 0x4a, 0xd4, 0xb5, 0xa8, 0xab, 0x18, 0xba, 0x4b, 0xf8, 0x09, + 0x4a, 0x7d, 0xd1, 0x20, 0x9e, 0xbe, 0xa8, 0x38, 0x7a, 0xc5, 0xb4, 0x99, 0xb1, 0xb0, 0x9d, 0x4d, + 0x42, 0xe5, 0xe8, 0x35, 0xdd, 0x0a, 0xa3, 0x49, 0x49, 0x16, 0x4d, 0x88, 0xdc, 0x66, 0x46, 0xe0, + 0x61, 0x5f, 0x86, 0xbf, 0xa6, 0x78, 0xa6, 0x45, 0x5c, 0x4f, 0xb7, 0x1c, 0x61, 0x30, 0xa1, 0x5b, + 0xa6, 0x4d, 0x15, 0xf6, 0x97, 0x2f, 0x49, 0x53, 0x80, 0xaf, 0x07, 0xd8, 0x8a, 0xec, 0x30, 0x95, + 0xdc, 0xf6, 0x89, 0xeb, 0x49, 0x45, 0x98, 0x8c, 0xad, 0xba, 0x0e, 0xb5, 0x5d, 0x82, 0xcf, 0xc2, + 0x08, 0x07, 0x35, 0x8d, 0x66, 0xd1, 0xfc, 0x58, 0xee, 0xa0, 0x9c, 0x40, 0x96, 0xcc, 0x9d, 0xf2, + 0x7b, 0x1e, 0x3e, 0x9b, 0x19, 0x50, 0x85, 0x83, 0xf4, 0x25, 0x82, 0x59, 0x16, 0x72, 0xc5, 0x74, + 0xbd, 0xa2, 0x6f, 0x54, 0xcd, 0x92, 0xaa, 0xdb, 0x65, 0x6a, 0xd9, 0xc4, 0x0d, 0x8f, 0xc5, 0x87, + 0x21, 0xbd, 0xe6, 0x68, 0x86, 0x57, 0xd2, 0x9c, 0x0d, 0x6d, 0x9d, 0x6c, 0xb2, 0x63, 0x46, 0x55, + 0x58, 0x73, 0xf2, 0x5e, 0xa9, 0xb8, 0x71, 0x95, 0x6c, 0xe2, 0x2b, 0x00, 0x2d, 0xf6, 0xa6, 0x07, + 0x19, 0x8c, 0x39, 0x99, 0x53, 0x2d, 0x07, 0x54, 0xcb, 0xbc, 0x98, 0x82, 0x6a, 0xb9, 0xa8, 0x57, + 0x88, 0x08, 0xaf, 0x46, 0x3c, 0xa5, 0xc7, 0x83, 0x70, 0xb8, 0x0b, 0x1e, 0x91, 0xf0, 0xf7, 0x08, + 0x52, 0x8e, 0x6f, 0x68, 0x35, 0xdd, 0x2e, 0x6b, 0x96, 0xee, 0x4c, 0xa3, 0xd9, 0xa1, 0xf9, 0xb1, + 0xdc, 0x95, 0xc4, 0xbc, 0x7b, 0x86, 0x93, 0x8b, 0xbe, 0x11, 0xac, 0x5e, 0xd3, 0x9d, 0xcb, 0xb6, + 0x57, 0x6b, 0xe4, 0xcf, 0x3d, 0x79, 0x36, 0x73, 0xba, 0x62, 0x7a, 0xeb, 0xbe, 0x21, 0x97, 0xa8, + 0xa5, 0x88, 0xa8, 0x55, 0xdd, 0x70, 0x4f, 0x9a, 0x34, 0xfc, 0x54, 0xbc, 0x86, 0x43, 0x5c, 0x79, + 0xb5, 0xb4, 0x6e, 0xd3, 0x5a, 0x4d, 0xc4, 0x50, 0xc1, 0x69, 0x06, 0xc3, 0xef, 0x25, 0x90, 0x72, + 0xac, 0x27, 0x29, 0x1c, 0x54, 0x94, 0x95, 0xcc, 0x3b, 0xf0, 0xff, 0x36, 0x8c, 0x78, 0x1c, 0x86, + 0x36, 0x48, 0x83, 0x55, 0x62, 0x8f, 0x1a, 0xfc, 0x8b, 0xa7, 0x60, 0xb8, 0xae, 0x57, 0x7d, 0xc2, + 0x0e, 0x4a, 0xa9, 0xfc, 0xe3, 0xdc, 0xe0, 0x19, 0x24, 0xd5, 0x61, 0xbf, 0x70, 0xbf, 0x44, 0x2d, + 0xcb, 0xf4, 0x9a, 0x3c, 0xce, 0x42, 0xca, 0xf6, 0x2d, 0x2d, 0xa4, 0x52, 0x44, 0x03, 0xdb, 0xb7, + 0x84, 0x3d, 0xce, 0x02, 0x94, 0x98, 0x8f, 0x45, 0x6c, 0x4f, 0x44, 0x8e, 0xac, 0xe0, 0x83, 0x30, + 0x4a, 0x1c, 0x5a, 0x5a, 0xd7, 0x6c, 0xdf, 0x9a, 0x1e, 0x62, 0xee, 0xfb, 0xd8, 0x42, 0xc1, 0xb7, + 0xa4, 0xcf, 0x11, 0x1c, 0x8a, 0xb2, 0x1f, 0x45, 0xf0, 0x9f, 0x77, 0xd6, 0x6f, 0x83, 0x90, 0xed, + 0x04, 0x46, 0xd0, 0xb1, 0x09, 0x93, 0xcd, 0xae, 0xe2, 0x39, 0x46, 0x9a, 0x6b, 0xb9, 0x67, 0x73, + 0x6d, 0x8d, 0x28, 0xc7, 0x56, 0xc3, 0xda, 0xa9, 0xe3, 0x4e, 0xdb, 0xf2, 0xee, 0x75, 0x0a, 0x6d, + 0x2b, 0x75, 0x97, 0x7e, 0xb9, 0x10, 0xed, 0x97, 0xb1, 0xdc, 0x42, 0xf2, 0xd0, 0x48, 0x4a, 0x2b, + 0xda, 0x5b, 0xc7, 0x61, 0x82, 0x71, 0x90, 0xaf, 0xd2, 0xd2, 0x46, 0x58, 0xd6, 0x03, 0x30, 0xb2, + 0x4e, 0xcc, 0xca, 0xba, 0x27, 0xce, 0x13, 0x5f, 0xd2, 0x35, 0x31, 0xd5, 0x84, 0xb1, 0xa0, 0xfd, + 0x4d, 0x18, 0x36, 0x82, 0x05, 0x31, 0xbd, 0x0e, 0x27, 0x02, 0x59, 0xb6, 0xcb, 0x64, 0x93, 0x94, + 0xb9, 0x27, 0xb7, 0x97, 0xbe, 0x45, 0x70, 0xa0, 0x59, 0x00, 0xb6, 0xd3, 0x1c, 0x59, 0xe7, 0x61, + 0xc4, 0xf5, 0x74, 0xcf, 0xe7, 0x23, 0xf1, 0x7f, 0xb9, 0x63, 0x1d, 0xab, 0x67, 0x8a, 0xa0, 0xab, + 0xcc, 0x5c, 0x15, 0x6e, 0xbb, 0xd6, 0x76, 0x0f, 0x10, 0xbc, 0xb4, 0x05, 0x63, 0x6b, 0x6e, 0xb3, + 0x44, 0x5c, 0xd1, 0x62, 0x7d, 0x64, 0x2e, 0x1c, 0x76, 0xad, 0x61, 0xa4, 0x25, 0x78, 0x99, 0xc1, + 0xbb, 0x49, 0x3d, 0xe2, 0x5e, 0xf4, 0xae, 0xb2, 0x42, 0xf5, 0xaa, 0x23, 0x85, 0x4c, 0x92, 0x93, + 0x48, 0xeb, 0x3a, 0xec, 0xe5, 0x37, 0x9a, 0xe7, 0x95, 0xca, 0x9f, 0x79, 0xf2, 0x6c, 0xe6, 0x54, + 0xbf, 0xf3, 0x34, 0xbf, 0x5c, 0x5c, 0x3a, 0xf5, 0x7a, 0xd1, 0x37, 0xde, 0x27, 0x0d, 0x75, 0xc4, + 0x08, 0xc6, 0x80, 0x2b, 0x9d, 0x85, 0x29, 0x76, 0xe0, 0xe5, 0xba, 0x59, 0x26, 0x76, 0x89, 0xf4, + 0x3f, 0x3f, 0x24, 0x15, 0xf6, 0xb7, 0xb9, 0x36, 0xd9, 0xdf, 0x47, 0xc4, 0x9a, 0xe8, 0xbc, 0x43, + 0x89, 0xfc, 0x37, 0x1d, 0x9b, 0xe6, 0xd2, 0x3d, 0x24, 0x58, 0x0b, 0x8a, 0x1a, 0xee, 0x47, 0x9e, + 0xcb, 0x94, 0xeb, 0xe9, 0x35, 0x4f, 0x8b, 0x71, 0x37, 0xc6, 0xd6, 0x38, 0x55, 0xbb, 0xd6, 0x5d, + 0xdf, 0x21, 0x51, 0x89, 0x36, 0x20, 0x22, 0xc5, 0xb7, 0x60, 0x34, 0xc4, 0x1c, 0xf6, 0x58, 0x8f, + 0x1c, 0x5b, 0xf6, 0xbb, 0xd7, 0x62, 0x6f, 0x8b, 0x1b, 0xb0, 0x6a, 0x56, 0x6c, 0xd3, 0xae, 0x2c, + 0xdb, 0x6b, 0x74, 0x1b, 0xf5, 0x7b, 0x8a, 0x60, 0x32, 0xe6, 0x29, 0x72, 0xeb, 0xe3, 0xe9, 0x68, + 0x2f, 0x44, 0x90, 0xc3, 0x50, 0xbc, 0x10, 0x39, 0xd8, 0x6f, 0x99, 0xae, 0x4b, 0xca, 0x1a, 0xbf, + 0x58, 0x5a, 0x89, 0xfa, 0xb6, 0x47, 0x6a, 0xec, 0x2d, 0x1b, 0x52, 0x27, 0xf9, 0x26, 0xbf, 0xb7, + 0x97, 0xf8, 0x16, 0x5e, 0x81, 0xd4, 0xc7, 0xba, 0x59, 0x25, 0x65, 0xcd, 0xb7, 0x3d, 0xb3, 0x3a, + 0xbd, 0x87, 0x51, 0x93, 0x91, 0xb9, 0xcc, 0x93, 0x43, 0x99, 0x27, 0xdf, 0x08, 0x65, 0x5e, 0x3e, + 0x1d, 0x68, 0xae, 0xfb, 0x7f, 0xcc, 0xa0, 0x1f, 0xff, 0xfe, 0x79, 0x01, 0xa9, 0x63, 0xdc, 0xfd, + 0xc3, 0xc0, 0x5b, 0xb2, 0x60, 0x7a, 0x2b, 0x3b, 0xcd, 0x9b, 0x94, 0x72, 0xf9, 0xb2, 0x66, 0xda, + 0x6b, 0x54, 0xb4, 0xe9, 0x7c, 0x62, 0x09, 0x13, 0xfc, 0x85, 0xd6, 0x1b, 0x73, 0x5b, 0x5b, 0x92, + 0xb1, 0xf5, 0xb8, 0x66, 0xe3, 0xc6, 0xbb, 0x12, 0xed, 0xb8, 0x2b, 0x7f, 0x09, 0xaf, 0x47, 0xfc, + 0x10, 0x91, 0xd4, 0x2a, 0xa4, 0xa3, 0x49, 0x85, 0x8d, 0xb9, 0xdd, 0xac, 0x52, 0x91, 0xac, 0x76, + 0xaf, 0x59, 0x17, 0xce, 0xf3, 0x27, 0x2a, 0xfe, 0x2a, 0xe0, 0x09, 0x48, 0x17, 0x3e, 0x28, 0x68, + 0x57, 0x96, 0x0b, 0x17, 0x57, 0x96, 0x6f, 0x5d, 0x7e, 0x77, 0x7c, 0x00, 0xa7, 0x61, 0xb4, 0xf5, + 0x89, 0xf0, 0x5e, 0x18, 0xba, 0x58, 0xf8, 0x68, 0x7c, 0x30, 0xf7, 0x59, 0x1a, 0x86, 0x59, 0xf2, + 0xf8, 0x13, 0x04, 0x23, 0x5c, 0x74, 0xe3, 0xce, 0xcf, 0x4f, 0x5c, 0xe1, 0x67, 0xe6, 0x7b, 0x1b, + 0x72, 0xd0, 0xd2, 0x91, 0x4f, 0x7f, 0xfd, 0xeb, 0xab, 0xc1, 0x43, 0xf8, 0xa0, 0xd2, 0xf9, 0x47, + 0x0a, 0x7e, 0x8a, 0x60, 0x2a, 0x49, 0xfa, 0xe2, 0x37, 0xb6, 0x2b, 0x95, 0x39, 0xbc, 0xd3, 0x3b, + 0x53, 0xd8, 0xd2, 0x4d, 0x06, 0xb6, 0x88, 0x0b, 0x4a, 0xb7, 0xdf, 0x4b, 0x9a, 0x53, 0xa3, 0xc1, + 0xf8, 0xa9, 0xb9, 0xca, 0x9d, 0xd8, 0xdd, 0xbe, 0xab, 0x38, 0x2c, 0x32, 0x93, 0x66, 0x3c, 0xb4, + 0x56, 0x35, 0x5d, 0x0f, 0x3f, 0x46, 0x30, 0xb1, 0x45, 0x7d, 0xe1, 0xdc, 0xb6, 0xa4, 0x1a, 0xcf, + 0x6c, 0x69, 0x07, 0xf2, 0x4e, 0xba, 0xc1, 0xd2, 0x2a, 0xe0, 0x95, 0x7f, 0x91, 0x56, 0x4c, 0x6e, + 0xb2, 0xa4, 0xee, 0x21, 0x18, 0x66, 0xcd, 0x87, 0xe7, 0x3a, 0x83, 0x8a, 0xea, 0xad, 0xcc, 0xb1, + 0x9e, 0x76, 0x02, 0xf0, 0x09, 0x06, 0x78, 0x0e, 0x1f, 0x4d, 0x04, 0xcc, 0x47, 0xa0, 0x72, 0x87, + 0x8f, 0xcb, 0xbb, 0xf8, 0x0b, 0x04, 0xd0, 0x92, 0x2d, 0xf8, 0x78, 0x77, 0x8a, 0x62, 0x02, 0x2c, + 0x73, 0xa2, 0x3f, 0xe3, 0xbe, 0x9a, 0x59, 0x68, 0x9e, 0x07, 0x08, 0xd2, 0x31, 0xc5, 0x81, 0xe5, + 0xce, 0x87, 0x24, 0xe9, 0x99, 0x8c, 0xd2, 0xb7, 0xbd, 0xc0, 0x75, 0x9c, 0xe1, 0x7a, 0x15, 0x1f, + 0x49, 0xc4, 0x55, 0x0f, 0x7c, 0x5a, 0x74, 0xfd, 0x84, 0x60, 0x5f, 0xf8, 0x90, 0xe2, 0xd7, 0x3a, + 0x1f, 0xd5, 0x26, 0x62, 0x32, 0x0b, 0xfd, 0x98, 0x0a, 0x40, 0x57, 0x19, 0xa0, 0x3c, 0xbe, 0xb0, + 0xd3, 0x8e, 0x0b, 0xdf, 0x77, 0xfc, 0x35, 0x82, 0x74, 0x4c, 0x35, 0x74, 0x63, 0x33, 0x49, 0xe7, + 0x74, 0x63, 0x33, 0x51, 0x8e, 0x48, 0x73, 0x0c, 0xfc, 0x2c, 0xce, 0x26, 0x82, 0x6f, 0x29, 0x8f, + 0x1f, 0x10, 0x8c, 0x45, 0x06, 0x3f, 0xee, 0xd2, 0x4b, 0x5b, 0x35, 0x45, 0xe6, 0x64, 0x9f, 0xd6, + 0x02, 0xd4, 0x39, 0x06, 0xea, 0x14, 0xce, 0x25, 0x82, 0x8a, 0xbd, 0x54, 0xed, 0x64, 0xe2, 0x6f, + 0x10, 0xa4, 0xa2, 0x6f, 0x1c, 0xee, 0xef, 0xec, 0x26, 0x83, 0x72, 0xbf, 0xe6, 0x02, 0xeb, 0x02, + 0xc3, 0x7a, 0x14, 0x4b, 0xbd, 0xb1, 0xe6, 0x57, 0x1e, 0x3e, 0xcf, 0xa2, 0x47, 0xcf, 0xb3, 0xe8, + 0xcf, 0xe7, 0x59, 0x74, 0xff, 0x45, 0x76, 0xe0, 0xd1, 0x8b, 0xec, 0xc0, 0xef, 0x2f, 0xb2, 0x03, + 0xb7, 0x72, 0xbd, 0xa5, 0xf8, 0x66, 0x2b, 0x30, 0x53, 0xe5, 0xc6, 0x08, 0x53, 0x35, 0x4b, 0xff, + 0x04, 0x00, 0x00, 0xff, 0xff, 0xaf, 0xed, 0x13, 0xce, 0xa8, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2471,18 +2476,14 @@ func (m *SigningInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.JailedUntil != nil { - { - size, err := m.JailedUntil.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 + n13, err13 := github_com_cosmos_gogoproto_types.StdTimeMarshalTo(m.JailedUntil, dAtA[i-github_com_cosmos_gogoproto_types.SizeOfStdTime(m.JailedUntil):]) + if err13 != nil { + return 0, err13 } + i -= n13 + i = encodeVarintQuery(dAtA, i, uint64(n13)) + i-- + dAtA[i] = 0x22 if m.MissedBlocksCounter != 0 { i = encodeVarintQuery(dAtA, i, uint64(m.MissedBlocksCounter)) i-- @@ -2933,10 +2934,8 @@ func (m *SigningInfoResponse) Size() (n int) { if m.MissedBlocksCounter != 0 { n += 1 + sovQuery(uint64(m.MissedBlocksCounter)) } - if m.JailedUntil != nil { - l = m.JailedUntil.Size() - n += 1 + l + sovQuery(uint64(l)) - } + l = github_com_cosmos_gogoproto_types.SizeOfStdTime(m.JailedUntil) + n += 1 + l + sovQuery(uint64(l)) return n } @@ -5020,10 +5019,7 @@ func (m *SigningInfoResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.JailedUntil == nil { - m.JailedUntil = ×tamppb.Timestamp{} - } - if err := m.JailedUntil.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := github_com_cosmos_gogoproto_types.StdTimeUnmarshal(&m.JailedUntil, dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex From 954a0f53e3f49188a9b48fb48780d310a59fbc5f Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Mon, 14 Oct 2024 14:44:21 +0300 Subject: [PATCH 3/6] Update keeper.go --- x/finality/keeper/keeper.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x/finality/keeper/keeper.go b/x/finality/keeper/keeper.go index ace900eee..d569896f9 100644 --- a/x/finality/keeper/keeper.go +++ b/x/finality/keeper/keeper.go @@ -7,10 +7,10 @@ import ( "cosmossdk.io/collections" corestoretypes "cosmossdk.io/core/store" "cosmossdk.io/log" - "github.com/babylonlabs-io/babylon/x/finality/types" "github.com/cosmos/cosmos-sdk/codec" - sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/babylonlabs-io/babylon/x/finality/types" ) type ( From ff24a392aca1f7095604302684521ce0353f7959 Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Mon, 14 Oct 2024 14:45:38 +0300 Subject: [PATCH 4/6] linter --- x/finality/keeper/grpc_query_test.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/x/finality/keeper/grpc_query_test.go b/x/finality/keeper/grpc_query_test.go index df7399e5f..d0c0c5829 100644 --- a/x/finality/keeper/grpc_query_test.go +++ b/x/finality/keeper/grpc_query_test.go @@ -428,12 +428,11 @@ func FuzzSigningInfo(f *testing.F) { } resp, err := fKeeper.SigningInfos(ctx, req) require.NoError(t, err) - require.LessOrEqual(t, len(resp.FpBtcPkHex), int(limit)) // check if pagination takes effect + require.LessOrEqual(t, len(resp.SigningInfos), int(limit)) // check if pagination takes effect require.EqualValues(t, resp.Pagination.Total, numSigningInfo) // ensure evidences before startHeight are not included - for _, si := range resp.SigningInfo { - require.Equal(t, fpSigningInfos[si.FpBtcPk.MarshalHex()].MissedBlocksCounter, si.MissedBlocksCounter) - require.Equal(t, fpSigningInfos[si.FpBtcPk.MarshalHex()].FpBtcPk.MarshalHex(), si.FpBtcPk.MarshalHex()) - require.Equal(t, fpSigningInfos[si.FpBtcPk.MarshalHex()].StartHeight, si.StartHeight) + for _, si := range resp.SigningInfos { + require.Equal(t, fpSigningInfos[si.FpBtcPkHex].MissedBlocksCounter, si.MissedBlocksCounter) + require.Equal(t, fpSigningInfos[si.FpBtcPkHex].StartHeight, si.StartHeight) } }) } From 23ba60dc2c3d2afaf9c268499be74cf96f1e54bc Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Mon, 14 Oct 2024 14:55:48 +0300 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8425796a9..14e0ce647 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## Unreleased +### Security + +* [#194](https://github.com/babylonlabs-io/babylon/pull/194) Adjusted handling of `FinalityProviderSigningInfo` in finality keeper queries to improve API security + * Modified `QuerySigningInfosResponse` to remove direct exposure of sensitive fields + * Updated related tests in `x/finality/keeper/grpc_query_test.go` + ### Bug Fixes * [#140](https://github.com/babylonlabs-io/babylon/pull/140) Removed `unbonding` From b3aab03e3b7cfb028cd00772940fdf115420fb1c Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Tue, 15 Oct 2024 11:48:54 +0300 Subject: [PATCH 6/6] review comments --- CHANGELOG.md | 2 +- proto/babylon/finality/v1/query.proto | 5 +++++ x/finality/keeper/grpc_query.go | 10 +++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 38a4aec4f..22caf1f08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## Unreleased -### Security +### API Breaking * [#194](https://github.com/babylonlabs-io/babylon/pull/194) Adjusted handling of `FinalityProviderSigningInfo` in finality keeper queries to improve API security * Modified `QuerySigningInfosResponse` to remove direct exposure of sensitive fields diff --git a/proto/babylon/finality/v1/query.proto b/proto/babylon/finality/v1/query.proto index d5d65eeac..2689f74ca 100644 --- a/proto/babylon/finality/v1/query.proto +++ b/proto/babylon/finality/v1/query.proto @@ -234,9 +234,14 @@ message QuerySigningInfoRequest { // SigningInfoResponse defines the API response containing a finality provider's signing info // for monitoring their liveness activity. message SigningInfoResponse { + // fp_btc_pk is the BTC PK of the finality provider that casts this vote string fp_btc_pk_hex = 1; + // start_height is the block height at which finality provider become active int64 start_height = 2; + // missed_blocks_counter defines a counter to avoid unnecessary array reads. + // Note that `Sum(MissedBlocksBitArray)` always equals `MissedBlocksCounter`. int64 missed_blocks_counter = 3; + // Timestamp until which the validator is jailed due to liveness downtime. google.protobuf.Timestamp jailed_until = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } diff --git a/x/finality/keeper/grpc_query.go b/x/finality/keeper/grpc_query.go index 462d5de99..f3452cc1d 100644 --- a/x/finality/keeper/grpc_query.go +++ b/x/finality/keeper/grpc_query.go @@ -246,7 +246,7 @@ func (k Keeper) SigningInfo(ctx context.Context, req *types.QuerySigningInfoRequ return nil, status.Errorf(codes.NotFound, "SigningInfo not found for the finality provider %s", req.FpBtcPkHex) } - return &types.QuerySigningInfoResponse{SigningInfo: k.convertToSigningInfoResponse(signingInfo)}, nil + return &types.QuerySigningInfoResponse{SigningInfo: convertToSigningInfoResponse(signingInfo)}, nil } // SigningInfos returns signing-infos of all finality providers. @@ -271,10 +271,10 @@ func (k Keeper) SigningInfos(ctx context.Context, req *types.QuerySigningInfosRe if err != nil { return nil, err } - return &types.QuerySigningInfosResponse{SigningInfos: k.convertToSigningInfosResponse(signInfos), Pagination: pageRes}, nil + return &types.QuerySigningInfosResponse{SigningInfos: convertToSigningInfosResponse(signInfos), Pagination: pageRes}, nil } -func (k Keeper) convertToSigningInfoResponse(info types.FinalityProviderSigningInfo) types.SigningInfoResponse { +func convertToSigningInfoResponse(info types.FinalityProviderSigningInfo) types.SigningInfoResponse { return types.SigningInfoResponse{ FpBtcPkHex: info.FpBtcPk.MarshalHex(), StartHeight: info.StartHeight, @@ -283,10 +283,10 @@ func (k Keeper) convertToSigningInfoResponse(info types.FinalityProviderSigningI } } -func (k Keeper) convertToSigningInfosResponse(signInfos []types.FinalityProviderSigningInfo) []types.SigningInfoResponse { +func convertToSigningInfosResponse(signInfos []types.FinalityProviderSigningInfo) []types.SigningInfoResponse { response := make([]types.SigningInfoResponse, len(signInfos)) for i, info := range signInfos { - response[i] = k.convertToSigningInfoResponse(info) + response[i] = convertToSigningInfoResponse(info) } return response }