fix: remove parallel deployments temporarily

hujw77 · Nov 15, 2022 · b653177 · b653177
1 parent 8555405
commit b653177
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 67 deletions.
diff --git a/.changeset/grumpy-icons-work.md b/.changeset/grumpy-icons-work.md
@@ -0,0 +1,7 @@
+---
+'@chugsplash/demo': patch
+'@chugsplash/executor': patch
+'@chugsplash/plugins': patch
+---
+
+Remove parallel deployments due to bug on live networks
diff --git a/packages/demo/hardhat.config.ts b/packages/demo/hardhat.config.ts
@@ -22,19 +22,6 @@ const config: HardhatUserConfig = {
     },
   },
   networks: {
-    hardhat: {
-      mining: {
-        auto: false,
-        interval: 1000,
-      },
-    },
-    localhost: {
-      url: 'http://localhost:8545',
-      mining: {
-        auto: false,
-        interval: 1000,
-      },
-    },
     goerli: {
       chainId: 5,
       url: `https://goerli.infura.io/v3/${process.env.INFURA_API_KEY}`,

diff --git a/packages/executor/hardhat.config.ts b/packages/executor/hardhat.config.ts
@@ -17,12 +17,6 @@ const config: HardhatUserConfig = {
     version: '0.8.15',
   },
   networks: {
-    hardhat: {
-      mining: {
-        auto: false,
-        interval: 1000,
-      },
-    },
     'optimism-goerli': {
       chainId: 420,
       url: `https://optimism-goerli.infura.io/v3/${process.env.INFURA_API_KEY}`,

diff --git a/packages/plugins/hardhat.config.ts b/packages/plugins/hardhat.config.ts
@@ -22,18 +22,8 @@ const config: HardhatUserConfig = {
     },
   },
   networks: {
-    hardhat: {
-      mining: {
-        auto: false,
-        interval: 1000,
-      },
-    },
     localhost: {
       url: 'http://localhost:8545',
-      mining: {
-        auto: false,
-        interval: 1000,
-      },
     },
     goerli: {
       chainId: 5,

diff --git a/packages/plugins/src/hardhat/tasks.ts b/packages/plugins/src/hardhat/tasks.ts
@@ -439,49 +439,20 @@ subtask(TASK_CHUGSPLASH_EXECUTE)
           isSetImplementationAction(fromRawChugSplashAction(action.action))
       )
 
-      // Execute in parallel if and only if not on automining hardhat network
-      if (
-        (await getChainId(hre.ethers.provider)) === 31337 &&
-        (await hre.network.provider.request({
-          method: 'hardhat_getAutomine',
-          params: [],
-        }))
+      // execute actions in series
+      for (
+        let i = bundleState.actionsExecuted;
+        i < firstSetImplementationActionIndex;
+        i++
       ) {
-        // execute actions in series
-        for (
-          let i = bundleState.actionsExecuted;
-          i < firstSetImplementationActionIndex;
-          i++
-        ) {
-          const action = bundle.actions[i]
-          const tx = await chugSplashManager.executeChugSplashAction(
+        const action = bundle.actions[i]
+        await (
+          await chugSplashManager.executeChugSplashAction(
             action.action,
             action.proof.actionIndex,
             action.proof.siblings
           )
-          await tx.wait()
-        }
-      } else {
-        // execute in parallel
-        let nonce = await chugSplashManager.signer.getTransactionCount()
-        const actions = bundle.actions.slice(
-          bundleState.actionsExecuted,
-          firstSetImplementationActionIndex
-        )
-        await Promise.all(
-          actions.map((action) => {
-            const tx = chugSplashManager.executeChugSplashAction(
-              action.action,
-              action.proof.actionIndex,
-              action.proof.siblings,
-              {
-                nonce,
-              }
-            )
-            nonce += 1
-            return tx
-          })
-        )
+        ).wait()
       }
 
       // If the bundle hasn't already been completed in an earlier call, complete the bundle by