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
209b8096
Unverified
Commit
209b8096
authored
Nov 08, 2023
by
Maurelian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ctb: Apply suggestions from code review
parent
fed16f5a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
9 deletions
+12
-9
Deploy.s.sol
packages/contracts-bedrock/scripts/Deploy.s.sol
+1
-1
L1CrossDomainMessenger.sol
packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
+2
-2
L1ERC721Bridge.sol
packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
+2
-2
L2OutputOracle.sol
packages/contracts-bedrock/src/L1/L2OutputOracle.sol
+4
-1
OptimismPortal.sol
packages/contracts-bedrock/src/L1/OptimismPortal.sol
+3
-3
No files found.
packages/contracts-bedrock/scripts/Deploy.s.sol
View file @
209b8096
...
@@ -401,7 +401,7 @@ contract Deploy is Deployer {
...
@@ -401,7 +401,7 @@ contract Deploy is Deployer {
_l2Oracle: l2OutputOracle,
_l2Oracle: l2OutputOracle,
_guardian: guardian,
_guardian: guardian,
_paused: true,
_paused: true,
_
c
onfig: systemConfig
_
systemC
onfig: systemConfig
});
});
require(address(portal.L2_ORACLE()) == address(l2OutputOracle));
require(address(portal.L2_ORACLE()) == address(l2OutputOracle));
...
...
packages/contracts-bedrock/src/L1/L1CrossDomainMessenger.sol
View file @
209b8096
...
@@ -19,8 +19,8 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
...
@@ -19,8 +19,8 @@ contract L1CrossDomainMessenger is CrossDomainMessenger, ISemver {
OptimismPortal public immutable PORTAL;
OptimismPortal public immutable PORTAL;
/// @notice Semantic version.
/// @notice Semantic version.
/// @custom:semver 1.
5
.0
/// @custom:semver 1.
8
.0
string public constant version = "1.
5
.0";
string public constant version = "1.
8
.0";
/// @notice Constructs the L1CrossDomainMessenger contract.
/// @notice Constructs the L1CrossDomainMessenger contract.
/// @param _portal Address of the OptimismPortal contract on this network.
/// @param _portal Address of the OptimismPortal contract on this network.
...
...
packages/contracts-bedrock/src/L1/L1ERC721Bridge.sol
View file @
209b8096
...
@@ -19,8 +19,8 @@ contract L1ERC721Bridge is ERC721Bridge, ISemver {
...
@@ -19,8 +19,8 @@ contract L1ERC721Bridge is ERC721Bridge, ISemver {
mapping(address => mapping(address => mapping(uint256 => bool))) public deposits;
mapping(address => mapping(address => mapping(uint256 => bool))) public deposits;
/// @notice Semantic version.
/// @notice Semantic version.
/// @custom:semver 1.5.
1
/// @custom:semver 1.5.
0
string public constant version = "1.5.
1
";
string public constant version = "1.5.
0
";
/// @notice Constructs the L1ERC721Bridge contract.
/// @notice Constructs the L1ERC721Bridge contract.
/// @param _messenger Address of the CrossDomainMessenger on this network.
/// @param _messenger Address of the CrossDomainMessenger on this network.
...
...
packages/contracts-bedrock/src/L1/L2OutputOracle.sol
View file @
209b8096
...
@@ -15,13 +15,16 @@ contract L2OutputOracle is Initializable, ISemver {
...
@@ -15,13 +15,16 @@ contract L2OutputOracle is Initializable, ISemver {
/// @notice The interval in L2 blocks at which checkpoints must be submitted.
/// @notice The interval in L2 blocks at which checkpoints must be submitted.
/// Although this is immutable, it can safely be modified by upgrading the
/// Although this is immutable, it can safely be modified by upgrading the
/// implementation contract.
/// implementation contract.
/// Public getter is legacy and will be removed in the future. Use `submissionInterval`
/// instead.
/// @custom:legacy
uint256 public immutable SUBMISSION_INTERVAL;
uint256 public immutable SUBMISSION_INTERVAL;
/// @notice The time between L2 blocks in seconds. Once set, this value MUST NOT be modified.
/// @notice The time between L2 blocks in seconds. Once set, this value MUST NOT be modified.
uint256 public immutable L2_BLOCK_TIME;
uint256 public immutable L2_BLOCK_TIME;
/// @notice The address of the challenger. Can be updated via upgrade. This will be removed in the
/// @notice The address of the challenger. Can be updated via upgrade. This will be removed in the
/// future, use `
propos
er` instead.
/// future, use `
challeng
er` instead.
/// @custom:legacy
/// @custom:legacy
address public immutable CHALLENGER;
address public immutable CHALLENGER;
...
...
packages/contracts-bedrock/src/L1/OptimismPortal.sol
View file @
209b8096
...
@@ -109,11 +109,11 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
...
@@ -109,11 +109,11 @@ contract OptimismPortal is Initializable, ResourceMetering, ISemver {
/// @param _l2Oracle Address of the L2OutputOracle contract.
/// @param _l2Oracle Address of the L2OutputOracle contract.
/// @param _guardian Address that can pause withdrawals.
/// @param _guardian Address that can pause withdrawals.
/// @param _paused Sets the contract's pausability state.
/// @param _paused Sets the contract's pausability state.
/// @param _
c
onfig Address of the SystemConfig contract.
/// @param _
systemC
onfig Address of the SystemConfig contract.
constructor(L2OutputOracle _l2Oracle, address _guardian, bool _paused, SystemConfig _
c
onfig) {
constructor(L2OutputOracle _l2Oracle, address _guardian, bool _paused, SystemConfig _
systemC
onfig) {
L2_ORACLE = _l2Oracle;
L2_ORACLE = _l2Oracle;
GUARDIAN = _guardian;
GUARDIAN = _guardian;
SYSTEM_CONFIG = _
c
onfig;
SYSTEM_CONFIG = _
systemC
onfig;
initialize(_paused);
initialize(_paused);
}
}
...
...
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