@zoralabs/protocol-sdk 0.11.3-COMMENTS.0 → 0.11.3

package/dist/preminter.d.ts

@@ -27,8 +27,8 @@ export declare const preminterTypedDataDefinition: ({ verifyingContract, premint
     domain?: {
         chainId?: number | undefined;
         name?: string | undefined;
-        salt?: import("abitype").ResolvedRegister["bytesType"]["outputs"] | undefined;
-        verifyingContract?: Address | undefined;
+        salt?: import("viem").ResolvedRegister["bytesType"]["outputs"] | undefined;
+        verifyingContract?: import("viem").Address | undefined;
         version?: string | undefined;
     } | undefined;
     message: Record<string, unknown>;

package/dist/preminter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preminter.d.ts","sourceRoot":"","sources":["../src/preminter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EACL,qCAAqC,IAAI,YAAY,EAEtD,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAGL,GAAG,EACH,YAAY,EACb,MAAM,MAAM,CAAC;AAEd,KAAK,aAAa,GAAG,kBAAkB,CACrC,OAAO,YAAY,EACnB,WAAW,CACZ,CAAC,QAAQ,CAAC,CAAC;AAEZ,KAAK,sBAAsB,GAAG,6BAA6B,CAAC,aAAa,CAAC,CAAC;AAE3E,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAC/D,MAAM,MAAM,aAAa,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AACtD,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;AAI/D,eAAO,MAAM,4BAA4B,mDAItC;IACD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB;;;;;;;;;;;;;;;;eAsGsqE,+CAA8B;;;;;CAzDpsE,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,EACvC,eAAe,EACf,qBAAqB,EACrB,aAAa,EACb,SAAS,EACT,OAAO,EACP,YAAY,GACb,EAAE;IACD,eAAe,EAAE,OAAO,CAAC;IACzB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,GAAG,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,GAAG,OAAO,CAAC;IACV,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC,CAqCD"}
+{"version":3,"file":"preminter.d.ts","sourceRoot":"","sources":["../src/preminter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EACL,qCAAqC,IAAI,YAAY,EAEtD,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAGL,GAAG,EACH,YAAY,EACb,MAAM,MAAM,CAAC;AAEd,KAAK,aAAa,GAAG,kBAAkB,CACrC,OAAO,YAAY,EACnB,WAAW,CACZ,CAAC,QAAQ,CAAC,CAAC;AAEZ,KAAK,sBAAsB,GAAG,6BAA6B,CAAC,aAAa,CAAC,CAAC;AAE3E,MAAM,MAAM,sBAAsB,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AAC/D,MAAM,MAAM,aAAa,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;AACtD,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAAC,aAAa,CAAC,CAAC;AAI/D,eAAO,MAAM,4BAA4B,mDAItC;IACD,iBAAiB,EAAE,OAAO,CAAC;IAC3B,aAAa,EAAE,aAAa,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;CACjB;;;;;;;;;;;;;;;;eAsGgoE,4CAA8B;;;;;CAzD9pE,CAAC;AAEF,wBAAsB,kBAAkB,CAAC,EACvC,eAAe,EACf,qBAAqB,EACrB,aAAa,EACb,SAAS,EACT,OAAO,EACP,YAAY,GACb,EAAE;IACD,eAAe,EAAE,OAAO,CAAC;IACzB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,SAAS,EAAE,GAAG,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,GAAG,OAAO,CAAC;IACV,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC,CAqCD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-sdk",
-  "version": "0.11.3-COMMENTS.0",
+  "version": "0.11.3",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "type": "module",
@@ -17,10 +17,10 @@
   },
   "dependencies": {
     "abitype": "^1.0.2",
-    "@zoralabs/protocol-deployments": "^0.3.5-COMMENTS.0"
+    "@zoralabs/protocol-deployments": "^0.3.5"
   },
   "peerDependencies": {
-    "viem": "^2.13.2"
+    "viem": "^2.21.21"
   },
   "devDependencies": {
     "@lavamoat/preinstall-always-fail": "2.0.0",

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

@@ -22,10 +22,10 @@ import {
   DEFAULT_MINIMUM_MARKET_ETH,
   DEFAULT_MARKET_COUNTDOWN,
 } from "./minter-defaults";
-
-export const demoTokenMetadataURI =
-  "ipfs://bafkreice23maski3x52tsfqgxstx3kbiifnt5jotg3a5ynvve53c4soi2u";
-export const demoContractMetadataURI = "ipfs://DUMMY/contract.json";
+import {
+  demoContractMetadataURI,
+  demoTokenMetadataURI,
+} from "src/fixtures/contract-setup";
 
 const anvilTest = makeAnvilTest({
   forkUrl: forkUrls.zoraMainnet,
@@ -101,7 +101,9 @@ describe("create-helper", () => {
         publicClient,
       });
       expect(receipt).not.toBeNull();
-      expect(receipt.to).to.equal("0x777777c338d93e2c7adf08d102d45ca7cc4ed021");
+      expect(receipt.to?.toLowerCase()).to.equal(
+        "0x777777c338d93e2c7adf08d102d45ca7cc4ed021".toLowerCase(),
+      );
       expect(getTokenIdFromCreateReceipt(receipt)).to.be.equal(1n);
       expect(getContractAddressFromReceipt(receipt)).to.be.equal(
         contractAddress,
@@ -299,7 +301,10 @@ describe("create-helper", () => {
         walletClient,
         publicClient,
       });
-      expect(receipt.to).to.equal("0x777777c338d93e2c7adf08d102d45ca7cc4ed021");
+
+      expect(receipt.to?.toLowerCase()).to.equal(
+        "0x777777c338d93e2c7adf08d102d45ca7cc4ed021".toLowerCase(),
+      );
       expect(getTokenIdFromCreateReceipt(receipt)).to.be.equal(newTokenId);
 
       expect(

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

@@ -219,7 +219,7 @@ async function createNew1155ContractAndToken({
   });
 
   const contractAddress = await getDeterministicContractAddress({
-    account,
+    account: typeof account === "string" ? account : account.address,
     publicClient,
     setupActions: tokenSetupActions,
     chainId,
@@ -327,7 +327,7 @@ function prepareSetupActions({
     setupActions: tokenSetupActions,
   } = constructCreate1155TokenCalls({
     chainId: chainId,
-    ownerAddress: account,
+    ownerAddress: typeof account === "string" ? account : account.address,
     contractVersion,
     nextTokenId,
     ...token,

package/src/create/minter-defaults.ts

@@ -9,10 +9,9 @@ import {
   ConcreteSalesConfig,
   TimedSaleParamsType,
 } from "./types";
-
-// 200 mints worth of eth
-export const DEFAULT_MINIMUM_MARKET_ETH = 2220000000000000n;
-
+import { parseEther } from "viem";
+// 1111 mints worth of market reward eth - 0.0000111 eth * 1,111 = 0.0123321 eth
+export const DEFAULT_MINIMUM_MARKET_ETH = parseEther("0.0123321");
 // 24 hour countdown
 export const DEFAULT_MARKET_COUNTDOWN = BigInt(24 * 60 * 60);
 

package/src/create/types.ts

@@ -63,7 +63,7 @@ export type SalesConfigParamsType =
   | TimedSaleParamsType;
 
 export type CreateNew1155ParamsBase = {
-  account: Address;
+  account: Address | Account;
   getAdditionalSetupActions?: (args: { tokenId: bigint }) => Hex[];
   token: CreateNew1155TokenProps;
 };

package/src/fixtures/contract-setup.ts

@@ -1,13 +1,13 @@
 import { Address, Chain, PublicClient, WalletClient } from "viem";
 import { simulateAndWriteContractWithRetries } from "src/anvil";
 import { createCreatorClient } from "src/sdk";
-import {
-  demoContractMetadataURI,
-  demoTokenMetadataURI,
-} from "src/create/1155-create-helper.test";
 import { SubgraphMintGetter } from "src/mint/subgraph-mint-getter";
 import { SubgraphRewardsGetter } from "../rewards/subgraph-rewards-getter";
 
+export const demoTokenMetadataURI =
+  "ipfs://bafkreice23maski3x52tsfqgxstx3kbiifnt5jotg3a5ynvve53c4soi2u";
+export const demoContractMetadataURI = "ipfs://DUMMY/contract.json";
+
 export async function setupContractAndToken({
   chain,
   publicClient,

package/src/fixtures/secondary.ts

@@ -0,0 +1,69 @@
+import { Address, Account, PublicClient, TestClient, WalletClient } from "viem";
+import { CollectorClient } from "../sdk";
+import { simulateAndWriteContractWithRetries } from "../anvil";
+import { makeContractParameters } from "../utils";
+import {
+  zoraTimedSaleStrategyABI,
+  zoraTimedSaleStrategyAddress,
+} from "@zoralabs/protocol-deployments";
+
+export async function advanceToSaleAndAndLaunchMarket({
+  contractAddress,
+  tokenId,
+  testClient,
+  publicClient,
+  walletClient,
+  collectorClient,
+  chainId,
+  account,
+}: {
+  contractAddress: Address;
+  tokenId: bigint;
+  testClient: TestClient;
+  publicClient: PublicClient;
+  walletClient: WalletClient;
+  collectorClient: CollectorClient;
+  chainId: number;
+  account: Address | Account;
+}) {
+  const saleInfo = await collectorClient.getSecondaryInfo({
+    contract: contractAddress,
+    tokenId,
+  });
+
+  if (!saleInfo) {
+    throw new Error("Sale not set");
+  }
+
+  if (!saleInfo.saleEnd) {
+    throw new Error("Sale end not set");
+  }
+
+  const saleEnd = saleInfo.saleEnd;
+
+  // advance to end of sale
+  await testClient.setNextBlockTimestamp({
+    timestamp: saleEnd,
+  });
+
+  await testClient.mine({
+    blocks: 1,
+  });
+
+  // advance to end of sale
+  // launch the market
+  await simulateAndWriteContractWithRetries({
+    parameters: makeContractParameters({
+      abi: zoraTimedSaleStrategyABI,
+      functionName: "launchMarket",
+      args: [contractAddress, tokenId],
+      address:
+        zoraTimedSaleStrategyAddress[
+          chainId as keyof typeof zoraTimedSaleStrategyAddress
+        ],
+      account: account,
+    }),
+    publicClient,
+    walletClient,
+  });
+}

package/src/mint/subgraph-mint-getter.ts

@@ -180,7 +180,7 @@ function getTargetStrategy({
   );
 
   const stillValidSalesStrategies = parsedStrategies.filter(
-    (strategy) => strategy.saleActive,
+    (strategy) => strategy.saleActive || strategy.secondaryMarketActive,
   );
 
   const saleStrategies = stillValidSalesStrategies.sort((a, b) =>

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

@@ -18,7 +18,7 @@ import {
 import { makeContractParameters } from "src/utils";
 import { mockRewardsQueryResults } from "src/fixtures/rewards-query-results";
 import { setupContractAndToken } from "src/fixtures/contract-setup";
-import { advanceToSaleAndAndLaunchMarket } from "src/secondary/secondary-client.test";
+import { advanceToSaleAndAndLaunchMarket } from "src/fixtures/secondary";
 
 describe("rewardsClient", () => {
   makeAnvilTest({
@@ -146,7 +146,7 @@ describe("rewardsClient", () => {
         value: parseEther("100"),
       });
 
-      const quantityToMint = 10_000n;
+      const quantityToMint = 1111n;
 
       mintGetter.subgraphQuerier.query = vi
         .fn<ISubgraphQuerier["query"]>()

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

@@ -1,12 +1,5 @@
 import { describe, expect, vi } from "vitest";
-import {
-  Address,
-  parseEther,
-  PublicClient,
-  TestClient,
-  WalletClient,
-  Account,
-} from "viem";
+import { parseEther } from "viem";
 import { zoraSepolia } from "viem/chains";
 import {
   forkUrls,
@@ -14,69 +7,13 @@ import {
   simulateAndWriteContractWithRetries,
 } from "src/anvil";
 import { createCollectorClient } from "src/sdk";
-import {
-  zoraCreator1155ImplABI,
-  zoraTimedSaleStrategyABI,
-  zoraTimedSaleStrategyAddress,
-} from "@zoralabs/protocol-deployments";
-import { makeContractParameters } from "src/utils";
+import { zoraCreator1155ImplABI } from "@zoralabs/protocol-deployments";
 import { setupContractAndToken } from "src/fixtures/contract-setup";
-import { CollectorClient } from "src/sdk";
 import { ERROR_SECONDARY_NOT_STARTED } from "./secondary-client";
 import { ISubgraphQuerier } from "src/apis/subgraph-querier";
 import { mockTimedSaleStrategyTokenQueryResult } from "src/fixtures/mint-query-results";
 import { new1155ContractVersion } from "src/create/contract-setup";
-
-export async function advanceToSaleAndAndLaunchMarket({
-  contractAddress,
-  tokenId,
-  testClient,
-  publicClient,
-  walletClient,
-  collectorClient,
-  chainId,
-  account,
-}: {
-  contractAddress: Address;
-  tokenId: bigint;
-  testClient: TestClient;
-  publicClient: PublicClient;
-  walletClient: WalletClient;
-  collectorClient: CollectorClient;
-  chainId: number;
-  account: Address | Account;
-}) {
-  const saleEnd = (await collectorClient.getSecondaryInfo({
-    contract: contractAddress,
-    tokenId,
-  }))!.saleEnd!;
-
-  // advance to end of sale
-  await testClient.setNextBlockTimestamp({
-    timestamp: saleEnd,
-  });
-
-  await testClient.mine({
-    blocks: 1,
-  });
-
-  // advance to end of sale
-  // launch the market
-  await simulateAndWriteContractWithRetries({
-    parameters: makeContractParameters({
-      abi: zoraTimedSaleStrategyABI,
-      functionName: "launchMarket",
-      args: [contractAddress, tokenId],
-      address:
-        zoraTimedSaleStrategyAddress[
-          chainId as keyof typeof zoraTimedSaleStrategyAddress
-        ],
-      account: account,
-    }),
-    publicClient,
-    walletClient,
-  });
-}
+import { advanceToSaleAndAndLaunchMarket } from "src/fixtures/secondary";
 
 describe("secondary", () => {
   makeAnvilTest({
@@ -152,8 +89,6 @@ describe("secondary", () => {
         value: parseEther("100"),
       });
 
-      const quantityToMint = 100_000n;
-
       mintGetter.subgraphQuerier.query = vi
         .fn<ISubgraphQuerier["query"]>()
         .mockResolvedValue({
@@ -174,10 +109,13 @@ describe("secondary", () => {
         mintGetter,
       });
 
+      // mint 1 less than expected minimum market.
+      // make sure that there is no sale end
       const { parameters: collectParameters } = await collectorClient.mint({
         minterAccount: collectorAccount,
         mintType: "1155",
-        quantityToMint,
+        // mint 1 less than expected minimum market.
+        quantityToMint: 1111n - 1n,
         tokenId: newTokenId,
         tokenContract: contractAddress,
       });
@@ -188,6 +126,37 @@ describe("secondary", () => {
         publicClient,
       });
 
+      // make sure that there is no sale end
+      let saleEnd = (await collectorClient.getSecondaryInfo({
+        contract: contractAddress,
+        tokenId: newTokenId,
+      }))!.saleEnd;
+
+      expect(saleEnd).toBeUndefined();
+
+      // mint 1 more - this should cause the countdown to start
+      const { parameters: collectMoreParameters } = await collectorClient.mint({
+        minterAccount: collectorAccount,
+        mintType: "1155",
+        quantityToMint: 1n,
+        tokenId: newTokenId,
+        tokenContract: contractAddress,
+      });
+
+      await simulateAndWriteContractWithRetries({
+        parameters: collectMoreParameters,
+        walletClient,
+        publicClient,
+      });
+
+      // now there should be a sale end
+      saleEnd = (await collectorClient.getSecondaryInfo({
+        contract: contractAddress,
+        tokenId: newTokenId,
+      }))!.saleEnd;
+
+      expect(saleEnd).toBeDefined();
+
       await advanceToSaleAndAndLaunchMarket({
         contractAddress,
         tokenId: newTokenId,
@@ -276,7 +245,7 @@ describe("secondary", () => {
         args: [collectorAccount, newTokenId],
       });
 
-      expect(balance).toBe(quantityToMint + quantityToBuy - quantityToSell);
+      expect(balance).toBe(1111n + quantityToBuy - quantityToSell);
     },
     30_000,
   );

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

@@ -1,3 +0,0 @@
-export declare const demoTokenMetadataURI = "ipfs://bafkreice23maski3x52tsfqgxstx3kbiifnt5jotg3a5ynvve53c4soi2u";
-export declare const demoContractMetadataURI = "ipfs://DUMMY/contract.json";
-//# sourceMappingURL=1155-create-helper.test.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"1155-create-helper.test.d.ts","sourceRoot":"","sources":["../../src/create/1155-create-helper.test.ts"],"names":[],"mappings":"AAyBA,eAAO,MAAM,oBAAoB,uEACqC,CAAC;AACvE,eAAO,MAAM,uBAAuB,+BAA+B,CAAC"}