Commit 6a5fb480 authored by Mark Tyneway's avatar Mark Tyneway Committed by GitHub

ci: enable devnet deploy (#4059)

parent d94ca27c
...@@ -844,9 +844,9 @@ workflows: ...@@ -844,9 +844,9 @@ workflows:
- depcheck: - depcheck:
requires: requires:
- yarn-monorepo - yarn-monorepo
# - devnet: - devnet:
# name: devnet (with deployed contracts) name: devnet (with deployed contracts)
# deploy: true deploy: true
- devnet: - devnet:
name: devnet (with genesis contracts) name: devnet (with genesis contracts)
deploy: false deploy: false
......
...@@ -80,8 +80,8 @@ def main(): ...@@ -80,8 +80,8 @@ def main():
'CanonicalTransactionChain': '0x0000000000000000000000000000000000000000', 'CanonicalTransactionChain': '0x0000000000000000000000000000000000000000',
'BondManager': '0x0000000000000000000000000000000000000000', 'BondManager': '0x0000000000000000000000000000000000000000',
}) })
sdk_addresses['L1CrossDomainMessenger'] = addresses['L1CrossDomainMessengerProxy'] sdk_addresses['L1CrossDomainMessenger'] = addresses['Proxy__OVM_L1CrossDomainMessenger']
sdk_addresses['L1StandardBridge'] = addresses['L1StandardBridgeProxy'] sdk_addresses['L1StandardBridge'] = addresses['Proxy__OVM_L1StandardBridge']
sdk_addresses['OptimismPortal'] = addresses['OptimismPortalProxy'] sdk_addresses['OptimismPortal'] = addresses['OptimismPortalProxy']
sdk_addresses['L2OutputOracle'] = addresses['L2OutputOracleProxy'] sdk_addresses['L2OutputOracle'] = addresses['L2OutputOracleProxy']
write_json(addresses_json_path, addresses) write_json(addresses_json_path, addresses)
......
...@@ -37,6 +37,22 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -37,6 +37,22 @@ const deployFn: DeployFunction = async (hre) => {
} }
} }
let finalOwner = hre.deployConfig.finalSystemOwner
if (finalOwner === ethers.constants.AddressZero) {
if (hre.network.config.live === false) {
console.log(`WARNING!!!`)
console.log(`WARNING!!!`)
console.log(`WARNING!!!`)
console.log(`WARNING!!! A proxy admin owner address was not provided.`)
console.log(
`WARNING!!! Make sure you are ONLY doing this on a test network.`
)
finalOwner = deployer
} else {
throw new Error(`must specify the finalSystemOwner on live networks`)
}
}
// Set up required contract references. // Set up required contract references.
const [ const [
MigrationSystemDictator, MigrationSystemDictator,
...@@ -378,17 +394,9 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -378,17 +394,9 @@ const deployFn: DeployFunction = async (hre) => {
return MigrationSystemDictator.finalized() return MigrationSystemDictator.finalized()
}) })
await assertContractVariable( await assertContractVariable(L1CrossDomainMessenger, 'owner', finalOwner)
L1CrossDomainMessenger,
'owner',
hre.deployConfig.finalSystemOwner
)
await assertContractVariable( await assertContractVariable(ProxyAdmin, 'owner', finalOwner)
ProxyAdmin,
'owner',
hre.deployConfig.finalSystemOwner
)
} }
} }
......
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