diff --git a/packages/contracts-bedrock/scripts/L2Genesis.s.sol b/packages/contracts-bedrock/scripts/L2Genesis.s.sol index 98edde181cc7..57b00494ec12 100644 --- a/packages/contracts-bedrock/scripts/L2Genesis.s.sol +++ b/packages/contracts-bedrock/scripts/L2Genesis.s.sol @@ -312,15 +312,7 @@ contract L2Genesis is Deployer { /// @notice This predeploy is following the safety invariant #1. function setL2StandardBridge(address payable _l1StandardBridgeProxy) public { - address impl; - if (cfg.useInterop()) { - string memory cname = "L2StandardBridgeInterop"; - impl = Predeploys.predeployToCodeNamespace(Predeploys.L2_STANDARD_BRIDGE); - console.log("Setting %s implementation at: %s", cname, impl); - vm.etch(impl, vm.getDeployedCode(string.concat(cname, ".sol:", cname))); - } else { - impl = _setImplementationCode(Predeploys.L2_STANDARD_BRIDGE); - } + address impl = _setImplementationCode(Predeploys.L2_STANDARD_BRIDGE); IL2StandardBridge(payable(impl)).initialize({ _otherBridge: IStandardBridge(payable(address(0))) }); diff --git a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol index 39e84556b35e..8bd51e59ec42 100644 --- a/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol +++ b/packages/contracts-bedrock/test/L2/L2StandardBridgeInterop.t.sol @@ -19,6 +19,9 @@ contract L2StandardBridgeInterop_Test is CommonTest { /// @notice Test setup. function setUp() public virtual override { + // Skip the test until L2StandardBridgeInterop is integrated again + vm.skip(true); + super.enableInterop(); super.setUp(); }