@zoralabs/protocol-sdk 0.11.10 → 0.11.11-DEV.0

package/.env

@@ -0,0 +1,3 @@
+VITE_CONDUIT_KEY=066ae224-b5c3-4086-ac11-a3a44ede9458
+VITE_ALCHEMY_KEY=SMkQiSpoj4za3-0hO0eP78i3b0OrBT4k
+PRIVATE_KEY=0x3a751f9ab33f32f374bd8c800b7a78725b33744dbf0716ca359dcd042c4b31c8

package/.turbo/turbo-build.log

@@ -1,18 +1,18 @@
-
-> @zoralabs/protocol-sdk@0.11.10 build /home/runner/work/zora-protocol-private/zora-protocol-private/packages/protocol-sdk
-> pnpm tsup
-
-CLI Building entry: src/index.ts
-CLI Using tsconfig: tsconfig.build.json
-CLI tsup v7.3.0
-CLI Using tsup config: /home/runner/work/zora-protocol-private/zora-protocol-private/packages/protocol-sdk/tsup.config.ts
-CLI Target: es2021
-CLI Cleaning output folder
-CJS Build start
-ESM Build start
-CJS dist/index.cjs     229.00 KB
-CJS dist/index.cjs.map 463.84 KB
-CJS ⚡️ Build success in 457ms
-ESM dist/index.js     222.71 KB
-ESM dist/index.js.map 462.00 KB
-ESM ⚡️ Build success in 463ms
+
+> @zoralabs/protocol-sdk@0.11.11-DEV.0 build /Users/danovedzora/source/zora-protocol/packages/protocol-sdk
+> pnpm tsup
+
+CLI Building entry: src/index.ts
+CLI Using tsconfig: tsconfig.build.json
+CLI tsup v7.3.0
+CLI Using tsup config: /Users/danovedzora/source/zora-protocol/packages/protocol-sdk/tsup.config.ts
+CLI Target: es2021
+CLI Cleaning output folder
+CJS Build start
+ESM Build start
+CJS dist/index.cjs     229.00 KB
+CJS dist/index.cjs.map 463.84 KB
+CJS ⚡️ Build success in 46ms
+ESM dist/index.js     222.71 KB
+ESM dist/index.js.map 462.00 KB
+ESM ⚡️ Build success in 46ms

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @zoralabs/protocol-sdk
 
+## 0.11.11-DEV.0
+
+### Patch Changes
+
+- Updated dependencies [e2f40e1a]
+  - @zoralabs/protocol-deployments@0.3.11-DEV.0
+
 ## 0.11.10
 
 ### Patch Changes

package/dist/anvil.d.ts

@@ -1,5 +1,4 @@
-import { Account, Chain, PublicClient, SimulateContractReturnType, TestClient, Transport, WalletClient } from "viem";
-import { SimulateContractParametersWithAccount } from "./types";
+import { Chain, PublicClient, TestClient, Transport, WalletClient } from "viem";
 export interface AnvilViemClientsTest {
     viemClients: {
         walletClient: WalletClient;
@@ -34,14 +33,4 @@ export declare const anvilTest: import("vitest").TestAPI<{
         chain: Chain;
     };
 }>;
-export declare function simulateAndWriteContractWithRetries({ parameters, walletClient, publicClient, }: {
-    parameters: SimulateContractParametersWithAccount;
-    walletClient: WalletClient;
-    publicClient: PublicClient;
-}): Promise<import("viem").TransactionReceipt>;
-export declare function writeContractWithRetries({ request, walletClient, publicClient, }: {
-    request: SimulateContractReturnType<any, any, any, Chain, Account>["request"];
-    walletClient: WalletClient;
-    publicClient: PublicClient;
-}): Promise<import("viem").TransactionReceipt>;
 //# sourceMappingURL=anvil.d.ts.map

package/dist/anvil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"anvil.d.ts","sourceRoot":"","sources":["../src/anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,OAAO,EACP,KAAK,EACL,YAAY,EACZ,0BAA0B,EAC1B,UAAU,EACV,SAAS,EACT,YAAY,EAKb,MAAM,MAAM,CAAC;AAGd,OAAO,EAAE,qCAAqC,EAAE,MAAM,SAAS,CAAC;AAEhE,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE;QACX,YAAY,EAAE,YAAY,CAAC;QAE3B,YAAY,EAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC7C,UAAU,EAAE,UAAU,CAAC;QACvB,KAAK,EAAE,KAAK,CAAC;KACd,CAAC;CACH;AAaD,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,aAAa,gDAIvB,qBAAqB;;sBA7BN,YAAY;sBAEZ,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC;oBAChC,UAAU;eACf,KAAK;;EAoFZ,CAAC;AAEL,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC;AAEF,eAAO,MAAM,SAAS;;sBAhGJ,YAAY;sBAEZ,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC;oBAChC,UAAU;eACf,KAAK;;EAgGd,CAAC;AAEH,wBAAsB,mCAAmC,CAAC,EACxD,UAAU,EACV,YAAY,EACZ,YAAY,GACb,EAAE;IACD,UAAU,EAAE,qCAAqC,CAAC;IAClD,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC5B,8CAOA;AAED,wBAAsB,wBAAwB,CAAC,EAC7C,OAAO,EACP,YAAY,EACZ,YAAY,GACb,EAAE;IACD,OAAO,EAAE,0BAA0B,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9E,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC5B,8CAuBA"}
+{"version":3,"file":"anvil.d.ts","sourceRoot":"","sources":["../src/anvil.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,KAAK,EACL,YAAY,EACZ,UAAU,EACV,SAAS,EACT,YAAY,EAKb,MAAM,MAAM,CAAC;AAGd,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE;QACX,YAAY,EAAE,YAAY,CAAC;QAE3B,YAAY,EAAE,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC7C,UAAU,EAAE,UAAU,CAAC;QACvB,KAAK,EAAE,KAAK,CAAC;KACd,CAAC;CACH;AAaD,MAAM,MAAM,qBAAqB,GAAG;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,aAAa,gDAIvB,qBAAqB;;sBA7BN,YAAY;sBAEZ,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC;oBAChC,UAAU;eACf,KAAK;;EAoFZ,CAAC;AAEL,eAAO,MAAM,QAAQ;;;;CAIpB,CAAC;AAEF,eAAO,MAAM,SAAS;;sBAhGJ,YAAY;sBAEZ,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC;oBAChC,UAAU;eACf,KAAK;;EAgGd,CAAC"}

package/dist/test-utils.d.ts

@@ -1,7 +1,7 @@
 import { zoraCreator1155FactoryImplAddress } from "@zoralabs/protocol-deployments";
-import { Address, Hex, PublicClient } from "viem";
+import { Address, PublicClient, Chain, WalletClient, SimulateContractReturnType, Account } from "viem";
 import { NewContractParams } from "./create/types";
-export declare const waitForSuccess: (hash: Hex, publicClient: PublicClient) => Promise<import("viem").TransactionReceipt>;
+import { SimulateContractParametersWithAccount } from "./types";
 export declare const getFixedPricedMinter: ({ publicClient, chainId, }: {
     publicClient: PublicClient;
     chainId: keyof typeof zoraCreator1155FactoryImplAddress;
@@ -12,4 +12,14 @@ export declare const fixedPriceMinterMinterArguments: ({ mintRecipient, }: {
 export declare function randomNewContract(): NewContractParams;
 export declare const randomNonce: () => `0x${string}`;
 export declare const thirtySecondsFromNow: () => bigint;
+export declare function simulateAndWriteContractWithRetries({ parameters, walletClient, publicClient, }: {
+    parameters: SimulateContractParametersWithAccount;
+    walletClient: WalletClient;
+    publicClient: PublicClient;
+}): Promise<import("viem").TransactionReceipt>;
+export declare function writeContractWithRetries({ request, walletClient, publicClient, }: {
+    request: SimulateContractReturnType<any, any, any, Chain, Account>["request"];
+    walletClient: WalletClient;
+    publicClient: PublicClient;
+}): Promise<import("viem").TransactionReceipt>;
 //# sourceMappingURL=test-utils.d.ts.map

package/dist/test-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iCAAiC,EAClC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,OAAO,EACP,GAAG,EACH,YAAY,EAKb,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAGnD,eAAO,MAAM,cAAc,SAAgB,GAAG,gBAAgB,YAAY,+CAQzE,CAAC;AAEF,eAAO,MAAM,oBAAoB,+BAG9B;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,OAAO,iCAAiC,CAAC;CACzD,2BAKG,CAAC;AAEL,eAAO,MAAM,+BAA+B,uBAEzC;IACD,aAAa,EAAE,OAAO,CAAC;CACxB,kBAAwE,CAAC;AAI1E,wBAAgB,iBAAiB,IAAI,iBAAiB,CAKrD;AAED,eAAO,MAAM,WAAW,qBAC8B,CAAC;AACvD,eAAO,MAAM,oBAAoB,cACsB,CAAC"}
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../src/test-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,iCAAiC,EAClC,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,OAAO,EACP,YAAY,EAKZ,KAAK,EACL,YAAY,EACZ,0BAA0B,EAC1B,OAAO,EACR,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEnD,OAAO,EAAE,qCAAqC,EAAE,MAAM,SAAS,CAAC;AAEhE,eAAO,MAAM,oBAAoB,+BAG9B;IACD,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,OAAO,iCAAiC,CAAC;CACzD,2BAKG,CAAC;AAEL,eAAO,MAAM,+BAA+B,uBAEzC;IACD,aAAa,EAAE,OAAO,CAAC;CACxB,kBAAwE,CAAC;AAI1E,wBAAgB,iBAAiB,IAAI,iBAAiB,CAKrD;AAED,eAAO,MAAM,WAAW,qBAC8B,CAAC;AACvD,eAAO,MAAM,oBAAoB,cACsB,CAAC;AAExD,wBAAsB,mCAAmC,CAAC,EACxD,UAAU,EACV,YAAY,EACZ,YAAY,GACb,EAAE;IACD,UAAU,EAAE,qCAAqC,CAAC;IAClD,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC5B,8CAOA;AAED,wBAAsB,wBAAwB,CAAC,EAC7C,OAAO,EACP,YAAY,EACZ,YAAY,GACb,EAAE;IACD,OAAO,EAAE,0BAA0B,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9E,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,YAAY,CAAC;CAC5B,8CAuBA"}

package/dist/waitForSuccess.d.ts

@@ -0,0 +1,4 @@
+import { Hex } from "viem/_types/types/misc";
+import { PublicClient } from "viem";
+export declare const waitForSuccess: (hash: Hex, publicClient: PublicClient) => Promise<import("viem").TransactionReceipt>;
+//# sourceMappingURL=waitForSuccess.d.ts.map

package/dist/waitForSuccess.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"waitForSuccess.d.ts","sourceRoot":"","sources":["../src/waitForSuccess.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,MAAM,wBAAwB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAEpC,eAAO,MAAM,cAAc,SAAgB,GAAG,gBAAgB,YAAY,+CAQzE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zoralabs/protocol-sdk",
-  "version": "0.11.10",
+  "version": "0.11.11-DEV.0",
   "repository": "https://github.com/ourzora/zora-protocol",
   "license": "MIT",
   "type": "module",
@@ -16,7 +16,7 @@
     }
   },
   "dependencies": {
-    "@zoralabs/protocol-deployments": "^0.3.10"
+    "@zoralabs/protocol-deployments": "^0.3.11-DEV.4"
   },
   "peerDependencies": {
     "viem": "^2.21.21",

package/src/comments/comments.test.ts

@@ -1,5 +1,6 @@
 import { describe, expect } from "vitest";
-import { forkUrls, makeAnvilTest, writeContractWithRetries } from "src/anvil";
+import { forkUrls, makeAnvilTest } from "src/anvil";
+import { writeContractWithRetries } from "src/test-utils";
 import { base, zora } from "viem/chains";
 import {
   commentsABI,
@@ -25,7 +26,8 @@ import {
   hashTypedData,
 } from "viem";
 import { createCreatorClient } from "src/sdk";
-import { randomNewContract, waitForSuccess } from "src/test-utils";
+import { randomNewContract } from "src/test-utils";
+import { waitForSuccess } from "src/waitForSuccess";
 import { permitCommentTypedDataDefinition } from "@zoralabs/protocol-deployments";
 import { demoTokenMetadataURI } from "src/fixtures/contract-setup";
 import { randomNonce, thirtySecondsFromNow } from "src/test-utils";

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

@@ -9,15 +9,14 @@ import {
   zoraTimedSaleStrategyABI,
   zoraTimedSaleStrategyAddress,
 } from "@zoralabs/protocol-deployments";
-import { waitForSuccess } from "src/test-utils";
+import { waitForSuccess } from "src/waitForSuccess";
 import { Address, erc20Abi, parseEther, PublicClient } from "viem";
 import { makePrepareMint1155TokenParams } from "src/mint/mint-transactions";
+import { forkUrls, makeAnvilTest } from "src/anvil";
 import {
-  forkUrls,
-  makeAnvilTest,
   simulateAndWriteContractWithRetries,
   writeContractWithRetries,
-} from "src/anvil";
+} from "src/test-utils";
 import { zora } from "viem/chains";
 import { AllowList } from "src/allow-list/types";
 import { createAllowList } from "src/allow-list/allow-list-client";

package/src/fixtures/contract-setup.ts

@@ -1,5 +1,5 @@
 import { Address, Chain, PublicClient, WalletClient } from "viem";
-import { simulateAndWriteContractWithRetries } from "src/anvil";
+import { simulateAndWriteContractWithRetries } from "src/test-utils";
 import { createCreatorClient } from "src/sdk";
 import { SubgraphMintGetter } from "src/mint/subgraph-mint-getter";
 import { SubgraphRewardsGetter } from "../rewards/subgraph-rewards-getter";

package/src/fixtures/secondary.ts

@@ -1,6 +1,6 @@
 import { Address, Account, PublicClient, TestClient, WalletClient } from "viem";
 import { CollectorClient } from "../sdk";
-import { simulateAndWriteContractWithRetries } from "../anvil";
+import { simulateAndWriteContractWithRetries } from "src/test-utils";
 import { makeContractParameters } from "../utils";
 import {
   zoraTimedSaleStrategyABI,

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

@@ -14,7 +14,8 @@ import {
   commentsABI,
   callerAndCommenterABI,
 } from "@zoralabs/protocol-deployments";
-import { forkUrls, makeAnvilTest, writeContractWithRetries } from "src/anvil";
+import { forkUrls, makeAnvilTest } from "src/anvil";
+import { writeContractWithRetries } from "src/test-utils";
 import { createCollectorClient, createCreatorClient } from "src/sdk";
 import { getAllowListEntry } from "src/allow-list/allow-list-client";
 import { SubgraphMintGetter } from "./subgraph-mint-getter";

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

@@ -1,11 +1,8 @@
 import { describe, expect, vi } from "vitest";
 import { encodeAbiParameters, erc20Abi, parseEther } from "viem";
 import { zoraSepolia, base } from "viem/chains";
-import {
-  forkUrls,
-  makeAnvilTest,
-  simulateAndWriteContractWithRetries,
-} from "src/anvil";
+import { forkUrls, makeAnvilTest } from "src/anvil";
+import { simulateAndWriteContractWithRetries } from "src/test-utils";
 import { createCollectorClient, createCreatorClient } from "src/sdk";
 import { new1155ContractVersion } from "src/create/contract-setup";
 import { ISubgraphQuerier } from "src/apis/subgraph-querier";

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

@@ -1,11 +1,8 @@
 import { describe, expect, vi } from "vitest";
 import { parseEther, Address, parseEventLogs } from "viem";
 import { zoraSepolia } from "viem/chains";
-import {
-  forkUrls,
-  makeAnvilTest,
-  simulateAndWriteContractWithRetries,
-} from "src/anvil";
+import { forkUrls, makeAnvilTest } from "src/anvil";
+import { simulateAndWriteContractWithRetries } from "src/test-utils";
 import { createCollectorClient } from "src/sdk";
 import {
   zoraCreator1155ImplABI,

package/src/sparks/sparks-contracts-test.ts

@@ -9,13 +9,11 @@ import {
   zoraCreator1155ImplABI,
   zoraMints1155ABI,
   zoraMints1155Address,
-  zoraMintsManagerImplABI,
   zoraMintsManagerImplAddress,
   PremintMintArguments,
   premintTypedDataDefinition,
   zoraSparks1155Address,
   zoraSparks1155ABI,
-  zoraSparksManagerImplABI,
 } from "@zoralabs/protocol-deployments";
 import {
   Address,
@@ -39,10 +37,9 @@ import { zora } from "viem/chains";
 import {
   fixedPriceMinterMinterArguments,
   getFixedPricedMinter,
-  waitForSuccess,
 } from "src/test-utils";
 import { PublicClient } from "src/utils";
-
+import { waitForSuccess } from "src/waitForSuccess";
 const sparksMainnetDeployedBlock = 17655716;
 
 const anvilTest = makeAnvilTest({

package/src/test-utils.ts

@@ -4,25 +4,19 @@ import {
 } from "@zoralabs/protocol-deployments";
 import {
   Address,
-  Hex,
   PublicClient,
   encodeAbiParameters,
   keccak256,
   toBytes,
   parseAbiParameters,
+  Chain,
+  WalletClient,
+  SimulateContractReturnType,
+  Account,
 } from "viem";
 import { NewContractParams } from "./create/types";
-import { expect } from "vitest";
-
-export const waitForSuccess = async (hash: Hex, publicClient: PublicClient) => {
-  const receipt = await publicClient.waitForTransactionReceipt({
-    hash,
-  });
-
-  expect(receipt.status).toBe("success");
-
-  return receipt;
-};
+import { retries } from "./apis/http-api-base";
+import { SimulateContractParametersWithAccount } from "./types";
 
 export const getFixedPricedMinter = async ({
   publicClient,
@@ -56,3 +50,53 @@ export const randomNonce = () =>
   keccak256(toBytes(Math.round(Math.random() * 1000)));
 export const thirtySecondsFromNow = () =>
   BigInt(Math.round(new Date().getTime() / 1000)) + 30n;
+
+export async function simulateAndWriteContractWithRetries({
+  parameters,
+  walletClient,
+  publicClient,
+}: {
+  parameters: SimulateContractParametersWithAccount;
+  walletClient: WalletClient;
+  publicClient: PublicClient;
+}) {
+  const { request } = await publicClient.simulateContract(parameters);
+  return await writeContractWithRetries({
+    request,
+    walletClient,
+    publicClient,
+  });
+}
+
+export async function writeContractWithRetries({
+  request,
+  walletClient,
+  publicClient,
+}: {
+  request: SimulateContractReturnType<any, any, any, Chain, Account>["request"];
+  walletClient: WalletClient;
+  publicClient: PublicClient;
+}) {
+  let tryCount = 1;
+  const tryFn = async () => {
+    if (tryCount > 1) {
+      console.log("retrying try #", tryCount);
+    }
+    const hash = await walletClient.writeContract(request);
+    const receipt = await publicClient.waitForTransactionReceipt({ hash });
+
+    if (receipt.status !== "success") {
+      console.log("failed try #", tryCount);
+      tryCount++;
+      throw new Error("transaction failed");
+    }
+
+    return receipt;
+  };
+
+  const shouldRetry = () => {
+    return true;
+  };
+
+  return await retries(tryFn, 3, 1000, shouldRetry);
+}

package/src/waitForSuccess.ts

@@ -0,0 +1,13 @@
+import { expect } from "vitest";
+import { Hex } from "viem/_types/types/misc";
+import { PublicClient } from "viem";
+
+export const waitForSuccess = async (hash: Hex, publicClient: PublicClient) => {
+  const receipt = await publicClient.waitForTransactionReceipt({
+    hash,
+  });
+
+  expect(receipt.status).toBe("success");
+
+  return receipt;
+};