Update finality depth check headtracker

.changeset/witty-onions-talk.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Switched finality check in HeadTracker to use the underlying finality type

common/headtracker/head_tracker.go

@@ -250,8 +250,9 @@ 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 {
+		prevLatestFinalized, err := prevHead.LatestFinalizedHead()
+
+		if err == nil && head.BlockNumber() <= prevLatestFinalized.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], error)
 }

core/chains/evm/types/head_test.go

@@ -38,7 +38,7 @@ func TestHead_LatestFinalizedHead(t *testing.T) {
 
 	for _, tc := range cases {
 		t.Run(tc.Name, func(t *testing.T) {
-			actual := tc.Head.LatestFinalizedHead()
+			actual, _ := tc.Head.LatestFinalizedHead()
 			if tc.Finalized == nil {
 				assert.Nil(t, actual)
 			} else {

core/chains/evm/types/models.go

@@ -167,12 +167,16 @@ func (h *Head) ChainHashes() []common.Hash {
 	return hashes
 }
 
-func (h *Head) LatestFinalizedHead() commontypes.Head[common.Hash] {
-	for h != nil && !h.IsFinalized {
+func (h *Head) LatestFinalizedHead() (commontypes.Head[common.Hash], error) {
+	for h != nil {
+		if h.IsFinalized {
+			return h, nil
+		}
+
 		h = h.Parent
 	}
 
-	return h
+	return nil, pkgerrors.New("no finalized head")
 }
 
 func (h *Head) ChainID() *big.Int {

core/internal/cltest/cltest.go

@@ -991,7 +991,7 @@ func AssertEthTxAttemptCountStays(t testing.TB, txStore txmgr.TestEvmTxStore, wa
 	return txaIds
 }
 
-// Head given the value convert it into an Head
+// Head given the value convert it into a Head
 func Head(val interface{}) *evmtypes.Head {
 	var h evmtypes.Head
 	time := uint64(0)