Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AUTO-9017: polish chain modules #12105

Merged
merged 10 commits into from
Feb 26, 2024
Merged

AUTO-9017: polish chain modules #12105

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
78b7720
AUTO-9017: polish chain modules
FelixFan1992 Feb 20, 2024
92a4276
update overheads
FelixFan1992 Feb 21, 2024
9e64e4c
update gas overheads
FelixFan1992 Feb 21, 2024
3de4f95
Merge branch 'develop' into AUTO-9017
FelixFan1992 Feb 21, 2024
1ee9eff
regen wrappers
FelixFan1992 Feb 21, 2024
31d30e7
adjust
FelixFan1992 Feb 22, 2024
87dceed
update
FelixFan1992 Feb 23, 2024
ecce974
prettier
FelixFan1992 Feb 23, 2024
b5255e0
udpate for arbitrum
FelixFan1992 Feb 23, 2024
8773d4d
update
FelixFan1992 Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions contracts/src/v0.8/automation/dev/chains/ArbitrumModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +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 = 20000;
uint256 private constant PER_CALLDATA_BYTE_GAS_OVERHEAD = 20;
FelixFan1992 marked this conversation as resolved.
Show resolved Hide resolved
uint256 private constant FIXED_GAS_OVERHEAD = 5000;
infiloop2 marked this conversation as resolved.
Show resolved Hide resolved

function blockHash(uint256 n) external view override returns (bytes32) {
uint256 blockNum = ARB_SYS.arbBlockNumber();
Expand Down Expand Up @@ -46,6 +45,6 @@ contract ArbitrumModule is ChainModuleBase {
override
returns (uint256 chainModuleFixedOverhead, uint256 chainModulePerByteOverhead)
{
return (FIXED_GAS_OVERHEAD, PER_CALLDATA_BYTE_GAS_OVERHEAD);
return (FIXED_GAS_OVERHEAD, 0);
}
}
4 changes: 3 additions & 1 deletion contracts/src/v0.8/automation/dev/chains/ChainModuleBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ pragma solidity 0.8.19;
import {IChainModule} from "../interfaces/v2_2/IChainModule.sol";

contract ChainModuleBase is IChainModule {
uint256 private constant FIXED_GAS_OVERHEAD = 300;

function blockNumber() external view virtual returns (uint256) {
return block.number;
}
Expand All @@ -29,6 +31,6 @@ contract ChainModuleBase is IChainModule {
virtual
returns (uint256 chainModuleFixedOverhead, uint256 chainModulePerByteOverhead)
{
return (0, 0);
return (FIXED_GAS_OVERHEAD, 0);
}
}
8 changes: 4 additions & 4 deletions contracts/src/v0.8/automation/dev/chains/OptimismModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 30000;
Copy link
Contributor

@infiloop2 infiloop2 Feb 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be 60000 based on sheet?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes the gas cost calculated by g1 - g2 is about 60K

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));
Expand Down
10 changes: 5 additions & 5 deletions contracts/src/v0.8/automation/dev/chains/ScrollModule.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 15000;
Copy link
Contributor

@infiloop2 infiloop2 Feb 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be 45000 based on sheet? (cost with 0x calldata)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the gas cost calculated by g1 - g2 is about 45K

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));
Expand Down
2 changes: 1 addition & 1 deletion core/gethwrappers/generated/arbitrum_module/arbitrum_module.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/gethwrappers/generated/chain_module_base/chain_module_base.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/gethwrappers/generated/optimism_module/optimism_module.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading