Merge branch 'develop' into demo-working-changes-test

.changeset/brave-frogs-greet.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+update plugin and evm chainwriter to remove evmConfig dependency #updated

.changeset/forty-foxes-watch.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Updated Solana TXM's in-memory storage to track statuses across the Solana transaction lifecycle. Added a method to translate Solana transaction statuses into states expected by the ChainWriter interface. Made the duration transactions are retained in storage after finality or error configurable using `TxRetentionTimeout`. #added

.changeset/good-roses-smash.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Fix Contract Reader data word index calculation and change ccip contract reader config for more optimal querying.

.changeset/great-spiders-greet.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fixed outdated headtracker config doc. #internal

.changeset/many-carrots-share.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Update ccip contract reader cfg for ccip message sent to use output codec wrapper modifier

.changeset/neat-singers-notice.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Added multiple blocks history estimator feature and config for Solana TXM. #added

.changeset/nine-stingrays-march.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Add don_id to Mercury Enhanced EA telemetry #added

.changeset/purple-shrimps-invent.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Upgrade go-ethereum to v1.14.11 #internal

.changeset/short-gifts-eat.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+use last mined nonce instead of pending nonce to recover from occasional nonce gap issues within nonce tracker. #internal

.changeset/silent-goats-jog.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fix HeadTracker tests caused by simulated client update #internal

.changeset/six-wombats-shake.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+CCIP token transfer integration tests #internal

.changeset/small-gifts-play.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#updated Operator UI to support StreamSpec job definition

.changeset/strange-radios-teach.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Merge raw configs correctly #bugfix

.changeset/swift-fireants-compare.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Add CSA authentication support to Beholder #added

.changeset/tender-colts-return.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#updated celo alfajores config

.changeset/thick-chefs-deliver.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Enable AutoPurge feature on all affected chains #nops

.github/CODEOWNERS

@@ -35,6 +35,10 @@
 /core/services/ccip @smartcontractkit/ccip
 /core/services/ocr2/plugins/ccip @smartcontractkit/ccip
 
+# CCIP
+/core/services/ccip @smartcontractkit/ccip
+/core/services/ocr2/plugins/ccip @smartcontractkit/ccip
+
 # VRF-related services
 /core/services/vrf @smartcontractkit/dev-services @smartcontractkit/core
 /core/services/blockhashstore @smartcontractkit/dev-services @smartcontractkit/core

.github/actions/golangci-lint/action.yml

@@ -1,10 +1,6 @@
 name: CI lint for Golang
 description: Runs CI lint for Golang
 inputs:
-  # general inputs
-  name:
-    description: Name of the lint action
-    required: true
   go-directory:
     description: Go directory to run commands from
     default: "."
@@ -25,10 +21,17 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/checkout@v4.2.1
+    - name: Checkout repo (full)
+      uses: actions/checkout@v4.2.1
+      # Only do a full checkout on merge_groups
+      if: github.event_name == 'merge_group'
       with:
-        # We only need a full clone on merge_group events for golangci-lint.
-        fetch-depth: ${{ github.event_name == 'merge_group' && '0' || '1' }}"
+        fetch-depth: 0
+    - name: Checkout repo
+      uses: actions/checkout@v4.2.1
+      if: github.event_name != 'merge_group'
+      with:
+        fetch-depth: 1
     - name: Setup Go
       uses: ./.github/actions/setup-go
       with:

.github/actions/setup-go/action.yml

@@ -85,7 +85,7 @@ runs:
     - uses: actions/cache/restore@v4.1.1
       name: Cache Go Build Outputs (restore)
       # For certain events, we don't necessarily want to create a build cache, but we will benefit from restoring from one. 
-      if: ${{ inputs.only-modules == 'false' && (github.event == 'merge_group' || inputs.restore-build-cache-only == 'true') }}
+      if: ${{ inputs.only-modules == 'false' && (github.event_name == 'merge_group' || inputs.restore-build-cache-only == 'true') }}
       with:
         path: |
           ${{ steps.go-cache-dir.outputs.gobuildcache }}
@@ -98,7 +98,7 @@ runs:
 
     - uses: actions/cache@v4.1.1
       # don't save cache on merge queue events
-      if: ${{ inputs.only-modules == 'false' && (github.event != 'merge_group' && inputs.restore-build-cache-only == 'false') }}
+      if: ${{ inputs.only-modules == 'false' && (github.event_name != 'merge_group' && inputs.restore-build-cache-only == 'false') }}
       name: Cache Go Build Outputs
       with:
         path: |

.github/e2e-tests.yml

@@ -948,6 +948,20 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.4.0
+
+  - id: smoke/ccip_messaging_test.go:*
+    path: integration-tests/smoke/ccip_messaging_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Merge Queue E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/ && go test smoke/ccip_messaging_test.go -timeout 12m -test.parallel=1 -count=1 -json
+    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
+    test_env_vars:
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
+      E2E_JD_VERSION: 0.4.0
 
   # END: CCIPv1.6 tests
 
@@ -1178,4 +1192,4 @@ runner-test-matrix:
       TEST_LOG_LEVEL: debug
       E2E_TEST_GRAFANA_DASHBOARD_URL: /d/6vjVx-1V8/ccip-long-running-tests
 
-  # END: CCIP tests
+  # END: CCIP tests

.github/workflows/build-publish-develop-pr.yml

@@ -24,7 +24,10 @@ on:
         default: "false"
 
 env:
-  GIT_REF: ${{ github.event.inputs.git_ref || github.ref }}
+  # Use github.sha here otherwise a race condition exists if
+  # a commit is pushed to develop before merge is run.
+  CHECKOUT_REF: ${{ github.event.inputs.git_ref || github.sha }}
+
 
 jobs:
   merge:
@@ -38,7 +41,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4.2.1
         with:
-          ref: ${{ env.GIT_REF }}
+          ref: ${{ env.CHECKOUT_REF }}
 
       - name: Configure aws credentials
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
@@ -48,13 +51,13 @@ jobs:
           mask-aws-account-id: true
           role-session-name: "merge"
 
-      - uses: actions/cache/restore@v4
+      - uses: actions/cache/restore@v4.1.1
         with:
           path: dist/linux_amd64_v1
           key: chainlink-amd64-${{ github.sha }}
           fail-on-cache-miss: true
 
-      - uses: actions/cache/restore@v4
+      - uses: actions/cache/restore@v4.1.1
         with:
           path: dist/linux_arm64_v8.0
           key: chainlink-arm64-${{ github.sha }}
@@ -91,7 +94,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4.2.1
         with:
-          ref: ${{ env.GIT_REF }}
+          ref: ${{ env.CHECKOUT_REF }}
           fetch-depth: 0
 
       - name: Configure aws credentials
@@ -103,7 +106,7 @@ jobs:
           role-session-name: "split-${{ matrix.goarch }}"
 
       - id: cache
-        uses: actions/cache@v4
+        uses: actions/cache@v4.1.1
         with:
           path: dist/${{ matrix.dist_name }}
           key: chainlink-${{ matrix.goarch }}-${{ github.sha }}
@@ -125,9 +128,9 @@ jobs:
       release-type: ${{ steps.get-image-tag.outputs.release-type }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.1
         with:
-          ref: ${{ env.GIT_REF }}
+          ref: ${{ env.CHECKOUT_REF }}
 
       - name: Get image tag
         id: get-image-tag

.github/workflows/changeset.yml

@@ -30,6 +30,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.2.1
+        with:
+          fetch-depth: 0
 
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: files-changed