@zoralabs/protocol-sdk 0.11.6-COMMENTS.0 → 0.11.7-BUGFIX.0

package/.env

@@ -0,0 +1 @@
+VITE_CONDUIT_KEY=066ae224-b5c3-4086-ac11-a3a44ede9458

package/.turbo/turbo-build.log

@@ -1,18 +1,18 @@
-
-> @zoralabs/protocol-sdk@0.11.6-COMMENTS.0 build /home/runner/work/zora-protocol-private/zora-protocol-private/packages/protocol-sdk
-> pnpm tsup
-
-CLI Building entry: src/index.ts
-CLI Using tsconfig: tsconfig.build.json
-CLI tsup v7.3.0
-CLI Using tsup config: /home/runner/work/zora-protocol-private/zora-protocol-private/packages/protocol-sdk/tsup.config.ts
-CLI Target: es2021
-CLI Cleaning output folder
-CJS Build start
-ESM Build start
-CJS dist/index.cjs     228.29 KB
-CJS dist/index.cjs.map 462.51 KB
-CJS ⚡️ Build success in 392ms
-ESM dist/index.js     222.00 KB
-ESM dist/index.js.map 460.67 KB
-ESM ⚡️ Build success in 399ms
+
+> @zoralabs/protocol-sdk@0.11.7-BUGFIX.0 build /Users/danovedzora/source/zora-protocol/packages/protocol-sdk
+> pnpm tsup
+
+CLI Building entry: src/index.ts
+CLI Using tsconfig: tsconfig.build.json
+CLI tsup v7.3.0
+CLI Using tsup config: /Users/danovedzora/source/zora-protocol/packages/protocol-sdk/tsup.config.ts
+CLI Target: es2021
+CLI Cleaning output folder
+CJS Build start
+ESM Build start
+ESM dist/index.js     218.90 KB
+ESM dist/index.js.map 454.14 KB
+ESM ⚡️ Build success in 66ms
+CJS dist/index.cjs     225.23 KB
+CJS dist/index.cjs.map 456.14 KB
+CJS ⚡️ Build success in 66ms

package/CHANGELOG.md

@@ -1,17 +1,19 @@
 # @zoralabs/protocol-sdk
 
-## 0.11.6-COMMENTS.0
+## 0.11.7-BUGFIX.0
 
 ### Patch Changes
 
-- 9d5d1638: When minting + commenting, and using the timed sale strategy, protocol sdk will call the CallerAndCommenter contract
-- 088ec6fb: When buying on secondary, you can now add a comment, which will call the CallerAndCommenter's buyOnSecondaryAndComment
-- Updated dependencies [4928687d]
-- Updated dependencies [c6e1c1bc]
-- Updated dependencies [7e285fb1]
+- 6ce69da4: Fix royalties query for secondary tokens to query subgraph for royaltyRecipient instead of user.
+
+## 0.11.6
+
+### Patch Changes
+
+- Updated dependencies [ad707434]
+- Updated dependencies [2e68a87c]
 - Updated dependencies [17cc9821]
-- Updated dependencies [a141e322]
-  - @zoralabs/protocol-deployments@0.3.8-COMMENTS.0
+  - @zoralabs/protocol-deployments@0.3.8
 
 ## 0.11.5
 

package/dist/create/mint-from-create.d.ts

@@ -1,13 +1,12 @@
 import { Address } from "viem";
 import { ConcreteSalesConfig } from "./types";
 import { AsyncPrepareMint } from "src/mint/types";
-export declare function makeOnchainPrepareMintFromCreate({ contractAddress, tokenId, result, minter, getContractMintFee, contractVersion, chainId, }: {
+export declare function makeOnchainPrepareMintFromCreate({ contractAddress, tokenId, result, minter, getContractMintFee, contractVersion, }: {
     contractAddress: Address;
     tokenId: bigint;
     result: ConcreteSalesConfig;
     minter: Address;
     getContractMintFee: () => Promise<bigint>;
     contractVersion: string;
-    chainId: number;
 }): AsyncPrepareMint;
 //# sourceMappingURL=mint-from-create.d.ts.map

package/dist/create/mint-from-create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mint-from-create.d.ts","sourceRoot":"","sources":["../../src/create/mint-from-create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA2B,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAIjB,MAAM,gBAAgB,CAAC;AA+DxB,wBAAgB,gCAAgC,CAAC,EAC/C,eAAe,EACf,OAAO,EACP,MAAM,EACN,MAAM,EACN,kBAAkB,EAClB,eAAe,EACf,OAAO,GACR,EAAE;IACD,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,kBAAkB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,gBAAgB,CA0BnB"}
+{"version":3,"file":"mint-from-create.d.ts","sourceRoot":"","sources":["../../src/create/mint-from-create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA2B,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC9C,OAAO,EACL,gBAAgB,EAIjB,MAAM,gBAAgB,CAAC;AA+DxB,wBAAgB,gCAAgC,CAAC,EAC/C,eAAe,EACf,OAAO,EACP,MAAM,EACN,MAAM,EACN,kBAAkB,EAClB,eAAe,GAChB,EAAE;IACD,eAAe,EAAE,OAAO,CAAC;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,kBAAkB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,eAAe,EAAE,MAAM,CAAC;CACzB,GAAG,gBAAgB,CAyBnB"}

package/dist/index.cjs

@@ -3773,8 +3773,7 @@ var contractSupportsNewMintFunction = (contractVersion) => {
 // src/mint/mint-transactions.ts
 function makeOnchainMintCall({
   token,
-  mintParams,
-  chainId
+  mintParams
 }) {
   if (token.mintType === "721") {
     return makePrepareMint721TokenParams({
@@ -3787,55 +3786,9 @@ function makeOnchainMintCall({
     salesConfigAndTokenInfo: token,
     tokenContract: token.contract.address,
     tokenId: token.tokenId,
-    chainId,
     ...mintParams
   });
 }
-function makeZoraTimedSaleStrategyMintCall({
-  minterAccount,
-  salesConfigAndTokenInfo,
-  mintQuantity,
-  mintTo,
-  tokenContract,
-  tokenId,
-  mintReferral,
-  mintComment,
-  chainId
-}) {
-  if (mintComment && mintComment !== "") {
-    return makeContractParameters({
-      abi: import_protocol_deployments6.callerAndCommenterABI,
-      address: import_protocol_deployments6.callerAndCommenterAddress[chainId],
-      functionName: "timedSaleMintAndComment",
-      account: minterAccount,
-      value: salesConfigAndTokenInfo.salesConfig.mintFeePerQuantity * mintQuantity,
-      args: [
-        mintTo,
-        mintQuantity,
-        tokenContract,
-        tokenId,
-        mintReferral || import_viem5.zeroAddress,
-        mintComment
-      ]
-    });
-  }
-  return makeContractParameters({
-    abi: import_protocol_deployments6.zoraTimedSaleStrategyABI,
-    functionName: "mint",
-    account: minterAccount,
-    address: salesConfigAndTokenInfo.salesConfig.address,
-    value: salesConfigAndTokenInfo.salesConfig.mintFeePerQuantity * mintQuantity,
-    /* args: mintTo, quantity, collection, tokenId, mintReferral, comment */
-    args: [
-      mintTo,
-      mintQuantity,
-      tokenContract,
-      BigInt(tokenId),
-      mintReferral || import_viem5.zeroAddress,
-      ""
-    ]
-  });
-}
 function makePrepareMint1155TokenParams({
   tokenContract,
   tokenId,
@@ -3845,8 +3798,7 @@ function makePrepareMint1155TokenParams({
   mintReferral,
   mintRecipient,
   quantityToMint,
-  allowListEntry,
-  chainId
+  allowListEntry
 }) {
   const mintQuantity = BigInt(quantityToMint || 1);
   const mintTo = mintRecipientOrAccount({ mintRecipient, minterAccount });
@@ -3865,16 +3817,21 @@ function makePrepareMint1155TokenParams({
     });
   }
   if (saleType === "timed") {
-    return makeZoraTimedSaleStrategyMintCall({
-      minterAccount,
-      salesConfigAndTokenInfo,
-      mintQuantity,
-      mintTo,
-      tokenContract,
-      tokenId,
-      mintReferral,
-      mintComment,
-      chainId
+    return makeContractParameters({
+      abi: import_protocol_deployments6.zoraTimedSaleStrategyABI,
+      functionName: "mint",
+      account: minterAccount,
+      address: salesConfigAndTokenInfo.salesConfig.address,
+      value: salesConfigAndTokenInfo.salesConfig.mintFeePerQuantity * mintQuantity,
+      /* args: mintTo, quantity, collection, tokenId, mintReferral, comment */
+      args: [
+        mintTo,
+        mintQuantity,
+        tokenContract,
+        BigInt(tokenId),
+        mintReferral || import_viem5.zeroAddress,
+        mintComment || ""
+      ]
     });
   }
   if (saleType === "erc20") {
@@ -4039,8 +3996,7 @@ async function getMint({
   params,
   mintGetter,
   premintGetter,
-  publicClient,
-  chainId
+  publicClient
 }) {
   const { tokenContract } = params;
   if (isOnChainMint(params)) {
@@ -4052,7 +4008,7 @@ async function getMint({
       preferredSaleType: params.preferredSaleType,
       blockTime
     });
-    return toMintableReturn(result, chainId);
+    return toMintableReturn(result);
   }
   const premint = await premintGetter.get({
     collectionAddress: tokenContract,
@@ -4090,12 +4046,11 @@ async function getMintsOfContract({
   params,
   mintGetter,
   premintGetter,
-  publicClient,
-  chainId
+  publicClient
 }) {
   const onchainMints = (await mintGetter.getContractMintable({
     tokenAddress: params.tokenContract
-  })).map((result) => toMintableReturn(result, chainId));
+  })).map(toMintableReturn);
   const offchainMints = await getPremintsOfContractMintable({
     mintGetter,
     premintGetter,
@@ -4212,15 +4167,14 @@ function parsePremint({
   }
   throw new Error("Invalid premint config version");
 }
-var makeOnchainPrepareMint = (result, chainId) => (params) => {
+var makeOnchainPrepareMint = (result) => (params) => {
   if (!result.salesConfig) {
     throw new Error("No valid sales config found for token");
   }
   return {
     parameters: makeOnchainMintCall({
       token: result,
-      mintParams: params,
-      chainId
+      mintParams: params
     }),
     erc20Approval: getRequiredErc20Approvals(params, result.salesConfig),
     costs: parseMintCosts({
@@ -4230,7 +4184,7 @@ var makeOnchainPrepareMint = (result, chainId) => (params) => {
     })
   };
 };
-function toMintableReturn(result, chainId) {
+function toMintableReturn(result) {
   const primaryMintActive = result.primaryMintActive;
   if (!primaryMintActive) {
     return {
@@ -4246,10 +4200,7 @@ function toMintableReturn(result, chainId) {
     primaryMintActive,
     primaryMintEnd: result.primaryMintEnd,
     secondaryMarketActive: result.secondaryMarketActive,
-    prepareMint: makeOnchainPrepareMint(
-      result.salesConfigAndTokenInfo,
-      chainId
-    )
+    prepareMint: makeOnchainPrepareMint(result.salesConfigAndTokenInfo)
   };
 }
 var makePremintPrepareMint = (mintable, mintFee, premint) => {
@@ -4312,13 +4263,11 @@ var MintClient = class {
   constructor({
     publicClient,
     premintGetter,
-    mintGetter,
-    chainId
+    mintGetter
   }) {
     this.publicClient = publicClient;
     this.mintGetter = mintGetter;
     this.premintGetter = premintGetter;
-    this.chainId = chainId;
   }
   /**
    * Returns the parameters needed to prepare a transaction mint a token.
@@ -4332,8 +4281,7 @@ var MintClient = class {
       parameters,
       publicClient: this.publicClient,
       mintGetter: this.mintGetter,
-      premintGetter: this.premintGetter,
-      chainId: this.chainId
+      premintGetter: this.premintGetter
     });
   }
   /**
@@ -4347,8 +4295,7 @@ var MintClient = class {
       params: parameters,
       mintGetter: this.mintGetter,
       premintGetter: this.premintGetter,
-      publicClient: this.publicClient,
-      chainId: this.chainId
+      publicClient: this.publicClient
     });
   }
   /**
@@ -4362,8 +4309,7 @@ var MintClient = class {
       params,
       mintGetter: this.mintGetter,
       premintGetter: this.premintGetter,
-      publicClient: this.publicClient,
-      chainId: this.chainId
+      publicClient: this.publicClient
     });
   }
   /**
@@ -4384,15 +4330,13 @@ async function mint({
   parameters,
   publicClient,
   mintGetter,
-  premintGetter,
-  chainId
+  premintGetter
 }) {
   const { prepareMint, primaryMintActive } = await getMint({
     params: parameters,
     mintGetter,
     premintGetter,
-    publicClient,
-    chainId
+    publicClient
   });
   if (!primaryMintActive) {
     throw new Error("Primary mint is not active");
@@ -4935,8 +4879,7 @@ function makeOnchainPrepareMintFromCreate({
   result,
   minter,
   getContractMintFee,
-  contractVersion,
-  chainId
+  contractVersion
 }) {
   return async (params) => {
     const subgraphSalesConfig = await toSalesStrategyFromSubgraph({
@@ -4952,8 +4895,7 @@ function makeOnchainPrepareMintFromCreate({
         },
         ...params,
         tokenContract: contractAddress,
-        tokenId,
-        chainId
+        tokenId
       }),
       costs: parseMintCosts({
         allowListEntry: params.allowListEntry,
@@ -5126,8 +5068,7 @@ async function createNew1155ContractAndToken({
     getContractMintFee: async () => getNewContractMintFee({
       publicClient,
       chainId
-    }),
-    chainId
+    })
   });
   return {
     parameters: request,
@@ -5173,8 +5114,7 @@ async function createNew1155Token({
     minter,
     result: newToken.salesConfig,
     tokenId: nextTokenId,
-    getContractMintFee: async () => mintFee,
-    chainId
+    getContractMintFee: async () => mintFee
   });
   return {
     parameters: request,
@@ -5762,7 +5702,7 @@ function buildCreatorERC20zs({
     query: `
     query ($address: Bytes!) {
       zoraCreateTokens(
-        where: { royalties_: { user: $address }, salesStrategies_: { type: "ZORA_TIMED" } }
+        where: { royalties_: { royaltyRecipient: $address }, salesStrategies_: { type: "ZORA_TIMED" } }
       ) {
         royalties {
           user
@@ -6077,13 +6017,10 @@ var ERROR_INSUFFICIENT_WALLET_FUNDS = "Insufficient wallet funds";
 var ERROR_INSUFFICIENT_POOL_SUPPLY = "Insufficient pool supply";
 var ERROR_SECONDARY_NOT_CONFIGURED = "Secondary not configured for given contract and token";
 var ERROR_SECONDARY_NOT_STARTED = "Secondary market has not started";
-var ERROR_RECIPIENT_MISMATCH = "Recipient must be the same as the caller if there is a comment";
 function makeError(errorMessage) {
   return { error: errorMessage };
 }
 async function makeBuy({
-  contract,
-  tokenId,
   erc20z,
   poolBalance,
   amount,
@@ -6092,106 +6029,20 @@ async function makeBuy({
   recipient,
   chainId,
   slippage,
-  publicClient,
-  comment
-}) {
-  const costWithSlippage = calculateSlippageUp(amount, slippage);
-  const accountAddress = addressOrAccountAddress(account);
-  const validationResult = await validateBuyConditions({
-    poolBalance,
-    quantity,
-    costWithSlippage,
-    accountAddress,
-    publicClient
-  });
-  if (validationResult.error) {
-    return makeError(validationResult.error);
-  }
-  if (comment && comment !== "") {
-    return handleBuyWithComment({
-      accountAddress,
-      recipient,
-      chainId,
-      quantity,
-      contract,
-      tokenId,
-      costWithSlippage,
-      comment,
-      account
-    });
-  }
-  return handleBuyWithoutComment({
-    erc20z,
-    quantity,
-    recipient,
-    accountAddress,
-    costWithSlippage,
-    chainId,
-    account
-  });
-}
-async function validateBuyConditions({
-  poolBalance,
-  quantity,
-  costWithSlippage,
-  accountAddress,
   publicClient
 }) {
+  const costWithSlippage = calculateSlippageUp(amount, slippage);
   const availableToBuy = poolBalance.erc20z / BigInt(1e18) - 1n;
+  const accountAddress = addressOrAccountAddress(account);
   const availableToSpend = await publicClient.getBalance({
     address: accountAddress
   });
   if (costWithSlippage > availableToSpend) {
-    return { error: ERROR_INSUFFICIENT_WALLET_FUNDS };
+    return makeError(ERROR_INSUFFICIENT_WALLET_FUNDS);
   }
   if (availableToBuy < BigInt(quantity)) {
-    return { error: ERROR_INSUFFICIENT_POOL_SUPPLY };
-  }
-  return {};
-}
-function handleBuyWithComment({
-  accountAddress,
-  recipient,
-  chainId,
-  quantity,
-  contract,
-  tokenId,
-  costWithSlippage,
-  comment,
-  account
-}) {
-  if (recipient && recipient !== accountAddress) {
-    return makeError(ERROR_RECIPIENT_MISMATCH);
+    return makeError(ERROR_INSUFFICIENT_POOL_SUPPLY);
   }
-  return {
-    parameters: makeContractParameters({
-      abi: import_protocol_deployments15.callerAndCommenterABI,
-      address: import_protocol_deployments15.callerAndCommenterAddress[chainId],
-      functionName: "buyOnSecondaryAndComment",
-      args: [
-        accountAddress,
-        quantity,
-        contract,
-        tokenId,
-        accountAddress,
-        costWithSlippage,
-        0n,
-        comment
-      ],
-      account,
-      value: costWithSlippage
-    })
-  };
-}
-function handleBuyWithoutComment({
-  erc20z,
-  quantity,
-  recipient,
-  accountAddress,
-  costWithSlippage,
-  chainId,
-  account
-}) {
   return {
     parameters: makeContractParameters({
       abi: import_protocol_deployments15.secondarySwapABI,
@@ -6218,8 +6069,7 @@ async function buyWithSlippage({
   chainId,
   account,
   slippage = UNISWAP_SLIPPAGE,
-  recipient,
-  comment
+  recipient
 }) {
   const secondaryInfo = await getSecondaryInfo({
     contract,
@@ -6246,8 +6096,6 @@ async function buyWithSlippage({
   );
   const call = await makeBuy({
     erc20z,
-    contract,
-    tokenId,
     poolBalance,
     amount,
     quantity,
@@ -6255,7 +6103,6 @@ async function buyWithSlippage({
     recipient,
     chainId,
     slippage,
-    comment,
     publicClient
   });
   return {
@@ -6445,8 +6292,7 @@ function createCollectorClient(params) {
   const mintClient = new MintClient({
     publicClient: params.publicClient,
     premintGetter: premintGetterToUse,
-    mintGetter: mintGetterToUse,
-    chainId: params.chainId
+    mintGetter: mintGetterToUse
   });
   const secondaryClient = new SecondaryClient({
     publicClient: params.publicClient,