@gearbox-protocol/sdk 3.0.2 → 3.0.4

package/dist/cjs/sdk/GearboxSDK.js

@@ -32,6 +32,7 @@ var import_plugins = require("./plugins/index.js");
 var import_router = require("./router/index.js");
 var import_utils = require("./utils/index.js");
 var import_internal = require("./utils/internal/index.js");
+var import_viem2 = require("./utils/viem/index.js");
 const ERR_NOT_ATTACHED = new Error("Gearbox SDK not attached");
 class GearboxSDK {
   #hooks = new import_internal.Hooks();
@@ -354,7 +355,7 @@ class GearboxSDK {
     this.logger?.debug(
       `getting logs from ${watchAddresses.length} addresses in [${this.currentBlock}:${blockNumber}]`
     );
-    const logs = await this.provider.publicClient.getLogs({
+    const logs = await (0, import_viem2.getLogsSafe)(this.provider.publicClient, {
       fromBlock: this.currentBlock,
       toBlock: blockNumber,
       address: watchAddresses

package/dist/cjs/sdk/core/address-provider/AddressProviderV3Contract.js

@@ -34,6 +34,7 @@ module.exports = __toCommonJS(AddressProviderV3Contract_exports);
 var import_viem = require("viem");
 var import_v300 = require("../../../abi/v300.js");
 var import_constants = require("../../constants/index.js");
+var import_viem2 = require("../../utils/viem/index.js");
 var import_AbstractAddressProviderContract = __toESM(require("./AbstractAddressProviderContract.js"));
 const abi = import_v300.iAddressProviderV300Abi;
 class AddressProviderContractV3 extends import_AbstractAddressProviderContract.default {
@@ -89,7 +90,7 @@ class AddressProviderContractV3 extends import_AbstractAddressProviderContract.d
     this.logger?.debug(
       `loading events from block ${fromBlock} to ${blockNumber}`
     );
-    const events = await this.sdk.provider.publicClient.getLogs({
+    const events = await (0, import_viem2.getLogsSafe)(this.sdk.provider.publicClient, {
       address: this.address,
       event: (0, import_viem.getAbiItem)({ abi: this.abi, name: "SetAddress" }),
       fromBlock,

package/dist/cjs/sdk/plugins/V300StalenessPeriodPlugin.js

@@ -27,6 +27,7 @@ var import_base = require("../base/index.js");
 var import_constants = require("../constants/index.js");
 var import_market = require("../market/index.js");
 var import_utils = require("../utils/index.js");
+var import_viem2 = require("../utils/viem/index.js");
 class V300StalenessPeriodPlugin extends import_base.SDKConstruct {
   #syncedTo;
   #logger;
@@ -49,7 +50,7 @@ class V300StalenessPeriodPlugin extends import_base.SDKConstruct {
     if (addresses.length === 0 || fromBlock > toBlock) {
       return;
     }
-    const events = await this.client.getLogs({
+    const events = await (0, import_viem2.getLogsSafe)(this.client, {
       address: addresses,
       events: [
         (0, import_viem.getAbiItem)({

package/dist/cjs/sdk/sdk-legacy/gearboxRewards/api.js

@@ -233,32 +233,32 @@ class GearboxRewardsApi {
       acc[p.dieselToken] = p.address;
       return acc;
     }, {});
-    const extraRewards = (merkleXYZLm || []).reduce(
-      (acc, chainRewards) => {
-        chainRewards.rewards.forEach((reward) => {
-          const rewardToken = reward.token.address.toLowerCase();
-          reward.breakdowns.forEach((reason) => {
-            const poolToken = ((reason.reason || "").split("_")[1] || "").toLowerCase();
-            const pool = (baseRewardPoolsInfo[poolToken]?.pool || poolToken || "").toLowerCase();
-            if (poolByItsToken[poolToken] && poolByItsToken[pool]) {
-              const total = (0, import_utils.toBigInt)(reason.amount || 0);
-              const claimed = (0, import_utils.toBigInt)(reason.claimed || 0);
-              acc.push({
-                pool,
-                poolToken,
-                rewardToken,
-                rewardTokenSymbol: reward.token.symbol,
-                rewardTokenDecimals: reward.token.decimals || 18,
-                amount: import_math.BigIntMath.max(total - claimed, 0n),
-                type: "extraMerkle"
-              });
-            }
-          });
+    const extraRewards = (merkleXYZLm || []).reduce((acc, chainRewards) => {
+      chainRewards.rewards.forEach((reward) => {
+        const rewardToken = reward.token.address.toLowerCase();
+        reward.breakdowns.forEach((reason) => {
+          const poolToken = ((reason.reason || "").split("_").find((part) => part.startsWith("0x")) || "").toLowerCase();
+          const pool = poolByItsToken[poolToken];
+          const total = (0, import_utils.toBigInt)(reason.amount || 0);
+          const claimed = (0, import_utils.toBigInt)(reason.claimed || 0);
+          const claimable = import_math.BigIntMath.max(total - claimed, 0n);
+          const key = [pool, poolToken, rewardToken].join("_");
+          if (pool && claimable > 0n) {
+            const prevAmount = acc[key]?.amount || 0n;
+            acc[key] = {
+              pool,
+              poolToken,
+              rewardToken,
+              rewardTokenSymbol: reward.token.symbol,
+              rewardTokenDecimals: reward.token.decimals || 18,
+              amount: prevAmount + claimable,
+              type: "extraMerkle"
+            };
+          }
         });
-        return acc;
-      },
-      []
-    );
+      });
+      return acc;
+    }, {});
     const gearboxLmRewards = poolTokens.map((address, i) => {
       const info = baseRewardPoolsInfo[address];
       const rewardToken = currentTokenData[info.symbol];
@@ -285,7 +285,7 @@ class GearboxRewardsApi {
       { nonZero: [], zero: [] }
     );
     return {
-      rewards: [...nonZero, ...extraRewards, zero]
+      rewards: [...nonZero, ...Object.values(extraRewards), zero]
     };
   }
   static extractFulfilled(r, reportError, description) {

package/dist/cjs/sdk/utils/viem/getLogsSafe.js

@@ -0,0 +1,86 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var getLogsSafe_exports = {};
+__export(getLogsSafe_exports, {
+  getLogsSafe: () => getLogsSafe
+});
+module.exports = __toCommonJS(getLogsSafe_exports);
+var import_viem = require("viem");
+var import_actions = require("viem/actions");
+async function getLogsSafe(client, params = {}) {
+  try {
+    const events = await (0, import_actions.getLogs)(client, params);
+    return events;
+  } catch (e) {
+    const fromBlock = params.fromBlock;
+    const toBlock = params.toBlock;
+    const bisected = tryBisectBlockRange({ fromBlock, toBlock }, e);
+    if (!bisected) {
+      throw e;
+    }
+    const [left, right] = await Promise.all([
+      (0, import_actions.getLogs)(client, { ...params, ...bisected[0] }),
+      (0, import_actions.getLogs)(client, { ...params, ...bisected[1] })
+    ]);
+    return [...left, ...right];
+  }
+}
+function tryBisectBlockRange({ fromBlock, toBlock }, e) {
+  const alchemyMid = checkForAlchemyBlockRange(e);
+  if (alchemyMid && alchemyMid > fromBlock && alchemyMid < toBlock) {
+    return [
+      { fromBlock, toBlock: alchemyMid },
+      { fromBlock: alchemyMid + 1n, toBlock }
+    ];
+  }
+  const blockRangeErrors = [
+    "query exceeds max block",
+    "range is too large",
+    "eth_getLogs is limited to",
+    "eth_getLogs requests with up to"
+  ];
+  if (e instanceof Error && blockRangeErrors.some((errorText) => e.message.includes(errorText))) {
+    const middle = (fromBlock + toBlock) / 2n;
+    return [
+      { fromBlock, toBlock: middle },
+      { fromBlock: middle + 1n, toBlock }
+    ];
+  }
+  return void 0;
+}
+const ALCHEMY_BLOCK_RANGE_REGEX = /this block range should work: \[(0x[0-9a-fA-F]+),\s*(0x[0-9a-fA-F]+)\]/;
+function checkForAlchemyBlockRange(e) {
+  if (e instanceof import_viem.HttpRequestError) {
+    try {
+      const err = JSON.parse(e.details);
+      if (typeof err.message === "string") {
+        const match = err.message.match(ALCHEMY_BLOCK_RANGE_REGEX);
+        if (match) {
+          return BigInt(match[2]);
+        }
+      }
+    } catch {
+    }
+  }
+  return void 0;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getLogsSafe
+});

package/dist/cjs/sdk/utils/viem/index.js

@@ -16,12 +16,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var viem_exports = {};
 module.exports = __toCommonJS(viem_exports);
 __reExport(viem_exports, require("./cast.js"), module.exports);
+__reExport(viem_exports, require("./getLogsSafe.js"), module.exports);
 __reExport(viem_exports, require("./sendRawTx.js"), module.exports);
 __reExport(viem_exports, require("./simulateMulticall.js"), module.exports);
 __reExport(viem_exports, require("./simulateWithPriceUpdates.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./cast.js"),
+  ...require("./getLogsSafe.js"),
   ...require("./sendRawTx.js"),
   ...require("./simulateMulticall.js"),
   ...require("./simulateWithPriceUpdates.js")

package/dist/esm/sdk/GearboxSDK.js

@@ -26,6 +26,7 @@ import {
 import { createRouter } from "./router/index.js";
 import { AddressMap, formatBN, TypedObjectUtils } from "./utils/index.js";
 import { Hooks } from "./utils/internal/index.js";
+import { getLogsSafe } from "./utils/viem/index.js";
 const ERR_NOT_ATTACHED = new Error("Gearbox SDK not attached");
 class GearboxSDK {
   #hooks = new Hooks();
@@ -348,7 +349,7 @@ class GearboxSDK {
     this.logger?.debug(
       `getting logs from ${watchAddresses.length} addresses in [${this.currentBlock}:${blockNumber}]`
     );
-    const logs = await this.provider.publicClient.getLogs({
+    const logs = await getLogsSafe(this.provider.publicClient, {
       fromBlock: this.currentBlock,
       toBlock: blockNumber,
       address: watchAddresses

package/dist/esm/sdk/core/address-provider/AddressProviderV3Contract.js

@@ -1,6 +1,7 @@
 import { bytesToString, getAbiItem, parseEventLogs, toBytes } from "viem";
 import { iAddressProviderV300Abi } from "../../../abi/v300.js";
 import { ADDRESS_PROVIDER_BLOCK } from "../../constants/index.js";
+import { getLogsSafe } from "../../utils/viem/index.js";
 import AbstractAddressProviderContract from "./AbstractAddressProviderContract.js";
 const abi = iAddressProviderV300Abi;
 class AddressProviderContractV3 extends AbstractAddressProviderContract {
@@ -56,7 +57,7 @@ class AddressProviderContractV3 extends AbstractAddressProviderContract {
     this.logger?.debug(
       `loading events from block ${fromBlock} to ${blockNumber}`
     );
-    const events = await this.sdk.provider.publicClient.getLogs({
+    const events = await getLogsSafe(this.sdk.provider.publicClient, {
       address: this.address,
       event: getAbiItem({ abi: this.abi, name: "SetAddress" }),
       fromBlock,

package/dist/esm/sdk/plugins/V300StalenessPeriodPlugin.js

@@ -4,6 +4,7 @@ import { SDKConstruct } from "../base/index.js";
 import { ADDRESS_PROVIDER_BLOCK } from "../constants/index.js";
 import { PriceFeedRef } from "../market/index.js";
 import { formatDuration, hexEq } from "../utils/index.js";
+import { getLogsSafe } from "../utils/viem/index.js";
 class V300StalenessPeriodPlugin extends SDKConstruct {
   #syncedTo;
   #logger;
@@ -26,7 +27,7 @@ class V300StalenessPeriodPlugin extends SDKConstruct {
     if (addresses.length === 0 || fromBlock > toBlock) {
       return;
     }
-    const events = await this.client.getLogs({
+    const events = await getLogsSafe(this.client, {
       address: addresses,
       events: [
         getAbiItem({

package/dist/esm/sdk/sdk-legacy/gearboxRewards/api.js

@@ -200,32 +200,32 @@ class GearboxRewardsApi {
       acc[p.dieselToken] = p.address;
       return acc;
     }, {});
-    const extraRewards = (merkleXYZLm || []).reduce(
-      (acc, chainRewards) => {
-        chainRewards.rewards.forEach((reward) => {
-          const rewardToken = reward.token.address.toLowerCase();
-          reward.breakdowns.forEach((reason) => {
-            const poolToken = ((reason.reason || "").split("_")[1] || "").toLowerCase();
-            const pool = (baseRewardPoolsInfo[poolToken]?.pool || poolToken || "").toLowerCase();
-            if (poolByItsToken[poolToken] && poolByItsToken[pool]) {
-              const total = toBigInt(reason.amount || 0);
-              const claimed = toBigInt(reason.claimed || 0);
-              acc.push({
-                pool,
-                poolToken,
-                rewardToken,
-                rewardTokenSymbol: reward.token.symbol,
-                rewardTokenDecimals: reward.token.decimals || 18,
-                amount: BigIntMath.max(total - claimed, 0n),
-                type: "extraMerkle"
-              });
-            }
-          });
+    const extraRewards = (merkleXYZLm || []).reduce((acc, chainRewards) => {
+      chainRewards.rewards.forEach((reward) => {
+        const rewardToken = reward.token.address.toLowerCase();
+        reward.breakdowns.forEach((reason) => {
+          const poolToken = ((reason.reason || "").split("_").find((part) => part.startsWith("0x")) || "").toLowerCase();
+          const pool = poolByItsToken[poolToken];
+          const total = toBigInt(reason.amount || 0);
+          const claimed = toBigInt(reason.claimed || 0);
+          const claimable = BigIntMath.max(total - claimed, 0n);
+          const key = [pool, poolToken, rewardToken].join("_");
+          if (pool && claimable > 0n) {
+            const prevAmount = acc[key]?.amount || 0n;
+            acc[key] = {
+              pool,
+              poolToken,
+              rewardToken,
+              rewardTokenSymbol: reward.token.symbol,
+              rewardTokenDecimals: reward.token.decimals || 18,
+              amount: prevAmount + claimable,
+              type: "extraMerkle"
+            };
+          }
         });
-        return acc;
-      },
-      []
-    );
+      });
+      return acc;
+    }, {});
     const gearboxLmRewards = poolTokens.map((address, i) => {
       const info = baseRewardPoolsInfo[address];
       const rewardToken = currentTokenData[info.symbol];
@@ -252,7 +252,7 @@ class GearboxRewardsApi {
       { nonZero: [], zero: [] }
     );
     return {
-      rewards: [...nonZero, ...extraRewards, zero]
+      rewards: [...nonZero, ...Object.values(extraRewards), zero]
     };
   }
   static extractFulfilled(r, reportError, description) {

package/dist/esm/sdk/utils/viem/getLogsSafe.js

@@ -0,0 +1,64 @@
+import {
+  HttpRequestError
+} from "viem";
+import { getLogs } from "viem/actions";
+async function getLogsSafe(client, params = {}) {
+  try {
+    const events = await getLogs(client, params);
+    return events;
+  } catch (e) {
+    const fromBlock = params.fromBlock;
+    const toBlock = params.toBlock;
+    const bisected = tryBisectBlockRange({ fromBlock, toBlock }, e);
+    if (!bisected) {
+      throw e;
+    }
+    const [left, right] = await Promise.all([
+      getLogs(client, { ...params, ...bisected[0] }),
+      getLogs(client, { ...params, ...bisected[1] })
+    ]);
+    return [...left, ...right];
+  }
+}
+function tryBisectBlockRange({ fromBlock, toBlock }, e) {
+  const alchemyMid = checkForAlchemyBlockRange(e);
+  if (alchemyMid && alchemyMid > fromBlock && alchemyMid < toBlock) {
+    return [
+      { fromBlock, toBlock: alchemyMid },
+      { fromBlock: alchemyMid + 1n, toBlock }
+    ];
+  }
+  const blockRangeErrors = [
+    "query exceeds max block",
+    "range is too large",
+    "eth_getLogs is limited to",
+    "eth_getLogs requests with up to"
+  ];
+  if (e instanceof Error && blockRangeErrors.some((errorText) => e.message.includes(errorText))) {
+    const middle = (fromBlock + toBlock) / 2n;
+    return [
+      { fromBlock, toBlock: middle },
+      { fromBlock: middle + 1n, toBlock }
+    ];
+  }
+  return void 0;
+}
+const ALCHEMY_BLOCK_RANGE_REGEX = /this block range should work: \[(0x[0-9a-fA-F]+),\s*(0x[0-9a-fA-F]+)\]/;
+function checkForAlchemyBlockRange(e) {
+  if (e instanceof HttpRequestError) {
+    try {
+      const err = JSON.parse(e.details);
+      if (typeof err.message === "string") {
+        const match = err.message.match(ALCHEMY_BLOCK_RANGE_REGEX);
+        if (match) {
+          return BigInt(match[2]);
+        }
+      }
+    } catch {
+    }
+  }
+  return void 0;
+}
+export {
+  getLogsSafe
+};

package/dist/esm/sdk/utils/viem/index.js

@@ -1,4 +1,5 @@
 export * from "./cast.js";
+export * from "./getLogsSafe.js";
 export * from "./sendRawTx.js";
 export * from "./simulateMulticall.js";
 export * from "./simulateWithPriceUpdates.js";

package/dist/types/sdk/utils/viem/getLogsSafe.d.ts

@@ -0,0 +1,3 @@
+import type { AbiEvent } from "abitype";
+import { type BlockNumber, type Chain, type Client, type GetLogsParameters, type GetLogsReturnType, type Transport } from "viem";
+export declare function getLogsSafe<chain extends Chain | undefined, const abiEvent extends AbiEvent | undefined = undefined, const abiEvents extends readonly AbiEvent[] | readonly unknown[] | undefined = abiEvent extends AbiEvent ? [abiEvent] : undefined, strict extends boolean | undefined = undefined>(client: Client<Transport, chain>, params?: GetLogsParameters<abiEvent, abiEvents, strict, BlockNumber, BlockNumber>): Promise<GetLogsReturnType<abiEvent, abiEvents, strict, BlockNumber, BlockNumber>>;

package/dist/types/sdk/utils/viem/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./cast.js";
+export * from "./getLogsSafe.js";
 export * from "./sendRawTx.js";
 export * from "./simulateMulticall.js";
 export * from "./simulateWithPriceUpdates.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",