Merge branch 'develop' into new-slot-before-propose

beacon-chain/blockchain/chain_info.go

@@ -32,8 +32,9 @@ type ChainInfoFetcher interface {
 }
 
 // HeadUpdater defines a common interface for methods in blockchain service
-// which allow to update the head info
+// which allow to update the head info and update propose boost score and justified check point via on_tick.
 type HeadUpdater interface {
+	NewSlot(ctx context.Context, slot types.Slot) error
 	UpdateHead(context.Context) error
 }
 

beacon-chain/blockchain/new_slot.go

@@ -30,6 +30,8 @@ import (
 //        if ancestor_at_finalized_slot == store.finalized_checkpoint.root:
 //            store.justified_checkpoint = store.best_justified_checkpoint
 func (s *Service) NewSlot(ctx context.Context, slot types.Slot) error {
+	s.newSlotLock.Lock()
+	defer s.newSlotLock.Unlock()
 
 	// Reset proposer boost root in fork choice.
 	if err := s.cfg.ForkChoiceStore.ResetBoostedProposerRoot(ctx); err != nil {

beacon-chain/blockchain/service.go

@@ -66,6 +66,7 @@ type Service struct {
 	wsVerifier              *WeakSubjectivityVerifier
 	store                   *store.Store
 	processAttestationsLock sync.Mutex
+	newSlotLock             sync.Mutex
 }
 
 // config options for the service.

beacon-chain/blockchain/testing/mock.go

@@ -456,3 +456,8 @@ func (s *ChainService) UpdateHead(_ context.Context) error { return nil }
 
 // ReceiveAttesterSlashing mocks the same method in the chain service.
 func (s *ChainService) ReceiveAttesterSlashing(context.Context, *ethpb.AttesterSlashing) {}
+
+// NewSlot mocks the same method in the chain service.
+func (s *ChainService) NewSlot(context.Context, types.Slot) error {
+	return nil
+}

beacon-chain/rpc/prysm/v1alpha1/validator/proposer_phase0.go

@@ -82,6 +82,9 @@ func (vs *Server) buildPhase0BlockData(ctx context.Context, req *ethpb.BlockRequ
 		return nil, fmt.Errorf("syncing to latest head, not ready to respond")
 	}
 
+	if err := vs.HeadUpdater.NewSlot(ctx, req.Slot); err != nil {
+		log.WithError(err).Error("Could not update propose boost score")
+	}
 	if err := vs.HeadUpdater.UpdateHead(ctx); err != nil {
 		log.WithError(err).Error("Could not process attestations and update head")
 	}