Infra deployment updated

kumaryash90 · kumaryash90 · commit 3b550ae3ebb0 · 2024-10-21T18:17:24.000+05:30
diff --git a/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx b/apps/dashboard/src/components/contract-components/contract-deploy-form/custom-contract.tsx
@@ -37,7 +37,7 @@ import {
 import { useActiveAccount, useActiveWalletChain } from "thirdweb/react";
 import { upload } from "thirdweb/storage";
 import { FormHelperText, FormLabel, Heading, Text } from "tw-components";
-import { useCustomFactoryAbi, useFunctionParamsFromABI } from "../hooks";
+import { useCustomFactoryAbi, useFunctionParamsFromABI, useMintfeeManager, useMultisig } from "../hooks";
 import { addContractToMultiChainRegistry } from "../utils";
 import { Fieldset } from "./common";
 import { ContractMetadataFieldset } from "./contract-metadata-fieldset";
@@ -149,6 +149,9 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
 
   const isTWPublisher = checkTwPublisher(metadata?.publisher);
 
+  const multisig = useMultisig(walletChain?.id);
+  const mintfeeManager = useMintfeeManager(walletChain?.id);
+
   const initializerParams = useFunctionParamsFromABI(
     metadata?.deployType === "customFactory" && customFactoryAbi?.data
       ? customFactoryAbi.data
@@ -193,6 +196,8 @@ export const CustomContractForm: React.FC<CustomContractFormProps> = ({
             {
               connectedWallet: activeAccount?.address,
               chainId: walletChain?.id,
+              multisig: multisig.data?.multisig,
+              mintFeeManager: mintfeeManager.data?.mintfeeManager
             },
           );
 
diff --git a/apps/dashboard/src/components/contract-components/hooks.ts b/apps/dashboard/src/components/contract-components/hooks.ts
@@ -6,7 +6,7 @@ import type { Abi } from "abitype";
 import { isEnsName, resolveEns } from "lib/ens";
 import { useV5DashboardChain } from "lib/v5-adapter";
 import { useMemo } from "react";
-import { type ThirdwebContract, getContract } from "thirdweb";
+import { type ThirdwebContract, ZERO_ADDRESS, getContract } from "thirdweb";
 import { resolveContractAbi } from "thirdweb/contract";
 import { isAddress } from "thirdweb/utils";
 import {
@@ -18,6 +18,7 @@ import { fetchDeployMetadata } from "./fetchDeployMetadata";
 import { fetchPublishedContracts } from "./fetchPublishedContracts";
 import { fetchPublishedContractsFromDeploy } from "./fetchPublishedContractsFromDeploy";
 import type { ContractId } from "./types";
+import { getPredictedMintFeeManagerAddress, getPredictedMultisigAddress } from "thirdweb/deploys";
 
 export function useFetchDeployMetadata(contractId: ContractId) {
   return useQuery({
@@ -150,6 +151,66 @@ export function usePublishedContractsQuery(address?: string) {
   });
 }
 
+function multisigQuery(chainId: number | undefined) {
+  if(!chainId) {
+    chainId = 1;
+  }
+  
+  return queryOptions({
+    queryKey: ["multisig", chainId],
+    queryFn: async() => {
+      const chain = useV5DashboardChain(chainId);
+      const client = useThirdwebClient();
+
+      const multisig = await getPredictedMultisigAddress({client, chain});
+
+      return {
+        multisig
+      }
+
+    },
+    enabled:
+      !!chainId,
+    // 24h
+    gcTime: 60 * 60 * 24 * 1000,
+    // 1h
+    staleTime: 60 * 60 * 1000,
+    // default to zero address
+    placeholderData: { multisig: ZERO_ADDRESS },
+    retry: false,
+  })
+}
+
+function mintfeeManagerQuery(chainId: number | undefined) {
+  if(!chainId) {
+    chainId = 1;
+  }
+
+  return queryOptions({
+    queryKey: ["mintfee-manager", chainId],
+    queryFn: async() => {
+      const chain = useV5DashboardChain(chainId);
+      const client = useThirdwebClient();
+
+      const mintfeeManager = await getPredictedMintFeeManagerAddress({client, chain});
+
+      return {
+        mintfeeManager
+      }
+
+    },
+    enabled:
+      !!chainId,
+    // 24h
+    gcTime: 60 * 60 * 24 * 1000,
+    // 1h
+    staleTime: 60 * 60 * 1000,
+    // default to zero address
+    placeholderData: { mintfeeManager: ZERO_ADDRESS },
+    retry: false,
+  })
+}
+
 function ensQuery(addressOrEnsName?: string) {
   // if the address is `thirdweb.eth` we actually want `deployer.thirdweb.eth` here...
   if (addressOrEnsName === "thirdweb.eth") {
@@ -208,6 +269,14 @@ export function useEns(addressOrEnsName?: string) {
   return useQuery(ensQuery(addressOrEnsName));
 }
 
+export function useMultisig(chainId: number | undefined) {
+  return useQuery(multisigQuery(chainId));
+}
+
+export function useMintfeeManager(chainId: number | undefined) {
+  return useQuery(mintfeeManagerQuery(chainId));
+}
+
 export function useContractEvents(abi: Abi) {
   return abi.filter((a) => a.type === "event");
 }
diff --git a/apps/dashboard/src/lib/deployment/template-values.ts b/apps/dashboard/src/lib/deployment/template-values.ts
@@ -3,6 +3,8 @@ import type { SolidityType } from "lib/solidity-types";
 interface ReplacementProps {
   connectedWallet?: string;
   chainId?: number;
+  mintFeeManager?: string;
+  multisig?: string;
 }
 
 interface TemplateValue {
@@ -25,6 +27,26 @@ const ADDRESS_TEMPLATE_VALUES: TemplateValue[] = [
       );
     },
   },
+  {
+    value: "{{tw_mintfee_manager}}",
+    helperText: "Replaced with the address of the thirdweb mint fee manager.",
+    replacerFunction: (searchValue, replacers) => {
+      return searchValue.replaceAll(
+        "{{tw_mintfee_manager}}",
+        replacers.mintFeeManager || "",
+      );
+    },
+  },
+  {
+    value: "{{tw_multisig}}",
+    helperText: "Replaced with the address of the thirdweb multisig.",
+    replacerFunction: (searchValue, replacers) => {
+      return searchValue.replaceAll(
+        "{{tw_multisig}}",
+        replacers.multisig || "",
+      );
+    },
+  },
 ];
 
 const ADDRESS_ARRAY_TEMPLATE_VALUES: TemplateValue[] = [
diff --git a/packages/thirdweb/src/contract/deployment/utils/bootstrap.ts b/packages/thirdweb/src/contract/deployment/utils/bootstrap.ts
@@ -1,3 +1,4 @@
+import { ZERO_ADDRESS } from "../../../constants/addresses.js";
 import { sendAndConfirmTransaction } from "../../../transaction/actions/send-and-confirm-transaction.js";
 import {
   type FetchDeployMetadataResult,
@@ -20,6 +21,7 @@ import {
   getDeployedInfraContractFromMetadata,
   prepareInfraContractDeployTransactionFromMetadata,
 } from "./infra.js";
+import { getDeployedMintFeeManagerContract } from "./mintfee-manager.js";
 
 /**
  * @internal
@@ -34,6 +36,7 @@ export async function getOrDeployInfraForPublishedContract(
 ): Promise<{
   cloneFactoryContract: ThirdwebContract;
   implementationContract: ThirdwebContract;
+  mintfeeManagerContract?: ThirdwebContract;
 }> {
   const {
     chain,
@@ -83,11 +86,15 @@ export async function getOrDeployInfraForPublishedContract(
     };
   }
 
-  let [cloneFactoryContract, implementationContract] = await Promise.all([
+  let [cloneFactoryContract, mintfeeManagerContract, implementationContract] = await Promise.all([
     getDeployedCloneFactoryContract({
       chain,
       client,
     }),
+    getDeployedMintFeeManagerContract({
+      chain,
+      client,
+    }),
     getDeployedInfraContract({
       chain,
       client,
@@ -98,13 +105,18 @@ export async function getOrDeployInfraForPublishedContract(
     }),
   ]);
 
-  if (!implementationContract || !cloneFactoryContract) {
+  if (!implementationContract || !cloneFactoryContract || !mintfeeManagerContract) {
     // deploy the infra and implementation contracts if not found
     cloneFactoryContract = await deployCloneFactory({
       client,
       chain,
       account,
     });
+    mintfeeManagerContract = await deployMintFeeManager({
+      client,
+      chain,
+      account,
+    });
     implementationContract = await deployImplementation({
       client,
       chain,
@@ -115,7 +127,7 @@ export async function getOrDeployInfraForPublishedContract(
       version,
     });
   }
-  return { cloneFactoryContract, implementationContract };
+  return { cloneFactoryContract, mintfeeManagerContract, implementationContract };
 }
 
 /**
@@ -143,6 +155,52 @@ export async function deployCloneFactory(options: ClientAndChainAndAccount) {
   });
 }
 
+/**
+ * @internal
+ * @returns the deployed mint fee manager contract
+ */
+export async function deployMintFeeManager(options: ClientAndChainAndAccount) {
+  // create2 factory
+  const create2Factory = await getDeployedCreate2Factory(options);
+  if (!create2Factory) {
+    await deployCreate2Factory(options);
+  }
+
+  // Multisig
+  const multisig = await deployMultisig(options);
+
+  // clone factory
+  return getOrDeployInfraContract({
+    ...options,
+    contractId: "MintFeeManagerCore",
+    constructorParams: { _owner: multisig, _modules: [], _moduleInstallData: [] },
+  });
+}
+
+/**
+ * @internal
+ * @returns the deployed multisig contract
+ */
+export async function deployMultisig(options: ClientAndChainAndAccount) {
+  // create2 factory
+  const create2Factory = await getDeployedCreate2Factory(options);
+  if (!create2Factory) {
+    await deployCreate2Factory(options);
+  }
+
+  return getOrDeployInfraContract({
+    ...options,
+    contractId: "Multisig",
+    constructorParams: { _signers: [TW_SIGNER_1, TW_SIGNER_2, TW_SIGNER_3], _requiredApprovals: MULTISIG_REQUIRED_APPROVALS },
+  });
+}
+
+export const TW_SIGNER_1 = ZERO_ADDRESS;
+export const TW_SIGNER_2 = ZERO_ADDRESS;
+export const TW_SIGNER_3 = ZERO_ADDRESS;
+
+export const MULTISIG_REQUIRED_APPROVALS = 2;
+
 /**
  * @internal
  * @returns the deployed infra contract
diff --git a/packages/thirdweb/src/contract/deployment/utils/infra.ts b/packages/thirdweb/src/contract/deployment/utils/infra.ts
@@ -16,6 +16,8 @@ export type InfraContractId =
   | "Forwarder"
   | "ForwarderEOAOnly"
   | "TWCloneFactory"
+  | "MintFeeManagerCore"
+  | "Multisig"
   | (string & {});
 
 type GetDeployedInfraParams = Prettify<
@@ -27,6 +29,26 @@ type GetDeployedInfraParams = Prettify<
   }
 >;
 
+/**
+ * @internal
+ */
+export async function getPredictedInfraContractAddress(
+  options: GetDeployedInfraParams,
+): Promise<string> {
+  const contractMetadata = await fetchPublishedContractMetadata({
+    client: options.client,
+    contractId: options.contractId,
+    publisher: options.publisher,
+    version: options.version,
+  });
+  return await computeContractAddress({
+    client: options.client,
+    chain: options.chain,
+    contractMetadata,
+    constructorParams: options.constructorParams,
+  })
+}
+
 /**
  * @internal
  */
diff --git a/packages/thirdweb/src/contract/deployment/utils/mintfee-manager.ts b/packages/thirdweb/src/contract/deployment/utils/mintfee-manager.ts
@@ -0,0 +1,69 @@
+import type { ClientAndChain } from "../../../utils/types.js";
+import { TW_SIGNER_1, TW_SIGNER_2, TW_SIGNER_3, MULTISIG_REQUIRED_APPROVALS } from "./bootstrap.js";
+import { getDeployedInfraContract, getPredictedInfraContractAddress } from "./infra.js";
+
+/**
+ * @internal
+ */
+export async function getDeployedMintFeeManagerContract(args: ClientAndChain) {
+  // check if Multisig is deployed
+  const multisig = await getDeployedInfraContract({
+    ...args,
+    contractId: "Multisig",
+    constructorParams: { _signers: [TW_SIGNER_1, TW_SIGNER_2, TW_SIGNER_3], _requiredApprovals: MULTISIG_REQUIRED_APPROVALS },
+    publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936", // TODO: remove before merging
+  });
+  if (!multisig) {
+    return null;
+  }
+
+  // check if MintFeeManager is deployed
+  const mintfeeManager = await getDeployedInfraContract({
+    ...args,
+    contractId: "MintFeeManagerCore",
+    constructorParams: { _owner: multisig, _modules: [], _moduleInstallData: [] },
+    publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936", // TODO: remove before merging
+  });
+  if (!mintfeeManager) {
+    return null;
+  }
+  return mintfeeManager;
+}
+
+/**
+ * @internal
+ */
+export async function getPredictedMintFeeManagerAddress(args: ClientAndChain) {
+  // compute multisig address
+  const multisig = await getPredictedInfraContractAddress({
+    ...args,
+    contractId: "Multisig",
+    constructorParams: { _signers: [TW_SIGNER_1, TW_SIGNER_2, TW_SIGNER_3], _requiredApprovals: MULTISIG_REQUIRED_APPROVALS },
+    publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936", // TODO: remove before merging
+  });
+
+  // compute mintfee manager address
+  const mintfeeManager = await getPredictedInfraContractAddress({
+    ...args,
+    contractId: "MintFeeManagerCore",
+    constructorParams: { _owner: multisig, _modules: [], _moduleInstallData: [] },
+    publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936", // TODO: remove before merging
+  });
+  
+  return mintfeeManager;
+}
+
+/**
+ * @internal
+ */
+export async function getPredictedMultisigAddress(args: ClientAndChain) {
+  // compute multisig address
+  const multisig = await getPredictedInfraContractAddress({
+    ...args,
+    contractId: "Multisig",
+    constructorParams: { _signers: [TW_SIGNER_1, TW_SIGNER_2, TW_SIGNER_3], _requiredApprovals: MULTISIG_REQUIRED_APPROVALS },
+    publisher: "0x6453a486d52e0EB6E79Ec4491038E2522a926936", // TODO: remove before merging
+  });
+
+  return multisig;
+}
diff --git a/packages/thirdweb/src/exports/deploys.ts b/packages/thirdweb/src/exports/deploys.ts
@@ -54,3 +54,8 @@ export {
   type DeployPackContractOptions,
   deployPackContract,
 } from "../extensions/prebuilts/deploy-pack.js";
+export {
+  getDeployedMintFeeManagerContract,
+  getPredictedMintFeeManagerAddress,
+  getPredictedMultisigAddress
+} from "../contract/deployment/utils/mintfee-manager.js";
diff --git a/packages/thirdweb/src/extensions/prebuilts/deploy-published.ts b/packages/thirdweb/src/extensions/prebuilts/deploy-published.ts
