Commit da791d56 authored by Kelvin Fichter's avatar Kelvin Fichter

fix(ctb): tweak addresses for MSD to wipe

Tweaks the addresses that the MigrationSystemDictator will zero out
inside of the AddressManager. The Proxy addresses should not be deleted
since some external services may rely on them as part of the current
system. The BondManager should be wiped so that no more state batches
can be appended.
parent 7636eb76
...@@ -57,9 +57,7 @@ contract MigrationSystemDictator is BaseSystemDictator { ...@@ -57,9 +57,7 @@ contract MigrationSystemDictator is BaseSystemDictator {
L1CrossDomainMessenger(config.proxyAddressConfig.l1CrossDomainMessengerProxy).pause(); L1CrossDomainMessenger(config.proxyAddressConfig.l1CrossDomainMessengerProxy).pause();
// Remove all dead addresses from the AddressManager // Remove all dead addresses from the AddressManager
string[18] memory deads = [ string[17] memory deads = [
"Proxy__OVM_L1CrossDomainMessenger",
"Proxy__OVM_L1StandardBridge",
"OVM_CanonicalTransactionChain", "OVM_CanonicalTransactionChain",
"OVM_L2CrossDomainMessenger", "OVM_L2CrossDomainMessenger",
"OVM_DecompressionPrecompileAddress", "OVM_DecompressionPrecompileAddress",
...@@ -75,7 +73,8 @@ contract MigrationSystemDictator is BaseSystemDictator { ...@@ -75,7 +73,8 @@ contract MigrationSystemDictator is BaseSystemDictator {
"OVM_StateManagerFactory", "OVM_StateManagerFactory",
"OVM_StateTransitionerFactory", "OVM_StateTransitionerFactory",
"OVM_SafetyChecker", "OVM_SafetyChecker",
"OVM_L1MultiMessageRelayer" "OVM_L1MultiMessageRelayer",
"BondManager"
]; ];
for (uint256 i = 0; i < deads.length; i++) { for (uint256 i = 0; i < deads.length; i++) {
......
...@@ -190,8 +190,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -190,8 +190,6 @@ const deployFn: DeployFunction = async (hre) => {
2: async () => { 2: async () => {
await assertContractVariable(L1CrossDomainMessenger, 'paused', true) await assertContractVariable(L1CrossDomainMessenger, 'paused', true)
const deads = [ const deads = [
'Proxy__OVM_L1CrossDomainMessenger',
'Proxy__OVM_L1StandardBridge',
'OVM_CanonicalTransactionChain', 'OVM_CanonicalTransactionChain',
'OVM_L2CrossDomainMessenger', 'OVM_L2CrossDomainMessenger',
'OVM_DecompressionPrecompileAddress', 'OVM_DecompressionPrecompileAddress',
...@@ -208,6 +206,7 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -208,6 +206,7 @@ const deployFn: DeployFunction = async (hre) => {
'OVM_StateTransitionerFactory', 'OVM_StateTransitionerFactory',
'OVM_SafetyChecker', 'OVM_SafetyChecker',
'OVM_L1MultiMessageRelayer', 'OVM_L1MultiMessageRelayer',
'BondManager',
] ]
for (const dead of deads) { for (const dead of deads) {
assert( assert(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment