WIP: staging to get help

Author: GWSzeto

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

@@ -26,27 +26,16 @@ import { CircleAlertIcon, ExternalLinkIcon, InfoIcon } from "lucide-react";
 import Link from "next/link";
 import { useCallback, useMemo } from "react";
 import { FormProvider, type UseFormReturn, useForm } from "react-hook-form";
-import {
-  ZERO_ADDRESS,
-  getContract,
-  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 { concatHex, padHex } from "thirdweb/utils";
 import { FormHelperText, FormLabel, Heading, Text } from "tw-components";
 import { useCustomFactoryAbi, useFunctionParamsFromABI } from "../hooks";
 import { addContractToMultiChainRegistry } from "../utils";
@@ -461,7 +450,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
       }));
       console.log("module deploy data", moduleDeployData);
 
-      const deployData = {
+      const coreContractAddress = await deployContractfromDeployMetadata({
         account: activeAccount,
         chain: walletChain,
         client: thirdwebClient,
@@ -472,61 +461,59 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
           ? // remove modules for superchain interop in order to deploy deterministically deploy just the core contract
             []
           : moduleDeployData,
-      };
-
-      console.log("deploy data", deployData);
-      const coreContractAddress =
-        await deployContractfromDeployMetadata(deployData);
+      });
       const coreContract = getContract({
         client: thirdwebClient,
         address: coreContractAddress,
         chain: walletChain,
       });
       console.log("core contract", coreContract);
 
-      if (isSuperchainInterop && moduleDeployData) {
-        await Promise.all(
-          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),
-              );
-            }
-            console.log("module install params", moduleInstallParams);
-
-            const installTransaction = installPublishedModule({
-              contract: coreContract,
-              account: activeAccount,
-              moduleName: m.deployMetadata.name,
-              publisher: m.deployMetadata.publisher,
-              version: m.deployMetadata.version,
-              moduleData,
-            });
-            console.log("install transaction", installTransaction);
-
-            const txResult = await sendTransaction({
-              transaction: installTransaction,
-              account: activeAccount,
-            });
-            console.log("tx result", txResult);
-
-            return await waitForReceipt(txResult);
-          }),
-        );
-      }
+      //if (isSuperchainInterop && moduleDeployData) {
+      //  await Promise.all(
+      //    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),
+      //        );
+      //      }
+      //      console.log("module install params", moduleInstallParams);
+      //
+      //      const installTransaction = installPublishedModule({
+      //        contract: coreContract,
+      //        account: activeAccount,
+      //        moduleName: m.deployMetadata.name,
+      //        publisher: m.deployMetadata.publisher,
+      //        version: m.deployMetadata.version,
+      //        moduleData,
+      //      });
+      //      console.log("install transaction", installTransaction);
+      //
+      //      const txResult = await sendTransaction({
+      //        transaction: installTransaction,
+      //        account: activeAccount,
+      //      });
+      //      console.log("tx result", txResult);
+      //
+      //      return await waitForReceipt(txResult);
+      //    }),
+      //  );
+      //}
+
+      return coreContractAddress;
     },
   });
 

apps/dashboard/src/data/explore.ts

@@ -203,8 +203,8 @@ const CROSS_CHAIN = {
     [
       "deployer.thirdweb.eth/ERC20CoreInitializable", // TODO: replace this with the thirdweb published contract
       [
-        "deployer.thirdweb.eth/ClaimableERC20",
         "0xf2d22310905EaD92C19c7ef0003C1AD38e129cb1/SuperChainInterop", // TODO: replace this with the OP published contract
+        "deployer.thirdweb.eth/ClaimableERC20",
       ],
       {
         title: "Modular Token Drop",

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

@@ -1,4 +1,3 @@
-import { keccakId } from "src/exports/utils.js";
 import { parseEventLogs } from "../../event/actions/parse-logs.js";
 import { proxyDeployedEvent } from "../../extensions/thirdweb/__generated__/IContractFactory/events/ProxyDeployed.js";
 import { deployProxyByImplementation } from "../../extensions/thirdweb/__generated__/IContractFactory/write/deployProxyByImplementation.js";
@@ -7,6 +6,7 @@ import { getRpcClient } from "../../rpc/rpc.js";
 import { encode } from "../../transaction/actions/encode.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import type { PreparedTransaction } from "../../transaction/prepare-transaction.js";
+import { keccakId } from "../../utils/any-evm/keccak-id.js";
 import { isZkSyncChain } from "../../utils/any-evm/zksync/isZkSyncChain.js";
 import { toHex } from "../../utils/encoding/hex.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";

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

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

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

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

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

@@ -20,7 +20,10 @@ export function namehash(name: string) {
     const hashed = hashFromEncodedLabel
       ? toBytes(hashFromEncodedLabel)
       : keccak256(stringToBytes(item), "bytes");
-    result = keccak256(concat([result, hashed]), "bytes");
+    result = keccak256(
+      concat([result, hashed]),
+      "bytes",
+    ) as Uint8Array<ArrayBuffer>;
   }
 
   return bytesToHex(result);