@zoralabs/protocol-sdk 0.5.17 → 0.7.0

package/src/premint/contract-types.ts

@@ -28,11 +28,11 @@ export type ContractCreationConfigAndAddress = {
 export type ContractCreationConfigOrAddress =
   | {
       /** Parameters for creating the contract for new premints. */
-      collection: ContractCreationConfigWithOptionalAdditionalAdmins;
-      collectionAddress?: undefined;
+      contract: ContractCreationConfigWithOptionalAdditionalAdmins;
+      contractAddress?: undefined;
     }
   | {
-      collection?: undefined;
+      contract?: undefined;
       /** Premint collection address */
-      collectionAddress: Address;
+      contractAddress: Address;
     };

package/src/premint/conversions.ts

@@ -9,7 +9,10 @@ import {
   PremintConfigVersion,
   PremintConfigWithVersion,
 } from "@zoralabs/protocol-deployments";
-import { PremintSignatureGetResponse } from "./premint-api-client";
+import {
+  PremintSignatureGetOfCollectionResponse,
+  PremintSignatureGetResponse,
+} from "./premint-api-client";
 import { ContractCreationConfigOrAddress } from "./contract-types";
 
 export const convertCollectionFromApi = (
@@ -84,13 +87,34 @@ export const convertPremintFromApi = (
   }
 };
 
+export type PremintFromApi = ReturnType<typeof convertGetPremintApiResponse>;
+
 export const convertGetPremintApiResponse = (
   response: PremintSignatureGetResponse,
 ) => ({
-  ...convertPremintFromApi(response.premint),
   collection: convertCollectionFromApi(response.collection),
   collectionAddress: response.collection_address as Address,
   signature: response.signature as Hex,
+  signer: response.signer as Address,
+  premint: convertPremintFromApi(response.premint),
+});
+
+export type PremintCollectionFromApi = ReturnType<
+  typeof convertGetPremintOfCollectionApiResponse
+>;
+
+export const convertGetPremintOfCollectionApiResponse = (
+  response: PremintSignatureGetOfCollectionResponse,
+) => ({
+  collection: convertCollectionFromApi({
+    contractAdmin: response.contract_admin,
+    contractName: response.contract_name,
+    contractURI: response.contract_uri,
+  }),
+  premints: response.premints.map((premint) => ({
+    premint: convertPremintFromApi(premint),
+    signature: premint.signature as Hex,
+  })),
 });
 
 const encodePremintV1ForAPI = ({
@@ -150,8 +174,8 @@ export type PremintSignatureResponse =
  * @returns
  */
 export const encodePostSignatureInput = <T extends PremintConfigVersion>({
-  collection,
-  collectionAddress,
+  contract: collection,
+  contractAddress: collectionAddress,
   premintConfigVersion,
   premintConfig,
   signature,
@@ -172,3 +196,13 @@ export const encodePostSignatureInput = <T extends PremintConfigVersion>({
   collection_address: collectionAddress,
   chain_name: networkConfigByChain[chainId]!.zoraBackendChainName,
 });
+
+export const isPremintConfigV1 = (
+  premintConfigAndVersion: PremintConfigAndVersion,
+): premintConfigAndVersion is PremintConfigWithVersion<PremintConfigVersion.V1> =>
+  premintConfigAndVersion.premintConfigVersion === PremintConfigVersion.V1;
+
+export const isPremintConfigV2 = (
+  premintConfigAndVersion: PremintConfigAndVersion,
+): premintConfigAndVersion is PremintConfigWithVersion<PremintConfigVersion.V2> =>
+  premintConfigAndVersion.premintConfigVersion === PremintConfigVersion.V2;

package/src/premint/premint-api-client.ts

@@ -4,19 +4,19 @@ import {
 } from "../apis/http-api-base";
 import { components, paths } from "../apis/generated/premint-api-types";
 import { ZORA_API_BASE } from "../constants";
-import { NetworkConfig } from "src/apis/chain-constants";
-import { getApiNetworkConfigForChain } from "src/mint/mint-api-client";
+import { getApiNetworkConfigForChain } from "src/mint/subgraph-mint-getter";
 import {
-  ContractCreationConfig,
-  PremintConfigAndVersion,
   PremintConfigVersion,
   PremintConfigWithVersion,
 } from "@zoralabs/protocol-deployments";
 import { Address, Hex } from "viem";
 import {
+  PremintCollectionFromApi,
+  PremintFromApi,
   PremintSignatureRequestBody,
   PremintSignatureResponse,
   convertGetPremintApiResponse,
+  convertGetPremintOfCollectionApiResponse,
   encodePostSignatureInput,
 } from "./conversions";
 import { ContractCreationConfigOrAddress } from "./contract-types";
@@ -30,11 +30,14 @@ export type PremintNextUIDGetResponse =
 
 type SignaturePremintGetType =
   paths["/signature/{chain_name}/{collection_address}/{uid}"]["get"];
-type PremintSignatureGetPathParameters =
-  SignaturePremintGetType["parameters"]["path"];
 export type PremintSignatureGetResponse =
   SignaturePremintGetType["responses"][200]["content"]["application/json"];
 
+type SignaturePremintGetOfCollectionType =
+  paths["/signature/{chain_name}/{collection_address}"]["get"];
+export type PremintSignatureGetOfCollectionResponse =
+  SignaturePremintGetOfCollectionType["responses"][200]["content"]["application/json"];
+
 export type PremintCollection = PremintSignatureGetResponse["collection"];
 
 export type BackendChainNames = components["schemas"]["ChainName"];
@@ -50,57 +53,102 @@ const postSignature = async ({
   );
 
 const getNextUID = async ({
-  chain_name,
+  chainId,
   collection_address,
   httpClient: { retries, get } = defaultHttpClient,
-}: PremintNextUIDGetPathParameters & {
+}: Omit<PremintNextUIDGetPathParameters, "chain_name"> & {
+  chainId: number;
   httpClient?: Pick<IHttpClient, "retries" | "get">;
 }): Promise<PremintNextUIDGetResponse> =>
   retries(() =>
     get<PremintNextUIDGetResponse>(
-      `${ZORA_API_BASE}premint/signature/${chain_name}/${collection_address}/next_uid`,
+      `${ZORA_API_BASE}premint/signature/${
+        getApiNetworkConfigForChain(chainId).zoraBackendChainName
+      }/${collection_address}/next_uid`,
     ),
   );
 
-const getSignature = async ({
-  collection_address,
+export const getSignature = async ({
+  collectionAddress,
   uid,
-  chain_name,
+  chainId,
   httpClient: { retries, get } = defaultHttpClient,
-}: PremintSignatureGetPathParameters & {
+}: {
+  collectionAddress: Address;
+  uid: number;
+  chainId: number;
   httpClient?: Pick<IHttpClient, "retries" | "get">;
-}): Promise<
-  PremintSignatureGetResponse & {
-    premint_config_version?: PremintConfigVersion;
-  }
-> => {
+}): Promise<PremintFromApi> => {
+  const chainName = getApiNetworkConfigForChain(chainId).zoraBackendChainName;
   const result = await retries(() =>
     get<PremintSignatureGetResponse>(
-      `${ZORA_API_BASE}premint/signature/${chain_name}/${collection_address}/${uid}`,
+      `${ZORA_API_BASE}premint/signature/${chainName}/${collectionAddress.toLowerCase()}/${uid}`,
+    ),
+  );
+
+  return convertGetPremintApiResponse(result);
+};
+
+const getOfCollection = async ({
+  collectionAddress,
+  chainId,
+  httpClient: { retries, get } = defaultHttpClient,
+}: {
+  collectionAddress: Address;
+  chainId: number;
+  httpClient?: Pick<IHttpClient, "retries" | "get">;
+}) => {
+  const chainName = getApiNetworkConfigForChain(chainId).zoraBackendChainName;
+  const result = await retries(() =>
+    get<PremintSignatureGetOfCollectionResponse>(
+      `${ZORA_API_BASE}premint/signature/${chainName}/${collectionAddress.toLowerCase()}`,
     ),
   );
 
-  return result;
+  return convertGetPremintOfCollectionApiResponse(result);
 };
 
-class PremintAPIClient {
+export interface IPremintGetter {
+  get(params: {
+    collectionAddress: Address;
+    uid: number;
+  }): Promise<PremintFromApi>;
+
+  getOfCollection(params: {
+    collectionAddress: Address;
+  }): Promise<PremintCollectionFromApi>;
+}
+
+export interface IPremintAPI {
+  get: IPremintGetter["get"];
+
+  getOfCollection: IPremintGetter["getOfCollection"];
+
+  getNextUID(collectionAddress: Address): Promise<number>;
+
+  postSignature<T extends PremintConfigVersion>(
+    params: {
+      signature: Hex;
+    } & PremintConfigWithVersion<T> &
+      ContractCreationConfigOrAddress,
+  ): Promise<PremintSignatureResponse>;
+}
+
+class PremintAPIClient implements IPremintAPI {
+  chainId: number;
   httpClient: IHttpClient;
-  networkConfig: NetworkConfig;
 
   constructor(chainId: number, httpClient?: IHttpClient) {
+    this.chainId = chainId;
     this.httpClient = httpClient || defaultHttpClient;
-    this.networkConfig = getApiNetworkConfigForChain(chainId);
   }
-  postSignature = async <T extends PremintConfigVersion>({
+  postSignature: IPremintAPI["postSignature"] = ({
     signature,
     ...rest
-  }: {
-    signature: Hex;
-  } & PremintConfigWithVersion<T> &
-    ContractCreationConfigOrAddress): Promise<PremintSignatureResponse> => {
+  }): Promise<PremintSignatureResponse> => {
     const data = encodePostSignatureInput({
       ...rest,
-      chainId: this.networkConfig.chainId,
+      chainId: this.chainId,
       signature,
     });
     return postSignature({
@@ -109,36 +157,32 @@ class PremintAPIClient {
     });
   };
 
-  getNextUID = async (collectionAddress: Address): Promise<number> =>
+  getNextUID: IPremintAPI["getNextUID"] = async (collectionAddress) =>
     (
       await getNextUID({
         collection_address: collectionAddress.toLowerCase(),
-        chain_name: this.networkConfig.zoraBackendChainName,
+        chainId: this.chainId,
         httpClient: this.httpClient,
       })
     ).next_uid;
 
-  getSignature = async ({
-    collectionAddress,
-    uid,
-  }: {
-    collectionAddress: Address;
-    uid: number;
-  }): Promise<
-    {
-      signature: Hex;
-      collection: ContractCreationConfig | undefined;
-      collectionAddress: Address;
-    } & PremintConfigAndVersion
-  > => {
-    const response = await getSignature({
-      collection_address: collectionAddress.toLowerCase(),
+  get: IPremintAPI["get"] = async ({ collectionAddress, uid }) => {
+    return getSignature({
+      collectionAddress,
       uid,
-      chain_name: this.networkConfig.zoraBackendChainName,
+      chainId: this.chainId,
       httpClient: this.httpClient,
     });
+  };
 
-    return convertGetPremintApiResponse(response);
+  getOfCollection: IPremintAPI["getOfCollection"] = async ({
+    collectionAddress,
+  }) => {
+    return getOfCollection({
+      collectionAddress,
+      chainId: this.chainId,
+      httpClient: this.httpClient,
+    });
   };
 }
 

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

@@ -1,7 +1,6 @@
 import { zoraSepolia } from "viem/chains";
 import { describe, expect, vi } from "vitest";
 
-import { createPremintClient } from "./premint-client";
 import { PremintConfigVersion } from "./contract-types";
 import {
   getDefaultFixedPriceMinterAddress,
@@ -12,6 +11,8 @@ import {
   ContractCreationConfig,
   PremintConfigV2,
 } from "@zoralabs/protocol-deployments";
+import { PremintAPIClient } from "./premint-api-client";
+import { createCollectorClient, createCreatorClient } from "src/sdk";
 
 const anvilTest = makeAnvilTest({
   forkUrl: forkUrls.zoraSepolia,
@@ -24,13 +25,11 @@ describe("ZoraCreator1155Premint", () => {
     "can mint premints",
     async ({ viemClients: { walletClient, publicClient, chain } }) => {
       const [deployerAccount] = await walletClient.getAddresses();
-      const premintClient = createPremintClient({
-        chain,
-        publicClient,
-      });
 
-      premintClient.apiClient.getSignature = vi
-        .fn<any, ReturnType<typeof premintClient.apiClient.getSignature>>()
+      const premintApiClient = new PremintAPIClient(chain.id);
+
+      premintApiClient.get = vi
+        .fn<any, ReturnType<typeof premintApiClient.get>>()
         .mockResolvedValue({
           collection: {
             contractAdmin: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
@@ -40,49 +39,55 @@ describe("ZoraCreator1155Premint", () => {
             additionalAdmins: [],
           },
           collectionAddress: "0xf8dA7f53c283d898818af7FB9d98103F559bDac2",
-          premintConfig: {
-            deleted: false,
-            tokenConfig: {
-              fixedPriceMinter: getDefaultFixedPriceMinterAddress(chain.id),
-              maxSupply: 18446744073709551615n,
-              maxTokensPerAddress: 0n,
-              mintDuration: 604800n,
-              mintStart: 0n,
-              pricePerToken: 0n,
-              royaltyBPS: 1000,
-              royaltyMintSchedule: 0,
-              royaltyRecipient: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-              tokenURI:
-                "ipfs://bafkreice23maski3x52tsfqgxstx3kbiifnt5jotg3a5ynvve53c4soi2u",
+          premint: {
+            premintConfig: {
+              deleted: false,
+              tokenConfig: {
+                fixedPriceMinter: getDefaultFixedPriceMinterAddress(chain.id),
+                maxSupply: 18446744073709551615n,
+                maxTokensPerAddress: 0n,
+                mintDuration: 604800n,
+                mintStart: 0n,
+                pricePerToken: 0n,
+                royaltyBPS: 1000,
+                royaltyMintSchedule: 0,
+                royaltyRecipient: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
+                tokenURI:
+                  "ipfs://bafkreice23maski3x52tsfqgxstx3kbiifnt5jotg3a5ynvve53c4soi2u",
+              },
+              uid: 3,
+              version: 0,
             },
-            uid: 3,
-            version: 0,
+            premintConfigVersion: PremintConfigVersion.V1,
           },
-          premintConfigVersion: PremintConfigVersion.V1,
+          signer: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
           signature:
             "0x4d191dd60d428adfe507932a1758bee8ac5bbb77dcd3c05840c237416a3a25035bb8cc7c62177a4e9acb5f40c4032cdb3dbfefdd1575f2c3b4c57945b2076e2e1c",
         });
 
-      premintClient.apiClient.postSignature = vi.fn();
+      premintApiClient.postSignature = vi.fn();
 
-      const simulateContractParameters = await premintClient.makeMintParameters(
-        {
-          minterAccount: deployerAccount!,
-          tokenContract: "0xf8dA7f53c283d898818af7FB9d98103F559bDac2",
-          uid: 3,
-          mintArguments: {
-            quantityToMint: 1,
-            mintComment: "",
-          },
-        },
-      );
-      const { request: simulateRequest } = await publicClient.simulateContract(
-        simulateContractParameters,
-      );
+      const collectorClient = createCollectorClient({
+        chainId: chain.id,
+        publicClient,
+        premintGetter: premintApiClient,
+      });
+
+      const { parameters } = await collectorClient.mint({
+        mintType: "premint",
+        minterAccount: deployerAccount!,
+        tokenContract: "0xf8dA7f53c283d898818af7FB9d98103F559bDac2",
+        uid: 3,
+        quantityToMint: 1,
+        mintComment: "",
+      });
+      const { request: simulateRequest } =
+        await publicClient.simulateContract(parameters);
       const hash = await walletClient.writeContract(simulateRequest);
       const receipt = await publicClient.waitForTransactionReceipt({ hash });
+
       const { premintedLog, urls } =
-        premintClient.getDataFromPremintReceipt(receipt);
+        collectorClient.getCollectDataFromPremintReceipt(receipt);
 
       expect(urls).toEqual({
         explorer:
@@ -112,26 +117,29 @@ describe("ZoraCreator1155Premint - v2 signatures", () => {
     async ({ viemClients: { walletClient, publicClient, chain } }) => {
       const [creatorAccount, createReferralAccount] =
         await walletClient.getAddresses();
-      const premintClient = createPremintClient({
-        chain,
-        publicClient,
-      });
+      const premintApiClient = new PremintAPIClient(chain.id);
 
-      premintClient.apiClient.getNextUID = vi
-        .fn<any, ReturnType<typeof premintClient.apiClient.getNextUID>>()
+      premintApiClient.getNextUID = vi
+        .fn<any, ReturnType<typeof premintApiClient.getNextUID>>()
         .mockResolvedValue(3);
-      premintClient.apiClient.postSignature = vi
-        .fn<Parameters<typeof premintClient.apiClient.postSignature>>()
+      premintApiClient.postSignature = vi
+        .fn<Parameters<typeof premintApiClient.postSignature>>()
         .mockResolvedValue({ ok: true });
 
-      const { signAndSubmit } = await premintClient.createPremint({
-        collection: {
+      const creatorClient = createCreatorClient({
+        chainId: chain.id,
+        premintApi: premintApiClient,
+        publicClient,
+      });
+
+      const { signAndSubmit } = await creatorClient.createPremint({
+        contract: {
           contractAdmin: creatorAccount!,
           contractName: "Testing Contract Premint V2",
           contractURI:
             "ipfs://bafkreiainxen4b4wz4ubylvbhons6rembxdet4a262nf2lziclqvv7au3e",
         },
-        tokenCreationConfig: {
+        token: {
           tokenURI:
             "ipfs://bafkreice23maski3x52tsfqgxstx3kbiifnt5jotg3a5ynvve53c4soi2u",
           payoutRecipient: creatorAccount!,
@@ -146,22 +154,22 @@ describe("ZoraCreator1155Premint - v2 signatures", () => {
       });
 
       const expectedPostSignatureArgs: Parameters<
-        typeof premintClient.apiClient.postSignature
+        typeof premintApiClient.postSignature
       >[0] = {
-        collection: {
+        contract: {
           contractAdmin: creatorAccount!,
           contractName: "Testing Contract Premint V2",
           contractURI:
             "ipfs://bafkreiainxen4b4wz4ubylvbhons6rembxdet4a262nf2lziclqvv7au3e",
         },
-        collectionAddress: undefined,
+        contractAddress: undefined,
         premintConfig: {
           deleted: false,
           tokenConfig: {
             fixedPriceMinter: "0x6d28164C3CE04A190D5F9f0f8881fc807EAD975A",
             maxSupply: 18446744073709551615n,
             maxTokensPerAddress: 0n,
-            mintDuration: 604800n,
+            mintDuration: 0n,
             mintStart: 0n,
             pricePerToken: 0n,
             royaltyBPS: 1000,
@@ -175,10 +183,10 @@ describe("ZoraCreator1155Premint - v2 signatures", () => {
         },
         premintConfigVersion: PremintConfigVersion.V2,
         signature:
-          "0x5cc8c0ab240920282cf936d8b5eb1dd151a91ad78cc4e89f8ddeae6ea432ce7904a38e145b734bdd438f18d457451cb1ae28beb2c44bda71d58638dfcc071e1b1c",
+          "0xfe5725c05754ad17a73cc9706bf940e30bd7b4a674bb1b283a66a1cc87022c8c13fcf8989f9feb675f8932a6a8ddb8d16af2abef28fa2fff3282487ef5385b3d1b",
       };
 
-      expect(premintClient.apiClient.postSignature).toHaveBeenCalledWith(
+      expect(premintApiClient.postSignature).toHaveBeenCalledWith(
         expectedPostSignatureArgs,
       );
     },
@@ -190,9 +198,19 @@ describe("ZoraCreator1155Premint - v2 signatures", () => {
     async ({ viemClients: { walletClient, publicClient, chain } }) => {
       const [deployerAccount, creatorAccount, additionalAdmin] =
         await walletClient.getAddresses();
-      const premintClient = createPremintClient({
-        chain,
+
+      const premintApiClient = new PremintAPIClient(chain.id);
+
+      const collectorClient = createCollectorClient({
+        chainId: chain.id,
         publicClient,
+        premintGetter: premintApiClient,
+      });
+
+      const creatorClient = createCreatorClient({
+        chainId: chain.id,
+        publicClient,
+        premintApi: premintApiClient,
       });
 
       const collection: ContractCreationConfig = {
@@ -204,14 +222,14 @@ describe("ZoraCreator1155Premint - v2 signatures", () => {
       };
 
       const collectionAddress = await getPremintCollectionAddress({
-        collection,
+        contract: collection,
         publicClient,
       });
 
       const { premintConfig, typedDataDefinition } =
-        await premintClient.createPremint({
-          collection,
-          tokenCreationConfig: {
+        await creatorClient.createPremint({
+          contract: collection,
+          token: {
             tokenURI:
               "ipfs://bafkreice23maski3x52tsfqgxstx3kbiifnt5jotg3a5ynvve53c4soi2u",
             payoutRecipient: creatorAccount!,
@@ -223,36 +241,34 @@ describe("ZoraCreator1155Premint - v2 signatures", () => {
         account: additionalAdmin!,
       });
 
-      premintClient.apiClient.getSignature = vi
-        .fn<any, ReturnType<typeof premintClient.apiClient.getSignature>>()
+      premintApiClient.get = vi
+        .fn<any, ReturnType<typeof premintApiClient.get>>()
         .mockResolvedValue({
           collection,
           collectionAddress,
-          premintConfig: premintConfig as PremintConfigV2,
-          premintConfigVersion: PremintConfigVersion.V2,
+          premint: {
+            premintConfig: premintConfig as PremintConfigV2,
+            premintConfigVersion: PremintConfigVersion.V2,
+          },
+          signer: collection.contractAdmin,
           signature,
         });
 
-      premintClient.apiClient.postSignature = vi.fn();
-
-      const simulateContractParameters = await premintClient.makeMintParameters(
-        {
-          minterAccount: deployerAccount!,
-          tokenContract: collectionAddress,
-          uid: premintConfig.uid,
-          mintArguments: {
-            quantityToMint: 1,
-            mintComment: "",
-          },
-        },
-      );
-      const { request: simulateRequest } = await publicClient.simulateContract(
-        simulateContractParameters,
-      );
+      const { parameters } = await collectorClient.mint({
+        mintType: "premint",
+        uid: premintConfig.uid,
+        minterAccount: deployerAccount!,
+        tokenContract: collectionAddress,
+        quantityToMint: 1,
+        mintComment: "",
+      });
+      const { request: simulateRequest } =
+        await publicClient.simulateContract(parameters);
       const hash = await walletClient.writeContract(simulateRequest);
       const receipt = await publicClient.waitForTransactionReceipt({ hash });
+
       const { premintedLog, urls } =
-        premintClient.getDataFromPremintReceipt(receipt);
+        collectorClient.getCollectDataFromPremintReceipt(receipt);
 
       expect(urls).toEqual({
         explorer: `https://undefined/token/${collectionAddress}/instance/1`,