Merge branch 'develop' into experiment_automatic_gas

.changeset/giant-hotels-sparkle.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+remove registerUpkeep from auto v21 common

.changeset/gorgeous-crabs-repeat.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Soft delete consumer nonce in VRF coordinator v2.5

.changeset/healthy-toes-destroy.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+HeadTracker now respects the `FinalityTagEnabled` config option. If the flag is enabled, HeadTracker backfills blocks up to the latest finalized block provided by the corresponding RPC call. To address potential misconfigurations, `HistoryDepth` is now calculated from the latest finalized block instead of the head. NOTE: Consumers (e.g. TXM and LogPoller) do not fully utilize Finality Tag yet.

.changeset/mighty-timers-travel.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+make reserveAmounts to be a map

.changeset/strange-tables-occur.md

@@ -0,0 +1,21 @@
+---
+"chainlink": patch
+---
+
+Mercury jobs can now broadcast to multiple mercury servers.
+
+Previously, a single mercury server would be specified in a job spec as so:
+
+```toml
+[pluginConfig]
+serverURL = "example.com/foo"
+serverPubKey = "724ff6eae9e900270edfff233e16322a70ec06e1a6e62a81ef13921f398f6c93"
+```
+
+You may now specify multiple mercury servers, as so:
+
+```toml
+[pluginConfig]
+servers = { "example.com/foo" = "724ff6eae9e900270edfff233e16322a70ec06e1a6e62a81ef13921f398f6c93", "mercury2.example:1234/bar" = "524ff6eae9e900270edfff233e16322a70ec06e1a6e62a81ef13921f398f6c93" }
+```
+

.changeset/strong-ears-heal.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Refactor EVM ORMs to remove pg dependency

.changeset/thirty-cheetahs-unite.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+bump grafana to 1.1.1

.changeset/warm-chefs-fry.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+add version support for automation registry 2.\*

.github/workflows/ci-core.yml

@@ -17,21 +17,43 @@ on:
     - cron: "0 0 * * *"
 
 jobs:
+
+  filter: # No need to run core tests if there are only changes to the integration-tests
+    name: Detect Changes
+    permissions:
+      pull-requests: read
+    outputs:
+      changes: ${{ steps.changes.outputs.changes }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repo
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          repository: smartcontractkit/chainlink
+      - uses: dorny/paths-filter@0bc4621a3135347011ad047f9ecf449bf72ce2bd # v3.0.0
+        id: changes
+        with:
+          filters: |
+            changes:
+              - '!integration-tests/**'
+
   golangci:
     # We don't directly merge dependabot PRs, so let's not waste the resources
-    if: ${{ github.event_name == 'pull_request' ||  github.event_name == 'schedule' && github.actor != 'dependabot[bot]'}}
+    if: ${{ github.event_name == 'pull_request' ||  github.event_name == 'schedule' && github.actor != 'dependabot[bot]' }}
     name: lint
     runs-on: ubuntu20.04-8cores-32GB
+    needs: [filter]
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 
       - name: Golang Lint
         uses: ./.github/actions/golangci-lint
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         with:
           gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
           gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
       - name: Notify Slack
-        if: ${{ failure() && (github.event_name == 'merge_group' || github.event.branch == 'develop')}}
+        if: ${{ failure() && (github.event_name == 'merge_group' || github.event.branch == 'develop') &&  needs.filter.outputs.changes == 'true' }}
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
@@ -47,35 +69,47 @@ jobs:
     name: Core Tests (${{ matrix.cmd }})
     # We don't directly merge dependabot PRs, so let's not waste the resources
     if: github.actor != 'dependabot[bot]'
+    needs: [filter]
     runs-on: ubuntu20.04-64cores-256GB
     env:
       CL_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/chainlink_test?sslmode=disable
     steps:
       - name: Checkout the repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup node
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
       - name: Setup NodeJS
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-nodejs
         with:
           prod: "true"
       - name: Setup Go
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-go
       - name: Setup Solana
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-solana
       - name: Setup wasmd
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-wasmd
       - name: Setup Postgres
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-postgres
       - name: Touching core/web/assets/index.html
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: mkdir -p core/web/assets && touch core/web/assets/index.html
       - name: Download Go vendor packages
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go mod download
       - name: Build binary
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go build -o chainlink.test .
       - name: Setup DB
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: ./chainlink.test local db preparetest
       - name: Install LOOP Plugins
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: |
           pushd $(go list -m -f "{{.Dir}}" github.com/smartcontractkit/chainlink-feeds)
           go install ./cmd/chainlink-feeds
@@ -90,31 +124,32 @@ jobs:
           go install ./pkg/chainlink/cmd/chainlink-starknet
           popd
       - name: Increase Race Timeout
-        if: github.event.schedule != ''
+        if: ${{ github.event.schedule != '' && needs.filter.outputs.changes == 'true' }}
         run: |
           echo "TIMEOUT=10m" >> $GITHUB_ENV
           echo "COUNT=50" >> $GITHUB_ENV
       - name: Run tests
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         id: run-tests
         env:
           OUTPUT_FILE: ./output.txt
           USE_TEE: false
         run: ./tools/bin/${{ matrix.cmd }} ./...
       - name: Print Filtered Test Results
-        if: ${{ failure() && matrix.cmd == 'go_core_tests' }}
+        if: ${{ failure() && matrix.cmd == 'go_core_tests' && needs.filter.outputs.changes == 'true' }}
         uses: smartcontractkit/chainlink-github-actions/go/go-test-results-parsing@c67a09566412d153ff7640d99f96b43aa03abc04 # v2.3.6
         with:
           results-file: ./output.txt
           output-file: ./output-short.txt
       - name: Print Races
-        if: ${{ failure() && matrix.cmd == 'go_core_race_tests' }}
+        if: ${{ failure() && matrix.cmd == 'go_core_race_tests' && needs.filter.outputs.changes == 'true' }}
         run: find race.* | xargs cat
       - name: Print postgres logs
-        if: always()
+        if: ${{ always() &&  needs.filter.outputs.changes == 'true' }}
         run: docker compose logs postgres | tee ../../../postgres_logs.txt
         working-directory: ./.github/actions/setup-postgres
       - name: Store logs artifacts
-        if: always()
+        if: ${{ needs.filter.outputs.changes == 'true' && always() }}
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: ${{ matrix.cmd }}_logs
@@ -125,15 +160,15 @@ jobs:
             ./coverage.txt
             ./postgres_logs.txt
       - name: Notify Slack
-        if: ${{ failure() && matrix.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.event.branch == 'develop') }}
+        if: ${{ failure() && matrix.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.event.branch == 'develop') &&  needs.filter.outputs.changes == 'true' }}
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
         with:
           channel-id: "#topic-data-races"
           slack-message: "Race tests failed: ${{ job.html_url }}\n${{ format('https://github.com/smartcontractkit/chainlink/actions/runs/{0}', github.run_id) }}"
       - name: Collect Metrics
-        if: always()
+        if: ${{ needs.filter.outputs.changes == 'true' && always() }}
         id: collect-gha-metrics
         uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
         with:
@@ -145,40 +180,51 @@ jobs:
         continue-on-error: true
 
   detect-flakey-tests:
-    needs: [core]
+    needs: [filter, core]
     name: Flakey Test Detection
     runs-on: ubuntu-latest
-    if: always()
+    if: ${{ always() && github.actor != 'dependabot[bot]' }} 
     env:
       CL_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/chainlink_test?sslmode=disable
     steps:
       - name: Checkout the repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Setup node
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
       - name: Setup NodeJS
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-nodejs
         with:
           prod: "true"
       - name: Setup Go
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-go
       - name: Setup Postgres
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: ./.github/actions/setup-postgres
       - name: Touching core/web/assets/index.html
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: mkdir -p core/web/assets && touch core/web/assets/index.html
-      - name: Download Go vendor packages
+      - name: Download Go vendor packages 
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go mod download
       - name: Build binary
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go build -o chainlink.test .
       - name: Setup DB
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: ./chainlink.test local db preparetest
       - name: Load test outputs
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
         with:
           path: ./artifacts
       - name: Build flakey test runner
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go build ./tools/flakeytests/cmd/runner
       - name: Re-run tests
+        if: ${{ needs.filter.outputs.changes == 'true' }}
         env:
           GRAFANA_INTERNAL_BASIC_AUTH: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -200,7 +246,7 @@ jobs:
             -command=./tools/bin/go_core_tests \
             `ls -R ./artifacts/go_core_tests*/output.txt`
       - name: Store logs artifacts
-        if: always()
+        if: ${{ needs.filter.outputs.changes == 'true' && always() }}
         uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: flakey_test_runner_logs
@@ -210,7 +256,7 @@ jobs:
   scan:
     name: SonarQube Scan
     needs: [core]
-    if: ${{ always() }}
+    if: ${{ always() && github.actor != 'dependabot[bot]' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repo
@@ -248,7 +294,7 @@ jobs:
 
   clean:
     name: Clean Go Tidy & Generate
-    if: ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') }}
+    if: ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') && github.actor != 'dependabot[bot]' }}
     runs-on: ubuntu20.04-8cores-32GB
     defaults:
       run:

.github/workflows/integration-tests.yml

@@ -529,7 +529,7 @@ jobs:
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
-            nodes: 4
+            nodes: 5
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2plus-evm-simulated
           - name: forwarder_ocr
@@ -699,13 +699,15 @@ jobs:
     if: always()
     runs-on: ubuntu-latest
     name: ETH Smoke Tests
-    needs: [eth-smoke-tests-matrix, eth-smoke-tests-matrix-automation]
+    needs: [eth-smoke-tests-matrix, eth-smoke-tests-matrix-automation, eth-smoke-tests-matrix-log-poller]
     # needs: [eth-smoke-tests-matrix]
     steps:
       - name: Check smoke test matrix status
-        if: needs.eth-smoke-tests-matrix.result != 'success' || needs.eth-smoke-tests-matrix-automation.result != 'success'
+        if: needs.eth-smoke-tests-matrix.result != 'success' || needs.eth-smoke-tests-matrix-automation.result != 'success' || needs.eth-smoke-tests-matrix-log-poller.result != 'success'
         run: |
-          echo "${{ needs.eth-smoke-tests-matrix.result }}"
+          echo "ETH Smoke Tests: ${{ needs.eth-smoke-tests-matrix.result }}"
+          echo "Automation: ${{ needs.eth-smoke-tests-matrix-automation.result }}"
+          echo "Log Poller: ${{ needs.eth-smoke-tests-matrix-log-poller.result }}"
           exit 1
       - name: Collect Metrics
         if: always()