Merge branch 'develop' into BCI-3905/update-txm-confirmer-and-finaliz…

…er-query-to-skip-evm-receipt
smartcontractkit · Aug 21, 2024 · 1e9cd28 · 1e9cd28
2 parents ac90100 + ee57b4f
commit 1e9cd28
Show file tree

Hide file tree

Showing 51 changed files with 1,523 additions and 2,557 deletions.
diff --git a/.changeset/odd-eagles-shave.md b/.changeset/odd-eagles-shave.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal Add hexutil Bytes encoding to batchcall data
diff --git a/.changeset/tender-wombats-juggle.md b/.changeset/tender-wombats-juggle.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal topeerid should validate []byte length
diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
diff --git a/.github/workflows/build-publish-develop-pr.yml b/.github/workflows/build-publish-develop-pr.yml
@@ -25,9 +25,6 @@ jobs:
     permissions:
       id-token: write
       contents: read
-    strategy:
-      matrix:
-        goarch: [amd64, arm64]
     steps:
       - name: Checkout repository
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
@@ -36,7 +33,7 @@ jobs:
 
       # This gets the image tag and whether to publish the image based on the event type
       # PR builds: pr-<pr_number>-<short_sha> (if label 'build-publish' is present publishes the image)
-      # develop builds: develop-<short_sha>
+      # develop builds: develop-<short_sha> and develop (only amd64)
       # release builds: release-<short_sha>
       # manual builds: <short_sha> (if build-publish is true publishes the image)
       - name: Get image tag
@@ -81,8 +78,6 @@ jobs:
           docker-image-name: chainlink
           docker-image-tag: ${{ steps.get-image-tag.outputs.image-tag }}
           enable-goreleaser-snapshot: "true"
-          enable-goreleaser-split: "true"
-          goreleaser-split-arch: ${{ matrix.goarch }}
           goreleaser-exec: ./tools/bin/goreleaser_wrapper
           goreleaser-config: .goreleaser.develop.yaml
           goreleaser-key: ${{ secrets.GORELEASER_KEY }}
@@ -92,7 +87,7 @@ jobs:
         if: steps.get-image-tag.outputs.build-publish == 'true'
         shell: bash
         run: |
-          # need to check if artifacts.json exists because goreleaser splits the build
+          # need to check if artifacts.json exists because goreleaser could split the build
           if [[ -f dist/artifacts.json ]]; then
             artifact_path="dist/artifacts.json"
           else
@@ -115,5 +110,5 @@ jobs:
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          this-job-name: goreleaser-build-publish-chainlink (${{ matrix.goarch }})
+          this-job-name: goreleaser-build-publish-chainlink
         continue-on-error: true
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
diff --git a/.github/workflows/run-automation-ondemand-e2e-tests.yml b/.github/workflows/run-automation-ondemand-e2e-tests.yml
@@ -91,53 +91,53 @@ jobs:
 
           # Always run upgrade tests 
           cat > test_list.yaml <<EOF
-          - id: integration-tests/smoke/automation_upgrade_test.go:^TestAutomationNodeUpgrade/registry_2_0
-            test_inputs:
-              chainlink_image: ${{ steps.determine-build.outputs.image }}
-              chainlink_version: ${{ steps.determine-build.outputs.version }}
-              chainlink_upgrade_image: ${{ steps.determine-build.outputs.upgrade_image }}
-              chainlink_upgrade_version: ${{ steps.determine-build.outputs.upgrade_version }}
+          - id: smoke/automation_upgrade_test.go:^TestAutomationNodeUpgrade/registry_2_0
+            test_env_vars:
+              E2E_TEST_CHAINLINK_IMAGE: ${{ steps.determine-build.outputs.image }}
+              E2E_TEST_CHAINLINK_VERSION: ${{ steps.determine-build.outputs.version }}
+              E2E_TEST_CHAINLINK_UPGRADE_IMAGE: ${{ steps.determine-build.outputs.upgrade_image }}
+              E2E_TEST_CHAINLINK_UPGRADE_VERSION: ${{ steps.determine-build.outputs.upgrade_version }}
 
-          - id: integration-tests/smoke/automation_upgrade_test.go:^TestAutomationNodeUpgrade/registry_2_1
-            test_inputs:
-              chainlink_image: ${{ steps.determine-build.outputs.image }}
-              chainlink_version: ${{ steps.determine-build.outputs.version }}
-              chainlink_upgrade_image: ${{ steps.determine-build.outputs.upgrade_image }}
-              chainlink_upgrade_version: ${{ steps.determine-build.outputs.upgrade_version }}
+          - id: smoke/automation_upgrade_test.go:^TestAutomationNodeUpgrade/registry_2_1
+            test_env_vars:
+              E2E_TEST_CHAINLINK_IMAGE: ${{ steps.determine-build.outputs.image }}
+              E2E_TEST_CHAINLINK_VERSION: ${{ steps.determine-build.outputs.version }}
+              E2E_TEST_CHAINLINK_UPGRADE_IMAGE: ${{ steps.determine-build.outputs.upgrade_image }}
+              E2E_TEST_CHAINLINK_UPGRADE_VERSION: ${{ steps.determine-build.outputs.upgrade_version }}
 
-          - id: integration-tests/smoke/automation_upgrade_test.go:^TestAutomationNodeUpgrade/registry_2_2
-            test_inputs:
-              chainlink_image: ${{ steps.determine-build.outputs.image }}
-              chainlink_version: ${{ steps.determine-build.outputs.version }}
-              chainlink_upgrade_image: ${{ steps.determine-build.outputs.upgrade_image }}
-              chainlink_upgrade_version: ${{ steps.determine-build.outputs.upgrade_version }}              
+          - id: smoke/automation_upgrade_test.go:^TestAutomationNodeUpgrade/registry_2_2
+            test_env_vars:
+              E2E_TEST_CHAINLINK_IMAGE: ${{ steps.determine-build.outputs.image }}
+              E2E_TEST_CHAINLINK_VERSION: ${{ steps.determine-build.outputs.version }}
+              E2E_TEST_CHAINLINK_UPGRADE_IMAGE: ${{ steps.determine-build.outputs.upgrade_image }}
+              E2E_TEST_CHAINLINK_UPGRADE_VERSION: ${{ steps.determine-build.outputs.upgrade_version }}              
           EOF
 
           # Run reorg tests if enabled
           if [[ "${{ github.event.inputs.enableReorg }}" == 'true' ]]; then
           cat >> test_list.yaml <<EOF
-          - id: integration-tests/reorg/automation_reorg_test.go^TestAutomationReorg/registry_2_0
-            test_inputs:
-              chainlink_image: ${{ steps.determine-build.outputs.image }}
-              chainlink_version: ${{ steps.determine-build.outputs.version }}
-          - id: integration-tests/reorg/automation_reorg_test.go^TestAutomationReorg/registry_2_1
-            test_inputs:
-              chainlink_image: ${{ steps.determine-build.outputs.image }}
-              chainlink_version: ${{ steps.determine-build.outputs.version }}              
-          - id: integration-tests/reorg/automation_reorg_test.go^TestAutomationReorg/registry_2_2
-            test_inputs:
-              chainlink_image: ${{ steps.determine-build.outputs.image }}
-              chainlink_version: ${{ steps.determine-build.outputs.version }}              
+          - id: reorg/automation_reorg_test.go^TestAutomationReorg/registry_2_0
+            test_env_vars:
+              E2E_TEST_CHAINLINK_IMAGE: ${{ steps.determine-build.outputs.image }}
+              E2E_TEST_CHAINLINK_VERSION: ${{ steps.determine-build.outputs.version }}
+          - id: reorg/automation_reorg_test.go^TestAutomationReorg/registry_2_1
+            test_env_vars:
+              E2E_TEST_CHAINLINK_IMAGE: ${{ steps.determine-build.outputs.image }}
+              E2E_TEST_CHAINLINK_VERSION: ${{ steps.determine-build.outputs.version }}              
+          - id: reorg/automation_reorg_test.go^TestAutomationReorg/registry_2_2
+            test_env_vars:
+              E2E_TEST_CHAINLINK_IMAGE: ${{ steps.determine-build.outputs.image }}
+              E2E_TEST_CHAINLINK_VERSION: ${{ steps.determine-build.outputs.version }}              
           EOF
           fi
 
           # Run chaos tests if enabled
           if [[ "${{ github.event.inputs.enableChaos }}" == 'true' ]]; then
           cat >> test_list.yaml <<EOF
-          - id: integration-tests/chaos/automation_chaos_test.go
-            test_inputs:
-              chainlink_image: ${{ steps.determine-build.outputs.image }}
-              chainlink_version: ${{ steps.determine-build.outputs.version }}
+          - id: chaos/automation_chaos_test.go
+            test_env_vars:
+              E2E_TEST_CHAINLINK_IMAGE: ${{ steps.determine-build.outputs.image }}
+              E2E_TEST_CHAINLINK_VERSION: ${{ steps.determine-build.outputs.version }}
           EOF
           fi