WIP: staging to get help

Author: GWSzeto

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

@@ -461,7 +461,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,11 +472,7 @@ 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,
@@ -527,6 +523,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
           }),
         );
       }
+
+      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

@@ -1,9 +1,17 @@
+import { http, createPublicClient } from "viem";
+import { optimismSepolia } from "viem/chains";
 import type { TransactionReceipt } from "../types.js";
 import {
   type SendTransactionOptions,
   sendTransaction,
 } from "./send-transaction.js";
-import { waitForReceipt } from "./wait-for-tx-receipt.js";
+
+const publicClient = createPublicClient({
+  chain: optimismSepolia,
+  transport: http(
+    "https://opt-sepolia.g.alchemy.com/v2/BtOwhqwBs6IOw5fd-dkhCDTh5Fx4XPHu",
+  ),
+});
 
 /**
  * Sends a transaction using the provided wallet.
@@ -53,5 +61,12 @@ export async function sendAndConfirmTransaction(
   options: SendTransactionOptions,
 ): Promise<TransactionReceipt> {
   const submittedTx = await sendTransaction(options);
-  return waitForReceipt(submittedTx);
+  const receipt = await publicClient.waitForTransactionReceipt({
+    hash: submittedTx.transactionHash,
+  });
+  console.error("receipt", receipt);
+
+  //const receipt = await waitForReceipt(submittedTx);
+  //console.error("receipt", receipt);
+  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);