Merge pull request #4455 from ethereum-optimism/willc/safer-deploy

feat(contracts-periphery): Make optimist deploy scripts safer

.changeset/silver-mayflies-raise.md

+---
+'@eth-optimism/contracts-periphery': patch
+---
+
+Make deploy scripts a little safer

packages/contracts-periphery/deploy/op-nft/AttestationStationProxy.ts

@@ -6,12 +6,16 @@ import 'hardhat-deploy'
 import { assertContractVariable } from '@eth-optimism/contracts-bedrock/src/deploy-utils'
 import { utils } from 'ethers'
 
+import type { DeployConfig } from '../../src'
+
 const { getAddress } = utils
 
 /**
  * Deploys the AttestationStationProxy
  */
 const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
+  const deployConfig = hre.deployConfig as DeployConfig
+
   const { deployer } = await hre.getNamedAccounts()
   const ddd = hre.deployConfig.ddd
 
@@ -75,7 +79,7 @@ const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     console.log('implementation already set to AttestationStation contract')
   }
 
-  const l2ProxyOwnerAddress = hre.deployConfig.l2ProxyOwnerAddress
+  const l2ProxyOwnerAddress = deployConfig.l2ProxyOwnerAddress
   const admin = await Proxy.callStatic.admin()
   console.log(`admin is set to ${admin}`)
   if (getAddress(admin) !== getAddress(l2ProxyOwnerAddress)) {
@@ -90,8 +94,8 @@ const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   }
   console.log('Contract deployment complete')
 
-  // Assert that the variables are set correctly
-  assertContractVariable(AttestationStation, 'version', '1.0.0')
+  await assertContractVariable(Proxy, 'admin', l2ProxyOwnerAddress)
+  await assertContractVariable(AttestationStation, 'version', '1.0.0')
 }
 
 deployFn.tags = ['AttestationStationProxy']

packages/contracts-periphery/deploy/op-nft/OptimistImpl.ts

 /* Imports: External */
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 import { HardhatRuntimeEnvironment } from 'hardhat/types'
+
 import '@nomiclabs/hardhat-ethers'
 import '@eth-optimism/hardhat-deploy-config'
 import 'hardhat-deploy'
+import type { DeployConfig } from '../../src'
 
 const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
+  const deployConfig = hre.deployConfig as DeployConfig
+
   const { deployer } = await hre.getNamedAccounts()
 
   console.log(`Deploying Optimist implementation with ${deployer}`)
@@ -16,15 +20,15 @@ const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
   const attestationStationAddress = Deployment__AttestationStation.address
 
   console.log(`Using ${attestationStationAddress} as the AttestationStation`)
-  console.log(`Using ${hre.deployConfig.attestorAddress} as ATTESTOR`)
+  console.log(`Using ${deployConfig.attestorAddress} as ATTESTOR`)
 
   const { deploy } = await hre.deployments.deterministic('Optimist', {
     salt: hre.ethers.utils.solidityKeccak256(['string'], ['Optimist']),
     from: deployer,
     args: [
-      hre.deployConfig.optimistName,
-      hre.deployConfig.optimistSymbol,
-      hre.deployConfig.attestorAddress,
+      deployConfig.optimistName,
+      deployConfig.optimistSymbol,
+      deployConfig.attestorAddress,
       attestationStationAddress,
     ],
     log: true,

packages/contracts-periphery/deploy/op-nft/OptimistProxy.ts

@@ -7,11 +7,15 @@ import 'hardhat-deploy'
 import { assertContractVariable } from '@eth-optimism/contracts-bedrock/src/deploy-utils'
 import { utils } from 'ethers'
 
+import type { DeployConfig } from '../../src'
+
 const { getAddress } = utils
 
 const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
+  const deployConfig = hre.deployConfig as DeployConfig
+
   const { deployer } = await hre.getNamedAccounts()
-  const ddd = hre.deployConfig.ddd
+  const ddd = deployConfig.ddd
 
   if (getAddress(deployer) !== getAddress(ddd)) {
     throw new Error('Must deploy with the ddd')
@@ -51,8 +55,8 @@ const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     console.log(`Setting implementation to ${Deployment__Optimist.address}`)
 
     // Create the calldata for the call to `initialize()`
-    const name = hre.deployConfig.optimistName
-    const symbol = hre.deployConfig.optimistSymbol
+    const name = deployConfig.optimistName
+    const symbol = deployConfig.optimistSymbol
     const calldata = Optimist.interface.encodeFunctionData('initialize', [
       name,
       symbol,
@@ -68,7 +72,7 @@ const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     console.log('implementation already set to Optimist contract')
   }
 
-  const l2ProxyOwnerAddress = hre.deployConfig.l2ProxyOwnerAddress
+  const l2ProxyOwnerAddress = deployConfig.l2ProxyOwnerAddress
   const admin = await Proxy.callStatic.admin()
   console.log(`admin set to ${admin}`)
   if (getAddress(admin) !== getAddress(l2ProxyOwnerAddress)) {
@@ -86,15 +90,20 @@ const deployFn: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
     'AttestationStationProxy'
   )
 
-  assertContractVariable(Optimist, 'name', hre.deployConfig.optimistName)
-  assertContractVariable(Optimist, 'symbol', hre.deployConfig.optimistSymbol)
-  assertContractVariable(
+  await assertContractVariable(Proxy, 'admin', l2ProxyOwnerAddress)
+  await assertContractVariable(Optimist, 'name', deployConfig.optimistName)
+  await assertContractVariable(Optimist, 'verson', '1.0.0')
+  await assertContractVariable(Optimist, 'symbol', deployConfig.optimistSymbol)
+  await assertContractVariable(
+    Optimist,
+    'ATTESTOR',
+    deployConfig.attestorAddress
+  )
+  await assertContractVariable(
     Optimist,
     'ATTESTATION_STATION',
     Deployment__AttestationStation.address
   )
-  assertContractVariable(Optimist, 'ATTESTOR', hre.deployConfig.attestorAddress)
-  assertContractVariable(Optimist, 'version', '1.0.0')
 }
 
 deployFn.tags = ['OptimistProxy']