Merge branch 'develop' into mk/CCIP-4398

smartcontractkit · Dec 4, 2024 · 4383805 · 4383805
2 parents 10dad3f + 29e5b3b
commit 4383805
Show file tree

Hide file tree

Showing 241 changed files with 8,090 additions and 3,923 deletions.
diff --git a/.changeset/afraid-houses-learn.md b/.changeset/afraid-houses-learn.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#updated use real contracts in ccipreader_tests where possible
diff --git a/.changeset/cool-penguins-raise.md b/.changeset/cool-penguins-raise.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#updated Remove custom ed25519 private to public key conversion.
diff --git a/.changeset/popular-rules-live.md b/.changeset/popular-rules-live.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Fixes a race condition with the Finalizer when clearing txs #bugfix
diff --git a/.changeset/spotty-knives-smile.md b/.changeset/spotty-knives-smile.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Increase GasLimit for Automation on ZKsync to 6M #nops
diff --git a/.changeset/tricky-clouds-move.md b/.changeset/tricky-clouds-move.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Updated Solana TXM to store prebroadcast transaction errors caught upfront by simulation. Refactored error parsing to more easily introduce new error cases. Optimized storing finalized and errored transaction to minimize memory usage. #updated
diff --git a/.github/actions/version-file-bump/action.yml b/.github/actions/version-file-bump/action.yml
@@ -1,5 +1,5 @@
 name: version-file-bump
-description: "Ensure that the VERSION file has been bumped since the last release."
+description: "Ensure that the package.json version field has been bumped since the last release."
 inputs:
   github-token:
     description: "Github access token"

diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
@@ -987,14 +987,40 @@ runner-test-matrix:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2,SIMULATED_3
       E2E_JD_VERSION: 0.6.0
 
-  - id: smoke/ccip/fee_boosting_test.go:*
-    path: integration-tests/smoke/ccip/fee_boosting_test.go
+  - id: smoke/ccip/ccip_message_limitations_test.go:*
+    path: integration-tests/smoke/ccip/ccip_message_limitations_test.go
     test_env_type: docker
     runs_on: ubuntu-latest
     triggers:
       - PR E2E Core Tests
       - Nightly E2E Tests
-    test_cmd: cd integration-tests/smoke/ccip && go test fee_boosting_test.go -timeout 15m -test.parallel=1 -count=1 -json
+    test_cmd: cd integration-tests/smoke/ccip && go test -run '^Test_CCIPMessageLimitations' -timeout 18m -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.6.0
+
+  - id: smoke/ccip/ccip_token_price_updates_test.go:*
+    path: integration-tests/smoke/ccip/ccip_token_price_updates_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_token_price_updates_test.go -timeout 18m -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.6.0
+
+  - id: smoke/ccip/ccip_gas_price_updates_test.go:*
+    path: integration-tests/smoke/ccip/ccip_gas_price_updates_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_gas_price_updates_test.go -timeout 18m -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
@@ -1030,21 +1056,20 @@ runner-test-matrix:
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
-# Enable after flaking issue is resolved
-#  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
-#    path: integration-tests/smoke/ccip/ccip_rmn_test.go
-#    test_env_type: docker
-#    runs_on: ubuntu-latest
-#    triggers:
-#      - PR E2E Core Tests
-#      - Nightly E2E Tests
-#    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughObservers$ -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.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
-#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughObservers$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentSigners$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1061,22 +1086,20 @@ runner-test-matrix:
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
-# Enable after flaking issue is resolved
-#  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
-#    path: integration-tests/smoke/ccip/ccip_rmn_test.go
-#    test_env_type: docker
-#    runs_on: ubuntu-latest
-#    triggers:
-#      - PR E2E Core Tests
-#      - Nightly E2E Tests
-#    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughSigners$ -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.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
-#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
-
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_NotEnoughSigners$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1093,6 +1116,35 @@ runner-test-matrix:
       E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
       E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_TwoMessagesOneSourceChainCursed$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_TwoMessagesOneSourceChainCursed$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
+
+  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_GlobalCurseTwoMessagesOnTwoLanes$
+    path: integration-tests/smoke/ccip/ccip_rmn_test.go
+    test_env_type: docker
+    runs_on: ubuntu-latest
+    triggers:
+      - PR E2E Core Tests
+      - Nightly E2E Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test -test.run ^TestRMN_GlobalCurseTwoMessagesOnTwoLanes$ -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.6.0
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   # END: CCIPv1.6 tests
 

diff --git a/.github/integration-in-memory-tests.yml b/.github/integration-in-memory-tests.yml
@@ -23,4 +23,21 @@ runner-test-matrix:
     triggers:
       - PR Integration CCIP Tests
     test_cmd: cd integration-tests/smoke/ccip && go test ccip_messaging_test.go -timeout 12m -test.parallel=2 -count=1 -json
+
+  - id: smoke/ccip/ccip_fee_boosting_test.go:*
+    path: integration-tests/smoke/ccip/ccip_fee_boosting_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/smoke/ccip && go test ccip_fee_boosting_test.go -timeout 12m -test.parallel=2 -count=1 -json
+
+  - id: contracts/ccipreader_test.go:*
+    path: integration-tests/contracts/ccipreader_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+    test_cmd: cd integration-tests/contracts && go test ccipreader_test.go -timeout 5m -test.parallel=1 -count=1 -json
+
   # END: CCIP tests
diff --git a/.github/workflows/build-publish-develop-pr.yml b/.github/workflows/build-publish-develop-pr.yml
@@ -2,9 +2,9 @@ name: "Build and Publish GoReleaser"
 
 on:
   pull_request:
-  # The default types are opened, synchronize, and reopened
-  # See https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
-  # We add a label trigger too, since when the build-publish label is added to a PR, we want to build and publish
+    # The default types are opened, synchronize, and reopened
+    # See https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request
+    # We add a label trigger too, since when the build-publish label is added to a PR, we want to build and publish
     types:
       - opened
       - synchronize
@@ -28,49 +28,41 @@ env:
   # a commit is pushed to develop before merge is run.
   CHECKOUT_REF: ${{ github.event.inputs.git_ref || github.sha }}
 
-
 jobs:
-  merge:
+  image-tag:
     runs-on: ubuntu-latest
-    needs: [split, image-tag]
-    if: ${{ needs.image-tag.outputs.release-type == 'nightly' }}
-    permissions:
-      id-token: write
-      contents: read
+    outputs:
+      image-tag: ${{ steps.get-image-tag.outputs.image-tag }}
+      release-type: ${{ steps.get-image-tag.outputs.release-type }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.2.1
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Configure aws credentials
-        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
-        with:
-          role-to-assume: ${{ secrets.AWS_OIDC_IAM_ROLE_BUILD_PUBLISH_DEVELOP_PR }}
-          aws-region: ${{ secrets.AWS_REGION }}
-          mask-aws-account-id: true
-          role-session-name: "merge"
-
-      - 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.1.1
-        with:
-          path: dist/linux_arm64_v8.0
-          key: chainlink-arm64-${{ github.sha }}
-          fail-on-cache-miss: true
-
-      - name: Merge images for both architectures
-        uses: ./.github/actions/goreleaser-build-sign-publish
-        with:
-          docker-registry: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
-          docker-image-tag: ${{ needs.image-tag.outputs.image-tag }}
-          goreleaser-release-type: "merge"
-          goreleaser-config: .goreleaser.develop.yaml
-          goreleaser-key: ${{ secrets.GORELEASER_KEY }}
+      - name: Get image tag
+        id: get-image-tag
+        run: |
+          short_sha=$(git rev-parse --short HEAD)
+          echo "release-type=snapshot" | tee -a $GITHUB_OUTPUT
+          if [[ ${{ github.event_name }} == 'push' ]]; then
+            echo "image-tag=develop" | tee -a $GITHUB_OUTPUT
+            echo "release-type=nightly" | tee -a $GITHUB_OUTPUT
+          elif [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then
+            echo "image-tag=${short_sha}" | tee -a $GITHUB_OUTPUT
+              if [[ "${{ inputs.build-publish }}" == 'false' ]]; then
+                echo "release-type=snapshot" | tee -a $GITHUB_OUTPUT
+              else
+                echo "release-type=nightly" | tee -a $GITHUB_OUTPUT
+            fi
+          else
+            if [[ ${{ github.event_name }} == "pull_request" ]]; then
+              echo "image-tag=pr-${{ github.event.number }}-${short_sha}" | tee -a $GITHUB_OUTPUT
+              if [[ ${{ contains(github.event.pull_request.labels.*.name, 'build-publish') }} == "true" ]]; then
+                echo "release-type=nightly" | tee -a $GITHUB_OUTPUT
+              fi
+            fi
+          fi
 
   split:
     name: "split-${{ matrix.goarch }}"
@@ -113,45 +105,52 @@ jobs:
 
       - name: Build images for ${{ matrix.goarch }}
         uses: ./.github/actions/goreleaser-build-sign-publish
-        if: steps.cache.outputs.cache-hit != 'true'
+        if: github.event_name == 'workflow_dispatch' || steps.cache.outputs.cache-hit != 'true'
         with:
           docker-registry: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
           docker-image-tag: ${{ needs.image-tag.outputs.image-tag }}
           goreleaser-release-type: ${{ needs.image-tag.outputs.release-type }}
           goreleaser-config: .goreleaser.develop.yaml
           goreleaser-key: ${{ secrets.GORELEASER_KEY }}
 
-  image-tag:
+  merge:
     runs-on: ubuntu-latest
-    outputs:
-      image-tag: ${{ steps.get-image-tag.outputs.image-tag }}
-      release-type: ${{ steps.get-image-tag.outputs.release-type }}
+    needs: [split, image-tag]
+    if: ${{ needs.image-tag.outputs.release-type == 'nightly' }}
+    permissions:
+      id-token: write
+      contents: read
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.2.1
         with:
           ref: ${{ env.CHECKOUT_REF }}
 
-      - name: Get image tag
-        id: get-image-tag
-        run: |
-          short_sha=$(git rev-parse --short HEAD)
-          echo "release-type=snapshot" | tee -a $GITHUB_OUTPUT
-          if [[ ${{ github.event_name }} == 'push' ]]; then
-            echo "image-tag=develop" | tee -a $GITHUB_OUTPUT
-            echo "release-type=nightly" | tee -a $GITHUB_OUTPUT
-          elif [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then
-            echo "image-tag=${short_sha}" | tee -a $GITHUB_OUTPUT
-              if [[ "${{ inputs.build-publish }}" == 'false' ]]; then
-                echo "release-type=snapshot" | tee -a $GITHUB_OUTPUT
-              else
-                echo "release-type=nightly" | tee -a $GITHUB_OUTPUT
-            fi
-          else
-            if [[ ${{ github.event_name }} == "pull_request" ]]; then
-              echo "image-tag=pr-${{ github.event.number }}-${short_sha}" | tee -a $GITHUB_OUTPUT
-              if [[ ${{ contains(github.event.pull_request.labels.*.name, 'build-publish') }} == "true" ]]; then
-                echo "release-type=nightly" | tee -a $GITHUB_OUTPUT
-              fi
-            fi
-          fi
+      - name: Configure aws credentials
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
+        with:
+          role-to-assume: ${{ secrets.AWS_OIDC_IAM_ROLE_BUILD_PUBLISH_DEVELOP_PR }}
+          aws-region: ${{ secrets.AWS_REGION }}
+          mask-aws-account-id: true
+          role-session-name: "merge"
+
+      - 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.1.1
+        with:
+          path: dist/linux_arm64_v8.0
+          key: chainlink-arm64-${{ github.sha }}
+          fail-on-cache-miss: true
+
+      - name: Merge images for both architectures
+        uses: ./.github/actions/goreleaser-build-sign-publish
+        with:
+          docker-registry: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
+          docker-image-tag: ${{ needs.image-tag.outputs.image-tag }}
+          goreleaser-release-type: "merge"
+          goreleaser-config: .goreleaser.develop.yaml
+          goreleaser-key: ${{ secrets.GORELEASER_KEY }}