Merge branch 'develop' into fix/update-estimate-gas-limit-config

.changeset/afraid-plums-look.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal updated to latest operator-ui to bring in new UI changes for supporting multiple job distributors

.changeset/cyan-spies-dream.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal validate capability trigger event ID before executing

.changeset/tiny-doors-brush.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+moved deployments ccip tooling from ccip repo to chainlink repo #added

.github/CODEOWNERS

@@ -13,6 +13,7 @@
 /core/services/directrequest @smartcontractkit/keepers
 /core/services/feeds @smartcontractkit/FMS
 /core/services/synchronization/telem @smartcontractkit/realtime
+/core/capabilities/ccip @smartcontractkit/ccip-offchain
 
 # To be deprecated in Chainlink V3
 /core/services/fluxmonitorv2 @smartcontractkit/foundations

.github/workflows/ci-core.yml

@@ -45,7 +45,9 @@ jobs:
         with:
           filters: |
             changes:
+              - 'integration-tests/deployment/**'
               - '!integration-tests/**'
+              - 'integration-tests/deployment/**'
       - name: Ignore Filter On Workflow Dispatch
         if: ${{ github.event_name == 'workflow_dispatch' }}
         id: ignore-filter

.github/workflows/client-compatibility-tests.yml

@@ -710,7 +710,7 @@ jobs:
                       "type": "section",
                       "text": {
                         "type": "mrkdwn",
-                        "text": "${{ contains(join(needs.*.result, ','), 'failure') && format('Some tests failed, notifying <!subteam^{0}|{0}>', secrets.COMPAT_SLACK_NOTIFICATION_HANDLE) || 'All Good!' }}"
+                        "text": "${{ contains(join(needs.*.result, ','), 'failure') && format('Some tests failed, notifying <!subteam^{0}|bix-scale-eng>', secrets.COMPAT_SLACK_NOTIFICATION_HANDLE) || 'All Good!' }}"
                       }
                     },
                     {

.github/workflows/integration-tests.yml

@@ -165,7 +165,7 @@ jobs:
           test_download_vendor_packages_command: cd ${{ matrix.project.path }} && go mod download
           go_mod_path: ${{ matrix.project.path }}/go.mod
           cache_key_id: ${{ matrix.project.cache_id }}
-          cache_restore_only: "true"          
+          cache_restore_only: "true"
       - name: Lint Go
         uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0
         with:
@@ -262,11 +262,11 @@ jobs:
       GRAFANA_INTERNAL_BASIC_AUTH: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN: ${{ secrets.AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN }}
-      AWS_API_GW_HOST_GRAFANA: ${{ secrets.AWS_API_GW_HOST_GRAFANA }}    
-      SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}    
+      AWS_API_GW_HOST_GRAFANA: ${{ secrets.AWS_API_GW_HOST_GRAFANA }}
+      SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
 
   run-ccip-e2e-tests-workflow:
     name: Run CCIP E2E Tests
@@ -298,12 +298,12 @@ jobs:
       GRAFANA_INTERNAL_BASIC_AUTH: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
       GRAFANA_INTERNAL_HOST: ${{ secrets.GRAFANA_INTERNAL_HOST }}
       GRAFANA_INTERNAL_URL_SHORTENER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       AWS_REGION: ${{ secrets.QA_AWS_REGION }}
       AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN: ${{ secrets.AWS_OIDC_IAM_ROLE_VALIDATION_PROD_ARN }}
-      AWS_API_GW_HOST_GRAFANA: ${{ secrets.AWS_API_GW_HOST_GRAFANA }}    
-      SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}      
-      
+      AWS_API_GW_HOST_GRAFANA: ${{ secrets.AWS_API_GW_HOST_GRAFANA }}
+      SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
+
   check-e2e-test-results:
     if: always()
     name: ETH Smoke Tests
@@ -341,11 +341,11 @@ jobs:
           slack-message: ":x: :mild-panic-intensifies: Node Migration Tests Failed: \n${{ format('https://github.com/{0}/actions/runs/{1}', github.repository, github.run_id) }}\n${{ format('Notifying <!subteam^{0}|{0}>', secrets.GUARDIAN_SLACK_NOTIFICATION_HANDLE) }}"
 
       - name: Fail the job if core tests not successful
-        if: always() && needs.run-core-e2e-tests-workflow.result != 'success'
+        if: always() && needs.run-core-e2e-tests-workflow.result == 'failure'
         run: exit 1
 
       - name: Fail the job if lint not successful
-        if: always() && needs.lint-integration-tests.result != 'success'
+        if: always() && needs.lint-integration-tests.result == 'failure'
         run: exit 1
 
   cleanup:

.github/workflows/solidity-foundry-artifacts.yml

@@ -374,7 +374,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           ARTIFACTS=$(gh api -X GET repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts)
-          ARTIFACT_ID=$(echo "$ARTIFACTS" | jq '.artifacts[] | select(.name=="review-artifacts-${{ inputs.product }}-${{ env.head_ref }}") | .id')
+          ARTIFACT_ID=$(echo "$ARTIFACTS" | jq '.artifacts[] | select(.name=="review-artifacts-${{ inputs.product }}-${{ inputs.base_ref }}-${{ env.head_ref }}") | .id')
           echo "Artifact ID: $ARTIFACT_ID"
           
           echo "# Solidity Review Artifact Generated" >> $GITHUB_STEP_SUMMARY
@@ -404,7 +404,7 @@ jobs:
           HEAD_REF: ${{ env.head_ref }}
           ARTIFACT_URL: ${{ steps.gather-all-artifacts.outputs.artifact-url }}
 
-          JIRA_HOST: ${{ vars.JIRA_HOST }} 
+          JIRA_HOST: ${{ vars.JIRA_HOST }}
           JIRA_USERNAME: ${{ secrets.JIRA_USERNAME }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
 

GNUmakefile

@@ -128,7 +128,7 @@ presubmit: ## Format go files and imports.
 
 .PHONY: gomods
 gomods: ## Install gomods
-	go install github.com/jmank88/gomods@v0.1.3
+	go install github.com/jmank88/gomods@v0.1.4
 
 .PHONY: mockery
 mockery: $(mockery) ## Install mockery.

contracts/.changeset/forty-radios-brush.md

@@ -0,0 +1,8 @@
+---
+'@chainlink/contracts': patch
+---
+
+Add Configurator contract
+
+
+MERC-6185

contracts/gas-snapshots/llo-feeds.gas-snapshot

@@ -88,7 +88,7 @@ DestinationFeeManagerProcessFeeTest:test_poolIdsCannotBeZeroAddress() (gas: 1179
 DestinationFeeManagerProcessFeeTest:test_processFeeAsProxy() (gas: 123807)
 DestinationFeeManagerProcessFeeTest:test_processFeeDefaultReportsStillVerifiesWithEmptyQuote() (gas: 29767)
 DestinationFeeManagerProcessFeeTest:test_processFeeEmitsEventIfNotEnoughLink() (gas: 167721)
-DestinationFeeManagerProcessFeeTest:test_processFeeIfSubscriberIsSelf() (gas: 30107)
+DestinationFeeManagerProcessFeeTest:test_processFeeIfSubscriberIsSelf() (gas: 32607)
 DestinationFeeManagerProcessFeeTest:test_processFeeNative() (gas: 180514)
 DestinationFeeManagerProcessFeeTest:test_processFeeUsesCorrectDigest() (gas: 125076)
 DestinationFeeManagerProcessFeeTest:test_processFeeWithDefaultReportPayloadAndQuoteStillVerifies() (gas: 31844)
@@ -299,7 +299,7 @@ FeeManagerProcessFeeTest:test_payLinkDeficitTwice() (gas: 198803)
 FeeManagerProcessFeeTest:test_processFeeAsProxy() (gas: 117088)
 FeeManagerProcessFeeTest:test_processFeeDefaultReportsStillVerifiesWithEmptyQuote() (gas: 27462)
 FeeManagerProcessFeeTest:test_processFeeEmitsEventIfNotEnoughLink() (gas: 163205)
-FeeManagerProcessFeeTest:test_processFeeIfSubscriberIsSelf() (gas: 27827)
+FeeManagerProcessFeeTest:test_processFeeIfSubscriberIsSelf() (gas: 30327)
 FeeManagerProcessFeeTest:test_processFeeNative() (gas: 173826)
 FeeManagerProcessFeeTest:test_processFeeUsesCorrectDigest() (gas: 118379)
 FeeManagerProcessFeeTest:test_processFeeWithDefaultReportPayloadAndQuoteStillVerifies() (gas: 29536)

contracts/scripts/native_solc_compile_all_llo-feeds

@@ -36,13 +36,9 @@ compileContract llo-feeds/v0.4.0/DestinationVerifier.sol
 compileContract llo-feeds/v0.4.0/DestinationVerifierProxy.sol
 compileContract llo-feeds/v0.4.0/DestinationFeeManager.sol
 compileContract llo-feeds/v0.4.0/DestinationRewardManager.sol
-
+compileContract llo-feeds/v0.5.0/configuration/ChannelConfigStore.sol
+compileContract llo-feeds/v0.5.0/configuration/Configurator.sol
 
 # Test | Mocks
 compileContract llo-feeds/v0.3.0/test/mocks/ErroredVerifier.sol
 compileContract llo-feeds/v0.3.0/test/mocks/ExposedVerifier.sol
-
-# LLO
-compileContract llo-feeds/dev/ChannelConfigStore.sol
-compileContract llo-feeds/dev/ChannelVerifier.sol
-compileContract llo-feeds/dev/test/mocks/ExposedChannelVerifier.sol