@zoralabs/protocol-sdk 0.11.7 → 0.11.8

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @zoralabs/protocol-sdk@0.11.7 build /home/runner/work/zora-protocol-private/zora-protocol-private/packages/protocol-sdk
+> @zoralabs/protocol-sdk@0.11.8 build /home/runner/work/zora-protocol-private/zora-protocol-private/packages/protocol-sdk
 > pnpm tsup
 
 CLI Building entry: src/index.ts
@@ -10,9 +10,9 @@ CLI Target: es2021
 CLI Cleaning output folder
 CJS Build start
 ESM Build start
-CJS dist/index.cjs     225.23 KB
-CJS dist/index.cjs.map 456.14 KB
-CJS ⚡️ Build success in 299ms
-ESM dist/index.js     218.90 KB
-ESM dist/index.js.map 454.14 KB
-ESM ⚡️ Build success in 334ms
+ESM dist/index.js     219.52 KB
+ESM dist/index.js.map 455.33 KB
+ESM ⚡️ Build success in 333ms
+CJS dist/index.cjs     225.85 KB
+CJS dist/index.cjs.map 457.32 KB
+CJS ⚡️ Build success in 338ms

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @zoralabs/protocol-sdk
 
+## 0.11.8
+
+### Patch Changes
+
+- 330f1131: Fix royalties queries to filter by erc20z that have secondary activated
+
 ## 0.11.7
 
 ### Patch Changes

package/dist/anvil.d.ts

@@ -24,6 +24,7 @@ export declare const makeAnvilTest: ({ forkUrl, forkBlockNumber, anvilChainId, }
 export declare const forkUrls: {
     zoraMainnet: string;
     zoraSepolia: string;
+    baseMainnet: string;
 };
 export declare const anvilTest: import("vitest").TestAPI<{
     viemClients: {

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;;;CAGpB,CAAC;AAEF,eAAO,MAAM,SAAS;;sBA/FJ,YAAY;sBAEZ,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC;oBAChC,UAAU;eACf,KAAK;;EA+Fd,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,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"}

package/dist/fixtures/rewards-query-results.d.ts

@@ -1,6 +1,9 @@
 import { Address } from "viem";
 import { CreatorERC20zQueryResult } from "../rewards/subgraph-queries";
 export declare const mockRewardsQueryResults: ({ erc20z, }: {
-    erc20z: Address[];
+    erc20z: {
+        secondaryActivated: boolean;
+        erz20z: Address;
+    }[];
 }) => CreatorERC20zQueryResult;
 //# sourceMappingURL=rewards-query-results.d.ts.map

package/dist/fixtures/rewards-query-results.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rewards-query-results.d.ts","sourceRoot":"","sources":["../../src/fixtures/rewards-query-results.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAEL,wBAAwB,EACzB,MAAM,6BAA6B,CAAC;AAcrC,eAAO,MAAM,uBAAuB,gBAEjC;IACD,MAAM,EAAE,OAAO,EAAE,CAAC;CACnB,KAAG,wBAEF,CAAC"}
+{"version":3,"file":"rewards-query-results.d.ts","sourceRoot":"","sources":["../../src/fixtures/rewards-query-results.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAEL,wBAAwB,EACzB,MAAM,6BAA6B,CAAC;AAqBrC,eAAO,MAAM,uBAAuB,gBAEjC;IACD,MAAM,EAAE;QAAE,kBAAkB,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,EAAE,CAAC;CAC5D,KAAG,wBAEF,CAAC"}

package/dist/index.cjs

@@ -5554,7 +5554,10 @@ var getRewardsBalance = async ({
   // Interface for getting ERC20Z tokens for a creator
 }) => {
   const address = typeof account === "string" ? account : account.address;
-  const erc20Zs = await rewardsGetter.getErc20ZzForCreator({ address });
+  const erc20ZsAndSecondaryActivated = await rewardsGetter.getErc20ZzForCreator(
+    { address }
+  );
+  const validErc20Zs = erc20ZsAndSecondaryActivated.filter(({ secondaryActivated }) => secondaryActivated).map(({ erc20z }) => erc20z);
   const result = await publicClient.multicall({
     contracts: [
       {
@@ -5567,7 +5570,7 @@ var getRewardsBalance = async ({
         address: import_protocol_deployments12.erc20ZRoyaltiesAddress[chainId],
         abi: import_protocol_deployments12.erc20ZRoyaltiesABI,
         functionName: "getUnclaimedFeesBatch",
-        args: [erc20Zs]
+        args: [validErc20Zs]
       }
     ],
     multicallAddress: multicall3Address,
@@ -5600,9 +5603,10 @@ var makeClaimSecondaryRoyaltiesCalls = async ({
   chainId,
   rewardsGetter
 }) => {
-  const erc20z = await rewardsGetter.getErc20ZzForCreator({
-    address: claimFor
-  });
+  const erc20ZsAndSecondaryActivated = await rewardsGetter.getErc20ZzForCreator(
+    { address: claimFor }
+  );
+  const erc20z = erc20ZsAndSecondaryActivated.filter(({ secondaryActivated }) => secondaryActivated).map(({ erc20z: erc20z2 }) => erc20z2);
   const royaltiesAddress = import_protocol_deployments12.erc20ZRoyaltiesAddress[chainId];
   if (erc20z.length === 0) {
     return [];
@@ -5709,6 +5713,7 @@ function buildCreatorERC20zs({
         }
         salesStrategies {
           zoraTimedMinter {
+            secondaryActivated
             erc20Z {
               id
             }
@@ -5729,15 +5734,23 @@ var SubgraphRewardsGetter = class extends SubgraphGetter {
   constructor(chainId, subgraphQuerier) {
     super(chainId, subgraphQuerier);
   }
-  async getErc20ZzForCreator({
-    address
-  }) {
+  async getErc20ZzForCreator({ address }) {
     const queryResults = await this.querySubgraphWithRetries(
       buildCreatorERC20zs({ address })
     );
-    return queryResults?.map(
-      (result) => result.salesStrategies[0].zoraTimedMinter.erc20Z.id
-    ) || [];
+    const results = (queryResults?.map((result) => {
+      const timedMinter = result.salesStrategies[0].zoraTimedMinter;
+      if (!timedMinter) {
+        return null;
+      }
+      return {
+        secondaryActivated: timedMinter.secondaryActivated,
+        erc20z: timedMinter.erc20Z.id
+      };
+    }) || []).filter(
+      (idAndActivated) => !!idAndActivated
+    );
+    return results;
   }
 };