thirdweb 5.93.14 → 5.93.15-nightly-386138e4f06b14aac2fea2ab4a7a0497932f74a7-20250406000354

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

@@ -2,6 +2,7 @@ import type { BaseTransactionOptions } from "../../../../transaction/types.js";
 import type { ClaimCondition } from "../../../../utils/extensions/drops/types.js";
 import * as MultiPhase from "../../__generated__/IDrop1155/read/claimCondition.js";
 import * as MultiById from "../../__generated__/IDrop1155/read/getClaimConditionById.js";
+import * as SinglePhase from "../../__generated__/IDropSinglePhase1155/read/claimCondition.js";
 
 export type GetClaimConditionsParams = {
   tokenId: bigint;
@@ -21,24 +22,53 @@ export type GetClaimConditionsParams = {
 export async function getClaimConditions(
   options: BaseTransactionOptions<GetClaimConditionsParams>,
 ): Promise<ClaimCondition[]> {
-  try {
-    const [startId, count] = await MultiPhase.claimCondition(options);
+  const [multi, single] = await Promise.allSettled([
+    (async () => {
+      const [startId, count] = await MultiPhase.claimCondition(options);
 
-    const conditionPromises: Array<
-      ReturnType<typeof MultiById.getClaimConditionById>
-    > = [];
-    for (let i = startId; i < startId + count; i++) {
-      conditionPromises.push(
-        MultiById.getClaimConditionById({
-          ...options,
-          conditionId: i,
-        }),
-      );
-    }
-    return Promise.all(conditionPromises);
-  } catch {
-    throw new Error("Claim condition not found");
+      const conditionPromises: Array<
+        ReturnType<typeof MultiById.getClaimConditionById>
+      > = [];
+      for (let i = startId; i < startId + count; i++) {
+        conditionPromises.push(
+          MultiById.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;
   }
+  if (single.status === "fulfilled") {
+    return [single.value];
+  }
+
+  throw new Error("Claim condition not found");
 }
 
 /**
@@ -56,7 +86,8 @@ export async function getClaimConditions(
 export function isGetClaimConditionsSupported(availableSelectors: string[]) {
   // if multi phase is supported, return true
   return (
-    MultiPhase.isClaimConditionSupported(availableSelectors) &&
-    MultiById.isGetClaimConditionByIdSupported(availableSelectors)
+    (MultiPhase.isClaimConditionSupported(availableSelectors) &&
+      MultiById.isGetClaimConditionByIdSupported(availableSelectors)) ||
+    SinglePhase.isClaimConditionSupported(availableSelectors)
   );
 }

package/src/extensions/erc1155/drops/write/resetClaimEligibility.ts

@@ -3,8 +3,16 @@ import type { BaseTransactionOptions } from "../../../../transaction/types.js";
 import type { ClaimCondition } from "../../../../utils/extensions/drops/types.js";
 import {
   isSetClaimConditionsSupported,
-  setClaimConditions,
+  setClaimConditions as setClaimConditionsMultiPhase,
 } from "../../__generated__/IDrop1155/write/setClaimConditions.js";
+import {
+  claimCondition as claimConditionSinglePhase,
+  isClaimConditionSupported,
+} from "../../__generated__/IDropSinglePhase1155/read/claimCondition.js";
+import {
+  isSetClaimConditionsSupported as isSetClaimConditionsSupportedGeneratedSinglePhase,
+  setClaimConditions as setClaimConditionsSinglePhase,
+} from "../../__generated__/IDropSinglePhase1155/write/setClaimConditions.js";
 import {
   type GetClaimConditionsParams,
   getClaimConditions,
@@ -31,10 +39,49 @@ export type ResetClaimEligibilityParams = GetClaimConditionsParams;
  * ```
  */
 export function resetClaimEligibility(
-  options: BaseTransactionOptions<ResetClaimEligibilityParams>,
+  options: BaseTransactionOptions<ResetClaimEligibilityParams> & {
+    singlePhaseDrop?: boolean;
+  },
 ) {
+  if (options.singlePhaseDrop) {
+    return setClaimConditionsSinglePhase({
+      contract: options.contract,
+      asyncParams: async () => {
+        // get existing condition
+        const existingCondition = await claimConditionSinglePhase(options).then(
+          ([
+            startTimestamp,
+            maxClaimableSupply,
+            supplyClaimed,
+            quantityLimitPerWallet,
+            merkleRoot,
+            pricePerToken,
+            currency,
+            metadata,
+          ]) => ({
+            startTimestamp,
+            maxClaimableSupply,
+            supplyClaimed,
+            quantityLimitPerWallet,
+            merkleRoot,
+            pricePerToken,
+            currency,
+            metadata,
+          }),
+        );
+
+        // then simply return the exact same ones, but with the resetClaimEligibility flag set to true
+        return {
+          tokenId: options.tokenId,
+          // type is necessary because of viem hex shenanigans (strict vs non-strict `0x` prefix string)
+          phase: existingCondition,
+          resetClaimEligibility: true,
+        };
+      },
+    });
+  }
   // download existing conditions
-  return setClaimConditions({
+  return setClaimConditionsMultiPhase({
     contract: options.contract,
     asyncParams: async () => {
       // get existing conditions
@@ -70,7 +117,9 @@ export function resetClaimEligibility(
  */
 export function isResetClaimEligibilitySupported(availableSelectors: string[]) {
   return (
-    isGetClaimConditionsSupported(availableSelectors) &&
-    isSetClaimConditionsSupported(availableSelectors)
+    (isGetClaimConditionsSupported(availableSelectors) &&
+      isSetClaimConditionsSupported(availableSelectors)) ||
+    isClaimConditionSupported(availableSelectors) ||
+    isSetClaimConditionsSupportedGeneratedSinglePhase(availableSelectors)
   );
 }

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

@@ -50,15 +50,6 @@ export async function getClaimParams(options: GetClaimParamsOptions) {
   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"
       );

package/src/version.ts

@@ -1 +1 @@
-export const version = "5.93.14";
+export const version = "5.93.15-nightly-386138e4f06b14aac2fea2ab4a7a0497932f74a7-20250406000354";