Skip to content

chore(L1): remove EthLockbox #378

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
jackchuma merged 2 commits into from
Jul 20, 2026
Merged

chore(L1): remove EthLockbox #378

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
74b89a5
chore(L1): remove EthLockbox
jackchuma Jul 20, 2026
63547f7
test(L1): retain ETH after failed withdrawal
jackchuma Jul 20, 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
40 changes: 0 additions & 40 deletions interfaces/L1/IETHLockbox.sol
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions interfaces/L1/IOptimismPortal2.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import { ISystemConfig } from "interfaces/L1/ISystemConfig.sol";
import { ISuperchainConfig } from "interfaces/L1/ISuperchainConfig.sol";
import { IAnchorStateRegistry } from "interfaces/L1/proofs/IAnchorStateRegistry.sol";
import { IProxyAdminOwnedBase } from "interfaces/L1/IProxyAdminOwnedBase.sol";
import { IETHLockbox } from "interfaces/L1/IETHLockbox.sol";

interface IOptimismPortal2 is IProxyAdminOwnedBase {
error ContentLengthMismatch();
Expand All @@ -33,7 +32,6 @@ interface IOptimismPortal2 is IProxyAdminOwnedBase {
error OptimismPortal_NoReentrancy();
error OptimismPortal_ProofNotOldEnough();
error OptimismPortal_Unproven();
error OptimismPortal_InvalidLockboxState();
error OutOfGas();
error UnexpectedList();
error UnexpectedString();
Expand All @@ -47,7 +45,6 @@ interface IOptimismPortal2 is IProxyAdminOwnedBase {
receive() external payable;

function anchorStateRegistry() external view returns (IAnchorStateRegistry);
function ethLockbox() external view returns (IETHLockbox);
function checkWithdrawal(bytes32 _withdrawalHash, address _proofSubmitter) external view;
function depositTransaction(
address _to,
Expand Down
26 changes: 0 additions & 26 deletions scripts/deploy/SystemDeploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
import { StateDiff } from "scripts/libraries/StateDiff.sol";
import { Types } from "scripts/libraries/Types.sol";

import { IETHLockbox } from "interfaces/L1/IETHLockbox.sol";
import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.sol";
import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
Expand Down Expand Up @@ -213,7 +212,6 @@ contract SystemDeploy is Script {
superchainConfigImpl: artifacts.mustGetAddress("SuperchainConfigImpl"),
l1ERC721BridgeImpl: artifacts.mustGetAddress("L1ERC721BridgeImpl"),
optimismPortalImpl: artifacts.mustGetAddress("OptimismPortalImpl"),
ethLockboxImpl: artifacts.mustGetAddress("ETHLockboxImpl"),
systemConfigImpl: artifacts.mustGetAddress("SystemConfigImpl"),
optimismMintableERC20FactoryImpl: artifacts.mustGetAddress("OptimismMintableERC20FactoryImpl"),
l1CrossDomainMessengerImpl: artifacts.mustGetAddress("L1CrossDomainMessengerImpl"),
Expand Down Expand Up @@ -453,7 +451,6 @@ contract SystemDeploy is Script {
output_.l1StandardBridgeImpl = address(_deployL1StandardBridgeImpl());
output_.optimismMintableERC20FactoryImpl = address(_deployOptimismMintableERC20FactoryImpl());
output_.optimismPortalImpl = address(_deployOptimismPortalImpl(_input));
output_.ethLockboxImpl = address(_deployETHLockboxImpl());
output_.delayedWETHImpl = address(_deployDelayedWETHImpl(_input));
output_.disputeGameFactoryImpl = address(_deployDisputeGameFactoryImpl());
output_.anchorStateRegistryImpl = address(_deployAnchorStateRegistryImpl(_input));
Expand Down Expand Up @@ -488,7 +485,6 @@ contract SystemDeploy is Script {
output_.l1ERC721BridgeProxy = IL1ERC721Bridge(_deployProxy(_input, output_.opChainProxyAdmin, "L1ERC721Bridge"));
output_.optimismPortalProxy =
IOptimismPortal(payable(_deployProxy(_input, output_.opChainProxyAdmin, "OptimismPortal")));
output_.ethLockboxProxy = IETHLockbox(_deployProxy(_input, output_.opChainProxyAdmin, "ETHLockbox"));
output_.systemConfigProxy = ISystemConfig(_deployProxy(_input, output_.opChainProxyAdmin, "SystemConfig"));
output_.optimismMintableERC20FactoryProxy = IOptimismMintableERC20Factory(
_deployProxy(_input, output_.opChainProxyAdmin, "OptimismMintableERC20Factory")
Expand Down Expand Up @@ -587,15 +583,6 @@ contract SystemDeploy is Script {
abi.encodeCall(IOptimismPortal.initialize, (_output.systemConfigProxy, _output.anchorStateRegistryProxy))
);

IOptimismPortal[] memory portals = new IOptimismPortal[](1);
portals[0] = _output.optimismPortalProxy;
_upgradeToAndCall(
_output.opChainProxyAdmin,
address(_output.ethLockboxProxy),
_impls.ethLockboxImpl,
abi.encodeCall(IETHLockbox.initialize, (_output.systemConfigProxy, portals))
);

_upgradeToAndCall(
_output.opChainProxyAdmin,
address(_output.optimismMintableERC20FactoryProxy),
Expand Down Expand Up @@ -933,16 +920,6 @@ contract SystemDeploy is Script {
);
}

function _deployETHLockboxImpl() internal returns (IETHLockbox) {
return IETHLockbox(
DeployUtils.createDeterministic({
_name: "ETHLockbox",
_args: DeployUtils.encodeConstructor(abi.encodeCall(IETHLockbox.__constructor__, ())),
_salt: DeployUtils.DEFAULT_SALT
})
);
}

function _deployDelayedWETHImpl(ImplementationInput memory _input) internal returns (IDelayedWETH) {
return IDelayedWETH(
DeployUtils.createDeterministic({
Expand Down Expand Up @@ -1134,7 +1111,6 @@ contract SystemDeploy is Script {
DeployUtils.assertValidContractAddress(_impls.superchainConfigImpl);
DeployUtils.assertValidContractAddress(_impls.l1ERC721BridgeImpl);
DeployUtils.assertValidContractAddress(_impls.optimismPortalImpl);
DeployUtils.assertValidContractAddress(_impls.ethLockboxImpl);
DeployUtils.assertValidContractAddress(_impls.systemConfigImpl);
DeployUtils.assertValidContractAddress(_impls.optimismMintableERC20FactoryImpl);
DeployUtils.assertValidContractAddress(_impls.l1CrossDomainMessengerImpl);
Expand Down Expand Up @@ -1164,7 +1140,6 @@ contract SystemDeploy is Script {
artifacts.save("OptimismMintableERC20FactoryProxy", address(chain.optimismMintableERC20FactoryProxy));
artifacts.save("L1StandardBridgeProxy", address(chain.l1StandardBridgeProxy));
artifacts.save("L1CrossDomainMessengerProxy", address(chain.l1CrossDomainMessengerProxy));
artifacts.save("ETHLockboxProxy", address(chain.ethLockboxProxy));
artifacts.save("DisputeGameFactoryProxy", address(chain.disputeGameFactoryProxy));
artifacts.save("DelayedWETHProxy", address(chain.delayedWETHProxy));
artifacts.save("AnchorStateRegistryProxy", address(chain.anchorStateRegistryProxy));
Expand All @@ -1187,7 +1162,6 @@ contract SystemDeploy is Script {
artifacts.save("SuperchainConfigImpl", _impls.superchainConfigImpl);
artifacts.save("L1ERC721BridgeImpl", _impls.l1ERC721BridgeImpl);
artifacts.save("OptimismPortalImpl", _impls.optimismPortalImpl);
artifacts.save("ETHLockboxImpl", _impls.ethLockboxImpl);
artifacts.save("SystemConfigImpl", _impls.systemConfigImpl);
artifacts.save("OptimismMintableERC20FactoryImpl", _impls.optimismMintableERC20FactoryImpl);
artifacts.save("L1CrossDomainMessengerImpl", _impls.l1CrossDomainMessengerImpl);
Expand Down
3 changes: 0 additions & 3 deletions scripts/libraries/Types.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import { IL1CrossDomainMessenger } from "interfaces/L1/IL1CrossDomainMessenger.s
import { IL1ERC721Bridge } from "interfaces/L1/IL1ERC721Bridge.sol";
import { IL1StandardBridge } from "interfaces/L1/IL1StandardBridge.sol";
import { IOptimismMintableERC20Factory } from "interfaces/universal/IOptimismMintableERC20Factory.sol";
import { IETHLockbox } from "interfaces/L1/IETHLockbox.sol";
import { IProtocolVersions } from "interfaces/L1/IProtocolVersions.sol";

import { Proposal } from "src/libraries/bridge/Types.sol";
Expand Down Expand Up @@ -52,7 +51,6 @@ library Types {
IOptimismMintableERC20Factory optimismMintableERC20FactoryProxy;
IL1StandardBridge l1StandardBridgeProxy;
IL1CrossDomainMessenger l1CrossDomainMessengerProxy;
IETHLockbox ethLockboxProxy;
IOptimismPortal2 optimismPortalProxy;
IDisputeGameFactory disputeGameFactoryProxy;
IAnchorStateRegistry anchorStateRegistryProxy;
Expand All @@ -71,7 +69,6 @@ library Types {
address superchainConfigImpl;
address l1ERC721BridgeImpl;
address optimismPortalImpl;
address ethLockboxImpl;
address systemConfigImpl;
address optimismMintableERC20FactoryImpl;
address l1CrossDomainMessengerImpl;
Expand Down
Loading
Loading