Merge pull request #5539 from ethereum-optimism/jm/deploy-testing-fixes

Improvements to enable deployment practice

packages/contracts-bedrock/.env.example

@@ -8,6 +8,17 @@ PRIVATE_KEY_DEPLOYER=
 TENDERLY_PROJECT=
 TENDERLY_USERNAME=
 
-# Optional boolean to define if cast commands should be printed.
-# Useful during migration testing
+
+# The following settings are useful for manually testing the migration scripts.
+
+# Define if cast commands should be printed.
 CAST_COMMANDS=1
+
+# Saves deployment artifacts when using the 'live' network
+SAVE_DEPLOYMENTS=1
+
+# Disable the live deployer so that transactions must be submitted manually
+DISABLE_LIVE_DEPLOYER=true
+
+# Sets the deployer's key to match the first default hardhat account
+PRIVATE_KEY_DEPLOYER=ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80

packages/contracts-bedrock/hardhat.config.ts

@@ -25,7 +25,7 @@ const config: HardhatUserConfig = {
     local: {
       live: false,
       url: 'http://localhost:8545',
-      saveDeployments: false,
+      saveDeployments: !!process.env.SAVE_DEPLOYMENTS || false,
       accounts: [
         'ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80',
       ],

packages/contracts-bedrock/src/deploy-utils.ts

@@ -359,19 +359,19 @@ export const doOwnershipTransfer = async (opts: {
  * Check if the script should submit the transaction or wait for the deployer to do it manually.
  *
  * @param hre HardhatRuntimeEnvironment.
- * @param ovveride Allow m
+ * @param ovveride Allow manually disabling live transaction submission. Useful for testing.
  * @returns True if the current step is the target step.
  */
 export const liveDeployer = async (opts: {
   hre: HardhatRuntimeEnvironment
   disabled: string | undefined
 }): Promise<boolean> => {
-  let ret: boolean
   if (!!opts.disabled) {
-    ret = false
+    console.log('Setting live deployer to', false)
+    return false
   }
   const { deployer } = await opts.hre.getNamedAccounts()
-  ret =
+  const ret =
     deployer.toLowerCase() === opts.hre.deployConfig.controller.toLowerCase()
   console.log('Setting live deployer to', ret)
   return ret
@@ -447,6 +447,7 @@ export const doStep = async (opts: {
     console.log(`Please execute step ${opts.step}...`)
     console.log(`MSD address: ${opts.SystemDictator.address}`)
     printJsonTransaction(tx)
+    printCastCommand(tx)
     await printTenderlySimulationLink(opts.SystemDictator.provider, tx)
   }
 
@@ -547,8 +548,12 @@ export const printTenderlySimulationLink = async (
  */
 export const printCastCommand = (tx: ethers.PopulatedTransaction): void => {
   if (process.env.CAST_COMMANDS) {
-    console.log(
-      `cast send ${tx.to} ${tx.data} --from ${tx.from} --value ${tx.value}`
-    )
+    if (!!tx.value && tx.value.gt(0)) {
+      console.log(
+        `cast send ${tx.to} ${tx.data} --from ${tx.from} --value ${tx.value}`
+      )
+    } else {
+      console.log(`cast send ${tx.to} ${tx.data} --from ${tx.from} `)
+    }
   }
 }