thirdweb 5.51.0-nightly-f9c351c22d9c869770dad13332f9c23d8cb84ed7-20240905000555 → 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/drop721.test.ts

@@ -282,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
@@ -407,8 +407,8 @@ describe.runIf(process.env.TW_SECRET_KEY)(
       ).rejects.toThrowErrorMatchingInlineSnapshot(`
         [TransactionError: Error - !Qty
 
-        contract: 0x6AA2E0148a57EcDdb025C856c4e68682CFfcac78
-        chainId: 31337]
+        contract: ${contract.address}
+        chainId: ${contract.chain.id}]
       `);
 
       // reset claim eligibility

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

@@ -1,6 +1,5 @@
 import type { BaseTransactionOptions } from "../../../../transaction/types.js";
 import type { ClaimCondition } from "../../../../utils/extensions/drops/types.js";
-import * as SinglePhase from "../../__generated__/DropSinglePhase/read/claimCondition.js";
 import * as GetActiveId from "../../__generated__/IDrop/read/getActiveClaimConditionId.js";
 import * as ById from "../../__generated__/IDrop/read/getClaimConditionById.js";
 
@@ -19,44 +18,12 @@ import * as ById from "../../__generated__/IDrop/read/getClaimConditionById.js";
 export async function getActiveClaimCondition(
   options: BaseTransactionOptions,
 ): Promise<ClaimCondition> {
-  const getActiveClaimConditionMultiPhase = async () => {
+  try {
     const conditionId = await GetActiveId.getActiveClaimConditionId(options);
     return ById.getClaimConditionById({ ...options, conditionId });
-  };
-  const getActiveClaimConditionSinglePhase = async () => {
-    const [
-      startTimestamp,
-      maxClaimableSupply,
-      supplyClaimed,
-      quantityLimitPerWallet,
-      merkleRoot,
-      pricePerToken,
-      currency,
-      metadata,
-    ] = await SinglePhase.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;
+  } catch {
+    throw new Error("Claim condition not found");
   }
-  throw new Error("Claim condition not found");
 }
 
 /**
@@ -74,11 +41,7 @@ export async function getActiveClaimCondition(
 export function isGetActiveClaimConditionSupported(
   availableSelectors: string[],
 ) {
-  // if single phase is supported, return true
-  if (SinglePhase.isClaimConditionSupported(availableSelectors)) {
-    return true;
-  }
-  // otherwise check that both multi phase functions are supported
+  // check that both multi phase functions are supported
   return (
     GetActiveId.isGetActiveClaimConditionIdSupported(availableSelectors) &&
     ById.isGetClaimConditionByIdSupported(availableSelectors)

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

@@ -1,8 +1,7 @@
 import type { BaseTransactionOptions } from "../../../../transaction/types.js";
 import type { ClaimCondition } from "../../../../utils/extensions/drops/types.js";
-import * as SinglePhase from "../../__generated__/DropSinglePhase/read/claimCondition.js";
 import * as MultiPhase from "../../__generated__/IDrop/read/claimCondition.js";
-import * as ById from "../../__generated__/IDrop/read/getClaimConditionById.js";
+import * as MultiById from "../../__generated__/IDrop/read/getClaimConditionById.js";
 
 /**
  * Retrieves all claim conditions.
@@ -19,53 +18,24 @@ import * as ById from "../../__generated__/IDrop/read/getClaimConditionById.js";
 export async function getClaimConditions(
   options: BaseTransactionOptions,
 ): Promise<ClaimCondition[]> {
-  const [multi, single] = await Promise.allSettled([
-    (async () => {
-      const [startId, count] = await MultiPhase.claimCondition(options);
+  try {
+    const [startId, count] = await MultiPhase.claimCondition(options);
 
-      const conditionPromises: Array<
-        ReturnType<typeof ById.getClaimConditionById>
-      > = [];
-      for (let i = startId; i < count; i++) {
-        conditionPromises.push(
-          ById.getClaimConditionById({
-            ...options,
-            conditionId: i,
-          }),
-        );
-      }
-      return Promise.all(conditionPromises);
-    })(),
-    SinglePhase.claimCondition(options).then(
-      ([
-        startTimestamp,
-        maxClaimableSupply,
-        supplyClaimed,
-        quantityLimitPerWallet,
-        merkleRoot,
-        pricePerToken,
-        currency,
-        metadata,
-      ]) => ({
-        startTimestamp,
-        maxClaimableSupply,
-        supplyClaimed,
-        quantityLimitPerWallet,
-        merkleRoot,
-        pricePerToken,
-        currency,
-        metadata,
-      }),
-    ),
-  ]);
-  if (multi.status === "fulfilled") {
-    return multi.value;
+    const conditionPromises: Array<
+      ReturnType<typeof MultiById.getClaimConditionById>
+    > = [];
+    for (let i = startId; i < count; i++) {
+      conditionPromises.push(
+        MultiById.getClaimConditionById({
+          ...options,
+          conditionId: i,
+        }),
+      );
+    }
+    return Promise.all(conditionPromises);
+  } catch {
+    throw new Error("Claim condition not found");
   }
-  if (single.status === "fulfilled") {
-    return [single.value];
-  }
-
-  throw new Error("Claim condition not found");
 }
 
 /**
@@ -81,13 +51,9 @@ export async function getClaimConditions(
  * ```
  */
 export function isGetClaimConditionsSupported(availableSelectors: string[]) {
-  // if single phase is supported, return true
-  if (SinglePhase.isClaimConditionSupported(availableSelectors)) {
-    return true;
-  }
   // if multi phase is supported, return true
   return (
     MultiPhase.isClaimConditionSupported(availableSelectors) &&
-    ById.isGetClaimConditionByIdSupported(availableSelectors)
+    MultiById.isGetClaimConditionByIdSupported(availableSelectors)
   );
 }

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

@@ -1,6 +1,7 @@
 import type { Address } from "abitype";
 import type { BaseTransactionOptions } from "../../../../transaction/types.js";
 import { getClaimParams } from "../../../../utils/extensions/drops/get-claim-params.js";
+import { isGetContractMetadataSupported } from "../../../common/read/getContractMetadata.js";
 import {
   claim,
   isClaimSupported,
@@ -67,6 +68,8 @@ export function isClaimToSupported(availableSelectors: string[]) {
   return (
     isClaimSupported(availableSelectors) &&
     // required to check if the contract supports the getActiveClaimCondition method
-    isGetActiveClaimConditionSupported(availableSelectors)
+    isGetActiveClaimConditionSupported(availableSelectors) &&
+    // requires contractMetadata for claimer proofs
+    isGetContractMetadataSupported(availableSelectors)
   );
 }