thirdweb 5.50.1 → 5.51.0

package/src/extensions/erc4626/__generated__/IERC4626/read/maxRedeem.ts

@@ -10,26 +10,20 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "maxRedeem" function.
  */
 export type MaxRedeemParams = {
-  owner: AbiParameterToPrimitiveType<{
-    name: "owner";
-    type: "address";
-    internalType: "address";
-  }>;
+  owner: AbiParameterToPrimitiveType<{ type: "address"; name: "owner" }>;
 };
 
 export const FN_SELECTOR = "0xd905777e" as const;
 const FN_INPUTS = [
   {
-    name: "owner",
     type: "address",
-    internalType: "address",
+    name: "owner",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "maxShares",
     type: "uint256",
-    internalType: "uint256",
+    name: "maxShares",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/read/maxWithdraw.ts

@@ -10,26 +10,20 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "maxWithdraw" function.
  */
 export type MaxWithdrawParams = {
-  owner: AbiParameterToPrimitiveType<{
-    name: "owner";
-    type: "address";
-    internalType: "address";
-  }>;
+  owner: AbiParameterToPrimitiveType<{ type: "address"; name: "owner" }>;
 };
 
 export const FN_SELECTOR = "0xce96cb77" as const;
 const FN_INPUTS = [
   {
-    name: "owner",
     type: "address",
-    internalType: "address",
+    name: "owner",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "maxAssets",
     type: "uint256",
-    internalType: "uint256",
+    name: "maxAssets",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/read/previewDeposit.ts

@@ -10,26 +10,20 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "previewDeposit" function.
  */
 export type PreviewDepositParams = {
-  assets: AbiParameterToPrimitiveType<{
-    name: "assets";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
+  assets: AbiParameterToPrimitiveType<{ type: "uint256"; name: "assets" }>;
 };
 
 export const FN_SELECTOR = "0xef8b30f7" as const;
 const FN_INPUTS = [
   {
-    name: "assets",
     type: "uint256",
-    internalType: "uint256",
+    name: "assets",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "shares",
     type: "uint256",
-    internalType: "uint256",
+    name: "shares",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/read/previewMint.ts

@@ -10,26 +10,19 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "previewMint" function.
  */
 export type PreviewMintParams = {
-  shares: AbiParameterToPrimitiveType<{
-    name: "shares";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
+  shares: AbiParameterToPrimitiveType<{ type: "uint256"; name: "shares" }>;
 };
 
 export const FN_SELECTOR = "0xb3d7f6b9" as const;
 const FN_INPUTS = [
   {
-    name: "shares",
     type: "uint256",
-    internalType: "uint256",
+    name: "shares",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "",
     type: "uint256",
-    internalType: "uint256",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/read/previewRedeem.ts

@@ -10,26 +10,20 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "previewRedeem" function.
  */
 export type PreviewRedeemParams = {
-  shares: AbiParameterToPrimitiveType<{
-    name: "shares";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
+  shares: AbiParameterToPrimitiveType<{ type: "uint256"; name: "shares" }>;
 };
 
 export const FN_SELECTOR = "0x4cdad506" as const;
 const FN_INPUTS = [
   {
-    name: "shares",
     type: "uint256",
-    internalType: "uint256",
+    name: "shares",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "assets",
     type: "uint256",
-    internalType: "uint256",
+    name: "assets",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/read/previewWithdraw.ts

@@ -10,26 +10,20 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "previewWithdraw" function.
  */
 export type PreviewWithdrawParams = {
-  assets: AbiParameterToPrimitiveType<{
-    name: "assets";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
+  assets: AbiParameterToPrimitiveType<{ type: "uint256"; name: "assets" }>;
 };
 
 export const FN_SELECTOR = "0x0a28a477" as const;
 const FN_INPUTS = [
   {
-    name: "assets",
     type: "uint256",
-    internalType: "uint256",
+    name: "assets",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "shares",
     type: "uint256",
-    internalType: "uint256",
+    name: "shares",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/read/totalAssets.ts

@@ -9,9 +9,8 @@ export const FN_SELECTOR = "0x01e1d114" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    name: "totalManagedAssets",
     type: "uint256",
-    internalType: "uint256",
+    name: "totalManagedAssets",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/write/deposit.ts

@@ -12,36 +12,25 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "deposit" function.
  */
 export type DepositParams = WithOverrides<{
-  assets: AbiParameterToPrimitiveType<{
-    name: "assets";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
-  receiver: AbiParameterToPrimitiveType<{
-    name: "receiver";
-    type: "address";
-    internalType: "address";
-  }>;
+  assets: AbiParameterToPrimitiveType<{ type: "uint256"; name: "assets" }>;
+  receiver: AbiParameterToPrimitiveType<{ type: "address"; name: "receiver" }>;
 }>;
 
 export const FN_SELECTOR = "0x6e553f65" as const;
 const FN_INPUTS = [
   {
-    name: "assets",
     type: "uint256",
-    internalType: "uint256",
+    name: "assets",
   },
   {
-    name: "receiver",
     type: "address",
-    internalType: "address",
+    name: "receiver",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "shares",
     type: "uint256",
-    internalType: "uint256",
+    name: "shares",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/write/mint.ts

@@ -12,36 +12,25 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "mint" function.
  */
 export type MintParams = WithOverrides<{
-  shares: AbiParameterToPrimitiveType<{
-    name: "shares";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
-  receiver: AbiParameterToPrimitiveType<{
-    name: "receiver";
-    type: "address";
-    internalType: "address";
-  }>;
+  shares: AbiParameterToPrimitiveType<{ type: "uint256"; name: "shares" }>;
+  receiver: AbiParameterToPrimitiveType<{ type: "address"; name: "receiver" }>;
 }>;
 
 export const FN_SELECTOR = "0x94bf804d" as const;
 const FN_INPUTS = [
   {
-    name: "shares",
     type: "uint256",
-    internalType: "uint256",
+    name: "shares",
   },
   {
-    name: "receiver",
     type: "address",
-    internalType: "address",
+    name: "receiver",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "assets",
     type: "uint256",
-    internalType: "uint256",
+    name: "assets",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/write/redeem.ts

@@ -12,46 +12,30 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "redeem" function.
  */
 export type RedeemParams = WithOverrides<{
-  shares: AbiParameterToPrimitiveType<{
-    name: "shares";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
-  receiver: AbiParameterToPrimitiveType<{
-    name: "receiver";
-    type: "address";
-    internalType: "address";
-  }>;
-  owner: AbiParameterToPrimitiveType<{
-    name: "owner";
-    type: "address";
-    internalType: "address";
-  }>;
+  shares: AbiParameterToPrimitiveType<{ type: "uint256"; name: "shares" }>;
+  receiver: AbiParameterToPrimitiveType<{ type: "address"; name: "receiver" }>;
+  owner: AbiParameterToPrimitiveType<{ type: "address"; name: "owner" }>;
 }>;
 
 export const FN_SELECTOR = "0xba087652" as const;
 const FN_INPUTS = [
   {
-    name: "shares",
     type: "uint256",
-    internalType: "uint256",
+    name: "shares",
   },
   {
-    name: "receiver",
     type: "address",
-    internalType: "address",
+    name: "receiver",
   },
   {
-    name: "owner",
     type: "address",
-    internalType: "address",
+    name: "owner",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "assets",
     type: "uint256",
-    internalType: "uint256",
+    name: "assets",
   },
 ] as const;
 

package/src/extensions/erc4626/__generated__/IERC4626/write/withdraw.ts

@@ -12,46 +12,30 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "withdraw" function.
  */
 export type WithdrawParams = WithOverrides<{
-  assets: AbiParameterToPrimitiveType<{
-    name: "assets";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
-  receiver: AbiParameterToPrimitiveType<{
-    name: "receiver";
-    type: "address";
-    internalType: "address";
-  }>;
-  owner: AbiParameterToPrimitiveType<{
-    name: "owner";
-    type: "address";
-    internalType: "address";
-  }>;
+  assets: AbiParameterToPrimitiveType<{ type: "uint256"; name: "assets" }>;
+  receiver: AbiParameterToPrimitiveType<{ type: "address"; name: "receiver" }>;
+  owner: AbiParameterToPrimitiveType<{ type: "address"; name: "owner" }>;
 }>;
 
 export const FN_SELECTOR = "0xb460af94" as const;
 const FN_INPUTS = [
   {
-    name: "assets",
     type: "uint256",
-    internalType: "uint256",
+    name: "assets",
   },
   {
-    name: "receiver",
     type: "address",
-    internalType: "address",
+    name: "receiver",
   },
   {
-    name: "owner",
     type: "address",
-    internalType: "address",
+    name: "owner",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "shares",
     type: "uint256",
-    internalType: "uint256",
+    name: "shares",
   },
 ] as const;
 

package/src/extensions/erc721/__generated__/{DropSinglePhase → IDrop}/read/claimCondition.ts

@@ -9,44 +9,12 @@ export const FN_SELECTOR = "0xd637ed59" as const;
 const FN_INPUTS = [] as const;
 const FN_OUTPUTS = [
   {
-    name: "startTimestamp",
     type: "uint256",
-    internalType: "uint256",
+    name: "currentStartId",
   },
   {
-    name: "maxClaimableSupply",
     type: "uint256",
-    internalType: "uint256",
-  },
-  {
-    name: "supplyClaimed",
-    type: "uint256",
-    internalType: "uint256",
-  },
-  {
-    name: "quantityLimitPerWallet",
-    type: "uint256",
-    internalType: "uint256",
-  },
-  {
-    name: "merkleRoot",
-    type: "bytes32",
-    internalType: "bytes32",
-  },
-  {
-    name: "pricePerToken",
-    type: "uint256",
-    internalType: "uint256",
-  },
-  {
-    name: "currency",
-    type: "address",
-    internalType: "address",
-  },
-  {
-    name: "metadata",
-    type: "string",
-    internalType: "string",
+    name: "count",
   },
 ] as const;
 

package/src/extensions/erc721/drop721.test.ts

@@ -6,6 +6,7 @@ import {
   TEST_ACCOUNT_A,
   TEST_ACCOUNT_B,
   TEST_ACCOUNT_C,
+  TEST_ACCOUNT_D,
 } from "../../../test/src/test-wallets.js";
 import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { sendAndConfirmTransaction } from "../../transaction/actions/send-and-confirm-transaction.js";
@@ -16,7 +17,9 @@ import { deployERC20Contract } from "../prebuilts/deploy-erc20.js";
 import { deployERC721Contract } from "../prebuilts/deploy-erc721.js";
 import { balanceOf } from "./__generated__/IERC721A/read/balanceOf.js";
 import { nextTokenIdToMint } from "./__generated__/IERC721Enumerable/read/nextTokenIdToMint.js";
+import { getClaimConditions } from "./drops/read/getClaimConditions.js";
 import { claimTo } from "./drops/write/claimTo.js";
+import { resetClaimEligibility } from "./drops/write/resetClaimEligibility.js";
 import { setClaimConditions } from "./drops/write/setClaimConditions.js";
 import { getNFT } from "./read/getNFT.js";
 import { lazyMint } from "./write/lazyMint.js";
@@ -83,6 +86,12 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           { name: "Test NFT 2" },
           { name: "Test NFT 3" },
           { name: "Test NFT 4" },
+          { name: "Test NFT 5" },
+          { name: "Test NFT 6" },
+          { name: "Test NFT 7" },
+          { name: "Test NFT 8" },
+          { name: "Test NFT 9" },
+          { name: "Test NFT 10" },
         ],
       });
       await sendAndConfirmTransaction({
@@ -90,7 +99,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         account: TEST_ACCOUNT_A,
       });
 
-      await expect(nextTokenIdToMint({ contract })).resolves.toBe(4n);
+      await expect(nextTokenIdToMint({ contract })).resolves.toBe(10n);
       await expect(
         getNFT({ contract, tokenId: 0n }),
       ).resolves.toMatchInlineSnapshot(`
@@ -100,7 +109,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
             "name": "Test NFT",
           },
           "owner": null,
-          "tokenURI": "ipfs://QmUfspS2uU9roYLJveebbY5geYaNR4KkZAsMkb5pPRtc7a/0",
+          "tokenURI": "ipfs://QmY1Rr4C7cYVPAaXykMMxg3AVbatDZ6Rd7u3gzt79CiDSB/0",
           "type": "ERC721",
         }
       `);
@@ -273,7 +282,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           [TransactionError: Error - !Qty
 
           contract: ${contract.address}
-          chainId: 31337]
+          chainId: ${contract.chain.id}]
         `);
 
         // we now try to claim just ONE more token
@@ -332,5 +341,96 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         balanceOf({ contract, owner: TEST_ACCOUNT_A.address }),
       ).resolves.toBe(3n);
     });
+
+    it("should be able to retrieve multiple phases", async () => {
+      await sendAndConfirmTransaction({
+        transaction: setClaimConditions({
+          contract,
+          phases: [
+            {
+              maxClaimablePerWallet: 1n,
+              startTime: new Date(0),
+            },
+            {
+              maxClaimablePerWallet: 2n,
+              startTime: new Date(),
+            },
+          ],
+        }),
+        account: TEST_ACCOUNT_A,
+      });
+
+      const phases = await getClaimConditions({ contract });
+      expect(phases).toHaveLength(2);
+      expect(phases[0]?.quantityLimitPerWallet).toBe(1n);
+      expect(phases[1]?.quantityLimitPerWallet).toBe(2n);
+    });
+
+    it("should be able to reset claim eligibility", async () => {
+      // set claim conditions to only allow one claim
+      await sendAndConfirmTransaction({
+        transaction: setClaimConditions({
+          contract,
+          phases: [
+            {
+              maxClaimablePerWallet: 1n,
+            },
+          ],
+        }),
+        account: TEST_ACCOUNT_A,
+      });
+      // claim one token
+      await sendAndConfirmTransaction({
+        transaction: claimTo({
+          contract,
+          // fresh account to avoid any previous claims
+          to: TEST_ACCOUNT_D.address,
+          quantity: 1n,
+        }),
+        // fresh account to avoid any previous claims
+        account: TEST_ACCOUNT_D,
+      });
+      // check that the account has claimed one token
+      await expect(
+        balanceOf({ contract, owner: TEST_ACCOUNT_D.address }),
+      ).resolves.toBe(1n);
+      // attempt to claim another token (this should fail)
+      await expect(
+        sendAndConfirmTransaction({
+          transaction: claimTo({
+            contract,
+            to: TEST_ACCOUNT_D.address,
+            quantity: 1n,
+          }),
+          account: TEST_ACCOUNT_D,
+        }),
+      ).rejects.toThrowErrorMatchingInlineSnapshot(`
+        [TransactionError: Error - !Qty
+
+        contract: ${contract.address}
+        chainId: ${contract.chain.id}]
+      `);
+
+      // reset claim eligibility
+      await sendAndConfirmTransaction({
+        transaction: resetClaimEligibility({
+          contract,
+        }),
+        account: TEST_ACCOUNT_A,
+      });
+      // attempt to claim another token (this should succeed)
+      await sendAndConfirmTransaction({
+        transaction: claimTo({
+          contract,
+          to: TEST_ACCOUNT_D.address,
+          quantity: 1n,
+        }),
+        account: TEST_ACCOUNT_D,
+      });
+      // check that the account has claimed two tokens
+      await expect(
+        balanceOf({ contract, owner: TEST_ACCOUNT_D.address }),
+      ).resolves.toBe(2n);
+    });
   },
 );

package/src/extensions/erc721/drops/read/getActiveClaimCondition.ts

@@ -1,8 +1,7 @@
 import type { BaseTransactionOptions } from "../../../../transaction/types.js";
 import type { ClaimCondition } from "../../../../utils/extensions/drops/types.js";
-import { claimCondition } from "../../__generated__/DropSinglePhase/read/claimCondition.js";
-import { getActiveClaimConditionId } from "../../__generated__/IDrop/read/getActiveClaimConditionId.js";
-import { getClaimConditionById } from "../../__generated__/IDrop/read/getClaimConditionById.js";
+import * as GetActiveId from "../../__generated__/IDrop/read/getActiveClaimConditionId.js";
+import * as ById from "../../__generated__/IDrop/read/getClaimConditionById.js";
 
 /**
  * Retrieves the active claim condition.
@@ -19,42 +18,32 @@ import { getClaimConditionById } from "../../__generated__/IDrop/read/getClaimCo
 export async function getActiveClaimCondition(
   options: BaseTransactionOptions,
 ): Promise<ClaimCondition> {
-  const getActiveClaimConditionMultiPhase = async () => {
-    const conditionId = await getActiveClaimConditionId(options);
-    return getClaimConditionById({ ...options, conditionId });
-  };
-  const getActiveClaimConditionSinglePhase = async () => {
-    const [
-      startTimestamp,
-      maxClaimableSupply,
-      supplyClaimed,
-      quantityLimitPerWallet,
-      merkleRoot,
-      pricePerToken,
-      currency,
-      metadata,
-    ] = await claimCondition(options);
-    return {
-      startTimestamp,
-      maxClaimableSupply,
-      supplyClaimed,
-      quantityLimitPerWallet,
-      merkleRoot,
-      pricePerToken,
-      currency,
-      metadata,
-    };
-  };
-
-  // The contract's phase type is unknown, so try both options and return whichever resolves, prioritizing multi-phase
-  const results = await Promise.allSettled([
-    getActiveClaimConditionMultiPhase(),
-    getActiveClaimConditionSinglePhase(),
-  ]);
-
-  const condition = results.find((result) => result.status === "fulfilled");
-  if (condition?.status === "fulfilled") {
-    return condition.value;
+  try {
+    const conditionId = await GetActiveId.getActiveClaimConditionId(options);
+    return ById.getClaimConditionById({ ...options, conditionId });
+  } catch {
+    throw new Error("Claim condition not found");
   }
-  throw new Error("Claim condition not found");
+}
+
+/**
+ * Checks if the `getActiveClaimCondition` 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 `getActiveClaimCondition` method is supported.
+ * @extension ERC721
+ * @example
+ * ```ts
+ * import { isGetActiveClaimConditionSupported } from "thirdweb/extensions/erc721";
+ *
+ * const supported = isGetActiveClaimConditionSupported(["0x..."]);
+ * ```
+ */
+export function isGetActiveClaimConditionSupported(
+  availableSelectors: string[],
+) {
+  // check that both multi phase functions are supported
+  return (
+    GetActiveId.isGetActiveClaimConditionIdSupported(availableSelectors) &&
+    ById.isGetClaimConditionByIdSupported(availableSelectors)
+  );
 }