Merge branch 'develop' of github.com:smartcontractkit/chainlink into …

…develop

.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/wet-bags-clean.md

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

.github/CODEOWNERS

@@ -139,8 +139,7 @@ core/scripts/gateway @smartcontractkit/dev-services
 /integration-tests/**/*ccip* @smartcontractkit/ccip-offchain @smartcontractkit/core
 
 # 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/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 }}

.github/workflows/ccip-chaos-tests.yml

@@ -6,6 +6,12 @@ on:
   #   types: [ completed ]
   #   branches: [ develop ]
   workflow_dispatch:
+    inputs:
+      team:
+        description: Team to run the tests for (e.g. BIX, CCIP)
+        required: true
+        default: "ccip"
+        type: string
 
 # Only run 1 of this workflow at a time per PR
 concurrency:
@@ -15,7 +21,7 @@ concurrency:
 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
       chainlink_version: ${{ github.sha }}
@@ -25,6 +31,7 @@ jobs:
       slack_notification_after_tests: on_failure
       slack_notification_after_tests_channel_id: '#ccip-testing'
       slack_notification_after_tests_name: CCIP Chaos E2E Tests
+      team: ${{ inputs.team }}
     secrets:
       QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

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

@@ -21,7 +21,12 @@ on:
       chainlink_version:
         description: Chainlink image version to use. Commit sha if not provided
         required: false
-        type: string        
+        type: string
+      team:
+        description: Team to run the tests for (e.g. BIX, CCIP)
+        required: true
+        default: "ccip"
+        type: string
 
 # Only run 1 of this workflow at a time per PR
 concurrency:
@@ -31,7 +36,7 @@ concurrency:
 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_trigger: E2E CCIP Load Tests
@@ -41,6 +46,7 @@ jobs:
       slack_notification_after_tests_channel_id: '#ccip-testing'
       slack_notification_after_tests_name: CCIP E2E Load Tests
       test_image_suites: ccip-load
+      team: ${{ inputs.team }}
     secrets:
       QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

.github/workflows/changeset.yml

@@ -162,3 +162,42 @@ jobs:
         run: |
           echo "Please include at least one tag in the core changeset file"
           exit 1
+
+  contracts-changeset:
+    name: Contracts Changeset Checker
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+
+      - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        id: files-changed
+        with:
+          predicate-quantifier: every
+          list-files: shell
+          filters: |
+            contracts-changeset:
+              - added|modified: 'contracts/.changeset/*.md'
+
+      - name: Setup node
+        uses: ./.github/actions/setup-node
+        if: ${{ steps.files-changed.outputs.contracts-changeset == 'true' }}
+
+      - name: Validate changeset files
+        if: ${{ steps.files-changed.outputs.contracts-changeset == 'true' }}
+        working-directory: contracts
+        run: |
+          pnpm changeset version
+
+      - name: Comment Failure
+        if: ${{ failure() && steps.files-changed.outputs.contracts-changeset == 'true' }}
+        uses: thollander/actions-comment-pull-request@fabd468d3a1a0b97feee5f6b9e499eab0dd903f6 # v2.5.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          message: |
+            It appears that the changeset file you've added or modified in `contracts/.changeset` is not valid.
+            Please delete the file and run `pnpm changeset` in the contracts directory.
+

.github/workflows/integration-tests.yml

@@ -296,7 +296,7 @@ jobs:
       contents: read
     needs: [build-chainlink, changes]
     if: github.event_name == 'pull_request' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@0d4a2b2b009c87b5c366d0b97f7a8d7de2f60760
     with:
       workflow_name: Run CCIP E2E Tests For PR
       chainlink_version: ${{ inputs.evm-ref || github.sha }}
@@ -306,6 +306,7 @@ jobs:
       upload_cl_node_coverage_artifact: true
       upload_cl_node_coverage_artifact_prefix: cl_node_coverage_data_
       enable_otel_traces_for_ocr2_plugins: ${{ contains(join(github.event.pull_request.labels.*.name, ' '), 'enable tracing') }}
+      team: "CCIP"
     secrets:
       QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
@@ -337,7 +338,7 @@ jobs:
       contents: read
     needs: [build-chainlink, changes]
     if: github.event_name == 'merge_group' && (needs.changes.outputs.ccip_changes == 'true' || needs.changes.outputs.github_ci_changes == 'true')
-    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@5412507526722a7b1c5d719fa686eed5a1bc4035 # [email protected]
+    uses: smartcontractkit/.github/.github/workflows/run-e2e-tests.yml@0d4a2b2b009c87b5c366d0b97f7a8d7de2f60760
     with:
       workflow_name: Run CCIP E2E Tests For Merge Queue
       chainlink_version: ${{ inputs.evm-ref || github.sha }}
@@ -347,6 +348,7 @@ jobs:
       upload_cl_node_coverage_artifact: true
       upload_cl_node_coverage_artifact_prefix: cl_node_coverage_data_
       enable_otel_traces_for_ocr2_plugins: ${{ contains(join(github.event.pull_request.labels.*.name, ' '), 'enable tracing') }}
+      team: "CCIP"
     secrets:
       QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

.github/workflows/on-demand-ocr-soak-test.yml

@@ -34,18 +34,23 @@ on:
       slackMemberID:
         description: Slack Member ID (Not your @)
         required: true
-        default: U01A2B2C3D4        
+        default: U01A2B2C3D4
+      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.testToRun}}
       test_config_override_path: ${{ inputs.test_config_override_path }}
       chainlink_version: ${{ inputs.chainlink_version }}
       SLACK_USER: ${{ inputs.slackMemberID }}
+      team: ${{ inputs.team }}
     secrets:
       QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

.mockery.yaml

@@ -348,7 +348,7 @@ packages:
       Codec:
         config:
           dir: core/services/relay/evm/mocks
-      ChainWriter:
+      ContractWriter:
   github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_onramp:
     config:
       dir: core/gethwrappers/ccip/mocks/

contracts/.changeset/rude-badgers-tickle.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+reduce length of reportContext in OCR3

contracts/.changeset/tender-lemons-punch.md

@@ -0,0 +1,9 @@
+---
+'@chainlink/contracts': minor
+---
+
+#internal Add supportsInterface to FeeQuoter for Keystone
+
+PR issue: CCIP-4359
+
+Solidity Review issue: CCIP-3966