From dcc7dccce43acbf87e0f16aab1d8abedc8c85dbe Mon Sep 17 00:00:00 2001 From: Akshay Aggarwal Date: Wed, 3 Apr 2024 19:10:43 +0100 Subject: [PATCH] Add defaults for ocr2 automation gas limit on eth mainnet and testnet (#12590) * Add defaults for ocr2 automation gas limit on eth mainnet and testnet * regen docs * fixes * fix test --- core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml | 3 +++ core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml | 3 +++ .../chainlink/testdata/config-multi-chain-effective.toml | 2 +- core/web/resolver/testdata/config-multi-chain-effective.toml | 2 +- core/web/resolver/testdata/config-multi-chain.toml | 4 ++++ docs/CONFIG.md | 4 ++-- .../scripts/node/validate/disk-based-logging-disabled.txtar | 2 +- .../scripts/node/validate/disk-based-logging-no-dir.txtar | 2 +- testdata/scripts/node/validate/disk-based-logging.txtar | 2 +- testdata/scripts/node/validate/invalid.txtar | 2 +- testdata/scripts/node/validate/valid.txtar | 2 +- 11 files changed, 19 insertions(+), 9 deletions(-) diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml index 075d450ca22..fede762a663 100644 --- a/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml +++ b/core/chains/evm/config/toml/defaults/Ethereum_Mainnet.toml @@ -11,3 +11,6 @@ BatchSize = 25 # EIP-1559 does well on a smaller block history size BlockHistorySize = 4 TransactionPercentile = 50 + +[OCR2.Automation] +GasLimit = 10500000 diff --git a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml index 27dda602962..27acddeb721 100644 --- a/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml +++ b/core/chains/evm/config/toml/defaults/Ethereum_Sepolia.toml @@ -9,3 +9,6 @@ EIP1559DynamicFees = true BatchSize = 25 BlockHistorySize = 4 TransactionPercentile = 50 + +[OCR2.Automation] +GasLimit = 10500000 diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml index 67cd1770d97..105cbfcaeb6 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -325,7 +325,7 @@ ObservationGracePeriod = '1s' [EVM.OCR2] [EVM.OCR2.Automation] -GasLimit = 5400000 +GasLimit = 10500000 [[EVM.Nodes]] Name = 'primary' diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml index 67cd1770d97..105cbfcaeb6 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -325,7 +325,7 @@ ObservationGracePeriod = '1s' [EVM.OCR2] [EVM.OCR2.Automation] -GasLimit = 5400000 +GasLimit = 10500000 [[EVM.Nodes]] Name = 'primary' diff --git a/core/web/resolver/testdata/config-multi-chain.toml b/core/web/resolver/testdata/config-multi-chain.toml index 7180471ca2a..3598e92cdc2 100644 --- a/core/web/resolver/testdata/config-multi-chain.toml +++ b/core/web/resolver/testdata/config-multi-chain.toml @@ -40,6 +40,10 @@ ChainID = '1' FinalityDepth = 26 FinalityTagEnabled = false +[EVM.OCR2] +[EVM.OCR2.Automation] +GasLimit = 10500000 + [[EVM.Nodes]] Name = 'primary' WSURL = 'wss://web.socket/mainnet' diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 9e385acd750..d1e42b522a5 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -1782,7 +1782,7 @@ ObservationGracePeriod = '1s' [OCR2] [OCR2.Automation] -GasLimit = 5400000 +GasLimit = 10500000 ```

@@ -6029,7 +6029,7 @@ ObservationGracePeriod = '1s' [OCR2] [OCR2.Automation] -GasLimit = 5400000 +GasLimit = 10500000 ```

diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar index cb8fba9d59e..24210031fd2 100644 --- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar @@ -381,7 +381,7 @@ ObservationGracePeriod = '1s' [EVM.OCR2] [EVM.OCR2.Automation] -GasLimit = 5400000 +GasLimit = 10500000 [[EVM.Nodes]] Name = 'fake' 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 2b9cc653d6d..a09a1ec9a53 100644 --- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar @@ -381,7 +381,7 @@ ObservationGracePeriod = '1s' [EVM.OCR2] [EVM.OCR2.Automation] -GasLimit = 5400000 +GasLimit = 10500000 [[EVM.Nodes]] Name = 'fake' diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar index dc679ad7dbb..9182f0ee471 100644 --- a/testdata/scripts/node/validate/disk-based-logging.txtar +++ b/testdata/scripts/node/validate/disk-based-logging.txtar @@ -381,7 +381,7 @@ ObservationGracePeriod = '1s' [EVM.OCR2] [EVM.OCR2.Automation] -GasLimit = 5400000 +GasLimit = 10500000 [[EVM.Nodes]] Name = 'fake' diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar index 1631ac88cfb..1c964ff5f5c 100644 --- a/testdata/scripts/node/validate/invalid.txtar +++ b/testdata/scripts/node/validate/invalid.txtar @@ -371,7 +371,7 @@ ObservationGracePeriod = '1s' [EVM.OCR2] [EVM.OCR2.Automation] -GasLimit = 5400000 +GasLimit = 10500000 [[EVM.Nodes]] Name = 'fake' diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar index 85ac9640363..03a46b1fe94 100644 --- a/testdata/scripts/node/validate/valid.txtar +++ b/testdata/scripts/node/validate/valid.txtar @@ -378,7 +378,7 @@ ObservationGracePeriod = '1s' [EVM.OCR2] [EVM.OCR2.Automation] -GasLimit = 5400000 +GasLimit = 10500000 [[EVM.Nodes]] Name = 'fake'