Merge branch 'develop' into BCI-4097-Update-the-TXM-confirmation-logi…

…c-to-use-the-mined-nonce
smartcontractkit · Nov 14, 2024 · 35b4631 · 35b4631
2 parents e2252d8 + b805b82
commit 35b4631
Show file tree

Hide file tree

Showing 451 changed files with 15,215 additions and 10,684 deletions.
diff --git a/.changeset/forty-foxes-watch.md b/.changeset/forty-foxes-watch.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Updated Solana TXM's in-memory storage to track statuses across the Solana transaction lifecycle. Added a method to translate Solana transaction statuses into states expected by the ChainWriter interface. Made the duration transactions are retained in storage after finality or error configurable using `TxRetentionTimeout`. #added
diff --git a/.changeset/healthy-shirts-remain.md b/.changeset/healthy-shirts-remain.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#removed Remove unused deprecated key interfaces.
diff --git a/.changeset/many-carrots-share.md b/.changeset/many-carrots-share.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Update ccip contract reader cfg for ccip message sent to use output codec wrapper modifier
diff --git a/.changeset/nine-stingrays-march.md b/.changeset/nine-stingrays-march.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Add don_id to Mercury Enhanced EA telemetry #added
diff --git a/.changeset/purple-shrimps-invent.md b/.changeset/purple-shrimps-invent.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Upgrade go-ethereum to v1.14.11 #internal
diff --git a/.changeset/silent-goats-jog.md b/.changeset/silent-goats-jog.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fix HeadTracker tests caused by simulated client update #internal
diff --git a/.changeset/swift-fireants-compare.md b/.changeset/swift-fireants-compare.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Add CSA authentication support to Beholder #added
diff --git a/.github/actions/golangci-lint/action.yml b/.github/actions/golangci-lint/action.yml
@@ -1,10 +1,6 @@
 name: CI lint for Golang
 description: Runs CI lint for Golang
 inputs:
-  # general inputs
-  name:
-    description: Name of the lint action
-    required: true
   go-directory:
     description: Go directory to run commands from
     default: "."
@@ -25,10 +21,17 @@ inputs:
 runs:
   using: composite
   steps:
-    - uses: actions/[email protected]
+    - name: Checkout repo (full)
+      uses: actions/[email protected]
+      # Only do a full checkout on merge_groups
+      if: github.event_name == 'merge_group'
       with:
-        # We only need a full clone on merge_group events for golangci-lint.
-        fetch-depth: ${{ github.event_name == 'merge_group' && '0' || '1' }}"
+        fetch-depth: 0
+    - name: Checkout repo
+      uses: actions/[email protected]
+      if: github.event_name != 'merge_group'
+      with:
+        fetch-depth: 1
     - name: Setup Go
       uses: ./.github/actions/setup-go
       with:

diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
@@ -948,6 +948,20 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.4.0
+
+  - id: smoke/ccip_messaging_test.go:*
+    path: integration-tests/smoke/ccip_messaging_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Merge Queue E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/ && go test smoke/ccip_messaging_test.go -timeout 12m -test.parallel=1 -count=1 -json
+    pyroscope_env: ci-smoke-ccipv1_6-evm-simulated
+    test_env_vars:
+      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
+      E2E_JD_VERSION: 0.4.0
 
   # END: CCIPv1.6 tests
 
@@ -1178,4 +1192,4 @@ runner-test-matrix:
       TEST_LOG_LEVEL: debug
       E2E_TEST_GRAFANA_DASHBOARD_URL: /d/6vjVx-1V8/ccip-long-running-tests
 
-  # END: CCIP tests
+  # END: CCIP tests
diff --git a/.github/workflows/build-publish-develop-pr.yml b/.github/workflows/build-publish-develop-pr.yml
@@ -24,7 +24,10 @@ on:
         default: "false"
 
 env:
-  GIT_REF: ${{ github.event.inputs.git_ref || github.ref }}
+  # Use github.sha here otherwise a race condition exists if
+  # a commit is pushed to develop before merge is run.
+  CHECKOUT_REF: ${{ github.event.inputs.git_ref || github.sha }}
+
 
 jobs:
   merge:
@@ -38,7 +41,7 @@ jobs:
       - name: Checkout repository
         uses: actions/[email protected]
         with:
-          ref: ${{ env.GIT_REF }}
+          ref: ${{ env.CHECKOUT_REF }}
 
       - name: Configure aws credentials
         uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
@@ -48,13 +51,13 @@ jobs:
           mask-aws-account-id: true
           role-session-name: "merge"
 
-      - uses: actions/cache/restore@v4
+      - uses: actions/cache/restore@v4.1.1
         with:
           path: dist/linux_amd64_v1
           key: chainlink-amd64-${{ github.sha }}
           fail-on-cache-miss: true
 
-      - uses: actions/cache/restore@v4
+      - uses: actions/cache/restore@v4.1.1
         with:
           path: dist/linux_arm64_v8.0
           key: chainlink-arm64-${{ github.sha }}
@@ -91,7 +94,7 @@ jobs:
       - name: Checkout repository
         uses: actions/[email protected]
         with:
-          ref: ${{ env.GIT_REF }}
+          ref: ${{ env.CHECKOUT_REF }}
           fetch-depth: 0
 
       - name: Configure aws credentials
@@ -103,7 +106,7 @@ jobs:
           role-session-name: "split-${{ matrix.goarch }}"
 
       - id: cache
-        uses: actions/cache@v4
+        uses: actions/cache@v4.1.1
         with:
           path: dist/${{ matrix.dist_name }}
           key: chainlink-${{ matrix.goarch }}-${{ github.sha }}
@@ -125,9 +128,9 @@ jobs:
       release-type: ${{ steps.get-image-tag.outputs.release-type }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4.2.1
         with:
-          ref: ${{ env.GIT_REF }}
+          ref: ${{ env.CHECKOUT_REF }}
 
       - name: Get image tag
         id: get-image-tag

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -34,8 +34,8 @@ jobs:
       pull-requests: read
     outputs:
       deployment-changes: ${{ steps.match-some.outputs.deployment == 'true' }}
-      should-run-ci-core: ${{ steps.match-every.outputs.non-ignored == 'true' || steps.match-some.outputs.core-ci == 'true' || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
-      should-run-golangci: ${{ steps.match-every.outputs.non-integration-tests == 'true' || github.event_name == 'workflow_dispatch' }}
+      should-run-ci-core: ${{ steps.match-some.outputs.core-ci == 'true' || steps.match-every.outputs.non-ignored == 'true' ||  github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }}
+      should-run-golangci: ${{ steps.match-some.outputs.golang-ci == 'true' || steps.match-every.outputs.non-ignored == 'true' || github.event_name == 'workflow_dispatch' }}
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repo
@@ -48,19 +48,25 @@ jobs:
           # "if any changed file matches one or more of the conditions" (https://github.com/dorny/paths-filter/issues/225)
           predicate-quantifier: some
           # deployment - any changes to files in `deployments/`
+          # core-ci - any changes that could affect this workflow definition
+          # golang-ci - any changes that could affect the linting result
           filters: |
             deployment:
               - 'deployment/**'
             core-ci:
               - '.github/workflows/ci-core.yml'
               - '.github/actions/**'
+            golang-ci:
+              - '.golangci.yml'
+              - '.github/workflows/ci-core.yml'
+              - '.github/actions/**'
       - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: match-every
         with:
           # "if any changed file match all of the conditions" (https://github.com/dorny/paths-filter/issues/225)
           predicate-quantifier: every
           # non-integration-tests - only changes made outside of the `integration-tests` directory
-          # everything-except-ignored - only changes except for the negated ones
+          # non-ignored - only changes except for the negated ones
           #  - This is opt-in on purpose. To be safe, new files are assumed to have an affect on CI Core unless listed here specifically.
           filters: |
             non-integration-tests:
@@ -103,9 +109,6 @@ jobs:
       - name: Golang Lint
         uses: ./.github/actions/golangci-lint
         if: ${{ needs.filter.outputs.should-run-golangci == 'true' }}
-        with:
-          id: core
-          name: lint
       - name: Notify Slack
         if: ${{ failure() && needs.run-frequency.outputs.one-per-day-frequency == 'true' }}
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
@@ -166,7 +169,7 @@ jobs:
         uses: ./.github/actions/setup-go
         with:
           # race/fuzz tests don't benefit repeated caching, so restore from develop's build cache
-          restore-build-cache-only: ${{ matrix.type.cmd == 'go_core_race_tests' || matrix.type.cmd == 'go_core_fuzz' }}
+          restore-build-cache-only: ${{ matrix.type.cmd == 'go_core_fuzz' }}
           build-cache-version: ${{ matrix.type.cmd }}
 
       - name: Replace chainlink-evm deps
@@ -220,12 +223,13 @@ jobs:
           go install ./pkg/chainlink/cmd/chainlink-starknet
           popd
 
-      - name: Increase Race Timeout
-        # Increase race timeout for scheduled runs only
+      - name: Increase Timeouts for Fuzz/Race
+        # Increase timeouts for scheduled runs only
         if: ${{ github.event.schedule != '' && needs.filter.outputs.should-run-ci-core == 'true' }}
         run: |
           echo "TIMEOUT=10m" >> $GITHUB_ENV
           echo "COUNT=50" >> $GITHUB_ENV
+          echo "FUZZ_TIMEOUT_MINUTES=10">> $GITHUB_ENV
 
       - name: Install gotestloghelper
         if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
@@ -459,20 +463,19 @@ jobs:
           SONAR_SCANNER_OPTS: "-Xms6g -Xmx8g"
 
   trigger-flaky-test-detection-for-root-project:
-    name: Find New Flaky Tests In Root Project
+    name: Find New Flaky Tests In Chainlink Project
     uses: ./.github/workflows/find-new-flaky-tests.yml
     if: ${{ github.event_name == 'pull_request' }}
     with:
       repoUrl: 'https://github.com/smartcontractkit/chainlink'
       projectPath: '.'
       baseRef: ${{ github.base_ref }}
       headRef: ${{ github.head_ref }}
-      runThreshold: '1'
-      runWithRace: true
+      runThreshold: '0.99'
       findByTestFilesDiff: true
       findByAffectedPackages: false
       slackNotificationAfterTestsChannelId: 'C07TRF65CNS' #flaky-test-detector-notifications
-      extraArgs: '{ "skipped_tests": "TestChainComponents" }'
+      extraArgs: '{ "skipped_tests": "TestChainComponents", "run_with_race": "true", "print_failed_tests": "true", "test_repeat_count": "3", "min_pass_ratio": "0.01" }'
     secrets:
       SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
 
@@ -486,12 +489,11 @@ jobs:
       projectPath: 'deployment'
       baseRef: ${{ github.base_ref }}
       headRef: ${{ github.head_ref }}
-      runThreshold: '1'
-      runWithRace: true
+      runThreshold: '0.99'
       findByTestFilesDiff: true
       findByAffectedPackages: false
       slackNotificationAfterTestsChannelId: 'C07TRF65CNS' #flaky-test-detector-notifications
-      extraArgs: '{ "skipped_tests": "TestAddLane" }'
+      extraArgs: '{ "skipped_tests": "TestAddLane", "run_with_race": "true", "print_failed_tests": "true", "test_repeat_count": "3", "min_pass_ratio": "0.01" }'
     secrets:
       SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}