From abdb357572b64c7c03fd59e7717ee24da44f0e22 Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Tue, 15 Oct 2024 17:42:16 +0300 Subject: [PATCH 1/4] chore: update exposed db objects in x/btcstaking module --- proto/babylon/btcstaking/v1/query.proto | 23 +- .../configurer/chain/queries_btcstaking.go | 2 +- x/btcstaking/keeper/grpc_query.go | 15 +- x/btcstaking/types/query.pb.go | 637 ++++++++++++++---- 4 files changed, 540 insertions(+), 137 deletions(-) diff --git a/proto/babylon/btcstaking/v1/query.proto b/proto/babylon/btcstaking/v1/query.proto index 437f87a25..b4d2c9308 100644 --- a/proto/babylon/btcstaking/v1/query.proto +++ b/proto/babylon/btcstaking/v1/query.proto @@ -187,11 +187,32 @@ message QueryActiveFinalityProvidersAtHeightRequest { cosmos.base.query.v1beta1.PageRequest pagination = 2; } +// ActiveFinalityProvidersAtHeightResponse wraps the FinalityProvider with metadata. +message ActiveFinalityProvidersAtHeightResponse { + // btc_pk is the Bitcoin secp256k1 PK of thisfinality provider + // the PK follows encoding in BIP-340 spec + bytes btc_pk = 1 [ (gogoproto.customtype) = "github.com/babylonlabs-io/babylon/types.BIP340PubKey" ]; + // height is the queried Babylon height + uint64 height = 2; + // voting_power is the voting power of this finality provider at the given height + uint64 voting_power = 3; + // slashed_babylon_height indicates the Babylon height when + // the finality provider is slashed. + // if it's 0 then the finality provider is not slashed + uint64 slashed_babylon_height = 4; + // slashed_btc_height indicates the BTC height when + // the finality provider is slashed. + // if it's 0 then the finality provider is not slashed + uint32 slashed_btc_height = 5; + // jailed defines whether the finality provider is detected jailed + bool jailed = 6; +} + // QueryActiveFinalityProvidersAtHeightResponse is the response type for the // Query/ActiveFinalityProvidersAtHeight RPC method. message QueryActiveFinalityProvidersAtHeightResponse { // finality_providers contains all the queried finality providersn. - repeated FinalityProviderWithMeta finality_providers = 1; + repeated ActiveFinalityProvidersAtHeightResponse finality_providers = 1; // pagination defines the pagination in the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; diff --git a/test/e2e/configurer/chain/queries_btcstaking.go b/test/e2e/configurer/chain/queries_btcstaking.go index 861302692..b7621230f 100644 --- a/test/e2e/configurer/chain/queries_btcstaking.go +++ b/test/e2e/configurer/chain/queries_btcstaking.go @@ -45,7 +45,7 @@ func (n *NodeConfig) QueryFinalityProviders() []*bstypes.FinalityProviderRespons return resp.FinalityProviders } -func (n *NodeConfig) QueryActiveFinalityProvidersAtHeight(height uint64) []*bstypes.FinalityProviderWithMeta { +func (n *NodeConfig) QueryActiveFinalityProvidersAtHeight(height uint64) []*bstypes.ActiveFinalityProvidersAtHeightResponse { path := fmt.Sprintf("/babylon/btcstaking/v1/finality_providers/%d", height) bz, err := n.QueryGRPCGateway(path, url.Values{}) require.NoError(n.t, err) diff --git a/x/btcstaking/keeper/grpc_query.go b/x/btcstaking/keeper/grpc_query.go index 714515ebe..1fab586f1 100644 --- a/x/btcstaking/keeper/grpc_query.go +++ b/x/btcstaking/keeper/grpc_query.go @@ -201,7 +201,7 @@ func (k Keeper) ActiveFinalityProvidersAtHeight(ctx context.Context, req *types. return nil, err } - return &types.QueryActiveFinalityProvidersAtHeightResponse{FinalityProviders: finalityProvidersWithMeta, Pagination: pageRes}, nil + return &types.QueryActiveFinalityProvidersAtHeightResponse{FinalityProviders: convertToActiveFinalityProvidersAtHeightResponse(finalityProvidersWithMeta), Pagination: pageRes}, nil } // ActivatedHeight returns the Babylon height in which the BTC Staking protocol was enabled @@ -302,3 +302,16 @@ func (k Keeper) BTCDelegation(ctx context.Context, req *types.QueryBTCDelegation BtcDelegation: types.NewBTCDelegationResponse(btcDel, status), }, nil } + +func convertToActiveFinalityProvidersAtHeightResponse(finalityProvidersWithMeta []*types.FinalityProviderWithMeta) []*types.ActiveFinalityProvidersAtHeightResponse { + var activeFinalityProvidersAtHeightResponse []*types.ActiveFinalityProvidersAtHeightResponse + for _, fpWithMeta := range finalityProvidersWithMeta { + activeFinalityProvidersAtHeightResponse = append(activeFinalityProvidersAtHeightResponse, &types.ActiveFinalityProvidersAtHeightResponse{ + BtcPk: fpWithMeta.BtcPk, + Height: fpWithMeta.Height, + VotingPower: fpWithMeta.VotingPower, + SlashedBabylonHeight: fpWithMeta.SlashedBabylonHeight, + }) + } + return activeFinalityProvidersAtHeightResponse +} diff --git a/x/btcstaking/types/query.pb.go b/x/btcstaking/types/query.pb.go index 7658416dd..2f64028fe 100644 --- a/x/btcstaking/types/query.pb.go +++ b/x/btcstaking/types/query.pb.go @@ -799,11 +799,102 @@ func (m *QueryActiveFinalityProvidersAtHeightRequest) GetPagination() *query.Pag return nil } +// ActiveFinalityProvidersAtHeightResponse wraps the FinalityProvider with metadata. +type ActiveFinalityProvidersAtHeightResponse struct { + // btc_pk is the Bitcoin secp256k1 PK of thisfinality provider + // the PK follows encoding in BIP-340 spec + BtcPk *github_com_babylonlabs_io_babylon_types.BIP340PubKey `protobuf:"bytes,1,opt,name=btc_pk,json=btcPk,proto3,customtype=github.com/babylonlabs-io/babylon/types.BIP340PubKey" json:"btc_pk,omitempty"` + // height is the queried Babylon height + Height uint64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` + // voting_power is the voting power of this finality provider at the given height + VotingPower uint64 `protobuf:"varint,3,opt,name=voting_power,json=votingPower,proto3" json:"voting_power,omitempty"` + // slashed_babylon_height indicates the Babylon height when + // the finality provider is slashed. + // if it's 0 then the finality provider is not slashed + SlashedBabylonHeight uint64 `protobuf:"varint,4,opt,name=slashed_babylon_height,json=slashedBabylonHeight,proto3" json:"slashed_babylon_height,omitempty"` + // slashed_btc_height indicates the BTC height when + // the finality provider is slashed. + // if it's 0 then the finality provider is not slashed + SlashedBtcHeight uint32 `protobuf:"varint,5,opt,name=slashed_btc_height,json=slashedBtcHeight,proto3" json:"slashed_btc_height,omitempty"` + // jailed defines whether the finality provider is detected jailed + Jailed bool `protobuf:"varint,6,opt,name=jailed,proto3" json:"jailed,omitempty"` +} + +func (m *ActiveFinalityProvidersAtHeightResponse) Reset() { + *m = ActiveFinalityProvidersAtHeightResponse{} +} +func (m *ActiveFinalityProvidersAtHeightResponse) String() string { return proto.CompactTextString(m) } +func (*ActiveFinalityProvidersAtHeightResponse) ProtoMessage() {} +func (*ActiveFinalityProvidersAtHeightResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_74d49d26f7429697, []int{15} +} +func (m *ActiveFinalityProvidersAtHeightResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *ActiveFinalityProvidersAtHeightResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_ActiveFinalityProvidersAtHeightResponse.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 *ActiveFinalityProvidersAtHeightResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ActiveFinalityProvidersAtHeightResponse.Merge(m, src) +} +func (m *ActiveFinalityProvidersAtHeightResponse) XXX_Size() int { + return m.Size() +} +func (m *ActiveFinalityProvidersAtHeightResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ActiveFinalityProvidersAtHeightResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_ActiveFinalityProvidersAtHeightResponse proto.InternalMessageInfo + +func (m *ActiveFinalityProvidersAtHeightResponse) GetHeight() uint64 { + if m != nil { + return m.Height + } + return 0 +} + +func (m *ActiveFinalityProvidersAtHeightResponse) GetVotingPower() uint64 { + if m != nil { + return m.VotingPower + } + return 0 +} + +func (m *ActiveFinalityProvidersAtHeightResponse) GetSlashedBabylonHeight() uint64 { + if m != nil { + return m.SlashedBabylonHeight + } + return 0 +} + +func (m *ActiveFinalityProvidersAtHeightResponse) GetSlashedBtcHeight() uint32 { + if m != nil { + return m.SlashedBtcHeight + } + return 0 +} + +func (m *ActiveFinalityProvidersAtHeightResponse) GetJailed() bool { + if m != nil { + return m.Jailed + } + return false +} + // QueryActiveFinalityProvidersAtHeightResponse is the response type for the // Query/ActiveFinalityProvidersAtHeight RPC method. type QueryActiveFinalityProvidersAtHeightResponse struct { // finality_providers contains all the queried finality providersn. - FinalityProviders []*FinalityProviderWithMeta `protobuf:"bytes,1,rep,name=finality_providers,json=finalityProviders,proto3" json:"finality_providers,omitempty"` + FinalityProviders []*ActiveFinalityProvidersAtHeightResponse `protobuf:"bytes,1,rep,name=finality_providers,json=finalityProviders,proto3" json:"finality_providers,omitempty"` // pagination defines the pagination in the response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -816,7 +907,7 @@ func (m *QueryActiveFinalityProvidersAtHeightResponse) String() string { } func (*QueryActiveFinalityProvidersAtHeightResponse) ProtoMessage() {} func (*QueryActiveFinalityProvidersAtHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{15} + return fileDescriptor_74d49d26f7429697, []int{16} } func (m *QueryActiveFinalityProvidersAtHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -845,7 +936,7 @@ func (m *QueryActiveFinalityProvidersAtHeightResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryActiveFinalityProvidersAtHeightResponse proto.InternalMessageInfo -func (m *QueryActiveFinalityProvidersAtHeightResponse) GetFinalityProviders() []*FinalityProviderWithMeta { +func (m *QueryActiveFinalityProvidersAtHeightResponse) GetFinalityProviders() []*ActiveFinalityProvidersAtHeightResponse { if m != nil { return m.FinalityProviders } @@ -867,7 +958,7 @@ func (m *QueryActivatedHeightRequest) Reset() { *m = QueryActivatedHeigh func (m *QueryActivatedHeightRequest) String() string { return proto.CompactTextString(m) } func (*QueryActivatedHeightRequest) ProtoMessage() {} func (*QueryActivatedHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{16} + return fileDescriptor_74d49d26f7429697, []int{17} } func (m *QueryActivatedHeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -905,7 +996,7 @@ func (m *QueryActivatedHeightResponse) Reset() { *m = QueryActivatedHeig func (m *QueryActivatedHeightResponse) String() string { return proto.CompactTextString(m) } func (*QueryActivatedHeightResponse) ProtoMessage() {} func (*QueryActivatedHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{17} + return fileDescriptor_74d49d26f7429697, []int{18} } func (m *QueryActivatedHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -958,7 +1049,7 @@ func (m *QueryFinalityProviderDelegationsRequest) Reset() { func (m *QueryFinalityProviderDelegationsRequest) String() string { return proto.CompactTextString(m) } func (*QueryFinalityProviderDelegationsRequest) ProtoMessage() {} func (*QueryFinalityProviderDelegationsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{18} + return fileDescriptor_74d49d26f7429697, []int{19} } func (m *QueryFinalityProviderDelegationsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1016,7 +1107,7 @@ func (m *QueryFinalityProviderDelegationsResponse) Reset() { func (m *QueryFinalityProviderDelegationsResponse) String() string { return proto.CompactTextString(m) } func (*QueryFinalityProviderDelegationsResponse) ProtoMessage() {} func (*QueryFinalityProviderDelegationsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{19} + return fileDescriptor_74d49d26f7429697, []int{20} } func (m *QueryFinalityProviderDelegationsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1070,7 +1161,7 @@ func (m *QueryBTCDelegationRequest) Reset() { *m = QueryBTCDelegationReq func (m *QueryBTCDelegationRequest) String() string { return proto.CompactTextString(m) } func (*QueryBTCDelegationRequest) ProtoMessage() {} func (*QueryBTCDelegationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{20} + return fileDescriptor_74d49d26f7429697, []int{21} } func (m *QueryBTCDelegationRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1117,7 +1208,7 @@ func (m *QueryBTCDelegationResponse) Reset() { *m = QueryBTCDelegationRe func (m *QueryBTCDelegationResponse) String() string { return proto.CompactTextString(m) } func (*QueryBTCDelegationResponse) ProtoMessage() {} func (*QueryBTCDelegationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{21} + return fileDescriptor_74d49d26f7429697, []int{22} } func (m *QueryBTCDelegationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1205,7 +1296,7 @@ func (m *BTCDelegationResponse) Reset() { *m = BTCDelegationResponse{} } func (m *BTCDelegationResponse) String() string { return proto.CompactTextString(m) } func (*BTCDelegationResponse) ProtoMessage() {} func (*BTCDelegationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{22} + return fileDescriptor_74d49d26f7429697, []int{23} } func (m *BTCDelegationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1371,7 +1462,7 @@ func (m *BTCUndelegationResponse) Reset() { *m = BTCUndelegationResponse func (m *BTCUndelegationResponse) String() string { return proto.CompactTextString(m) } func (*BTCUndelegationResponse) ProtoMessage() {} func (*BTCUndelegationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{23} + return fileDescriptor_74d49d26f7429697, []int{24} } func (m *BTCUndelegationResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1451,7 +1542,7 @@ func (m *BTCDelegatorDelegationsResponse) Reset() { *m = BTCDelegatorDel func (m *BTCDelegatorDelegationsResponse) String() string { return proto.CompactTextString(m) } func (*BTCDelegatorDelegationsResponse) ProtoMessage() {} func (*BTCDelegatorDelegationsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{24} + return fileDescriptor_74d49d26f7429697, []int{25} } func (m *BTCDelegatorDelegationsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1521,7 +1612,7 @@ func (m *FinalityProviderResponse) Reset() { *m = FinalityProviderRespon func (m *FinalityProviderResponse) String() string { return proto.CompactTextString(m) } func (*FinalityProviderResponse) ProtoMessage() {} func (*FinalityProviderResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_74d49d26f7429697, []int{25} + return fileDescriptor_74d49d26f7429697, []int{26} } func (m *FinalityProviderResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1622,6 +1713,7 @@ func init() { proto.RegisterType((*QueryFinalityProviderCurrentPowerRequest)(nil), "babylon.btcstaking.v1.QueryFinalityProviderCurrentPowerRequest") proto.RegisterType((*QueryFinalityProviderCurrentPowerResponse)(nil), "babylon.btcstaking.v1.QueryFinalityProviderCurrentPowerResponse") proto.RegisterType((*QueryActiveFinalityProvidersAtHeightRequest)(nil), "babylon.btcstaking.v1.QueryActiveFinalityProvidersAtHeightRequest") + proto.RegisterType((*ActiveFinalityProvidersAtHeightResponse)(nil), "babylon.btcstaking.v1.ActiveFinalityProvidersAtHeightResponse") proto.RegisterType((*QueryActiveFinalityProvidersAtHeightResponse)(nil), "babylon.btcstaking.v1.QueryActiveFinalityProvidersAtHeightResponse") proto.RegisterType((*QueryActivatedHeightRequest)(nil), "babylon.btcstaking.v1.QueryActivatedHeightRequest") proto.RegisterType((*QueryActivatedHeightResponse)(nil), "babylon.btcstaking.v1.QueryActivatedHeightResponse") @@ -1638,126 +1730,129 @@ func init() { func init() { proto.RegisterFile("babylon/btcstaking/v1/query.proto", fileDescriptor_74d49d26f7429697) } var fileDescriptor_74d49d26f7429697 = []byte{ - // 1902 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcb, 0x6f, 0xdb, 0xc8, - 0x19, 0x0f, 0x6d, 0x45, 0xb1, 0x3f, 0xd9, 0x8e, 0x3d, 0xeb, 0x24, 0x8c, 0x1c, 0xdb, 0x09, 0x9b, - 0x4d, 0x9c, 0x87, 0xc5, 0x58, 0xf1, 0xee, 0xb6, 0x0d, 0xd2, 0xc4, 0xb2, 0x77, 0x93, 0xec, 0xae, - 0x1b, 0x95, 0x4e, 0x5a, 0xa0, 0x2f, 0x81, 0x22, 0x47, 0x14, 0x1b, 0x89, 0x64, 0x38, 0x23, 0x57, - 0x46, 0xe0, 0x4b, 0x0f, 0xbd, 0x15, 0x28, 0xd0, 0xfe, 0x0b, 0x0b, 0x14, 0xe8, 0xa5, 0x40, 0x73, - 0xe9, 0xa1, 0xf7, 0xed, 0x6d, 0x91, 0x1e, 0x5a, 0xe4, 0x10, 0x14, 0x49, 0xd1, 0x02, 0x05, 0x7a, - 0xed, 0xa1, 0xa7, 0x82, 0x33, 0x43, 0x91, 0x92, 0x48, 0x59, 0xb2, 0xdd, 0x9b, 0x38, 0xf3, 0xbd, - 0x1f, 0xbf, 0x99, 0xf9, 0x04, 0x97, 0xaa, 0x7a, 0x75, 0xaf, 0xe1, 0x3a, 0x6a, 0x95, 0x1a, 0x84, - 0xea, 0xcf, 0x6c, 0xc7, 0x52, 0x77, 0xd7, 0xd4, 0xe7, 0x2d, 0xec, 0xef, 0x15, 0x3c, 0xdf, 0xa5, - 0x2e, 0x3a, 0x23, 0x48, 0x0a, 0x11, 0x49, 0x61, 0x77, 0x2d, 0x3f, 0x6f, 0xb9, 0x96, 0xcb, 0x28, - 0xd4, 0xe0, 0x17, 0x27, 0xce, 0x5f, 0xb0, 0x5c, 0xd7, 0x6a, 0x60, 0x55, 0xf7, 0x6c, 0x55, 0x77, - 0x1c, 0x97, 0xea, 0xd4, 0x76, 0x1d, 0x22, 0x76, 0xcf, 0x1b, 0x2e, 0x69, 0xba, 0xa4, 0xc2, 0xd9, - 0xf8, 0x87, 0xd8, 0xba, 0xcc, 0xbf, 0xd4, 0xc8, 0x88, 0x2a, 0xa6, 0xfa, 0x5a, 0xf8, 0x2d, 0xa8, - 0xae, 0x0b, 0xaa, 0xaa, 0x4e, 0x30, 0x37, 0xb2, 0x43, 0xe8, 0xe9, 0x96, 0xed, 0x30, 0x6d, 0x82, - 0x56, 0x49, 0x76, 0xcd, 0xd3, 0x7d, 0xbd, 0x19, 0x6a, 0xbd, 0x92, 0x4c, 0x13, 0xf3, 0x94, 0xd3, - 0x2d, 0xa7, 0xc8, 0x72, 0x3d, 0x4e, 0xa0, 0xcc, 0x03, 0xfa, 0x4e, 0x60, 0x4e, 0x99, 0x49, 0xd7, - 0xf0, 0xf3, 0x16, 0x26, 0x54, 0xd1, 0xe0, 0xbd, 0xae, 0x55, 0xe2, 0xb9, 0x0e, 0xc1, 0xe8, 0x0e, - 0x64, 0xb9, 0x15, 0xb2, 0x74, 0x51, 0x5a, 0xc9, 0x15, 0x17, 0x0b, 0x89, 0x21, 0x2e, 0x70, 0xb6, - 0x52, 0xe6, 0xcb, 0x37, 0xcb, 0x27, 0x34, 0xc1, 0xa2, 0x7c, 0x04, 0x0b, 0x31, 0x99, 0xa5, 0xbd, - 0xef, 0x62, 0x9f, 0xd8, 0xae, 0x23, 0x54, 0x22, 0x19, 0x4e, 0xed, 0xf2, 0x15, 0x26, 0x7c, 0x5a, - 0x0b, 0x3f, 0x95, 0x1f, 0xc0, 0x85, 0x64, 0xc6, 0xe3, 0xb0, 0xca, 0x82, 0x45, 0x26, 0xfc, 0x13, - 0xdb, 0xd1, 0x1b, 0x36, 0xdd, 0x2b, 0xfb, 0xee, 0xae, 0x6d, 0x62, 0x3f, 0x0c, 0x05, 0xfa, 0x04, - 0x20, 0xca, 0x90, 0xd0, 0x70, 0xa5, 0x20, 0x4a, 0x20, 0x48, 0x67, 0x81, 0xd7, 0x9c, 0x48, 0x67, - 0xa1, 0xac, 0x5b, 0x58, 0xf0, 0x6a, 0x31, 0x4e, 0xe5, 0x4f, 0x12, 0x2c, 0xa5, 0x69, 0x12, 0x8e, - 0xfc, 0x18, 0x50, 0x4d, 0x6c, 0x06, 0x95, 0xc6, 0x77, 0x65, 0xe9, 0xe2, 0xf8, 0x4a, 0xae, 0xa8, - 0xa6, 0x38, 0xd5, 0x2b, 0x2d, 0x14, 0xa6, 0xcd, 0xd5, 0x7a, 0xf5, 0xa0, 0x07, 0x5d, 0xae, 0x8c, - 0x31, 0x57, 0xae, 0x1e, 0xe8, 0x8a, 0x90, 0x17, 0xf7, 0x65, 0x43, 0x64, 0xa4, 0x5f, 0x39, 0x8f, - 0xd9, 0x25, 0x98, 0xae, 0x79, 0x95, 0x2a, 0x35, 0x2a, 0xde, 0xb3, 0x4a, 0x1d, 0xb7, 0x59, 0xd8, - 0x26, 0x35, 0xa8, 0x79, 0x25, 0x6a, 0x94, 0x9f, 0x3d, 0xc4, 0x6d, 0x65, 0x3f, 0x25, 0xee, 0x9d, - 0x60, 0xfc, 0x10, 0xe6, 0xfa, 0x82, 0x21, 0xc2, 0x3f, 0x72, 0x2c, 0x66, 0x7b, 0x63, 0xa1, 0xfc, - 0x46, 0x82, 0x3c, 0xd3, 0x5f, 0x7a, 0xb2, 0xb9, 0x85, 0x1b, 0xd8, 0xe2, 0xed, 0x1e, 0x3a, 0x50, - 0x82, 0x2c, 0xa1, 0x3a, 0x6d, 0xf1, 0x92, 0x9a, 0x29, 0x5e, 0x4f, 0xd1, 0xd8, 0xc5, 0xbd, 0xc3, - 0x38, 0x34, 0xc1, 0xd9, 0x53, 0x38, 0x63, 0x87, 0x2e, 0x9c, 0x3f, 0x4a, 0xa2, 0x71, 0x7a, 0x4d, - 0x15, 0x81, 0x7a, 0x0a, 0xa7, 0x83, 0x48, 0x9b, 0xd1, 0x96, 0x28, 0x99, 0x9b, 0xc3, 0x18, 0xdd, - 0x89, 0xd1, 0x4c, 0x95, 0x1a, 0x31, 0xf1, 0xc7, 0x57, 0x2c, 0x35, 0xb8, 0x96, 0x98, 0xe9, 0xb2, - 0xfb, 0x53, 0xec, 0x6f, 0xd0, 0x87, 0xd8, 0xb6, 0xea, 0x74, 0xf8, 0xca, 0x41, 0x67, 0x21, 0x5b, - 0x67, 0x3c, 0xcc, 0xa8, 0x8c, 0x26, 0xbe, 0x94, 0xc7, 0x70, 0x7d, 0x18, 0x3d, 0x22, 0x6a, 0x97, - 0x60, 0x6a, 0xd7, 0xa5, 0xb6, 0x63, 0x55, 0xbc, 0x60, 0x9f, 0xe9, 0xc9, 0x68, 0x39, 0xbe, 0xc6, - 0x58, 0x94, 0x6d, 0x58, 0x49, 0x14, 0xb8, 0xd9, 0xf2, 0x7d, 0xec, 0x50, 0x46, 0x34, 0x42, 0xc5, - 0xa7, 0xc5, 0xa1, 0x5b, 0x9c, 0x30, 0x2f, 0x72, 0x52, 0x8a, 0x3b, 0xd9, 0x67, 0xf6, 0x58, 0xbf, - 0xd9, 0xbf, 0x90, 0xe0, 0x06, 0x53, 0xb4, 0x61, 0x50, 0x7b, 0x17, 0xf7, 0xc1, 0x4d, 0x6f, 0xc8, - 0xd3, 0x54, 0x1d, 0x57, 0xfd, 0xfe, 0x45, 0x82, 0x9b, 0xc3, 0xd9, 0x73, 0x8c, 0x30, 0xf8, 0x3d, - 0x9b, 0xd6, 0xb7, 0x31, 0xd5, 0xff, 0xaf, 0x30, 0xb8, 0x28, 0x1a, 0x93, 0x39, 0xa6, 0x53, 0x6c, - 0x76, 0x05, 0x56, 0xf9, 0x50, 0xa0, 0x64, 0xdf, 0xf6, 0xe0, 0x1c, 0x2b, 0xbf, 0x96, 0xe0, 0x6a, - 0x62, 0xa5, 0x24, 0x00, 0xd5, 0x10, 0xfd, 0x72, 0x5c, 0x79, 0xfc, 0xa7, 0x94, 0xd2, 0x0f, 0x49, - 0xa0, 0xe4, 0xc3, 0xf9, 0x18, 0x28, 0xb9, 0x7e, 0x02, 0x3c, 0x7d, 0x78, 0x20, 0x3c, 0xb9, 0x49, - 0xa2, 0xb5, 0x73, 0x11, 0x50, 0x75, 0x11, 0x1c, 0x5f, 0x5e, 0x3f, 0x85, 0xf3, 0xfd, 0x80, 0x1b, - 0x46, 0x7c, 0x15, 0xde, 0x13, 0xc6, 0x56, 0x68, 0xbb, 0x52, 0xd7, 0x49, 0x3d, 0x16, 0xf7, 0x59, - 0xb1, 0xf5, 0xa4, 0xfd, 0x50, 0x27, 0xf5, 0xa0, 0xeb, 0x9f, 0x27, 0x9d, 0x33, 0x9d, 0x30, 0xed, - 0xc0, 0x4c, 0x37, 0x76, 0x8b, 0x13, 0x6e, 0x34, 0xe8, 0x9e, 0xee, 0x82, 0x6e, 0xe5, 0xbf, 0x59, - 0x38, 0x93, 0xac, 0xee, 0x1b, 0x90, 0x0b, 0x84, 0x61, 0xbf, 0xa2, 0x9b, 0x26, 0xc7, 0xbc, 0xc9, - 0x92, 0xfc, 0xea, 0xe5, 0xea, 0xbc, 0x88, 0xd2, 0x86, 0x69, 0xfa, 0x98, 0x90, 0x1d, 0xea, 0xdb, - 0x8e, 0xa5, 0x01, 0x27, 0x0e, 0x16, 0xd1, 0x63, 0xc8, 0xf2, 0x2a, 0x63, 0x81, 0x9d, 0x2a, 0x7d, - 0xfd, 0xf5, 0x9b, 0xe5, 0x75, 0xcb, 0xa6, 0xf5, 0x56, 0xb5, 0x60, 0xb8, 0x4d, 0x55, 0xd8, 0xdb, - 0xd0, 0xab, 0x64, 0xd5, 0x76, 0xc3, 0x4f, 0x95, 0xee, 0x79, 0x98, 0x14, 0x4a, 0x8f, 0xca, 0xb7, - 0xd7, 0x6f, 0x95, 0x5b, 0xd5, 0xcf, 0xf0, 0x9e, 0x76, 0xb2, 0x1a, 0x54, 0x26, 0xfa, 0x11, 0xcc, - 0x44, 0x95, 0xdb, 0xb0, 0x09, 0x95, 0xc7, 0x2f, 0x8e, 0x1f, 0x49, 0x70, 0x4e, 0x14, 0xfd, 0xe7, - 0x36, 0x6b, 0x8c, 0xa9, 0x4e, 0x9a, 0xec, 0x26, 0x96, 0x33, 0xec, 0x4e, 0x99, 0x0b, 0xf3, 0x63, - 0x37, 0xb1, 0x20, 0xf1, 0x69, 0x45, 0x74, 0xe1, 0xc9, 0x0e, 0x89, 0x2f, 0x20, 0x09, 0x2d, 0x02, - 0x60, 0xc7, 0x0c, 0x09, 0xb2, 0x8c, 0x60, 0x12, 0x3b, 0xa2, 0x93, 0xd1, 0x02, 0x4c, 0x52, 0x97, - 0xea, 0x8d, 0x0a, 0xd1, 0xa9, 0x7c, 0x8a, 0x35, 0xf1, 0x04, 0x5b, 0xd8, 0xd1, 0x29, 0xba, 0x0c, - 0x33, 0xf1, 0x42, 0xc1, 0x6d, 0x79, 0x82, 0xd5, 0xc8, 0x54, 0x54, 0x23, 0xb8, 0x8d, 0xae, 0xc0, - 0x69, 0xd2, 0xd0, 0x49, 0x3d, 0x46, 0x36, 0xc9, 0xc8, 0xa6, 0xc3, 0x65, 0x4e, 0xf7, 0x01, 0x9c, - 0x8b, 0x9a, 0x89, 0x6d, 0x55, 0x88, 0x6d, 0x31, 0x7a, 0x60, 0xf4, 0xf3, 0x9d, 0xed, 0x9d, 0x60, - 0x77, 0xc7, 0xb6, 0x02, 0xb6, 0xa7, 0x30, 0x6d, 0xb8, 0xbb, 0xd8, 0xd1, 0x1d, 0x1a, 0xd0, 0x13, - 0x39, 0xc7, 0x7a, 0xef, 0x56, 0x4a, 0x7d, 0x6d, 0x0a, 0xda, 0x0d, 0x53, 0xf7, 0x02, 0x49, 0xb6, - 0xe5, 0xe8, 0xb4, 0xe5, 0x63, 0xa2, 0x4d, 0x85, 0x62, 0x76, 0x6c, 0x8b, 0xa0, 0x9b, 0x80, 0x42, - 0xdf, 0xdc, 0x16, 0xf5, 0x5a, 0xb4, 0x62, 0x9b, 0x6d, 0x79, 0x8a, 0xc5, 0x27, 0xec, 0x81, 0xc7, - 0x6c, 0xe3, 0x91, 0xc9, 0x4e, 0x6c, 0x9d, 0x61, 0xbf, 0x3c, 0x7d, 0x51, 0x5a, 0x99, 0xd0, 0xc4, - 0x17, 0x5a, 0x66, 0xe5, 0x48, 0x5b, 0xa4, 0x62, 0x62, 0x62, 0xc8, 0x33, 0x1c, 0xba, 0xf8, 0xd2, - 0x16, 0x26, 0x06, 0x7a, 0x1f, 0x66, 0x5a, 0x4e, 0xd5, 0x75, 0xcc, 0x4e, 0x1a, 0x4f, 0x33, 0x15, - 0xd3, 0x9d, 0x55, 0x96, 0x48, 0x03, 0xce, 0xb4, 0x9c, 0xa8, 0x87, 0x2a, 0xbe, 0xa8, 0x77, 0x79, - 0x96, 0x35, 0x53, 0x21, 0xbd, 0x99, 0x9e, 0xc6, 0xd8, 0x3a, 0xed, 0x34, 0xdf, 0x4a, 0x58, 0x0d, - 0x6c, 0xe1, 0x4f, 0x86, 0x4a, 0xf8, 0x4c, 0x99, 0xe3, 0xb6, 0xf0, 0x55, 0xf1, 0x28, 0x51, 0x5e, - 0x8e, 0xc3, 0xb9, 0x14, 0xc1, 0x68, 0x05, 0x66, 0x63, 0xee, 0xb4, 0x63, 0xb8, 0x11, 0xb9, 0xc9, - 0xb3, 0x7d, 0x17, 0x16, 0xa2, 0x6c, 0x47, 0x3c, 0x61, 0xc6, 0xc7, 0x18, 0x93, 0xdc, 0x21, 0x79, - 0x1a, 0x52, 0x88, 0xac, 0x1b, 0xb0, 0xd0, 0xc9, 0x7a, 0x37, 0x77, 0xa7, 0xd1, 0x72, 0xc5, 0xcb, - 0x29, 0x61, 0xe9, 0x24, 0xfd, 0x91, 0x53, 0x73, 0x35, 0x39, 0x14, 0x14, 0xd7, 0xc1, 0x3a, 0x2c, - 0xa1, 0x72, 0x33, 0x49, 0x95, 0x7b, 0x07, 0xf2, 0x3d, 0x95, 0x1b, 0x77, 0xe5, 0x24, 0x63, 0x39, - 0xd7, 0x5d, 0xbc, 0x91, 0x27, 0x35, 0x38, 0x1b, 0xd5, 0x6f, 0x8c, 0x97, 0xc8, 0xd9, 0x43, 0x16, - 0xf2, 0x7c, 0xa7, 0x90, 0x23, 0x4d, 0x44, 0x31, 0x60, 0xf9, 0x80, 0x73, 0x07, 0xdd, 0x87, 0x8c, - 0x89, 0x1b, 0x87, 0xbb, 0x5c, 0x33, 0x4e, 0xe5, 0x8b, 0x0c, 0xc8, 0xa9, 0xef, 0x9d, 0x8f, 0x21, - 0x17, 0x74, 0x81, 0x6f, 0x7b, 0xb1, 0x73, 0xe0, 0x6b, 0xe1, 0xf1, 0x15, 0x69, 0xe0, 0x67, 0xd7, - 0x56, 0x44, 0xaa, 0xc5, 0xf9, 0xd0, 0x36, 0x80, 0xe1, 0x36, 0x9b, 0x36, 0x21, 0xe1, 0x21, 0x38, - 0x59, 0x5a, 0x7d, 0xfd, 0x66, 0x79, 0x81, 0x0b, 0x22, 0xe6, 0xb3, 0x82, 0xed, 0xaa, 0x4d, 0x9d, - 0xd6, 0x0b, 0x9f, 0x63, 0x4b, 0x37, 0xf6, 0xb6, 0xb0, 0xf1, 0xea, 0xe5, 0x2a, 0x08, 0x3d, 0x5b, - 0xd8, 0xd0, 0x62, 0x02, 0xd0, 0x4d, 0xc8, 0xb0, 0xa3, 0x62, 0xfc, 0x80, 0xa3, 0x82, 0x51, 0xc5, - 0x0e, 0x89, 0xcc, 0xf1, 0x1c, 0x12, 0x77, 0x61, 0xdc, 0x73, 0x3d, 0x56, 0x24, 0xb9, 0xe2, 0x8d, - 0xb4, 0x77, 0xbd, 0xef, 0xba, 0xb5, 0xc7, 0xb5, 0xb2, 0x4b, 0x08, 0x66, 0x56, 0x97, 0x9e, 0x6c, - 0x6a, 0x01, 0x1f, 0x5a, 0x87, 0xb3, 0xac, 0x68, 0xb0, 0x59, 0x11, 0xac, 0x71, 0x28, 0xcf, 0x68, - 0xf3, 0x62, 0xb7, 0xc4, 0x37, 0x05, 0xaa, 0x07, 0xe0, 0x16, 0x72, 0x51, 0x23, 0xe4, 0x38, 0x25, - 0xc0, 0x4d, 0x70, 0x50, 0x43, 0x50, 0x47, 0xb7, 0xb8, 0x89, 0x81, 0x37, 0xf5, 0xc9, 0xbe, 0x9b, - 0x7a, 0xc0, 0xfa, 0x13, 0xdd, 0x6e, 0x60, 0x93, 0x41, 0xf8, 0x84, 0x26, 0xbe, 0x8a, 0x5f, 0xcc, - 0xc1, 0x49, 0x76, 0x69, 0x40, 0x3f, 0x97, 0x20, 0xcb, 0xc7, 0x16, 0xe8, 0x5a, 0x8a, 0xf7, 0xfd, - 0xd3, 0x9b, 0xfc, 0xf5, 0x61, 0x48, 0x79, 0xd9, 0x29, 0xef, 0xff, 0xec, 0xcf, 0x7f, 0xff, 0xd5, - 0xd8, 0x32, 0x5a, 0x54, 0x07, 0x4d, 0x9d, 0xd0, 0x6f, 0x25, 0x38, 0xdd, 0x33, 0x7f, 0x41, 0xc5, - 0x83, 0xd5, 0xf4, 0x4e, 0x79, 0xf2, 0xb7, 0x47, 0xe2, 0x11, 0x36, 0xaa, 0xcc, 0xc6, 0x6b, 0xe8, - 0xea, 0x40, 0x1b, 0xd5, 0x17, 0x02, 0x98, 0xf7, 0xd1, 0xef, 0x25, 0x98, 0xeb, 0x7b, 0x67, 0xa0, - 0xf5, 0x41, 0xba, 0xd3, 0xe6, 0x3f, 0xf9, 0x0f, 0x46, 0xe4, 0x12, 0x36, 0xaf, 0x31, 0x9b, 0x6f, - 0xa0, 0x6b, 0x29, 0x36, 0xf7, 0xbf, 0x70, 0xd0, 0x2b, 0x09, 0x66, 0x7b, 0x05, 0xa2, 0xdb, 0xa3, - 0xa8, 0x0f, 0x6d, 0x5e, 0x1f, 0x8d, 0x49, 0x98, 0xbc, 0xc3, 0x4c, 0xde, 0x46, 0x9f, 0x0d, 0x6d, - 0xb2, 0xfa, 0xa2, 0xeb, 0xf1, 0xb1, 0xdf, 0x4f, 0x82, 0x7e, 0x27, 0xc1, 0x4c, 0xf7, 0xe0, 0x02, - 0xad, 0x0d, 0xb2, 0x2e, 0x71, 0x1e, 0x93, 0x2f, 0x8e, 0xc2, 0x22, 0xdc, 0xf9, 0x88, 0xb9, 0xb3, - 0x86, 0x54, 0x35, 0x75, 0x56, 0x1a, 0x7f, 0x95, 0xa8, 0x2f, 0xf8, 0xc5, 0x63, 0x1f, 0xfd, 0x43, - 0x82, 0xe5, 0x03, 0xde, 0xaa, 0xa8, 0x34, 0xc8, 0xa0, 0xe1, 0x1e, 0xde, 0xf9, 0xcd, 0x23, 0xc9, - 0x10, 0x5e, 0x7e, 0x93, 0x79, 0xb9, 0x8e, 0x8a, 0x23, 0x24, 0x8d, 0x23, 0xd4, 0x3e, 0xfa, 0x8f, - 0x04, 0x8b, 0x03, 0xa7, 0x25, 0xe8, 0xfe, 0x28, 0x85, 0x94, 0x34, 0xd0, 0xc9, 0x6f, 0x1c, 0x41, - 0x82, 0x70, 0xb1, 0xcc, 0x5c, 0xfc, 0x14, 0x3d, 0x3c, 0x7c, 0x5d, 0x32, 0x08, 0x8e, 0x1c, 0xff, - 0x97, 0x04, 0x17, 0x06, 0x8d, 0x61, 0xd0, 0xbd, 0x51, 0xac, 0x4e, 0x98, 0x07, 0xe5, 0xef, 0x1f, - 0x5e, 0x80, 0xf0, 0xfa, 0x01, 0xf3, 0x7a, 0x03, 0xdd, 0x3b, 0xa2, 0xd7, 0x0c, 0xba, 0x7b, 0x46, - 0x10, 0x83, 0xa1, 0x3b, 0x79, 0x9c, 0x31, 0x18, 0xba, 0x53, 0x66, 0x1c, 0x07, 0x42, 0xb7, 0x1e, - 0xf2, 0x89, 0x63, 0x16, 0xfd, 0x5b, 0x82, 0x85, 0x01, 0x03, 0x06, 0xf4, 0xad, 0x51, 0x02, 0x9b, - 0x80, 0x24, 0xf7, 0x0e, 0xcd, 0x2f, 0x3c, 0xda, 0x66, 0x1e, 0x3d, 0x40, 0x1f, 0x1f, 0x3e, 0x2f, - 0x31, 0xd4, 0x41, 0x7f, 0x90, 0x60, 0xba, 0x0b, 0xc0, 0xd0, 0xad, 0xa1, 0xb1, 0x2e, 0xf4, 0x69, - 0x6d, 0x04, 0x0e, 0xe1, 0xc5, 0x26, 0xf3, 0xe2, 0x2e, 0xba, 0x33, 0x14, 0x38, 0x32, 0x6c, 0xec, - 0x1d, 0x79, 0xec, 0x97, 0xbe, 0xfd, 0xe5, 0xdb, 0x25, 0xe9, 0xab, 0xb7, 0x4b, 0xd2, 0xdf, 0xde, - 0x2e, 0x49, 0xbf, 0x7c, 0xb7, 0x74, 0xe2, 0xab, 0x77, 0x4b, 0x27, 0xfe, 0xfa, 0x6e, 0xe9, 0xc4, - 0xf7, 0x87, 0xb8, 0xf4, 0xb5, 0xe3, 0x1a, 0xd9, 0x0d, 0xb0, 0x9a, 0x65, 0x7f, 0x49, 0xdd, 0xfe, - 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x95, 0x54, 0x9e, 0x1b, 0xdc, 0x1b, 0x00, 0x00, + // 1945 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x6f, 0xdb, 0xc8, + 0x15, 0x0f, 0x6d, 0x45, 0x89, 0x9f, 0x2c, 0xc7, 0x9e, 0x75, 0x12, 0x46, 0x8e, 0xed, 0x84, 0xcd, + 0x26, 0xce, 0x87, 0xc5, 0x58, 0xf1, 0xee, 0xb6, 0x0d, 0xb2, 0x89, 0x65, 0xef, 0x26, 0xd9, 0xdd, + 0x34, 0x2a, 0x9d, 0xf4, 0xd0, 0x2f, 0x81, 0x22, 0x47, 0x14, 0x1b, 0x89, 0x64, 0x38, 0x23, 0x57, + 0x46, 0xe0, 0x4b, 0x0f, 0xbd, 0x15, 0x28, 0xd0, 0xfe, 0x0b, 0x0b, 0x14, 0xe8, 0xa5, 0x45, 0x73, + 0xe9, 0xa1, 0xf7, 0xed, 0x6d, 0x91, 0x5e, 0x8a, 0x3d, 0x04, 0x45, 0x52, 0x6c, 0x81, 0x02, 0xbd, + 0xf6, 0xd0, 0x53, 0xc1, 0x99, 0xa1, 0x48, 0x49, 0xa4, 0x2c, 0xd9, 0xde, 0x9b, 0x38, 0xf3, 0xbe, + 0xdf, 0x9b, 0xdf, 0x9b, 0x79, 0x82, 0x8b, 0x35, 0xbd, 0xb6, 0xdb, 0x74, 0x1d, 0xb5, 0x46, 0x0d, + 0x42, 0xf5, 0x67, 0xb6, 0x63, 0xa9, 0x3b, 0x6b, 0xea, 0xf3, 0x36, 0xf6, 0x77, 0x8b, 0x9e, 0xef, + 0x52, 0x17, 0x9d, 0x16, 0x24, 0xc5, 0x88, 0xa4, 0xb8, 0xb3, 0x56, 0x98, 0xb7, 0x5c, 0xcb, 0x65, + 0x14, 0x6a, 0xf0, 0x8b, 0x13, 0x17, 0xce, 0x5b, 0xae, 0x6b, 0x35, 0xb1, 0xaa, 0x7b, 0xb6, 0xaa, + 0x3b, 0x8e, 0x4b, 0x75, 0x6a, 0xbb, 0x0e, 0x11, 0xbb, 0xe7, 0x0c, 0x97, 0xb4, 0x5c, 0x52, 0xe5, + 0x6c, 0xfc, 0x43, 0x6c, 0x5d, 0xe2, 0x5f, 0x6a, 0x64, 0x44, 0x0d, 0x53, 0x7d, 0x2d, 0xfc, 0x16, + 0x54, 0xd7, 0x04, 0x55, 0x4d, 0x27, 0x98, 0x1b, 0xd9, 0x25, 0xf4, 0x74, 0xcb, 0x76, 0x98, 0x36, + 0x41, 0xab, 0x24, 0xbb, 0xe6, 0xe9, 0xbe, 0xde, 0x0a, 0xb5, 0x5e, 0x4e, 0xa6, 0x89, 0x79, 0xca, + 0xe9, 0x96, 0x53, 0x64, 0xb9, 0x1e, 0x27, 0x50, 0xe6, 0x01, 0x7d, 0x3f, 0x30, 0xa7, 0xc2, 0xa4, + 0x6b, 0xf8, 0x79, 0x1b, 0x13, 0xaa, 0x68, 0xf0, 0x4e, 0xcf, 0x2a, 0xf1, 0x5c, 0x87, 0x60, 0x74, + 0x1b, 0xb2, 0xdc, 0x0a, 0x59, 0xba, 0x20, 0xad, 0xe4, 0x4a, 0x8b, 0xc5, 0xc4, 0x10, 0x17, 0x39, + 0x5b, 0x39, 0xf3, 0xc5, 0xeb, 0xe5, 0x63, 0x9a, 0x60, 0x51, 0x3e, 0x80, 0x85, 0x98, 0xcc, 0xf2, + 0xee, 0x0f, 0xb0, 0x4f, 0x6c, 0xd7, 0x11, 0x2a, 0x91, 0x0c, 0x27, 0x76, 0xf8, 0x0a, 0x13, 0x9e, + 0xd7, 0xc2, 0x4f, 0xe5, 0x47, 0x70, 0x3e, 0x99, 0xf1, 0x28, 0xac, 0xb2, 0x60, 0x91, 0x09, 0xff, + 0xd8, 0x76, 0xf4, 0xa6, 0x4d, 0x77, 0x2b, 0xbe, 0xbb, 0x63, 0x9b, 0xd8, 0x0f, 0x43, 0x81, 0x3e, + 0x06, 0x88, 0x32, 0x24, 0x34, 0x5c, 0x2e, 0x8a, 0x12, 0x08, 0xd2, 0x59, 0xe4, 0x35, 0x27, 0xd2, + 0x59, 0xac, 0xe8, 0x16, 0x16, 0xbc, 0x5a, 0x8c, 0x53, 0xf9, 0xab, 0x04, 0x4b, 0x69, 0x9a, 0x84, + 0x23, 0x3f, 0x05, 0x54, 0x17, 0x9b, 0x41, 0xa5, 0xf1, 0x5d, 0x59, 0xba, 0x30, 0xb9, 0x92, 0x2b, + 0xa9, 0x29, 0x4e, 0xf5, 0x4b, 0x0b, 0x85, 0x69, 0x73, 0xf5, 0x7e, 0x3d, 0xe8, 0x7e, 0x8f, 0x2b, + 0x13, 0xcc, 0x95, 0x2b, 0xfb, 0xba, 0x22, 0xe4, 0xc5, 0x7d, 0xd9, 0x10, 0x19, 0x19, 0x54, 0xce, + 0x63, 0x76, 0x11, 0xf2, 0x75, 0xaf, 0x5a, 0xa3, 0x46, 0xd5, 0x7b, 0x56, 0x6d, 0xe0, 0x0e, 0x0b, + 0xdb, 0x94, 0x06, 0x75, 0xaf, 0x4c, 0x8d, 0xca, 0xb3, 0x07, 0xb8, 0xa3, 0xec, 0xa5, 0xc4, 0xbd, + 0x1b, 0x8c, 0x1f, 0xc3, 0xdc, 0x40, 0x30, 0x44, 0xf8, 0xc7, 0x8e, 0xc5, 0x6c, 0x7f, 0x2c, 0x94, + 0xdf, 0x49, 0x50, 0x60, 0xfa, 0xcb, 0x4f, 0x36, 0xb7, 0x70, 0x13, 0x5b, 0xfc, 0xb8, 0x87, 0x0e, + 0x94, 0x21, 0x4b, 0xa8, 0x4e, 0xdb, 0xbc, 0xa4, 0x66, 0x4a, 0xd7, 0x52, 0x34, 0xf6, 0x70, 0x6f, + 0x33, 0x0e, 0x4d, 0x70, 0xf6, 0x15, 0xce, 0xc4, 0x81, 0x0b, 0xe7, 0x2f, 0x92, 0x38, 0x38, 0xfd, + 0xa6, 0x8a, 0x40, 0x3d, 0x85, 0x53, 0x41, 0xa4, 0xcd, 0x68, 0x4b, 0x94, 0xcc, 0x8d, 0x51, 0x8c, + 0xee, 0xc6, 0x68, 0xa6, 0x46, 0x8d, 0x98, 0xf8, 0xa3, 0x2b, 0x96, 0x3a, 0x5c, 0x4d, 0xcc, 0x74, + 0xc5, 0xfd, 0x39, 0xf6, 0x37, 0xe8, 0x03, 0x6c, 0x5b, 0x0d, 0x3a, 0x7a, 0xe5, 0xa0, 0x33, 0x90, + 0x6d, 0x30, 0x1e, 0x66, 0x54, 0x46, 0x13, 0x5f, 0xca, 0x63, 0xb8, 0x36, 0x8a, 0x1e, 0x11, 0xb5, + 0x8b, 0x30, 0xbd, 0xe3, 0x52, 0xdb, 0xb1, 0xaa, 0x5e, 0xb0, 0xcf, 0xf4, 0x64, 0xb4, 0x1c, 0x5f, + 0x63, 0x2c, 0xca, 0x23, 0x58, 0x49, 0x14, 0xb8, 0xd9, 0xf6, 0x7d, 0xec, 0x50, 0x46, 0x34, 0x46, + 0xc5, 0xa7, 0xc5, 0xa1, 0x57, 0x9c, 0x30, 0x2f, 0x72, 0x52, 0x8a, 0x3b, 0x39, 0x60, 0xf6, 0xc4, + 0xa0, 0xd9, 0xbf, 0x92, 0xe0, 0x3a, 0x53, 0xb4, 0x61, 0x50, 0x7b, 0x07, 0x0f, 0xc0, 0x4d, 0x7f, + 0xc8, 0xd3, 0x54, 0x1d, 0x55, 0xfd, 0xfe, 0x71, 0x02, 0xae, 0xec, 0x6b, 0x8a, 0x70, 0xfb, 0x31, + 0x64, 0x79, 0x0c, 0x99, 0x2d, 0xd3, 0xe5, 0x6f, 0x7f, 0xf5, 0x7a, 0x79, 0xdd, 0xb2, 0x69, 0xa3, + 0x5d, 0x2b, 0x1a, 0x6e, 0x4b, 0x15, 0x05, 0xdd, 0xd4, 0x6b, 0x64, 0xd5, 0x76, 0xc3, 0x4f, 0x95, + 0xee, 0x7a, 0x98, 0x14, 0xcb, 0x0f, 0x2b, 0xb7, 0xd6, 0x6f, 0x56, 0xda, 0xb5, 0x4f, 0xf1, 0xae, + 0x76, 0xbc, 0x16, 0xc4, 0x3d, 0xad, 0x58, 0x06, 0xe2, 0x38, 0x39, 0x10, 0x47, 0xb4, 0x0e, 0x67, + 0x48, 0x53, 0x27, 0x0d, 0x6c, 0x56, 0x85, 0x9e, 0xaa, 0x10, 0x95, 0x61, 0xc4, 0xf3, 0x62, 0xb7, + 0xcc, 0x37, 0xb9, 0x27, 0xe8, 0x06, 0xa0, 0x2e, 0x17, 0x35, 0x42, 0x8e, 0xe3, 0xac, 0xa3, 0xcd, + 0x86, 0x1c, 0xd4, 0x10, 0xd4, 0x67, 0x20, 0xfb, 0x33, 0xdd, 0x6e, 0x62, 0x53, 0xce, 0x5e, 0x90, + 0x56, 0x4e, 0x6a, 0xe2, 0x4b, 0xf9, 0x5a, 0x82, 0x1b, 0xa3, 0xe5, 0x50, 0x04, 0xae, 0x35, 0xa4, + 0x75, 0x7c, 0x98, 0x82, 0x03, 0x23, 0xca, 0xfe, 0x46, 0x3b, 0xc9, 0xa2, 0xc0, 0x36, 0x66, 0x8b, + 0x4e, 0xb1, 0xd9, 0x53, 0x9b, 0xca, 0xfb, 0xa2, 0xd1, 0x0c, 0x6c, 0x0f, 0x3f, 0x26, 0xca, 0x6f, + 0x25, 0xb8, 0x92, 0x78, 0xd8, 0x12, 0xb0, 0x7e, 0x04, 0xc8, 0x39, 0xaa, 0xa3, 0xf0, 0x2f, 0x29, + 0x05, 0x52, 0x92, 0x70, 0xdd, 0x87, 0x73, 0x31, 0x5c, 0x77, 0xfd, 0x04, 0x84, 0x7f, 0x7f, 0x5f, + 0x84, 0x77, 0x93, 0x44, 0x6b, 0x67, 0x23, 0xac, 0xef, 0x21, 0x38, 0xba, 0xbc, 0x7e, 0x02, 0xe7, + 0x06, 0x7b, 0x56, 0x18, 0xf1, 0x55, 0x78, 0x47, 0x18, 0x5b, 0xa5, 0x9d, 0x6a, 0x43, 0x27, 0x8d, + 0x58, 0xdc, 0x67, 0xc5, 0xd6, 0x93, 0xce, 0x03, 0x9d, 0x34, 0x02, 0xe0, 0x7c, 0x9e, 0xd4, 0xaa, + 0xbb, 0x61, 0xda, 0x86, 0x99, 0xde, 0xf6, 0x27, 0x2e, 0x09, 0xe3, 0x75, 0xbf, 0x7c, 0x4f, 0xf7, + 0x53, 0xfe, 0x97, 0x85, 0xd3, 0xc9, 0xea, 0xbe, 0x03, 0xb9, 0x40, 0x18, 0xf6, 0xab, 0xba, 0x69, + 0xf2, 0xb6, 0x31, 0x55, 0x96, 0x5f, 0xbd, 0x5c, 0x9d, 0x17, 0x51, 0xda, 0x30, 0x4d, 0x1f, 0x13, + 0xb2, 0x4d, 0x7d, 0xdb, 0xb1, 0x34, 0xe0, 0xc4, 0xc1, 0x62, 0x0c, 0xdc, 0x26, 0x8e, 0x06, 0xdc, + 0x7e, 0x02, 0x33, 0x51, 0xe5, 0x36, 0x6d, 0x42, 0xe5, 0xc9, 0x0b, 0x93, 0x87, 0x12, 0x9c, 0x13, + 0x45, 0xff, 0x99, 0xcd, 0x0e, 0xc6, 0x74, 0x37, 0x4d, 0x76, 0x0b, 0x33, 0xd8, 0xcb, 0x6b, 0xb9, + 0x30, 0x3f, 0x76, 0x0b, 0x0b, 0x12, 0x9f, 0xf6, 0xe2, 0x5c, 0x8e, 0xad, 0x09, 0x88, 0x5b, 0x04, + 0xc0, 0x8e, 0x19, 0x12, 0x64, 0x19, 0xc1, 0x14, 0x76, 0xc4, 0x49, 0x46, 0x0b, 0x30, 0x45, 0x5d, + 0xaa, 0x37, 0xab, 0x44, 0xa7, 0xf2, 0x09, 0x76, 0x88, 0x4f, 0xb2, 0x85, 0x6d, 0x9d, 0xa2, 0x4b, + 0x30, 0x13, 0x2f, 0x14, 0xdc, 0x91, 0x4f, 0xb2, 0x1a, 0x99, 0x8e, 0x6a, 0x04, 0x77, 0xd0, 0x65, + 0x38, 0xc5, 0x80, 0x35, 0x46, 0x36, 0xc5, 0xc8, 0xf2, 0xe1, 0x32, 0xa7, 0x7b, 0x0f, 0xce, 0x46, + 0x87, 0x89, 0x6d, 0x55, 0x89, 0x6d, 0x31, 0x7a, 0x60, 0xf4, 0xf3, 0xdd, 0xed, 0xed, 0x60, 0x77, + 0xdb, 0xb6, 0x02, 0xb6, 0xa7, 0x90, 0x37, 0xdc, 0x1d, 0xec, 0xe8, 0x0e, 0x0d, 0xe8, 0x89, 0x9c, + 0x63, 0x67, 0xef, 0x66, 0x4a, 0x7d, 0x6d, 0x0a, 0xda, 0x0d, 0x53, 0xf7, 0x02, 0x49, 0xb6, 0xe5, + 0xe8, 0xb4, 0xed, 0x63, 0xa2, 0x4d, 0x87, 0x62, 0xb6, 0x6d, 0x8b, 0xb0, 0x46, 0x21, 0x7c, 0x73, + 0xdb, 0xd4, 0x6b, 0xd3, 0xaa, 0x6d, 0x76, 0xe4, 0x69, 0xd1, 0x28, 0xf8, 0xce, 0x63, 0xb6, 0xf1, + 0xd0, 0x64, 0x97, 0x1e, 0x9d, 0xc1, 0xb5, 0x9c, 0xe7, 0x8d, 0x82, 0x7f, 0xa1, 0x65, 0x56, 0x8e, + 0xb4, 0x4d, 0xaa, 0x26, 0x26, 0x86, 0x3c, 0xc3, 0xa1, 0x8b, 0x2f, 0x6d, 0x61, 0x62, 0xa0, 0x77, + 0x61, 0xa6, 0xed, 0xd4, 0x5c, 0xc7, 0xec, 0xa6, 0xf1, 0x14, 0x53, 0x91, 0xef, 0xae, 0xb2, 0x44, + 0x1a, 0x70, 0xba, 0xed, 0x44, 0x67, 0xa8, 0xea, 0x8b, 0x7a, 0x97, 0x67, 0xd9, 0x61, 0x2a, 0xa6, + 0x1f, 0xa6, 0xa7, 0x31, 0xb6, 0xee, 0x71, 0x9a, 0x6f, 0x27, 0xac, 0x06, 0xb6, 0xf0, 0x57, 0x57, + 0x35, 0x7c, 0xe9, 0xcd, 0x71, 0x5b, 0xf8, 0xaa, 0x78, 0xd7, 0x29, 0x2f, 0x27, 0xe1, 0x6c, 0x8a, + 0x60, 0xb4, 0x02, 0xb3, 0x31, 0x77, 0x3a, 0x31, 0xdc, 0x88, 0xdc, 0xe4, 0xd9, 0xbe, 0x03, 0x0b, + 0x51, 0xb6, 0x23, 0x9e, 0x30, 0xe3, 0x13, 0x8c, 0x49, 0xee, 0x92, 0x3c, 0x0d, 0x29, 0x44, 0xd6, + 0x0d, 0x58, 0xe8, 0x66, 0xbd, 0x97, 0xbb, 0x7b, 0xd0, 0x72, 0xa5, 0x4b, 0x29, 0x61, 0xe9, 0x26, + 0xfd, 0xa1, 0x53, 0x77, 0x35, 0x39, 0x14, 0x14, 0xd7, 0xc1, 0x4e, 0x58, 0x42, 0xe5, 0x66, 0x92, + 0x2a, 0xf7, 0x36, 0x14, 0xfa, 0x2a, 0x37, 0xee, 0xca, 0x71, 0xc6, 0x72, 0xb6, 0xb7, 0x78, 0x23, + 0x4f, 0xea, 0x70, 0x26, 0xaa, 0xdf, 0x18, 0x2f, 0x91, 0xb3, 0x07, 0x2c, 0xe4, 0xf9, 0x6e, 0x21, + 0x47, 0x9a, 0x88, 0x62, 0xc0, 0xf2, 0x3e, 0x7d, 0x07, 0xdd, 0x83, 0x8c, 0x89, 0x9b, 0x07, 0x7b, + 0x9f, 0x30, 0x4e, 0xe5, 0xf3, 0x0c, 0xc8, 0xa9, 0x4f, 0xc6, 0x8f, 0x20, 0x17, 0x9c, 0x02, 0xdf, + 0xf6, 0x62, 0x7d, 0xe0, 0x5b, 0x61, 0xfb, 0x8a, 0x34, 0xf0, 0xde, 0xb5, 0x15, 0x91, 0x6a, 0x71, + 0x3e, 0xf4, 0x08, 0xc0, 0x70, 0x5b, 0x2d, 0x9b, 0x90, 0xb0, 0x09, 0x4e, 0x95, 0x57, 0xbf, 0x7a, + 0xbd, 0xbc, 0xc0, 0x05, 0x11, 0xf3, 0x59, 0xd1, 0x76, 0xd5, 0x96, 0x4e, 0x1b, 0xc5, 0xcf, 0xb0, + 0xa5, 0x1b, 0xbb, 0x5b, 0xd8, 0x78, 0xf5, 0x72, 0x15, 0x84, 0x9e, 0x2d, 0x6c, 0x68, 0x31, 0x01, + 0xe8, 0x06, 0x64, 0x58, 0xab, 0x98, 0xdc, 0xa7, 0x55, 0x30, 0xaa, 0x58, 0x93, 0xc8, 0x1c, 0x4d, + 0x93, 0xb8, 0x03, 0x93, 0x9e, 0xeb, 0xb1, 0x22, 0xc9, 0x95, 0xae, 0xa7, 0x8d, 0x46, 0x7c, 0xd7, + 0xad, 0x3f, 0xae, 0x57, 0x5c, 0x42, 0x30, 0xb3, 0xba, 0xfc, 0x64, 0x53, 0x0b, 0xf8, 0x86, 0xdc, + 0x82, 0xb3, 0x63, 0xdf, 0x82, 0x4f, 0xa4, 0xdf, 0x82, 0x05, 0xc5, 0xc9, 0xa1, 0x97, 0xf4, 0xa9, + 0xc1, 0x4b, 0x7a, 0x74, 0x81, 0x86, 0xf8, 0x05, 0xba, 0xf4, 0xf9, 0x1c, 0x1c, 0x67, 0x97, 0x06, + 0xf4, 0x4b, 0x09, 0xb2, 0x7c, 0xf2, 0x83, 0xae, 0xa6, 0x78, 0x3f, 0x38, 0x00, 0x2b, 0x5c, 0x1b, + 0x85, 0x94, 0x97, 0x9d, 0xf2, 0xee, 0x2f, 0xfe, 0xf6, 0xcf, 0xdf, 0x4c, 0x2c, 0xa3, 0x45, 0x75, + 0xd8, 0xe0, 0x0e, 0xfd, 0x5e, 0x82, 0x53, 0x7d, 0x23, 0x2c, 0x54, 0xda, 0x5f, 0x4d, 0xff, 0xa0, + 0xac, 0x70, 0x6b, 0x2c, 0x1e, 0x61, 0xa3, 0xca, 0x6c, 0xbc, 0x8a, 0xae, 0x0c, 0xb5, 0x51, 0x7d, + 0x21, 0x80, 0x79, 0x0f, 0xfd, 0x49, 0x82, 0xb9, 0x81, 0xa7, 0x01, 0x5a, 0x1f, 0xa6, 0x3b, 0x6d, + 0x84, 0x56, 0x78, 0x6f, 0x4c, 0x2e, 0x61, 0xf3, 0x1a, 0xb3, 0xf9, 0x3a, 0xba, 0x9a, 0x62, 0xf3, + 0xe0, 0x83, 0x07, 0xbd, 0x92, 0x60, 0xb6, 0x5f, 0x20, 0xba, 0x35, 0x8e, 0xfa, 0xd0, 0xe6, 0xf5, + 0xf1, 0x98, 0x84, 0xc9, 0xdb, 0xcc, 0xe4, 0x47, 0xe8, 0xd3, 0x91, 0x4d, 0x56, 0x5f, 0xf4, 0x3c, + 0x3e, 0xf6, 0x06, 0x49, 0xd0, 0x1f, 0x24, 0x98, 0xe9, 0x9d, 0xfd, 0xa0, 0xb5, 0x61, 0xd6, 0x25, + 0x8e, 0xb4, 0x0a, 0xa5, 0x71, 0x58, 0x84, 0x3b, 0x1f, 0x30, 0x77, 0xd6, 0x90, 0xaa, 0xa6, 0x8e, + 0x9b, 0xe3, 0xaf, 0x12, 0xf5, 0x05, 0xbf, 0x78, 0xec, 0xa1, 0xaf, 0x25, 0x58, 0xde, 0xe7, 0x79, + 0x89, 0xca, 0xc3, 0x0c, 0x1a, 0x6d, 0x76, 0x51, 0xd8, 0x3c, 0x94, 0x0c, 0xe1, 0xe5, 0x77, 0x99, + 0x97, 0xeb, 0xa8, 0x34, 0x46, 0xd2, 0x38, 0x42, 0xed, 0xa1, 0xff, 0x4a, 0xb0, 0x38, 0x74, 0xe0, + 0x84, 0xee, 0x8d, 0x53, 0x48, 0x49, 0x33, 0xb1, 0xc2, 0xc6, 0x21, 0x24, 0x08, 0x17, 0x2b, 0xcc, + 0xc5, 0x4f, 0xd0, 0x83, 0x83, 0xd7, 0x25, 0x83, 0xe0, 0xc8, 0xf1, 0x7f, 0x4b, 0x70, 0x7e, 0xd8, + 0x24, 0x0b, 0xdd, 0x1d, 0xc7, 0xea, 0x84, 0x91, 0x5a, 0xe1, 0xde, 0xc1, 0x05, 0x08, 0xaf, 0xef, + 0x33, 0xaf, 0x37, 0xd0, 0xdd, 0x43, 0x7a, 0xcd, 0xa0, 0xbb, 0x6f, 0x04, 0x31, 0x1c, 0xba, 0x93, + 0xc7, 0x19, 0xc3, 0xa1, 0x3b, 0x65, 0xc6, 0xb1, 0x2f, 0x74, 0xeb, 0x21, 0x9f, 0x68, 0xb3, 0xe8, + 0x3f, 0x12, 0x2c, 0x0c, 0x19, 0x30, 0xa0, 0x0f, 0xc7, 0x09, 0x6c, 0x02, 0x92, 0xdc, 0x3d, 0x30, + 0xbf, 0xf0, 0xe8, 0x11, 0xf3, 0xe8, 0x3e, 0xfa, 0xe8, 0xe0, 0x79, 0x89, 0xa1, 0x0e, 0xfa, 0xb3, + 0x04, 0xf9, 0x1e, 0x00, 0x43, 0x37, 0x47, 0xc6, 0xba, 0xd0, 0xa7, 0xb5, 0x31, 0x38, 0x84, 0x17, + 0x9b, 0xcc, 0x8b, 0x3b, 0xe8, 0xf6, 0x48, 0xe0, 0xc8, 0xb0, 0xb1, 0x7f, 0xe4, 0xb1, 0x57, 0xfe, + 0xde, 0x17, 0x6f, 0x96, 0xa4, 0x2f, 0xdf, 0x2c, 0x49, 0xff, 0x78, 0xb3, 0x24, 0xfd, 0xfa, 0xed, + 0xd2, 0xb1, 0x2f, 0xdf, 0x2e, 0x1d, 0xfb, 0xfb, 0xdb, 0xa5, 0x63, 0x3f, 0x1c, 0xe1, 0xd2, 0xd7, + 0x89, 0x6b, 0x64, 0x37, 0xc0, 0x5a, 0x96, 0xfd, 0xab, 0x77, 0xeb, 0xff, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xb0, 0x49, 0xe6, 0xaf, 0x1f, 0x1d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2745,6 +2840,71 @@ func (m *QueryActiveFinalityProvidersAtHeightRequest) MarshalToSizedBuffer(dAtA return len(dAtA) - i, nil } +func (m *ActiveFinalityProvidersAtHeightResponse) 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 *ActiveFinalityProvidersAtHeightResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *ActiveFinalityProvidersAtHeightResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Jailed { + i-- + if m.Jailed { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x30 + } + if m.SlashedBtcHeight != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.SlashedBtcHeight)) + i-- + dAtA[i] = 0x28 + } + if m.SlashedBabylonHeight != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.SlashedBabylonHeight)) + i-- + dAtA[i] = 0x20 + } + if m.VotingPower != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.VotingPower)) + i-- + dAtA[i] = 0x18 + } + if m.Height != 0 { + i = encodeVarintQuery(dAtA, i, uint64(m.Height)) + i-- + dAtA[i] = 0x10 + } + if m.BtcPk != nil { + { + size := m.BtcPk.Size() + i -= size + if _, err := m.BtcPk.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintQuery(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *QueryActiveFinalityProvidersAtHeightResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -3603,6 +3763,34 @@ func (m *QueryActiveFinalityProvidersAtHeightRequest) Size() (n int) { return n } +func (m *ActiveFinalityProvidersAtHeightResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.BtcPk != nil { + l = m.BtcPk.Size() + n += 1 + l + sovQuery(uint64(l)) + } + if m.Height != 0 { + n += 1 + sovQuery(uint64(m.Height)) + } + if m.VotingPower != 0 { + n += 1 + sovQuery(uint64(m.VotingPower)) + } + if m.SlashedBabylonHeight != 0 { + n += 1 + sovQuery(uint64(m.SlashedBabylonHeight)) + } + if m.SlashedBtcHeight != 0 { + n += 1 + sovQuery(uint64(m.SlashedBtcHeight)) + } + if m.Jailed { + n += 2 + } + return n +} + func (m *QueryActiveFinalityProvidersAtHeightResponse) Size() (n int) { if m == nil { return 0 @@ -5209,6 +5397,187 @@ func (m *QueryActiveFinalityProvidersAtHeightRequest) Unmarshal(dAtA []byte) err } return nil } +func (m *ActiveFinalityProvidersAtHeightResponse) 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: ActiveFinalityProvidersAtHeightResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: ActiveFinalityProvidersAtHeightResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BtcPk", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthQuery + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var v github_com_babylonlabs_io_babylon_types.BIP340PubKey + m.BtcPk = &v + if err := m.BtcPk.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Height", wireType) + } + m.Height = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Height |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field VotingPower", wireType) + } + m.VotingPower = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.VotingPower |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SlashedBabylonHeight", wireType) + } + m.SlashedBabylonHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SlashedBabylonHeight |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SlashedBtcHeight", wireType) + } + m.SlashedBtcHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SlashedBtcHeight |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Jailed", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Jailed = bool(v != 0) + 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 *QueryActiveFinalityProvidersAtHeightResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -5267,7 +5636,7 @@ func (m *QueryActiveFinalityProvidersAtHeightResponse) Unmarshal(dAtA []byte) er if postIndex > l { return io.ErrUnexpectedEOF } - m.FinalityProviders = append(m.FinalityProviders, &FinalityProviderWithMeta{}) + m.FinalityProviders = append(m.FinalityProviders, &ActiveFinalityProvidersAtHeightResponse{}) if err := m.FinalityProviders[len(m.FinalityProviders)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } From 188377891ac91b4a07dd4d93349103dd355dd854 Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Tue, 15 Oct 2024 17:47:06 +0300 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4deb4e348..78e2195e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) * [#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` +* [#202](https://github.com/babylonlabs-io/babylon/pull/202) Adjusted handling of `FinalityProviderWithMeta` in btcstaking keeper queries to improve API security ### State Machine Breaking From bb8ceedc98857924479c087bf53b54727fd06d46 Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Tue, 15 Oct 2024 19:04:10 +0300 Subject: [PATCH 3/4] change to hex --- proto/babylon/btcstaking/v1/query.proto | 34 +-- x/btcstaking/keeper/grpc_query.go | 2 +- x/btcstaking/keeper/grpc_query_test.go | 4 +- x/btcstaking/types/query.pb.go | 269 ++++++++++++------------ x/finality/types/query.pb.go | 13 +- 5 files changed, 164 insertions(+), 158 deletions(-) diff --git a/proto/babylon/btcstaking/v1/query.proto b/proto/babylon/btcstaking/v1/query.proto index b4d2c9308..e1634da8b 100644 --- a/proto/babylon/btcstaking/v1/query.proto +++ b/proto/babylon/btcstaking/v1/query.proto @@ -189,23 +189,23 @@ message QueryActiveFinalityProvidersAtHeightRequest { // ActiveFinalityProvidersAtHeightResponse wraps the FinalityProvider with metadata. message ActiveFinalityProvidersAtHeightResponse { - // btc_pk is the Bitcoin secp256k1 PK of thisfinality provider - // the PK follows encoding in BIP-340 spec - bytes btc_pk = 1 [ (gogoproto.customtype) = "github.com/babylonlabs-io/babylon/types.BIP340PubKey" ]; - // height is the queried Babylon height - uint64 height = 2; - // voting_power is the voting power of this finality provider at the given height - uint64 voting_power = 3; - // slashed_babylon_height indicates the Babylon height when - // the finality provider is slashed. - // if it's 0 then the finality provider is not slashed - uint64 slashed_babylon_height = 4; - // slashed_btc_height indicates the BTC height when - // the finality provider is slashed. - // if it's 0 then the finality provider is not slashed - uint32 slashed_btc_height = 5; - // jailed defines whether the finality provider is detected jailed - bool jailed = 6; + // btc_pk is the Bitcoin secp256k1 PK of thisfinality provider + // the PK follows encoding in BIP-340 spec + string btc_pk_hex = 1 [ (gogoproto.customtype) = "github.com/babylonlabs-io/babylon/types.BIP340PubKey" ]; + // height is the queried Babylon height + uint64 height = 2; + // voting_power is the voting power of this finality provider at the given height + uint64 voting_power = 3; + // slashed_babylon_height indicates the Babylon height when + // the finality provider is slashed. + // if it's 0 then the finality provider is not slashed + uint64 slashed_babylon_height = 4; + // slashed_btc_height indicates the BTC height when + // the finality provider is slashed. + // if it's 0 then the finality provider is not slashed + uint32 slashed_btc_height = 5; + // jailed defines whether the finality provider is detected jailed + bool jailed = 6; } // QueryActiveFinalityProvidersAtHeightResponse is the response type for the diff --git a/x/btcstaking/keeper/grpc_query.go b/x/btcstaking/keeper/grpc_query.go index 1fab586f1..fa5dca2f6 100644 --- a/x/btcstaking/keeper/grpc_query.go +++ b/x/btcstaking/keeper/grpc_query.go @@ -307,7 +307,7 @@ func convertToActiveFinalityProvidersAtHeightResponse(finalityProvidersWithMeta var activeFinalityProvidersAtHeightResponse []*types.ActiveFinalityProvidersAtHeightResponse for _, fpWithMeta := range finalityProvidersWithMeta { activeFinalityProvidersAtHeightResponse = append(activeFinalityProvidersAtHeightResponse, &types.ActiveFinalityProvidersAtHeightResponse{ - BtcPk: fpWithMeta.BtcPk, + BtcPkHex: fpWithMeta.BtcPk, Height: fpWithMeta.Height, VotingPower: fpWithMeta.VotingPower, SlashedBabylonHeight: fpWithMeta.SlashedBabylonHeight, diff --git a/x/btcstaking/keeper/grpc_query_test.go b/x/btcstaking/keeper/grpc_query_test.go index 036cd3348..ec784e11f 100644 --- a/x/btcstaking/keeper/grpc_query_test.go +++ b/x/btcstaking/keeper/grpc_query_test.go @@ -480,10 +480,10 @@ func FuzzActiveFinalityProvidersAtHeight(f *testing.F) { for _, fp := range resp.FinalityProviders { // Check if the pk exists in the map - if _, ok := fpsWithVotingPowerMap[fp.BtcPk.MarshalHex()]; !ok { + if _, ok := fpsWithVotingPowerMap[fp.BtcPkHex.MarshalHex()]; !ok { t.Fatalf("rpc returned a finality provider that was not created") } - fpsFound[fp.BtcPk.MarshalHex()] = true + fpsFound[fp.BtcPkHex.MarshalHex()] = true } // Construct the next page request diff --git a/x/btcstaking/types/query.pb.go b/x/btcstaking/types/query.pb.go index 2f64028fe..51f403e00 100644 --- a/x/btcstaking/types/query.pb.go +++ b/x/btcstaking/types/query.pb.go @@ -803,7 +803,7 @@ func (m *QueryActiveFinalityProvidersAtHeightRequest) GetPagination() *query.Pag type ActiveFinalityProvidersAtHeightResponse struct { // btc_pk is the Bitcoin secp256k1 PK of thisfinality provider // the PK follows encoding in BIP-340 spec - BtcPk *github_com_babylonlabs_io_babylon_types.BIP340PubKey `protobuf:"bytes,1,opt,name=btc_pk,json=btcPk,proto3,customtype=github.com/babylonlabs-io/babylon/types.BIP340PubKey" json:"btc_pk,omitempty"` + BtcPkHex *github_com_babylonlabs_io_babylon_types.BIP340PubKey `protobuf:"bytes,1,opt,name=btc_pk_hex,json=btcPkHex,proto3,customtype=github.com/babylonlabs-io/babylon/types.BIP340PubKey" json:"btc_pk_hex,omitempty"` // height is the queried Babylon height Height uint64 `protobuf:"varint,2,opt,name=height,proto3" json:"height,omitempty"` // voting_power is the voting power of this finality provider at the given height @@ -1730,129 +1730,129 @@ func init() { func init() { proto.RegisterFile("babylon/btcstaking/v1/query.proto", fileDescriptor_74d49d26f7429697) } var fileDescriptor_74d49d26f7429697 = []byte{ - // 1945 bytes of a gzipped FileDescriptorProto + // 1947 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x59, 0xcd, 0x6f, 0xdb, 0xc8, - 0x15, 0x0f, 0x6d, 0x45, 0x89, 0x9f, 0x2c, 0xc7, 0x9e, 0x75, 0x12, 0x46, 0x8e, 0xed, 0x84, 0xcd, + 0x15, 0x0f, 0x6d, 0x45, 0xb1, 0x9f, 0x2c, 0xc7, 0x9e, 0x75, 0x12, 0x46, 0x8e, 0xed, 0x84, 0xcd, 0x26, 0xce, 0x87, 0xc5, 0x58, 0xf1, 0xee, 0xb6, 0x0d, 0xb2, 0x89, 0x65, 0xef, 0x26, 0xd9, 0xdd, - 0x34, 0x2a, 0x9d, 0xf4, 0xd0, 0x2f, 0x81, 0x22, 0x47, 0x14, 0x1b, 0x89, 0x64, 0x38, 0x23, 0x57, - 0x46, 0xe0, 0x4b, 0x0f, 0xbd, 0x15, 0x28, 0xd0, 0xfe, 0x0b, 0x0b, 0x14, 0xe8, 0xa5, 0x45, 0x73, - 0xe9, 0xa1, 0xf7, 0xed, 0x6d, 0x91, 0x5e, 0x8a, 0x3d, 0x04, 0x45, 0x52, 0x6c, 0x81, 0x02, 0xbd, - 0xf6, 0xd0, 0x53, 0xc1, 0x99, 0xa1, 0x48, 0x49, 0xa4, 0x2c, 0xd9, 0xde, 0x9b, 0x38, 0xf3, 0xbe, - 0xdf, 0x9b, 0xdf, 0x9b, 0x79, 0x82, 0x8b, 0x35, 0xbd, 0xb6, 0xdb, 0x74, 0x1d, 0xb5, 0x46, 0x0d, - 0x42, 0xf5, 0x67, 0xb6, 0x63, 0xa9, 0x3b, 0x6b, 0xea, 0xf3, 0x36, 0xf6, 0x77, 0x8b, 0x9e, 0xef, - 0x52, 0x17, 0x9d, 0x16, 0x24, 0xc5, 0x88, 0xa4, 0xb8, 0xb3, 0x56, 0x98, 0xb7, 0x5c, 0xcb, 0x65, - 0x14, 0x6a, 0xf0, 0x8b, 0x13, 0x17, 0xce, 0x5b, 0xae, 0x6b, 0x35, 0xb1, 0xaa, 0x7b, 0xb6, 0xaa, - 0x3b, 0x8e, 0x4b, 0x75, 0x6a, 0xbb, 0x0e, 0x11, 0xbb, 0xe7, 0x0c, 0x97, 0xb4, 0x5c, 0x52, 0xe5, - 0x6c, 0xfc, 0x43, 0x6c, 0x5d, 0xe2, 0x5f, 0x6a, 0x64, 0x44, 0x0d, 0x53, 0x7d, 0x2d, 0xfc, 0x16, - 0x54, 0xd7, 0x04, 0x55, 0x4d, 0x27, 0x98, 0x1b, 0xd9, 0x25, 0xf4, 0x74, 0xcb, 0x76, 0x98, 0x36, - 0x41, 0xab, 0x24, 0xbb, 0xe6, 0xe9, 0xbe, 0xde, 0x0a, 0xb5, 0x5e, 0x4e, 0xa6, 0x89, 0x79, 0xca, - 0xe9, 0x96, 0x53, 0x64, 0xb9, 0x1e, 0x27, 0x50, 0xe6, 0x01, 0x7d, 0x3f, 0x30, 0xa7, 0xc2, 0xa4, - 0x6b, 0xf8, 0x79, 0x1b, 0x13, 0xaa, 0x68, 0xf0, 0x4e, 0xcf, 0x2a, 0xf1, 0x5c, 0x87, 0x60, 0x74, - 0x1b, 0xb2, 0xdc, 0x0a, 0x59, 0xba, 0x20, 0xad, 0xe4, 0x4a, 0x8b, 0xc5, 0xc4, 0x10, 0x17, 0x39, - 0x5b, 0x39, 0xf3, 0xc5, 0xeb, 0xe5, 0x63, 0x9a, 0x60, 0x51, 0x3e, 0x80, 0x85, 0x98, 0xcc, 0xf2, - 0xee, 0x0f, 0xb0, 0x4f, 0x6c, 0xd7, 0x11, 0x2a, 0x91, 0x0c, 0x27, 0x76, 0xf8, 0x0a, 0x13, 0x9e, - 0xd7, 0xc2, 0x4f, 0xe5, 0x47, 0x70, 0x3e, 0x99, 0xf1, 0x28, 0xac, 0xb2, 0x60, 0x91, 0x09, 0xff, - 0xd8, 0x76, 0xf4, 0xa6, 0x4d, 0x77, 0x2b, 0xbe, 0xbb, 0x63, 0x9b, 0xd8, 0x0f, 0x43, 0x81, 0x3e, - 0x06, 0x88, 0x32, 0x24, 0x34, 0x5c, 0x2e, 0x8a, 0x12, 0x08, 0xd2, 0x59, 0xe4, 0x35, 0x27, 0xd2, - 0x59, 0xac, 0xe8, 0x16, 0x16, 0xbc, 0x5a, 0x8c, 0x53, 0xf9, 0xab, 0x04, 0x4b, 0x69, 0x9a, 0x84, - 0x23, 0x3f, 0x05, 0x54, 0x17, 0x9b, 0x41, 0xa5, 0xf1, 0x5d, 0x59, 0xba, 0x30, 0xb9, 0x92, 0x2b, - 0xa9, 0x29, 0x4e, 0xf5, 0x4b, 0x0b, 0x85, 0x69, 0x73, 0xf5, 0x7e, 0x3d, 0xe8, 0x7e, 0x8f, 0x2b, - 0x13, 0xcc, 0x95, 0x2b, 0xfb, 0xba, 0x22, 0xe4, 0xc5, 0x7d, 0xd9, 0x10, 0x19, 0x19, 0x54, 0xce, - 0x63, 0x76, 0x11, 0xf2, 0x75, 0xaf, 0x5a, 0xa3, 0x46, 0xd5, 0x7b, 0x56, 0x6d, 0xe0, 0x0e, 0x0b, - 0xdb, 0x94, 0x06, 0x75, 0xaf, 0x4c, 0x8d, 0xca, 0xb3, 0x07, 0xb8, 0xa3, 0xec, 0xa5, 0xc4, 0xbd, - 0x1b, 0x8c, 0x1f, 0xc3, 0xdc, 0x40, 0x30, 0x44, 0xf8, 0xc7, 0x8e, 0xc5, 0x6c, 0x7f, 0x2c, 0x94, - 0xdf, 0x49, 0x50, 0x60, 0xfa, 0xcb, 0x4f, 0x36, 0xb7, 0x70, 0x13, 0x5b, 0xfc, 0xb8, 0x87, 0x0e, - 0x94, 0x21, 0x4b, 0xa8, 0x4e, 0xdb, 0xbc, 0xa4, 0x66, 0x4a, 0xd7, 0x52, 0x34, 0xf6, 0x70, 0x6f, - 0x33, 0x0e, 0x4d, 0x70, 0xf6, 0x15, 0xce, 0xc4, 0x81, 0x0b, 0xe7, 0x2f, 0x92, 0x38, 0x38, 0xfd, - 0xa6, 0x8a, 0x40, 0x3d, 0x85, 0x53, 0x41, 0xa4, 0xcd, 0x68, 0x4b, 0x94, 0xcc, 0x8d, 0x51, 0x8c, - 0xee, 0xc6, 0x68, 0xa6, 0x46, 0x8d, 0x98, 0xf8, 0xa3, 0x2b, 0x96, 0x3a, 0x5c, 0x4d, 0xcc, 0x74, - 0xc5, 0xfd, 0x39, 0xf6, 0x37, 0xe8, 0x03, 0x6c, 0x5b, 0x0d, 0x3a, 0x7a, 0xe5, 0xa0, 0x33, 0x90, - 0x6d, 0x30, 0x1e, 0x66, 0x54, 0x46, 0x13, 0x5f, 0xca, 0x63, 0xb8, 0x36, 0x8a, 0x1e, 0x11, 0xb5, - 0x8b, 0x30, 0xbd, 0xe3, 0x52, 0xdb, 0xb1, 0xaa, 0x5e, 0xb0, 0xcf, 0xf4, 0x64, 0xb4, 0x1c, 0x5f, - 0x63, 0x2c, 0xca, 0x23, 0x58, 0x49, 0x14, 0xb8, 0xd9, 0xf6, 0x7d, 0xec, 0x50, 0x46, 0x34, 0x46, - 0xc5, 0xa7, 0xc5, 0xa1, 0x57, 0x9c, 0x30, 0x2f, 0x72, 0x52, 0x8a, 0x3b, 0x39, 0x60, 0xf6, 0xc4, - 0xa0, 0xd9, 0xbf, 0x92, 0xe0, 0x3a, 0x53, 0xb4, 0x61, 0x50, 0x7b, 0x07, 0x0f, 0xc0, 0x4d, 0x7f, - 0xc8, 0xd3, 0x54, 0x1d, 0x55, 0xfd, 0xfe, 0x71, 0x02, 0xae, 0xec, 0x6b, 0x8a, 0x70, 0xfb, 0x31, - 0x64, 0x79, 0x0c, 0x99, 0x2d, 0xd3, 0xe5, 0x6f, 0x7f, 0xf5, 0x7a, 0x79, 0xdd, 0xb2, 0x69, 0xa3, - 0x5d, 0x2b, 0x1a, 0x6e, 0x4b, 0x15, 0x05, 0xdd, 0xd4, 0x6b, 0x64, 0xd5, 0x76, 0xc3, 0x4f, 0x95, - 0xee, 0x7a, 0x98, 0x14, 0xcb, 0x0f, 0x2b, 0xb7, 0xd6, 0x6f, 0x56, 0xda, 0xb5, 0x4f, 0xf1, 0xae, - 0x76, 0xbc, 0x16, 0xc4, 0x3d, 0xad, 0x58, 0x06, 0xe2, 0x38, 0x39, 0x10, 0x47, 0xb4, 0x0e, 0x67, - 0x48, 0x53, 0x27, 0x0d, 0x6c, 0x56, 0x85, 0x9e, 0xaa, 0x10, 0x95, 0x61, 0xc4, 0xf3, 0x62, 0xb7, - 0xcc, 0x37, 0xb9, 0x27, 0xe8, 0x06, 0xa0, 0x2e, 0x17, 0x35, 0x42, 0x8e, 0xe3, 0xac, 0xa3, 0xcd, - 0x86, 0x1c, 0xd4, 0x10, 0xd4, 0x67, 0x20, 0xfb, 0x33, 0xdd, 0x6e, 0x62, 0x53, 0xce, 0x5e, 0x90, - 0x56, 0x4e, 0x6a, 0xe2, 0x4b, 0xf9, 0x5a, 0x82, 0x1b, 0xa3, 0xe5, 0x50, 0x04, 0xae, 0x35, 0xa4, - 0x75, 0x7c, 0x98, 0x82, 0x03, 0x23, 0xca, 0xfe, 0x46, 0x3b, 0xc9, 0xa2, 0xc0, 0x36, 0x66, 0x8b, - 0x4e, 0xb1, 0xd9, 0x53, 0x9b, 0xca, 0xfb, 0xa2, 0xd1, 0x0c, 0x6c, 0x0f, 0x3f, 0x26, 0xca, 0x6f, - 0x25, 0xb8, 0x92, 0x78, 0xd8, 0x12, 0xb0, 0x7e, 0x04, 0xc8, 0x39, 0xaa, 0xa3, 0xf0, 0x2f, 0x29, - 0x05, 0x52, 0x92, 0x70, 0xdd, 0x87, 0x73, 0x31, 0x5c, 0x77, 0xfd, 0x04, 0x84, 0x7f, 0x7f, 0x5f, - 0x84, 0x77, 0x93, 0x44, 0x6b, 0x67, 0x23, 0xac, 0xef, 0x21, 0x38, 0xba, 0xbc, 0x7e, 0x02, 0xe7, - 0x06, 0x7b, 0x56, 0x18, 0xf1, 0x55, 0x78, 0x47, 0x18, 0x5b, 0xa5, 0x9d, 0x6a, 0x43, 0x27, 0x8d, - 0x58, 0xdc, 0x67, 0xc5, 0xd6, 0x93, 0xce, 0x03, 0x9d, 0x34, 0x02, 0xe0, 0x7c, 0x9e, 0xd4, 0xaa, - 0xbb, 0x61, 0xda, 0x86, 0x99, 0xde, 0xf6, 0x27, 0x2e, 0x09, 0xe3, 0x75, 0xbf, 0x7c, 0x4f, 0xf7, - 0x53, 0xfe, 0x97, 0x85, 0xd3, 0xc9, 0xea, 0xbe, 0x03, 0xb9, 0x40, 0x18, 0xf6, 0xab, 0xba, 0x69, - 0xf2, 0xb6, 0x31, 0x55, 0x96, 0x5f, 0xbd, 0x5c, 0x9d, 0x17, 0x51, 0xda, 0x30, 0x4d, 0x1f, 0x13, - 0xb2, 0x4d, 0x7d, 0xdb, 0xb1, 0x34, 0xe0, 0xc4, 0xc1, 0x62, 0x0c, 0xdc, 0x26, 0x8e, 0x06, 0xdc, - 0x7e, 0x02, 0x33, 0x51, 0xe5, 0x36, 0x6d, 0x42, 0xe5, 0xc9, 0x0b, 0x93, 0x87, 0x12, 0x9c, 0x13, - 0x45, 0xff, 0x99, 0xcd, 0x0e, 0xc6, 0x74, 0x37, 0x4d, 0x76, 0x0b, 0x33, 0xd8, 0xcb, 0x6b, 0xb9, - 0x30, 0x3f, 0x76, 0x0b, 0x0b, 0x12, 0x9f, 0xf6, 0xe2, 0x5c, 0x8e, 0xad, 0x09, 0x88, 0x5b, 0x04, - 0xc0, 0x8e, 0x19, 0x12, 0x64, 0x19, 0xc1, 0x14, 0x76, 0xc4, 0x49, 0x46, 0x0b, 0x30, 0x45, 0x5d, - 0xaa, 0x37, 0xab, 0x44, 0xa7, 0xf2, 0x09, 0x76, 0x88, 0x4f, 0xb2, 0x85, 0x6d, 0x9d, 0xa2, 0x4b, - 0x30, 0x13, 0x2f, 0x14, 0xdc, 0x91, 0x4f, 0xb2, 0x1a, 0x99, 0x8e, 0x6a, 0x04, 0x77, 0xd0, 0x65, - 0x38, 0xc5, 0x80, 0x35, 0x46, 0x36, 0xc5, 0xc8, 0xf2, 0xe1, 0x32, 0xa7, 0x7b, 0x0f, 0xce, 0x46, - 0x87, 0x89, 0x6d, 0x55, 0x89, 0x6d, 0x31, 0x7a, 0x60, 0xf4, 0xf3, 0xdd, 0xed, 0xed, 0x60, 0x77, - 0xdb, 0xb6, 0x02, 0xb6, 0xa7, 0x90, 0x37, 0xdc, 0x1d, 0xec, 0xe8, 0x0e, 0x0d, 0xe8, 0x89, 0x9c, - 0x63, 0x67, 0xef, 0x66, 0x4a, 0x7d, 0x6d, 0x0a, 0xda, 0x0d, 0x53, 0xf7, 0x02, 0x49, 0xb6, 0xe5, - 0xe8, 0xb4, 0xed, 0x63, 0xa2, 0x4d, 0x87, 0x62, 0xb6, 0x6d, 0x8b, 0xb0, 0x46, 0x21, 0x7c, 0x73, - 0xdb, 0xd4, 0x6b, 0xd3, 0xaa, 0x6d, 0x76, 0xe4, 0x69, 0xd1, 0x28, 0xf8, 0xce, 0x63, 0xb6, 0xf1, - 0xd0, 0x64, 0x97, 0x1e, 0x9d, 0xc1, 0xb5, 0x9c, 0xe7, 0x8d, 0x82, 0x7f, 0xa1, 0x65, 0x56, 0x8e, - 0xb4, 0x4d, 0xaa, 0x26, 0x26, 0x86, 0x3c, 0xc3, 0xa1, 0x8b, 0x2f, 0x6d, 0x61, 0x62, 0xa0, 0x77, - 0x61, 0xa6, 0xed, 0xd4, 0x5c, 0xc7, 0xec, 0xa6, 0xf1, 0x14, 0x53, 0x91, 0xef, 0xae, 0xb2, 0x44, - 0x1a, 0x70, 0xba, 0xed, 0x44, 0x67, 0xa8, 0xea, 0x8b, 0x7a, 0x97, 0x67, 0xd9, 0x61, 0x2a, 0xa6, - 0x1f, 0xa6, 0xa7, 0x31, 0xb6, 0xee, 0x71, 0x9a, 0x6f, 0x27, 0xac, 0x06, 0xb6, 0xf0, 0x57, 0x57, - 0x35, 0x7c, 0xe9, 0xcd, 0x71, 0x5b, 0xf8, 0xaa, 0x78, 0xd7, 0x29, 0x2f, 0x27, 0xe1, 0x6c, 0x8a, - 0x60, 0xb4, 0x02, 0xb3, 0x31, 0x77, 0x3a, 0x31, 0xdc, 0x88, 0xdc, 0xe4, 0xd9, 0xbe, 0x03, 0x0b, - 0x51, 0xb6, 0x23, 0x9e, 0x30, 0xe3, 0x13, 0x8c, 0x49, 0xee, 0x92, 0x3c, 0x0d, 0x29, 0x44, 0xd6, - 0x0d, 0x58, 0xe8, 0x66, 0xbd, 0x97, 0xbb, 0x7b, 0xd0, 0x72, 0xa5, 0x4b, 0x29, 0x61, 0xe9, 0x26, - 0xfd, 0xa1, 0x53, 0x77, 0x35, 0x39, 0x14, 0x14, 0xd7, 0xc1, 0x4e, 0x58, 0x42, 0xe5, 0x66, 0x92, - 0x2a, 0xf7, 0x36, 0x14, 0xfa, 0x2a, 0x37, 0xee, 0xca, 0x71, 0xc6, 0x72, 0xb6, 0xb7, 0x78, 0x23, - 0x4f, 0xea, 0x70, 0x26, 0xaa, 0xdf, 0x18, 0x2f, 0x91, 0xb3, 0x07, 0x2c, 0xe4, 0xf9, 0x6e, 0x21, - 0x47, 0x9a, 0x88, 0x62, 0xc0, 0xf2, 0x3e, 0x7d, 0x07, 0xdd, 0x83, 0x8c, 0x89, 0x9b, 0x07, 0x7b, - 0x9f, 0x30, 0x4e, 0xe5, 0xf3, 0x0c, 0xc8, 0xa9, 0x4f, 0xc6, 0x8f, 0x20, 0x17, 0x9c, 0x02, 0xdf, - 0xf6, 0x62, 0x7d, 0xe0, 0x5b, 0x61, 0xfb, 0x8a, 0x34, 0xf0, 0xde, 0xb5, 0x15, 0x91, 0x6a, 0x71, - 0x3e, 0xf4, 0x08, 0xc0, 0x70, 0x5b, 0x2d, 0x9b, 0x90, 0xb0, 0x09, 0x4e, 0x95, 0x57, 0xbf, 0x7a, - 0xbd, 0xbc, 0xc0, 0x05, 0x11, 0xf3, 0x59, 0xd1, 0x76, 0xd5, 0x96, 0x4e, 0x1b, 0xc5, 0xcf, 0xb0, - 0xa5, 0x1b, 0xbb, 0x5b, 0xd8, 0x78, 0xf5, 0x72, 0x15, 0x84, 0x9e, 0x2d, 0x6c, 0x68, 0x31, 0x01, - 0xe8, 0x06, 0x64, 0x58, 0xab, 0x98, 0xdc, 0xa7, 0x55, 0x30, 0xaa, 0x58, 0x93, 0xc8, 0x1c, 0x4d, - 0x93, 0xb8, 0x03, 0x93, 0x9e, 0xeb, 0xb1, 0x22, 0xc9, 0x95, 0xae, 0xa7, 0x8d, 0x46, 0x7c, 0xd7, - 0xad, 0x3f, 0xae, 0x57, 0x5c, 0x42, 0x30, 0xb3, 0xba, 0xfc, 0x64, 0x53, 0x0b, 0xf8, 0x86, 0xdc, - 0x82, 0xb3, 0x63, 0xdf, 0x82, 0x4f, 0xa4, 0xdf, 0x82, 0x05, 0xc5, 0xc9, 0xa1, 0x97, 0xf4, 0xa9, - 0xc1, 0x4b, 0x7a, 0x74, 0x81, 0x86, 0xf8, 0x05, 0xba, 0xf4, 0xf9, 0x1c, 0x1c, 0x67, 0x97, 0x06, - 0xf4, 0x4b, 0x09, 0xb2, 0x7c, 0xf2, 0x83, 0xae, 0xa6, 0x78, 0x3f, 0x38, 0x00, 0x2b, 0x5c, 0x1b, - 0x85, 0x94, 0x97, 0x9d, 0xf2, 0xee, 0x2f, 0xfe, 0xf6, 0xcf, 0xdf, 0x4c, 0x2c, 0xa3, 0x45, 0x75, - 0xd8, 0xe0, 0x0e, 0xfd, 0x5e, 0x82, 0x53, 0x7d, 0x23, 0x2c, 0x54, 0xda, 0x5f, 0x4d, 0xff, 0xa0, - 0xac, 0x70, 0x6b, 0x2c, 0x1e, 0x61, 0xa3, 0xca, 0x6c, 0xbc, 0x8a, 0xae, 0x0c, 0xb5, 0x51, 0x7d, - 0x21, 0x80, 0x79, 0x0f, 0xfd, 0x49, 0x82, 0xb9, 0x81, 0xa7, 0x01, 0x5a, 0x1f, 0xa6, 0x3b, 0x6d, - 0x84, 0x56, 0x78, 0x6f, 0x4c, 0x2e, 0x61, 0xf3, 0x1a, 0xb3, 0xf9, 0x3a, 0xba, 0x9a, 0x62, 0xf3, - 0xe0, 0x83, 0x07, 0xbd, 0x92, 0x60, 0xb6, 0x5f, 0x20, 0xba, 0x35, 0x8e, 0xfa, 0xd0, 0xe6, 0xf5, - 0xf1, 0x98, 0x84, 0xc9, 0xdb, 0xcc, 0xe4, 0x47, 0xe8, 0xd3, 0x91, 0x4d, 0x56, 0x5f, 0xf4, 0x3c, - 0x3e, 0xf6, 0x06, 0x49, 0xd0, 0x1f, 0x24, 0x98, 0xe9, 0x9d, 0xfd, 0xa0, 0xb5, 0x61, 0xd6, 0x25, - 0x8e, 0xb4, 0x0a, 0xa5, 0x71, 0x58, 0x84, 0x3b, 0x1f, 0x30, 0x77, 0xd6, 0x90, 0xaa, 0xa6, 0x8e, - 0x9b, 0xe3, 0xaf, 0x12, 0xf5, 0x05, 0xbf, 0x78, 0xec, 0xa1, 0xaf, 0x25, 0x58, 0xde, 0xe7, 0x79, - 0x89, 0xca, 0xc3, 0x0c, 0x1a, 0x6d, 0x76, 0x51, 0xd8, 0x3c, 0x94, 0x0c, 0xe1, 0xe5, 0x77, 0x99, - 0x97, 0xeb, 0xa8, 0x34, 0x46, 0xd2, 0x38, 0x42, 0xed, 0xa1, 0xff, 0x4a, 0xb0, 0x38, 0x74, 0xe0, - 0x84, 0xee, 0x8d, 0x53, 0x48, 0x49, 0x33, 0xb1, 0xc2, 0xc6, 0x21, 0x24, 0x08, 0x17, 0x2b, 0xcc, - 0xc5, 0x4f, 0xd0, 0x83, 0x83, 0xd7, 0x25, 0x83, 0xe0, 0xc8, 0xf1, 0x7f, 0x4b, 0x70, 0x7e, 0xd8, - 0x24, 0x0b, 0xdd, 0x1d, 0xc7, 0xea, 0x84, 0x91, 0x5a, 0xe1, 0xde, 0xc1, 0x05, 0x08, 0xaf, 0xef, - 0x33, 0xaf, 0x37, 0xd0, 0xdd, 0x43, 0x7a, 0xcd, 0xa0, 0xbb, 0x6f, 0x04, 0x31, 0x1c, 0xba, 0x93, - 0xc7, 0x19, 0xc3, 0xa1, 0x3b, 0x65, 0xc6, 0xb1, 0x2f, 0x74, 0xeb, 0x21, 0x9f, 0x68, 0xb3, 0xe8, - 0x3f, 0x12, 0x2c, 0x0c, 0x19, 0x30, 0xa0, 0x0f, 0xc7, 0x09, 0x6c, 0x02, 0x92, 0xdc, 0x3d, 0x30, - 0xbf, 0xf0, 0xe8, 0x11, 0xf3, 0xe8, 0x3e, 0xfa, 0xe8, 0xe0, 0x79, 0x89, 0xa1, 0x0e, 0xfa, 0xb3, - 0x04, 0xf9, 0x1e, 0x00, 0x43, 0x37, 0x47, 0xc6, 0xba, 0xd0, 0xa7, 0xb5, 0x31, 0x38, 0x84, 0x17, - 0x9b, 0xcc, 0x8b, 0x3b, 0xe8, 0xf6, 0x48, 0xe0, 0xc8, 0xb0, 0xb1, 0x7f, 0xe4, 0xb1, 0x57, 0xfe, - 0xde, 0x17, 0x6f, 0x96, 0xa4, 0x2f, 0xdf, 0x2c, 0x49, 0xff, 0x78, 0xb3, 0x24, 0xfd, 0xfa, 0xed, - 0xd2, 0xb1, 0x2f, 0xdf, 0x2e, 0x1d, 0xfb, 0xfb, 0xdb, 0xa5, 0x63, 0x3f, 0x1c, 0xe1, 0xd2, 0xd7, - 0x89, 0x6b, 0x64, 0x37, 0xc0, 0x5a, 0x96, 0xfd, 0xab, 0x77, 0xeb, 0xff, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xb0, 0x49, 0xe6, 0xaf, 0x1f, 0x1d, 0x00, 0x00, + 0x34, 0x2a, 0x9d, 0xec, 0xa1, 0x5f, 0x02, 0x45, 0x8e, 0x28, 0xd6, 0x12, 0xa9, 0x70, 0x46, 0xae, + 0x8c, 0xc0, 0x97, 0x1e, 0x7a, 0x2b, 0x50, 0xa0, 0xfd, 0x17, 0x16, 0x28, 0xd0, 0x4b, 0x81, 0xe6, + 0xd0, 0x1e, 0x7a, 0xdf, 0xde, 0x16, 0xe9, 0xa5, 0xd8, 0x43, 0x50, 0x24, 0xc5, 0x16, 0x28, 0xd0, + 0x6b, 0x0f, 0x3d, 0x15, 0x9c, 0x19, 0x8a, 0x94, 0x44, 0xea, 0xc3, 0x76, 0x6f, 0xe2, 0xcc, 0xfb, + 0x7e, 0x6f, 0x7e, 0x6f, 0xe6, 0x09, 0x2e, 0x55, 0xf4, 0xca, 0x7e, 0xdd, 0x75, 0xd4, 0x0a, 0x35, + 0x08, 0xd5, 0x77, 0x6d, 0xc7, 0x52, 0xf7, 0xd6, 0xd5, 0xe7, 0x2d, 0xec, 0xed, 0xe7, 0x9b, 0x9e, + 0x4b, 0x5d, 0x74, 0x46, 0x90, 0xe4, 0x43, 0x92, 0xfc, 0xde, 0x7a, 0x6e, 0xc1, 0x72, 0x2d, 0x97, + 0x51, 0xa8, 0xfe, 0x2f, 0x4e, 0x9c, 0xbb, 0x60, 0xb9, 0xae, 0x55, 0xc7, 0xaa, 0xde, 0xb4, 0x55, + 0xdd, 0x71, 0x5c, 0xaa, 0x53, 0xdb, 0x75, 0x88, 0xd8, 0x3d, 0x6f, 0xb8, 0xa4, 0xe1, 0x92, 0x32, + 0x67, 0xe3, 0x1f, 0x62, 0xeb, 0x32, 0xff, 0x52, 0x43, 0x23, 0x2a, 0x98, 0xea, 0xeb, 0xc1, 0xb7, + 0xa0, 0xba, 0x2e, 0xa8, 0x2a, 0x3a, 0xc1, 0xdc, 0xc8, 0x0e, 0x61, 0x53, 0xb7, 0x6c, 0x87, 0x69, + 0x13, 0xb4, 0x4a, 0xbc, 0x6b, 0x4d, 0xdd, 0xd3, 0x1b, 0x81, 0xd6, 0x2b, 0xf1, 0x34, 0x11, 0x4f, + 0x39, 0xdd, 0x4a, 0x82, 0x2c, 0xb7, 0xc9, 0x09, 0x94, 0x05, 0x40, 0xdf, 0xf7, 0xcd, 0x29, 0x31, + 0xe9, 0x1a, 0x7e, 0xde, 0xc2, 0x84, 0x2a, 0x1a, 0xbc, 0xd3, 0xb5, 0x4a, 0x9a, 0xae, 0x43, 0x30, + 0xba, 0x03, 0x69, 0x6e, 0x85, 0x2c, 0x5d, 0x94, 0x56, 0x33, 0x85, 0xa5, 0x7c, 0x6c, 0x88, 0xf3, + 0x9c, 0xad, 0x98, 0xfa, 0xf2, 0xf5, 0xca, 0x09, 0x4d, 0xb0, 0x28, 0x1f, 0xc0, 0x62, 0x44, 0x66, + 0x71, 0xff, 0x73, 0xec, 0x11, 0xdb, 0x75, 0x84, 0x4a, 0x24, 0xc3, 0xa9, 0x3d, 0xbe, 0xc2, 0x84, + 0x67, 0xb5, 0xe0, 0x53, 0xf9, 0x21, 0x5c, 0x88, 0x67, 0x3c, 0x0e, 0xab, 0x2c, 0x58, 0x62, 0xc2, + 0x3f, 0xb6, 0x1d, 0xbd, 0x6e, 0xd3, 0xfd, 0x92, 0xe7, 0xee, 0xd9, 0x26, 0xf6, 0x82, 0x50, 0xa0, + 0x8f, 0x01, 0xc2, 0x0c, 0x09, 0x0d, 0x57, 0xf2, 0xa2, 0x04, 0xfc, 0x74, 0xe6, 0x79, 0xcd, 0x89, + 0x74, 0xe6, 0x4b, 0xba, 0x85, 0x05, 0xaf, 0x16, 0xe1, 0x54, 0xfe, 0x22, 0xc1, 0x72, 0x92, 0x26, + 0xe1, 0xc8, 0x4f, 0x00, 0x55, 0xc5, 0xa6, 0x5f, 0x69, 0x7c, 0x57, 0x96, 0x2e, 0x4e, 0xae, 0x66, + 0x0a, 0x6a, 0x82, 0x53, 0xbd, 0xd2, 0x02, 0x61, 0xda, 0x7c, 0xb5, 0x57, 0x0f, 0x7a, 0xd0, 0xe5, + 0xca, 0x04, 0x73, 0xe5, 0xea, 0x50, 0x57, 0x84, 0xbc, 0xa8, 0x2f, 0x9b, 0x22, 0x23, 0xfd, 0xca, + 0x79, 0xcc, 0x2e, 0x41, 0xb6, 0xda, 0x2c, 0x57, 0xa8, 0x51, 0x6e, 0xee, 0x96, 0x6b, 0xb8, 0xcd, + 0xc2, 0x36, 0xad, 0x41, 0xb5, 0x59, 0xa4, 0x46, 0x69, 0xf7, 0x21, 0x6e, 0x2b, 0x07, 0x09, 0x71, + 0xef, 0x04, 0xe3, 0x47, 0x30, 0xdf, 0x17, 0x0c, 0x11, 0xfe, 0xb1, 0x63, 0x31, 0xd7, 0x1b, 0x0b, + 0xe5, 0xb7, 0x12, 0xe4, 0x98, 0xfe, 0xe2, 0xd3, 0xad, 0x6d, 0x5c, 0xc7, 0x16, 0x3f, 0xee, 0x81, + 0x03, 0x45, 0x48, 0x13, 0xaa, 0xd3, 0x16, 0x2f, 0xa9, 0xd9, 0xc2, 0xf5, 0x04, 0x8d, 0x5d, 0xdc, + 0x3b, 0x8c, 0x43, 0x13, 0x9c, 0x3d, 0x85, 0x33, 0x71, 0xe8, 0xc2, 0xf9, 0xb3, 0x24, 0x0e, 0x4e, + 0xaf, 0xa9, 0x22, 0x50, 0xcf, 0xe0, 0xb4, 0x1f, 0x69, 0x33, 0xdc, 0x12, 0x25, 0x73, 0x73, 0x14, + 0xa3, 0x3b, 0x31, 0x9a, 0xad, 0x50, 0x23, 0x22, 0xfe, 0xf8, 0x8a, 0xa5, 0x0a, 0xd7, 0x62, 0x33, + 0x5d, 0x72, 0x7f, 0x86, 0xbd, 0x4d, 0xfa, 0x10, 0xdb, 0x56, 0x8d, 0x8e, 0x5e, 0x39, 0xe8, 0x2c, + 0xa4, 0x6b, 0x8c, 0x87, 0x19, 0x95, 0xd2, 0xc4, 0x97, 0xf2, 0x04, 0xae, 0x8f, 0xa2, 0x47, 0x44, + 0xed, 0x12, 0xcc, 0xec, 0xb9, 0xd4, 0x76, 0xac, 0x72, 0xd3, 0xdf, 0x67, 0x7a, 0x52, 0x5a, 0x86, + 0xaf, 0x31, 0x16, 0xe5, 0x31, 0xac, 0xc6, 0x0a, 0xdc, 0x6a, 0x79, 0x1e, 0x76, 0x28, 0x23, 0x1a, + 0xa3, 0xe2, 0x93, 0xe2, 0xd0, 0x2d, 0x4e, 0x98, 0x17, 0x3a, 0x29, 0x45, 0x9d, 0xec, 0x33, 0x7b, + 0xa2, 0xdf, 0xec, 0x5f, 0x4a, 0x70, 0x83, 0x29, 0xda, 0x34, 0xa8, 0xbd, 0x87, 0xfb, 0xe0, 0xa6, + 0x37, 0xe4, 0x49, 0xaa, 0x8e, 0xab, 0x7e, 0xff, 0x38, 0x01, 0x57, 0x87, 0x9a, 0x22, 0xdc, 0xfe, + 0x1c, 0xa0, 0x37, 0x86, 0xc5, 0x6f, 0x7f, 0xfd, 0x7a, 0x65, 0xc3, 0xb2, 0x69, 0xad, 0x55, 0xc9, + 0x1b, 0x6e, 0x43, 0x15, 0x45, 0x5d, 0xd7, 0x2b, 0x64, 0xcd, 0x76, 0x83, 0x4f, 0x95, 0xee, 0x37, + 0x31, 0xc9, 0x17, 0x1f, 0x95, 0x6e, 0x6f, 0xdc, 0x2a, 0xb5, 0x2a, 0x9f, 0xe2, 0x7d, 0x6d, 0xaa, + 0x32, 0xa4, 0x66, 0xfa, 0xc2, 0x39, 0xd9, 0x17, 0x4e, 0xb4, 0x01, 0x67, 0x49, 0x5d, 0x27, 0x35, + 0x6c, 0x96, 0x85, 0xaa, 0xb2, 0x10, 0x95, 0x62, 0xc4, 0x0b, 0x62, 0xb7, 0xc8, 0x37, 0xb9, 0x43, + 0xe8, 0x26, 0xa0, 0x0e, 0x17, 0x35, 0x02, 0x8e, 0x93, 0xac, 0xb1, 0xcd, 0x05, 0x1c, 0xd4, 0x10, + 0xd4, 0x67, 0x21, 0xfd, 0x53, 0xdd, 0xae, 0x63, 0x53, 0x4e, 0x5f, 0x94, 0x56, 0xa7, 0x34, 0xf1, + 0xa5, 0x7c, 0x23, 0xc1, 0xcd, 0xd1, 0x52, 0x29, 0xe2, 0xd7, 0x18, 0xd0, 0x41, 0x3e, 0x4c, 0x80, + 0x83, 0x11, 0x65, 0xff, 0x5f, 0x1b, 0xca, 0x92, 0x80, 0x38, 0x66, 0x8b, 0x4e, 0xb1, 0xd9, 0x55, + 0xa2, 0xca, 0xfb, 0xa2, 0xdf, 0xf4, 0x6d, 0x0f, 0x3e, 0x2d, 0xca, 0x6f, 0x24, 0xb8, 0x1a, 0x7b, + 0xe6, 0x62, 0x20, 0x7f, 0x04, 0xe4, 0x39, 0xae, 0x13, 0xf1, 0x4f, 0x29, 0x01, 0x59, 0xe2, 0xe0, + 0xdd, 0x83, 0xf3, 0x11, 0x78, 0x77, 0xbd, 0x18, 0xa0, 0x7f, 0x7f, 0x28, 0xd0, 0xbb, 0x71, 0xa2, + 0xb5, 0x73, 0x21, 0xe4, 0x77, 0x11, 0x1c, 0x5f, 0x5e, 0x3f, 0x81, 0xf3, 0xfd, 0xad, 0x2b, 0x88, + 0xf8, 0x1a, 0xbc, 0x23, 0x8c, 0x2d, 0xd3, 0x76, 0xb9, 0xa6, 0x93, 0x5a, 0x24, 0xee, 0x73, 0x62, + 0xeb, 0x69, 0xfb, 0xa1, 0x4e, 0x6a, 0x3e, 0x7e, 0x3e, 0x8f, 0xeb, 0xd8, 0x9d, 0x30, 0xed, 0xc0, + 0x6c, 0x77, 0x17, 0x14, 0x77, 0x85, 0xf1, 0x9a, 0x60, 0xb6, 0xab, 0x09, 0x2a, 0xff, 0x4d, 0xc3, + 0x99, 0x78, 0x75, 0xdf, 0x81, 0x8c, 0x2f, 0x0c, 0x7b, 0x65, 0xdd, 0x34, 0x3d, 0x81, 0x54, 0xf2, + 0xab, 0x97, 0x6b, 0x0b, 0x22, 0x4a, 0x9b, 0xa6, 0xe9, 0x61, 0x42, 0x76, 0xa8, 0x67, 0x3b, 0x96, + 0x06, 0x9c, 0xd8, 0x5f, 0x44, 0x4f, 0x20, 0xcd, 0xab, 0x8c, 0x05, 0x76, 0xe6, 0x08, 0xf8, 0x76, + 0x92, 0xe1, 0x1b, 0xfa, 0x31, 0xcc, 0x86, 0x95, 0x5b, 0xb7, 0x09, 0x95, 0x27, 0x2f, 0x4e, 0x1e, + 0x49, 0x70, 0x46, 0x14, 0xfd, 0x67, 0x36, 0x3b, 0x18, 0x33, 0x9d, 0x34, 0xd9, 0x0d, 0xcc, 0x60, + 0x2f, 0xab, 0x65, 0x82, 0xfc, 0xd8, 0x0d, 0x2c, 0x48, 0x3c, 0xda, 0x8d, 0x73, 0x19, 0xb6, 0x26, + 0x20, 0x6e, 0x09, 0x00, 0x3b, 0x66, 0x40, 0x90, 0x66, 0x04, 0xd3, 0xd8, 0x11, 0x27, 0x19, 0x2d, + 0xc2, 0x34, 0x75, 0xa9, 0x5e, 0x2f, 0x13, 0x9d, 0xca, 0xa7, 0xd8, 0x21, 0x9e, 0x62, 0x0b, 0x3b, + 0x3a, 0x45, 0x97, 0x61, 0x36, 0x5a, 0x28, 0xb8, 0x2d, 0x4f, 0xb1, 0x1a, 0x99, 0x09, 0x6b, 0x04, + 0xb7, 0xd1, 0x15, 0x38, 0xcd, 0x80, 0x35, 0x42, 0x36, 0xcd, 0xc8, 0xb2, 0xc1, 0x32, 0xa7, 0x7b, + 0x0f, 0xce, 0x85, 0x87, 0x89, 0x6d, 0x95, 0x89, 0x6d, 0x31, 0x7a, 0x60, 0xf4, 0x0b, 0x9d, 0xed, + 0x1d, 0x7f, 0x77, 0xc7, 0xb6, 0x7c, 0xb6, 0x67, 0x90, 0x35, 0xdc, 0x3d, 0xec, 0xe8, 0x0e, 0xf5, + 0xe9, 0x89, 0x9c, 0x61, 0x67, 0xef, 0x56, 0x42, 0x7d, 0x6d, 0x09, 0xda, 0x4d, 0x53, 0x6f, 0xfa, + 0x92, 0x6c, 0xcb, 0xd1, 0x69, 0xcb, 0xc3, 0x44, 0x9b, 0x09, 0xc4, 0xec, 0xd8, 0x16, 0x61, 0x8d, + 0x42, 0xf8, 0xe6, 0xb6, 0x68, 0xb3, 0x45, 0xcb, 0xb6, 0xd9, 0x96, 0x67, 0x44, 0xa3, 0xe0, 0x3b, + 0x4f, 0xd8, 0xc6, 0x23, 0x93, 0xf5, 0x31, 0x9d, 0xc1, 0xb5, 0x9c, 0xe5, 0x8d, 0x82, 0x7f, 0xa1, + 0x15, 0x56, 0x8e, 0xb4, 0x45, 0xca, 0x26, 0x26, 0x86, 0x3c, 0xcb, 0xa1, 0x8b, 0x2f, 0x6d, 0x63, + 0x62, 0xa0, 0x77, 0x61, 0xb6, 0xe5, 0x54, 0x5c, 0xc7, 0xec, 0xa4, 0xf1, 0x34, 0x53, 0x91, 0xed, + 0xac, 0xb2, 0x44, 0x1a, 0x70, 0xa6, 0xe5, 0x84, 0x67, 0xa8, 0xec, 0x89, 0x7a, 0x97, 0xe7, 0xd8, + 0x61, 0xca, 0x27, 0x1f, 0xa6, 0x67, 0x11, 0xb6, 0xce, 0x71, 0x5a, 0x68, 0xc5, 0xac, 0xfa, 0xb6, + 0xf0, 0xc7, 0x57, 0x39, 0x78, 0xf0, 0xcd, 0x73, 0x5b, 0xf8, 0xaa, 0x78, 0xde, 0x29, 0x2f, 0x27, + 0xe1, 0x5c, 0x82, 0x60, 0xb4, 0x0a, 0x73, 0x11, 0x77, 0xda, 0x11, 0xdc, 0x08, 0xdd, 0xe4, 0xd9, + 0xbe, 0x0b, 0x8b, 0x61, 0xb6, 0x43, 0x9e, 0x20, 0xe3, 0x13, 0x8c, 0x49, 0xee, 0x90, 0x3c, 0x0b, + 0x28, 0x44, 0xd6, 0x0d, 0x58, 0xec, 0x64, 0xbd, 0x9b, 0xbb, 0x73, 0xd0, 0x32, 0x85, 0xcb, 0x09, + 0x61, 0xe9, 0x24, 0xfd, 0x91, 0x53, 0x75, 0x35, 0x39, 0x10, 0x14, 0xd5, 0xc1, 0x4e, 0x58, 0x4c, + 0xe5, 0xa6, 0xe2, 0x2a, 0xf7, 0x0e, 0xe4, 0x7a, 0x2a, 0x37, 0xea, 0xca, 0x49, 0xc6, 0x72, 0xae, + 0xbb, 0x78, 0x43, 0x4f, 0xaa, 0x70, 0x36, 0xac, 0xdf, 0x08, 0x2f, 0x91, 0xd3, 0x87, 0x2c, 0xe4, + 0x85, 0x4e, 0x21, 0x87, 0x9a, 0x88, 0x62, 0xc0, 0xca, 0x90, 0xbe, 0x83, 0xee, 0x43, 0xca, 0xc4, + 0xf5, 0xc3, 0x3d, 0x53, 0x18, 0xa7, 0xf2, 0x45, 0x0a, 0xe4, 0xc4, 0x97, 0xe3, 0x47, 0x90, 0xf1, + 0x4f, 0x81, 0x67, 0x37, 0x23, 0x7d, 0xe0, 0x5b, 0x41, 0xfb, 0x0a, 0x35, 0xf0, 0xde, 0xb5, 0x1d, + 0x92, 0x6a, 0x51, 0x3e, 0xf4, 0x18, 0xc0, 0x70, 0x1b, 0x0d, 0x9b, 0x90, 0xa0, 0x09, 0x4e, 0x17, + 0xd7, 0xbe, 0x7e, 0xbd, 0xb2, 0xc8, 0x05, 0x11, 0x73, 0x37, 0x6f, 0xbb, 0x6a, 0x43, 0xa7, 0xb5, + 0xfc, 0x67, 0xd8, 0xd2, 0x8d, 0xfd, 0x6d, 0x6c, 0xbc, 0x7a, 0xb9, 0x06, 0x42, 0xcf, 0x36, 0x36, + 0xb4, 0x88, 0x00, 0x74, 0x13, 0x52, 0xac, 0x55, 0x4c, 0x0e, 0x69, 0x15, 0x8c, 0x2a, 0xd2, 0x24, + 0x52, 0xc7, 0xd3, 0x24, 0xee, 0xc2, 0x64, 0xd3, 0x6d, 0xb2, 0x22, 0xc9, 0x14, 0x6e, 0x24, 0x4d, + 0x48, 0x3c, 0xd7, 0xad, 0x3e, 0xa9, 0x96, 0x5c, 0x42, 0x30, 0xb3, 0xba, 0xf8, 0x74, 0x4b, 0xf3, + 0xf9, 0x06, 0xdc, 0x82, 0xd3, 0x63, 0xdf, 0x82, 0x4f, 0x25, 0xdf, 0x82, 0x05, 0xc5, 0xd4, 0xc0, + 0x4b, 0xfa, 0x74, 0xff, 0x25, 0x3d, 0xbc, 0x40, 0x43, 0xf4, 0x02, 0x5d, 0xf8, 0x62, 0x1e, 0x4e, + 0xb2, 0x4b, 0x03, 0xfa, 0x85, 0x04, 0x69, 0x3e, 0x00, 0x42, 0xd7, 0x12, 0xbc, 0xef, 0x9f, 0x83, + 0xe5, 0xae, 0x8f, 0x42, 0xca, 0xcb, 0x4e, 0x79, 0xf7, 0xe7, 0x7f, 0xfd, 0xc7, 0xaf, 0x27, 0x56, + 0xd0, 0x92, 0x3a, 0x68, 0x7e, 0x87, 0x7e, 0x27, 0xc1, 0xe9, 0x9e, 0x49, 0x16, 0x2a, 0x0c, 0x57, + 0xd3, 0x3b, 0x2f, 0xcb, 0xdd, 0x1e, 0x8b, 0x47, 0xd8, 0xa8, 0x32, 0x1b, 0xaf, 0xa1, 0xab, 0x03, + 0x6d, 0x54, 0x5f, 0x08, 0x60, 0x3e, 0x40, 0x7f, 0x90, 0x60, 0xbe, 0xef, 0x69, 0x80, 0x36, 0x06, + 0xe9, 0x4e, 0x9a, 0xa4, 0xe5, 0xde, 0x1b, 0x93, 0x4b, 0xd8, 0xbc, 0xce, 0x6c, 0xbe, 0x81, 0xae, + 0x25, 0xd8, 0xdc, 0xff, 0xe0, 0x41, 0xaf, 0x24, 0x98, 0xeb, 0x15, 0x88, 0x6e, 0x8f, 0xa3, 0x3e, + 0xb0, 0x79, 0x63, 0x3c, 0x26, 0x61, 0xf2, 0x0e, 0x33, 0xf9, 0x31, 0xfa, 0x74, 0x64, 0x93, 0xd5, + 0x17, 0x5d, 0x8f, 0x8f, 0x83, 0x7e, 0x12, 0xf4, 0x7b, 0x09, 0x66, 0xbb, 0x47, 0x40, 0x68, 0x7d, + 0x90, 0x75, 0xb1, 0x93, 0xad, 0x5c, 0x61, 0x1c, 0x16, 0xe1, 0xce, 0x07, 0xcc, 0x9d, 0x75, 0xa4, + 0xaa, 0x89, 0x53, 0xe7, 0xe8, 0xab, 0x44, 0x7d, 0xc1, 0x2f, 0x1e, 0x07, 0xe8, 0x1b, 0x09, 0x56, + 0x86, 0x3c, 0x2f, 0x51, 0x71, 0x90, 0x41, 0xa3, 0x8d, 0x30, 0x72, 0x5b, 0x47, 0x92, 0x21, 0xbc, + 0xfc, 0x2e, 0xf3, 0x72, 0x03, 0x15, 0xc6, 0x48, 0x1a, 0x47, 0xa8, 0x03, 0xf4, 0x1f, 0x09, 0x96, + 0x06, 0xce, 0x9d, 0xd0, 0xfd, 0x71, 0x0a, 0x29, 0x6e, 0x34, 0x96, 0xdb, 0x3c, 0x82, 0x04, 0xe1, + 0x62, 0x89, 0xb9, 0xf8, 0x09, 0x7a, 0x78, 0xf8, 0xba, 0x64, 0x10, 0x1c, 0x3a, 0xfe, 0x2f, 0x09, + 0x2e, 0x0c, 0x1a, 0x68, 0xa1, 0x7b, 0xe3, 0x58, 0x1d, 0x33, 0x59, 0xcb, 0xdd, 0x3f, 0xbc, 0x00, + 0xe1, 0xf5, 0x03, 0xe6, 0xf5, 0x26, 0xba, 0x77, 0x44, 0xaf, 0x19, 0x74, 0xf7, 0x8c, 0x20, 0x06, + 0x43, 0x77, 0xfc, 0x38, 0x63, 0x30, 0x74, 0x27, 0xcc, 0x38, 0x86, 0x42, 0xb7, 0x1e, 0xf0, 0x89, + 0x36, 0x8b, 0xfe, 0x2d, 0xc1, 0xe2, 0x80, 0x01, 0x03, 0xfa, 0x70, 0x9c, 0xc0, 0xc6, 0x20, 0xc9, + 0xbd, 0x43, 0xf3, 0x0b, 0x8f, 0x1e, 0x33, 0x8f, 0x1e, 0xa0, 0x8f, 0x0e, 0x9f, 0x97, 0x08, 0xea, + 0xa0, 0x3f, 0x49, 0x90, 0xed, 0x02, 0x30, 0x74, 0x6b, 0x64, 0xac, 0x0b, 0x7c, 0x5a, 0x1f, 0x83, + 0x43, 0x78, 0xb1, 0xc5, 0xbc, 0xb8, 0x8b, 0xee, 0x8c, 0x04, 0x8e, 0x0c, 0x1b, 0x7b, 0x47, 0x1e, + 0x07, 0xc5, 0xef, 0x7d, 0xf9, 0x66, 0x59, 0xfa, 0xea, 0xcd, 0xb2, 0xf4, 0xf7, 0x37, 0xcb, 0xd2, + 0xaf, 0xde, 0x2e, 0x9f, 0xf8, 0xea, 0xed, 0xf2, 0x89, 0xbf, 0xbd, 0x5d, 0x3e, 0xf1, 0x83, 0x11, + 0x2e, 0x7d, 0xed, 0xa8, 0x46, 0x76, 0x03, 0xac, 0xa4, 0xd9, 0x9f, 0x7b, 0xb7, 0xff, 0x17, 0x00, + 0x00, 0xff, 0xff, 0x27, 0xb0, 0xa1, 0xbd, 0x26, 0x1d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2890,11 +2890,11 @@ func (m *ActiveFinalityProvidersAtHeightResponse) MarshalToSizedBuffer(dAtA []by i-- dAtA[i] = 0x10 } - if m.BtcPk != nil { + if m.BtcPkHex != nil { { - size := m.BtcPk.Size() + size := m.BtcPkHex.Size() i -= size - if _, err := m.BtcPk.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.BtcPkHex.MarshalTo(dAtA[i:]); err != nil { return 0, err } i = encodeVarintQuery(dAtA, i, uint64(size)) @@ -3769,8 +3769,8 @@ func (m *ActiveFinalityProvidersAtHeightResponse) Size() (n int) { } var l int _ = l - if m.BtcPk != nil { - l = m.BtcPk.Size() + if m.BtcPkHex != nil { + l = m.BtcPkHex.Size() n += 1 + l + sovQuery(uint64(l)) } if m.Height != 0 { @@ -5428,9 +5428,9 @@ func (m *ActiveFinalityProvidersAtHeightResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field BtcPk", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field BtcPkHex", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -5440,15 +5440,16 @@ func (m *ActiveFinalityProvidersAtHeightResponse) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } @@ -5456,8 +5457,8 @@ func (m *ActiveFinalityProvidersAtHeightResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } var v github_com_babylonlabs_io_babylon_types.BIP340PubKey - m.BtcPk = &v - if err := m.BtcPk.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.BtcPkHex = &v + if err := m.BtcPkHex.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/x/finality/types/query.pb.go b/x/finality/types/query.pb.go index d12c7aad2..18df8c26d 100644 --- a/x/finality/types/query.pb.go +++ b/x/finality/types/query.pb.go @@ -986,10 +986,15 @@ 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 time.Time `protobuf:"bytes,4,opt,name=jailed_until,json=jailedUntil,proto3,stdtime" json:"jailed_until"` + // fp_btc_pk is the BTC PK of the finality provider that casts this vote + FpBtcPkHex string `protobuf:"bytes,1,opt,name=fp_btc_pk_hex,json=fpBtcPkHex,proto3" json:"fp_btc_pk_hex,omitempty"` + // start_height is the block height at which finality provider become active + StartHeight int64 `protobuf:"varint,2,opt,name=start_height,json=startHeight,proto3" json:"start_height,omitempty"` + // missed_blocks_counter defines a counter to avoid unnecessary array reads. + // Note that `Sum(MissedBlocksBitArray)` always equals `MissedBlocksCounter`. + MissedBlocksCounter int64 `protobuf:"varint,3,opt,name=missed_blocks_counter,json=missedBlocksCounter,proto3" json:"missed_blocks_counter,omitempty"` + // Timestamp until which the validator is jailed due to liveness downtime. + JailedUntil time.Time `protobuf:"bytes,4,opt,name=jailed_until,json=jailedUntil,proto3,stdtime" json:"jailed_until"` } func (m *SigningInfoResponse) Reset() { *m = SigningInfoResponse{} } From 507136d2a3cae89c309dd6e7be10b26708eb9cc1 Mon Sep 17 00:00:00 2001 From: Sam Ricotta Date: Wed, 16 Oct 2024 13:27:50 +0300 Subject: [PATCH 4/4] Update grpc_query.go --- x/btcstaking/keeper/grpc_query.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x/btcstaking/keeper/grpc_query.go b/x/btcstaking/keeper/grpc_query.go index fa5dca2f6..d34f76acc 100644 --- a/x/btcstaking/keeper/grpc_query.go +++ b/x/btcstaking/keeper/grpc_query.go @@ -311,6 +311,8 @@ func convertToActiveFinalityProvidersAtHeightResponse(finalityProvidersWithMeta Height: fpWithMeta.Height, VotingPower: fpWithMeta.VotingPower, SlashedBabylonHeight: fpWithMeta.SlashedBabylonHeight, + SlashedBtcHeight: fpWithMeta.SlashedBtcHeight, + Jailed: fpWithMeta.Jailed, }) } return activeFinalityProvidersAtHeightResponse