Commit 9f0958f7 authored by mergify[bot]'s avatar mergify[bot] Committed by GitHub

Merge pull request #5082 from ethereum-optimism/fix/remove-ownable-checks-l1xdm

contracts-bedrock: remove deployment ownable check l1xdm
parents 7eba9adc c39e6692
...@@ -23,7 +23,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -23,7 +23,6 @@ const deployFn: DeployFunction = async (hre) => {
SystemDictator, SystemDictator,
ProxyAdmin, ProxyAdmin,
AddressManager, AddressManager,
L1CrossDomainMessenger,
L1StandardBridgeProxy, L1StandardBridgeProxy,
L1StandardBridgeProxyWithSigner, L1StandardBridgeProxyWithSigner,
L1ERC721BridgeProxy, L1ERC721BridgeProxy,
...@@ -43,11 +42,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -43,11 +42,6 @@ const deployFn: DeployFunction = async (hre) => {
name: 'Lib_AddressManager', name: 'Lib_AddressManager',
signerOrProvider: deployer, signerOrProvider: deployer,
}, },
{
name: 'Proxy__OVM_L1CrossDomainMessenger',
iface: 'L1CrossDomainMessenger',
signerOrProvider: deployer,
},
{ {
name: 'Proxy__OVM_L1StandardBridge', name: 'Proxy__OVM_L1StandardBridge',
}, },
...@@ -118,41 +112,6 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -118,41 +112,6 @@ const deployFn: DeployFunction = async (hre) => {
console.log(`AddressManager already owned by the SystemDictator`) 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. // Transfer ownership of the L1StandardBridge (proxy) to SystemDictator.
if ( if (
needsProxyTransfer && needsProxyTransfer &&
......
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