From 3c570e77625a1f0f12e8a89fc1c472aca451d995 Mon Sep 17 00:00:00 2001 From: Terence Tsao Date: Mon, 4 Nov 2019 08:02:54 -0800 Subject: [PATCH 1/3] Use proposer slot --- beacon-chain/rpc/validator_server.go | 13 +- beacon-chain/rpc/validator_server_test.go | 8 +- proto/beacon/rpc/v1/services.pb.go | 264 ++++++++++++--------- proto/beacon/rpc/v1/services.proto | 7 +- proto/beacon/rpc/v1_gateway/services.pb.go | 215 +++++++++-------- validator/client/validator.go | 6 +- 6 files changed, 280 insertions(+), 233 deletions(-) diff --git a/beacon-chain/rpc/validator_server.go b/beacon-chain/rpc/validator_server.go index f6cb539fb5eb..57be4f49da10 100644 --- a/beacon-chain/rpc/validator_server.go +++ b/beacon-chain/rpc/validator_server.go @@ -195,17 +195,18 @@ func (vs *ValidatorServer) CommitteeAssignment(ctx context.Context, req *pb.Assi func (vs *ValidatorServer) assignment(idx uint64, beaconState *pbp2p.BeaconState, epoch uint64) (*pb.AssignmentResponse_ValidatorAssignment, error) { // TODO(3865): Update ValidatorAssignments_CommitteeAssignment to take in proposer slot - committee, shard, slot, isProposer, _, err := helpers.CommitteeAssignment(beaconState, epoch, idx) + committee, shard, aSlot, isProposer, pSlot, err := helpers.CommitteeAssignment(beaconState, epoch, idx) if err != nil { return nil, err } status := vs.assignmentStatus(idx, beaconState) return &pb.AssignmentResponse_ValidatorAssignment{ - Committee: committee, - Shard: shard, - Slot: slot, - IsProposer: isProposer, - Status: status, + Committee: committee, + Shard: shard, + AttesterSlot: aSlot, + IsProposer: isProposer, + ProposerSlot: pSlot, + Status: status, }, nil } diff --git a/beacon-chain/rpc/validator_server_test.go b/beacon-chain/rpc/validator_server_test.go index 4d6ff5bf6251..7f9142b6b511 100644 --- a/beacon-chain/rpc/validator_server_test.go +++ b/beacon-chain/rpc/validator_server_test.go @@ -177,9 +177,9 @@ func TestCommitteeAssignment_OK(t *testing.T) { if err != nil { t.Fatalf("Could not call epoch committee assignment %v", err) } - if res.ValidatorAssignment[0].Slot > state.Slot+params.BeaconConfig().SlotsPerEpoch { + if res.ValidatorAssignment[0].AttesterSlot > state.Slot+params.BeaconConfig().SlotsPerEpoch { t.Errorf("Assigned slot %d can't be higher than %d", - res.ValidatorAssignment[0].Slot, state.Slot+params.BeaconConfig().SlotsPerEpoch) + res.ValidatorAssignment[0].AttesterSlot, state.Slot+params.BeaconConfig().SlotsPerEpoch) } // Test the last validator in registry. @@ -192,9 +192,9 @@ func TestCommitteeAssignment_OK(t *testing.T) { if err != nil { t.Fatalf("Could not call epoch committee assignment %v", err) } - if res.ValidatorAssignment[0].Slot > state.Slot+params.BeaconConfig().SlotsPerEpoch { + if res.ValidatorAssignment[0].AttesterSlot > state.Slot+params.BeaconConfig().SlotsPerEpoch { t.Errorf("Assigned slot %d can't be higher than %d", - res.ValidatorAssignment[0].Slot, state.Slot+params.BeaconConfig().SlotsPerEpoch) + res.ValidatorAssignment[0].AttesterSlot, state.Slot+params.BeaconConfig().SlotsPerEpoch) } } diff --git a/proto/beacon/rpc/v1/services.pb.go b/proto/beacon/rpc/v1/services.pb.go index bdba22dc3238..78d294e11abb 100755 --- a/proto/beacon/rpc/v1/services.pb.go +++ b/proto/beacon/rpc/v1/services.pb.go @@ -958,10 +958,11 @@ func (m *AssignmentResponse) GetValidatorAssignment() []*AssignmentResponse_Vali type AssignmentResponse_ValidatorAssignment struct { Committee []uint64 `protobuf:"varint,1,rep,packed,name=committee,proto3" json:"committee,omitempty"` Shard uint64 `protobuf:"varint,2,opt,name=shard,proto3" json:"shard,omitempty"` - Slot uint64 `protobuf:"varint,3,opt,name=slot,proto3" json:"slot,omitempty"` + AttesterSlot uint64 `protobuf:"varint,3,opt,name=attesterSlot,proto3" json:"attesterSlot,omitempty"` IsProposer bool `protobuf:"varint,4,opt,name=is_proposer,json=isProposer,proto3" json:"is_proposer,omitempty"` - PublicKey []byte `protobuf:"bytes,5,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` - Status ValidatorStatus `protobuf:"varint,6,opt,name=status,proto3,enum=ethereum.beacon.rpc.v1.ValidatorStatus" json:"status,omitempty"` + ProposerSlot uint64 `protobuf:"varint,5,opt,name=proposerSlot,proto3" json:"proposerSlot,omitempty"` + PublicKey []byte `protobuf:"bytes,6,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` + Status ValidatorStatus `protobuf:"varint,7,opt,name=status,proto3,enum=ethereum.beacon.rpc.v1.ValidatorStatus" json:"status,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1016,9 +1017,9 @@ func (m *AssignmentResponse_ValidatorAssignment) GetShard() uint64 { return 0 } -func (m *AssignmentResponse_ValidatorAssignment) GetSlot() uint64 { +func (m *AssignmentResponse_ValidatorAssignment) GetAttesterSlot() uint64 { if m != nil { - return m.Slot + return m.AttesterSlot } return 0 } @@ -1030,6 +1031,13 @@ func (m *AssignmentResponse_ValidatorAssignment) GetIsProposer() bool { return false } +func (m *AssignmentResponse_ValidatorAssignment) GetProposerSlot() uint64 { + if m != nil { + return m.ProposerSlot + } + return 0 +} + func (m *AssignmentResponse_ValidatorAssignment) GetPublicKey() []byte { if m != nil { return m.PublicKey @@ -1429,105 +1437,106 @@ func init() { func init() { proto.RegisterFile("proto/beacon/rpc/v1/services.proto", fileDescriptor_9eb4e94b85965285) } var fileDescriptor_9eb4e94b85965285 = []byte{ - // 1564 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xcf, 0x6e, 0x13, 0x49, - 0x13, 0x67, 0x1c, 0xc7, 0x09, 0x65, 0x27, 0x99, 0x74, 0x4c, 0x62, 0x4c, 0x80, 0x7c, 0xf3, 0xc1, - 0xf7, 0x25, 0x91, 0xb0, 0x13, 0x83, 0x10, 0x0b, 0x62, 0x91, 0x13, 0x0f, 0xc1, 0x02, 0x39, 0x61, - 0x6c, 0x12, 0x56, 0x1c, 0x46, 0x6d, 0xbb, 0x89, 0x47, 0xd8, 0xd3, 0x93, 0x99, 0xb6, 0x45, 0x2e, - 0x2b, 0xed, 0x23, 0xec, 0x61, 0xcf, 0xab, 0x7d, 0x86, 0x3d, 0xec, 0x2b, 0x70, 0xdc, 0x07, 0x58, - 0xad, 0x56, 0x68, 0x0f, 0xfb, 0x18, 0xab, 0xe9, 0xee, 0xf9, 0x13, 0x3b, 0x26, 0x0e, 0x37, 0x77, - 0x55, 0xfd, 0xaa, 0xaa, 0xab, 0xaa, 0xab, 0x6a, 0x0c, 0x9a, 0xe3, 0x52, 0x46, 0x8b, 0x4d, 0x82, - 0x5b, 0xd4, 0x2e, 0xba, 0x4e, 0xab, 0x38, 0xd8, 0x2e, 0x7a, 0xc4, 0x1d, 0x58, 0x2d, 0xe2, 0x15, - 0x38, 0x13, 0x2d, 0x13, 0xd6, 0x21, 0x2e, 0xe9, 0xf7, 0x0a, 0x42, 0xac, 0xe0, 0x3a, 0xad, 0xc2, - 0x60, 0x3b, 0x7f, 0xe3, 0x98, 0xd2, 0xe3, 0x2e, 0x29, 0x72, 0xa9, 0x66, 0xff, 0x7d, 0x91, 0xf4, - 0x1c, 0x76, 0x2a, 0x40, 0xf9, 0xbb, 0x42, 0x31, 0x61, 0x9d, 0xe2, 0x60, 0x1b, 0x77, 0x9d, 0x0e, - 0xde, 0x96, 0x56, 0xcc, 0x66, 0x97, 0xb6, 0x3e, 0x48, 0xb1, 0x3b, 0xe7, 0x88, 0x61, 0xc6, 0x88, - 0xc7, 0x30, 0xb3, 0xa8, 0x2d, 0xa5, 0x56, 0xa5, 0x25, 0xec, 0x58, 0x45, 0x6c, 0xdb, 0x54, 0x30, - 0xa5, 0x7f, 0xda, 0x1e, 0x64, 0x76, 0x7c, 0x95, 0x06, 0x39, 0xe9, 0x13, 0x8f, 0x21, 0x04, 0x49, - 0xaf, 0x4b, 0x59, 0x4e, 0x59, 0x53, 0xd6, 0x93, 0x06, 0xff, 0x8d, 0xfe, 0x0b, 0x73, 0x2e, 0xb6, - 0xdb, 0x98, 0x9a, 0x2e, 0x19, 0x10, 0xdc, 0xcd, 0x25, 0xd6, 0x94, 0xf5, 0x8c, 0x91, 0x11, 0x44, - 0x83, 0xd3, 0xb4, 0x2d, 0x58, 0x38, 0x70, 0xa9, 0x43, 0x3d, 0x62, 0x10, 0xcf, 0xa1, 0xb6, 0x47, - 0xd0, 0x4d, 0x00, 0xee, 0xae, 0xe9, 0x52, 0xa9, 0x31, 0x63, 0x5c, 0xe5, 0x14, 0x83, 0x52, 0xa6, - 0x0d, 0x00, 0x95, 0x23, 0x6f, 0x03, 0x07, 0x6e, 0x02, 0x38, 0xfd, 0x66, 0xd7, 0x6a, 0x99, 0x1f, - 0xc8, 0x69, 0x00, 0x12, 0x94, 0x97, 0xe4, 0x14, 0xad, 0xc0, 0x8c, 0x43, 0x5b, 0x66, 0xd3, 0x62, - 0xd2, 0x8b, 0x94, 0x43, 0x5b, 0x3b, 0x56, 0xe4, 0xf8, 0x54, 0xcc, 0xf1, 0x2c, 0x4c, 0x7b, 0x1d, - 0xec, 0xb6, 0x73, 0x49, 0x4e, 0x14, 0x07, 0xed, 0x0e, 0xcc, 0x0b, 0xbb, 0xa1, 0xa3, 0x08, 0x92, - 0x31, 0x17, 0xf9, 0x6f, 0xcd, 0x80, 0x1b, 0x87, 0xb8, 0x6b, 0xb5, 0x31, 0xa3, 0xee, 0x01, 0x71, - 0xdf, 0x53, 0xb7, 0x87, 0xed, 0x16, 0xf9, 0x52, 0x9c, 0x6e, 0x43, 0x3a, 0x72, 0xdd, 0xcb, 0x25, - 0xd6, 0xa6, 0xd6, 0x33, 0x06, 0x84, 0xbe, 0x7b, 0xda, 0x4f, 0x09, 0x58, 0x3d, 0x5f, 0xa9, 0x74, - 0x24, 0x0f, 0xb3, 0x4d, 0xdc, 0xf5, 0x49, 0x5e, 0x4e, 0x59, 0x9b, 0x5a, 0x4f, 0x1a, 0xe1, 0x19, - 0x6d, 0x80, 0xca, 0x28, 0xc3, 0x5d, 0x73, 0x10, 0x68, 0xf0, 0x78, 0x08, 0x92, 0xc6, 0x02, 0xa7, - 0x87, 0x8a, 0x3d, 0xf4, 0x10, 0x56, 0x84, 0x28, 0x6e, 0x31, 0x6b, 0x40, 0xe2, 0x08, 0x11, 0x9e, - 0x6b, 0x9c, 0x5d, 0xe6, 0xdc, 0x18, 0xee, 0x1e, 0xa0, 0x9e, 0xe5, 0x79, 0x96, 0x7d, 0x1c, 0x87, - 0x24, 0xf9, 0x3d, 0x16, 0x25, 0x27, 0x26, 0xbe, 0x07, 0x6b, 0x78, 0x40, 0x5c, 0x7c, 0x4c, 0x46, - 0x0c, 0x99, 0xd2, 0xed, 0xdc, 0xf4, 0x9a, 0xb2, 0x9e, 0x30, 0x6e, 0x4a, 0xb9, 0x21, 0x8b, 0x3b, - 0x42, 0x48, 0x7b, 0x0a, 0xf9, 0x90, 0xc6, 0x45, 0xce, 0x54, 0xc4, 0x50, 0x58, 0x95, 0x91, 0xb0, - 0xfe, 0x9c, 0x88, 0xe5, 0x2a, 0x8e, 0x97, 0x51, 0x7d, 0x08, 0xd7, 0xb0, 0xa0, 0x92, 0xb6, 0x39, - 0xa2, 0x6a, 0x27, 0x91, 0x53, 0x8c, 0xa5, 0x50, 0xe0, 0x20, 0xd4, 0x8b, 0x0e, 0x61, 0xd6, 0x2f, - 0xce, 0xbe, 0x47, 0x44, 0x32, 0xd3, 0xa5, 0xc7, 0x85, 0xf3, 0x9f, 0x73, 0xe1, 0x0b, 0xe6, 0x0b, - 0x75, 0xae, 0xc3, 0x08, 0x75, 0xe5, 0x1d, 0x48, 0x09, 0xda, 0x45, 0xc5, 0xbe, 0x07, 0x29, 0x01, - 0xe2, 0x89, 0x4e, 0x97, 0x8a, 0x17, 0x9a, 0x97, 0xb6, 0xa4, 0x69, 0x43, 0xc2, 0xb5, 0xc7, 0xb0, - 0xa2, 0x7f, 0xb4, 0x18, 0x69, 0x47, 0xd9, 0x9b, 0x38, 0xba, 0x4f, 0x20, 0x37, 0x8a, 0x95, 0x91, - 0xbd, 0x10, 0xfc, 0x1a, 0xd0, 0x6e, 0x07, 0x5b, 0x76, 0x9d, 0x61, 0x37, 0x7a, 0x6f, 0x39, 0x98, - 0xf1, 0x7c, 0x02, 0x69, 0xf3, 0x3b, 0xcf, 0x1a, 0xc1, 0x11, 0xfd, 0x07, 0x32, 0xc7, 0xc4, 0x26, - 0x9e, 0xe5, 0x99, 0xcc, 0xea, 0x11, 0x59, 0xe0, 0x69, 0x49, 0x6b, 0x58, 0x3d, 0xa2, 0x3d, 0x84, - 0x6b, 0xa1, 0x27, 0x55, 0xbb, 0x4d, 0x3e, 0x4e, 0xd6, 0x39, 0xb4, 0x02, 0x2c, 0x0f, 0xe3, 0xa4, - 0x3b, 0x59, 0x98, 0xb6, 0x7c, 0x82, 0x7c, 0xcc, 0xe2, 0xa0, 0xbd, 0x81, 0xc5, 0xb2, 0xe7, 0x59, - 0xc7, 0x76, 0x8f, 0xd8, 0x2c, 0x16, 0x2d, 0xe2, 0xd0, 0x56, 0xc7, 0xe4, 0x0e, 0x4b, 0x00, 0x70, - 0x12, 0xbf, 0xe2, 0xc5, 0x3d, 0xe0, 0x9f, 0x04, 0xa0, 0xb8, 0x5e, 0xe9, 0xc3, 0x09, 0x64, 0xa3, - 0xc7, 0x83, 0x43, 0x3e, 0x0f, 0x69, 0xba, 0xf4, 0xed, 0xb8, 0xc4, 0x8f, 0x6a, 0x8a, 0x95, 0x62, - 0xc4, 0x5b, 0x1a, 0x8c, 0x12, 0xf3, 0x7f, 0x2a, 0xb0, 0x74, 0x8e, 0x30, 0x5a, 0x85, 0xab, 0x2d, - 0xda, 0xeb, 0x59, 0x8c, 0x11, 0x22, 0xbb, 0x50, 0x44, 0x88, 0x7a, 0x6a, 0x22, 0xd6, 0x53, 0xcf, - 0xed, 0xbe, 0xb7, 0x21, 0x6d, 0x79, 0xa6, 0x23, 0x86, 0x82, 0xcb, 0x7b, 0xf0, 0xac, 0x01, 0x96, - 0x27, 0xc7, 0x84, 0x3b, 0x94, 0xb0, 0xe9, 0xe1, 0xea, 0x7f, 0x16, 0x56, 0x7f, 0x6a, 0x4d, 0x59, - 0x9f, 0x2f, 0xfd, 0x7f, 0xd2, 0xea, 0x0f, 0xaa, 0xfe, 0xb7, 0x04, 0xac, 0x8c, 0x79, 0x19, 0x31, - 0xe5, 0xca, 0x57, 0x29, 0x47, 0xdf, 0xc0, 0x75, 0xc2, 0x3a, 0xdb, 0x66, 0x9b, 0x38, 0xd4, 0xb3, - 0x98, 0x18, 0xcc, 0xa6, 0xdd, 0xef, 0x35, 0x89, 0x2b, 0x63, 0xe3, 0xcf, 0xfe, 0xed, 0x8a, 0xe0, - 0xf3, 0x21, 0x5b, 0xe3, 0x5c, 0xf4, 0x00, 0x96, 0x03, 0x94, 0x65, 0xb7, 0xba, 0x7d, 0xcf, 0xa2, - 0xb6, 0x19, 0x0b, 0x5f, 0x56, 0x72, 0xab, 0x01, 0xb3, 0xee, 0x87, 0x73, 0x03, 0x54, 0x1c, 0x36, - 0x17, 0x93, 0x97, 0x9c, 0x9c, 0x6b, 0x0b, 0x11, 0x5d, 0xf7, 0xc9, 0xe8, 0x19, 0xac, 0x72, 0x05, - 0xbe, 0xa0, 0x65, 0x9b, 0x31, 0xd8, 0x49, 0x9f, 0xf4, 0x45, 0x53, 0x4e, 0x1a, 0xd7, 0x03, 0x99, - 0xaa, 0x1d, 0x75, 0xad, 0xd7, 0xbe, 0x80, 0xf6, 0x14, 0xe6, 0x2a, 0xb4, 0x87, 0xad, 0xb0, 0x07, - 0x67, 0x61, 0x5a, 0x58, 0x94, 0x4f, 0x84, 0x1f, 0xd0, 0x32, 0xa4, 0xda, 0x5c, 0x2c, 0x98, 0xc5, - 0xe2, 0xa4, 0x3d, 0x81, 0xf9, 0x00, 0x2e, 0xc3, 0xbd, 0x01, 0xaa, 0x5f, 0x5f, 0x98, 0xf5, 0x5d, - 0x62, 0x4a, 0x8c, 0x50, 0xb5, 0x10, 0xd2, 0x05, 0x44, 0xfb, 0x31, 0x01, 0x8b, 0x3c, 0x5a, 0x0d, - 0x97, 0x44, 0x93, 0xf1, 0x39, 0x24, 0x99, 0x2b, 0xeb, 0x31, 0x5d, 0x2a, 0x8d, 0xcb, 0xd6, 0x08, - 0xb0, 0xe0, 0x1f, 0x6a, 0xb4, 0x4d, 0x0c, 0x8e, 0xcf, 0xff, 0xaa, 0xc0, 0x6c, 0x40, 0x42, 0x8f, - 0x60, 0x9a, 0xa7, 0x8d, 0xbb, 0x92, 0x2e, 0x69, 0x91, 0x56, 0xc2, 0x3a, 0x85, 0x60, 0xa7, 0x2a, - 0xec, 0x70, 0x13, 0x62, 0x4d, 0x12, 0x80, 0xa1, 0xd5, 0x26, 0x31, 0xb4, 0xda, 0xf8, 0x83, 0xd4, - 0xc1, 0x2e, 0xb3, 0x5a, 0x96, 0xc3, 0x87, 0xce, 0x80, 0x32, 0x12, 0xcc, 0xde, 0xc5, 0x38, 0xe7, - 0xd0, 0x67, 0xf8, 0x2f, 0x45, 0x8e, 0x76, 0x2e, 0x27, 0xb2, 0x0a, 0x62, 0xaa, 0xfb, 0x14, 0xed, - 0x15, 0x64, 0x7d, 0xa7, 0xb9, 0x0b, 0x7e, 0x31, 0x04, 0x69, 0xb9, 0x01, 0x57, 0xfd, 0xba, 0x31, - 0xdf, 0xbb, 0xb4, 0x27, 0xe3, 0x39, 0xeb, 0x13, 0x9e, 0xbb, 0xb4, 0xe7, 0xaf, 0x4a, 0x9c, 0xc9, - 0xa8, 0xac, 0xc7, 0x94, 0x7f, 0x6c, 0xd0, 0xcd, 0x47, 0x30, 0x17, 0x56, 0xb5, 0x41, 0xbb, 0x04, - 0xa5, 0x61, 0xe6, 0x4d, 0xed, 0x65, 0x6d, 0xff, 0xa8, 0xa6, 0x5e, 0x41, 0x19, 0x98, 0x2d, 0x37, - 0x1a, 0x7a, 0xbd, 0xa1, 0x1b, 0xaa, 0xe2, 0x9f, 0x0e, 0x8c, 0xfd, 0x83, 0xfd, 0xba, 0x6e, 0xa8, - 0x89, 0xcd, 0x5f, 0x14, 0x58, 0x18, 0x7a, 0x10, 0x08, 0xc1, 0xbc, 0x04, 0x9b, 0xf5, 0x46, 0xb9, - 0xf1, 0xa6, 0xae, 0x5e, 0x41, 0x59, 0x50, 0x2b, 0xfa, 0xc1, 0x7e, 0xbd, 0xda, 0x30, 0x0d, 0x7d, - 0x57, 0xaf, 0x1e, 0xea, 0x15, 0x55, 0xf1, 0x25, 0x0f, 0xf4, 0x5a, 0xa5, 0x5a, 0xdb, 0x33, 0xcb, - 0xbb, 0x8d, 0xea, 0xa1, 0xae, 0x26, 0x10, 0x40, 0x4a, 0xfe, 0x9e, 0xf2, 0xf9, 0xd5, 0x5a, 0xb5, - 0x51, 0x2d, 0x37, 0xf4, 0x8a, 0xa9, 0xbf, 0xad, 0x36, 0xd4, 0x24, 0x52, 0x21, 0x73, 0x54, 0x6d, - 0xbc, 0xa8, 0x18, 0xe5, 0xa3, 0xf2, 0xce, 0x2b, 0x5d, 0x9d, 0xf6, 0x11, 0x3e, 0x4f, 0xaf, 0xa8, - 0x29, 0x1f, 0x21, 0x7e, 0x9b, 0xf5, 0x57, 0xe5, 0xfa, 0x0b, 0xbd, 0xa2, 0xce, 0x94, 0xfe, 0x50, - 0x60, 0x41, 0xec, 0x77, 0xc4, 0xad, 0x8b, 0x65, 0x1c, 0x75, 0x00, 0xc9, 0x90, 0xc5, 0x36, 0x4e, - 0xb4, 0x39, 0xb6, 0xab, 0x8e, 0xac, 0xa5, 0xf9, 0xff, 0x8d, 0xa9, 0x8d, 0x98, 0x68, 0x05, 0x33, - 0x8c, 0x4c, 0x58, 0xac, 0xf7, 0x9b, 0x3d, 0xeb, 0x8c, 0x21, 0xed, 0x62, 0x70, 0xdc, 0xc0, 0x79, - 0xce, 0x04, 0xf5, 0x5c, 0xfa, 0xa4, 0x84, 0x8b, 0x76, 0x78, 0xbd, 0xb7, 0x90, 0x91, 0x7e, 0xf2, - 0x0a, 0x41, 0x77, 0xbe, 0xf8, 0x3c, 0x82, 0x2b, 0x4d, 0x50, 0xee, 0xe8, 0x1d, 0x64, 0xa4, 0x31, - 0x71, 0x9e, 0x00, 0x93, 0x1f, 0xdb, 0x4a, 0x87, 0xbe, 0x0f, 0x4a, 0x7f, 0xcf, 0x80, 0x1a, 0x55, - 0x93, 0xbc, 0xcb, 0x3b, 0x00, 0xd1, 0x08, 0x78, 0x38, 0xef, 0x8e, 0xd3, 0x75, 0xa6, 0x3d, 0x8d, - 0x0f, 0xde, 0x50, 0x1b, 0xfa, 0x1e, 0x16, 0x8f, 0xb0, 0xc5, 0x9e, 0xc7, 0xf7, 0x34, 0x54, 0xba, - 0xd4, 0x52, 0x27, 0x0c, 0xde, 0xff, 0x8a, 0x45, 0x70, 0x4b, 0x41, 0x14, 0xe6, 0xcf, 0xee, 0x20, - 0xe8, 0xde, 0x85, 0x8a, 0xe2, 0x3b, 0x4e, 0xbe, 0x30, 0xa9, 0xb8, 0xbc, 0x70, 0x17, 0x96, 0x76, - 0x83, 0xd1, 0x1d, 0x1b, 0xf1, 0x1b, 0x93, 0xec, 0x13, 0xc2, 0xe2, 0xe6, 0xe4, 0xab, 0x07, 0x3a, - 0x19, 0xed, 0x0e, 0x97, 0xbc, 0xdf, 0x65, 0x37, 0x5c, 0xf4, 0x83, 0x02, 0xd9, 0xf3, 0x3e, 0xa9, - 0xd0, 0xc5, 0x19, 0x1a, 0xfd, 0xaa, 0xcb, 0x3f, 0xb8, 0x1c, 0x48, 0xfa, 0xd0, 0x07, 0x75, 0x78, - 0x43, 0x46, 0x63, 0x2f, 0x32, 0x66, 0x0f, 0xcf, 0x6f, 0x4d, 0x0e, 0x90, 0x66, 0xbf, 0x0b, 0x8b, - 0x39, 0x5a, 0xb1, 0xd1, 0x72, 0x41, 0x7c, 0xee, 0x17, 0x82, 0x3f, 0x16, 0x0a, 0x7a, 0xcf, 0x61, - 0xa7, 0xe3, 0xd3, 0x38, 0xba, 0x9e, 0x6f, 0x29, 0xe8, 0x25, 0xcc, 0xed, 0x62, 0x9b, 0xda, 0x56, - 0x0b, 0x77, 0x5f, 0x10, 0xdc, 0x1e, 0xab, 0x76, 0x82, 0x7e, 0xb0, 0x93, 0xf9, 0xf4, 0xf9, 0x96, - 0xf2, 0xfb, 0xe7, 0x5b, 0xca, 0x5f, 0x9f, 0x6f, 0x29, 0xcd, 0x14, 0xd7, 0x70, 0xff, 0xdf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x41, 0x63, 0x28, 0xb3, 0x3d, 0x11, 0x00, 0x00, + // 1578 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xdd, 0x6e, 0x13, 0xc7, + 0x17, 0x67, 0x1d, 0xc7, 0x09, 0xc7, 0x4e, 0xb2, 0x99, 0x98, 0xc4, 0x98, 0xc0, 0x3f, 0xff, 0x2d, + 0xb4, 0x49, 0x24, 0xec, 0xc4, 0x20, 0x44, 0x41, 0x14, 0x39, 0xf1, 0x12, 0x2c, 0x90, 0x13, 0xd6, + 0x26, 0xa1, 0xe2, 0x62, 0x35, 0xb6, 0x87, 0x78, 0x85, 0xbd, 0xb3, 0xd9, 0x1d, 0x5b, 0xe4, 0xa6, + 0x52, 0x1f, 0xa1, 0x95, 0x7a, 0x57, 0xa9, 0xea, 0x33, 0xf4, 0xa2, 0xaf, 0xc0, 0x65, 0x1f, 0xa0, + 0x17, 0x15, 0xea, 0x83, 0x54, 0x3b, 0x33, 0xfb, 0x11, 0x3b, 0x26, 0x0e, 0x77, 0x3b, 0xe7, 0x9c, + 0xdf, 0x39, 0x67, 0xce, 0x9c, 0x2f, 0x1b, 0x34, 0xc7, 0xa5, 0x8c, 0x16, 0x9b, 0x04, 0xb7, 0xa8, + 0x5d, 0x74, 0x9d, 0x56, 0x71, 0xb0, 0x5d, 0xf4, 0x88, 0x3b, 0xb0, 0x5a, 0xc4, 0x2b, 0x70, 0x26, + 0x5a, 0x26, 0xac, 0x43, 0x5c, 0xd2, 0xef, 0x15, 0x84, 0x58, 0xc1, 0x75, 0x5a, 0x85, 0xc1, 0x76, + 0xfe, 0xc6, 0x31, 0xa5, 0xc7, 0x5d, 0x52, 0xe4, 0x52, 0xcd, 0xfe, 0xbb, 0x22, 0xe9, 0x39, 0xec, + 0x54, 0x80, 0xf2, 0x77, 0x84, 0x62, 0xc2, 0x3a, 0xc5, 0xc1, 0x36, 0xee, 0x3a, 0x1d, 0xbc, 0x2d, + 0xad, 0x98, 0xcd, 0x2e, 0x6d, 0xbd, 0x97, 0x62, 0xb7, 0xcf, 0x11, 0xc3, 0x8c, 0x11, 0x8f, 0x61, + 0x66, 0x51, 0x5b, 0x4a, 0xad, 0x4a, 0x4b, 0xd8, 0xb1, 0x8a, 0xd8, 0xb6, 0xa9, 0x60, 0x4a, 0xff, + 0xb4, 0x3d, 0xc8, 0xec, 0xf8, 0x2a, 0x0d, 0x72, 0xd2, 0x27, 0x1e, 0x43, 0x08, 0x92, 0x5e, 0x97, + 0xb2, 0x9c, 0xb2, 0xa6, 0xac, 0x27, 0x0d, 0xfe, 0x8d, 0xbe, 0x82, 0x39, 0x17, 0xdb, 0x6d, 0x4c, + 0x4d, 0x97, 0x0c, 0x08, 0xee, 0xe6, 0x12, 0x6b, 0xca, 0x7a, 0xc6, 0xc8, 0x08, 0xa2, 0xc1, 0x69, + 0xda, 0x16, 0x2c, 0x1c, 0xb8, 0xd4, 0xa1, 0x1e, 0x31, 0x88, 0xe7, 0x50, 0xdb, 0x23, 0xe8, 0x26, + 0x00, 0x77, 0xd7, 0x74, 0xa9, 0xd4, 0x98, 0x31, 0xae, 0x72, 0x8a, 0x41, 0x29, 0xd3, 0x06, 0x80, + 0xca, 0x91, 0xb7, 0x81, 0x03, 0x37, 0x01, 0x9c, 0x7e, 0xb3, 0x6b, 0xb5, 0xcc, 0xf7, 0xe4, 0x34, + 0x00, 0x09, 0xca, 0x0b, 0x72, 0x8a, 0x56, 0x60, 0xc6, 0xa1, 0x2d, 0xb3, 0x69, 0x31, 0xe9, 0x45, + 0xca, 0xa1, 0xad, 0x1d, 0x2b, 0x72, 0x7c, 0x2a, 0xe6, 0x78, 0x16, 0xa6, 0xbd, 0x0e, 0x76, 0xdb, + 0xb9, 0x24, 0x27, 0x8a, 0x83, 0x76, 0x1b, 0xe6, 0x85, 0xdd, 0xd0, 0x51, 0x04, 0xc9, 0x98, 0x8b, + 0xfc, 0x5b, 0x33, 0xe0, 0xc6, 0x21, 0xee, 0x5a, 0x6d, 0xcc, 0xa8, 0x7b, 0x40, 0xdc, 0x77, 0xd4, + 0xed, 0x61, 0xbb, 0x45, 0x3e, 0x17, 0xa7, 0xff, 0x41, 0x3a, 0x72, 0xdd, 0xcb, 0x25, 0xd6, 0xa6, + 0xd6, 0x33, 0x06, 0x84, 0xbe, 0x7b, 0xda, 0x2f, 0x09, 0x58, 0x3d, 0x5f, 0xa9, 0x74, 0x24, 0x0f, + 0xb3, 0x4d, 0xdc, 0xf5, 0x49, 0x5e, 0x4e, 0x59, 0x9b, 0x5a, 0x4f, 0x1a, 0xe1, 0x19, 0x6d, 0x80, + 0xca, 0x28, 0xc3, 0x5d, 0x73, 0x10, 0x68, 0xf0, 0x78, 0x08, 0x92, 0xc6, 0x02, 0xa7, 0x87, 0x8a, + 0x3d, 0xf4, 0x00, 0x56, 0x84, 0x28, 0x6e, 0x31, 0x6b, 0x40, 0xe2, 0x08, 0x11, 0x9e, 0x6b, 0x9c, + 0x5d, 0xe6, 0xdc, 0x18, 0xee, 0x2e, 0xa0, 0x9e, 0xe5, 0x79, 0x96, 0x7d, 0x1c, 0x87, 0x24, 0xf9, + 0x3d, 0x16, 0x25, 0x27, 0x26, 0xbe, 0x07, 0x6b, 0x78, 0x40, 0x5c, 0x7c, 0x4c, 0x46, 0x0c, 0x99, + 0xd2, 0xed, 0xdc, 0xf4, 0x9a, 0xb2, 0x9e, 0x30, 0x6e, 0x4a, 0xb9, 0x21, 0x8b, 0x3b, 0x42, 0x48, + 0x7b, 0x02, 0xf9, 0x90, 0xc6, 0x45, 0xce, 0x64, 0xc4, 0x50, 0x58, 0x95, 0x91, 0xb0, 0xfe, 0x96, + 0x88, 0xbd, 0x55, 0x1c, 0x2f, 0xa3, 0xfa, 0x00, 0xae, 0x61, 0x41, 0x25, 0x6d, 0x73, 0x44, 0xd5, + 0x4e, 0x22, 0xa7, 0x18, 0x4b, 0xa1, 0xc0, 0x41, 0xa8, 0x17, 0x1d, 0xc2, 0xac, 0x9f, 0x9c, 0x7d, + 0x8f, 0x88, 0xc7, 0x4c, 0x97, 0x1e, 0x15, 0xce, 0x2f, 0xe7, 0xc2, 0x67, 0xcc, 0x17, 0xea, 0x5c, + 0x87, 0x11, 0xea, 0xca, 0x3b, 0x90, 0x12, 0xb4, 0x8b, 0x92, 0x7d, 0x0f, 0x52, 0x02, 0xc4, 0x1f, + 0x3a, 0x5d, 0x2a, 0x5e, 0x68, 0x5e, 0xda, 0x92, 0xa6, 0x0d, 0x09, 0xd7, 0x1e, 0xc1, 0x8a, 0xfe, + 0xc1, 0x62, 0xa4, 0x1d, 0xbd, 0xde, 0xc4, 0xd1, 0x7d, 0x0c, 0xb9, 0x51, 0xac, 0x8c, 0xec, 0x85, + 0xe0, 0x57, 0x80, 0x76, 0x3b, 0xd8, 0xb2, 0xeb, 0x0c, 0xbb, 0x51, 0xbd, 0xe5, 0x60, 0xc6, 0xf3, + 0x09, 0xa4, 0xcd, 0xef, 0x3c, 0x6b, 0x04, 0x47, 0xf4, 0x7f, 0xc8, 0x1c, 0x13, 0x9b, 0x78, 0x96, + 0x67, 0x32, 0xab, 0x47, 0x64, 0x82, 0xa7, 0x25, 0xad, 0x61, 0xf5, 0x88, 0xf6, 0x00, 0xae, 0x85, + 0x9e, 0x54, 0xed, 0x36, 0xf9, 0x30, 0x59, 0xe7, 0xd0, 0x0a, 0xb0, 0x3c, 0x8c, 0x93, 0xee, 0x64, + 0x61, 0xda, 0xf2, 0x09, 0xb2, 0x98, 0xc5, 0x41, 0x7b, 0x0d, 0x8b, 0x65, 0xcf, 0xb3, 0x8e, 0xed, + 0x1e, 0xb1, 0x59, 0x2c, 0x5a, 0xc4, 0xa1, 0xad, 0x8e, 0xc9, 0x1d, 0x96, 0x00, 0xe0, 0x24, 0x7e, + 0xc5, 0x8b, 0x7b, 0xc0, 0xaf, 0x53, 0x80, 0xe2, 0x7a, 0xa5, 0x0f, 0x27, 0x90, 0x8d, 0x8a, 0x07, + 0x87, 0x7c, 0x1e, 0xd2, 0x74, 0xe9, 0xbb, 0x71, 0x0f, 0x3f, 0xaa, 0x29, 0x96, 0x8a, 0x11, 0x6f, + 0x69, 0x30, 0x4a, 0xcc, 0xff, 0x9c, 0x80, 0xa5, 0x73, 0x84, 0xd1, 0x2a, 0x5c, 0x6d, 0xd1, 0x5e, + 0xcf, 0x62, 0x8c, 0x10, 0xd9, 0x85, 0x22, 0x42, 0xd4, 0x53, 0x13, 0xb1, 0x9e, 0x8a, 0x34, 0xc8, + 0x88, 0xc9, 0x43, 0xdc, 0x7a, 0xd4, 0x85, 0xcf, 0xd0, 0xfc, 0xd0, 0x58, 0x9e, 0xe9, 0x88, 0x21, + 0xe1, 0xf2, 0x9e, 0x3c, 0x6b, 0x80, 0xe5, 0xc9, 0xb1, 0xe1, 0xfa, 0x4a, 0x02, 0x2e, 0x57, 0x32, + 0x2d, 0x94, 0xc4, 0x69, 0x43, 0x8f, 0x9c, 0x1a, 0xae, 0x98, 0xa7, 0x61, 0xc5, 0xcc, 0xac, 0x29, + 0xeb, 0xf3, 0xa5, 0x6f, 0x26, 0xad, 0x98, 0xa0, 0x52, 0xfe, 0x4c, 0xc0, 0xca, 0x98, 0x6a, 0x8a, + 0x29, 0x57, 0xbe, 0x48, 0x39, 0xfa, 0x16, 0xae, 0x13, 0xd6, 0xd9, 0x36, 0xdb, 0xc4, 0xa1, 0x9e, + 0xc5, 0xc4, 0x30, 0x37, 0xed, 0x7e, 0xaf, 0x49, 0x5c, 0x19, 0x4f, 0x7f, 0x5f, 0xd8, 0xae, 0x08, + 0x3e, 0x1f, 0xcc, 0x35, 0xce, 0x45, 0xf7, 0x61, 0x39, 0x40, 0x59, 0x76, 0xab, 0xdb, 0xf7, 0x2c, + 0x6a, 0x9b, 0xb1, 0x81, 0x97, 0x95, 0xdc, 0x6a, 0xc0, 0xe4, 0xd1, 0xda, 0x00, 0x15, 0x87, 0x0d, + 0xc9, 0xe4, 0x69, 0x2a, 0x67, 0xe1, 0x42, 0x44, 0xd7, 0x7d, 0x32, 0x7a, 0x0a, 0xab, 0x5c, 0x81, + 0x2f, 0x68, 0xd9, 0x66, 0x0c, 0x76, 0xd2, 0x27, 0x7d, 0x22, 0x1f, 0xe3, 0x7a, 0x20, 0x53, 0xb5, + 0xa3, 0x4e, 0xf7, 0xca, 0x17, 0xd0, 0x9e, 0xc0, 0x5c, 0x85, 0xf6, 0xb0, 0x15, 0xf6, 0xed, 0x2c, + 0x4c, 0x0b, 0x8b, 0xb2, 0xac, 0xf8, 0x01, 0x2d, 0x43, 0xaa, 0xcd, 0xc5, 0x82, 0xf9, 0x2d, 0x4e, + 0xda, 0x63, 0x98, 0x0f, 0xe0, 0x32, 0xdc, 0x1b, 0xa0, 0xfa, 0x39, 0x89, 0x59, 0xdf, 0x25, 0xa6, + 0xc4, 0x08, 0x55, 0x0b, 0x21, 0x5d, 0x40, 0xb4, 0x9f, 0x12, 0xb0, 0xc8, 0xa3, 0xd5, 0x70, 0x49, + 0x34, 0x4d, 0x9f, 0x41, 0x92, 0xb9, 0x32, 0x87, 0xd3, 0xa5, 0xd2, 0xb8, 0xd7, 0x1a, 0x01, 0x16, + 0xfc, 0x43, 0x8d, 0xb6, 0x89, 0xc1, 0xf1, 0xf9, 0x3f, 0x14, 0x98, 0x0d, 0x48, 0xe8, 0x21, 0x4c, + 0xf3, 0x67, 0xe3, 0xae, 0xa4, 0x4b, 0x5a, 0xa4, 0x95, 0xb0, 0x4e, 0x21, 0xd8, 0xc3, 0x0a, 0x3b, + 0xdc, 0x84, 0x58, 0xad, 0x04, 0x60, 0x68, 0x1d, 0x4a, 0x0c, 0xad, 0x43, 0xfe, 0xf0, 0x75, 0xb0, + 0xcb, 0xac, 0x96, 0xe5, 0xf0, 0x41, 0x35, 0xa0, 0x8c, 0x04, 0xf3, 0x7a, 0x31, 0xce, 0x39, 0xf4, + 0x19, 0x7e, 0x35, 0xc9, 0x75, 0x80, 0xcb, 0x89, 0x57, 0x05, 0xb1, 0x09, 0xf8, 0x14, 0xed, 0x25, + 0x64, 0x7d, 0xa7, 0xb9, 0x0b, 0x7e, 0x32, 0x04, 0xcf, 0x72, 0x03, 0xae, 0xfa, 0x79, 0x63, 0xbe, + 0x73, 0x69, 0x4f, 0xc6, 0x73, 0xd6, 0x27, 0x3c, 0x73, 0x69, 0xcf, 0x5f, 0xaf, 0x38, 0x93, 0x51, + 0x99, 0x8f, 0x29, 0xff, 0xd8, 0xa0, 0x9b, 0x0f, 0x61, 0x2e, 0xcc, 0x6a, 0x83, 0x76, 0x09, 0x4a, + 0xc3, 0xcc, 0xeb, 0xda, 0x8b, 0xda, 0xfe, 0x51, 0x4d, 0xbd, 0x82, 0x32, 0x30, 0x5b, 0x6e, 0x34, + 0xf4, 0x7a, 0x43, 0x37, 0x54, 0xc5, 0x3f, 0x1d, 0x18, 0xfb, 0x07, 0xfb, 0x75, 0xdd, 0x50, 0x13, + 0x9b, 0xbf, 0x2b, 0xb0, 0x30, 0x54, 0x10, 0x08, 0xc1, 0xbc, 0x04, 0x9b, 0xf5, 0x46, 0xb9, 0xf1, + 0xba, 0xae, 0x5e, 0x41, 0x59, 0x50, 0x2b, 0xfa, 0xc1, 0x7e, 0xbd, 0xda, 0x30, 0x0d, 0x7d, 0x57, + 0xaf, 0x1e, 0xea, 0x15, 0x55, 0xf1, 0x25, 0x0f, 0xf4, 0x5a, 0xa5, 0x5a, 0xdb, 0x33, 0xcb, 0xbb, + 0x8d, 0xea, 0xa1, 0xae, 0x26, 0x10, 0x40, 0x4a, 0x7e, 0x4f, 0xf9, 0xfc, 0x6a, 0xad, 0xda, 0xa8, + 0x96, 0x1b, 0x7a, 0xc5, 0xd4, 0xdf, 0x54, 0x1b, 0x6a, 0x12, 0xa9, 0x90, 0x39, 0xaa, 0x36, 0x9e, + 0x57, 0x8c, 0xf2, 0x51, 0x79, 0xe7, 0xa5, 0xae, 0x4e, 0xfb, 0x08, 0x9f, 0xa7, 0x57, 0xd4, 0x94, + 0x8f, 0x10, 0xdf, 0x66, 0xfd, 0x65, 0xb9, 0xfe, 0x5c, 0xaf, 0xa8, 0x33, 0xa5, 0xbf, 0x15, 0x58, + 0x28, 0x07, 0xbd, 0x4a, 0x2c, 0xf0, 0xa8, 0x03, 0x48, 0x86, 0x2c, 0xb6, 0xa5, 0xa2, 0xcd, 0xb1, + 0x9d, 0x78, 0x64, 0x95, 0xcd, 0x7f, 0x3d, 0x26, 0x37, 0x62, 0xa2, 0x15, 0xcc, 0x30, 0x32, 0x61, + 0xb1, 0xde, 0x6f, 0xf6, 0xac, 0x33, 0x86, 0xb4, 0x8b, 0xc1, 0x71, 0x03, 0xe7, 0x39, 0x13, 0xe4, + 0x73, 0xe9, 0xa3, 0x12, 0x2e, 0xe7, 0xe1, 0xf5, 0xde, 0x40, 0x46, 0xfa, 0xc9, 0x33, 0x04, 0xdd, + 0xfe, 0x6c, 0x79, 0x04, 0x57, 0x9a, 0x20, 0xdd, 0xd1, 0x5b, 0xc8, 0x48, 0x63, 0xe2, 0x3c, 0x01, + 0x26, 0x3f, 0xb6, 0x95, 0x0e, 0xfd, 0xa6, 0x28, 0xfd, 0x3b, 0x03, 0x6a, 0x94, 0x4d, 0xf2, 0x2e, + 0x6f, 0x01, 0x44, 0x23, 0xe0, 0xe1, 0xbc, 0x33, 0x4e, 0xd7, 0x99, 0xf6, 0x34, 0x3e, 0x78, 0x43, + 0x6d, 0xe8, 0x07, 0x58, 0x3c, 0xc2, 0x16, 0x7b, 0x16, 0xdf, 0xed, 0x50, 0xe9, 0x52, 0x8b, 0xa0, + 0x30, 0x78, 0xef, 0x0b, 0x96, 0xc7, 0x2d, 0x05, 0x51, 0x98, 0x3f, 0xbb, 0xb7, 0xa0, 0xbb, 0x17, + 0x2a, 0x8a, 0xef, 0x45, 0xf9, 0xc2, 0xa4, 0xe2, 0xf2, 0xc2, 0x5d, 0x58, 0xda, 0x0d, 0xc6, 0x7d, + 0x6c, 0x2d, 0xd8, 0x98, 0x64, 0x07, 0x11, 0x16, 0x37, 0x27, 0x5f, 0x57, 0xd0, 0xc9, 0x68, 0x77, + 0xb8, 0xe4, 0xfd, 0x2e, 0xbb, 0x15, 0xa3, 0x1f, 0x15, 0xc8, 0x9e, 0xf7, 0x33, 0x0c, 0x5d, 0xfc, + 0x42, 0xa3, 0xbf, 0x04, 0xf3, 0xf7, 0x2f, 0x07, 0x92, 0x3e, 0xf4, 0x41, 0x1d, 0xde, 0xaa, 0xd1, + 0xd8, 0x8b, 0x8c, 0xd9, 0xdd, 0xf3, 0x5b, 0x93, 0x03, 0xa4, 0xd9, 0xef, 0xc3, 0x64, 0x8e, 0xd6, + 0x72, 0xb4, 0x5c, 0x10, 0x7f, 0x11, 0x14, 0x82, 0x3f, 0x23, 0x0a, 0x7a, 0xcf, 0x61, 0xa7, 0xe3, + 0x9f, 0x71, 0x74, 0xa5, 0xdf, 0x52, 0xd0, 0x0b, 0x98, 0xdb, 0xc5, 0x36, 0xb5, 0xad, 0x16, 0xee, + 0x3e, 0x27, 0xb8, 0x3d, 0x56, 0xed, 0x04, 0xfd, 0x60, 0x27, 0xf3, 0xf1, 0xd3, 0x2d, 0xe5, 0xaf, + 0x4f, 0xb7, 0x94, 0x7f, 0x3e, 0xdd, 0x52, 0x9a, 0x29, 0xae, 0xe1, 0xde, 0x7f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x97, 0xb7, 0x7a, 0xc6, 0x71, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2698,10 +2707,10 @@ func (m *AssignmentResponse_ValidatorAssignment) MarshalTo(dAtA []byte) (int, er i++ i = encodeVarintServices(dAtA, i, uint64(m.Shard)) } - if m.Slot != 0 { + if m.AttesterSlot != 0 { dAtA[i] = 0x18 i++ - i = encodeVarintServices(dAtA, i, uint64(m.Slot)) + i = encodeVarintServices(dAtA, i, uint64(m.AttesterSlot)) } if m.IsProposer { dAtA[i] = 0x20 @@ -2713,14 +2722,19 @@ func (m *AssignmentResponse_ValidatorAssignment) MarshalTo(dAtA []byte) (int, er } i++ } + if m.ProposerSlot != 0 { + dAtA[i] = 0x28 + i++ + i = encodeVarintServices(dAtA, i, uint64(m.ProposerSlot)) + } if len(m.PublicKey) > 0 { - dAtA[i] = 0x2a + dAtA[i] = 0x32 i++ i = encodeVarintServices(dAtA, i, uint64(len(m.PublicKey))) i += copy(dAtA[i:], m.PublicKey) } if m.Status != 0 { - dAtA[i] = 0x30 + dAtA[i] = 0x38 i++ i = encodeVarintServices(dAtA, i, uint64(m.Status)) } @@ -3288,12 +3302,15 @@ func (m *AssignmentResponse_ValidatorAssignment) Size() (n int) { if m.Shard != 0 { n += 1 + sovServices(uint64(m.Shard)) } - if m.Slot != 0 { - n += 1 + sovServices(uint64(m.Slot)) + if m.AttesterSlot != 0 { + n += 1 + sovServices(uint64(m.AttesterSlot)) } if m.IsProposer { n += 2 } + if m.ProposerSlot != 0 { + n += 1 + sovServices(uint64(m.ProposerSlot)) + } l = len(m.PublicKey) if l > 0 { n += 1 + l + sovServices(uint64(l)) @@ -5277,9 +5294,9 @@ func (m *AssignmentResponse_ValidatorAssignment) Unmarshal(dAtA []byte) error { } case 3: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Slot", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field AttesterSlot", wireType) } - m.Slot = 0 + m.AttesterSlot = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowServices @@ -5289,7 +5306,7 @@ func (m *AssignmentResponse_ValidatorAssignment) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Slot |= uint64(b&0x7F) << shift + m.AttesterSlot |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -5315,6 +5332,25 @@ func (m *AssignmentResponse_ValidatorAssignment) Unmarshal(dAtA []byte) error { } m.IsProposer = bool(v != 0) case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ProposerSlot", wireType) + } + m.ProposerSlot = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowServices + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ProposerSlot |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field PublicKey", wireType) } @@ -5348,7 +5384,7 @@ func (m *AssignmentResponse_ValidatorAssignment) Unmarshal(dAtA []byte) error { m.PublicKey = []byte{} } iNdEx = postIndex - case 6: + case 7: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) } diff --git a/proto/beacon/rpc/v1/services.proto b/proto/beacon/rpc/v1/services.proto index 79e17cce369c..fdb2bca9b063 100644 --- a/proto/beacon/rpc/v1/services.proto +++ b/proto/beacon/rpc/v1/services.proto @@ -113,10 +113,11 @@ message AssignmentResponse { message ValidatorAssignment { repeated uint64 committee = 1; uint64 shard = 2; - uint64 slot = 3; + uint64 attesterSlot = 3; bool is_proposer = 4; - bytes public_key = 5; - ValidatorStatus status = 6; + uint64 proposerSlot = 5; + bytes public_key = 6; + ValidatorStatus status = 7; } } diff --git a/proto/beacon/rpc/v1_gateway/services.pb.go b/proto/beacon/rpc/v1_gateway/services.pb.go index c7f6837657d9..4f29cf1bdad0 100755 --- a/proto/beacon/rpc/v1_gateway/services.pb.go +++ b/proto/beacon/rpc/v1_gateway/services.pb.go @@ -828,10 +828,11 @@ func (m *AssignmentResponse) GetValidatorAssignment() []*AssignmentResponse_Vali type AssignmentResponse_ValidatorAssignment struct { Committee []uint64 `protobuf:"varint,1,rep,packed,name=committee,proto3" json:"committee,omitempty"` Shard uint64 `protobuf:"varint,2,opt,name=shard,proto3" json:"shard,omitempty"` - Slot uint64 `protobuf:"varint,3,opt,name=slot,proto3" json:"slot,omitempty"` + AttesterSlot uint64 `protobuf:"varint,3,opt,name=attesterSlot,proto3" json:"attesterSlot,omitempty"` IsProposer bool `protobuf:"varint,4,opt,name=is_proposer,json=isProposer,proto3" json:"is_proposer,omitempty"` - PublicKey []byte `protobuf:"bytes,5,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` - Status ValidatorStatus `protobuf:"varint,6,opt,name=status,proto3,enum=ethereum.beacon.rpc.v1.ValidatorStatus" json:"status,omitempty"` + ProposerSlot uint64 `protobuf:"varint,5,opt,name=proposerSlot,proto3" json:"proposerSlot,omitempty"` + PublicKey []byte `protobuf:"bytes,6,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` + Status ValidatorStatus `protobuf:"varint,7,opt,name=status,proto3,enum=ethereum.beacon.rpc.v1.ValidatorStatus" json:"status,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -878,9 +879,9 @@ func (m *AssignmentResponse_ValidatorAssignment) GetShard() uint64 { return 0 } -func (m *AssignmentResponse_ValidatorAssignment) GetSlot() uint64 { +func (m *AssignmentResponse_ValidatorAssignment) GetAttesterSlot() uint64 { if m != nil { - return m.Slot + return m.AttesterSlot } return 0 } @@ -892,6 +893,13 @@ func (m *AssignmentResponse_ValidatorAssignment) GetIsProposer() bool { return false } +func (m *AssignmentResponse_ValidatorAssignment) GetProposerSlot() uint64 { + if m != nil { + return m.ProposerSlot + } + return 0 +} + func (m *AssignmentResponse_ValidatorAssignment) GetPublicKey() []byte { if m != nil { return m.PublicKey @@ -1243,104 +1251,105 @@ func init() { func init() { proto.RegisterFile("proto/beacon/rpc/v1/services.proto", fileDescriptor_9eb4e94b85965285) } var fileDescriptor_9eb4e94b85965285 = []byte{ - // 1546 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x41, 0x4f, 0x1b, 0xc9, - 0x12, 0xce, 0x18, 0x63, 0x48, 0xd9, 0xc0, 0xd0, 0x38, 0xe0, 0x38, 0x44, 0xe1, 0xcd, 0x4b, 0xde, - 0x03, 0xa4, 0xd8, 0xe0, 0x44, 0x51, 0x5e, 0xa2, 0xbc, 0xc8, 0xe0, 0x09, 0xb1, 0x12, 0x19, 0x32, - 0x76, 0x20, 0xab, 0x1c, 0x46, 0x6d, 0xbb, 0x83, 0x5b, 0xb1, 0xa7, 0x87, 0x99, 0xb6, 0x15, 0x2e, - 0x2b, 0xed, 0x4f, 0xd8, 0xc3, 0x9e, 0x57, 0xfb, 0x1b, 0xf6, 0xb0, 0x7f, 0x61, 0x7f, 0xc4, 0x6a, - 0x4f, 0x7b, 0xd8, 0x9f, 0xb1, 0x9a, 0xee, 0x9e, 0xf1, 0x60, 0xe3, 0x60, 0x72, 0x73, 0x57, 0xd5, - 0x57, 0x55, 0x5d, 0x55, 0x5d, 0x55, 0x63, 0x30, 0x5c, 0x8f, 0x71, 0x56, 0x6c, 0x12, 0xdc, 0x62, - 0x4e, 0xd1, 0x73, 0x5b, 0xc5, 0xc1, 0x6e, 0xd1, 0x27, 0xde, 0x80, 0xb6, 0x88, 0x5f, 0x10, 0x4c, - 0xb4, 0x4a, 0x78, 0x87, 0x78, 0xa4, 0xdf, 0x2b, 0x48, 0xb1, 0x82, 0xe7, 0xb6, 0x0a, 0x83, 0xdd, - 0xfc, 0x9d, 0x53, 0xc6, 0x4e, 0xbb, 0xa4, 0x28, 0xa4, 0x9a, 0xfd, 0x4f, 0x45, 0xd2, 0x73, 0xf9, - 0xb9, 0x04, 0xe5, 0x1f, 0x48, 0xc5, 0x84, 0x77, 0x8a, 0x83, 0x5d, 0xdc, 0x75, 0x3b, 0x78, 0x57, - 0x59, 0xb1, 0x9b, 0x5d, 0xd6, 0xfa, 0xac, 0xc4, 0xee, 0x5f, 0x22, 0x86, 0x39, 0x27, 0x3e, 0xc7, - 0x9c, 0x32, 0x47, 0x49, 0xad, 0x2b, 0x4b, 0xd8, 0xa5, 0x45, 0xec, 0x38, 0x4c, 0x32, 0x95, 0x7f, - 0xc6, 0x01, 0x64, 0xf6, 0x02, 0x95, 0x16, 0x39, 0xeb, 0x13, 0x9f, 0x23, 0x04, 0x49, 0xbf, 0xcb, - 0x78, 0x4e, 0xdb, 0xd0, 0x36, 0x93, 0x96, 0xf8, 0x8d, 0xfe, 0x0d, 0x0b, 0x1e, 0x76, 0xda, 0x98, - 0xd9, 0x1e, 0x19, 0x10, 0xdc, 0xcd, 0x25, 0x36, 0xb4, 0xcd, 0x8c, 0x95, 0x91, 0x44, 0x4b, 0xd0, - 0x8c, 0x1d, 0x58, 0x3a, 0xf2, 0x98, 0xcb, 0x7c, 0x62, 0x11, 0xdf, 0x65, 0x8e, 0x4f, 0xd0, 0x5d, - 0x00, 0xe1, 0xae, 0xed, 0x31, 0xa5, 0x31, 0x63, 0xdd, 0x14, 0x14, 0x8b, 0x31, 0x6e, 0x0c, 0x00, - 0x95, 0x87, 0xde, 0x86, 0x0e, 0xdc, 0x05, 0x70, 0xfb, 0xcd, 0x2e, 0x6d, 0xd9, 0x9f, 0xc9, 0x79, - 0x08, 0x92, 0x94, 0x37, 0xe4, 0x1c, 0xad, 0xc1, 0x9c, 0xcb, 0x5a, 0x76, 0x93, 0x72, 0xe5, 0x45, - 0xca, 0x65, 0xad, 0x3d, 0x3a, 0x74, 0x7c, 0x26, 0xe6, 0x78, 0x16, 0x66, 0xfd, 0x0e, 0xf6, 0xda, - 0xb9, 0xa4, 0x20, 0xca, 0x83, 0x71, 0x1f, 0x16, 0xa5, 0xdd, 0xc8, 0x51, 0x04, 0xc9, 0x98, 0x8b, - 0xe2, 0xb7, 0x61, 0xc1, 0x9d, 0x63, 0xdc, 0xa5, 0x6d, 0xcc, 0x99, 0x77, 0x44, 0xbc, 0x4f, 0xcc, - 0xeb, 0x61, 0xa7, 0x45, 0xbe, 0x16, 0xa7, 0x7b, 0x90, 0x1e, 0xba, 0xee, 0xe7, 0x12, 0x1b, 0x33, - 0x9b, 0x19, 0x0b, 0x22, 0xdf, 0x7d, 0xe3, 0xa7, 0x04, 0xac, 0x5f, 0xae, 0x54, 0x39, 0x92, 0x87, - 0xf9, 0x26, 0xee, 0x06, 0x24, 0x3f, 0xa7, 0x6d, 0xcc, 0x6c, 0x26, 0xad, 0xe8, 0x8c, 0xb6, 0x40, - 0xe7, 0x8c, 0xe3, 0xae, 0x3d, 0x08, 0x35, 0xf8, 0x22, 0x04, 0x49, 0x6b, 0x49, 0xd0, 0x23, 0xc5, - 0x3e, 0x7a, 0x02, 0x6b, 0x52, 0x14, 0xb7, 0x38, 0x1d, 0x90, 0x38, 0x42, 0x86, 0xe7, 0x96, 0x60, - 0x97, 0x05, 0x37, 0x86, 0x7b, 0x08, 0xa8, 0x47, 0x7d, 0x9f, 0x3a, 0xa7, 0x71, 0x48, 0x52, 0xdc, - 0x63, 0x59, 0x71, 0x62, 0xe2, 0x07, 0xb0, 0x81, 0x07, 0xc4, 0xc3, 0xa7, 0x64, 0xcc, 0x90, 0xad, - 0xdc, 0xce, 0xcd, 0x6e, 0x68, 0x9b, 0x09, 0xeb, 0xae, 0x92, 0x1b, 0xb1, 0xb8, 0x27, 0x85, 0x8c, - 0x17, 0x90, 0x8f, 0x68, 0x42, 0xe4, 0x42, 0x45, 0x8c, 0x84, 0x55, 0x1b, 0x0b, 0xeb, 0xcf, 0x89, - 0x58, 0xae, 0xe2, 0x78, 0x15, 0xd5, 0x27, 0x70, 0x0b, 0x4b, 0x2a, 0x69, 0xdb, 0x63, 0xaa, 0xf6, - 0x12, 0x39, 0xcd, 0x5a, 0x89, 0x04, 0x8e, 0x22, 0xbd, 0xe8, 0x18, 0xe6, 0x83, 0xe2, 0xec, 0xfb, - 0x44, 0x26, 0x33, 0x5d, 0x7a, 0x56, 0xb8, 0xfc, 0x39, 0x17, 0xbe, 0x62, 0xbe, 0x50, 0x17, 0x3a, - 0xac, 0x48, 0x57, 0xde, 0x85, 0x94, 0xa4, 0x5d, 0x55, 0xec, 0x07, 0x90, 0x92, 0x20, 0x91, 0xe8, - 0x74, 0xa9, 0x78, 0xa5, 0x79, 0x65, 0x4b, 0x99, 0xb6, 0x14, 0xdc, 0x78, 0x06, 0x6b, 0xe6, 0x17, - 0xca, 0x49, 0x7b, 0x98, 0xbd, 0xa9, 0xa3, 0xfb, 0x1c, 0x72, 0xe3, 0x58, 0x15, 0xd9, 0x2b, 0xc1, - 0xef, 0x00, 0xed, 0x77, 0x30, 0x75, 0xea, 0x1c, 0x7b, 0xc3, 0xf7, 0x96, 0x83, 0x39, 0x3f, 0x20, - 0x90, 0xb6, 0xb8, 0xf3, 0xbc, 0x15, 0x1e, 0xd1, 0xbf, 0x20, 0x73, 0x4a, 0x1c, 0xe2, 0x53, 0xdf, - 0xe6, 0xb4, 0x47, 0x54, 0x81, 0xa7, 0x15, 0xad, 0x41, 0x7b, 0xc4, 0x78, 0x02, 0xb7, 0x22, 0x4f, - 0xaa, 0x4e, 0x9b, 0x7c, 0x99, 0xae, 0x73, 0x18, 0x05, 0x58, 0x1d, 0xc5, 0x29, 0x77, 0xb2, 0x30, - 0x4b, 0x03, 0x82, 0x7a, 0xcc, 0xf2, 0x60, 0xbc, 0x87, 0xe5, 0xb2, 0xef, 0xd3, 0x53, 0xa7, 0x47, - 0x1c, 0x1e, 0x8b, 0x16, 0x71, 0x59, 0xab, 0x63, 0x0b, 0x87, 0x15, 0x00, 0x04, 0x49, 0x5c, 0xf1, - 0xea, 0x1e, 0xf0, 0x77, 0x02, 0x50, 0x5c, 0xaf, 0xf2, 0xe1, 0x0c, 0xb2, 0xc3, 0xc7, 0x83, 0x23, - 0xbe, 0x08, 0x69, 0xba, 0xf4, 0xff, 0x49, 0x89, 0x1f, 0xd7, 0x14, 0x2b, 0xc5, 0x21, 0x6f, 0x65, - 0x30, 0x4e, 0xcc, 0xff, 0xa9, 0xc1, 0xca, 0x25, 0xc2, 0x68, 0x1d, 0x6e, 0xb6, 0x58, 0xaf, 0x47, - 0x39, 0x27, 0x44, 0x75, 0xa1, 0x21, 0x61, 0xd8, 0x53, 0x13, 0xb1, 0x9e, 0x7a, 0x69, 0xf7, 0xbd, - 0x07, 0x69, 0xea, 0xdb, 0xae, 0x1c, 0x0a, 0x9e, 0xe8, 0xc1, 0xf3, 0x16, 0x50, 0x5f, 0x8d, 0x09, - 0x6f, 0x24, 0x61, 0xb3, 0xa3, 0xd5, 0xff, 0x32, 0xaa, 0xfe, 0xd4, 0x86, 0xb6, 0xb9, 0x58, 0xfa, - 0xef, 0xb4, 0xd5, 0x1f, 0x56, 0xfd, 0x6f, 0x09, 0x58, 0x9b, 0xf0, 0x32, 0x62, 0xca, 0xb5, 0x6f, - 0x52, 0x8e, 0xfe, 0x07, 0xb7, 0x09, 0xef, 0xec, 0xda, 0x6d, 0xe2, 0x32, 0x9f, 0x72, 0x39, 0x98, - 0x6d, 0xa7, 0xdf, 0x6b, 0x12, 0x4f, 0xc5, 0x26, 0x98, 0xfd, 0xbb, 0x15, 0xc9, 0x17, 0x43, 0xb6, - 0x26, 0xb8, 0xe8, 0x31, 0xac, 0x86, 0x28, 0xea, 0xb4, 0xba, 0x7d, 0x9f, 0x32, 0xc7, 0x8e, 0x85, - 0x2f, 0xab, 0xb8, 0xd5, 0x90, 0x59, 0x0f, 0xc2, 0xb9, 0x05, 0x3a, 0x8e, 0x9a, 0x8b, 0x2d, 0x4a, - 0x4e, 0xcd, 0xb5, 0xa5, 0x21, 0xdd, 0x0c, 0xc8, 0xe8, 0x25, 0xac, 0x0b, 0x05, 0x81, 0x20, 0x75, - 0xec, 0x18, 0xec, 0xac, 0x4f, 0xfa, 0xb2, 0x29, 0x27, 0xad, 0xdb, 0xa1, 0x4c, 0xd5, 0x19, 0x76, - 0xad, 0x77, 0x81, 0x80, 0xf1, 0x02, 0x16, 0x2a, 0xac, 0x87, 0x69, 0xd4, 0x83, 0xb3, 0x30, 0x2b, - 0x2d, 0xaa, 0x27, 0x22, 0x0e, 0x68, 0x15, 0x52, 0x6d, 0x21, 0x16, 0xce, 0x62, 0x79, 0x32, 0x9e, - 0xc3, 0x62, 0x08, 0x57, 0xe1, 0xde, 0x02, 0x3d, 0xa8, 0x2f, 0xcc, 0xfb, 0x1e, 0xb1, 0x15, 0x46, - 0xaa, 0x5a, 0x8a, 0xe8, 0x12, 0x62, 0xfc, 0x98, 0x80, 0x65, 0x11, 0xad, 0x86, 0x47, 0x86, 0x93, - 0xf1, 0x15, 0x24, 0xb9, 0xa7, 0xea, 0x31, 0x5d, 0x2a, 0x4d, 0xca, 0xd6, 0x18, 0xb0, 0x10, 0x1c, - 0x6a, 0xac, 0x4d, 0x2c, 0x81, 0xcf, 0xff, 0xaa, 0xc1, 0x7c, 0x48, 0x42, 0x4f, 0x61, 0x56, 0xa4, - 0x4d, 0xb8, 0x92, 0x2e, 0x19, 0x43, 0xad, 0x84, 0x77, 0x0a, 0xe1, 0x4e, 0x55, 0xd8, 0x13, 0x26, - 0xe4, 0x9a, 0x24, 0x01, 0x23, 0xab, 0x4d, 0x62, 0x64, 0xb5, 0x09, 0x06, 0xa9, 0x8b, 0x3d, 0x4e, - 0x5b, 0xd4, 0x15, 0x43, 0x67, 0xc0, 0x38, 0x09, 0x67, 0xef, 0x72, 0x9c, 0x73, 0x1c, 0x30, 0x82, - 0x97, 0xa2, 0x46, 0xbb, 0x90, 0x93, 0x59, 0x05, 0x39, 0xd5, 0x03, 0x8a, 0xf1, 0x16, 0xb2, 0x81, - 0xd3, 0xc2, 0x85, 0xa0, 0x18, 0xc2, 0xb4, 0xdc, 0x81, 0x9b, 0x41, 0xdd, 0xd8, 0x9f, 0x3c, 0xd6, - 0x53, 0xf1, 0x9c, 0x0f, 0x08, 0xaf, 0x3c, 0xd6, 0x0b, 0x56, 0x25, 0xc1, 0xe4, 0x4c, 0xd5, 0x63, - 0x2a, 0x38, 0x36, 0xd8, 0xf6, 0x53, 0x58, 0x88, 0xaa, 0xda, 0x62, 0x5d, 0x82, 0xd2, 0x30, 0xf7, - 0xbe, 0xf6, 0xa6, 0x76, 0x78, 0x52, 0xd3, 0x6f, 0xa0, 0x0c, 0xcc, 0x97, 0x1b, 0x0d, 0xb3, 0xde, - 0x30, 0x2d, 0x5d, 0x0b, 0x4e, 0x47, 0xd6, 0xe1, 0xd1, 0x61, 0xdd, 0xb4, 0xf4, 0xc4, 0xf6, 0x2f, - 0x1a, 0x2c, 0x8d, 0x3c, 0x08, 0x84, 0x60, 0x51, 0x81, 0xed, 0x7a, 0xa3, 0xdc, 0x78, 0x5f, 0xd7, - 0x6f, 0xa0, 0x2c, 0xe8, 0x15, 0xf3, 0xe8, 0xb0, 0x5e, 0x6d, 0xd8, 0x96, 0xb9, 0x6f, 0x56, 0x8f, - 0xcd, 0x8a, 0xae, 0x05, 0x92, 0x47, 0x66, 0xad, 0x52, 0xad, 0x1d, 0xd8, 0xe5, 0xfd, 0x46, 0xf5, - 0xd8, 0xd4, 0x13, 0x08, 0x20, 0xa5, 0x7e, 0xcf, 0x04, 0xfc, 0x6a, 0xad, 0xda, 0xa8, 0x96, 0x1b, - 0x66, 0xc5, 0x36, 0x3f, 0x54, 0x1b, 0x7a, 0x12, 0xe9, 0x90, 0x39, 0xa9, 0x36, 0x5e, 0x57, 0xac, - 0xf2, 0x49, 0x79, 0xef, 0xad, 0xa9, 0xcf, 0x06, 0x88, 0x80, 0x67, 0x56, 0xf4, 0x54, 0x80, 0x90, - 0xbf, 0xed, 0xfa, 0xdb, 0x72, 0xfd, 0xb5, 0x59, 0xd1, 0xe7, 0x4a, 0x7f, 0x68, 0xb0, 0x24, 0xf7, - 0x3b, 0xe2, 0xd5, 0xe5, 0x32, 0x8e, 0x3a, 0x80, 0x54, 0xc8, 0x62, 0x1b, 0x27, 0xda, 0x9e, 0xd8, - 0x55, 0xc7, 0xd6, 0xd2, 0xfc, 0x7f, 0x26, 0xd4, 0x46, 0x4c, 0xb4, 0x82, 0x39, 0x46, 0x36, 0x2c, - 0xd7, 0xfb, 0xcd, 0x1e, 0xbd, 0x60, 0xc8, 0xb8, 0x1a, 0x1c, 0x37, 0x70, 0x99, 0x33, 0x61, 0x3d, - 0x97, 0x7e, 0xd7, 0xa2, 0x45, 0x3b, 0xba, 0xde, 0x07, 0xc8, 0x28, 0x3f, 0x45, 0x85, 0xa0, 0xfb, - 0x5f, 0x7d, 0x1e, 0xe1, 0x95, 0xa6, 0x28, 0x77, 0xf4, 0x11, 0x32, 0xca, 0x98, 0x3c, 0x4f, 0x81, - 0xc9, 0x4f, 0x6c, 0xa5, 0x23, 0xdf, 0x07, 0xa5, 0xbf, 0xe6, 0x40, 0x1f, 0x56, 0x93, 0xba, 0xcb, - 0x47, 0x00, 0xd9, 0x08, 0x44, 0x38, 0x1f, 0x4c, 0xd2, 0x75, 0xa1, 0x3d, 0x4d, 0x0e, 0xde, 0x48, - 0x1b, 0xfa, 0x1e, 0x96, 0x4f, 0x30, 0xe5, 0xaf, 0xe2, 0x7b, 0x1a, 0x2a, 0x5d, 0x6b, 0xa9, 0x93, - 0x06, 0x1f, 0x7d, 0xc3, 0x22, 0xb8, 0xa3, 0x21, 0x06, 0x8b, 0x17, 0x77, 0x10, 0xf4, 0xf0, 0x4a, - 0x45, 0xf1, 0x1d, 0x27, 0x5f, 0x98, 0x56, 0x5c, 0x5d, 0xb8, 0x0b, 0x2b, 0xfb, 0xe1, 0xe8, 0x8e, - 0x8d, 0xf8, 0xad, 0x69, 0xf6, 0x09, 0x69, 0x71, 0x7b, 0xfa, 0xd5, 0x03, 0x9d, 0x8d, 0x77, 0x87, - 0x6b, 0xde, 0xef, 0xba, 0x1b, 0x2e, 0xfa, 0x41, 0x83, 0xec, 0x65, 0x9f, 0x54, 0xe8, 0xea, 0x0c, - 0x8d, 0x7f, 0xd5, 0xe5, 0x1f, 0x5f, 0x0f, 0xa4, 0x7c, 0xe8, 0x83, 0x3e, 0xba, 0x21, 0xa3, 0x89, - 0x17, 0x99, 0xb0, 0x87, 0xe7, 0x77, 0xa6, 0x07, 0x28, 0xb3, 0xdf, 0x45, 0xc5, 0x3c, 0x5c, 0xb1, - 0xd1, 0x6a, 0x41, 0x7e, 0xee, 0x17, 0xc2, 0x3f, 0x16, 0x0a, 0x66, 0xcf, 0xe5, 0xe7, 0x93, 0xd3, - 0x38, 0xbe, 0x9e, 0xef, 0x68, 0xe8, 0x0d, 0x2c, 0xec, 0x63, 0x87, 0x39, 0xb4, 0x85, 0xbb, 0xaf, - 0x09, 0x6e, 0x4f, 0x54, 0x3b, 0x45, 0x3f, 0x68, 0xa6, 0x04, 0xe6, 0xd1, 0x3f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xc0, 0x92, 0xa7, 0x79, 0x2f, 0x11, 0x00, 0x00, + // 1560 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xdf, 0x4e, 0x1b, 0x47, + 0x17, 0xcf, 0x1a, 0x63, 0xc8, 0xb1, 0x81, 0x65, 0x70, 0xc0, 0x71, 0x88, 0x3e, 0xbe, 0xfd, 0x92, + 0xaf, 0x80, 0x14, 0x1b, 0x9c, 0x28, 0x4a, 0x13, 0xa5, 0x91, 0xc1, 0x1b, 0x62, 0x25, 0x32, 0x64, + 0xed, 0x40, 0xaa, 0x5c, 0xac, 0xc6, 0xf6, 0x04, 0xaf, 0xe2, 0xdd, 0x59, 0x76, 0xc7, 0x56, 0xb8, + 0xa9, 0xd4, 0x47, 0x68, 0xa5, 0xde, 0x55, 0xaa, 0xfa, 0x0c, 0xbd, 0xe8, 0x2b, 0xf4, 0x21, 0x7a, + 0xd9, 0x07, 0xa9, 0x76, 0x66, 0xf6, 0x0f, 0x36, 0x0e, 0x26, 0x77, 0x3b, 0xe7, 0x9c, 0xdf, 0x39, + 0x67, 0xce, 0x9c, 0x7f, 0x36, 0x68, 0xae, 0x47, 0x19, 0x2d, 0xb7, 0x09, 0xee, 0x50, 0xa7, 0xec, + 0xb9, 0x9d, 0xf2, 0x70, 0xb7, 0xec, 0x13, 0x6f, 0x68, 0x75, 0x88, 0x5f, 0xe2, 0x4c, 0xb4, 0x4a, + 0x58, 0x8f, 0x78, 0x64, 0x60, 0x97, 0x84, 0x58, 0xc9, 0x73, 0x3b, 0xa5, 0xe1, 0x6e, 0xf1, 0xce, + 0x29, 0xa5, 0xa7, 0x7d, 0x52, 0xe6, 0x52, 0xed, 0xc1, 0xc7, 0x32, 0xb1, 0x5d, 0x76, 0x2e, 0x40, + 0xc5, 0xfb, 0x42, 0x31, 0x61, 0xbd, 0xf2, 0x70, 0x17, 0xf7, 0xdd, 0x1e, 0xde, 0x95, 0x56, 0xcc, + 0x76, 0x9f, 0x76, 0x3e, 0x49, 0xb1, 0x7b, 0x97, 0x88, 0x61, 0xc6, 0x88, 0xcf, 0x30, 0xb3, 0xa8, + 0x23, 0xa5, 0xd6, 0xa5, 0x25, 0xec, 0x5a, 0x65, 0xec, 0x38, 0x54, 0x30, 0xa5, 0x7f, 0xda, 0x01, + 0xe4, 0xf6, 0x02, 0x95, 0x06, 0x39, 0x1b, 0x10, 0x9f, 0x21, 0x04, 0x69, 0xbf, 0x4f, 0x59, 0x41, + 0xd9, 0x50, 0x36, 0xd3, 0x06, 0xff, 0x46, 0xff, 0x83, 0x05, 0x0f, 0x3b, 0x5d, 0x4c, 0x4d, 0x8f, + 0x0c, 0x09, 0xee, 0x17, 0x52, 0x1b, 0xca, 0x66, 0xce, 0xc8, 0x09, 0xa2, 0xc1, 0x69, 0xda, 0x0e, + 0x2c, 0x1d, 0x79, 0xd4, 0xa5, 0x3e, 0x31, 0x88, 0xef, 0x52, 0xc7, 0x27, 0xe8, 0x2e, 0x00, 0x77, + 0xd7, 0xf4, 0xa8, 0xd4, 0x98, 0x33, 0x6e, 0x72, 0x8a, 0x41, 0x29, 0xd3, 0x86, 0x80, 0xaa, 0xb1, + 0xb7, 0xa1, 0x03, 0x77, 0x01, 0xdc, 0x41, 0xbb, 0x6f, 0x75, 0xcc, 0x4f, 0xe4, 0x3c, 0x04, 0x09, + 0xca, 0x6b, 0x72, 0x8e, 0xd6, 0x60, 0xce, 0xa5, 0x1d, 0xb3, 0x6d, 0x31, 0xe9, 0x45, 0xc6, 0xa5, + 0x9d, 0x3d, 0x2b, 0x76, 0x7c, 0x26, 0xe1, 0x78, 0x1e, 0x66, 0xfd, 0x1e, 0xf6, 0xba, 0x85, 0x34, + 0x27, 0x8a, 0x83, 0x76, 0x0f, 0x16, 0x85, 0xdd, 0xc8, 0x51, 0x04, 0xe9, 0x84, 0x8b, 0xfc, 0x5b, + 0x33, 0xe0, 0xce, 0x31, 0xee, 0x5b, 0x5d, 0xcc, 0xa8, 0x77, 0x44, 0xbc, 0x8f, 0xd4, 0xb3, 0xb1, + 0xd3, 0x21, 0x5f, 0x8a, 0xd3, 0x7f, 0x20, 0x1b, 0xbb, 0xee, 0x17, 0x52, 0x1b, 0x33, 0x9b, 0x39, + 0x03, 0x22, 0xdf, 0x7d, 0xed, 0x97, 0x14, 0xac, 0x5f, 0xae, 0x54, 0x3a, 0x52, 0x84, 0xf9, 0x36, + 0xee, 0x07, 0x24, 0xbf, 0xa0, 0x6c, 0xcc, 0x6c, 0xa6, 0x8d, 0xe8, 0x8c, 0xb6, 0x40, 0x65, 0x94, + 0xe1, 0xbe, 0x39, 0x0c, 0x35, 0xf8, 0x3c, 0x04, 0x69, 0x63, 0x89, 0xd3, 0x23, 0xc5, 0x3e, 0x7a, + 0x0c, 0x6b, 0x42, 0x14, 0x77, 0x98, 0x35, 0x24, 0x49, 0x84, 0x08, 0xcf, 0x2d, 0xce, 0xae, 0x72, + 0x6e, 0x02, 0xf7, 0x00, 0x90, 0x6d, 0xf9, 0xbe, 0xe5, 0x9c, 0x26, 0x21, 0x69, 0x7e, 0x8f, 0x65, + 0xc9, 0x49, 0x88, 0x1f, 0xc0, 0x06, 0x1e, 0x12, 0x0f, 0x9f, 0x92, 0x31, 0x43, 0xa6, 0x74, 0xbb, + 0x30, 0xbb, 0xa1, 0x6c, 0xa6, 0x8c, 0xbb, 0x52, 0x6e, 0xc4, 0xe2, 0x9e, 0x10, 0xd2, 0x9e, 0x43, + 0x31, 0xa2, 0x71, 0x91, 0x0b, 0x19, 0x31, 0x12, 0x56, 0x65, 0x2c, 0xac, 0xbf, 0xa5, 0x12, 0x6f, + 0x95, 0xc4, 0xcb, 0xa8, 0x3e, 0x86, 0x5b, 0x58, 0x50, 0x49, 0xd7, 0x1c, 0x53, 0xb5, 0x97, 0x2a, + 0x28, 0xc6, 0x4a, 0x24, 0x70, 0x14, 0xe9, 0x45, 0xc7, 0x30, 0x1f, 0x24, 0xe7, 0xc0, 0x27, 0xe2, + 0x31, 0xb3, 0x95, 0xa7, 0xa5, 0xcb, 0xcb, 0xb9, 0xf4, 0x05, 0xf3, 0xa5, 0x26, 0xd7, 0x61, 0x44, + 0xba, 0x8a, 0x2e, 0x64, 0x04, 0xed, 0xaa, 0x64, 0x3f, 0x80, 0x8c, 0x00, 0xf1, 0x87, 0xce, 0x56, + 0xca, 0x57, 0x9a, 0x97, 0xb6, 0xa4, 0x69, 0x43, 0xc2, 0xb5, 0xa7, 0xb0, 0xa6, 0x7f, 0xb6, 0x18, + 0xe9, 0xc6, 0xaf, 0x37, 0x75, 0x74, 0x9f, 0x41, 0x61, 0x1c, 0x2b, 0x23, 0x7b, 0x25, 0xf8, 0x2d, + 0xa0, 0xfd, 0x1e, 0xb6, 0x9c, 0x26, 0xc3, 0x5e, 0x5c, 0x6f, 0x05, 0x98, 0xf3, 0x03, 0x02, 0xe9, + 0xf2, 0x3b, 0xcf, 0x1b, 0xe1, 0x11, 0xfd, 0x17, 0x72, 0xa7, 0xc4, 0x21, 0xbe, 0xe5, 0x9b, 0xcc, + 0xb2, 0x89, 0x4c, 0xf0, 0xac, 0xa4, 0xb5, 0x2c, 0x9b, 0x68, 0x8f, 0xe1, 0x56, 0xe4, 0x49, 0xdd, + 0xe9, 0x92, 0xcf, 0xd3, 0x75, 0x0e, 0xad, 0x04, 0xab, 0xa3, 0x38, 0xe9, 0x4e, 0x1e, 0x66, 0xad, + 0x80, 0x20, 0x8b, 0x59, 0x1c, 0xb4, 0x77, 0xb0, 0x5c, 0xf5, 0x7d, 0xeb, 0xd4, 0xb1, 0x89, 0xc3, + 0x12, 0xd1, 0x22, 0x2e, 0xed, 0xf4, 0x4c, 0xee, 0xb0, 0x04, 0x00, 0x27, 0xf1, 0x2b, 0x5e, 0xdd, + 0x03, 0x7e, 0x9d, 0x01, 0x94, 0xd4, 0x2b, 0x7d, 0x38, 0x83, 0x7c, 0x5c, 0x3c, 0x38, 0xe2, 0xf3, + 0x90, 0x66, 0x2b, 0xdf, 0x4d, 0x7a, 0xf8, 0x71, 0x4d, 0x89, 0x54, 0x8c, 0x79, 0x2b, 0xc3, 0x71, + 0x62, 0xf1, 0xe7, 0x14, 0xac, 0x5c, 0x22, 0x8c, 0xd6, 0xe1, 0x66, 0x87, 0xda, 0xb6, 0xc5, 0x18, + 0x21, 0xb2, 0x0b, 0xc5, 0x84, 0xb8, 0xa7, 0xa6, 0x12, 0x3d, 0x15, 0x69, 0x90, 0x13, 0x93, 0x87, + 0x78, 0xcd, 0xb8, 0x0b, 0x5f, 0xa0, 0x05, 0xa1, 0xb1, 0x7c, 0xd3, 0x15, 0x43, 0xc2, 0xe3, 0x3d, + 0x79, 0xde, 0x00, 0xcb, 0x97, 0x63, 0xc3, 0x0b, 0x94, 0x84, 0x5c, 0xae, 0x64, 0x56, 0x28, 0x49, + 0xd2, 0x46, 0x1e, 0x39, 0x33, 0x5a, 0x31, 0x2f, 0xa2, 0x8a, 0x99, 0xdb, 0x50, 0x36, 0x17, 0x2b, + 0xdf, 0x4c, 0x5b, 0x31, 0x61, 0xa5, 0xfc, 0x99, 0x82, 0xb5, 0x09, 0xd5, 0x94, 0x50, 0xae, 0x7c, + 0x95, 0x72, 0xf4, 0x2d, 0xdc, 0x26, 0xac, 0xb7, 0x6b, 0x76, 0x89, 0x4b, 0x7d, 0x8b, 0x89, 0x61, + 0x6e, 0x3a, 0x03, 0xbb, 0x4d, 0x3c, 0x19, 0xcf, 0x60, 0x5f, 0xd8, 0xad, 0x09, 0x3e, 0x1f, 0xcc, + 0x0d, 0xce, 0x45, 0x8f, 0x60, 0x35, 0x44, 0x59, 0x4e, 0xa7, 0x3f, 0xf0, 0x2d, 0xea, 0x98, 0x89, + 0x81, 0x97, 0x97, 0xdc, 0x7a, 0xc8, 0xe4, 0xd1, 0xda, 0x02, 0x15, 0x47, 0x0d, 0xc9, 0xe4, 0x69, + 0x2a, 0x67, 0xe1, 0x52, 0x4c, 0xd7, 0x03, 0x32, 0x7a, 0x01, 0xeb, 0x5c, 0x41, 0x20, 0x68, 0x39, + 0x66, 0x02, 0x76, 0x36, 0x20, 0x03, 0x22, 0x1f, 0xe3, 0x76, 0x28, 0x53, 0x77, 0xe2, 0x4e, 0xf7, + 0x36, 0x10, 0xd0, 0x9e, 0xc3, 0x42, 0x8d, 0xda, 0xd8, 0x8a, 0xfa, 0x76, 0x1e, 0x66, 0x85, 0x45, + 0x59, 0x56, 0xfc, 0x80, 0x56, 0x21, 0xd3, 0xe5, 0x62, 0xe1, 0xfc, 0x16, 0x27, 0xed, 0x19, 0x2c, + 0x86, 0x70, 0x19, 0xee, 0x2d, 0x50, 0x83, 0x9c, 0xc4, 0x6c, 0xe0, 0x11, 0x53, 0x62, 0x84, 0xaa, + 0xa5, 0x88, 0x2e, 0x20, 0xda, 0x4f, 0x29, 0x58, 0xe6, 0xd1, 0x6a, 0x79, 0x24, 0x9e, 0xa6, 0x2f, + 0x21, 0xcd, 0x3c, 0x99, 0xc3, 0xd9, 0x4a, 0x65, 0xd2, 0x6b, 0x8d, 0x01, 0x4b, 0xc1, 0xa1, 0x41, + 0xbb, 0xc4, 0xe0, 0xf8, 0xe2, 0x1f, 0x0a, 0xcc, 0x87, 0x24, 0xf4, 0x04, 0x66, 0xf9, 0xb3, 0x71, + 0x57, 0xb2, 0x15, 0x2d, 0xd6, 0x4a, 0x58, 0xaf, 0x14, 0xee, 0x61, 0xa5, 0x3d, 0x6e, 0x42, 0xac, + 0x56, 0x02, 0x30, 0xb2, 0x0e, 0xa5, 0x46, 0xd6, 0xa1, 0x60, 0xf8, 0xba, 0xd8, 0x63, 0x56, 0xc7, + 0x72, 0xf9, 0xa0, 0x1a, 0x52, 0x46, 0xc2, 0x79, 0xbd, 0x9c, 0xe4, 0x1c, 0x07, 0x8c, 0xa0, 0x9a, + 0xe4, 0x3a, 0xc0, 0xe5, 0xc4, 0xab, 0x82, 0xd8, 0x04, 0x02, 0x8a, 0xf6, 0x06, 0xf2, 0x81, 0xd3, + 0xdc, 0x85, 0x20, 0x19, 0xc2, 0x67, 0xb9, 0x03, 0x37, 0x83, 0xbc, 0x31, 0x3f, 0x7a, 0xd4, 0x96, + 0xf1, 0x9c, 0x0f, 0x08, 0x2f, 0x3d, 0x6a, 0x07, 0xeb, 0x15, 0x67, 0x32, 0x2a, 0xf3, 0x31, 0x13, + 0x1c, 0x5b, 0x74, 0xfb, 0x09, 0x2c, 0x44, 0x59, 0x6d, 0xd0, 0x3e, 0x41, 0x59, 0x98, 0x7b, 0xd7, + 0x78, 0xdd, 0x38, 0x3c, 0x69, 0xa8, 0x37, 0x50, 0x0e, 0xe6, 0xab, 0xad, 0x96, 0xde, 0x6c, 0xe9, + 0x86, 0xaa, 0x04, 0xa7, 0x23, 0xe3, 0xf0, 0xe8, 0xb0, 0xa9, 0x1b, 0x6a, 0x6a, 0xfb, 0x77, 0x05, + 0x96, 0x46, 0x0a, 0x02, 0x21, 0x58, 0x94, 0x60, 0xb3, 0xd9, 0xaa, 0xb6, 0xde, 0x35, 0xd5, 0x1b, + 0x28, 0x0f, 0x6a, 0x4d, 0x3f, 0x3a, 0x6c, 0xd6, 0x5b, 0xa6, 0xa1, 0xef, 0xeb, 0xf5, 0x63, 0xbd, + 0xa6, 0x2a, 0x81, 0xe4, 0x91, 0xde, 0xa8, 0xd5, 0x1b, 0x07, 0x66, 0x75, 0xbf, 0x55, 0x3f, 0xd6, + 0xd5, 0x14, 0x02, 0xc8, 0xc8, 0xef, 0x99, 0x80, 0x5f, 0x6f, 0xd4, 0x5b, 0xf5, 0x6a, 0x4b, 0xaf, + 0x99, 0xfa, 0xfb, 0x7a, 0x4b, 0x4d, 0x23, 0x15, 0x72, 0x27, 0xf5, 0xd6, 0xab, 0x9a, 0x51, 0x3d, + 0xa9, 0xee, 0xbd, 0xd1, 0xd5, 0xd9, 0x00, 0x11, 0xf0, 0xf4, 0x9a, 0x9a, 0x09, 0x10, 0xe2, 0xdb, + 0x6c, 0xbe, 0xa9, 0x36, 0x5f, 0xe9, 0x35, 0x75, 0xae, 0xf2, 0xb7, 0x02, 0x4b, 0xd5, 0xb0, 0x57, + 0x89, 0x05, 0x1e, 0xf5, 0x00, 0xc9, 0x90, 0x25, 0xb6, 0x54, 0xb4, 0x3d, 0xb1, 0x13, 0x8f, 0xad, + 0xb2, 0xc5, 0xff, 0x4f, 0xc8, 0x8d, 0x84, 0x68, 0x0d, 0x33, 0x8c, 0x4c, 0x58, 0x6e, 0x0e, 0xda, + 0xb6, 0x75, 0xc1, 0x90, 0x76, 0x35, 0x38, 0x69, 0xe0, 0x32, 0x67, 0xc2, 0x7c, 0xae, 0xfc, 0xa5, + 0x44, 0xcb, 0x79, 0x74, 0xbd, 0xf7, 0x90, 0x93, 0x7e, 0xf2, 0x0c, 0x41, 0xf7, 0xbe, 0x58, 0x1e, + 0xe1, 0x95, 0xa6, 0x48, 0x77, 0xf4, 0x01, 0x72, 0xd2, 0x98, 0x38, 0x4f, 0x81, 0x29, 0x4e, 0x6c, + 0xa5, 0x23, 0xbf, 0x29, 0x2a, 0xff, 0xcc, 0x81, 0x1a, 0x67, 0x93, 0xbc, 0xcb, 0x07, 0x00, 0xd1, + 0x08, 0x78, 0x38, 0xef, 0x4f, 0xd2, 0x75, 0xa1, 0x3d, 0x4d, 0x0e, 0xde, 0x48, 0x1b, 0xfa, 0x01, + 0x96, 0x4f, 0xb0, 0xc5, 0x5e, 0x26, 0x77, 0x3b, 0x54, 0xb9, 0xd6, 0x22, 0x28, 0x0c, 0x3e, 0xfc, + 0x8a, 0xe5, 0x71, 0x47, 0x41, 0x14, 0x16, 0x2f, 0xee, 0x2d, 0xe8, 0xc1, 0x95, 0x8a, 0x92, 0x7b, + 0x51, 0xb1, 0x34, 0xad, 0xb8, 0xbc, 0x70, 0x1f, 0x56, 0xf6, 0xc3, 0x71, 0x9f, 0x58, 0x0b, 0xb6, + 0xa6, 0xd9, 0x41, 0x84, 0xc5, 0xed, 0xe9, 0xd7, 0x15, 0x74, 0x36, 0xde, 0x1d, 0xae, 0x79, 0xbf, + 0xeb, 0x6e, 0xc5, 0xe8, 0x47, 0x05, 0xf2, 0x97, 0xfd, 0x0c, 0x43, 0x57, 0xbf, 0xd0, 0xf8, 0x2f, + 0xc1, 0xe2, 0xa3, 0xeb, 0x81, 0xa4, 0x0f, 0x03, 0x50, 0x47, 0xb7, 0x6a, 0x34, 0xf1, 0x22, 0x13, + 0x76, 0xf7, 0xe2, 0xce, 0xf4, 0x00, 0x69, 0xf6, 0xfb, 0x28, 0x99, 0xe3, 0xb5, 0x1c, 0xad, 0x96, + 0xc4, 0x5f, 0x04, 0xa5, 0xf0, 0xcf, 0x88, 0x92, 0x6e, 0xbb, 0xec, 0x7c, 0xf2, 0x33, 0x8e, 0xaf, + 0xf4, 0x3b, 0x0a, 0x7a, 0x0d, 0x0b, 0xfb, 0xd8, 0xa1, 0x8e, 0xd5, 0xc1, 0xfd, 0x57, 0x04, 0x77, + 0x27, 0xaa, 0x9d, 0xa2, 0x1f, 0xb4, 0x33, 0x1c, 0xf3, 0xf0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x53, 0xd0, 0x39, 0x96, 0x63, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/validator/client/validator.go b/validator/client/validator.go index 20bbf6ff9c94..9d663d652c76 100644 --- a/validator/client/validator.go +++ b/validator/client/validator.go @@ -208,9 +208,9 @@ func (v *validator) UpdateAssignments(ctx context.Context, slot uint64) error { } if assignment.Status == pb.ValidatorStatus_ACTIVE { if assignment.IsProposer { - lFields["proposerSlot"] = assignment.Slot + lFields["proposerSlot"] = assignment.ProposerSlot } - lFields["attesterSlot"] = assignment.Slot + lFields["attesterSlot"] = assignment.AttesterSlot } log.WithFields(lFields).Info("New assignment") } @@ -229,7 +229,7 @@ func (v *validator) RolesAt(slot uint64) map[[48]byte]pb.ValidatorRole { if assignment == nil { role = pb.ValidatorRole_UNKNOWN } - if assignment.Slot == slot { + if assignment.AttesterSlot == slot { // Note: A proposer also attests to the slot. if assignment.IsProposer { role = pb.ValidatorRole_PROPOSER From 326cb90093d14f05991f1842f0ca495c10beeeac Mon Sep 17 00:00:00 2001 From: Terence Tsao Date: Mon, 4 Nov 2019 08:35:58 -0800 Subject: [PATCH 2/3] Fixed tests --- validator/client/BUILD.bazel | 1 - validator/client/validator_attest_test.go | 9 ++--- validator/client/validator_test.go | 46 ++++++++++++----------- 3 files changed, 29 insertions(+), 27 deletions(-) diff --git a/validator/client/BUILD.bazel b/validator/client/BUILD.bazel index 0ed8887760e3..5b00371ce63d 100644 --- a/validator/client/BUILD.bazel +++ b/validator/client/BUILD.bazel @@ -60,7 +60,6 @@ go_test( "//shared/testutil:go_default_library", "//validator/accounts:go_default_library", "//validator/internal:go_default_library", - "@com_github_gogo_protobuf//proto:go_default_library", "@com_github_gogo_protobuf//types:go_default_library", "@com_github_golang_mock//gomock:go_default_library", "@com_github_prysmaticlabs_go_bitfield//:go_default_library", diff --git a/validator/client/validator_attest_test.go b/validator/client/validator_attest_test.go index 028dcf6a1cbf..10ade4a1292b 100644 --- a/validator/client/validator_attest_test.go +++ b/validator/client/validator_attest_test.go @@ -3,14 +3,14 @@ package client import ( "context" "errors" + "reflect" "sync" "testing" "time" - "github.com/gogo/protobuf/proto" "github.com/golang/mock/gomock" - bitfield "github.com/prysmaticlabs/go-bitfield" - ssz "github.com/prysmaticlabs/go-ssz" + "github.com/prysmaticlabs/go-bitfield" + "github.com/prysmaticlabs/go-ssz" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" pb "github.com/prysmaticlabs/prysm/proto/beacon/rpc/v1" ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1" @@ -163,8 +163,7 @@ func TestAttestToBlockHead_AttestsCorrectly(t *testing.T) { sig := validator.keys[validatorPubKey].SecretKey.Sign(root[:], 0).Marshal() expectedAttestation.Signature = sig - - if !proto.Equal(generatedAttestation, expectedAttestation) { + if !reflect.DeepEqual(generatedAttestation, expectedAttestation) { t.Errorf("Incorrectly attested head, wanted %v, received %v", expectedAttestation, generatedAttestation) } testutil.AssertLogsContain(t, hook, "Submitted new attestation") diff --git a/validator/client/validator_test.go b/validator/client/validator_test.go index f466666f4cb3..c8d9da7fcea6 100644 --- a/validator/client/validator_test.go +++ b/validator/client/validator_test.go @@ -391,9 +391,9 @@ func TestUpdateAssignments_DoesNothingWhenNotEpochStartAndAlreadyExistingAssignm assignments: &pb.AssignmentResponse{ ValidatorAssignment: []*pb.AssignmentResponse_ValidatorAssignment{ { - Committee: []uint64{}, - Slot: 10, - Shard: 20, + Committee: []uint64{}, + AttesterSlot: 10, + Shard: 20, }, }, }, @@ -449,11 +449,12 @@ func TestUpdateAssignments_OK(t *testing.T) { resp := &pb.AssignmentResponse{ ValidatorAssignment: []*pb.AssignmentResponse_ValidatorAssignment{ { - Slot: params.BeaconConfig().SlotsPerEpoch, - Shard: 100, - Committee: []uint64{0, 1, 2, 3}, - IsProposer: true, - PublicKey: []byte("testPubKey_1"), + AttesterSlot: params.BeaconConfig().SlotsPerEpoch, + Shard: 100, + Committee: []uint64{0, 1, 2, 3}, + IsProposer: true, + PublicKey: []byte("testPubKey_1"), + ProposerSlot: params.BeaconConfig().SlotsPerEpoch + 1, }, }, } @@ -470,11 +471,14 @@ func TestUpdateAssignments_OK(t *testing.T) { t.Fatalf("Could not update assignments: %v", err) } - if v.assignments.ValidatorAssignment[0].Slot != params.BeaconConfig().SlotsPerEpoch { - t.Errorf("Unexpected validator assignments. want=%v got=%v", params.BeaconConfig().SlotsPerEpoch, v.assignments.ValidatorAssignment[0].Slot) + if v.assignments.ValidatorAssignment[0].ProposerSlot != params.BeaconConfig().SlotsPerEpoch+1 { + t.Errorf("Unexpected validator assignments. want=%v got=%v", params.BeaconConfig().SlotsPerEpoch+1, v.assignments.ValidatorAssignment[0].ProposerSlot) + } + if v.assignments.ValidatorAssignment[0].AttesterSlot != params.BeaconConfig().SlotsPerEpoch { + t.Errorf("Unexpected validator assignments. want=%v got=%v", params.BeaconConfig().SlotsPerEpoch, v.assignments.ValidatorAssignment[0].AttesterSlot) } if v.assignments.ValidatorAssignment[0].Shard != resp.ValidatorAssignment[0].Shard { - t.Errorf("Unexpected validator assignments. want=%v got=%v", resp.ValidatorAssignment[0].Shard, v.assignments.ValidatorAssignment[0].Slot) + t.Errorf("Unexpected validator assignments. want=%v got=%v", resp.ValidatorAssignment[0].Shard, v.assignments.ValidatorAssignment[0].Shard) } if !v.assignments.ValidatorAssignment[0].IsProposer { t.Errorf("Unexpected validator assignments. want: proposer=true") @@ -487,20 +491,20 @@ func TestRolesAt_OK(t *testing.T) { assignments: &pb.AssignmentResponse{ ValidatorAssignment: []*pb.AssignmentResponse_ValidatorAssignment{ { - Shard: 1, - Slot: 1, - IsProposer: true, - PublicKey: []byte{0x01}, + Shard: 1, + AttesterSlot: 1, + IsProposer: true, + PublicKey: []byte{0x01}, }, { - Shard: 2, - Slot: 1, - PublicKey: []byte{0x02}, + Shard: 2, + AttesterSlot: 1, + PublicKey: []byte{0x02}, }, { - Shard: 1, - Slot: 2, - PublicKey: []byte{0x03}, + Shard: 1, + AttesterSlot: 2, + PublicKey: []byte{0x03}, }, }, }, From 5c0e2e7fac6fe9f16943dd1a5ae32665310c3c94 Mon Sep 17 00:00:00 2001 From: Terence Tsao Date: Tue, 5 Nov 2019 07:00:44 -0800 Subject: [PATCH 3/3] All tests pass --- beacon-chain/rpc/validator_server.go | 3 +- proto/beacon/rpc/v1/services.pb.go | 262 +++++++++------------ proto/beacon/rpc/v1/services.proto | 10 +- proto/beacon/rpc/v1_gateway/services.pb.go | 217 +++++++++-------- validator/client/runner.go | 4 +- validator/client/runner_test.go | 2 +- validator/client/validator.go | 21 +- validator/client/validator_test.go | 22 +- 8 files changed, 250 insertions(+), 291 deletions(-) diff --git a/beacon-chain/rpc/validator_server.go b/beacon-chain/rpc/validator_server.go index 57be4f49da10..bce15d5d1f50 100644 --- a/beacon-chain/rpc/validator_server.go +++ b/beacon-chain/rpc/validator_server.go @@ -195,7 +195,7 @@ func (vs *ValidatorServer) CommitteeAssignment(ctx context.Context, req *pb.Assi func (vs *ValidatorServer) assignment(idx uint64, beaconState *pbp2p.BeaconState, epoch uint64) (*pb.AssignmentResponse_ValidatorAssignment, error) { // TODO(3865): Update ValidatorAssignments_CommitteeAssignment to take in proposer slot - committee, shard, aSlot, isProposer, pSlot, err := helpers.CommitteeAssignment(beaconState, epoch, idx) + committee, shard, aSlot, _, pSlot, err := helpers.CommitteeAssignment(beaconState, epoch, idx) if err != nil { return nil, err } @@ -204,7 +204,6 @@ func (vs *ValidatorServer) assignment(idx uint64, beaconState *pbp2p.BeaconState Committee: committee, Shard: shard, AttesterSlot: aSlot, - IsProposer: isProposer, ProposerSlot: pSlot, Status: status, }, nil diff --git a/proto/beacon/rpc/v1/services.pb.go b/proto/beacon/rpc/v1/services.pb.go index 78d294e11abb..d275e6bbd7d6 100755 --- a/proto/beacon/rpc/v1/services.pb.go +++ b/proto/beacon/rpc/v1/services.pb.go @@ -33,18 +33,21 @@ const ( ValidatorRole_UNKNOWN ValidatorRole = 0 ValidatorRole_ATTESTER ValidatorRole = 1 ValidatorRole_PROPOSER ValidatorRole = 2 + ValidatorRole_BOTH ValidatorRole = 3 ) var ValidatorRole_name = map[int32]string{ 0: "UNKNOWN", 1: "ATTESTER", 2: "PROPOSER", + 3: "BOTH", } var ValidatorRole_value = map[string]int32{ "UNKNOWN": 0, "ATTESTER": 1, "PROPOSER": 2, + "BOTH": 3, } func (x ValidatorRole) String() string { @@ -958,11 +961,10 @@ func (m *AssignmentResponse) GetValidatorAssignment() []*AssignmentResponse_Vali type AssignmentResponse_ValidatorAssignment struct { Committee []uint64 `protobuf:"varint,1,rep,packed,name=committee,proto3" json:"committee,omitempty"` Shard uint64 `protobuf:"varint,2,opt,name=shard,proto3" json:"shard,omitempty"` - AttesterSlot uint64 `protobuf:"varint,3,opt,name=attesterSlot,proto3" json:"attesterSlot,omitempty"` - IsProposer bool `protobuf:"varint,4,opt,name=is_proposer,json=isProposer,proto3" json:"is_proposer,omitempty"` - ProposerSlot uint64 `protobuf:"varint,5,opt,name=proposerSlot,proto3" json:"proposerSlot,omitempty"` - PublicKey []byte `protobuf:"bytes,6,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` - Status ValidatorStatus `protobuf:"varint,7,opt,name=status,proto3,enum=ethereum.beacon.rpc.v1.ValidatorStatus" json:"status,omitempty"` + AttesterSlot uint64 `protobuf:"varint,3,opt,name=attester_slot,json=attesterSlot,proto3" json:"attester_slot,omitempty"` + ProposerSlot uint64 `protobuf:"varint,4,opt,name=proposer_slot,json=proposerSlot,proto3" json:"proposer_slot,omitempty"` + PublicKey []byte `protobuf:"bytes,5,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` + Status ValidatorStatus `protobuf:"varint,6,opt,name=status,proto3,enum=ethereum.beacon.rpc.v1.ValidatorStatus" json:"status,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1024,13 +1026,6 @@ func (m *AssignmentResponse_ValidatorAssignment) GetAttesterSlot() uint64 { return 0 } -func (m *AssignmentResponse_ValidatorAssignment) GetIsProposer() bool { - if m != nil { - return m.IsProposer - } - return false -} - func (m *AssignmentResponse_ValidatorAssignment) GetProposerSlot() uint64 { if m != nil { return m.ProposerSlot @@ -1437,106 +1432,106 @@ func init() { func init() { proto.RegisterFile("proto/beacon/rpc/v1/services.proto", fileDescriptor_9eb4e94b85965285) } var fileDescriptor_9eb4e94b85965285 = []byte{ - // 1578 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xdd, 0x6e, 0x13, 0xc7, - 0x17, 0x67, 0x1d, 0xc7, 0x09, 0xc7, 0x4e, 0xb2, 0x99, 0x98, 0xc4, 0x98, 0xc0, 0x3f, 0xff, 0x2d, - 0xb4, 0x49, 0x24, 0xec, 0xc4, 0x20, 0x44, 0x41, 0x14, 0x39, 0xf1, 0x12, 0x2c, 0x90, 0x13, 0xd6, - 0x26, 0xa1, 0xe2, 0x62, 0x35, 0xb6, 0x87, 0x78, 0x85, 0xbd, 0xb3, 0xd9, 0x1d, 0x5b, 0xe4, 0xa6, - 0x52, 0x1f, 0xa1, 0x95, 0x7a, 0x57, 0xa9, 0xea, 0x33, 0xf4, 0xa2, 0xaf, 0xc0, 0x65, 0x1f, 0xa0, - 0x17, 0x15, 0xea, 0x83, 0x54, 0x3b, 0x33, 0xfb, 0x11, 0x3b, 0x26, 0x0e, 0x77, 0x3b, 0xe7, 0x9c, - 0xdf, 0x39, 0x67, 0xce, 0x9c, 0x2f, 0x1b, 0x34, 0xc7, 0xa5, 0x8c, 0x16, 0x9b, 0x04, 0xb7, 0xa8, - 0x5d, 0x74, 0x9d, 0x56, 0x71, 0xb0, 0x5d, 0xf4, 0x88, 0x3b, 0xb0, 0x5a, 0xc4, 0x2b, 0x70, 0x26, - 0x5a, 0x26, 0xac, 0x43, 0x5c, 0xd2, 0xef, 0x15, 0x84, 0x58, 0xc1, 0x75, 0x5a, 0x85, 0xc1, 0x76, - 0xfe, 0xc6, 0x31, 0xa5, 0xc7, 0x5d, 0x52, 0xe4, 0x52, 0xcd, 0xfe, 0xbb, 0x22, 0xe9, 0x39, 0xec, - 0x54, 0x80, 0xf2, 0x77, 0x84, 0x62, 0xc2, 0x3a, 0xc5, 0xc1, 0x36, 0xee, 0x3a, 0x1d, 0xbc, 0x2d, - 0xad, 0x98, 0xcd, 0x2e, 0x6d, 0xbd, 0x97, 0x62, 0xb7, 0xcf, 0x11, 0xc3, 0x8c, 0x11, 0x8f, 0x61, - 0x66, 0x51, 0x5b, 0x4a, 0xad, 0x4a, 0x4b, 0xd8, 0xb1, 0x8a, 0xd8, 0xb6, 0xa9, 0x60, 0x4a, 0xff, - 0xb4, 0x3d, 0xc8, 0xec, 0xf8, 0x2a, 0x0d, 0x72, 0xd2, 0x27, 0x1e, 0x43, 0x08, 0x92, 0x5e, 0x97, - 0xb2, 0x9c, 0xb2, 0xa6, 0xac, 0x27, 0x0d, 0xfe, 0x8d, 0xbe, 0x82, 0x39, 0x17, 0xdb, 0x6d, 0x4c, - 0x4d, 0x97, 0x0c, 0x08, 0xee, 0xe6, 0x12, 0x6b, 0xca, 0x7a, 0xc6, 0xc8, 0x08, 0xa2, 0xc1, 0x69, - 0xda, 0x16, 0x2c, 0x1c, 0xb8, 0xd4, 0xa1, 0x1e, 0x31, 0x88, 0xe7, 0x50, 0xdb, 0x23, 0xe8, 0x26, - 0x00, 0x77, 0xd7, 0x74, 0xa9, 0xd4, 0x98, 0x31, 0xae, 0x72, 0x8a, 0x41, 0x29, 0xd3, 0x06, 0x80, - 0xca, 0x91, 0xb7, 0x81, 0x03, 0x37, 0x01, 0x9c, 0x7e, 0xb3, 0x6b, 0xb5, 0xcc, 0xf7, 0xe4, 0x34, - 0x00, 0x09, 0xca, 0x0b, 0x72, 0x8a, 0x56, 0x60, 0xc6, 0xa1, 0x2d, 0xb3, 0x69, 0x31, 0xe9, 0x45, - 0xca, 0xa1, 0xad, 0x1d, 0x2b, 0x72, 0x7c, 0x2a, 0xe6, 0x78, 0x16, 0xa6, 0xbd, 0x0e, 0x76, 0xdb, - 0xb9, 0x24, 0x27, 0x8a, 0x83, 0x76, 0x1b, 0xe6, 0x85, 0xdd, 0xd0, 0x51, 0x04, 0xc9, 0x98, 0x8b, - 0xfc, 0x5b, 0x33, 0xe0, 0xc6, 0x21, 0xee, 0x5a, 0x6d, 0xcc, 0xa8, 0x7b, 0x40, 0xdc, 0x77, 0xd4, - 0xed, 0x61, 0xbb, 0x45, 0x3e, 0x17, 0xa7, 0xff, 0x41, 0x3a, 0x72, 0xdd, 0xcb, 0x25, 0xd6, 0xa6, - 0xd6, 0x33, 0x06, 0x84, 0xbe, 0x7b, 0xda, 0x2f, 0x09, 0x58, 0x3d, 0x5f, 0xa9, 0x74, 0x24, 0x0f, - 0xb3, 0x4d, 0xdc, 0xf5, 0x49, 0x5e, 0x4e, 0x59, 0x9b, 0x5a, 0x4f, 0x1a, 0xe1, 0x19, 0x6d, 0x80, - 0xca, 0x28, 0xc3, 0x5d, 0x73, 0x10, 0x68, 0xf0, 0x78, 0x08, 0x92, 0xc6, 0x02, 0xa7, 0x87, 0x8a, - 0x3d, 0xf4, 0x00, 0x56, 0x84, 0x28, 0x6e, 0x31, 0x6b, 0x40, 0xe2, 0x08, 0x11, 0x9e, 0x6b, 0x9c, - 0x5d, 0xe6, 0xdc, 0x18, 0xee, 0x2e, 0xa0, 0x9e, 0xe5, 0x79, 0x96, 0x7d, 0x1c, 0x87, 0x24, 0xf9, - 0x3d, 0x16, 0x25, 0x27, 0x26, 0xbe, 0x07, 0x6b, 0x78, 0x40, 0x5c, 0x7c, 0x4c, 0x46, 0x0c, 0x99, - 0xd2, 0xed, 0xdc, 0xf4, 0x9a, 0xb2, 0x9e, 0x30, 0x6e, 0x4a, 0xb9, 0x21, 0x8b, 0x3b, 0x42, 0x48, - 0x7b, 0x02, 0xf9, 0x90, 0xc6, 0x45, 0xce, 0x64, 0xc4, 0x50, 0x58, 0x95, 0x91, 0xb0, 0xfe, 0x96, - 0x88, 0xbd, 0x55, 0x1c, 0x2f, 0xa3, 0xfa, 0x00, 0xae, 0x61, 0x41, 0x25, 0x6d, 0x73, 0x44, 0xd5, - 0x4e, 0x22, 0xa7, 0x18, 0x4b, 0xa1, 0xc0, 0x41, 0xa8, 0x17, 0x1d, 0xc2, 0xac, 0x9f, 0x9c, 0x7d, - 0x8f, 0x88, 0xc7, 0x4c, 0x97, 0x1e, 0x15, 0xce, 0x2f, 0xe7, 0xc2, 0x67, 0xcc, 0x17, 0xea, 0x5c, - 0x87, 0x11, 0xea, 0xca, 0x3b, 0x90, 0x12, 0xb4, 0x8b, 0x92, 0x7d, 0x0f, 0x52, 0x02, 0xc4, 0x1f, - 0x3a, 0x5d, 0x2a, 0x5e, 0x68, 0x5e, 0xda, 0x92, 0xa6, 0x0d, 0x09, 0xd7, 0x1e, 0xc1, 0x8a, 0xfe, - 0xc1, 0x62, 0xa4, 0x1d, 0xbd, 0xde, 0xc4, 0xd1, 0x7d, 0x0c, 0xb9, 0x51, 0xac, 0x8c, 0xec, 0x85, - 0xe0, 0x57, 0x80, 0x76, 0x3b, 0xd8, 0xb2, 0xeb, 0x0c, 0xbb, 0x51, 0xbd, 0xe5, 0x60, 0xc6, 0xf3, - 0x09, 0xa4, 0xcd, 0xef, 0x3c, 0x6b, 0x04, 0x47, 0xf4, 0x7f, 0xc8, 0x1c, 0x13, 0x9b, 0x78, 0x96, - 0x67, 0x32, 0xab, 0x47, 0x64, 0x82, 0xa7, 0x25, 0xad, 0x61, 0xf5, 0x88, 0xf6, 0x00, 0xae, 0x85, - 0x9e, 0x54, 0xed, 0x36, 0xf9, 0x30, 0x59, 0xe7, 0xd0, 0x0a, 0xb0, 0x3c, 0x8c, 0x93, 0xee, 0x64, - 0x61, 0xda, 0xf2, 0x09, 0xb2, 0x98, 0xc5, 0x41, 0x7b, 0x0d, 0x8b, 0x65, 0xcf, 0xb3, 0x8e, 0xed, - 0x1e, 0xb1, 0x59, 0x2c, 0x5a, 0xc4, 0xa1, 0xad, 0x8e, 0xc9, 0x1d, 0x96, 0x00, 0xe0, 0x24, 0x7e, - 0xc5, 0x8b, 0x7b, 0xc0, 0xaf, 0x53, 0x80, 0xe2, 0x7a, 0xa5, 0x0f, 0x27, 0x90, 0x8d, 0x8a, 0x07, - 0x87, 0x7c, 0x1e, 0xd2, 0x74, 0xe9, 0xbb, 0x71, 0x0f, 0x3f, 0xaa, 0x29, 0x96, 0x8a, 0x11, 0x6f, - 0x69, 0x30, 0x4a, 0xcc, 0xff, 0x9c, 0x80, 0xa5, 0x73, 0x84, 0xd1, 0x2a, 0x5c, 0x6d, 0xd1, 0x5e, - 0xcf, 0x62, 0x8c, 0x10, 0xd9, 0x85, 0x22, 0x42, 0xd4, 0x53, 0x13, 0xb1, 0x9e, 0x8a, 0x34, 0xc8, - 0x88, 0xc9, 0x43, 0xdc, 0x7a, 0xd4, 0x85, 0xcf, 0xd0, 0xfc, 0xd0, 0x58, 0x9e, 0xe9, 0x88, 0x21, - 0xe1, 0xf2, 0x9e, 0x3c, 0x6b, 0x80, 0xe5, 0xc9, 0xb1, 0xe1, 0xfa, 0x4a, 0x02, 0x2e, 0x57, 0x32, - 0x2d, 0x94, 0xc4, 0x69, 0x43, 0x8f, 0x9c, 0x1a, 0xae, 0x98, 0xa7, 0x61, 0xc5, 0xcc, 0xac, 0x29, - 0xeb, 0xf3, 0xa5, 0x6f, 0x26, 0xad, 0x98, 0xa0, 0x52, 0xfe, 0x4c, 0xc0, 0xca, 0x98, 0x6a, 0x8a, - 0x29, 0x57, 0xbe, 0x48, 0x39, 0xfa, 0x16, 0xae, 0x13, 0xd6, 0xd9, 0x36, 0xdb, 0xc4, 0xa1, 0x9e, - 0xc5, 0xc4, 0x30, 0x37, 0xed, 0x7e, 0xaf, 0x49, 0x5c, 0x19, 0x4f, 0x7f, 0x5f, 0xd8, 0xae, 0x08, - 0x3e, 0x1f, 0xcc, 0x35, 0xce, 0x45, 0xf7, 0x61, 0x39, 0x40, 0x59, 0x76, 0xab, 0xdb, 0xf7, 0x2c, - 0x6a, 0x9b, 0xb1, 0x81, 0x97, 0x95, 0xdc, 0x6a, 0xc0, 0xe4, 0xd1, 0xda, 0x00, 0x15, 0x87, 0x0d, - 0xc9, 0xe4, 0x69, 0x2a, 0x67, 0xe1, 0x42, 0x44, 0xd7, 0x7d, 0x32, 0x7a, 0x0a, 0xab, 0x5c, 0x81, - 0x2f, 0x68, 0xd9, 0x66, 0x0c, 0x76, 0xd2, 0x27, 0x7d, 0x22, 0x1f, 0xe3, 0x7a, 0x20, 0x53, 0xb5, - 0xa3, 0x4e, 0xf7, 0xca, 0x17, 0xd0, 0x9e, 0xc0, 0x5c, 0x85, 0xf6, 0xb0, 0x15, 0xf6, 0xed, 0x2c, - 0x4c, 0x0b, 0x8b, 0xb2, 0xac, 0xf8, 0x01, 0x2d, 0x43, 0xaa, 0xcd, 0xc5, 0x82, 0xf9, 0x2d, 0x4e, - 0xda, 0x63, 0x98, 0x0f, 0xe0, 0x32, 0xdc, 0x1b, 0xa0, 0xfa, 0x39, 0x89, 0x59, 0xdf, 0x25, 0xa6, - 0xc4, 0x08, 0x55, 0x0b, 0x21, 0x5d, 0x40, 0xb4, 0x9f, 0x12, 0xb0, 0xc8, 0xa3, 0xd5, 0x70, 0x49, - 0x34, 0x4d, 0x9f, 0x41, 0x92, 0xb9, 0x32, 0x87, 0xd3, 0xa5, 0xd2, 0xb8, 0xd7, 0x1a, 0x01, 0x16, - 0xfc, 0x43, 0x8d, 0xb6, 0x89, 0xc1, 0xf1, 0xf9, 0x3f, 0x14, 0x98, 0x0d, 0x48, 0xe8, 0x21, 0x4c, - 0xf3, 0x67, 0xe3, 0xae, 0xa4, 0x4b, 0x5a, 0xa4, 0x95, 0xb0, 0x4e, 0x21, 0xd8, 0xc3, 0x0a, 0x3b, - 0xdc, 0x84, 0x58, 0xad, 0x04, 0x60, 0x68, 0x1d, 0x4a, 0x0c, 0xad, 0x43, 0xfe, 0xf0, 0x75, 0xb0, - 0xcb, 0xac, 0x96, 0xe5, 0xf0, 0x41, 0x35, 0xa0, 0x8c, 0x04, 0xf3, 0x7a, 0x31, 0xce, 0x39, 0xf4, - 0x19, 0x7e, 0x35, 0xc9, 0x75, 0x80, 0xcb, 0x89, 0x57, 0x05, 0xb1, 0x09, 0xf8, 0x14, 0xed, 0x25, - 0x64, 0x7d, 0xa7, 0xb9, 0x0b, 0x7e, 0x32, 0x04, 0xcf, 0x72, 0x03, 0xae, 0xfa, 0x79, 0x63, 0xbe, - 0x73, 0x69, 0x4f, 0xc6, 0x73, 0xd6, 0x27, 0x3c, 0x73, 0x69, 0xcf, 0x5f, 0xaf, 0x38, 0x93, 0x51, - 0x99, 0x8f, 0x29, 0xff, 0xd8, 0xa0, 0x9b, 0x0f, 0x61, 0x2e, 0xcc, 0x6a, 0x83, 0x76, 0x09, 0x4a, - 0xc3, 0xcc, 0xeb, 0xda, 0x8b, 0xda, 0xfe, 0x51, 0x4d, 0xbd, 0x82, 0x32, 0x30, 0x5b, 0x6e, 0x34, - 0xf4, 0x7a, 0x43, 0x37, 0x54, 0xc5, 0x3f, 0x1d, 0x18, 0xfb, 0x07, 0xfb, 0x75, 0xdd, 0x50, 0x13, - 0x9b, 0xbf, 0x2b, 0xb0, 0x30, 0x54, 0x10, 0x08, 0xc1, 0xbc, 0x04, 0x9b, 0xf5, 0x46, 0xb9, 0xf1, - 0xba, 0xae, 0x5e, 0x41, 0x59, 0x50, 0x2b, 0xfa, 0xc1, 0x7e, 0xbd, 0xda, 0x30, 0x0d, 0x7d, 0x57, - 0xaf, 0x1e, 0xea, 0x15, 0x55, 0xf1, 0x25, 0x0f, 0xf4, 0x5a, 0xa5, 0x5a, 0xdb, 0x33, 0xcb, 0xbb, - 0x8d, 0xea, 0xa1, 0xae, 0x26, 0x10, 0x40, 0x4a, 0x7e, 0x4f, 0xf9, 0xfc, 0x6a, 0xad, 0xda, 0xa8, - 0x96, 0x1b, 0x7a, 0xc5, 0xd4, 0xdf, 0x54, 0x1b, 0x6a, 0x12, 0xa9, 0x90, 0x39, 0xaa, 0x36, 0x9e, - 0x57, 0x8c, 0xf2, 0x51, 0x79, 0xe7, 0xa5, 0xae, 0x4e, 0xfb, 0x08, 0x9f, 0xa7, 0x57, 0xd4, 0x94, - 0x8f, 0x10, 0xdf, 0x66, 0xfd, 0x65, 0xb9, 0xfe, 0x5c, 0xaf, 0xa8, 0x33, 0xa5, 0xbf, 0x15, 0x58, - 0x28, 0x07, 0xbd, 0x4a, 0x2c, 0xf0, 0xa8, 0x03, 0x48, 0x86, 0x2c, 0xb6, 0xa5, 0xa2, 0xcd, 0xb1, - 0x9d, 0x78, 0x64, 0x95, 0xcd, 0x7f, 0x3d, 0x26, 0x37, 0x62, 0xa2, 0x15, 0xcc, 0x30, 0x32, 0x61, - 0xb1, 0xde, 0x6f, 0xf6, 0xac, 0x33, 0x86, 0xb4, 0x8b, 0xc1, 0x71, 0x03, 0xe7, 0x39, 0x13, 0xe4, - 0x73, 0xe9, 0xa3, 0x12, 0x2e, 0xe7, 0xe1, 0xf5, 0xde, 0x40, 0x46, 0xfa, 0xc9, 0x33, 0x04, 0xdd, - 0xfe, 0x6c, 0x79, 0x04, 0x57, 0x9a, 0x20, 0xdd, 0xd1, 0x5b, 0xc8, 0x48, 0x63, 0xe2, 0x3c, 0x01, - 0x26, 0x3f, 0xb6, 0x95, 0x0e, 0xfd, 0xa6, 0x28, 0xfd, 0x3b, 0x03, 0x6a, 0x94, 0x4d, 0xf2, 0x2e, - 0x6f, 0x01, 0x44, 0x23, 0xe0, 0xe1, 0xbc, 0x33, 0x4e, 0xd7, 0x99, 0xf6, 0x34, 0x3e, 0x78, 0x43, - 0x6d, 0xe8, 0x07, 0x58, 0x3c, 0xc2, 0x16, 0x7b, 0x16, 0xdf, 0xed, 0x50, 0xe9, 0x52, 0x8b, 0xa0, - 0x30, 0x78, 0xef, 0x0b, 0x96, 0xc7, 0x2d, 0x05, 0x51, 0x98, 0x3f, 0xbb, 0xb7, 0xa0, 0xbb, 0x17, - 0x2a, 0x8a, 0xef, 0x45, 0xf9, 0xc2, 0xa4, 0xe2, 0xf2, 0xc2, 0x5d, 0x58, 0xda, 0x0d, 0xc6, 0x7d, - 0x6c, 0x2d, 0xd8, 0x98, 0x64, 0x07, 0x11, 0x16, 0x37, 0x27, 0x5f, 0x57, 0xd0, 0xc9, 0x68, 0x77, - 0xb8, 0xe4, 0xfd, 0x2e, 0xbb, 0x15, 0xa3, 0x1f, 0x15, 0xc8, 0x9e, 0xf7, 0x33, 0x0c, 0x5d, 0xfc, - 0x42, 0xa3, 0xbf, 0x04, 0xf3, 0xf7, 0x2f, 0x07, 0x92, 0x3e, 0xf4, 0x41, 0x1d, 0xde, 0xaa, 0xd1, - 0xd8, 0x8b, 0x8c, 0xd9, 0xdd, 0xf3, 0x5b, 0x93, 0x03, 0xa4, 0xd9, 0xef, 0xc3, 0x64, 0x8e, 0xd6, - 0x72, 0xb4, 0x5c, 0x10, 0x7f, 0x11, 0x14, 0x82, 0x3f, 0x23, 0x0a, 0x7a, 0xcf, 0x61, 0xa7, 0xe3, - 0x9f, 0x71, 0x74, 0xa5, 0xdf, 0x52, 0xd0, 0x0b, 0x98, 0xdb, 0xc5, 0x36, 0xb5, 0xad, 0x16, 0xee, - 0x3e, 0x27, 0xb8, 0x3d, 0x56, 0xed, 0x04, 0xfd, 0x60, 0x27, 0xf3, 0xf1, 0xd3, 0x2d, 0xe5, 0xaf, - 0x4f, 0xb7, 0x94, 0x7f, 0x3e, 0xdd, 0x52, 0x9a, 0x29, 0xae, 0xe1, 0xde, 0x7f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x97, 0xb7, 0x7a, 0xc6, 0x71, 0x11, 0x00, 0x00, + // 1577 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x4f, 0x4f, 0x1b, 0x49, + 0x16, 0x4f, 0x1b, 0x63, 0xc8, 0xb3, 0x81, 0xa6, 0x70, 0xc0, 0x71, 0x48, 0x96, 0xed, 0x4d, 0x76, + 0x01, 0x29, 0x36, 0x38, 0x51, 0xb4, 0x9b, 0x28, 0x1b, 0xd9, 0xb8, 0x03, 0x56, 0x22, 0x43, 0xda, + 0x0e, 0x64, 0x95, 0x43, 0xab, 0x6c, 0x57, 0x70, 0x2b, 0x76, 0x57, 0xd3, 0x5d, 0xb6, 0xc2, 0x65, + 0xa5, 0xfd, 0x08, 0x7b, 0x98, 0xf3, 0x68, 0x3e, 0xc3, 0x1c, 0xe6, 0x2b, 0xe4, 0x38, 0x1f, 0x60, + 0x0e, 0xa3, 0x68, 0xbe, 0xc1, 0x9c, 0x47, 0x1a, 0x75, 0x55, 0xf5, 0x1f, 0x6c, 0x1c, 0x4c, 0x6e, + 0x5d, 0xef, 0xbd, 0xdf, 0x7b, 0xaf, 0x5e, 0xbd, 0x7f, 0x36, 0x68, 0x8e, 0x4b, 0x19, 0x2d, 0xb6, + 0x08, 0x6e, 0x53, 0xbb, 0xe8, 0x3a, 0xed, 0xe2, 0x70, 0xb7, 0xe8, 0x11, 0x77, 0x68, 0xb5, 0x89, + 0x57, 0xe0, 0x4c, 0xb4, 0x4a, 0x58, 0x97, 0xb8, 0x64, 0xd0, 0x2f, 0x08, 0xb1, 0x82, 0xeb, 0xb4, + 0x0b, 0xc3, 0xdd, 0xfc, 0x9d, 0x53, 0x4a, 0x4f, 0x7b, 0xa4, 0xc8, 0xa5, 0x5a, 0x83, 0x0f, 0x45, + 0xd2, 0x77, 0xd8, 0xb9, 0x00, 0xe5, 0x1f, 0x08, 0xc5, 0x84, 0x75, 0x8b, 0xc3, 0x5d, 0xdc, 0x73, + 0xba, 0x78, 0x57, 0x5a, 0x31, 0x5b, 0x3d, 0xda, 0xfe, 0x28, 0xc5, 0xee, 0x5f, 0x22, 0x86, 0x19, + 0x23, 0x1e, 0xc3, 0xcc, 0xa2, 0xb6, 0x94, 0x5a, 0x97, 0x96, 0xb0, 0x63, 0x15, 0xb1, 0x6d, 0x53, + 0xc1, 0x94, 0xfe, 0x69, 0xfb, 0x90, 0xa9, 0xf8, 0x2a, 0x0d, 0x72, 0x36, 0x20, 0x1e, 0x43, 0x08, + 0x92, 0x5e, 0x8f, 0xb2, 0x9c, 0xb2, 0xa1, 0x6c, 0x26, 0x0d, 0xfe, 0x8d, 0xfe, 0x06, 0x0b, 0x2e, + 0xb6, 0x3b, 0x98, 0x9a, 0x2e, 0x19, 0x12, 0xdc, 0xcb, 0x25, 0x36, 0x94, 0xcd, 0x8c, 0x91, 0x11, + 0x44, 0x83, 0xd3, 0xb4, 0x1d, 0x58, 0x3a, 0x72, 0xa9, 0x43, 0x3d, 0x62, 0x10, 0xcf, 0xa1, 0xb6, + 0x47, 0xd0, 0x5d, 0x00, 0xee, 0xae, 0xe9, 0x52, 0xa9, 0x31, 0x63, 0xdc, 0xe4, 0x14, 0x83, 0x52, + 0xa6, 0x0d, 0x01, 0x95, 0x23, 0x6f, 0x03, 0x07, 0xee, 0x02, 0x38, 0x83, 0x56, 0xcf, 0x6a, 0x9b, + 0x1f, 0xc9, 0x79, 0x00, 0x12, 0x94, 0x57, 0xe4, 0x1c, 0xad, 0xc1, 0x9c, 0x43, 0xdb, 0x66, 0xcb, + 0x62, 0xd2, 0x8b, 0x94, 0x43, 0xdb, 0x15, 0x2b, 0x72, 0x7c, 0x26, 0xe6, 0x78, 0x16, 0x66, 0xbd, + 0x2e, 0x76, 0x3b, 0xb9, 0x24, 0x27, 0x8a, 0x83, 0x76, 0x1f, 0x16, 0x85, 0xdd, 0xd0, 0x51, 0x04, + 0xc9, 0x98, 0x8b, 0xfc, 0x5b, 0x33, 0xe0, 0xce, 0x31, 0xee, 0x59, 0x1d, 0xcc, 0xa8, 0x7b, 0x44, + 0xdc, 0x0f, 0xd4, 0xed, 0x63, 0xbb, 0x4d, 0xbe, 0x16, 0xa7, 0xbf, 0x40, 0x3a, 0x72, 0xdd, 0xcb, + 0x25, 0x36, 0x66, 0x36, 0x33, 0x06, 0x84, 0xbe, 0x7b, 0xda, 0x77, 0x09, 0x58, 0xbf, 0x5c, 0xa9, + 0x74, 0x24, 0x0f, 0xf3, 0x2d, 0xdc, 0xf3, 0x49, 0x5e, 0x4e, 0xd9, 0x98, 0xd9, 0x4c, 0x1a, 0xe1, + 0x19, 0x6d, 0x81, 0xca, 0x28, 0xc3, 0x3d, 0x73, 0x18, 0x68, 0xf0, 0x78, 0x08, 0x92, 0xc6, 0x12, + 0xa7, 0x87, 0x8a, 0x3d, 0xf4, 0x04, 0xd6, 0x84, 0x28, 0x6e, 0x33, 0x6b, 0x48, 0xe2, 0x08, 0x11, + 0x9e, 0x5b, 0x9c, 0x5d, 0xe6, 0xdc, 0x18, 0xee, 0x21, 0xa0, 0xbe, 0xe5, 0x79, 0x96, 0x7d, 0x1a, + 0x87, 0x24, 0xf9, 0x3d, 0x96, 0x25, 0x27, 0x26, 0xbe, 0x0f, 0x1b, 0x78, 0x48, 0x5c, 0x7c, 0x4a, + 0xc6, 0x0c, 0x99, 0xd2, 0xed, 0xdc, 0xec, 0x86, 0xb2, 0x99, 0x30, 0xee, 0x4a, 0xb9, 0x11, 0x8b, + 0x15, 0x21, 0xa4, 0x3d, 0x87, 0x7c, 0x48, 0xe3, 0x22, 0x17, 0x32, 0x62, 0x24, 0xac, 0xca, 0x58, + 0x58, 0xbf, 0x4f, 0xc4, 0xde, 0x2a, 0x8e, 0x97, 0x51, 0x7d, 0x02, 0xb7, 0xb0, 0xa0, 0x92, 0x8e, + 0x39, 0xa6, 0xaa, 0x92, 0xc8, 0x29, 0xc6, 0x4a, 0x28, 0x70, 0x14, 0xea, 0x45, 0xc7, 0x30, 0xef, + 0x27, 0xe7, 0xc0, 0x23, 0xe2, 0x31, 0xd3, 0xa5, 0xa7, 0x85, 0xcb, 0xcb, 0xb9, 0xf0, 0x15, 0xf3, + 0x85, 0x06, 0xd7, 0x61, 0x84, 0xba, 0xf2, 0x0e, 0xa4, 0x04, 0xed, 0xaa, 0x64, 0xdf, 0x87, 0x94, + 0x00, 0xf1, 0x87, 0x4e, 0x97, 0x8a, 0x57, 0x9a, 0x97, 0xb6, 0xa4, 0x69, 0x43, 0xc2, 0xb5, 0xa7, + 0xb0, 0xa6, 0x7f, 0xb2, 0x18, 0xe9, 0x44, 0xaf, 0x37, 0x75, 0x74, 0x9f, 0x41, 0x6e, 0x1c, 0x2b, + 0x23, 0x7b, 0x25, 0xf8, 0x0d, 0xa0, 0xbd, 0x2e, 0xb6, 0xec, 0x06, 0xc3, 0x6e, 0x54, 0x6f, 0x39, + 0x98, 0xf3, 0x7c, 0x02, 0xe9, 0xf0, 0x3b, 0xcf, 0x1b, 0xc1, 0x11, 0xfd, 0x15, 0x32, 0xa7, 0xc4, + 0x26, 0x9e, 0xe5, 0x99, 0xcc, 0xea, 0x13, 0x99, 0xe0, 0x69, 0x49, 0x6b, 0x5a, 0x7d, 0xa2, 0x3d, + 0x81, 0x5b, 0xa1, 0x27, 0x35, 0xbb, 0x43, 0x3e, 0x4d, 0xd7, 0x39, 0xb4, 0x02, 0xac, 0x8e, 0xe2, + 0xa4, 0x3b, 0x59, 0x98, 0xb5, 0x7c, 0x82, 0x2c, 0x66, 0x71, 0xd0, 0xde, 0xc2, 0x72, 0xd9, 0xf3, + 0xac, 0x53, 0xbb, 0x4f, 0x6c, 0x16, 0x8b, 0x16, 0x71, 0x68, 0xbb, 0x6b, 0x72, 0x87, 0x25, 0x00, + 0x38, 0x89, 0x5f, 0xf1, 0xea, 0x1e, 0xf0, 0x47, 0x02, 0x50, 0x5c, 0xaf, 0xf4, 0xe1, 0x0c, 0xb2, + 0x51, 0xf1, 0xe0, 0x90, 0xcf, 0x43, 0x9a, 0x2e, 0xfd, 0x7b, 0xd2, 0xc3, 0x8f, 0x6b, 0x8a, 0xa5, + 0x62, 0xc4, 0x5b, 0x19, 0x8e, 0x13, 0xf3, 0xbf, 0x2b, 0xb0, 0x72, 0x89, 0x30, 0x5a, 0x87, 0x9b, + 0x6d, 0xda, 0xef, 0x5b, 0x8c, 0x11, 0x22, 0xbb, 0x50, 0x44, 0x88, 0x7a, 0x6a, 0x22, 0xd6, 0x53, + 0xfd, 0x11, 0x21, 0x26, 0x0f, 0x71, 0xcd, 0x58, 0x1b, 0xce, 0x04, 0xc4, 0x86, 0x9c, 0x23, 0x8e, + 0x18, 0x11, 0x52, 0x48, 0xb4, 0xe5, 0x4c, 0x40, 0xe4, 0x42, 0x17, 0x5f, 0x71, 0x76, 0xb4, 0x24, + 0x5e, 0x84, 0x25, 0x91, 0xda, 0x50, 0x36, 0x17, 0x4b, 0xff, 0x98, 0xb6, 0x24, 0x82, 0x52, 0xf8, + 0x29, 0x01, 0x6b, 0x13, 0xca, 0x25, 0xa6, 0x5c, 0xf9, 0x26, 0xe5, 0xe8, 0x5f, 0x70, 0x9b, 0xb0, + 0xee, 0xae, 0xd9, 0x21, 0x0e, 0xf5, 0x2c, 0x26, 0xa6, 0xb5, 0x69, 0x0f, 0xfa, 0x2d, 0xe2, 0xca, + 0x80, 0xf9, 0x0b, 0xc1, 0x6e, 0x55, 0xf0, 0xf9, 0xe4, 0xad, 0x73, 0x2e, 0x7a, 0x0c, 0xab, 0x01, + 0xca, 0xb2, 0xdb, 0xbd, 0x81, 0x67, 0x51, 0x3b, 0x1e, 0xca, 0xac, 0xe4, 0xd6, 0x02, 0x26, 0x8f, + 0xd6, 0x16, 0xa8, 0x38, 0xec, 0x38, 0x26, 0xcf, 0x43, 0x19, 0xd5, 0xa5, 0x88, 0xae, 0xfb, 0x64, + 0xf4, 0x02, 0xd6, 0xb9, 0x02, 0x5f, 0xd0, 0xb2, 0xcd, 0x18, 0xec, 0x6c, 0x40, 0x06, 0xa2, 0x53, + 0x27, 0x8d, 0xdb, 0x81, 0x4c, 0xcd, 0x8e, 0x5a, 0xd9, 0x1b, 0x5f, 0x40, 0x7b, 0x0e, 0x0b, 0x55, + 0xda, 0xc7, 0x56, 0xd8, 0x98, 0xb3, 0x30, 0x2b, 0x2c, 0xca, 0xba, 0xe1, 0x07, 0xb4, 0x0a, 0xa9, + 0x0e, 0x17, 0x0b, 0x06, 0xb4, 0x38, 0x69, 0xcf, 0x60, 0x31, 0x80, 0xcb, 0x70, 0x6f, 0x81, 0xea, + 0x27, 0x1d, 0x66, 0x03, 0x97, 0x98, 0x12, 0x23, 0x54, 0x2d, 0x85, 0x74, 0x01, 0xd1, 0xfe, 0x9f, + 0x80, 0x65, 0x1e, 0xad, 0xa6, 0x4b, 0xa2, 0x71, 0xf9, 0x12, 0x92, 0xcc, 0x95, 0x49, 0x9a, 0x2e, + 0x95, 0x26, 0xbd, 0xd6, 0x18, 0xb0, 0xe0, 0x1f, 0xea, 0xb4, 0x43, 0x0c, 0x8e, 0xcf, 0xff, 0xa8, + 0xc0, 0x7c, 0x40, 0x42, 0xff, 0x84, 0x59, 0xfe, 0x6c, 0xdc, 0x95, 0x74, 0x49, 0x8b, 0xb4, 0x12, + 0xd6, 0x2d, 0x04, 0x8b, 0x56, 0xa1, 0xc2, 0x4d, 0x88, 0xdd, 0x49, 0x00, 0x46, 0xf6, 0x9d, 0xc4, + 0xc8, 0xbe, 0xe3, 0x4f, 0x57, 0x07, 0xbb, 0xcc, 0x6a, 0x5b, 0x0e, 0x9f, 0x44, 0x43, 0xca, 0x48, + 0x30, 0x90, 0x97, 0xe3, 0x9c, 0x63, 0x9f, 0xe1, 0x77, 0x12, 0x39, 0xef, 0xb9, 0x9c, 0x78, 0x55, + 0x10, 0xa3, 0xde, 0xa7, 0x68, 0xaf, 0x21, 0xeb, 0x3b, 0xcd, 0x5d, 0xf0, 0x93, 0x21, 0x78, 0x96, + 0x3b, 0x70, 0xd3, 0xcf, 0x1b, 0xf3, 0x83, 0x4b, 0xfb, 0x32, 0x9e, 0xf3, 0x3e, 0xe1, 0xa5, 0x4b, + 0xfb, 0xfe, 0xfe, 0xc4, 0x99, 0x8c, 0xca, 0x7c, 0x4c, 0xf9, 0xc7, 0x26, 0xdd, 0xae, 0xc0, 0x42, + 0x98, 0xd5, 0x06, 0xed, 0x11, 0x94, 0x86, 0xb9, 0xb7, 0xf5, 0x57, 0xf5, 0xc3, 0x93, 0xba, 0x7a, + 0x03, 0x65, 0x60, 0xbe, 0xdc, 0x6c, 0xea, 0x8d, 0xa6, 0x6e, 0xa8, 0x8a, 0x7f, 0x3a, 0x32, 0x0e, + 0x8f, 0x0e, 0x1b, 0xba, 0xa1, 0x26, 0xd0, 0x3c, 0x24, 0x2b, 0x87, 0xcd, 0x03, 0x75, 0x66, 0xfb, + 0x07, 0x05, 0x96, 0x46, 0x4a, 0x03, 0x21, 0x58, 0x94, 0x6a, 0xcc, 0x46, 0xb3, 0xdc, 0x7c, 0xdb, + 0x50, 0x6f, 0xa0, 0x2c, 0xa8, 0x55, 0xfd, 0xe8, 0xb0, 0x51, 0x6b, 0x9a, 0x86, 0xbe, 0xa7, 0xd7, + 0x8e, 0xf5, 0xaa, 0xaa, 0xf8, 0x92, 0x47, 0x7a, 0xbd, 0x5a, 0xab, 0xef, 0x9b, 0xe5, 0xbd, 0x66, + 0xed, 0x58, 0x57, 0x13, 0x08, 0x20, 0x25, 0xbf, 0x67, 0x7c, 0x7e, 0xad, 0x5e, 0x6b, 0xd6, 0xca, + 0x4d, 0xbd, 0x6a, 0xea, 0xef, 0x6a, 0x4d, 0x35, 0x89, 0x54, 0xc8, 0x9c, 0xd4, 0x9a, 0x07, 0x55, + 0xa3, 0x7c, 0x52, 0xae, 0xbc, 0xd6, 0xd5, 0x59, 0x1f, 0xe1, 0xf3, 0xf4, 0xaa, 0x9a, 0xf2, 0x11, + 0xe2, 0xdb, 0x6c, 0xbc, 0x2e, 0x37, 0x0e, 0xf4, 0xaa, 0x3a, 0x57, 0xfa, 0x45, 0x81, 0xa5, 0x72, + 0xd0, 0x95, 0xc4, 0xae, 0x8e, 0xba, 0x80, 0x64, 0xf0, 0x62, 0x0b, 0x29, 0xda, 0x9e, 0xd8, 0x74, + 0xc7, 0xb6, 0xd6, 0xfc, 0xdf, 0x27, 0x64, 0x49, 0x4c, 0xb4, 0x8a, 0x19, 0x46, 0x26, 0x2c, 0x37, + 0x06, 0xad, 0xbe, 0x75, 0xc1, 0x90, 0x76, 0x35, 0x38, 0x6e, 0xe0, 0x32, 0x67, 0x82, 0xcc, 0x2e, + 0x7d, 0x56, 0xc2, 0x3d, 0x3c, 0xbc, 0xde, 0x3b, 0xc8, 0x48, 0x3f, 0x79, 0xae, 0xa0, 0xfb, 0x5f, + 0x2d, 0x94, 0xe0, 0x4a, 0x53, 0x24, 0x3e, 0x7a, 0x0f, 0x19, 0x69, 0x4c, 0x9c, 0xa7, 0xc0, 0xe4, + 0x27, 0x36, 0xd5, 0x91, 0x9f, 0x0f, 0xa5, 0xdf, 0xe6, 0x40, 0x8d, 0xb2, 0x49, 0xde, 0xe5, 0x3d, + 0x80, 0x68, 0x09, 0x3c, 0x9c, 0x0f, 0x26, 0xe9, 0xba, 0xd0, 0xa8, 0x26, 0x07, 0x6f, 0xa4, 0x21, + 0xfd, 0x17, 0x96, 0x4f, 0xb0, 0xc5, 0x5e, 0xc6, 0xd7, 0x38, 0x54, 0xba, 0xd6, 0xce, 0x27, 0x0c, + 0x3e, 0xfa, 0x86, 0x3d, 0x71, 0x47, 0x41, 0x14, 0x16, 0x2f, 0xae, 0x28, 0xe8, 0xe1, 0x95, 0x8a, + 0xe2, 0x2b, 0x50, 0xbe, 0x30, 0xad, 0xb8, 0xbc, 0x70, 0x0f, 0x56, 0xf6, 0x82, 0xc9, 0x1e, 0xdb, + 0x00, 0xb6, 0xa6, 0x59, 0x37, 0x84, 0xc5, 0xed, 0xe9, 0x37, 0x13, 0x74, 0x36, 0xde, 0x1d, 0xae, + 0x79, 0xbf, 0xeb, 0x2e, 0xc0, 0xe8, 0x7f, 0x0a, 0x64, 0x2f, 0xfb, 0xc5, 0x85, 0xae, 0x7e, 0xa1, + 0xf1, 0x1f, 0x7d, 0xf9, 0xc7, 0xd7, 0x03, 0x49, 0x1f, 0x06, 0xa0, 0x8e, 0x2e, 0xd0, 0x68, 0xe2, + 0x45, 0x26, 0xac, 0xe9, 0xf9, 0x9d, 0xe9, 0x01, 0xd2, 0xec, 0x7f, 0xc2, 0x64, 0x8e, 0x36, 0x70, + 0xb4, 0x5a, 0x10, 0xff, 0x06, 0x14, 0x82, 0xff, 0x1d, 0x0a, 0x7a, 0xdf, 0x61, 0xe7, 0x93, 0x9f, + 0x71, 0x7c, 0x7b, 0xdf, 0x51, 0xd0, 0x2b, 0x58, 0xd8, 0xc3, 0x36, 0xb5, 0xad, 0x36, 0xee, 0x1d, + 0x10, 0xdc, 0x99, 0xa8, 0x76, 0x8a, 0x7e, 0x50, 0xc9, 0x7c, 0xfe, 0x72, 0x4f, 0xf9, 0xf9, 0xcb, + 0x3d, 0xe5, 0xd7, 0x2f, 0xf7, 0x94, 0x56, 0x8a, 0x6b, 0x78, 0xf4, 0x67, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xda, 0x2d, 0x51, 0xd7, 0x5c, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2712,29 +2707,19 @@ func (m *AssignmentResponse_ValidatorAssignment) MarshalTo(dAtA []byte) (int, er i++ i = encodeVarintServices(dAtA, i, uint64(m.AttesterSlot)) } - if m.IsProposer { - dAtA[i] = 0x20 - i++ - if m.IsProposer { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i++ - } if m.ProposerSlot != 0 { - dAtA[i] = 0x28 + dAtA[i] = 0x20 i++ i = encodeVarintServices(dAtA, i, uint64(m.ProposerSlot)) } if len(m.PublicKey) > 0 { - dAtA[i] = 0x32 + dAtA[i] = 0x2a i++ i = encodeVarintServices(dAtA, i, uint64(len(m.PublicKey))) i += copy(dAtA[i:], m.PublicKey) } if m.Status != 0 { - dAtA[i] = 0x38 + dAtA[i] = 0x30 i++ i = encodeVarintServices(dAtA, i, uint64(m.Status)) } @@ -3305,9 +3290,6 @@ func (m *AssignmentResponse_ValidatorAssignment) Size() (n int) { if m.AttesterSlot != 0 { n += 1 + sovServices(uint64(m.AttesterSlot)) } - if m.IsProposer { - n += 2 - } if m.ProposerSlot != 0 { n += 1 + sovServices(uint64(m.ProposerSlot)) } @@ -5312,26 +5294,6 @@ func (m *AssignmentResponse_ValidatorAssignment) Unmarshal(dAtA []byte) error { } } case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field IsProposer", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowServices - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.IsProposer = bool(v != 0) - case 5: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field ProposerSlot", wireType) } @@ -5350,7 +5312,7 @@ func (m *AssignmentResponse_ValidatorAssignment) Unmarshal(dAtA []byte) error { break } } - case 6: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field PublicKey", wireType) } @@ -5384,7 +5346,7 @@ func (m *AssignmentResponse_ValidatorAssignment) Unmarshal(dAtA []byte) error { m.PublicKey = []byte{} } iNdEx = postIndex - case 7: + case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) } diff --git a/proto/beacon/rpc/v1/services.proto b/proto/beacon/rpc/v1/services.proto index fdb2bca9b063..4ca36d84e33a 100644 --- a/proto/beacon/rpc/v1/services.proto +++ b/proto/beacon/rpc/v1/services.proto @@ -93,6 +93,7 @@ message ChainStartResponse { UNKNOWN = 0; ATTESTER = 1; PROPOSER = 2; + BOTH = 3; } message ValidatorIndexRequest { @@ -113,11 +114,10 @@ message AssignmentResponse { message ValidatorAssignment { repeated uint64 committee = 1; uint64 shard = 2; - uint64 attesterSlot = 3; - bool is_proposer = 4; - uint64 proposerSlot = 5; - bytes public_key = 6; - ValidatorStatus status = 7; + uint64 attester_slot = 3; + uint64 proposer_slot = 4; + bytes public_key = 5; + ValidatorStatus status = 6; } } diff --git a/proto/beacon/rpc/v1_gateway/services.pb.go b/proto/beacon/rpc/v1_gateway/services.pb.go index 4f29cf1bdad0..1960a0cf71b6 100755 --- a/proto/beacon/rpc/v1_gateway/services.pb.go +++ b/proto/beacon/rpc/v1_gateway/services.pb.go @@ -31,18 +31,21 @@ const ( ValidatorRole_UNKNOWN ValidatorRole = 0 ValidatorRole_ATTESTER ValidatorRole = 1 ValidatorRole_PROPOSER ValidatorRole = 2 + ValidatorRole_BOTH ValidatorRole = 3 ) var ValidatorRole_name = map[int32]string{ 0: "UNKNOWN", 1: "ATTESTER", 2: "PROPOSER", + 3: "BOTH", } var ValidatorRole_value = map[string]int32{ "UNKNOWN": 0, "ATTESTER": 1, "PROPOSER": 2, + "BOTH": 3, } func (x ValidatorRole) String() string { @@ -828,11 +831,10 @@ func (m *AssignmentResponse) GetValidatorAssignment() []*AssignmentResponse_Vali type AssignmentResponse_ValidatorAssignment struct { Committee []uint64 `protobuf:"varint,1,rep,packed,name=committee,proto3" json:"committee,omitempty"` Shard uint64 `protobuf:"varint,2,opt,name=shard,proto3" json:"shard,omitempty"` - AttesterSlot uint64 `protobuf:"varint,3,opt,name=attesterSlot,proto3" json:"attesterSlot,omitempty"` - IsProposer bool `protobuf:"varint,4,opt,name=is_proposer,json=isProposer,proto3" json:"is_proposer,omitempty"` - ProposerSlot uint64 `protobuf:"varint,5,opt,name=proposerSlot,proto3" json:"proposerSlot,omitempty"` - PublicKey []byte `protobuf:"bytes,6,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` - Status ValidatorStatus `protobuf:"varint,7,opt,name=status,proto3,enum=ethereum.beacon.rpc.v1.ValidatorStatus" json:"status,omitempty"` + AttesterSlot uint64 `protobuf:"varint,3,opt,name=attester_slot,json=attesterSlot,proto3" json:"attester_slot,omitempty"` + ProposerSlot uint64 `protobuf:"varint,4,opt,name=proposer_slot,json=proposerSlot,proto3" json:"proposer_slot,omitempty"` + PublicKey []byte `protobuf:"bytes,5,opt,name=public_key,json=publicKey,proto3" json:"public_key,omitempty"` + Status ValidatorStatus `protobuf:"varint,6,opt,name=status,proto3,enum=ethereum.beacon.rpc.v1.ValidatorStatus" json:"status,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -886,13 +888,6 @@ func (m *AssignmentResponse_ValidatorAssignment) GetAttesterSlot() uint64 { return 0 } -func (m *AssignmentResponse_ValidatorAssignment) GetIsProposer() bool { - if m != nil { - return m.IsProposer - } - return false -} - func (m *AssignmentResponse_ValidatorAssignment) GetProposerSlot() uint64 { if m != nil { return m.ProposerSlot @@ -1251,105 +1246,105 @@ func init() { func init() { proto.RegisterFile("proto/beacon/rpc/v1/services.proto", fileDescriptor_9eb4e94b85965285) } var fileDescriptor_9eb4e94b85965285 = []byte{ - // 1560 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0xdf, 0x4e, 0x1b, 0x47, - 0x17, 0xcf, 0x1a, 0x63, 0xc8, 0xb1, 0x81, 0x65, 0x70, 0xc0, 0x71, 0x88, 0x3e, 0xbe, 0xfd, 0x92, - 0xaf, 0x80, 0x14, 0x1b, 0x9c, 0x28, 0x4a, 0x13, 0xa5, 0x91, 0xc1, 0x1b, 0x62, 0x25, 0x32, 0x64, - 0xed, 0x40, 0xaa, 0x5c, 0xac, 0xc6, 0xf6, 0x04, 0xaf, 0xe2, 0xdd, 0x59, 0x76, 0xc7, 0x56, 0xb8, - 0xa9, 0xd4, 0x47, 0x68, 0xa5, 0xde, 0x55, 0xaa, 0xfa, 0x0c, 0xbd, 0xe8, 0x2b, 0xf4, 0x21, 0x7a, - 0xd9, 0x07, 0xa9, 0x76, 0x66, 0xf6, 0x0f, 0x36, 0x0e, 0x26, 0x77, 0x3b, 0xe7, 0x9c, 0xdf, 0x39, - 0x67, 0xce, 0x9c, 0x7f, 0x36, 0x68, 0xae, 0x47, 0x19, 0x2d, 0xb7, 0x09, 0xee, 0x50, 0xa7, 0xec, - 0xb9, 0x9d, 0xf2, 0x70, 0xb7, 0xec, 0x13, 0x6f, 0x68, 0x75, 0x88, 0x5f, 0xe2, 0x4c, 0xb4, 0x4a, - 0x58, 0x8f, 0x78, 0x64, 0x60, 0x97, 0x84, 0x58, 0xc9, 0x73, 0x3b, 0xa5, 0xe1, 0x6e, 0xf1, 0xce, - 0x29, 0xa5, 0xa7, 0x7d, 0x52, 0xe6, 0x52, 0xed, 0xc1, 0xc7, 0x32, 0xb1, 0x5d, 0x76, 0x2e, 0x40, - 0xc5, 0xfb, 0x42, 0x31, 0x61, 0xbd, 0xf2, 0x70, 0x17, 0xf7, 0xdd, 0x1e, 0xde, 0x95, 0x56, 0xcc, - 0x76, 0x9f, 0x76, 0x3e, 0x49, 0xb1, 0x7b, 0x97, 0x88, 0x61, 0xc6, 0x88, 0xcf, 0x30, 0xb3, 0xa8, - 0x23, 0xa5, 0xd6, 0xa5, 0x25, 0xec, 0x5a, 0x65, 0xec, 0x38, 0x54, 0x30, 0xa5, 0x7f, 0xda, 0x01, - 0xe4, 0xf6, 0x02, 0x95, 0x06, 0x39, 0x1b, 0x10, 0x9f, 0x21, 0x04, 0x69, 0xbf, 0x4f, 0x59, 0x41, - 0xd9, 0x50, 0x36, 0xd3, 0x06, 0xff, 0x46, 0xff, 0x83, 0x05, 0x0f, 0x3b, 0x5d, 0x4c, 0x4d, 0x8f, - 0x0c, 0x09, 0xee, 0x17, 0x52, 0x1b, 0xca, 0x66, 0xce, 0xc8, 0x09, 0xa2, 0xc1, 0x69, 0xda, 0x0e, - 0x2c, 0x1d, 0x79, 0xd4, 0xa5, 0x3e, 0x31, 0x88, 0xef, 0x52, 0xc7, 0x27, 0xe8, 0x2e, 0x00, 0x77, - 0xd7, 0xf4, 0xa8, 0xd4, 0x98, 0x33, 0x6e, 0x72, 0x8a, 0x41, 0x29, 0xd3, 0x86, 0x80, 0xaa, 0xb1, - 0xb7, 0xa1, 0x03, 0x77, 0x01, 0xdc, 0x41, 0xbb, 0x6f, 0x75, 0xcc, 0x4f, 0xe4, 0x3c, 0x04, 0x09, - 0xca, 0x6b, 0x72, 0x8e, 0xd6, 0x60, 0xce, 0xa5, 0x1d, 0xb3, 0x6d, 0x31, 0xe9, 0x45, 0xc6, 0xa5, - 0x9d, 0x3d, 0x2b, 0x76, 0x7c, 0x26, 0xe1, 0x78, 0x1e, 0x66, 0xfd, 0x1e, 0xf6, 0xba, 0x85, 0x34, - 0x27, 0x8a, 0x83, 0x76, 0x0f, 0x16, 0x85, 0xdd, 0xc8, 0x51, 0x04, 0xe9, 0x84, 0x8b, 0xfc, 0x5b, - 0x33, 0xe0, 0xce, 0x31, 0xee, 0x5b, 0x5d, 0xcc, 0xa8, 0x77, 0x44, 0xbc, 0x8f, 0xd4, 0xb3, 0xb1, - 0xd3, 0x21, 0x5f, 0x8a, 0xd3, 0x7f, 0x20, 0x1b, 0xbb, 0xee, 0x17, 0x52, 0x1b, 0x33, 0x9b, 0x39, - 0x03, 0x22, 0xdf, 0x7d, 0xed, 0x97, 0x14, 0xac, 0x5f, 0xae, 0x54, 0x3a, 0x52, 0x84, 0xf9, 0x36, - 0xee, 0x07, 0x24, 0xbf, 0xa0, 0x6c, 0xcc, 0x6c, 0xa6, 0x8d, 0xe8, 0x8c, 0xb6, 0x40, 0x65, 0x94, - 0xe1, 0xbe, 0x39, 0x0c, 0x35, 0xf8, 0x3c, 0x04, 0x69, 0x63, 0x89, 0xd3, 0x23, 0xc5, 0x3e, 0x7a, - 0x0c, 0x6b, 0x42, 0x14, 0x77, 0x98, 0x35, 0x24, 0x49, 0x84, 0x08, 0xcf, 0x2d, 0xce, 0xae, 0x72, - 0x6e, 0x02, 0xf7, 0x00, 0x90, 0x6d, 0xf9, 0xbe, 0xe5, 0x9c, 0x26, 0x21, 0x69, 0x7e, 0x8f, 0x65, - 0xc9, 0x49, 0x88, 0x1f, 0xc0, 0x06, 0x1e, 0x12, 0x0f, 0x9f, 0x92, 0x31, 0x43, 0xa6, 0x74, 0xbb, - 0x30, 0xbb, 0xa1, 0x6c, 0xa6, 0x8c, 0xbb, 0x52, 0x6e, 0xc4, 0xe2, 0x9e, 0x10, 0xd2, 0x9e, 0x43, - 0x31, 0xa2, 0x71, 0x91, 0x0b, 0x19, 0x31, 0x12, 0x56, 0x65, 0x2c, 0xac, 0xbf, 0xa5, 0x12, 0x6f, - 0x95, 0xc4, 0xcb, 0xa8, 0x3e, 0x86, 0x5b, 0x58, 0x50, 0x49, 0xd7, 0x1c, 0x53, 0xb5, 0x97, 0x2a, - 0x28, 0xc6, 0x4a, 0x24, 0x70, 0x14, 0xe9, 0x45, 0xc7, 0x30, 0x1f, 0x24, 0xe7, 0xc0, 0x27, 0xe2, - 0x31, 0xb3, 0x95, 0xa7, 0xa5, 0xcb, 0xcb, 0xb9, 0xf4, 0x05, 0xf3, 0xa5, 0x26, 0xd7, 0x61, 0x44, - 0xba, 0x8a, 0x2e, 0x64, 0x04, 0xed, 0xaa, 0x64, 0x3f, 0x80, 0x8c, 0x00, 0xf1, 0x87, 0xce, 0x56, - 0xca, 0x57, 0x9a, 0x97, 0xb6, 0xa4, 0x69, 0x43, 0xc2, 0xb5, 0xa7, 0xb0, 0xa6, 0x7f, 0xb6, 0x18, - 0xe9, 0xc6, 0xaf, 0x37, 0x75, 0x74, 0x9f, 0x41, 0x61, 0x1c, 0x2b, 0x23, 0x7b, 0x25, 0xf8, 0x2d, - 0xa0, 0xfd, 0x1e, 0xb6, 0x9c, 0x26, 0xc3, 0x5e, 0x5c, 0x6f, 0x05, 0x98, 0xf3, 0x03, 0x02, 0xe9, - 0xf2, 0x3b, 0xcf, 0x1b, 0xe1, 0x11, 0xfd, 0x17, 0x72, 0xa7, 0xc4, 0x21, 0xbe, 0xe5, 0x9b, 0xcc, - 0xb2, 0x89, 0x4c, 0xf0, 0xac, 0xa4, 0xb5, 0x2c, 0x9b, 0x68, 0x8f, 0xe1, 0x56, 0xe4, 0x49, 0xdd, - 0xe9, 0x92, 0xcf, 0xd3, 0x75, 0x0e, 0xad, 0x04, 0xab, 0xa3, 0x38, 0xe9, 0x4e, 0x1e, 0x66, 0xad, - 0x80, 0x20, 0x8b, 0x59, 0x1c, 0xb4, 0x77, 0xb0, 0x5c, 0xf5, 0x7d, 0xeb, 0xd4, 0xb1, 0x89, 0xc3, - 0x12, 0xd1, 0x22, 0x2e, 0xed, 0xf4, 0x4c, 0xee, 0xb0, 0x04, 0x00, 0x27, 0xf1, 0x2b, 0x5e, 0xdd, - 0x03, 0x7e, 0x9d, 0x01, 0x94, 0xd4, 0x2b, 0x7d, 0x38, 0x83, 0x7c, 0x5c, 0x3c, 0x38, 0xe2, 0xf3, - 0x90, 0x66, 0x2b, 0xdf, 0x4d, 0x7a, 0xf8, 0x71, 0x4d, 0x89, 0x54, 0x8c, 0x79, 0x2b, 0xc3, 0x71, - 0x62, 0xf1, 0xe7, 0x14, 0xac, 0x5c, 0x22, 0x8c, 0xd6, 0xe1, 0x66, 0x87, 0xda, 0xb6, 0xc5, 0x18, - 0x21, 0xb2, 0x0b, 0xc5, 0x84, 0xb8, 0xa7, 0xa6, 0x12, 0x3d, 0x15, 0x69, 0x90, 0x13, 0x93, 0x87, - 0x78, 0xcd, 0xb8, 0x0b, 0x5f, 0xa0, 0x05, 0xa1, 0xb1, 0x7c, 0xd3, 0x15, 0x43, 0xc2, 0xe3, 0x3d, - 0x79, 0xde, 0x00, 0xcb, 0x97, 0x63, 0xc3, 0x0b, 0x94, 0x84, 0x5c, 0xae, 0x64, 0x56, 0x28, 0x49, - 0xd2, 0x46, 0x1e, 0x39, 0x33, 0x5a, 0x31, 0x2f, 0xa2, 0x8a, 0x99, 0xdb, 0x50, 0x36, 0x17, 0x2b, - 0xdf, 0x4c, 0x5b, 0x31, 0x61, 0xa5, 0xfc, 0x99, 0x82, 0xb5, 0x09, 0xd5, 0x94, 0x50, 0xae, 0x7c, - 0x95, 0x72, 0xf4, 0x2d, 0xdc, 0x26, 0xac, 0xb7, 0x6b, 0x76, 0x89, 0x4b, 0x7d, 0x8b, 0x89, 0x61, - 0x6e, 0x3a, 0x03, 0xbb, 0x4d, 0x3c, 0x19, 0xcf, 0x60, 0x5f, 0xd8, 0xad, 0x09, 0x3e, 0x1f, 0xcc, - 0x0d, 0xce, 0x45, 0x8f, 0x60, 0x35, 0x44, 0x59, 0x4e, 0xa7, 0x3f, 0xf0, 0x2d, 0xea, 0x98, 0x89, - 0x81, 0x97, 0x97, 0xdc, 0x7a, 0xc8, 0xe4, 0xd1, 0xda, 0x02, 0x15, 0x47, 0x0d, 0xc9, 0xe4, 0x69, - 0x2a, 0x67, 0xe1, 0x52, 0x4c, 0xd7, 0x03, 0x32, 0x7a, 0x01, 0xeb, 0x5c, 0x41, 0x20, 0x68, 0x39, - 0x66, 0x02, 0x76, 0x36, 0x20, 0x03, 0x22, 0x1f, 0xe3, 0x76, 0x28, 0x53, 0x77, 0xe2, 0x4e, 0xf7, - 0x36, 0x10, 0xd0, 0x9e, 0xc3, 0x42, 0x8d, 0xda, 0xd8, 0x8a, 0xfa, 0x76, 0x1e, 0x66, 0x85, 0x45, - 0x59, 0x56, 0xfc, 0x80, 0x56, 0x21, 0xd3, 0xe5, 0x62, 0xe1, 0xfc, 0x16, 0x27, 0xed, 0x19, 0x2c, - 0x86, 0x70, 0x19, 0xee, 0x2d, 0x50, 0x83, 0x9c, 0xc4, 0x6c, 0xe0, 0x11, 0x53, 0x62, 0x84, 0xaa, - 0xa5, 0x88, 0x2e, 0x20, 0xda, 0x4f, 0x29, 0x58, 0xe6, 0xd1, 0x6a, 0x79, 0x24, 0x9e, 0xa6, 0x2f, - 0x21, 0xcd, 0x3c, 0x99, 0xc3, 0xd9, 0x4a, 0x65, 0xd2, 0x6b, 0x8d, 0x01, 0x4b, 0xc1, 0xa1, 0x41, - 0xbb, 0xc4, 0xe0, 0xf8, 0xe2, 0x1f, 0x0a, 0xcc, 0x87, 0x24, 0xf4, 0x04, 0x66, 0xf9, 0xb3, 0x71, - 0x57, 0xb2, 0x15, 0x2d, 0xd6, 0x4a, 0x58, 0xaf, 0x14, 0xee, 0x61, 0xa5, 0x3d, 0x6e, 0x42, 0xac, - 0x56, 0x02, 0x30, 0xb2, 0x0e, 0xa5, 0x46, 0xd6, 0xa1, 0x60, 0xf8, 0xba, 0xd8, 0x63, 0x56, 0xc7, - 0x72, 0xf9, 0xa0, 0x1a, 0x52, 0x46, 0xc2, 0x79, 0xbd, 0x9c, 0xe4, 0x1c, 0x07, 0x8c, 0xa0, 0x9a, - 0xe4, 0x3a, 0xc0, 0xe5, 0xc4, 0xab, 0x82, 0xd8, 0x04, 0x02, 0x8a, 0xf6, 0x06, 0xf2, 0x81, 0xd3, - 0xdc, 0x85, 0x20, 0x19, 0xc2, 0x67, 0xb9, 0x03, 0x37, 0x83, 0xbc, 0x31, 0x3f, 0x7a, 0xd4, 0x96, - 0xf1, 0x9c, 0x0f, 0x08, 0x2f, 0x3d, 0x6a, 0x07, 0xeb, 0x15, 0x67, 0x32, 0x2a, 0xf3, 0x31, 0x13, - 0x1c, 0x5b, 0x74, 0xfb, 0x09, 0x2c, 0x44, 0x59, 0x6d, 0xd0, 0x3e, 0x41, 0x59, 0x98, 0x7b, 0xd7, - 0x78, 0xdd, 0x38, 0x3c, 0x69, 0xa8, 0x37, 0x50, 0x0e, 0xe6, 0xab, 0xad, 0x96, 0xde, 0x6c, 0xe9, - 0x86, 0xaa, 0x04, 0xa7, 0x23, 0xe3, 0xf0, 0xe8, 0xb0, 0xa9, 0x1b, 0x6a, 0x6a, 0xfb, 0x77, 0x05, - 0x96, 0x46, 0x0a, 0x02, 0x21, 0x58, 0x94, 0x60, 0xb3, 0xd9, 0xaa, 0xb6, 0xde, 0x35, 0xd5, 0x1b, - 0x28, 0x0f, 0x6a, 0x4d, 0x3f, 0x3a, 0x6c, 0xd6, 0x5b, 0xa6, 0xa1, 0xef, 0xeb, 0xf5, 0x63, 0xbd, - 0xa6, 0x2a, 0x81, 0xe4, 0x91, 0xde, 0xa8, 0xd5, 0x1b, 0x07, 0x66, 0x75, 0xbf, 0x55, 0x3f, 0xd6, - 0xd5, 0x14, 0x02, 0xc8, 0xc8, 0xef, 0x99, 0x80, 0x5f, 0x6f, 0xd4, 0x5b, 0xf5, 0x6a, 0x4b, 0xaf, - 0x99, 0xfa, 0xfb, 0x7a, 0x4b, 0x4d, 0x23, 0x15, 0x72, 0x27, 0xf5, 0xd6, 0xab, 0x9a, 0x51, 0x3d, - 0xa9, 0xee, 0xbd, 0xd1, 0xd5, 0xd9, 0x00, 0x11, 0xf0, 0xf4, 0x9a, 0x9a, 0x09, 0x10, 0xe2, 0xdb, - 0x6c, 0xbe, 0xa9, 0x36, 0x5f, 0xe9, 0x35, 0x75, 0xae, 0xf2, 0xb7, 0x02, 0x4b, 0xd5, 0xb0, 0x57, - 0x89, 0x05, 0x1e, 0xf5, 0x00, 0xc9, 0x90, 0x25, 0xb6, 0x54, 0xb4, 0x3d, 0xb1, 0x13, 0x8f, 0xad, - 0xb2, 0xc5, 0xff, 0x4f, 0xc8, 0x8d, 0x84, 0x68, 0x0d, 0x33, 0x8c, 0x4c, 0x58, 0x6e, 0x0e, 0xda, - 0xb6, 0x75, 0xc1, 0x90, 0x76, 0x35, 0x38, 0x69, 0xe0, 0x32, 0x67, 0xc2, 0x7c, 0xae, 0xfc, 0xa5, - 0x44, 0xcb, 0x79, 0x74, 0xbd, 0xf7, 0x90, 0x93, 0x7e, 0xf2, 0x0c, 0x41, 0xf7, 0xbe, 0x58, 0x1e, - 0xe1, 0x95, 0xa6, 0x48, 0x77, 0xf4, 0x01, 0x72, 0xd2, 0x98, 0x38, 0x4f, 0x81, 0x29, 0x4e, 0x6c, - 0xa5, 0x23, 0xbf, 0x29, 0x2a, 0xff, 0xcc, 0x81, 0x1a, 0x67, 0x93, 0xbc, 0xcb, 0x07, 0x00, 0xd1, - 0x08, 0x78, 0x38, 0xef, 0x4f, 0xd2, 0x75, 0xa1, 0x3d, 0x4d, 0x0e, 0xde, 0x48, 0x1b, 0xfa, 0x01, - 0x96, 0x4f, 0xb0, 0xc5, 0x5e, 0x26, 0x77, 0x3b, 0x54, 0xb9, 0xd6, 0x22, 0x28, 0x0c, 0x3e, 0xfc, - 0x8a, 0xe5, 0x71, 0x47, 0x41, 0x14, 0x16, 0x2f, 0xee, 0x2d, 0xe8, 0xc1, 0x95, 0x8a, 0x92, 0x7b, - 0x51, 0xb1, 0x34, 0xad, 0xb8, 0xbc, 0x70, 0x1f, 0x56, 0xf6, 0xc3, 0x71, 0x9f, 0x58, 0x0b, 0xb6, - 0xa6, 0xd9, 0x41, 0x84, 0xc5, 0xed, 0xe9, 0xd7, 0x15, 0x74, 0x36, 0xde, 0x1d, 0xae, 0x79, 0xbf, - 0xeb, 0x6e, 0xc5, 0xe8, 0x47, 0x05, 0xf2, 0x97, 0xfd, 0x0c, 0x43, 0x57, 0xbf, 0xd0, 0xf8, 0x2f, - 0xc1, 0xe2, 0xa3, 0xeb, 0x81, 0xa4, 0x0f, 0x03, 0x50, 0x47, 0xb7, 0x6a, 0x34, 0xf1, 0x22, 0x13, - 0x76, 0xf7, 0xe2, 0xce, 0xf4, 0x00, 0x69, 0xf6, 0xfb, 0x28, 0x99, 0xe3, 0xb5, 0x1c, 0xad, 0x96, - 0xc4, 0x5f, 0x04, 0xa5, 0xf0, 0xcf, 0x88, 0x92, 0x6e, 0xbb, 0xec, 0x7c, 0xf2, 0x33, 0x8e, 0xaf, - 0xf4, 0x3b, 0x0a, 0x7a, 0x0d, 0x0b, 0xfb, 0xd8, 0xa1, 0x8e, 0xd5, 0xc1, 0xfd, 0x57, 0x04, 0x77, - 0x27, 0xaa, 0x9d, 0xa2, 0x1f, 0xb4, 0x33, 0x1c, 0xf3, 0xf0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x53, 0xd0, 0x39, 0x96, 0x63, 0x11, 0x00, 0x00, + // 1558 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x58, 0x5f, 0x4f, 0x1b, 0x49, + 0x12, 0xcf, 0x18, 0x63, 0x48, 0xd9, 0xc0, 0xd0, 0x38, 0xe0, 0x38, 0x44, 0xc7, 0xcd, 0x25, 0x77, + 0x80, 0x14, 0x1b, 0x9c, 0x28, 0xba, 0x4b, 0x94, 0x8b, 0x6c, 0x3c, 0x01, 0x2b, 0x91, 0x21, 0x63, + 0x07, 0x72, 0xca, 0xc3, 0xa8, 0x6d, 0x77, 0xf0, 0x28, 0x9e, 0xe9, 0x61, 0xa6, 0x6d, 0x85, 0x97, + 0x93, 0xee, 0x23, 0xdc, 0xc3, 0x3d, 0x9f, 0xf6, 0x33, 0xec, 0xc3, 0x7e, 0x85, 0xfd, 0x10, 0xfb, + 0xb8, 0xdf, 0x60, 0x9f, 0x57, 0x5a, 0x4d, 0x77, 0xcf, 0x1f, 0x6c, 0x1c, 0x4c, 0xde, 0xa6, 0xab, + 0xea, 0x57, 0x55, 0x5d, 0x5d, 0xff, 0x6c, 0xd0, 0x5c, 0x8f, 0x32, 0x5a, 0xee, 0x10, 0xdc, 0xa5, + 0x4e, 0xd9, 0x73, 0xbb, 0xe5, 0xd1, 0x7e, 0xd9, 0x27, 0xde, 0xc8, 0xea, 0x12, 0xbf, 0xc4, 0x99, + 0x68, 0x9d, 0xb0, 0x3e, 0xf1, 0xc8, 0xd0, 0x2e, 0x09, 0xb1, 0x92, 0xe7, 0x76, 0x4b, 0xa3, 0xfd, + 0xe2, 0x83, 0x73, 0x4a, 0xcf, 0x07, 0xa4, 0xcc, 0xa5, 0x3a, 0xc3, 0xcf, 0x65, 0x62, 0xbb, 0xec, + 0x52, 0x80, 0x8a, 0x8f, 0x85, 0x62, 0xc2, 0xfa, 0xe5, 0xd1, 0x3e, 0x1e, 0xb8, 0x7d, 0xbc, 0x2f, + 0xad, 0x98, 0x9d, 0x01, 0xed, 0x7e, 0x91, 0x62, 0x8f, 0xae, 0x11, 0xc3, 0x8c, 0x11, 0x9f, 0x61, + 0x66, 0x51, 0x47, 0x4a, 0x6d, 0x4a, 0x4b, 0xd8, 0xb5, 0xca, 0xd8, 0x71, 0xa8, 0x60, 0x4a, 0xff, + 0xb4, 0x43, 0xc8, 0xd5, 0x02, 0x95, 0x06, 0xb9, 0x18, 0x12, 0x9f, 0x21, 0x04, 0x69, 0x7f, 0x40, + 0x59, 0x41, 0xd9, 0x52, 0xb6, 0xd3, 0x06, 0xff, 0x46, 0x7f, 0x81, 0x25, 0x0f, 0x3b, 0x3d, 0x4c, + 0x4d, 0x8f, 0x8c, 0x08, 0x1e, 0x14, 0x52, 0x5b, 0xca, 0x76, 0xce, 0xc8, 0x09, 0xa2, 0xc1, 0x69, + 0xda, 0x1e, 0xac, 0x9c, 0x78, 0xd4, 0xa5, 0x3e, 0x31, 0x88, 0xef, 0x52, 0xc7, 0x27, 0xe8, 0x21, + 0x00, 0x77, 0xd7, 0xf4, 0xa8, 0xd4, 0x98, 0x33, 0xee, 0x72, 0x8a, 0x41, 0x29, 0xd3, 0x46, 0x80, + 0xaa, 0xb1, 0xb7, 0xa1, 0x03, 0x0f, 0x01, 0xdc, 0x61, 0x67, 0x60, 0x75, 0xcd, 0x2f, 0xe4, 0x32, + 0x04, 0x09, 0xca, 0x5b, 0x72, 0x89, 0x36, 0x60, 0xc1, 0xa5, 0x5d, 0xb3, 0x63, 0x31, 0xe9, 0x45, + 0xc6, 0xa5, 0xdd, 0x9a, 0x15, 0x3b, 0x3e, 0x97, 0x70, 0x3c, 0x0f, 0xf3, 0x7e, 0x1f, 0x7b, 0xbd, + 0x42, 0x9a, 0x13, 0xc5, 0x41, 0x7b, 0x04, 0xcb, 0xc2, 0x6e, 0xe4, 0x28, 0x82, 0x74, 0xc2, 0x45, + 0xfe, 0xad, 0x19, 0xf0, 0xe0, 0x14, 0x0f, 0xac, 0x1e, 0x66, 0xd4, 0x3b, 0x21, 0xde, 0x67, 0xea, + 0xd9, 0xd8, 0xe9, 0x92, 0x6f, 0xc5, 0xe9, 0x4f, 0x90, 0x8d, 0x5d, 0xf7, 0x0b, 0xa9, 0xad, 0xb9, + 0xed, 0x9c, 0x01, 0x91, 0xef, 0xbe, 0xf6, 0xbf, 0x14, 0x6c, 0x5e, 0xaf, 0x54, 0x3a, 0x52, 0x84, + 0xc5, 0x0e, 0x1e, 0x04, 0x24, 0xbf, 0xa0, 0x6c, 0xcd, 0x6d, 0xa7, 0x8d, 0xe8, 0x8c, 0x76, 0x40, + 0x65, 0x94, 0xe1, 0x81, 0x39, 0x0a, 0x35, 0xf8, 0x3c, 0x04, 0x69, 0x63, 0x85, 0xd3, 0x23, 0xc5, + 0x3e, 0x7a, 0x0e, 0x1b, 0x42, 0x14, 0x77, 0x99, 0x35, 0x22, 0x49, 0x84, 0x08, 0xcf, 0x3d, 0xce, + 0xae, 0x72, 0x6e, 0x02, 0xf7, 0x04, 0x90, 0x6d, 0xf9, 0xbe, 0xe5, 0x9c, 0x27, 0x21, 0x69, 0x7e, + 0x8f, 0x55, 0xc9, 0x49, 0x88, 0x1f, 0xc2, 0x16, 0x1e, 0x11, 0x0f, 0x9f, 0x93, 0x09, 0x43, 0xa6, + 0x74, 0xbb, 0x30, 0xbf, 0xa5, 0x6c, 0xa7, 0x8c, 0x87, 0x52, 0x6e, 0xcc, 0x62, 0x4d, 0x08, 0x69, + 0xaf, 0xa0, 0x18, 0xd1, 0xb8, 0xc8, 0x95, 0x8c, 0x18, 0x0b, 0xab, 0x32, 0x11, 0xd6, 0xff, 0xa7, + 0x12, 0x6f, 0x95, 0xc4, 0xcb, 0xa8, 0x3e, 0x87, 0x7b, 0x58, 0x50, 0x49, 0xcf, 0x9c, 0x50, 0x55, + 0x4b, 0x15, 0x14, 0x63, 0x2d, 0x12, 0x38, 0x89, 0xf4, 0xa2, 0x53, 0x58, 0x0c, 0x92, 0x73, 0xe8, + 0x13, 0xf1, 0x98, 0xd9, 0xca, 0x8b, 0xd2, 0xf5, 0xe5, 0x5c, 0xfa, 0x86, 0xf9, 0x52, 0x8b, 0xeb, + 0x30, 0x22, 0x5d, 0x45, 0x17, 0x32, 0x82, 0x76, 0x53, 0xb2, 0x1f, 0x42, 0x46, 0x80, 0xf8, 0x43, + 0x67, 0x2b, 0xe5, 0x1b, 0xcd, 0x4b, 0x5b, 0xd2, 0xb4, 0x21, 0xe1, 0xda, 0x0b, 0xd8, 0xd0, 0xbf, + 0x5a, 0x8c, 0xf4, 0xe2, 0xd7, 0x9b, 0x39, 0xba, 0x2f, 0xa1, 0x30, 0x89, 0x95, 0x91, 0xbd, 0x11, + 0xfc, 0x1e, 0xd0, 0x41, 0x1f, 0x5b, 0x4e, 0x8b, 0x61, 0x2f, 0xae, 0xb7, 0x02, 0x2c, 0xf8, 0x01, + 0x81, 0xf4, 0xf8, 0x9d, 0x17, 0x8d, 0xf0, 0x88, 0xfe, 0x0c, 0xb9, 0x73, 0xe2, 0x10, 0xdf, 0xf2, + 0x4d, 0x66, 0xd9, 0x44, 0x26, 0x78, 0x56, 0xd2, 0xda, 0x96, 0x4d, 0xb4, 0xe7, 0x70, 0x2f, 0xf2, + 0xa4, 0xe1, 0xf4, 0xc8, 0xd7, 0xd9, 0x3a, 0x87, 0x56, 0x82, 0xf5, 0x71, 0x9c, 0x74, 0x27, 0x0f, + 0xf3, 0x56, 0x40, 0x90, 0xc5, 0x2c, 0x0e, 0xda, 0x07, 0x58, 0xad, 0xfa, 0xbe, 0x75, 0xee, 0xd8, + 0xc4, 0x61, 0x89, 0x68, 0x11, 0x97, 0x76, 0xfb, 0x26, 0x77, 0x58, 0x02, 0x80, 0x93, 0xf8, 0x15, + 0x6f, 0xee, 0x01, 0xbf, 0xa7, 0x00, 0x25, 0xf5, 0x4a, 0x1f, 0x2e, 0x20, 0x1f, 0x17, 0x0f, 0x8e, + 0xf8, 0x3c, 0xa4, 0xd9, 0xca, 0x3f, 0xa7, 0x3d, 0xfc, 0xa4, 0xa6, 0x44, 0x2a, 0xc6, 0xbc, 0xb5, + 0xd1, 0x24, 0xb1, 0xf8, 0x9b, 0x02, 0x6b, 0xd7, 0x08, 0xa3, 0x4d, 0xb8, 0xdb, 0xa5, 0xb6, 0x6d, + 0x31, 0x46, 0x88, 0xec, 0x42, 0x31, 0x21, 0xee, 0xa9, 0xa9, 0x44, 0x4f, 0x0d, 0x46, 0x84, 0x98, + 0x3c, 0xc4, 0x33, 0x13, 0x6d, 0x38, 0x17, 0x12, 0x5b, 0x72, 0x8e, 0xb8, 0x62, 0x44, 0x48, 0x21, + 0xd1, 0x96, 0x73, 0x21, 0x91, 0x0b, 0x5d, 0x7d, 0xc5, 0xf9, 0xf1, 0x92, 0x78, 0x1d, 0x95, 0x44, + 0x66, 0x4b, 0xd9, 0x5e, 0xae, 0xfc, 0x6d, 0xd6, 0x92, 0x08, 0x4b, 0xe1, 0xa7, 0x14, 0x6c, 0x4c, + 0x29, 0x97, 0x84, 0x72, 0xe5, 0xbb, 0x94, 0xa3, 0x7f, 0xc0, 0x7d, 0xc2, 0xfa, 0xfb, 0x66, 0x8f, + 0xb8, 0xd4, 0xb7, 0x98, 0x98, 0xd6, 0xa6, 0x33, 0xb4, 0x3b, 0xc4, 0x93, 0x01, 0x0b, 0x16, 0x82, + 0xfd, 0xba, 0xe0, 0xf3, 0xc9, 0xdb, 0xe4, 0x5c, 0xf4, 0x0c, 0xd6, 0x43, 0x94, 0xe5, 0x74, 0x07, + 0x43, 0xdf, 0xa2, 0x4e, 0x32, 0x94, 0x79, 0xc9, 0x6d, 0x84, 0x4c, 0x1e, 0xad, 0x1d, 0x50, 0x71, + 0xd4, 0x71, 0x4c, 0x9e, 0x87, 0x32, 0xaa, 0x2b, 0x31, 0x5d, 0x0f, 0xc8, 0xe8, 0x35, 0x6c, 0x72, + 0x05, 0x81, 0xa0, 0xe5, 0x98, 0x09, 0xd8, 0xc5, 0x90, 0x0c, 0x45, 0xa7, 0x4e, 0x1b, 0xf7, 0x43, + 0x99, 0x86, 0x13, 0xb7, 0xb2, 0xf7, 0x81, 0x80, 0xf6, 0x0a, 0x96, 0xea, 0xd4, 0xc6, 0x56, 0xd4, + 0x98, 0xf3, 0x30, 0x2f, 0x2c, 0xca, 0xba, 0xe1, 0x07, 0xb4, 0x0e, 0x99, 0x1e, 0x17, 0x0b, 0x07, + 0xb4, 0x38, 0x69, 0x2f, 0x61, 0x39, 0x84, 0xcb, 0x70, 0xef, 0x80, 0x1a, 0x24, 0x1d, 0x66, 0x43, + 0x8f, 0x98, 0x12, 0x23, 0x54, 0xad, 0x44, 0x74, 0x01, 0xd1, 0xfe, 0x9b, 0x82, 0x55, 0x1e, 0xad, + 0xb6, 0x47, 0xe2, 0x71, 0xf9, 0x06, 0xd2, 0xcc, 0x93, 0x49, 0x9a, 0xad, 0x54, 0xa6, 0xbd, 0xd6, + 0x04, 0xb0, 0x14, 0x1c, 0x9a, 0xb4, 0x47, 0x0c, 0x8e, 0x2f, 0xfe, 0xa8, 0xc0, 0x62, 0x48, 0x42, + 0x7f, 0x87, 0x79, 0xfe, 0x6c, 0xdc, 0x95, 0x6c, 0x45, 0x8b, 0xb5, 0x12, 0xd6, 0x2f, 0x85, 0x8b, + 0x56, 0xa9, 0xc6, 0x4d, 0x88, 0xdd, 0x49, 0x00, 0xc6, 0xf6, 0x9d, 0xd4, 0xd8, 0xbe, 0x13, 0x4c, + 0x57, 0x17, 0x7b, 0xcc, 0xea, 0x5a, 0x2e, 0x9f, 0x44, 0x23, 0xca, 0x48, 0x38, 0x90, 0x57, 0x93, + 0x9c, 0xd3, 0x80, 0x11, 0x74, 0x12, 0x39, 0xef, 0xb9, 0x9c, 0x78, 0x55, 0x10, 0xa3, 0x3e, 0xa0, + 0x68, 0xef, 0x20, 0x1f, 0x38, 0xcd, 0x5d, 0x08, 0x92, 0x21, 0x7c, 0x96, 0x07, 0x70, 0x37, 0xc8, + 0x1b, 0xf3, 0xb3, 0x47, 0x6d, 0x19, 0xcf, 0xc5, 0x80, 0xf0, 0xc6, 0xa3, 0x76, 0xb0, 0x3f, 0x71, + 0x26, 0xa3, 0x32, 0x1f, 0x33, 0xc1, 0xb1, 0x4d, 0x77, 0x6b, 0xb0, 0x14, 0x65, 0xb5, 0x41, 0x07, + 0x04, 0x65, 0x61, 0xe1, 0x43, 0xf3, 0x6d, 0xf3, 0xf8, 0xac, 0xa9, 0xde, 0x41, 0x39, 0x58, 0xac, + 0xb6, 0xdb, 0x7a, 0xab, 0xad, 0x1b, 0xaa, 0x12, 0x9c, 0x4e, 0x8c, 0xe3, 0x93, 0xe3, 0x96, 0x6e, + 0xa8, 0x29, 0xb4, 0x08, 0xe9, 0xda, 0x71, 0xfb, 0x48, 0x9d, 0xdb, 0xfd, 0x41, 0x81, 0x95, 0xb1, + 0xd2, 0x40, 0x08, 0x96, 0xa5, 0x1a, 0xb3, 0xd5, 0xae, 0xb6, 0x3f, 0xb4, 0xd4, 0x3b, 0x28, 0x0f, + 0x6a, 0x5d, 0x3f, 0x39, 0x6e, 0x35, 0xda, 0xa6, 0xa1, 0x1f, 0xe8, 0x8d, 0x53, 0xbd, 0xae, 0x2a, + 0x81, 0xe4, 0x89, 0xde, 0xac, 0x37, 0x9a, 0x87, 0x66, 0xf5, 0xa0, 0xdd, 0x38, 0xd5, 0xd5, 0x14, + 0x02, 0xc8, 0xc8, 0xef, 0xb9, 0x80, 0xdf, 0x68, 0x36, 0xda, 0x8d, 0x6a, 0x5b, 0xaf, 0x9b, 0xfa, + 0xc7, 0x46, 0x5b, 0x4d, 0x23, 0x15, 0x72, 0x67, 0x8d, 0xf6, 0x51, 0xdd, 0xa8, 0x9e, 0x55, 0x6b, + 0xef, 0x74, 0x75, 0x3e, 0x40, 0x04, 0x3c, 0xbd, 0xae, 0x66, 0x02, 0x84, 0xf8, 0x36, 0x5b, 0xef, + 0xaa, 0xad, 0x23, 0xbd, 0xae, 0x2e, 0x54, 0x7e, 0x51, 0x60, 0xa5, 0x1a, 0x76, 0x25, 0xb1, 0xab, + 0xa3, 0x3e, 0x20, 0x19, 0xbc, 0xc4, 0x42, 0x8a, 0x76, 0xa7, 0x36, 0xdd, 0x89, 0xad, 0xb5, 0xf8, + 0xd7, 0x29, 0x59, 0x92, 0x10, 0xad, 0x63, 0x86, 0x91, 0x09, 0xab, 0xad, 0x61, 0xc7, 0xb6, 0xae, + 0x18, 0xd2, 0x6e, 0x06, 0x27, 0x0d, 0x5c, 0xe7, 0x4c, 0x98, 0xd9, 0x95, 0x9f, 0x95, 0x68, 0x0f, + 0x8f, 0xae, 0xf7, 0x11, 0x72, 0xd2, 0x4f, 0x9e, 0x2b, 0xe8, 0xd1, 0x37, 0x0b, 0x25, 0xbc, 0xd2, + 0x0c, 0x89, 0x8f, 0x3e, 0x41, 0x4e, 0x1a, 0x13, 0xe7, 0x19, 0x30, 0xc5, 0xa9, 0x4d, 0x75, 0xec, + 0xe7, 0x43, 0xe5, 0xd7, 0x05, 0x50, 0xe3, 0x6c, 0x92, 0x77, 0xf9, 0x04, 0x20, 0x5a, 0x02, 0x0f, + 0xe7, 0xe3, 0x69, 0xba, 0xae, 0x34, 0xaa, 0xe9, 0xc1, 0x1b, 0x6b, 0x48, 0xff, 0x86, 0xd5, 0x33, + 0x6c, 0xb1, 0x37, 0xc9, 0x35, 0x0e, 0x55, 0x6e, 0xb5, 0xf3, 0x09, 0x83, 0x4f, 0xbf, 0x63, 0x4f, + 0xdc, 0x53, 0x10, 0x85, 0xe5, 0xab, 0x2b, 0x0a, 0x7a, 0x72, 0xa3, 0xa2, 0xe4, 0x0a, 0x54, 0x2c, + 0xcd, 0x2a, 0x2e, 0x2f, 0x3c, 0x80, 0xb5, 0x83, 0x70, 0xb2, 0x27, 0x36, 0x80, 0x9d, 0x59, 0xd6, + 0x0d, 0x61, 0x71, 0x77, 0xf6, 0xcd, 0x04, 0x5d, 0x4c, 0x76, 0x87, 0x5b, 0xde, 0xef, 0xb6, 0x0b, + 0x30, 0xfa, 0x8f, 0x02, 0xf9, 0xeb, 0x7e, 0x71, 0xa1, 0x9b, 0x5f, 0x68, 0xf2, 0x47, 0x5f, 0xf1, + 0xd9, 0xed, 0x40, 0xd2, 0x87, 0x21, 0xa8, 0xe3, 0x0b, 0x34, 0x9a, 0x7a, 0x91, 0x29, 0x6b, 0x7a, + 0x71, 0x6f, 0x76, 0x80, 0x34, 0xfb, 0xaf, 0x28, 0x99, 0xe3, 0x0d, 0x1c, 0xad, 0x97, 0xc4, 0xbf, + 0x01, 0xa5, 0xf0, 0x7f, 0x87, 0x92, 0x6e, 0xbb, 0xec, 0x72, 0xfa, 0x33, 0x4e, 0x6e, 0xef, 0x7b, + 0x0a, 0x7a, 0x0b, 0x4b, 0x07, 0xd8, 0xa1, 0x8e, 0xd5, 0xc5, 0x83, 0x23, 0x82, 0x7b, 0x53, 0xd5, + 0xce, 0xd0, 0x0f, 0x3a, 0x19, 0x8e, 0x79, 0xfa, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd9, 0xfd, + 0xbc, 0x8c, 0x4e, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/validator/client/runner.go b/validator/client/runner.go index 7c550297ad1f..dcce0102d810 100644 --- a/validator/client/runner.go +++ b/validator/client/runner.go @@ -89,10 +89,12 @@ func run(ctx context.Context, v Validator) { "role": role, }) switch role { + case pb.ValidatorRole_BOTH: + go v.AttestToBlockHead(slotCtx, slot, id) + v.ProposeBlock(slotCtx, slot, id) case pb.ValidatorRole_ATTESTER: v.AttestToBlockHead(slotCtx, slot, id) case pb.ValidatorRole_PROPOSER: - go v.AttestToBlockHead(slotCtx, slot, id) v.ProposeBlock(slotCtx, slot, id) case pb.ValidatorRole_UNKNOWN: log.Debug("No active role, doing nothing") diff --git a/validator/client/runner_test.go b/validator/client/runner_test.go index 4d1b473bd2e8..d828d8a81620 100644 --- a/validator/client/runner_test.go +++ b/validator/client/runner_test.go @@ -162,7 +162,7 @@ func TestBothProposesAndAttests_NextSlot(t *testing.T) { slot := uint64(55) ticker := make(chan uint64) v.NextSlotRet = ticker - v.RoleAtRet = pb.ValidatorRole_PROPOSER + v.RoleAtRet = pb.ValidatorRole_BOTH go func() { ticker <- slot diff --git a/validator/client/validator.go b/validator/client/validator.go index 9d663d652c76..e2e4d4df6ed0 100644 --- a/validator/client/validator.go +++ b/validator/client/validator.go @@ -207,7 +207,7 @@ func (v *validator) UpdateAssignments(ctx context.Context, slot uint64) error { "status": assignment.Status, } if assignment.Status == pb.ValidatorStatus_ACTIVE { - if assignment.IsProposer { + if assignment.ProposerSlot > 0 { lFields["proposerSlot"] = assignment.ProposerSlot } lFields["attesterSlot"] = assignment.AttesterSlot @@ -226,17 +226,16 @@ func (v *validator) RolesAt(slot uint64) map[[48]byte]pb.ValidatorRole { rolesAt := make(map[[48]byte]pb.ValidatorRole) for _, assignment := range v.assignments.ValidatorAssignment { var role pb.ValidatorRole - if assignment == nil { + switch { + case assignment == nil: role = pb.ValidatorRole_UNKNOWN - } - if assignment.AttesterSlot == slot { - // Note: A proposer also attests to the slot. - if assignment.IsProposer { - role = pb.ValidatorRole_PROPOSER - } else { - role = pb.ValidatorRole_ATTESTER - } - } else { + case assignment.ProposerSlot == slot && assignment.AttesterSlot == slot: + role = pb.ValidatorRole_BOTH + case assignment.AttesterSlot == slot: + role = pb.ValidatorRole_ATTESTER + case assignment.ProposerSlot == slot: + role = pb.ValidatorRole_PROPOSER + default: role = pb.ValidatorRole_UNKNOWN } var pubKey [48]byte diff --git a/validator/client/validator_test.go b/validator/client/validator_test.go index c8d9da7fcea6..56876f78ed3b 100644 --- a/validator/client/validator_test.go +++ b/validator/client/validator_test.go @@ -452,7 +452,6 @@ func TestUpdateAssignments_OK(t *testing.T) { AttesterSlot: params.BeaconConfig().SlotsPerEpoch, Shard: 100, Committee: []uint64{0, 1, 2, 3}, - IsProposer: true, PublicKey: []byte("testPubKey_1"), ProposerSlot: params.BeaconConfig().SlotsPerEpoch + 1, }, @@ -470,7 +469,6 @@ func TestUpdateAssignments_OK(t *testing.T) { if err := v.UpdateAssignments(context.Background(), slot); err != nil { t.Fatalf("Could not update assignments: %v", err) } - if v.assignments.ValidatorAssignment[0].ProposerSlot != params.BeaconConfig().SlotsPerEpoch+1 { t.Errorf("Unexpected validator assignments. want=%v got=%v", params.BeaconConfig().SlotsPerEpoch+1, v.assignments.ValidatorAssignment[0].ProposerSlot) } @@ -480,9 +478,6 @@ func TestUpdateAssignments_OK(t *testing.T) { if v.assignments.ValidatorAssignment[0].Shard != resp.ValidatorAssignment[0].Shard { t.Errorf("Unexpected validator assignments. want=%v got=%v", resp.ValidatorAssignment[0].Shard, v.assignments.ValidatorAssignment[0].Shard) } - if !v.assignments.ValidatorAssignment[0].IsProposer { - t.Errorf("Unexpected validator assignments. want: proposer=true") - } } func TestRolesAt_OK(t *testing.T) { @@ -493,12 +488,11 @@ func TestRolesAt_OK(t *testing.T) { { Shard: 1, AttesterSlot: 1, - IsProposer: true, PublicKey: []byte{0x01}, }, { Shard: 2, - AttesterSlot: 1, + ProposerSlot: 1, PublicKey: []byte{0x02}, }, { @@ -506,18 +500,26 @@ func TestRolesAt_OK(t *testing.T) { AttesterSlot: 2, PublicKey: []byte{0x03}, }, + { + Shard: 2, + AttesterSlot: 1, + ProposerSlot: 1, + PublicKey: []byte{0x04}, + }, }, }, } roleMap := v.RolesAt(1) - if roleMap[[48]byte{0x01}] != pb.ValidatorRole_PROPOSER { + if roleMap[[48]byte{0x01}] != pb.ValidatorRole_ATTESTER { t.Errorf("Unexpected validator role. want: ValidatorRole_PROPOSER") } - if roleMap[[48]byte{0x02}] != pb.ValidatorRole_ATTESTER { + if roleMap[[48]byte{0x02}] != pb.ValidatorRole_PROPOSER { t.Errorf("Unexpected validator role. want: ValidatorRole_ATTESTER") } if roleMap[[48]byte{0x03}] != pb.ValidatorRole_UNKNOWN { t.Errorf("Unexpected validator role. want: UNKNOWN") } - + if roleMap[[48]byte{0x04}] != pb.ValidatorRole_BOTH { + t.Errorf("Unexpected validator role. want: BOTH") + } }