@gearbox-protocol/sdk 3.2.1-next.1 → 4.0.0-next.2

package/dist/cjs/dev/AccountOpener.js

@@ -193,7 +193,7 @@ class AccountOpener extends import_sdk.SDKConstruct {
       });
     }
     logger?.debug("looking for open strategy");
-    const strategy = await this.sdk.router.findOpenStrategyPath({
+    const strategy = await this.sdk.routerFor(cm).findOpenStrategyPath({
       creditManager: cm.creditManager,
       expectedBalances,
       leftoverBalances,

package/dist/cjs/sdk/GearboxSDK.js

@@ -50,8 +50,8 @@ class GearboxSDK {
   #attachConfig;
   // Collection of markets
   #marketRegister;
-  // Router contract
-  #router;
+  // Routers by address
+  #routers = new import_utils.AddressMap();
   logger;
   /**
    * Interest rate models can be reused across chain (and SDK operates on chain level)
@@ -203,11 +203,6 @@ class GearboxSDK {
       marketConfigurators,
       ignoreUpdateablePrices
     );
-    try {
-      this.#router = (0, import_router.createRouter)(this);
-    } catch (e) {
-      this.logger?.warn("router not found", e);
-    }
     const pluginsList = import_utils.TypedObjectUtils.entries(this.plugins);
     const pluginResponse = await Promise.allSettled(
       pluginsList.map(([name, plugin]) => {
@@ -435,11 +430,37 @@ class GearboxSDK {
     }
     return this.#marketRegister;
   }
-  get router() {
-    if (this.#router === void 0) {
-      throw ERR_NOT_ATTACHED;
+  /**
+   * Returns router contract that will work for given credit manager or credit facade
+   * @param params
+   * @returns
+   */
+  routerFor(params) {
+    let facadeAddr;
+    if ("creditFacade" in params) {
+      facadeAddr = (0, import_utils.toAddress)(params.creditFacade);
+    } else {
+      const cm = this.marketRegister.findCreditManager(
+        (0, import_utils.toAddress)(params.creditManager)
+      );
+      facadeAddr = cm.creditFacade.address;
+    }
+    const facadeV = this.contracts.mustGet(facadeAddr).version;
+    const routerRange = facadeV >= 310 ? [310, 319] : [300, 309];
+    const routerEntry = this.addressProvider.getLatestInRange(
+      import_constants.AP_ROUTER,
+      routerRange
+    );
+    if (!routerEntry) {
+      throw new Error(
+        `router not found for facade v ${facadeV} at ${facadeAddr}`
+      );
+    }
+    const [routerAddr, routerV] = routerEntry;
+    if (!this.#routers.has(routerAddr)) {
+      this.#routers.upsert(routerAddr, (0, import_router.createRouter)(this, routerAddr, routerV));
     }
-    return this.#router;
+    return this.#routers.mustGet(routerAddr);
   }
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/sdk/accounts/CreditAccountsService.js

@@ -219,7 +219,7 @@ class CreditAccountsService extends import_base.SDKConstruct {
    */
   async fullyLiquidate(account, to, slippage = 50n, force = false) {
     const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
-    const routerCloseResult = await this.sdk.router.findBestClosePath({
+    const routerCloseResult = await this.sdk.routerFor(account).findBestClosePath({
       creditAccount: account,
       creditManager: cm.creditManager,
       slippage,
@@ -263,7 +263,7 @@ class CreditAccountsService extends import_base.SDKConstruct {
     closePath
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const routerCloseResult = closePath || await this.sdk.router.findBestClosePath({
+    const routerCloseResult = closePath || await this.sdk.routerFor(ca).findBestClosePath({
       creditAccount: ca,
       creditManager: cm.creditManager,
       slippage

package/dist/cjs/sdk/router/createRouter.js

@@ -21,18 +21,16 @@ __export(createRouter_exports, {
   createRouter: () => createRouter
 });
 module.exports = __toCommonJS(createRouter_exports);
-var import_constants = require("../constants/index.js");
 var import_RouterV300Contract = require("./RouterV300Contract.js");
 var import_RouterV310Contract = require("./RouterV310Contract.js");
-function createRouter(sdk) {
-  const [address, v] = sdk.addressProvider.getLatestVersion(import_constants.AP_ROUTER);
-  if (v >= 300 && v < 310) {
+function createRouter(sdk, address, version) {
+  if (version >= 300 && version < 310) {
     return new import_RouterV300Contract.RouterV300Contract(sdk, address);
   }
-  if (v === 310) {
+  if (version === 310) {
     return new import_RouterV310Contract.RouterV310Contract(sdk, address);
   }
-  throw new Error(`Unsupported router version ${v}`);
+  throw new Error(`Unsupported router version ${version}`);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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

@@ -26,6 +26,7 @@ __reExport(utils_exports, require("./hex.js"), module.exports);
 __reExport(utils_exports, require("./json.js"), module.exports);
 __reExport(utils_exports, require("./mappers.js"), module.exports);
 __reExport(utils_exports, require("./retry.js"), module.exports);
+__reExport(utils_exports, require("./toAddress.js"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ...require("./AddressMap.js"),
@@ -38,5 +39,6 @@ __reExport(utils_exports, require("./retry.js"), module.exports);
   ...require("./hex.js"),
   ...require("./json.js"),
   ...require("./mappers.js"),
-  ...require("./retry.js")
+  ...require("./retry.js"),
+  ...require("./toAddress.js")
 });

package/dist/cjs/sdk/utils/toAddress.js

@@ -0,0 +1,36 @@
+"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 toAddress_exports = {};
+__export(toAddress_exports, {
+  toAddress: () => toAddress
+});
+module.exports = __toCommonJS(toAddress_exports);
+function toAddress(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if ("baseParams" in value) {
+    return value.baseParams.addr;
+  }
+  return value.address;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  toAddress
+});

package/dist/esm/dev/AccountOpener.js

@@ -179,7 +179,7 @@ class AccountOpener extends SDKConstruct {
       });
     }
     logger?.debug("looking for open strategy");
-    const strategy = await this.sdk.router.findOpenStrategyPath({
+    const strategy = await this.sdk.routerFor(cm).findOpenStrategyPath({
       creditManager: cm.creditManager,
       expectedBalances,
       leftoverBalances,

package/dist/esm/sdk/GearboxSDK.js

@@ -11,6 +11,7 @@ import {
   AP_BOT_LIST,
   AP_GEAR_STAKING,
   AP_GEAR_TOKEN,
+  AP_ROUTER,
   NO_VERSION
 } from "./constants/index.js";
 import {
@@ -24,7 +25,12 @@ import {
   defaultPlugins
 } from "./plugins/index.js";
 import { createRouter } from "./router/index.js";
-import { AddressMap, formatBN, TypedObjectUtils } from "./utils/index.js";
+import {
+  AddressMap,
+  formatBN,
+  toAddress,
+  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");
@@ -44,8 +50,8 @@ class GearboxSDK {
   #attachConfig;
   // Collection of markets
   #marketRegister;
-  // Router contract
-  #router;
+  // Routers by address
+  #routers = new AddressMap();
   logger;
   /**
    * Interest rate models can be reused across chain (and SDK operates on chain level)
@@ -197,11 +203,6 @@ class GearboxSDK {
       marketConfigurators,
       ignoreUpdateablePrices
     );
-    try {
-      this.#router = createRouter(this);
-    } catch (e) {
-      this.logger?.warn("router not found", e);
-    }
     const pluginsList = TypedObjectUtils.entries(this.plugins);
     const pluginResponse = await Promise.allSettled(
       pluginsList.map(([name, plugin]) => {
@@ -429,11 +430,37 @@ class GearboxSDK {
     }
     return this.#marketRegister;
   }
-  get router() {
-    if (this.#router === void 0) {
-      throw ERR_NOT_ATTACHED;
+  /**
+   * Returns router contract that will work for given credit manager or credit facade
+   * @param params
+   * @returns
+   */
+  routerFor(params) {
+    let facadeAddr;
+    if ("creditFacade" in params) {
+      facadeAddr = toAddress(params.creditFacade);
+    } else {
+      const cm = this.marketRegister.findCreditManager(
+        toAddress(params.creditManager)
+      );
+      facadeAddr = cm.creditFacade.address;
+    }
+    const facadeV = this.contracts.mustGet(facadeAddr).version;
+    const routerRange = facadeV >= 310 ? [310, 319] : [300, 309];
+    const routerEntry = this.addressProvider.getLatestInRange(
+      AP_ROUTER,
+      routerRange
+    );
+    if (!routerEntry) {
+      throw new Error(
+        `router not found for facade v ${facadeV} at ${facadeAddr}`
+      );
+    }
+    const [routerAddr, routerV] = routerEntry;
+    if (!this.#routers.has(routerAddr)) {
+      this.#routers.upsert(routerAddr, createRouter(this, routerAddr, routerV));
     }
-    return this.#router;
+    return this.#routers.mustGet(routerAddr);
   }
 }
 export {

package/dist/esm/sdk/accounts/CreditAccountsService.js

@@ -223,7 +223,7 @@ class CreditAccountsService extends SDKConstruct {
    */
   async fullyLiquidate(account, to, slippage = 50n, force = false) {
     const cm = this.sdk.marketRegister.findCreditManager(account.creditManager);
-    const routerCloseResult = await this.sdk.router.findBestClosePath({
+    const routerCloseResult = await this.sdk.routerFor(account).findBestClosePath({
       creditAccount: account,
       creditManager: cm.creditManager,
       slippage,
@@ -267,7 +267,7 @@ class CreditAccountsService extends SDKConstruct {
     closePath
   }) {
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
-    const routerCloseResult = closePath || await this.sdk.router.findBestClosePath({
+    const routerCloseResult = closePath || await this.sdk.routerFor(ca).findBestClosePath({
       creditAccount: ca,
       creditManager: cm.creditManager,
       slippage

package/dist/esm/sdk/router/createRouter.js

@@ -1,15 +1,13 @@
-import { AP_ROUTER } from "../constants/index.js";
 import { RouterV300Contract } from "./RouterV300Contract.js";
 import { RouterV310Contract } from "./RouterV310Contract.js";
-function createRouter(sdk) {
-  const [address, v] = sdk.addressProvider.getLatestVersion(AP_ROUTER);
-  if (v >= 300 && v < 310) {
+function createRouter(sdk, address, version) {
+  if (version >= 300 && version < 310) {
     return new RouterV300Contract(sdk, address);
   }
-  if (v === 310) {
+  if (version === 310) {
     return new RouterV310Contract(sdk, address);
   }
-  throw new Error(`Unsupported router version ${v}`);
+  throw new Error(`Unsupported router version ${version}`);
 }
 export {
   createRouter

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

@@ -9,3 +9,4 @@ export * from "./hex.js";
 export * from "./json.js";
 export * from "./mappers.js";
 export * from "./retry.js";
+export * from "./toAddress.js";

package/dist/esm/sdk/utils/toAddress.js

@@ -0,0 +1,12 @@
+function toAddress(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if ("baseParams" in value) {
+    return value.baseParams.addr;
+  }
+  return value.address;
+}
+export {
+  toAddress
+};

package/dist/types/sdk/GearboxSDK.d.ts

@@ -1,5 +1,5 @@
 import type { Address, Hex } from "viem";
-import type { BaseContract } from "./base/index.js";
+import type { BaseContract, BaseState, IBaseContract } from "./base/index.js";
 import { TokensMeta } from "./base/index.js";
 import type { ConnectionOptions, NetworkOptions, TransportOptions } from "./chain/index.js";
 import { Provider } from "./chain/index.js";
@@ -8,7 +8,7 @@ import { BotListContract, GearStakingContract } from "./core/index.js";
 import { MarketRegister } from "./market/MarketRegister.js";
 import { PriceFeedRegister } from "./market/pricefeeds/index.js";
 import { type PluginInstances, type PluginMap } from "./plugins/index.js";
-import type { IRouterContract } from "./router/index.js";
+import { type IRouterContract } from "./router/index.js";
 import type { GearboxState, GearboxStateHuman, ILogger, MultiCall } from "./types/index.js";
 import { AddressMap } from "./utils/index.js";
 export interface SDKOptions<Plugins extends PluginMap = {}> {
@@ -150,5 +150,14 @@ export declare class GearboxSDK<Plugins extends PluginMap = {}> {
     get botListContract(): BotListContract;
     get gearStakingContract(): GearStakingContract;
     get marketRegister(): MarketRegister;
-    get router(): IRouterContract;
+    /**
+     * Returns router contract that will work for given credit manager or credit facade
+     * @param params
+     * @returns
+     */
+    routerFor(params: {
+        creditManager: Address | BaseState | IBaseContract;
+    } | {
+        creditFacade: Address | BaseState | IBaseContract;
+    }): IRouterContract;
 }

package/dist/types/sdk/router/createRouter.d.ts

@@ -1,3 +1,4 @@
+import type { Address } from "viem";
 import type { GearboxSDK } from "../GearboxSDK.js";
 import type { IRouterContract } from "./types.js";
-export declare function createRouter(sdk: GearboxSDK): IRouterContract;
+export declare function createRouter(sdk: GearboxSDK, address: Address, version: number): IRouterContract;

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

@@ -9,3 +9,4 @@ export * from "./hex.js";
 export * from "./json.js";
 export * from "./mappers.js";
 export * from "./retry.js";
+export * from "./toAddress.js";

package/dist/types/sdk/utils/toAddress.d.ts

@@ -0,0 +1,3 @@
+import type { Address } from "abitype";
+import type { BaseState, IBaseContract } from "../base/index.js";
+export declare function toAddress(value: Address | BaseState | IBaseContract): Address;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "3.2.1-next.1",
+  "version": "4.0.0-next.2",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",
@@ -65,8 +65,8 @@
     "typecheck:ci": "tsc --noEmit"
   },
   "dependencies": {
-    "@redstone-finance/evm-connector": "^0.7.3",
-    "@redstone-finance/protocol": "^0.7.3",
+    "@redstone-finance/evm-connector": "^0.7.5",
+    "@redstone-finance/protocol": "^0.7.5",
     "abitype": "^1.0.8",
     "date-fns": "^4.1.0",
     "decimal.js-light": "^2.5.1",
@@ -79,7 +79,7 @@
     "@gearbox-protocol/eslint-config": "^2.0.0-next.2",
     "@gearbox-protocol/prettier-config": "^2.1.0",
     "@types/cross-spawn": "^6.0.6",
-    "axios": "^1.8.4",
+    "axios": "^1.9.0",
     "cross-spawn": "^7.0.6",
     "eslint": "^8.57.1",
     "eslint-plugin-require-extensions": "^0.1.3",
@@ -89,9 +89,9 @@
     "pino-pretty": "^13.0.0",
     "prettier": "^3.5.3",
     "tsup": "^8.4.0",
-    "tsx": "^4.19.3",
+    "tsx": "^4.19.4",
     "typescript": "^5.8.3",
-    "vitest": "^3.1.1"
+    "vitest": "^3.1.2"
   },
   "peerDependencies": {
     "axios": "^1.0.0"