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
994209b0
Unverified
Commit
994209b0
authored
Feb 22, 2023
by
Matthew Slipper
Committed by
GitHub
Feb 22, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4916 from ethereum-optimism/sc/ctb-exited-no-continue
fix(ctb): no continue on dictator exit or finalize
parents
ab603c69
ff1feba2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
SystemDictator.sol
...contracts-bedrock/contracts/deployment/SystemDictator.sol
+12
-1
No files found.
packages/contracts-bedrock/contracts/deployment/SystemDictator.sol
View file @
994209b0
...
...
@@ -126,6 +126,11 @@ contract SystemDictator is OwnableUpgradeable {
*/
bool public finalized;
/**
* @notice Whether or not the deployment has been exited.
*/
bool public exited;
/**
* @notice Address of the old L1CrossDomainMessenger implementation.
*/
...
...
@@ -137,7 +142,9 @@ contract SystemDictator is OwnableUpgradeable {
* @param _step Current step.
*/
modifier step(uint8 _step) {
require(currentStep == _step, "BaseSystemDictator: incorrect step");
require(!finalized, "SystemDictator: already finalized");
require(!exited, "SystemDictator: already exited");
require(currentStep == _step, "SystemDictator: incorrect step");
_;
currentStep++;
}
...
...
@@ -402,6 +409,7 @@ contract SystemDictator is OwnableUpgradeable {
);
}
// Mark the deployment as finalized.
finalized = true;
}
...
...
@@ -422,5 +430,8 @@ contract SystemDictator is OwnableUpgradeable {
// Unset the DTL shutoff block which will allow the DTL to sync again.
config.globalConfig.addressManager.setAddress("DTL_SHUTOFF_BLOCK", address(0));
// Mark the deployment as exited.
exited = 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