@gearbox-protocol/sdk 13.2.0-next.1 → 13.2.1

package/dist/cjs/dev/AccountOpener.js

@@ -52,7 +52,6 @@ class AccountOpener extends import_sdk.SDKConstruct {
   #minDebtMultiplier;
   #allowMint;
   #leverageDelta;
-  #poolService;
   constructor(service, options_ = {}) {
     super(service.sdk);
     const {
@@ -78,7 +77,6 @@ class AccountOpener extends import_sdk.SDKConstruct {
     this.#poolDepositMultiplier = BigInt(poolDepositMultiplier);
     this.#minDebtMultiplier = BigInt(minDebtMultiplier);
     this.#leverageDelta = BigInt(leverageDelta);
-    this.#poolService = new import_sdk.PoolService(service.sdk);
     this.#logger?.info(
       {
         borrower: (0, import_accounts.privateKeyToAccount)(this.borrowerKey).address,
@@ -116,10 +114,6 @@ class AccountOpener extends import_sdk.SDKConstruct {
       },
       "opening credit accounts"
     );
-    await Promise.all([
-      this.sdk.tokensMeta.loadTokenData(),
-      this.sdk.marketRegister.loadZappers()
-    ]);
     let deposits = [];
     if (depositIntoPools) {
       try {
@@ -471,34 +465,9 @@ class AccountOpener extends import_sdk.SDKConstruct {
       this.#logger?.debug(
         `depositor balance in underlying: ${this.sdk.tokensMeta.formatBN(pool.underlying, allowance, { symbol: true })}`
       );
-      const tokensOut = this.#poolService.getDepositTokensOut(
-        address,
-        underlying
-      );
-      this.#logger?.debug(
-        { tokensOut: tokensOut.map((t) => this.labelAddress(t)) },
-        "deposit tokens out"
-      );
-      if (tokensOut.length === 0) {
-        throw new Error(`no tokens out found for pool ${poolName}`);
-      }
-      const tokenOut = tokensOut[0];
-      const metadata = this.#poolService.getDepositMetadata(
-        address,
-        underlying,
-        tokenOut
-      );
-      this.logger?.debug(
-        {
-          underlying: this.labelAddress(underlying),
-          tokenOut: this.labelAddress(tokenOut),
-          ...metadata
-        },
-        "pool deposit metadata"
-      );
       txHash = await this.#anvil.writeContract({
         account: depositor,
-        address: metadata.approveTarget,
+        address: underlying,
         abi: import_iERC20.ierc20Abi,
         functionName: "approve",
         args: [address, allowance],
@@ -515,21 +484,12 @@ class AccountOpener extends import_sdk.SDKConstruct {
       this.#logger?.debug(
         `depositor approved underlying for pool ${poolName}: ${txHash}`
       );
-      const depositCall = this.#poolService.addLiquidity({
-        collateral: { token: underlying, balance: amount },
-        pool: address,
-        wallet: depositor.address,
-        meta: metadata
-      });
-      if (!depositCall) {
-        throw new Error(`no deposit call could be created for ${poolName}`);
-      }
       txHash = await this.#anvil.writeContract({
         account: depositor,
-        address: depositCall.target,
-        abi: depositCall.abi,
-        functionName: depositCall.functionName,
-        args: depositCall.args,
+        address,
+        abi: import_generated.iPoolV310Abi,
+        functionName: "deposit",
+        args: [amount, depositor.address],
         chain: this.#anvil.chain
       });
       receipt = await this.#anvil.waitForTransactionReceipt({ hash: txHash });

package/dist/cjs/dev/index.js

@@ -3,6 +3,10 @@ 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))
@@ -14,6 +18,11 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var dev_exports = {};
+__export(dev_exports, {
+  LogSplitterTransportOptions: () => import_logSplitterTransport.LogSplitterTransportOptions,
+  isRangeError: () => import_logSplitterTransport.isRangeError,
+  logSplitterTransport: () => import_logSplitterTransport.logSplitterTransport
+});
 module.exports = __toCommonJS(dev_exports);
 __reExport(dev_exports, require("./AccountOpener.js"), module.exports);
 __reExport(dev_exports, require("./CachedStateSubscriber.js"), module.exports);
@@ -26,6 +35,7 @@ __reExport(dev_exports, require("./EthCallSpy.js"), module.exports);
 __reExport(dev_exports, require("./isOutOfSyncError.js"), module.exports);
 __reExport(dev_exports, require("./isRateLimitError.js"), module.exports);
 __reExport(dev_exports, require("./isTransientError.js"), module.exports);
+var import_logSplitterTransport = require("./logSplitterTransport.js");
 __reExport(dev_exports, require("./ltUtils.js"), module.exports);
 __reExport(dev_exports, require("./migrateFaucet.js"), module.exports);
 __reExport(dev_exports, require("./mint/index.js"), module.exports);
@@ -37,6 +47,9 @@ __reExport(dev_exports, require("./transports.js"), module.exports);
 __reExport(dev_exports, require("./types.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  LogSplitterTransportOptions,
+  isRangeError,
+  logSplitterTransport,
   ...require("./AccountOpener.js"),
   ...require("./CachedStateSubscriber.js"),
   ...require("./calcLiquidatableLTs.js"),

package/dist/cjs/dev/isTransientError.js

@@ -57,7 +57,11 @@ const TRANSIENT_PATTERNS = [
   // EIP-1474 ResourceUnavailableRpcError (code -32002): node is syncing or the
   // requested resource is temporarily unavailable.
   // Matches both the RPC message and viem's shortMessage "Requested resource not available."
-  /resource unavailable|requested resource not available/i
+  /resource unavailable|requested resource not available/i,
+  // sometimes happens on DRPC: "GRPC Context cancellation"
+  /context cancel/i,
+  // DRPC error: Can't route your request to suitable provider, if you specified certain providers revise the list
+  /suitable provider/i
 ];
 function isTransientError(e) {
   if (e instanceof import_viem.BaseError) {

package/dist/cjs/dev/logSplitterTransport.js

@@ -0,0 +1,154 @@
+"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 logSplitterTransport_exports = {};
+__export(logSplitterTransport_exports, {
+  fetchLogsWithPagination: () => fetchLogsWithPagination,
+  isFixedBlockRange: () => isFixedBlockRange,
+  isRangeError: () => isRangeError,
+  logSplitterTransport: () => logSplitterTransport,
+  parsePageSizeHint: () => parsePageSizeHint
+});
+module.exports = __toCommonJS(logSplitterTransport_exports);
+var import_viem = require("viem");
+function isFixedBlockRange(filter) {
+  if (filter.blockHash != null) return false;
+  return isHexBlockNumber(filter.fromBlock) && isHexBlockNumber(filter.toBlock);
+}
+function isHexBlockNumber(value) {
+  return typeof value === "string" && value.startsWith("0x");
+}
+const RANGE_ERROR_PATTERNS = [
+  /block range/i,
+  /too many results/i,
+  /response size/i,
+  /result window/i,
+  /exceeds allowed/i,
+  /cannot request logs over more than/i,
+  /eth_getLogs is limited to/i,
+  /eth_getLogs requests with up to/i,
+  /range is too large/i,
+  /exceeded max allowed range/i
+];
+function isRangeError(error) {
+  const msg = errorMessage(error);
+  return RANGE_ERROR_PATTERNS.some((re) => re.test(msg));
+}
+const GENERIC_BLOCKS_RE = /(\d+)\s*block/i;
+const ALCHEMY_RANGE_RE = /this block range should work: \[(0x[0-9a-fA-F]+),\s*(0x[0-9a-fA-F]+)\]/;
+function parsePageSizeHint(error) {
+  const alchemy = tryAlchemyHint(error);
+  if (alchemy != null) return alchemy;
+  const msg = errorMessage(error);
+  const m = msg.match(GENERIC_BLOCKS_RE);
+  return m ? Number(m[1]) : null;
+}
+function tryAlchemyHint(error) {
+  if (!(error instanceof import_viem.HttpRequestError)) return void 0;
+  try {
+    const parsed = JSON.parse(error.details);
+    if (typeof parsed.message !== "string") return void 0;
+    const match = parsed.message.match(ALCHEMY_RANGE_RE);
+    if (!match) return void 0;
+    const from = (0, import_viem.hexToNumber)(match[1]);
+    const to = (0, import_viem.hexToNumber)(match[2]);
+    return to - from + 1;
+  } catch {
+    return void 0;
+  }
+}
+function errorMessage(error) {
+  if (error instanceof Error) {
+    const details = error.details;
+    return details ? `${error.message} ${details}` : error.message;
+  }
+  return String(error);
+}
+async function fetchLogsWithPagination(callRpc, from, to, options) {
+  if (from > to) {
+    throw new import_viem.InvalidParamsRpcError(
+      new Error(`Invalid parameters: from (${from}) > to (${to})`)
+    );
+  }
+  const { softLimit, hardLimit } = options ?? {};
+  let pageSize = hardLimit ?? to - from + 1;
+  const results = [];
+  let cursor = from;
+  while (cursor <= to) {
+    const chunkEnd = Math.min(to, cursor + pageSize - 1);
+    try {
+      const logs = await callRpc(cursor, chunkEnd);
+      results.push(...logs);
+      cursor = chunkEnd + 1;
+    } catch (error) {
+      if (!isRangeError(error)) {
+        throw error;
+      }
+      if (cursor === chunkEnd) {
+        throw error;
+      }
+      const hint = parsePageSizeHint(error);
+      if (hint) {
+        pageSize = hint;
+      } else {
+        const half = Math.max(1, Math.floor((chunkEnd - cursor + 1) / 2));
+        pageSize = softLimit ? Math.min(softLimit, half) : half;
+      }
+    }
+  }
+  return results;
+}
+function logSplitterTransport(transport, logOptions) {
+  return (opts) => {
+    const base = transport(opts);
+    const rpcRequest = base.request;
+    const request = (async (args) => {
+      const { method, params } = args;
+      if (method !== "eth_getLogs") {
+        return rpcRequest(args);
+      }
+      const filter = params?.[0] ?? {};
+      if (!isFixedBlockRange(filter)) {
+        return rpcRequest(args);
+      }
+      const from = (0, import_viem.hexToNumber)(filter.fromBlock);
+      const to = (0, import_viem.hexToNumber)(filter.toBlock);
+      const callRpc = async (f, t) => {
+        const paginatedFilter = {
+          ...filter,
+          fromBlock: (0, import_viem.numberToHex)(f),
+          toBlock: (0, import_viem.numberToHex)(t)
+        };
+        return rpcRequest({
+          method: "eth_getLogs",
+          params: [paginatedFilter]
+        });
+      };
+      return fetchLogsWithPagination(callRpc, from, to, logOptions);
+    });
+    return { ...base, request };
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  fetchLogsWithPagination,
+  isFixedBlockRange,
+  isRangeError,
+  logSplitterTransport,
+  parsePageSizeHint
+});

package/dist/cjs/plugins/zappers/ZappersPlugin.js

@@ -0,0 +1,144 @@
+"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 ZappersPlugin_exports = {};
+__export(ZappersPlugin_exports, {
+  ZappersPlugin: () => ZappersPlugin
+});
+module.exports = __toCommonJS(ZappersPlugin_exports);
+var import_peripheryCompressor = require("../../abi/compressors/peripheryCompressor.js");
+var import_sdk = require("../../sdk/index.js");
+class ZappersPlugin extends import_sdk.BasePlugin {
+  #zappers;
+  #extraZappers;
+  constructor(extraZappers = [], loadOnAttach = false) {
+    super(loadOnAttach);
+    this.#extraZappers = this.#addExtraZappers(extraZappers);
+  }
+  async load(force) {
+    if (!force && this.loaded) {
+      return this.state;
+    }
+    const [pcAddr] = this.sdk.addressProvider.mustGetLatest(
+      import_sdk.AP_PERIPHERY_COMPRESSOR,
+      import_sdk.VERSION_RANGE_310
+    );
+    this.sdk.logger?.debug(
+      `loading zappers with periphery compressor ${pcAddr}`
+    );
+    const markets = this.sdk.marketRegister.markets;
+    const resp = await this.client.multicall({
+      contracts: markets.map(
+        (m) => ({
+          abi: import_peripheryCompressor.peripheryCompressorAbi,
+          address: pcAddr,
+          functionName: "getZappers",
+          args: [m.configurator.address, m.pool.pool.address]
+        })
+      ),
+      allowFailure: true,
+      batchSize: 0,
+      blockNumber: this.sdk.currentBlock
+    });
+    this.#zappers = new import_sdk.AddressMap(void 0, "zappers");
+    for (let i = 0; i < resp.length; i++) {
+      const { status, result, error } = resp[i];
+      const marketConfigurator = markets[i].configurator.address;
+      const pool = markets[i].pool.pool.address;
+      if (status === "success") {
+        this.#zappers.upsert(
+          pool,
+          result.map((z) => ({ ...z, pool }))
+        );
+      } else {
+        this.sdk.logger?.error(
+          `failed to load zapper for market configurator ${this.labelAddress(
+            marketConfigurator
+          )} and pool ${this.labelAddress(pool)}: ${error}`
+        );
+      }
+    }
+    this.#loadZapperTokens();
+    return this.state;
+  }
+  #addExtraZappers(extraZappers) {
+    const zappers = new import_sdk.AddressMap();
+    for (const z of extraZappers) {
+      const existing = zappers?.get(z.pool);
+      if (existing) {
+        const hasZapper = existing.some(
+          (zz) => (0, import_sdk.hexEq)(zz.baseParams.addr, z.baseParams.addr)
+        );
+        if (!hasZapper) {
+          existing.push(z);
+        }
+      } else {
+        zappers?.upsert(z.pool, [z]);
+      }
+    }
+    return zappers;
+  }
+  get extraZappers() {
+    if (!this.#extraZappers) {
+      console.error("extra zappers not attached");
+      return new import_sdk.AddressMap();
+    }
+    return this.#extraZappers;
+  }
+  get zappers() {
+    if (!this.#zappers) {
+      throw new Error("zappers plugin not attached");
+    }
+    return this.#zappers;
+  }
+  get loaded() {
+    return !!this.#zappers;
+  }
+  stateHuman(_) {
+    return this.zappers.values().flatMap(
+      (l) => l.flatMap((z) => ({
+        address: z.baseParams.addr,
+        contractType: z.baseParams.contractType,
+        version: Number(z.baseParams.version),
+        tokenIn: this.labelAddress(z.tokenIn.addr),
+        tokenOut: this.labelAddress(z.tokenOut.addr)
+      }))
+    );
+  }
+  get state() {
+    return {
+      zappers: this.zappers.asRecord()
+    };
+  }
+  hydrate(state) {
+    this.#zappers = new import_sdk.AddressMap(Object.entries(state.zappers), "zappers");
+    this.#loadZapperTokens();
+  }
+  #loadZapperTokens() {
+    const zappersTokens = this.zappers.values().flatMap((l) => l.flatMap((z) => [z.tokenIn, z.tokenOut]));
+    const extraZappersTokens = this.extraZappers.values().flatMap((l) => l.flatMap((z) => [z.tokenIn, z.tokenOut]));
+    for (const t of [...zappersTokens, ...extraZappersTokens]) {
+      this.sdk.tokensMeta.upsert(t.addr, t);
+      this.sdk.setAddressLabel(t.addr, t.symbol);
+    }
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ZappersPlugin
+});

package/dist/cjs/{sdk/market/ZapperRegister.js → plugins/zappers/extraZappers.js}

@@ -16,115 +16,12 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var ZapperRegister_exports = {};
-__export(ZapperRegister_exports, {
-  ZapperRegister: () => ZapperRegister
+var extraZappers_exports = {};
+__export(extraZappers_exports, {
+  extraZappers: () => extraZappers
 });
-module.exports = __toCommonJS(ZapperRegister_exports);
-var import_peripheryCompressor = require("../../abi/compressors/peripheryCompressor.js");
-var import_base = require("../base/index.js");
-var import_constants = require("../constants/index.js");
-var import_utils = require("../utils/index.js");
-class ZapperRegister extends import_base.SDKConstruct {
-  /**
-   * Mapping pool.address -> ZapperData[]
-   * Needs to be loaded explicitly using loadZappers method
-   */
-  #zappers;
-  /**
-   * Load zappers for all pools using periphery compressor, adds hardcoded zappers
-   */
-  async loadZappers(force) {
-    if (!force && this.#zappers) {
-      return;
-    }
-    const [pcAddr] = this.sdk.addressProvider.mustGetLatest(
-      import_constants.AP_PERIPHERY_COMPRESSOR,
-      import_constants.VERSION_RANGE_310
-    );
-    this.logger?.debug(`loading zappers with periphery compressor ${pcAddr}`);
-    const markets = this.sdk.marketRegister.markets;
-    const resp = await this.client.multicall({
-      contracts: markets.map(
-        (m) => ({
-          abi: import_peripheryCompressor.peripheryCompressorAbi,
-          address: pcAddr,
-          functionName: "getZappers",
-          args: [m.configurator.address, m.pool.pool.address]
-        })
-      ),
-      allowFailure: true,
-      batchSize: 0
-    });
-    this.#zappers = new import_utils.AddressMap(void 0, "zappers");
-    for (let i = 0; i < resp.length; i++) {
-      const { status, result, error } = resp[i];
-      const marketConfigurator = markets[i].configurator.address;
-      const pool = markets[i].pool.pool.address;
-      if (status === "success") {
-        for (const z of result) {
-          this.#addZapper({ ...z, pool, type: "base" });
-        }
-      } else {
-        this.logger?.error(
-          `failed to load zapper for market configurator ${this.labelAddress(
-            marketConfigurator
-          )} and pool ${this.labelAddress(pool)}: ${error}`
-        );
-      }
-    }
-    for (const z of KYC_ZAPPERS[this.networkType] ?? []) {
-      this.#addZapper({ ...z, type: "kyc" });
-    }
-    for (const z of MIGRATION_ZAPPERS[this.networkType] ?? []) {
-      this.#addZapper({ ...z, type: "migration" });
-    }
-  }
-  #addZapper(z) {
-    if (BROKEN_ZAPPERS.has(z.baseParams.addr)) {
-      return;
-    }
-    const existing = this.zappers.get(z.pool);
-    if (existing) {
-      const hasZapper = existing.some(
-        (zz) => (0, import_utils.hexEq)(zz.baseParams.addr, z.baseParams.addr)
-      );
-      if (!hasZapper) {
-        existing.push(z);
-      }
-    } else {
-      this.zappers.upsert(z.pool, [z]);
-    }
-    const zappersTokens = [z.tokenIn, z.tokenOut];
-    for (const t of zappersTokens) {
-      this.sdk.tokensMeta.upsert(t.addr, t);
-      this.sdk.setAddressLabel(t.addr, t.symbol);
-    }
-  }
-  get zappers() {
-    if (!this.#zappers) {
-      throw new Error("zappers not loaded, call loadZappers first");
-    }
-    return this.#zappers;
-  }
-  poolZappers(pool) {
-    return this.zappers.get(pool) ?? [];
-  }
-  /**
-   * Can return multiple zappers if there are multiple zappers for the same tokenIn and tokenOut
-   */
-  getZapper(pool, tokenIn, tokenOut) {
-    const zappers = this.zappers.get(pool)?.filter(
-      (z) => (0, import_utils.hexEq)(z.tokenIn.addr, tokenIn) && (0, import_utils.hexEq)(z.tokenOut.addr, tokenOut)
-    );
-    return zappers;
-  }
-}
-const BROKEN_ZAPPERS = new import_utils.AddressMap(
-  [["0x90D66b03EC4D462e42e3c7741049FB46a4a03B69", true]],
-  "brokenZappers"
-);
-const MIGRATION_ZAPPERS = {
+module.exports = __toCommonJS(extraZappers_exports);
+const extraZappers = {
   Mainnet: [
     {
       baseParams: {
@@ -233,8 +130,7 @@ const MIGRATION_ZAPPERS = {
     }
   ]
 };
-const KYC_ZAPPERS = {};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ZapperRegister
+  extraZappers
 });

package/dist/cjs/plugins/zappers/index.js

@@ -0,0 +1,26 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+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 __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var zappers_exports = {};
+module.exports = __toCommonJS(zappers_exports);
+__reExport(zappers_exports, require("./extraZappers.js"), module.exports);
+__reExport(zappers_exports, require("./types.js"), module.exports);
+__reExport(zappers_exports, require("./ZappersPlugin.js"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ...require("./extraZappers.js"),
+  ...require("./types.js"),
+  ...require("./ZappersPlugin.js")
+});

package/dist/cjs/plugins/zappers/package.json

@@ -0,0 +1 @@
+{"type": "commonjs"}