@zoralabs/protocol-sdk 0.11.4-COMMENTS.0 → 0.11.5

package/dist/secondary/secondary-client.d.ts

@@ -1,7 +1,7 @@
 import { Address } from "viem";
 import { PublicClient } from "src/utils";
 import { SimulateContractParametersWithAccount } from "src/types";
-import { QuotePrice, BuyWithSlippageInput, SellWithSlippageInput } from "./types";
+import { QuotePrice, BuyWithSlippageInput, SellWithSlippageInput, SecondaryInfo } from "./types";
 export declare const ERROR_SECONDARY_NOT_STARTED = "Secondary market has not started";
 type Call = {
     parameters: SimulateContractParametersWithAccount;
@@ -49,7 +49,7 @@ export declare class SecondaryClient {
     getSecondaryInfo({ contract, tokenId, }: {
         contract: Address;
         tokenId: bigint;
-    }): Promise<import("./types").SecondaryInfo | undefined>;
+    }): Promise<SecondaryInfo | undefined>;
     /**
      * Prepares a buy operation with slippage protection for purchasing a quantity of ERC1155 tokens with ETH on the secondary market.
      * @param input - The input parameters for the buy operation.

package/dist/secondary/secondary-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secondary-client.d.ts","sourceRoot":"","sources":["../../src/secondary/secondary-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAuB,MAAM,MAAM,CAAC;AAO7D,OAAO,EAA0B,YAAY,EAAE,MAAM,WAAW,CAAC;AAKjE,OAAO,EAAE,qCAAqC,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAUjB,eAAO,MAAM,2BAA2B,qCAAqC,CAAC;AAO9E,KAAK,IAAI,GACL;IAEE,UAAU,EAAE,qCAAqC,CAAC;IAClD,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,GACD;IACE,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA8DN,KAAK,2BAA2B,GAC5B,CAAC;IAEC,KAAK,EAAE,UAAU,CAAC;CACnB,GAAG,IAAI,CAAC,GACT;IACE,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB,CAAC;AAEN,wBAAsB,eAAe,CAAC,EACpC,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,OAAO,EACP,QAA2B,EAC3B,SAAS,GACV,EAAE,oBAAoB,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CA6CvC;AAsED,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,OAAO,EACP,QAA2B,EAC3B,SAAS,GACV,EAAE,qBAAqB,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAwCvC;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,OAAO,CAAS;IAExB;;;;OAIG;gBACS,EACV,YAAY,EACZ,OAAO,GACR,EAAE;QACD,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,MAAM,CAAC;KACjB;IAKD;;;;;OAKG;IACG,gBAAgB,CAAC,EACrB,QAAQ,EACR,OAAO,GACR,EAAE;QACD,QAAQ,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACjB;IASD;;;;OAIG;IACG,kBAAkB,CACtB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,2BAA2B,CAAC;IASvC;;;;OAIG;IACG,mBAAmB,CACvB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,2BAA2B,CAAC;CAQxC"}
+{"version":3,"file":"secondary-client.d.ts","sourceRoot":"","sources":["../../src/secondary/secondary-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,OAAO,EAAuB,MAAM,MAAM,CAAC;AAO7D,OAAO,EAA0B,YAAY,EAAE,MAAM,WAAW,CAAC;AAKjE,OAAO,EAAE,qCAAqC,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,qBAAqB,EACrB,aAAa,EACd,MAAM,SAAS,CAAC;AAUjB,eAAO,MAAM,2BAA2B,qCAAqC,CAAC;AAO9E,KAAK,IAAI,GACL;IAEE,UAAU,EAAE,qCAAqC,CAAC;IAClD,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,GACD;IACE,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AA8DN,KAAK,2BAA2B,GAC5B,CAAC;IAEC,KAAK,EAAE,UAAU,CAAC;CACnB,GAAG,IAAI,CAAC,GACT;IACE,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,UAAU,CAAC,EAAE,SAAS,CAAC;CACxB,CAAC;AAEN,wBAAsB,eAAe,CAAC,EACpC,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,OAAO,EACP,QAA2B,EAC3B,SAAS,GACV,EAAE,oBAAoB,GAAG;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CA6CvC;AAsED,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,OAAO,EACP,OAAO,EACP,QAA2B,EAC3B,SAAS,GACV,EAAE,qBAAqB,GAAG;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAwCvC;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,OAAO,CAAS;IAExB;;;;OAIG;gBACS,EACV,YAAY,EACZ,OAAO,GACR,EAAE;QACD,YAAY,EAAE,YAAY,CAAC;QAC3B,OAAO,EAAE,MAAM,CAAC;KACjB;IAKD;;;;;OAKG;IACG,gBAAgB,CAAC,EACrB,QAAQ,EACR,OAAO,GACR,EAAE;QACD,QAAQ,EAAE,OAAO,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;KACjB,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC;IAStC;;;;OAIG;IACG,kBAAkB,CACtB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,2BAA2B,CAAC;IASvC;;;;OAIG;IACG,mBAAmB,CACvB,KAAK,EAAE,qBAAqB,GAC3B,OAAO,CAAC,2BAA2B,CAAC;CAQxC"}

package/dist/secondary/types.d.ts

@@ -32,6 +32,12 @@ export type SecondaryInfo = {
     secondaryActivated: boolean;
     pool: Address;
     erc20z: Address;
+    name: string;
+    symbol: string;
+    saleStart: bigint;
     saleEnd?: bigint;
+    marketCountdown?: bigint;
+    minimumMintsForCountdown?: bigint;
+    mintCount: bigint;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/secondary/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/secondary/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAExC,MAAM,MAAM,cAAc,GAAG;IAE3B,QAAQ,EAAE,MAAM,CAAC;IAEjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAEvB,GAAG,EAAE,cAAc,CAAC;IAEpB,MAAM,EAAE,cAAc,CAAC;IAEvB,IAAI,EAAE,MAAM,OAAO,CAAC;QAElB,QAAQ,EAAE,MAAM,CAAC;QAEjB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;CACJ,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAE3B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE;QAEX,MAAM,EAAE,MAAM,CAAC;QAEf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAEjC,QAAQ,EAAE,OAAO,CAAC;IAElB,OAAO,EAAE,MAAM,CAAC;IAEhB,QAAQ,EAAE,MAAM,CAAC;IAEjB,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IAE3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAGF,MAAM,MAAM,qBAAqB,GAAG,oBAAoB,CAAC;AAEzD,MAAM,MAAM,aAAa,GAAG;IAE1B,kBAAkB,EAAE,OAAO,CAAC;IAE5B,IAAI,EAAE,OAAO,CAAC;IAEd,MAAM,EAAE,OAAO,CAAC;IAEhB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/secondary/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAExC,MAAM,MAAM,cAAc,GAAG;IAE3B,QAAQ,EAAE,MAAM,CAAC;IAEjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAEvB,GAAG,EAAE,cAAc,CAAC;IAEpB,MAAM,EAAE,cAAc,CAAC;IAEvB,IAAI,EAAE,MAAM,OAAO,CAAC;QAElB,QAAQ,EAAE,MAAM,CAAC;QAEjB,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;CACJ,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAE3B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE;QAEX,MAAM,EAAE,MAAM,CAAC;QAEf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IAEF,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IAEjC,QAAQ,EAAE,OAAO,CAAC;IAElB,OAAO,EAAE,MAAM,CAAC;IAEhB,QAAQ,EAAE,MAAM,CAAC;IAEjB,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IAE3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAGF,MAAM,MAAM,qBAAqB,GAAG,oBAAoB,CAAC;AAGzD,MAAM,MAAM,aAAa,GAAG;IAE1B,kBAAkB,EAAE,OAAO,CAAC;IAE5B,IAAI,EAAE,OAAO,CAAC;IAEd,MAAM,EAAE,OAAO,CAAC;IAEhB,IAAI,EAAE,MAAM,CAAC;IAEb,MAAM,EAAE,MAAM,CAAC;IAEf,SAAS,EAAE,MAAM,CAAC;IAElB,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAElC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC"}

package/dist/secondary/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/secondary/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAKzC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAsBrC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/secondary/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAc,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAKzC,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,wBAAsB,gBAAgB,CAAC,EACrC,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,OAAO,GACR,EAAE;IACD,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CA0CrC"}

package/dist/test-utils.d.ts

@@ -1,7 +1,6 @@
 import { zoraCreator1155FactoryImplAddress } from "@zoralabs/protocol-deployments";
 import { Address, Hex, PublicClient } from "viem";
-import { NewContractParams } from "./create/types";
-export declare const waitForSuccess: (hash: Hex, publicClient: PublicClient) => Promise<import("viem").TransactionReceipt>;
+export declare const waitForSuccess: (hash: Hex, publicClient: PublicClient) => Promise<void>;
 export declare const getFixedPricedMinter: ({ publicClient, chainId, }: {
     publicClient: PublicClient;
     chainId: keyof typeof zoraCreator1155FactoryImplAddress;
@@ -9,5 +8,4 @@ export declare const getFixedPricedMinter: ({ publicClient, chainId, }: {
 export declare const fixedPriceMinterMinterArguments: ({ mintRecipient, }: {
     mintRecipient: Address;
 }) => `0x${string}`;
-export declare function randomNewContract(): NewContractParams;
 //# sourceMappingURL=test-utils.d.ts.map

package/dist/test-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iCAAiC,EAClC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,OAAO,EACP,GAAG,EACH,YAAY,EAGb,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGnD,eAAO,MAAM,cAAc,SAAgB,GAAG,gBAAgB,YAAY,+CAQzE,CAAC;AAEF,eAAO,MAAM,oBAAoB,+BAG9B;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,OAAO,iCAAiC,CAAC;CACzD,2BAKG,CAAC;AAEL,eAAO,MAAM,+BAA+B,uBAEzC;IACD,aAAa,EAAE,OAAO,CAAC;CACxB,kBAAwE,CAAC;AAI1E,wBAAgB,iBAAiB,IAAI,iBAAiB,CAKrD"}
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iCAAiC,EAClC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,OAAO,EACP,GAAG,EACH,YAAY,EAGb,MAAM,MAAM,CAAC;AAGd,eAAO,MAAM,cAAc,SAAgB,GAAG,gBAAgB,YAAY,kBAMzE,CAAC;AAEF,eAAO,MAAM,oBAAoB,+BAG9B;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,OAAO,iCAAiC,CAAC;CACzD,2BAKG,CAAC;AAEL,eAAO,MAAM,+BAA+B,uBAEzC;IACD,aAAa,EAAE,OAAO,CAAC;CACxB,kBAAwE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-sdk",
-  "version": "0.11.4-COMMENTS.0",
+  "version": "0.11.5",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "type": "module",
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "abitype": "^1.0.2",
-    "@zoralabs/protocol-deployments": "^0.3.6-COMMENTS.0"
+    "@zoralabs/protocol-deployments": "^0.3.7"
   },
   "peerDependencies": {
     "viem": "^2.21.21"

package/src/create/1155-create-helper.test.ts

@@ -3,7 +3,7 @@ import {
   getContractAddressFromReceipt,
   getTokenIdFromCreateReceipt,
 } from "./1155-create-helper";
-import { createCreatorClient } from "src/sdk";
+import { createCollectorClient, createCreatorClient } from "src/sdk";
 import {
   zoraCreator1155ImplABI,
   zoraTimedSaleStrategyABI,
@@ -12,17 +12,25 @@ import {
 import { waitForSuccess } from "src/test-utils";
 import { Address, erc20Abi, parseEther, PublicClient } from "viem";
 import { makePrepareMint1155TokenParams } from "src/mint/mint-transactions";
-import { forkUrls, makeAnvilTest, writeContractWithRetries } from "src/anvil";
+import {
+  forkUrls,
+  makeAnvilTest,
+  simulateAndWriteContractWithRetries,
+  writeContractWithRetries,
+} from "src/anvil";
 import { zora } from "viem/chains";
 import { AllowList } from "src/allow-list/types";
 import { createAllowList } from "src/allow-list/allow-list-client";
+import { NewContractParams } from "./types";
 import { SubgraphContractGetter } from "./contract-getter";
 import {
   DEFAULT_MINIMUM_MARKET_ETH,
   DEFAULT_MARKET_COUNTDOWN,
 } from "./minter-defaults";
-import { randomNewContract } from "src/test-utils";
-import { demoTokenMetadataURI } from "src/fixtures/contract-setup";
+import {
+  demoContractMetadataURI,
+  demoTokenMetadataURI,
+} from "src/fixtures/contract-setup";
 
 const anvilTest = makeAnvilTest({
   forkUrl: forkUrls.zoraMainnet,
@@ -53,6 +61,13 @@ const minterIsMinterOnToken = async ({
   });
 };
 
+function randomNewContract(): NewContractParams {
+  return {
+    name: `testContract-${Math.round(Math.random() * 1_000_000)}`,
+    uri: demoContractMetadataURI,
+  };
+}
+
 describe("create-helper", () => {
   anvilTest(
     "when no sales config is provided, it creates a new 1155 contract and token using the timed sale strategy",
@@ -133,6 +148,74 @@ describe("create-helper", () => {
             ],
         }),
       ).toBe(true);
+
+      // get secondary info, minimum mints count should be 1111, sale end should be undefined,
+      // market countdown should be 24 hours
+
+      const collectorClient = createCollectorClient({
+        chainId: chain.id,
+        publicClient,
+      });
+
+      const secondaryInfo = await collectorClient.getSecondaryInfo({
+        contract: contractAddress,
+        tokenId: newTokenId,
+      });
+
+      expect(secondaryInfo).toBeDefined();
+      expect(secondaryInfo!.minimumMintsForCountdown).toBe(1111n);
+      expect(secondaryInfo!.secondaryActivated).toBe(false);
+      expect(secondaryInfo!.saleEnd).toBeUndefined();
+      expect(secondaryInfo!.marketCountdown).toBe(24n * 60n * 60n);
+    },
+    20 * 1000,
+  );
+  anvilTest(
+    "when minimumMintsForCountdown is set, it uses that as the minimum mints for countdown",
+    async ({ viemClients: { publicClient, walletClient, chain } }) => {
+      const addresses = await walletClient.getAddresses();
+      const creatorAddress = addresses[0]!;
+
+      const creatorClient = createCreatorClient({
+        chainId: chain.id,
+        publicClient: publicClient,
+      });
+
+      const saleStart = 5n;
+      const contract = randomNewContract();
+      const { parameters, contractAddress, newTokenId } =
+        await creatorClient.create1155({
+          contract,
+          token: {
+            tokenMetadataURI: demoTokenMetadataURI,
+            mintToCreatorCount: 1,
+            salesConfig: {
+              saleStart,
+              minimumMintsForCountdown: 500n,
+              marketCountdown: 100n,
+              type: "timed",
+            },
+          },
+          account: creatorAddress,
+        });
+
+      await simulateAndWriteContractWithRetries({
+        parameters,
+        walletClient,
+        publicClient,
+      });
+
+      const secondaryInfo = await createCollectorClient({
+        chainId: chain.id,
+        publicClient,
+      }).getSecondaryInfo({
+        contract: contractAddress,
+        tokenId: newTokenId,
+      });
+
+      expect(secondaryInfo).toBeDefined();
+      expect(secondaryInfo!.minimumMintsForCountdown).toBe(500n);
+      expect(secondaryInfo!.marketCountdown).toBe(100n);
     },
     20 * 1000,
   );

package/src/create/minter-defaults.ts

@@ -79,24 +79,38 @@ export const parseNameIntoSymbol = (name: string) => {
   return result;
 };
 
+const getMinimumMarketEth = (
+  params: Pick<
+    TimedSaleParamsType,
+    "minimumMarketEth" | "minimumMintsForCountdown"
+  >,
+) => {
+  if (params.minimumMintsForCountdown) {
+    return params.minimumMintsForCountdown * parseEther("0.0000111");
+  }
+  return params.minimumMarketEth || DEFAULT_MINIMUM_MARKET_ETH;
+};
+
 const timedSaleSettingsWithDefaults = (
   params: TimedSaleParamsType,
   contractName: string,
 ): Concrete<TimedSaleParamsType> => {
   // If the name is not provided, try to fetch it from the metadata
   const erc20Name = params.erc20Name || contractName;
-  const symbol = params.erc20Symbol || parseNameIntoSymbol(erc20Name);
-  const start = params.saleStart || 0n;
-  const countdown = params.marketCountdown || DEFAULT_MARKET_COUNTDOWN;
-  const minimumEth = params.minimumMarketEth || DEFAULT_MINIMUM_MARKET_ETH;
+  const minimumMarketEth = getMinimumMarketEth({
+    minimumMarketEth: params.minimumMarketEth,
+    minimumMintsForCountdown: params.minimumMintsForCountdown,
+  });
+  const minimumMintsForCountdown = minimumMarketEth / parseEther("0.0000111");
 
   return {
     type: "timed",
     erc20Name: erc20Name,
-    erc20Symbol: symbol,
-    saleStart: start,
-    marketCountdown: countdown,
-    minimumMarketEth: minimumEth,
+    erc20Symbol: params.erc20Symbol || parseNameIntoSymbol(erc20Name),
+    saleStart: params.saleStart || 0n,
+    marketCountdown: params.marketCountdown || DEFAULT_MARKET_COUNTDOWN,
+    minimumMarketEth,
+    minimumMintsForCountdown,
   };
 };
 

package/src/create/types.ts

@@ -33,12 +33,14 @@ export type TimedSaleParamsType = {
   erc20Name?: string;
   // Symbol of the erc20z token to create for the secondary sale.  If not provided, extracts it from the name.
   erc20Symbol?: string;
-  // Sale start time
+  // Earliest time a token can be minted.  If undefined or 0, then it can be minted immediately.  Defaults to 0n.
   saleStart?: bigint;
-  // Market countdown
+  // Market countdown that will start once the minimum mints for countdown is reached. Defaults to 24 hours.
   marketCountdown?: bigint;
-  // Minimum market ETH amount
+  // Deprecated: Use minimumMintsForCountdown instead.
   minimumMarketEth?: bigint;
+  // Minimum mints that will trigger the countdown.  Defaults to 1111
+  minimumMintsForCountdown?: bigint;
 };
 
 export type Erc20ParamsType = SaleStartAndEnd &

package/src/secondary/secondary-client.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, vi } from "vitest";
-import { parseEther } from "viem";
+import { parseEther, Address } from "viem";
 import { zoraSepolia } from "viem/chains";
 import {
   forkUrls,
@@ -8,7 +8,7 @@ import {
 } from "src/anvil";
 import { createCollectorClient } from "src/sdk";
 import { zoraCreator1155ImplABI } from "@zoralabs/protocol-deployments";
-import { setupContractAndToken } from "src/fixtures/contract-setup";
+import { SubgraphMintGetter } from "src/mint/subgraph-mint-getter";
 import { ERROR_SECONDARY_NOT_STARTED } from "./secondary-client";
 import { ISubgraphQuerier } from "src/apis/subgraph-querier";
 import { mockTimedSaleStrategyTokenQueryResult } from "src/fixtures/mint-query-results";
@@ -17,7 +17,7 @@ import { advanceToSaleAndAndLaunchMarket } from "src/fixtures/secondary";
 
 describe("secondary", () => {
   makeAnvilTest({
-    forkBlockNumber: 14653556,
+    forkBlockNumber: 16072399,
     forkUrl: forkUrls.zoraSepolia,
     anvilChainId: zoraSepolia.id,
   })(
@@ -25,16 +25,11 @@ describe("secondary", () => {
     async ({
       viemClients: { publicClient, chain, walletClient, testClient },
     }) => {
-      const creatorAccount = (await walletClient.getAddresses()!)[0]!;
       const collectorAccount = (await walletClient.getAddresses()!)[1]!;
 
-      const { contractAddress, newTokenId } = await setupContractAndToken({
-        chain,
-        publicClient,
-        creatorAccount,
-        walletClient,
-      });
-
+      const contractAddress: Address =
+        "0xd42557f24034b53e7340a40bb5813ef9ba88f2b4";
+      const newTokenId = 4n;
       await testClient.setBalance({
         address: collectorAccount,
         value: parseEther("100"),
@@ -50,7 +45,10 @@ describe("secondary", () => {
         tokenId: newTokenId,
       });
 
-      expect(secondaryInfo?.secondaryActivated).toBe(false);
+      expect(secondaryInfo).toBeDefined();
+
+      expect(secondaryInfo!.minimumMintsForCountdown).toBe(1111n);
+      expect(secondaryInfo!.secondaryActivated).toBe(false);
 
       const buyResult = await collectorClient.buy1155OnSecondary({
         account: collectorAccount,
@@ -65,7 +63,7 @@ describe("secondary", () => {
   );
 
   makeAnvilTest({
-    forkBlockNumber: 14653556,
+    forkBlockNumber: 16072399,
     forkUrl: forkUrls.zoraSepolia,
     anvilChainId: zoraSepolia.id,
   })(
@@ -73,16 +71,12 @@ describe("secondary", () => {
     async ({
       viemClients: { publicClient, chain, walletClient, testClient },
     }) => {
-      const creatorAccount = (await walletClient.getAddresses()!)[0]!;
       const collectorAccount = (await walletClient.getAddresses()!)[1]!;
 
-      const { contractAddress, newTokenId, mintGetter } =
-        await setupContractAndToken({
-          chain,
-          publicClient,
-          creatorAccount,
-          walletClient,
-        });
+      const mintGetter = new SubgraphMintGetter(chain.id);
+      const contractAddress: Address =
+        "0xd42557f24034b53e7340a40bb5813ef9ba88f2b4";
+      const newTokenId = 4n;
 
       await testClient.setBalance({
         address: collectorAccount,
@@ -109,13 +103,25 @@ describe("secondary", () => {
         mintGetter,
       });
 
+      const secondaryInfo = await collectorClient.getSecondaryInfo({
+        contract: contractAddress,
+        tokenId: newTokenId,
+      });
+
+      expect(secondaryInfo).toBeDefined();
+      expect(secondaryInfo!.mintCount).toBeGreaterThan(0n);
+
       // mint 1 less than expected minimum market.
       // make sure that there is no sale end
+      const quantityToMintFirst =
+        secondaryInfo!.minimumMintsForCountdown! -
+        secondaryInfo!.mintCount -
+        1n;
+
       const { parameters: collectParameters } = await collectorClient.mint({
         minterAccount: collectorAccount,
         mintType: "1155",
-        // mint 1 less than expected minimum market.
-        quantityToMint: 1111n - 1n,
+        quantityToMint: quantityToMintFirst,
         tokenId: newTokenId,
         tokenContract: contractAddress,
       });
@@ -245,7 +251,9 @@ describe("secondary", () => {
         args: [collectorAccount, newTokenId],
       });
 
-      expect(balance).toBe(1111n + quantityToBuy - quantityToSell);
+      expect(balance).toBe(
+        quantityToMintFirst + 1n + quantityToBuy - quantityToSell,
+      );
     },
     30_000,
   );

package/src/secondary/secondary-client.ts

@@ -15,6 +15,7 @@ import {
   QuotePrice,
   BuyWithSlippageInput,
   SellWithSlippageInput,
+  SecondaryInfo,
 } from "./types";
 
 // uniswap's auto slippage for L2s is 0.5% -> 0.005
@@ -331,7 +332,7 @@ export class SecondaryClient {
   }: {
     contract: Address;
     tokenId: bigint;
-  }) {
+  }): Promise<SecondaryInfo | undefined> {
     return getSecondaryInfo({
       contract,
       tokenId,

package/src/secondary/types.ts

@@ -52,13 +52,26 @@ export type BuyWithSlippageInput = {
 // Same structure as BuyWithSlippageInput
 export type SellWithSlippageInput = BuyWithSlippageInput;
 
+// Base type for shared properties
 export type SecondaryInfo = {
-  // Whether the secondary market is activated
+  // Boolean if the secondary market has been launched
   secondaryActivated: boolean;
-  // Address of the liquidity pool for the erc20z to WETH pair
+  // The Uniswap pool address
   pool: Address;
-  // Address of the erc20z token
+  // The ERC20z address
   erc20z: Address;
-  // Timestamp when the secondary market will end
+  // The ERC20Z name
+  name: string;
+  // The ERC20Z symbol
+  symbol: string;
+  // Earliest time in seconds a token can be minted
+  saleStart: bigint;
+  // Latest time in seconds a token can be minted. Gets set after the market countdown has started.
   saleEnd?: bigint;
+  // The amount of time after the `minimumMarketEth` is reached until the secondary market can be launched, in seconds.
+  marketCountdown?: bigint;
+  // minimum quantity of tokens that must have been minted to launch the countdown.
+  minimumMintsForCountdown?: bigint;
+  // mints so far
+  mintCount: bigint;
 };

package/src/secondary/utils.ts

@@ -1,4 +1,4 @@
-import { Address } from "viem";
+import { Address, parseEther } from "viem";
 import { PublicClient } from "src/utils";
 import {
   zoraTimedSaleStrategyABI,
@@ -16,15 +16,22 @@ export async function getSecondaryInfo({
   publicClient: PublicClient;
   chainId: number;
 }): Promise<SecondaryInfo | undefined> {
-  const result = await publicClient.readContract({
-    abi: zoraTimedSaleStrategyABI,
-    address:
-      zoraTimedSaleStrategyAddress[
-        chainId as keyof typeof zoraTimedSaleStrategyAddress
-      ],
-    functionName: "sale",
-    args: [contract, tokenId],
-  });
+  let result;
+
+  try {
+    result = await publicClient.readContract({
+      abi: zoraTimedSaleStrategyABI,
+      address:
+        zoraTimedSaleStrategyAddress[
+          chainId as keyof typeof zoraTimedSaleStrategyAddress
+        ],
+      functionName: "saleV2",
+      args: [contract, tokenId],
+    });
+  } catch (e) {
+    console.error(e);
+    return undefined;
+  }
 
   // if there is no erc20zAddress, we can assume that secondary market has not been configured for this contract and token.
   if (!result.erc20zAddress) {
@@ -36,5 +43,18 @@ export async function getSecondaryInfo({
     pool: result.poolAddress,
     secondaryActivated: result.secondaryActivated,
     saleEnd: result.saleEnd === 0n ? undefined : result.saleEnd,
+    saleStart: result.saleStart,
+    name: result.name,
+    symbol: result.symbol,
+    marketCountdown:
+      result.marketCountdown === 0n ? undefined : result.marketCountdown,
+    minimumMintsForCountdown:
+      result.minimumMarketEth === 0n
+        ? undefined
+        : result.minimumMarketEth / parseEther("0.0000111"),
+    mintCount:
+      (await publicClient.getBalance({
+        address: result.erc20zAddress,
+      })) / parseEther("0.0000111"),
   };
 }

package/src/test-utils.ts

@@ -9,7 +9,6 @@ import {
   encodeAbiParameters,
   parseAbiParameters,
 } from "viem";
-import { NewContractParams } from "./create/types";
 import { expect } from "vitest";
 
 export const waitForSuccess = async (hash: Hex, publicClient: PublicClient) => {
@@ -18,8 +17,6 @@ export const waitForSuccess = async (hash: Hex, publicClient: PublicClient) => {
   });
 
   expect(receipt.status).toBe("success");
-
-  return receipt;
 };
 
 export const getFixedPricedMinter = async ({
@@ -40,12 +37,3 @@ export const fixedPriceMinterMinterArguments = ({
 }: {
   mintRecipient: Address;
 }) => encodeAbiParameters(parseAbiParameters("address"), [mintRecipient]);
-
-const demoContractMetadataURI = "ipfs://DUMMY/contract.json";
-
-export function randomNewContract(): NewContractParams {
-  return {
-    name: `testContract-${Math.round(Math.random() * 1_000_000)}`,
-    uri: demoContractMetadataURI,
-  };
-}