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

…ocrWASP
smartcontractkit · Mar 20, 2024 · f6112bc · f6112bc
2 parents 9023711 + 79db120
commit f6112bc
Show file tree

Hide file tree

Showing 180 changed files with 1,801 additions and 1,376 deletions.
diff --git a/.changeset/kind-crabs-begin.md b/.changeset/kind-crabs-begin.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Helper VRF CLI command
diff --git a/.changeset/popular-buckets-hang.md b/.changeset/popular-buckets-hang.md
@@ -0,0 +1,18 @@
+---
+"chainlink": patch
+---
+
+Add new config option Pipeline.VerboseLogging
+
+VerboseLogging enables detailed logging of pipeline execution steps. This is
+disabled by default because it increases log volume for pipeline runs, but can
+be useful for debugging failed runs without relying on the UI or database.
+Consider enabling this if you disabled run saving by setting MaxSuccessfulRuns
+to zero.
+
+Set it like the following example:
+
+```
+[Pipeline]
+VerboseLogging = true
+```
diff --git a/.changeset/selfish-timers-matter.md b/.changeset/selfish-timers-matter.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Refactor Log and TxStore ORMs
diff --git a/.changeset/shiny-forks-clap.md b/.changeset/shiny-forks-clap.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Helper VRF CLI command
diff --git a/.changeset/smooth-suits-provide.md b/.changeset/smooth-suits-provide.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+docs: remove repeated words in documentation and comments
diff --git a/.changeset/stale-sloths-drive.md b/.changeset/stale-sloths-drive.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+update solc version for vrf v2.5 coordinators
diff --git a/.github/actions/setup-go/action.yml b/.github/actions/setup-go/action.yml
@@ -40,7 +40,7 @@ runs:
       shell: bash
       run: echo "path=./${{ inputs.go-module-file }}" >> $GITHUB_OUTPUT
 
-    - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+    - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       name: Cache Go Modules
       with:
         path: |
@@ -51,7 +51,7 @@ runs:
         restore-keys: |
           ${{ runner.os }}-gomod-${{ inputs.cache-version }}-
 
-    - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+    - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       if: ${{ inputs.only-modules == 'false' }}
       name: Cache Go Build Outputs
       with:

diff --git a/.github/actions/setup-hardhat/action.yaml b/.github/actions/setup-hardhat/action.yaml
@@ -11,13 +11,13 @@ runs:
   using: composite
   steps:
     - name: Cache Compilers
-      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: ~/.cache/hardhat-nodejs/
         key: contracts-compilers-${{ runner.os }}-${{ inputs.cache-version }}-${{ hashFiles('contracts/pnpm-lock.yaml', 'contracts/hardhat.config.ts') }}
 
     - name: Cache contracts build outputs
-      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: |
           contracts/cache/

diff --git a/.github/actions/setup-solana/action.yml b/.github/actions/setup-solana/action.yml
@@ -3,7 +3,7 @@ description: Setup solana CLI
 runs:
   using: composite
   steps:
-      - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         id: cache
         name: Cache solana CLI
         with:

diff --git a/.github/actions/setup-wasmd/action.yml b/.github/actions/setup-wasmd/action.yml
@@ -3,7 +3,7 @@ description: Setup Cosmos wasmd, used for integration tests
 runs:
   using: composite
   steps:
-      - uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
         id: cache
         name: Cache wasmd-build
         with:

diff --git a/.github/actions/version-file-bump/action.yml b/.github/actions/version-file-bump/action.yml
@@ -45,7 +45,7 @@ runs:
         package_version=$(jq -r '.version' ./package.json)
         echo "package_version=${package_version}" | tee -a "$GITHUB_OUTPUT"
     - name: Diff versions
-      uses: smartcontractkit/chainlink-github-actions/semver-compare@c67a09566412d153ff7640d99f96b43aa03abc04 # v2.3.6
+      uses: smartcontractkit/chainlink-github-actions/semver-compare@5bee84d30d90295010bda68b0cd46be3a1eea917 # v2.3.9
       id: diff
       with:
         version1: ${{ steps.get-current-version.outputs.current_version }}

diff --git a/.github/tracing/tempo.yaml b/.github/tracing/tempo.yaml
@@ -19,6 +19,6 @@ storage:
   trace:
     backend: local            # backend configuration to use
     wal:
-      path: /tmp/tempo/wal    # where to store the the wal locally
+      path: /tmp/tempo/wal    # where to store the wal locally
     local:
       path: /tmp/tempo/blocks
diff --git a/.github/workflows/evm-version-compatibility-tests.yml b/.github/workflows/evm-version-compatibility-tests.yml
@@ -23,27 +23,41 @@ jobs:
   check-dependency-bump:
       runs-on: ubuntu-latest
       outputs:
-        dependency_bumped: ${{ steps.changes.outputs.dependency_bumped }}
+        dependency_changed: ${{ steps.changes.outputs.dependency_changed }}
       steps:
       - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Fetch develop branch
-        run: git fetch --depth=1 origin develop:develop
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          fetch-depth: 0
       - name: Check for go.mod changes
         id: changes
         run: |
-          if git diff origin/develop -- go.mod | grep -q 'github.com/ethereum/go-ethereum'; then
-            echo "Dependency ethereum/go-ethereum was changed"
-            echo "dependency_bumped=true" >> "$GITHUB_OUTPUT"
+          git fetch origin ${{ github.base_ref }}
+          # if no match is found then grep exits with code 1, but if there is a match it exits with code 0
+          DEPENDENCY_CHANGED=$(git diff origin/${{ github.base_ref }}...HEAD -- go.mod | grep -q 'github.com/ethereum/go-ethereum'; echo $?)
+          PR_VERSION=$(grep 'github.com/ethereum/go-ethereum' go.mod | awk '{print $2}')
+
+          # here 0 means a match was found, 1 means no match was found
+          if [ "$DEPENDENCY_CHANGED" -eq 0 ]; then
+            # Dependency was changed in the PR, now compare with the base branch
+            git fetch origin ${{ github.base_ref }}
+            BASE_VERSION=$(git show origin/${{ github.base_ref }}:go.mod | grep 'github.com/ethereum/go-ethereum' | awk '{print $2}')
+
+            echo "Base branch version: $BASE_VERSION"
+            echo "PR branch version: $PR_VERSION"
+
+            echo "Dependency version changed in the PR compared to the base branch."
+            echo "dependency_changed=true" >> $GITHUB_OUTPUT
           else
-            echo "No relevant dependency bump detected."
-            echo "dependency_bumped=false" >> "$GITHUB_OUTPUT"
+            echo "No changes to ethereum/go-ethereum dependency in the PR."
+            echo "PR branch version: $PR_VERSION"
+            echo "dependency_changed=false" >> $GITHUB_OUTPUT
           fi
 
   # Build Test Dependencies
 
   build-chainlink:
-    if: needs.check-dependency-bump.outputs.dependency_bumped == 'true' || github.event_name == 'workflow_dispatch'
+    if: needs.check-dependency-bump.outputs.dependency_changed == 'true' || github.event_name == 'workflow_dispatch'
     needs: [check-dependency-bump]
     environment: integration
     permissions:
@@ -62,7 +76,7 @@ jobs:
           this-job-name: Build Chainlink Image
         continue-on-error: true
       - name: Checkout the repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       - name: Build Chainlink Image
@@ -75,7 +89,7 @@ jobs:
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
 
   build-tests:
-    if: needs.check-dependency-bump.outputs.dependency_bumped == 'true' || github.event_name == 'workflow_dispatch'
+    if: needs.check-dependency-bump.outputs.dependency_changed == 'true' || github.event_name == 'workflow_dispatch'
     needs: [check-dependency-bump]
     environment: integration
     permissions:
@@ -94,11 +108,11 @@ jobs:
           this-job-name: Build Tests Binary
         continue-on-error: true
       - name: Checkout the repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       - name: Build Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-tests@c67a09566412d153ff7640d99f96b43aa03abc04 # v2.3.6
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-tests@5bee84d30d90295010bda68b0cd46be3a1eea917 # v2.3.9
         with:
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -109,15 +123,15 @@ jobs:
           binary_name: tests
 
   build-test-matrix:
-    if: needs.check-dependency-bump.outputs.dependency_bumped == 'true' || github.event_name == 'workflow_dispatch'
+    if: needs.check-dependency-bump.outputs.dependency_changed == 'true' || github.event_name == 'workflow_dispatch'
     needs: [check-dependency-bump]
     runs-on: ubuntu-latest
     name: Build Test Matrix
     outputs:
       matrix: ${{ env.JOB_MATRIX_JSON }}
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Setup environment variables
         run: |
           echo "BASE64_TEST_LIST=${{ github.event.inputs.base64_test_list }}" >> $GITHUB_ENV
@@ -179,7 +193,7 @@ jobs:
           test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
         continue-on-error: true
       - name: Checkout the repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       - name: Build Go Test Command
@@ -209,7 +223,7 @@ jobs:
           customEthClientDockerImage: ${{ matrix.evm_node.docker_image }}
 
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@c67a09566412d153ff7640d99f96b43aa03abc04 # v2.3.6
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5bee84d30d90295010bda68b0cd46be3a1eea917 # v2.3.9
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 45m -count=1 -json -test.parallel=2 ${{ steps.build-go-test-command.outputs.run_command }} 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
@@ -228,11 +242,11 @@ jobs:
           should_tidy: "false"
       - name: Print failed test summary
         if: always()
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/show-test-summary@c67a09566412d153ff7640d99f96b43aa03abc04 # v2.3.6
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/show-test-summary@5bee84d30d90295010bda68b0cd46be3a1eea917 # v2.3.9
 
   start-slack-thread:
     name: Start Slack Thread
-    if: ${{ always() && needs.check-dependency-bump.outputs.dependency_bumped == 'true' && needs.*.result != 'skipped' && needs.*.result != 'cancelled' }}
+    if: ${{ always() && needs.check-dependency-bump.outputs.dependency_changed == 'true' && needs.*.result != 'skipped' && needs.*.result != 'cancelled' }}
     environment: integration
     outputs:
       thread_ts: ${{ steps.slack.outputs.thread_ts }}
@@ -291,7 +305,7 @@ jobs:
 
   post-test-results-to-slack:
     name: Post Test Results for ${{matrix.evm_node.eth_client}} to Slack
-    if: ${{ always() && needs.check-dependency-bump.outputs.dependency_bumped == 'true' && needs.*.result != 'skipped' && needs.*.result != 'cancelled' }}
+    if: ${{ always() && needs.check-dependency-bump.outputs.dependency_changed == 'true' && needs.*.result != 'skipped' && needs.*.result != 'cancelled' }}
     environment: integration
     permissions:
       checks: write
@@ -307,7 +321,7 @@ jobs:
         product: [automation,ocr,ocr2,vrf,vrfv2,vrfv2plus]
     steps:
       - name: Checkout the repo
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }}
       - name: Post Test Results to Slack
@@ -317,7 +331,7 @@ jobs:
           github_repository: ${{ github.repository }}
           workflow_run_id: ${{ github.run_id }}
           github_job_name_regex: ^EVM node compatibility of ${{ matrix.product }} with (?<cap>.*?)$
-          message_title: ${{ matrix.product  }}
+          message_title: ${{ matrix.product }}
           slack_channel_id: ${{ secrets.QA_SLACK_CHANNEL }}
           slack_bot_token: ${{ secrets.QA_SLACK_API_KEY }}
           slack_thread_ts: ${{ needs.start-slack-thread.outputs.thread_ts }}
diff --git a/charts/chainlink-cluster/dashboard/cmd/deploy.go b/charts/chainlink-cluster/dashboard/cmd/deploy.go
@@ -2,9 +2,9 @@ package main
 
 import (
 	"github.com/K-Phoen/grabana/dashboard"
-	lib "github.com/smartcontractkit/chainlink/dashboard-lib/lib"
-	core_don "github.com/smartcontractkit/chainlink/dashboard-lib/lib/core-don"
-	k8spods "github.com/smartcontractkit/chainlink/dashboard-lib/lib/k8s-pods"
+	lib "github.com/smartcontractkit/chainlink/dashboard-lib"
+	core_don "github.com/smartcontractkit/chainlink/dashboard-lib/core-don"
+	k8spods "github.com/smartcontractkit/chainlink/dashboard-lib/k8s-pods"
 	waspdb "github.com/smartcontractkit/wasp/dashboard"
 )
 

diff --git a/charts/chainlink-cluster/go.mod b/charts/chainlink-cluster/go.mod
@@ -4,7 +4,7 @@ go 1.21.7
 
 require (
 	github.com/K-Phoen/grabana v0.22.1
-	github.com/smartcontractkit/chainlink/dashboard-lib v0.22.1
+	github.com/smartcontractkit/chainlink/dashboard-lib v0.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/wasp v0.4.6
 )
 
@@ -25,6 +25,7 @@ replace (
 
 	// replicating the replace directive on cosmos SDK
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
+	github.com/grafana/grafana-foundation-sdk/go => github.com/grafana/grafana-foundation-sdk/go v0.0.0-20240314112857-a7c9c6d0044c
 
 	// until merged upstream: https://github.com/hashicorp/go-plugin/pull/257
 	github.com/hashicorp/go-plugin => github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16
@@ -33,5 +34,5 @@ replace (
 	github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f
 
 	github.com/sercand/kuberesolver/v4 => github.com/sercand/kuberesolver/v5 v5.1.1
-	github.com/smartcontractkit/chainlink/dashboard-lib => ../../dashboard
+	github.com/smartcontractkit/chainlink/dashboard-lib => ../../dashboard-lib
 )
diff --git a/charts/chainlink-cluster/values.yaml b/charts/chainlink-cluster/values.yaml
@@ -232,7 +232,7 @@ tempo:
       trace:
         backend: local # backend configuration to use
         wal:
-          path: /tmp/tempo/wal # where to store the the wal locally
+          path: /tmp/tempo/wal # where to store the wal locally
         local:
           path: /tmp/tempo/blocks
 

diff --git a/contracts/.changeset/forty-ways-ring.md b/contracts/.changeset/forty-ways-ring.md
@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+upgrade solc version to 0.8.19 for vrf v2.5 contracts
diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -26,17 +26,14 @@ gas_price = 3_000_000_000 # 3 gwei
 optimizer_runs = 1000
 src = 'src/v0.8/vrf'
 test = 'test/v0.8/foundry/vrf' # skips tests for no VRF foundry tests
-solc_version = '0.8.6'
 
 [profile.vrfv2plus_coordinator]
 optimizer_runs = 50
 src = 'src/v0.8/vrf'
-solc_version = '0.8.6'
 
 [profile.vrfv2plus]
 optimizer_runs = 1_000_000
 src = 'src/v0.8/vrf'
-solc_version = '0.8.6'
 
 [profile.automation]
 optimizer_runs = 10000

diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
@@ -107,7 +107,7 @@ let config = {
         },
       },
       'src/v0.8/vrf/dev/VRFCoordinatorV2_5.sol': {
-        version: '0.8.6',
+        version: '0.8.19',
         settings: {
           optimizer: {
             enabled: true,