Skip to content

Increase MAX_GAS_LIMIT to a higher value that's safe with MT Cannon #15864

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

Merged
pauldowman merged 1 commit into from
May 16, 2025
Merged

Increase MAX_GAS_LIMIT to a higher value that's safe with MT Cannon #15864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/snapshots/semver-lock.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
"sourceCodeHash": "0xad12c20a00dc20683bd3f68e6ee254f968da6cc2d98930be6534107ee5cb11d9"
},
"src/L1/SystemConfig.sol:SystemConfig": {
"initCodeHash": "0x19e352bb99cab389e0eead6178746c49b14d061bea89c444f26e768f601bd6d8",
"sourceCodeHash": "0x5ab5f6a63e40b3c491167afa4a207daebc87286829e3cf07cc2a8ce04abe70e9"
"initCodeHash": "0x07b7039de5b8a4dc57642ee9696e949d70516b7f6dce41dde4920efb17105ef2",
"sourceCodeHash": "0x997212ceadabb306c2abd31918b09bccbba0b21662c1d8930a3599831c374b13"
},
"src/L2/BaseFeeVault.sol:BaseFeeVault": {
"initCodeHash": "0x9b664e3d84ad510091337b4aacaa494b142512e2f6f7fbcdb6210ed62ca9b885",
Expand Down
4 changes: 2 additions & 2 deletions packages/contracts-bedrock/src/L1/StandardValidator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ contract StandardValidator {

/// @notice Returns the expected SystemConfig version.
function systemConfigVersion() public pure returns (string memory) {
return "3.3.0";
return "3.4.0";
}

/// @notice Returns the expected OptimismPortal version.
Expand Down Expand Up @@ -267,7 +267,7 @@ contract StandardValidator {
{
ISemver _semver = ISemver(address(_sysCfg));
_errors = internalRequire(LibString.eq(_semver.version(), systemConfigVersion()), "SYSCON-10", _errors);
_errors = internalRequire(_sysCfg.gasLimit() <= uint64(200_000_000), "SYSCON-20", _errors);
_errors = internalRequire(_sysCfg.gasLimit() <= uint64(500_000_000), "SYSCON-20", _errors);
_errors = internalRequire(_sysCfg.scalar() != 0, "SYSCON-30", _errors);
_errors =
internalRequire(_admin.getProxyImplementation(address(_sysCfg)) == systemConfigImpl, "SYSCON-40", _errors);
Expand Down
6 changes: 3 additions & 3 deletions packages/contracts-bedrock/src/L1/SystemConfig.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ contract SystemConfig is ProxyAdminOwnedBase, OwnableUpgradeable, Reinitializabl
/// @notice The maximum gas limit that can be set for L2 blocks. This limit is used to enforce that the blocks
/// on L2 are not too large to process and prove. Over time, this value can be increased as various
/// optimizations and improvements are made to the system at large.
uint64 internal constant MAX_GAS_LIMIT = 200_000_000;
uint64 internal constant MAX_GAS_LIMIT = 500_000_000;

/// @notice Fixed L2 gas overhead. Used as part of the L2 fee calculation.
/// Deprecated since the Ecotone network upgrade
Expand Down Expand Up @@ -142,9 +142,9 @@ contract SystemConfig is ProxyAdminOwnedBase, OwnableUpgradeable, Reinitializabl
event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data);

/// @notice Semantic version.
/// @custom:semver 3.3.0
/// @custom:semver 3.4.0
function version() public pure virtual returns (string memory) {
return "3.3.0";
return "3.4.0";
}

/// @notice Constructs the SystemConfig contract.
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/test/L1/OPContractsManager.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ contract OPContractsManager_Upgrade_Harness is CommonTest {

// Make sure that the SystemConfig is upgraded to the right version. It must also have the
// right l2ChainId and must be properly initialized.
assertEq(ISemver(address(systemConfig)).version(), "3.3.0");
assertEq(ISemver(address(systemConfig)).version(), "3.4.0");
assertEq(impls.systemConfigImpl, EIP1967Helper.getImplementation(address(systemConfig)));
assertEq(systemConfig.l2ChainId(), l2ChainId);
DeployUtils.assertInitialized({ _contractAddress: address(systemConfig), _isProxy: true, _slot: 0, _offset: 0 });
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-bedrock/test/L1/StandardValidator.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ contract StandardValidator_validate_Test is StandardValidator_TestInit {
/// @notice Tests that the validate function successfully returns the right error when the
/// SystemConfig gas limit is invalid.
function test_validate_systemConfigInvalidGasLimit_succeeds() public {
vm.mockCall(address(systemConfig), abi.encodeCall(ISystemConfig.gasLimit, ()), abi.encode(uint64(200_000_001)));
vm.mockCall(address(systemConfig), abi.encodeCall(ISystemConfig.gasLimit, ()), abi.encode(uint64(500_000_001)));
assertEq("SYSCON-20", _validate(true));
}

Expand Down