resolving merge conflicts

.changeset/breezy-taxis-breathe.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Add json schema support to workflows

.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/hungry-impalas-jog.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Added a tx simulation feature to the chain client to enable testing for zk out-of-counter (OOC) errors

.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/silly-weeks-serve.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+update starknet relayer to fix nonce issue. introduces optional api-key for starknet toml config.

.changeset/smooth-monkeys-help.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+upgraded transmission to 0.8.19

.changeset/strange-swans-compare.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+remove trailing slash

.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

.changeset/witty-jeans-wave.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Remove 0.6 and 0.7 Solidity source code

.github/workflows/integration-tests.yml

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

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

@@ -2,6 +2,9 @@ name: Operator UI CI
 on:
   pull_request:
 
+env:
+  TARGET_BRANCH_NAME: ${{ github.event.pull_request.base.ref }}
+
 jobs:
   check-gql:
     permissions:
@@ -37,10 +40,24 @@ 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: |
+          if [[ $TARGET_BRANCH_NAME == release/* ]]; then
+            TAG=$(cat ./operator_ui/TAG)
+            echo "TAG=$TAG" >> $GITHUB_OUTPUT
+          else
+            echo "TAG=main" >> $GITHUB_OUTPUT
+          fi
+
       - 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 }}"}'

.github/workflows/solidity-foundry.yml

@@ -21,12 +21,11 @@ jobs:
           filters: |
             src:
               - 'contracts/src/v0.8/**/*'
-              - 'contracts/test/v0.8/foundry/**/*'
               - '.github/workflows/solidity-foundry.yml'
               - 'contracts/foundry.toml'
               - 'contracts/gas-snapshots/*.gas-snapshot'
-              - '.gitmodules'
               - 'contracts/foundry-lib'
+              - '.gitmodules'
 
   tests:
     strategy:

.github/workflows/solidity-hardhat.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           filters: |
             src:
-              - 'contracts/src/!(v0.8/(llo-feeds|keystone|ccip)/**)/**/*'
+              - 'contracts/src/!(v0.8/(llo-feeds|keystone|ccip|functions|transmission)/**)/**/*'
               - 'contracts/test/**/*'
               - 'contracts/package.json'
               - 'contracts/pnpm-lock.yaml'
@@ -56,72 +56,6 @@ jobs:
           this-job-name: Split Solidity Tests
         continue-on-error: true
 
-  solidity-coverage-splits:
-    needs: [changes, split-tests]
-    if: needs.changes.outputs.changes == 'true'
-    name: Solidity Coverage ${{ matrix.split.id }} ${{ fromJSON('["(skipped)", ""]')[needs.changes.outputs.changes == 'true'] }}
-    strategy:
-      fail-fast: false
-      matrix:
-        split: ${{ fromJson(needs.split-tests.outputs.splits) }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - name: Setup NodeJS
-        uses: ./.github/actions/setup-nodejs
-      - name: Setup Hardhat
-        uses: ./.github/actions/setup-hardhat
-        with:
-          namespace: coverage
-      - name: Run coverage
-        env:
-          SPLIT: ${{ matrix.split.coverageTests }}
-        shell: bash
-        run: pnpm coverage --testfiles "$SPLIT"
-        working-directory: contracts
-      - name: Push coverage
-        run: ./tools/bin/codecov -f ./contracts/coverage.json
-      - name: Rename coverage
-        run: mv ./contracts/coverage.json ./contracts/coverage-${{ matrix.split.idx }}.json
-      - name: Upload coverage
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
-        with:
-          name: solidity-coverage-${{ matrix.split.idx }}
-          path: ./contracts/coverage-${{ matrix.split.idx }}.json
-      - name: Collect Metrics
-        id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
-        with:
-          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
-          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          this-job-name: Solidity Coverage ${{ matrix.split.id }}
-        continue-on-error: true
-
-  solidity-coverage:
-    needs: [changes, solidity-coverage-splits]
-    if: needs.changes.outputs.changes == 'true'
-    name: Solidity Coverage ${{ fromJSON('["(skipped)", ""]')[needs.changes.outputs.changes == 'true'] }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - name: Setup NodeJS
-        uses: ./.github/actions/setup-nodejs
-      - name: Make coverage directory
-        run: mkdir ./contracts/coverage-reports
-      - name: Download coverage
-        uses: actions/download-artifact@c850b930e6ba138125429b7e5c93fc707a7f8427 # v4.1.4
-        with:
-          path: ./contracts/coverage-reports
-      - name: Display structure of downloaded files
-        run: ls -R coverage-reports
-        working-directory: contracts
-      - name: Generate merged report
-        run: pnpm istanbul report text text-summary
-        working-directory: contracts
-
   solidity-splits:
     needs: [changes, split-tests]
     if: needs.changes.outputs.changes == 'true'

.github/workflows/solidity.yml

@@ -26,15 +26,17 @@ jobs:
               - 'contracts/**/*'
               - '.github/workflows/solidity.yml'
               - '.github/workflows/solidity-foundry.yml'
-            old_sol:
-              - 'contracts/src/v0.6/**/*'
-              - 'contracts/src/v0.7/**/*'
+            read_only_sol:
+              - 'contracts/src/v0.8/interfaces/**/*'
+              - 'contracts/src/v0.8/automation/v1_2/**/*'
+              - 'contracts/src/v0.8/automation/v1_3/**/*'
+              - 'contracts/src/v0.8/automation/v2_0/**/*'
 
       - name: Fail if read-only files have changed
-        if: ${{ steps.changes.outputs.old_sol == 'true' }}
+        if: ${{ steps.changes.outputs.read_only_sol == 'true' }}
         run: |
           echo "One or more read-only Solidity file(s) has changed."
-          for file in ${{ steps.changes.outputs.old_sol_files }}; do
+          for file in ${{ steps.changes.outputs.read_only_sol_files }}; do
             echo "$file was changed"
           done
           exit 1

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/models.go

@@ -18,6 +18,7 @@ const (
 	InsufficientFunds                        // Tx was rejected due to insufficient funds.
 	ExceedsMaxFee                            // Attempt's fee was higher than the node's limit and got rejected.
 	FeeOutOfValidRange                       // This error is returned when we use a fee price suggested from an RPC, but the network rejects the attempt due to an invalid range(mostly used by L2 chains). Retry by requesting a new suggested fee price.
+	OutOfCounters                            // The error returned when a transaction is too complex to be proven by zk circuits. This error is mainly returned by zk chains.
 	sendTxReturnCodeLen                      // tracks the number of errors. Must always be last
 )