@zoralabs/protocol-sdk 0.11.7-COMMENTS.0 → 0.11.8

package/dist/index.js

@@ -3717,9 +3717,7 @@ import {
 import {
   erc20MinterABI,
   zoraCreator1155ImplABI as zoraCreator1155ImplABI2,
-  zoraTimedSaleStrategyABI,
-  callerAndCommenterABI,
-  callerAndCommenterAddress
+  zoraTimedSaleStrategyABI
 } from "@zoralabs/protocol-deployments";
 
 // src/mint/utils.ts
@@ -3737,8 +3735,7 @@ var contractSupportsNewMintFunction = (contractVersion) => {
 // src/mint/mint-transactions.ts
 function makeOnchainMintCall({
   token,
-  mintParams,
-  chainId
+  mintParams
 }) {
   if (token.mintType === "721") {
     return makePrepareMint721TokenParams({
@@ -3751,55 +3748,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: callerAndCommenterABI,
-      address: callerAndCommenterAddress[chainId],
-      functionName: "timedSaleMintAndComment",
-      account: minterAccount,
-      value: salesConfigAndTokenInfo.salesConfig.mintFeePerQuantity * mintQuantity,
-      args: [
-        mintTo,
-        mintQuantity,
-        tokenContract,
-        tokenId,
-        mintReferral || zeroAddress3,
-        mintComment
-      ]
-    });
-  }
-  return makeContractParameters({
-    abi: 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 || zeroAddress3,
-      ""
-    ]
-  });
-}
 function makePrepareMint1155TokenParams({
   tokenContract,
   tokenId,
@@ -3809,8 +3760,7 @@ function makePrepareMint1155TokenParams({
   mintReferral,
   mintRecipient,
   quantityToMint,
-  allowListEntry,
-  chainId
+  allowListEntry
 }) {
   const mintQuantity = BigInt(quantityToMint || 1);
   const mintTo = mintRecipientOrAccount({ mintRecipient, minterAccount });
@@ -3829,16 +3779,21 @@ function makePrepareMint1155TokenParams({
     });
   }
   if (saleType === "timed") {
-    return makeZoraTimedSaleStrategyMintCall({
-      minterAccount,
-      salesConfigAndTokenInfo,
-      mintQuantity,
-      mintTo,
-      tokenContract,
-      tokenId,
-      mintReferral,
-      mintComment,
-      chainId
+    return makeContractParameters({
+      abi: 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 || zeroAddress3,
+        mintComment || ""
+      ]
     });
   }
   if (saleType === "erc20") {
@@ -4003,8 +3958,7 @@ async function getMint({
   params,
   mintGetter,
   premintGetter,
-  publicClient,
-  chainId
+  publicClient
 }) {
   const { tokenContract } = params;
   if (isOnChainMint(params)) {
@@ -4016,7 +3970,7 @@ async function getMint({
       preferredSaleType: params.preferredSaleType,
       blockTime
     });
-    return toMintableReturn(result, chainId);
+    return toMintableReturn(result);
   }
   const premint = await premintGetter.get({
     collectionAddress: tokenContract,
@@ -4054,12 +4008,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,
@@ -4176,15 +4129,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({
@@ -4194,7 +4146,7 @@ var makeOnchainPrepareMint = (result, chainId) => (params) => {
     })
   };
 };
-function toMintableReturn(result, chainId) {
+function toMintableReturn(result) {
   const primaryMintActive = result.primaryMintActive;
   if (!primaryMintActive) {
     return {
@@ -4210,10 +4162,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) => {
@@ -4276,13 +4225,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.
@@ -4296,8 +4243,7 @@ var MintClient = class {
       parameters,
       publicClient: this.publicClient,
       mintGetter: this.mintGetter,
-      premintGetter: this.premintGetter,
-      chainId: this.chainId
+      premintGetter: this.premintGetter
     });
   }
   /**
@@ -4311,8 +4257,7 @@ var MintClient = class {
       params: parameters,
       mintGetter: this.mintGetter,
       premintGetter: this.premintGetter,
-      publicClient: this.publicClient,
-      chainId: this.chainId
+      publicClient: this.publicClient
     });
   }
   /**
@@ -4326,8 +4271,7 @@ var MintClient = class {
       params,
       mintGetter: this.mintGetter,
       premintGetter: this.premintGetter,
-      publicClient: this.publicClient,
-      chainId: this.chainId
+      publicClient: this.publicClient
     });
   }
   /**
@@ -4348,15 +4292,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");
@@ -4918,8 +4860,7 @@ function makeOnchainPrepareMintFromCreate({
   result,
   minter,
   getContractMintFee,
-  contractVersion,
-  chainId
+  contractVersion
 }) {
   return async (params) => {
     const subgraphSalesConfig = await toSalesStrategyFromSubgraph({
@@ -4935,8 +4876,7 @@ function makeOnchainPrepareMintFromCreate({
         },
         ...params,
         tokenContract: contractAddress,
-        tokenId,
-        chainId
+        tokenId
       }),
       costs: parseMintCosts({
         allowListEntry: params.allowListEntry,
@@ -5109,8 +5049,7 @@ async function createNew1155ContractAndToken({
     getContractMintFee: async () => getNewContractMintFee({
       publicClient,
       chainId
-    }),
-    chainId
+    })
   });
   return {
     parameters: request,
@@ -5156,8 +5095,7 @@ async function createNew1155Token({
     minter,
     result: newToken.salesConfig,
     tokenId: nextTokenId,
-    getContractMintFee: async () => mintFee,
-    chainId
+    getContractMintFee: async () => mintFee
   });
   return {
     parameters: request,
@@ -5616,7 +5554,10 @@ var getRewardsBalance = async ({
   // Interface for getting ERC20Z tokens for a creator
 }) => {
   const address = typeof account === "string" ? account : account.address;
-  const erc20Zs = await rewardsGetter.getErc20ZzForCreator({ address });
+  const erc20ZsAndSecondaryActivated = await rewardsGetter.getErc20ZzForCreator(
+    { address }
+  );
+  const validErc20Zs = erc20ZsAndSecondaryActivated.filter(({ secondaryActivated }) => secondaryActivated).map(({ erc20z }) => erc20z);
   const result = await publicClient.multicall({
     contracts: [
       {
@@ -5629,7 +5570,7 @@ var getRewardsBalance = async ({
         address: erc20ZRoyaltiesAddress[chainId],
         abi: erc20ZRoyaltiesABI,
         functionName: "getUnclaimedFeesBatch",
-        args: [erc20Zs]
+        args: [validErc20Zs]
       }
     ],
     multicallAddress: multicall3Address,
@@ -5662,9 +5603,10 @@ var makeClaimSecondaryRoyaltiesCalls = async ({
   chainId,
   rewardsGetter
 }) => {
-  const erc20z = await rewardsGetter.getErc20ZzForCreator({
-    address: claimFor
-  });
+  const erc20ZsAndSecondaryActivated = await rewardsGetter.getErc20ZzForCreator(
+    { address: claimFor }
+  );
+  const erc20z = erc20ZsAndSecondaryActivated.filter(({ secondaryActivated }) => secondaryActivated).map(({ erc20z: erc20z2 }) => erc20z2);
   const royaltiesAddress = erc20ZRoyaltiesAddress[chainId];
   if (erc20z.length === 0) {
     return [];
@@ -5764,13 +5706,14 @@ 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
         }
         salesStrategies {
           zoraTimedMinter {
+            secondaryActivated
             erc20Z {
               id
             }
@@ -5791,15 +5734,23 @@ var SubgraphRewardsGetter = class extends SubgraphGetter {
   constructor(chainId, subgraphQuerier) {
     super(chainId, subgraphQuerier);
   }
-  async getErc20ZzForCreator({
-    address
-  }) {
+  async getErc20ZzForCreator({ address }) {
     const queryResults = await this.querySubgraphWithRetries(
       buildCreatorERC20zs({ address })
     );
-    return queryResults?.map(
-      (result) => result.salesStrategies[0].zoraTimedMinter.erc20Z.id
-    ) || [];
+    const results = (queryResults?.map((result) => {
+      const timedMinter = result.salesStrategies[0].zoraTimedMinter;
+      if (!timedMinter) {
+        return null;
+      }
+      return {
+        secondaryActivated: timedMinter.secondaryActivated,
+        erc20z: timedMinter.erc20Z.id
+      };
+    }) || []).filter(
+      (idAndActivated) => !!idAndActivated
+    );
+    return results;
   }
 };
 
@@ -5809,9 +5760,7 @@ import {
   secondarySwapAddress,
   zoraCreator1155ImplABI as zoraCreator1155ImplABI7,
   safeTransferSwapAbiParameters,
-  secondarySwapABI,
-  callerAndCommenterABI as callerAndCommenterABI2,
-  callerAndCommenterAddress as callerAndCommenterAddress2
+  secondarySwapABI
 } from "@zoralabs/protocol-deployments";
 
 // src/secondary/uniswap/uniswapQuote.ts
@@ -6099,13 +6048,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,
@@ -6114,106 +6060,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: callerAndCommenterABI2,
-      address: callerAndCommenterAddress2[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: secondarySwapABI,
@@ -6240,8 +6100,7 @@ async function buyWithSlippage({
   chainId,
   account,
   slippage = UNISWAP_SLIPPAGE,
-  recipient,
-  comment
+  recipient
 }) {
   const secondaryInfo = await getSecondaryInfo({
     contract,
@@ -6268,8 +6127,6 @@ async function buyWithSlippage({
   );
   const call = await makeBuy({
     erc20z,
-    contract,
-    tokenId,
     poolBalance,
     amount,
     quantity,
@@ -6277,7 +6134,6 @@ async function buyWithSlippage({
     recipient,
     chainId,
     slippage,
-    comment,
     publicClient
   });
   return {
@@ -6467,8 +6323,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,