adjust

smartcontractkit · Feb 22, 2024 · 31d30e7 · 31d30e7
1 parent 1ee9eff
commit 31d30e7
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 18 deletions.
diff --git a/contracts/src/v0.8/automation/dev/chains/ArbitrumModule.sol b/contracts/src/v0.8/automation/dev/chains/ArbitrumModule.sol
@@ -16,7 +16,7 @@ contract ArbitrumModule is ChainModuleBase {
   address private constant ARB_GAS_ADDR = 0x000000000000000000000000000000000000006C;
   ArbGasInfo private constant ARB_GAS = ArbGasInfo(ARB_GAS_ADDR);
 
-  uint256 private constant FIXED_GAS_OVERHEAD = 30000;
+  uint256 private constant FIXED_GAS_OVERHEAD = 5000;
   uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 20;
 
   function blockHash(uint256 n) external view override returns (bytes32) {

diff --git a/contracts/src/v0.8/automation/dev/chains/ChainModuleBase.sol b/contracts/src/v0.8/automation/dev/chains/ChainModuleBase.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.19;
 import {IChainModule} from "../interfaces/v2_2/IChainModule.sol";
 
 contract ChainModuleBase is IChainModule {
-  uint256 private constant FIXED_GAS_OVERHEAD = 30000;
+  uint256 private constant FIXED_GAS_OVERHEAD = 300;
 
   function blockNumber() external view virtual returns (uint256) {
     return block.number;

diff --git a/contracts/src/v0.8/automation/dev/chains/OptimismModule.sol b/contracts/src/v0.8/automation/dev/chains/OptimismModule.sol
@@ -10,7 +10,7 @@ contract OptimismModule is ChainModuleBase {
   address private constant OVM_GASPRICEORACLE_ADDR = 0x420000000000000000000000000000000000000F;
   OVM_GasPriceOracle private constant OVM_GASPRICEORACLE = OVM_GasPriceOracle(OVM_GASPRICEORACLE_ADDR);
 
-  uint256 private constant FIXED_GAS_OVERHEAD = 60000;
+  uint256 private constant FIXED_GAS_OVERHEAD = 30000;
   uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 20;
 
   function getCurrentL1Fee() external view override returns (uint256) {

diff --git a/contracts/src/v0.8/automation/dev/chains/ScrollModule.sol b/contracts/src/v0.8/automation/dev/chains/ScrollModule.sol
@@ -10,7 +10,7 @@ contract ScrollModule is ChainModuleBase {
   address private constant SCROLL_ORACLE_ADDR = 0x5300000000000000000000000000000000000002;
   IScrollL1GasPriceOracle private constant SCROLL_ORACLE = IScrollL1GasPriceOracle(SCROLL_ORACLE_ADDR);
 
-  uint256 private constant FIXED_GAS_OVERHEAD = 60000;
+  uint256 private constant FIXED_GAS_OVERHEAD = 15000;
   uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 20;
 
   function getCurrentL1Fee() external view override returns (uint256) {

diff --git a/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol b/contracts/src/v0.8/automation/dev/v2_2/AutomationRegistryBase2_2.sol
@@ -48,8 +48,8 @@ abstract contract AutomationRegistryBase2_2 is ConfirmedOwner {
   // Next block of constants are only used in maxPayment estimation during checkUpkeep simulation
   // These values are calibrated using hardhat tests which simulates various cases and verifies that
   // the variables result in accurate estimation
-  uint256 internal constant REGISTRY_CONDITIONAL_OVERHEAD = 30_000; // Fixed gas overhead for conditional upkeeps
-  uint256 internal constant REGISTRY_LOG_OVERHEAD = 58_000; // Fixed gas overhead for log upkeeps
+  uint256 internal constant REGISTRY_CONDITIONAL_OVERHEAD = 60_000; // Fixed gas overhead for conditional upkeeps
+  uint256 internal constant REGISTRY_LOG_OVERHEAD = 85_000; // Fixed gas overhead for log upkeeps
   uint256 internal constant REGISTRY_PER_SIGNER_GAS_OVERHEAD = 5_600; // Value scales with f
   uint256 internal constant REGISTRY_PER_PERFORM_BYTE_GAS_OVERHEAD = 24; // Per perform data byte overhead
 

diff --git a/core/gethwrappers/generated/arbitrum_module/arbitrum_module.go b/core/gethwrappers/generated/arbitrum_module/arbitrum_module.go
diff --git a/...erated/automation_registry_logic_a_wrapper_2_2/automation_registry_logic_a_wrapper_2_2.go b/...erated/automation_registry_logic_a_wrapper_2_2/automation_registry_logic_a_wrapper_2_2.go
diff --git a/...erated/automation_registry_logic_b_wrapper_2_2/automation_registry_logic_b_wrapper_2_2.go b/...erated/automation_registry_logic_b_wrapper_2_2/automation_registry_logic_b_wrapper_2_2.go
diff --git a/core/gethwrappers/generated/chain_module_base/chain_module_base.go b/core/gethwrappers/generated/chain_module_base/chain_module_base.go
diff --git a/core/gethwrappers/generated/optimism_module/optimism_module.go b/core/gethwrappers/generated/optimism_module/optimism_module.go