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
9fda7d93
Unverified
Commit
9fda7d93
authored
Nov 15, 2022
by
ProtocolWhisper
Committed by
GitHub
Nov 15, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ethereum-optimism:develop' into develop
parents
c20747ea
66d56a47
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
6 deletions
+4
-6
MigrationSystemDictator.sol
...-bedrock/contracts/deployment/MigrationSystemDictator.sol
+3
-4
019-MigrationSystemDictatorSteps.ts
...tracts-bedrock/deploy/019-MigrationSystemDictatorSteps.ts
+1
-2
No files found.
packages/contracts-bedrock/contracts/deployment/MigrationSystemDictator.sol
View file @
9fda7d93
...
...
@@ -66,9 +66,7 @@ contract MigrationSystemDictator is BaseSystemDictator {
*/
function step3() external onlyOwner step(3) {
// Remove all deprecated addresses from the AddressManager
string[18] memory deprecated = [
"Proxy__OVM_L1CrossDomainMessenger",
"Proxy__OVM_L1StandardBridge",
string[17] memory deprecated = [
"OVM_CanonicalTransactionChain",
"OVM_L2CrossDomainMessenger",
"OVM_DecompressionPrecompileAddress",
...
...
@@ -84,7 +82,8 @@ contract MigrationSystemDictator is BaseSystemDictator {
"OVM_StateManagerFactory",
"OVM_StateTransitionerFactory",
"OVM_SafetyChecker",
"OVM_L1MultiMessageRelayer"
"OVM_L1MultiMessageRelayer",
"BondManager"
];
for (uint256 i = 0; i < deprecated.length; i++) {
...
...
packages/contracts-bedrock/deploy/019-MigrationSystemDictatorSteps.ts
View file @
9fda7d93
...
...
@@ -195,8 +195,6 @@ const deployFn: DeployFunction = async (hre) => {
},
3
:
async
()
=>
{
const
deads
=
[
'
Proxy__OVM_L1CrossDomainMessenger
'
,
'
Proxy__OVM_L1StandardBridge
'
,
'
OVM_CanonicalTransactionChain
'
,
'
OVM_L2CrossDomainMessenger
'
,
'
OVM_DecompressionPrecompileAddress
'
,
...
...
@@ -213,6 +211,7 @@ const deployFn: DeployFunction = async (hre) => {
'
OVM_StateTransitionerFactory
'
,
'
OVM_SafetyChecker
'
,
'
OVM_L1MultiMessageRelayer
'
,
'
BondManager
'
,
]
for
(
const
dead
of
deads
)
{
assert
(
...
...
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