Copy Block When Receiving it From Sync

beacon-chain/blockchain/forkchoice/process_block.go

@@ -73,7 +73,6 @@ func (s *Store) OnBlock(ctx context.Context, b *ethpb.BeaconBlock) error {
 		"slot": b.Slot,
 		"root": fmt.Sprintf("0x%s...", hex.EncodeToString(root[:])[:8]),
 	}).Info("Executing state transition on block")
-
 	postState, err := state.ExecuteStateTransition(ctx, preState, b)
 	if err != nil {
 		return errors.Wrap(err, "could not execute state transition")

beacon-chain/blockchain/receive_block.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/hex"
 
+	"github.com/gogo/protobuf/proto"
 	"github.com/pkg/errors"
 	"github.com/prysmaticlabs/go-ssz"
 	ethpb "github.com/prysmaticlabs/prysm/proto/eth/v1alpha1"
@@ -61,14 +62,15 @@ func (s *Service) ReceiveBlock(ctx context.Context, block *ethpb.BeaconBlock) er
 func (s *Service) ReceiveBlockNoPubsub(ctx context.Context, block *ethpb.BeaconBlock) error {
 	ctx, span := trace.StartSpan(ctx, "beacon-chain.blockchain.ReceiveBlockNoPubsub")
 	defer span.End()
+	blockCopy := proto.Clone(block).(*ethpb.BeaconBlock)
 
 	// Apply state transition on the new block.
-	if err := s.forkChoiceStore.OnBlock(ctx, block); err != nil {
+	if err := s.forkChoiceStore.OnBlock(ctx, blockCopy); err != nil {
 		err := errors.Wrap(err, "could not process block from fork choice service")
 		traceutil.AnnotateError(span, err)
 		return err
 	}
-	root, err := ssz.SigningRoot(block)
+	root, err := ssz.SigningRoot(blockCopy)
 	if err != nil {
 		return errors.Wrap(err, "could not get signing root on received block")
 	}
@@ -91,18 +93,18 @@ func (s *Service) ReceiveBlockNoPubsub(ctx context.Context, block *ethpb.BeaconB
 	}
 
 	// Remove block's contained deposits, attestations, and other operations from persistent storage.
-	if err := s.cleanupBlockOperations(ctx, block); err != nil {
+	if err := s.cleanupBlockOperations(ctx, blockCopy); err != nil {
 		return errors.Wrap(err, "could not clean up block deposits, attestations, and other operations")
 	}
 
 	// Reports on block and fork choice metrics.
-	s.reportSlotMetrics(block.Slot)
+	s.reportSlotMetrics(blockCopy.Slot)
 
 	// Log if block is a competing block.
-	isCompetingBlock(root[:], block.Slot, headRoot, headBlk.Slot)
+	isCompetingBlock(root[:], blockCopy.Slot, headRoot, headBlk.Slot)
 
 	// Log state transition data.
-	logStateTransitionData(block, root[:])
+	logStateTransitionData(blockCopy, root[:])
 
 	processedBlkNoPubsub.Inc()
 
@@ -118,34 +120,35 @@ func (s *Service) ReceiveBlockNoPubsub(ctx context.Context, block *ethpb.BeaconB
 func (s *Service) ReceiveBlockNoPubsubForkchoice(ctx context.Context, block *ethpb.BeaconBlock) error {
 	ctx, span := trace.StartSpan(ctx, "beacon-chain.blockchain.ReceiveBlockNoForkchoice")
 	defer span.End()
+	blockCopy := proto.Clone(block).(*ethpb.BeaconBlock)
 
 	// Apply state transition on the incoming newly received block.
-	if err := s.forkChoiceStore.OnBlock(ctx, block); err != nil {
+	if err := s.forkChoiceStore.OnBlock(ctx, blockCopy); err != nil {
 		err := errors.Wrap(err, "could not process block from fork choice service")
 		traceutil.AnnotateError(span, err)
 		return err
 	}
-	root, err := ssz.SigningRoot(block)
+	root, err := ssz.SigningRoot(blockCopy)
 	if err != nil {
 		return errors.Wrap(err, "could not get signing root on received block")
 	}
 
 	if !bytes.Equal(root[:], s.HeadRoot()) {
-		if err := s.saveHead(ctx, block, root); err != nil {
+		if err := s.saveHead(ctx, blockCopy, root); err != nil {
 			return errors.Wrap(err, "could not save head")
 		}
 	}
 
 	// Remove block's contained deposits, attestations, and other operations from persistent storage.
-	if err := s.cleanupBlockOperations(ctx, block); err != nil {
+	if err := s.cleanupBlockOperations(ctx, blockCopy); err != nil {
 		return errors.Wrap(err, "could not clean up block deposits, attestations, and other operations")
 	}
 
 	// Reports on block and fork choice metrics.
-	s.reportSlotMetrics(block.Slot)
+	s.reportSlotMetrics(blockCopy.Slot)
 
 	// Log state transition data.
-	logStateTransitionData(block, root[:])
+	logStateTransitionData(blockCopy, root[:])
 
 	// We write the latest saved head root to a feed for consumption by other services.
 	s.headUpdatedFeed.Send(root)
@@ -159,32 +162,33 @@ func (s *Service) ReceiveBlockNoPubsubForkchoice(ctx context.Context, block *eth
 func (s *Service) ReceiveBlockNoVerify(ctx context.Context, block *ethpb.BeaconBlock) error {
 	ctx, span := trace.StartSpan(ctx, "beacon-chain.blockchain.ReceiveBlockNoVerify")
 	defer span.End()
+	blockCopy := proto.Clone(block).(*ethpb.BeaconBlock)
 
-	// Apply state transition on the incoming newly received block without verifying its BLS contents.
-	if err := s.forkChoiceStore.OnBlockNoVerifyStateTransition(ctx, block); err != nil {
-		return errors.Wrap(err, "could not process block from fork choice service")
+	// Apply state transition on the incoming newly received blockCopy without verifying its BLS contents.
+	if err := s.forkChoiceStore.OnBlockNoVerifyStateTransition(ctx, blockCopy); err != nil {
+		return errors.Wrap(err, "could not process blockCopy from fork choice service")
 	}
-	root, err := ssz.SigningRoot(block)
+	root, err := ssz.SigningRoot(blockCopy)
 	if err != nil {
-		return errors.Wrap(err, "could not get signing root on received block")
+		return errors.Wrap(err, "could not get signing root on received blockCopy")
 	}
 
 	if !bytes.Equal(root[:], s.HeadRoot()) {
-		if err := s.saveHead(ctx, block, root); err != nil {
+		if err := s.saveHead(ctx, blockCopy, root); err != nil {
 			err := errors.Wrap(err, "could not save head")
 			traceutil.AnnotateError(span, err)
 			return err
 		}
 	}
 
-	// Reports on block and fork choice metrics.
-	s.reportSlotMetrics(block.Slot)
+	// Reports on blockCopy and fork choice metrics.
+	s.reportSlotMetrics(blockCopy.Slot)
 
 	// Log state transition data.
 	log.WithFields(logrus.Fields{
-		"slot":         block.Slot,
-		"attestations": len(block.Body.Attestations),
-		"deposits":     len(block.Body.Deposits),
+		"slot":         blockCopy.Slot,
+		"attestations": len(blockCopy.Body.Attestations),
+		"deposits":     len(blockCopy.Body.Deposits),
 	}).Debug("Finished applying state transition")
 
 	// We write the latest saved head root to a feed for consumption by other services.