use new clone factory, cleanup

Author: kumaryash90

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

@@ -40,7 +40,7 @@ describe.runIf(process.env.TW_SECRET_KEY)("bootstrap", () => {
     const cloneFactory = await getDeployedInfraContract({
       chain: ANVIL_CHAIN,
       client: TEST_CLIENT,
-      contractId: "TWCloneFactory",
+      contractId: "TWCloneFactoryV2",
       constructorParams: {
         _trustedForwarder: forwarder.address,
       },

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

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

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

@@ -21,9 +21,8 @@ export async function getDeployedCloneFactoryContract(args: ClientAndChain) {
   // check if clone factory is deployed
   const cloneFactory = await getDeployedInfraContract({
     ...args,
-    contractId: "TWCloneFactory",
+    contractId: "TWCloneFactoryV2",
     constructorParams: { _trustedForwarder: forwarder.address },
-    publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936", // TODO: use default publisher
   });
   if (!cloneFactory) {
     return null;

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

@@ -15,7 +15,7 @@ export type InfraContractId =
   | "WETH9"
   | "Forwarder"
   | "ForwarderEOAOnly"
-  | "TWCloneFactory"
+  | "TWCloneFactoryV2"
   | (string & {});
 
 type GetDeployedInfraParams = Prettify<
@@ -46,10 +46,7 @@ export async function getDeployedInfraContract(
   const contractMetadata = await fetchPublishedContractMetadata({
     client: options.client,
     contractId: options.contractId,
-    publisher:
-      options.contractId === "TWCloneFactory"
-        ? "0x6453a486d52e0EB6E79Ec4491038E2522a926936" // TODO: use default publisher
-        : options.publisher,
+    publisher: options.publisher,
     version: options.version,
   });
   return getDeployedInfraContractFromMetadata({

packages/thirdweb/src/extensions/prebuilts/get-required-transactions.ts

@@ -76,7 +76,7 @@ export async function getRequiredTransactions(
         : getDeployedInfraContract({
             chain,
             client,
-            contractId: "TWCloneFactory",
+            contractId: "TWCloneFactoryV2",
             constructorParams: {
               _trustedForwarder: await computePublishedContractAddress({
                 chain,
@@ -87,7 +87,7 @@ export async function getRequiredTransactions(
           }).then((c) =>
             c
               ? null
-              : ({ type: "infra", contractId: "TWCloneFactory" } as const),
+              : ({ type: "infra", contractId: "TWCloneFactoryV2" } as const),
           ),
       // TODO (deploy): add WETH contract check for implementations that need it (check implementation constructor params)
       getTransactionsForImplementation({