thirdweb 5.64.4-nightly-c2a90542d7f870c799c297c59cd2b468816f7939-20241031000332 → 5.64.5

package/src/extensions/erc721/__generated__/IDropSinglePhase/write/setClaimConditions.ts

@@ -0,0 +1,203 @@
+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 "setClaimConditions" function.
+ */
+export type SetClaimConditionsParams = WithOverrides<{
+  phase: AbiParameterToPrimitiveType<{
+    type: "tuple";
+    name: "phase";
+    components: [
+      { type: "uint256"; name: "startTimestamp" },
+      { type: "uint256"; name: "maxClaimableSupply" },
+      { type: "uint256"; name: "supplyClaimed" },
+      { type: "uint256"; name: "quantityLimitPerWallet" },
+      { type: "bytes32"; name: "merkleRoot" },
+      { type: "uint256"; name: "pricePerToken" },
+      { type: "address"; name: "currency" },
+      { type: "string"; name: "metadata" },
+    ];
+  }>;
+  resetClaimEligibility: AbiParameterToPrimitiveType<{
+    type: "bool";
+    name: "resetClaimEligibility";
+  }>;
+}>;
+
+export const FN_SELECTOR = "0x426cfaf3" as const;
+const FN_INPUTS = [
+  {
+    type: "tuple",
+    name: "phase",
+    components: [
+      {
+        type: "uint256",
+        name: "startTimestamp",
+      },
+      {
+        type: "uint256",
+        name: "maxClaimableSupply",
+      },
+      {
+        type: "uint256",
+        name: "supplyClaimed",
+      },
+      {
+        type: "uint256",
+        name: "quantityLimitPerWallet",
+      },
+      {
+        type: "bytes32",
+        name: "merkleRoot",
+      },
+      {
+        type: "uint256",
+        name: "pricePerToken",
+      },
+      {
+        type: "address",
+        name: "currency",
+      },
+      {
+        type: "string",
+        name: "metadata",
+      },
+    ],
+  },
+  {
+    type: "bool",
+    name: "resetClaimEligibility",
+  },
+] as const;
+const FN_OUTPUTS = [] as const;
+
+/**
+ * Checks if the `setClaimConditions` 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 `setClaimConditions` method is supported.
+ * @extension ERC721
+ * @example
+ * ```ts
+ * import { isSetClaimConditionsSupported } from "thirdweb/extensions/erc721";
+ *
+ * const supported = isSetClaimConditionsSupported(["0x..."]);
+ * ```
+ */
+export function isSetClaimConditionsSupported(availableSelectors: string[]) {
+  return detectMethod({
+    availableSelectors,
+    method: [FN_SELECTOR, FN_INPUTS, FN_OUTPUTS] as const,
+  });
+}
+
+/**
+ * Encodes the parameters for the "setClaimConditions" function.
+ * @param options - The options for the setClaimConditions function.
+ * @returns The encoded ABI parameters.
+ * @extension ERC721
+ * @example
+ * ```ts
+ * import { encodeSetClaimConditionsParams } from "thirdweb/extensions/erc721";
+ * const result = encodeSetClaimConditionsParams({
+ *  phase: ...,
+ *  resetClaimEligibility: ...,
+ * });
+ * ```
+ */
+export function encodeSetClaimConditionsParams(
+  options: SetClaimConditionsParams,
+) {
+  return encodeAbiParameters(FN_INPUTS, [
+    options.phase,
+    options.resetClaimEligibility,
+  ]);
+}
+
+/**
+ * Encodes the "setClaimConditions" function into a Hex string with its parameters.
+ * @param options - The options for the setClaimConditions function.
+ * @returns The encoded hexadecimal string.
+ * @extension ERC721
+ * @example
+ * ```ts
+ * import { encodeSetClaimConditions } from "thirdweb/extensions/erc721";
+ * const result = encodeSetClaimConditions({
+ *  phase: ...,
+ *  resetClaimEligibility: ...,
+ * });
+ * ```
+ */
+export function encodeSetClaimConditions(options: SetClaimConditionsParams) {
+  // 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 +
+    encodeSetClaimConditionsParams(options).slice(
+      2,
+    )) as `${typeof FN_SELECTOR}${string}`;
+}
+
+/**
+ * Prepares a transaction to call the "setClaimConditions" function on the contract.
+ * @param options - The options for the "setClaimConditions" function.
+ * @returns A prepared transaction object.
+ * @extension ERC721
+ * @example
+ * ```ts
+ * import { sendTransaction } from "thirdweb";
+ * import { setClaimConditions } from "thirdweb/extensions/erc721";
+ *
+ * const transaction = setClaimConditions({
+ *  contract,
+ *  phase: ...,
+ *  resetClaimEligibility: ...,
+ *  overrides: {
+ *    ...
+ *  }
+ * });
+ *
+ * // Send the transaction
+ * await sendTransaction({ transaction, account });
+ * ```
+ */
+export function setClaimConditions(
+  options: BaseTransactionOptions<
+    | SetClaimConditionsParams
+    | {
+        asyncParams: () => Promise<SetClaimConditionsParams>;
+      }
+  >,
+) {
+  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.phase,
+        resolvedOptions.resetClaimEligibility,
+      ] 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/erc721/customDrop721.test.ts

@@ -0,0 +1,115 @@
+import { fetchDeployMetadata } from "../../utils/any-evm/deploy-metadata.js";
+
+import { beforeAll, describe, expect, it } from "vitest";
+import { ANVIL_CHAIN } from "../../../test/src/chains.js";
+import { TEST_CLIENT } from "../../../test/src/test-clients.js";
+import { TEST_ACCOUNT_C } from "../../../test/src/test-wallets.js";
+import { type ThirdwebContract, getContract } from "../../contract/contract.js";
+import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
+import { deployContractfromDeployMetadata } from "../prebuilts/deploy-published.js";
+import { balanceOf } from "./__generated__/IERC721A/read/balanceOf.js";
+import { nextTokenIdToMint } from "./__generated__/IERC721Enumerable/read/nextTokenIdToMint.js";
+import { claimTo } from "./drops/write/claimTo.js";
+import { setClaimConditions } from "./drops/write/setClaimConditions.js";
+import { getNFT } from "./read/getNFT.js";
+import { lazyMint } from "./write/lazyMint.js";
+
+describe.runIf(process.env.TW_SECRET_KEY)(
+  "CustomDropERC721",
+  {
+    retry: 0,
+  },
+  () => {
+    let contract: ThirdwebContract;
+
+    beforeAll(async () => {
+      const customDropDeployMetadata = await fetchDeployMetadata({
+        client: TEST_CLIENT,
+        uri: "ipfs://QmY6CHFuhDpQzuv3y3NyQBPdAa7cYjZGJgFeFcw9BfSMQx",
+      });
+      const contractAddress = await deployContractfromDeployMetadata({
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+        account: TEST_ACCOUNT_C,
+        deployMetadata: customDropDeployMetadata,
+        initializeParams: {
+          defaultAdmin: TEST_ACCOUNT_C.address,
+          name: "TestCustomDropERC721",
+          symbol: "TT",
+        },
+      });
+
+      contract = getContract({
+        address: contractAddress,
+        chain: ANVIL_CHAIN,
+        client: TEST_CLIENT,
+      });
+      // this deploys a contract, it may take some time
+    }, 60_000);
+
+    it("should allow for lazy minting tokens", async () => {
+      const mintTx = lazyMint({
+        contract,
+        nfts: [
+          { name: "Test NFT" },
+          { name: "Test NFT 2" },
+          { name: "Test NFT 3" },
+          { name: "Test NFT 4" },
+          { name: "Test NFT 5" },
+          { name: "Test NFT 6" },
+        ],
+      });
+      await sendAndConfirmTransaction({
+        transaction: mintTx,
+        account: TEST_ACCOUNT_C,
+      });
+
+      await expect(nextTokenIdToMint({ contract })).resolves.toBe(6n);
+      await expect(
+        getNFT({ contract, tokenId: 0n }),
+      ).resolves.toMatchInlineSnapshot(`
+          {
+            "id": 0n,
+            "metadata": {
+              "name": "Test NFT",
+            },
+            "owner": null,
+            "tokenURI": "ipfs://QmTo68Dm1ntSp2BHLmE9gesS6ELuXosRz5mAgFCK6tfsRk/0",
+            "type": "ERC721",
+          }
+        `);
+    });
+
+    it("should allow to claim tokens", async () => {
+      await expect(
+        balanceOf({ contract, owner: TEST_ACCOUNT_C.address }),
+      ).resolves.toBe(0n);
+      await sendAndConfirmTransaction({
+        transaction: setClaimConditions({
+          contract,
+          phases: [
+            {
+              startTime: new Date(0),
+              maxClaimableSupply: 10n,
+            },
+          ],
+          singlePhaseDrop: true,
+        }),
+        account: TEST_ACCOUNT_C,
+      });
+      const claimTx = claimTo({
+        contract,
+        to: TEST_ACCOUNT_C.address,
+        quantity: 1n,
+        singlePhaseDrop: true,
+      });
+      await sendAndConfirmTransaction({
+        transaction: claimTx,
+        account: TEST_ACCOUNT_C,
+      });
+      await expect(
+        balanceOf({ contract, owner: TEST_ACCOUNT_C.address }),
+      ).resolves.toBe(1n);
+    });
+  },
+);

package/src/extensions/erc721/drops/write/claimTo.ts

@@ -6,6 +6,7 @@ import {
   claim,
   isClaimSupported,
 } from "../../__generated__/IDrop/write/claim.js";
+import { isClaimConditionSupported } from "../../__generated__/IDropSinglePhase/read/claimCondition.js";
 import { isGetActiveClaimConditionSupported } from "../read/getActiveClaimCondition.js";
 
 /**
@@ -16,6 +17,7 @@ export type ClaimToParams = {
   to: Address;
   quantity: bigint;
   from?: Address;
+  singlePhaseDrop?: boolean;
 };
 
 /**
@@ -61,6 +63,7 @@ export function claimTo(options: BaseTransactionOptions<ClaimToParams>) {
         to: options.to,
         quantity: options.quantity,
         from: options.from,
+        singlePhaseDrop: options.singlePhaseDrop,
       }),
   });
 }
@@ -80,9 +83,10 @@ export function claimTo(options: BaseTransactionOptions<ClaimToParams>) {
 export function isClaimToSupported(availableSelectors: string[]) {
   return (
     isClaimSupported(availableSelectors) &&
-    // required to check if the contract supports the getActiveClaimCondition method
-    isGetActiveClaimConditionSupported(availableSelectors) &&
     // requires contractMetadata for claimer proofs
-    isGetContractMetadataSupported(availableSelectors)
+    isGetContractMetadataSupported(availableSelectors) &&
+    // required to check if the contract supports the getActiveClaimCondition method
+    (isGetActiveClaimConditionSupported(availableSelectors) ||
+      isClaimConditionSupported(availableSelectors))
   );
 }

package/src/extensions/erc721/drops/write/setClaimConditions.ts

@@ -8,6 +8,7 @@ import {
 } from "../../../common/__generated__/IMulticall/write/multicall.js";
 import { isGetContractMetadataSupported } from "../../../common/read/getContractMetadata.js";
 import { isSetClaimConditionsSupported as isSetClaimConditionsSupportedGenerated } from "../../__generated__/IDrop/write/setClaimConditions.js";
+import { isSetClaimConditionsSupported as isSetClaimConditionsSupportedGeneratedSinglePhase } from "../../__generated__/IDropSinglePhase/write/setClaimConditions.js";
 
 /**
  * @extension ERC721
@@ -15,6 +16,7 @@ import { isSetClaimConditionsSupported as isSetClaimConditionsSupportedGenerated
 export type SetClaimConditionsParams = {
   phases: ClaimConditionsInput[];
   resetClaimEligibility?: boolean;
+  singlePhaseDrop?: boolean;
 };
 
 /**
@@ -55,6 +57,7 @@ export function setClaimConditions(
           phases: options.phases,
           resetClaimEligibility: options.resetClaimEligibility,
           tokenDecimals: 0,
+          singlePhase: options.singlePhaseDrop,
         }),
       };
     },
@@ -80,6 +83,7 @@ export function isSetClaimConditionsSupported(availableSelectors: string[]) {
     isGetContractMetadataSupported(availableSelectors) &&
     isSetContractURISupported(availableSelectors) &&
     // needs to actually be able to set the claim Conditions
-    isSetClaimConditionsSupportedGenerated(availableSelectors)
+    (isSetClaimConditionsSupportedGenerated(availableSelectors) ||
+      isSetClaimConditionsSupportedGeneratedSinglePhase(availableSelectors))
   );
 }

package/src/utils/extensions/drops/get-claim-params.ts

@@ -6,13 +6,14 @@ import {
 import type { ThirdwebContract } from "../../../contract/contract.js";
 import { getContractMetadata } from "../../../extensions/common/read/getContractMetadata.js";
 import type { Hex } from "../../encoding/hex.js";
-import type { OverrideProof } from "./types.js";
+import type { ClaimCondition, OverrideProof } from "./types.js";
 
 export type GetClaimParamsOptions = {
   contract: ThirdwebContract;
   to: string;
   quantity: bigint;
   from?: string;
+  singlePhaseDrop?: boolean;
 } & (
   | {
       type: "erc721";
@@ -47,9 +48,18 @@ export type GetClaimParamsOptions = {
  * @extension COMMON
  */
 export async function getClaimParams(options: GetClaimParamsOptions) {
-  const cc = await (async () => {
+  const cc: ClaimCondition = await (async () => {
     if (options.type === "erc1155") {
       // lazy-load the getActiveClaimCondition function
+      if (options.singlePhaseDrop) {
+        const { claimCondition } = await import(
+          "../../../extensions/erc1155/__generated__/IDropSinglePhase1155/read/claimCondition.js"
+        );
+        return await claimCondition({
+          contract: options.contract,
+          tokenId: options.tokenId,
+        });
+      }
       const { getActiveClaimCondition } = await import(
         "../../../extensions/erc1155/drops/read/getActiveClaimCondition.js"
       );
@@ -60,6 +70,14 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
     }
     if (options.type === "erc721") {
       // lazy-load the getActiveClaimCondition function
+      if (options.singlePhaseDrop) {
+        const { claimCondition } = await import(
+          "../../../extensions/erc721/__generated__/IDropSinglePhase/read/claimCondition.js"
+        );
+        return await claimCondition({
+          contract: options.contract,
+        });
+      }
       const { getActiveClaimCondition } = await import(
         "../../../extensions/erc721/drops/read/getActiveClaimCondition.js"
       );
@@ -71,6 +89,15 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
     // otherwise erc20 case!
 
     // lazy-load the getActiveClaimCondition function
+    if (options.singlePhaseDrop) {
+      // same ABI as erc721
+      const { claimCondition } = await import(
+        "../../../extensions/erc721/__generated__/IDropSinglePhase/read/claimCondition.js"
+      );
+      return await claimCondition({
+        contract: options.contract,
+      });
+    }
     const { getActiveClaimCondition } = await import(
       "../../../extensions/erc20/drops/read/getActiveClaimCondition.js"
     );

package/src/utils/extensions/drops/get-multicall-set-claim-claim-conditon-transactions.ts

@@ -15,6 +15,7 @@ export async function getMulticallSetClaimConditionTransactions(options: {
   tokenDecimals: number;
   tokenId?: bigint;
   resetClaimEligibility?: boolean;
+  singlePhase?: boolean;
 }): Promise<Hex[]> {
   const merkleInfos: Record<string, string> = {};
   const phases = await Promise.all(
@@ -94,23 +95,52 @@ export async function getMulticallSetClaimConditionTransactions(options: {
   let encodedSetClaimConditions: Hex;
   if (options.tokenId !== undefined) {
     // 1155
-    const { encodeSetClaimConditions } = await import(
-      "../../../extensions/erc1155/__generated__/IDrop1155/write/setClaimConditions.js"
-    );
-    encodedSetClaimConditions = encodeSetClaimConditions({
-      tokenId: options.tokenId,
-      phases: sortedPhases,
-      resetClaimEligibility: options.resetClaimEligibility || false,
-    });
+    if (options.singlePhase) {
+      const { encodeSetClaimConditions } = await import(
+        "../../../extensions/erc1155/__generated__/IDropSinglePhase1155/write/setClaimConditions.js"
+      );
+      const phase = sortedPhases[0];
+      if (!phase) {
+        throw new Error("No phase provided");
+      }
+      encodedSetClaimConditions = encodeSetClaimConditions({
+        tokenId: options.tokenId,
+        phase,
+        resetClaimEligibility: options.resetClaimEligibility || false,
+      });
+    } else {
+      const { encodeSetClaimConditions } = await import(
+        "../../../extensions/erc1155/__generated__/IDrop1155/write/setClaimConditions.js"
+      );
+      encodedSetClaimConditions = encodeSetClaimConditions({
+        tokenId: options.tokenId,
+        phases: sortedPhases,
+        resetClaimEligibility: options.resetClaimEligibility || false,
+      });
+    }
   } else {
-    // 721
-    const { encodeSetClaimConditions } = await import(
-      "../../../extensions/erc721/__generated__/IDrop/write/setClaimConditions.js"
-    );
-    encodedSetClaimConditions = encodeSetClaimConditions({
-      phases: sortedPhases,
-      resetClaimEligibility: options.resetClaimEligibility || false,
-    });
+    // erc721 or erc20
+    if (options.singlePhase) {
+      const { encodeSetClaimConditions } = await import(
+        "../../../extensions/erc721/__generated__/IDropSinglePhase/write/setClaimConditions.js"
+      );
+      const phase = sortedPhases[0];
+      if (!phase) {
+        throw new Error("No phase provided");
+      }
+      encodedSetClaimConditions = encodeSetClaimConditions({
+        phase,
+        resetClaimEligibility: options.resetClaimEligibility || false,
+      });
+    } else {
+      const { encodeSetClaimConditions } = await import(
+        "../../../extensions/erc721/__generated__/IDrop/write/setClaimConditions.js"
+      );
+      encodedSetClaimConditions = encodeSetClaimConditions({
+        phases: sortedPhases,
+        resetClaimEligibility: options.resetClaimEligibility || false,
+      });
+    }
   }
   encodedTransactions.push(encodedSetClaimConditions);
   return encodedTransactions;

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.64.4-nightly-c2a90542d7f870c799c297c59cd2b468816f7939-20241031000332";
+export const version = "5.64.5";

package/src/wallets/smart/index.ts

@@ -225,6 +225,8 @@ async function createSmartAccount(
           };
         };
         paymasterOverride = options.overrides?.paymaster || paymasterCallback;
+      } else {
+        paymasterOverride = options.overrides?.paymaster;
       }
       const executeTx = prepareExecute({
         accountContract,

package/src/wallets/smart/smart-wallet-integration.test.ts

@@ -18,7 +18,9 @@ import { setContractURI } from "../../extensions/marketplace/__generated__/IMark
 import { estimateGasCost } from "../../transaction/actions/estimate-gas-cost.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
 import { sendBatchTransaction } from "../../transaction/actions/send-batch-transaction.js";
+import { sendTransaction } from "../../transaction/actions/send-transaction.js";
 import { waitForReceipt } from "../../transaction/actions/wait-for-tx-receipt.js";
+import { prepareTransaction } from "../../transaction/prepare-transaction.js";
 import { isContractDeployed } from "../../utils/bytecode/is-contract-deployed.js";
 import { sleep } from "../../utils/sleep.js";
 import type { Account, Wallet } from "../interfaces/wallet.js";
@@ -364,5 +366,36 @@ describe.runIf(process.env.TW_SECRET_KEY).sequential(
       });
       expect(balance).toEqual(2n);
     });
+
+    it("can use a different paymaster", async () => {
+      const wallet = smartWallet({
+        chain,
+        factoryAddress: factoryAddress,
+        gasless: true,
+        overrides: {
+          paymaster: async () => {
+            return {
+              paymaster: "0x",
+              paymasterData: "0x",
+            };
+          },
+        },
+      });
+      const newSmartAccount = await wallet.connect({
+        client: TEST_CLIENT,
+        personalAccount,
+      });
+      const transaction = prepareTransaction({
+        client: TEST_CLIENT,
+        chain,
+        value: 0n,
+      });
+      await expect(
+        sendTransaction({
+          transaction,
+          account: newSmartAccount,
+        }),
+      ).rejects.toThrowError(/AA21 didn't pay prefund/);
+    });
   },
 );