addressed comments in PR

Author: GWSzeto

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

@@ -458,7 +458,10 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
       const moduleDeployData = modules?.map((m) => ({
         deployMetadata: m,
-        initializeParams: params.moduleData[m.name],
+        initializeParams:
+          m.name === "SuperChainInterop"
+            ? { superchainBridge: "0x4200000000000000000000000000000000000010" }
+            : params.moduleData[m.name],
       }));
 
       const coreContractAddress = await deployContractfromDeployMetadata({
@@ -480,15 +483,15 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
         chain: walletChain,
       });
 
-      const rpcRequest = getRpcClient({
-        client: thirdwebClient,
-        chain: walletChain,
-      });
-      const currentNonce = await eth_getTransactionCount(rpcRequest, {
-        address: activeAccount.address,
-      });
-
       if (isSuperchainInterop && moduleDeployData) {
+        const rpcRequest = getRpcClient({
+          client: thirdwebClient,
+          chain: walletChain,
+        });
+        const currentNonce = await eth_getTransactionCount(rpcRequest, {
+          address: activeAccount.address,
+        });
+
         for (const [i, m] of moduleDeployData.entries()) {
           let moduleData: `0x${string}` | undefined;
 
@@ -849,7 +852,10 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
               {isModular && modules && modules.length > 0 && (
                 <ModularContractDefaultModulesFieldset
                   form={form}
-                  modules={modules}
+                  modules={modules.filter(
+                    // superchain interop will have a default value for it's install param
+                    (mod) => mod.name !== "SuperChainInterop",
+                  )}
                   isTWPublisher={isTWPublisher}
                 />
               )}

packages/thirdweb/src/contract/deployment/deploy-via-autofactory.ts

@@ -1,5 +1,8 @@
 import { parseEventLogs } from "../../event/actions/parse-logs.js";
-import { proxyDeployedEvent } from "../../extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployed.js";
+import {
+  modifiedProxyDeployedEvent,
+  proxyDeployedEvent,
+} from "../../extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployed.js";
 import { deployProxyByImplementation } from "../../extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.js";
 import { eth_blockNumber } from "../../rpc/actions/eth_blockNumber.js";
 import { getRpcClient } from "../../rpc/rpc.js";
@@ -97,8 +100,13 @@ export async function deployViaAutoFactory(
     transaction: tx,
     account,
   });
+
+  // TODO: remove this once the modified version of TWCloneFactory has been published
+  const proxyEvent = salt?.startsWith("0x0101")
+    ? modifiedProxyDeployedEvent()
+    : proxyDeployedEvent();
   const decodedEvent = parseEventLogs({
-    events: [proxyDeployedEvent()],
+    events: [proxyEvent],
     logs: receipt.logs,
   });
   if (decodedEvent.length === 0 || !decodedEvent[0]) {
@@ -143,19 +151,18 @@ export async function deployViaAutoFactoryWithImplementationParams(
         size: 32,
       });
 
-  const asd = {
+  const tx = deployProxyByImplementation({
     contract: cloneFactoryContract,
     data: initializeData || "0x",
     implementation: implementationAddress,
     salt: parsedSalt,
-  };
-  const tx = deployProxyByImplementation(asd);
+  });
   const receipt = await sendAndConfirmTransaction({
     transaction: tx,
     account,
   });
   const decodedEvent = parseEventLogs({
-    events: [proxyDeployedEvent()],
+    events: [modifiedProxyDeployedEvent()],
     logs: receipt.logs,
   });
   if (decodedEvent.length === 0 || !decodedEvent[0]) {

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

@@ -185,10 +185,6 @@ export async function deployContractfromDeployMetadata(
           publisher: deployMetadata.publisher,
         });
 
-      console.error("is superchain interop", isSuperchainInterop);
-      console.error("is crosschain: ", isCrosschain);
-      console.error("initialize data: ", initializeData);
-
       // TODO: remove this once the modified version of TWCloneFactory
       // has been published under the thirdweb wallet
       const modifiedCloneFactoryContract = getContract({

packages/thirdweb/src/extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployed.ts

@@ -53,7 +53,5 @@ export async function sendAndConfirmTransaction(
   options: SendTransactionOptions,
 ): Promise<TransactionReceipt> {
   const submittedTx = await sendTransaction(options);
-  const receipt = await waitForReceipt(submittedTx);
-
-  return receipt;
+  return waitForReceipt(submittedTx);
 }

packages/thirdweb/src/transaction/actions/send-and-confirm-transaction.ts

@@ -207,7 +207,7 @@ export type ExtendedMetadata = {
         factoryAddresses?: Record<string, string>;
       }
     | undefined;
-  deployType?: "standard" | "autoFactory" | "customFactory" | "crosschain";
+  deployType?: "standard" | "autoFactory" | "customFactory";
   routerType?: "none" | "plugin" | "dynamic" | "modular";
   networksForDeployment?: {
     allNetworks?: boolean;