Skip to content

fix(l2genesis): explicitly initialize WETH storage slots after vm.etch #372

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

Open
dev-khimesh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(l2genesis): explicitly initialize WETH storage slots after vm.etch #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b91d57
fix(disputegamefactory): apply CEI pattern fix in create() and create…
Jul 11, 2026
0b83314
fix(l2genesis): explicitly initialize WETH storage slots after vm.etch
Jul 11, 2026
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
14 changes: 12 additions & 2 deletions scripts/L2Genesis.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,20 @@ contract L2Genesis is Script {
}

/// @notice This predeploy is following the safety invariant #1.
/// This contract is NOT proxied and the state that is set
/// in the constructor is set manually.
/// This contract is NOT proxied.
/// The WETH contract (src/L2/WETH.sol) has no constructor side effects:
/// - `name()` and `symbol()` are `pure` functions that read from the
/// L1Block predeploy, not from storage.
/// - `decimals` is a `constant` (no storage slot).
/// - `_balanceOf` (slot 0) and `_allowance` (slot 1) are mappings
/// that correctly start empty.
/// We explicitly zero both storage slots after `vm.etch` for clarity,
/// even though the EVM zero-initializes all storage after `vm.etch`.
function setWETH() internal {
vm.etch(Predeploys.WETH, vm.getDeployedCode("WETH.sol:WETH"));
// Explicitly zero-initialize storage slots for audit clarity:
vm.store(Predeploys.WETH, bytes32(uint256(0)), bytes32(0)); // _balanceOf (slot 0)
vm.store(Predeploys.WETH, bytes32(uint256(1)), bytes32(0)); // _allowance (slot 1)
}

/// @notice This predeploy is following the safety invariant #2.
Expand Down
8 changes: 6 additions & 2 deletions src/L1/proofs/DisputeGameFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,10 @@ contract DisputeGameFactory is ProxyAdminOwnedBase, ReinitializableBase, Ownable
returns (IDisputeGame proxy_)
{
proxy_ = _createGameImpl(_gameType, _rootClaim, _extraData);
proxy_.initialize{ value: msg.value }();
// EFFECT: Finalize and register state first (CEI pattern)
_finalizeGameCreation(_gameType, _rootClaim, _extraData, proxy_);
// INTERACTION: Perform external initialization call last
proxy_.initialize{ value: msg.value }();
}

function createWithInitData(
Expand All @@ -165,8 +167,10 @@ contract DisputeGameFactory is ProxyAdminOwnedBase, ReinitializableBase, Ownable
returns (IDisputeGame proxy_)
{
proxy_ = _createGameImpl(_gameType, _rootClaim, _extraData);
proxy_.initializeWithInitData{ value: msg.value }(_initData);
// EFFECT: Finalize and register state first (CEI pattern)
_finalizeGameCreation(_gameType, _rootClaim, _extraData, proxy_);
// INTERACTION: Perform external initialization call last
proxy_.initializeWithInitData{ value: msg.value }(_initData);
}

/// @notice Creates a new DisputeGame proxy contract.
Expand Down