Merge branch 'develop' of github.com:smartcontractkit/chainlink into …

…develop

.changeset/dull-dingos-remember.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+use safe lib for approve #bugfix

.changeset/fresh-moles-explode.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+core/chains/evm/logpoller: Stricter finality checks in LogPoller, to be more robust during rpc failover events #updated

.changeset/fuzzy-pans-destroy.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Use sqlutil instead of pg.Opts/Q/Queryer #internal

.changeset/olive-knives-happen.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Generic Plugin `onchainSigningStrategy` support

.changeset/pretty-kangaroos-tell.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Add check for valid semvar value for changeset file #internal

.changeset/smooth-comics-love.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+update keystone gethwrapper with remove operator function #internal

.changeset/tasty-lions-rhyme.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+add getters #internal

.changeset/tricky-bats-exist.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+minor fixes #bugfix

.changeset/two-countries-lay.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+update keystone gethwrapper #internal

.changeset/warm-impalas-return.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added JuelsPerFeeCoinCache is enabled by default for OCR2 jobs, added `Disable` field under [pluginConfig.JuelsPerFeeCoinCache] tag to disable this feature (e.g. Disable=true)

.changeset/witty-icons-rhyme.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+offchain settlement fix #bugfix

.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,22 @@ runs:
         [ChainlinkUpgradeImage]
         image="$UPGRADE_IMAGE"
         version="$UPGRADE_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)

.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

.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:

.github/workflows/automation-ondemand-tests.yml

@@ -226,7 +226,15 @@ jobs:
           UPGRADE_IMAGE: ${{ steps.determine-build.outputs.upgrade_image }}
           PYROSCOPE_SERVER: ${{ matrix.tests.pyroscope_env == '' && '' || !startsWith(github.ref, 'refs/tags/') && '' || secrets.QA_PYROSCOPE_INSTANCE }} # Avoid sending blank envs https://github.com/orgs/community/discussions/25725
           PYROSCOPE_ENVIRONMENT: ${{ matrix.tests.pyroscope_env }}
-          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}          
+          PYROSCOPE_KEY: ${{ secrets.QA_PYROSCOPE_KEY }}
+          RUN_ID: ${{ github.run_id }}
+          TEST_LOG_COLLECT: "true"
+          LOKI_ENDPOINT: https://${{ secrets.GRAFANA_INTERNAL_HOST }}/loki/api/v1/push
+          LOKI_TENANT_ID: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
+          LOKI_BASIC_AUTH:  ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
+          LOGSTREAM_LOG_TARGETS: ${{ vars.LOGSTREAM_LOG_TARGETS }}
+          GRAFANA_URL: ${{ vars.GRAFANA_URL }}
+          GRAFANA_DASHBOARD_URL: "/d/ddf75041-1e39-42af-aa46-361fe4c36e9e/ci-e2e-tests-logs"
         run: |
           echo ::add-mask::$UPGRADE_IMAGE
           echo ::add-mask::$OLD_IMAGE
@@ -242,6 +250,14 @@ jobs:
             pyroscope_enabled=false
           fi          
 
+          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
@@ -254,6 +270,22 @@ jobs:
           image="$UPGRADE_IMAGE"
           version="$UPGRADE_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"
+
           [Pyroscope]
           enabled=$pyroscope_enabled
           server_url="$PYROSCOPE_SERVER"

.github/workflows/integration-tests.yml

@@ -563,12 +563,12 @@ jobs:
             pyroscope_env: ci-smoke-vrf-evm-simulated
           - name: vrfv2
             id: vrfv2
-            nodes: 4
+            nodes: 5
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
             id: vrfv2plus
-            nodes: 7
+            nodes: 8
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2plus-evm-simulated
           - name: forwarder_ocr

.github/workflows/solidity.yml

@@ -258,10 +258,7 @@ jobs:
         uses: smartcontractkit/.github/actions/ci-publish-npm@4b0ab756abcb1760cb82e1e87b94ff431905bffc # [email protected]
         with:
           npm-token: ${{ secrets.NPM_TOKEN }}
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          github-release-tag-name: ${{ github.ref_name }}
-          github-release-changelog-path: "contracts/CHANGELOG.md"
-          create-github-release: true
+          create-github-release: false
           publish-command: "pnpm publish-prod --no-git-checks"
           package-json-directory: contracts
 

.gitignore

@@ -24,7 +24,6 @@ tools/clroot/db.sqlite3-wal
 .envrc
 .env*
 .dbenv
-!charts/chainlink-cluster/.env.example
 !crib/.env.example
 !.github/actions/setup-postgres/.env
 .direnv

GNUmakefile

@@ -33,7 +33,7 @@ gomodtidy: ## Run go mod tidy on all modules.
 	cd ./integration-tests && go mod tidy
 	cd ./integration-tests/load && go mod tidy
 	cd ./dashboard-lib && go mod tidy
-	cd ./charts/chainlink-cluster && go mod tidy
+	cd ./crib && go mod tidy
 
 .PHONY: docs
 docs: ## Install and run pkgsite to view Go docs
@@ -96,7 +96,7 @@ generate: abigen codecgen mockery protoc ## Execute all go:generate commands.
 	cd ./integration-tests && go generate -x ./...
 	cd ./integration-tests/load && go generate -x ./...
 	cd ./dashboard-lib && go generate -x ./...
-	cd ./charts/chainlink-cluster && go generate -x ./...
+	cd ./crib && go generate -x ./...
 
 .PHONY: testscripts
 testscripts: chainlink-test ## Install and run testscript against testdata/scripts/* files.