@zoralabs/protocol-sdk 0.11.11-DEV.0 → 0.11.12

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,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"}
+{"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;AAMxC,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,CAiDrC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-sdk",
-  "version": "0.11.11-DEV.0",
+  "version": "0.11.12",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "type": "module",
@@ -16,7 +16,7 @@
     }
   },
   "dependencies": {
-    "@zoralabs/protocol-deployments": "^0.3.11-DEV.4"
+    "@zoralabs/protocol-deployments": "^0.4.0"
   },
   "peerDependencies": {
     "viem": "^2.21.21",

package/src/allow-list/allow-list-client.ts

@@ -2,30 +2,67 @@ import {
   IHttpClient,
   httpClient as defaultHttpClient,
 } from "src/apis/http-api-base";
-import { paths } from "../apis/generated/allow-list-api-types";
-import { Hex } from "viem";
+import { Address, decodeAbiParameters, encodeAbiParameters, Hex } from "viem";
 import { AllowList } from "./types";
 
-type AllowListCreateType = paths["/allowlist"]["post"];
-type AllowListCreateParameters =
-  AllowListCreateType["requestBody"]["content"]["application/json"];
+type AllowListCreateParameters = {
+  unhashedLeaves: Hex[];
+  leafTypeDescriptor: string[];
+  packedEncoding: boolean;
+};
+
 type AllowListCreateResponse = {
-  existing?: {
-    entries: AllowListCreateParameters["entries"];
-    root: string;
-    added: string;
-  };
-  success: boolean;
-  root: string;
-  associated_id?: string;
+  merkleRoot: Hex;
+};
+
+type LanyardResponse = {
+  proof: Hex[];
+  unhashedLeaf: Hex;
 };
 
-const ALLOW_LIST_API_BASE = "http://allowlist.zora.co/";
-type AllowListAllowedResponse = {
+const ALLOWLIST_ABI_PARAMETERS = [
+  { type: "address", name: "user" },
+  { type: "uint256", name: "maxCanMint" },
+  { type: "uint256", name: "price" },
+];
+
+const ALLOW_LIST_API_BASE = "https://lanyard.org/api/v1/";
+type AllowlistEntry = {
+  user: Address;
   maxCanMint: number;
-  price: string;
-  proof: string[];
-}[];
+  price: bigint;
+  priceDecimal: number;
+  proof: Hex[];
+};
+
+function getZoraEntry(
+  lanyardResponse: LanyardResponse | undefined,
+  root: string | undefined,
+): AllowlistEntry | undefined {
+  if (!lanyardResponse || !root) {
+    return;
+  }
+
+  try {
+    const [user, maxCanMint, price] = decodeAbiParameters(
+      ALLOWLIST_ABI_PARAMETERS,
+      lanyardResponse.unhashedLeaf,
+    );
+
+    return {
+      user: user as Address,
+      maxCanMint: Number(maxCanMint),
+      price: price as bigint,
+      // This won't realistically overflow.
+      priceDecimal: Number(price),
+      proof: lanyardResponse.proof,
+    };
+  } catch (e: any) {
+    console.error(e);
+    // Silently error here because the format is unexpected
+    return;
+  }
+}
 
 export const createAllowList = async ({
   allowList,
@@ -39,26 +76,22 @@ export const createAllowList = async ({
   const { post, retries } = httpClient;
 
   const data: AllowListCreateParameters = {
-    entries: allowList.entries.map((entry) => ({
-      user: entry.user,
-      maxCanMint: entry.maxCanMint,
-      price: entry.price.toString(),
-    })),
+    unhashedLeaves: allowList.entries.map((entry) =>
+      encodeAbiParameters(ALLOWLIST_ABI_PARAMETERS, [
+        entry.user,
+        entry.maxCanMint,
+        entry.price,
+      ]),
+    ),
+    leafTypeDescriptor: ["address", "uint256", "uint256"],
+    packedEncoding: false,
   };
 
   return (
-    await retries(() =>
-      post<AllowListCreateResponse>(`${baseUrl}allowlist`, data),
-    )
-  ).root;
+    await retries(() => post<AllowListCreateResponse>(`${baseUrl}tree`, data))
+  ).merkleRoot;
 };
 
-function padHex(value: string): Hex {
-  if (value.startsWith("0x")) return value as Hex;
-
-  return `0x${value}`;
-}
-
 export const getAllowListEntry = async ({
   merkleRoot,
   address,
@@ -73,24 +106,16 @@ export const getAllowListEntry = async ({
   const { retries, get } = httpClient;
 
   const response = await retries(() =>
-    get<AllowListAllowedResponse>(
-      `${baseUrl}allowed?user=${address}&root=${merkleRoot}`,
+    get<LanyardResponse>(
+      `${baseUrl}proof?address=${address}&root=${merkleRoot}`,
     ),
   );
 
-  const entries = response?.map((x) => ({
-    maxCanMint: x.maxCanMint,
-    price: BigInt(x.price),
-    proof: x.proof.map(padHex),
-  }));
-
-  const entry = entries?.sort(
-    (a, b) => Number(a.price) - Number(b.price) || b.maxCanMint - a.maxCanMint,
-  )[0];
+  const allowListEntry = getZoraEntry(response, merkleRoot);
 
   return {
-    accessAllowed: entry && entry?.proof?.length,
-    allowListEntry: entry,
+    accessAllowed: allowListEntry && allowListEntry?.proof?.length,
+    allowListEntry,
   };
 };
 

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

@@ -560,7 +560,7 @@ describe("create-helper", () => {
             "ipfs://bafkreice23maski3x52tsfqgxstx3kbiifnt5jotg3a5ynvve53c4soi2u",
           salesConfig: {
             type: "allowlistMint",
-            presaleMerkleRoot: `0x${root}`,
+            presaleMerkleRoot: root,
           },
         },
         account: creator,

package/src/create/minter-defaults.ts

@@ -10,8 +10,11 @@ import {
   TimedSaleParamsType,
 } from "./types";
 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");
+
+// The amount of eth per mint for the secondary market
+export const MARKET_REWARD_V2 = parseEther("0.0000222");
+// 1111 mints worth of market reward eth - 0.0000222 eth * 1,111 = 0.0246642 eth
+export const DEFAULT_MINIMUM_MARKET_ETH = parseEther("0.0246642");
 // 24 hour countdown
 export const DEFAULT_MARKET_COUNTDOWN = BigInt(24 * 60 * 60);
 
@@ -86,7 +89,7 @@ const getMinimumMarketEth = (
   >,
 ) => {
   if (params.minimumMintsForCountdown) {
-    return params.minimumMintsForCountdown * parseEther("0.0000111");
+    return params.minimumMintsForCountdown * MARKET_REWARD_V2;
   }
   return params.minimumMarketEth || DEFAULT_MINIMUM_MARKET_ETH;
 };
@@ -101,7 +104,7 @@ const timedSaleSettingsWithDefaults = (
     minimumMarketEth: params.minimumMarketEth,
     minimumMintsForCountdown: params.minimumMintsForCountdown,
   });
-  const minimumMintsForCountdown = minimumMarketEth / parseEther("0.0000111");
+  const minimumMintsForCountdown = minimumMarketEth / MARKET_REWARD_V2;
 
   return {
     type: "timed",

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

@@ -135,7 +135,7 @@ describe("rewardsClient", () => {
     30_000,
   );
   makeAnvilTest({
-    forkBlockNumber: 14653556,
+    forkBlockNumber: 17938475,
     forkUrl: forkUrls.zoraSepolia,
     anvilChainId: zoraSepolia.id,
   })(

package/src/secondary/utils.ts

@@ -5,6 +5,11 @@ import {
   zoraTimedSaleStrategyAddress,
 } from "@zoralabs/protocol-deployments";
 import { SecondaryInfo } from "./types";
+
+const LEGACY_MINIMUM_MARKET_ETH = parseEther("0.0123321");
+const LEGACY_MARKET_REWARD = parseEther("0.0000111");
+const MARKET_REWARD = parseEther("0.0000222");
+
 export async function getSecondaryInfo({
   contract,
   tokenId,
@@ -38,6 +43,12 @@ export async function getSecondaryInfo({
     return undefined;
   }
 
+  const usesLegacyMarketReward =
+    result.minimumMarketEth === LEGACY_MINIMUM_MARKET_ETH;
+  const erc20zBalance = await publicClient.getBalance({
+    address: result.erc20zAddress,
+  });
+
   return {
     erc20z: result.erc20zAddress,
     pool: result.poolAddress,
@@ -51,10 +62,11 @@ export async function getSecondaryInfo({
     minimumMintsForCountdown:
       result.minimumMarketEth === 0n
         ? undefined
-        : result.minimumMarketEth / parseEther("0.0000111"),
-    mintCount:
-      (await publicClient.getBalance({
-        address: result.erc20zAddress,
-      })) / parseEther("0.0000111"),
+        : usesLegacyMarketReward
+          ? result.minimumMarketEth / LEGACY_MARKET_REWARD
+          : result.minimumMarketEth / MARKET_REWARD,
+    mintCount: usesLegacyMarketReward
+      ? erc20zBalance / LEGACY_MARKET_REWARD
+      : erc20zBalance / MARKET_REWARD,
   };
 }

package/.env

@@ -1,3 +0,0 @@
-VITE_CONDUIT_KEY=066ae224-b5c3-4086-ac11-a3a44ede9458
-VITE_ALCHEMY_KEY=SMkQiSpoj4za3-0hO0eP78i3b0OrBT4k
-PRIVATE_KEY=0x3a751f9ab33f32f374bd8c800b7a78725b33744dbf0716ca359dcd042c4b31c8

package/dist/apis/generated/allow-list-api-types.d.ts

@@ -1,288 +0,0 @@
-/**
- * This file was auto-generated by openapi-typescript.
- * Do not make direct changes to the file.
- */
-export interface paths {
-    "/_health": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Health */
-        get: operations["health__health_get"];
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/allowlist": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        get?: never;
-        put?: never;
-        /**
-         * Add Allowlist
-         * @description This route adds a new allowlist
-         */
-        post: operations["add_allowlist_allowlist_post"];
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/allowed": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Allowed */
-        get: operations["allowed_allowed_get"];
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/allowlist/{root}": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Allowlist */
-        get: operations["allowlist_allowlist__root__get"];
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-    "/allowlist/{root}/count": {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        /** Allowlist Count */
-        get: operations["allowlist_count_allowlist__root__count_get"];
-        put?: never;
-        post?: never;
-        delete?: never;
-        options?: never;
-        head?: never;
-        patch?: never;
-        trace?: never;
-    };
-}
-export type webhooks = Record<string, never>;
-export interface components {
-    schemas: {
-        /**
-         * AllowlistEntry
-         * @description Currently matches zora-nft-drops model
-         */
-        AllowlistEntry: {
-            /** User */
-            user: string;
-            /** Price */
-            price: string;
-            /** Maxcanmint */
-            maxCanMint: number;
-        };
-        /** AllowlistRequest */
-        AllowlistRequest: {
-            /** Entries */
-            entries: components["schemas"]["AllowlistEntry"][];
-            /** Contract */
-            contract?: string;
-        };
-        /** HTTPValidationError */
-        HTTPValidationError: {
-            /** Detail */
-            detail?: components["schemas"]["ValidationError"][];
-        };
-        /** ValidationError */
-        ValidationError: {
-            /** Location */
-            loc: (string | number)[];
-            /** Message */
-            msg: string;
-            /** Error Type */
-            type: string;
-        };
-    };
-    responses: never;
-    parameters: never;
-    requestBodies: never;
-    headers: never;
-    pathItems: never;
-}
-export type $defs = Record<string, never>;
-export interface operations {
-    health__health_get: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": unknown;
-                };
-            };
-        };
-    };
-    add_allowlist_allowlist_post: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        requestBody: {
-            content: {
-                "application/json": components["schemas"]["AllowlistRequest"];
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": unknown;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    allowed_allowed_get: {
-        parameters: {
-            query: {
-                user: string;
-                root: string;
-            };
-            header?: never;
-            path?: never;
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": unknown;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    allowlist_allowlist__root__get: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path: {
-                root: string;
-            };
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": unknown;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    allowlist_count_allowlist__root__count_get: {
-        parameters: {
-            query?: never;
-            header?: never;
-            path: {
-                root: string;
-            };
-            cookie?: never;
-        };
-        requestBody?: never;
-        responses: {
-            /** @description Successful Response */
-            200: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": unknown;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                headers: {
-                    [name: string]: unknown;
-                };
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-}
-//# sourceMappingURL=allow-list-api-types.d.ts.map

package/dist/apis/generated/allow-list-api-types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"allow-list-api-types.d.ts","sourceRoot":"","sources":["../../../src/apis/generated/allow-list-api-types.ts"],"names":[],"mappings":"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"}