@zoralabs/protocol-sdk 0.9.4-PRE.0 → 0.9.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-sdk",
-  "version": "0.9.4-PRE.0",
+  "version": "0.9.4",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "type": "module",
@@ -15,18 +15,9 @@
       "default": "./dist/index.cjs"
     }
   },
-  "scripts": {
-    "build": "pnpm tsup",
-    "prepack": "pnpm build",
-    "test:js": "vitest src",
-    "test:integration": "vitest test-integration",
-    "generate-types": "echo 'npx is used here because this is a rare operation' && npx openapi-typescript https://api.zora.co/premint/openapi.json -o src/apis/generated/premint-api-types.ts",
-    "prettier:write": "prettier --write 'src/**/*.ts' 'test-integration/**/*.ts'",
-    "lint": "prettier --check 'src/**/*.ts' 'test-integration/**/*.ts'"
-  },
   "dependencies": {
-    "@zoralabs/protocol-deployments": "workspace:^",
-    "abitype": "^1.0.2"
+    "abitype": "^1.0.2",
+    "@zoralabs/protocol-deployments": "^0.3.1"
   },
   "peerDependencies": {
     "viem": "^2.13.2"
@@ -37,7 +28,6 @@
     "@reservoir0x/reservoir-sdk": "^2.0.11",
     "@types/node": "^20.13.0",
     "@types/semver": "^7.5.8",
-    "@zoralabs/tsconfig": "workspace:^",
     "graphql-prettier": "^1.0.6",
     "multiformats": "^13.2.0",
     "prettier": "^3.0.3",
@@ -46,6 +36,15 @@
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.5.0",
-    "vitest": "^2.0.5"
+    "vitest": "^2.0.5",
+    "@zoralabs/tsconfig": "^0.0.0"
+  },
+  "scripts": {
+    "build": "pnpm tsup",
+    "test:js": "vitest src",
+    "test:integration": "vitest test-integration",
+    "generate-types": "echo 'npx is used here because this is a rare operation' && npx openapi-typescript https://api.zora.co/premint/openapi.json -o src/apis/generated/premint-api-types.ts",
+    "prettier:write": "prettier --write 'src/**/*.ts' 'test-integration/**/*.ts'",
+    "lint": "prettier --check 'src/**/*.ts' 'test-integration/**/*.ts'"
   }
-}
+}

package/src/apis/http-api-base.ts

@@ -79,15 +79,16 @@ export const post = async <T>(url: string, data: any) => {
   return (await response.json()) as T;
 };
 
+const defaultShouldRetry = (err: any) => {
+  return err instanceof BadResponseError && err.status >= 500;
+};
+
 export const retries = async <T>(
   tryFn: () => T,
   maxTries: number = 3,
   linearBackoffMS: number = 200,
+  shouldRetry: (err: any) => boolean = defaultShouldRetry,
 ): Promise<T> => {
-  const shouldRetry = (err: any) => {
-    return err instanceof BadResponseError && err.status >= 500;
-  };
-
   return retriesGeneric({
     tryFn,
     maxTries,

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

@@ -10,21 +10,14 @@ import {
   zoraTimedSaleStrategyAddress,
 } from "@zoralabs/protocol-deployments";
 import { waitForSuccess } from "src/test-utils";
-import {
-  Address,
-  erc20Abi,
-  parseEther,
-  PublicClient,
-  TransactionReceipt,
-} from "viem";
+import { Address, erc20Abi, parseEther, PublicClient } from "viem";
 import { makePrepareMint1155TokenParams } from "src/mint/mint-transactions";
-import { forkUrls, makeAnvilTest } from "src/anvil";
+import { forkUrls, makeAnvilTest, writeContractWithRetries } from "src/anvil";
 import { zora } from "viem/chains";
 import { AllowList } from "src/allow-list/types";
 import { createAllowList } from "src/allow-list/allow-list-client";
 import { NewContractParams } from "./types";
 import { SubgraphContractGetter } from "./contract-getter";
-import { inspect } from "util";
 
 export const demoTokenMetadataURI =
   "ipfs://bafkreice23maski3x52tsfqgxstx3kbiifnt5jotg3a5ynvve53c4soi2u";
@@ -59,14 +52,6 @@ const minterIsMinterOnToken = async ({
   });
 };
 
-function logFailure(receipt: TransactionReceipt) {
-  if (receipt.status !== "success") {
-    console.log("transaction failed");
-    console.log(receipt.logs);
-    console.log(inspect(receipt, { depth: 10 }));
-  }
-}
-
 function randomNewContract(): NewContractParams {
   return {
     name: `testContract-${Math.round(Math.random() * 1_000_000)}`,
@@ -115,10 +100,11 @@ describe("create-helper", () => {
       });
 
       const { request } = await publicClient.simulateContract(parameters);
-      const hash = await walletClient.writeContract(request);
-      const receipt = await publicClient.waitForTransactionReceipt({ hash });
-      logFailure(receipt);
-      expect(receipt.status).toBe("success");
+      const receipt = await writeContractWithRetries(
+        request,
+        walletClient,
+        publicClient,
+      );
       expect(receipt).not.toBeNull();
       expect(receipt.to).to.equal("0x777777c338d93e2c7adf08d102d45ca7cc4ed021");
       expect(getTokenIdFromCreateReceipt(receipt)).to.be.equal(1n);
@@ -187,12 +173,8 @@ describe("create-helper", () => {
       });
 
       const { request } = await publicClient.simulateContract(parameters);
-      const hash = await walletClient.writeContract(request);
-      const receipt = await publicClient.waitForTransactionReceipt({ hash });
 
-      logFailure(receipt);
-
-      expect(receipt.status).toBe("success");
+      await writeContractWithRetries(request, walletClient, publicClient);
 
       expect(
         await minterIsMinterOnToken({
@@ -234,13 +216,13 @@ describe("create-helper", () => {
         });
       const { request: simulateResponse } =
         await publicClient.simulateContract(request);
-      const hash = await walletClient.writeContract(simulateResponse);
-      const receipt = await publicClient.waitForTransactionReceipt({ hash });
-      logFailure(receipt);
-      expect(receipt.status).toBe("success");
+      const receipt = await writeContractWithRetries(
+        simulateResponse,
+        walletClient,
+        publicClient,
+      );
       const firstTokenId = getTokenIdFromCreateReceipt(receipt);
       expect(firstTokenId).to.be.equal(1n);
-      expect(receipt).not.toBeNull();
 
       // creator should have mint to creator count balance
       expect(
@@ -279,18 +261,16 @@ describe("create-helper", () => {
       const { request: simulateRequest } = await publicClient.simulateContract(
         newTokenOnExistingContract.parameters,
       );
-      const newHash = await walletClient.writeContract(simulateRequest);
-      const newReceipt = await publicClient.waitForTransactionReceipt({
-        hash: newHash,
-      });
-
-      logFailure(receipt);
+      const newReceipt = await writeContractWithRetries(
+        simulateRequest,
+        walletClient,
+        publicClient,
+      );
 
-      expect(newReceipt.status).toBe("success");
       const tokenId = getTokenIdFromCreateReceipt(newReceipt);
       expect(tokenId).to.be.equal(2n);
     },
-    20 * 1000,
+    30 * 1000,
   );
   anvilTest(
     "creates a new token with a create referral address",
@@ -317,9 +297,11 @@ describe("create-helper", () => {
       });
       const { request: simulationResponse } =
         await publicClient.simulateContract(request);
-      const hash = await walletClient.writeContract(simulationResponse);
-      const receipt = await publicClient.waitForTransactionReceipt({ hash });
-      expect(receipt.status).toBe("success");
+      const receipt = await writeContractWithRetries(
+        simulationResponse,
+        walletClient,
+        publicClient,
+      );
       expect(receipt.to).to.equal("0x777777c338d93e2c7adf08d102d45ca7cc4ed021");
       expect(getTokenIdFromCreateReceipt(receipt)).to.be.equal(newTokenId);
 
@@ -357,8 +339,10 @@ describe("create-helper", () => {
         });
       const { request: createSimulation } =
         await publicClient.simulateContract(request);
-      await waitForSuccess(
-        await walletClient.writeContract(createSimulation),
+
+      await writeContractWithRetries(
+        createSimulation,
+        walletClient,
         publicClient,
       );
 
@@ -420,8 +404,9 @@ describe("create-helper", () => {
       });
       const { request: createSimulation } =
         await publicClient.simulateContract(request);
-      await waitForSuccess(
-        await walletClient.writeContract(createSimulation),
+      await writeContractWithRetries(
+        createSimulation,
+        walletClient,
         publicClient,
       );
 

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

@@ -199,7 +199,7 @@ async function createNew1155ContractAndToken({
     minter,
     newToken,
     setupActions: tokenSetupActions,
-  } = await prepareSetupActions({
+  } = prepareSetupActions({
     chainId,
     account,
     contractVersion,
@@ -271,7 +271,7 @@ async function createNew1155Token({
     minter,
     newToken,
     setupActions: tokenSetupActions,
-  } = await prepareSetupActions({
+  } = prepareSetupActions({
     chainId,
     account,
     contractVersion,
@@ -307,7 +307,7 @@ async function createNew1155Token({
   };
 }
 
-async function prepareSetupActions({
+function prepareSetupActions({
   chainId,
   account,
   contractVersion,
@@ -325,7 +325,7 @@ async function prepareSetupActions({
     minter,
     newToken,
     setupActions: tokenSetupActions,
-  } = await constructCreate1155TokenCalls({
+  } = constructCreate1155TokenCalls({
     chainId: chainId,
     ownerAddress: account,
     contractVersion,

package/src/create/minter-defaults.ts

@@ -74,10 +74,10 @@ export const parseNameIntoSymbol = (name: string) => {
   return result;
 };
 
-const timedSaleSettingsWithDefaults = async (
+const timedSaleSettingsWithDefaults = (
   params: TimedSaleParamsType,
   contractName: string,
-): Promise<Concrete<TimedSaleParamsType>> => {
+): Concrete<TimedSaleParamsType> => {
   // If the name is not provided, try to fetch it from the metadata
   const erc20Name = params.erc20Name || contractName;
   const symbol = params.erc20Symbol || parseNameIntoSymbol(erc20Name);
@@ -106,10 +106,10 @@ const isFixedPrice = (
   );
 };
 
-export const getSalesConfigWithDefaults = async (
+export const getSalesConfigWithDefaults = (
   salesConfig: SalesConfigParamsType | undefined,
   contractName: string,
-): Promise<ConcreteSalesConfig> => {
+): ConcreteSalesConfig => {
   if (!salesConfig) return timedSaleSettingsWithDefaults({}, contractName);
   if (isAllowList(salesConfig)) {
     return allowListWithDefaults(salesConfig);

package/src/create/token-setup.ts

@@ -6,11 +6,11 @@ import { OPEN_EDITION_MINT_SIZE } from "src/constants";
 import { getSalesConfigWithDefaults } from "./minter-defaults";
 import { setupMinters } from "./minter-setup";
 
-async function applyNew1155Defaults(
+function applyNew1155Defaults(
   props: CreateNew1155TokenProps,
   ownerAddress: Address,
   contractName: string,
-): Promise<New1155Token> {
+): New1155Token {
   const { payoutRecipient: fundsRecipient } = props;
   const fundsRecipientOrOwner =
     fundsRecipient && fundsRecipient !== zeroAddress
@@ -25,10 +25,7 @@ async function applyNew1155Defaults(
         : BigInt(props.maxSupply),
     royaltyBPS: props.royaltyBPS || 1000,
     tokenMetadataURI: props.tokenMetadataURI,
-    salesConfig: await getSalesConfigWithDefaults(
-      props.salesConfig,
-      contractName,
-    ),
+    salesConfig: getSalesConfigWithDefaults(props.salesConfig, contractName),
   };
 }
 
@@ -113,7 +110,7 @@ function makeAdminMintCall({
   });
 }
 
-export async function constructCreate1155TokenCalls(
+export function constructCreate1155TokenCalls(
   props: CreateNew1155TokenProps &
     ContractProps & {
       ownerAddress: Address;
@@ -121,11 +118,11 @@ export async function constructCreate1155TokenCalls(
     } & {
       contractName: string;
     },
-): Promise<{
+): {
   setupActions: `0x${string}`[];
   newToken: New1155Token;
   minter: Address;
-}> {
+} {
   const {
     chainId,
     nextTokenId,
@@ -134,7 +131,7 @@ export async function constructCreate1155TokenCalls(
     contractVersion,
   } = props;
 
-  const new1155TokenPropsWithDefaults = await applyNew1155Defaults(
+  const new1155TokenPropsWithDefaults = applyNew1155Defaults(
     props,
     ownerAddress,
     props.contractName,

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

@@ -5,7 +5,7 @@ import {
   zoraCreator1155ImplABI,
   zoraTimedSaleStrategyAddress,
 } from "@zoralabs/protocol-deployments";
-import { forkUrls, makeAnvilTest } from "src/anvil";
+import { forkUrls, makeAnvilTest, writeContractWithRetries } from "src/anvil";
 import { createCollectorClient, createCreatorClient } from "src/sdk";
 import { getAllowListEntry } from "src/allow-list/allow-list-client";
 import {
@@ -370,11 +370,7 @@ describe("mint-helper", () => {
 
       const { request: createRequest } =
         await publicClient.simulateContract(parameters);
-      const createHash = await walletClient.writeContract(createRequest);
-      const createReceipt = await publicClient.waitForTransactionReceipt({
-        hash: createHash,
-      });
-      expect(createReceipt.status).toBe("success");
+      await writeContractWithRetries(createRequest, walletClient, publicClient);
 
       const zoraCreateToken: TokenQueryResult = {
         contract: {

package/.env

@@ -1 +0,0 @@
-VITE_CONDUIT_KEY=066ae224-b5c3-4086-ac11-a3a44ede9458