WIP: hardcoded modified version of TWCloneFactory to be used

Author: GWSzeto

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

@@ -36,6 +36,7 @@ import { ZERO_ADDRESS, defineChain } from "thirdweb";
 import type { FetchDeployMetadataResult } from "thirdweb/contract";
 import { deployContractfromDeployMetadata } from "thirdweb/deploys";
 import { useActiveAccount, useSwitchActiveWalletChain } from "thirdweb/react";
+import { concatHex, padHex } from "thirdweb/utils";
 
 export type CrossChain = {
   id: number;
@@ -170,7 +171,7 @@ export function DataTable({
 
       const chain = defineChain(chainId);
       const client = getThirdwebClient();
-      const salt = "thirdweb";
+      const salt = concatHex(["0x0101", padHex("0x", { size: 30 })]).toString();
 
       await switchChain(chain);
 

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

@@ -52,14 +52,6 @@ export default async function Page(props: {
     },
   );
 
-  const _topOPStackChainIds = [
-    8453, // Base
-    10, // OP Mainnet
-    34443, // Mode Network
-    7560, // Cyber
-    7777777, // Zora
-  ];
-
   const topOPStackTestnetChainIds = [
     84532, // Base
     11155420, // OP testnet

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

@@ -35,6 +35,7 @@ import {
 } from "thirdweb/deploys";
 import { useActiveAccount, useActiveWalletChain } from "thirdweb/react";
 import { upload } from "thirdweb/storage";
+import { concatHex, padHex } from "thirdweb/utils";
 import { FormHelperText, FormLabel, Heading, Text } from "tw-components";
 import { useCustomFactoryAbi, useFunctionParamsFromABI } from "../hooks";
 import { addContractToMultiChainRegistry } from "../utils";
@@ -436,7 +437,7 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
       // TODO: discuss how to handle the salt properly for crosschain contracts
       const salt = isSuperchainInterop
-        ? "thirdweb"
+        ? concatHex(["0x0101", padHex("0x", { size: 30 })]).toString()
         : params.deployDeterministic
           ? params.signerAsSalt
             ? activeAccount.address.concat(params.saltForCreate2)

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

@@ -6,7 +6,6 @@ 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";
@@ -35,7 +34,8 @@ export function prepareAutoFactoryDeployTransaction(
       });
       const blockNumber = await eth_blockNumber(rpcRequest);
       const salt = args.salt
-        ? keccakId(args.salt)
+        ? //? keccakId(args.salt)
+          (args.salt as `0x${string}`)
         : toHex(blockNumber, {
             size: 32,
           });

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

@@ -163,7 +163,7 @@ export async function deployContractfromDeployMetadata(
         import("../../contract/deployment/deploy-via-autofactory.js"),
         import("../../contract/deployment/utils/bootstrap.js"),
       ]);
-      const { cloneFactoryContract, implementationContract } =
+      const { cloneFactoryContract: _, implementationContract } =
         await getOrDeployInfraForPublishedContract({
           chain,
           client,
@@ -181,18 +181,26 @@ export async function deployContractfromDeployMetadata(
       const initializeTransaction = await getInitializeTransaction({
         client,
         chain,
-        deployMetadata: deployMetadata,
+        deployMetadata,
         implementationContract,
         initializeParams,
         account,
         modules,
       });
 
+      // TODO: remove this once the modified version of TWCloneFactory
+      // has been published under the thirdweb wallet
+      const modifiedCloneFactoryContract = getContract({
+        client,
+        address: "0x7756D8a084e55d9872BD5bBDf6867543D15866A4", // only deployed on OP and zora testnets
+        chain,
+      });
+
       return deployViaAutoFactory({
         client,
         chain,
         account,
-        cloneFactoryContract,
+        cloneFactoryContract: modifiedCloneFactoryContract,
         initializeTransaction,
         salt,
       });