Merge branch 'develop' into ks-87-workflow-engine-scheduler

smartcontractkit · Mar 19, 2024 · fc223e5 · fc223e5
2 parents 0cec920 + ee06eb2
commit fc223e5
Show file tree

Hide file tree

Showing 107 changed files with 3,464 additions and 4,134 deletions.
diff --git a/.changeset/lazy-cooks-agree.md b/.changeset/lazy-cooks-agree.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Chainlink Functions contracts v1.3 audit findings
diff --git a/.changeset/shy-jobs-speak.md b/.changeset/shy-jobs-speak.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+use common interface for v2.3
diff --git a/.changeset/silver-months-glow.md b/.changeset/silver-months-glow.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fixed a race condition bug around EVM nonce management, which could cause the Node to skip a nonce and get stuck.
diff --git a/.dockerignore b/.dockerignore
@@ -30,3 +30,6 @@ codeship-*.yml
 dockercfg
 credentials.env
 gcr_creds.env
+
+go.work
+go.work.sum
diff --git a/.github/workflows/automation-benchmark-tests.yml b/.github/workflows/automation-benchmark-tests.yml
@@ -25,7 +25,7 @@ jobs:
       id-token: write
       contents: read
     name: Automation Benchmark Test
-    runs-on: ubuntu20.04-16cores-64GB
+    runs-on: ubuntu22.04-16cores-64GB
     env:
       SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
       SLACK_CHANNEL: C03KJ5S7KEK

diff --git a/.github/workflows/automation-load-tests.yml b/.github/workflows/automation-load-tests.yml
@@ -21,7 +21,7 @@ jobs:
       id-token: write
       contents: read
     name: Automation Load Test
-    runs-on: ubuntu20.04-16cores-64GB
+    runs-on: ubuntu22.04-16cores-64GB
     env:
       SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
       SLACK_CHANNEL: C03KJ5S7KEK

diff --git a/.github/workflows/automation-nightly-tests.yml b/.github/workflows/automation-nightly-tests.yml
@@ -17,7 +17,7 @@ jobs:
       id-token: write
       contents: read
     name: Build Chainlink Image
-    runs-on: ubuntu20.04-16cores-64GB
+    runs-on: ubuntu22.04-16cores-64GB
     steps:
       - name: Collect Metrics
         id: collect-gha-metrics
@@ -61,19 +61,19 @@ jobs:
           - name: Upgrade 2.0
             suite: smoke
             nodes: 1
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu22.04-8cores-32GB
             network: SIMULATED
             command: -run ^TestAutomationNodeUpgrade/registry_2_0 ./smoke
           - name: Upgrade 2.1
             suite: smoke
             nodes: 5
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu22.04-8cores-32GB
             network: SIMULATED
             command: -run ^TestAutomationNodeUpgrade/registry_2_1 ./smoke
           - name: Upgrade 2.2
             suite: smoke
             nodes: 5
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu22.04-8cores-32GB
             network: SIMULATED
             command: -run ^TestAutomationNodeUpgrade/registry_2_2 ./smoke
     runs-on: ${{ matrix.tests.os }}

diff --git a/.github/workflows/automation-ondemand-tests.yml b/.github/workflows/automation-ondemand-tests.yml
@@ -51,7 +51,7 @@ jobs:
             dockerfile: plugins/chainlink.Dockerfile
             tag-suffix: -plugins
     name: Build Chainlink Image ${{ matrix.image.name }}
-    runs-on: ubuntu20.04-16cores-64GB
+    runs-on: ubuntu22.04-16cores-64GB
     steps:
       - name: Collect Metrics
         if: inputs.chainlinkImage == ''
@@ -98,7 +98,7 @@ jobs:
       id-token: write
       contents: read
     name: Build Test Image
-    runs-on: ubuntu20.04-16cores-64GB
+    runs-on: ubuntu22.04-16cores-64GB
     steps:
       - name: Collect Metrics
         id: collect-gha-metrics
@@ -157,7 +157,7 @@ jobs:
             type: upgrade
             suite: smoke
             nodes: 1
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu22.04-8cores-32GB
             enabled: true
             pyroscope_env: ci-automation-on-demand-upgrade
             network: SIMULATED
@@ -166,7 +166,7 @@ jobs:
             type: upgrade
             suite: smoke
             nodes: 5
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu22.04-8cores-32GB
             enabled: true
             pyroscope_env: ci-automation-on-demand-upgrade
             network: SIMULATED
@@ -175,7 +175,7 @@ jobs:
             type: upgrade
             suite: smoke
             nodes: 5
-            os: ubuntu20.04-8cores-32GB
+            os: ubuntu22.04-8cores-32GB
             enabled: true
             pyroscope_env: ci-automation-on-demand-upgrade
             network: SIMULATED

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -1,7 +1,8 @@
 name: CI Core
+run-name: CI Core ${{ inputs.distinct_run_name && inputs.distinct_run_name || '' }}
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  group: ${{ github.workflow }}-${{ github.ref }}-${{ inputs.distinct_run_name }}
   cancel-in-progress: true
 
 # Run on key branches to make sure integration is good, otherwise run on all PR's
@@ -15,6 +16,17 @@ on:
   pull_request:
   schedule:
     - cron: "0 0 * * *"
+  workflow_dispatch:
+    inputs:
+      distinct_run_name:
+        description: 'A unique identifier for this run, used when running from other repos'
+        required: false
+        type: string
+      evm-ref:
+        description: The chainlink-evm reference to use when testing against a specific version for compatibliity
+        required: false
+        default: ""
+        type: string
 
 jobs:
 
@@ -23,7 +35,7 @@ jobs:
     permissions:
       pull-requests: read
     outputs:
-      changes: ${{ steps.changes.outputs.changes }}
+      changes: ${{ steps.ignore-filter.outputs.changes || steps.changes.outputs.changes }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repo
@@ -36,12 +48,16 @@ jobs:
           filters: |
             changes:
               - '!integration-tests/**'
+      - name: Ignore Filter On Workflow Dispatch
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        id: ignore-filter
+        run: echo "changes=true" >> $GITHUB_OUTPUT
 
   golangci:
     # We don't directly merge dependabot PRs, so let's not waste the resources
     if: ${{ github.event_name == 'pull_request' ||  github.event_name == 'schedule' && github.actor != 'dependabot[bot]' }}
     name: lint
-    runs-on: ubuntu20.04-8cores-32GB
+    runs-on: ubuntu22.04-8cores-32GB
     needs: [filter]
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 
@@ -70,7 +86,7 @@ jobs:
     # We don't directly merge dependabot PRs, so let's not waste the resources
     if: github.actor != 'dependabot[bot]'
     needs: [filter]
-    runs-on: ubuntu20.04-64cores-256GB
+    runs-on: ubuntu-latest-64cores-256GB
     env:
       CL_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/chainlink_test?sslmode=disable
     steps:
@@ -102,6 +118,10 @@ jobs:
       - name: Download Go vendor packages
         if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go mod download
+      - name: Replace chainlink-evm deps
+        if: ${{ needs.filter.outputs.changes == 'true' && inputs.evm-ref != ''}}
+        shell: bash
+        run: go get github.com/smartcontractkit/chainlink-evm@${{ inputs.evm-ref }}
       - name: Build binary
         if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go build -o chainlink.test .
@@ -209,6 +229,10 @@ jobs:
       - name: Download Go vendor packages 
         if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go mod download
+      - name: Replace chainlink-evm deps
+        if: ${{ needs.filter.outputs.changes == 'true' && inputs.evm-ref != ''}}
+        shell: bash
+        run: go get github.com/smartcontractkit/chainlink-evm@${{ inputs.evm-ref }}
       - name: Build binary
         if: ${{ needs.filter.outputs.changes == 'true' }}
         run: go build -o chainlink.test .
@@ -295,7 +319,7 @@ jobs:
   clean:
     name: Clean Go Tidy & Generate
     if: ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') && github.actor != 'dependabot[bot]' }}
-    runs-on: ubuntu20.04-8cores-32GB
+    runs-on: ubuntu22.04-8cores-32GB
     defaults:
       run:
         shell: bash

diff --git a/.github/workflows/goreleaser-build-publish-develop.yml b/.github/workflows/goreleaser-build-publish-develop.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   push-chainlink-develop-goreleaser:
     runs-on:
-      labels: ubuntu20.04-16cores-64GB
+      labels: ubuntu22.04-16cores-64GB
     outputs:
       goreleaser-metadata: ${{ steps.build-sign-publish.outputs.goreleaser-metadata }}
       goreleaser-artifacts: ${{ steps.build-sign-publish.outputs.goreleaser-artifacts }}

diff --git a/.github/workflows/integration-staging-tests.yml b/.github/workflows/integration-staging-tests.yml
@@ -35,7 +35,7 @@ concurrency:
 jobs:
   e2e-soak-test:
     environment: sdlc
-    runs-on: ubuntu20.04-8cores-32GB
+    runs-on: ubuntu22.04-8cores-32GB
     permissions:
       contents: read
       id-token: write

diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml
@@ -18,7 +18,7 @@ jobs:
       id-token: write
       contents: read
     name: Publish Integration Test Image
-    runs-on: ubuntu20.04-16cores-64GB
+    runs-on: ubuntu22.04-16cores-64GB
     steps:
       - name: Collect Metrics
         id: collect-gha-metrics
@@ -72,7 +72,7 @@ jobs:
           #   dockerfile: plugins/chainlink.Dockerfile
           #   tag-suffix: -plugins
     name: Build Chainlink Image ${{ matrix.image.name }}
-    runs-on: ubuntu20.04-8cores-32GB
+    runs-on: ubuntu22.04-8cores-32GB
     steps:
       - name: Collect Metrics
         id: collect-gha-metrics