@gearbox-protocol/sdk 7.3.0 → 7.4.0-next.1

package/dist/cjs/dev/AccountsCounterPlugin.js

@@ -32,6 +32,12 @@ class AccountsCounterPlugin extends import_sdk.SDKConstruct {
   async syncState() {
     await this.#load();
   }
+  get accounts() {
+    return this.#accounts;
+  }
+  forCreditManager(addr) {
+    return this.#accounts.mustGet(addr);
+  }
   async #load() {
     const [compressor] = this.sdk.addressProvider.mustGetLatest(
       import_sdk.AP_CREDIT_ACCOUNT_COMPRESSOR,

package/dist/cjs/sdk/sdk-legacy/core/creditAccount.js

@@ -28,6 +28,8 @@ var import_price = require("../utils/price.js");
 const MAX_UINT16 = 65535;
 class CreditAccountData_Legacy {
   isSuccessful;
+  chainId;
+  network;
   creditAccount;
   borrower;
   creditManager;
@@ -38,7 +40,6 @@ class CreditAccountData_Legacy {
   version;
   enabledTokensMask;
   healthFactor;
-  isDeleting;
   baseBorrowRateWithoutFee;
   borrowedAmount;
   accruedInterest;
@@ -56,6 +57,8 @@ class CreditAccountData_Legacy {
   quotedTokens = {};
   constructor(payload) {
     this.isSuccessful = payload.isSuccessful;
+    this.chainId = payload.chainId;
+    this.network = payload.network;
     this.creditAccount = payload.addr.toLowerCase();
     this.borrower = payload.borrower.toLowerCase();
     this.creditManager = payload.creditManager.toLowerCase();
@@ -68,7 +71,6 @@ class CreditAccountData_Legacy {
       (payload.healthFactor || 0n) * import_constants.PERCENTAGE_FACTOR / import_constants.WAD
     );
     this.enabledTokensMask = payload.enabledTokensMask;
-    this.isDeleting = false;
     this.borrowedAmount = payload.debt;
     this.accruedInterest = payload.accruedInterest || 0n;
     this.accruedFees = payload.accruedFees || 0n;
@@ -107,9 +109,6 @@ class CreditAccountData_Legacy {
       this.tokens[token] = balance;
     });
   }
-  setDeleteInProgress(d) {
-    this.isDeleting = d;
-  }
   static sortBalances(balances, prices, tokens) {
     return Object.entries(balances).sort(
       ([addr1, amount1], [addr2, amount2]) => {

package/dist/cjs/sdk/sdk-legacy/core/creditManager.js

@@ -26,6 +26,8 @@ var import_constants = require("../../constants/index.js");
 var import_utils = require("../../utils/index.js");
 class CreditManagerData_Legacy {
   address;
+  chainId;
+  network;
   underlyingToken;
   pool;
   creditFacade;
@@ -67,6 +69,8 @@ class CreditManagerData_Legacy {
   quotas;
   constructor(payload) {
     this.address = payload.addr.toLowerCase();
+    this.chainId = payload.chainId;
+    this.network = payload.network;
     this.underlyingToken = payload.underlying.toLowerCase();
     this.name = payload.name;
     this.pool = payload.pool.toLowerCase();

package/dist/cjs/sdk/sdk-legacy/core/pool.js

@@ -30,7 +30,8 @@ var import_utils = require("../../utils/index.js");
 var import_formatter = require("../utils/formatter.js");
 class PoolData_Legacy {
   address;
-  type;
+  chainId;
+  network;
   underlyingToken;
   dieselToken;
   stakedDieselToken;
@@ -62,7 +63,8 @@ class PoolData_Legacy {
   lastBaseInterestUpdate;
   constructor(payload, extra) {
     this.address = payload.addr.toLowerCase();
-    this.type = PoolData_Legacy.getPoolType(payload.name || "");
+    this.chainId = payload.chainId;
+    this.network = payload.network;
     this.underlyingToken = payload.underlying.toLowerCase();
     this.dieselToken = payload.dieselToken.toLowerCase();
     this.stakedDieselToken = (extra.stakedDieselToken || []).map(
@@ -151,13 +153,6 @@ class PoolData_Legacy {
     });
     return model.read.calcBorrowRate([expectedLiquidity, availableLiquidity]);
   }
-  static getPoolType(name) {
-    const [identity = ""] = name.split(" ") || [];
-    const lc = identity.toLowerCase();
-    if (lc === "farm") return "farm";
-    if (lc === "trade") return "trade";
-    return "universal";
-  }
   static calculateUtilization(expected, available) {
     if (expected === 0n) return 0;
     const borrowed = expected - available;
@@ -169,7 +164,6 @@ class ChartsPoolData {
   address;
   underlyingToken;
   dieselToken;
-  type;
   version;
   name;
   addLiqCount;
@@ -222,7 +216,6 @@ class ChartsPoolData {
     this.address = (payload.addr || "").toLowerCase();
     this.underlyingToken = (payload.underlyingToken || "").toLowerCase();
     this.dieselToken = (payload.dieselToken || "").toLowerCase();
-    this.type = PoolData_Legacy.getPoolType(payload.name || "");
     this.version = payload.version || 1;
     this.name = payload.name || "";
     this.earned7D = payload.earned7D || 0;

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

@@ -86,7 +86,7 @@ class GearboxRewardsExtraApy {
             pointsInfo2
           );
           if (points !== null) {
-            acc2.push({ balance: points, token: tokenBalance.token });
+            acc2.push({ balance: points, token: tokenAddress });
           }
           return acc2;
         },
@@ -98,14 +98,15 @@ class GearboxRewardsExtraApy {
     return r;
   }
   static getPoolTokenPoints(tokenBalanceInPool, pool, tokensList, pointsInfo) {
-    if (!tokenBalanceInPool) return null;
+    if (!tokenBalanceInPool && pointsInfo.estimation === "relative")
+      return null;
     if (pool.expectedLiquidity <= 0) return 0n;
-    const { decimals = 18 } = tokensList[tokenBalanceInPool.token] || {};
+    const { decimals = 18 } = tokensList[pointsInfo.token] || {};
     const targetFactor = 10n ** BigInt(decimals);
     const { decimals: underlyingDecimals = 18 } = tokensList[pool.underlyingToken] || {};
     const underlyingFactor = 10n ** BigInt(underlyingDecimals);
     const defaultPoints = pointsInfo.amount * targetFactor / import_constants.PERCENTAGE_FACTOR;
-    const points = pointsInfo.estimation === "absolute" ? defaultPoints : tokenBalanceInPool.balance * defaultPoints / (pool.expectedLiquidity * targetFactor / underlyingFactor);
+    const points = pointsInfo.estimation === "absolute" ? defaultPoints : (tokenBalanceInPool?.balance || 0n) * defaultPoints / (pool.expectedLiquidity * targetFactor / underlyingFactor);
     return import_math.BigIntMath.min(points, defaultPoints);
   }
   static getPoolPointsTip(poolRewards, pool, token) {

package/dist/esm/dev/AccountsCounterPlugin.js

@@ -17,6 +17,12 @@ class AccountsCounterPlugin extends SDKConstruct {
   async syncState() {
     await this.#load();
   }
+  get accounts() {
+    return this.#accounts;
+  }
+  forCreditManager(addr) {
+    return this.#accounts.mustGet(addr);
+  }
   async #load() {
     const [compressor] = this.sdk.addressProvider.mustGetLatest(
       AP_CREDIT_ACCOUNT_COMPRESSOR,

package/dist/esm/sdk/sdk-legacy/core/creditAccount.js

@@ -14,6 +14,8 @@ import { PriceUtils } from "../utils/price.js";
 const MAX_UINT16 = 65535;
 class CreditAccountData_Legacy {
   isSuccessful;
+  chainId;
+  network;
   creditAccount;
   borrower;
   creditManager;
@@ -24,7 +26,6 @@ class CreditAccountData_Legacy {
   version;
   enabledTokensMask;
   healthFactor;
-  isDeleting;
   baseBorrowRateWithoutFee;
   borrowedAmount;
   accruedInterest;
@@ -42,6 +43,8 @@ class CreditAccountData_Legacy {
   quotedTokens = {};
   constructor(payload) {
     this.isSuccessful = payload.isSuccessful;
+    this.chainId = payload.chainId;
+    this.network = payload.network;
     this.creditAccount = payload.addr.toLowerCase();
     this.borrower = payload.borrower.toLowerCase();
     this.creditManager = payload.creditManager.toLowerCase();
@@ -54,7 +57,6 @@ class CreditAccountData_Legacy {
       (payload.healthFactor || 0n) * PERCENTAGE_FACTOR / WAD
     );
     this.enabledTokensMask = payload.enabledTokensMask;
-    this.isDeleting = false;
     this.borrowedAmount = payload.debt;
     this.accruedInterest = payload.accruedInterest || 0n;
     this.accruedFees = payload.accruedFees || 0n;
@@ -93,9 +95,6 @@ class CreditAccountData_Legacy {
       this.tokens[token] = balance;
     });
   }
-  setDeleteInProgress(d) {
-    this.isDeleting = d;
-  }
   static sortBalances(balances, prices, tokens) {
     return Object.entries(balances).sort(
       ([addr1, amount1], [addr2, amount2]) => {

package/dist/esm/sdk/sdk-legacy/core/creditManager.js

@@ -6,6 +6,8 @@ import {
 import { toBigInt } from "../../utils/index.js";
 class CreditManagerData_Legacy {
   address;
+  chainId;
+  network;
   underlyingToken;
   pool;
   creditFacade;
@@ -47,6 +49,8 @@ class CreditManagerData_Legacy {
   quotas;
   constructor(payload) {
     this.address = payload.addr.toLowerCase();
+    this.chainId = payload.chainId;
+    this.network = payload.network;
     this.underlyingToken = payload.underlying.toLowerCase();
     this.name = payload.name;
     this.pool = payload.pool.toLowerCase();

package/dist/esm/sdk/sdk-legacy/core/pool.js

@@ -8,7 +8,8 @@ import { toBigInt } from "../../utils/index.js";
 import { rayToNumber } from "../utils/formatter.js";
 class PoolData_Legacy {
   address;
-  type;
+  chainId;
+  network;
   underlyingToken;
   dieselToken;
   stakedDieselToken;
@@ -40,7 +41,8 @@ class PoolData_Legacy {
   lastBaseInterestUpdate;
   constructor(payload, extra) {
     this.address = payload.addr.toLowerCase();
-    this.type = PoolData_Legacy.getPoolType(payload.name || "");
+    this.chainId = payload.chainId;
+    this.network = payload.network;
     this.underlyingToken = payload.underlying.toLowerCase();
     this.dieselToken = payload.dieselToken.toLowerCase();
     this.stakedDieselToken = (extra.stakedDieselToken || []).map(
@@ -129,13 +131,6 @@ class PoolData_Legacy {
     });
     return model.read.calcBorrowRate([expectedLiquidity, availableLiquidity]);
   }
-  static getPoolType(name) {
-    const [identity = ""] = name.split(" ") || [];
-    const lc = identity.toLowerCase();
-    if (lc === "farm") return "farm";
-    if (lc === "trade") return "trade";
-    return "universal";
-  }
   static calculateUtilization(expected, available) {
     if (expected === 0n) return 0;
     const borrowed = expected - available;
@@ -147,7 +142,6 @@ class ChartsPoolData {
   address;
   underlyingToken;
   dieselToken;
-  type;
   version;
   name;
   addLiqCount;
@@ -200,7 +194,6 @@ class ChartsPoolData {
     this.address = (payload.addr || "").toLowerCase();
     this.underlyingToken = (payload.underlyingToken || "").toLowerCase();
     this.dieselToken = (payload.dieselToken || "").toLowerCase();
-    this.type = PoolData_Legacy.getPoolType(payload.name || "");
     this.version = payload.version || 1;
     this.name = payload.name || "";
     this.earned7D = payload.earned7D || 0;

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

@@ -53,7 +53,7 @@ class GearboxRewardsExtraApy {
             pointsInfo2
           );
           if (points !== null) {
-            acc2.push({ balance: points, token: tokenBalance.token });
+            acc2.push({ balance: points, token: tokenAddress });
           }
           return acc2;
         },
@@ -65,14 +65,15 @@ class GearboxRewardsExtraApy {
     return r;
   }
   static getPoolTokenPoints(tokenBalanceInPool, pool, tokensList, pointsInfo) {
-    if (!tokenBalanceInPool) return null;
+    if (!tokenBalanceInPool && pointsInfo.estimation === "relative")
+      return null;
     if (pool.expectedLiquidity <= 0) return 0n;
-    const { decimals = 18 } = tokensList[tokenBalanceInPool.token] || {};
+    const { decimals = 18 } = tokensList[pointsInfo.token] || {};
     const targetFactor = 10n ** BigInt(decimals);
     const { decimals: underlyingDecimals = 18 } = tokensList[pool.underlyingToken] || {};
     const underlyingFactor = 10n ** BigInt(underlyingDecimals);
     const defaultPoints = pointsInfo.amount * targetFactor / PERCENTAGE_FACTOR;
-    const points = pointsInfo.estimation === "absolute" ? defaultPoints : tokenBalanceInPool.balance * defaultPoints / (pool.expectedLiquidity * targetFactor / underlyingFactor);
+    const points = pointsInfo.estimation === "absolute" ? defaultPoints : (tokenBalanceInPool?.balance || 0n) * defaultPoints / (pool.expectedLiquidity * targetFactor / underlyingFactor);
     return BigIntMath.min(points, defaultPoints);
   }
   static getPoolPointsTip(poolRewards, pool, token) {

package/dist/types/dev/AccountsCounterPlugin.d.ts

@@ -1,6 +1,6 @@
 import type { Address } from "viem";
 import type { IGearboxSDKPlugin, IPluginState } from "../sdk/index.js";
-import { SDKConstruct } from "../sdk/index.js";
+import { AddressMap, SDKConstruct } from "../sdk/index.js";
 export interface AccountsCounterPluginState extends IPluginState {
     /**
      * Mapping of credit manager addresses to the number of accounts
@@ -12,6 +12,8 @@ export declare class AccountsCounterPlugin extends SDKConstruct implements IGear
     readonly version = 1;
     attach(): Promise<void>;
     syncState(): Promise<void>;
+    get accounts(): AddressMap<bigint>;
+    forCreditManager(addr: Address): bigint;
     get state(): AccountsCounterPluginState;
     hydrate(state: AccountsCounterPluginState): void;
 }

package/dist/types/sdk/sdk-legacy/core/creditAccount.d.ts

@@ -1,4 +1,5 @@
 import type { Address } from "viem";
+import type { NetworkType } from "../../chain/chains.js";
 import type { Asset } from "../../router/index.js";
 import type { TokensAPYList } from "../apy/index.js";
 import type { CaTokenBalance, CreditAccountDataPayload } from "../payload/creditAccount.js";
@@ -103,6 +104,8 @@ export interface BotDataLegacy {
 }
 export declare class CreditAccountData_Legacy {
     readonly isSuccessful: boolean;
+    readonly chainId: number;
+    readonly network: NetworkType;
     readonly creditAccount: Address;
     readonly borrower: Address;
     readonly creditManager: Address;
@@ -113,7 +116,6 @@ export declare class CreditAccountData_Legacy {
     readonly version: number;
     readonly enabledTokensMask: bigint;
     readonly healthFactor: number;
-    isDeleting: boolean;
     readonly baseBorrowRateWithoutFee: number;
     readonly borrowedAmount: bigint;
     readonly accruedInterest: bigint;
@@ -130,7 +132,6 @@ export declare class CreditAccountData_Legacy {
     readonly forbiddenTokens: Record<Address, true>;
     readonly quotedTokens: Record<Address, true>;
     constructor(payload: CreditAccountDataPayload);
-    setDeleteInProgress(d: boolean): void;
     static sortBalances(balances: Record<Address, bigint>, prices: Record<Address, bigint>, tokens: Record<Address, TokenData>): Array<[Address, bigint]>;
     static sortAssets(balances: Array<Asset>, prices: Record<Address, bigint>, tokens: Record<Address, TokenData>): Asset[];
     static tokensAbcComparator(t1?: TokenData, t2?: TokenData): 1 | 0 | -1;

package/dist/types/sdk/sdk-legacy/core/creditManager.d.ts

@@ -1,7 +1,10 @@
 import type { Address } from "viem";
+import type { NetworkType } from "../../chain/chains.js";
 import type { ChartsCreditManagerPayload, CreditManagerDataPayload, QuotaInfo } from "../payload/creditManager.js";
 export declare class CreditManagerData_Legacy {
     readonly address: Address;
+    readonly chainId: number;
+    readonly network: NetworkType;
     readonly underlyingToken: Address;
     readonly pool: Address;
     readonly creditFacade: Address;

package/dist/types/sdk/sdk-legacy/core/pool.d.ts

@@ -1,9 +1,10 @@
 import type { Address, PublicClient } from "viem";
+import type { NetworkType } from "../../chain/chains.js";
 import type { ChartsPoolDataPayload, LinearModel, PoolDataExtraPayload, PoolDataPayload, UserPoolPayload } from "../payload/pool.js";
-export type PoolType = "universal" | "trade" | "farm";
 export declare class PoolData_Legacy {
     readonly address: Address;
-    readonly type: PoolType;
+    readonly chainId: number;
+    readonly network: NetworkType;
     readonly underlyingToken: Address;
     readonly dieselToken: Address;
     readonly stakedDieselToken: Array<Address>;
@@ -45,7 +46,6 @@ export declare class PoolData_Legacy {
     readonly lastBaseInterestUpdate: bigint;
     constructor(payload: PoolDataPayload, extra: PoolDataExtraPayload);
     calculateBorrowRate({ provider, expectedLiquidity, availableLiquidity, }: CalculateBorrowRateProps): Promise<bigint>;
-    static getPoolType(name: string): PoolType;
     static calculateUtilization(expected: bigint, available: bigint): number;
 }
 interface CalculateBorrowRateProps {
@@ -57,7 +57,6 @@ export declare class ChartsPoolData {
     readonly address: Address;
     readonly underlyingToken: Address;
     readonly dieselToken: Address;
-    readonly type: PoolType;
     readonly version: number;
     readonly name: string;
     readonly addLiqCount: number;

package/dist/types/sdk/sdk-legacy/payload/creditAccount.d.ts

@@ -1,4 +1,5 @@
 import type { Address } from "viem";
+import type { NetworkType } from "../../chain/index.js";
 export interface CaTokenBalance {
     success: boolean;
     token: Address;
@@ -41,4 +42,6 @@ export interface CreditAccountDataPayload {
     }[];
     cfVersion: bigint;
     expirationDate: number;
+    chainId: number;
+    network: NetworkType;
 }

package/dist/types/sdk/sdk-legacy/payload/creditManager.d.ts

@@ -1,4 +1,5 @@
 import type { Address } from "viem";
+import type { NetworkType } from "../../chain/chains.js";
 import type { BigNumberish } from "../utils/formatter.js";
 import type { PoolDataPayload } from "./pool.js";
 export interface CreditManagerDebtParamsSDK {
@@ -54,6 +55,8 @@ export interface CreditManagerDataPayload {
     liquidationDiscountExpired: number;
     quotas: PoolDataPayload["quotas"];
     isBorrowingForbidden: boolean;
+    chainId: number;
+    network: NetworkType;
 }
 export interface ChartsCreditManagerPayload {
     addr: Address;

package/dist/types/sdk/sdk-legacy/payload/pool.d.ts

@@ -2,6 +2,7 @@ import type { AbiParametersToPrimitiveTypes, ExtractAbiFunction } from "abitype"
 import type { Address } from "viem";
 import type { iPeripheryCompressorAbi } from "../../../abi/compressors.js";
 import type { Unarray } from "../../base/types.js";
+import type { NetworkType } from "../../chain/chains.js";
 export type ZapperData = Unarray<AbiParametersToPrimitiveTypes<ExtractAbiFunction<typeof iPeripheryCompressorAbi, "getZappers">["outputs"]>>;
 export interface ZapperDataFull extends ZapperData {
     pool: Address;
@@ -49,6 +50,8 @@ export interface PoolDataPayload {
         isActive: boolean;
     }[];
     zappers: readonly ZapperDataFull[];
+    chainId: number;
+    network: NetworkType;
 }
 export interface PoolDataExtraPayload {
     stakedDieselToken: Array<Address>;

package/package.json

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