Merge remote-tracking branch 'origin/develop' into TT-835-unique-id

.changeset/chilly-garlics-kneel.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Fix error log formatting for in memory data source cache for juels fee per coin

.changeset/few-swans-wonder.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+small gas fix

.changeset/friendly-coats-switch.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+safeTransfer and cleanups

.changeset/odd-mugs-divide.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Set LINK native feed in VRFV2PlusWrapper to immutable

.changeset/poor-melons-vanish.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Add the `pool_rpc_node_highest_finalized_block` metric that tracks the highest finalized block seen per RPC. If `FinalityTagEnabled = true`, a positive `NodePool.FinalizedBlockPollInterval` is needed to collect the metric. If the finality tag is not enabled, the metric is populated with a calculated latest finalized block based on the latest head and finality depth.

.changeset/quick-berries-sin.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+fix bug in auto2.3 withdrawERC20Fees

.changeset/rude-paws-cross.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+L1Oracle handles OP Stack Ecotone encoded l1 gas price

.changeset/shaggy-pots-pretend.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Add error log if juels fee per coin cache is over 24h old and lower other logs severity in cache to warn

.changeset/silent-pets-sip.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Exposing information about LogPoller finality violation via Healthy method. It's raised whenever LogPoller sees reorg deeper than the finality

.changeset/thick-apes-reply.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+bug fixes in s_reserveAmount accounting

.changeset/thin-coats-joke.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+fix withdraw LINK bug in auto 2.3

.changeset/tiny-rabbits-crave.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Handle zkSync specific known transaction error

.changeset/tiny-suns-end.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+add test for billing override

.changeset/wicked-gorillas-sniff.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+VRFV2PlusWrapper config refactor

.github/workflows/integration-tests.yml

@@ -543,7 +543,7 @@ jobs:
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
             id: vrfv2plus
-            nodes: 6
+            nodes: 7
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2plus-evm-simulated
           - name: forwarder_ocr

.github/workflows/operator-ui-ci.yml

@@ -38,10 +38,20 @@ jobs:
         with:
           url: ${{ secrets.AWS_INFRA_RELENG_TOKEN_ISSUER_LAMBDA_URL }}
 
+      - name: Checkout repository
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+
+      - name: Get operator-ui tag
+        id: get-operator-ui-tag
+        shell: bash
+        run: |
+          TAG=$(cat ./operator_ui/TAG)
+          echo "TAG=$TAG" >> $GITHUB_OUTPUT
+
       - uses: convictional/trigger-workflow-and-wait@f69fa9eedd3c62a599220f4d5745230e237904be #v1.6.5
         with:
           owner: smartcontractkit
           repo: operator-ui
           github_token: ${{ steps.get-gh-token.outputs.access-token }}
           workflow_file_name: chainlink-ci.yml
-          client_payload: '{"ref": "${{ github.event.pull_request.head.sha }}"}'
+          client_payload: '{"ref": "${{ github.event.pull_request.head.sha }}", "tag": "${{ steps.get-operator-ui-tag.outputs.TAG }}"}'

CODEOWNERS

@@ -75,7 +75,7 @@ core/scripts/gateway @smartcontractkit/functions
 /contracts/src/v0.8/l2ep @chris-de-leon-cll
 /contracts/src/v0.8/llo-feeds @smartcontractkit/mercury-team
 # TODO: mocks folder, folder should be removed and files moved to the correct folders
-/contracts/src/v0.8/operatorforwarder @smartcontractkit/foundations
+/contracts/src/v0.8/operatorforwarder @RensR
 /contracts/src/v0.8/shared @RensR
 # TODO: tests folder, folder should be removed and files moved to the correct folders
 # TODO: transmission folder, owner should be found

common/client/mocks/config.go

@@ -0,0 +1,30 @@
+package mocks
+
+import (
+	"time"
+
+	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
+)
+
+type ChainConfig struct {
+	IsFinalityTagEnabled   bool
+	FinalityDepthVal       uint32
+	NoNewHeadsThresholdVal time.Duration
+	ChainTypeVal           commonconfig.ChainType
+}
+
+func (t ChainConfig) ChainType() commonconfig.ChainType {
+	return t.ChainTypeVal
+}
+
+func (t ChainConfig) NodeNoNewHeadsThreshold() time.Duration {
+	return t.NoNewHeadsThresholdVal
+}
+
+func (t ChainConfig) FinalityDepth() uint32 {
+	return t.FinalityDepthVal
+}
+
+func (t ChainConfig) FinalityTagEnabled() bool {
+	return t.IsFinalityTagEnabled
+}

common/client/node.go

@@ -15,6 +15,7 @@ import (
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 
+	commonconfig "github.com/smartcontractkit/chainlink/v2/common/config"
 	"github.com/smartcontractkit/chainlink/v2/common/types"
 )
 
@@ -43,6 +44,14 @@ type NodeConfig interface {
 	SelectionMode() string
 	SyncThreshold() uint32
 	NodeIsSyncingEnabled() bool
+	FinalizedBlockPollInterval() time.Duration
+}
+
+type ChainConfig interface {
+	NodeNoNewHeadsThreshold() time.Duration
+	FinalityDepth() uint32
+	FinalityTagEnabled() bool
+	ChainType() commonconfig.ChainType
 }
 
 //go:generate mockery --quiet --name Node --structname mockNode --filename "mock_node_test.go" --inpackage --case=underscore
@@ -73,14 +82,14 @@ type node[
 	RPC NodeClient[CHAIN_ID, HEAD],
 ] struct {
 	services.StateMachine
-	lfcLog              logger.Logger
-	name                string
-	id                  int32
-	chainID             CHAIN_ID
-	nodePoolCfg         NodeConfig
-	noNewHeadsThreshold time.Duration
-	order               int32
-	chainFamily         string
+	lfcLog      logger.Logger
+	name        string
+	id          int32
+	chainID     CHAIN_ID
+	nodePoolCfg NodeConfig
+	chainCfg    ChainConfig
+	order       int32
+	chainFamily string
 
 	ws   url.URL
 	http *url.URL
@@ -90,8 +99,9 @@ type node[
 	stateMu sync.RWMutex // protects state* fields
 	state   nodeState
 	// Each node is tracking the last received head number and total difficulty
-	stateLatestBlockNumber     int64
-	stateLatestTotalDifficulty *big.Int
+	stateLatestBlockNumber          int64
+	stateLatestTotalDifficulty      *big.Int
+	stateLatestFinalizedBlockNumber int64
 
 	// nodeCtx is the node lifetime's context
 	nodeCtx context.Context
@@ -113,7 +123,7 @@ func NewNode[
 	RPC NodeClient[CHAIN_ID, HEAD],
 ](
 	nodeCfg NodeConfig,
-	noNewHeadsThreshold time.Duration,
+	chainCfg ChainConfig,
 	lggr logger.Logger,
 	wsuri url.URL,
 	httpuri *url.URL,
@@ -129,7 +139,7 @@ func NewNode[
 	n.id = id
 	n.chainID = chainID
 	n.nodePoolCfg = nodeCfg
-	n.noNewHeadsThreshold = noNewHeadsThreshold
+	n.chainCfg = chainCfg
 	n.ws = wsuri
 	n.order = nodeOrder
 	if httpuri != nil {

common/client/node_lifecycle.go

@@ -22,6 +22,10 @@ var (
 		Name: "pool_rpc_node_highest_seen_block",
 		Help: "The highest seen block for the given RPC node",
 	}, []string{"chainID", "nodeName"})
+	promPoolRPCNodeHighestFinalizedBlock = promauto.NewGaugeVec(prometheus.GaugeOpts{
+		Name: "pool_rpc_node_highest_finalized_block",
+		Help: "The highest seen finalized block for the given RPC node",
+	}, []string{"chainID", "nodeName"})
 	promPoolRPCNodeNumSeenBlocks = promauto.NewCounterVec(prometheus.CounterOpts{
 		Name: "pool_rpc_node_num_seen_blocks",
 		Help: "The total number of new blocks seen by the given RPC node",
@@ -88,7 +92,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 		}
 	}
 
-	noNewHeadsTimeoutThreshold := n.noNewHeadsThreshold
+	noNewHeadsTimeoutThreshold := n.chainCfg.NodeNoNewHeadsThreshold()
 	pollFailureThreshold := n.nodePoolCfg.PollFailureThreshold()
 	pollInterval := n.nodePoolCfg.PollInterval()
 
@@ -134,6 +138,14 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 		lggr.Debug("Polling disabled")
 	}
 
+	var pollFinalizedHeadCh <-chan time.Time
+	if n.chainCfg.FinalityTagEnabled() && n.nodePoolCfg.FinalizedBlockPollInterval() > 0 {
+		lggr.Debugw("Finalized block polling enabled")
+		pollT := time.NewTicker(n.nodePoolCfg.FinalizedBlockPollInterval())
+		defer pollT.Stop()
+		pollFinalizedHeadCh = pollT.C
+	}
+
 	_, highestReceivedBlockNumber, _ := n.StateAndLatest()
 	var pollFailures uint32
 
@@ -201,6 +213,13 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 				outOfSyncT.Reset(noNewHeadsTimeoutThreshold)
 			}
 			n.setLatestReceived(bh.BlockNumber(), bh.BlockDifficulty())
+			if !n.chainCfg.FinalityTagEnabled() {
+				latestFinalizedBN := max(bh.BlockNumber()-int64(n.chainCfg.FinalityDepth()), 0)
+				if latestFinalizedBN > n.stateLatestFinalizedBlockNumber {
+					promPoolRPCNodeHighestFinalizedBlock.WithLabelValues(n.chainID.String(), n.name).Set(float64(latestFinalizedBN))
+					n.stateLatestFinalizedBlockNumber = latestFinalizedBN
+				}
+			}
 		case err := <-sub.Err():
 			lggr.Errorw("Subscription was terminated", "err", err, "nodeState", n.State())
 			n.declareUnreachable()
@@ -214,13 +233,33 @@ func (n *node[CHAIN_ID, HEAD, RPC]) aliveLoop() {
 					lggr.Criticalf("RPC endpoint detected out of sync; %s %s", msgCannotDisable, msgDegradedState)
 					// We don't necessarily want to wait the full timeout to check again, we should
 					// check regularly and log noisily in this state
-					outOfSyncT.Reset(zombieNodeCheckInterval(n.noNewHeadsThreshold))
+					outOfSyncT.Reset(zombieNodeCheckInterval(noNewHeadsTimeoutThreshold))
 					continue
 				}
 			}
 			n.declareOutOfSync(func(num int64, td *big.Int) bool { return num < highestReceivedBlockNumber })
 			return
+		case <-pollFinalizedHeadCh:
+			ctx, cancel := context.WithTimeout(n.nodeCtx, n.nodePoolCfg.FinalizedBlockPollInterval())
+			latestFinalized, err := n.RPC().LatestFinalizedBlock(ctx)
+			cancel()
+			if err != nil {
+				lggr.Warnw("Failed to fetch latest finalized block", "err", err)
+				continue
+			}
+
+			if !latestFinalized.IsValid() {
+				lggr.Warn("Latest finalized block is not valid")
+				continue
+			}
+
+			latestFinalizedBN := latestFinalized.BlockNumber()
+			if latestFinalizedBN > n.stateLatestFinalizedBlockNumber {
+				promPoolRPCNodeHighestFinalizedBlock.WithLabelValues(n.chainID.String(), n.name).Set(float64(latestFinalizedBN))
+				n.stateLatestFinalizedBlockNumber = latestFinalizedBN
+			}
 		}
+
 	}
 }
 
@@ -316,7 +355,7 @@ func (n *node[CHAIN_ID, HEAD, RPC]) outOfSyncLoop(isOutOfSync func(num int64, td
 				return
 			}
 			lggr.Debugw(msgReceivedBlock, "blockNumber", head.BlockNumber(), "blockDifficulty", head.BlockDifficulty(), "nodeState", n.State())
-		case <-time.After(zombieNodeCheckInterval(n.noNewHeadsThreshold)):
+		case <-time.After(zombieNodeCheckInterval(n.chainCfg.NodeNoNewHeadsThreshold())):
 			if n.nLiveNodes != nil {
 				if l, _, _ := n.nLiveNodes(); l < 1 {
 					lggr.Critical("RPC endpoint is still out of sync, but there are no other available nodes. This RPC node will be forcibly moved back into the live pool in a degraded state")