Merge remote-tracking branch 'origin/master' into chore/release-2.8.0…

…-to-master

.github/workflows/integration-tests.yml

@@ -144,7 +144,7 @@ jobs:
       - name: Build Chainlink Image
         if: needs.changes.outputs.src == 'true'
         uses: ./.github/actions/build-chainlink-image
-        with: 
+        with:
           tag_suffix: ${{ matrix.image.tag-suffix }}
           dockerfile: ${{ matrix.image.dockerfile }}
           git_commit_sha: ${{ github.sha }}
@@ -832,7 +832,7 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           repository: smartcontractkit/chainlink-solana
-          ref: ${{ needs.get_solana_sha.outputs.sha }}
+          ref: a28100b7f2954604a8ca2ff9ec7bccc6ec952953 # temporarily using specific commit for release branch ${{ needs.get_solana_sha.outputs.sha }}
       - name: Run Setup
         if: needs.changes.outputs.src == 'true'
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/setup-run-tests-environment@e865e376b8c2d594028c8d645dd6c47169b72974 # v2.2.16

core/chains/evm/config/v2/defaults/Base_Goerli.toml

@@ -0,0 +1,29 @@
+ChainID = '84531'
+ChainType = 'optimismBedrock'
+FinalityDepth = 200
+LogPollInterval = '2s'
+NoNewHeadsThreshold = '40s'
+MinIncomingConfirmations = 1
+
+[GasEstimator]
+EIP1559DynamicFees = true
+PriceMin = '1 wei'
+BumpMin = '100 wei'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 60
+
+[Transactions]
+ResendAfterThreshold = '30s'
+
+[HeadTracker]
+HistoryDepth = 300
+
+[NodePool]
+SyncThreshold = 10
+
+[OCR]
+ContractConfirmations = 1
+
+[OCR2.Automation]
+GasLimit = 6500000

core/chains/evm/config/v2/defaults/Base_Mainnet.toml

@@ -0,0 +1,29 @@
+ChainID = '8453'
+ChainType = 'optimismBedrock'
+FinalityDepth = 200
+LogPollInterval = '2s'
+NoNewHeadsThreshold = '40s'
+MinIncomingConfirmations = 1
+
+[GasEstimator]
+EIP1559DynamicFees = true
+PriceMin = '1 wei'
+BumpMin = '100 wei'
+
+[GasEstimator.BlockHistory]
+BlockHistorySize = 24
+
+[Transactions]
+ResendAfterThreshold = '30s'
+
+[HeadTracker]
+HistoryDepth = 300
+
+[NodePool]
+SyncThreshold = 10
+
+[OCR]
+ContractConfirmations = 1
+
+[OCR2.Automation]
+GasLimit = 6500000

docs/CHANGELOG.md

@@ -111,14 +111,17 @@ Starting in `v2.9.0`:
 
 - Added new configuration field named `LeaseDuration` for `EVM.NodePool` that will periodically check if internal subscriptions are connected to the "best" (as defined by the `SelectionMode`) node and switch to it if necessary. Setting this value to `0s` will disable this feature.
 - Added multichain telemetry support. Each network/chainID pair must be configured using the new fields:
+
 ```toml
 [[TelemetryIngress.Endpoints]]
 Network = '...' # e.g. EVM. Solana, Starknet, Cosmos
 ChainID = '...' # e.g. 1, 5, devnet, mainnet-beta
 URL = '...'
 ServerPubKey = '...'
 ```
+
 These will eventually replace `TelemetryIngress.URL` and `TelemetryIngress.ServerPubKey`. Setting `TelemetryIngress.URL` and `TelemetryIngress.ServerPubKey` alongside `[[TelemetryIngress.Endpoints]]` will prevent the node from booting. Only one way of configuring telemetry endpoints is supported.
+
 - Added bridge_name label to `pipeline_tasks_total_finished` prometheus metric. This should make it easier to see directly what bridge was failing out from the CL NODE perspective.
 
 - LogPoller will now use finality tags to dynamically determine finality on evm chains if `EVM.FinalityTagEnabled=true`, rather than the fixed `EVM.FinalityDepth` specified in toml config
@@ -167,7 +170,9 @@ All nodes will have to remove the following configuration field: `ExplorerURL`
 - Fixed a bug where `evmChainId` is requested instead of `id` or `evm-chain-id` in CLI error verbatim
 - Fixed a bug that would cause the node to shut down while performing backup
 - Fixed health checker to include more services in the prometheus `health` metric and HTTP `/health` endpoint
-- Fixed a bug where prices would not be parsed correctly in telemetry data
+  <<<<<<< HEAD
+- # Fixed a bug where prices would not be parsed correctly in telemetry data
+  > > > > > > > master
 
 ## 2.5.0 - 2023-09-13
 

integration-tests/benchmark/keeper_test.go

@@ -36,7 +36,6 @@ Enabled = true
 
 [P2P]
 [P2P.V2]
-Enabled = true
 AnnounceAddresses = ["0.0.0.0:6690"]
 ListenAddresses = ["0.0.0.0:6690"]
 [Keeper]

integration-tests/config/config.go

@@ -4,6 +4,10 @@ var (
 	BaseOCR1Config = `[OCR]
 Enabled = true
 
+[P2P]
+[P2P.V2]
+Enabled = false
+
 [P2P]
 [P2P.V2]
 AnnounceAddresses = ["0.0.0.0:6690"]

integration-tests/performance/ocr_test.go

@@ -101,6 +101,10 @@ func setupOCRTest(t *testing.T) (testEnvironment *environment.Environment, testN
 	baseTOML := `[OCR]
 Enabled = true
 
+[P2P]
+[P2P.V2]
+Enabled = false
+
 [P2P]
 [P2P.V2]
 AnnounceAddresses = ["0.0.0.0:6690"]