Merge branch 'develop' into chore/dependabot-action-updates

* develop:
  Bump version and update CHANGELOG for core v2.7.0 (#11072)
  VRF-664:add Slack notification for VRF v2 Plus WASP test (#11063)
  fix several npm audit issues (#11080)
  Pass docker image and version to ClNode in E2E tests (#11082)
  core/internal/testutils/configtest: consolidate v2 and toml packages in to configtest (#11081)
  [BCF-2725] Add the repository name to the flakey test runner output (#11078)
  Bump breaking NPM deps (#11003)
  Fix redundant "replacing abandoned tx" logs (#11019)
  (chore): Reduce contracts solhint warnings by ignoring Functions v1.0.0 production code (#11069)
  (test): Add Functions test harnesses & additional foundry unit tests (#11011)
  Use correct git commit sha as build metadata from manual workflow dispatches (#11068)
  (chore): FUN-1024 - Deprecate Chainlink Functions v0 contract code (#11049)
  move testing contracts from integration-tests/contracts/ethereum/src to contracts/src/v0.8/automation/testhelpers (#11046)

.github/actions/build-sign-publish-chainlink/action.yml

@@ -10,6 +10,7 @@ inputs:
     required: false
 
   dockerfile:
+    description: Path to the Dockerfile (relative to the repo root)
     default: core/chainlink.Dockerfile
     required: false
   ecr-hostname:
@@ -23,6 +24,11 @@ inputs:
     default: chainlink/chainlink
     required: false
   ecr-tag-suffix:
+    description: Docker image tag suffix
+    required: false
+  git-commit-sha:
+    description: Git commit SHA used as metadata when building the application (appears in logs)
+    default: ${{ github.sha }}
     required: false
   aws-role-to-assume:
     description: The AWS role to assume as the CD user, if any. Used in configuring the docker/login-action
@@ -74,7 +80,7 @@ runs:
         )
 
         SHARED_BUILD_ARGS=$(cat << EOF
-        COMMIT_SHA=${{ github.sha }}
+        COMMIT_SHA=${{ inputs.git-commit-sha }}
         EOF
         )
 

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

@@ -34,6 +34,13 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: ${{ env.GIT_REF }}
+      # When this is ran from manual workflow_dispatch, the github.sha may be
+      # different than the checked out commit sha. The core build uses this
+      # commit sha as build metadata, so we need to make sure it's correct.
+      - name: Get checked out git ref
+        if: github.event.inputs.git_ref
+        id: git-ref
+        run: echo "checked-out=$(git rev-parse HEAD)" | tee -a "${GITHUB_OUTPUT}"
       - name: Build, sign and publish chainlink image
         uses: ./.github/actions/build-sign-publish-chainlink
         with:
@@ -45,6 +52,7 @@ jobs:
           ecr-image-name: chainlink
           ecr-tag-suffix: ${{ matrix.image.tag-suffix }}
           dockerfile: ${{ matrix.image.dockerfile }}
+          git-commit-sha: ${{ steps.git-ref.outputs.checked-out || github.sha }}
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics

.github/workflows/ci-core.yml

@@ -156,12 +156,16 @@ jobs:
           GRAFANA_CLOUD_BASIC_AUTH: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
           GRAFANA_CLOUD_HOST: ${{ secrets.GRAFANA_CLOUD_HOST }}
           GITHUB_EVENT_PATH: ${{ github.event_path }}
+          GITHUB_EVENT_NAME: ${{ github.event_name }}
+          GITHUB_REPO: ${{ github.repository }}
         run: |
           ./runner \
             -grafana_auth=$GRAFANA_CLOUD_BASIC_AUTH \
             -grafana_host=$GRAFANA_CLOUD_HOST \
             -gh_sha=$GITHUB_SHA \
             -gh_event_path=$GITHUB_EVENT_PATH \
+            -gh_event_name=$GITHUB_EVENT_NAME \
+            -gh_repo=$GITHUB_REPO \
             -command=./tools/bin/go_core_tests \
             `ls -R ./artifacts/go_core_tests*/output.txt`
       - name: Store logs artifacts

.github/workflows/on-demand-vrfv2plus-load-test.yml → .github/workflows/on-demand-vrfv2plus-performance-test.yml

@@ -1,4 +1,4 @@
-name: On Demand VRFV2 Plus Load Test
+name: On Demand VRFV2 Plus Performance Test
 on:
   workflow_dispatch:
     inputs:
@@ -49,8 +49,8 @@ on:
           - "Spike"
       testDuration:
         description: Duration of the test (time string)
-        required: false
-        default: 1m
+        required: true
+        default: 5m
       useExistingEnv:
         description: Set `true` to use existing environment or `false` to deploy CL node and all contracts
         required: false
@@ -59,8 +59,8 @@ on:
         description: TOML config in base64 (Needed when overriding config or providing contract addresses for existing env)
         required: false
 jobs:
-  vrfv2plus_load_test:
-    name: ${{ inputs.network }} VRFV2 Plus Load Test
+  vrfv2plus_performance_test:
+    name: ${{ inputs.network }} VRFV2 Plus Performance Test
     environment: integration
     runs-on: ubuntu20.04-8cores-32GB
     permissions:
@@ -80,6 +80,8 @@ jobs:
       REF_NAME: ${{ github.head_ref || github.ref_name }}
       CHAINLINK_IMAGE: ${{ inputs.chainlinkImage }}
       CHAINLINK_VERSION: ${{ inputs.chainlinkVersion }}
+      SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
+      SLACK_CHANNEL: ${{ secrets.QA_VRF_SLACK_CHANNEL }}
       WASP_LOG_LEVEL: info
     steps:
       - name: Collect Metrics
@@ -88,8 +90,15 @@ jobs:
         with:
           basic-auth: ${{ secrets.GRAFANA_CLOUD_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_CLOUD_HOST }}
-          this-job-name: ${{ inputs.network }} VRFV2 Plus Load Test
+          this-job-name: ${{ inputs.network }} VRFV2 Plus Performance Test
         continue-on-error: true
+      - name: Setup Push Tag
+        shell: bash
+        run: |
+          echo "### chainlink image used for this test run :link:" >>$GITHUB_STEP_SUMMARY
+          echo "\`${{ inputs.chainlinkVersion }}\`" >>$GITHUB_STEP_SUMMARY
+          echo "### chainlink-tests image tag for this test run :ship:" >>$GITHUB_STEP_SUMMARY
+          echo "\`${GITHUB_SHA}\`" >>$GITHUB_STEP_SUMMARY
       - name: Get Inputs
         run: |
           EVM_URLS=$(jq -r '.inputs.wsURL' $GITHUB_EVENT_PATH)
@@ -111,7 +120,7 @@ jobs:
       - name: Run Tests
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13
         with:
-          test_command_to_run: cd ./integration-tests && go test -v -count=1 -timeout 6h -run TestVRFV2PlusLoad/vrfv2plus_soak_test ./load/vrfv2plus
+          test_command_to_run: cd ./integration-tests && go test -v -count=1 -timeout 6h -run TestVRFV2PlusPerformance/vrfv2plus_performance_test ./load/vrfv2plus
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           cl_repo: ${{ inputs.chainlinkImage }}
           cl_image_tag: ${{ inputs.chainlinkVersion }}

.github/workflows/solidity-hardhat.yml

@@ -28,6 +28,7 @@ jobs:
               - 'contracts/src/!(v0.8/(llo-feeds|ccip)/**)/**/*'
               - 'contracts/test/**/*'
               - 'contracts/package.json'
+              - 'contracts/pnpm-lock.yaml'
               - 'contracts/hardhat.config.ts'
               - 'contracts/ci.json'
               - '.github/workflows/solidity-hardhat.yml'

VERSION

@@ -1 +1 @@
-2.6.0
+2.7.0

contracts/.solhintignore

@@ -1,8 +1,8 @@
-# 351 warnings
+# 377 warnings
 #./src/v0.8/automation
-# 91 warnings
-#./src/v0.8/functions
 
+# Ignore Functions v1.0.0 code that was frozen after audit
+./src/v0.8/functions/v1_0_0
 
 # Ignore tests, this should not be the long term plan but is OK in the short term
 ./src/v0.8/**/*.t.sol

contracts/foundry.toml

@@ -18,9 +18,9 @@ block_number = 12345
 
 [profile.functions]
 solc_version = '0.8.19'
-src = 'src/v0.8/functions'
-test = 'src/v0.8/functions/tests'
-gas_price = 3000000000
+src = 'src/v0.8/functions/dev/v1_X'
+test = 'src/v0.8/functions/tests/v1_X'
+gas_price = 3_000_000_000 # 3 gwei
 
 [profile.vrf]
 optimizer_runs = 1000