Skip to content

chore: descope interop bridges #15726

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
tynes merged 3 commits into from
May 7, 2025
Merged

chore: descope interop bridges #15726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de36ba6
chore: descope interop bridges
hexshire May 6, 2025
c5c51e9
Merge branch 'develop' into chore/sync-dev-on-descope-interop-bridge
hexshire May 6, 2025
d5b8e3b
Merge pull request #383 from defi-wonderland/chore/sync-dev-on-descop…
agusduha May 6, 2025
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
3 changes: 0 additions & 3 deletions packages/contracts-bedrock/scripts/L2Genesis.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,6 @@ contract L2Genesis is Script {
if (_input.useInterop) {
setCrossL2Inbox(); // 22
setL2ToL2CrossDomainMessenger(); // 23
setSuperchainETHBridge(); // 24
setETHLiquidity(); // 25
setSuperchainTokenBridge(); // 28
}
}

Expand Down
3 changes: 1 addition & 2 deletions packages/contracts-bedrock/src/libraries/Predeploys.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,7 @@ library Predeploys {
|| _addr == OPTIMISM_MINTABLE_ERC721_FACTORY || _addr == PROXY_ADMIN || _addr == BASE_FEE_VAULT
|| _addr == L1_FEE_VAULT || _addr == OPERATOR_FEE_VAULT || _addr == SCHEMA_REGISTRY || _addr == EAS
|| _addr == GOVERNANCE_TOKEN || (_useInterop && _addr == CROSS_L2_INBOX)
|| (_useInterop && _addr == L2_TO_L2_CROSS_DOMAIN_MESSENGER) || (_useInterop && _addr == SUPERCHAIN_ETH_BRIDGE)
|| (_useInterop && _addr == ETH_LIQUIDITY) || (_useInterop && _addr == SUPERCHAIN_TOKEN_BRIDGE);
|| (_useInterop && _addr == L2_TO_L2_CROSS_DOMAIN_MESSENGER);
}

function isPredeployNamespace(address _addr) internal pure returns (bool) {
Expand Down
7 changes: 7 additions & 0 deletions packages/contracts-bedrock/test/L2/ETHLiquidity.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ contract ETHLiquidity_Test is CommonTest {
function setUp() public virtual override {
super.enableInterop();
super.setUp();

{
// TODO: Remove this block when L2Genesis includes this contract.
vm.etch(address(superchainETHBridge), vm.getDeployedCode("SuperchainETHBridge.sol:SuperchainETHBridge"));
vm.etch(address(ethLiquidity), vm.getDeployedCode("ETHLiquidity.sol:ETHLiquidity"));
vm.deal(address(ethLiquidity), type(uint248).max);
}
}

/// @notice Tests that contract is set up with the correct starting balance.
Expand Down
8 changes: 8 additions & 0 deletions packages/contracts-bedrock/test/L2/ExecutingMessageEmitted.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,14 @@ contract ExecutingMessageEmittedTest is CommonTest {
super.enableInterop();
super.setUp();

{
// TODO: Remove this block when L2Genesis includes this contract.
vm.etch(
Predeploys.SUPERCHAIN_TOKEN_BRIDGE,
vm.getDeployedCode("SuperchainTokenBridge.sol:SuperchainTokenBridge")
);
}

vm.etch(superchainERC20, vm.getDeployedCode("OptimismSuperchainERC20.sol:OptimismSuperchainERC20"));
}

Expand Down
6 changes: 6 additions & 0 deletions packages/contracts-bedrock/test/L2/SuperchainETHBridge.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ contract SuperchainETHBridge_Test is CommonTest {
function setUp() public virtual override {
super.enableInterop();
super.setUp();

{
// TODO: Remove this block when L2Genesis includes this contract.
vm.etch(address(superchainETHBridge), vm.getDeployedCode("SuperchainETHBridge.sol:SuperchainETHBridge"));
vm.etch(address(ethLiquidity), vm.getDeployedCode("ETHLiquidity.sol:ETHLiquidity"));
}
}

/// @notice Helper function to setup a mock and expect a call to it.
Expand Down