resolving merge conflicts

smartcontractkit · Apr 3, 2024 · 73b4f01 · 73b4f01
2 parents 4ab7038 + c0e3374
commit 73b4f01
Show file tree

Hide file tree

Showing 267 changed files with 14,131 additions and 16,623 deletions.
diff --git a/.changeset/brave-games-drop.md b/.changeset/brave-games-drop.md
@@ -0,0 +1,5 @@
+---
+"chainlink": major
+---
+
+Fix kv_store migration fk cascade deletion
diff --git a/.changeset/fresh-oranges-brake.md b/.changeset/fresh-oranges-brake.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+fix jfpc cache cleanup
diff --git a/.changeset/large-flowers-agree.md b/.changeset/large-flowers-agree.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Update keyvalue store to be compatible with the interface required in chainlink common
diff --git a/.changeset/large-oranges-warn.md b/.changeset/large-oranges-warn.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Adds prometheus metrics for automation streams error handling
diff --git a/.changeset/nasty-penguins-smash.md b/.changeset/nasty-penguins-smash.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Add GetFilters function to the log_poller
diff --git a/.changeset/polite-jeans-knock.md b/.changeset/polite-jeans-knock.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Remote Trigger
diff --git a/.changeset/rude-beds-change.md b/.changeset/rude-beds-change.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+more auto 2.3 tests
diff --git a/.changeset/rude-falcons-beg.md b/.changeset/rude-falcons-beg.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Calculate blockRate and logLimit defaults in the log provider based on chain ID
diff --git a/.changeset/spicy-horses-poke.md b/.changeset/spicy-horses-poke.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+Updating prometheus metrics for Automation log triggers
diff --git a/.changeset/tasty-bobcats-hammer.md b/.changeset/tasty-bobcats-hammer.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Remove noisy log poller warning in VRFv2 & VRFv2+ listener loops
diff --git a/.changeset/twenty-zebras-joke.md b/.changeset/twenty-zebras-joke.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+enable gas tests for auto 2.3
diff --git a/.changeset/wet-turtles-provide.md b/.changeset/wet-turtles-provide.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Copy common transmitter methods into FunctionsContractTransmitter to enable product specific modification 
diff --git a/.changeset/wicked-suits-watch.md b/.changeset/wicked-suits-watch.md
@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+Extracted Gas Limit Multiplier from gas estimators to WrappedEvmEstimator.
diff --git a/.github/actions/golangci-lint/action.yml b/.github/actions/golangci-lint/action.yml
@@ -66,8 +66,9 @@ runs:
         path: ${{ inputs.go-directory }}/golangci-lint-report.xml
     - name: Collect Metrics
       if: always()
-      uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+      uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
       with:
+        id: chainlink-golang-ci
         basic-auth: ${{ inputs.gc-basic-auth }}
         hostname: ${{ inputs.gc-host }}
         org-id: ${{ inputs.gc-org-id }}

diff --git a/.github/workflows/automation-benchmark-tests.yml b/.github/workflows/automation-benchmark-tests.yml
@@ -89,8 +89,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: automation-benchmark-build-test-image
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/automation-load-tests.yml b/.github/workflows/automation-load-tests.yml
@@ -107,8 +107,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: automation-load-test
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/automation-nightly-tests.yml b/.github/workflows/automation-nightly-tests.yml
@@ -21,8 +21,9 @@ jobs:
     steps:
       - name: Collect Metrics
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: automation-nightly-build-chainlink
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -59,18 +60,21 @@ jobs:
       matrix:
         tests:
           - name: Upgrade 2.0
+            id: upgrade-2-0
             suite: smoke
             nodes: 1
             os: ubuntu22.04-8cores-32GB
             network: SIMULATED
             command: -run ^TestAutomationNodeUpgrade/registry_2_0 ./smoke
           - name: Upgrade 2.1
+            id: upgrade-2-1
             suite: smoke
             nodes: 5
             os: ubuntu22.04-8cores-32GB
             network: SIMULATED
             command: -run ^TestAutomationNodeUpgrade/registry_2_1 ./smoke
           - name: Upgrade 2.2
+            id: upgrade-2-2
             suite: smoke
             nodes: 5
             os: ubuntu22.04-8cores-32GB
@@ -119,8 +123,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: automation-nightly-upgrade-tests-${{ matrix.tests.id }}
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/automation-ondemand-tests.yml b/.github/workflows/automation-ondemand-tests.yml
@@ -56,8 +56,9 @@ jobs:
       - name: Collect Metrics
         if: inputs.chainlinkImage == ''
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: automation-on-demand-build-chainlink
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -102,8 +103,9 @@ jobs:
     steps:
       - name: Collect Metrics
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: automation-on-demand-build-test-image
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -138,6 +140,7 @@ jobs:
       matrix:
         tests:
           - name: chaos
+            id: chaos
             suite: chaos
             nodes: 15
             os: ubuntu-latest
@@ -146,6 +149,7 @@ jobs:
             network: SIMULATED
             command: -run ^TestAutomationChaos$ ./chaos
           - name: reorg
+            id: reorg
             suite: reorg
             nodes: 5
             os: ubuntu-latest
@@ -154,6 +158,7 @@ jobs:
             network: SIMULATED_NONDEV
             command: -run ^TestAutomationReorg$ ./reorg
           - name: upgrade 2.0
+            id: upgrade-2.0
             type: upgrade
             suite: smoke
             nodes: 1
@@ -163,6 +168,7 @@ jobs:
             network: SIMULATED
             command: -run ^TestAutomationNodeUpgrade/registry_2_0 ./smoke
           - name: upgrade 2.1
+            id: upgrade-2.1
             type: upgrade
             suite: smoke
             nodes: 5
@@ -172,6 +178,7 @@ jobs:
             network: SIMULATED
             command: -run ^TestAutomationNodeUpgrade/registry_2_1 ./smoke
           - name: upgrade 2.2
+            id: upgrade-2.2
             type: upgrade
             suite: smoke
             nodes: 5
@@ -286,8 +293,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: automation-on-demand-tests-${{ matrix.tests.id }}
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/build-publish-develop.yml b/.github/workflows/build-publish-develop.yml
@@ -101,8 +101,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: build-chainlink-develop
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/build-publish-pr.yml b/.github/workflows/build-publish-pr.yml
@@ -56,8 +56,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: build-chainlink-pr
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml
@@ -53,8 +53,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: build-chainlink-publish
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,8 +23,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: build-chainlink
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/changeset.yml b/.github/workflows/changeset.yml
@@ -75,8 +75,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: chainlink-changesets
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
@@ -55,7 +55,7 @@ jobs:
 
   golangci:
     # We don't directly merge dependabot PRs, so let's not waste the resources
-    if: ${{ github.event_name == 'pull_request' ||  github.event_name == 'schedule' && github.actor != 'dependabot[bot]' }}
+    if: ${{ (github.event_name == 'pull_request' ||  github.event_name == 'schedule') && github.actor != 'dependabot[bot]' }}
     name: lint
     runs-on: ubuntu22.04-8cores-32GB
     needs: [filter]
@@ -81,8 +81,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cmd: ["go_core_tests", "go_core_race_tests", "go_core_fuzz"]
-    name: Core Tests (${{ matrix.cmd }})
+        type:
+          - cmd: go_core_tests
+            id: core_unit
+          - cmd: go_core_race_tests
+            id: core_race
+          - cmd: go_core_fuzz
+            id: core_fuzz
+    name: Core Tests (${{ matrix.type.cmd }})
     # We don't directly merge dependabot PRs, so let's not waste the resources
     if: github.actor != 'dependabot[bot]'
     needs: [filter]
@@ -154,15 +160,15 @@ jobs:
         env:
           OUTPUT_FILE: ./output.txt
           USE_TEE: false
-        run: ./tools/bin/${{ matrix.cmd }} ./...
+        run: ./tools/bin/${{ matrix.type.cmd }} ./...
       - name: Print Filtered Test Results
-        if: ${{ failure() && matrix.cmd == 'go_core_tests' && needs.filter.outputs.changes == 'true' }}
+        if: ${{ failure() && matrix.type.cmd == 'go_core_tests' && needs.filter.outputs.changes == 'true' }}
         uses: smartcontractkit/chainlink-github-actions/go/go-test-results-parsing@5bee84d30d90295010bda68b0cd46be3a1eea917 # v2.3.9
         with:
           results-file: ./output.txt
           output-file: ./output-short.txt
       - name: Print Races
-        if: ${{ failure() && matrix.cmd == 'go_core_race_tests' && needs.filter.outputs.changes == 'true' }}
+        if: ${{ failure() && matrix.type.cmd == 'go_core_race_tests' && needs.filter.outputs.changes == 'true' }}
         run: find race.* | xargs cat
       - name: Print postgres logs
         if: ${{ always() &&  needs.filter.outputs.changes == 'true' }}
@@ -172,15 +178,15 @@ jobs:
         if: ${{ needs.filter.outputs.changes == 'true' && always() }}
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
-          name: ${{ matrix.cmd }}_logs
+          name: ${{ matrix.type.cmd }}_logs
           path: |
             ./output.txt
             ./output-short.txt
             ./race.*
             ./coverage.txt
             ./postgres_logs.txt
       - name: Notify Slack
-        if: ${{ failure() && matrix.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.event.branch == 'develop') &&  needs.filter.outputs.changes == 'true' }}
+        if: ${{ failure() && matrix.type.cmd == 'go_core_race_tests' && (github.event_name == 'merge_group' || github.event.branch == 'develop') &&  needs.filter.outputs.changes == 'true' }}
         uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
         env:
           SLACK_BOT_TOKEN: ${{ secrets.QA_SLACK_API_KEY }}
@@ -190,12 +196,13 @@ jobs:
       - name: Collect Metrics
         if: ${{ needs.filter.outputs.changes == 'true' && always() }}
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: ${{ matrix.type.id }}
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
-          this-job-name: Core Tests (${{ matrix.cmd }})
+          this-job-name: Core Tests (${{ matrix.type.cmd }})
           test-results-file: '{"testType":"go","filePath":"./output.txt"}'
         continue-on-error: true
 
@@ -308,8 +315,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: ci-core-sonarqube
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -349,8 +357,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: ci-core-generate
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

diff --git a/.github/workflows/ci-scripts.yml b/.github/workflows/ci-scripts.yml
@@ -38,8 +38,9 @@ jobs:
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
         with:
+          id: ci-test-scripts
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}