From 6dad6a53bc781f422f77db05af24df6715c562b8 Mon Sep 17 00:00:00 2001
From: Fergal Gribben <fergal.gribben@smartcontract.com>
Date: Thu, 27 Jun 2024 18:20:48 +0100
Subject: [PATCH] Update configs

---
 .../config/toml/defaults/Avalanche_Fuji.toml  |  2 +-
 .../toml/defaults/Avalanche_Mainnet.toml      |  2 +-
 .../evm/config/toml/defaults/BSC_Mainnet.toml |  2 +-
 .../evm/config/toml/defaults/BSC_Testnet.toml |  2 +-
 .../evm/config/toml/defaults/Base_Goerli.toml |  2 +-
 .../config/toml/defaults/Base_Mainnet.toml    |  2 +-
 .../config/toml/defaults/Base_Sepolia.toml    |  2 +-
 .../config/toml/defaults/Ethereum_Goerli.toml |  2 +-
 .../toml/defaults/Ethereum_Mainnet.toml       |  2 +-
 .../toml/defaults/Ethereum_Rinkeby.toml       |  2 +-
 .../toml/defaults/Ethereum_Sepolia.toml       |  2 +-
 .../config/toml/defaults/Polygon_Amoy.toml    |  2 +-
 .../config/toml/defaults/Polygon_Mainnet.toml |  2 +-
 .../config/toml/defaults/Polygon_Mumbai.toml  |  2 +-
 .../toml/defaults/Polygon_Zkevm_Cardona.toml  |  2 +-
 .../toml/defaults/Polygon_Zkevm_Goerli.toml   |  2 +-
 .../toml/defaults/Polygon_Zkevm_Mainnet.toml  |  2 +-
 .../config-multi-chain-effective.toml         |  8 +--
 .../config-multi-chain-effective.toml         |  8 +--
 docs/CONFIG.md                                | 68 +++++++++----------
 .../disk-based-logging-disabled.txtar         |  2 +-
 .../validate/disk-based-logging-no-dir.txtar  |  2 +-
 testdata/scripts/node/validate/valid.txtar    |  2 +
 23 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml b/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
index 9c6ad4f8c8e..e08b08cbb29 100644
--- a/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
+++ b/core/chains/evm/config/toml/defaults/Avalanche_Fuji.toml
@@ -19,4 +19,4 @@ BlockHistorySize = 24
 FinalityTagBypass = false
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml b/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
index 620ea2a8636..266bff57a72 100644
--- a/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Avalanche_Mainnet.toml
@@ -17,4 +17,4 @@ PriceMin = '25 gwei'
 BlockHistorySize = 24
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
index 4f6ad526522..942e0743022 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Mainnet.toml
@@ -24,4 +24,4 @@ ObservationGracePeriod = '500ms'
 SyncThreshold = 10
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
index 953a984a6c3..f980aa04091 100644
--- a/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
+++ b/core/chains/evm/config/toml/defaults/BSC_Testnet.toml
@@ -29,4 +29,4 @@ ObservationGracePeriod = '500ms'
 SyncThreshold = 10
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Base_Goerli.toml b/core/chains/evm/config/toml/defaults/Base_Goerli.toml
index 33c59ee6d5b..ae8a9020cf6 100644
--- a/core/chains/evm/config/toml/defaults/Base_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Goerli.toml
@@ -27,4 +27,4 @@ ContractConfirmations = 1
 
 [OCR2.Automation]
 GasLimit = 6500000
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Base_Mainnet.toml b/core/chains/evm/config/toml/defaults/Base_Mainnet.toml
index 36dc94d38e0..ae9b7994657 100644
--- a/core/chains/evm/config/toml/defaults/Base_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Mainnet.toml
@@ -27,4 +27,4 @@ ContractConfirmations = 1
 
 [OCR2.Automation]
 GasLimit = 6500000
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Base_Sepolia.toml b/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
index 2daa6e9c0fc..52826ab425f 100644
--- a/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Base_Sepolia.toml
@@ -27,4 +27,4 @@ ContractConfirmations = 1
 
 [OCR2.Automation]
 GasLimit = 6500000
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml b/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
index 24488c03efd..ab9c5ef7bec 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Goerli.toml
@@ -10,4 +10,4 @@ BlockHistorySize = 4
 TransactionPercentile = 50
 
 [OCR2.Automation]
-BlockRate = 20
+LogLimit = 20
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
index 9f4a9c6d2f4..f9d6653636b 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml
@@ -13,4 +13,4 @@ TransactionPercentile = 50
 
 [OCR2.Automation]
 GasLimit = 10500000
-BlockRate = 20
+LogLimit = 20
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml b/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
index c27dce43f0a..3fcef3ccdc0 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Rinkeby.toml
@@ -12,4 +12,4 @@ BlockHistorySize = 4
 TransactionPercentile = 50
 
 [OCR2.Automation]
-BlockRate = 20
+LogLimit = 20
diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
index 11a4037b321..467beee2506 100644
--- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
+++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml
@@ -11,7 +11,7 @@ TransactionPercentile = 50
 
 [OCR2.Automation]
 GasLimit = 10500000
-BlockRate = 20
+LogLimit = 20
 
 [HeadTracker]
 FinalityTagBypass = false
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml b/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
index cc5c91babc7..9f142850f84 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Amoy.toml
@@ -25,4 +25,4 @@ HistoryDepth = 2000
 SyncThreshold = 10
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml b/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
index bda2202de86..303f45750d2 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Mainnet.toml
@@ -36,4 +36,4 @@ HistoryDepth = 2000
 SyncThreshold = 10
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml b/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
index 54c92fd4bd3..f6da421f639 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Mumbai.toml
@@ -26,4 +26,4 @@ HistoryDepth = 2000
 SyncThreshold = 10
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml
index 9f078753f09..b74aacd4347 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Cardona.toml
@@ -24,4 +24,4 @@ BlockHistorySize = 12
 HistoryDepth = 2000
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Goerli.toml b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Goerli.toml
index e45500af2a4..cd3507e05a8 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Goerli.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Goerli.toml
@@ -24,4 +24,4 @@ BlockHistorySize = 12
 HistoryDepth = 2000
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml
index db2220a9e9e..a0ff8978883 100644
--- a/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml
+++ b/core/chains/evm/config/toml/defaults/Polygon_Zkevm_Mainnet.toml
@@ -26,4 +26,4 @@ BlockHistorySize = 12
 HistoryDepth = 2000
 
 [OCR2.Automation]
-BlockRate = 5
+LogLimit = 5
diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml
index a79db5f158f..e34959b5e04 100644
--- a/core/services/chainlink/testdata/config-multi-chain-effective.toml
+++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml
@@ -340,8 +340,8 @@ ObservationGracePeriod = '1s'
 [EVM.OCR2]
 [EVM.OCR2.Automation]
 GasLimit = 10500000
-BlockRate = 20
-LogLimit = 2
+BlockRate = 1
+LogLimit = 20
 
 [[EVM.Nodes]]
 Name = 'primary'
@@ -530,8 +530,8 @@ ObservationGracePeriod = '1s'
 [EVM.OCR2]
 [EVM.OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 
 [[EVM.Nodes]]
 Name = 'bar'
diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml
index a79db5f158f..e34959b5e04 100644
--- a/core/web/resolver/testdata/config-multi-chain-effective.toml
+++ b/core/web/resolver/testdata/config-multi-chain-effective.toml
@@ -340,8 +340,8 @@ ObservationGracePeriod = '1s'
 [EVM.OCR2]
 [EVM.OCR2.Automation]
 GasLimit = 10500000
-BlockRate = 20
-LogLimit = 2
+BlockRate = 1
+LogLimit = 20
 
 [[EVM.Nodes]]
 Name = 'primary'
@@ -530,8 +530,8 @@ ObservationGracePeriod = '1s'
 [EVM.OCR2]
 [EVM.OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 
 [[EVM.Nodes]]
 Name = 'bar'
diff --git a/docs/CONFIG.md b/docs/CONFIG.md
index fbaa80cb45e..1919b17a02c 100644
--- a/docs/CONFIG.md
+++ b/docs/CONFIG.md
@@ -1842,8 +1842,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 10500000
-BlockRate = 20
-LogLimit = 2
+BlockRate = 1
+LogLimit = 20
 ```
 
 </p></details>
@@ -2026,8 +2026,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 20
-LogLimit = 2
+BlockRate = 1
+LogLimit = 20
 ```
 
 </p></details>
@@ -2118,8 +2118,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 20
-LogLimit = 2
+BlockRate = 1
+LogLimit = 20
 ```
 
 </p></details>
@@ -2580,8 +2580,8 @@ ObservationGracePeriod = '500ms'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -2854,8 +2854,8 @@ ObservationGracePeriod = '500ms'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -3131,8 +3131,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -4235,8 +4235,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -4602,8 +4602,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -4786,8 +4786,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -5061,8 +5061,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 6500000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -5430,8 +5430,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -5522,8 +5522,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -6071,8 +6071,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -6162,8 +6162,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 5400000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -6254,8 +6254,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 6500000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -6346,8 +6346,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 6500000
-BlockRate = 5
-LogLimit = 2
+BlockRate = 1
+LogLimit = 5
 ```
 
 </p></details>
@@ -6900,8 +6900,8 @@ ObservationGracePeriod = '1s'
 [OCR2]
 [OCR2.Automation]
 GasLimit = 10500000
-BlockRate = 20
-LogLimit = 2
+BlockRate = 1
+LogLimit = 20
 ```
 
 </p></details>
diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
index a67b1408f5b..5b8d53a7c5d 100644
--- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar
@@ -396,7 +396,7 @@ ObservationGracePeriod = '1s'
 [EVM.OCR2]
 [EVM.OCR2.Automation]
 GasLimit = 10500000
-BlockRate = 1
+BlockRate = 20
 LogLimit = 2
 
 [[EVM.Nodes]]
diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
index e752d65d759..69c2d81216f 100644
--- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
+++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar
@@ -396,7 +396,7 @@ ObservationGracePeriod = '1s'
 [EVM.OCR2]
 [EVM.OCR2.Automation]
 GasLimit = 10500000
-BlockRate = 1
+BlockRate = 20
 LogLimit = 2
 
 [[EVM.Nodes]]
diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar
index 688829513e9..ddb8010be92 100644
--- a/testdata/scripts/node/validate/valid.txtar
+++ b/testdata/scripts/node/validate/valid.txtar
@@ -393,6 +393,8 @@ ObservationGracePeriod = '1s'
 [EVM.OCR2]
 [EVM.OCR2.Automation]
 GasLimit = 10500000
+BlockRate = 20
+LogLimit = 1
 
 [[EVM.Nodes]]
 Name = 'fake'