review comments

smartcontractkit · Sep 20, 2024 · fa3760d · fa3760d
2 parents fe85444 + 10f7aab
commit fa3760d
Show file tree

Hide file tree

Showing 206 changed files with 5,905 additions and 2,480 deletions.
diff --git a/.changeset/lucky-zebras-reflect.md b/.changeset/lucky-zebras-reflect.md
@@ -0,0 +1,7 @@
+---
+"chainlink": minor
+---
+
+#internal Implement EVM ChainReader ValueComparator filtering by non-indexed event data. Right now only simple non indexed data where byte offsets don't exist is supported.
+
+BCFR-203
diff --git a/.changeset/many-lamps-rush.md b/.changeset/many-lamps-rush.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added Hedera configs
diff --git a/.changeset/sixty-cougars-mix.md b/.changeset/sixty-cougars-mix.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Use tx in insertLogsWithinTx #internal
diff --git a/.changeset/slow-lizards-shout.md b/.changeset/slow-lizards-shout.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Skip telemetry for market-status bridges #internal
diff --git a/.changeset/sour-ears-wink.md b/.changeset/sour-ears-wink.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal KMS client for deployment
diff --git a/.changeset/thirty-emus-enjoy.md b/.changeset/thirty-emus-enjoy.md
@@ -0,0 +1,7 @@
+---
+"chainlink": minor
+---
+
+#bugfix Fix potential nil ptr reference for LinkFeedID and NativeFeedID in Mercury specs
+#bugfix Ensure Streams PluginConfig is checked for contents correctly when validated
+#changed New Feed IDs with 0x01 prefix can be parsed for Mercury report schemas
diff --git a/.changeset/young-lions-provide.md b/.changeset/young-lions-provide.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added feed deployment to ccip integration tests
diff --git a/.github/workflows/build-publish-develop-pr.yml b/.github/workflows/build-publish-develop-pr.yml
@@ -21,6 +21,15 @@ env:
 
 jobs:
   goreleaser-build-publish-chainlink:
+    name: "goreleaser-build-publish-${{ matrix.image-name }}"
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - image-name: chainlink
+            goreleaser-config: .goreleaser.develop.yaml
+          - image-name: ccip
+            goreleaser-config: .goreleaser.ccip.develop.yaml
     runs-on: ubuntu-20.04
     permissions:
       id-token: write
@@ -68,32 +77,25 @@ jobs:
           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: goreleaser-build-publish-chainlink
+          role-session-name: goreleaser-build-publish-${{ matrix.image-name }}
 
       - name: Build and publish images
         uses: ./.github/actions/goreleaser-build-sign-publish
         with:
           enable-docker-publish: ${{ steps.get-image-tag.outputs.build-publish }}
           docker-registry: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }}
-          docker-image-name: chainlink
+          docker-image-name: ${{ matrix.image-name }}
           docker-image-tag: ${{ steps.get-image-tag.outputs.image-tag }}
           enable-goreleaser-snapshot: "true"
           goreleaser-exec: ./tools/bin/goreleaser_wrapper
-          goreleaser-config: .goreleaser.develop.yaml
+          goreleaser-config: ${{ matrix.goreleaser-config }}
           goreleaser-key: ${{ secrets.GORELEASER_KEY }}
           zig-version: 0.11.0
 
       - name: Output image name and digest
         if: steps.get-image-tag.outputs.build-publish == 'true'
         shell: bash
         run: |
-          # 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
-            artifact_path="dist/linux_${{ matrix.goarch }}/artifacts.json"
-            cat dist/linux_${{ matrix.goarch }}/artifacts.json
-          fi
           echo "### Docker Images" | tee -a "$GITHUB_STEP_SUMMARY"
           jq -r '.[] | select(.type == "Docker Image") | "\(.name)"' ${artifact_path} >> output.txt
           while read -r line; do
@@ -109,5 +111,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
+          this-job-name: goreleaser-build-publish-${{ matrix.image-name }}
         continue-on-error: true
diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml
@@ -98,15 +98,27 @@ jobs:
           mask-aws-account-id: true
           role-session-name: goreleaser-build-sign-publish-chainlink
 
+      - name: Set build configs
+        shell: bash
+        id: set-build-configs
+        run: |
+          if [[ ${{ github.ref_name }} =~ "-ccip" ]]; then
+            echo "ECR_IMAGE_NAME=chainlink/ccip" | tee -a $GITHUB_OUTPUT
+            echo "GORELEASER_CONFIG=.goreleaser.ccip.production.yaml" | tee -a $GITHUB_OUTPUT
+          else
+            echo "ECR_IMAGE_NAME=chainlink/chainlink" | tee -a $GITHUB_OUTPUT
+            echo "GORELEASER_CONFIG=.goreleaser.production.yaml" | tee -a $GITHUB_OUTPUT
+          fi
+
       - name: Build, sign, and publish image
         id: goreleaser-build-sign-publish
         uses: ./.github/actions/goreleaser-build-sign-publish
         with:
           docker-registry: ${{ env.ECR_HOSTNAME}}
-          docker-image-name: ${{ env.ECR_IMAGE_NAME }}
+          docker-image-name: ${{ steps.set-build-configs.outputs.ECR_IMAGE_NAME }}
           docker-image-tag: ${{ github.ref_name }}
           goreleaser-exec: ./tools/bin/goreleaser_wrapper
-          goreleaser-config: .goreleaser.production.yaml
+          goreleaser-config: ${{ steps.set-build-configs.outputs.GORELEASER_CONFIG }}
           goreleaser-key: ${{ secrets.GORELEASER_KEY }}
           zig-version: 0.11.0
           enable-cosign: true
@@ -124,10 +136,10 @@ jobs:
             echo "$line" | tee -a "$GITHUB_STEP_SUMMARY"
           done < output.txt
 
-          core_amd64_name="${{ env.ECR_HOSTNAME }}/${{ env.ECR_IMAGE_NAME }}:${{ github.ref_name }}-amd64"
-          plugins_amd64_name="${{ env.ECR_HOSTNAME }}/${{ env.ECR_IMAGE_NAME }}:${{ github.ref_name }}-plugins-amd64"
-          core_arm64_name="${{ env.ECR_HOSTNAME }}/${{ env.ECR_IMAGE_NAME }}:${{ github.ref_name }}-arm64"
-          plugins_arm64_name="${{ env.ECR_HOSTNAME }}/${{ env.ECR_IMAGE_NAME }}:${{ github.ref_name }}-plugins-arm64"
+          core_amd64_name="${{ env.ECR_HOSTNAME }}/${{ steps.set-build-configs.outputs.ECR_IMAGE_NAME }}:${{ github.ref_name }}-amd64"
+          plugins_amd64_name="${{ env.ECR_HOSTNAME }}/${{ steps.set-build-configs.outputs.ECR_IMAGE_NAME }}:${{ github.ref_name }}-plugins-amd64"
+          core_arm64_name="${{ env.ECR_HOSTNAME }}/${{ steps.set-build-configs.outputs.ECR_IMAGE_NAME }}:${{ github.ref_name }}-arm64"
+          plugins_arm64_name="${{ env.ECR_HOSTNAME }}/${{ steps.set-build-configs.outputs.ECR_IMAGE_NAME }}:${{ github.ref_name }}-plugins-arm64"
 
           echo "core_amd64_digest=$(jq -r --arg name "$core_amd64_name" '.[]|select(.type=="Published Docker Image" and .name==$name)|.extra.Digest' ${artifact_path})" | tee -a "$GITHUB_OUTPUT" "$GITHUB_STEP_SUMMARY"
           echo "plugins_amd64_digest=$(jq -r --arg name "$plugins_amd64_name" '.[]|select(.type=="Published Docker Image" and .name==$name)|.extra.Digest' ${artifact_path})" | tee -a "$GITHUB_OUTPUT" "$GITHUB_STEP_SUMMARY"
@@ -143,28 +155,28 @@ jobs:
         uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2
         with:
           subject-digest: ${{ steps.get-image-name-digest.outputs.core_amd64_digest }}
-          subject-name: ${{ env.ECR_HOSTNAME }}/${{ env.ECR_IMAGE_NAME }}
+          subject-name: ${{ env.ECR_HOSTNAME }}/${{ steps.set-build-configs.outputs.ECR_IMAGE_NAME }}
           push-to-registry: true
 
       - name: Attest Docker image (plugins-amd64)
         uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2
         with:
           subject-digest: ${{ steps.get-image-name-digest.outputs.plugins_amd64_digest }}
-          subject-name: ${{ env.ECR_HOSTNAME }}/${{ env.ECR_IMAGE_NAME }}
+          subject-name: ${{ env.ECR_HOSTNAME }}/${{ steps.set-build-configs.outputs.ECR_IMAGE_NAME }}
           push-to-registry: true
 
       - name: Attest Docker image (core-arm64)
         uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2
         with:
           subject-digest: ${{ steps.get-image-name-digest.outputs.core_arm64_digest }}
-          subject-name: ${{ env.ECR_HOSTNAME }}/${{ env.ECR_IMAGE_NAME }}
+          subject-name: ${{ env.ECR_HOSTNAME }}/${{ steps.set-build-configs.outputs.ECR_IMAGE_NAME }}
           push-to-registry: true
 
       - name: Attest Docker image (plugins-arm64)
         uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2
         with:
           subject-digest: ${{ steps.get-image-name-digest.outputs.plugins_arm64_digest }}
-          subject-name: ${{ env.ECR_HOSTNAME }}/${{ env.ECR_IMAGE_NAME }}
+          subject-name: ${{ env.ECR_HOSTNAME }}/${{ steps.set-build-configs.outputs.ECR_IMAGE_NAME }}
           push-to-registry: true
 
       - name: Upload SBOMs

diff --git a/.github/workflows/run-e2e-tests-reusable-workflow.yml b/.github/workflows/run-e2e-tests-reusable-workflow.yml
@@ -572,8 +572,7 @@ jobs:
           E2E_TEST_LOKI_TENANT_ID: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           E2E_TEST_LOKI_ENDPOINT: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
           E2E_TEST_LOKI_BASIC_AUTH: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-          E2E_TEST_GRAFANA_BASE_URL: "http://localhost:8080/primary"
-          E2E_TEST_GRAFANA_DASHBOARD_URL: ${{ matrix.tests.test_env_vars.E2E_TEST_GRAFANA_DASHBOARD_URL || '/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs' }} 
+          E2E_TEST_GRAFANA_DASHBOARD_URL: ${{ matrix.tests.test_env_vars.E2E_TEST_GRAFANA_DASHBOARD_URL }} 
           E2E_TEST_GRAFANA_BEARER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
           E2E_TEST_PYROSCOPE_ENVIRONMENT: ${{ matrix.tests.pyroscope_env }}
           E2E_TEST_PYROSCOPE_SERVER_URL: ${{ matrix.tests.pyroscope_env != '' && secrets.QA_PYROSCOPE_INSTANCE || '' }}
@@ -788,8 +787,7 @@ jobs:
           E2E_TEST_LOKI_TENANT_ID: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           E2E_TEST_LOKI_ENDPOINT: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
           E2E_TEST_LOKI_BASIC_AUTH: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
-          E2E_TEST_GRAFANA_BASE_URL: "http://localhost:8080/primary"
-          E2E_TEST_GRAFANA_DASHBOARD_URL: ${{ matrix.tests.test_env_vars.E2E_TEST_GRAFANA_DASHBOARD_URL || '/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs' }} 
+          E2E_TEST_GRAFANA_DASHBOARD_URL: ${{ matrix.tests.test_env_vars.E2E_TEST_GRAFANA_DASHBOARD_URL }} 
           E2E_TEST_GRAFANA_BEARER_TOKEN: ${{ secrets.GRAFANA_INTERNAL_URL_SHORTENER_TOKEN }}
           E2E_TEST_PYROSCOPE_ENVIRONMENT: ${{ matrix.tests.pyroscope_env }}
           E2E_TEST_PYROSCOPE_SERVER_URL: ${{ matrix.tests.pyroscope_env != '' && secrets.QA_PYROSCOPE_INSTANCE || '' }}