cleanup

Author: kumaryash90

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

@@ -28,29 +28,16 @@ import {
 import Link from "next/link";
 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";
+import { ZERO_ADDRESS, getContract } from "thirdweb";
 import type { FetchDeployMetadataResult } from "thirdweb/contract";
 import {
   deployContractfromDeployMetadata,
   deployMarketplaceContract,
   getRequiredTransactions,
 } from "thirdweb/deploys";
-import { installPublishedModule } from "thirdweb/modules";
 import { useActiveAccount, useActiveWalletChain } from "thirdweb/react";
 import { upload } from "thirdweb/storage";
-import {
-  type AbiFunction,
-  concatHex,
-  encodeAbiParameters,
-  padHex,
-} from "thirdweb/utils";
+import {} from "thirdweb/utils";
 import { isZkSyncChain } from "thirdweb/utils";
 import { FormHelperText, FormLabel, Text } from "tw-components";
 import { useCustomFactoryAbi, useFunctionParamsFromABI } from "../hooks";
@@ -204,10 +191,6 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
     !isFactoryDeployment &&
     (metadata?.name.includes("AccountFactory") || false);
 
-  const isSuperchainInterop = !!modules?.find(
-    (m) => m.name === "SuperChainInterop",
-  );
-
   const parsedDeployParams = useMemo(
     () => ({
       ...deployParams.reduce(
@@ -482,20 +465,15 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
         _contractURI,
       };
 
-      const salt = isSuperchainInterop
-        ? concatHex(["0x0101", padHex("0x", { size: 30 })]).toString()
-        : params.deployDeterministic
-          ? params.signerAsSalt
-            ? activeAccount.address.concat(params.saltForCreate2)
-            : params.saltForCreate2
-          : undefined;
+      const salt = params.deployDeterministic
+        ? params.signerAsSalt
+          ? activeAccount.address.concat(params.saltForCreate2)
+          : params.saltForCreate2
+        : undefined;
 
       const moduleDeployData = modules?.map((m) => ({
         deployMetadata: m,
-        initializeParams:
-          m.name === "SuperChainInterop"
-            ? { superchainBridge: "0x4200000000000000000000000000000000000028" }
-            : params.moduleData[m.name],
+        initializeParams: params.moduleData[m.name],
       }));
 
       const coreContractAddress = await deployContractfromDeployMetadata({
@@ -506,69 +484,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
         initializeParams,
         implementationConstructorParams,
         salt,
-        isSuperchainInterop,
-        modules: isSuperchainInterop
-          ? // remove modules for superchain interop in order to deploy deterministically deploy just the core contract
-            []
-          : moduleDeployData,
+        modules: moduleDeployData,
       });
-      const coreContract = getContract({
-        client: thirdwebClient,
-        address: coreContractAddress,
-        chain: walletChain,
-      });
-
-      if (isSuperchainInterop && moduleDeployData) {
-        const rpcRequest = getRpcClient({
-          client: thirdwebClient,
-          chain: walletChain,
-        });
-        const currentNonce = await eth_getTransactionCount(rpcRequest, {
-          address: activeAccount.address as `0x${string}`,
-        });
-
-        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),
-            );
-          }
-
-          console.log("nonce used: ", currentNonce + i);
-
-          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;
     },
@@ -899,10 +816,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
               {isModular && modules && modules.length > 0 && (
                 <ModularContractDefaultModulesFieldset
                   form={form}
-                  modules={modules.filter(
-                    // superchain interop will have a default value for it's install param
-                    (mod) => mod.name !== "SuperChainInterop",
-                  )}
+                  modules={modules}
                   isTWPublisher={isTWPublisher}
                 />
               )}

apps/dashboard/src/data/explore.ts

@@ -192,29 +192,6 @@ const MODULAR_CONTRACTS = {
   ],
 } satisfies ExploreCategory;
 
-const CROSS_CHAIN = {
-  id: "cross-chain",
-  name: "cross-chain",
-  displayName: "Cross Chain",
-  description:
-    "Collection of contracts that are popular for building cross-chain applications.",
-  contracts: [
-    // erc20 drop
-    [
-      "deployer.thirdweb.eth/ERC20CoreInitializable", // TODO: replace this with the thirdweb published contract
-      [
-        "0xf2d22310905EaD92C19c7ef0003C1AD38e129cb1/SuperChainInterop", // TODO: replace this with the OP published contract
-        "deployer.thirdweb.eth/ClaimableERC20",
-      ],
-      {
-        title: "OP Superchain Modular Token Drop",
-        description:
-          "ERC-20 Tokens crosschain compatible across OP Superchains",
-      },
-    ],
-  ],
-} satisfies ExploreCategory;
-
 const AIRDROP = {
   id: "airdrop",
   name: "Airdrop",
@@ -304,7 +281,6 @@ const SMART_WALLET = {
 const CATEGORIES: Record<string, ExploreCategory> = {
   [POPULAR.id]: POPULAR,
   [MODULAR_CONTRACTS.id]: MODULAR_CONTRACTS,
-  [CROSS_CHAIN.id]: CROSS_CHAIN,
   [NFTS.id]: NFTS,
   [MARKETS.id]: MARKETS,
   [DROPS.id]: DROPS,

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

@@ -127,7 +127,6 @@ export type DeployContractfromDeployMetadataOptions = {
   initializeParams?: Record<string, unknown>;
   initializeData?: `0x${string}`;
   implementationConstructorParams?: Record<string, unknown>;
-  isSuperchainInterop?: boolean;
   isCrosschain?: boolean;
   modules?: {
     deployMetadata: FetchDeployMetadataResult;