handle undefined merke data in claim conditions (#563)

thirdweb-dev · Aug 27, 2022 · 6cddd7e · 6cddd7e
1 parent cd8edae
commit 6cddd7e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/src/common/claim-conditions.ts b/src/common/claim-conditions.ts
@@ -119,9 +119,12 @@ export async function prepareClaim(
  */
 export async function fetchSnapshot(
   merkleRoot: string,
-  merkleMetadata: Record<string, string>,
+  merkleMetadata: Record<string, string> | undefined,
   storage: IStorage,
 ) {
+  if (!merkleMetadata) {
+    return undefined;
+  }
   const snapshotUri = merkleMetadata[merkleRoot];
   let snapshot = undefined;
   if (snapshotUri) {
@@ -336,10 +339,11 @@ export async function transformResultToClaimCondition(
   pm: IDropClaimCondition.ClaimConditionStructOutput,
   tokenDecimals: number,
   provider: providers.Provider,
-  merkleMetadata: Record<string, string>,
+  merkleMetadata: Record<string, string> | undefined,
   storage: IStorage,
 ): Promise<ClaimCondition> {
   const cv = await fetchCurrencyValue(provider, pm.currency, pm.pricePerToken);
+
   const claims = await fetchSnapshot(pm.merkleRoot, merkleMetadata, storage);
   const maxClaimableSupply = convertToReadableQuantity(
     pm.maxClaimableSupply,

diff --git a/src/common/feature-detection.ts b/src/common/feature-detection.ts
@@ -87,7 +87,6 @@ function extractCommentFromMetadata(
   metadata: Record<string, any> | undefined,
   type: "methods" | "events",
 ) {
-  // console.log(metadata?.output?.userdoc);
   return (
     metadata?.output?.userdoc?.[type]?.[
       Object.keys(metadata?.output?.userdoc[type] || {}).find((fn) =>

diff --git a/src/core/classes/drop-claim-conditions.ts b/src/core/classes/drop-claim-conditions.ts
@@ -206,7 +206,7 @@ export class DropClaimConditions<
         reasons.push(ClaimEligibility.NoClaimConditionSet);
         return reasons;
       }
-      console.log("failed to get active claim condition", err);
+      console.warn("failed to get active claim condition", err);
       reasons.push(ClaimEligibility.Unknown);
       return reasons;
     }

diff --git a/src/core/sdk.ts b/src/core/sdk.ts
@@ -378,7 +378,7 @@ export class ThirdwebSDK extends RPCConnectionHandler {
           try {
             metadata = (await this.getContract(address)).metadata;
           } catch (e) {
-            console.log(
+            console.warn(
               `Couldn't get contract metadata for custom contract: ${address}`,
             );
           }