Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
fc3ed6fa
Unverified
Commit
fc3ed6fa
authored
Nov 28, 2023
by
Maurelian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
contracts-bedrock: Set superchainConfig to zero in portal constructor
parent
86ce7216
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
21 deletions
+15
-21
ChainAssertions.sol
packages/contracts-bedrock/scripts/ChainAssertions.sol
+10
-14
Deploy.s.sol
packages/contracts-bedrock/scripts/Deploy.s.sol
+3
-4
OptimismPortal.sol
packages/contracts-bedrock/src/L1/OptimismPortal.sol
+2
-3
No files found.
packages/contracts-bedrock/scripts/ChainAssertions.sol
View file @
fc3ed6fa
...
...
@@ -43,7 +43,7 @@ library ChainAssertions {
checkL2OutputOracle(_prox, _cfg, _l2OutputOracleStartingTimestamp, _l2OutputOracleStartingBlockNumber);
checkOptimismMintableERC20Factory(_prox);
checkL1ERC721Bridge(_prox);
checkOptimismPortal({ _contracts: _prox, _cfg: _cfg, _isP
aused: fals
e });
checkOptimismPortal({ _contracts: _prox, _cfg: _cfg, _isP
roxy: tru
e });
checkProtocolVersions({ _contracts: _prox, _cfg: _cfg, _isProxy: true });
}
...
...
@@ -135,29 +135,25 @@ library ChainAssertions {
}
/// @notice Asserts the OptimismPortal is setup correctly
function checkOptimismPortal(
Types.ContractSet memory _contracts,
DeployConfig _cfg,
bool _isPaused
)
internal
view
{
function checkOptimismPortal(Types.ContractSet memory _contracts, DeployConfig _cfg, bool _isProxy) internal view {
OptimismPortal portal = OptimismPortal(payable(_contracts.OptimismPortal));
address guardian = _cfg.superchainConfigGuardian();
if (guardian.code.length == 0) {
console.log("
Portal g
uardian has no code: %s", guardian);
console.log("
G
uardian has no code: %s", guardian);
}
require(address(portal.L2_ORACLE()) == _contracts.L2OutputOracle);
require(address(portal.l2Oracle()) == _contracts.L2OutputOracle);
require(portal.GUARDIAN() == _cfg.superchainConfigGuardian());
require(portal.guardian() == _cfg.superchainConfigGuardian());
require(address(portal.SYSTEM_CONFIG()) == _contracts.SystemConfig);
require(address(portal.systemConfig()) == _contracts.SystemConfig);
require(address(portal.superchainConfig()) == address(_contracts.SuperchainConfig));
require(portal.paused() == _isPaused);
if (_isProxy) {
require(portal.GUARDIAN() == _cfg.superchainConfigGuardian());
require(portal.guardian() == _cfg.superchainConfigGuardian());
require(address(portal.superchainConfig()) == address(_contracts.SuperchainConfig));
require(portal.paused() == SuperchainConfig(_contracts.SuperchainConfig).paused());
}
}
/// @notice Asserts that the ProtocolVersions is setup correctly
...
...
packages/contracts-bedrock/scripts/Deploy.s.sol
View file @
fc3ed6fa
...
...
@@ -504,8 +504,7 @@ contract Deploy is Deployer {
OptimismPortal portal = new OptimismPortal{ salt: _implSalt() }({
_l2Oracle: l2OutputOracle,
_systemConfig: systemConfig,
_superchainConfig: superchainConfig
_systemConfig: systemConfig
});
save("OptimismPortal", address(portal));
...
...
@@ -516,7 +515,7 @@ contract Deploy is Deployer {
// are always proxies.
Types.ContractSet memory contracts = _proxiesUnstrict();
contracts.OptimismPortal = address(portal);
ChainAssertions.checkOptimismPortal({ _contracts: contracts, _cfg: cfg, _isP
aused
: false });
ChainAssertions.checkOptimismPortal({ _contracts: contracts, _cfg: cfg, _isP
roxy
: false });
require(loadInitializedSlot("OptimismPortal", false) == 1, "OptimismPortal is not initialized");
...
...
@@ -943,7 +942,7 @@ contract Deploy is Deployer {
string memory version = portal.version();
console.log("OptimismPortal version: %s", version);
ChainAssertions.checkOptimismPortal({ _contracts: _proxies(), _cfg: cfg, _isP
aused: fals
e });
ChainAssertions.checkOptimismPortal({ _contracts: _proxies(), _cfg: cfg, _isP
roxy: tru
e });
require(loadInitializedSlot("OptimismPortal", true) == 1, "OptimismPortalProxy is not initialized");
}
...
...
packages/contracts-bedrock/src/L1/OptimismPortal.sol
View file @
fc3ed6fa
...
...
@@ -107,11 +107,10 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
/// @notice Constructs the OptimismPortal contract.
/// @param _l2Oracle Address of the L2OutputOracle contract.
/// @param _systemConfig Address of the SystemConfig contract.
/// @param _superchainConfig Address of the SuperchainConfig contract.
constructor(L2OutputOracle _l2Oracle, SystemConfig _systemConfig, SuperchainConfig _superchainConfig) {
constructor(L2OutputOracle _l2Oracle, SystemConfig _systemConfig) {
L2_ORACLE = _l2Oracle;
SYSTEM_CONFIG = _systemConfig;
initialize(
_superchainConfig
);
initialize(
SuperchainConfig(address(0))
);
}
/// @notice Initializer.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment