Merge branch 'develop' into chore/l2ep-codeowners

.changeset/gorgeous-lobsters-argue.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#changed Connect to multiple feeds managers on app start instead of just one (default to first)

.changeset/kind-houses-smile.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal index don ID in ConfigSet event

.changeset/moody-turkeys-provide.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#changed Allow registration of more than 1 feeds manager on CreateFeedsManager

.changeset/sixty-fireants-return.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal gas limit default value

.github/workflows/changeset.yml

@@ -92,7 +92,7 @@ jobs:
           pnpm install && pnpm issue:update 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          JIRA_HOST: ${{ secrets.JIRA_HOST }}
+          JIRA_HOST: ${{ vars.JIRA_HOST }}
           JIRA_USERNAME: ${{ secrets.JIRA_USERNAME }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
           CHAINLINK_VERSION: ${{ steps.chainlink-version.outputs.chainlink_version }}

.github/workflows/crib-integration-test.yml

@@ -104,7 +104,7 @@ jobs:
           # RESTY_DEBUG: true
           TEST_PERSISTENCE: true
         run: |-
-          go test -v -run TestCRIB
+          go test -v -run TestCRIBChaos
       - name: Destroy CRIB Environment
         id: destroy
         if: always() && steps.deploy-crib.outputs.devspace-namespace != ''

.github/workflows/on-demand-vrfv2plus-smoke-tests.yml

@@ -0,0 +1,115 @@
+name: On Demand VRFV2 Plus Smoke Tests
+on:
+  workflow_dispatch:
+    inputs:
+      base64Config:
+        description: base64-ed config
+        required: true
+        type: string
+      test_suite:
+        description: "Test Suite to run"
+        required: true
+        type: choice
+        options:
+          - "All Tests"
+          - "Selected Tests"
+      test_list_regex:
+        description: "Regex for 'Selected Tests' to run"
+        required: false
+        default: "(TestVRFv2Plus$/(Link_Billing|Native_Billing|Direct_Funding)|TestVRFV2PlusWithBHS|TestVRFV2PlusWithBHF)"
+      test_secrets_override_key:
+        description: 'Key to run tests with custom test secrets'
+        required: false
+        type: string
+
+jobs:
+  vrfv2plus_smoke_test:
+    name: VRFV2 Plus Smoke Test
+    environment: integration
+    runs-on: ubuntu22.04-8cores-32GB
+    permissions:
+      checks: write
+      pull-requests: write
+      id-token: write
+      contents: read
+    env:
+      LOKI_URL: ${{ secrets.LOKI_URL }}
+      LOKI_TENANT_ID: ${{ secrets.LOKI_TENANT_ID }}
+      LOKI_BASIC_AUTH: ${{ secrets.LOKI_BASIC_AUTH }}
+      TEST_LOG_LEVEL: debug
+      REF_NAME: ${{ github.head_ref || github.ref_name }}
+      SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
+      SLACK_CHANNEL: ${{ secrets.QA_VRF_SLACK_CHANNEL }}
+      GRAFANA_URL: "http://localhost:8080/primary"
+      GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
+      GRAFANA_BEARER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
+      WASP_LOG_LEVEL: info
+    steps:
+      - name: Collect Metrics
+        id: collect-gha-metrics
+        uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
+        with:
+          id: on-demand-vrfv2plus-smoke-tests
+          org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
+          this-job-name: ${{ inputs.network }} VRFV2 Plus Smoke Test
+        continue-on-error: true
+      - name: Checkout code
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          fetch-depth: 0
+      - name: Mask base64 config
+        run: |
+          BASE64_CONFIG_OVERRIDE=$(jq -r '.inputs.base64Config' $GITHUB_EVENT_PATH)
+          echo ::add-mask::$BASE64_CONFIG_OVERRIDE
+          echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV
+      - name: Merge and export base64 config
+        uses: ./.github/actions/setup-merge-base64-config
+        with:
+          base64Config: ${{ env.BASE64_CONFIG_OVERRIDE }}
+      - name: Send details to Step Summary
+        shell: bash
+        run: |
+          echo "### chainlink image used for this test run :link:" >>$GITHUB_STEP_SUMMARY
+          echo "\`${{ env.CHAINLINK_IMAGE }}\`" >>$GITHUB_STEP_SUMMARY
+          echo "### chainlink-tests image tag for this test run :ship:" >>$GITHUB_STEP_SUMMARY
+          echo "\`${GITHUB_SHA}\`" >>$GITHUB_STEP_SUMMARY
+          echo "### Networks on which test was run" >>$GITHUB_STEP_SUMMARY
+          echo "\`${{ env.NETWORKS }}\`" >>$GITHUB_STEP_SUMMARY
+      - name: Run Tests
+        if: ${{ github.event.inputs.test_suite == 'Selected Tests' }}
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@2967f2287bd3f3ddbac7b476e9568993df01796e # v2.3.27
+        with:
+          test_command_to_run: cd ./integration-tests/smoke && go test -v -count=1 -parallel=1 -timeout 2h -run "${{ inputs.test_list_regex }}"
+          test_download_vendor_packages_command: cd ./integration-tests && go mod download
+          test_secrets_override_base64: ${{ secrets[inputs.test_secrets_override_key] }}
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ env.CHAINLINK_VERSION }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          artifacts_name: vrf-test-logs
+          artifacts_location: ./integration-tests/smoke/vrfv2plus/logs/
+          token: ${{ secrets.GITHUB_TOKEN }}
+          go_mod_path: ./integration-tests/go.mod
+          should_cleanup: false
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
+      - name: Run Tests
+        if: ${{ github.event.inputs.test_suite == 'All Tests' }}
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@2967f2287bd3f3ddbac7b476e9568993df01796e # v2.3.27
+        with:
+          test_command_to_run: cd ./integration-tests/smoke && go test -v -count=1 -parallel=1 -timeout 3h vrfv2plus_test.go
+          test_download_vendor_packages_command: cd ./integration-tests && go mod download
+          test_secrets_override_base64: ${{ secrets[inputs.test_secrets_override_key] }}
+          cl_repo: ${{ env.CHAINLINK_IMAGE }}
+          cl_image_tag: ${{ env.CHAINLINK_VERSION }}
+          aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
+          artifacts_name: vrf-test-logs
+          artifacts_location: ./integration-tests/smoke/vrfv2plus/logs/
+          token: ${{ secrets.GITHUB_TOKEN }}
+          go_mod_path: ./integration-tests/go.mod
+          should_cleanup: false
+          QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }}
+          QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
+          QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}

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

@@ -404,7 +404,7 @@ jobs:
           HEAD_REF: ${{ env.head_ref }}
           ARTIFACT_URL: ${{ steps.gather-all-artifacts.outputs.artifact-url }}
 
-          JIRA_HOST: https://smartcontract-it.atlassian.net/
+          JIRA_HOST: ${{ vars.JIRA_HOST }} 
           JIRA_USERNAME: ${{ secrets.JIRA_USERNAME }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
 

.github/workflows/solidity-tracability.yml

@@ -107,7 +107,7 @@ jobs:
           PR_TITLE: ${{ github.event.pull_request.title }}
           BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
 
-          JIRA_HOST: https://smartcontract-it.atlassian.net/ 
+          JIRA_HOST: ${{ vars.JIRA_HOST }} 
           JIRA_USERNAME: ${{ secrets.JIRA_USERNAME }}
           JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
 

contracts/.changeset/chilled-melons-warn.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+#internal index don ID in ConfigSet event

contracts/src/v0.8/keystone/CapabilitiesRegistry.sol

@@ -396,7 +396,7 @@ contract CapabilitiesRegistry is OwnerIsCreator, TypeAndVersionInterface {
   /// @param donId The ID of the DON the config was set for
   /// @param configCount The number of times the DON has been
   /// configured
-  event ConfigSet(uint32 donId, uint32 configCount);
+  event ConfigSet(uint32 indexed donId, uint32 configCount);
 
   /// @notice This event is emitted when a new node operator is added
   /// @param nodeOperatorId The ID of the newly added node operator

core/capabilities/ccip/ccip_integration_tests/helpers.go

@@ -562,7 +562,7 @@ func (h *homeChain) AddDON(
 	iter, err := h.capabilityRegistry.FilterConfigSet(&bind.FilterOpts{
 		Start: h.backend.Blockchain().CurrentBlock().Number.Uint64() - 1,
 		End:   &endBlock,
-	})
+	}, []uint32{})
 	require.NoError(t, err, "failed to filter config set events")
 	var donID uint32
 	for iter.Next() {