diff --git a/eth/v1alpha1/beacon_chain.pb.go b/eth/v1alpha1/beacon_chain.pb.go index d660316f..bc415d3b 100755 --- a/eth/v1alpha1/beacon_chain.pb.go +++ b/eth/v1alpha1/beacon_chain.pb.go @@ -2540,12 +2540,14 @@ func (m *ValidatorPerformanceResponse) GetAverageActiveValidatorBalance() float3 } type ValidatorQueue struct { - ChurnLimit uint64 `protobuf:"varint,1,opt,name=churn_limit,json=churnLimit,proto3" json:"churn_limit,omitempty"` - ActivationPublicKeys [][]byte `protobuf:"bytes,2,rep,name=activation_public_keys,json=activationPublicKeys,proto3" json:"activation_public_keys,omitempty" ssz-size:"?,48"` - ExitPublicKeys [][]byte `protobuf:"bytes,3,rep,name=exit_public_keys,json=exitPublicKeys,proto3" json:"exit_public_keys,omitempty" ssz-size:"?,48"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ChurnLimit uint64 `protobuf:"varint,1,opt,name=churn_limit,json=churnLimit,proto3" json:"churn_limit,omitempty"` + ActivationPublicKeys [][]byte `protobuf:"bytes,2,rep,name=activation_public_keys,json=activationPublicKeys,proto3" json:"activation_public_keys,omitempty" ssz-size:"?,48"` // Deprecated: Do not use. + ExitPublicKeys [][]byte `protobuf:"bytes,3,rep,name=exit_public_keys,json=exitPublicKeys,proto3" json:"exit_public_keys,omitempty" ssz-size:"?,48"` // Deprecated: Do not use. + ActivationValidatorIndices []uint64 `protobuf:"varint,4,rep,packed,name=activation_validator_indices,json=activationValidatorIndices,proto3" json:"activation_validator_indices,omitempty"` + ExitValidatorIndices []uint64 `protobuf:"varint,5,rep,packed,name=exit_validator_indices,json=exitValidatorIndices,proto3" json:"exit_validator_indices,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ValidatorQueue) Reset() { *m = ValidatorQueue{} } @@ -2588,6 +2590,7 @@ func (m *ValidatorQueue) GetChurnLimit() uint64 { return 0 } +// Deprecated: Do not use. func (m *ValidatorQueue) GetActivationPublicKeys() [][]byte { if m != nil { return m.ActivationPublicKeys @@ -2595,6 +2598,7 @@ func (m *ValidatorQueue) GetActivationPublicKeys() [][]byte { return nil } +// Deprecated: Do not use. func (m *ValidatorQueue) GetExitPublicKeys() [][]byte { if m != nil { return m.ExitPublicKeys @@ -2602,6 +2606,20 @@ func (m *ValidatorQueue) GetExitPublicKeys() [][]byte { return nil } +func (m *ValidatorQueue) GetActivationValidatorIndices() []uint64 { + if m != nil { + return m.ActivationValidatorIndices + } + return nil +} + +func (m *ValidatorQueue) GetExitValidatorIndices() []uint64 { + if m != nil { + return m.ExitValidatorIndices + } + return nil +} + type ListValidatorAssignmentsRequest struct { // Types that are valid to be assigned to QueryFilter: // *ListValidatorAssignmentsRequest_Epoch @@ -2858,7 +2876,8 @@ type ValidatorAssignments_CommitteeAssignment struct { CommitteeIndex uint64 `protobuf:"varint,2,opt,name=committee_index,json=committeeIndex,proto3" json:"committee_index,omitempty"` AttesterSlot uint64 `protobuf:"varint,3,opt,name=attester_slot,json=attesterSlot,proto3" json:"attester_slot,omitempty"` ProposerSlots []uint64 `protobuf:"varint,4,rep,packed,name=proposer_slots,json=proposerSlots,proto3" json:"proposer_slots,omitempty"` - PublicKey []byte `protobuf:"bytes,5,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" ssz-size:"48"` + PublicKey []byte `protobuf:"bytes,5,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty" ssz-size:"48"` // Deprecated: Do not use. + ValidatorIndex uint64 `protobuf:"varint,6,opt,name=validator_index,json=validatorIndex,proto3" json:"validator_index,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -2927,6 +2946,7 @@ func (m *ValidatorAssignments_CommitteeAssignment) GetProposerSlots() []uint64 { return nil } +// Deprecated: Do not use. func (m *ValidatorAssignments_CommitteeAssignment) GetPublicKey() []byte { if m != nil { return m.PublicKey @@ -2934,6 +2954,13 @@ func (m *ValidatorAssignments_CommitteeAssignment) GetPublicKey() []byte { return nil } +func (m *ValidatorAssignments_CommitteeAssignment) GetValidatorIndex() uint64 { + if m != nil { + return m.ValidatorIndex + } + return 0 +} + type GetValidatorParticipationRequest struct { // Types that are valid to be assigned to QueryFilter: // *GetValidatorParticipationRequest_Epoch @@ -3448,184 +3475,188 @@ func init() { func init() { proto.RegisterFile("eth/v1alpha1/beacon_chain.proto", fileDescriptor_e33ad64d6ced77c1) } var fileDescriptor_e33ad64d6ced77c1 = []byte{ - // 2826 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0xcf, 0x6f, 0x1b, 0xc7, - 0xf5, 0xf7, 0x52, 0x94, 0x2c, 0x3e, 0x51, 0xa4, 0x34, 0xa2, 0x64, 0x79, 0x6d, 0x4b, 0xcc, 0x3a, - 0xb6, 0x64, 0x3b, 0x22, 0x15, 0xd9, 0x71, 0x9c, 0x7c, 0xf3, 0x75, 0x20, 0xd9, 0xac, 0xac, 0xc6, - 0x45, 0xd4, 0xa5, 0xe2, 0xa2, 0x4d, 0x00, 0x62, 0x49, 0x0d, 0xc9, 0x8d, 0xc9, 0x5d, 0x7a, 0x77, - 0x28, 0x44, 0x46, 0xdb, 0x43, 0x5b, 0xf4, 0x0f, 0x68, 0x81, 0x1e, 0x7a, 0x28, 0x5a, 0xb4, 0x87, - 0xa4, 0x41, 0x81, 0x22, 0x87, 0x5e, 0x72, 0x28, 0xd0, 0x43, 0x51, 0xf4, 0x54, 0xa0, 0xe8, 0xad, - 0x08, 0x8a, 0x20, 0x97, 0xf6, 0x50, 0xa0, 0x41, 0xff, 0x80, 0x62, 0x7e, 0xec, 0xee, 0xec, 0x72, - 0x97, 0xa4, 0x60, 0x15, 0x08, 0x7a, 0x12, 0xf7, 0xcd, 0x9b, 0xf7, 0x3e, 0xf3, 0xe6, 0xcd, 0x9b, - 0xf7, 0xde, 0x08, 0x56, 0x31, 0x69, 0x97, 0x8f, 0x5e, 0x34, 0x3a, 0xbd, 0xb6, 0xf1, 0x62, 0xb9, - 0x8e, 0x8d, 0x86, 0x6d, 0xd5, 0x1a, 0x6d, 0xc3, 0xb4, 0x4a, 0x3d, 0xc7, 0x26, 0x36, 0x5a, 0xc4, - 0xa4, 0x8d, 0x1d, 0xdc, 0xef, 0x96, 0x30, 0x69, 0x97, 0x3c, 0x4e, 0x75, 0xa3, 0x65, 0x92, 0x76, - 0xbf, 0x5e, 0x6a, 0xd8, 0xdd, 0x72, 0xcb, 0x6e, 0xd9, 0x65, 0xc6, 0x5d, 0xef, 0x37, 0xd9, 0x17, - 0xfb, 0x60, 0xbf, 0xb8, 0x14, 0xf5, 0x62, 0xcb, 0xb6, 0x5b, 0x1d, 0x5c, 0x36, 0x7a, 0x66, 0xd9, - 0xb0, 0x2c, 0x9b, 0x18, 0xc4, 0xb4, 0x2d, 0x57, 0x8c, 0x5e, 0x10, 0xa3, 0xbe, 0x0c, 0xdc, 0xed, - 0x91, 0x63, 0x31, 0x78, 0x3e, 0x3a, 0x68, 0x58, 0xde, 0xd0, 0x4a, 0x08, 0xbc, 0x41, 0x08, 0x76, - 0xb9, 0x60, 0x31, 0x1e, 0xbb, 0xb8, 0x7a, 0xc7, 0x6e, 0x3c, 0xf6, 0x60, 0x85, 0x18, 0x8e, 0x8c, - 0x8e, 0x79, 0x68, 0x10, 0xdb, 0xe1, 0xa3, 0x9a, 0x0d, 0xe8, 0x91, 0x47, 0xba, 0xd7, 0x36, 0xac, - 0x16, 0xae, 0x62, 0x82, 0xee, 0xc0, 0x94, 0xd1, 0xa0, 0x4a, 0x96, 0x95, 0xa2, 0xb2, 0x9e, 0xdb, - 0x2a, 0x96, 0x62, 0x2d, 0x54, 0xaa, 0x62, 0xb2, 0xcd, 0xf8, 0x74, 0xc1, 0x8f, 0x56, 0x61, 0xa6, - 0xd7, 0xaf, 0x77, 0xcc, 0x46, 0xed, 0x31, 0x3e, 0x76, 0x97, 0x53, 0xc5, 0x89, 0xf5, 0xac, 0x0e, - 0x9c, 0xf4, 0x06, 0x3e, 0x76, 0xb5, 0x0f, 0x15, 0x58, 0x79, 0x68, 0xba, 0x64, 0xcf, 0x3a, 0xc4, - 0xef, 0xe1, 0xc3, 0xed, 0x60, 0x41, 0xae, 0x8e, 0x9f, 0xf4, 0xb1, 0x4b, 0xd0, 0x12, 0x4c, 0xe2, - 0x9e, 0xdd, 0x68, 0x33, 0xe5, 0xe9, 0x07, 0x67, 0x74, 0xfe, 0x89, 0xae, 0xc0, 0x6c, 0x0b, 0x5b, - 0xd8, 0x35, 0xdd, 0x1a, 0x1f, 0x4f, 0x15, 0x95, 0xf5, 0xe9, 0x07, 0x67, 0xf4, 0xac, 0x20, 0x57, - 0x18, 0xdb, 0x05, 0xc8, 0xf4, 0x8c, 0x16, 0xae, 0xb9, 0xe6, 0x53, 0xbc, 0x3c, 0x51, 0x54, 0xd6, - 0x27, 0xf5, 0x69, 0x4a, 0xa8, 0x9a, 0x4f, 0x31, 0xba, 0x04, 0xc0, 0x06, 0x89, 0xfd, 0x18, 0x5b, - 0xcb, 0xe9, 0xa2, 0xb2, 0x9e, 0xd1, 0x19, 0xfb, 0x01, 0x25, 0xec, 0xe4, 0x20, 0xfb, 0xa4, 0x8f, - 0x9d, 0xe3, 0x5a, 0xd3, 0xec, 0x10, 0xec, 0x68, 0xbf, 0x50, 0xe0, 0x1c, 0x45, 0xfb, 0x05, 0x87, - 0xf9, 0x81, 0x02, 0xcb, 0x83, 0x30, 0xdd, 0x9e, 0x6d, 0xb9, 0x18, 0x7d, 0x09, 0xb2, 0x92, 0xdb, - 0xb8, 0xcb, 0x4a, 0x71, 0x62, 0x7d, 0x66, 0x4b, 0x4b, 0xd8, 0x52, 0x49, 0x84, 0x1e, 0x9a, 0x87, - 0xae, 0x42, 0xde, 0xc2, 0xef, 0x91, 0x9a, 0x04, 0x2c, 0xc5, 0x80, 0xcd, 0x52, 0xf2, 0xbe, 0x07, - 0x8e, 0x62, 0x27, 0x36, 0x31, 0x3a, 0xf2, 0xca, 0x32, 0x8c, 0x42, 0x97, 0xa6, 0xfd, 0x5e, 0x81, - 0xd5, 0x44, 0x07, 0x10, 0x90, 0xdf, 0x81, 0x82, 0xc9, 0x87, 0x6b, 0x31, 0xd0, 0xaf, 0x25, 0x40, - 0x1f, 0x94, 0xa8, 0x2f, 0x98, 0x83, 0x5a, 0x4e, 0x6b, 0x21, 0xbf, 0x55, 0x60, 0x9e, 0x2e, 0x64, - 0x87, 0x1e, 0x36, 0xdf, 0x2b, 0x0a, 0x90, 0x76, 0x6c, 0x9b, 0x30, 0xa7, 0xc8, 0x3e, 0x38, 0xa3, - 0xb3, 0x2f, 0x4a, 0x75, 0x3b, 0x36, 0x61, 0x7a, 0xa8, 0xab, 0xb0, 0xaf, 0xc0, 0x83, 0x26, 0xc2, - 0x1e, 0xa4, 0xc2, 0x59, 0xe1, 0x2a, 0x6c, 0xeb, 0xa9, 0xef, 0x78, 0x84, 0xb0, 0xdb, 0x4c, 0x0e, - 0x75, 0x9b, 0xa9, 0x51, 0x6e, 0xf3, 0x91, 0x02, 0x48, 0x5e, 0x81, 0xb0, 0xfe, 0x5b, 0x90, 0x67, - 0x01, 0xe4, 0x9e, 0x6d, 0x11, 0xc3, 0xb4, 0xb0, 0xe3, 0x19, 0xfe, 0x46, 0x82, 0xe1, 0x77, 0x58, - 0xd4, 0xd9, 0x09, 0xcd, 0xd1, 0xa3, 0x32, 0x4e, 0xcb, 0xec, 0x7d, 0x28, 0xc4, 0xe9, 0x43, 0x77, - 0x61, 0x92, 0x69, 0x64, 0x96, 0x9f, 0xd9, 0x5a, 0x4f, 0x0a, 0x59, 0x66, 0xcb, 0xc2, 0x87, 0x92, - 0x04, 0x9d, 0x4f, 0xa3, 0x6a, 0xd9, 0x8f, 0x1a, 0xdb, 0x3e, 0x8a, 0x2c, 0xab, 0x67, 0x18, 0x45, - 0xb7, 0x6d, 0xa2, 0xfd, 0x3b, 0x0d, 0x99, 0x7b, 0xf4, 0xce, 0x78, 0x80, 0x8d, 0x43, 0xba, 0x0b, - 0x6d, 0x6c, 0x1c, 0xd6, 0xd8, 0xa6, 0xb2, 0xf3, 0xaf, 0x4f, 0x53, 0x42, 0x95, 0x6e, 0xeb, 0x25, - 0x00, 0x36, 0x18, 0x9c, 0xfe, 0xb4, 0xce, 0xd8, 0xf9, 0xc1, 0x7f, 0x05, 0xf2, 0x6c, 0x58, 0xd2, - 0x46, 0x17, 0x99, 0xdd, 0x99, 0xff, 0xfc, 0x93, 0xd5, 0x59, 0xd7, 0x7d, 0xba, 0x41, 0x17, 0xfe, - 0xaa, 0x76, 0x73, 0x4b, 0xd3, 0x67, 0x29, 0xe7, 0x8e, 0x07, 0x02, 0x5d, 0x81, 0x5c, 0xd3, 0xb4, - 0x8c, 0x8e, 0xf9, 0x14, 0x0b, 0xdd, 0x69, 0x26, 0x7d, 0xd6, 0xa7, 0x32, 0x00, 0x6b, 0x90, 0x0f, - 0xd8, 0x38, 0x8a, 0x49, 0xc6, 0x17, 0xcc, 0xe6, 0x50, 0xee, 0x41, 0x21, 0x60, 0x94, 0xf0, 0x4c, - 0x25, 0xe1, 0x41, 0x3e, 0x7b, 0x08, 0xd4, 0xbb, 0x7d, 0x97, 0x98, 0x4d, 0xd3, 0x03, 0x75, 0x96, - 0x83, 0xf2, 0xa9, 0x1e, 0xa8, 0x80, 0x8d, 0x83, 0x9a, 0xe6, 0xa0, 0x7c, 0xb2, 0x0f, 0x2a, 0x60, - 0x94, 0x40, 0x65, 0x12, 0x41, 0xf9, 0xec, 0x01, 0xa8, 0xdb, 0x70, 0xae, 0xe7, 0xe0, 0x23, 0xd3, - 0xee, 0xbb, 0xb5, 0x08, 0x3a, 0x60, 0x5a, 0x17, 0xbd, 0xe1, 0x2f, 0x87, 0x50, 0xde, 0x81, 0xe5, - 0x98, 0x79, 0x1c, 0xee, 0x0c, 0x9b, 0xb8, 0x34, 0x30, 0x91, 0xc3, 0x3e, 0x80, 0x4b, 0x31, 0x33, - 0x25, 0xfc, 0xd9, 0x24, 0xfc, 0xea, 0x80, 0x44, 0x7f, 0x1d, 0xda, 0xdb, 0xb0, 0x48, 0x4f, 0xe8, - 0x3d, 0xbb, 0xdb, 0x35, 0x09, 0xc1, 0x78, 0xe4, 0xed, 0x23, 0xc5, 0x8e, 0x54, 0x24, 0x76, 0x0c, - 0x9c, 0xff, 0xbf, 0x4c, 0xc0, 0x1c, 0x3f, 0x09, 0x81, 0x7c, 0x54, 0x08, 0x09, 0xf6, 0xc4, 0x7e, - 0x0d, 0xa0, 0xe1, 0xf3, 0xb0, 0x6b, 0x7d, 0x66, 0xeb, 0xe5, 0xa1, 0xe1, 0x20, 0x10, 0x59, 0x0a, - 0x7e, 0x56, 0x2c, 0xe2, 0x1c, 0xeb, 0x92, 0x28, 0x74, 0x0b, 0x96, 0x68, 0xea, 0x70, 0x84, 0x6b, - 0x7e, 0x6a, 0x52, 0x6b, 0xd8, 0x7d, 0x8b, 0x1f, 0x8a, 0xb4, 0x5e, 0xe0, 0xa3, 0x41, 0x92, 0x42, - 0xc7, 0xd4, 0xd7, 0x60, 0xd6, 0x17, 0xba, 0x47, 0x70, 0x17, 0xdd, 0x80, 0xf9, 0x60, 0xbe, 0x69, - 0x1d, 0x9a, 0x0d, 0xcc, 0xa3, 0x56, 0x5a, 0x9f, 0xf3, 0x07, 0xf6, 0x38, 0x5d, 0x6d, 0x41, 0x2e, - 0x80, 0x44, 0xcd, 0x8b, 0xde, 0x0a, 0x2d, 0x8f, 0x47, 0xbb, 0x97, 0x4e, 0xbc, 0x3c, 0x8a, 0x44, - 0x5e, 0x9c, 0xda, 0x87, 0x7c, 0x64, 0xed, 0x68, 0x0e, 0x26, 0x1e, 0xe3, 0x63, 0x61, 0x5c, 0xfa, - 0x13, 0x3d, 0x84, 0xc9, 0x23, 0xa3, 0xd3, 0xc7, 0x6c, 0xbf, 0x66, 0xb6, 0x6e, 0x9f, 0xdc, 0xaa, - 0x74, 0x09, 0x3a, 0x17, 0xf2, 0x6a, 0xea, 0x8e, 0xa2, 0xfd, 0x53, 0x81, 0x8b, 0x94, 0xe6, 0x1b, - 0x6d, 0xc7, 0xe8, 0x18, 0x56, 0xe3, 0x99, 0x9c, 0x07, 0xdd, 0x0a, 0x67, 0x76, 0x13, 0x34, 0xb3, - 0xdb, 0x59, 0xf8, 0xfc, 0x93, 0xd5, 0x7c, 0xe0, 0xcd, 0xaf, 0xbf, 0x70, 0xeb, 0x8e, 0x26, 0xa7, - 0x7b, 0x68, 0x19, 0xce, 0x7a, 0xbb, 0x91, 0x66, 0xbb, 0xe1, 0x7d, 0x9e, 0xea, 0x45, 0xf6, 0x61, - 0x0a, 0xe6, 0x07, 0x16, 0x9b, 0xe0, 0xc9, 0x0f, 0x61, 0xba, 0x2e, 0x38, 0x84, 0x1f, 0x6f, 0x26, - 0x58, 0x7c, 0x40, 0x62, 0x49, 0xfc, 0xd0, 0x7d, 0x09, 0x71, 0x97, 0xda, 0xc4, 0xe8, 0x4b, 0x2d, - 0x1d, 0xb9, 0xd4, 0xd4, 0xc7, 0x70, 0x56, 0xc8, 0x46, 0x9b, 0x00, 0x81, 0x9d, 0x79, 0x1a, 0x11, - 0x0d, 0x1a, 0xd4, 0xc8, 0x19, 0xdf, 0xc8, 0x74, 0x9d, 0x2c, 0xcd, 0x11, 0x57, 0x0d, 0xff, 0xa0, - 0x96, 0x17, 0x28, 0xc5, 0x49, 0xf2, 0x3e, 0xb5, 0x7f, 0x28, 0x3c, 0xa8, 0xf8, 0xeb, 0x7b, 0x26, - 0xbf, 0x58, 0xe2, 0xb5, 0xc2, 0x11, 0x57, 0x33, 0xad, 0x8b, 0xaf, 0xf0, 0xfe, 0xa6, 0x87, 0xee, - 0xef, 0x64, 0x64, 0x7f, 0xa3, 0x55, 0xc4, 0x54, 0xb4, 0x8a, 0x90, 0xdd, 0xea, 0x6c, 0xc8, 0xad, - 0x06, 0x5c, 0xe3, 0x09, 0x2c, 0xec, 0xe2, 0x60, 0xa9, 0xd2, 0x4a, 0xb9, 0xcd, 0xfc, 0x95, 0x72, - 0xab, 0x6d, 0x85, 0xac, 0x9f, 0x4a, 0xb0, 0xfe, 0x83, 0x33, 0x92, 0xfd, 0x07, 0xd3, 0xaa, 0x14, - 0x40, 0x60, 0xdb, 0x04, 0x37, 0x7c, 0x1b, 0x72, 0x41, 0xc0, 0xea, 0x98, 0x2e, 0x11, 0xce, 0x78, - 0x6b, 0x94, 0x33, 0xba, 0x25, 0x29, 0x16, 0x7a, 0xc9, 0xd6, 0xac, 0x2f, 0x8b, 0x85, 0xb3, 0x53, - 0xf2, 0xca, 0x77, 0xe5, 0xe2, 0xd0, 0x4f, 0xb4, 0x0a, 0x21, 0xd3, 0x79, 0x86, 0xbb, 0x0b, 0x19, - 0x1f, 0x83, 0x88, 0x64, 0xc5, 0x51, 0x4b, 0xd1, 0x83, 0x29, 0x9a, 0x09, 0x97, 0xe5, 0x7d, 0xda, - 0x66, 0x4e, 0x54, 0xc5, 0x84, 0x17, 0xa5, 0xa7, 0x7a, 0xed, 0x7d, 0x36, 0x01, 0x73, 0x51, 0xf9, - 0x09, 0xbb, 0xb4, 0x0b, 0x8b, 0xcc, 0x9d, 0x0d, 0x82, 0x0f, 0x6b, 0x03, 0x85, 0x6d, 0x7c, 0xf8, - 0x5b, 0xf0, 0x67, 0xec, 0x07, 0x0e, 0x7b, 0x03, 0xe6, 0x03, 0x41, 0x9e, 0xeb, 0x4e, 0xf0, 0xfb, - 0xc9, 0x1f, 0x10, 0xf7, 0x13, 0xda, 0x06, 0x84, 0xdf, 0x33, 0xa3, 0x2a, 0xd3, 0xc9, 0x2a, 0xe7, - 0x38, 0xbb, 0xa4, 0xef, 0x0a, 0xe4, 0x84, 0x08, 0x4f, 0xd9, 0x24, 0x53, 0x36, 0xcb, 0xa9, 0x9e, - 0xa6, 0x7b, 0xb0, 0xe0, 0x76, 0x0c, 0xb7, 0x1d, 0x51, 0x35, 0x95, 0xac, 0x6a, 0x5e, 0xf0, 0x4b, - 0xba, 0xd6, 0x20, 0xef, 0x09, 0x09, 0x1f, 0xca, 0x9c, 0x20, 0x4b, 0xda, 0xf0, 0xbb, 0xb8, 0x11, - 0x5d, 0xd8, 0xf4, 0x10, 0x6d, 0x82, 0x3f, 0xac, 0xcd, 0x13, 0xe2, 0x69, 0xcb, 0x70, 0x6d, 0x82, - 0x2c, 0xb4, 0x69, 0x77, 0xe1, 0x82, 0xef, 0x4e, 0xfb, 0xd8, 0x69, 0xda, 0x4e, 0x97, 0x05, 0x6f, - 0xe1, 0x49, 0x91, 0x18, 0xa3, 0x0c, 0x74, 0x2a, 0xfe, 0x9a, 0x86, 0x8b, 0xf1, 0x02, 0x44, 0x9d, - 0xf4, 0x1a, 0xa8, 0x8d, 0xbe, 0xe3, 0x60, 0x8b, 0xd4, 0x70, 0xb3, 0x89, 0x79, 0x16, 0xe3, 0xdf, - 0x2d, 0x3c, 0xf9, 0x58, 0x16, 0x1c, 0x15, 0x8f, 0xc1, 0xbf, 0x9d, 0xd6, 0x20, 0x6f, 0x5a, 0x8d, - 0x4e, 0xdf, 0x35, 0x6d, 0x8b, 0x25, 0xa6, 0xdc, 0xa9, 0xd2, 0x7a, 0xce, 0x27, 0xd3, 0x8c, 0xd4, - 0x45, 0x65, 0x58, 0x08, 0x18, 0x0f, 0x4d, 0x97, 0x70, 0xf9, 0xdc, 0x79, 0x90, 0x3f, 0x74, 0xdf, - 0x1b, 0xa1, 0x29, 0x55, 0xc3, 0x76, 0x1c, 0xdc, 0x20, 0x9d, 0xe3, 0xda, 0x91, 0x4d, 0x2d, 0xe5, - 0xda, 0x7d, 0xa7, 0x81, 0x99, 0x0b, 0x4d, 0xeb, 0x05, 0x7f, 0xf4, 0x11, 0x1d, 0xac, 0xb2, 0xb1, - 0xb8, 0x59, 0xc4, 0x70, 0x5a, 0x98, 0x30, 0xcf, 0x19, 0x98, 0x75, 0xc0, 0xc6, 0xd0, 0x26, 0x14, - 0xa2, 0xb3, 0x68, 0xc9, 0xc2, 0x3c, 0x68, 0x5a, 0x47, 0xe1, 0x39, 0xac, 0x74, 0xda, 0x85, 0xa2, - 0x67, 0xa3, 0x5a, 0x1d, 0x37, 0x6d, 0x07, 0xf3, 0xf4, 0xba, 0x46, 0x1c, 0xc3, 0x72, 0x4d, 0xd6, - 0x75, 0xe2, 0xee, 0x73, 0xc9, 0xe3, 0xdb, 0x61, 0x6c, 0x2c, 0xcd, 0x3e, 0xf0, 0x99, 0x50, 0x05, - 0x56, 0x7d, 0x41, 0x46, 0x93, 0x60, 0x67, 0x50, 0xce, 0x34, 0x93, 0x73, 0xd1, 0x63, 0xdb, 0xa6, - 0x5c, 0x51, 0x31, 0x1b, 0x80, 0xba, 0xa6, 0xeb, 0x9a, 0x56, 0x2b, 0xc8, 0x40, 0xb9, 0x4b, 0x65, - 0xf5, 0x79, 0x31, 0x22, 0x45, 0xf3, 0x5d, 0x28, 0x1a, 0x47, 0xd8, 0xa1, 0x81, 0x75, 0x20, 0x6f, - 0xf5, 0xee, 0x5b, 0x5a, 0x61, 0xa4, 0xf4, 0x4b, 0x82, 0x6f, 0x3b, 0x9c, 0xc0, 0x0a, 0x07, 0xd0, - 0x3e, 0x56, 0x20, 0xe7, 0x13, 0xbf, 0xda, 0xc7, 0x7d, 0x4c, 0x5d, 0xb2, 0xd1, 0xee, 0x3b, 0x56, - 0xad, 0x63, 0x76, 0x4d, 0xaf, 0xae, 0x04, 0x46, 0x7a, 0x48, 0x29, 0x68, 0x4f, 0x24, 0xcb, 0xac, - 0x91, 0x31, 0x6e, 0x3c, 0x2a, 0x04, 0x53, 0xa4, 0x63, 0xf4, 0xff, 0xc0, 0x82, 0x46, 0x6d, 0xcc, - 0x9c, 0x8e, 0x45, 0x93, 0x60, 0xba, 0xf6, 0x2f, 0xd1, 0xc5, 0x09, 0x02, 0xb6, 0xeb, 0x9a, 0x2d, - 0xab, 0x8b, 0x2d, 0xf2, 0x3f, 0x9b, 0x65, 0xfe, 0x6e, 0x02, 0x0a, 0x71, 0xeb, 0x4d, 0xb8, 0x3b, - 0x0c, 0x98, 0x31, 0x02, 0x26, 0x71, 0xbd, 0xbf, 0x3e, 0xea, 0x4e, 0x94, 0xe4, 0x06, 0x19, 0x7e, - 0x40, 0xd4, 0x65, 0x99, 0xa7, 0x75, 0xcf, 0xff, 0x5d, 0x81, 0x85, 0x18, 0x5d, 0xf4, 0xd2, 0xf2, - 0xba, 0xe5, 0xe1, 0xe2, 0x28, 0xad, 0xcf, 0xd5, 0xa3, 0x75, 0xe3, 0x1a, 0xe4, 0x7d, 0xae, 0x9a, - 0x9c, 0x8f, 0xe6, 0x7c, 0x32, 0x6b, 0xd0, 0xa1, 0xcb, 0x30, 0xcb, 0x9b, 0x7a, 0xd8, 0xe1, 0x05, - 0x39, 0x4f, 0x4f, 0xb3, 0x1e, 0x91, 0xd5, 0xe1, 0x57, 0x20, 0xd7, 0x73, 0xec, 0x9e, 0xed, 0x0a, - 0x26, 0x6f, 0x63, 0x67, 0x3d, 0x2a, 0x8f, 0x8d, 0xe1, 0x64, 0x79, 0x72, 0x74, 0xb2, 0xac, 0x35, - 0xa1, 0x28, 0xe7, 0x19, 0xfb, 0x86, 0x43, 0xcc, 0x86, 0xd9, 0xe3, 0xed, 0xc2, 0x53, 0x4c, 0x32, - 0x3e, 0x50, 0x60, 0x25, 0x49, 0x8b, 0xb8, 0x3f, 0xe2, 0xdd, 0xe6, 0x22, 0x64, 0xfc, 0x26, 0x0b, - 0x57, 0xa3, 0x07, 0x04, 0x54, 0x85, 0xd9, 0x9e, 0x2c, 0x8c, 0x19, 0x6f, 0x66, 0x6b, 0x63, 0x94, - 0x5b, 0x85, 0x11, 0x84, 0x65, 0x68, 0x07, 0xb0, 0x24, 0x35, 0x48, 0xf7, 0x6d, 0xbb, 0xe3, 0x59, - 0x22, 0x74, 0x7c, 0x94, 0xa1, 0xc7, 0x27, 0x15, 0x39, 0x3e, 0xda, 0xfb, 0x0a, 0x9c, 0x1b, 0x10, - 0xfb, 0xc5, 0xec, 0x49, 0xff, 0x40, 0x81, 0xac, 0x57, 0x5f, 0x5b, 0x4d, 0xb3, 0x85, 0x76, 0x61, - 0xaa, 0xc1, 0x7e, 0x09, 0x64, 0xe5, 0x11, 0x45, 0x39, 0x65, 0x2d, 0xf1, 0x3f, 0xbc, 0xc5, 0x21, - 0xa6, 0xab, 0xaf, 0xc0, 0x8c, 0x44, 0x96, 0xab, 0xff, 0x0c, 0xaf, 0xfe, 0x0b, 0x72, 0xf5, 0x9f, - 0x91, 0xab, 0xf8, 0x6d, 0x58, 0xaa, 0xf6, 0xeb, 0x5d, 0x93, 0x54, 0x69, 0x16, 0x65, 0x5a, 0x2d, - 0xdf, 0x7a, 0x31, 0x09, 0x97, 0x12, 0x97, 0x70, 0x69, 0x77, 0x61, 0x71, 0x97, 0xfb, 0xa7, 0x54, - 0xeb, 0xf1, 0x9e, 0x9d, 0xd4, 0xa5, 0x8e, 0xeb, 0x49, 0xb1, 0xe1, 0xeb, 0x8f, 0x20, 0xe3, 0x3f, - 0xf1, 0xa0, 0x25, 0x40, 0xdb, 0xf7, 0xef, 0xd7, 0x1e, 0x6d, 0x3f, 0xdc, 0xbb, 0xbf, 0x7d, 0xf0, - 0xa6, 0x5e, 0x7b, 0xa3, 0xf2, 0xf5, 0xea, 0xdc, 0x19, 0x74, 0x1e, 0x16, 0xf5, 0xca, 0x57, 0xde, - 0x7c, 0x54, 0x89, 0x0e, 0x29, 0x74, 0x4a, 0xb5, 0x72, 0x10, 0xa5, 0xa7, 0xb6, 0x3e, 0x52, 0x61, - 0x46, 0x98, 0xae, 0x6d, 0x98, 0x16, 0xfa, 0x89, 0x02, 0x73, 0xd1, 0xf7, 0x0b, 0x54, 0x4a, 0xb0, - 0x79, 0xc2, 0x7b, 0x8c, 0x5a, 0x1e, 0x9b, 0x9f, 0x9b, 0x51, 0xbb, 0xf6, 0x9d, 0x3f, 0x7f, 0xf6, - 0xc3, 0xd4, 0x65, 0xf4, 0x5c, 0x39, 0xe6, 0x0d, 0xad, 0x1c, 0xf2, 0xb3, 0x8f, 0xc5, 0x3b, 0x50, - 0xcc, 0xa3, 0x05, 0x7a, 0x69, 0x88, 0xde, 0xe4, 0x57, 0x2e, 0xf5, 0xf6, 0x49, 0xa7, 0x09, 0xd4, - 0x2f, 0x32, 0xd4, 0x37, 0xd0, 0xb5, 0x91, 0xa8, 0xcb, 0xe2, 0xf1, 0x03, 0x7d, 0x4f, 0x01, 0x54, - 0x25, 0x0e, 0x36, 0xba, 0x21, 0xe0, 0x4b, 0x25, 0xfe, 0xec, 0x58, 0xf2, 0x9e, 0x1d, 0x4b, 0x95, - 0x6e, 0x8f, 0x1c, 0xab, 0x63, 0x1c, 0x43, 0x6d, 0x93, 0xa1, 0xb8, 0x8e, 0xd6, 0x47, 0xa3, 0x70, - 0x99, 0xe6, 0x4d, 0x05, 0xfd, 0x58, 0x81, 0xf3, 0x1c, 0x46, 0x9c, 0x19, 0x93, 0xd0, 0x8c, 0xff, - 0xda, 0xa3, 0xdd, 0x61, 0xa0, 0xb6, 0xd0, 0xe6, 0xd8, 0xa6, 0x09, 0xc0, 0xfd, 0x54, 0x81, 0x7c, - 0x24, 0x5a, 0xa1, 0x8d, 0xd1, 0x86, 0x90, 0x82, 0xa5, 0x5a, 0x1a, 0x97, 0x5d, 0xec, 0x64, 0x89, - 0xc1, 0x5d, 0x47, 0x57, 0x47, 0xc3, 0xed, 0x51, 0x38, 0xdf, 0x57, 0x00, 0x82, 0xe7, 0x1a, 0xb4, - 0x3e, 0xc4, 0x81, 0x42, 0x6f, 0x52, 0x89, 0x26, 0x1c, 0x7c, 0xfb, 0xd1, 0x2e, 0x33, 0x4c, 0x97, - 0xd0, 0x85, 0x58, 0x4c, 0x75, 0xae, 0xf9, 0xdb, 0x90, 0xe5, 0xfb, 0x28, 0x90, 0x24, 0x6d, 0xdd, - 0xd8, 0x6f, 0x30, 0xda, 0x75, 0xa6, 0xf6, 0x79, 0xa4, 0x0d, 0x51, 0x1b, 0xec, 0xd5, 0x37, 0x21, - 0xcf, 0xf5, 0x07, 0x0f, 0x32, 0x49, 0x10, 0x92, 0x7a, 0x10, 0xfe, 0x4c, 0x6d, 0x83, 0xa9, 0x5e, - 0x43, 0x57, 0x62, 0x55, 0xb3, 0x7f, 0x13, 0xa0, 0x15, 0x4d, 0xa0, 0xbd, 0x07, 0xd9, 0x5d, 0xd6, - 0x37, 0x78, 0x66, 0xd5, 0x57, 0x99, 0xea, 0x22, 0x5a, 0x19, 0xae, 0x1a, 0xfd, 0x48, 0x81, 0x02, - 0xdb, 0xab, 0x68, 0xce, 0xf5, 0xc2, 0x90, 0x8d, 0x1d, 0x78, 0x32, 0x50, 0xd7, 0xc6, 0xec, 0x2c, - 0x6b, 0x6b, 0x0c, 0xd7, 0x73, 0x68, 0x35, 0x1e, 0x57, 0xa0, 0xff, 0x67, 0xd1, 0x4e, 0xa2, 0x5f, - 0xdd, 0xde, 0x1c, 0x82, 0x2c, 0xa9, 0x2d, 0x9d, 0xe8, 0x2f, 0x03, 0x13, 0x92, 0x42, 0x77, 0x50, - 0xc0, 0x95, 0xfd, 0x0e, 0xed, 0x77, 0x15, 0xc8, 0x85, 0xbb, 0x9d, 0x43, 0xcd, 0x36, 0xd0, 0x14, - 0x55, 0x9f, 0x1b, 0xd9, 0x91, 0xd3, 0x8a, 0x0c, 0x8e, 0x8a, 0x96, 0x93, 0xe0, 0xa0, 0x6f, 0x31, - 0xa7, 0xf1, 0xa7, 0xa0, 0xeb, 0x09, 0x42, 0x63, 0x7a, 0x95, 0xea, 0xc8, 0x3e, 0x9a, 0xb6, 0xca, - 0xf4, 0x9f, 0x47, 0xe7, 0x12, 0xf4, 0xa3, 0xdf, 0x28, 0x70, 0x71, 0x58, 0x7b, 0x0d, 0xbd, 0x3a, - 0x06, 0x9e, 0x84, 0x9e, 0x5c, 0xa2, 0x5f, 0x45, 0xf9, 0x93, 0xae, 0x2e, 0x69, 0xd7, 0x78, 0x49, - 0xed, 0x62, 0xd2, 0x10, 0xb8, 0x9e, 0xc2, 0xbc, 0x0c, 0x81, 0xd7, 0xc9, 0x49, 0x27, 0xee, 0xca, - 0x28, 0x43, 0xb1, 0xe9, 0x49, 0xc7, 0x4e, 0x82, 0xf1, 0x84, 0xa9, 0xf9, 0xb5, 0x02, 0xe7, 0x42, - 0xb5, 0x42, 0xd0, 0x03, 0x42, 0x5b, 0x23, 0x13, 0xee, 0x81, 0x8e, 0x93, 0x7a, 0xf3, 0x44, 0x73, - 0x44, 0x40, 0x7e, 0x81, 0x81, 0xbd, 0x8a, 0x9e, 0x4f, 0x04, 0xdb, 0x93, 0x60, 0xfd, 0x4a, 0xfc, - 0x23, 0x48, 0x6c, 0x99, 0x7a, 0x7b, 0x1c, 0xb7, 0x1f, 0xac, 0xe3, 0xd5, 0x1b, 0x27, 0xa8, 0x59, - 0xc7, 0xc0, 0x2b, 0x17, 0xb0, 0x1f, 0x2b, 0x70, 0x3e, 0xb1, 0x1c, 0x43, 0x2f, 0x8f, 0xe1, 0x94, - 0x71, 0x05, 0x9c, 0xfa, 0xd2, 0xc9, 0xca, 0xa1, 0x11, 0x17, 0xb2, 0x6c, 0xeb, 0x10, 0x3e, 0x17, - 0xf2, 0xbb, 0x98, 0x84, 0x0a, 0x87, 0x24, 0xd7, 0xbc, 0x3c, 0x46, 0x01, 0x31, 0xe2, 0xf2, 0xe5, - 0x15, 0x05, 0x4d, 0x54, 0x0a, 0xfc, 0xf6, 0x0b, 0x02, 0xd0, 0x9e, 0xd5, 0xb4, 0xd1, 0xb5, 0x51, - 0x8b, 0xf6, 0xff, 0xbf, 0x4b, 0x7d, 0x7e, 0x14, 0x2b, 0x15, 0xa8, 0xdd, 0x64, 0x70, 0x36, 0xd0, - 0x8d, 0x58, 0x38, 0x92, 0x55, 0x4c, 0xab, 0x69, 0x8b, 0xfb, 0x71, 0x5d, 0xd9, 0x54, 0xd0, 0xfb, - 0x8a, 0x57, 0xba, 0x6c, 0xfb, 0x35, 0x3d, 0x2f, 0x61, 0xd0, 0xda, 0xd0, 0x1c, 0x29, 0x60, 0x54, - 0x93, 0x72, 0xaf, 0xf8, 0x92, 0x48, 0xbb, 0xcd, 0xb0, 0x6e, 0xa2, 0x52, 0x2c, 0x56, 0x57, 0xb0, - 0xbb, 0x65, 0xaf, 0xc9, 0x50, 0x76, 0x99, 0x1c, 0x09, 0xea, 0xbe, 0xdf, 0x58, 0x18, 0x01, 0x35, - 0xca, 0xf8, 0xdf, 0x82, 0xea, 0x75, 0x3a, 0x04, 0xd4, 0x9d, 0x9f, 0x2b, 0x7f, 0xf8, 0x74, 0x45, - 0xf9, 0xd3, 0xa7, 0x2b, 0xca, 0xdf, 0x3e, 0x5d, 0x51, 0xe0, 0xbc, 0xed, 0xb4, 0xe2, 0x15, 0xef, - 0xcc, 0x49, 0xb5, 0xd5, 0x3e, 0xf5, 0xc3, 0x7d, 0xe5, 0x1b, 0xb7, 0xa5, 0x7f, 0x66, 0xec, 0x39, - 0xc7, 0x6e, 0xd7, 0x20, 0x66, 0xa3, 0x63, 0xd4, 0xdd, 0xb2, 0x27, 0xc3, 0xe8, 0x99, 0x6e, 0x08, - 0xd2, 0xff, 0x61, 0xd2, 0xfe, 0x65, 0x6a, 0xb1, 0xe2, 0xe9, 0xa8, 0x48, 0x3a, 0xfe, 0x18, 0xd0, - 0xdf, 0xa9, 0x90, 0xf6, 0x3b, 0x1e, 0xbd, 0x3e, 0xc5, 0x1c, 0xff, 0xe6, 0x7f, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x6b, 0x22, 0x56, 0xba, 0x75, 0x29, 0x00, 0x00, + // 2885 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0x5f, 0x6f, 0x1c, 0x57, + 0x15, 0xcf, 0xac, 0xd7, 0x8e, 0xf7, 0x78, 0xbd, 0x6b, 0x5f, 0xaf, 0x1d, 0x67, 0xe2, 0xd8, 0xdb, + 0x49, 0x13, 0x3b, 0x49, 0xbd, 0xeb, 0x3a, 0x69, 0x9a, 0x96, 0x2a, 0xc5, 0x4e, 0x8c, 0x13, 0x1a, + 0x54, 0x33, 0x76, 0x83, 0xa0, 0x95, 0x56, 0xb3, 0xeb, 0xbb, 0xbb, 0xd3, 0xec, 0xce, 0x6c, 0x66, + 0xee, 0x5a, 0x71, 0x04, 0x3c, 0x00, 0xe2, 0x03, 0x00, 0xe2, 0x81, 0x07, 0x04, 0x82, 0x87, 0x96, + 0x0a, 0x09, 0xf5, 0x01, 0x1e, 0xfa, 0xc0, 0x1b, 0x42, 0x3c, 0x21, 0x21, 0xde, 0x50, 0x85, 0xaa, + 0x3e, 0x21, 0x81, 0x44, 0xc5, 0x07, 0x40, 0xf7, 0xcf, 0xcc, 0xdc, 0xf9, 0xb7, 0xbb, 0x51, 0x8c, + 0x54, 0xf1, 0xe4, 0x9d, 0x73, 0xcf, 0x3d, 0xe7, 0x77, 0xcf, 0x3d, 0xf7, 0xdc, 0x73, 0xce, 0x35, + 0xac, 0x60, 0xd2, 0xae, 0x1e, 0xbd, 0x68, 0x74, 0x7a, 0x6d, 0xe3, 0xc5, 0x6a, 0x1d, 0x1b, 0x0d, + 0xdb, 0xaa, 0x35, 0xda, 0x86, 0x69, 0x55, 0x7a, 0x8e, 0x4d, 0x6c, 0x34, 0x8f, 0x49, 0x1b, 0x3b, + 0xb8, 0xdf, 0xad, 0x60, 0xd2, 0xae, 0x78, 0x9c, 0xea, 0x7a, 0xcb, 0x24, 0xed, 0x7e, 0xbd, 0xd2, + 0xb0, 0xbb, 0xd5, 0x96, 0xdd, 0xb2, 0xab, 0x8c, 0xbb, 0xde, 0x6f, 0xb2, 0x2f, 0xf6, 0xc1, 0x7e, + 0x71, 0x29, 0xea, 0x52, 0xcb, 0xb6, 0x5b, 0x1d, 0x5c, 0x35, 0x7a, 0x66, 0xd5, 0xb0, 0x2c, 0x9b, + 0x18, 0xc4, 0xb4, 0x2d, 0x57, 0x8c, 0x9e, 0x13, 0xa3, 0xbe, 0x0c, 0xdc, 0xed, 0x91, 0x63, 0x31, + 0x78, 0x36, 0x3a, 0x68, 0x58, 0xde, 0xd0, 0x72, 0x08, 0xbc, 0x41, 0x08, 0x76, 0xb9, 0x60, 0x31, + 0x9e, 0xb8, 0xb8, 0x7a, 0xc7, 0x6e, 0x3c, 0xf4, 0x60, 0x85, 0x18, 0x8e, 0x8c, 0x8e, 0x79, 0x68, + 0x10, 0xdb, 0xe1, 0xa3, 0x9a, 0x0d, 0xe8, 0x81, 0x47, 0xba, 0xdd, 0x36, 0xac, 0x16, 0xde, 0xc7, + 0x04, 0xdd, 0x84, 0x09, 0xa3, 0x41, 0x95, 0x2c, 0x2a, 0x65, 0x65, 0xad, 0xb0, 0x59, 0xae, 0x24, + 0x5a, 0xa8, 0xb2, 0x8f, 0xc9, 0x16, 0xe3, 0xd3, 0x05, 0x3f, 0x5a, 0x81, 0xa9, 0x5e, 0xbf, 0xde, + 0x31, 0x1b, 0xb5, 0x87, 0xf8, 0xd8, 0x5d, 0xcc, 0x94, 0xc7, 0xd6, 0xf2, 0x3a, 0x70, 0xd2, 0x1b, + 0xf8, 0xd8, 0xd5, 0x3e, 0x50, 0x60, 0xf9, 0xbe, 0xe9, 0x92, 0x7b, 0xd6, 0x21, 0x7e, 0x8c, 0x0f, + 0xb7, 0x82, 0x05, 0xb9, 0x3a, 0x7e, 0xd4, 0xc7, 0x2e, 0x41, 0x0b, 0x30, 0x8e, 0x7b, 0x76, 0xa3, + 0xcd, 0x94, 0x67, 0xef, 0x9e, 0xd2, 0xf9, 0x27, 0xba, 0x08, 0xd3, 0x2d, 0x6c, 0x61, 0xd7, 0x74, + 0x6b, 0x7c, 0x3c, 0x53, 0x56, 0xd6, 0x26, 0xef, 0x9e, 0xd2, 0xf3, 0x82, 0xbc, 0xc3, 0xd8, 0xce, + 0x41, 0xae, 0x67, 0xb4, 0x70, 0xcd, 0x35, 0x9f, 0xe0, 0xc5, 0xb1, 0xb2, 0xb2, 0x36, 0xae, 0x4f, + 0x52, 0xc2, 0xbe, 0xf9, 0x04, 0xa3, 0xf3, 0x00, 0x6c, 0x90, 0xd8, 0x0f, 0xb1, 0xb5, 0x98, 0x2d, + 0x2b, 0x6b, 0x39, 0x9d, 0xb1, 0x1f, 0x50, 0xc2, 0x76, 0x01, 0xf2, 0x8f, 0xfa, 0xd8, 0x39, 0xae, + 0x35, 0xcd, 0x0e, 0xc1, 0x8e, 0xf6, 0x4b, 0x05, 0xce, 0x50, 0xb4, 0x9f, 0x73, 0x98, 0xef, 0x2b, + 0xb0, 0x18, 0x87, 0xe9, 0xf6, 0x6c, 0xcb, 0xc5, 0xe8, 0x4b, 0x90, 0x97, 0xdc, 0xc6, 0x5d, 0x54, + 0xca, 0x63, 0x6b, 0x53, 0x9b, 0x5a, 0xca, 0x96, 0x4a, 0x22, 0xf4, 0xd0, 0x3c, 0x74, 0x09, 0x8a, + 0x16, 0x7e, 0x4c, 0x6a, 0x12, 0xb0, 0x0c, 0x03, 0x36, 0x4d, 0xc9, 0x7b, 0x1e, 0x38, 0x8a, 0x9d, + 0xd8, 0xc4, 0xe8, 0xc8, 0x2b, 0xcb, 0x31, 0x0a, 0x5d, 0x9a, 0xf6, 0x07, 0x05, 0x56, 0x52, 0x1d, + 0x40, 0x40, 0x7e, 0x07, 0x4a, 0x26, 0x1f, 0xae, 0x25, 0x40, 0xbf, 0x9c, 0x02, 0x3d, 0x2e, 0x51, + 0x9f, 0x33, 0xe3, 0x5a, 0x4e, 0x6a, 0x21, 0xbf, 0x57, 0x60, 0x96, 0x2e, 0x64, 0x9b, 0x1e, 0x36, + 0xdf, 0x2b, 0x4a, 0x90, 0x75, 0x6c, 0x9b, 0x30, 0xa7, 0xc8, 0xdf, 0x3d, 0xa5, 0xb3, 0x2f, 0x4a, + 0x75, 0x3b, 0x36, 0x61, 0x7a, 0xa8, 0xab, 0xb0, 0xaf, 0xc0, 0x83, 0xc6, 0xc2, 0x1e, 0xa4, 0xc2, + 0x69, 0xe1, 0x2a, 0x6c, 0xeb, 0xa9, 0xef, 0x78, 0x84, 0xb0, 0xdb, 0x8c, 0x0f, 0x74, 0x9b, 0x89, + 0x61, 0x6e, 0xf3, 0xa1, 0x02, 0x48, 0x5e, 0x81, 0xb0, 0xfe, 0x5b, 0x50, 0x64, 0x01, 0xe4, 0xb6, + 0x6d, 0x11, 0xc3, 0xb4, 0xb0, 0xe3, 0x19, 0xfe, 0x6a, 0x8a, 0xe1, 0xb7, 0x59, 0xd4, 0xd9, 0x0e, + 0xcd, 0xd1, 0xa3, 0x32, 0x4e, 0xca, 0xec, 0x7d, 0x28, 0x25, 0xe9, 0x43, 0xb7, 0x60, 0x9c, 0x69, + 0x64, 0x96, 0x9f, 0xda, 0x5c, 0x4b, 0x0b, 0x59, 0x66, 0xcb, 0xc2, 0x87, 0x92, 0x04, 0x9d, 0x4f, + 0xa3, 0x6a, 0xd9, 0x8f, 0x1a, 0xdb, 0x3e, 0x8a, 0x2c, 0xaf, 0xe7, 0x18, 0x45, 0xb7, 0x6d, 0xa2, + 0xfd, 0x27, 0x0b, 0xb9, 0xdb, 0xf4, 0xce, 0xb8, 0x8b, 0x8d, 0x43, 0xba, 0x0b, 0x6d, 0x6c, 0x1c, + 0xd6, 0xd8, 0xa6, 0xb2, 0xf3, 0xaf, 0x4f, 0x52, 0xc2, 0x3e, 0xdd, 0xd6, 0xf3, 0x00, 0x6c, 0x30, + 0x38, 0xfd, 0x59, 0x9d, 0xb1, 0xf3, 0x83, 0xff, 0x0a, 0x14, 0xd9, 0xb0, 0xa4, 0x8d, 0x2e, 0x32, + 0xbf, 0x3d, 0xfb, 0xd9, 0xc7, 0x2b, 0xd3, 0xae, 0xfb, 0x64, 0x9d, 0x2e, 0xfc, 0x55, 0xed, 0xda, + 0xa6, 0xa6, 0x4f, 0x53, 0xce, 0x6d, 0x0f, 0x04, 0xba, 0x08, 0x85, 0xa6, 0x69, 0x19, 0x1d, 0xf3, + 0x09, 0x16, 0xba, 0xb3, 0x4c, 0xfa, 0xb4, 0x4f, 0x65, 0x00, 0x56, 0xa1, 0x18, 0xb0, 0x71, 0x14, + 0xe3, 0x8c, 0x2f, 0x98, 0xcd, 0xa1, 0xdc, 0x86, 0x52, 0xc0, 0x28, 0xe1, 0x99, 0x48, 0xc3, 0x83, + 0x7c, 0xf6, 0x10, 0xa8, 0x77, 0xfb, 0x2e, 0x31, 0x9b, 0xa6, 0x07, 0xea, 0x34, 0x07, 0xe5, 0x53, + 0x3d, 0x50, 0x01, 0x1b, 0x07, 0x35, 0xc9, 0x41, 0xf9, 0x64, 0x1f, 0x54, 0xc0, 0x28, 0x81, 0xca, + 0xa5, 0x82, 0xf2, 0xd9, 0x03, 0x50, 0x37, 0xe0, 0x4c, 0xcf, 0xc1, 0x47, 0xa6, 0xdd, 0x77, 0x6b, + 0x11, 0x74, 0xc0, 0xb4, 0xce, 0x7b, 0xc3, 0x5f, 0x0e, 0xa1, 0xbc, 0x09, 0x8b, 0x09, 0xf3, 0x38, + 0xdc, 0x29, 0x36, 0x71, 0x21, 0x36, 0x91, 0xc3, 0x3e, 0x80, 0xf3, 0x09, 0x33, 0x25, 0xfc, 0xf9, + 0x34, 0xfc, 0x6a, 0x4c, 0xa2, 0xbf, 0x0e, 0xed, 0x6d, 0x98, 0xa7, 0x27, 0xf4, 0xb6, 0xdd, 0xed, + 0x9a, 0x84, 0x60, 0x3c, 0xf4, 0xf6, 0x91, 0x62, 0x47, 0x26, 0x12, 0x3b, 0x62, 0xe7, 0xff, 0xaf, + 0x63, 0x30, 0xc3, 0x4f, 0x42, 0x20, 0x1f, 0x95, 0x42, 0x82, 0x3d, 0xb1, 0x5f, 0x03, 0x68, 0xf8, + 0x3c, 0xec, 0x5a, 0x9f, 0xda, 0x7c, 0x79, 0x60, 0x38, 0x08, 0x44, 0x56, 0x82, 0x9f, 0x3b, 0x16, + 0x71, 0x8e, 0x75, 0x49, 0x14, 0xba, 0x0e, 0x0b, 0x34, 0x75, 0x38, 0xc2, 0x35, 0x3f, 0x35, 0xa9, + 0x35, 0xec, 0xbe, 0xc5, 0x0f, 0x45, 0x56, 0x2f, 0xf1, 0xd1, 0x20, 0x49, 0xa1, 0x63, 0xea, 0x6b, + 0x30, 0xed, 0x0b, 0xbd, 0x47, 0x70, 0x17, 0x5d, 0x85, 0xd9, 0x60, 0xbe, 0x69, 0x1d, 0x9a, 0x0d, + 0xcc, 0xa3, 0x56, 0x56, 0x9f, 0xf1, 0x07, 0xee, 0x71, 0xba, 0xda, 0x82, 0x42, 0x00, 0x89, 0x9a, + 0x17, 0xbd, 0x15, 0x5a, 0x1e, 0x8f, 0x76, 0x2f, 0x3d, 0xf5, 0xf2, 0x28, 0x12, 0x79, 0x71, 0x6a, + 0x1f, 0x8a, 0x91, 0xb5, 0xa3, 0x19, 0x18, 0x7b, 0x88, 0x8f, 0x85, 0x71, 0xe9, 0x4f, 0x74, 0x1f, + 0xc6, 0x8f, 0x8c, 0x4e, 0x1f, 0xb3, 0xfd, 0x9a, 0xda, 0xbc, 0xf1, 0xf4, 0x56, 0xa5, 0x4b, 0xd0, + 0xb9, 0x90, 0x57, 0x33, 0x37, 0x15, 0xed, 0x5f, 0x0a, 0x2c, 0x51, 0x9a, 0x6f, 0xb4, 0x6d, 0xa3, + 0x63, 0x58, 0x8d, 0x67, 0x72, 0x1e, 0x74, 0x3d, 0x9c, 0xd9, 0x8d, 0xd1, 0xcc, 0x6e, 0x7b, 0xee, + 0xb3, 0x8f, 0x57, 0x8a, 0x81, 0x37, 0xbf, 0xfe, 0xc2, 0xf5, 0x9b, 0x9a, 0x9c, 0xee, 0xa1, 0x45, + 0x38, 0xed, 0xed, 0x46, 0x96, 0xed, 0x86, 0xf7, 0x79, 0xa2, 0x17, 0xd9, 0x07, 0x19, 0x98, 0x8d, + 0x2d, 0x36, 0xc5, 0x93, 0xef, 0xc3, 0x64, 0x5d, 0x70, 0x08, 0x3f, 0xde, 0x48, 0xb1, 0x78, 0x4c, + 0x62, 0x45, 0xfc, 0xd0, 0x7d, 0x09, 0x49, 0x97, 0xda, 0xd8, 0xf0, 0x4b, 0x2d, 0x1b, 0xb9, 0xd4, + 0xd4, 0x87, 0x70, 0x5a, 0xc8, 0x46, 0x1b, 0x00, 0x81, 0x9d, 0x79, 0x1a, 0x11, 0x0d, 0x1a, 0xd4, + 0xc8, 0x39, 0xdf, 0xc8, 0x74, 0x9d, 0x2c, 0xcd, 0x11, 0x57, 0x0d, 0xff, 0xa0, 0x96, 0x17, 0x28, + 0xc5, 0x49, 0xf2, 0x3e, 0xb5, 0x7f, 0x28, 0x3c, 0xa8, 0xf8, 0xeb, 0x7b, 0x26, 0xbf, 0x58, 0xe0, + 0xb5, 0xc2, 0x11, 0x57, 0x33, 0xa9, 0x8b, 0xaf, 0xf0, 0xfe, 0x66, 0x07, 0xee, 0xef, 0x78, 0x64, + 0x7f, 0xa3, 0x55, 0xc4, 0x44, 0xb4, 0x8a, 0x90, 0xdd, 0xea, 0x74, 0xc8, 0xad, 0x62, 0xae, 0xf1, + 0x08, 0xe6, 0x76, 0x71, 0xb0, 0x54, 0x69, 0xa5, 0xdc, 0x66, 0xfe, 0x4a, 0xb9, 0xd5, 0x36, 0x43, + 0xd6, 0xcf, 0xa4, 0x58, 0xff, 0xee, 0x29, 0xc9, 0xfe, 0xf1, 0xb4, 0x2a, 0x03, 0x10, 0xd8, 0x36, + 0xc5, 0x0d, 0xdf, 0x86, 0x42, 0x10, 0xb0, 0x3a, 0xa6, 0x4b, 0x84, 0x33, 0x5e, 0x1f, 0xe6, 0x8c, + 0x6e, 0x45, 0x8a, 0x85, 0x5e, 0xb2, 0x35, 0xed, 0xcb, 0x62, 0xe1, 0xec, 0x84, 0xbc, 0xf2, 0x5d, + 0xb9, 0x38, 0xf4, 0x13, 0xad, 0x52, 0xc8, 0x74, 0x9e, 0xe1, 0x6e, 0x41, 0xce, 0xc7, 0x20, 0x22, + 0x59, 0x79, 0xd8, 0x52, 0xf4, 0x60, 0x8a, 0x66, 0xc2, 0x05, 0x79, 0x9f, 0xb6, 0x98, 0x13, 0xed, + 0x63, 0xc2, 0x8b, 0xd2, 0x13, 0xbd, 0xf6, 0x3e, 0x1d, 0x83, 0x99, 0xa8, 0xfc, 0x94, 0x5d, 0xda, + 0x85, 0x79, 0xe6, 0xce, 0x06, 0xc1, 0x87, 0xb5, 0x58, 0x61, 0x9b, 0x1c, 0xfe, 0xe6, 0xfc, 0x19, + 0x7b, 0x81, 0xc3, 0x5e, 0x85, 0xd9, 0x40, 0x90, 0xe7, 0xba, 0x63, 0xfc, 0x7e, 0xf2, 0x07, 0xc4, + 0xfd, 0x84, 0xb6, 0x00, 0xe1, 0xc7, 0x66, 0x54, 0x65, 0x36, 0x5d, 0xe5, 0x0c, 0x67, 0x97, 0xf4, + 0x5d, 0x84, 0x82, 0x10, 0xe1, 0x29, 0x1b, 0x67, 0xca, 0xa6, 0x39, 0xd5, 0xd3, 0x74, 0x1b, 0xe6, + 0xdc, 0x8e, 0xe1, 0xb6, 0x23, 0xaa, 0x26, 0xd2, 0x55, 0xcd, 0x0a, 0x7e, 0x49, 0xd7, 0x2a, 0x14, + 0x3d, 0x21, 0xe1, 0x43, 0x59, 0x10, 0x64, 0x49, 0x1b, 0x7e, 0x17, 0x37, 0xa2, 0x0b, 0x9b, 0x1c, + 0xa0, 0x4d, 0xf0, 0x87, 0xb5, 0x79, 0x42, 0x3c, 0x6d, 0x39, 0xae, 0x4d, 0x90, 0x85, 0x36, 0xed, + 0x16, 0x9c, 0xf3, 0xdd, 0x69, 0x0f, 0x3b, 0x4d, 0xdb, 0xe9, 0xb2, 0xe0, 0x2d, 0x3c, 0x29, 0x12, + 0x63, 0x94, 0x58, 0xa7, 0xe2, 0x6f, 0x59, 0x58, 0x4a, 0x16, 0x20, 0xea, 0xa4, 0xd7, 0x40, 0x6d, + 0xf4, 0x1d, 0x07, 0x5b, 0xa4, 0x86, 0x9b, 0x4d, 0xcc, 0xb3, 0x18, 0xff, 0x6e, 0xe1, 0xc9, 0xc7, + 0xa2, 0xe0, 0xd8, 0xf1, 0x18, 0xfc, 0xdb, 0x69, 0x15, 0x8a, 0xa6, 0xd5, 0xe8, 0xf4, 0x5d, 0xd3, + 0xb6, 0x58, 0x62, 0xca, 0x9d, 0x2a, 0xab, 0x17, 0x7c, 0x32, 0xcd, 0x48, 0x5d, 0x54, 0x85, 0xb9, + 0x80, 0xf1, 0xd0, 0x74, 0x09, 0x97, 0xcf, 0x9d, 0x07, 0xf9, 0x43, 0x77, 0xbc, 0x11, 0x9a, 0x52, + 0x35, 0x6c, 0xc7, 0xc1, 0x0d, 0xd2, 0x39, 0xae, 0x1d, 0xd9, 0xd4, 0x52, 0xae, 0xdd, 0x77, 0x1a, + 0x98, 0xb9, 0xd0, 0xa4, 0x5e, 0xf2, 0x47, 0x1f, 0xd0, 0xc1, 0x7d, 0x36, 0x96, 0x34, 0x8b, 0x18, + 0x4e, 0x0b, 0x13, 0xe6, 0x39, 0xb1, 0x59, 0x07, 0x6c, 0x0c, 0x6d, 0x40, 0x29, 0x3a, 0x8b, 0x96, + 0x2c, 0xcc, 0x83, 0x26, 0x75, 0x14, 0x9e, 0xc3, 0x4a, 0xa7, 0x5d, 0x28, 0x7b, 0x36, 0xaa, 0xd5, + 0x71, 0xd3, 0x76, 0x30, 0x4f, 0xaf, 0x6b, 0xc4, 0x31, 0x2c, 0xd7, 0x64, 0x5d, 0x27, 0xee, 0x3e, + 0xe7, 0x3d, 0xbe, 0x6d, 0xc6, 0xc6, 0xd2, 0xec, 0x03, 0x9f, 0x09, 0xed, 0xc0, 0x8a, 0x2f, 0xc8, + 0x68, 0x12, 0xec, 0xc4, 0xe5, 0x4c, 0x32, 0x39, 0x4b, 0x1e, 0xdb, 0x16, 0xe5, 0x8a, 0x8a, 0x59, + 0x07, 0xd4, 0x35, 0x5d, 0xd7, 0xb4, 0x5a, 0x41, 0x06, 0xca, 0x5d, 0x2a, 0xaf, 0xcf, 0x8a, 0x11, + 0x29, 0x9a, 0xef, 0x42, 0xd9, 0x38, 0xc2, 0x0e, 0x0d, 0xac, 0xb1, 0xbc, 0xd5, 0xbb, 0x6f, 0x69, + 0x85, 0x91, 0xd1, 0xcf, 0x0b, 0xbe, 0xad, 0x70, 0x02, 0x2b, 0x1c, 0x40, 0xfb, 0x5d, 0x06, 0x0a, + 0x3e, 0xf1, 0xab, 0x7d, 0xdc, 0xc7, 0xd4, 0x25, 0x1b, 0xed, 0xbe, 0x63, 0xd5, 0x3a, 0x66, 0xd7, + 0xf4, 0xea, 0x4a, 0x60, 0xa4, 0xfb, 0x94, 0x82, 0xde, 0x10, 0xc9, 0x32, 0x6b, 0x64, 0x24, 0xc4, + 0xa3, 0xf9, 0x84, 0x33, 0xb4, 0xa8, 0x88, 0x1c, 0x9a, 0x4d, 0x92, 0x0e, 0xd2, 0xeb, 0xc0, 0xc2, + 0x46, 0x2d, 0x9e, 0xd5, 0xa5, 0x88, 0x61, 0x11, 0x45, 0x12, 0xf0, 0x45, 0x58, 0x92, 0xd0, 0xc4, + 0xd3, 0x6f, 0x9e, 0xf0, 0xa9, 0x01, 0xcf, 0x83, 0x48, 0x22, 0x4e, 0x7d, 0x8e, 0x41, 0x88, 0xcf, + 0xe5, 0xd1, 0xaa, 0x44, 0x47, 0xa3, 0xb3, 0xb4, 0x7f, 0x8b, 0x0e, 0x52, 0x70, 0x59, 0xb8, 0xae, + 0xd9, 0xb2, 0xba, 0xd8, 0x22, 0xff, 0xb7, 0x19, 0xee, 0x3f, 0xc7, 0xa0, 0x94, 0xb4, 0xde, 0x94, + 0x7b, 0xcb, 0x80, 0x29, 0x23, 0x60, 0x12, 0xa9, 0xc5, 0xeb, 0xc3, 0xee, 0x63, 0x49, 0x6e, 0x50, + 0x5d, 0x04, 0x44, 0x5d, 0x96, 0x79, 0x52, 0x39, 0xc6, 0x8f, 0x32, 0x30, 0x97, 0xa0, 0x8b, 0x5e, + 0x98, 0x5e, 0xa7, 0x3e, 0x5c, 0x98, 0x65, 0xf5, 0x99, 0x7a, 0xb4, 0x66, 0x5d, 0x85, 0xa2, 0xcf, + 0x55, 0x93, 0x73, 0xe1, 0x82, 0x4f, 0x66, 0xcd, 0x41, 0x74, 0x01, 0xa6, 0x79, 0x43, 0x11, 0x3b, + 0xbc, 0x19, 0xc0, 0x53, 0xe3, 0xbc, 0x47, 0x64, 0x3d, 0x80, 0x8b, 0x50, 0xe8, 0x39, 0x76, 0xcf, + 0x76, 0x05, 0x93, 0xb7, 0xb1, 0xd3, 0x1e, 0x95, 0xc7, 0xe5, 0x70, 0xaa, 0x38, 0xce, 0x52, 0xc5, + 0xb9, 0x58, 0xaa, 0xb8, 0xa8, 0xc8, 0xa9, 0xfa, 0x2a, 0x14, 0x43, 0xbe, 0x8e, 0x1f, 0xb3, 0xad, + 0xcf, 0xea, 0x05, 0xb9, 0x48, 0xc5, 0x8f, 0xb5, 0x26, 0x94, 0xe5, 0x74, 0x68, 0xcf, 0x70, 0x88, + 0xd9, 0x30, 0x7b, 0xbc, 0xab, 0x79, 0x82, 0xb9, 0xd0, 0xfb, 0x0a, 0x2c, 0xa7, 0x69, 0x11, 0xd7, + 0x5c, 0xb2, 0x87, 0x2d, 0x41, 0xce, 0xef, 0x05, 0x71, 0x35, 0x7a, 0x40, 0x40, 0xfb, 0x30, 0xdd, + 0x93, 0x85, 0x31, 0x3b, 0x4f, 0x6d, 0xae, 0x0f, 0xf3, 0xc0, 0x30, 0x82, 0xb0, 0x0c, 0xed, 0x00, + 0x16, 0xa4, 0x3e, 0xee, 0x9e, 0x6d, 0x77, 0x3c, 0x4b, 0x84, 0x4e, 0x9a, 0x32, 0xf0, 0xa4, 0x65, + 0x22, 0x27, 0x4d, 0x7b, 0x4f, 0x81, 0x33, 0x31, 0xb1, 0x9f, 0xcf, 0xd6, 0xf9, 0x0f, 0x14, 0xc8, + 0x7b, 0x6d, 0x00, 0xab, 0x69, 0xb6, 0xd0, 0x2e, 0x4c, 0x34, 0xd8, 0x2f, 0x81, 0xac, 0x3a, 0xa4, + 0x77, 0x40, 0x59, 0x2b, 0xfc, 0x0f, 0xef, 0xc4, 0x88, 0xe9, 0xea, 0x2b, 0x30, 0x25, 0x91, 0xe5, + 0x26, 0x45, 0x8e, 0x37, 0x29, 0x4a, 0x72, 0x93, 0x22, 0x27, 0x37, 0x1b, 0xb6, 0x60, 0x61, 0xbf, + 0x5f, 0xef, 0x9a, 0x64, 0x9f, 0x26, 0x7b, 0xa6, 0xd5, 0xf2, 0xad, 0x97, 0x90, 0x17, 0x2a, 0x49, + 0x79, 0xa1, 0x76, 0x0b, 0xe6, 0x77, 0xb9, 0x7f, 0x4a, 0x25, 0x29, 0x6f, 0x2d, 0x4a, 0xcd, 0xf4, + 0xa4, 0xd6, 0x19, 0x1b, 0xbe, 0xf2, 0x00, 0x72, 0xfe, 0x4b, 0x14, 0x5a, 0x00, 0xb4, 0x75, 0xe7, + 0x4e, 0xed, 0xc1, 0xd6, 0xfd, 0x7b, 0x77, 0xb6, 0x0e, 0xde, 0xd4, 0x6b, 0x6f, 0xec, 0x7c, 0x7d, + 0x7f, 0xe6, 0x14, 0x3a, 0x0b, 0xf3, 0xfa, 0xce, 0x57, 0xde, 0x7c, 0xb0, 0x13, 0x1d, 0x52, 0xe8, + 0x94, 0xfd, 0x9d, 0x83, 0x28, 0x3d, 0xb3, 0xf9, 0xa1, 0x0a, 0x53, 0xc2, 0x74, 0x6d, 0xc3, 0xb4, + 0xd0, 0x4f, 0x15, 0x98, 0x89, 0x3e, 0xb3, 0xa0, 0x4a, 0x8a, 0xcd, 0x53, 0x9e, 0x8d, 0xd4, 0xea, + 0xc8, 0xfc, 0xdc, 0x8c, 0xda, 0xe5, 0xef, 0xfc, 0xe5, 0xd3, 0x1f, 0x66, 0x2e, 0xa0, 0xe7, 0xaa, + 0x09, 0x4f, 0x7d, 0xd5, 0x90, 0x9f, 0x7d, 0x24, 0x9e, 0xab, 0x12, 0xde, 0x56, 0xd0, 0x4b, 0x03, + 0xf4, 0xa6, 0x3f, 0xc6, 0xa9, 0x37, 0x9e, 0x76, 0x9a, 0x40, 0xfd, 0x22, 0x43, 0x7d, 0x15, 0x5d, + 0x1e, 0x8a, 0xba, 0x2a, 0xde, 0x68, 0xd0, 0xf7, 0x14, 0x40, 0xfb, 0xc4, 0xc1, 0x46, 0x37, 0x04, + 0x7c, 0xa1, 0xc2, 0x5f, 0x47, 0x2b, 0xde, 0xeb, 0x68, 0x65, 0xa7, 0xdb, 0x23, 0xc7, 0xea, 0x08, + 0xc7, 0x50, 0xdb, 0x60, 0x28, 0xae, 0xa0, 0xb5, 0xe1, 0x28, 0x5c, 0xa6, 0x79, 0x43, 0x41, 0x3f, + 0x51, 0xe0, 0x2c, 0x87, 0x91, 0x64, 0xc6, 0x34, 0x34, 0xa3, 0x3f, 0x4a, 0x69, 0x37, 0x19, 0xa8, + 0x4d, 0xb4, 0x31, 0xb2, 0x69, 0x02, 0x70, 0x3f, 0x53, 0xa0, 0x18, 0x89, 0x56, 0x68, 0x7d, 0xb8, + 0x21, 0xa4, 0x60, 0xa9, 0x56, 0x46, 0x65, 0x17, 0x3b, 0x59, 0x61, 0x70, 0xd7, 0xd0, 0xa5, 0xe1, + 0x70, 0x7b, 0x14, 0xce, 0xf7, 0x15, 0x80, 0xe0, 0x55, 0x09, 0xad, 0x0d, 0x70, 0xa0, 0xd0, 0xd3, + 0x59, 0xaa, 0x09, 0xe3, 0x4f, 0x54, 0xda, 0x05, 0x86, 0xe9, 0x3c, 0x3a, 0x97, 0x88, 0xa9, 0xce, + 0x35, 0x7f, 0x1b, 0xf2, 0x7c, 0x1f, 0x05, 0x92, 0xb4, 0xad, 0x1b, 0xf9, 0xa9, 0x48, 0xbb, 0xc2, + 0xd4, 0x3e, 0x8f, 0xb4, 0x01, 0x6a, 0x83, 0xbd, 0xfa, 0x26, 0x14, 0xb9, 0xfe, 0xe0, 0xdd, 0x28, + 0x0d, 0x42, 0x5a, 0xab, 0xc4, 0x9f, 0xa9, 0xad, 0x33, 0xd5, 0xab, 0xe8, 0x62, 0xa2, 0x6a, 0xf6, + 0xdf, 0x0c, 0xb4, 0xf0, 0x0a, 0xb4, 0xf7, 0x20, 0xbf, 0xcb, 0xda, 0x1b, 0xcf, 0xac, 0xfa, 0x12, + 0x53, 0x5d, 0x46, 0xcb, 0x83, 0x55, 0xa3, 0x1f, 0x2b, 0x50, 0x62, 0x7b, 0x15, 0x4d, 0xcf, 0x5e, + 0x18, 0xb0, 0xb1, 0xb1, 0x97, 0x0d, 0x75, 0x75, 0xc4, 0x06, 0xb8, 0xb6, 0xca, 0x70, 0x3d, 0x87, + 0x56, 0x92, 0x71, 0x05, 0xfa, 0x7f, 0x1e, 0x6d, 0x78, 0xfa, 0x45, 0xf8, 0xb5, 0x01, 0xc8, 0xd2, + 0xba, 0xe7, 0xa9, 0xfe, 0x12, 0x9b, 0x90, 0x16, 0xba, 0x83, 0x3a, 0xb3, 0xea, 0x37, 0x92, 0xbf, + 0xab, 0x40, 0x21, 0xdc, 0x94, 0x1d, 0x68, 0xb6, 0x58, 0xef, 0x56, 0x7d, 0x6e, 0x68, 0xe3, 0x50, + 0x2b, 0x33, 0x38, 0x2a, 0x5a, 0x4c, 0x83, 0x83, 0xbe, 0xc5, 0x9c, 0xc6, 0x9f, 0x82, 0xae, 0xa4, + 0x08, 0x4d, 0x68, 0xa9, 0xaa, 0x43, 0xdb, 0x7d, 0xda, 0x0a, 0xd3, 0x7f, 0x16, 0x9d, 0x49, 0xd1, + 0x8f, 0x7e, 0xab, 0xc0, 0xd2, 0xa0, 0x2e, 0x20, 0x7a, 0x75, 0x04, 0x3c, 0x29, 0xad, 0xc3, 0x54, + 0xbf, 0x8a, 0xf2, 0xa7, 0x5d, 0x5d, 0xd2, 0xae, 0xf1, 0xca, 0xdf, 0xc5, 0xa4, 0x21, 0x70, 0x3d, + 0x81, 0x59, 0x19, 0x02, 0x2f, 0xe7, 0xd3, 0x4e, 0xdc, 0xc5, 0x61, 0x86, 0x62, 0xd3, 0xd3, 0x8e, + 0x9d, 0x04, 0xe3, 0x11, 0x53, 0xf3, 0x1b, 0x05, 0xce, 0x84, 0x6a, 0x85, 0xa0, 0x55, 0x85, 0x36, + 0x87, 0x26, 0xdc, 0xb1, 0xc6, 0x98, 0x7a, 0xed, 0xa9, 0xe6, 0x88, 0x80, 0xfc, 0x02, 0x03, 0x7b, + 0x09, 0x3d, 0x9f, 0x0a, 0xb6, 0x27, 0xc1, 0xfa, 0xb5, 0xf8, 0x7f, 0x95, 0xc4, 0x8a, 0xf6, 0xc6, + 0x28, 0x6e, 0x1f, 0x2f, 0xf9, 0xd5, 0xab, 0x4f, 0x51, 0xde, 0x8e, 0x80, 0x57, 0xae, 0x75, 0x3f, + 0x52, 0xe0, 0x6c, 0x6a, 0x39, 0x86, 0x5e, 0x1e, 0xc1, 0x29, 0x93, 0x0a, 0x38, 0xf5, 0xa5, 0xa7, + 0x2b, 0x87, 0x86, 0x5c, 0xc8, 0xb2, 0xad, 0x43, 0xf8, 0x5c, 0x28, 0xee, 0x62, 0x12, 0x2a, 0x1c, + 0xd2, 0x5c, 0xf3, 0xc2, 0x08, 0x05, 0xc4, 0x90, 0xcb, 0x97, 0x57, 0x14, 0x34, 0x51, 0x29, 0xf1, + 0xdb, 0x2f, 0x08, 0x40, 0xf7, 0xac, 0xa6, 0x8d, 0x2e, 0x0f, 0x5b, 0xb4, 0xff, 0x6f, 0x68, 0xea, + 0xf3, 0xc3, 0x58, 0xa9, 0x40, 0xed, 0x1a, 0x83, 0xb3, 0x8e, 0xae, 0x26, 0xc2, 0x91, 0xac, 0x62, + 0x5a, 0x4d, 0x5b, 0xdc, 0x8f, 0x6b, 0xca, 0x86, 0x82, 0xde, 0x53, 0xbc, 0xd2, 0x65, 0xcb, 0x2f, + 0xff, 0x79, 0x09, 0x83, 0x56, 0x07, 0xe6, 0x48, 0x01, 0xa3, 0x9a, 0x96, 0x7b, 0x25, 0x97, 0x44, + 0xda, 0x0d, 0x86, 0x75, 0x03, 0x55, 0x12, 0xb1, 0xba, 0x82, 0xdd, 0xad, 0x7a, 0xfd, 0x88, 0xaa, + 0xcb, 0xe4, 0x48, 0x50, 0xf7, 0xfc, 0x1e, 0xc4, 0x10, 0xa8, 0x51, 0xc6, 0xff, 0x15, 0x54, 0xaf, + 0x29, 0x22, 0xa0, 0x6e, 0xff, 0x42, 0xf9, 0xe3, 0x27, 0xcb, 0xca, 0x9f, 0x3f, 0x59, 0x56, 0xfe, + 0xfe, 0xc9, 0xb2, 0x02, 0x67, 0x6d, 0xa7, 0x95, 0xac, 0x78, 0x7b, 0x46, 0xaa, 0xad, 0xf6, 0xa8, + 0x1f, 0xee, 0x29, 0xdf, 0xb8, 0x21, 0xfd, 0xcf, 0x65, 0xcf, 0x39, 0x76, 0xbb, 0x06, 0x31, 0x1b, + 0x1d, 0xa3, 0xee, 0x56, 0x3d, 0x19, 0x46, 0xcf, 0x74, 0x43, 0x90, 0xbe, 0x80, 0x49, 0xfb, 0x57, + 0x99, 0xf9, 0x1d, 0x4f, 0xc7, 0x8e, 0xa4, 0xe3, 0x4f, 0x01, 0xfd, 0x9d, 0x1d, 0xd2, 0x7e, 0xc7, + 0xa3, 0xd7, 0x27, 0x98, 0xe3, 0x5f, 0xfb, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x35, 0xce, + 0xa9, 0x1c, 0x2a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5978,6 +6009,40 @@ func (m *ValidatorQueue) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], b) } } + if len(m.ActivationValidatorIndices) > 0 { + dAtA37 := make([]byte, len(m.ActivationValidatorIndices)*10) + var j36 int + for _, num := range m.ActivationValidatorIndices { + for num >= 1<<7 { + dAtA37[j36] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j36++ + } + dAtA37[j36] = uint8(num) + j36++ + } + dAtA[i] = 0x22 + i++ + i = encodeVarintBeaconChain(dAtA, i, uint64(j36)) + i += copy(dAtA[i:], dAtA37[:j36]) + } + if len(m.ExitValidatorIndices) > 0 { + dAtA39 := make([]byte, len(m.ExitValidatorIndices)*10) + var j38 int + for _, num := range m.ExitValidatorIndices { + for num >= 1<<7 { + dAtA39[j38] = uint8(uint64(num)&0x7f | 0x80) + num >>= 7 + j38++ + } + dAtA39[j38] = uint8(num) + j38++ + } + dAtA[i] = 0x2a + i++ + i = encodeVarintBeaconChain(dAtA, i, uint64(j38)) + i += copy(dAtA[i:], dAtA39[:j38]) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -6000,11 +6065,11 @@ func (m *ListValidatorAssignmentsRequest) MarshalTo(dAtA []byte) (int, error) { var l int _ = l if m.QueryFilter != nil { - nn36, err := m.QueryFilter.MarshalTo(dAtA[i:]) + nn40, err := m.QueryFilter.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += nn36 + i += nn40 } if len(m.PublicKeys) > 0 { for _, b := range m.PublicKeys { @@ -6015,21 +6080,21 @@ func (m *ListValidatorAssignmentsRequest) MarshalTo(dAtA []byte) (int, error) { } } if len(m.Indices) > 0 { - dAtA38 := make([]byte, len(m.Indices)*10) - var j37 int + dAtA42 := make([]byte, len(m.Indices)*10) + var j41 int for _, num := range m.Indices { for num >= 1<<7 { - dAtA38[j37] = uint8(uint64(num)&0x7f | 0x80) + dAtA42[j41] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j37++ + j41++ } - dAtA38[j37] = uint8(num) - j37++ + dAtA42[j41] = uint8(num) + j41++ } dAtA[i] = 0x22 i++ - i = encodeVarintBeaconChain(dAtA, i, uint64(j37)) - i += copy(dAtA[i:], dAtA38[:j37]) + i = encodeVarintBeaconChain(dAtA, i, uint64(j41)) + i += copy(dAtA[i:], dAtA42[:j41]) } if m.PageSize != 0 { dAtA[i] = 0x28 @@ -6132,21 +6197,21 @@ func (m *ValidatorAssignments_CommitteeAssignment) MarshalTo(dAtA []byte) (int, var l int _ = l if len(m.BeaconCommittees) > 0 { - dAtA40 := make([]byte, len(m.BeaconCommittees)*10) - var j39 int + dAtA44 := make([]byte, len(m.BeaconCommittees)*10) + var j43 int for _, num := range m.BeaconCommittees { for num >= 1<<7 { - dAtA40[j39] = uint8(uint64(num)&0x7f | 0x80) + dAtA44[j43] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j39++ + j43++ } - dAtA40[j39] = uint8(num) - j39++ + dAtA44[j43] = uint8(num) + j43++ } dAtA[i] = 0xa i++ - i = encodeVarintBeaconChain(dAtA, i, uint64(j39)) - i += copy(dAtA[i:], dAtA40[:j39]) + i = encodeVarintBeaconChain(dAtA, i, uint64(j43)) + i += copy(dAtA[i:], dAtA44[:j43]) } if m.CommitteeIndex != 0 { dAtA[i] = 0x10 @@ -6159,21 +6224,21 @@ func (m *ValidatorAssignments_CommitteeAssignment) MarshalTo(dAtA []byte) (int, i = encodeVarintBeaconChain(dAtA, i, uint64(m.AttesterSlot)) } if len(m.ProposerSlots) > 0 { - dAtA42 := make([]byte, len(m.ProposerSlots)*10) - var j41 int + dAtA46 := make([]byte, len(m.ProposerSlots)*10) + var j45 int for _, num := range m.ProposerSlots { for num >= 1<<7 { - dAtA42[j41] = uint8(uint64(num)&0x7f | 0x80) + dAtA46[j45] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j41++ + j45++ } - dAtA42[j41] = uint8(num) - j41++ + dAtA46[j45] = uint8(num) + j45++ } dAtA[i] = 0x22 i++ - i = encodeVarintBeaconChain(dAtA, i, uint64(j41)) - i += copy(dAtA[i:], dAtA42[:j41]) + i = encodeVarintBeaconChain(dAtA, i, uint64(j45)) + i += copy(dAtA[i:], dAtA46[:j45]) } if len(m.PublicKey) > 0 { dAtA[i] = 0x2a @@ -6181,6 +6246,11 @@ func (m *ValidatorAssignments_CommitteeAssignment) MarshalTo(dAtA []byte) (int, i = encodeVarintBeaconChain(dAtA, i, uint64(len(m.PublicKey))) i += copy(dAtA[i:], m.PublicKey) } + if m.ValidatorIndex != 0 { + dAtA[i] = 0x30 + i++ + i = encodeVarintBeaconChain(dAtA, i, uint64(m.ValidatorIndex)) + } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) } @@ -6203,11 +6273,11 @@ func (m *GetValidatorParticipationRequest) MarshalTo(dAtA []byte) (int, error) { var l int _ = l if m.QueryFilter != nil { - nn43, err := m.QueryFilter.MarshalTo(dAtA[i:]) + nn47, err := m.QueryFilter.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += nn43 + i += nn47 } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -6268,11 +6338,11 @@ func (m *ValidatorParticipationResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ i = encodeVarintBeaconChain(dAtA, i, uint64(m.Participation.Size())) - n44, err := m.Participation.MarshalTo(dAtA[i:]) + n48, err := m.Participation.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n44 + i += n48 } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -6410,21 +6480,21 @@ func (m *SubmitSlashingResponse) MarshalTo(dAtA []byte) (int, error) { var l int _ = l if len(m.SlashedIndices) > 0 { - dAtA46 := make([]byte, len(m.SlashedIndices)*10) - var j45 int + dAtA50 := make([]byte, len(m.SlashedIndices)*10) + var j49 int for _, num := range m.SlashedIndices { for num >= 1<<7 { - dAtA46[j45] = uint8(uint64(num)&0x7f | 0x80) + dAtA50[j49] = uint8(uint64(num)&0x7f | 0x80) num >>= 7 - j45++ + j49++ } - dAtA46[j45] = uint8(num) - j45++ + dAtA50[j49] = uint8(num) + j49++ } dAtA[i] = 0xa i++ - i = encodeVarintBeaconChain(dAtA, i, uint64(j45)) - i += copy(dAtA[i:], dAtA46[:j45]) + i = encodeVarintBeaconChain(dAtA, i, uint64(j49)) + i += copy(dAtA[i:], dAtA50[:j49]) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -7324,6 +7394,20 @@ func (m *ValidatorQueue) Size() (n int) { n += 1 + l + sovBeaconChain(uint64(l)) } } + if len(m.ActivationValidatorIndices) > 0 { + l = 0 + for _, e := range m.ActivationValidatorIndices { + l += sovBeaconChain(uint64(e)) + } + n += 1 + sovBeaconChain(uint64(l)) + l + } + if len(m.ExitValidatorIndices) > 0 { + l = 0 + for _, e := range m.ExitValidatorIndices { + l += sovBeaconChain(uint64(e)) + } + n += 1 + sovBeaconChain(uint64(l)) + l + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -7441,6 +7525,9 @@ func (m *ValidatorAssignments_CommitteeAssignment) Size() (n int) { if l > 0 { n += 1 + l + sovBeaconChain(uint64(l)) } + if m.ValidatorIndex != 0 { + n += 1 + sovBeaconChain(uint64(m.ValidatorIndex)) + } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -12284,6 +12371,158 @@ func (m *ValidatorQueue) Unmarshal(dAtA []byte) error { m.ExitPublicKeys = append(m.ExitPublicKeys, make([]byte, postIndex-iNdEx)) copy(m.ExitPublicKeys[len(m.ExitPublicKeys)-1], dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBeaconChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.ActivationValidatorIndices = append(m.ActivationValidatorIndices, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBeaconChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthBeaconChain + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthBeaconChain + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.ActivationValidatorIndices) == 0 { + m.ActivationValidatorIndices = make([]uint64, 0, elementCount) + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBeaconChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.ActivationValidatorIndices = append(m.ActivationValidatorIndices, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field ActivationValidatorIndices", wireType) + } + case 5: + if wireType == 0 { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBeaconChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.ExitValidatorIndices = append(m.ExitValidatorIndices, v) + } else if wireType == 2 { + var packedLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBeaconChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + packedLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if packedLen < 0 { + return ErrInvalidLengthBeaconChain + } + postIndex := iNdEx + packedLen + if postIndex < 0 { + return ErrInvalidLengthBeaconChain + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + var elementCount int + var count int + for _, integer := range dAtA[iNdEx:postIndex] { + if integer < 128 { + count++ + } + } + elementCount = count + if elementCount != 0 && len(m.ExitValidatorIndices) == 0 { + m.ExitValidatorIndices = make([]uint64, 0, elementCount) + } + for iNdEx < postIndex { + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBeaconChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.ExitValidatorIndices = append(m.ExitValidatorIndices, v) + } + } else { + return fmt.Errorf("proto: wrong wireType = %d for field ExitValidatorIndices", wireType) + } default: iNdEx = preIndex skippy, err := skipBeaconChain(dAtA[iNdEx:]) @@ -12974,6 +13213,25 @@ func (m *ValidatorAssignments_CommitteeAssignment) Unmarshal(dAtA []byte) error m.PublicKey = []byte{} } iNdEx = postIndex + case 6: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorIndex", wireType) + } + m.ValidatorIndex = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowBeaconChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ValidatorIndex |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipBeaconChain(dAtA[iNdEx:]) diff --git a/eth/v1alpha1/beacon_chain.proto b/eth/v1alpha1/beacon_chain.proto index 08033ce6..5e33f78a 100644 --- a/eth/v1alpha1/beacon_chain.proto +++ b/eth/v1alpha1/beacon_chain.proto @@ -658,11 +658,19 @@ message ValidatorQueue { // Ordered list of 48 byte public keys awaiting activation. 0th index is the // next key to be processed. - repeated bytes activation_public_keys = 2 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; + repeated bytes activation_public_keys = 2 [(gogoproto.moretags) = "ssz-size:\"?,48\"", deprecated = true]; // Ordered list of public keys awaiting exit. 0th index is the next key to // be processed. - repeated bytes exit_public_keys = 3 [(gogoproto.moretags) = "ssz-size:\"?,48\""]; + repeated bytes exit_public_keys = 3 [(gogoproto.moretags) = "ssz-size:\"?,48\"", deprecated = true]; + + // Ordered list of validator indices awaiting activation. 0th item in the list is the + // next validator index to be processed. + repeated uint64 activation_validator_indices = 4; + + // Ordered list of validator indices awaiting exit. 0th item in the list is the + // next validator index to be processed. + repeated uint64 exit_validator_indices = 5; } message ListValidatorAssignmentsRequest { @@ -708,7 +716,10 @@ message ValidatorAssignments { repeated uint64 proposer_slots = 4; // 48 byte BLS public key. - bytes public_key = 5 [(gogoproto.moretags) = "ssz-size:\"48\""]; + bytes public_key = 5 [(gogoproto.moretags) = "ssz-size:\"48\"", deprecated = true]; + + // Validator index in the beacon state. + uint64 validator_index = 6; } // The epoch for which this set of validator assignments is valid. diff --git a/eth/v1alpha1/generated.ssz.go b/eth/v1alpha1/generated.ssz.go index 23db2a84..4b4fc34f 100755 --- a/eth/v1alpha1/generated.ssz.go +++ b/eth/v1alpha1/generated.ssz.go @@ -18,6 +18,88 @@ var ( errSize = fmt.Errorf("incorrect size") ) +// MarshalSSZ ssz marshals the Validator object +func (v *Validator) MarshalSSZ() ([]byte, error) { + buf := make([]byte, v.SizeSSZ()) + return v.MarshalSSZTo(buf[:0]) +} + +// MarshalSSZTo ssz marshals the Validator object to a target array +func (v *Validator) MarshalSSZTo(dst []byte) ([]byte, error) { + var err error + + // Field (0) 'PublicKey' + if dst, err = ssz.MarshalFixedBytes(dst, v.PublicKey, 48); err != nil { + return nil, errMarshalFixedBytes + } + + // Field (1) 'WithdrawalCredentials' + if dst, err = ssz.MarshalFixedBytes(dst, v.WithdrawalCredentials, 32); err != nil { + return nil, errMarshalFixedBytes + } + + // Field (2) 'EffectiveBalance' + dst = ssz.MarshalUint64(dst, v.EffectiveBalance) + + // Field (3) 'Slashed' + dst = ssz.MarshalBool(dst, v.Slashed) + + // Field (4) 'ActivationEligibilityEpoch' + dst = ssz.MarshalUint64(dst, v.ActivationEligibilityEpoch) + + // Field (5) 'ActivationEpoch' + dst = ssz.MarshalUint64(dst, v.ActivationEpoch) + + // Field (6) 'ExitEpoch' + dst = ssz.MarshalUint64(dst, v.ExitEpoch) + + // Field (7) 'WithdrawableEpoch' + dst = ssz.MarshalUint64(dst, v.WithdrawableEpoch) + + return dst, err +} + +// UnmarshalSSZ ssz unmarshals the Validator object +func (v *Validator) UnmarshalSSZ(buf []byte) error { + var err error + size := uint64(len(buf)) + if size != 121 { + return errSize + } + + // Field (0) 'PublicKey' + v.PublicKey = append(v.PublicKey, buf[0:48]...) + + // Field (1) 'WithdrawalCredentials' + v.WithdrawalCredentials = append(v.WithdrawalCredentials, buf[48:80]...) + + // Field (2) 'EffectiveBalance' + v.EffectiveBalance = ssz.UnmarshallUint64(buf[80:88]) + + // Field (3) 'Slashed' + v.Slashed = ssz.UnmarshalBool(buf[88:89]) + + // Field (4) 'ActivationEligibilityEpoch' + v.ActivationEligibilityEpoch = ssz.UnmarshallUint64(buf[89:97]) + + // Field (5) 'ActivationEpoch' + v.ActivationEpoch = ssz.UnmarshallUint64(buf[97:105]) + + // Field (6) 'ExitEpoch' + v.ExitEpoch = ssz.UnmarshallUint64(buf[105:113]) + + // Field (7) 'WithdrawableEpoch' + v.WithdrawableEpoch = ssz.UnmarshallUint64(buf[113:121]) + + return err +} + +// SizeSSZ returns the ssz encoded size in bytes for the Validator object +func (v *Validator) SizeSSZ() (size int) { + size = 121 + return +} + // MarshalSSZ ssz marshals the Attestation object func (a *Attestation) MarshalSSZ() ([]byte, error) { buf := make([]byte, a.SizeSSZ()) @@ -1351,85 +1433,3 @@ func (i *IndexedAttestation) SizeSSZ() (size int) { return } - -// MarshalSSZ ssz marshals the Validator object -func (v *Validator) MarshalSSZ() ([]byte, error) { - buf := make([]byte, v.SizeSSZ()) - return v.MarshalSSZTo(buf[:0]) -} - -// MarshalSSZTo ssz marshals the Validator object to a target array -func (v *Validator) MarshalSSZTo(dst []byte) ([]byte, error) { - var err error - - // Field (0) 'PublicKey' - if dst, err = ssz.MarshalFixedBytes(dst, v.PublicKey, 48); err != nil { - return nil, errMarshalFixedBytes - } - - // Field (1) 'WithdrawalCredentials' - if dst, err = ssz.MarshalFixedBytes(dst, v.WithdrawalCredentials, 32); err != nil { - return nil, errMarshalFixedBytes - } - - // Field (2) 'EffectiveBalance' - dst = ssz.MarshalUint64(dst, v.EffectiveBalance) - - // Field (3) 'Slashed' - dst = ssz.MarshalBool(dst, v.Slashed) - - // Field (4) 'ActivationEligibilityEpoch' - dst = ssz.MarshalUint64(dst, v.ActivationEligibilityEpoch) - - // Field (5) 'ActivationEpoch' - dst = ssz.MarshalUint64(dst, v.ActivationEpoch) - - // Field (6) 'ExitEpoch' - dst = ssz.MarshalUint64(dst, v.ExitEpoch) - - // Field (7) 'WithdrawableEpoch' - dst = ssz.MarshalUint64(dst, v.WithdrawableEpoch) - - return dst, err -} - -// UnmarshalSSZ ssz unmarshals the Validator object -func (v *Validator) UnmarshalSSZ(buf []byte) error { - var err error - size := uint64(len(buf)) - if size != 121 { - return errSize - } - - // Field (0) 'PublicKey' - v.PublicKey = append(v.PublicKey, buf[0:48]...) - - // Field (1) 'WithdrawalCredentials' - v.WithdrawalCredentials = append(v.WithdrawalCredentials, buf[48:80]...) - - // Field (2) 'EffectiveBalance' - v.EffectiveBalance = ssz.UnmarshallUint64(buf[80:88]) - - // Field (3) 'Slashed' - v.Slashed = ssz.UnmarshalBool(buf[88:89]) - - // Field (4) 'ActivationEligibilityEpoch' - v.ActivationEligibilityEpoch = ssz.UnmarshallUint64(buf[89:97]) - - // Field (5) 'ActivationEpoch' - v.ActivationEpoch = ssz.UnmarshallUint64(buf[97:105]) - - // Field (6) 'ExitEpoch' - v.ExitEpoch = ssz.UnmarshallUint64(buf[105:113]) - - // Field (7) 'WithdrawableEpoch' - v.WithdrawableEpoch = ssz.UnmarshallUint64(buf[113:121]) - - return err -} - -// SizeSSZ returns the ssz encoded size in bytes for the Validator object -func (v *Validator) SizeSSZ() (size int) { - size = 121 - return -}