From f293cae4981d1982be0667125a2a1fc7201d3139 Mon Sep 17 00:00:00 2001 From: Terence Tsao Date: Mon, 25 Feb 2019 12:18:02 -0800 Subject: [PATCH 1/4] moved processiing logs to block chain service layer --- beacon-chain/blockchain/service.go | 18 ++++++++++++++++-- beacon-chain/core/state/transition.go | 10 +--------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/beacon-chain/blockchain/service.go b/beacon-chain/blockchain/service.go index 0e06f0e4e3a..17174818226 100644 --- a/beacon-chain/blockchain/service.go +++ b/beacon-chain/blockchain/service.go @@ -313,8 +313,11 @@ func (c *ChainService) ReceiveBlock(block *pb.BeaconBlock, beaconState *pb.Beaco true, /* sig verify */ ) if err != nil { - return nil, fmt.Errorf("could not execute state transition %v", err) + return nil, fmt.Errorf("could not execute state transition without block %v", err) } + log.WithField( + "slotsSinceGenesis", beaconState.Slot-params.BeaconConfig().GenesisSlot, + ).Info("Slot transition successfully processed") } beaconState, err = state.ExecuteStateTransition( @@ -324,7 +327,18 @@ func (c *ChainService) ReceiveBlock(block *pb.BeaconBlock, beaconState *pb.Beaco true, /* no sig verify */ ) if err != nil { - return nil, fmt.Errorf("could not execute state transition %v", err) + return nil, fmt.Errorf("could not execute state transition with block %v", err) + } + log.WithField( + "slotsSinceGenesis", beaconState.Slot-params.BeaconConfig().GenesisSlot, + ).Info("Slot transition successfully processed") + log.WithField( + "slotsSinceGenesis", beaconState.Slot-params.BeaconConfig().GenesisSlot, + ).Info("Block transition successfully processed") + if (beaconState.Slot+1)%params.BeaconConfig().SlotsPerEpoch == 0 { + log.WithField( + "SlotsSinceGenesis", beaconState.Slot-params.BeaconConfig().GenesisSlot, + ).Info("Epoch transition successfully processed") } // if there exists a block for the slot being processed. diff --git a/beacon-chain/core/state/transition.go b/beacon-chain/core/state/transition.go index c9639b84e27..cdc4384e44f 100644 --- a/beacon-chain/core/state/transition.go +++ b/beacon-chain/core/state/transition.go @@ -73,9 +73,6 @@ func ExecuteStateTransition( func ProcessSlot(state *pb.BeaconState, headRoot [32]byte) *pb.BeaconState { state.Slot++ state = b.ProcessBlockRoots(state, headRoot) - log.WithField( - "slotsSinceGenesis", state.Slot-params.BeaconConfig().GenesisSlot, - ).Info("Slot transition successfully processed") return state } @@ -141,9 +138,7 @@ func ProcessBlock(state *pb.BeaconState, block *pb.BeaconBlock, verifySignatures if err != nil { return nil, fmt.Errorf("could not process validator exits: %v", err) } - log.WithField( - "slotsSinceGenesis", state.Slot-params.BeaconConfig().GenesisSlot, - ).Info("Block transition successfully processed") + log.WithField( "attestationsInBlock", len(block.Body.Attestations), ).Info("Block attestations") @@ -396,9 +391,6 @@ func ProcessEpoch(state *pb.BeaconState) (*pb.BeaconState, error) { // Clean up processed attestations. state = e.CleanupAttestations(state) - log.WithField( - "SlotsSinceGenesis", state.Slot-params.BeaconConfig().GenesisSlot, - ).Info("Epoch transition successfully processed") log.WithField( "PreviousJustifiedEpoch", state.PreviousJustifiedEpoch-params.BeaconConfig().GenesisEpoch, ).Info("Previous justified epoch") From 97c6fc6111fb200074af2fbf8e5171b4df7c4bed Mon Sep 17 00:00:00 2001 From: Terence Tsao Date: Wed, 27 Feb 2019 13:21:58 -0800 Subject: [PATCH 2/4] rename shard_block_root -> crosslink_data_root --- beacon-chain/core/blocks/block_operations.go | 6 +- .../core/blocks/block_operations_test.go | 18 +- beacon-chain/core/epoch/epoch_operations.go | 2 +- .../core/epoch/epoch_operations_test.go | 12 +- beacon-chain/core/epoch/epoch_processing.go | 2 +- .../core/epoch/epoch_processing_test.go | 10 +- beacon-chain/core/state/state.go | 2 +- beacon-chain/core/state/transition_test.go | 12 +- beacon-chain/core/validators/validator.go | 4 +- .../core/validators/validator_test.go | 4 +- beacon-chain/rpc/attester_server_test.go | 6 +- beacon-chain/sync/regular_sync_test.go | 6 +- proto/beacon/p2p/v1/types.pb.go | 342 +++++++++--------- proto/beacon/p2p/v1/types.proto | 4 +- validator/client/validator_attest.go | 2 +- validator/client/validator_attest_test.go | 10 +- 16 files changed, 221 insertions(+), 221 deletions(-) diff --git a/beacon-chain/core/blocks/block_operations.go b/beacon-chain/core/blocks/block_operations.go index 452ae8565dd..f48202e6c29 100644 --- a/beacon-chain/core/blocks/block_operations.go +++ b/beacon-chain/core/blocks/block_operations.go @@ -485,7 +485,7 @@ func verifyAttestation(beaconState *pb.BeaconState, att *pb.Attestation, verifyS // equals state.latest_crosslinks[attestation.data.shard] shard := att.Data.Shard crosslink := &pb.Crosslink{ - ShardBlockRootHash32: att.Data.ShardBlockRootHash32, + CrosslinkDataRootHash32: att.Data.CrosslinkDataRootHash32, Epoch: helpers.SlotToEpoch(att.Data.Slot), } crosslinkFromAttestation := att.Data.LatestCrosslink @@ -499,11 +499,11 @@ func verifyAttestation(beaconState *pb.BeaconState, att *pb.Attestation, verifyS } // Verify attestation.shard_block_root == ZERO_HASH [TO BE REMOVED IN PHASE 1]. - if !bytes.Equal(att.Data.ShardBlockRootHash32, params.BeaconConfig().ZeroHash[:]) { + if !bytes.Equal(att.Data.CrosslinkDataRootHash32, params.BeaconConfig().ZeroHash[:]) { return fmt.Errorf( "expected attestation.ShardBlockRoot == %#x, received %#x instead", params.BeaconConfig().ZeroHash[:], - att.Data.ShardBlockRootHash32, + att.Data.CrosslinkDataRootHash32, ) } if verifySignatures { diff --git a/beacon-chain/core/blocks/block_operations_test.go b/beacon-chain/core/blocks/block_operations_test.go index 866ac30e14f..7262649cc98 100644 --- a/beacon-chain/core/blocks/block_operations_test.go +++ b/beacon-chain/core/blocks/block_operations_test.go @@ -907,7 +907,7 @@ func TestProcessBlockAttestations_CrosslinkRootFailure(t *testing.T) { // the attestation should be invalid. stateLatestCrosslinks := []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } state := &pb.BeaconState{ @@ -922,8 +922,8 @@ func TestProcessBlockAttestations_CrosslinkRootFailure(t *testing.T) { Shard: 0, Slot: params.BeaconConfig().GenesisSlot + 20, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{2}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{2}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], JustifiedEpoch: params.BeaconConfig().GenesisEpoch, }, }, @@ -953,7 +953,7 @@ func TestProcessBlockAttestations_ShardBlockRootEqualZeroHashFailure(t *testing. } stateLatestCrosslinks := []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } state := &pb.BeaconState{ @@ -968,8 +968,8 @@ func TestProcessBlockAttestations_ShardBlockRootEqualZeroHashFailure(t *testing. Shard: 0, Slot: params.BeaconConfig().GenesisSlot + 20, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{1}}, - ShardBlockRootHash32: []byte{1}, + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, + CrosslinkDataRootHash32: []byte{1}, JustifiedEpoch: params.BeaconConfig().GenesisEpoch, }, }, @@ -1000,7 +1000,7 @@ func TestProcessBlockAttestations_CreatePendingAttestations(t *testing.T) { } stateLatestCrosslinks := []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } state := &pb.BeaconState{ @@ -1014,8 +1014,8 @@ func TestProcessBlockAttestations_CreatePendingAttestations(t *testing.T) { Shard: 0, Slot: params.BeaconConfig().GenesisSlot + 20, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{1}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], JustifiedEpoch: params.BeaconConfig().GenesisEpoch, }, AggregationBitfield: []byte{1}, diff --git a/beacon-chain/core/epoch/epoch_operations.go b/beacon-chain/core/epoch/epoch_operations.go index 7b84edf1127..5bb86778c11 100644 --- a/beacon-chain/core/epoch/epoch_operations.go +++ b/beacon-chain/core/epoch/epoch_operations.go @@ -320,7 +320,7 @@ func winningRoot( for _, attestation := range attestations { if attestation.Data.Shard == shard { - candidateRoots = append(candidateRoots, attestation.Data.ShardBlockRootHash32) + candidateRoots = append(candidateRoots, attestation.Data.CrosslinkDataRootHash32) } } diff --git a/beacon-chain/core/epoch/epoch_operations_test.go b/beacon-chain/core/epoch/epoch_operations_test.go index 34ac5d827fe..fe30f080815 100644 --- a/beacon-chain/core/epoch/epoch_operations_test.go +++ b/beacon-chain/core/epoch/epoch_operations_test.go @@ -352,7 +352,7 @@ func TestWinningRoot_AccurateRoot(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{byte(i + 100)}, + CrosslinkDataRootHash32: []byte{byte(i + 100)}, }, AggregationBitfield: participationBitfield, } @@ -380,7 +380,7 @@ func TestWinningRoot_EmptyParticipantBitfield(t *testing.T) { attestations := []*pb.PendingAttestation{ {Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, }, AggregationBitfield: []byte{}, }, @@ -400,7 +400,7 @@ func TestAttestingValidators_MatchActive(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{byte(i + 100)}, + CrosslinkDataRootHash32: []byte{byte(i + 100)}, }, AggregationBitfield: []byte{0x03}, } @@ -428,7 +428,7 @@ func TestAttestingValidators_EmptyWinningRoot(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, }, AggregationBitfield: []byte{}, } @@ -449,7 +449,7 @@ func TestTotalAttestingBalance_CorrectBalance(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{byte(i + 100)}, + CrosslinkDataRootHash32: []byte{byte(i + 100)}, }, // All validators attested to the above roots. AggregationBitfield: []byte{0x03}, @@ -477,7 +477,7 @@ func TestTotalAttestingBalance_EmptyWinningRoot(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, }, AggregationBitfield: []byte{}, } diff --git a/beacon-chain/core/epoch/epoch_processing.go b/beacon-chain/core/epoch/epoch_processing.go index d648b6e4c1c..361f2573672 100644 --- a/beacon-chain/core/epoch/epoch_processing.go +++ b/beacon-chain/core/epoch/epoch_processing.go @@ -214,7 +214,7 @@ func ProcessCrosslinks( } state.LatestCrosslinks[shard] = &pb.Crosslink{ Epoch: currentEpoch, - ShardBlockRootHash32: winningRoot, + CrosslinkDataRootHash32: winningRoot, } } } diff --git a/beacon-chain/core/epoch/epoch_processing_test.go b/beacon-chain/core/epoch/epoch_processing_test.go index 476b2e99974..5b51638b9e1 100644 --- a/beacon-chain/core/epoch/epoch_processing_test.go +++ b/beacon-chain/core/epoch/epoch_processing_test.go @@ -257,7 +257,7 @@ func TestProcessCrosslinks_CrosslinksCorrectEpoch(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: state.Slot, - ShardBlockRootHash32: []byte{'A'}, + CrosslinkDataRootHash32: []byte{'A'}, }, // All validators attested to the above roots. AggregationBitfield: participationBitfield, @@ -279,11 +279,11 @@ func TestProcessCrosslinks_CrosslinksCorrectEpoch(t *testing.T) { newState.LatestCrosslinks[0].Epoch, +params.BeaconConfig().GenesisSlot) } // Verify crosslink for shard 0 was root hashed for []byte{'A'}. - if !bytes.Equal(newState.LatestCrosslinks[0].ShardBlockRootHash32, - attestations[0].Data.ShardBlockRootHash32) { + if !bytes.Equal(newState.LatestCrosslinks[0].CrosslinkDataRootHash32, + attestations[0].Data.CrosslinkDataRootHash32) { t.Errorf("Shard 0's root hash is %#x, wanted: %#x", - newState.LatestCrosslinks[0].ShardBlockRootHash32, - attestations[0].Data.ShardBlockRootHash32) + newState.LatestCrosslinks[0].CrosslinkDataRootHash32, + attestations[0].Data.CrosslinkDataRootHash32) } } diff --git a/beacon-chain/core/state/state.go b/beacon-chain/core/state/state.go index dfff613fdd7..6b2084f204c 100644 --- a/beacon-chain/core/state/state.go +++ b/beacon-chain/core/state/state.go @@ -52,7 +52,7 @@ func GenesisBeaconState( for i := 0; i < len(latestCrosslinks); i++ { latestCrosslinks[i] = &pb.Crosslink{ Epoch: params.BeaconConfig().GenesisEpoch, - ShardBlockRootHash32: zeroHash, + CrosslinkDataRootHash32: zeroHash, } } diff --git a/beacon-chain/core/state/transition_test.go b/beacon-chain/core/state/transition_test.go index 8193767b136..de8a5faeee9 100644 --- a/beacon-chain/core/state/transition_test.go +++ b/beacon-chain/core/state/transition_test.go @@ -261,7 +261,7 @@ func TestProcessBlock_IncorrectProcessExits(t *testing.T) { beaconState.LatestBlockRootHash32S = blockRoots beaconState.LatestCrosslinks = []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } beaconState.Slot = params.BeaconConfig().GenesisSlot + 10 @@ -271,8 +271,8 @@ func TestProcessBlock_IncorrectProcessExits(t *testing.T) { Slot: params.BeaconConfig().GenesisSlot, JustifiedEpoch: params.BeaconConfig().GenesisEpoch, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{1}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], }, AggregationBitfield: []byte{1}, CustodyBitfield: []byte{1}, @@ -353,7 +353,7 @@ func TestProcessBlock_PassesProcessingConditions(t *testing.T) { beaconState.LatestBlockRootHash32S = blockRoots beaconState.LatestCrosslinks = []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } beaconState.Slot = params.BeaconConfig().GenesisSlot + 10 @@ -363,8 +363,8 @@ func TestProcessBlock_PassesProcessingConditions(t *testing.T) { Slot: params.BeaconConfig().GenesisSlot, JustifiedEpoch: params.BeaconConfig().GenesisEpoch, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{1}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], }, AggregationBitfield: []byte{1}, CustodyBitfield: []byte{1}, diff --git a/beacon-chain/core/validators/validator.go b/beacon-chain/core/validators/validator.go index 4f4657113fa..ae1acf31deb 100644 --- a/beacon-chain/core/validators/validator.go +++ b/beacon-chain/core/validators/validator.go @@ -55,7 +55,7 @@ func ValidatorIndices( func AttestingValidatorIndices( state *pb.BeaconState, shard uint64, - shardBlockRoot []byte, + crosslinkDataRoot []byte, thisEpochAttestations []*pb.PendingAttestation, prevEpochAttestations []*pb.PendingAttestation) ([]uint64, error) { @@ -64,7 +64,7 @@ func AttestingValidatorIndices( for _, attestation := range attestations { if attestation.Data.Shard == shard && - bytes.Equal(attestation.Data.ShardBlockRootHash32, shardBlockRoot) { + bytes.Equal(attestation.Data.CrosslinkDataRootHash32, crosslinkDataRoot) { validatorIndicesCommittee, err := helpers.AttestationParticipants(state, attestation.Data, attestation.AggregationBitfield) if err != nil { diff --git a/beacon-chain/core/validators/validator_test.go b/beacon-chain/core/validators/validator_test.go index 2482de70822..adfeb607b6b 100644 --- a/beacon-chain/core/validators/validator_test.go +++ b/beacon-chain/core/validators/validator_test.go @@ -103,7 +103,7 @@ func TestAttestingValidatorIndices_OK(t *testing.T) { Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot + 3, Shard: 6, - ShardBlockRootHash32: []byte{'B'}, + CrosslinkDataRootHash32: []byte{'B'}, }, AggregationBitfield: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, } @@ -141,7 +141,7 @@ func TestAttestingValidatorIndices_OutOfBound(t *testing.T) { Data: &pb.AttestationData{ Slot: 0, Shard: 1, - ShardBlockRootHash32: []byte{'B'}, + CrosslinkDataRootHash32: []byte{'B'}, }, AggregationBitfield: []byte{'A'}, // 01000001 = 1,7 } diff --git a/beacon-chain/rpc/attester_server_test.go b/beacon-chain/rpc/attester_server_test.go index 1cf3f97d064..08723069bd1 100644 --- a/beacon-chain/rpc/attester_server_test.go +++ b/beacon-chain/rpc/attester_server_test.go @@ -24,7 +24,7 @@ func TestAttestHead_OK(t *testing.T) { Data: &pbp2p.AttestationData{ Slot: 999, Shard: 1, - ShardBlockRootHash32: []byte{'a'}, + CrosslinkDataRootHash32: []byte{'a'}, }, } if _, err := attesterServer.AttestHead(context.Background(), req); err != nil { @@ -123,7 +123,7 @@ func TestAttestationInfoAtSlot_OK(t *testing.T) { LatestBlockRootHash32S: make([][]byte, params.BeaconConfig().LatestBlockRootsLength), LatestCrosslinks: []*pbp2p.Crosslink{ { - ShardBlockRootHash32: []byte("A"), + CrosslinkDataRootHash32: []byte("A"), }, }, } @@ -163,7 +163,7 @@ func TestAttestationInfoAtSlot_OK(t *testing.T) { JustifiedEpoch: 2 + params.BeaconConfig().GenesisEpoch, JustifiedBlockRootHash32: justifiedBlockRoot[:], LatestCrosslink: &pbp2p.Crosslink{ - ShardBlockRootHash32: []byte("A"), + CrosslinkDataRootHash32: []byte("A"), }, } diff --git a/beacon-chain/sync/regular_sync_test.go b/beacon-chain/sync/regular_sync_test.go index 1f1a5683dee..2b7139f32a8 100644 --- a/beacon-chain/sync/regular_sync_test.go +++ b/beacon-chain/sync/regular_sync_test.go @@ -179,7 +179,7 @@ func TestProcessBlock_OK(t *testing.T) { Data: &pb.AttestationData{ Slot: 0, Shard: 0, - ShardBlockRootHash32: []byte{'A'}, + CrosslinkDataRootHash32: []byte{'A'}, }, } @@ -261,7 +261,7 @@ func TestProcessBlock_MultipleBlocks(t *testing.T) { Block: data1, Attestation: &pb.Attestation{ Data: &pb.AttestationData{ - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, Slot: params.BeaconConfig().GenesisSlot, }, }, @@ -286,7 +286,7 @@ func TestProcessBlock_MultipleBlocks(t *testing.T) { Block: data2, Attestation: &pb.Attestation{ Data: &pb.AttestationData{ - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, Slot: 0, }, }, diff --git a/proto/beacon/p2p/v1/types.pb.go b/proto/beacon/p2p/v1/types.pb.go index c4226552d93..2cee91696d7 100755 --- a/proto/beacon/p2p/v1/types.pb.go +++ b/proto/beacon/p2p/v1/types.pb.go @@ -44,7 +44,7 @@ func (x Validator_StatusFlags) String() string { return proto.EnumName(Validator_StatusFlags_name, int32(x)) } func (Validator_StatusFlags) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{6, 0} + return fileDescriptor_types_8a9af0146f22ddb5, []int{6, 0} } type BeaconState struct { @@ -82,7 +82,7 @@ func (m *BeaconState) Reset() { *m = BeaconState{} } func (m *BeaconState) String() string { return proto.CompactTextString(m) } func (*BeaconState) ProtoMessage() {} func (*BeaconState) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{0} + return fileDescriptor_types_8a9af0146f22ddb5, []int{0} } func (m *BeaconState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -299,7 +299,7 @@ func (m *Fork) Reset() { *m = Fork{} } func (m *Fork) String() string { return proto.CompactTextString(m) } func (*Fork) ProtoMessage() {} func (*Fork) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{1} + return fileDescriptor_types_8a9af0146f22ddb5, []int{1} } func (m *Fork) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -363,7 +363,7 @@ func (m *PendingAttestation) Reset() { *m = PendingAttestation{} } func (m *PendingAttestation) String() string { return proto.CompactTextString(m) } func (*PendingAttestation) ProtoMessage() {} func (*PendingAttestation) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{2} + return fileDescriptor_types_8a9af0146f22ddb5, []int{2} } func (m *PendingAttestation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -434,7 +434,7 @@ func (m *Attestation) Reset() { *m = Attestation{} } func (m *Attestation) String() string { return proto.CompactTextString(m) } func (*Attestation) ProtoMessage() {} func (*Attestation) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{3} + return fileDescriptor_types_8a9af0146f22ddb5, []int{3} } func (m *Attestation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -496,7 +496,7 @@ type AttestationData struct { Shard uint64 `protobuf:"varint,2,opt,name=shard,proto3" json:"shard,omitempty"` BeaconBlockRootHash32 []byte `protobuf:"bytes,3,opt,name=beacon_block_root_hash32,json=beaconBlockRootHash32,proto3" json:"beacon_block_root_hash32,omitempty"` EpochBoundaryRootHash32 []byte `protobuf:"bytes,4,opt,name=epoch_boundary_root_hash32,json=epochBoundaryRootHash32,proto3" json:"epoch_boundary_root_hash32,omitempty"` - ShardBlockRootHash32 []byte `protobuf:"bytes,5,opt,name=shard_block_root_hash32,json=shardBlockRootHash32,proto3" json:"shard_block_root_hash32,omitempty"` + CrosslinkDataRootHash32 []byte `protobuf:"bytes,5,opt,name=crosslink_data_root_hash32,json=crosslinkDataRootHash32,proto3" json:"crosslink_data_root_hash32,omitempty"` LatestCrosslink *Crosslink `protobuf:"bytes,6,opt,name=latest_crosslink,json=latestCrosslink,proto3" json:"latest_crosslink,omitempty"` JustifiedEpoch uint64 `protobuf:"varint,7,opt,name=justified_epoch,json=justifiedEpoch,proto3" json:"justified_epoch,omitempty"` JustifiedBlockRootHash32 []byte `protobuf:"bytes,8,opt,name=justified_block_root_hash32,json=justifiedBlockRootHash32,proto3" json:"justified_block_root_hash32,omitempty"` @@ -509,7 +509,7 @@ func (m *AttestationData) Reset() { *m = AttestationData{} } func (m *AttestationData) String() string { return proto.CompactTextString(m) } func (*AttestationData) ProtoMessage() {} func (*AttestationData) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{4} + return fileDescriptor_types_8a9af0146f22ddb5, []int{4} } func (m *AttestationData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -566,9 +566,9 @@ func (m *AttestationData) GetEpochBoundaryRootHash32() []byte { return nil } -func (m *AttestationData) GetShardBlockRootHash32() []byte { +func (m *AttestationData) GetCrosslinkDataRootHash32() []byte { if m != nil { - return m.ShardBlockRootHash32 + return m.CrosslinkDataRootHash32 } return nil } @@ -606,7 +606,7 @@ func (m *AttestationDataAndCustodyBit) Reset() { *m = AttestationDataAnd func (m *AttestationDataAndCustodyBit) String() string { return proto.CompactTextString(m) } func (*AttestationDataAndCustodyBit) ProtoMessage() {} func (*AttestationDataAndCustodyBit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{5} + return fileDescriptor_types_8a9af0146f22ddb5, []int{5} } func (m *AttestationDataAndCustodyBit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -666,7 +666,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{6} + return fileDescriptor_types_8a9af0146f22ddb5, []int{6} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -757,7 +757,7 @@ func (m *ShardReassignmentRecord) Reset() { *m = ShardReassignmentRecord func (m *ShardReassignmentRecord) String() string { return proto.CompactTextString(m) } func (*ShardReassignmentRecord) ProtoMessage() {} func (*ShardReassignmentRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{7} + return fileDescriptor_types_8a9af0146f22ddb5, []int{7} } func (m *ShardReassignmentRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -808,18 +808,18 @@ func (m *ShardReassignmentRecord) GetSlot() uint64 { } type Crosslink struct { - Epoch uint64 `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty"` - ShardBlockRootHash32 []byte `protobuf:"bytes,2,opt,name=shard_block_root_hash32,json=shardBlockRootHash32,proto3" json:"shard_block_root_hash32,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Epoch uint64 `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty"` + CrosslinkDataRootHash32 []byte `protobuf:"bytes,2,opt,name=crosslink_data_root_hash32,json=crosslinkDataRootHash32,proto3" json:"crosslink_data_root_hash32,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Crosslink) Reset() { *m = Crosslink{} } func (m *Crosslink) String() string { return proto.CompactTextString(m) } func (*Crosslink) ProtoMessage() {} func (*Crosslink) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{8} + return fileDescriptor_types_8a9af0146f22ddb5, []int{8} } func (m *Crosslink) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -855,9 +855,9 @@ func (m *Crosslink) GetEpoch() uint64 { return 0 } -func (m *Crosslink) GetShardBlockRootHash32() []byte { +func (m *Crosslink) GetCrosslinkDataRootHash32() []byte { if m != nil { - return m.ShardBlockRootHash32 + return m.CrosslinkDataRootHash32 } return nil } @@ -879,7 +879,7 @@ func (m *BeaconBlock) Reset() { *m = BeaconBlock{} } func (m *BeaconBlock) String() string { return proto.CompactTextString(m) } func (*BeaconBlock) ProtoMessage() {} func (*BeaconBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{9} + return fileDescriptor_types_8a9af0146f22ddb5, []int{9} } func (m *BeaconBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -972,7 +972,7 @@ func (m *BeaconBlockBody) Reset() { *m = BeaconBlockBody{} } func (m *BeaconBlockBody) String() string { return proto.CompactTextString(m) } func (*BeaconBlockBody) ProtoMessage() {} func (*BeaconBlockBody) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{10} + return fileDescriptor_types_8a9af0146f22ddb5, []int{10} } func (m *BeaconBlockBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1049,7 +1049,7 @@ func (m *DepositInput) Reset() { *m = DepositInput{} } func (m *DepositInput) String() string { return proto.CompactTextString(m) } func (*DepositInput) ProtoMessage() {} func (*DepositInput) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{11} + return fileDescriptor_types_8a9af0146f22ddb5, []int{11} } func (m *DepositInput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1112,7 +1112,7 @@ func (m *ProposalSignedData) Reset() { *m = ProposalSignedData{} } func (m *ProposalSignedData) String() string { return proto.CompactTextString(m) } func (*ProposalSignedData) ProtoMessage() {} func (*ProposalSignedData) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{12} + return fileDescriptor_types_8a9af0146f22ddb5, []int{12} } func (m *ProposalSignedData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1176,7 +1176,7 @@ func (m *SlashableAttestation) Reset() { *m = SlashableAttestation{} } func (m *SlashableAttestation) String() string { return proto.CompactTextString(m) } func (*SlashableAttestation) ProtoMessage() {} func (*SlashableAttestation) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{13} + return fileDescriptor_types_8a9af0146f22ddb5, []int{13} } func (m *SlashableAttestation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1246,7 +1246,7 @@ func (m *DepositData) Reset() { *m = DepositData{} } func (m *DepositData) String() string { return proto.CompactTextString(m) } func (*DepositData) ProtoMessage() {} func (*DepositData) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{14} + return fileDescriptor_types_8a9af0146f22ddb5, []int{14} } func (m *DepositData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1311,7 +1311,7 @@ func (m *ProposerSlashing) Reset() { *m = ProposerSlashing{} } func (m *ProposerSlashing) String() string { return proto.CompactTextString(m) } func (*ProposerSlashing) ProtoMessage() {} func (*ProposerSlashing) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{15} + return fileDescriptor_types_8a9af0146f22ddb5, []int{15} } func (m *ProposerSlashing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1387,7 +1387,7 @@ func (m *AttesterSlashing) Reset() { *m = AttesterSlashing{} } func (m *AttesterSlashing) String() string { return proto.CompactTextString(m) } func (*AttesterSlashing) ProtoMessage() {} func (*AttesterSlashing) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{16} + return fileDescriptor_types_8a9af0146f22ddb5, []int{16} } func (m *AttesterSlashing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1443,7 +1443,7 @@ func (m *Deposit) Reset() { *m = Deposit{} } func (m *Deposit) String() string { return proto.CompactTextString(m) } func (*Deposit) ProtoMessage() {} func (*Deposit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{17} + return fileDescriptor_types_8a9af0146f22ddb5, []int{17} } func (m *Deposit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1506,7 +1506,7 @@ func (m *VoluntaryExit) Reset() { *m = VoluntaryExit{} } func (m *VoluntaryExit) String() string { return proto.CompactTextString(m) } func (*VoluntaryExit) ProtoMessage() {} func (*VoluntaryExit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{18} + return fileDescriptor_types_8a9af0146f22ddb5, []int{18} } func (m *VoluntaryExit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1568,7 +1568,7 @@ func (m *Eth1Data) Reset() { *m = Eth1Data{} } func (m *Eth1Data) String() string { return proto.CompactTextString(m) } func (*Eth1Data) ProtoMessage() {} func (*Eth1Data) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{19} + return fileDescriptor_types_8a9af0146f22ddb5, []int{19} } func (m *Eth1Data) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1623,7 +1623,7 @@ func (m *Eth1DataVote) Reset() { *m = Eth1DataVote{} } func (m *Eth1DataVote) String() string { return proto.CompactTextString(m) } func (*Eth1DataVote) ProtoMessage() {} func (*Eth1DataVote) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{20} + return fileDescriptor_types_8a9af0146f22ddb5, []int{20} } func (m *Eth1DataVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2148,11 +2148,11 @@ func (m *AttestationData) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(len(m.EpochBoundaryRootHash32))) i += copy(dAtA[i:], m.EpochBoundaryRootHash32) } - if len(m.ShardBlockRootHash32) > 0 { + if len(m.CrosslinkDataRootHash32) > 0 { dAtA[i] = 0x2a i++ - i = encodeVarintTypes(dAtA, i, uint64(len(m.ShardBlockRootHash32))) - i += copy(dAtA[i:], m.ShardBlockRootHash32) + i = encodeVarintTypes(dAtA, i, uint64(len(m.CrosslinkDataRootHash32))) + i += copy(dAtA[i:], m.CrosslinkDataRootHash32) } if m.LatestCrosslink != nil { dAtA[i] = 0x32 @@ -2336,11 +2336,11 @@ func (m *Crosslink) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintTypes(dAtA, i, uint64(m.Epoch)) } - if len(m.ShardBlockRootHash32) > 0 { + if len(m.CrosslinkDataRootHash32) > 0 { dAtA[i] = 0x12 i++ - i = encodeVarintTypes(dAtA, i, uint64(len(m.ShardBlockRootHash32))) - i += copy(dAtA[i:], m.ShardBlockRootHash32) + i = encodeVarintTypes(dAtA, i, uint64(len(m.CrosslinkDataRootHash32))) + i += copy(dAtA[i:], m.CrosslinkDataRootHash32) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -3149,7 +3149,7 @@ func (m *AttestationData) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = len(m.ShardBlockRootHash32) + l = len(m.CrosslinkDataRootHash32) if l > 0 { n += 1 + l + sovTypes(uint64(l)) } @@ -3254,7 +3254,7 @@ func (m *Crosslink) Size() (n int) { if m.Epoch != 0 { n += 1 + sovTypes(uint64(m.Epoch)) } - l = len(m.ShardBlockRootHash32) + l = len(m.CrosslinkDataRootHash32) if l > 0 { n += 1 + l + sovTypes(uint64(l)) } @@ -4949,7 +4949,7 @@ func (m *AttestationData) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ShardBlockRootHash32", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CrosslinkDataRootHash32", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4973,9 +4973,9 @@ func (m *AttestationData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ShardBlockRootHash32 = append(m.ShardBlockRootHash32[:0], dAtA[iNdEx:postIndex]...) - if m.ShardBlockRootHash32 == nil { - m.ShardBlockRootHash32 = []byte{} + m.CrosslinkDataRootHash32 = append(m.CrosslinkDataRootHash32[:0], dAtA[iNdEx:postIndex]...) + if m.CrosslinkDataRootHash32 == nil { + m.CrosslinkDataRootHash32 = []byte{} } iNdEx = postIndex case 6: @@ -5553,7 +5553,7 @@ func (m *Crosslink) Unmarshal(dAtA []byte) error { } case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ShardBlockRootHash32", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CrosslinkDataRootHash32", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -5577,9 +5577,9 @@ func (m *Crosslink) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ShardBlockRootHash32 = append(m.ShardBlockRootHash32[:0], dAtA[iNdEx:postIndex]...) - if m.ShardBlockRootHash32 == nil { - m.ShardBlockRootHash32 = []byte{} + m.CrosslinkDataRootHash32 = append(m.CrosslinkDataRootHash32[:0], dAtA[iNdEx:postIndex]...) + if m.CrosslinkDataRootHash32 == nil { + m.CrosslinkDataRootHash32 = []byte{} } iNdEx = postIndex default: @@ -7562,131 +7562,131 @@ var ( ) func init() { - proto.RegisterFile("proto/beacon/p2p/v1/types.proto", fileDescriptor_types_0317e0784c4aa0b4) + proto.RegisterFile("proto/beacon/p2p/v1/types.proto", fileDescriptor_types_8a9af0146f22ddb5) } -var fileDescriptor_types_0317e0784c4aa0b4 = []byte{ +var fileDescriptor_types_8a9af0146f22ddb5 = []byte{ // 1938 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x49, 0x8f, 0x23, 0x49, - 0x15, 0x26, 0xed, 0x5a, 0x9f, 0xb3, 0xca, 0xae, 0xa8, 0xc5, 0x49, 0x6f, 0x55, 0x9d, 0x3d, 0xa3, - 0xae, 0x6e, 0x66, 0x5c, 0xd8, 0x23, 0x68, 0x41, 0x33, 0x12, 0xe5, 0xae, 0x1a, 0xa6, 0xa0, 0x67, - 0xa6, 0x95, 0x2e, 0xba, 0xe7, 0x00, 0x4a, 0x85, 0x9d, 0x61, 0x3b, 0xbb, 0xd2, 0x19, 0xa9, 0x8c, - 0xb0, 0xa7, 0x0b, 0xf1, 0x07, 0x58, 0xc4, 0x8d, 0x03, 0x1c, 0x90, 0xe0, 0x5f, 0xb0, 0x9f, 0x90, - 0x38, 0xb2, 0x09, 0x09, 0x09, 0x21, 0xd4, 0x67, 0xf6, 0x2b, 0x17, 0x94, 0x11, 0x91, 0x8b, 0xd3, - 0xce, 0xaa, 0x6e, 0x86, 0x0b, 0x27, 0x2b, 0xdf, 0xfb, 0xde, 0x8b, 0xf7, 0x5e, 0xbc, 0x2d, 0x0c, - 0xbb, 0x41, 0x48, 0x39, 0x3d, 0xe8, 0x12, 0xdc, 0xa3, 0xfe, 0x41, 0xd0, 0x0a, 0x0e, 0x26, 0xcd, - 0x03, 0x7e, 0x1e, 0x10, 0xd6, 0x10, 0x1c, 0xb4, 0x43, 0xf8, 0x90, 0x84, 0x64, 0x3c, 0x6a, 0x48, - 0x4c, 0x23, 0x68, 0x05, 0x8d, 0x49, 0xf3, 0xca, 0x55, 0x29, 0xd8, 0xa3, 0xa3, 0x11, 0xf5, 0x0f, - 0x46, 0x84, 0x31, 0x3c, 0x88, 0x85, 0xcc, 0x7f, 0x57, 0xa0, 0xd2, 0x16, 0xf0, 0x0e, 0xc7, 0x9c, - 0xa0, 0x47, 0x80, 0x26, 0xd8, 0x73, 0x1d, 0xcc, 0x69, 0x68, 0x87, 0x64, 0xe0, 0x32, 0x1e, 0x9e, - 0x1b, 0xda, 0x5e, 0x79, 0xbf, 0xd2, 0xba, 0xd9, 0x98, 0x7f, 0x42, 0xe3, 0x71, 0x2c, 0x61, 0x6d, - 0x24, 0xc2, 0x96, 0x92, 0x45, 0xc7, 0xb0, 0x3b, 0xab, 0xd1, 0x1e, 0x07, 0x0e, 0xe6, 0xc4, 0x26, - 0x01, 0xed, 0x0d, 0x8d, 0xd2, 0x9e, 0xb6, 0xbf, 0x60, 0x5d, 0x9b, 0x91, 0xfd, 0xa2, 0x00, 0x1d, - 0x47, 0x18, 0xf4, 0x7a, 0xd6, 0xb0, 0x2e, 0xf6, 0xb0, 0xdf, 0x23, 0xcc, 0x28, 0xef, 0x95, 0xf7, - 0x17, 0x32, 0xa7, 0xb6, 0x15, 0x03, 0x1d, 0xc0, 0xa6, 0x87, 0x39, 0x61, 0xdc, 0x0e, 0xb1, 0xef, - 0x60, 0x6a, 0x8f, 0xdc, 0x67, 0x84, 0x19, 0x7f, 0x59, 0xde, 0x2b, 0xef, 0xeb, 0xd6, 0x86, 0xe4, - 0x59, 0x82, 0xf5, 0x4e, 0xc4, 0x41, 0x47, 0x70, 0x23, 0x08, 0xc9, 0xc4, 0xa5, 0x63, 0x66, 0xb3, - 0xe1, 0xb8, 0xdf, 0xf7, 0x5c, 0x7f, 0x60, 0x33, 0x8e, 0x43, 0x6e, 0xb3, 0x21, 0x0e, 0x1d, 0xe3, - 0xaf, 0xcb, 0xc2, 0xcc, 0xab, 0x31, 0xac, 0x13, 0xa3, 0x3a, 0x11, 0xa8, 0x13, 0x61, 0x50, 0x1b, - 0xae, 0xf7, 0xc6, 0x61, 0x48, 0x7c, 0x5e, 0xa0, 0xe4, 0x6f, 0x52, 0xc9, 0x15, 0x85, 0x9a, 0xa7, - 0xe3, 0x53, 0x60, 0xcc, 0xb1, 0x44, 0x46, 0xea, 0xef, 0x52, 0x7c, 0x67, 0xc6, 0x06, 0x19, 0xa4, - 0x7b, 0x50, 0x9f, 0x3d, 0x5e, 0x4a, 0xfe, 0x43, 0x4a, 0x6e, 0xe7, 0x0f, 0x96, 0x82, 0x05, 0xde, - 0x13, 0xe2, 0xd8, 0x43, 0xcc, 0x86, 0x6f, 0xb4, 0x8c, 0x7f, 0x46, 0xf2, 0xfa, 0x3c, 0xef, 0x09, - 0x71, 0xde, 0x16, 0x98, 0x02, 0xef, 0x33, 0x4a, 0xfe, 0x25, 0x95, 0xcc, 0x7a, 0x9f, 0xea, 0xc8, - 0x7a, 0xff, 0x74, 0xcc, 0xb8, 0xdb, 0x77, 0x89, 0xa3, 0x7c, 0xf8, 0x75, 0x75, 0xda, 0xfb, 0xcf, - 0xc7, 0x7c, 0xe9, 0xc4, 0x3e, 0x54, 0xf3, 0x12, 0xbf, 0x91, 0x12, 0xeb, 0x4f, 0xa7, 0x91, 0x9f, - 0x84, 0x1d, 0x45, 0xe9, 0x61, 0xee, 0x52, 0xdf, 0xee, 0xba, 0xbc, 0xef, 0x12, 0xcf, 0x31, 0x7e, - 0x2b, 0x05, 0xb6, 0xa7, 0xd8, 0x6d, 0xc5, 0x8d, 0x4e, 0xe8, 0xbb, 0x3e, 0xf6, 0xdc, 0xaf, 0x24, - 0x27, 0xfc, 0x4e, 0x9d, 0x90, 0xd0, 0xe5, 0x09, 0xef, 0x81, 0xca, 0x31, 0xbb, 0x17, 0x52, 0xc6, - 0x3c, 0xd7, 0x3f, 0x63, 0xc6, 0x0f, 0xeb, 0x17, 0xd7, 0xd1, 0x83, 0x18, 0x6a, 0xd5, 0xa4, 0x70, - 0x42, 0x60, 0xe8, 0xd3, 0xf0, 0x51, 0xa5, 0xb0, 0xeb, 0xd1, 0xde, 0x99, 0x1d, 0x52, 0xca, 0x55, - 0x58, 0x99, 0xf1, 0xe3, 0xba, 0x48, 0xeb, 0x1d, 0x89, 0x68, 0x47, 0x00, 0x8b, 0x52, 0x2e, 0x43, - 0xca, 0xd0, 0x67, 0xe0, 0x4a, 0x17, 0xf3, 0xde, 0x90, 0x38, 0xf3, 0x84, 0x7f, 0x22, 0x85, 0xeb, - 0x0a, 0x32, 0x23, 0x7d, 0x0f, 0xea, 0xea, 0x64, 0xe6, 0x61, 0x26, 0x94, 0xc4, 0xe5, 0xf7, 0xd3, - 0xba, 0xa8, 0xbf, 0x6d, 0xc9, 0xef, 0x48, 0x76, 0x52, 0x83, 0x5f, 0x4a, 0x6a, 0x10, 0xf3, 0xe8, - 0x47, 0xc4, 0x92, 0x19, 0x3f, 0x93, 0x51, 0xb8, 0x5b, 0x14, 0x85, 0x47, 0xc4, 0x77, 0x5c, 0x7f, - 0x70, 0x98, 0xca, 0x58, 0x48, 0xea, 0xc9, 0x90, 0xb2, 0x01, 0x71, 0x7d, 0x87, 0x3c, 0x9b, 0xf6, - 0xe9, 0xe7, 0x53, 0x01, 0x39, 0x89, 0x00, 0x59, 0x97, 0xbe, 0x00, 0x2a, 0xc0, 0x36, 0xe1, 0xc3, - 0xa6, 0xed, 0x60, 0x8e, 0x8d, 0xef, 0xef, 0xee, 0x69, 0xfb, 0x95, 0xd6, 0x5e, 0x91, 0x59, 0xc7, - 0x7c, 0xd8, 0x3c, 0xc2, 0x1c, 0x5b, 0xeb, 0x52, 0x34, 0xfe, 0x46, 0xef, 0x40, 0x35, 0xd1, 0x62, - 0x4f, 0x28, 0x27, 0xcc, 0xf8, 0xc1, 0xae, 0x70, 0xf1, 0x95, 0xcb, 0x74, 0x3d, 0xa6, 0x9c, 0x58, - 0x6b, 0x24, 0xf3, 0xc5, 0x90, 0x09, 0xfa, 0x80, 0xf8, 0x84, 0xb9, 0xcc, 0xe6, 0xee, 0x88, 0x18, - 0x5f, 0xbb, 0x2d, 0x12, 0xac, 0xa2, 0x88, 0xa7, 0xee, 0x88, 0xa0, 0x26, 0x2c, 0xf4, 0x69, 0x78, - 0x66, 0x7c, 0xfd, 0xb6, 0xb0, 0xf9, 0x5a, 0xd1, 0x39, 0x6f, 0xd1, 0xf0, 0xcc, 0x12, 0x50, 0xb4, - 0x09, 0x0b, 0xcc, 0xa3, 0xdc, 0xf8, 0x86, 0x54, 0x27, 0x3e, 0xcc, 0x00, 0x16, 0x22, 0x08, 0xba, - 0x03, 0xb5, 0xa4, 0xe8, 0x26, 0x24, 0x64, 0x2e, 0xf5, 0x0d, 0x4d, 0xe0, 0xaa, 0x31, 0xfd, 0xb1, - 0x24, 0xa3, 0xdb, 0x50, 0x8d, 0x6b, 0x3c, 0x46, 0xca, 0xf6, 0xbd, 0xae, 0xc8, 0x31, 0x70, 0x0b, - 0x16, 0x65, 0x85, 0x94, 0x05, 0x5b, 0x7e, 0x98, 0xbf, 0xd7, 0x00, 0xcd, 0x5e, 0x30, 0xba, 0x0f, - 0x0b, 0xe2, 0x12, 0x34, 0xe1, 0xcf, 0xed, 0x22, 0x7f, 0x32, 0x22, 0xe2, 0x2a, 0x84, 0x10, 0x6a, - 0xc2, 0x16, 0x1e, 0x0c, 0x42, 0x32, 0xc8, 0xd5, 0x72, 0x49, 0x34, 0x9b, 0xcd, 0x0c, 0x2f, 0x29, - 0xe4, 0x3b, 0x50, 0xeb, 0x8d, 0x19, 0xa7, 0xce, 0x79, 0x0a, 0x2f, 0x0b, 0x78, 0x55, 0xd1, 0x13, - 0xe8, 0xab, 0xb0, 0xee, 0xfa, 0x3d, 0x6f, 0x1c, 0x39, 0x65, 0x8b, 0x10, 0x2e, 0x08, 0x87, 0xd6, - 0x12, 0x6a, 0x27, 0x0a, 0xe5, 0x1f, 0x34, 0xa8, 0xfc, 0x9f, 0x78, 0x74, 0x00, 0x89, 0x06, 0x62, - 0x33, 0x77, 0xe0, 0x63, 0x3e, 0x0e, 0x89, 0x70, 0x4b, 0xb7, 0x50, 0xc2, 0xea, 0xc4, 0x1c, 0xf3, - 0x7b, 0x65, 0xa8, 0xe6, 0x0c, 0x45, 0x48, 0xe5, 0x93, 0x96, 0xa6, 0x53, 0x74, 0xe5, 0x72, 0xca, - 0xc9, 0x8c, 0x90, 0x1f, 0xe8, 0x1e, 0x18, 0xd2, 0xe7, 0xd9, 0xe6, 0xa3, 0x2c, 0xdc, 0x96, 0xfc, - 0x5c, 0xe7, 0x41, 0xf7, 0xe1, 0x8a, 0x48, 0x1a, 0xbb, 0x4b, 0xc7, 0xbe, 0x83, 0xc3, 0xf3, 0x29, - 0x51, 0x69, 0x6e, 0x5d, 0x20, 0xda, 0x0a, 0x90, 0x11, 0xfe, 0x04, 0xd4, 0xc5, 0xf1, 0x73, 0x0e, - 0x5d, 0x14, 0x92, 0x5b, 0x82, 0x9d, 0x3f, 0xf3, 0x61, 0xd2, 0x19, 0x92, 0xbe, 0x6d, 0x2c, 0x89, - 0x2b, 0x7c, 0x81, 0xae, 0x5d, 0xcd, 0x75, 0xed, 0xa8, 0x58, 0xf2, 0x13, 0x69, 0x79, 0xee, 0x40, - 0x7a, 0x13, 0xae, 0xa6, 0xc0, 0x59, 0x8b, 0x57, 0x84, 0xc5, 0x46, 0x02, 0xc9, 0x59, 0x6d, 0x7e, - 0x15, 0xae, 0xe5, 0xee, 0xe7, 0xd0, 0x77, 0x1e, 0x24, 0xd7, 0xfe, 0xe1, 0x92, 0x71, 0x17, 0x2a, - 0x99, 0xcc, 0x12, 0x77, 0xbb, 0x62, 0x41, 0x9a, 0x54, 0xe6, 0xb7, 0xcb, 0xb0, 0x9a, 0xac, 0x80, - 0x68, 0x07, 0x96, 0x82, 0x71, 0xf7, 0x8c, 0x9c, 0x8b, 0xd3, 0x74, 0x4b, 0x7d, 0x45, 0xcb, 0xc1, - 0x07, 0x2e, 0x1f, 0x3a, 0x21, 0xfe, 0x00, 0x7b, 0x76, 0x2f, 0x24, 0x0e, 0xf1, 0xb9, 0x8b, 0x3d, - 0x16, 0x3b, 0x29, 0x93, 0xfb, 0x6a, 0x0a, 0x7a, 0x90, 0x62, 0xd4, 0xed, 0xdc, 0x81, 0x1a, 0xee, - 0x71, 0x77, 0x22, 0xcb, 0x42, 0x06, 0x74, 0x51, 0xf6, 0xa9, 0x94, 0x2e, 0x23, 0x7a, 0x1d, 0x80, - 0x3c, 0x73, 0xb9, 0x02, 0x2d, 0x09, 0xd0, 0x6a, 0x44, 0x91, 0xec, 0x3b, 0x50, 0xcb, 0x58, 0x93, - 0xbd, 0x9a, 0x6a, 0x4a, 0x97, 0xd0, 0x5b, 0xb0, 0x16, 0x0f, 0x3e, 0x89, 0x5b, 0x11, 0x38, 0x5d, - 0x11, 0x25, 0xe8, 0x11, 0xe8, 0x51, 0xe4, 0xc6, 0xcc, 0xee, 0x7b, 0x78, 0xc0, 0x0c, 0xd8, 0xd3, - 0xf6, 0xd7, 0x5b, 0xaf, 0x5f, 0xba, 0x31, 0x37, 0x3a, 0x42, 0xea, 0xad, 0x48, 0xc8, 0xaa, 0xb0, - 0xf4, 0xc3, 0xfc, 0x2c, 0x54, 0x32, 0x3c, 0x54, 0x81, 0xe5, 0x93, 0x77, 0x4f, 0x4e, 0x4f, 0x0e, - 0x1f, 0xd6, 0x3e, 0x82, 0x10, 0xac, 0xcb, 0x8f, 0xd3, 0xe3, 0x23, 0xfb, 0xf8, 0xfd, 0x93, 0xd3, - 0x9a, 0x86, 0x6a, 0xa0, 0x3f, 0x39, 0x39, 0x7d, 0xfb, 0xc8, 0x3a, 0x7c, 0x72, 0xd8, 0x7e, 0x78, - 0x5c, 0x2b, 0x99, 0x1e, 0xd4, 0xc5, 0x46, 0x69, 0x11, 0xcc, 0xa2, 0x32, 0x1f, 0x11, 0x9f, 0x5b, - 0xa4, 0x47, 0x43, 0x27, 0x4a, 0xcc, 0x74, 0x9b, 0x16, 0xf3, 0x53, 0x15, 0xf2, 0x7a, 0x42, 0x16, - 0x43, 0xb3, 0xa0, 0xa4, 0xe3, 0xe2, 0x2f, 0x67, 0x66, 0xc9, 0xfb, 0xb0, 0x9a, 0x26, 0x7e, 0xd2, - 0xfc, 0xb5, 0x4c, 0xf3, 0xbf, 0xa8, 0x26, 0x4b, 0xc5, 0x35, 0x69, 0xfe, 0xa8, 0x14, 0xbf, 0x51, - 0x04, 0x67, 0x6e, 0xeb, 0x79, 0x0d, 0x50, 0x80, 0xc5, 0x54, 0x9a, 0xd5, 0x5a, 0x93, 0x9c, 0x4c, - 0x95, 0xdf, 0x85, 0x8d, 0x28, 0xd4, 0x64, 0x4e, 0x2f, 0xaa, 0x0a, 0x46, 0x06, 0x7b, 0x0b, 0xd6, - 0xd4, 0x13, 0x22, 0x24, 0x13, 0x82, 0x3d, 0xd5, 0x78, 0x74, 0x49, 0xb4, 0x04, 0x0d, 0xbd, 0x09, - 0xab, 0xe9, 0x26, 0xb1, 0xf8, 0x82, 0x8b, 0xc4, 0x4a, 0x3c, 0xf8, 0xd1, 0x35, 0x58, 0x4d, 0xfb, - 0xf0, 0x92, 0xd0, 0x9f, 0x12, 0xa2, 0xea, 0xed, 0x52, 0xe7, 0x5c, 0xe4, 0xe7, 0x05, 0xd5, 0x9b, - 0x09, 0x51, 0x9b, 0x3a, 0xe7, 0x96, 0x10, 0x32, 0xbf, 0x53, 0x86, 0x6a, 0x8e, 0x83, 0x3e, 0x07, - 0xfa, 0xd4, 0x46, 0x26, 0x9f, 0x77, 0xb7, 0x5e, 0xa0, 0x2d, 0x58, 0x53, 0x82, 0xe8, 0x09, 0xa0, - 0x20, 0xa4, 0x01, 0x65, 0x24, 0x94, 0xcb, 0xa1, 0xeb, 0x0f, 0x98, 0x51, 0x12, 0xea, 0xf6, 0x0b, - 0xf7, 0x3b, 0x25, 0xd1, 0x51, 0x02, 0xd6, 0x46, 0x90, 0xa3, 0x08, 0xc5, 0xf2, 0xa0, 0x29, 0xc5, - 0xe5, 0x8b, 0x15, 0x1f, 0x2a, 0x89, 0x54, 0x31, 0xce, 0x51, 0x18, 0xba, 0x0f, 0x2b, 0x0e, 0x09, - 0x28, 0x73, 0x39, 0x33, 0x16, 0x84, 0xba, 0xdd, 0x22, 0x75, 0x47, 0x12, 0x67, 0x25, 0x02, 0xe8, - 0x5d, 0xa8, 0x4e, 0xa8, 0x37, 0xf6, 0x79, 0x34, 0x8b, 0xa2, 0x5e, 0xc2, 0x8c, 0x45, 0xa1, 0xe3, - 0xd5, 0xc2, 0x3a, 0x8f, 0xe1, 0xc7, 0xcf, 0x5c, 0x6e, 0xad, 0x4f, 0xb2, 0x9f, 0xcc, 0xfc, 0xae, - 0x06, 0xba, 0x3a, 0xe5, 0xc4, 0x0f, 0xc6, 0xbc, 0xb0, 0x77, 0x36, 0x60, 0x33, 0x08, 0x29, 0xed, - 0xdb, 0xb4, 0x6f, 0x07, 0x94, 0x31, 0xc2, 0x92, 0xc5, 0x4b, 0x17, 0xe1, 0xa3, 0xfd, 0xf7, 0xfa, - 0x8f, 0x12, 0xc6, 0xe5, 0xbd, 0xb6, 0x7c, 0x69, 0xaf, 0x35, 0x9f, 0x02, 0x92, 0x37, 0x85, 0xbd, - 0x68, 0x13, 0x20, 0xce, 0x4b, 0x8e, 0xfd, 0xbb, 0xb0, 0x51, 0x34, 0xef, 0xab, 0xdd, 0x5c, 0x85, - 0xff, 0x51, 0x83, 0x2d, 0x71, 0x47, 0xb8, 0xeb, 0x91, 0xec, 0x16, 0xf5, 0x31, 0xd8, 0x98, 0xea, - 0x53, 0x6e, 0xf4, 0xea, 0xd0, 0xc4, 0xa3, 0xa3, 0x96, 0xed, 0x54, 0x11, 0x7d, 0xee, 0x0a, 0x54, - 0x9a, 0xbf, 0x02, 0xc5, 0x03, 0xb1, 0xfc, 0xdf, 0x0c, 0xc4, 0x97, 0xde, 0x9f, 0xbe, 0xa5, 0x41, - 0x45, 0xdd, 0xb3, 0x08, 0xe2, 0x09, 0xac, 0xa9, 0x9c, 0xb2, 0xdd, 0xe8, 0xde, 0xd5, 0x5c, 0x7e, - 0xe5, 0x92, 0x4c, 0x14, 0x39, 0x62, 0xe9, 0x4e, 0x2e, 0x63, 0xf0, 0x88, 0x8e, 0x7d, 0xae, 0x82, - 0xaf, 0xbe, 0xa2, 0x8e, 0x12, 0xbd, 0x1e, 0x18, 0xc7, 0xa3, 0x40, 0xb5, 0xe9, 0x94, 0x60, 0xfe, - 0xa2, 0x04, 0xb5, 0x7c, 0x19, 0x46, 0x8b, 0x6e, 0x52, 0xcc, 0xd9, 0x91, 0xb0, 0x16, 0x53, 0xe5, - 0x44, 0xb0, 0xa0, 0x1a, 0xa8, 0xbc, 0x90, 0x4f, 0x9e, 0xa6, 0x38, 0xfa, 0xa2, 0x07, 0xdd, 0x4c, - 0x1a, 0xc5, 0x3a, 0xb1, 0x17, 0x7d, 0x35, 0xd1, 0xc7, 0x61, 0x2b, 0xd1, 0x99, 0x04, 0xd4, 0x6e, - 0xaa, 0x74, 0x41, 0x41, 0x46, 0x81, 0x60, 0x35, 0x67, 0xad, 0x90, 0x0b, 0xe1, 0x87, 0xb0, 0xa2, - 0x55, 0x60, 0x45, 0xbc, 0x2f, 0xce, 0x5a, 0xd1, 0x32, 0xff, 0xa4, 0x41, 0x2d, 0xdf, 0x75, 0x90, - 0x03, 0x75, 0x16, 0xe7, 0x72, 0xf6, 0xe5, 0x6b, 0x37, 0xd5, 0x3d, 0xbf, 0x56, 0x64, 0xe2, 0xbc, - 0x12, 0xb0, 0xb6, 0xd9, 0x1c, 0x6a, 0xb3, 0xf8, 0x94, 0x96, 0xba, 0x8e, 0xff, 0xc1, 0x29, 0x2d, - 0xf3, 0x9b, 0x1a, 0x2c, 0xab, 0xec, 0x43, 0x2d, 0xd8, 0x1e, 0x91, 0xf0, 0xcc, 0x23, 0x76, 0x37, - 0xc4, 0x7e, 0x6f, 0x98, 0x3c, 0xb6, 0x35, 0xf1, 0xd6, 0xde, 0x94, 0xcc, 0xb6, 0xe0, 0xc5, 0x0f, - 0xed, 0xbb, 0xb0, 0xa1, 0x64, 0x78, 0x48, 0x88, 0x4a, 0x2b, 0x99, 0xa9, 0x55, 0xc9, 0x38, 0x0d, - 0x09, 0x91, 0x89, 0x75, 0x13, 0xe2, 0xd4, 0xb6, 0x93, 0xda, 0xd4, 0xad, 0x8a, 0x93, 0x16, 0x8e, - 0xe9, 0xc1, 0xda, 0x54, 0x47, 0x2d, 0xd8, 0x33, 0xe6, 0x6c, 0x37, 0xa5, 0xb9, 0xdb, 0xcd, 0xd4, - 0xdc, 0x2d, 0xe7, 0xe6, 0xae, 0xf9, 0x65, 0x58, 0x49, 0x1e, 0xf9, 0x0d, 0xd8, 0x8c, 0x8d, 0xcb, - 0xf6, 0x33, 0xd9, 0xa6, 0x37, 0x14, 0x2b, 0xb3, 0x35, 0xdc, 0x04, 0x5d, 0x76, 0xbf, 0xa9, 0x4d, - 0xa4, 0x22, 0x68, 0xaa, 0xe9, 0x79, 0xa0, 0x67, 0xff, 0x07, 0x98, 0xde, 0x21, 0xb4, 0x97, 0xde, - 0x21, 0xae, 0x03, 0x4c, 0x28, 0x27, 0x76, 0x2f, 0xd3, 0x0d, 0x56, 0x23, 0xca, 0x83, 0x88, 0xd0, - 0xd6, 0x7f, 0xf9, 0xfc, 0x86, 0xf6, 0xab, 0xe7, 0x37, 0xb4, 0x3f, 0x3f, 0xbf, 0xa1, 0x75, 0x97, - 0xc4, 0xbf, 0xbf, 0x6f, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0x8d, 0xb3, 0x99, 0x07, 0x55, 0x16, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcb, 0x6f, 0x23, 0x49, + 0x19, 0xa7, 0xed, 0x3c, 0x3f, 0x3b, 0xb1, 0x53, 0x99, 0xc4, 0xcd, 0xbc, 0x92, 0xe9, 0xd9, 0xd5, + 0x64, 0x86, 0x5d, 0x07, 0x7b, 0x25, 0x46, 0x30, 0xac, 0x44, 0x3c, 0xc9, 0xb2, 0x81, 0xd9, 0xdd, + 0x51, 0x3b, 0xcc, 0x70, 0x00, 0x5a, 0x65, 0x77, 0xd9, 0xee, 0x49, 0xbb, 0xab, 0xd5, 0x55, 0xf6, + 0x26, 0x88, 0x7f, 0x80, 0x87, 0xb8, 0x71, 0x80, 0x1b, 0x88, 0x7f, 0x82, 0xf7, 0x09, 0x89, 0x23, + 0x2f, 0x21, 0x21, 0x21, 0x84, 0xe6, 0xcc, 0xfb, 0xca, 0x05, 0xd5, 0xa3, 0x1f, 0x7e, 0x74, 0x32, + 0xc3, 0x72, 0xd9, 0x93, 0xd5, 0xdf, 0xf7, 0xfb, 0x7d, 0x55, 0xf5, 0xd5, 0xf7, 0x2a, 0xc3, 0x4e, + 0x18, 0x51, 0x4e, 0xf7, 0x3b, 0x04, 0x77, 0x69, 0xb0, 0x1f, 0x36, 0xc3, 0xfd, 0x71, 0x63, 0x9f, + 0x9f, 0x87, 0x84, 0xd5, 0xa5, 0x06, 0x6d, 0x13, 0x3e, 0x20, 0x11, 0x19, 0x0d, 0xeb, 0x0a, 0x53, + 0x0f, 0x9b, 0x61, 0x7d, 0xdc, 0xb8, 0x7a, 0x4d, 0x11, 0xbb, 0x74, 0x38, 0xa4, 0xc1, 0xfe, 0x90, + 0x30, 0x86, 0xfb, 0x31, 0xc9, 0xfa, 0x4f, 0x09, 0x4a, 0x2d, 0x09, 0x6f, 0x73, 0xcc, 0x09, 0x7a, + 0x0c, 0x68, 0x8c, 0x7d, 0xcf, 0xc5, 0x9c, 0x46, 0x4e, 0x44, 0xfa, 0x1e, 0xe3, 0xd1, 0xb9, 0x69, + 0xec, 0x16, 0xf7, 0x4a, 0xcd, 0x5b, 0xf5, 0xf9, 0x2b, 0xd4, 0x9f, 0xc4, 0x0c, 0x7b, 0x23, 0x21, + 0xdb, 0x9a, 0x8b, 0x8e, 0x60, 0x67, 0xd6, 0xa2, 0x33, 0x0a, 0x5d, 0xcc, 0x89, 0x43, 0x42, 0xda, + 0x1d, 0x98, 0x85, 0x5d, 0x63, 0x6f, 0xc1, 0xbe, 0x3e, 0xc3, 0xfd, 0x82, 0x04, 0x1d, 0x09, 0x0c, + 0x7a, 0x3d, 0xbb, 0xb1, 0x0e, 0xf6, 0x71, 0xd0, 0x25, 0xcc, 0x2c, 0xee, 0x16, 0xf7, 0x16, 0x32, + 0xab, 0xb6, 0xb4, 0x02, 0xed, 0xc3, 0xa6, 0x8f, 0x39, 0x61, 0xdc, 0x89, 0x70, 0xe0, 0x62, 0xea, + 0x0c, 0xbd, 0x33, 0xc2, 0xcc, 0xbf, 0x2e, 0xef, 0x16, 0xf7, 0xca, 0xf6, 0x86, 0xd2, 0xd9, 0x52, + 0xf5, 0x8e, 0xd0, 0xa0, 0x43, 0xb8, 0x19, 0x46, 0x64, 0xec, 0xd1, 0x11, 0x73, 0xd8, 0x60, 0xd4, + 0xeb, 0xf9, 0x5e, 0xd0, 0x77, 0x18, 0xc7, 0x11, 0x77, 0xd8, 0x00, 0x47, 0xae, 0xf9, 0xb7, 0x65, + 0xb9, 0xcd, 0x6b, 0x31, 0xac, 0x1d, 0xa3, 0xda, 0x02, 0xd4, 0x16, 0x18, 0xd4, 0x82, 0x1b, 0xdd, + 0x51, 0x14, 0x91, 0x80, 0xe7, 0x18, 0xf9, 0xbb, 0x32, 0x72, 0x55, 0xa3, 0xe6, 0xd9, 0xf8, 0x24, + 0x98, 0x73, 0x76, 0xa2, 0x3c, 0xf5, 0x0f, 0x45, 0xdf, 0x9e, 0xd9, 0x83, 0x72, 0xd2, 0x7d, 0xa8, + 0xcd, 0x2e, 0xaf, 0x98, 0xff, 0x54, 0xcc, 0xad, 0xe9, 0x85, 0x15, 0x31, 0xe7, 0xf4, 0x84, 0xb8, + 0xce, 0x00, 0xb3, 0xc1, 0x1b, 0x4d, 0xf3, 0x5f, 0x82, 0x5f, 0x9e, 0x77, 0x7a, 0x42, 0xdc, 0xb7, + 0x25, 0x26, 0xe7, 0xf4, 0x19, 0x23, 0xff, 0x56, 0x46, 0x66, 0x4f, 0x9f, 0xda, 0xc8, 0x9e, 0xfe, + 0xd9, 0x88, 0x71, 0xaf, 0xe7, 0x11, 0x57, 0x9f, 0xe1, 0x37, 0x95, 0xc9, 0xd3, 0x7f, 0x2e, 0xd6, + 0xab, 0x43, 0xec, 0x41, 0x65, 0x9a, 0xf1, 0x5b, 0xc5, 0x58, 0x7f, 0x36, 0x89, 0xfc, 0x04, 0x6c, + 0x6b, 0x49, 0x17, 0x73, 0x8f, 0x06, 0x4e, 0xc7, 0xe3, 0x3d, 0x8f, 0xf8, 0xae, 0xf9, 0x3b, 0x45, + 0xd8, 0x9a, 0x50, 0xb7, 0xb4, 0x56, 0xac, 0xd0, 0xf3, 0x02, 0xec, 0x7b, 0x5f, 0x4d, 0x56, 0xf8, + 0xbd, 0x5e, 0x21, 0x91, 0xab, 0x15, 0xde, 0x03, 0x1d, 0x63, 0x4e, 0x37, 0xa2, 0x8c, 0xf9, 0x5e, + 0x70, 0xca, 0xcc, 0x1f, 0xd5, 0x2e, 0xce, 0xa3, 0x87, 0x31, 0xd4, 0xae, 0x2a, 0x72, 0x22, 0x60, + 0xe8, 0x53, 0xf0, 0x51, 0x6d, 0xb0, 0xe3, 0xd3, 0xee, 0xa9, 0x13, 0x51, 0xca, 0xb5, 0x5b, 0x99, + 0xf9, 0x93, 0x9a, 0x0c, 0xeb, 0x6d, 0x85, 0x68, 0x09, 0x80, 0x4d, 0x29, 0x57, 0x2e, 0x65, 0xe8, + 0xd3, 0x70, 0xb5, 0x83, 0x79, 0x77, 0x40, 0xdc, 0x79, 0xe4, 0x9f, 0x2a, 0x72, 0x4d, 0x43, 0x66, + 0xd8, 0xf7, 0xa1, 0xa6, 0x57, 0x66, 0x3e, 0x66, 0xd2, 0x48, 0x9c, 0x7e, 0x3f, 0xab, 0xc9, 0xfc, + 0xdb, 0x52, 0xfa, 0xb6, 0x52, 0x27, 0x39, 0xf8, 0xa5, 0x24, 0x07, 0x31, 0x17, 0x3f, 0xd2, 0x97, + 0xcc, 0xfc, 0xb9, 0xf2, 0xc2, 0xbd, 0x3c, 0x2f, 0x3c, 0x26, 0x81, 0xeb, 0x05, 0xfd, 0x83, 0x94, + 0x63, 0x23, 0x65, 0x27, 0x23, 0xca, 0x3a, 0xc4, 0x0b, 0x5c, 0x72, 0x36, 0x79, 0xa6, 0x5f, 0x4c, + 0x38, 0xe4, 0x58, 0x00, 0xb2, 0x47, 0xfa, 0x3c, 0x68, 0x07, 0x3b, 0x84, 0x0f, 0x1a, 0x8e, 0x8b, + 0x39, 0x36, 0xbf, 0xbf, 0xb3, 0x6b, 0xec, 0x95, 0x9a, 0xbb, 0x79, 0xdb, 0x3a, 0xe2, 0x83, 0xc6, + 0x21, 0xe6, 0xd8, 0x5e, 0x57, 0xd4, 0xf8, 0x1b, 0xbd, 0x03, 0x95, 0xc4, 0x8a, 0x33, 0xa6, 0x9c, + 0x30, 0xf3, 0x07, 0x3b, 0xf2, 0x88, 0xaf, 0x5c, 0x66, 0xeb, 0x09, 0xe5, 0xc4, 0x5e, 0x23, 0x99, + 0x2f, 0x86, 0x2c, 0x28, 0xf7, 0x49, 0x40, 0x98, 0xc7, 0x1c, 0xee, 0x0d, 0x89, 0xf9, 0xf5, 0x3b, + 0x32, 0xc0, 0x4a, 0x5a, 0x78, 0xe2, 0x0d, 0x09, 0x6a, 0xc0, 0x42, 0x8f, 0x46, 0xa7, 0xe6, 0x37, + 0xee, 0xc8, 0x3d, 0x5f, 0xcf, 0x5b, 0xe7, 0x2d, 0x1a, 0x9d, 0xda, 0x12, 0x8a, 0x36, 0x61, 0x81, + 0xf9, 0x94, 0x9b, 0xdf, 0x54, 0xe6, 0xe4, 0x87, 0x15, 0xc2, 0x82, 0x80, 0xa0, 0xbb, 0x50, 0x4d, + 0x92, 0x6e, 0x4c, 0x22, 0xe6, 0xd1, 0xc0, 0x34, 0x24, 0xae, 0x12, 0xcb, 0x9f, 0x28, 0x31, 0xba, + 0x03, 0x95, 0x38, 0xc7, 0x63, 0xa4, 0x2a, 0xdf, 0xeb, 0x5a, 0x1c, 0x03, 0xaf, 0xc0, 0xa2, 0xca, + 0x90, 0xa2, 0x54, 0xab, 0x0f, 0xeb, 0x0f, 0x06, 0xa0, 0xd9, 0x0b, 0x46, 0x0f, 0x60, 0x41, 0x5e, + 0x82, 0x21, 0xcf, 0x73, 0x27, 0xef, 0x3c, 0x19, 0x8a, 0xbc, 0x0a, 0x49, 0x42, 0x0d, 0xb8, 0x82, + 0xfb, 0xfd, 0x88, 0xf4, 0xa7, 0x72, 0xb9, 0x20, 0x8b, 0xcd, 0x66, 0x46, 0x97, 0x24, 0xf2, 0x5d, + 0xa8, 0x76, 0x47, 0x8c, 0x53, 0xf7, 0x3c, 0x85, 0x17, 0x25, 0xbc, 0xa2, 0xe5, 0x09, 0xf4, 0x55, + 0x58, 0xf7, 0x82, 0xae, 0x3f, 0x12, 0x87, 0x72, 0xa4, 0x0b, 0x17, 0xe4, 0x81, 0xd6, 0x12, 0x69, + 0x5b, 0xb8, 0xf2, 0x8f, 0x06, 0x94, 0x3e, 0x24, 0x27, 0xda, 0x87, 0xc4, 0x02, 0x71, 0x98, 0xd7, + 0x0f, 0x30, 0x1f, 0x45, 0x44, 0x1e, 0xab, 0x6c, 0xa3, 0x44, 0xd5, 0x8e, 0x35, 0xd6, 0x0f, 0x8b, + 0x50, 0x99, 0xda, 0x28, 0x42, 0x3a, 0x9e, 0x8c, 0x34, 0x9c, 0xc4, 0x95, 0xab, 0x2e, 0xa7, 0x22, + 0x42, 0x7d, 0xa0, 0xfb, 0x60, 0xaa, 0x33, 0xcf, 0x16, 0x1f, 0xbd, 0xc3, 0x2d, 0xa5, 0x9f, 0xaa, + 0x3c, 0xe8, 0x01, 0x5c, 0x95, 0x41, 0xe3, 0x74, 0xe8, 0x28, 0x70, 0x71, 0x74, 0x3e, 0x41, 0x55, + 0xdb, 0xad, 0x49, 0x44, 0x4b, 0x03, 0x26, 0xc9, 0x49, 0xe5, 0x55, 0xa9, 0x99, 0x25, 0x2f, 0x2a, + 0x72, 0x82, 0x90, 0xbe, 0x4f, 0xc9, 0x8f, 0x92, 0xfa, 0x90, 0x20, 0xcc, 0x25, 0x79, 0x91, 0x2f, + 0x50, 0xbb, 0x2b, 0x53, 0xb5, 0x5b, 0xa4, 0xcc, 0x74, 0x5f, 0x5a, 0x9e, 0xdb, 0x96, 0xde, 0x84, + 0x6b, 0x29, 0x70, 0xd6, 0x59, 0x2b, 0x72, 0xd3, 0x66, 0x02, 0x99, 0xf2, 0x97, 0xf5, 0x35, 0xb8, + 0x3e, 0x75, 0x4b, 0x07, 0x81, 0xfb, 0x30, 0xb9, 0xfc, 0x0f, 0x16, 0x92, 0x3b, 0x50, 0xca, 0xc4, + 0x97, 0xbc, 0xe1, 0x15, 0x1b, 0xd2, 0xd0, 0xb2, 0xbe, 0x53, 0x84, 0xd5, 0x64, 0x10, 0x44, 0xdb, + 0xb0, 0x14, 0x8e, 0x3a, 0xa7, 0xe4, 0x5c, 0xae, 0x56, 0xb6, 0xf5, 0x97, 0x18, 0x11, 0xde, 0xf7, + 0xf8, 0xc0, 0x8d, 0xf0, 0xfb, 0xd8, 0x77, 0xba, 0x11, 0x71, 0x49, 0xc0, 0x3d, 0xec, 0xb3, 0xf8, + 0x90, 0x2a, 0xc4, 0xaf, 0xa5, 0xa0, 0x87, 0x29, 0x46, 0xdf, 0xce, 0x5d, 0xa8, 0xe2, 0x2e, 0xf7, + 0xc6, 0x2a, 0x39, 0x94, 0x43, 0x17, 0x55, 0xb5, 0x4a, 0xe5, 0xca, 0xa3, 0x37, 0x00, 0xc8, 0x99, + 0xc7, 0x35, 0x68, 0x49, 0x82, 0x56, 0x85, 0x44, 0xa9, 0xef, 0x42, 0x35, 0xb3, 0x9b, 0xec, 0xd5, + 0x54, 0x52, 0xb9, 0x82, 0xde, 0x86, 0xb5, 0xb8, 0xfd, 0x29, 0xdc, 0x8a, 0xc4, 0x95, 0xb5, 0x50, + 0x81, 0x1e, 0x43, 0x59, 0x78, 0x6e, 0xc4, 0x9c, 0x9e, 0x8f, 0xfb, 0xcc, 0x84, 0x5d, 0x63, 0x6f, + 0xbd, 0xf9, 0xfa, 0xa5, 0x73, 0x73, 0xbd, 0x2d, 0x59, 0x6f, 0x09, 0x92, 0x5d, 0x62, 0xe9, 0x87, + 0xf5, 0x19, 0x28, 0x65, 0x74, 0xa8, 0x04, 0xcb, 0xc7, 0xef, 0x1e, 0x9f, 0x1c, 0x1f, 0x3c, 0xaa, + 0x7e, 0x04, 0x21, 0x58, 0x57, 0x1f, 0x27, 0x47, 0x87, 0xce, 0xd1, 0x17, 0x8f, 0x4f, 0xaa, 0x06, + 0xaa, 0x42, 0xf9, 0xe9, 0xf1, 0xc9, 0xdb, 0x87, 0xf6, 0xc1, 0xd3, 0x83, 0xd6, 0xa3, 0xa3, 0x6a, + 0xc1, 0xf2, 0xa1, 0x26, 0xe7, 0x4a, 0x9b, 0x60, 0x26, 0x92, 0x7d, 0x48, 0x02, 0x6e, 0x93, 0x2e, + 0x8d, 0x5c, 0x11, 0x98, 0xe9, 0x4c, 0x2d, 0xbb, 0xa8, 0x4e, 0xe7, 0xf5, 0x44, 0x2c, 0x5b, 0x67, + 0x4e, 0x62, 0xc7, 0x25, 0xa0, 0x98, 0xe9, 0x28, 0x5f, 0x81, 0xd5, 0x34, 0xf0, 0x93, 0x16, 0x60, + 0x64, 0x5a, 0xc0, 0x25, 0x99, 0x59, 0xb8, 0x30, 0x33, 0xad, 0x1f, 0x17, 0xe2, 0xf7, 0x8a, 0x8c, + 0xfe, 0xb9, 0x65, 0xe8, 0x35, 0x40, 0x21, 0x96, 0x1d, 0x6a, 0xd6, 0x70, 0x55, 0x69, 0x32, 0xb9, + 0x7e, 0x0f, 0x36, 0x84, 0xc3, 0xc9, 0x9c, 0xba, 0x54, 0x91, 0x8a, 0x0c, 0xf6, 0x36, 0xac, 0xe9, + 0xe7, 0x44, 0x44, 0xc6, 0x04, 0xfb, 0xba, 0x08, 0x95, 0x95, 0xd0, 0x96, 0x32, 0xf4, 0x26, 0xac, + 0xa6, 0x53, 0xc5, 0xe2, 0x0b, 0x0e, 0x15, 0x2b, 0xf1, 0x10, 0x80, 0xae, 0xc3, 0x6a, 0x5a, 0x93, + 0x97, 0xa4, 0xfd, 0x54, 0x20, 0x72, 0xb8, 0x43, 0xdd, 0x73, 0x19, 0xa5, 0x17, 0xe4, 0x70, 0xc6, + 0x45, 0x2d, 0xea, 0x9e, 0xdb, 0x92, 0x64, 0x7d, 0xb7, 0x08, 0x95, 0x29, 0x0d, 0xfa, 0x2c, 0x94, + 0x27, 0xa6, 0x33, 0xf5, 0xd4, 0xbb, 0xfd, 0x02, 0xc5, 0xc1, 0x9e, 0x20, 0xa2, 0xa7, 0x80, 0xc2, + 0x88, 0x86, 0x94, 0x91, 0x48, 0x0d, 0x8a, 0x5e, 0xd0, 0x67, 0x66, 0x41, 0x9a, 0xdb, 0xcb, 0x9d, + 0xf5, 0x34, 0xa3, 0xad, 0x09, 0xf6, 0x46, 0x38, 0x25, 0x91, 0x86, 0xd5, 0x42, 0x13, 0x86, 0x8b, + 0x17, 0x1b, 0x3e, 0xd0, 0x8c, 0xd4, 0x30, 0x9e, 0x92, 0x30, 0xf4, 0x00, 0x56, 0x5c, 0x12, 0x52, + 0xe6, 0x71, 0x66, 0x2e, 0x48, 0x73, 0x3b, 0x79, 0xe6, 0x0e, 0x15, 0xce, 0x4e, 0x08, 0xe8, 0x5d, + 0xa8, 0x8c, 0xa9, 0x3f, 0x0a, 0xb8, 0xe8, 0x4b, 0xa2, 0xa2, 0x30, 0x73, 0x51, 0xda, 0x78, 0x35, + 0x37, 0xdb, 0x63, 0xf8, 0xd1, 0x99, 0xc7, 0xed, 0xf5, 0x71, 0xf6, 0x93, 0x59, 0xdf, 0x33, 0xa0, + 0xac, 0x57, 0x39, 0x0e, 0xc2, 0x11, 0xcf, 0xad, 0xa0, 0x75, 0xd8, 0x0c, 0x23, 0x4a, 0x7b, 0x0e, + 0xed, 0x39, 0x21, 0x65, 0x8c, 0xb0, 0x64, 0x08, 0x2b, 0x4b, 0xf7, 0xd1, 0xde, 0x7b, 0xbd, 0xc7, + 0x89, 0xe2, 0xf2, 0x8a, 0x5b, 0xbc, 0xb4, 0xe2, 0x5a, 0xcf, 0x00, 0xa9, 0x9b, 0xc2, 0xbe, 0x98, + 0x0a, 0x88, 0xfb, 0x92, 0x23, 0xc0, 0x3d, 0xd8, 0xc8, 0xeb, 0xfd, 0x95, 0xce, 0x54, 0x17, 0xfb, + 0x93, 0x01, 0x57, 0xe4, 0x1d, 0xe1, 0x8e, 0x4f, 0xb2, 0x13, 0xd5, 0xc7, 0x60, 0x63, 0xa2, 0x5a, + 0x79, 0xe2, 0x05, 0x62, 0xc8, 0x07, 0x48, 0x35, 0x5b, 0xaf, 0x84, 0x7c, 0xee, 0x38, 0x54, 0x98, + 0x3f, 0x0e, 0xc5, 0x6d, 0xb1, 0xf8, 0xbf, 0xb4, 0xc5, 0x97, 0x9e, 0xa5, 0xbe, 0x6d, 0x40, 0x49, + 0xdf, 0xb3, 0x74, 0xe2, 0x31, 0xac, 0xe9, 0x98, 0x72, 0x3c, 0x71, 0xef, 0xba, 0x3b, 0xbf, 0x72, + 0x49, 0x24, 0xca, 0x18, 0xb1, 0xcb, 0xee, 0x54, 0xc4, 0xe0, 0x21, 0x1d, 0x05, 0x5c, 0x3b, 0x5f, + 0x7f, 0x89, 0x8a, 0x22, 0x5e, 0x12, 0x8c, 0xe3, 0x61, 0xa8, 0x8b, 0x75, 0x2a, 0xb0, 0x7e, 0x59, + 0x80, 0xea, 0x74, 0x1a, 0x8a, 0xa1, 0x37, 0x49, 0xe6, 0x6c, 0x63, 0x58, 0x8b, 0xa5, 0xaa, 0x2f, + 0xd8, 0x50, 0x09, 0x75, 0x5c, 0xa8, 0x4a, 0xde, 0x90, 0x4b, 0x5f, 0xf4, 0xb8, 0x9b, 0x09, 0xa3, + 0xd8, 0x26, 0xf6, 0xc5, 0x57, 0x03, 0x7d, 0x1c, 0xae, 0x24, 0x36, 0x13, 0x87, 0x3a, 0x0d, 0x1d, + 0x2e, 0x28, 0xcc, 0x18, 0x90, 0xaa, 0xc6, 0xec, 0x2e, 0xd4, 0x70, 0xf8, 0x01, 0x76, 0xd1, 0xcc, + 0xd9, 0x45, 0x3c, 0x38, 0xce, 0xee, 0xa2, 0x69, 0xfd, 0xd9, 0x80, 0xea, 0x74, 0xd5, 0x41, 0x2e, + 0xd4, 0x58, 0x1c, 0xcb, 0xd9, 0x57, 0xb0, 0xd3, 0xd0, 0xf7, 0xfc, 0x5a, 0xde, 0x16, 0xe7, 0xa5, + 0x80, 0xbd, 0xc5, 0xe6, 0x48, 0x1b, 0xf9, 0xab, 0x34, 0xf5, 0x75, 0xfc, 0x1f, 0x56, 0x69, 0x5a, + 0xdf, 0x32, 0x60, 0x59, 0x47, 0x1f, 0x6a, 0xc2, 0xd6, 0x90, 0x44, 0xa7, 0x3e, 0x71, 0x3a, 0x11, + 0x0e, 0xba, 0x83, 0xe4, 0xe1, 0x6d, 0xc8, 0x77, 0xf7, 0xa6, 0x52, 0xb6, 0xa4, 0x2e, 0x7e, 0x74, + 0xdf, 0x83, 0x0d, 0xcd, 0xe1, 0x11, 0x21, 0x3a, 0xac, 0x54, 0xa4, 0x56, 0x94, 0xe2, 0x24, 0x22, + 0x44, 0x05, 0xd6, 0x2d, 0x88, 0x43, 0xdb, 0x49, 0x72, 0xb3, 0x6c, 0x97, 0xdc, 0x34, 0x71, 0x2c, + 0x1f, 0xd6, 0x26, 0x2a, 0x6a, 0xce, 0xb4, 0x31, 0x67, 0xc6, 0x29, 0xcc, 0x9d, 0x71, 0x26, 0xfa, + 0x6e, 0x71, 0xaa, 0xef, 0x5a, 0x5f, 0x86, 0x95, 0xe4, 0xc1, 0x5f, 0x87, 0xcd, 0x78, 0x73, 0xd9, + 0x7a, 0xa6, 0xca, 0xf4, 0x86, 0x56, 0x65, 0xa6, 0x86, 0x5b, 0x50, 0x56, 0xd5, 0x6f, 0x62, 0x12, + 0x29, 0x49, 0x99, 0x2e, 0x7a, 0x3e, 0x94, 0xb3, 0xff, 0x09, 0x4c, 0xce, 0x10, 0xc6, 0x4b, 0xcf, + 0x10, 0x37, 0x00, 0xc6, 0x94, 0x13, 0xa7, 0x9b, 0xa9, 0x06, 0xab, 0x42, 0xf2, 0x50, 0x08, 0x5a, + 0xe5, 0x5f, 0x3d, 0xbf, 0x69, 0xfc, 0xfa, 0xf9, 0x4d, 0xe3, 0x2f, 0xcf, 0x6f, 0x1a, 0x9d, 0x25, + 0xf9, 0x4f, 0xf0, 0x1b, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x40, 0x0b, 0xb5, 0x02, 0x61, 0x16, 0x00, 0x00, } diff --git a/proto/beacon/p2p/v1/types.proto b/proto/beacon/p2p/v1/types.proto index 699d03270e0..d61bc6b545d 100644 --- a/proto/beacon/p2p/v1/types.proto +++ b/proto/beacon/p2p/v1/types.proto @@ -68,7 +68,7 @@ message AttestationData { uint64 shard = 2; bytes beacon_block_root_hash32 = 3; bytes epoch_boundary_root_hash32 = 4; - bytes shard_block_root_hash32 = 5; + bytes crosslink_data_root_hash32 = 5; Crosslink latest_crosslink = 6; uint64 justified_epoch = 7; bytes justified_block_root_hash32 = 8; @@ -105,7 +105,7 @@ message ShardReassignmentRecord { message Crosslink { uint64 epoch = 1; - bytes shard_block_root_hash32 = 2; + bytes crosslink_data_root_hash32 = 2; } message BeaconBlock { diff --git a/validator/client/validator_attest.go b/validator/client/validator_attest.go index e5e262c7b7b..51f4e928b11 100644 --- a/validator/client/validator_attest.go +++ b/validator/client/validator_attest.go @@ -25,7 +25,7 @@ func (v *validator) AttestToBlockHead(ctx context.Context, slot uint64) { // object based upon the state at the assigned slot. attData := &pbp2p.AttestationData{ Slot: slot, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], // Stub for Phase 0. + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], // Stub for Phase 0. } // We fetch the validator index as it is necessary to generate the aggregation // bitfield of the attestation itself. diff --git a/validator/client/validator_attest_test.go b/validator/client/validator_attest_test.go index 9dd7ccd68ea..84c0384ff36 100644 --- a/validator/client/validator_attest_test.go +++ b/validator/client/validator_attest_test.go @@ -136,7 +136,7 @@ func TestAttestToBlockHead_AttestsCorrectly(t *testing.T) { BeaconBlockRootHash32: []byte("A"), EpochBoundaryRootHash32: []byte("B"), JustifiedBlockRootHash32: []byte("C"), - LatestCrosslink: &pbp2p.Crosslink{ShardBlockRootHash32: []byte{'D'}}, + LatestCrosslink: &pbp2p.Crosslink{CrosslinkDataRootHash32: []byte{'D'}}, JustifiedEpoch: 3, }, nil) @@ -161,8 +161,8 @@ func TestAttestToBlockHead_AttestsCorrectly(t *testing.T) { BeaconBlockRootHash32: []byte("A"), EpochBoundaryRootHash32: []byte("B"), JustifiedBlockRootHash32: []byte("C"), - LatestCrosslink: &pbp2p.Crosslink{ShardBlockRootHash32: []byte{'D'}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pbp2p.Crosslink{CrosslinkDataRootHash32: []byte{'D'}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], JustifiedEpoch: 3, }, CustodyBitfield: make([]byte, (len(committee)+7)/8), @@ -204,7 +204,7 @@ func TestAttestToBlockHead_DoesNotAttestBeforeDelay(t *testing.T) { BeaconBlockRootHash32: []byte("A"), EpochBoundaryRootHash32: []byte("B"), JustifiedBlockRootHash32: []byte("C"), - LatestCrosslink: &pbp2p.Crosslink{ShardBlockRootHash32: []byte{'D'}}, + LatestCrosslink: &pbp2p.Crosslink{CrosslinkDataRootHash32: []byte{'D'}}, JustifiedEpoch: 3, }, nil).Do(func(arg0, arg1 interface{}) { wg.Done() @@ -257,7 +257,7 @@ func TestAttestToBlockHead_DoesAttestAfterDelay(t *testing.T) { BeaconBlockRootHash32: []byte("A"), EpochBoundaryRootHash32: []byte("B"), JustifiedBlockRootHash32: []byte("C"), - LatestCrosslink: &pbp2p.Crosslink{ShardBlockRootHash32: []byte{'D'}}, + LatestCrosslink: &pbp2p.Crosslink{CrosslinkDataRootHash32: []byte{'D'}}, JustifiedEpoch: 3, }, nil).Do(func(arg0, arg1 interface{}) { wg.Done() From a4ecc3179a6074008f27f42e7d22f9fb8aa43647 Mon Sep 17 00:00:00 2001 From: Terence Tsao Date: Wed, 27 Feb 2019 13:21:58 -0800 Subject: [PATCH 3/4] rename shard_block_root -> crosslink_data_root --- beacon-chain/core/blocks/block_operations.go | 6 +- .../core/blocks/block_operations_test.go | 18 +- beacon-chain/core/epoch/epoch_operations.go | 2 +- .../core/epoch/epoch_operations_test.go | 12 +- beacon-chain/core/epoch/epoch_processing.go | 2 +- .../core/epoch/epoch_processing_test.go | 10 +- beacon-chain/core/state/state.go | 2 +- beacon-chain/core/state/transition_test.go | 12 +- beacon-chain/core/validators/validator.go | 4 +- .../core/validators/validator_test.go | 4 +- beacon-chain/rpc/attester_server_test.go | 6 +- beacon-chain/sync/regular_sync_test.go | 6 +- proto/beacon/p2p/v1/types.pb.go | 342 +++++++++--------- proto/beacon/p2p/v1/types.proto | 4 +- validator/client/validator_attest.go | 2 +- validator/client/validator_attest_test.go | 10 +- 16 files changed, 221 insertions(+), 221 deletions(-) diff --git a/beacon-chain/core/blocks/block_operations.go b/beacon-chain/core/blocks/block_operations.go index 452ae8565dd..f48202e6c29 100644 --- a/beacon-chain/core/blocks/block_operations.go +++ b/beacon-chain/core/blocks/block_operations.go @@ -485,7 +485,7 @@ func verifyAttestation(beaconState *pb.BeaconState, att *pb.Attestation, verifyS // equals state.latest_crosslinks[attestation.data.shard] shard := att.Data.Shard crosslink := &pb.Crosslink{ - ShardBlockRootHash32: att.Data.ShardBlockRootHash32, + CrosslinkDataRootHash32: att.Data.CrosslinkDataRootHash32, Epoch: helpers.SlotToEpoch(att.Data.Slot), } crosslinkFromAttestation := att.Data.LatestCrosslink @@ -499,11 +499,11 @@ func verifyAttestation(beaconState *pb.BeaconState, att *pb.Attestation, verifyS } // Verify attestation.shard_block_root == ZERO_HASH [TO BE REMOVED IN PHASE 1]. - if !bytes.Equal(att.Data.ShardBlockRootHash32, params.BeaconConfig().ZeroHash[:]) { + if !bytes.Equal(att.Data.CrosslinkDataRootHash32, params.BeaconConfig().ZeroHash[:]) { return fmt.Errorf( "expected attestation.ShardBlockRoot == %#x, received %#x instead", params.BeaconConfig().ZeroHash[:], - att.Data.ShardBlockRootHash32, + att.Data.CrosslinkDataRootHash32, ) } if verifySignatures { diff --git a/beacon-chain/core/blocks/block_operations_test.go b/beacon-chain/core/blocks/block_operations_test.go index 866ac30e14f..7262649cc98 100644 --- a/beacon-chain/core/blocks/block_operations_test.go +++ b/beacon-chain/core/blocks/block_operations_test.go @@ -907,7 +907,7 @@ func TestProcessBlockAttestations_CrosslinkRootFailure(t *testing.T) { // the attestation should be invalid. stateLatestCrosslinks := []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } state := &pb.BeaconState{ @@ -922,8 +922,8 @@ func TestProcessBlockAttestations_CrosslinkRootFailure(t *testing.T) { Shard: 0, Slot: params.BeaconConfig().GenesisSlot + 20, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{2}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{2}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], JustifiedEpoch: params.BeaconConfig().GenesisEpoch, }, }, @@ -953,7 +953,7 @@ func TestProcessBlockAttestations_ShardBlockRootEqualZeroHashFailure(t *testing. } stateLatestCrosslinks := []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } state := &pb.BeaconState{ @@ -968,8 +968,8 @@ func TestProcessBlockAttestations_ShardBlockRootEqualZeroHashFailure(t *testing. Shard: 0, Slot: params.BeaconConfig().GenesisSlot + 20, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{1}}, - ShardBlockRootHash32: []byte{1}, + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, + CrosslinkDataRootHash32: []byte{1}, JustifiedEpoch: params.BeaconConfig().GenesisEpoch, }, }, @@ -1000,7 +1000,7 @@ func TestProcessBlockAttestations_CreatePendingAttestations(t *testing.T) { } stateLatestCrosslinks := []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } state := &pb.BeaconState{ @@ -1014,8 +1014,8 @@ func TestProcessBlockAttestations_CreatePendingAttestations(t *testing.T) { Shard: 0, Slot: params.BeaconConfig().GenesisSlot + 20, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{1}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], JustifiedEpoch: params.BeaconConfig().GenesisEpoch, }, AggregationBitfield: []byte{1}, diff --git a/beacon-chain/core/epoch/epoch_operations.go b/beacon-chain/core/epoch/epoch_operations.go index 680f67f4d22..6f3f01ade28 100644 --- a/beacon-chain/core/epoch/epoch_operations.go +++ b/beacon-chain/core/epoch/epoch_operations.go @@ -319,7 +319,7 @@ func winningRoot( for _, attestation := range attestations { if attestation.Data.Shard == shard { - candidateRoots = append(candidateRoots, attestation.Data.ShardBlockRootHash32) + candidateRoots = append(candidateRoots, attestation.Data.CrosslinkDataRootHash32) } } diff --git a/beacon-chain/core/epoch/epoch_operations_test.go b/beacon-chain/core/epoch/epoch_operations_test.go index 001f06f6263..454d34c0a3c 100644 --- a/beacon-chain/core/epoch/epoch_operations_test.go +++ b/beacon-chain/core/epoch/epoch_operations_test.go @@ -352,7 +352,7 @@ func TestWinningRoot_AccurateRoot(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{byte(i + 100)}, + CrosslinkDataRootHash32: []byte{byte(i + 100)}, }, AggregationBitfield: participationBitfield, } @@ -380,7 +380,7 @@ func TestWinningRoot_EmptyParticipantBitfield(t *testing.T) { attestations := []*pb.PendingAttestation{ {Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, }, AggregationBitfield: []byte{}, }, @@ -400,7 +400,7 @@ func TestAttestingValidators_MatchActive(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{byte(i + 100)}, + CrosslinkDataRootHash32: []byte{byte(i + 100)}, }, AggregationBitfield: []byte{0x03}, } @@ -428,7 +428,7 @@ func TestAttestingValidators_EmptyWinningRoot(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, }, AggregationBitfield: []byte{}, } @@ -449,7 +449,7 @@ func TestTotalAttestingBalance_CorrectBalance(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{byte(i + 100)}, + CrosslinkDataRootHash32: []byte{byte(i + 100)}, }, // All validators attested to the above roots. AggregationBitfield: []byte{0x03}, @@ -477,7 +477,7 @@ func TestTotalAttestingBalance_EmptyWinningRoot(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot, - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, }, AggregationBitfield: []byte{}, } diff --git a/beacon-chain/core/epoch/epoch_processing.go b/beacon-chain/core/epoch/epoch_processing.go index d7a95f3b708..05c5938b53b 100644 --- a/beacon-chain/core/epoch/epoch_processing.go +++ b/beacon-chain/core/epoch/epoch_processing.go @@ -214,7 +214,7 @@ func ProcessCrosslinks( } state.LatestCrosslinks[shard] = &pb.Crosslink{ Epoch: currentEpoch, - ShardBlockRootHash32: winningRoot, + CrosslinkDataRootHash32: winningRoot, } } } diff --git a/beacon-chain/core/epoch/epoch_processing_test.go b/beacon-chain/core/epoch/epoch_processing_test.go index 062eb557f08..9710474f0ed 100644 --- a/beacon-chain/core/epoch/epoch_processing_test.go +++ b/beacon-chain/core/epoch/epoch_processing_test.go @@ -257,7 +257,7 @@ func TestProcessCrosslinks_CrosslinksCorrectEpoch(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ Slot: state.Slot, - ShardBlockRootHash32: []byte{'A'}, + CrosslinkDataRootHash32: []byte{'A'}, }, // All validators attested to the above roots. AggregationBitfield: participationBitfield, @@ -279,11 +279,11 @@ func TestProcessCrosslinks_CrosslinksCorrectEpoch(t *testing.T) { newState.LatestCrosslinks[0].Epoch, +params.BeaconConfig().GenesisSlot) } // Verify crosslink for shard 0 was root hashed for []byte{'A'}. - if !bytes.Equal(newState.LatestCrosslinks[0].ShardBlockRootHash32, - attestations[0].Data.ShardBlockRootHash32) { + if !bytes.Equal(newState.LatestCrosslinks[0].CrosslinkDataRootHash32, + attestations[0].Data.CrosslinkDataRootHash32) { t.Errorf("Shard 0's root hash is %#x, wanted: %#x", - newState.LatestCrosslinks[0].ShardBlockRootHash32, - attestations[0].Data.ShardBlockRootHash32) + newState.LatestCrosslinks[0].CrosslinkDataRootHash32, + attestations[0].Data.CrosslinkDataRootHash32) } } diff --git a/beacon-chain/core/state/state.go b/beacon-chain/core/state/state.go index dfff613fdd7..6b2084f204c 100644 --- a/beacon-chain/core/state/state.go +++ b/beacon-chain/core/state/state.go @@ -52,7 +52,7 @@ func GenesisBeaconState( for i := 0; i < len(latestCrosslinks); i++ { latestCrosslinks[i] = &pb.Crosslink{ Epoch: params.BeaconConfig().GenesisEpoch, - ShardBlockRootHash32: zeroHash, + CrosslinkDataRootHash32: zeroHash, } } diff --git a/beacon-chain/core/state/transition_test.go b/beacon-chain/core/state/transition_test.go index 8193767b136..de8a5faeee9 100644 --- a/beacon-chain/core/state/transition_test.go +++ b/beacon-chain/core/state/transition_test.go @@ -261,7 +261,7 @@ func TestProcessBlock_IncorrectProcessExits(t *testing.T) { beaconState.LatestBlockRootHash32S = blockRoots beaconState.LatestCrosslinks = []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } beaconState.Slot = params.BeaconConfig().GenesisSlot + 10 @@ -271,8 +271,8 @@ func TestProcessBlock_IncorrectProcessExits(t *testing.T) { Slot: params.BeaconConfig().GenesisSlot, JustifiedEpoch: params.BeaconConfig().GenesisEpoch, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{1}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], }, AggregationBitfield: []byte{1}, CustodyBitfield: []byte{1}, @@ -353,7 +353,7 @@ func TestProcessBlock_PassesProcessingConditions(t *testing.T) { beaconState.LatestBlockRootHash32S = blockRoots beaconState.LatestCrosslinks = []*pb.Crosslink{ { - ShardBlockRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, }, } beaconState.Slot = params.BeaconConfig().GenesisSlot + 10 @@ -363,8 +363,8 @@ func TestProcessBlock_PassesProcessingConditions(t *testing.T) { Slot: params.BeaconConfig().GenesisSlot, JustifiedEpoch: params.BeaconConfig().GenesisEpoch, JustifiedBlockRootHash32: blockRoots[0], - LatestCrosslink: &pb.Crosslink{ShardBlockRootHash32: []byte{1}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], }, AggregationBitfield: []byte{1}, CustodyBitfield: []byte{1}, diff --git a/beacon-chain/core/validators/validator.go b/beacon-chain/core/validators/validator.go index 16876119eb5..26dcd746c68 100644 --- a/beacon-chain/core/validators/validator.go +++ b/beacon-chain/core/validators/validator.go @@ -55,7 +55,7 @@ func ValidatorIndices( func AttestingValidatorIndices( state *pb.BeaconState, shard uint64, - shardBlockRoot []byte, + crosslinkDataRoot []byte, thisEpochAttestations []*pb.PendingAttestation, prevEpochAttestations []*pb.PendingAttestation) ([]uint64, error) { @@ -64,7 +64,7 @@ func AttestingValidatorIndices( for _, attestation := range attestations { if attestation.Data.Shard == shard && - bytes.Equal(attestation.Data.ShardBlockRootHash32, shardBlockRoot) { + bytes.Equal(attestation.Data.CrosslinkDataRootHash32, crosslinkDataRoot) { validatorIndicesCommittee, err := helpers.AttestationParticipants(state, attestation.Data, attestation.AggregationBitfield) if err != nil { diff --git a/beacon-chain/core/validators/validator_test.go b/beacon-chain/core/validators/validator_test.go index 2482de70822..adfeb607b6b 100644 --- a/beacon-chain/core/validators/validator_test.go +++ b/beacon-chain/core/validators/validator_test.go @@ -103,7 +103,7 @@ func TestAttestingValidatorIndices_OK(t *testing.T) { Data: &pb.AttestationData{ Slot: params.BeaconConfig().GenesisSlot + 3, Shard: 6, - ShardBlockRootHash32: []byte{'B'}, + CrosslinkDataRootHash32: []byte{'B'}, }, AggregationBitfield: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, } @@ -141,7 +141,7 @@ func TestAttestingValidatorIndices_OutOfBound(t *testing.T) { Data: &pb.AttestationData{ Slot: 0, Shard: 1, - ShardBlockRootHash32: []byte{'B'}, + CrosslinkDataRootHash32: []byte{'B'}, }, AggregationBitfield: []byte{'A'}, // 01000001 = 1,7 } diff --git a/beacon-chain/rpc/attester_server_test.go b/beacon-chain/rpc/attester_server_test.go index ff2a20c5161..0a4fa9a2992 100644 --- a/beacon-chain/rpc/attester_server_test.go +++ b/beacon-chain/rpc/attester_server_test.go @@ -24,7 +24,7 @@ func TestAttestHead_OK(t *testing.T) { Data: &pbp2p.AttestationData{ Slot: 999, Shard: 1, - ShardBlockRootHash32: []byte{'a'}, + CrosslinkDataRootHash32: []byte{'a'}, }, } if _, err := attesterServer.AttestHead(context.Background(), req); err != nil { @@ -123,7 +123,7 @@ func TestAttestationDataAtSlot_OK(t *testing.T) { LatestBlockRootHash32S: make([][]byte, params.BeaconConfig().LatestBlockRootsLength), LatestCrosslinks: []*pbp2p.Crosslink{ { - ShardBlockRootHash32: []byte("A"), + CrosslinkDataRootHash32: []byte("A"), }, }, } @@ -163,7 +163,7 @@ func TestAttestationDataAtSlot_OK(t *testing.T) { JustifiedEpoch: 2 + params.BeaconConfig().GenesisEpoch, JustifiedBlockRootHash32: justifiedBlockRoot[:], LatestCrosslink: &pbp2p.Crosslink{ - ShardBlockRootHash32: []byte("A"), + CrosslinkDataRootHash32: []byte("A"), }, } diff --git a/beacon-chain/sync/regular_sync_test.go b/beacon-chain/sync/regular_sync_test.go index 1f1a5683dee..2b7139f32a8 100644 --- a/beacon-chain/sync/regular_sync_test.go +++ b/beacon-chain/sync/regular_sync_test.go @@ -179,7 +179,7 @@ func TestProcessBlock_OK(t *testing.T) { Data: &pb.AttestationData{ Slot: 0, Shard: 0, - ShardBlockRootHash32: []byte{'A'}, + CrosslinkDataRootHash32: []byte{'A'}, }, } @@ -261,7 +261,7 @@ func TestProcessBlock_MultipleBlocks(t *testing.T) { Block: data1, Attestation: &pb.Attestation{ Data: &pb.AttestationData{ - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, Slot: params.BeaconConfig().GenesisSlot, }, }, @@ -286,7 +286,7 @@ func TestProcessBlock_MultipleBlocks(t *testing.T) { Block: data2, Attestation: &pb.Attestation{ Data: &pb.AttestationData{ - ShardBlockRootHash32: []byte{}, + CrosslinkDataRootHash32: []byte{}, Slot: 0, }, }, diff --git a/proto/beacon/p2p/v1/types.pb.go b/proto/beacon/p2p/v1/types.pb.go index c4226552d93..2cee91696d7 100755 --- a/proto/beacon/p2p/v1/types.pb.go +++ b/proto/beacon/p2p/v1/types.pb.go @@ -44,7 +44,7 @@ func (x Validator_StatusFlags) String() string { return proto.EnumName(Validator_StatusFlags_name, int32(x)) } func (Validator_StatusFlags) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{6, 0} + return fileDescriptor_types_8a9af0146f22ddb5, []int{6, 0} } type BeaconState struct { @@ -82,7 +82,7 @@ func (m *BeaconState) Reset() { *m = BeaconState{} } func (m *BeaconState) String() string { return proto.CompactTextString(m) } func (*BeaconState) ProtoMessage() {} func (*BeaconState) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{0} + return fileDescriptor_types_8a9af0146f22ddb5, []int{0} } func (m *BeaconState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -299,7 +299,7 @@ func (m *Fork) Reset() { *m = Fork{} } func (m *Fork) String() string { return proto.CompactTextString(m) } func (*Fork) ProtoMessage() {} func (*Fork) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{1} + return fileDescriptor_types_8a9af0146f22ddb5, []int{1} } func (m *Fork) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -363,7 +363,7 @@ func (m *PendingAttestation) Reset() { *m = PendingAttestation{} } func (m *PendingAttestation) String() string { return proto.CompactTextString(m) } func (*PendingAttestation) ProtoMessage() {} func (*PendingAttestation) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{2} + return fileDescriptor_types_8a9af0146f22ddb5, []int{2} } func (m *PendingAttestation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -434,7 +434,7 @@ func (m *Attestation) Reset() { *m = Attestation{} } func (m *Attestation) String() string { return proto.CompactTextString(m) } func (*Attestation) ProtoMessage() {} func (*Attestation) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{3} + return fileDescriptor_types_8a9af0146f22ddb5, []int{3} } func (m *Attestation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -496,7 +496,7 @@ type AttestationData struct { Shard uint64 `protobuf:"varint,2,opt,name=shard,proto3" json:"shard,omitempty"` BeaconBlockRootHash32 []byte `protobuf:"bytes,3,opt,name=beacon_block_root_hash32,json=beaconBlockRootHash32,proto3" json:"beacon_block_root_hash32,omitempty"` EpochBoundaryRootHash32 []byte `protobuf:"bytes,4,opt,name=epoch_boundary_root_hash32,json=epochBoundaryRootHash32,proto3" json:"epoch_boundary_root_hash32,omitempty"` - ShardBlockRootHash32 []byte `protobuf:"bytes,5,opt,name=shard_block_root_hash32,json=shardBlockRootHash32,proto3" json:"shard_block_root_hash32,omitempty"` + CrosslinkDataRootHash32 []byte `protobuf:"bytes,5,opt,name=crosslink_data_root_hash32,json=crosslinkDataRootHash32,proto3" json:"crosslink_data_root_hash32,omitempty"` LatestCrosslink *Crosslink `protobuf:"bytes,6,opt,name=latest_crosslink,json=latestCrosslink,proto3" json:"latest_crosslink,omitempty"` JustifiedEpoch uint64 `protobuf:"varint,7,opt,name=justified_epoch,json=justifiedEpoch,proto3" json:"justified_epoch,omitempty"` JustifiedBlockRootHash32 []byte `protobuf:"bytes,8,opt,name=justified_block_root_hash32,json=justifiedBlockRootHash32,proto3" json:"justified_block_root_hash32,omitempty"` @@ -509,7 +509,7 @@ func (m *AttestationData) Reset() { *m = AttestationData{} } func (m *AttestationData) String() string { return proto.CompactTextString(m) } func (*AttestationData) ProtoMessage() {} func (*AttestationData) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{4} + return fileDescriptor_types_8a9af0146f22ddb5, []int{4} } func (m *AttestationData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -566,9 +566,9 @@ func (m *AttestationData) GetEpochBoundaryRootHash32() []byte { return nil } -func (m *AttestationData) GetShardBlockRootHash32() []byte { +func (m *AttestationData) GetCrosslinkDataRootHash32() []byte { if m != nil { - return m.ShardBlockRootHash32 + return m.CrosslinkDataRootHash32 } return nil } @@ -606,7 +606,7 @@ func (m *AttestationDataAndCustodyBit) Reset() { *m = AttestationDataAnd func (m *AttestationDataAndCustodyBit) String() string { return proto.CompactTextString(m) } func (*AttestationDataAndCustodyBit) ProtoMessage() {} func (*AttestationDataAndCustodyBit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{5} + return fileDescriptor_types_8a9af0146f22ddb5, []int{5} } func (m *AttestationDataAndCustodyBit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -666,7 +666,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{6} + return fileDescriptor_types_8a9af0146f22ddb5, []int{6} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -757,7 +757,7 @@ func (m *ShardReassignmentRecord) Reset() { *m = ShardReassignmentRecord func (m *ShardReassignmentRecord) String() string { return proto.CompactTextString(m) } func (*ShardReassignmentRecord) ProtoMessage() {} func (*ShardReassignmentRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{7} + return fileDescriptor_types_8a9af0146f22ddb5, []int{7} } func (m *ShardReassignmentRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -808,18 +808,18 @@ func (m *ShardReassignmentRecord) GetSlot() uint64 { } type Crosslink struct { - Epoch uint64 `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty"` - ShardBlockRootHash32 []byte `protobuf:"bytes,2,opt,name=shard_block_root_hash32,json=shardBlockRootHash32,proto3" json:"shard_block_root_hash32,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Epoch uint64 `protobuf:"varint,1,opt,name=epoch,proto3" json:"epoch,omitempty"` + CrosslinkDataRootHash32 []byte `protobuf:"bytes,2,opt,name=crosslink_data_root_hash32,json=crosslinkDataRootHash32,proto3" json:"crosslink_data_root_hash32,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Crosslink) Reset() { *m = Crosslink{} } func (m *Crosslink) String() string { return proto.CompactTextString(m) } func (*Crosslink) ProtoMessage() {} func (*Crosslink) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{8} + return fileDescriptor_types_8a9af0146f22ddb5, []int{8} } func (m *Crosslink) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -855,9 +855,9 @@ func (m *Crosslink) GetEpoch() uint64 { return 0 } -func (m *Crosslink) GetShardBlockRootHash32() []byte { +func (m *Crosslink) GetCrosslinkDataRootHash32() []byte { if m != nil { - return m.ShardBlockRootHash32 + return m.CrosslinkDataRootHash32 } return nil } @@ -879,7 +879,7 @@ func (m *BeaconBlock) Reset() { *m = BeaconBlock{} } func (m *BeaconBlock) String() string { return proto.CompactTextString(m) } func (*BeaconBlock) ProtoMessage() {} func (*BeaconBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{9} + return fileDescriptor_types_8a9af0146f22ddb5, []int{9} } func (m *BeaconBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -972,7 +972,7 @@ func (m *BeaconBlockBody) Reset() { *m = BeaconBlockBody{} } func (m *BeaconBlockBody) String() string { return proto.CompactTextString(m) } func (*BeaconBlockBody) ProtoMessage() {} func (*BeaconBlockBody) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{10} + return fileDescriptor_types_8a9af0146f22ddb5, []int{10} } func (m *BeaconBlockBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1049,7 +1049,7 @@ func (m *DepositInput) Reset() { *m = DepositInput{} } func (m *DepositInput) String() string { return proto.CompactTextString(m) } func (*DepositInput) ProtoMessage() {} func (*DepositInput) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{11} + return fileDescriptor_types_8a9af0146f22ddb5, []int{11} } func (m *DepositInput) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1112,7 +1112,7 @@ func (m *ProposalSignedData) Reset() { *m = ProposalSignedData{} } func (m *ProposalSignedData) String() string { return proto.CompactTextString(m) } func (*ProposalSignedData) ProtoMessage() {} func (*ProposalSignedData) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{12} + return fileDescriptor_types_8a9af0146f22ddb5, []int{12} } func (m *ProposalSignedData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1176,7 +1176,7 @@ func (m *SlashableAttestation) Reset() { *m = SlashableAttestation{} } func (m *SlashableAttestation) String() string { return proto.CompactTextString(m) } func (*SlashableAttestation) ProtoMessage() {} func (*SlashableAttestation) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{13} + return fileDescriptor_types_8a9af0146f22ddb5, []int{13} } func (m *SlashableAttestation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1246,7 +1246,7 @@ func (m *DepositData) Reset() { *m = DepositData{} } func (m *DepositData) String() string { return proto.CompactTextString(m) } func (*DepositData) ProtoMessage() {} func (*DepositData) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{14} + return fileDescriptor_types_8a9af0146f22ddb5, []int{14} } func (m *DepositData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1311,7 +1311,7 @@ func (m *ProposerSlashing) Reset() { *m = ProposerSlashing{} } func (m *ProposerSlashing) String() string { return proto.CompactTextString(m) } func (*ProposerSlashing) ProtoMessage() {} func (*ProposerSlashing) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{15} + return fileDescriptor_types_8a9af0146f22ddb5, []int{15} } func (m *ProposerSlashing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1387,7 +1387,7 @@ func (m *AttesterSlashing) Reset() { *m = AttesterSlashing{} } func (m *AttesterSlashing) String() string { return proto.CompactTextString(m) } func (*AttesterSlashing) ProtoMessage() {} func (*AttesterSlashing) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{16} + return fileDescriptor_types_8a9af0146f22ddb5, []int{16} } func (m *AttesterSlashing) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1443,7 +1443,7 @@ func (m *Deposit) Reset() { *m = Deposit{} } func (m *Deposit) String() string { return proto.CompactTextString(m) } func (*Deposit) ProtoMessage() {} func (*Deposit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{17} + return fileDescriptor_types_8a9af0146f22ddb5, []int{17} } func (m *Deposit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1506,7 +1506,7 @@ func (m *VoluntaryExit) Reset() { *m = VoluntaryExit{} } func (m *VoluntaryExit) String() string { return proto.CompactTextString(m) } func (*VoluntaryExit) ProtoMessage() {} func (*VoluntaryExit) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{18} + return fileDescriptor_types_8a9af0146f22ddb5, []int{18} } func (m *VoluntaryExit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1568,7 +1568,7 @@ func (m *Eth1Data) Reset() { *m = Eth1Data{} } func (m *Eth1Data) String() string { return proto.CompactTextString(m) } func (*Eth1Data) ProtoMessage() {} func (*Eth1Data) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{19} + return fileDescriptor_types_8a9af0146f22ddb5, []int{19} } func (m *Eth1Data) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1623,7 +1623,7 @@ func (m *Eth1DataVote) Reset() { *m = Eth1DataVote{} } func (m *Eth1DataVote) String() string { return proto.CompactTextString(m) } func (*Eth1DataVote) ProtoMessage() {} func (*Eth1DataVote) Descriptor() ([]byte, []int) { - return fileDescriptor_types_0317e0784c4aa0b4, []int{20} + return fileDescriptor_types_8a9af0146f22ddb5, []int{20} } func (m *Eth1DataVote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2148,11 +2148,11 @@ func (m *AttestationData) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(len(m.EpochBoundaryRootHash32))) i += copy(dAtA[i:], m.EpochBoundaryRootHash32) } - if len(m.ShardBlockRootHash32) > 0 { + if len(m.CrosslinkDataRootHash32) > 0 { dAtA[i] = 0x2a i++ - i = encodeVarintTypes(dAtA, i, uint64(len(m.ShardBlockRootHash32))) - i += copy(dAtA[i:], m.ShardBlockRootHash32) + i = encodeVarintTypes(dAtA, i, uint64(len(m.CrosslinkDataRootHash32))) + i += copy(dAtA[i:], m.CrosslinkDataRootHash32) } if m.LatestCrosslink != nil { dAtA[i] = 0x32 @@ -2336,11 +2336,11 @@ func (m *Crosslink) MarshalTo(dAtA []byte) (int, error) { i++ i = encodeVarintTypes(dAtA, i, uint64(m.Epoch)) } - if len(m.ShardBlockRootHash32) > 0 { + if len(m.CrosslinkDataRootHash32) > 0 { dAtA[i] = 0x12 i++ - i = encodeVarintTypes(dAtA, i, uint64(len(m.ShardBlockRootHash32))) - i += copy(dAtA[i:], m.ShardBlockRootHash32) + i = encodeVarintTypes(dAtA, i, uint64(len(m.CrosslinkDataRootHash32))) + i += copy(dAtA[i:], m.CrosslinkDataRootHash32) } if m.XXX_unrecognized != nil { i += copy(dAtA[i:], m.XXX_unrecognized) @@ -3149,7 +3149,7 @@ func (m *AttestationData) Size() (n int) { if l > 0 { n += 1 + l + sovTypes(uint64(l)) } - l = len(m.ShardBlockRootHash32) + l = len(m.CrosslinkDataRootHash32) if l > 0 { n += 1 + l + sovTypes(uint64(l)) } @@ -3254,7 +3254,7 @@ func (m *Crosslink) Size() (n int) { if m.Epoch != 0 { n += 1 + sovTypes(uint64(m.Epoch)) } - l = len(m.ShardBlockRootHash32) + l = len(m.CrosslinkDataRootHash32) if l > 0 { n += 1 + l + sovTypes(uint64(l)) } @@ -4949,7 +4949,7 @@ func (m *AttestationData) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ShardBlockRootHash32", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CrosslinkDataRootHash32", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -4973,9 +4973,9 @@ func (m *AttestationData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ShardBlockRootHash32 = append(m.ShardBlockRootHash32[:0], dAtA[iNdEx:postIndex]...) - if m.ShardBlockRootHash32 == nil { - m.ShardBlockRootHash32 = []byte{} + m.CrosslinkDataRootHash32 = append(m.CrosslinkDataRootHash32[:0], dAtA[iNdEx:postIndex]...) + if m.CrosslinkDataRootHash32 == nil { + m.CrosslinkDataRootHash32 = []byte{} } iNdEx = postIndex case 6: @@ -5553,7 +5553,7 @@ func (m *Crosslink) Unmarshal(dAtA []byte) error { } case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ShardBlockRootHash32", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CrosslinkDataRootHash32", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -5577,9 +5577,9 @@ func (m *Crosslink) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ShardBlockRootHash32 = append(m.ShardBlockRootHash32[:0], dAtA[iNdEx:postIndex]...) - if m.ShardBlockRootHash32 == nil { - m.ShardBlockRootHash32 = []byte{} + m.CrosslinkDataRootHash32 = append(m.CrosslinkDataRootHash32[:0], dAtA[iNdEx:postIndex]...) + if m.CrosslinkDataRootHash32 == nil { + m.CrosslinkDataRootHash32 = []byte{} } iNdEx = postIndex default: @@ -7562,131 +7562,131 @@ var ( ) func init() { - proto.RegisterFile("proto/beacon/p2p/v1/types.proto", fileDescriptor_types_0317e0784c4aa0b4) + proto.RegisterFile("proto/beacon/p2p/v1/types.proto", fileDescriptor_types_8a9af0146f22ddb5) } -var fileDescriptor_types_0317e0784c4aa0b4 = []byte{ +var fileDescriptor_types_8a9af0146f22ddb5 = []byte{ // 1938 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x49, 0x8f, 0x23, 0x49, - 0x15, 0x26, 0xed, 0x5a, 0x9f, 0xb3, 0xca, 0xae, 0xa8, 0xc5, 0x49, 0x6f, 0x55, 0x9d, 0x3d, 0xa3, - 0xae, 0x6e, 0x66, 0x5c, 0xd8, 0x23, 0x68, 0x41, 0x33, 0x12, 0xe5, 0xae, 0x1a, 0xa6, 0xa0, 0x67, - 0xa6, 0x95, 0x2e, 0xba, 0xe7, 0x00, 0x4a, 0x85, 0x9d, 0x61, 0x3b, 0xbb, 0xd2, 0x19, 0xa9, 0x8c, - 0xb0, 0xa7, 0x0b, 0xf1, 0x07, 0x58, 0xc4, 0x8d, 0x03, 0x1c, 0x90, 0xe0, 0x5f, 0xb0, 0x9f, 0x90, - 0x38, 0xb2, 0x09, 0x09, 0x09, 0x21, 0xd4, 0x67, 0xf6, 0x2b, 0x17, 0x94, 0x11, 0x91, 0x8b, 0xd3, - 0xce, 0xaa, 0x6e, 0x86, 0x0b, 0x27, 0x2b, 0xdf, 0xfb, 0xde, 0x8b, 0xf7, 0x5e, 0xbc, 0x2d, 0x0c, - 0xbb, 0x41, 0x48, 0x39, 0x3d, 0xe8, 0x12, 0xdc, 0xa3, 0xfe, 0x41, 0xd0, 0x0a, 0x0e, 0x26, 0xcd, - 0x03, 0x7e, 0x1e, 0x10, 0xd6, 0x10, 0x1c, 0xb4, 0x43, 0xf8, 0x90, 0x84, 0x64, 0x3c, 0x6a, 0x48, - 0x4c, 0x23, 0x68, 0x05, 0x8d, 0x49, 0xf3, 0xca, 0x55, 0x29, 0xd8, 0xa3, 0xa3, 0x11, 0xf5, 0x0f, - 0x46, 0x84, 0x31, 0x3c, 0x88, 0x85, 0xcc, 0x7f, 0x57, 0xa0, 0xd2, 0x16, 0xf0, 0x0e, 0xc7, 0x9c, - 0xa0, 0x47, 0x80, 0x26, 0xd8, 0x73, 0x1d, 0xcc, 0x69, 0x68, 0x87, 0x64, 0xe0, 0x32, 0x1e, 0x9e, - 0x1b, 0xda, 0x5e, 0x79, 0xbf, 0xd2, 0xba, 0xd9, 0x98, 0x7f, 0x42, 0xe3, 0x71, 0x2c, 0x61, 0x6d, - 0x24, 0xc2, 0x96, 0x92, 0x45, 0xc7, 0xb0, 0x3b, 0xab, 0xd1, 0x1e, 0x07, 0x0e, 0xe6, 0xc4, 0x26, - 0x01, 0xed, 0x0d, 0x8d, 0xd2, 0x9e, 0xb6, 0xbf, 0x60, 0x5d, 0x9b, 0x91, 0xfd, 0xa2, 0x00, 0x1d, - 0x47, 0x18, 0xf4, 0x7a, 0xd6, 0xb0, 0x2e, 0xf6, 0xb0, 0xdf, 0x23, 0xcc, 0x28, 0xef, 0x95, 0xf7, - 0x17, 0x32, 0xa7, 0xb6, 0x15, 0x03, 0x1d, 0xc0, 0xa6, 0x87, 0x39, 0x61, 0xdc, 0x0e, 0xb1, 0xef, - 0x60, 0x6a, 0x8f, 0xdc, 0x67, 0x84, 0x19, 0x7f, 0x59, 0xde, 0x2b, 0xef, 0xeb, 0xd6, 0x86, 0xe4, - 0x59, 0x82, 0xf5, 0x4e, 0xc4, 0x41, 0x47, 0x70, 0x23, 0x08, 0xc9, 0xc4, 0xa5, 0x63, 0x66, 0xb3, - 0xe1, 0xb8, 0xdf, 0xf7, 0x5c, 0x7f, 0x60, 0x33, 0x8e, 0x43, 0x6e, 0xb3, 0x21, 0x0e, 0x1d, 0xe3, - 0xaf, 0xcb, 0xc2, 0xcc, 0xab, 0x31, 0xac, 0x13, 0xa3, 0x3a, 0x11, 0xa8, 0x13, 0x61, 0x50, 0x1b, - 0xae, 0xf7, 0xc6, 0x61, 0x48, 0x7c, 0x5e, 0xa0, 0xe4, 0x6f, 0x52, 0xc9, 0x15, 0x85, 0x9a, 0xa7, - 0xe3, 0x53, 0x60, 0xcc, 0xb1, 0x44, 0x46, 0xea, 0xef, 0x52, 0x7c, 0x67, 0xc6, 0x06, 0x19, 0xa4, - 0x7b, 0x50, 0x9f, 0x3d, 0x5e, 0x4a, 0xfe, 0x43, 0x4a, 0x6e, 0xe7, 0x0f, 0x96, 0x82, 0x05, 0xde, - 0x13, 0xe2, 0xd8, 0x43, 0xcc, 0x86, 0x6f, 0xb4, 0x8c, 0x7f, 0x46, 0xf2, 0xfa, 0x3c, 0xef, 0x09, - 0x71, 0xde, 0x16, 0x98, 0x02, 0xef, 0x33, 0x4a, 0xfe, 0x25, 0x95, 0xcc, 0x7a, 0x9f, 0xea, 0xc8, - 0x7a, 0xff, 0x74, 0xcc, 0xb8, 0xdb, 0x77, 0x89, 0xa3, 0x7c, 0xf8, 0x75, 0x75, 0xda, 0xfb, 0xcf, - 0xc7, 0x7c, 0xe9, 0xc4, 0x3e, 0x54, 0xf3, 0x12, 0xbf, 0x91, 0x12, 0xeb, 0x4f, 0xa7, 0x91, 0x9f, - 0x84, 0x1d, 0x45, 0xe9, 0x61, 0xee, 0x52, 0xdf, 0xee, 0xba, 0xbc, 0xef, 0x12, 0xcf, 0x31, 0x7e, - 0x2b, 0x05, 0xb6, 0xa7, 0xd8, 0x6d, 0xc5, 0x8d, 0x4e, 0xe8, 0xbb, 0x3e, 0xf6, 0xdc, 0xaf, 0x24, - 0x27, 0xfc, 0x4e, 0x9d, 0x90, 0xd0, 0xe5, 0x09, 0xef, 0x81, 0xca, 0x31, 0xbb, 0x17, 0x52, 0xc6, - 0x3c, 0xd7, 0x3f, 0x63, 0xc6, 0x0f, 0xeb, 0x17, 0xd7, 0xd1, 0x83, 0x18, 0x6a, 0xd5, 0xa4, 0x70, - 0x42, 0x60, 0xe8, 0xd3, 0xf0, 0x51, 0xa5, 0xb0, 0xeb, 0xd1, 0xde, 0x99, 0x1d, 0x52, 0xca, 0x55, - 0x58, 0x99, 0xf1, 0xe3, 0xba, 0x48, 0xeb, 0x1d, 0x89, 0x68, 0x47, 0x00, 0x8b, 0x52, 0x2e, 0x43, - 0xca, 0xd0, 0x67, 0xe0, 0x4a, 0x17, 0xf3, 0xde, 0x90, 0x38, 0xf3, 0x84, 0x7f, 0x22, 0x85, 0xeb, - 0x0a, 0x32, 0x23, 0x7d, 0x0f, 0xea, 0xea, 0x64, 0xe6, 0x61, 0x26, 0x94, 0xc4, 0xe5, 0xf7, 0xd3, - 0xba, 0xa8, 0xbf, 0x6d, 0xc9, 0xef, 0x48, 0x76, 0x52, 0x83, 0x5f, 0x4a, 0x6a, 0x10, 0xf3, 0xe8, - 0x47, 0xc4, 0x92, 0x19, 0x3f, 0x93, 0x51, 0xb8, 0x5b, 0x14, 0x85, 0x47, 0xc4, 0x77, 0x5c, 0x7f, - 0x70, 0x98, 0xca, 0x58, 0x48, 0xea, 0xc9, 0x90, 0xb2, 0x01, 0x71, 0x7d, 0x87, 0x3c, 0x9b, 0xf6, - 0xe9, 0xe7, 0x53, 0x01, 0x39, 0x89, 0x00, 0x59, 0x97, 0xbe, 0x00, 0x2a, 0xc0, 0x36, 0xe1, 0xc3, - 0xa6, 0xed, 0x60, 0x8e, 0x8d, 0xef, 0xef, 0xee, 0x69, 0xfb, 0x95, 0xd6, 0x5e, 0x91, 0x59, 0xc7, - 0x7c, 0xd8, 0x3c, 0xc2, 0x1c, 0x5b, 0xeb, 0x52, 0x34, 0xfe, 0x46, 0xef, 0x40, 0x35, 0xd1, 0x62, - 0x4f, 0x28, 0x27, 0xcc, 0xf8, 0xc1, 0xae, 0x70, 0xf1, 0x95, 0xcb, 0x74, 0x3d, 0xa6, 0x9c, 0x58, - 0x6b, 0x24, 0xf3, 0xc5, 0x90, 0x09, 0xfa, 0x80, 0xf8, 0x84, 0xb9, 0xcc, 0xe6, 0xee, 0x88, 0x18, - 0x5f, 0xbb, 0x2d, 0x12, 0xac, 0xa2, 0x88, 0xa7, 0xee, 0x88, 0xa0, 0x26, 0x2c, 0xf4, 0x69, 0x78, - 0x66, 0x7c, 0xfd, 0xb6, 0xb0, 0xf9, 0x5a, 0xd1, 0x39, 0x6f, 0xd1, 0xf0, 0xcc, 0x12, 0x50, 0xb4, - 0x09, 0x0b, 0xcc, 0xa3, 0xdc, 0xf8, 0x86, 0x54, 0x27, 0x3e, 0xcc, 0x00, 0x16, 0x22, 0x08, 0xba, - 0x03, 0xb5, 0xa4, 0xe8, 0x26, 0x24, 0x64, 0x2e, 0xf5, 0x0d, 0x4d, 0xe0, 0xaa, 0x31, 0xfd, 0xb1, - 0x24, 0xa3, 0xdb, 0x50, 0x8d, 0x6b, 0x3c, 0x46, 0xca, 0xf6, 0xbd, 0xae, 0xc8, 0x31, 0x70, 0x0b, - 0x16, 0x65, 0x85, 0x94, 0x05, 0x5b, 0x7e, 0x98, 0xbf, 0xd7, 0x00, 0xcd, 0x5e, 0x30, 0xba, 0x0f, - 0x0b, 0xe2, 0x12, 0x34, 0xe1, 0xcf, 0xed, 0x22, 0x7f, 0x32, 0x22, 0xe2, 0x2a, 0x84, 0x10, 0x6a, - 0xc2, 0x16, 0x1e, 0x0c, 0x42, 0x32, 0xc8, 0xd5, 0x72, 0x49, 0x34, 0x9b, 0xcd, 0x0c, 0x2f, 0x29, - 0xe4, 0x3b, 0x50, 0xeb, 0x8d, 0x19, 0xa7, 0xce, 0x79, 0x0a, 0x2f, 0x0b, 0x78, 0x55, 0xd1, 0x13, - 0xe8, 0xab, 0xb0, 0xee, 0xfa, 0x3d, 0x6f, 0x1c, 0x39, 0x65, 0x8b, 0x10, 0x2e, 0x08, 0x87, 0xd6, - 0x12, 0x6a, 0x27, 0x0a, 0xe5, 0x1f, 0x34, 0xa8, 0xfc, 0x9f, 0x78, 0x74, 0x00, 0x89, 0x06, 0x62, - 0x33, 0x77, 0xe0, 0x63, 0x3e, 0x0e, 0x89, 0x70, 0x4b, 0xb7, 0x50, 0xc2, 0xea, 0xc4, 0x1c, 0xf3, - 0x7b, 0x65, 0xa8, 0xe6, 0x0c, 0x45, 0x48, 0xe5, 0x93, 0x96, 0xa6, 0x53, 0x74, 0xe5, 0x72, 0xca, - 0xc9, 0x8c, 0x90, 0x1f, 0xe8, 0x1e, 0x18, 0xd2, 0xe7, 0xd9, 0xe6, 0xa3, 0x2c, 0xdc, 0x96, 0xfc, - 0x5c, 0xe7, 0x41, 0xf7, 0xe1, 0x8a, 0x48, 0x1a, 0xbb, 0x4b, 0xc7, 0xbe, 0x83, 0xc3, 0xf3, 0x29, - 0x51, 0x69, 0x6e, 0x5d, 0x20, 0xda, 0x0a, 0x90, 0x11, 0xfe, 0x04, 0xd4, 0xc5, 0xf1, 0x73, 0x0e, - 0x5d, 0x14, 0x92, 0x5b, 0x82, 0x9d, 0x3f, 0xf3, 0x61, 0xd2, 0x19, 0x92, 0xbe, 0x6d, 0x2c, 0x89, - 0x2b, 0x7c, 0x81, 0xae, 0x5d, 0xcd, 0x75, 0xed, 0xa8, 0x58, 0xf2, 0x13, 0x69, 0x79, 0xee, 0x40, - 0x7a, 0x13, 0xae, 0xa6, 0xc0, 0x59, 0x8b, 0x57, 0x84, 0xc5, 0x46, 0x02, 0xc9, 0x59, 0x6d, 0x7e, - 0x15, 0xae, 0xe5, 0xee, 0xe7, 0xd0, 0x77, 0x1e, 0x24, 0xd7, 0xfe, 0xe1, 0x92, 0x71, 0x17, 0x2a, - 0x99, 0xcc, 0x12, 0x77, 0xbb, 0x62, 0x41, 0x9a, 0x54, 0xe6, 0xb7, 0xcb, 0xb0, 0x9a, 0xac, 0x80, - 0x68, 0x07, 0x96, 0x82, 0x71, 0xf7, 0x8c, 0x9c, 0x8b, 0xd3, 0x74, 0x4b, 0x7d, 0x45, 0xcb, 0xc1, - 0x07, 0x2e, 0x1f, 0x3a, 0x21, 0xfe, 0x00, 0x7b, 0x76, 0x2f, 0x24, 0x0e, 0xf1, 0xb9, 0x8b, 0x3d, - 0x16, 0x3b, 0x29, 0x93, 0xfb, 0x6a, 0x0a, 0x7a, 0x90, 0x62, 0xd4, 0xed, 0xdc, 0x81, 0x1a, 0xee, - 0x71, 0x77, 0x22, 0xcb, 0x42, 0x06, 0x74, 0x51, 0xf6, 0xa9, 0x94, 0x2e, 0x23, 0x7a, 0x1d, 0x80, - 0x3c, 0x73, 0xb9, 0x02, 0x2d, 0x09, 0xd0, 0x6a, 0x44, 0x91, 0xec, 0x3b, 0x50, 0xcb, 0x58, 0x93, - 0xbd, 0x9a, 0x6a, 0x4a, 0x97, 0xd0, 0x5b, 0xb0, 0x16, 0x0f, 0x3e, 0x89, 0x5b, 0x11, 0x38, 0x5d, - 0x11, 0x25, 0xe8, 0x11, 0xe8, 0x51, 0xe4, 0xc6, 0xcc, 0xee, 0x7b, 0x78, 0xc0, 0x0c, 0xd8, 0xd3, - 0xf6, 0xd7, 0x5b, 0xaf, 0x5f, 0xba, 0x31, 0x37, 0x3a, 0x42, 0xea, 0xad, 0x48, 0xc8, 0xaa, 0xb0, - 0xf4, 0xc3, 0xfc, 0x2c, 0x54, 0x32, 0x3c, 0x54, 0x81, 0xe5, 0x93, 0x77, 0x4f, 0x4e, 0x4f, 0x0e, - 0x1f, 0xd6, 0x3e, 0x82, 0x10, 0xac, 0xcb, 0x8f, 0xd3, 0xe3, 0x23, 0xfb, 0xf8, 0xfd, 0x93, 0xd3, - 0x9a, 0x86, 0x6a, 0xa0, 0x3f, 0x39, 0x39, 0x7d, 0xfb, 0xc8, 0x3a, 0x7c, 0x72, 0xd8, 0x7e, 0x78, - 0x5c, 0x2b, 0x99, 0x1e, 0xd4, 0xc5, 0x46, 0x69, 0x11, 0xcc, 0xa2, 0x32, 0x1f, 0x11, 0x9f, 0x5b, - 0xa4, 0x47, 0x43, 0x27, 0x4a, 0xcc, 0x74, 0x9b, 0x16, 0xf3, 0x53, 0x15, 0xf2, 0x7a, 0x42, 0x16, - 0x43, 0xb3, 0xa0, 0xa4, 0xe3, 0xe2, 0x2f, 0x67, 0x66, 0xc9, 0xfb, 0xb0, 0x9a, 0x26, 0x7e, 0xd2, - 0xfc, 0xb5, 0x4c, 0xf3, 0xbf, 0xa8, 0x26, 0x4b, 0xc5, 0x35, 0x69, 0xfe, 0xa8, 0x14, 0xbf, 0x51, - 0x04, 0x67, 0x6e, 0xeb, 0x79, 0x0d, 0x50, 0x80, 0xc5, 0x54, 0x9a, 0xd5, 0x5a, 0x93, 0x9c, 0x4c, - 0x95, 0xdf, 0x85, 0x8d, 0x28, 0xd4, 0x64, 0x4e, 0x2f, 0xaa, 0x0a, 0x46, 0x06, 0x7b, 0x0b, 0xd6, - 0xd4, 0x13, 0x22, 0x24, 0x13, 0x82, 0x3d, 0xd5, 0x78, 0x74, 0x49, 0xb4, 0x04, 0x0d, 0xbd, 0x09, - 0xab, 0xe9, 0x26, 0xb1, 0xf8, 0x82, 0x8b, 0xc4, 0x4a, 0x3c, 0xf8, 0xd1, 0x35, 0x58, 0x4d, 0xfb, - 0xf0, 0x92, 0xd0, 0x9f, 0x12, 0xa2, 0xea, 0xed, 0x52, 0xe7, 0x5c, 0xe4, 0xe7, 0x05, 0xd5, 0x9b, - 0x09, 0x51, 0x9b, 0x3a, 0xe7, 0x96, 0x10, 0x32, 0xbf, 0x53, 0x86, 0x6a, 0x8e, 0x83, 0x3e, 0x07, - 0xfa, 0xd4, 0x46, 0x26, 0x9f, 0x77, 0xb7, 0x5e, 0xa0, 0x2d, 0x58, 0x53, 0x82, 0xe8, 0x09, 0xa0, - 0x20, 0xa4, 0x01, 0x65, 0x24, 0x94, 0xcb, 0xa1, 0xeb, 0x0f, 0x98, 0x51, 0x12, 0xea, 0xf6, 0x0b, - 0xf7, 0x3b, 0x25, 0xd1, 0x51, 0x02, 0xd6, 0x46, 0x90, 0xa3, 0x08, 0xc5, 0xf2, 0xa0, 0x29, 0xc5, - 0xe5, 0x8b, 0x15, 0x1f, 0x2a, 0x89, 0x54, 0x31, 0xce, 0x51, 0x18, 0xba, 0x0f, 0x2b, 0x0e, 0x09, - 0x28, 0x73, 0x39, 0x33, 0x16, 0x84, 0xba, 0xdd, 0x22, 0x75, 0x47, 0x12, 0x67, 0x25, 0x02, 0xe8, - 0x5d, 0xa8, 0x4e, 0xa8, 0x37, 0xf6, 0x79, 0x34, 0x8b, 0xa2, 0x5e, 0xc2, 0x8c, 0x45, 0xa1, 0xe3, - 0xd5, 0xc2, 0x3a, 0x8f, 0xe1, 0xc7, 0xcf, 0x5c, 0x6e, 0xad, 0x4f, 0xb2, 0x9f, 0xcc, 0xfc, 0xae, - 0x06, 0xba, 0x3a, 0xe5, 0xc4, 0x0f, 0xc6, 0xbc, 0xb0, 0x77, 0x36, 0x60, 0x33, 0x08, 0x29, 0xed, - 0xdb, 0xb4, 0x6f, 0x07, 0x94, 0x31, 0xc2, 0x92, 0xc5, 0x4b, 0x17, 0xe1, 0xa3, 0xfd, 0xf7, 0xfa, - 0x8f, 0x12, 0xc6, 0xe5, 0xbd, 0xb6, 0x7c, 0x69, 0xaf, 0x35, 0x9f, 0x02, 0x92, 0x37, 0x85, 0xbd, - 0x68, 0x13, 0x20, 0xce, 0x4b, 0x8e, 0xfd, 0xbb, 0xb0, 0x51, 0x34, 0xef, 0xab, 0xdd, 0x5c, 0x85, - 0xff, 0x51, 0x83, 0x2d, 0x71, 0x47, 0xb8, 0xeb, 0x91, 0xec, 0x16, 0xf5, 0x31, 0xd8, 0x98, 0xea, - 0x53, 0x6e, 0xf4, 0xea, 0xd0, 0xc4, 0xa3, 0xa3, 0x96, 0xed, 0x54, 0x11, 0x7d, 0xee, 0x0a, 0x54, - 0x9a, 0xbf, 0x02, 0xc5, 0x03, 0xb1, 0xfc, 0xdf, 0x0c, 0xc4, 0x97, 0xde, 0x9f, 0xbe, 0xa5, 0x41, - 0x45, 0xdd, 0xb3, 0x08, 0xe2, 0x09, 0xac, 0xa9, 0x9c, 0xb2, 0xdd, 0xe8, 0xde, 0xd5, 0x5c, 0x7e, - 0xe5, 0x92, 0x4c, 0x14, 0x39, 0x62, 0xe9, 0x4e, 0x2e, 0x63, 0xf0, 0x88, 0x8e, 0x7d, 0xae, 0x82, - 0xaf, 0xbe, 0xa2, 0x8e, 0x12, 0xbd, 0x1e, 0x18, 0xc7, 0xa3, 0x40, 0xb5, 0xe9, 0x94, 0x60, 0xfe, - 0xa2, 0x04, 0xb5, 0x7c, 0x19, 0x46, 0x8b, 0x6e, 0x52, 0xcc, 0xd9, 0x91, 0xb0, 0x16, 0x53, 0xe5, - 0x44, 0xb0, 0xa0, 0x1a, 0xa8, 0xbc, 0x90, 0x4f, 0x9e, 0xa6, 0x38, 0xfa, 0xa2, 0x07, 0xdd, 0x4c, - 0x1a, 0xc5, 0x3a, 0xb1, 0x17, 0x7d, 0x35, 0xd1, 0xc7, 0x61, 0x2b, 0xd1, 0x99, 0x04, 0xd4, 0x6e, - 0xaa, 0x74, 0x41, 0x41, 0x46, 0x81, 0x60, 0x35, 0x67, 0xad, 0x90, 0x0b, 0xe1, 0x87, 0xb0, 0xa2, - 0x55, 0x60, 0x45, 0xbc, 0x2f, 0xce, 0x5a, 0xd1, 0x32, 0xff, 0xa4, 0x41, 0x2d, 0xdf, 0x75, 0x90, - 0x03, 0x75, 0x16, 0xe7, 0x72, 0xf6, 0xe5, 0x6b, 0x37, 0xd5, 0x3d, 0xbf, 0x56, 0x64, 0xe2, 0xbc, - 0x12, 0xb0, 0xb6, 0xd9, 0x1c, 0x6a, 0xb3, 0xf8, 0x94, 0x96, 0xba, 0x8e, 0xff, 0xc1, 0x29, 0x2d, - 0xf3, 0x9b, 0x1a, 0x2c, 0xab, 0xec, 0x43, 0x2d, 0xd8, 0x1e, 0x91, 0xf0, 0xcc, 0x23, 0x76, 0x37, - 0xc4, 0x7e, 0x6f, 0x98, 0x3c, 0xb6, 0x35, 0xf1, 0xd6, 0xde, 0x94, 0xcc, 0xb6, 0xe0, 0xc5, 0x0f, - 0xed, 0xbb, 0xb0, 0xa1, 0x64, 0x78, 0x48, 0x88, 0x4a, 0x2b, 0x99, 0xa9, 0x55, 0xc9, 0x38, 0x0d, - 0x09, 0x91, 0x89, 0x75, 0x13, 0xe2, 0xd4, 0xb6, 0x93, 0xda, 0xd4, 0xad, 0x8a, 0x93, 0x16, 0x8e, - 0xe9, 0xc1, 0xda, 0x54, 0x47, 0x2d, 0xd8, 0x33, 0xe6, 0x6c, 0x37, 0xa5, 0xb9, 0xdb, 0xcd, 0xd4, - 0xdc, 0x2d, 0xe7, 0xe6, 0xae, 0xf9, 0x65, 0x58, 0x49, 0x1e, 0xf9, 0x0d, 0xd8, 0x8c, 0x8d, 0xcb, - 0xf6, 0x33, 0xd9, 0xa6, 0x37, 0x14, 0x2b, 0xb3, 0x35, 0xdc, 0x04, 0x5d, 0x76, 0xbf, 0xa9, 0x4d, - 0xa4, 0x22, 0x68, 0xaa, 0xe9, 0x79, 0xa0, 0x67, 0xff, 0x07, 0x98, 0xde, 0x21, 0xb4, 0x97, 0xde, - 0x21, 0xae, 0x03, 0x4c, 0x28, 0x27, 0x76, 0x2f, 0xd3, 0x0d, 0x56, 0x23, 0xca, 0x83, 0x88, 0xd0, - 0xd6, 0x7f, 0xf9, 0xfc, 0x86, 0xf6, 0xab, 0xe7, 0x37, 0xb4, 0x3f, 0x3f, 0xbf, 0xa1, 0x75, 0x97, - 0xc4, 0xbf, 0xbf, 0x6f, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff, 0x8d, 0xb3, 0x99, 0x07, 0x55, 0x16, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcb, 0x6f, 0x23, 0x49, + 0x19, 0xa7, 0xed, 0x3c, 0x3f, 0x3b, 0xb1, 0x53, 0x99, 0xc4, 0xcd, 0xbc, 0x92, 0xe9, 0xd9, 0xd5, + 0x64, 0x86, 0x5d, 0x07, 0x7b, 0x25, 0x46, 0x30, 0xac, 0x44, 0x3c, 0xc9, 0xb2, 0x81, 0xd9, 0xdd, + 0x51, 0x3b, 0xcc, 0x70, 0x00, 0x5a, 0x65, 0x77, 0xd9, 0xee, 0x49, 0xbb, 0xab, 0xd5, 0x55, 0xf6, + 0x26, 0x88, 0x7f, 0x80, 0x87, 0xb8, 0x71, 0x80, 0x1b, 0x88, 0x7f, 0x82, 0xf7, 0x09, 0x89, 0x23, + 0x2f, 0x21, 0x21, 0x21, 0x84, 0xe6, 0xcc, 0xfb, 0xca, 0x05, 0xd5, 0xa3, 0x1f, 0x7e, 0x74, 0x32, + 0xc3, 0x72, 0xd9, 0x93, 0xd5, 0xdf, 0xf7, 0xfb, 0x7d, 0x55, 0xf5, 0xd5, 0xf7, 0x2a, 0xc3, 0x4e, + 0x18, 0x51, 0x4e, 0xf7, 0x3b, 0x04, 0x77, 0x69, 0xb0, 0x1f, 0x36, 0xc3, 0xfd, 0x71, 0x63, 0x9f, + 0x9f, 0x87, 0x84, 0xd5, 0xa5, 0x06, 0x6d, 0x13, 0x3e, 0x20, 0x11, 0x19, 0x0d, 0xeb, 0x0a, 0x53, + 0x0f, 0x9b, 0x61, 0x7d, 0xdc, 0xb8, 0x7a, 0x4d, 0x11, 0xbb, 0x74, 0x38, 0xa4, 0xc1, 0xfe, 0x90, + 0x30, 0x86, 0xfb, 0x31, 0xc9, 0xfa, 0x4f, 0x09, 0x4a, 0x2d, 0x09, 0x6f, 0x73, 0xcc, 0x09, 0x7a, + 0x0c, 0x68, 0x8c, 0x7d, 0xcf, 0xc5, 0x9c, 0x46, 0x4e, 0x44, 0xfa, 0x1e, 0xe3, 0xd1, 0xb9, 0x69, + 0xec, 0x16, 0xf7, 0x4a, 0xcd, 0x5b, 0xf5, 0xf9, 0x2b, 0xd4, 0x9f, 0xc4, 0x0c, 0x7b, 0x23, 0x21, + 0xdb, 0x9a, 0x8b, 0x8e, 0x60, 0x67, 0xd6, 0xa2, 0x33, 0x0a, 0x5d, 0xcc, 0x89, 0x43, 0x42, 0xda, + 0x1d, 0x98, 0x85, 0x5d, 0x63, 0x6f, 0xc1, 0xbe, 0x3e, 0xc3, 0xfd, 0x82, 0x04, 0x1d, 0x09, 0x0c, + 0x7a, 0x3d, 0xbb, 0xb1, 0x0e, 0xf6, 0x71, 0xd0, 0x25, 0xcc, 0x2c, 0xee, 0x16, 0xf7, 0x16, 0x32, + 0xab, 0xb6, 0xb4, 0x02, 0xed, 0xc3, 0xa6, 0x8f, 0x39, 0x61, 0xdc, 0x89, 0x70, 0xe0, 0x62, 0xea, + 0x0c, 0xbd, 0x33, 0xc2, 0xcc, 0xbf, 0x2e, 0xef, 0x16, 0xf7, 0xca, 0xf6, 0x86, 0xd2, 0xd9, 0x52, + 0xf5, 0x8e, 0xd0, 0xa0, 0x43, 0xb8, 0x19, 0x46, 0x64, 0xec, 0xd1, 0x11, 0x73, 0xd8, 0x60, 0xd4, + 0xeb, 0xf9, 0x5e, 0xd0, 0x77, 0x18, 0xc7, 0x11, 0x77, 0xd8, 0x00, 0x47, 0xae, 0xf9, 0xb7, 0x65, + 0xb9, 0xcd, 0x6b, 0x31, 0xac, 0x1d, 0xa3, 0xda, 0x02, 0xd4, 0x16, 0x18, 0xd4, 0x82, 0x1b, 0xdd, + 0x51, 0x14, 0x91, 0x80, 0xe7, 0x18, 0xf9, 0xbb, 0x32, 0x72, 0x55, 0xa3, 0xe6, 0xd9, 0xf8, 0x24, + 0x98, 0x73, 0x76, 0xa2, 0x3c, 0xf5, 0x0f, 0x45, 0xdf, 0x9e, 0xd9, 0x83, 0x72, 0xd2, 0x7d, 0xa8, + 0xcd, 0x2e, 0xaf, 0x98, 0xff, 0x54, 0xcc, 0xad, 0xe9, 0x85, 0x15, 0x31, 0xe7, 0xf4, 0x84, 0xb8, + 0xce, 0x00, 0xb3, 0xc1, 0x1b, 0x4d, 0xf3, 0x5f, 0x82, 0x5f, 0x9e, 0x77, 0x7a, 0x42, 0xdc, 0xb7, + 0x25, 0x26, 0xe7, 0xf4, 0x19, 0x23, 0xff, 0x56, 0x46, 0x66, 0x4f, 0x9f, 0xda, 0xc8, 0x9e, 0xfe, + 0xd9, 0x88, 0x71, 0xaf, 0xe7, 0x11, 0x57, 0x9f, 0xe1, 0x37, 0x95, 0xc9, 0xd3, 0x7f, 0x2e, 0xd6, + 0xab, 0x43, 0xec, 0x41, 0x65, 0x9a, 0xf1, 0x5b, 0xc5, 0x58, 0x7f, 0x36, 0x89, 0xfc, 0x04, 0x6c, + 0x6b, 0x49, 0x17, 0x73, 0x8f, 0x06, 0x4e, 0xc7, 0xe3, 0x3d, 0x8f, 0xf8, 0xae, 0xf9, 0x3b, 0x45, + 0xd8, 0x9a, 0x50, 0xb7, 0xb4, 0x56, 0xac, 0xd0, 0xf3, 0x02, 0xec, 0x7b, 0x5f, 0x4d, 0x56, 0xf8, + 0xbd, 0x5e, 0x21, 0x91, 0xab, 0x15, 0xde, 0x03, 0x1d, 0x63, 0x4e, 0x37, 0xa2, 0x8c, 0xf9, 0x5e, + 0x70, 0xca, 0xcc, 0x1f, 0xd5, 0x2e, 0xce, 0xa3, 0x87, 0x31, 0xd4, 0xae, 0x2a, 0x72, 0x22, 0x60, + 0xe8, 0x53, 0xf0, 0x51, 0x6d, 0xb0, 0xe3, 0xd3, 0xee, 0xa9, 0x13, 0x51, 0xca, 0xb5, 0x5b, 0x99, + 0xf9, 0x93, 0x9a, 0x0c, 0xeb, 0x6d, 0x85, 0x68, 0x09, 0x80, 0x4d, 0x29, 0x57, 0x2e, 0x65, 0xe8, + 0xd3, 0x70, 0xb5, 0x83, 0x79, 0x77, 0x40, 0xdc, 0x79, 0xe4, 0x9f, 0x2a, 0x72, 0x4d, 0x43, 0x66, + 0xd8, 0xf7, 0xa1, 0xa6, 0x57, 0x66, 0x3e, 0x66, 0xd2, 0x48, 0x9c, 0x7e, 0x3f, 0xab, 0xc9, 0xfc, + 0xdb, 0x52, 0xfa, 0xb6, 0x52, 0x27, 0x39, 0xf8, 0xa5, 0x24, 0x07, 0x31, 0x17, 0x3f, 0xd2, 0x97, + 0xcc, 0xfc, 0xb9, 0xf2, 0xc2, 0xbd, 0x3c, 0x2f, 0x3c, 0x26, 0x81, 0xeb, 0x05, 0xfd, 0x83, 0x94, + 0x63, 0x23, 0x65, 0x27, 0x23, 0xca, 0x3a, 0xc4, 0x0b, 0x5c, 0x72, 0x36, 0x79, 0xa6, 0x5f, 0x4c, + 0x38, 0xe4, 0x58, 0x00, 0xb2, 0x47, 0xfa, 0x3c, 0x68, 0x07, 0x3b, 0x84, 0x0f, 0x1a, 0x8e, 0x8b, + 0x39, 0x36, 0xbf, 0xbf, 0xb3, 0x6b, 0xec, 0x95, 0x9a, 0xbb, 0x79, 0xdb, 0x3a, 0xe2, 0x83, 0xc6, + 0x21, 0xe6, 0xd8, 0x5e, 0x57, 0xd4, 0xf8, 0x1b, 0xbd, 0x03, 0x95, 0xc4, 0x8a, 0x33, 0xa6, 0x9c, + 0x30, 0xf3, 0x07, 0x3b, 0xf2, 0x88, 0xaf, 0x5c, 0x66, 0xeb, 0x09, 0xe5, 0xc4, 0x5e, 0x23, 0x99, + 0x2f, 0x86, 0x2c, 0x28, 0xf7, 0x49, 0x40, 0x98, 0xc7, 0x1c, 0xee, 0x0d, 0x89, 0xf9, 0xf5, 0x3b, + 0x32, 0xc0, 0x4a, 0x5a, 0x78, 0xe2, 0x0d, 0x09, 0x6a, 0xc0, 0x42, 0x8f, 0x46, 0xa7, 0xe6, 0x37, + 0xee, 0xc8, 0x3d, 0x5f, 0xcf, 0x5b, 0xe7, 0x2d, 0x1a, 0x9d, 0xda, 0x12, 0x8a, 0x36, 0x61, 0x81, + 0xf9, 0x94, 0x9b, 0xdf, 0x54, 0xe6, 0xe4, 0x87, 0x15, 0xc2, 0x82, 0x80, 0xa0, 0xbb, 0x50, 0x4d, + 0x92, 0x6e, 0x4c, 0x22, 0xe6, 0xd1, 0xc0, 0x34, 0x24, 0xae, 0x12, 0xcb, 0x9f, 0x28, 0x31, 0xba, + 0x03, 0x95, 0x38, 0xc7, 0x63, 0xa4, 0x2a, 0xdf, 0xeb, 0x5a, 0x1c, 0x03, 0xaf, 0xc0, 0xa2, 0xca, + 0x90, 0xa2, 0x54, 0xab, 0x0f, 0xeb, 0x0f, 0x06, 0xa0, 0xd9, 0x0b, 0x46, 0x0f, 0x60, 0x41, 0x5e, + 0x82, 0x21, 0xcf, 0x73, 0x27, 0xef, 0x3c, 0x19, 0x8a, 0xbc, 0x0a, 0x49, 0x42, 0x0d, 0xb8, 0x82, + 0xfb, 0xfd, 0x88, 0xf4, 0xa7, 0x72, 0xb9, 0x20, 0x8b, 0xcd, 0x66, 0x46, 0x97, 0x24, 0xf2, 0x5d, + 0xa8, 0x76, 0x47, 0x8c, 0x53, 0xf7, 0x3c, 0x85, 0x17, 0x25, 0xbc, 0xa2, 0xe5, 0x09, 0xf4, 0x55, + 0x58, 0xf7, 0x82, 0xae, 0x3f, 0x12, 0x87, 0x72, 0xa4, 0x0b, 0x17, 0xe4, 0x81, 0xd6, 0x12, 0x69, + 0x5b, 0xb8, 0xf2, 0x8f, 0x06, 0x94, 0x3e, 0x24, 0x27, 0xda, 0x87, 0xc4, 0x02, 0x71, 0x98, 0xd7, + 0x0f, 0x30, 0x1f, 0x45, 0x44, 0x1e, 0xab, 0x6c, 0xa3, 0x44, 0xd5, 0x8e, 0x35, 0xd6, 0x0f, 0x8b, + 0x50, 0x99, 0xda, 0x28, 0x42, 0x3a, 0x9e, 0x8c, 0x34, 0x9c, 0xc4, 0x95, 0xab, 0x2e, 0xa7, 0x22, + 0x42, 0x7d, 0xa0, 0xfb, 0x60, 0xaa, 0x33, 0xcf, 0x16, 0x1f, 0xbd, 0xc3, 0x2d, 0xa5, 0x9f, 0xaa, + 0x3c, 0xe8, 0x01, 0x5c, 0x95, 0x41, 0xe3, 0x74, 0xe8, 0x28, 0x70, 0x71, 0x74, 0x3e, 0x41, 0x55, + 0xdb, 0xad, 0x49, 0x44, 0x4b, 0x03, 0x26, 0xc9, 0x49, 0xe5, 0x55, 0xa9, 0x99, 0x25, 0x2f, 0x2a, + 0x72, 0x82, 0x90, 0xbe, 0x4f, 0xc9, 0x8f, 0x92, 0xfa, 0x90, 0x20, 0xcc, 0x25, 0x79, 0x91, 0x2f, + 0x50, 0xbb, 0x2b, 0x53, 0xb5, 0x5b, 0xa4, 0xcc, 0x74, 0x5f, 0x5a, 0x9e, 0xdb, 0x96, 0xde, 0x84, + 0x6b, 0x29, 0x70, 0xd6, 0x59, 0x2b, 0x72, 0xd3, 0x66, 0x02, 0x99, 0xf2, 0x97, 0xf5, 0x35, 0xb8, + 0x3e, 0x75, 0x4b, 0x07, 0x81, 0xfb, 0x30, 0xb9, 0xfc, 0x0f, 0x16, 0x92, 0x3b, 0x50, 0xca, 0xc4, + 0x97, 0xbc, 0xe1, 0x15, 0x1b, 0xd2, 0xd0, 0xb2, 0xbe, 0x53, 0x84, 0xd5, 0x64, 0x10, 0x44, 0xdb, + 0xb0, 0x14, 0x8e, 0x3a, 0xa7, 0xe4, 0x5c, 0xae, 0x56, 0xb6, 0xf5, 0x97, 0x18, 0x11, 0xde, 0xf7, + 0xf8, 0xc0, 0x8d, 0xf0, 0xfb, 0xd8, 0x77, 0xba, 0x11, 0x71, 0x49, 0xc0, 0x3d, 0xec, 0xb3, 0xf8, + 0x90, 0x2a, 0xc4, 0xaf, 0xa5, 0xa0, 0x87, 0x29, 0x46, 0xdf, 0xce, 0x5d, 0xa8, 0xe2, 0x2e, 0xf7, + 0xc6, 0x2a, 0x39, 0x94, 0x43, 0x17, 0x55, 0xb5, 0x4a, 0xe5, 0xca, 0xa3, 0x37, 0x00, 0xc8, 0x99, + 0xc7, 0x35, 0x68, 0x49, 0x82, 0x56, 0x85, 0x44, 0xa9, 0xef, 0x42, 0x35, 0xb3, 0x9b, 0xec, 0xd5, + 0x54, 0x52, 0xb9, 0x82, 0xde, 0x86, 0xb5, 0xb8, 0xfd, 0x29, 0xdc, 0x8a, 0xc4, 0x95, 0xb5, 0x50, + 0x81, 0x1e, 0x43, 0x59, 0x78, 0x6e, 0xc4, 0x9c, 0x9e, 0x8f, 0xfb, 0xcc, 0x84, 0x5d, 0x63, 0x6f, + 0xbd, 0xf9, 0xfa, 0xa5, 0x73, 0x73, 0xbd, 0x2d, 0x59, 0x6f, 0x09, 0x92, 0x5d, 0x62, 0xe9, 0x87, + 0xf5, 0x19, 0x28, 0x65, 0x74, 0xa8, 0x04, 0xcb, 0xc7, 0xef, 0x1e, 0x9f, 0x1c, 0x1f, 0x3c, 0xaa, + 0x7e, 0x04, 0x21, 0x58, 0x57, 0x1f, 0x27, 0x47, 0x87, 0xce, 0xd1, 0x17, 0x8f, 0x4f, 0xaa, 0x06, + 0xaa, 0x42, 0xf9, 0xe9, 0xf1, 0xc9, 0xdb, 0x87, 0xf6, 0xc1, 0xd3, 0x83, 0xd6, 0xa3, 0xa3, 0x6a, + 0xc1, 0xf2, 0xa1, 0x26, 0xe7, 0x4a, 0x9b, 0x60, 0x26, 0x92, 0x7d, 0x48, 0x02, 0x6e, 0x93, 0x2e, + 0x8d, 0x5c, 0x11, 0x98, 0xe9, 0x4c, 0x2d, 0xbb, 0xa8, 0x4e, 0xe7, 0xf5, 0x44, 0x2c, 0x5b, 0x67, + 0x4e, 0x62, 0xc7, 0x25, 0xa0, 0x98, 0xe9, 0x28, 0x5f, 0x81, 0xd5, 0x34, 0xf0, 0x93, 0x16, 0x60, + 0x64, 0x5a, 0xc0, 0x25, 0x99, 0x59, 0xb8, 0x30, 0x33, 0xad, 0x1f, 0x17, 0xe2, 0xf7, 0x8a, 0x8c, + 0xfe, 0xb9, 0x65, 0xe8, 0x35, 0x40, 0x21, 0x96, 0x1d, 0x6a, 0xd6, 0x70, 0x55, 0x69, 0x32, 0xb9, + 0x7e, 0x0f, 0x36, 0x84, 0xc3, 0xc9, 0x9c, 0xba, 0x54, 0x91, 0x8a, 0x0c, 0xf6, 0x36, 0xac, 0xe9, + 0xe7, 0x44, 0x44, 0xc6, 0x04, 0xfb, 0xba, 0x08, 0x95, 0x95, 0xd0, 0x96, 0x32, 0xf4, 0x26, 0xac, + 0xa6, 0x53, 0xc5, 0xe2, 0x0b, 0x0e, 0x15, 0x2b, 0xf1, 0x10, 0x80, 0xae, 0xc3, 0x6a, 0x5a, 0x93, + 0x97, 0xa4, 0xfd, 0x54, 0x20, 0x72, 0xb8, 0x43, 0xdd, 0x73, 0x19, 0xa5, 0x17, 0xe4, 0x70, 0xc6, + 0x45, 0x2d, 0xea, 0x9e, 0xdb, 0x92, 0x64, 0x7d, 0xb7, 0x08, 0x95, 0x29, 0x0d, 0xfa, 0x2c, 0x94, + 0x27, 0xa6, 0x33, 0xf5, 0xd4, 0xbb, 0xfd, 0x02, 0xc5, 0xc1, 0x9e, 0x20, 0xa2, 0xa7, 0x80, 0xc2, + 0x88, 0x86, 0x94, 0x91, 0x48, 0x0d, 0x8a, 0x5e, 0xd0, 0x67, 0x66, 0x41, 0x9a, 0xdb, 0xcb, 0x9d, + 0xf5, 0x34, 0xa3, 0xad, 0x09, 0xf6, 0x46, 0x38, 0x25, 0x91, 0x86, 0xd5, 0x42, 0x13, 0x86, 0x8b, + 0x17, 0x1b, 0x3e, 0xd0, 0x8c, 0xd4, 0x30, 0x9e, 0x92, 0x30, 0xf4, 0x00, 0x56, 0x5c, 0x12, 0x52, + 0xe6, 0x71, 0x66, 0x2e, 0x48, 0x73, 0x3b, 0x79, 0xe6, 0x0e, 0x15, 0xce, 0x4e, 0x08, 0xe8, 0x5d, + 0xa8, 0x8c, 0xa9, 0x3f, 0x0a, 0xb8, 0xe8, 0x4b, 0xa2, 0xa2, 0x30, 0x73, 0x51, 0xda, 0x78, 0x35, + 0x37, 0xdb, 0x63, 0xf8, 0xd1, 0x99, 0xc7, 0xed, 0xf5, 0x71, 0xf6, 0x93, 0x59, 0xdf, 0x33, 0xa0, + 0xac, 0x57, 0x39, 0x0e, 0xc2, 0x11, 0xcf, 0xad, 0xa0, 0x75, 0xd8, 0x0c, 0x23, 0x4a, 0x7b, 0x0e, + 0xed, 0x39, 0x21, 0x65, 0x8c, 0xb0, 0x64, 0x08, 0x2b, 0x4b, 0xf7, 0xd1, 0xde, 0x7b, 0xbd, 0xc7, + 0x89, 0xe2, 0xf2, 0x8a, 0x5b, 0xbc, 0xb4, 0xe2, 0x5a, 0xcf, 0x00, 0xa9, 0x9b, 0xc2, 0xbe, 0x98, + 0x0a, 0x88, 0xfb, 0x92, 0x23, 0xc0, 0x3d, 0xd8, 0xc8, 0xeb, 0xfd, 0x95, 0xce, 0x54, 0x17, 0xfb, + 0x93, 0x01, 0x57, 0xe4, 0x1d, 0xe1, 0x8e, 0x4f, 0xb2, 0x13, 0xd5, 0xc7, 0x60, 0x63, 0xa2, 0x5a, + 0x79, 0xe2, 0x05, 0x62, 0xc8, 0x07, 0x48, 0x35, 0x5b, 0xaf, 0x84, 0x7c, 0xee, 0x38, 0x54, 0x98, + 0x3f, 0x0e, 0xc5, 0x6d, 0xb1, 0xf8, 0xbf, 0xb4, 0xc5, 0x97, 0x9e, 0xa5, 0xbe, 0x6d, 0x40, 0x49, + 0xdf, 0xb3, 0x74, 0xe2, 0x31, 0xac, 0xe9, 0x98, 0x72, 0x3c, 0x71, 0xef, 0xba, 0x3b, 0xbf, 0x72, + 0x49, 0x24, 0xca, 0x18, 0xb1, 0xcb, 0xee, 0x54, 0xc4, 0xe0, 0x21, 0x1d, 0x05, 0x5c, 0x3b, 0x5f, + 0x7f, 0x89, 0x8a, 0x22, 0x5e, 0x12, 0x8c, 0xe3, 0x61, 0xa8, 0x8b, 0x75, 0x2a, 0xb0, 0x7e, 0x59, + 0x80, 0xea, 0x74, 0x1a, 0x8a, 0xa1, 0x37, 0x49, 0xe6, 0x6c, 0x63, 0x58, 0x8b, 0xa5, 0xaa, 0x2f, + 0xd8, 0x50, 0x09, 0x75, 0x5c, 0xa8, 0x4a, 0xde, 0x90, 0x4b, 0x5f, 0xf4, 0xb8, 0x9b, 0x09, 0xa3, + 0xd8, 0x26, 0xf6, 0xc5, 0x57, 0x03, 0x7d, 0x1c, 0xae, 0x24, 0x36, 0x13, 0x87, 0x3a, 0x0d, 0x1d, + 0x2e, 0x28, 0xcc, 0x18, 0x90, 0xaa, 0xc6, 0xec, 0x2e, 0xd4, 0x70, 0xf8, 0x01, 0x76, 0xd1, 0xcc, + 0xd9, 0x45, 0x3c, 0x38, 0xce, 0xee, 0xa2, 0x69, 0xfd, 0xd9, 0x80, 0xea, 0x74, 0xd5, 0x41, 0x2e, + 0xd4, 0x58, 0x1c, 0xcb, 0xd9, 0x57, 0xb0, 0xd3, 0xd0, 0xf7, 0xfc, 0x5a, 0xde, 0x16, 0xe7, 0xa5, + 0x80, 0xbd, 0xc5, 0xe6, 0x48, 0x1b, 0xf9, 0xab, 0x34, 0xf5, 0x75, 0xfc, 0x1f, 0x56, 0x69, 0x5a, + 0xdf, 0x32, 0x60, 0x59, 0x47, 0x1f, 0x6a, 0xc2, 0xd6, 0x90, 0x44, 0xa7, 0x3e, 0x71, 0x3a, 0x11, + 0x0e, 0xba, 0x83, 0xe4, 0xe1, 0x6d, 0xc8, 0x77, 0xf7, 0xa6, 0x52, 0xb6, 0xa4, 0x2e, 0x7e, 0x74, + 0xdf, 0x83, 0x0d, 0xcd, 0xe1, 0x11, 0x21, 0x3a, 0xac, 0x54, 0xa4, 0x56, 0x94, 0xe2, 0x24, 0x22, + 0x44, 0x05, 0xd6, 0x2d, 0x88, 0x43, 0xdb, 0x49, 0x72, 0xb3, 0x6c, 0x97, 0xdc, 0x34, 0x71, 0x2c, + 0x1f, 0xd6, 0x26, 0x2a, 0x6a, 0xce, 0xb4, 0x31, 0x67, 0xc6, 0x29, 0xcc, 0x9d, 0x71, 0x26, 0xfa, + 0x6e, 0x71, 0xaa, 0xef, 0x5a, 0x5f, 0x86, 0x95, 0xe4, 0xc1, 0x5f, 0x87, 0xcd, 0x78, 0x73, 0xd9, + 0x7a, 0xa6, 0xca, 0xf4, 0x86, 0x56, 0x65, 0xa6, 0x86, 0x5b, 0x50, 0x56, 0xd5, 0x6f, 0x62, 0x12, + 0x29, 0x49, 0x99, 0x2e, 0x7a, 0x3e, 0x94, 0xb3, 0xff, 0x09, 0x4c, 0xce, 0x10, 0xc6, 0x4b, 0xcf, + 0x10, 0x37, 0x00, 0xc6, 0x94, 0x13, 0xa7, 0x9b, 0xa9, 0x06, 0xab, 0x42, 0xf2, 0x50, 0x08, 0x5a, + 0xe5, 0x5f, 0x3d, 0xbf, 0x69, 0xfc, 0xfa, 0xf9, 0x4d, 0xe3, 0x2f, 0xcf, 0x6f, 0x1a, 0x9d, 0x25, + 0xf9, 0x4f, 0xf0, 0x1b, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x40, 0x0b, 0xb5, 0x02, 0x61, 0x16, 0x00, 0x00, } diff --git a/proto/beacon/p2p/v1/types.proto b/proto/beacon/p2p/v1/types.proto index 699d03270e0..d61bc6b545d 100644 --- a/proto/beacon/p2p/v1/types.proto +++ b/proto/beacon/p2p/v1/types.proto @@ -68,7 +68,7 @@ message AttestationData { uint64 shard = 2; bytes beacon_block_root_hash32 = 3; bytes epoch_boundary_root_hash32 = 4; - bytes shard_block_root_hash32 = 5; + bytes crosslink_data_root_hash32 = 5; Crosslink latest_crosslink = 6; uint64 justified_epoch = 7; bytes justified_block_root_hash32 = 8; @@ -105,7 +105,7 @@ message ShardReassignmentRecord { message Crosslink { uint64 epoch = 1; - bytes shard_block_root_hash32 = 2; + bytes crosslink_data_root_hash32 = 2; } message BeaconBlock { diff --git a/validator/client/validator_attest.go b/validator/client/validator_attest.go index 365adfc1e09..e8519559a85 100644 --- a/validator/client/validator_attest.go +++ b/validator/client/validator_attest.go @@ -25,7 +25,7 @@ func (v *validator) AttestToBlockHead(ctx context.Context, slot uint64) { // object based upon the state at the assigned slot. attData := &pbp2p.AttestationData{ Slot: slot, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], // Stub for Phase 0. + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], // Stub for Phase 0. } // We fetch the validator index as it is necessary to generate the aggregation // bitfield of the attestation itself. diff --git a/validator/client/validator_attest_test.go b/validator/client/validator_attest_test.go index 55b75d0068f..0b17a5b73ea 100644 --- a/validator/client/validator_attest_test.go +++ b/validator/client/validator_attest_test.go @@ -136,7 +136,7 @@ func TestAttestToBlockHead_AttestsCorrectly(t *testing.T) { BeaconBlockRootHash32: []byte("A"), EpochBoundaryRootHash32: []byte("B"), JustifiedBlockRootHash32: []byte("C"), - LatestCrosslink: &pbp2p.Crosslink{ShardBlockRootHash32: []byte{'D'}}, + LatestCrosslink: &pbp2p.Crosslink{CrosslinkDataRootHash32: []byte{'D'}}, JustifiedEpoch: 3, }, nil) @@ -161,8 +161,8 @@ func TestAttestToBlockHead_AttestsCorrectly(t *testing.T) { BeaconBlockRootHash32: []byte("A"), EpochBoundaryRootHash32: []byte("B"), JustifiedBlockRootHash32: []byte("C"), - LatestCrosslink: &pbp2p.Crosslink{ShardBlockRootHash32: []byte{'D'}}, - ShardBlockRootHash32: params.BeaconConfig().ZeroHash[:], + LatestCrosslink: &pbp2p.Crosslink{CrosslinkDataRootHash32: []byte{'D'}}, + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], JustifiedEpoch: 3, }, CustodyBitfield: make([]byte, (len(committee)+7)/8), @@ -204,7 +204,7 @@ func TestAttestToBlockHead_DoesNotAttestBeforeDelay(t *testing.T) { BeaconBlockRootHash32: []byte("A"), EpochBoundaryRootHash32: []byte("B"), JustifiedBlockRootHash32: []byte("C"), - LatestCrosslink: &pbp2p.Crosslink{ShardBlockRootHash32: []byte{'D'}}, + LatestCrosslink: &pbp2p.Crosslink{CrosslinkDataRootHash32: []byte{'D'}}, JustifiedEpoch: 3, }, nil).Do(func(arg0, arg1 interface{}) { wg.Done() @@ -257,7 +257,7 @@ func TestAttestToBlockHead_DoesAttestAfterDelay(t *testing.T) { BeaconBlockRootHash32: []byte("A"), EpochBoundaryRootHash32: []byte("B"), JustifiedBlockRootHash32: []byte("C"), - LatestCrosslink: &pbp2p.Crosslink{ShardBlockRootHash32: []byte{'D'}}, + LatestCrosslink: &pbp2p.Crosslink{CrosslinkDataRootHash32: []byte{'D'}}, JustifiedEpoch: 3, }, nil).Do(func(arg0, arg1 interface{}) { wg.Done() From 4829fbe9cc0f061a9fbc0850d8a3919020de1243 Mon Sep 17 00:00:00 2001 From: Terence Tsao Date: Wed, 27 Feb 2019 14:55:19 -0800 Subject: [PATCH 4/4] lint --- beacon-chain/core/blocks/block_operations.go | 2 +- beacon-chain/core/blocks/block_operations_test.go | 6 +++--- beacon-chain/core/epoch/epoch_operations_test.go | 12 ++++++------ beacon-chain/core/epoch/epoch_processing.go | 2 +- beacon-chain/core/epoch/epoch_processing_test.go | 2 +- beacon-chain/core/state/state.go | 2 +- beacon-chain/core/state/transition_test.go | 4 ++-- beacon-chain/core/validators/validator_test.go | 8 ++++---- beacon-chain/rpc/attester_server_test.go | 4 ++-- beacon-chain/sync/regular_sync_test.go | 8 ++++---- validator/client/validator_attest.go | 2 +- validator/client/validator_attest_test.go | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/beacon-chain/core/blocks/block_operations.go b/beacon-chain/core/blocks/block_operations.go index f48202e6c29..82ca35c31df 100644 --- a/beacon-chain/core/blocks/block_operations.go +++ b/beacon-chain/core/blocks/block_operations.go @@ -486,7 +486,7 @@ func verifyAttestation(beaconState *pb.BeaconState, att *pb.Attestation, verifyS shard := att.Data.Shard crosslink := &pb.Crosslink{ CrosslinkDataRootHash32: att.Data.CrosslinkDataRootHash32, - Epoch: helpers.SlotToEpoch(att.Data.Slot), + Epoch: helpers.SlotToEpoch(att.Data.Slot), } crosslinkFromAttestation := att.Data.LatestCrosslink crosslinkFromState := beaconState.LatestCrosslinks[shard] diff --git a/beacon-chain/core/blocks/block_operations_test.go b/beacon-chain/core/blocks/block_operations_test.go index 7262649cc98..11bfa59e935 100644 --- a/beacon-chain/core/blocks/block_operations_test.go +++ b/beacon-chain/core/blocks/block_operations_test.go @@ -923,7 +923,7 @@ func TestProcessBlockAttestations_CrosslinkRootFailure(t *testing.T) { Slot: params.BeaconConfig().GenesisSlot + 20, JustifiedBlockRootHash32: blockRoots[0], LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{2}}, - CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], JustifiedEpoch: params.BeaconConfig().GenesisEpoch, }, }, @@ -969,7 +969,7 @@ func TestProcessBlockAttestations_ShardBlockRootEqualZeroHashFailure(t *testing. Slot: params.BeaconConfig().GenesisSlot + 20, JustifiedBlockRootHash32: blockRoots[0], LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, - CrosslinkDataRootHash32: []byte{1}, + CrosslinkDataRootHash32: []byte{1}, JustifiedEpoch: params.BeaconConfig().GenesisEpoch, }, }, @@ -1015,7 +1015,7 @@ func TestProcessBlockAttestations_CreatePendingAttestations(t *testing.T) { Slot: params.BeaconConfig().GenesisSlot + 20, JustifiedBlockRootHash32: blockRoots[0], LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, - CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], JustifiedEpoch: params.BeaconConfig().GenesisEpoch, }, AggregationBitfield: []byte{1}, diff --git a/beacon-chain/core/epoch/epoch_operations_test.go b/beacon-chain/core/epoch/epoch_operations_test.go index 454d34c0a3c..35bec4c2130 100644 --- a/beacon-chain/core/epoch/epoch_operations_test.go +++ b/beacon-chain/core/epoch/epoch_operations_test.go @@ -351,7 +351,7 @@ func TestWinningRoot_AccurateRoot(t *testing.T) { for i := 0; i < 10; i++ { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ - Slot: params.BeaconConfig().GenesisSlot, + Slot: params.BeaconConfig().GenesisSlot, CrosslinkDataRootHash32: []byte{byte(i + 100)}, }, AggregationBitfield: participationBitfield, @@ -379,7 +379,7 @@ func TestWinningRoot_EmptyParticipantBitfield(t *testing.T) { attestations := []*pb.PendingAttestation{ {Data: &pb.AttestationData{ - Slot: params.BeaconConfig().GenesisSlot, + Slot: params.BeaconConfig().GenesisSlot, CrosslinkDataRootHash32: []byte{}, }, AggregationBitfield: []byte{}, @@ -399,7 +399,7 @@ func TestAttestingValidators_MatchActive(t *testing.T) { for i := 0; i < 10; i++ { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ - Slot: params.BeaconConfig().GenesisSlot, + Slot: params.BeaconConfig().GenesisSlot, CrosslinkDataRootHash32: []byte{byte(i + 100)}, }, AggregationBitfield: []byte{0x03}, @@ -427,7 +427,7 @@ func TestAttestingValidators_EmptyWinningRoot(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ - Slot: params.BeaconConfig().GenesisSlot, + Slot: params.BeaconConfig().GenesisSlot, CrosslinkDataRootHash32: []byte{}, }, AggregationBitfield: []byte{}, @@ -448,7 +448,7 @@ func TestTotalAttestingBalance_CorrectBalance(t *testing.T) { for i := 0; i < 10; i++ { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ - Slot: params.BeaconConfig().GenesisSlot, + Slot: params.BeaconConfig().GenesisSlot, CrosslinkDataRootHash32: []byte{byte(i + 100)}, }, // All validators attested to the above roots. @@ -476,7 +476,7 @@ func TestTotalAttestingBalance_EmptyWinningRoot(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ - Slot: params.BeaconConfig().GenesisSlot, + Slot: params.BeaconConfig().GenesisSlot, CrosslinkDataRootHash32: []byte{}, }, AggregationBitfield: []byte{}, diff --git a/beacon-chain/core/epoch/epoch_processing.go b/beacon-chain/core/epoch/epoch_processing.go index 05c5938b53b..cabfe7aebd2 100644 --- a/beacon-chain/core/epoch/epoch_processing.go +++ b/beacon-chain/core/epoch/epoch_processing.go @@ -213,7 +213,7 @@ func ProcessCrosslinks( return nil, fmt.Errorf("could not get winning root: %v", err) } state.LatestCrosslinks[shard] = &pb.Crosslink{ - Epoch: currentEpoch, + Epoch: currentEpoch, CrosslinkDataRootHash32: winningRoot, } } diff --git a/beacon-chain/core/epoch/epoch_processing_test.go b/beacon-chain/core/epoch/epoch_processing_test.go index 9710474f0ed..fab626d8996 100644 --- a/beacon-chain/core/epoch/epoch_processing_test.go +++ b/beacon-chain/core/epoch/epoch_processing_test.go @@ -256,7 +256,7 @@ func TestProcessCrosslinks_CrosslinksCorrectEpoch(t *testing.T) { for i := 0; i < 10; i++ { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ - Slot: state.Slot, + Slot: state.Slot, CrosslinkDataRootHash32: []byte{'A'}, }, // All validators attested to the above roots. diff --git a/beacon-chain/core/state/state.go b/beacon-chain/core/state/state.go index 6b2084f204c..1f85929d7f7 100644 --- a/beacon-chain/core/state/state.go +++ b/beacon-chain/core/state/state.go @@ -51,7 +51,7 @@ func GenesisBeaconState( latestCrosslinks := make([]*pb.Crosslink, params.BeaconConfig().ShardCount) for i := 0; i < len(latestCrosslinks); i++ { latestCrosslinks[i] = &pb.Crosslink{ - Epoch: params.BeaconConfig().GenesisEpoch, + Epoch: params.BeaconConfig().GenesisEpoch, CrosslinkDataRootHash32: zeroHash, } } diff --git a/beacon-chain/core/state/transition_test.go b/beacon-chain/core/state/transition_test.go index de8a5faeee9..4fc5873bfbf 100644 --- a/beacon-chain/core/state/transition_test.go +++ b/beacon-chain/core/state/transition_test.go @@ -272,7 +272,7 @@ func TestProcessBlock_IncorrectProcessExits(t *testing.T) { JustifiedEpoch: params.BeaconConfig().GenesisEpoch, JustifiedBlockRootHash32: blockRoots[0], LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, - CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], }, AggregationBitfield: []byte{1}, CustodyBitfield: []byte{1}, @@ -364,7 +364,7 @@ func TestProcessBlock_PassesProcessingConditions(t *testing.T) { JustifiedEpoch: params.BeaconConfig().GenesisEpoch, JustifiedBlockRootHash32: blockRoots[0], LatestCrosslink: &pb.Crosslink{CrosslinkDataRootHash32: []byte{1}}, - CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], }, AggregationBitfield: []byte{1}, CustodyBitfield: []byte{1}, diff --git a/beacon-chain/core/validators/validator_test.go b/beacon-chain/core/validators/validator_test.go index adfeb607b6b..a35fff510e2 100644 --- a/beacon-chain/core/validators/validator_test.go +++ b/beacon-chain/core/validators/validator_test.go @@ -101,8 +101,8 @@ func TestAttestingValidatorIndices_OK(t *testing.T) { prevAttestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ - Slot: params.BeaconConfig().GenesisSlot + 3, - Shard: 6, + Slot: params.BeaconConfig().GenesisSlot + 3, + Shard: 6, CrosslinkDataRootHash32: []byte{'B'}, }, AggregationBitfield: []byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1}, @@ -139,8 +139,8 @@ func TestAttestingValidatorIndices_OutOfBound(t *testing.T) { attestation := &pb.PendingAttestation{ Data: &pb.AttestationData{ - Slot: 0, - Shard: 1, + Slot: 0, + Shard: 1, CrosslinkDataRootHash32: []byte{'B'}, }, AggregationBitfield: []byte{'A'}, // 01000001 = 1,7 diff --git a/beacon-chain/rpc/attester_server_test.go b/beacon-chain/rpc/attester_server_test.go index 0a4fa9a2992..672706a34ad 100644 --- a/beacon-chain/rpc/attester_server_test.go +++ b/beacon-chain/rpc/attester_server_test.go @@ -22,8 +22,8 @@ func TestAttestHead_OK(t *testing.T) { } req := &pbp2p.Attestation{ Data: &pbp2p.AttestationData{ - Slot: 999, - Shard: 1, + Slot: 999, + Shard: 1, CrosslinkDataRootHash32: []byte{'a'}, }, } diff --git a/beacon-chain/sync/regular_sync_test.go b/beacon-chain/sync/regular_sync_test.go index 2b7139f32a8..3e5a6f74294 100644 --- a/beacon-chain/sync/regular_sync_test.go +++ b/beacon-chain/sync/regular_sync_test.go @@ -177,8 +177,8 @@ func TestProcessBlock_OK(t *testing.T) { } attestation := &pb.Attestation{ Data: &pb.AttestationData{ - Slot: 0, - Shard: 0, + Slot: 0, + Shard: 0, CrosslinkDataRootHash32: []byte{'A'}, }, } @@ -262,7 +262,7 @@ func TestProcessBlock_MultipleBlocks(t *testing.T) { Attestation: &pb.Attestation{ Data: &pb.AttestationData{ CrosslinkDataRootHash32: []byte{}, - Slot: params.BeaconConfig().GenesisSlot, + Slot: params.BeaconConfig().GenesisSlot, }, }, } @@ -287,7 +287,7 @@ func TestProcessBlock_MultipleBlocks(t *testing.T) { Attestation: &pb.Attestation{ Data: &pb.AttestationData{ CrosslinkDataRootHash32: []byte{}, - Slot: 0, + Slot: 0, }, }, } diff --git a/validator/client/validator_attest.go b/validator/client/validator_attest.go index e8519559a85..612beb9da3b 100644 --- a/validator/client/validator_attest.go +++ b/validator/client/validator_attest.go @@ -24,7 +24,7 @@ func (v *validator) AttestToBlockHead(ctx context.Context, slot uint64) { // First the validator should construct attestation_data, an AttestationData // object based upon the state at the assigned slot. attData := &pbp2p.AttestationData{ - Slot: slot, + Slot: slot, CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], // Stub for Phase 0. } // We fetch the validator index as it is necessary to generate the aggregation diff --git a/validator/client/validator_attest_test.go b/validator/client/validator_attest_test.go index 0b17a5b73ea..0a8ad2b2261 100644 --- a/validator/client/validator_attest_test.go +++ b/validator/client/validator_attest_test.go @@ -162,7 +162,7 @@ func TestAttestToBlockHead_AttestsCorrectly(t *testing.T) { EpochBoundaryRootHash32: []byte("B"), JustifiedBlockRootHash32: []byte("C"), LatestCrosslink: &pbp2p.Crosslink{CrosslinkDataRootHash32: []byte{'D'}}, - CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], + CrosslinkDataRootHash32: params.BeaconConfig().ZeroHash[:], JustifiedEpoch: 3, }, CustodyBitfield: make([]byte, (len(committee)+7)/8),