thirdweb 5.50.1 → 5.51.0

package/src/extensions/airdrop/__generated__/Airdrop/write/airdropERC721WithSignature.ts

@@ -13,76 +13,62 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  */
 export type AirdropERC721WithSignatureParams = WithOverrides<{
   req: AbiParameterToPrimitiveType<{
-    name: "req";
     type: "tuple";
-    internalType: "struct Airdrop.AirdropRequestERC721";
+    name: "req";
     components: [
-      { name: "uid"; type: "bytes32"; internalType: "bytes32" },
-      { name: "tokenAddress"; type: "address"; internalType: "address" },
-      { name: "expirationTimestamp"; type: "uint256"; internalType: "uint256" },
+      { type: "bytes32"; name: "uid" },
+      { type: "address"; name: "tokenAddress" },
+      { type: "uint256"; name: "expirationTimestamp" },
       {
-        name: "contents";
         type: "tuple[]";
-        internalType: "struct Airdrop.AirdropContentERC721[]";
+        name: "contents";
         components: [
-          { name: "recipient"; type: "address"; internalType: "address" },
-          { name: "tokenId"; type: "uint256"; internalType: "uint256" },
+          { type: "address"; name: "recipient" },
+          { type: "uint256"; name: "tokenId" },
         ];
       },
     ];
   }>;
-  signature: AbiParameterToPrimitiveType<{
-    name: "signature";
-    type: "bytes";
-    internalType: "bytes";
-  }>;
+  signature: AbiParameterToPrimitiveType<{ type: "bytes"; name: "signature" }>;
 }>;
 
 export const FN_SELECTOR = "0xb654a6f3" as const;
 const FN_INPUTS = [
   {
-    name: "req",
     type: "tuple",
-    internalType: "struct Airdrop.AirdropRequestERC721",
+    name: "req",
     components: [
       {
-        name: "uid",
         type: "bytes32",
-        internalType: "bytes32",
+        name: "uid",
       },
       {
-        name: "tokenAddress",
         type: "address",
-        internalType: "address",
+        name: "tokenAddress",
       },
       {
-        name: "expirationTimestamp",
         type: "uint256",
-        internalType: "uint256",
+        name: "expirationTimestamp",
       },
       {
-        name: "contents",
         type: "tuple[]",
-        internalType: "struct Airdrop.AirdropContentERC721[]",
+        name: "contents",
         components: [
           {
-            name: "recipient",
             type: "address",
-            internalType: "address",
+            name: "recipient",
           },
           {
-            name: "tokenId",
             type: "uint256",
-            internalType: "uint256",
+            name: "tokenId",
           },
         ],
       },
     ],
   },
   {
-    name: "signature",
     type: "bytes",
-    internalType: "bytes",
+    name: "signature",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;

package/src/extensions/airdrop/__generated__/Airdrop/write/airdropNativeToken.ts

@@ -13,12 +13,11 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  */
 export type AirdropNativeTokenParams = WithOverrides<{
   contents: AbiParameterToPrimitiveType<{
-    name: "_contents";
     type: "tuple[]";
-    internalType: "struct Airdrop.AirdropContentERC20[]";
+    name: "_contents";
     components: [
-      { name: "recipient"; type: "address"; internalType: "address" },
-      { name: "amount"; type: "uint256"; internalType: "uint256" },
+      { type: "address"; name: "recipient" },
+      { type: "uint256"; name: "amount" },
     ];
   }>;
 }>;
@@ -26,19 +25,16 @@ export type AirdropNativeTokenParams = WithOverrides<{
 export const FN_SELECTOR = "0x0d5818f7" as const;
 const FN_INPUTS = [
   {
-    name: "_contents",
     type: "tuple[]",
-    internalType: "struct Airdrop.AirdropContentERC20[]",
+    name: "_contents",
     components: [
       {
-        name: "recipient",
         type: "address",
-        internalType: "address",
+        name: "recipient",
       },
       {
-        name: "amount",
         type: "uint256",
-        internalType: "uint256",
+        name: "amount",
       },
     ],
   },

package/src/extensions/airdrop/__generated__/Airdrop/write/claimERC1155.ts

@@ -12,59 +12,34 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "claimERC1155" function.
  */
 export type ClaimERC1155Params = WithOverrides<{
-  token: AbiParameterToPrimitiveType<{
-    name: "_token";
-    type: "address";
-    internalType: "address";
-  }>;
-  receiver: AbiParameterToPrimitiveType<{
-    name: "_receiver";
-    type: "address";
-    internalType: "address";
-  }>;
-  tokenId: AbiParameterToPrimitiveType<{
-    name: "_tokenId";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
-  quantity: AbiParameterToPrimitiveType<{
-    name: "_quantity";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
-  proofs: AbiParameterToPrimitiveType<{
-    name: "_proofs";
-    type: "bytes32[]";
-    internalType: "bytes32[]";
-  }>;
+  token: AbiParameterToPrimitiveType<{ type: "address"; name: "_token" }>;
+  receiver: AbiParameterToPrimitiveType<{ type: "address"; name: "_receiver" }>;
+  tokenId: AbiParameterToPrimitiveType<{ type: "uint256"; name: "_tokenId" }>;
+  quantity: AbiParameterToPrimitiveType<{ type: "uint256"; name: "_quantity" }>;
+  proofs: AbiParameterToPrimitiveType<{ type: "bytes32[]"; name: "_proofs" }>;
 }>;
 
 export const FN_SELECTOR = "0xc6fa26ab" as const;
 const FN_INPUTS = [
   {
-    name: "_token",
     type: "address",
-    internalType: "address",
+    name: "_token",
   },
   {
-    name: "_receiver",
     type: "address",
-    internalType: "address",
+    name: "_receiver",
   },
   {
-    name: "_tokenId",
     type: "uint256",
-    internalType: "uint256",
+    name: "_tokenId",
   },
   {
-    name: "_quantity",
     type: "uint256",
-    internalType: "uint256",
+    name: "_quantity",
   },
   {
-    name: "_proofs",
     type: "bytes32[]",
-    internalType: "bytes32[]",
+    name: "_proofs",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;

package/src/extensions/airdrop/__generated__/Airdrop/write/claimERC20.ts

@@ -12,49 +12,29 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "claimERC20" function.
  */
 export type ClaimERC20Params = WithOverrides<{
-  token: AbiParameterToPrimitiveType<{
-    name: "_token";
-    type: "address";
-    internalType: "address";
-  }>;
-  receiver: AbiParameterToPrimitiveType<{
-    name: "_receiver";
-    type: "address";
-    internalType: "address";
-  }>;
-  quantity: AbiParameterToPrimitiveType<{
-    name: "_quantity";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
-  proofs: AbiParameterToPrimitiveType<{
-    name: "_proofs";
-    type: "bytes32[]";
-    internalType: "bytes32[]";
-  }>;
+  token: AbiParameterToPrimitiveType<{ type: "address"; name: "_token" }>;
+  receiver: AbiParameterToPrimitiveType<{ type: "address"; name: "_receiver" }>;
+  quantity: AbiParameterToPrimitiveType<{ type: "uint256"; name: "_quantity" }>;
+  proofs: AbiParameterToPrimitiveType<{ type: "bytes32[]"; name: "_proofs" }>;
 }>;
 
 export const FN_SELECTOR = "0xecf3d3d4" as const;
 const FN_INPUTS = [
   {
-    name: "_token",
     type: "address",
-    internalType: "address",
+    name: "_token",
   },
   {
-    name: "_receiver",
     type: "address",
-    internalType: "address",
+    name: "_receiver",
   },
   {
-    name: "_quantity",
     type: "uint256",
-    internalType: "uint256",
+    name: "_quantity",
   },
   {
-    name: "_proofs",
     type: "bytes32[]",
-    internalType: "bytes32[]",
+    name: "_proofs",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;

package/src/extensions/airdrop/__generated__/Airdrop/write/claimERC721.ts

@@ -12,49 +12,29 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "claimERC721" function.
  */
 export type ClaimERC721Params = WithOverrides<{
-  token: AbiParameterToPrimitiveType<{
-    name: "_token";
-    type: "address";
-    internalType: "address";
-  }>;
-  receiver: AbiParameterToPrimitiveType<{
-    name: "_receiver";
-    type: "address";
-    internalType: "address";
-  }>;
-  tokenId: AbiParameterToPrimitiveType<{
-    name: "_tokenId";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
-  proofs: AbiParameterToPrimitiveType<{
-    name: "_proofs";
-    type: "bytes32[]";
-    internalType: "bytes32[]";
-  }>;
+  token: AbiParameterToPrimitiveType<{ type: "address"; name: "_token" }>;
+  receiver: AbiParameterToPrimitiveType<{ type: "address"; name: "_receiver" }>;
+  tokenId: AbiParameterToPrimitiveType<{ type: "uint256"; name: "_tokenId" }>;
+  proofs: AbiParameterToPrimitiveType<{ type: "bytes32[]"; name: "_proofs" }>;
 }>;
 
 export const FN_SELECTOR = "0x1290be10" as const;
 const FN_INPUTS = [
   {
-    name: "_token",
     type: "address",
-    internalType: "address",
+    name: "_token",
   },
   {
-    name: "_receiver",
     type: "address",
-    internalType: "address",
+    name: "_receiver",
   },
   {
-    name: "_tokenId",
     type: "uint256",
-    internalType: "uint256",
+    name: "_tokenId",
   },
   {
-    name: "_proofs",
     type: "bytes32[]",
-    internalType: "bytes32[]",
+    name: "_proofs",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;

package/src/extensions/airdrop/__generated__/Airdrop/write/initialize.ts

@@ -13,18 +13,16 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  */
 export type InitializeParams = WithOverrides<{
   defaultAdmin: AbiParameterToPrimitiveType<{
-    name: "_defaultAdmin";
     type: "address";
-    internalType: "address";
+    name: "_defaultAdmin";
   }>;
 }>;
 
 export const FN_SELECTOR = "0xc4d66de8" as const;
 const FN_INPUTS = [
   {
-    name: "_defaultAdmin",
     type: "address",
-    internalType: "address",
+    name: "_defaultAdmin",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;

package/src/extensions/airdrop/__generated__/Airdrop/write/setMerkleRoot.ts

@@ -12,39 +12,30 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "setMerkleRoot" function.
  */
 export type SetMerkleRootParams = WithOverrides<{
-  token: AbiParameterToPrimitiveType<{
-    name: "_token";
-    type: "address";
-    internalType: "address";
-  }>;
+  token: AbiParameterToPrimitiveType<{ type: "address"; name: "_token" }>;
   tokenMerkleRoot: AbiParameterToPrimitiveType<{
-    name: "_tokenMerkleRoot";
     type: "bytes32";
-    internalType: "bytes32";
+    name: "_tokenMerkleRoot";
   }>;
   resetClaimStatus: AbiParameterToPrimitiveType<{
-    name: "_resetClaimStatus";
     type: "bool";
-    internalType: "bool";
+    name: "_resetClaimStatus";
   }>;
 }>;
 
 export const FN_SELECTOR = "0x8259a87b" as const;
 const FN_INPUTS = [
   {
-    name: "_token",
     type: "address",
-    internalType: "address",
+    name: "_token",
   },
   {
-    name: "_tokenMerkleRoot",
     type: "bytes32",
-    internalType: "bytes32",
+    name: "_tokenMerkleRoot",
   },
   {
-    name: "_resetClaimStatus",
     type: "bool",
-    internalType: "bool",
+    name: "_resetClaimStatus",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;

package/src/extensions/airdrop/__generated__/Airdrop/write/setOwner.ts

@@ -12,19 +12,14 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "setOwner" function.
  */
 export type SetOwnerParams = WithOverrides<{
-  newOwner: AbiParameterToPrimitiveType<{
-    name: "_newOwner";
-    type: "address";
-    internalType: "address";
-  }>;
+  newOwner: AbiParameterToPrimitiveType<{ type: "address"; name: "_newOwner" }>;
 }>;
 
 export const FN_SELECTOR = "0x13af4035" as const;
 const FN_INPUTS = [
   {
-    name: "_newOwner",
     type: "address",
-    internalType: "address",
+    name: "_newOwner",
   },
 ] as const;
 const FN_OUTPUTS = [] as const;

package/src/extensions/erc1155/__generated__/{DropSinglePhase1155 → IDrop1155}/read/claimCondition.ts

@@ -10,61 +10,24 @@ import { detectMethod } from "../../../../../utils/bytecode/detectExtension.js";
  * Represents the parameters for the "claimCondition" function.
  */
 export type ClaimConditionParams = {
-  tokenId: AbiParameterToPrimitiveType<{
-    name: "_tokenId";
-    type: "uint256";
-    internalType: "uint256";
-  }>;
+  tokenId: AbiParameterToPrimitiveType<{ type: "uint256"; name: "_tokenId" }>;
 };
 
 export const FN_SELECTOR = "0xe9703d25" as const;
 const FN_INPUTS = [
   {
-    name: "_tokenId",
     type: "uint256",
-    internalType: "uint256",
+    name: "_tokenId",
   },
 ] as const;
 const FN_OUTPUTS = [
   {
-    name: "startTimestamp",
-    type: "uint256",
-    internalType: "uint256",
-  },
-  {
-    name: "maxClaimableSupply",
     type: "uint256",
-    internalType: "uint256",
+    name: "currentStartId",
   },
   {
-    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/erc1155/drop1155.test.ts

@@ -5,6 +5,7 @@ import { TEST_CLIENT } from "../../../test/src/test-clients.js";
 import {
   TEST_ACCOUNT_A,
   TEST_ACCOUNT_B,
+  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";
@@ -14,7 +15,9 @@ import { getContractMetadata } from "../common/read/getContractMetadata.js";
 import { deployERC1155Contract } from "../prebuilts/deploy-erc1155.js";
 import { balanceOf } from "./__generated__/IERC1155/read/balanceOf.js";
 import { nextTokenIdToMint } from "./__generated__/IERC1155Enumerable/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";
@@ -64,6 +67,8 @@ 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" },
         ],
       });
       await sendAndConfirmTransaction({
@@ -71,7 +76,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(6n);
       await expect(
         getNFT({ contract, tokenId: 0n }),
       ).resolves.toMatchInlineSnapshot(`
@@ -82,7 +87,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           },
           "owner": null,
           "supply": 0n,
-          "tokenURI": "ipfs://QmUfspS2uU9roYLJveebbY5geYaNR4KkZAsMkb5pPRtc7a/0",
+          "tokenURI": "ipfs://QmTo68Dm1ntSp2BHLmE9gesS6ELuXosRz5mAgFCK6tfsRk/0",
           "type": "ERC1155",
         }
       `);
@@ -245,7 +250,7 @@ describe.runIf(process.env.TW_SECRET_KEY)(
           [TransactionError: Error - !Qty
 
           contract: ${contract.address}
-          chainId: 31337]
+          chainId: ${contract.chain.id}]
         `);
 
         await sendAndConfirmTransaction({
@@ -305,5 +310,102 @@ describe.runIf(process.env.TW_SECRET_KEY)(
         balanceOf({ contract, owner: TEST_ACCOUNT_A.address, tokenId }),
       ).resolves.toBe(1n);
     });
+
+    it("should be able to retrieve multiple phases", async () => {
+      await sendAndConfirmTransaction({
+        transaction: setClaimConditions({
+          contract,
+          tokenId: 5n,
+          phases: [
+            {
+              maxClaimablePerWallet: 1n,
+              startTime: new Date(0),
+            },
+            {
+              maxClaimablePerWallet: 2n,
+              startTime: new Date(),
+            },
+          ],
+        }),
+        account: TEST_ACCOUNT_A,
+      });
+
+      const phases = await getClaimConditions({ contract, tokenId: 5n });
+      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,
+          tokenId: 6n,
+          phases: [
+            {
+              maxClaimablePerWallet: 1n,
+            },
+          ],
+        }),
+        account: TEST_ACCOUNT_A,
+      });
+      // claim one token
+      await sendAndConfirmTransaction({
+        transaction: claimTo({
+          tokenId: 6n,
+          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({ tokenId: 6n, contract, owner: TEST_ACCOUNT_D.address }),
+      ).resolves.toBe(1n);
+      // attempt to claim another token (this should fail)
+      await expect(
+        sendAndConfirmTransaction({
+          transaction: claimTo({
+            tokenId: 6n,
+            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({
+          tokenId: 6n,
+          contract,
+        }),
+        account: TEST_ACCOUNT_A,
+      });
+      // attempt to claim another token (this should succeed)
+      await sendAndConfirmTransaction({
+        transaction: claimTo({
+          tokenId: 6n,
+          contract,
+          to: TEST_ACCOUNT_D.address,
+          quantity: 1n,
+        }),
+        account: TEST_ACCOUNT_D,
+      });
+      // check that the account has claimed two tokens
+      await expect(
+        balanceOf({ tokenId: 6n, contract, owner: TEST_ACCOUNT_D.address }),
+      ).resolves.toBe(2n);
+    });
   },
 );