@zoralabs/protocol-sdk 0.5.13 → 0.5.15

package/src/mints/mints-contracts.ts

@@ -8,9 +8,9 @@ import {
 } from "@zoralabs/protocol-deployments";
 import { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from "abitype";
 import {
-  MintArguments as PremintMintArguments,
+  PremintMintArguments,
   PremintConfigV2,
-} from "src/premint/contract-types";
+} from "@zoralabs/protocol-deployments";
 import { ContractCreationConfig } from "src/preminter";
 import { makeSimulateContractParamaters } from "src/utils";
 import {

package/src/mints/mints-queries.ts

@@ -1,8 +1,7 @@
 import { Address } from "viem";
-import { gql } from "graphql-request";
 
 export const getMintsAccountBalanceWithPriceQuery = (account: Address) => {
-  const query = gql`
+  const query = `
     query GetMintAccountBalances($account: String!) {
       mintAccountBalances(where: { account: $account }) {
         balance

package/src/premint/contract-types.ts

@@ -1,57 +1,7 @@
-import { ExtractAbiFunction, AbiParametersToPrimitiveTypes } from "abitype";
-import { zoraCreator1155PremintExecutorImplABI as preminterAbi } from "@zoralabs/protocol-deployments";
-
-type PremintV1Inputs = ExtractAbiFunction<
-  typeof preminterAbi,
-  "premintV1"
->["inputs"];
-
-type PremintV1HashDataTypes = AbiParametersToPrimitiveTypes<PremintV1Inputs>;
-
-export type ContractCreationConfig = PremintV1HashDataTypes[0];
-
-export type PremintConfigV1 = PremintV1HashDataTypes[1];
-export type TokenCreationConfigV1 = PremintConfigV1["tokenConfig"];
-
-export type MintArguments = PremintV1HashDataTypes[4];
-
-type PremintV2Inputs = ExtractAbiFunction<
-  typeof preminterAbi,
-  "premintV2"
->["inputs"];
-
-type PremintV2HashDataTypes = AbiParametersToPrimitiveTypes<PremintV2Inputs>;
-
-export type PremintConfigV2 = PremintV2HashDataTypes[1];
-export type TokenCreationConfigV2 = PremintConfigV2["tokenConfig"];
+import { PremintConfigVersion as PremintConfigVersionOrig } from "@zoralabs/protocol-deployments";
 
 export enum PremintConfigVersion {
-  V1 = "1",
-  V2 = "2",
+  V1 = PremintConfigVersionOrig.V1,
+  V2 = PremintConfigVersionOrig.V2,
+  V3 = PremintConfigVersionOrig.V3,
 }
-
-export type PremintConfigForVersion<T extends PremintConfigVersion> =
-  T extends PremintConfigVersion.V1 ? PremintConfigV1 : PremintConfigV2;
-
-export type PremintConfigWithVersion<T extends PremintConfigVersion> = {
-  premintConfig: PremintConfigForVersion<T>;
-  premintConfigVersion: T;
-};
-
-export type PremintConfigAndVersion =
-  | PremintConfigWithVersion<PremintConfigVersion.V1>
-  | PremintConfigWithVersion<PremintConfigVersion.V2>;
-
-export type PremintConfig = PremintConfigV1 | PremintConfigV2;
-export type TokenCreationConfig = TokenCreationConfigV1 | TokenCreationConfigV2;
-
-export type PremintConfigForTokenCreationConfig<T extends TokenCreationConfig> =
-  T extends TokenCreationConfigV1 ? PremintConfigV1 : PremintConfigV2;
-
-export type TokenConfigForVersion<T extends PremintConfigVersion> =
-  PremintConfigForVersion<T>["tokenConfig"];
-
-export type TokenConfigWithVersion<T extends PremintConfigVersion> = {
-  tokenConfig: TokenConfigForVersion<T>;
-  premintConfigVersion: T;
-};

package/src/premint/conversions.ts

@@ -8,7 +8,7 @@ import {
   PremintConfigV2,
   PremintConfigVersion,
   PremintConfigWithVersion,
-} from "./contract-types";
+} from "@zoralabs/protocol-deployments";
 import { PremintSignatureGetResponse } from "./premint-api-client";
 
 export const convertCollectionFromApi = (
@@ -16,6 +16,7 @@ export const convertCollectionFromApi = (
 ): ContractCreationConfig => ({
   ...collection,
   contractAdmin: collection.contractAdmin as Address,
+  additionalAdmins: [],
 });
 
 /**

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

@@ -11,7 +11,7 @@ import {
   PremintConfigAndVersion,
   PremintConfigVersion,
   PremintConfigWithVersion,
-} from "./contract-types";
+} from "@zoralabs/protocol-deployments";
 import { Address, Hex } from "viem";
 import {
   PremintSignatureRequestBody,

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

@@ -1,10 +1,16 @@
-import { foundry } from "viem/chains";
+import { foundry, zoraSepolia } from "viem/chains";
 import { describe, expect, vi } from "vitest";
 
 import { createPremintClient } from "./premint-client";
-import { anvilTest } from "src/anvil";
 import { PremintConfigVersion } from "./contract-types";
 import { getDefaultFixedPriceMinterAddress } from "./preminter";
+import { forkUrls, makeAnvilTest } from "src/anvil";
+
+const anvilTest = makeAnvilTest({
+  forkUrl: forkUrls.zoraSepolia,
+  forkBlockNumber: 8869648,
+  anvilChainId: zoraSepolia.id,
+});
 
 describe("ZoraCreator1155Premint - v1 signatures", () => {
   anvilTest(
@@ -32,6 +38,7 @@ describe("ZoraCreator1155Premint - v1 signatures", () => {
           contractName: "Testing Contract",
           contractURI:
             "ipfs://bafkreiainxen4b4wz4ubylvbhons6rembxdet4a262nf2lziclqvv7au3e",
+          additionalAdmins: [],
         },
         tokenCreationConfig: {
           tokenURI:
@@ -47,6 +54,7 @@ describe("ZoraCreator1155Premint - v1 signatures", () => {
           contractName: "Testing Contract",
           contractURI:
             "ipfs://bafkreiainxen4b4wz4ubylvbhons6rembxdet4a262nf2lziclqvv7au3e",
+          additionalAdmins: [],
         },
         premintConfig: {
           deleted: false,
@@ -68,7 +76,7 @@ describe("ZoraCreator1155Premint - v1 signatures", () => {
         },
         premintConfigVersion: PremintConfigVersion.V1,
         signature:
-          "0x70fc1d6e862c42f2b0e4a062f4eb973cc8692df58a24b71b4fe91ae7baa5a26d2c99b1b8ab61f64ff431bf30b0897877b11b7405542c90b89b041808f1561a6c1c",
+          "0x4d191dd60d428adfe507932a1758bee8ac5bbb77dcd3c05840c237416a3a25035bb8cc7c62177a4e9acb5f40c4032cdb3dbfefdd1575f2c3b4c57945b2076e2e1c",
       };
 
       expect(premintClient.apiClient.postSignature).toHaveBeenCalledWith(
@@ -95,6 +103,7 @@ describe("ZoraCreator1155Premint - v1 signatures", () => {
             contractName: "Testing Contract",
             contractURI:
               "ipfs://bafkreiainxen4b4wz4ubylvbhons6rembxdet4a262nf2lziclqvv7au3e",
+            additionalAdmins: [],
           },
           premintConfig: {
             deleted: false,
@@ -116,7 +125,7 @@ describe("ZoraCreator1155Premint - v1 signatures", () => {
           },
           premintConfigVersion: PremintConfigVersion.V1,
           signature:
-            "0x70fc1d6e862c42f2b0e4a062f4eb973cc8692df58a24b71b4fe91ae7baa5a26d2c99b1b8ab61f64ff431bf30b0897877b11b7405542c90b89b041808f1561a6c1c",
+            "0x4d191dd60d428adfe507932a1758bee8ac5bbb77dcd3c05840c237416a3a25035bb8cc7c62177a4e9acb5f40c4032cdb3dbfefdd1575f2c3b4c57945b2076e2e1c",
         });
 
       premintClient.apiClient.postSignature = vi.fn();
@@ -189,6 +198,7 @@ describe("ZoraCreator1155Premint - v2 signatures", () => {
           contractName: "Testing Contract Premint V2",
           contractURI:
             "ipfs://bafkreiainxen4b4wz4ubylvbhons6rembxdet4a262nf2lziclqvv7au3e",
+          additionalAdmins: [],
         },
         premintConfigVersion: PremintConfigVersion.V2,
         tokenCreationConfig: {
@@ -206,11 +216,12 @@ describe("ZoraCreator1155Premint - v2 signatures", () => {
           contractName: "Testing Contract Premint V2",
           contractURI:
             "ipfs://bafkreiainxen4b4wz4ubylvbhons6rembxdet4a262nf2lziclqvv7au3e",
+          additionalAdmins: [],
         },
         premintConfig: {
           deleted: false,
           tokenConfig: {
-            fixedPriceMinter: "0x04E2516A2c207E84a1839755675dfd8eF6302F0a",
+            fixedPriceMinter: "0x6d28164C3CE04A190D5F9f0f8881fc807EAD975A",
             maxSupply: 18446744073709551615n,
             maxTokensPerAddress: 0n,
             mintDuration: 604800n,
@@ -227,7 +238,7 @@ describe("ZoraCreator1155Premint - v2 signatures", () => {
         },
         premintConfigVersion: PremintConfigVersion.V2,
         signature:
-          "0x8be7932b0b31bdb7fc9269b756e0d0c9514519f083d86576e23b73c033d8ed8440ea363bc8bba0ec5c30eb6bbdf796163a324201bc7520965037102518fb5e991c",
+          "0x5cc8c0ab240920282cf936d8b5eb1dd151a91ad78cc4e89f8ddeae6ea432ce7904a38e145b734bdd438f18d457451cb1ae28beb2c44bda71d58638dfcc071e1b1c",
       };
 
       expect(premintClient.apiClient.postSignature).toHaveBeenCalledWith(

package/src/premint/premint-client.ts

@@ -5,19 +5,16 @@ import type {
   Chain,
   Hex,
   PublicClient,
-  SimulateContractParameters,
   TransactionReceipt,
   WalletClient,
 } from "viem";
 import { zoraCreator1155PremintExecutorImplABI } from "@zoralabs/protocol-deployments";
 import {
   getPremintCollectionAddress,
-  premintTypedDataDefinition,
   isValidSignature,
   isAuthorizedToCreatePremint,
   getPremintExecutorAddress,
   applyUpdateToPremint,
-  markPremintDeleted,
   makeNewPremint,
   supportsPremintVersion,
   getPremintMintCosts,
@@ -28,13 +25,14 @@ import {
   PremintConfigVersion,
   ContractCreationConfig,
   TokenConfigForVersion,
-  PremintConfigWithVersion,
   TokenCreationConfigV1,
   TokenCreationConfigV2,
   TokenCreationConfig,
   PremintConfigForVersion,
-  MintArguments,
-} from "./contract-types";
+  PremintConfigWithVersion,
+  PremintMintArguments,
+  premintTypedDataDefinition,
+} from "@zoralabs/protocol-deployments";
 import { PremintAPIClient } from "./premint-api-client";
 import type { DecodeEventLogReturnType } from "viem";
 import { OPEN_EDITION_MINT_SIZE } from "../constants";
@@ -92,21 +90,28 @@ const makeTokenConfigWithDefaults = <T extends PremintConfigVersion>({
   creatorAccount,
 }: {
   chainId: number;
-  premintConfigVersion: PremintConfigVersion;
+  premintConfigVersion: T;
   tokenCreationConfig: Partial<TokenConfigForVersion<T>> & { tokenURI: string };
   creatorAccount: Address;
 }): TokenConfigForVersion<T> => {
+  if (premintConfigVersion === PremintConfigVersion.V3) {
+    throw new Error("PremintV3 not supported in SDK");
+  }
+
   const fixedPriceMinter =
-    tokenCreationConfig.fixedPriceMinter ||
-    getDefaultFixedPriceMinterAddress(chainId);
+    (
+      tokenCreationConfig as
+        | Partial<TokenCreationConfigV1>
+        | Partial<TokenCreationConfigV2>
+    ).fixedPriceMinter || getDefaultFixedPriceMinterAddress(chainId);
 
   if (premintConfigVersion === PremintConfigVersion.V1) {
     return {
       fixedPriceMinter,
       ...defaultTokenConfigV1MintArguments(),
       royaltyRecipient: creatorAccount,
-      ...tokenCreationConfig,
-    };
+      ...(tokenCreationConfig as Partial<TokenCreationConfigV1>),
+    } as TokenCreationConfigV1;
   } else if (premintConfigVersion === PremintConfigVersion.V2) {
     return {
       fixedPriceMinter,
@@ -265,7 +270,11 @@ class PremintClient {
       uid: uid,
     });
 
-    const deletedPremint = markPremintDeleted(premintConfig);
+    const deletedPremint = {
+      ...premintConfig,
+      version: premintConfig.version + 1,
+      deleted: true,
+    };
 
     return await this.signAndSubmitPremint({
       walletClient,
@@ -363,6 +372,7 @@ class PremintClient {
 
     const premintConfig = makeNewPremint({
       tokenConfig: makeTokenConfigWithDefaults({
+        // @ts-ignore
         premintConfigVersion: actualVersion,
         tokenCreationConfig,
         creatorAccount:
@@ -511,16 +521,7 @@ class PremintClient {
       platformReferral?: Address;
       mintRecipient?: Address;
     };
-  }): Promise<
-    SimulateContractParameters<
-      typeof zoraCreator1155PremintExecutorImplABI,
-      "premintV1" | "premintV2",
-      any,
-      any,
-      any,
-      Account | Address
-    >
-  > {
+  }) {
     if (mintArguments && mintArguments?.quantityToMint < 1) {
       throw new Error("Quantity to mint cannot be below 1");
     }
@@ -537,6 +538,10 @@ class PremintClient {
 
     const numberToMint = BigInt(mintArguments?.quantityToMint || 1);
 
+    if (premintConfigVersion === PremintConfigVersion.V3) {
+      throw new Error("PremintV3 not supported in premint SDK");
+    }
+
     const value = (
       await getPremintMintCosts({
         tokenContract,
@@ -546,7 +551,7 @@ class PremintClient {
       })
     ).totalCost;
 
-    const mintArgumentsContract: MintArguments = {
+    const mintArgumentsContract: PremintMintArguments = {
       mintComment: mintArguments?.mintComment || "",
       mintRecipient:
         mintArguments?.mintRecipient ||