Update mint client to fix reading from subgraph (#392)

* update mint client to fix reading from subgraph * update mint-client * update mint client to use subgraph price * add changeset and update the fixedPrice subgraph fetch
ourzora · Dec 8, 2023 · 0b84095 · 0b84095
1 parent 400d68d
commit 0b84095
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 14 deletions.
diff --git a/.changeset/sharp-bobcats-sin.md b/.changeset/sharp-bobcats-sin.md
@@ -0,0 +1,5 @@
+---
+"@zoralabs/protocol-sdk": patch
+---
+
+Fix reading the FIXED_PRICE_MINTER from the subgraph
diff --git a/packages/protocol-sdk/src/create/1155-create-helper.ts b/packages/protocol-sdk/src/create/1155-create-helper.ts
@@ -45,7 +45,7 @@ export const DEFAULT_SALE_SETTINGS = {
 };
 
 // Hardcode the permission bit for the minter
-const PERMISSION_BIT_MINTER = 2n ** 2n;
+const PERMISSION_BIT_MINTER = 4n;
 
 type ContractType =
   | {

diff --git a/packages/protocol-sdk/src/mint/mint-api-client.ts b/packages/protocol-sdk/src/mint/mint-api-client.ts
@@ -56,18 +56,40 @@ export class MintAPIClient {
   }: {
     contractAddress: string;
     tokenId: bigint;
-  }): Promise<undefined | string> {
+  }): Promise<undefined | { address: Address; pricePerToken: bigint }> {
     const { retries, post } = this.httpClient;
     return retries(async () => {
       const response = await post<any>(this.networkConfig.subgraphUrl, {
-        query:
-          "query($id: ID!) {\n  zoraCreateToken(id: $id) {\n    id\n    salesStrategies{\n      fixedPrice {\n        address\n      }\n    }\n  }\n}",
+        query: `query ($id: ID!) {
+          zoraCreateToken(id: $id) {
+            id
+            salesStrategies(where: {type: "FIXED_PRICE"}) {
+              type
+              fixedPrice {
+                address
+                pricePerToken
+                saleEnd
+                saleStart
+                maxTokensPerAddress
+              }
+            }
+          }
+        }`,
         variables: {
           id: `${contractAddress.toLowerCase()}-${tokenId.toString()}`,
         },
       });
-      return response.zoraCreateToken?.salesStrategies?.find(() => true)
-        ?.fixedPriceMinterAddress;
+
+      const fixedPrice: {
+        address: Address;
+        pricePerToken: string;
+      } = response.data?.zoraCreateToken?.salesStrategies?.find(() => true)
+        ?.fixedPrice;
+
+      return {
+        address: fixedPrice.address as Address,
+        pricePerToken: BigInt(fixedPrice.pricePerToken),
+      };
     });
   }
 

diff --git a/packages/protocol-sdk/src/mint/mint-client.ts b/packages/protocol-sdk/src/mint/mint-client.ts
@@ -109,6 +109,7 @@ class MintClient {
     if (mintContextType === "zora_create_1155") {
       return await get1155MintCosts({
         mintable,
+        price: BigInt(mintable.cost.native_price.raw),
         publicClient: this.publicClient,
         quantityToMint: BigInt(quantityToMint),
       });
@@ -306,10 +307,12 @@ export type MintCosts = {
 
 export async function get1155MintCosts({
   mintable,
+  price,
   publicClient,
   quantityToMint,
 }: {
   mintable: MintableGetTokenResponse;
+  price: bigint;
   publicClient: PublicClient;
   quantityToMint: bigint;
 }): Promise<MintCosts> {
@@ -321,8 +324,7 @@ export async function get1155MintCosts({
   });
 
   const mintFeeForTokens = mintFee * quantityToMint;
-  const tokenPurchaseCost =
-    BigInt(mintable.cost.native_price.raw) * quantityToMint;
+  const tokenPurchaseCost = price * quantityToMint;
 
   return {
     mintFee: mintFeeForTokens,
@@ -354,19 +356,22 @@ async function makePrepareMint1155TokenParams({
 
   const address = mintable.collection.address as Address;
 
+  const tokenFixedPriceMinter = await apiClient.getSalesConfigFixedPrice({
+    contractAddress: address,
+    tokenId: BigInt(mintable.token_id!),
+  });
+
   const mintValue = (
     await get1155MintCosts({
       mintable,
+      price:
+        tokenFixedPriceMinter?.pricePerToken ||
+        BigInt(mintable.cost.native_price.raw),
       publicClient,
       quantityToMint: mintQuantity,
     })
   ).totalCost;
 
-  const tokenFixedPriceMinter = await apiClient.getSalesConfigFixedPrice({
-    contractAddress: address,
-    tokenId: BigInt(mintable.token_id!),
-  });
-
   const result = {
     abi: zoraCreator1155ImplABI,
     functionName: "mintWithRewards",
@@ -375,7 +380,7 @@ async function makePrepareMint1155TokenParams({
     address,
     /* args: minter, tokenId, quantity, minterArguments, mintReferral */
     args: [
-      (tokenFixedPriceMinter ||
+      (tokenFixedPriceMinter?.address ||
         zoraCreatorFixedPriceSaleStrategyAddress[999]) as Address,
       BigInt(mintable.token_id!),
       mintQuantity,