@zoralabs/protocol-sdk 0.5.10 → 0.5.11

package/.turbo/turbo-build.log

@@ -9,7 +9,7 @@ $ tsup
 ESM Build start
 CJS dist/index.cjs     1.06 MB
 CJS dist/index.cjs.map 1.43 MB
-CJS ⚡️ Build success in 835ms
-ESM dist/index.js     1.06 MB
+CJS ⚡️ Build success in 845ms
+ESM dist/index.js     1.05 MB
 ESM dist/index.js.map 1.43 MB
-ESM ⚡️ Build success in 840ms
+ESM ⚡️ Build success in 856ms

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @zoralabs/protocol-sdk
 
+## 0.5.11
+
+### Patch Changes
+
+- 8e514b7: Cleanup protocol-sdk to have better docs around all methods, and remove methods that do not need to be exported and are not used.
+- 598a95b: Bumps protocol-sdk to use viem@2.x- see the [viem 2.X.X migration guide](https://viem.sh/docs/migration-guide#2xx-breaking-changes) for breaking changes when migratring from viem 1.X.X to 2.X.X
+- Updated dependencies [8e514b7]
+  - @zoralabs/protocol-deployments@0.1.8
+
 ## 0.5.10
 
 ### Patch Changes

package/README.md

@@ -9,6 +9,16 @@ Protocol SDK allows developers to create tokens using the Zora Protocol and mint
 - `npm install viem`
 - `npm install `
 
+
+## Examples
+
+- [Creating a mint from an on-chain contract](#creating-a-mint-from-an-on-chain-contract)
+- [Creating an 1155 contract](#creating-an-1155-contract)
+- [Premint: create a mint without paying gas](#premint-create-a-mint-without-paying-gas)
+- [Updating a premint before it is brought onchain](#updating-a-premint-before-it-is-brought-onchain)
+- [Deleting a premint before it is brought onchain](#deleting-a-premint-before-it-is-brought-onchain)
+- [Minting a premint and bringing it onchain](#minting-a-premint-and-bringing-it-onchain)
+
 ### Creating a mint from an on-chain contract
 
 #### Using viem

package/dist/create/1155-create-helper.d.ts

@@ -1,4 +1,4 @@
-import type { Address, Hex, PublicClient, SimulateContractParameters, TransactionReceipt } from "viem";
+import type { Account, Address, Hex, PublicClient, SimulateContractParameters, TransactionReceipt } from "viem";
 type SalesConfigParamsType = {
     pricePerToken?: bigint;
     saleStart?: bigint;
@@ -35,7 +35,7 @@ export declare function create1155TokenSetupArgs({ nextTokenId, mintToCreatorCou
 }): `0x${string}`[];
 export declare const getTokenIdFromCreateReceipt: (receipt: TransactionReceipt) => bigint | undefined;
 type CreateNew1155TokenReturn = {
-    request: SimulateContractParameters;
+    request: SimulateContractParameters<any, any, any, any, any, Account | Address>;
     tokenSetupActions: Hex[];
     contractAddress: Address;
     contractExists: boolean;

package/dist/create/1155-create-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"1155-create-helper.d.ts","sourceRoot":"","sources":["../../src/create/1155-create-helper.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,OAAO,EACP,GAAG,EACH,YAAY,EACZ,0BAA0B,EAC1B,kBAAkB,EACnB,MAAM,MAAM,CAAC;AAUd,KAAK,qBAAqB,GAAG;IAE3B,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;CAUjC,CAAC;AAKF,KAAK,YAAY,GACb;IACE,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GACD,OAAO,CAAC;AAEZ,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,EACvC,WAAW,EAEX,kBAAkB,EAClB,gBAAgB,EAEhB,uBAAuB,EAEvB,cAAc,EAEd,SAAS,EAET,OAAO,EACP,WAAW,EACX,eAAe,GAChB,EAAE;IACD,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB,EAAE,OAAO,CAAC;IACjC,WAAW,EAAE,qBAAqB,CAAC;IACnC,eAAe,CAAC,EAAE,mBAAmB,CAAC;CACvC,mBA+EA;AAED,eAAO,MAAM,2BAA2B,YAC7B,kBAAkB,KAC1B,MAAM,GAAG,SAaX,CAAC;AA4CF,KAAK,wBAAwB,GAAG;IAC9B,OAAO,EAAE,0BAA0B,CAAC;IACpC,iBAAiB,EAAE,GAAG,EAAE,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,EACtC,YAAY,GACb,EAAE;IACD,YAAY,EAAE,YAAY,CAAC;CAC5B;;iBAYY,OAAO;;;;kBAIN,YAAY;0BACJ,MAAM;;;;4CAIW;YACjC,OAAO,EAAE,MAAM,CAAC;YAChB,eAAe,EAAE,OAAO,CAAC;SAC1B,KAAK,GAAG,EAAE;UACT,QAAQ,wBAAwB,CAAC;EAiGtC"}
+{"version":3,"file":"1155-create-helper.d.ts","sourceRoot":"","sources":["../../src/create/1155-create-helper.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,OAAO,EACP,OAAO,EACP,GAAG,EACH,YAAY,EACZ,0BAA0B,EAC1B,kBAAkB,EACnB,MAAM,MAAM,CAAC;AAWd,KAAK,qBAAqB,GAAG;IAE3B,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;CAUjC,CAAC;AAKF,KAAK,YAAY,GACb;IACE,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,GACD,OAAO,CAAC;AAEZ,KAAK,mBAAmB,GAAG;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,wBAAgB,wBAAwB,CAAC,EACvC,WAAW,EAEX,kBAAkB,EAClB,gBAAgB,EAEhB,uBAAuB,EAEvB,cAAc,EAEd,SAAS,EAET,OAAO,EACP,WAAW,EACX,eAAe,GAChB,EAAE;IACD,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,OAAO,EAAE,OAAO,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB,EAAE,OAAO,CAAC;IACjC,WAAW,EAAE,qBAAqB,CAAC;IACnC,eAAe,CAAC,EAAE,mBAAmB,CAAC;CACvC,mBA+EA;AAED,eAAO,MAAM,2BAA2B,YAC7B,kBAAkB,KAC1B,MAAM,GAAG,SAaX,CAAC;AA4CF,KAAK,wBAAwB,GAAG;IAC9B,OAAO,EAAE,0BAA0B,CACjC,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,OAAO,GAAG,OAAO,CAClB,CAAC;IACF,iBAAiB,EAAE,GAAG,EAAE,CAAC;IACzB,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;CACzB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,EACtC,YAAY,GACb,EAAE;IACD,YAAY,EAAE,YAAY,CAAC;CAC5B;;iBAYY,OAAO;;;;kBAIN,YAAY;0BACJ,MAAM;;;;4CAIW;YACjC,OAAO,EAAE,MAAM,CAAC;YAChB,eAAe,EAAE,OAAO,CAAC;SAC1B,KAAK,GAAG,EAAE;UACT,QAAQ,wBAAwB,CAAC;EA2FtC"}

package/dist/index.cjs

@@ -6795,9 +6795,7 @@ __export(src_exports, {
   ZORA_API_BASE: () => ZORA_API_BASE,
   applyUpdateToPremint: () => applyUpdateToPremint,
   collectPremintV2WithMintsParams: () => collectPremintV2WithMintsParams,
-  collectPremintWithMintsTypedDataDefinition: () => collectPremintWithMintsTypedDataDefinition,
   collectWithMintsParams: () => collectWithMintsParams,
-  collectWithMintsTypedDataDefinition: () => collectWithMintsTypedDataDefinition,
   convertCollectionFromApi: () => convertCollectionFromApi,
   convertGetPremintApiResponse: () => convertGetPremintApiResponse,
   convertPremintFromApi: () => convertPremintFromApi,
@@ -6811,12 +6809,11 @@ __export(src_exports, {
   encodeCollectOnManager: () => encodeCollectOnManager,
   encodePostSignatureInput: () => encodePostSignatureInput,
   encodePremintForAPI: () => encodePremintForAPI,
-  encodePremintOnManager: () => encodePremintOnManager,
-  fixedPriceMinterMinterArguments: () => fixedPriceMinterMinterArguments,
   getApiNetworkConfigForChain: () => getApiNetworkConfigForChain,
   getDefaultFixedPriceMinterAddress: () => getDefaultFixedPriceMinterAddress,
   getMintCosts: () => getMintCosts,
   getMintsAccountBalanceWithPriceQuery: () => getMintsAccountBalanceWithPriceQuery,
+  getMintsEthPrice: () => getMintsEthPrice,
   getPremintCollectionAddress: () => getPremintCollectionAddress,
   getPremintExecutorAddress: () => getPremintExecutorAddress,
   getPremintMintCosts: () => getPremintMintCosts,
@@ -6825,26 +6822,27 @@ __export(src_exports, {
   getTokenIdFromCreateReceipt: () => getTokenIdFromCreateReceipt,
   isAuthorizedToCreatePremint: () => isAuthorizedToCreatePremint,
   isValidSignature: () => isValidSignature,
+  makeCallWithEthSafeTransferData: () => makeCallWithEthSafeTransferData,
   makeMintRewardsRecipient: () => makeMintRewardsRecipient,
   makeNewPremint: () => makeNewPremint,
+  makePermitToCollectPremintOrNonPremint: () => makePermitToCollectPremintOrNonPremint,
+  makePermitTransferBatchAndTypeData: () => makePermitTransferBatchAndTypeData,
+  makePermitTransferTypeData: () => makePermitTransferTypeData,
   markPremintDeleted: () => markPremintDeleted,
   migratePremintConfigToV2: () => migratePremintConfigToV2,
   mintWithEthParams: () => mintWithEthParams,
   mintsBalanceOfAccountParams: () => mintsBalanceOfAccountParams,
   permitBatchTypedDataDefinition: () => permitBatchTypedDataDefinition,
-  permitTransferBatchToManagerAndCallParams: () => permitTransferBatchToManagerAndCallParams,
   permitTransferTypedDataDefinition: () => permitTransferTypedDataDefinition,
   premintTypedDataDefinition: () => premintTypedDataDefinition,
   recoverCreatorFromCreatorAttribution: () => recoverCreatorFromCreatorAttribution,
   recoverPremintSigner: () => recoverPremintSigner,
-  safeTransferAndUnwrapEthParams: () => safeTransferAndUnwrapEthParams,
-  safeTransferAndUnwrapTypedDataDefinition: () => safeTransferAndUnwrapTypedDataDefinition,
-  safeTransferBatchAndUnwrapTypedDataDefinition: () => safeTransferBatchAndUnwrapTypedDataDefinition,
   selectMintsToCollectWithFromQueryResult: () => selectMintsToCollectWithFromQueryResult,
   sumBalances: () => sumBalances,
   supportedPremintVersions: () => supportedPremintVersions,
   supportsPremintVersion: () => supportsPremintVersion,
   tryRecoverPremintSigner: () => tryRecoverPremintSigner,
+  unwrapAndForwardEthPermitAndTypedDataDefinition: () => unwrapAndForwardEthPermitAndTypedDataDefinition,
   v1Types: () => v1Types,
   v2Types: () => v2Types
 });
@@ -7570,6 +7568,9 @@ var PremintAPIClient = class {
   }
 };
 
+// src/utils.ts
+var makeSimulateContractParamaters = (args) => args;
+
 // src/premint/premint-client.ts
 var defaultTokenConfigV1MintArguments = () => ({
   maxSupply: OPEN_EDITION_MINT_SIZE,
@@ -7932,7 +7933,7 @@ var PremintClient = class {
       })
     };
     if (premintConfigVersion === "1" /* V1 */) {
-      return {
+      return makeSimulateContractParamaters({
         account: minterAccount,
         abi: import_protocol_deployments2.zoraCreator1155PremintExecutorImplABI,
         functionName: "premintV1",
@@ -7945,9 +7946,9 @@ var PremintClient = class {
           numberToMint,
           mintArgumentsContract
         ]
-      };
+      });
     } else if (premintConfigVersion === "2" /* V2 */) {
-      return {
+      return makeSimulateContractParamaters({
         account: minterAccount,
         abi: import_protocol_deployments2.zoraCreator1155PremintExecutorImplABI,
         functionName: "premintV2",
@@ -7960,7 +7961,7 @@ var PremintClient = class {
           numberToMint,
           mintArgumentsContract
         ]
-      };
+      });
     }
     throw new Error(`Invalid premint config version ${premintConfigVersion}`);
   }
@@ -8111,7 +8112,7 @@ async function makePrepareMint721TokenParams({
     salesConfigAndTokenInfo,
     quantityToMint: BigInt(mintArguments.quantityToMint)
   }).totalCost;
-  const result = {
+  return makeSimulateContractParamaters({
     abi: zora721Abi,
     address: tokenAddress,
     account: minterAccount,
@@ -8123,8 +8124,7 @@ async function makePrepareMint721TokenParams({
       mintArguments.mintComment || "",
       mintArguments.mintReferral || import_viem5.zeroAddress
     ]
-  };
-  return result;
+  });
 }
 function getMintCosts({
   salesConfigAndTokenInfo,
@@ -8150,7 +8150,7 @@ async function makePrepareMint1155TokenParams({
     salesConfigAndTokenInfo,
     quantityToMint: mintQuantity
   }).totalCost;
-  const result = {
+  return makeSimulateContractParamaters({
     abi: import_protocol_deployments3.zoraCreator1155ImplABI,
     functionName: "mintWithRewards",
     account: minterAccount,
@@ -8167,8 +8167,7 @@ async function makePrepareMint1155TokenParams({
       ]),
       mintArguments.mintReferral || import_viem5.zeroAddress
     ]
-  };
-  return result;
+  });
 }
 
 // src/create/1155-create-helper.ts
@@ -8376,7 +8375,7 @@ function create1155CreatorClient({
       throw new Error("Invariant: contract cannot be missing and an address");
     }
     if (!contractExists && typeof contract !== "string") {
-      const request = {
+      const request = makeSimulateContractParamaters({
         abi: import_protocol_deployments4.zoraCreator1155FactoryImplABI,
         functionName: "createContractDeterministic",
         account,
@@ -8393,7 +8392,7 @@ function create1155CreatorClient({
           contract.defaultAdmin || account,
           tokenSetupActions
         ]
-      };
+      });
       return {
         request,
         tokenSetupActions,
@@ -8401,13 +8400,13 @@ function create1155CreatorClient({
         contractExists
       };
     } else if (contractExists) {
-      const request = {
+      const request = makeSimulateContractParamaters({
         abi: import_protocol_deployments4.zoraCreator1155ImplABI,
         functionName: "multicall",
         account,
         address: contractAddress,
         args: [tokenSetupActions]
-      };
+      });
       return {
         request,
         tokenSetupActions,
@@ -11743,30 +11742,26 @@ var sumBalances = (mintAccountBalances) => {
 // src/mints/mints-contracts.ts
 var import_protocol_deployments5 = require("@zoralabs/protocol-deployments");
 var import_viem7 = require("viem");
-function mintWithEthParams({
+var addressOrAccountAddress = (address) => typeof address === "string" ? address : address.address;
+var mintWithEthParams = ({
   quantity,
   recipient,
   chainId,
   pricePerMint,
   account
-}) {
-  return {
-    abi: import_protocol_deployments5.zoraMintsManagerImplConfig.abi,
-    address: import_protocol_deployments5.zoraMintsManagerImplConfig.address[chainId],
-    functionName: "mintWithEth",
-    args: [quantity, recipient],
-    value: pricePerMint * quantity,
-    account
-  };
-}
+}) => makeSimulateContractParamaters({
+  abi: import_protocol_deployments5.zoraMintsManagerImplConfig.abi,
+  address: import_protocol_deployments5.zoraMintsManagerImplConfig.address[chainId],
+  functionName: "mintWithEth",
+  args: [quantity, recipient || addressOrAccountAddress(account)],
+  value: pricePerMint * quantity,
+  account
+});
 var getPaidMintValue = (quantities, pricePerMint) => {
   if (!pricePerMint || pricePerMint === 0n)
     return;
   return quantities.reduce((a, b) => a + b, 0n) * pricePerMint;
 };
-var fixedPriceMinterMinterArguments = ({
-  mintRecipient
-}) => (0, import_viem7.encodeAbiParameters)((0, import_viem7.parseAbiParameters)("address"), [mintRecipient]);
 var mintsBalanceOfAccountParams = ({
   account,
   chainId
@@ -11795,88 +11790,57 @@ function collectWithMintsParams({
   tokenIds,
   quantities,
   chainId,
-  pricePerToken,
+  paidMintPricePerToken,
   account,
-  ...rest
+  mintArguments,
+  minter,
+  zoraCreator1155Contract,
+  zoraCreator1155TokenId
 }) {
   const call = encodeCollectOnManager({
     tokenIds,
     quantities,
-    ...rest
+    zoraCreator1155Contract,
+    zoraCreator1155TokenId,
+    minter,
+    mintArguments
   });
-  return {
+  return makeSimulateContractParamaters({
     abi: import_protocol_deployments5.zoraMints1155Config.abi,
     address: import_protocol_deployments5.zoraMints1155Config.address[chainId],
     functionName: "transferBatchToManagerAndCall",
     args: [tokenIds, quantities, call],
-    value: getPaidMintValue(quantities, pricePerToken),
+    // if it is a paid mint, the aadditional value will be sent to the manager contract and forwarded to the creator 1155 contract
+    // for the paid mint cost.
+    value: getPaidMintValue(quantities, paidMintPricePerToken),
     account
-  };
-}
-var collectWithMintsTypedDataDefinition = ({
-  tokenIds,
-  quantities,
-  chainId,
-  account,
-  nonce,
-  deadline,
-  ...rest
-}) => {
-  const safeTransferData = encodeCollectOnManager({
-    tokenIds,
-    quantities,
-    ...rest
-  });
-  return makePermitTransferBatchAndTypeData({
-    tokenIds,
-    quantities,
-    chainId,
-    account,
-    nonce,
-    deadline,
-    safeTransferData,
-    // will safe transfer to manager contract before doing the
-    // collect operation
-    to: import_protocol_deployments5.zoraMintsManagerImplConfig.address[chainId]
-  });
-};
-var collectPremintWithMintsTypedDataDefinition = ({
-  tokenIds,
-  quantities,
-  chainId,
-  account,
-  nonce,
-  deadline,
-  ...rest
-}) => {
-  const safeTransferData = encodePremintOnManager({
-    ...rest
   });
-  return makePermitTransferBatchAndTypeData({
-    tokenIds,
-    quantities,
-    chainId,
-    account,
-    nonce,
-    deadline,
-    safeTransferData,
-    // will safe transfer to manager contract before doing the
-    // collect operation
-    to: import_protocol_deployments5.zoraMintsManagerImplConfig.address[chainId]
+}
+function getMintsEthPrice({
+  publicClient
+}) {
+  const chainId = publicClient.chain?.id;
+  if (!chainId || !import_protocol_deployments5.zoraMintsManagerImplAddress[chainId]) {
+    throw new Error(`Chain id ${chainId} not supported`);
+  }
+  return publicClient.readContract({
+    abi: import_protocol_deployments5.zoraMintsManagerImplABI,
+    address: import_protocol_deployments5.zoraMintsManagerImplAddress[chainId],
+    functionName: "getEthPrice"
   });
-};
+}
 function makePermitTransferBatchAndTypeData({
   tokenIds,
   quantities,
   chainId,
-  account,
+  mintsOwner,
   to,
   nonce,
   deadline,
   safeTransferData
 }) {
   const permit = {
-    owner: typeof account === "string" ? account : account.address,
+    owner: typeof mintsOwner === "string" ? mintsOwner : mintsOwner.address,
     to,
     tokenIds,
     quantities,
@@ -11887,7 +11851,7 @@ function makePermitTransferBatchAndTypeData({
   const typedData = permitBatchTypedDataDefinition({
     chainId,
     permit,
-    account
+    account: mintsOwner
   });
   return {
     permit,
@@ -11898,14 +11862,14 @@ function makePermitTransferTypeData({
   tokenId,
   quantity,
   chainId,
-  account,
+  mintsOwner,
   to,
   nonce,
   deadline,
   safeTransferData
 }) {
   const permit = {
-    owner: typeof account === "string" ? account : account.address,
+    owner: typeof mintsOwner === "string" ? mintsOwner : mintsOwner.address,
     to,
     tokenId,
     quantity,
@@ -11916,7 +11880,7 @@ function makePermitTransferTypeData({
   const typedData = permitTransferTypedDataDefinition({
     chainId,
     permit,
-    account
+    account: mintsOwner
   });
   return {
     permit,
@@ -11940,10 +11904,42 @@ var encodePremintOnManager = ({
     signerContract
   ]
 });
+var makePermitToCollectPremintOrNonPremint = ({
+  mintsOwner,
+  chainId,
+  deadline,
+  tokenIds,
+  // this quantity of MINTs will be used to collect premint
+  // and will be burned.  This same quantity is the quantity of
+  // premint to collect.
+  quantities,
+  nonce,
+  premint,
+  collect
+}) => {
+  let safeTransferData;
+  if (premint) {
+    safeTransferData = encodePremintOnManager(premint);
+  } else if (collect) {
+    safeTransferData = encodeCollectOnManager(collect);
+  } else {
+    throw new Error("Invalid operation");
+  }
+  return makePermitTransferBatchAndTypeData({
+    tokenIds,
+    quantities,
+    chainId,
+    mintsOwner,
+    nonce,
+    deadline,
+    safeTransferData,
+    to: import_protocol_deployments5.zoraMintsManagerImplConfig.address[chainId]
+  });
+};
 function collectPremintV2WithMintsParams({
   tokenIds,
   quantities,
-  pricePerToken,
+  paidMintPricePerToken,
   account,
   chainId,
   ...rest
@@ -11951,14 +11947,14 @@ function collectPremintV2WithMintsParams({
   const call = encodePremintOnManager({
     ...rest
   });
-  return {
+  return makeSimulateContractParamaters({
     abi: import_protocol_deployments5.zoraMints1155Config.abi,
     address: import_protocol_deployments5.zoraMints1155Config.address[chainId],
     functionName: "transferBatchToManagerAndCall",
     args: [tokenIds, quantities, call],
-    value: getPaidMintValue(quantities, pricePerToken),
+    value: getPaidMintValue(quantities, paidMintPricePerToken),
     account
-  };
+  });
 }
 function makeTypeData(args) {
   return args;
@@ -12063,117 +12059,47 @@ function permitTransferTypedDataDefinition({
     account
   });
 }
-var permitTransferBatchToManagerAndCallParams = ({
-  permit,
-  chainId,
-  signature
-}) => {
-  const result = {
-    abi: import_protocol_deployments5.zoraMints1155Config.abi,
-    address: import_protocol_deployments5.zoraMints1155Config.address[chainId],
-    functionName: "permitSafeTransferBatch",
-    args: [permit, signature]
-  };
-  return result;
-};
-var safeTransferAndUnwrapTypedDataDefinition = ({
-  chainId,
-  tokenId,
-  quantity,
-  from,
-  addressToCall,
-  functionToCall,
-  valueToSend,
-  deadline,
-  nonce
-}) => {
-  const callArgument = (0, import_viem7.encodeFunctionData)({
-    abi: import_protocol_deployments5.iUnwrapAndForwardActionABI,
-    functionName: "callWithEth",
-    args: [addressToCall, functionToCall, valueToSend]
-  });
-  return makePermitTransferTypeData({
-    account: from,
-    chainId,
-    deadline,
-    tokenId,
-    quantity,
-    safeTransferData: callArgument,
-    to: import_protocol_deployments5.mintsEthUnwrapperAndCallerConfig.address[chainId],
-    nonce
+function decodeCallFailedError(error) {
+  if (error.data?.errorName !== "CallFailed")
+    throw new Error("Not a CallFailed error");
+  const internalErrorData = error.data?.args?.[0];
+  return (0, import_viem7.decodeErrorResult)({
+    abi: import_protocol_deployments5.zoraMintsManagerImplABI,
+    data: internalErrorData
   });
-};
-var safeTransferBatchAndUnwrapTypedDataDefinition = ({
+}
+
+// src/mints/mints-eth-unwrapper-and-caller.ts
+var import_protocol_deployments6 = require("@zoralabs/protocol-deployments");
+var import_viem8 = require("viem");
+var makeCallWithEthSafeTransferData = ({
+  address: addressToCall,
+  call: functionToCall,
+  value: valueToSend
+}) => (0, import_viem8.encodeFunctionData)({
+  abi: import_protocol_deployments6.iUnwrapAndForwardActionABI,
+  functionName: "callWithEth",
+  args: [addressToCall, functionToCall, valueToSend]
+});
+var unwrapAndForwardEthPermitAndTypedDataDefinition = ({
   chainId,
   tokenIds,
   quantities,
   from,
-  addressToCall,
-  functionToCall,
-  valueToSend,
+  callWithEth,
+  safeTransferData,
   deadline,
   nonce
-}) => {
-  const callArgument = (0, import_viem7.encodeFunctionData)({
-    abi: import_protocol_deployments5.iUnwrapAndForwardActionABI,
-    functionName: "callWithEth",
-    args: [addressToCall, functionToCall, valueToSend]
-  });
-  return makePermitTransferBatchAndTypeData({
-    account: from,
-    chainId,
-    deadline,
-    tokenIds,
-    quantities,
-    safeTransferData: callArgument,
-    to: import_protocol_deployments5.mintsEthUnwrapperAndCallerConfig.address[chainId],
-    nonce
-  });
-};
-var safeTransferAndUnwrapEthParams = ({
+}) => makePermitTransferBatchAndTypeData({
+  mintsOwner: from,
   chainId,
+  deadline,
   tokenIds,
   quantities,
-  from,
-  addressToCall,
-  functionToCall,
-  valueToSend
-}) => {
-  const callArgument = (0, import_viem7.encodeFunctionData)({
-    abi: import_protocol_deployments5.iUnwrapAndForwardActionABI,
-    functionName: "callWithEth",
-    args: [addressToCall, functionToCall, valueToSend]
-  });
-  const result = {
-    abi: import_protocol_deployments5.zoraMints1155Config.abi,
-    functionName: "safeBatchTransferFrom",
-    address: import_protocol_deployments5.zoraMints1155Config.address[chainId],
-    args: [
-      typeof from === "string" ? from : from.address,
-      // the mints will be transferred to this address, which
-      // will burn/redeem their eth value
-      import_protocol_deployments5.mintsEthUnwrapperAndCallerConfig.address[chainId],
-      // token ids to transfer/burn/unwrap - must be eth based tokens
-      tokenIds,
-      // quantities to transfer/burn/unwrap
-      quantities,
-      // this is the safeTransferData - which gets forwarded to the eth transferrer
-      callArgument
-    ],
-    // the account whos mints will be transferred from
-    account: from
-  };
-  return result;
-};
-function decodeCallFailedError(error) {
-  if (error.data?.errorName !== "CallFailed")
-    throw new Error("Not a CallFailed error");
-  const internalErrorData = error.data?.args?.[0];
-  return (0, import_viem7.decodeErrorResult)({
-    abi: import_protocol_deployments5.zoraMintsManagerImplABI,
-    data: internalErrorData
-  });
-}
+  safeTransferData: safeTransferData || makeCallWithEthSafeTransferData(callWithEth),
+  to: import_protocol_deployments6.mintsEthUnwrapperAndCallerAddress[chainId],
+  nonce
+});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_SALE_SETTINGS,
@@ -12185,9 +12111,7 @@ function decodeCallFailedError(error) {
   ZORA_API_BASE,
   applyUpdateToPremint,
   collectPremintV2WithMintsParams,
-  collectPremintWithMintsTypedDataDefinition,
   collectWithMintsParams,
-  collectWithMintsTypedDataDefinition,
   convertCollectionFromApi,
   convertGetPremintApiResponse,
   convertPremintFromApi,
@@ -12201,12 +12125,11 @@ function decodeCallFailedError(error) {
   encodeCollectOnManager,
   encodePostSignatureInput,
   encodePremintForAPI,
-  encodePremintOnManager,
-  fixedPriceMinterMinterArguments,
   getApiNetworkConfigForChain,
   getDefaultFixedPriceMinterAddress,
   getMintCosts,
   getMintsAccountBalanceWithPriceQuery,
+  getMintsEthPrice,
   getPremintCollectionAddress,
   getPremintExecutorAddress,
   getPremintMintCosts,
@@ -12215,26 +12138,27 @@ function decodeCallFailedError(error) {
   getTokenIdFromCreateReceipt,
   isAuthorizedToCreatePremint,
   isValidSignature,
+  makeCallWithEthSafeTransferData,
   makeMintRewardsRecipient,
   makeNewPremint,
+  makePermitToCollectPremintOrNonPremint,
+  makePermitTransferBatchAndTypeData,
+  makePermitTransferTypeData,
   markPremintDeleted,
   migratePremintConfigToV2,
   mintWithEthParams,
   mintsBalanceOfAccountParams,
   permitBatchTypedDataDefinition,
-  permitTransferBatchToManagerAndCallParams,
   permitTransferTypedDataDefinition,
   premintTypedDataDefinition,
   recoverCreatorFromCreatorAttribution,
   recoverPremintSigner,
-  safeTransferAndUnwrapEthParams,
-  safeTransferAndUnwrapTypedDataDefinition,
-  safeTransferBatchAndUnwrapTypedDataDefinition,
   selectMintsToCollectWithFromQueryResult,
   sumBalances,
   supportedPremintVersions,
   supportsPremintVersion,
   tryRecoverPremintSigner,
+  unwrapAndForwardEthPermitAndTypedDataDefinition,
   v1Types,
   v2Types
 });