diff --git a/mainnet/2024-11-18-increase-max-gas-limit/.env b/mainnet/2024-11-18-increase-max-gas-limit/.env index d73a36cb..3df3f6a2 100644 --- a/mainnet/2024-11-18-increase-max-gas-limit/.env +++ b/mainnet/2024-11-18-increase-max-gas-limit/.env @@ -1,6 +1,6 @@ -BASE_CONTRACTS_COMMIT=ed36aac52a19bdad6dee09c59e7241fe3a194160 OPTIMISM_REPO=https://github.com/ethereum-optimism/optimism.git -OPTIMISM_PR_ID=pull/12879/head +OPTIMISM_VERSION=op-contracts/v1.5.0 +OPTIMISM_CONTRACT_PATCH=patch/max-gas-limit.patch SAFE_ADDRESS=0x7bb41c3008b3f03fe483b28b8db90e19cf07595c PROXY_ADMIN_ADDRESS=0x0475cBCAebd9CE8AfA5025828d5b98DFb67E059E diff --git a/mainnet/2024-11-18-increase-max-gas-limit/Makefile b/mainnet/2024-11-18-increase-max-gas-limit/Makefile index 68e69d4e..004c5bc6 100644 --- a/mainnet/2024-11-18-increase-max-gas-limit/Makefile +++ b/mainnet/2024-11-18-increase-max-gas-limit/Makefile @@ -14,8 +14,9 @@ checkout-op-commit: cd lib/optimism; \ git init; \ git remote add origin $(OPTIMISM_REPO); \ - git fetch --depth=1 origin $(OPTIMISM_PR_ID):pr_branch; \ - git switch pr_branch + git fetch --depth=1 origin tag $(OPTIMISM_VERSION) --no-tags; \ + git checkout $(OPTIMISM_VERSION); \ + git apply ../../$(OPTIMISM_CONTRACT_PATCH) .PHONY: deploy diff --git a/mainnet/2024-11-18-increase-max-gas-limit/patch/max-gas-limit.patch b/mainnet/2024-11-18-increase-max-gas-limit/patch/max-gas-limit.patch new file mode 100644 index 00000000..fc89fd73 --- /dev/null +++ b/mainnet/2024-11-18-increase-max-gas-limit/patch/max-gas-limit.patch @@ -0,0 +1,24 @@ +diff --git a/packages/contracts-bedrock/src/L1/SystemConfig.sol b/packages/contracts-bedrock/src/L1/SystemConfig.sol +index 67a8353ae..ae72faf92 100644 +--- a/packages/contracts-bedrock/src/L1/SystemConfig.sol ++++ b/packages/contracts-bedrock/src/L1/SystemConfig.sol +@@ -87,7 +87,7 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken { + /// @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 = 400_000_000; + + /// @notice Fixed L2 gas overhead. Used as part of the L2 fee calculation. + uint256 public overhead; +@@ -115,8 +115,8 @@ contract SystemConfig is OwnableUpgradeable, ISemver, IGasToken { + event ConfigUpdate(uint256 indexed version, UpdateType indexed updateType, bytes data); + + /// @notice Semantic version. +- /// @custom:semver 2.2.0 +- string public constant version = "2.2.0"; ++ /// @custom:semver 2.2.0+max-gas-limit-400M ++ string public constant version = "2.2.0+max-gas-limit-400M"; + + /// @notice Constructs the SystemConfig contract. Cannot set + /// the owner to `address(0)` due to the Ownable contract's