thirdweb 5.93.4 → 5.93.5-nightly-e0e31826a8ed11041372f66b3b75fda293a2a05d-20250326035818

package/src/extensions/dynamic-contracts/__generated__/IExtensionManager/write/removeExtension.ts

@@ -0,0 +1,140 @@
+import type { AbiParameterToPrimitiveType } from "abitype";
+import type {
+  BaseTransactionOptions,
+  WithOverrides,
+} from "../../../../../transaction/types.js";
+import { prepareContractCall } from "../../../../../transaction/prepare-contract-call.js";
+import { encodeAbiParameters } from "../../../../../utils/abi/encodeAbiParameters.js";
+import { once } from "../../../../../utils/promise/once.js";
+import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
+
+/**
+ * Represents the parameters for the "removeExtension" function.
+ */
+export type RemoveExtensionParams = WithOverrides<{
+  extensionName: AbiParameterToPrimitiveType<{
+    type: "string";
+    name: "extensionName";
+  }>;
+}>;
+
+export const FN_SELECTOR = "0xee7d2adf" as const;
+const FN_INPUTS = [
+  {
+    type: "string",
+    name: "extensionName",
+  },
+] as const;
+const FN_OUTPUTS = [] as const;
+
+/**
+ * Checks if the `removeExtension` method is supported by the given contract.
+ * @param availableSelectors An array of 4byte function selectors of the contract. You can get this in various ways, such as using "whatsabi" or if you have the ABI of the contract available you can use it to generate the selectors.
+ * @returns A boolean indicating if the `removeExtension` method is supported.
+ * @extension DYNAMIC-CONTRACTS
+ * @example
+ * ```ts
+ * import { isRemoveExtensionSupported } from "thirdweb/extensions/dynamic-contracts";
+ *
+ * const supported = isRemoveExtensionSupported(["0x..."]);
+ * ```
+ */
+export function isRemoveExtensionSupported(availableSelectors: string[]) {
+  return detectMethod({
+    availableSelectors,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+  });
+}
+
+/**
+ * Encodes the parameters for the "removeExtension" function.
+ * @param options - The options for the removeExtension function.
+ * @returns The encoded ABI parameters.
+ * @extension DYNAMIC-CONTRACTS
+ * @example
+ * ```ts
+ * import { encodeRemoveExtensionParams } from "thirdweb/extensions/dynamic-contracts";
+ * const result = encodeRemoveExtensionParams({
+ *  extensionName: ...,
+ * });
+ * ```
+ */
+export function encodeRemoveExtensionParams(options: RemoveExtensionParams) {
+  return encodeAbiParameters(FN_INPUTS, [options.extensionName]);
+}
+
+/**
+ * Encodes the "removeExtension" function into a Hex string with its parameters.
+ * @param options - The options for the removeExtension function.
+ * @returns The encoded hexadecimal string.
+ * @extension DYNAMIC-CONTRACTS
+ * @example
+ * ```ts
+ * import { encodeRemoveExtension } from "thirdweb/extensions/dynamic-contracts";
+ * const result = encodeRemoveExtension({
+ *  extensionName: ...,
+ * });
+ * ```
+ */
+export function encodeRemoveExtension(options: RemoveExtensionParams) {
+  // we do a "manual" concat here to avoid the overhead of the "concatHex" function
+  // we can do this because we know the specific formats of the values
+  return (FN_SELECTOR +
+    encodeRemoveExtensionParams(options).slice(
+      2,
+    )) as `${typeof FN_SELECTOR}${string}`;
+}
+
+/**
+ * Prepares a transaction to call the "removeExtension" function on the contract.
+ * @param options - The options for the "removeExtension" function.
+ * @returns A prepared transaction object.
+ * @extension DYNAMIC-CONTRACTS
+ * @example
+ * ```ts
+ * import { sendTransaction } from "thirdweb";
+ * import { removeExtension } from "thirdweb/extensions/dynamic-contracts";
+ *
+ * const transaction = removeExtension({
+ *  contract,
+ *  extensionName: ...,
+ *  overrides: {
+ *    ...
+ *  }
+ * });
+ *
+ * // Send the transaction
+ * await sendTransaction({ transaction, account });
+ * ```
+ */
+export function removeExtension(
+  options: BaseTransactionOptions<
+    | RemoveExtensionParams
+    | {
+        asyncParams: () => Promise<RemoveExtensionParams>;
+      }
+  >,
+) {
+  const asyncOptions = once(async () => {
+    return "asyncParams" in options ? await options.asyncParams() : options;
+  });
+
+  return prepareContractCall({
+    contract: options.contract,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+    params: async () => {
+      const resolvedOptions = await asyncOptions();
+      return [resolvedOptions.extensionName] as const;
+    },
+    value: async () => (await asyncOptions()).overrides?.value,
+    accessList: async () => (await asyncOptions()).overrides?.accessList,
+    gas: async () => (await asyncOptions()).overrides?.gas,
+    gasPrice: async () => (await asyncOptions()).overrides?.gasPrice,
+    maxFeePerGas: async () => (await asyncOptions()).overrides?.maxFeePerGas,
+    maxPriorityFeePerGas: async () =>
+      (await asyncOptions()).overrides?.maxPriorityFeePerGas,
+    nonce: async () => (await asyncOptions()).overrides?.nonce,
+    extraGas: async () => (await asyncOptions()).overrides?.extraGas,
+    erc20Value: async () => (await asyncOptions()).overrides?.erc20Value,
+  });
+}

package/src/extensions/dynamic-contracts/write/installPublishedExtension.test.ts

@@ -0,0 +1,61 @@
+import { describe, expect, it } from "vitest";
+
+import { readContract } from "src/transaction/read-contract.js";
+import { resolveMethod } from "src/transaction/resolve-method.js";
+import { ANVIL_CHAIN } from "../../../../test/src/chains.js";
+import { TEST_CLIENT } from "../../../../test/src/test-clients.js";
+import { TEST_ACCOUNT_A } from "../../../../test/src/test-wallets.js";
+import { getContract } from "../../../contract/contract.js";
+import { deployCloneFactory } from "../../../contract/deployment/utils/bootstrap.js";
+import { deployPublishedContract } from "../../../extensions/prebuilts/deploy-published.js";
+import { sendTransaction } from "../../../transaction/actions/send-transaction.js";
+import { installPublishedExtension } from "./installPublishedExtension.js";
+
+describe.runIf(process.env.TW_SECRET_KEY)("install extension", () => {
+  it.sequential("should install extension to a dynamic contract", async () => {
+    await deployCloneFactory({
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
+      account: TEST_ACCOUNT_A,
+    });
+
+    const deployed = await deployPublishedContract({
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
+      account: TEST_ACCOUNT_A,
+      contractId: "EvolvingNFT",
+      contractParams: {
+        name: "Evolving nft",
+        symbol: "ENFT",
+        defaultAdmin: TEST_ACCOUNT_A.address,
+        royaltyBps: 0n,
+        royaltyRecipient: TEST_ACCOUNT_A.address,
+        saleRecipient: TEST_ACCOUNT_A.address,
+        trustedForwarders: [],
+        contractURI: "",
+      },
+    });
+
+    const contract = getContract({
+      chain: ANVIL_CHAIN,
+      client: TEST_CLIENT,
+      address: deployed,
+    });
+
+    const transaction = installPublishedExtension({
+      account: TEST_ACCOUNT_A,
+      contract,
+      extensionName: "DirectListingsLogic",
+    });
+
+    await sendTransaction({ transaction, account: TEST_ACCOUNT_A });
+
+    const extensions = await readContract({
+      contract,
+      method: resolveMethod("getAllExtensions"),
+      params: [],
+    });
+
+    expect(extensions.length).toEqual(4);
+  });
+});

package/src/extensions/dynamic-contracts/write/installPublishedExtension.ts

@@ -0,0 +1,85 @@
+import { resolveContractAbi } from "../../../contract/actions/resolve-abi.js";
+import type { ThirdwebContract } from "../../../contract/contract.js";
+import { getOrDeployInfraForPublishedContract } from "../../../contract/deployment/utils/bootstrap.js";
+import {
+  generateExtensionFunctionsFromAbi,
+  getAllDefaultConstructorParamsForImplementation,
+} from "../../../extensions/prebuilts/get-required-transactions.js";
+import type { Account } from "../../../wallets/interfaces/wallet.js";
+import { addExtension } from "../__generated__/IExtensionManager/write/addExtension.js";
+
+export type InstallPublishedExtensionOptions = {
+  account: Account;
+  contract: ThirdwebContract;
+  extensionName: string;
+  publisher?: string;
+  version?: string;
+  constructorParams?: Record<string, unknown>;
+};
+
+/**
+ * Install a published extension on a dynamic contract
+ * @param options - The options for installing a published extension
+ * @returns A prepared transaction to send
+ * @example
+ * ```ts
+ * import { installPublishedExtension } from "thirdweb/dynamic-contracts";
+ * const transaction = installPublishedExtension({
+ *  client,
+ *  chain,
+ *  account,
+ *  contract,
+ *  extensionName: "MyExtension",
+ *  publisherAddress: "0x...",
+ * });
+ * await sendTransaction({ transaction, account });
+ * ```
+ */
+export function installPublishedExtension(
+  options: InstallPublishedExtensionOptions,
+) {
+  const {
+    account,
+    contract,
+    extensionName,
+    constructorParams,
+    publisher,
+    version,
+  } = options;
+
+  return addExtension({
+    contract,
+    asyncParams: async () => {
+      const deployedExtension = await getOrDeployInfraForPublishedContract({
+        chain: contract.chain,
+        client: contract.client,
+        account,
+        contractId: extensionName,
+        constructorParams:
+          constructorParams ||
+          (await getAllDefaultConstructorParamsForImplementation({
+            chain: contract.chain,
+            client: contract.client,
+            contractId: extensionName,
+          })),
+        publisher,
+        version,
+      });
+
+      const abi = await resolveContractAbi(
+        deployedExtension.implementationContract,
+      );
+      const functions = generateExtensionFunctionsFromAbi(abi);
+      return {
+        extension: {
+          metadata: {
+            name: extensionName,
+            metadataURI: "",
+            implementation: deployedExtension.implementationContract.address,
+          },
+          functions,
+        },
+      };
+    },
+  });
+}

package/src/extensions/dynamic-contracts/write/uninstallExtension.test.ts

@@ -0,0 +1,64 @@
+import { describe, expect, it } from "vitest";
+
+import { readContract } from "src/transaction/read-contract.js";
+import { resolveMethod } from "src/transaction/resolve-method.js";
+import { ANVIL_CHAIN } from "../../../../test/src/chains.js";
+import { TEST_CLIENT } from "../../../../test/src/test-clients.js";
+import { TEST_ACCOUNT_A } from "../../../../test/src/test-wallets.js";
+import { getContract } from "../../../contract/contract.js";
+import { deployCloneFactory } from "../../../contract/deployment/utils/bootstrap.js";
+import { sendTransaction } from "../../../transaction/actions/send-transaction.js";
+import { deployPublishedContract } from "../../prebuilts/deploy-published.js";
+import { uninstallExtension } from "./uninstallExtension.js";
+
+describe.runIf(process.env.TW_SECRET_KEY)("uninstall extension", () => {
+  it.sequential(
+    "should uninstall extension from a dynamic contract",
+    async () => {
+      await deployCloneFactory({
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+        account: TEST_ACCOUNT_A,
+      });
+
+      const deployed = await deployPublishedContract({
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+        account: TEST_ACCOUNT_A,
+        contractId: "EvolvingNFT",
+        contractParams: {
+          name: "Evolving nft",
+          symbol: "ENFT",
+          defaultAdmin: TEST_ACCOUNT_A.address,
+          royaltyBps: 0n,
+          royaltyRecipient: TEST_ACCOUNT_A.address,
+          saleRecipient: TEST_ACCOUNT_A.address,
+          trustedForwarders: [],
+          contractURI: "",
+        },
+      });
+
+      const contract = getContract({
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+        address: deployed,
+      });
+
+      const transaction = uninstallExtension({
+        account: TEST_ACCOUNT_A,
+        contract,
+        extensionName: "EvolvingNFTLogic",
+      });
+
+      await sendTransaction({ transaction, account: TEST_ACCOUNT_A });
+
+      const extensions = await readContract({
+        contract,
+        method: resolveMethod("getAllExtensions"),
+        params: [],
+      });
+
+      expect(extensions.length).toEqual(2);
+    },
+  );
+});

package/src/extensions/dynamic-contracts/write/uninstallExtension.ts

@@ -0,0 +1,35 @@
+import type { ThirdwebContract } from "../../../contract/contract.js";
+import type { Account } from "../../../wallets/interfaces/wallet.js";
+import { removeExtension } from "../__generated__/IExtensionManager/write/removeExtension.js";
+
+export type UninstallExtensionOptions = {
+  account: Account;
+  contract: ThirdwebContract;
+  extensionName: string;
+};
+
+/**
+ * Uninstall an extension on a dynamic contract
+ * @param options - The options for uninstalling an extension
+ * @returns A prepared transaction to send
+ * @example
+ * ```ts
+ * import { uninstallExtension } from "thirdweb/dynamic-contracts";
+ * const transaction = uninstallExtension({
+ *  client,
+ *  chain,
+ *  account,
+ *  contract,
+ *  extensionName: "MyExtension",
+ * });
+ * await sendTransaction({ transaction, account });
+ * ```
+ */
+export function uninstallExtension(options: UninstallExtensionOptions) {
+  const { contract, extensionName } = options;
+
+  return removeExtension({
+    contract,
+    extensionName,
+  });
+}

package/src/extensions/prebuilts/deploy-marketplace.ts

@@ -1,10 +1,4 @@
-import type {
-  Abi,
-  AbiFunction,
-  AbiParametersToPrimitiveTypes,
-  Address,
-} from "abitype";
-import { toFunctionSelector, toFunctionSignature } from "viem";
+import type { AbiParametersToPrimitiveTypes, Address } from "abitype";
 import type { ThirdwebClient } from "../../client/client.js";
 import { resolveContractAbi } from "../../contract/actions/resolve-abi.js";
 import type { ThirdwebContract } from "../../contract/contract.js";
@@ -19,6 +13,19 @@ import { getRoyaltyEngineV1ByChainId } from "../../utils/royalty-engine.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { ClientAndChainAndAccount } from "../../utils/types.js";
 import { initialize as initMarketplace } from "./__generated__/Marketplace/write/initialize.js";
+import { generateExtensionFunctionsFromAbi } from "./get-required-transactions.js";
+
+type Extension = {
+  metadata: {
+    name: string;
+    metadataURI: string;
+    implementation: `0x${string}`;
+  };
+  functions: {
+    functionSelector: string;
+    functionSignature: string;
+  }[];
+};
 
 export type MarketplaceContractParams = {
   name: string;
@@ -74,41 +81,72 @@ export async function deployMarketplaceContract(
     account,
     contractId: "WETH9",
   });
-  const direct = await getOrDeployInfraForPublishedContract({
-    chain,
-    client,
-    account,
-    contractId: "DirectListingsLogic",
-    constructorParams: { _nativeTokenWrapper: WETH.address },
-  });
 
-  const english = await getOrDeployInfraForPublishedContract({
-    chain,
-    client,
-    account,
-    contractId: "EnglishAuctionsLogic",
-    constructorParams: { _nativeTokenWrapper: WETH.address },
-  });
+  let extensions: Extension[] = [];
 
-  const offers = await getOrDeployInfraForPublishedContract({
-    chain,
-    client,
-    account,
-    contractId: "OffersLogic",
-  });
+  if (options.version !== "6.0.0") {
+    const direct = await getOrDeployInfraForPublishedContract({
+      chain,
+      client,
+      account,
+      contractId: "DirectListingsLogic",
+      constructorParams: { _nativeTokenWrapper: WETH.address },
+    });
 
-  const [directFunctions, englishFunctions, offersFunctions] =
-    await Promise.all([
-      resolveContractAbi(direct.implementationContract).then(
-        generateExtensionFunctionsFromAbi,
-      ),
-      resolveContractAbi(english.implementationContract).then(
-        generateExtensionFunctionsFromAbi,
-      ),
-      resolveContractAbi(offers.implementationContract).then(
-        generateExtensionFunctionsFromAbi,
-      ),
-    ]);
+    const english = await getOrDeployInfraForPublishedContract({
+      chain,
+      client,
+      account,
+      contractId: "EnglishAuctionsLogic",
+      constructorParams: { _nativeTokenWrapper: WETH.address },
+    });
+
+    const offers = await getOrDeployInfraForPublishedContract({
+      chain,
+      client,
+      account,
+      contractId: "OffersLogic",
+    });
+
+    const [directFunctions, englishFunctions, offersFunctions] =
+      await Promise.all([
+        resolveContractAbi(direct.implementationContract).then(
+          generateExtensionFunctionsFromAbi,
+        ),
+        resolveContractAbi(english.implementationContract).then(
+          generateExtensionFunctionsFromAbi,
+        ),
+        resolveContractAbi(offers.implementationContract).then(
+          generateExtensionFunctionsFromAbi,
+        ),
+      ]);
+    extensions = [
+      {
+        metadata: {
+          name: "Direct Listings",
+          metadataURI: "",
+          implementation: direct.implementationContract.address,
+        },
+        functions: directFunctions,
+      },
+      {
+        metadata: {
+          name: "English Auctions",
+          metadataURI: "",
+          implementation: english.implementationContract.address,
+        },
+        functions: englishFunctions,
+      },
+      {
+        metadata: {
+          name: "Offers",
+          metadataURI: "",
+          implementation: offers.implementationContract.address,
+        },
+        functions: offersFunctions,
+      },
+    ];
+  }
 
   const { cloneFactoryContract, implementationContract } =
     await getOrDeployInfraForPublishedContract({
@@ -118,32 +156,7 @@ export async function deployMarketplaceContract(
       contractId: "MarketplaceV3",
       constructorParams: {
         _marketplaceV3Params: {
-          extensions: [
-            {
-              metadata: {
-                name: "Direct Listings",
-                metadataURI: "",
-                implementation: direct.implementationContract.address,
-              },
-              functions: directFunctions,
-            },
-            {
-              metadata: {
-                name: "English Auctions",
-                metadataURI: "",
-                implementation: english.implementationContract.address,
-              },
-              functions: englishFunctions,
-            },
-            {
-              metadata: {
-                name: "Offers",
-                metadataURI: "",
-                implementation: offers.implementationContract.address,
-              },
-              functions: offersFunctions,
-            },
-          ],
+          extensions,
           royaltyEngineAddress: getRoyaltyEngineV1ByChainId(chain.id),
           nativeTokenWrapper: WETH.address,
         } as MarketplaceConstructorParams[number],
@@ -199,22 +212,6 @@ async function getInitializeTransaction(options: {
   });
 }
 
-// helperFns
-
-function generateExtensionFunctionsFromAbi(abi: Abi): Array<{
-  functionSelector: string;
-  functionSignature: string;
-}> {
-  const functions = abi.filter(
-    (item) => item.type === "function" && !item.name.startsWith("_"),
-  ) as AbiFunction[];
-
-  return functions.map((fn) => ({
-    functionSelector: toFunctionSelector(fn),
-    functionSignature: toFunctionSignature(fn),
-  }));
-}
-
 // let's just ... put this down here
 type MarketplaceConstructorParams = AbiParametersToPrimitiveTypes<
   [

package/src/extensions/prebuilts/deploy-published.ts

@@ -204,6 +204,29 @@ export async function deployContractfromDeployMetadata(
         import("../../contract/deployment/deploy-via-autofactory.js"),
         import("../../contract/deployment/utils/bootstrap.js"),
       ]);
+
+      if (
+        deployMetadata.routerType === "dynamic" &&
+        deployMetadata.defaultExtensions
+      ) {
+        for (const e of deployMetadata.defaultExtensions) {
+          await getOrDeployInfraForPublishedContract({
+            chain,
+            client,
+            account,
+            contractId: e.extensionName,
+            version: e.extensionVersion || "latest",
+            publisher: e.publisherAddress,
+            constructorParams:
+              await getAllDefaultConstructorParamsForImplementation({
+                chain,
+                client,
+                contractId: e.extensionName,
+              }),
+          });
+        }
+      }
+
       const { cloneFactoryContract, implementationContract } =
         await getOrDeployInfraForPublishedContract({
           chain,
@@ -216,6 +239,7 @@ export async function deployContractfromDeployMetadata(
               chain,
               client,
               contractId: deployMetadata.name,
+              defaultExtensions: deployMetadata.defaultExtensions,
             })),
           publisher: deployMetadata.publisher,
           version: deployMetadata.version,

package/src/extensions/prebuilts/get-required-transactions.test.ts

@@ -64,6 +64,20 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       expect(results.length).toBe(7);
     });
 
+    it("should count transactions for a dynamic contract", async () => {
+      const deployMetadata = await fetchPublishedContractMetadata({
+        client: TEST_CLIENT,
+        contractId: "EvolvingNFT",
+      });
+      const results = await getRequiredTransactions({
+        client: TEST_CLIENT,
+        chain: CLEAN_ANVIL_CHAIN,
+        deployMetadata,
+      });
+
+      expect(results.length).toBe(8);
+    });
+
     it("should return default constructor params for zksync chains", async () => {
       const params = await getAllDefaultConstructorParamsForImplementation({
         chain: defineChain(300),