@zoralabs/protocol-sdk 0.5.12 → 0.5.14

package/src/premint/preminter.ts

@@ -5,9 +5,9 @@ import {
   zoraCreator1155PremintExecutorImplABI,
   zoraCreator1155PremintExecutorImplAddress,
   zoraCreatorFixedPriceSaleStrategyAddress,
+  premintTypedDataDefinition,
 } from "@zoralabs/protocol-deployments";
 import {
-  TypedDataDefinition,
   recoverTypedDataAddress,
   Hex,
   PublicClient,
@@ -27,59 +27,12 @@ import {
   PremintConfigV2,
   PremintConfigVersion,
   PremintConfigWithVersion,
-  PreminterDomain,
   TokenCreationConfig,
-  v1Types,
-  v2Types,
-} from "./contract-types";
+} from "@zoralabs/protocol-deployments";
 import { MintCosts } from "src/mint/mint-client";
 
 export const getPremintExecutorAddress = () =>
-  zoraCreator1155PremintExecutorImplAddress[999];
-
-/**
- * Creates a typed data definition for a premint config.  Works for all versions of the premint config by specifying the premintConfigVersion.
- *
- * @param params.verifyingContract the address of the 1155 contract
- * @param params.chainId the chain id the premint is signed for
- * @param params.premintConfigVersion the version of the premint config
- * @param params.premintConfig the premint config
- * @returns
- */
-export const premintTypedDataDefinition = <T extends PremintConfigVersion>({
-  verifyingContract,
-  chainId,
-  premintConfigVersion: version,
-  premintConfig,
-}: {
-  verifyingContract: Address;
-  chainId: number;
-} & PremintConfigWithVersion<T>): TypedDataDefinition => {
-  const domain = {
-    chainId,
-    name: PreminterDomain,
-    version,
-    verifyingContract: verifyingContract,
-  };
-
-  if (version === PremintConfigVersion.V1)
-    return {
-      domain,
-      types: v1Types,
-      message: premintConfig as PremintConfigV1,
-      primaryType: "CreatorAttribution",
-    } satisfies TypedDataDefinition<typeof v1Types, "CreatorAttribution">;
-  if (version === PremintConfigVersion.V2) {
-    return {
-      domain,
-      types: v2Types,
-      message: premintConfig as PremintConfigV2,
-      primaryType: "CreatorAttribution",
-    } satisfies TypedDataDefinition<typeof v2Types, "CreatorAttribution">;
-  }
-
-  throw new Error(`Invalid version ${version}`);
-};
+  zoraCreator1155PremintExecutorImplAddress[999] as Address;
 
 export type IsValidSignatureReturn = {
   isAuthorized: boolean;
@@ -101,8 +54,13 @@ export async function isAuthorizedToCreatePremint({
   return await publicClient.readContract({
     abi: preminterAbi,
     address: getPremintExecutorAddress(),
-    functionName: "isAuthorizedToCreatePremint",
-    args: [signer, collection.contractAdmin, collectionAddress],
+    functionName: "isAuthorizedToCreatePremintWithAdditionalAdmins",
+    args: [
+      signer,
+      collection.contractAdmin,
+      collectionAddress,
+      collection.additionalAdmins,
+    ],
   });
 }
 
@@ -114,9 +72,8 @@ export async function recoverPremintSigner<T extends PremintConfigVersion>({
   chainId: number;
   verifyingContract: Address;
 } & PremintConfigWithVersion<T>): Promise<Address> {
-  const typedData = premintTypedDataDefinition(rest);
   return await recoverTypedDataAddress({
-    ...typedData,
+    ...premintTypedDataDefinition(rest),
     signature,
   });
 }
@@ -321,16 +278,6 @@ export async function getPremintCollectionAddress({
   });
 }
 
-export function markPremintDeleted<T extends PremintConfig>(
-  premintConfig: T,
-): T {
-  return {
-    ...premintConfig,
-    version: premintConfig.version + 1,
-    deleted: true,
-  };
-}
-
 export function applyUpdateToPremint({
   uid,
   version,

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

@@ -54,6 +54,7 @@ tests.forEach(({ anvilTest, chain }) => {
                   contractName: "Testing Contract Premint V2",
                   contractURI:
                     "ipfs://bafkreiainxen4b4wz4ubylvbhons6rembxdet4a262nf2lziclqvv7au3f",
+                  additionalAdmins: [],
                 },
                 premintConfigVersion: PremintConfigVersion.V2,
                 tokenCreationConfig: {
@@ -110,6 +111,7 @@ tests.forEach(({ anvilTest, chain }) => {
                   contractName: `Testing Contract Premint V1 ${publicClient.chain?.name}`,
                   contractURI:
                     "ipfs://bafkreiainxen4b4wz4ubylvbhons6rembxdet4a262nf2lziclqvv7au3fg",
+                  additionalAdmins: [],
                 },
                 premintConfigVersion: PremintConfigVersion.V1,
                 tokenCreationConfig: {