Merge branch 'develop' into chore/gha-version-bumps-2024-02

contracts/src/v0.8/automation/dev/chains/ArbitrumModule.sol

@@ -16,8 +16,8 @@ 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 = 20000;
-  uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 20;
+  uint256 private constant FIXED_GAS_OVERHEAD = 5000;
+  uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 0;
 
   function blockHash(uint256 n) external view override returns (bytes32) {
     uint256 blockNum = ARB_SYS.arbBlockNumber();

contracts/src/v0.8/automation/dev/chains/ChainModuleBase.sol

@@ -4,6 +4,9 @@ pragma solidity 0.8.19;
 import {IChainModule} from "../interfaces/v2_2/IChainModule.sol";
 
 contract ChainModuleBase is IChainModule {
+  uint256 private constant FIXED_GAS_OVERHEAD = 300;
+  uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 0;
+
   function blockNumber() external view virtual returns (uint256) {
     return block.number;
   }
@@ -29,6 +32,6 @@ contract ChainModuleBase is IChainModule {
     virtual
     returns (uint256 chainModuleFixedOverhead, uint256 chainModulePerByteOverhead)
   {
-    return (0, 0);
+    return (FIXED_GAS_OVERHEAD, PER_CALLDATA_BYTE_GAS_OVERHEAD);
   }
 }

contracts/src/v0.8/automation/dev/chains/OptimismModule.sol

@@ -5,16 +5,16 @@ import {OVM_GasPriceOracle} from "../../../vendor/@eth-optimism/contracts/v0.8.9
 import {ChainModuleBase} from "./ChainModuleBase.sol";
 
 contract OptimismModule is ChainModuleBase {
-  /// @dev OP_L1_DATA_FEE_PADDING includes 35 bytes for L1 data padding for Optimism and BASE
+  /// @dev OP_L1_DATA_FEE_PADDING includes 80 bytes for L1 data padding for Optimism and BASE
   bytes private constant OP_L1_DATA_FEE_PADDING =
-    hex"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
+    hex"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
   /// @dev OVM_GASPRICEORACLE_ADDR is the address of the OVM_GasPriceOracle precompile on Optimism.
   /// @dev reference: https://community.optimism.io/docs/developers/build/transaction-fees/#estimating-the-l1-data-fee
   address private constant OVM_GASPRICEORACLE_ADDR = 0x420000000000000000000000000000000000000F;
   OVM_GasPriceOracle private constant OVM_GASPRICEORACLE = OVM_GasPriceOracle(OVM_GASPRICEORACLE_ADDR);
 
-  uint256 private constant FIXED_GAS_OVERHEAD = 20000;
-  uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 20;
+  uint256 private constant FIXED_GAS_OVERHEAD = 60_000;
+  uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 270;
 
   function getCurrentL1Fee() external view override returns (uint256) {
     return OVM_GASPRICEORACLE.getL1Fee(bytes.concat(msg.data, OP_L1_DATA_FEE_PADDING));

contracts/src/v0.8/automation/dev/chains/ScrollModule.sol

@@ -5,18 +5,18 @@ import {IScrollL1GasPriceOracle} from "../../../vendor/@scroll-tech/contracts/sr
 import {ChainModuleBase} from "./ChainModuleBase.sol";
 
 contract ScrollModule is ChainModuleBase {
-  /// @dev SCROLL_L1_FEE_DATA_PADDING includes 120 bytes for L1 data padding for Optimism
+  /// @dev SCROLL_L1_FEE_DATA_PADDING includes 140 bytes for L1 data padding for Scroll
   /// @dev according to testing, this padding allows automation registry to properly estimates L1 data fee with 3-5% buffer
   /// @dev this MAY NOT work for a different product and this may get out of date if transmit function is changed
   bytes private constant SCROLL_L1_FEE_DATA_PADDING =
-    hex"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
-  /// @dev SCROLL_ORACLE_ADDR is the address of the L1GasPriceOracle precompile on Optimism.
+    hex"ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff";
+  /// @dev SCROLL_ORACLE_ADDR is the address of the ScrollL1GasPriceOracle precompile on Scroll.
   /// @dev reference: https://docs.scroll.io/en/developers/transaction-fees-on-scroll/#estimating-the-l1-data-fee
   address private constant SCROLL_ORACLE_ADDR = 0x5300000000000000000000000000000000000002;
   IScrollL1GasPriceOracle private constant SCROLL_ORACLE = IScrollL1GasPriceOracle(SCROLL_ORACLE_ADDR);
 
-  uint256 private constant FIXED_GAS_OVERHEAD = 20000;
-  uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 20;
+  uint256 private constant FIXED_GAS_OVERHEAD = 45_000;
+  uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 170;
 
   function getCurrentL1Fee() external view override returns (uint256) {
     return SCROLL_ORACLE.getL1Fee(bytes.concat(msg.data, SCROLL_L1_FEE_DATA_PADDING));