Commit 41902810 authored by Mark Tyneway's avatar Mark Tyneway

contracts-bedrock: fix deployment

parent de485399
import { ethers } from 'ethers'
import { DeployFunction } from 'hardhat-deploy/dist/types'
import {
......@@ -23,11 +22,6 @@ const deployFn: DeployFunction = async (hre) => {
'PORTAL',
OptimismPortalProxy.address
)
await assertContractVariable(
contract,
'owner',
ethers.constants.AddressZero
)
},
})
}
......
......@@ -116,7 +116,7 @@ const deployFn: DeployFunction = async (hre) => {
for (const dead of deads) {
assert(
(await AddressManager.getAddress(dead)) ===
ethers.constants.AddressZero
ethers.constants.AddressZero
)
}
},
......@@ -258,11 +258,6 @@ const deployFn: DeployFunction = async (hre) => {
} catch (err) {
// Expected.
}
await assertContractVariable(
L1CrossDomainMessenger,
'owner',
SystemDictator.address
)
// Check L1StandardBridge was initialized properly.
await assertContractVariable(
......@@ -318,14 +313,16 @@ const deployFn: DeployFunction = async (hre) => {
30000,
1000
)
await assertContractVariable(OptimismPortal, 'paused', false)
}
// At the end we finalize the upgrade.
if (await isStep(SystemDictator, 7)) {
if (await isStep(SystemDictator, 6)) {
console.log(`
You must now finalize the upgrade by calling finalize() on the SystemDictator. This will
transfer ownership of the ProxyAdmin and the L1CrossDomainMessenger to the final system owner
as specified in the deployment configuration.
transfer ownership of the ProxyAdmin to the final system owner as specified in the deployment
configuration.
`)
if (isLiveDeployer) {
......@@ -347,11 +344,6 @@ const deployFn: DeployFunction = async (hre) => {
1000
)
await assertContractVariable(
L1CrossDomainMessenger,
'owner',
hre.deployConfig.finalSystemOwner
)
await assertContractVariable(
ProxyAdmin,
'owner',
......
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