diff --git a/packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts b/packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts index 2475870105930..9d8af1db4f279 100644 --- a/packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts +++ b/packages/contracts-bedrock/deploy/020-SystemDictatorSteps-1.ts @@ -23,7 +23,6 @@ const deployFn: DeployFunction = async (hre) => { SystemDictator, ProxyAdmin, AddressManager, - L1CrossDomainMessenger, L1StandardBridgeProxy, L1StandardBridgeProxyWithSigner, L1ERC721BridgeProxy, @@ -43,11 +42,6 @@ const deployFn: DeployFunction = async (hre) => { name: 'Lib_AddressManager', signerOrProvider: deployer, }, - { - name: 'Proxy__OVM_L1CrossDomainMessenger', - iface: 'L1CrossDomainMessenger', - signerOrProvider: deployer, - }, { name: 'Proxy__OVM_L1StandardBridge', }, @@ -118,41 +112,6 @@ const deployFn: DeployFunction = async (hre) => { console.log(`AddressManager already owned by the SystemDictator`) } - // Transfer ownership of the L1CrossDomainMessenger to SystemDictator. - if ( - needsProxyTransfer && - (await AddressManager.getAddress('OVM_L1CrossDomainMessenger')) !== - ethers.constants.AddressZero && - (await L1CrossDomainMessenger.owner()) !== SystemDictator.address - ) { - if (isLiveDeployer) { - console.log(`Setting L1CrossDomainMessenger owner to MSD`) - await L1CrossDomainMessenger.transferOwnership(SystemDictator.address) - } else { - const tx = - await L1CrossDomainMessenger.populateTransaction.transferOwnership( - SystemDictator.address - ) - console.log(`Please transfer L1CrossDomainMessenger owner to MSD`) - console.log(`L1XDM address: ${L1CrossDomainMessenger.address}`) - console.log(`MSD address: ${SystemDictator.address}`) - console.log(`JSON:`) - console.log(jsonifyTransaction(tx)) - } - - // Wait for the ownership transfer to complete. - await awaitCondition( - async () => { - const owner = await L1CrossDomainMessenger.owner() - return owner === SystemDictator.address - }, - 30000, - 1000 - ) - } else { - console.log(`L1CrossDomainMessenger already owned by MSD`) - } - // Transfer ownership of the L1StandardBridge (proxy) to SystemDictator. if ( needsProxyTransfer &&