Merge branch 'develop' into BCF-3255-create-golangci-lint-rule-for-ve…

…tting-logger-args

.changeset/afraid-cups-scream.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added zkSync L1 GasPrice calculation

.changeset/blue-phones-rest.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal Use audited version of OCR2Base.sol in OCR3Capability.sol

.changeset/happy-fans-enjoy.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#db_update ccip capability specs migration

.changeset/pink-ants-reply.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal remove shared secret from transmission schedule

.changeset/stupid-poems-glow.md

@@ -0,0 +1,5 @@
+---
+"chainlink": minor
+---
+
+#internal rework operator_ui installer

.changeset/ten-falcons-suffer.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+move v23 contracts #bugfix

.changeset/unlucky-pillows-fly.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+add events, add getter and add comments #bugfix

.github/pull_request_template.md

@@ -0,0 +1,13 @@
+<!--- Does this work have a corresponding ticket? --> 
+
+https://smartcontract-it.atlassian.net/browse/...
+
+<!--- Does this work depend on other open PRs? -->
+
+Requires:
+- https://github.com/smartcontractkit/chainlink-common/pull/123456
+
+<!--- Does this work support other open PRs? -->
+
+Supports:
+- https://github.com/smartcontractkit/ccip/pull/456789

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

@@ -88,7 +88,7 @@ jobs:
         with:
           ref: ${{ github.head_ref || github.ref_name }}
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}

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

@@ -155,7 +155,7 @@ jobs:
             os: ubuntu-latest
             enabled: ${{ inputs.enableReorg }}
             pyroscope_env: ci-automation-on-demand-reorg
-            network: SIMULATED_NONDEV
+            network: SIMULATED
             command: -run ^TestAutomationReorg$ ./reorg
           - name: upgrade 2.0
             id: upgrade-2.0
@@ -218,7 +218,7 @@ jobs:
             echo "version=${{ inputs.chainlinkVersionUpdate }}" >>$GITHUB_OUTPUT
           fi
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}

.github/workflows/ci-core.yml

@@ -225,7 +225,7 @@ jobs:
       - name: Collect Metrics
         if: ${{ needs.filter.outputs.changes == 'true' && always() }}
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@2954caaadb1b194740b24fde41daf3f4e6d1eba7
+        uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
         with:
           id: ${{ matrix.type.id }}
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}

.github/workflows/client-compatibility-tests.yml

@@ -39,7 +39,7 @@ jobs:
             expression: '^[0-9]+\.[0-9]+\.[0-9]+(\-slots\-per\-epoch)?'    
     steps:
       - name: Update internal ECR if the latest Ethereum client image does not exist
-        uses: smartcontractkit/chainlink-testing-framework/.github/actions/update-internal-mirrors@7eb04a030823b316d8dd5bb555f1e49593a503fc
+        uses: smartcontractkit/chainlink-testing-framework/.github/actions/update-internal-mirrors@5eea86ee4f7742b4e944561a570a6b268e712d9e # v1.30.3
         with:
           aws_region: ${{ secrets.QA_AWS_REGION }}
           role_to_assume: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

.github/workflows/evm-version-compatibility-tests.yml

@@ -229,7 +229,7 @@ jobs:
             echo "run_command=./smoke/${{ matrix.evm_node.product }}_test.go" >> "$GITHUB_OUTPUT"
           fi
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}

.github/workflows/gha-workflow-validation.yml

@@ -14,14 +14,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: GHA Workflow Validator
-        uses: smartcontractkit/.github/actions/gha-workflow-validator@7d4c3591affba99d0b073e527569ec6638518d41 # gha-workflow-validator@0.1.0
+        uses: smartcontractkit/.github/actions/gha-workflow-validator@d316f66b2990ea4daa479daa3de6fc92b00f863e # gha-workflow-validator@0.2.0
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
       - name: Collect Metrics
         if: always()
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0
+        uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
         with:
           id: lint-gh-workflows
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}

.github/workflows/integration-tests.yml

@@ -322,7 +322,7 @@ jobs:
             echo "run_command=./smoke/${{ matrix.product.name }}_test.go" >> "$GITHUB_OUTPUT"
           fi
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -437,7 +437,7 @@ jobs:
             echo "run_command=./smoke/${{ matrix.product.name }}_test.go" >> "$GITHUB_OUTPUT"
           fi
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -660,7 +660,7 @@ jobs:
         run: |
           docker logs otel-collector
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}

.github/workflows/live-testnet-tests.yml

@@ -248,7 +248,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -331,7 +331,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -414,7 +414,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -497,7 +497,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -576,7 +576,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -659,7 +659,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -742,7 +742,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -825,7 +825,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -904,7 +904,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -983,7 +983,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}
@@ -1062,7 +1062,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}

.github/workflows/live-vrf-tests.yml

@@ -139,7 +139,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup GAP for Grafana
-        uses: smartcontractkit/.github/actions/setup-gap@main
+        uses: smartcontractkit/.github/actions/setup-gap@6c9d62fdad050cfb8b59376ded291f1350705944 # [email protected]
         with:
           # aws inputs
           aws-region: ${{ secrets.AWS_REGION }}

.github/workflows/on-demand-keeper-smoke-tests.yml

@@ -151,7 +151,7 @@ jobs:
 
       ## Run this step when changes that require tests to be run are made
       - name: Run Tests
-        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@519851800779323566b7b7c22cc21bff95dbb639
+        uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19
         with:
           test_command_to_run: cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=${{ matrix.product.nodes }} ${{ steps.build-go-test-command.outputs.run_command }} 2>&1 | tee /tmp/gotest.log | gotestloghelper -ci -singlepackage -hidepassingtests=false -hidepassinglogs
           test_download_vendor_packages_command: cd ./integration-tests && go mod download

.github/workflows/solidity.yml

@@ -192,8 +192,9 @@ jobs:
 
       - name: Collect Metrics
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
         with:
+          id: solidity-publish-beta
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}
@@ -234,8 +235,9 @@ jobs:
 
       - name: Collect Metrics
         id: collect-gha-metrics
-        uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0
+        uses: smartcontractkit/push-gha-metrics-action@d9da21a2747016b3e13de58c7d4115a3d5c97935 # v3.0.1
         with:
+          id: solitidy-publish-prod
           org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
           basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
           hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }}

.gitignore

@@ -32,6 +32,7 @@ tools/clroot/db.sqlite3-wal
 *.iml
 debug.env
 *.txt
+operator_ui/install
 
 # codeship
 *.aes
@@ -102,4 +103,3 @@ override*.toml
 .venv/
 
 ocr_soak_report.csv
-

GNUmakefile

@@ -33,7 +33,6 @@ 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 ./crib && go mod tidy
 
 .PHONY: docs
 docs: ## Install and run pkgsite to view Go docs
@@ -83,7 +82,7 @@ docker-plugins:
 
 .PHONY: operator-ui
 operator-ui: ## Fetch the frontend
-	go generate ./core/web
+	go run operator_ui/install.go .
 
 .PHONY: abigen
 abigen: ## Build & install abigen.
@@ -96,7 +95,6 @@ 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 ./crib && go generate -x ./...
 
 .PHONY: testscripts
 testscripts: chainlink-test ## Install and run testscript against testdata/scripts/* files.
@@ -129,7 +127,7 @@ presubmit: ## Format go files and imports.
 
 .PHONY: gomods
 gomods: ## Install gomods
-	go install github.com/jmank88/[email protected].0
+	go install github.com/jmank88/[email protected].1
 
 .PHONY: mockery
 mockery: $(mockery) ## Install mockery.

contracts/.changeset/calm-bikes-grin.md

@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+add events, add getter and add comments #bugfix

contracts/.changeset/proud-seals-draw.md

@@ -0,0 +1,5 @@
+---
+"@chainlink/contracts": patch
+---
+
+move v23 contracts #bugfix

contracts/.changeset/quiet-crews-impress.md

@@ -0,0 +1,5 @@
+---
+'@chainlink/contracts': patch
+---
+
+#internal Use audited version of OCR2Base.sol in OCR3Capability.sol

contracts/.solhintignore

@@ -22,7 +22,7 @@
 ./src/v0.8/automation/AutomationForwarder.sol
 ./src/v0.8/automation/AutomationForwarderLogic.sol
 ./src/v0.8/automation/interfaces/v2_2/IAutomationRegistryMaster.sol
-./src/v0.8/automation/dev/interfaces/v2_3/IAutomationRegistryMaster2_3.sol
+./src/v0.8/automation/interfaces/v2_3/IAutomationRegistryMaster2_3.sol
 
 
 # Ignore tests / test helpers (for now)

contracts/gas-snapshots/keystone.gas-snapshot

@@ -30,8 +30,8 @@ CapabilityRegistry_DeprecateCapabilitiesTest:test_EmitsEvent() (gas: 93066)
 CapabilityRegistry_DeprecateCapabilitiesTest:test_RevertWhen_CalledByNonAdmin() (gas: 22944)
 CapabilityRegistry_DeprecateCapabilitiesTest:test_RevertWhen_CapabilityDoesNotExist() (gas: 16231)
 CapabilityRegistry_DeprecateCapabilitiesTest:test_RevertWhen_CapabilityIsDeprecated() (gas: 94395)
-CapabilityRegistry_GetCapabilitiesTest:test_ExcludesDeprecatedCapabilities() (gas: 122130)
-CapabilityRegistry_GetCapabilitiesTest:test_ReturnsCapabilities() (gas: 58327)
+CapabilityRegistry_GetCapabilitiesTest:test_ExcludesDeprecatedCapabilities() (gas: 122114)
+CapabilityRegistry_GetCapabilitiesTest:test_ReturnsCapabilities() (gas: 58311)
 CapabilityRegistry_GetDONsTest:test_CorrectlyFetchesDONs() (gas: 65746)
 CapabilityRegistry_GetDONsTest:test_DoesNotIncludeRemovedDONs() (gas: 88461)
 CapabilityRegistry_GetHashedCapabilityTest:test_CorrectlyGeneratesHashedCapabilityId() (gas: 11428)

contracts/scripts/generate-automation-master-interface-v2_3.ts

@@ -10,7 +10,7 @@ import { utils } from 'ethers'
 import fs from 'fs'
 import { exec } from 'child_process'
 
-const dest = 'src/v0.8/automation/dev/interfaces/v2_3'
+const dest = 'src/v0.8/automation/interfaces/v2_3'
 const srcDest = `${dest}/IAutomationRegistryMaster2_3.sol`
 const tmpDest = `${dest}/tmp.txt`