mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-25 04:47:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Misc updates for epoch processing (#1957)

Browse Source
This commit is contained in:
terence tsao 2019-03-10 12:21:40 -07:00 committed by GitHub
parent a385b1c138
commit 19977afa96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beacon-chain/core/blocks/block.go
View File

@ -73,10 +73,10 @@ func BlockRoot(state *pb.BeaconState, slot uint64) ([]byte, error) {
// Let previous_block_root be the tree_hash_root of the previous beacon block processed in the chain.
// Set state.latest_block_roots[(state.slot - 1) % LATEST_BLOCK_ROOTS_LENGTH] = previous_block_root.
// If state.slot % LATEST_BLOCK_ROOTS_LENGTH == 0 append merkle_root(state.latest_block_roots) to state.batched_block_roots.
func ProcessBlockRoots(ctx context.Context, state *pb.BeaconState, prevBlockRoot [32]byte) *pb.BeaconState {
func ProcessBlockRoots(ctx context.Context, state *pb.BeaconState, parentRoot [32]byte) *pb.BeaconState {
ctx, span := trace.StartSpan(ctx, "beacon-chain.ChainService.ProcessSlot.ProcessBlockRoots")
defer span.End()
state.LatestBlockRootHash32S[(state.Slot-1)%params.BeaconConfig().LatestBlockRootsLength] = prevBlockRoot[:]
state.LatestBlockRootHash32S[(state.Slot-1)%params.BeaconConfig().LatestBlockRootsLength] = parentRoot[:]
if state.Slot%params.BeaconConfig().LatestBlockRootsLength == 0 {
merkleRoot := hashutil.MerkleRoot(state.LatestBlockRootHash32S)
state.BatchedBlockRootHash32S = append(state.BatchedBlockRootHash32S, merkleRoot)

15
beacon-chain/core/epoch/epoch_processing.go
View File

@ -62,7 +62,6 @@ func CanProcessValidatorRegistry(ctx context.Context, state *pb.BeaconState) boo
shardsProcessed := helpers.CurrentEpochCommitteeCount(state) * params.BeaconConfig().SlotsPerEpoch
startShard := state.CurrentShufflingStartShard
for i := startShard; i < shardsProcessed; i++ {
if state.LatestCrosslinks[i%params.BeaconConfig().ShardCount].Epoch <=
state.ValidatorRegistryUpdateEpoch {
return false
@ -133,7 +132,7 @@ func ProcessJustification(
prevEpoch := helpers.PrevEpoch(state)
currentEpoch := helpers.CurrentEpoch(state)
// Shifts all the bits over one to create a new bit for the recent epoch.
state.JustificationBitfield = state.JustificationBitfield << 1
state.JustificationBitfield <<= 1
log.Infof("Processing Total Balance: %d", totalBalance)
// If prev prev epoch was justified then we ensure the 2nd bit in the bitfield is set,
// assign new justified slot to 2 * SLOTS_PER_EPOCH before.
@ -153,21 +152,29 @@ func ProcessJustification(
}
// Process finality.
// When the 2nd, 3rd and 4th most epochs are all justified, the 2nd can finalize the 4th epoch
// as a source.
if state.PreviousJustifiedEpoch == prevEpoch-2 &&
(state.JustificationBitfield>>1)%8 == 7 {
state.FinalizedEpoch = state.PreviousJustifiedEpoch
log.Infof("New Finalized Epoch: %d", state.FinalizedEpoch-params.BeaconConfig().GenesisEpoch)
}
// When the 2nd and 3rd most epochs are all justified, the 2nd can finalize the 3rd epoch
// as a source.
if state.PreviousJustifiedEpoch == prevEpoch-1 &&
(state.JustificationBitfield>>1)%4 == 3 {
state.FinalizedEpoch = state.PreviousJustifiedEpoch
log.Infof("New Finalized Epoch: %d", state.FinalizedEpoch-params.BeaconConfig().GenesisEpoch)
}
// When the 1st, 2nd and 3rd most epochs are all justified, the 1st can finalize the 3rd epoch
// as a source.
if state.JustifiedEpoch == prevEpoch-1 &&
(state.JustificationBitfield>>0)%8 == 7 {
state.FinalizedEpoch = state.JustifiedEpoch
log.Infof("New Finalized Epoch: %d", state.FinalizedEpoch-params.BeaconConfig().GenesisEpoch)
}
// When the 1st and 2nd most epochs are all justified, the 1st can finalize the 2nd epoch
// as a source.
if state.JustifiedEpoch == prevEpoch &&
(state.JustificationBitfield>>0)%4 == 3 {
state.FinalizedEpoch = state.JustifiedEpoch
@ -255,7 +262,9 @@ func ProcessEjections(ctx context.Context, state *pb.BeaconState) (*pb.BeaconSta
activeValidatorIndices := helpers.ActiveValidatorIndices(state.ValidatorRegistry, helpers.CurrentEpoch(state))
for _, index := range activeValidatorIndices {
if state.ValidatorBalances[index] < params.BeaconConfig().EjectionBalance {
log.Infof("Validator at index %d EJECTED", index)
log.WithFields(logrus.Fields{
"pubKey": fmt.Sprintf("%#x", state.ValidatorRegistry[index].Pubkey),
"index": index}).Info("Validator ejected")
state = validators.ExitValidator(state, index)
}
}