auto deploy new clone factory

Author: kumaryash90

packages/thirdweb/src/contract/deployment/utils/bootstrap.ts

@@ -167,6 +167,7 @@ export async function deployCloneFactory(options: ClientAndChainAndAccount) {
     ...options,
     contractId: "TWCloneFactory",
     constructorParams: { _trustedForwarder: forwarder.address },
+    publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936", // TODO: use default publisher
   });
 }
 
@@ -218,7 +219,10 @@ export async function getOrDeployInfraContract(
   const contractMetadata = await fetchPublishedContractMetadata({
     client: options.client,
     contractId: options.contractId,
-    publisher: options.publisher,
+    publisher:
+      options.contractId === "TWCloneFactory"
+        ? "0x6453a486d52e0EB6E79Ec4491038E2522a926936" // TODO: use default publisher
+        : options.publisher,
     version: options.version,
   });
   return getOrDeployInfraContractFromMetadata({

packages/thirdweb/src/contract/deployment/utils/clone-factory.ts

@@ -23,6 +23,7 @@ export async function getDeployedCloneFactoryContract(args: ClientAndChain) {
     ...args,
     contractId: "TWCloneFactory",
     constructorParams: { _trustedForwarder: forwarder.address },
+    publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936", // TODO: use default publisher
   });
   if (!cloneFactory) {
     return null;

packages/thirdweb/src/contract/deployment/utils/infra.ts

@@ -46,7 +46,10 @@ export async function getDeployedInfraContract(
   const contractMetadata = await fetchPublishedContractMetadata({
     client: options.client,
     contractId: options.contractId,
-    publisher: options.publisher,
+    publisher:
+      options.contractId === "TWCloneFactory"
+        ? "0x6453a486d52e0EB6E79Ec4491038E2522a926936" // TODO: use default publisher
+        : options.publisher,
     version: options.version,
   });
   return getDeployedInfraContractFromMetadata({

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

@@ -149,7 +149,6 @@ export async function deployContractfromDeployMetadata(
     initializeParams,
     initializeData,
     deployMetadata,
-    isSuperchainInterop, // TODO: Remove this once the updated Clone Factory has been published
     isCrosschain,
     implementationConstructorParams,
     modules,
@@ -223,20 +222,12 @@ export async function deployContractfromDeployMetadata(
           version: deployMetadata.version,
         });
 
-      // TODO: remove this once the modified version of TWCloneFactory
-      // has been published under the thirdweb wallet
-      const modifiedCloneFactoryContract = getContract({
-        client,
-        address: "0xB83db4b940e4796aA1f53DBFC824B9B1865835D5", // only deployed on OP and zora testnets
-        chain,
-      });
-
       if (isCrosschain) {
         return deployViaAutoFactory({
           client,
           chain,
           account,
-          cloneFactoryContract: modifiedCloneFactoryContract,
+          cloneFactoryContract,
           implementationAddress: implementationContract.address,
           initializeData,
           salt,
@@ -256,9 +247,7 @@ export async function deployContractfromDeployMetadata(
         client,
         chain,
         account,
-        cloneFactoryContract: isSuperchainInterop // TODO: remove this once the updated clone factory is publsihed
-          ? modifiedCloneFactoryContract
-          : cloneFactoryContract,
+        cloneFactoryContract,
         initializeTransaction,
         salt,
       });