Merge branch 'develop' into add-coordinatorv2_5_mock

smartcontractkit · May 2, 2024 · 7963274 · 7963274
2 parents 31331a7 + 841fe61
commit 7963274
Show file tree

Hide file tree

Showing 576 changed files with 25,038 additions and 10,978 deletions.
diff --git a/.changeset/bright-queens-joke.md b/.changeset/bright-queens-joke.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Keystone - rename type -> id
diff --git a/.changeset/brown-penguins-grin.md b/.changeset/brown-penguins-grin.md
diff --git a/.changeset/chilled-bikes-unite.md b/.changeset/chilled-bikes-unite.md
diff --git a/.changeset/cyan-crabs-explode.md b/.changeset/cyan-crabs-explode.md
diff --git a/.changeset/empty-tomatoes-yawn.md b/.changeset/empty-tomatoes-yawn.md
diff --git a/.changeset/flat-guests-marry.md b/.changeset/flat-guests-marry.md
diff --git a/.changeset/forty-feet-train.md b/.changeset/forty-feet-train.md
diff --git a/.changeset/four-shoes-trade.md b/.changeset/four-shoes-trade.md
diff --git a/.changeset/fresh-lizards-love.md b/.changeset/fresh-lizards-love.md
diff --git a/.changeset/gold-bottles-tell.md b/.changeset/gold-bottles-tell.md
diff --git a/.changeset/great-rockets-obey.md b/.changeset/great-rockets-obey.md
diff --git a/.changeset/hot-dryers-flash.md b/.changeset/hot-dryers-flash.md
diff --git a/.changeset/hungry-ways-add.md b/.changeset/hungry-ways-add.md
diff --git a/.changeset/kind-deers-leave.md b/.changeset/kind-deers-leave.md
diff --git a/.changeset/loud-peaches-beg.md b/.changeset/loud-peaches-beg.md
diff --git a/.changeset/lucky-ghosts-give.md b/.changeset/lucky-ghosts-give.md
diff --git a/.changeset/lucky-windows-taste.md b/.changeset/lucky-windows-taste.md
diff --git a/.changeset/many-pillows-reflect.md b/.changeset/many-pillows-reflect.md
diff --git a/.changeset/new-forks-grab.md b/.changeset/new-forks-grab.md
diff --git a/.changeset/odd-horses-fix.md b/.changeset/odd-horses-fix.md
diff --git a/.changeset/orange-squids-kick.md b/.changeset/orange-squids-kick.md
diff --git a/.changeset/plenty-wombats-grab.md b/.changeset/plenty-wombats-grab.md
diff --git a/.changeset/poor-masks-fold.md b/.changeset/poor-masks-fold.md
diff --git a/.changeset/poor-socks-travel.md b/.changeset/poor-socks-travel.md
diff --git a/.changeset/pretty-flies-fold.md b/.changeset/pretty-flies-fold.md
diff --git a/.changeset/real-numbers-taste.md b/.changeset/real-numbers-taste.md
diff --git a/.changeset/rich-jars-flow.md b/.changeset/rich-jars-flow.md
diff --git a/.changeset/silver-otters-play.md b/.changeset/silver-otters-play.md
diff --git a/.changeset/soft-hotels-decide.md b/.changeset/soft-hotels-decide.md
diff --git a/.changeset/stale-terms-march.md b/.changeset/stale-terms-march.md
diff --git a/.changeset/sweet-sloths-laugh.md b/.changeset/sweet-sloths-laugh.md
diff --git a/.changeset/swift-horses-unite.md b/.changeset/swift-horses-unite.md
diff --git a/.changeset/ten-clouds-collect.md b/.changeset/ten-clouds-collect.md
diff --git a/.changeset/tender-crews-jam.md b/.changeset/tender-crews-jam.md
diff --git a/.changeset/weak-emus-reply.md b/.changeset/weak-emus-reply.md
diff --git a/.ct.yml b/.ct.yml
diff --git a/.github/actions/build-chainlink-image/action.yml b/.github/actions/build-chainlink-image/action.yml
@@ -33,14 +33,15 @@ runs:
         AWS_ROLE_TO_ASSUME: ${{ inputs.AWS_ROLE_TO_ASSUME }}
     - name: Build Image
       if: steps.check-image.outputs.exists != 'true'
-      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@5dd916d08c03cb5f9a97304f4f174820421bb946 # v2.3.11
+      uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@519851800779323566b7b7c22cc21bff95dbb639 # v2.3.14
       with:
         cl_repo: smartcontractkit/chainlink
         cl_ref: ${{ inputs.git_commit_sha }}
         cl_dockerfile: ${{ inputs.dockerfile }}
         push_tag: ${{ env.CHAINLINK_IMAGE }}:${{ inputs.git_commit_sha }}${{ inputs.tag_suffix }}
         QA_AWS_REGION: ${{ inputs.AWS_REGION }}
         QA_AWS_ROLE_TO_ASSUME: ${{ inputs.AWS_ROLE_TO_ASSUME }}
+        GO_COVER_FLAG: true
         dep_evm_sha: ${{ inputs.dep_evm_sha }}
     - name: Print Chainlink Image Built
       shell: sh

diff --git a/.github/actions/golangci-lint/action.yml b/.github/actions/golangci-lint/action.yml
@@ -7,7 +7,7 @@ inputs:
     required: true
   name:
     description: Name of the lint action
-    default: lint
+    required: true
   go-directory:
     description: Go directory to run commands from
     default: "."

diff --git a/.github/actions/setup-create-base64-upgrade-config/action.yml b/.github/actions/setup-create-base64-upgrade-config/action.yml
@@ -17,6 +17,23 @@ inputs:
     default: "public.ecr.aws/chainlink/chainlink"
   upgradeVersion:
     description: The git commit sha to use for the image tag
+  runId:
+    description: The run id
+  testLogCollect:
+    description: Whether to always collect logs, even for passing tests
+    default: "false"
+  lokiEndpoint:
+    description: Loki push endpoint
+  lokiTenantId:
+    description: Loki tenant id
+  lokiBasicAuth:
+    description: Loki basic auth
+  logstreamLogTargets:
+    description: Where to send logs (e.g. file, loki)
+  grafanaUrl:
+    description: Grafana URL
+  grafanaDashboardUrl:
+    description: Grafana dashboard URL
 
 runs:
   using: composite
@@ -31,6 +48,14 @@ runs:
         CHAINLINK_POSTGRES_VERSION: ${{ inputs.chainlinkPostgresVersion }}
         UPGRADE_IMAGE: ${{ inputs.upgradeImage }}
         UPGRADE_VERSION: ${{ inputs.upgradeVersion }}
+        RUN_ID: ${{ inputs.runId }}
+        TEST_LOG_COLLECT: ${{ inputs.testLogCollect }}
+        LOKI_ENDPOINT: ${{ inputs.lokiEndpoint }}
+        LOKI_TENANT_ID: ${{ inputs.lokiTenantId }}
+        LOKI_BASIC_AUTH: ${{ inputs.lokiBasicAuth }}
+        LOGSTREAM_LOG_TARGETS: ${{ inputs.logstreamLogTargets }}
+        GRAFANA_URL: ${{ inputs.grafanaUrl }}
+        GRAFANA_DASHBOARD_URL: ${{ inputs.grafanaDashboardUrl }}
       run: |
         function convert_to_toml_array() {
           local IFS=','
@@ -47,6 +72,14 @@ runs:
 
         selected_networks=$(convert_to_toml_array "$SELECTED_NETWORKS")
 
+        if [ -n "$TEST_LOG_COLLECT" ]; then
+          test_log_collect=true
+        else
+          test_log_collect=false
+        fi
+
+        log_targets=$(convert_to_toml_array "$LOGSTREAM_LOG_TARGETS")
+
         cat << EOF > config.toml
         [Network]
         selected_networks=$selected_networks
@@ -59,6 +92,23 @@ runs:
         [ChainlinkUpgradeImage]
         image="$UPGRADE_IMAGE"
         version="$UPGRADE_VERSION"
+        postgres_version="$CHAINLINK_POSTGRES_VERSION"
+
+        [Logging]
+        test_log_collect=$test_log_collect
+        run_id="$RUN_ID"
+
+        [Logging.LogStream]
+        log_targets=$log_targets
+
+        [Logging.Loki]
+        tenant_id="$LOKI_TENANT_ID"
+        endpoint="$LOKI_ENDPOINT"
+        basic_auth_secret="$LOKI_BASIC_AUTH"
+
+        [Logging.Grafana]
+        base_url="$GRAFANA_URL"
+        dashboard_url="$GRAFANA_DASHBOARD_URL"
         EOF
 
         BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0)

diff --git a/.github/scripts/check-changeset-tags.sh b/.github/scripts/check-changeset-tags.sh
@@ -29,6 +29,14 @@ if [[ ! -f "$CHANGESET_FILE_PATH" ]]; then
   exit 1
 fi
 
+changeset_content=$(sed -n '/^---$/,/^---$/{ /^---$/!p; }' $CHANGESET_FILE_PATH)
+semvar_value=$(echo "$changeset_content" | awk -F": " '/"chainlink"/ {print $2}')
+
+if [[ "$semvar_value" != "major" && "$semvar_value" != "minor" && "$semvar_value" != "patch" ]]; then
+  echo "Invalid changeset semvar value for 'chainlink'. Must be 'major', 'minor', or 'patch'."
+  exit 1
+fi
+
 while IFS= read -r line; do
   for tag in "${tags_list[@]}"; do
     if [[ "$line" == *"$tag"* ]]; then

diff --git a/.github/workflows/automation-nightly-tests.yml b/.github/workflows/automation-nightly-tests.yml
@@ -95,6 +95,14 @@ jobs:
           chainlinkVersion: "latest"
           upgradeImage: ${{ env.CHAINLINK_IMAGE }}
           upgradeVersion: ${{ github.sha }}
+          runId: ${{ github.run_id }}
+          testLogCollect: "true"
+          lokiEndpoint: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+          lokiTenantId: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          lokiBasicAuth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          logstreamLogTargets: ${{ vars.LOGSTREAM_LOG_TARGETS }}
+          grafanaUrl: ${{ vars.GRAFANA_URL }}
+          grafanaDashboardUrl: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
       - name: Run Tests
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5dd916d08c03cb5f9a97304f4f174820421bb946 # v2.3.11
         env: