fix(contracts): Always print dictator contract instructions

packages/contracts/deploy/011-set-addresses.ts

@@ -32,21 +32,6 @@ const deployFn: DeployFunction = async (hre) => {
   const finalOwner = await AddressDictator.finalOwner()
   const currentOwner = await Lib_AddressManager.owner()
 
-  // Check if the hardhat runtime environment has the owner of the AddressManager. This will only
-  // happen in CI. If this is the case, we can skip directly to transferring ownership over to the
-  // AddressDictator contract.
-  const hreSigners = await hre.ethers.getSigners()
-  const hreHasOwner = hreSigners.some((signer) => {
-    return hexStringEquals(signer.address, currentOwner)
-  })
-
-  if (hreHasOwner) {
-    // Hardhat has the owner loaded into it, we can skip directly to transferOwnership.
-    const owner = await hre.ethers.getSigner(currentOwner)
-    await Lib_AddressManager.connect(owner).transferOwnership(
-      AddressDictator.address
-    )
-  } else {
   console.log(`
     The AddressDictator contract (glory to Arstotzka) has been deployed.
 
@@ -85,6 +70,20 @@ const deployFn: DeployFunction = async (hre) => {
 
     (4) Wait for the deploy process to continue.
   `)
+
+  // Check if the hardhat runtime environment has the owner of the AddressManager. This will only
+  // happen in CI. If this is the case, we can skip directly to transferring ownership over to the
+  // AddressDictator contract.
+  const hreSigners = await hre.ethers.getSigners()
+  const hreHasOwner = hreSigners.some((signer) => {
+    return hexStringEquals(signer.address, currentOwner)
+  })
+  if (hreHasOwner) {
+    // Hardhat has the owner loaded into it, we can skip directly to transferOwnership.
+    const owner = await hre.ethers.getSigner(currentOwner)
+    await Lib_AddressManager.connect(owner).transferOwnership(
+      AddressDictator.address
+    )
   }
 
   // Wait for ownership to be transferred to the AddressDictator contract.

packages/contracts/deploy/014-OVM_L1StandardBridge.deploy.ts

@@ -45,21 +45,6 @@ const deployFn: DeployFunction = async (hre) => {
   })
   const finalOwner = await ChugSplashDictator.finalOwner()
 
-  // Check if the hardhat runtime environment has the owner of the proxy. This will only
-  // happen in CI. If this is the case, we can skip directly to transferring ownership over to the
-  // ChugSplashDictator contract.
-  const hreSigners = await hre.ethers.getSigners()
-  const hreHasOwner = hreSigners.some((signer) => {
-    return hexStringEquals(signer.address, currentOwner)
-  })
-
-  if (hreHasOwner) {
-    // Hardhat has the owner loaded into it, we can skip directly to transferOwnership.
-    const owner = await hre.ethers.getSigner(currentOwner)
-    await Proxy__OVM_L1StandardBridge.connect(owner).setOwner(
-      ChugSplashDictator.address
-    )
-  } else {
   const messengerSlotKey = await ChugSplashDictator.messengerSlotKey()
   const messengerSlotVal = await ChugSplashDictator.messengerSlotVal()
   const bridgeSlotKey = await ChugSplashDictator.bridgeSlotKey()
@@ -96,6 +81,21 @@ const deployFn: DeployFunction = async (hre) => {
 
     (4) Wait for the deploy process to continue.
   `)
+
+  // Check if the hardhat runtime environment has the owner of the proxy. This will only
+  // happen in CI. If this is the case, we can skip directly to transferring ownership over to the
+  // ChugSplashDictator contract.
+  const hreSigners = await hre.ethers.getSigners()
+  const hreHasOwner = hreSigners.some((signer) => {
+    return hexStringEquals(signer.address, currentOwner)
+  })
+
+  if (hreHasOwner) {
+    // Hardhat has the owner loaded into it, we can skip directly to transferOwnership.
+    const owner = await hre.ethers.getSigner(currentOwner)
+    await Proxy__OVM_L1StandardBridge.connect(owner).setOwner(
+      ChugSplashDictator.address
+    )
   }
 
   // Wait for ownership to be transferred to the AddressDictator contract.