god bless greg it works

Author: GWSzeto

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/cross-chain/data-table.tsx

@@ -34,7 +34,9 @@ import { useTxNotifications } from "hooks/useTxNotifications";
 import {
   ZERO_ADDRESS,
   defineChain,
+  eth_getTransactionCount,
   getContract,
+  getRpcClient,
   readContract,
   sendTransaction,
   waitForReceipt,
@@ -205,44 +207,53 @@ export function DataTable({
           client,
         });
 
-        await Promise.all(
-          moduleDeployData.map(async (m) => {
-            let moduleData: `0x${string}` | undefined;
+        const rpcRequest = getRpcClient({
+          client,
+          chain,
+        });
+        const currentNonce = await eth_getTransactionCount(rpcRequest, {
+          address: activeAccount.address,
+        });
 
-            const moduleInstallParams = m.deployMetadata.abi.find(
-              (abiType) =>
-                (abiType as AbiFunction).name === "encodeBytesOnInstall",
-            ) as AbiFunction | undefined;
+        for (const [i, m] of moduleDeployData.entries()) {
+          let moduleData: `0x${string}` | undefined;
 
-            if (m.initializeParams && moduleInstallParams) {
-              moduleData = encodeAbiParameters(
-                (
-                  moduleInstallParams.inputs as { name: string; type: string }[]
-                ).map((p) => ({
-                  name: p.name,
-                  type: p.type,
-                })),
-                Object.values(m.initializeParams),
-              );
-            }
+          const moduleInstallParams = m.deployMetadata.abi.find(
+            (abiType) =>
+              (abiType as AbiFunction).name === "encodeBytesOnInstall",
+          ) as AbiFunction | undefined;
 
-            const installTransaction = installPublishedModule({
-              contract,
-              account: activeAccount,
-              moduleName: m.deployMetadata.name,
-              publisher: m.deployMetadata.publisher,
-              version: m.deployMetadata.version,
-              moduleData,
-            });
+          if (m.initializeParams && moduleInstallParams) {
+            moduleData = encodeAbiParameters(
+              (
+                moduleInstallParams.inputs as { name: string; type: string }[]
+              ).map((p) => ({
+                name: p.name,
+                type: p.type,
+              })),
+              Object.values(m.initializeParams),
+            );
+          }
 
-            const txResult = await sendTransaction({
-              transaction: installTransaction,
-              account: activeAccount,
-            });
+          const installTransaction = installPublishedModule({
+            contract,
+            account: activeAccount,
+            moduleName: m.deployMetadata.name,
+            publisher: m.deployMetadata.publisher,
+            version: m.deployMetadata.version,
+            moduleData,
+            nonce: currentNonce + i,
+          });
 
-            return await waitForReceipt(txResult);
-          }),
-        );
+          const txResult = await sendTransaction({
+            transaction: installTransaction,
+            account: activeAccount,
+          });
+
+          await waitForReceipt(txResult);
+          // can't handle parallel transactions, so wait a bit
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+        }
       }
 
       deployStatusModal.nextStep();

apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx

@@ -28,7 +28,9 @@ import { useCallback, useMemo } from "react";
 import { FormProvider, type UseFormReturn, useForm } from "react-hook-form";
 import {
   ZERO_ADDRESS,
+  eth_getTransactionCount,
   getContract,
+  getRpcClient,
   sendTransaction,
   waitForReceipt,
 } from "thirdweb";
@@ -478,45 +480,54 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
         chain: walletChain,
       });
 
-      if (isSuperchainInterop && moduleDeployData) {
-        await Promise.allSettled(
-          moduleDeployData.map(async (m) => {
-            let moduleData: `0x${string}` | undefined;
-
-            const moduleInstallParams = m.deployMetadata.abi.find(
-              (abiType) =>
-                (abiType as AbiFunction).name === "encodeBytesOnInstall",
-            ) as AbiFunction | undefined;
-
-            if (m.initializeParams && moduleInstallParams) {
-              moduleData = encodeAbiParameters(
-                (
-                  moduleInstallParams.inputs as { name: string; type: string }[]
-                ).map((p) => ({
-                  name: p.name,
-                  type: p.type,
-                })),
-                Object.values(m.initializeParams),
-              );
-            }
-
-            const installTransaction = installPublishedModule({
-              contract: coreContract,
-              account: activeAccount,
-              moduleName: m.deployMetadata.name,
-              publisher: m.deployMetadata.publisher,
-              version: m.deployMetadata.version,
-              moduleData,
-            });
+      const rpcRequest = getRpcClient({
+        client: thirdwebClient,
+        chain: walletChain,
+      });
+      const currentNonce = await eth_getTransactionCount(rpcRequest, {
+        address: activeAccount.address,
+      });
 
-            const txResult = await sendTransaction({
-              transaction: installTransaction,
-              account: activeAccount,
-            });
+      if (isSuperchainInterop && moduleDeployData) {
+        for (const [i, m] of moduleDeployData.entries()) {
+          let moduleData: `0x${string}` | undefined;
+
+          const moduleInstallParams = m.deployMetadata.abi.find(
+            (abiType) =>
+              (abiType as AbiFunction).name === "encodeBytesOnInstall",
+          ) as AbiFunction | undefined;
+
+          if (m.initializeParams && moduleInstallParams) {
+            moduleData = encodeAbiParameters(
+              (
+                moduleInstallParams.inputs as { name: string; type: string }[]
+              ).map((p) => ({
+                name: p.name,
+                type: p.type,
+              })),
+              Object.values(m.initializeParams),
+            );
+          }
 
-            return await waitForReceipt(txResult);
-          }),
-        );
+          const installTransaction = installPublishedModule({
+            contract: coreContract,
+            account: activeAccount,
+            moduleName: m.deployMetadata.name,
+            publisher: m.deployMetadata.publisher,
+            version: m.deployMetadata.version,
+            moduleData,
+            nonce: currentNonce + i,
+          });
+
+          const txResult = await sendTransaction({
+            transaction: installTransaction,
+            account: activeAccount,
+          });
+
+          await waitForReceipt(txResult);
+          // can't handle parallel transactions, so wait a bit
+          await new Promise((resolve) => setTimeout(resolve, 1000));
+        }
       }
 
       return coreContractAddress;

packages/thirdweb/src/extensions/modules/common/installPublishedModule.ts

@@ -14,6 +14,7 @@ export type InstallPublishedModuleOptions = {
   version?: string;
   constructorParams?: Record<string, unknown>;
   moduleData?: `0x${string}`;
+  nonce?: number;
 };
 
 /**
@@ -43,10 +44,14 @@ export function installPublishedModule(options: InstallPublishedModuleOptions) {
     constructorParams,
     publisher,
     moduleData,
+    nonce,
   } = options;
 
   return installModule({
     contract,
+    overrides: {
+      nonce,
+    },
     asyncParams: async () => {
       const deployedModule = await getOrDeployInfraForPublishedContract({
         chain: contract.chain,

packages/thirdweb/src/extensions/prebuilts/deploy-published.ts

@@ -217,7 +217,7 @@ export async function deployContractfromDeployMetadata(
           account,
           modules,
         });
-        return await deployViaAutoFactory({
+        return deployViaAutoFactory({
           client,
           chain,
           account,