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
eaf1cde5
Unverified
Commit
eaf1cde5
authored
Apr 06, 2023
by
OptimismBot
Committed by
GitHub
Apr 06, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5356 from ethereum-optimism/fix/comment-l2oo
contracts-bedrock: fix L2OutputOracle comment
parents
17e4ffe2
bf8b130c
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
7 deletions
+6
-7
optimismportal.go
op-bindings/bindings/optimismportal.go
+1
-1
OptimismPortal.sol
packages/contracts-bedrock/contracts/L1/OptimismPortal.sol
+3
-4
PostSherlock.s.sol
...ges/contracts-bedrock/scripts/upgrades/PostSherlock.s.sol
+1
-1
slither.config.json
packages/contracts-bedrock/slither.config.json
+1
-1
No files found.
op-bindings/bindings/optimismportal.go
View file @
eaf1cde5
This diff is collapsed.
Click to expand it.
packages/contracts-bedrock/contracts/L1/OptimismPortal.sol
View file @
eaf1cde5
...
@@ -78,8 +78,7 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
...
@@ -78,8 +78,7 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
/**
/**
* @notice Determines if cross domain messaging is paused. When set to true,
* @notice Determines if cross domain messaging is paused. When set to true,
* deposits and withdrawals are paused. This may be removed in the
* withdrawals are paused. This may be removed in the future.
* future.
*/
*/
bool public paused;
bool public paused;
...
@@ -141,7 +140,7 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
...
@@ -141,7 +140,7 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
}
}
/**
/**
* @custom:semver 1.3.
0
* @custom:semver 1.3.
1
*
*
* @param _l2Oracle Address of the L2OutputOracle contract.
* @param _l2Oracle Address of the L2OutputOracle contract.
* @param _guardian Address that can pause deposits and withdrawals.
* @param _guardian Address that can pause deposits and withdrawals.
...
@@ -153,7 +152,7 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
...
@@ -153,7 +152,7 @@ contract OptimismPortal is Initializable, ResourceMetering, Semver {
address _guardian,
address _guardian,
bool _paused,
bool _paused,
SystemConfig _config
SystemConfig _config
) Semver(1, 3,
0
) {
) Semver(1, 3,
1
) {
L2_ORACLE = _l2Oracle;
L2_ORACLE = _l2Oracle;
GUARDIAN = _guardian;
GUARDIAN = _guardian;
SYSTEM_CONFIG = _config;
SYSTEM_CONFIG = _config;
...
...
packages/contracts-bedrock/scripts/upgrades/PostSherlock.s.sol
View file @
eaf1cde5
...
@@ -77,7 +77,7 @@ contract PostSherlock is Script {
...
@@ -77,7 +77,7 @@ contract PostSherlock is Script {
string constant internal L1StandardBridge_Version = "1.1.0";
string constant internal L1StandardBridge_Version = "1.1.0";
string constant internal L2OutputOracle_Version = "1.2.0";
string constant internal L2OutputOracle_Version = "1.2.0";
string constant internal OptimismMintableERC20Factory_Version = "1.1.0";
string constant internal OptimismMintableERC20Factory_Version = "1.1.0";
string constant internal OptimismPortal_Version = "1.3.
0
";
string constant internal OptimismPortal_Version = "1.3.
1
";
string constant internal SystemConfig_Version = "1.2.0";
string constant internal SystemConfig_Version = "1.2.0";
string constant internal L1ERC721Bridge_Version = "1.1.0";
string constant internal L1ERC721Bridge_Version = "1.1.0";
...
...
packages/contracts-bedrock/slither.config.json
View file @
eaf1cde5
{
{
"detectors_to_exclude"
:
"assembly-usage,block-timestamp,naming-convention,solc-version,low-level-calls"
,
"detectors_to_exclude"
:
"assembly-usage,block-timestamp,naming-convention,solc-version,low-level-calls
,boolean-equality
"
,
"exclude_informational"
:
true
,
"exclude_informational"
:
true
,
"exclude_low"
:
true
,
"exclude_low"
:
true
,
"exclude_medium"
:
true
,
"exclude_medium"
:
true
,
...
...
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