Merge branch 'develop' into refcell/deployscripts/cleanup

packages/contracts-bedrock/deploy/009-DisputeGameFactoryProxy.ts

+import { DeployFunction } from 'hardhat-deploy/dist/types'
+
+import { deploy, getDeploymentAddress } from '../src/deploy-utils'
+
+const deployFn: DeployFunction = async (hre) => {
+  const proxyAdmin = await getDeploymentAddress(hre, 'ProxyAdmin')
+
+  // We only want to deploy the dgf on devnet for now
+  const network = await hre.ethers.provider.getNetwork()
+  const chainId = network.chainId
+
+  if (chainId === 900) {
+    console.log('Devnet detected, deploying DisputeGameFactoryProxy')
+    const disputeGameFactoryProxy = await deploy({
+      hre,
+      name: 'DisputeGameFactoryProxy',
+      contract: 'Proxy',
+      args: [proxyAdmin],
+    })
+    console.log(
+      `DisputeGameFactoryProxy deployed at ${disputeGameFactoryProxy.address}`
+    )
+  } else {
+    console.log('Skipping deployment of DisputeGameFactoryProxy')
+  }
+}
+
+deployFn.tags = ['DisputeGameFactoryProxy', 'setup', 'l1']
+
+export default deployFn

packages/contracts-bedrock/deploy/016-DisputeGameFactoryImpl.ts

+import { DeployFunction } from 'hardhat-deploy/dist/types'
+
+import { deploy } from '../src/deploy-utils'
+
+const deployFn: DeployFunction = async (hre) => {
+  // We only want to deploy the dgf on devnet for now
+  const network = await hre.ethers.provider.getNetwork()
+  const chainId = network.chainId
+
+  if (chainId === 900) {
+    const disputeGameFactory = await deploy({
+      hre,
+      name: 'DisputeGameFactory',
+      args: [],
+    })
+    console.log(`DisputeGameFactory deployed at ${disputeGameFactory.address}`)
+  } else {
+    console.log('Skipping deployment of DisputeGameFactory implementation')
+  }
+}
+
+deployFn.tags = ['DisputeGameFactoryImpl', 'setup', 'l1']
+
+export default deployFn

packages/contracts-bedrock/deploy/019-DisputeGameFactoryInit.ts

+import assert from 'assert'
+
+import { DeployFunction } from 'hardhat-deploy/dist/types'
+import '@eth-optimism/hardhat-deploy-config'
+import 'hardhat-deploy'
+
+import { getContractsFromArtifacts } from '../src/deploy-utils'
+
+const deployFn: DeployFunction = async (hre) => {
+  // We only want to deploy the dgf on devnet for now
+  const network = await hre.ethers.provider.getNetwork()
+  const chainId = network.chainId
+
+  // The DisputeGameFactory is only deployed on devnet
+  if (chainId === 900) {
+    const { deployer } = await hre.getNamedAccounts()
+    const [proxyAdmin, disputeGameFactoryProxy, disputeGameFactoryImpl] =
+      await getContractsFromArtifacts(hre, [
+        {
+          name: 'ProxyAdmin',
+          signerOrProvider: deployer,
+        },
+        {
+          name: 'DisputeGameFactoryProxy',
+          iface: 'DisputeGameFactory',
+          signerOrProvider: deployer,
+        },
+        {
+          name: 'DisputeGameFactory',
+        },
+      ])
+
+    const finalOwner = hre.deployConfig.finalSystemOwner
+
+    try {
+      const tx = await proxyAdmin.upgradeAndCall(
+        disputeGameFactoryProxy.address,
+        disputeGameFactoryImpl.address,
+        disputeGameFactoryProxy.interface.encodeFunctionData('initialize', [
+          finalOwner,
+        ])
+      )
+      await tx.wait()
+    } catch (e) {
+      console.log('DisputeGameFactory already initialized')
+    }
+
+    const fetchedOwner = await disputeGameFactoryProxy.callStatic.owner()
+    assert(fetchedOwner === finalOwner)
+
+    console.log('Updgraded and initialized DisputeGameFactory')
+  } else {
+    console.log('Skipping initialization of DisputeGameFactory')
+  }
+}
+
+deployFn.tags = ['DisputeGameFactoryInitialize', 'l1']
+
+export default deployFn