Merge branch 'develop' into re-3199/updater-root-module-go.mod-ref

.changeset/afraid-houses-learn.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#updated use real contracts in ccipreader_tests where possible

.changeset/breezy-kings-clean.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Potential bug introduced from chain selector refactor, not causing issue now since only EVM is used, but need to fix #bugfix

.changeset/cool-penguins-raise.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated Remove custom ed25519 private to public key conversion.

.changeset/fuzzy-hairs-appear.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Prometheus observability layer added to OCR3 Reporting Plugins #internal

.changeset/late-doors-battle.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fix TransactionSender go routine leak. #bugfix

.changeset/popular-rules-live.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fixes a race condition with the Finalizer when clearing txs #bugfix

.changeset/spotty-knives-smile.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Increase GasLimit for Automation on ZKsync to 6M #nops

.changeset/tricky-clouds-move.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Updated Solana TXM to store prebroadcast transaction errors caught upfront by simulation. Refactored error parsing to more easily introduce new error cases. Optimized storing finalized and errored transaction to minimize memory usage. #updated

.changeset/wet-bags-clean.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Change ChainWriter naming to ContractWriter to consolidate Relayer chain interfaces #internal

.github/CODEOWNERS

@@ -133,14 +133,13 @@ core/scripts/gateway @smartcontractkit/dev-services
 
 # Tests
 /integration-tests/ @smartcontractkit/test-tooling-team @smartcontractkit/core
-/integration-tests/ccip-tests @smartcontractkit/ccip-offchain @smartcontractkit/core
+/integration-tests/ccip-tests @smartcontractkit/ccip-offchain @smartcontractkit/core @smartcontractkit/ccip
 /integration-tests/**/*keeper* @smartcontractkit/dev-services @smartcontractkit/core
 /integration-tests/**/*automation* @smartcontractkit/dev-services @smartcontractkit/core
-/integration-tests/**/*ccip* @smartcontractkit/ccip-offchain @smartcontractkit/core
+/integration-tests/**/*ccip* @smartcontractkit/ccip-offchain @smartcontractkit/core @smartcontractkit/ccip
 
 # Deployment tooling
-# Initially the common structures owned by CCIP
-/deployment @smartcontractkit/ccip @smartcontractkit/keystone @smartcontractkit/core
+/deployment @smartcontractkit/ccip @smartcontractkit/keystone @smartcontractkit/core @smartcontractkit/deployment-automation
 /deployment/ccip @smartcontractkit/ccip @smartcontractkit/core
 /deployment/keystone @smartcontractkit/keystone @smartcontractkit/core
 # TODO: As more products add their deployment logic here, add the team as an owner

.github/actions/version-file-bump/action.yml

@@ -1,5 +1,5 @@
 name: version-file-bump
-description: "Ensure that the VERSION file has been bumped since the last release."
+description: "Ensure that the package.json version field has been bumped since the last release."
 inputs:
   github-token:
     description: "Github access token"

.github/e2e-tests.yml

@@ -948,27 +948,27 @@ runner-test-matrix:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
 
-  - id: smoke/ccip/ccip_batching_test.go:*
-    path: integration-tests/smoke/ccip/ccip_batching_test.go
+  - id: smoke/ccip/ccip_token_transfer_test.go:*
+    path: integration-tests/smoke/ccip/ccip_token_transfer_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_batching_test.go -timeout 12m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_token_transfer_test.go -timeout 16m -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,SIMULATED_3
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
 
-  - id: smoke/ccip/ccip_token_transfer_test.go:*
-    path: integration-tests/smoke/ccip/ccip_token_transfer_test.go
+  - id: smoke/ccip/ccip_ooo_execution_test.go:*
+    path: integration-tests/smoke/ccip/ccip_ooo_execution_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_token_transfer_test.go -timeout 16m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/ && go test smoke/ccip/ccip_ooo_execution_test.go -timeout 16m -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
@@ -987,6 +987,45 @@ runner-test-matrix:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2,SIMULATED_3
       E2E_JD_VERSION: 0.6.0
 
+  - id: smoke/ccip/ccip_message_limitations_test.go:*
+    path: integration-tests/smoke/ccip/ccip_message_limitations_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -run '^Test_CCIPMessageLimitations' -timeout 18m -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.6.0
+
+  - id: smoke/ccip/ccip_token_price_updates_test.go:*
+    path: integration-tests/smoke/ccip/ccip_token_price_updates_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_token_price_updates_test.go -timeout 18m -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.6.0
+
+  - id: smoke/ccip/ccip_gas_price_updates_test.go:*
+    path: integration-tests/smoke/ccip/ccip_gas_price_updates_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_gas_price_updates_test.go -timeout 18m -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.6.0
+
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOnTwoLanesIncludingBatching$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
     test_env_type: docker

.github/integration-in-memory-tests.yml

@@ -31,4 +31,21 @@ runner-test-matrix:
     triggers:
       - PR Integration CCIP Tests
     test_cmd: cd integration-tests/smoke/ccip && go test ccip_fee_boosting_test.go -timeout 12m -test.parallel=2 -count=1 -json
+
+  - id: smoke/ccip/ccip_batching_test.go:*
+    path: integration-tests/smoke/ccip/ccip_batching_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_batching_test.go -timeout 12m -test.parallel=2 -count=1 -json
+
+  - id: contracts/ccipreader_test.go:*
+    path: integration-tests/contracts/ccipreader_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/contracts && go test ccipreader_test.go -timeout 5m -test.parallel=1 -count=1 -json
+
   # END: CCIP tests

.github/workflows/automation-benchmark-tests.yml

@@ -20,17 +20,22 @@ on:
         required: true
         default: benchmark
         type: string
+      team:
+        description: Team to run the tests for (e.g. BIX, CCIP)
+        required: true
+        type: string
 
 jobs:
   run-e2e-tests-workflow:
     name: Run E2E Tests
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@0d4a2b2b009c87b5c366d0b97f7a8d7de2f60760
     with:
       test_path: .github/e2e-tests.yml
       test_ids: '${{ inputs.testType }}/automation_test.go:TestAutomationBenchmark'
       test_config_override_path: ${{ inputs.test_config_override_path }}
       SLACK_USER: ${{ inputs.slackMemberID }}
       SLACK_CHANNEL: C03KJ5S7KEK
+      team: ${{ inputs.team }}
     secrets:
       QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

.github/workflows/automation-load-tests.yml

@@ -14,18 +14,23 @@ on:
         description: Notifies test results (Not your @)
         required: true
         default: U02Q14G80TY
-        type: string         
+        type: string
+      team:
+        description: Team to run the tests for (e.g. BIX, CCIP)
+        required: true
+        type: string
 
 jobs:
   run-e2e-tests-workflow:
     name: Run E2E Tests
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@0d4a2b2b009c87b5c366d0b97f7a8d7de2f60760
     with:
       test_path: .github/e2e-tests.yml
       test_ids: 'load/automationv2_1/automationv2_1_test.go:TestLogTrigger'
       test_config_override_path: ${{ inputs.test_config_override_path }}
       SLACK_USER: ${{ inputs.slackMemberID }}
       SLACK_CHANNEL: C03KJ5S7KEK
+      team: ${{ inputs.team }}
     secrets:
       QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

.github/workflows/automation-ondemand-tests.yml

@@ -38,7 +38,11 @@ on:
       with_existing_remote_runner_version:
         description: 'Tag of the existing remote runner version to use (Leave empty to build from head/ref)' 
         required: false
-        type: string                 
+        type: string
+      team:
+        description: Team to run the tests for (e.g. BIX, CCIP)
+        required: true
+        type: string
 
 jobs:
   # Set tests to run based on the workflow inputs
@@ -153,14 +157,15 @@ jobs:
   call-run-e2e-tests-workflow:
     name: Run E2E Tests
     needs: set-tests-to-run
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@0d4a2b2b009c87b5c366d0b97f7a8d7de2f60760
     with:
       test_path: .github/e2e-tests.yml
       test_list: ${{ needs.set-tests-to-run.outputs.test_list }}
       require_chainlink_image_versions_in_qa_ecr: ${{ needs.set-tests-to-run.outputs.require_chainlink_image_versions_in_qa_ecr }}
       with_existing_remote_runner_version: ${{ github.event.inputs.with_existing_remote_runner_version }}
       test_log_upload_on_failure: true
       test_log_upload_retention_days: 7
+      team: ${{ inputs.team }}
     secrets:
       QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}