increase attempted reorgs at the right spot (#12106)

prysmaticlabs · Mar 9, 2023 · 6d3ff65 · 6d3ff65
1 parent 83a294c
commit 6d3ff65
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/beacon-chain/blockchain/metrics.go b/beacon-chain/blockchain/metrics.go
@@ -111,7 +111,7 @@ var (
 		Name: "beacon_reorgs_total",
 		Help: "Count the number of times beacon chain has a reorg",
 	})
-	lateBlockAttemptedReorgCount = promauto.NewCounter(prometheus.CounterOpts{
+	LateBlockAttemptedReorgCount = promauto.NewCounter(prometheus.CounterOpts{
 		Name: "beacon_late_block_attempted_reorgs",
 		Help: "Count the number of times a proposer served by this beacon has attempted a late block reorg",
 	})

diff --git a/beacon-chain/blockchain/process_block.go b/beacon-chain/blockchain/process_block.go
@@ -698,7 +698,6 @@ func (s *Service) fillMissingBlockPayloadId(ctx context.Context) error {
 	if !has || id != [8]byte{} {
 		return nil
 	}
-	lateBlockAttemptedReorgCount.Inc()
 	s.headLock.RLock()
 	headBlock, err := s.headBlock()
 	if err != nil {

diff --git a/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go b/beacon-chain/rpc/prysm/v1alpha1/validator/proposer.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	emptypb "github.com/golang/protobuf/ptypes/empty"
 	"github.com/pkg/errors"
+	"github.com/prysmaticlabs/prysm/v3/beacon-chain/blockchain"
 	"github.com/prysmaticlabs/prysm/v3/beacon-chain/builder"
 	"github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed"
 	blockfeed "github.com/prysmaticlabs/prysm/v3/beacon-chain/core/feed/block"
@@ -50,7 +51,11 @@ func (vs *Server) GetBeaconBlock(ctx context.Context, req *ethpb.BlockRequest) (
 	// process attestations and update head in forkchoice
 	vs.ForkFetcher.ForkChoicer().Lock()
 	vs.HeadUpdater.UpdateHead(ctx, vs.ForkFetcher.CurrentSlot())
+	headRoot := vs.ForkFetcher.ForkChoicer().CachedHeadRoot()
 	parentRoot := vs.ForkFetcher.ForkChoicer().GetProposerHead()
+	if parentRoot != headRoot {
+		blockchain.LateBlockAttemptedReorgCount.Inc()
+	}
 	vs.ForkFetcher.ForkChoicer().Unlock()
 
 	// An optimistic validator MUST NOT produce a block (i.e., sign across the DOMAIN_BEACON_PROPOSER domain).