Update finality depth check headtracker

Signed-off-by: Silas Lenihan <[email protected]>

common/headtracker/head_tracker.go

@@ -250,8 +250,8 @@ func (ht *headTracker[HTH, S, ID, BLOCK_HASH]) handleNewHead(ctx context.Context
 		}
 	} else {
 		ht.log.Debugw("Got out of order head", "blockNum", head.BlockNumber(), "head", head.BlockHash(), "prevHead", prevHead.BlockNumber())
-		prevUnFinalizedHead := prevHead.BlockNumber() - int64(ht.config.FinalityDepth())
-		if head.BlockNumber() < prevUnFinalizedHead {
+		fmt.Println("PREVHEAD:", prevHead, head.BlockNumber())
+		if head.BlockNumber() <= prevHead.LatestFinalizedHead().BlockNumber() {
 			promOldHead.WithLabelValues(ht.chainID.String()).Inc()
 			ht.log.Criticalf("Got very old block with number %d (highest seen was %d). This is a problem and either means a very deep re-org occurred, one of the RPC nodes has gotten far out of sync, or the chain went backwards in block numbers. This node may not function correctly without manual intervention.", head.BlockNumber(), prevHead.BlockNumber())
 			ht.SvcErrBuffer.Append(errors.New("got very old block"))

common/types/head.go

@@ -38,4 +38,7 @@ type Head[BLOCK_HASH Hashable] interface {
 	BlockDifficulty() *big.Int
 	// IsValid returns true if the head is valid.
 	IsValid() bool
+
+	// Returns the latest finalized based on finality tag or depth
+	LatestFinalizedHead() Head[BLOCK_HASH]
 }

core/chains/evm/headtracker/head_tracker_test.go

@@ -64,6 +64,7 @@ func TestHeadTracker_New(t *testing.T) {
 	orm := headtracker.NewORM(cltest.FixtureChainID, db)
 	assert.Nil(t, orm.IdempotentInsertHead(testutils.Context(t), cltest.Head(1)))
 	last := cltest.Head(16)
+	last.IsFinalized = true
 	assert.Nil(t, orm.IdempotentInsertHead(testutils.Context(t), last))
 	assert.Nil(t, orm.IdempotentInsertHead(testutils.Context(t), cltest.Head(10)))
 

core/chains/evm/types/models.go

@@ -169,6 +169,7 @@ func (h *Head) ChainHashes() []common.Hash {
 
 func (h *Head) LatestFinalizedHead() commontypes.Head[common.Hash] {
 	for h != nil && !h.IsFinalized {
+		fmt.Println(h.BlockNumber(), h.IsFinalized)
 		h = h.Parent
 	}