@zoralabs/protocol-sdk 0.3.3 → 0.3.5

package/dist/premint/preminter.d.ts

@@ -1,25 +1,112 @@
 import { Address } from "abitype";
 import { ExtractAbiFunction, AbiParametersToPrimitiveTypes } from "abitype";
-import { zoraCreator1155PremintExecutorImplABI as preminterAbi } from "@zoralabs/protocol-deployments";
-import { TypedDataDefinition } from "viem";
-type PremintInputs = ExtractAbiFunction<typeof preminterAbi, "premint">["inputs"];
-type PreminterHashDataTypes = AbiParametersToPrimitiveTypes<PremintInputs>;
-export type ContractCreationConfig = PreminterHashDataTypes[0];
-export type PremintConfig = PreminterHashDataTypes[1];
-export type TokenCreationConfig = PremintConfig["tokenConfig"];
-export declare const preminterTypedDataDefinition: ({ verifyingContract, premintConfig, chainId, }: {
+import { zoraCreator1155PremintExecutorImplABI as preminterAbi, zoraCreator1155ImplABI } from "@zoralabs/protocol-deployments";
+import { TypedDataDefinition, Hex, PublicClient, GetEventArgs } from "viem";
+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"];
+export declare const PreminterDomain = "Preminter";
+type PremintConfigVersion = "1" | "2";
+export declare const PremintConfigVersion: {
+    readonly V1: "1";
+    readonly V2: "2";
+};
+type PremintConfigForVersion<T extends PremintConfigVersion> = T extends "1" ? PremintConfigV1 : PremintConfigV2;
+type PremintConfigWithVersion<T extends PremintConfigVersion> = {
+    premintConfig: PremintConfigForVersion<T>;
+    premintConfigVersion: T;
+};
+export type PremintConfigAndVersion = PremintConfigWithVersion<"1"> | PremintConfigWithVersion<"2">;
+export declare const getPremintExecutorAddress: () => "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340";
+/**
+ * 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 declare const premintTypedDataDefinition: ({ verifyingContract, chainId, premintConfigVersion: version, premintConfig, }: {
     verifyingContract: Address;
-    premintConfig: PremintConfig;
     chainId: number;
-}) => TypedDataDefinition<{
-    CreatorAttribution: {
-        name: string;
-        type: string;
-    }[];
-    TokenCreationConfig: {
-        name: string;
-        type: string;
-    }[];
-}, "CreatorAttribution">;
+} & PremintConfigAndVersion) => TypedDataDefinition;
+export type IsValidSignatureReturn = {
+    isAuthorized: boolean;
+    recoveredAddress?: Address;
+};
+export declare function isAuthorizedToCreatePremint({ collection, collectionAddress, publicClient, premintConfig, premintConfigVersion, signature, signer, }: {
+    collection: ContractCreationConfig;
+    collectionAddress: Address;
+    publicClient: PublicClient;
+    signature: Hex;
+    signer: Address;
+} & PremintConfigAndVersion): Promise<boolean>;
+export declare function recoverPremintSigner({ signature, ...rest }: {
+    signature: Hex;
+    chainId: number;
+    verifyingContract: Address;
+} & PremintConfigAndVersion): Promise<Address>;
+export declare function tryRecoverPremintSigner(params: Parameters<typeof recoverPremintSigner>[0]): Promise<`0x${string}` | undefined>;
+/**
+ * Recovers the address from a typed data signature and then checks if the recovered address is authorized to create a premint
+ *
+ * @param params validationProperties
+ * @param params.typedData typed data definition for premint config
+ * @param params.signature signature to validate
+ * @param params.publicClient public rpc read-only client
+ * @param params.premintConfigContractAdmin the original contractAdmin on the ContractCreationConfig for the premint; this is usually the original creator of the premint
+ * @param params.tokenContract the address of the 1155 contract
+ * @returns
+ */
+export declare function isValidSignature({ signature, publicClient, collection, chainId, ...premintConfigAndVersion }: {
+    collection: ContractCreationConfig;
+    signature: Hex;
+    chainId: number;
+    publicClient: PublicClient;
+} & PremintConfigAndVersion): Promise<IsValidSignatureReturn>;
+/**
+ * Converts a premint config from v1 to v2
+ *
+ * @param premintConfig premint config to convert
+ * @param createReferral address that referred the creator, that will receive create referral rewards for the created token
+ */
+export declare function migratePremintConfigToV2({ premintConfig, createReferral, }: {
+    premintConfig: PremintConfigV1;
+    createReferral: Address;
+}): PremintConfigV2;
+export type CreatorAttributionEventParams = GetEventArgs<typeof zoraCreator1155ImplABI, "CreatorAttribution", {
+    EnableUnion: false;
+}>;
+/**
+ * Recovers the address from a CreatorAttribution event emitted from a ZoraCreator1155 contract
+ * Useful for verifying that the creator of a token is the one who signed a premint for its creation.
+ *
+
+ * @param creatorAttribution parameters from the CreatorAttribution event
+ * @param chainId the chain id of the current chain
+ * @param tokenContract the address of the 1155 contract
+ * @returns the address of the signer
+ */
+export declare const recoverCreatorFromCreatorAttribution: ({ creatorAttribution: { version, domainName, structHash, signature }, chainId, tokenContract, }: {
+    creatorAttribution: CreatorAttributionEventParams;
+    tokenContract: Address;
+    chainId: number;
+}) => Promise<`0x${string}`>;
+/**
+ * Checks if the 1155 contract at that address supports the given version of the premint config.
+ */
+export declare const supportsPremintVersion: (version: PremintConfigVersion, tokenContract: Address, publicClient: PublicClient) => Promise<boolean>;
+export declare function getPremintCollectionAddress({ collection, publicClient, }: {
+    collection: ContractCreationConfig;
+    publicClient: PublicClient;
+}): Promise<Address>;
 export {};
 //# sourceMappingURL=preminter.d.ts.map

package/dist/premint/preminter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preminter.d.ts","sourceRoot":"","sources":["../../src/premint/preminter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,6BAA6B,EAAE,MAAM,SAAS,CAAC;AAC5E,OAAO,EAAE,qCAAqC,IAAI,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACvG,OAAO,EAAE,mBAAmB,EAAE,MAAM,MAAM,CAAC;AAE3C,KAAK,aAAa,GAAG,kBAAkB,CACrC,OAAO,YAAY,EACnB,SAAS,CACV,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;uBAKpB,OAAO;mBACX,aAAa;aACnB,MAAM;;;;;;;;;;wBA8ChB,CAAC"}
+{"version":3,"file":"preminter.d.ts","sourceRoot":"","sources":["../../src/premint/preminter.ts"],"names":[],"mappings":"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"}

package/dist/types.d.ts

@@ -0,0 +1,2 @@
+export type GenericTokenIdTypes = number | bigint | string;
+//# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mBAAmB,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-sdk",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "main": "./dist/index.js",
@@ -23,6 +23,7 @@
     "viem": "^1.16.6"
   },
   "devDependencies": {
+    "zoralabs-tsconfig": "*",
     "typescript": "^5.2.2",
     "vite": "4.5.0",
     "vitest": "0.34.6"

package/src/anvil.ts

@@ -28,13 +28,15 @@ async function waitForAnvilInit(anvil: any) {
   });
 }
 
+export type AnvilTestForkSettings = {
+  forkUrl: string;
+  forkBlockNumber: number;
+};
+
 export const makeAnvilTest = ({
   forkUrl,
   forkBlockNumber,
-}: {
-  forkUrl: string;
-  forkBlockNumber: number;
-}) =>
+}: AnvilTestForkSettings) =>
   test.extend<AnvilViemClientsTest>({
     viemClients: async ({ task }, use) => {
       console.log("setting up clients for ", task.name);
@@ -93,6 +95,7 @@ export const makeAnvilTest = ({
 export const forkUrls = {
   zoraMainnet: "https://rpc.zora.co/",
   zoraGoerli: "https://testnet.rpc.zora.co",
+  zoraSepoli: "https://sepolia.rpc.zora.energy",
 };
 
 export const anvilTest = makeAnvilTest({

package/src/constants.ts

@@ -1,3 +1,5 @@
+import { parseAbi } from "viem";
+
 export const ZORA_API_BASE = "https://api.zora.co/";
 export const OPEN_EDITION_MINT_SIZE = BigInt("18446744073709551615");
 
@@ -8,3 +10,8 @@ const SUBGRAPH_CONFIG_BASE =
 export function getSubgraph(name: string, version: string): string {
   return `${SUBGRAPH_CONFIG_BASE}/${name}/${version}/gn`;
 }
+
+export const zora721Abi = parseAbi([
+  "function mintWithRewards(address recipient, uint256 quantity, string calldata comment, address mintReferral) external payable",
+  "function zoraFeeForAmount(uint256 amount) public view returns (address, uint256)",
+] as const);

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

@@ -45,7 +45,7 @@ export const DEFAULT_SALE_SETTINGS = {
 };
 
 // Hardcode the permission bit for the minter
-const PERMISSION_BIT_MINTER = 2n ** 2n;
+const PERMISSION_BIT_MINTER = 4n;
 
 type ContractType =
   | {

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

@@ -2,23 +2,26 @@ import {
   httpClient as defaultHttpClient,
   IHttpClient,
 } from "../apis/http-api-base";
-import { paths } from "../apis/generated/discover-api-types";
-import { ZORA_API_BASE } from "../constants";
 import { NetworkConfig, networkConfigByChain } from "src/apis/chain-constants";
+import { GenericTokenIdTypes } from "src/types";
 import { Address } from "viem";
 
-export type MintableGetToken =
-  paths["/mintables/{chain_name}/{collection_address}"];
-type MintableGetTokenPathParameters =
-  MintableGetToken["get"]["parameters"]["path"];
-type MintableGetTokenGetQueryParameters =
-  MintableGetToken["get"]["parameters"]["query"];
-export type MintableGetTokenResponse =
-  MintableGetToken["get"]["responses"][200]["content"]["application/json"];
+type FixedPriceSaleStrategyResult = {
+  address: Address;
+  pricePerToken: string;
+  saleEnd: string;
+  saleStart: string;
+  maxTokensPerAddress: string;
+};
 
-function encodeQueryParameters(params: Record<string, string>) {
-  return new URLSearchParams(params).toString();
-}
+type SaleStrategyResult = {
+  fixedPrice: FixedPriceSaleStrategyResult;
+};
+
+export type SalesConfigAndTokenInfo = {
+  fixedPrice: FixedPriceSaleStrategyResult;
+  mintFeePerQuantity: bigint;
+};
 
 export const getApiNetworkConfigForChain = (chainId: number): NetworkConfig => {
   if (!networkConfigByChain[chainId]) {
@@ -36,54 +39,77 @@ export class MintAPIClient {
     this.networkConfig = getApiNetworkConfigForChain(chainId);
   }
 
-  async getMintable(
-    path: MintableGetTokenPathParameters,
-    query: MintableGetTokenGetQueryParameters,
-  ): Promise<MintableGetTokenResponse> {
-    const httpClient = this.httpClient;
-    return httpClient.retries(() => {
-      return httpClient.get<MintableGetTokenResponse>(
-        `${ZORA_API_BASE}discover/mintables/${path.chain_name}/${
-          path.collection_address
-        }${query?.token_id ? `?${encodeQueryParameters(query)}` : ""}`,
-      );
-    });
-  }
-
-  async getSalesConfigFixedPrice({
-    contractAddress,
+  async getSalesConfigAndTokenInfo({
+    tokenAddress,
     tokenId,
   }: {
-    contractAddress: string;
-    tokenId: bigint;
-  }): Promise<undefined | string> {
+    tokenAddress: Address;
+    tokenId?: GenericTokenIdTypes;
+  }): Promise<SalesConfigAndTokenInfo> {
     const { retries, post } = this.httpClient;
     return retries(async () => {
       const response = await post<any>(this.networkConfig.subgraphUrl, {
-        query:
-          "query($id: ID!) {\n  zoraCreateToken(id: $id) {\n    id\n    salesStrategies{\n      fixedPrice {\n        address\n      }\n    }\n  }\n}",
+        query: `
+          fragment SaleStrategy on SalesStrategyConfig {
+            type
+            fixedPrice {
+              address
+              pricePerToken
+              saleEnd
+              saleStart
+              maxTokensPerAddress
+            }
+          }
+          
+          query ($id: ID!) {
+            zoraCreateToken(id: $id) {
+              id
+              contract {
+                mintFeePerQuantity
+                salesStrategies(where: {type: "FIXED_PRICE"}) {
+                  ...SaleStrategy
+                }
+              }
+              salesStrategies(where: {type: "FIXED_PRICE"}) {
+                ...SaleStrategy
+              }
+            }
+          }
+        `,
         variables: {
-          id: `${contractAddress.toLowerCase()}-${tokenId.toString()}`,
+          id:
+            tokenId !== undefined
+              ? // Generic Token ID types all stringify down to the base numeric equivalent.
+                `${tokenAddress.toLowerCase()}-${tokenId}`
+              : `${tokenAddress.toLowerCase()}-0`,
         },
       });
-      return response.zoraCreateToken?.salesStrategies?.find(() => true)
-        ?.fixedPriceMinterAddress;
-    });
-  }
 
-  async getMintableForToken({
-    tokenContract,
-    tokenId,
-  }: {
-    tokenContract: Address;
-    tokenId?: bigint | number | string;
-  }) {
-    return await this.getMintable(
-      {
-        chain_name: this.networkConfig.zoraBackendChainName,
-        collection_address: tokenContract,
-      },
-      { token_id: tokenId?.toString() },
-    );
+      const token = response.data?.zoraCreateToken;
+
+      if (!token) {
+        throw new Error("Cannot find a token to mint");
+      }
+
+      const saleStrategies: SaleStrategyResult[] =
+        tokenId !== undefined
+          ? token.salesStrategies
+          : token.contract.salesStrategies;
+
+      const fixedPrice = saleStrategies
+        ?.sort((a: SaleStrategyResult, b: SaleStrategyResult) =>
+          BigInt(a.fixedPrice.saleEnd) > BigInt(b.fixedPrice.saleEnd) ? 1 : -1,
+        )
+        ?.find(() => true)?.fixedPrice;
+
+      if (!fixedPrice) {
+        throw new Error("Cannot find fixed price sale strategy");
+      }
+
+      return {
+        fixedPrice,
+        mintFeePerQuantity: BigInt(token.contract.mintFeePerQuantity),
+      };
+    });
   }
 }

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

@@ -1,4 +1,4 @@
-import { parseAbi, parseEther } from "viem";
+import { Address, parseAbi, parseEther } from "viem";
 import { zora } from "viem/chains";
 import { describe, expect } from "vitest";
 import { createMintClient } from "./mint-client";
@@ -19,16 +19,15 @@ describe("mint-helper", () => {
         address: creatorAccount,
         value: parseEther("2000"),
       });
-      const targetContract = "0xa2fea3537915dc6c7c7a97a82d1236041e6feb2e";
+      const targetContract: Address =
+        "0xa2fea3537915dc6c7c7a97a82d1236041e6feb2e";
       const targetTokenId = 1n;
       const minter = createMintClient({ chain: zora });
 
       const params = await minter.makePrepareMintTokenParams({
         minterAccount: creatorAccount,
-        mintable: await minter.getMintable({
-          tokenId: targetTokenId,
-          tokenContract: targetContract,
-        }),
+        tokenId: targetTokenId,
+        tokenAddress: targetContract,
         mintArguments: {
           mintToAddress: creatorAccount,
           quantityToMint: 1,
@@ -69,15 +68,14 @@ describe("mint-helper", () => {
         value: parseEther("2000"),
       });
 
-      const targetContract = "0x7aae7e67515A2CbB8585C707Ca6db37BDd3EA839";
+      const targetContract: Address =
+        "0x7aae7e67515A2CbB8585C707Ca6db37BDd3EA839";
       const targetTokenId = undefined;
       const minter = createMintClient({ chain: zora });
 
       const params = await minter.makePrepareMintTokenParams({
-        mintable: await minter.getMintable({
-          tokenContract: targetContract,
-          tokenId: targetTokenId,
-        }),
+        tokenId: targetTokenId,
+        tokenAddress: targetContract,
         minterAccount: creatorAccount,
         mintArguments: {
           mintToAddress: creatorAccount,