@gearbox-protocol/sdk 3.0.0-next.4 → 3.0.0-next.5

package/contracts/IRouter.sol

@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Holdings, 2021
+pragma solidity ^0.8.10;
+
+import {Balance} from "@gearbox-protocol/core-v2/contracts/libraries/Balances.sol";
+import {IVersion} from "@gearbox-protocol/core-v2/contracts/interfaces/IVersion.sol";
+import {MultiCall} from "@gearbox-protocol/core-v2/contracts/libraries/MultiCall.sol";
+
+struct PathOption {
+    address target;
+    uint8 option;
+    uint8 totalOptions;
+}
+
+enum SwapOperation {
+    EXACT_INPUT,
+    EXACT_INPUT_ALL,
+    EXACT_OUTPUT
+}
+
+struct SwapTask {
+    SwapOperation swapOperation;
+    address creditAccount;
+    address tokenIn;
+    address tokenOut;
+    address[] connectors;
+    uint256 amount;
+    uint256 slippage;
+    bool externalSlippage;
+}
+
+struct RouterResult {
+    uint256 amount;
+    uint256 gasUsage;
+    MultiCall[] calls;
+}
+
+interface IRouter is IVersion {
+    /// @dev Emits each time when routerComponent is set / updated
+    event RouterComponentUpdate(uint8 indexed, address indexed);
+
+    /// @dev Emits each time when resolver is set / updated
+    event ResolverUpdate(uint8 indexed ttIn, uint8 indexed ttOut, uint8 indexed rc);
+
+    event TokenTypeUpdate(address indexed tokenAddress, uint8 indexed tt);
+
+    /// @dev Finds all available swaps for NORMAL tokens
+    function findAllSwaps(SwapTask memory swapTask) external returns (RouterResult[] memory);
+
+    /// @dev Finds best path to swap all Normal tokens and tokens "on the way" to target one and vice versa
+    function findOneTokenPath(
+        address tokenIn,
+        uint256 amount,
+        address tokenOut,
+        address creditAccount,
+        address[] calldata connectors,
+        uint256 slippage
+    ) external returns (RouterResult memory);
+
+    /// @dev Finds the best swap to deposit (or swap) all provided tokens into target one
+    /// Currently it takes ALL Normal tokens and all LP "on the way" tokens into target one.
+    /// It some token is not "on the way" it would be skipped.
+    /// @param creditManager Address of creditManager
+    /// @param balances Expected balances on credit account
+    /// @param target Address of target token
+    /// @param connectors Addresses of "connectors" - internidiatery tokens which're used for swap operations
+    /// @param slippage Slippage in PERCENTAGE_FORMAT
+    function findOpenStrategyPath(
+        address creditManager,
+        Balance[] calldata balances,
+        address target,
+        address[] calldata connectors,
+        uint256 slippage
+    ) external returns (Balance[] memory, RouterResult memory);
+
+    /// @dev Finds the best close path - withdraw all tokens and swap them into underlying one
+    /// @param creditAccount Address of closing creditAccount
+    /// @param connectors Addresses of "connectors" - internidiatery tokens which're used for swap operations
+    /// @param slippage Slippage in PERCENTAGE_FORMAT
+    /// @param pathOptions Starting point for iterating routes. More info in PathOption file
+    /// @param iterations How many iterations algo should compute starting from PathOptions
+    function findBestClosePath(
+        address creditAccount,
+        address[] memory connectors,
+        uint256 slippage,
+        PathOption[] memory pathOptions,
+        uint256 iterations,
+        bool force
+    ) external returns (RouterResult memory result, uint256 gasPriceTargetRAY);
+
+    /// @dev Returns TokenType for provided token
+    function tokenTypes(address) external view returns (uint8);
+
+    /// @dev Returns current address for RouterComponent. Used for self-discovery
+    function componentAddressById(uint8) external view returns (address);
+
+    /// @dev @return True if address is router configurator, otherwise false
+    function isRouterConfigurator(address account) external view returns (bool);
+}

package/contracts/index.sol

@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: UNLICENSED
+// Gearbox Protocol. Generalized leverage for DeFi protocols
+// (c) Gearbox Foundation, 2023.
+
+pragma solidity ^0.8.10;
+
+import {IDataCompressorV2_10} from "@gearbox-protocol/periphery-v3/contracts/interfaces/IDataCompressorV2_10.sol";
+import {IDataCompressorV3_00} from "@gearbox-protocol/periphery-v3/contracts/interfaces/IDataCompressorV3_00.sol";
+import {IAddressProviderV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IAddressProviderV3.sol";
+import {IPoolV3} from "@gearbox-protocol/core-v3/contracts/interfaces/IPoolV3.sol";
+import {ICreditFacadeV3} from "@gearbox-protocol/core-v3/contracts/interfaces/ICreditFacadeV3.sol";
+import {IPoolService} from "@gearbox-protocol/core-v2/contracts/interfaces/IPoolService.sol";
+import {ICreditFacadeV2} from "@gearbox-protocol/core-v2/contracts/interfaces/ICreditFacadeV2.sol";
+import {ICreditConfiguratorV2} from "@gearbox-protocol/core-v2/contracts/interfaces/ICreditConfiguratorV2.sol";
+import {WATokenZapper} from "@gearbox-protocol/integrations-v3/contracts/zappers/WATokenZapper.sol";
+import {WETHZapper} from "@gearbox-protocol/integrations-v3/contracts/zappers/WETHZapper.sol";
+import {WstETHZapper} from "@gearbox-protocol/integrations-v3/contracts/zappers/WstETHZapper.sol";
+
+// Adapters
+import {ILidoV1Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/lido/ILidoV1Adapter.sol";
+import {IBaseRewardPool} from "@gearbox-protocol/integrations-v3/contracts/integrations/convex/IBaseRewardPool.sol";
+import {IConvexToken} from "@gearbox-protocol/integrations-v3/contracts/integrations/convex/IConvexToken.sol";
+import {ICurvePool} from "@gearbox-protocol/integrations-v3/contracts/integrations/curve/ICurvePool.sol";
+import {IConvexV1BaseRewardPoolAdapter} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/convex/IConvexV1BaseRewardPoolAdapter.sol";
+import {IConvexV1BoosterAdapter} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/convex/IConvexV1BoosterAdapter.sol";
+
+import {IInterestRateModel} from "@gearbox-protocol/core-v2/contracts/interfaces/IInterestRateModel.sol";
+import {IUniswapV2Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/uniswap/IUniswapV2Adapter.sol";
+import {IUniswapV3Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/uniswap/IUniswapV3Adapter.sol";
+import {IYVault} from "@gearbox-protocol/integrations-v3/contracts/integrations/yearn/IYVault.sol";
+import {IYearnV2Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/yearn/IYearnV2Adapter.sol";
+
+import {IwstETHV1Adapter} from "@gearbox-protocol/integrations-v3/contracts/interfaces/lido/IwstETHV1Adapter.sol";
+import {IstETH} from "@gearbox-protocol/integrations-v3/contracts/integrations/lido/IstETH.sol";
+import {IPriceOracleBase} from "@gearbox-protocol/core-v2/contracts/interfaces/IPriceOracleBase.sol";
+
+import {ICurveV1_2AssetsAdapter} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/curve/ICurveV1_2AssetsAdapter.sol";
+
+import {ICurveV1_3AssetsAdapter} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/curve/ICurveV1_3AssetsAdapter.sol";
+
+import {ICurveV1_4AssetsAdapter} from
+    "@gearbox-protocol/integrations-v3/contracts/interfaces/curve/ICurveV1_4AssetsAdapter.sol";

package/lib/apy/convexAPY.d.ts

@@ -29,7 +29,7 @@ export interface GetConvexAPYBulkCallsProps {
 }
 export declare function getConvexAPYBulkCalls({ pools, networkType, }: GetConvexAPYBulkCallsProps): {
     poolsInfo: PoolInfo[];
-    calls: [MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/curve/ICurvePool").ICurvePoolInterface>, MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IConvexToken").IConvexTokenInterface>, ...(MCall<import("../types/@gearbox-protocol/integrations-v2/contracts/integrations/convex/IBaseRewardPool").IBaseRewardPoolInterface> | MCall<any>)[]][];
+    calls: [MCall<import("../types/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/IBaseRewardPool").IBaseRewardPoolInterface>, MCall<import("../types/ICurvePool").ICurvePoolInterface>, MCall<import("../types/IConvexToken").IConvexTokenInterface>, ...(MCall<import("../types/IBaseRewardPool").IBaseRewardPoolInterface> | MCall<any>)[]][];
 };
 export interface CalculateConvexAPYProps {
     cvxPoolRate: bigint;

package/lib/apy/convexAPY.js

@@ -5,7 +5,6 @@ const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const token_1 = require("@gearbox-protocol/sdk-gov/lib/tokens/token");
 const utils_1 = require("ethers/lib/utils");
 const types_1 = require("../types");
-const formatter_1 = require("../utils/formatter");
 const V2_POOLS = { 20: true };
 function getConvexAPYBulk(props) {
     const { poolsInfo, calls } = props.generated;
@@ -24,14 +23,14 @@ function getConvexAPYBulk(props) {
         const lpPriceEnd = extraFinishEnd + crvLpPriceList.length;
         const crvLpPrice = rest.slice(extraFinishEnd, lpPriceEnd);
         const apy = calculateConvexAPY({
-            cvxPoolRewardsFinish: (0, formatter_1.toBigInt)(cvxPoolRewardsFinish),
-            cvxPoolRate: (0, formatter_1.toBigInt)(cvxPoolRate),
-            cvxPoolSupply: (0, formatter_1.toBigInt)(cvxPoolSupply),
-            crvVPrice: (0, formatter_1.toBigInt)(crvVPrice),
-            cvxTokenSupply: (0, formatter_1.toBigInt)(cvxTokenSupply),
-            cvxExtraRewards: cvxExtraRewards.map(v => (0, formatter_1.toBigInt)(v)),
-            cvxExtraRewardsFinish: cvxExtraRewardsFinish.map(v => (0, formatter_1.toBigInt)(v)),
-            crvLpPrice: crvLpPrice.map(v => (0, formatter_1.toBigInt)(v)),
+            cvxPoolRewardsFinish: (0, sdk_gov_1.toBigInt)(cvxPoolRewardsFinish),
+            cvxPoolRate: (0, sdk_gov_1.toBigInt)(cvxPoolRate),
+            cvxPoolSupply: (0, sdk_gov_1.toBigInt)(cvxPoolSupply),
+            crvVPrice: (0, sdk_gov_1.toBigInt)(crvVPrice),
+            cvxTokenSupply: (0, sdk_gov_1.toBigInt)(cvxTokenSupply),
+            cvxExtraRewards: cvxExtraRewards.map(v => (0, sdk_gov_1.toBigInt)(v)),
+            cvxExtraRewardsFinish: cvxExtraRewardsFinish.map(v => (0, sdk_gov_1.toBigInt)(v)),
+            crvLpPrice: crvLpPrice.map(v => (0, sdk_gov_1.toBigInt)(v)),
             info: poolsInfo[i],
             getTokenPrice: props.getTokenPrice,
             curveAPY: props.curveAPY,

package/lib/core/creditAccount.d.ts

@@ -1,9 +1,7 @@
 import { LpTokensAPY } from "../apy";
-import { CreditAccountDataPayload } from "../payload/creditAccount";
+import { CaTokenBalance, CreditAccountDataPayload, ScheduledWithdrawal } from "../payload/creditAccount";
 import { TokenData } from "../tokens/tokenData";
 import { Asset } from "./assets";
-import { CreditManagerData } from "./creditManager";
-import { PriceOracleData } from "./priceOracle";
 export interface CalcOverallAPYProps {
     caAssets: Array<Asset>;
     lpAPY: LpTokensAPY | undefined;
@@ -23,36 +21,45 @@ export interface CalcHealthFactorProps {
 export declare class CreditAccountData {
     readonly addr: string;
     readonly borrower: string;
-    readonly inUse: boolean;
     readonly creditManager: string;
+    readonly creditFacade: string;
     readonly underlyingToken: string;
     readonly since: number;
-    readonly cumulativeIndexAtOpen: bigint;
+    readonly expirationDate: number;
+    readonly version: number;
+    readonly enabledTokenMask: bigint;
+    readonly healthFactor: number;
+    isDeleting: boolean;
+    readonly baseBorrowRate: number;
+    readonly borrowRate: number;
     readonly borrowedAmount: bigint;
+    readonly accruedInterest: bigint;
+    readonly accruedFees: bigint;
+    readonly totalDebtUSD: bigint;
     readonly borrowedAmountPlusInterestAndFees: bigint;
-    readonly borrowedAmountPlusInterest: bigint;
     readonly totalValue: bigint;
-    healthFactor: number;
-    readonly borrowRate: number;
-    isDeleting: boolean;
-    readonly enabledTokenMask: bigint;
-    readonly version: number;
-    readonly collateralTokens: Array<string>;
-    readonly allTokens: Array<string>;
-    readonly forbiddenTokens: Array<string>;
+    readonly totalValueUSD: bigint;
+    readonly twvUSD: bigint;
+    readonly cumulativeIndexNow: bigint;
+    readonly cumulativeIndexLastUpdate: bigint;
+    readonly cumulativeQuotaInterest: bigint;
+    readonly activeBots: string[];
+    readonly maxApprovedBots: bigint;
     readonly balances: Record<string, bigint>;
-    readonly allBalances: Record<string, bigint>;
-    readonly repayAmount: bigint;
-    readonly liquidationAmount: bigint;
-    readonly canBeClosed: boolean;
+    readonly collateralTokens: Array<string>;
+    readonly allBalances: Record<string, CaTokenBalance>;
+    readonly forbiddenTokens: Record<string, true>;
+    readonly quotedTokens: Record<string, true>;
+    readonly schedultedWithdrawals: Array<ScheduledWithdrawal>;
     constructor(payload: CreditAccountDataPayload);
+    setDeleteInProgress(d: boolean): void;
     balancesSorted(prices: Record<string, bigint>, tokens: Record<string, TokenData>): Array<Asset>;
     static sortBalances(balances: Record<string, bigint>, prices: Record<string, bigint>, tokens: Record<string, TokenData>): Array<[string, bigint]>;
     static tokensAbcComparator(t1?: TokenData, t2?: TokenData): 1 | -1;
     static amountAbcComparator(t1: bigint, t2: bigint): 1 | -1;
-    calcBorrowAmountPlusInterestRate(currentCumulativeIndex: bigint): bigint;
     isForbidden(token: string): boolean;
-    updateHealthFactor(creditManager: CreditManagerData, currentCumulativeIndex: bigint, priceOracle: PriceOracleData): void;
+    isQuoted(token: string): boolean;
+    isTokenEnabled(index: number): boolean;
     static isTokenEnabled(index: number, enabledTokenMask: bigint): boolean;
     static calcMaxDebtIncrease(healthFactor: number, borrowAmountPlusInterest: bigint, underlyingLT: number, minHf?: number): bigint;
     static calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }: CalcOverallAPYProps): number | undefined;

package/lib/core/creditAccount.js

@@ -8,64 +8,100 @@ const price_1 = require("../utils/price");
 class CreditAccountData {
     addr;
     borrower;
-    inUse;
     creditManager;
+    creditFacade;
     underlyingToken;
     since;
-    cumulativeIndexAtOpen;
+    expirationDate;
+    version;
+    enabledTokenMask;
+    healthFactor;
+    isDeleting;
+    baseBorrowRate;
+    borrowRate;
     borrowedAmount;
+    accruedInterest;
+    accruedFees;
+    totalDebtUSD;
     borrowedAmountPlusInterestAndFees;
-    borrowedAmountPlusInterest;
     totalValue;
-    healthFactor;
-    borrowRate;
-    isDeleting;
-    enabledTokenMask;
-    version = 1;
-    collateralTokens = [];
-    allTokens = [];
-    forbiddenTokens = [];
+    totalValueUSD;
+    twvUSD;
+    cumulativeIndexNow;
+    cumulativeIndexLastUpdate;
+    cumulativeQuotaInterest;
+    activeBots;
+    maxApprovedBots;
     balances = {};
+    collateralTokens = [];
     allBalances = {};
-    /// V1 Artifacts
-    repayAmount;
-    liquidationAmount;
-    canBeClosed;
+    forbiddenTokens = {};
+    quotedTokens = {};
+    schedultedWithdrawals;
     constructor(payload) {
         this.addr = payload.addr.toLowerCase();
         this.borrower = payload.borrower.toLowerCase();
-        this.inUse = payload.inUse;
         this.creditManager = payload.creditManager.toLowerCase();
+        this.creditFacade = payload.creditFacade.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
-        this.since = Number((0, formatter_1.toBigInt)(payload.since || 0));
-        this.cumulativeIndexAtOpen = (0, formatter_1.toBigInt)(payload.cumulativeIndexAtOpen || 0);
-        this.borrowedAmount = (0, formatter_1.toBigInt)(payload.borrowedAmount || 0);
-        this.borrowedAmountPlusInterest = (0, formatter_1.toBigInt)(payload.borrowedAmountPlusInterest || 0);
-        this.borrowedAmountPlusInterestAndFees = (0, formatter_1.toBigInt)(payload.borrowedAmountPlusInterestAndFees || 0);
-        this.totalValue = (0, formatter_1.toBigInt)(payload.totalValue || 0);
-        this.healthFactor = payload.healthFactor.toNumber();
-        this.borrowRate = Number(((0, formatter_1.toBigInt)(payload.borrowRate || 0) *
-            sdk_gov_1.PERCENTAGE_FACTOR *
-            sdk_gov_1.PERCENTAGE_DECIMALS) /
-            sdk_gov_1.RAY);
+        this.since = Number((0, sdk_gov_1.toBigInt)(payload.since));
+        this.expirationDate = Number((0, sdk_gov_1.toBigInt)(payload.expirationDate));
+        this.version = payload.cfVersion?.toNumber();
+        this.healthFactor = Number((0, sdk_gov_1.toBigInt)(payload.healthFactor));
+        this.enabledTokenMask = (0, sdk_gov_1.toBigInt)(payload.enabledTokensMask);
+        this.isDeleting = false;
+        this.borrowedAmount = (0, sdk_gov_1.toBigInt)(payload.debt);
+        this.accruedInterest = (0, sdk_gov_1.toBigInt)(payload.accruedInterest);
+        this.accruedFees = (0, sdk_gov_1.toBigInt)(payload.accruedFees);
+        this.borrowedAmountPlusInterestAndFees =
+            this.borrowedAmount + this.accruedInterest + this.accruedFees;
+        this.totalDebtUSD = (0, sdk_gov_1.toBigInt)(payload.totalDebtUSD);
+        this.totalValue = (0, sdk_gov_1.toBigInt)(payload.totalValue);
+        this.totalValueUSD = (0, sdk_gov_1.toBigInt)(payload.totalValueUSD);
+        this.twvUSD = (0, sdk_gov_1.toBigInt)(payload.twvUSD);
+        this.baseBorrowRate = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.baseBorrowRate) *
+            sdk_gov_1.PERCENTAGE_DECIMALS *
+            sdk_gov_1.PERCENTAGE_FACTOR);
+        this.borrowRate = (0, formatter_1.rayToNumber)((0, sdk_gov_1.toBigInt)(payload.aggregatedBorrowRate) *
+            sdk_gov_1.PERCENTAGE_DECIMALS *
+            sdk_gov_1.PERCENTAGE_FACTOR);
+        this.cumulativeIndexNow = (0, sdk_gov_1.toBigInt)(payload.cumulativeIndexNow);
+        this.cumulativeIndexLastUpdate = (0, sdk_gov_1.toBigInt)(payload.cumulativeIndexLastUpdate);
+        this.cumulativeQuotaInterest = (0, sdk_gov_1.toBigInt)(payload.cumulativeQuotaInterest);
+        this.activeBots = payload.activeBots.map(b => b.toLowerCase());
+        this.maxApprovedBots = (0, sdk_gov_1.toBigInt)(payload.maxApprovedBots);
         payload.balances.forEach(b => {
-            const tokenLC = b.token.toLowerCase();
-            if (b.isAllowed) {
-                this.balances[tokenLC] = (0, formatter_1.toBigInt)(b.balance || 0);
-                this.collateralTokens.push(tokenLC);
+            const token = b.token.toLowerCase();
+            const balance = {
+                token,
+                balance: (0, sdk_gov_1.toBigInt)(b.balance),
+                isForbidden: b.isForbidden,
+                isEnabled: b.isEnabled,
+                isQuoted: b.isQuoted,
+                quota: (0, sdk_gov_1.toBigInt)(b.quota),
+                quotaRate: b.quotaRate,
+            };
+            if (!b.isForbidden) {
+                this.balances[token] = balance.balance;
+                this.collateralTokens.push(token);
+            }
+            if (b.isForbidden) {
+                this.forbiddenTokens[token] = true;
             }
-            else {
-                this.forbiddenTokens.push(tokenLC);
+            if (b.isQuoted) {
+                this.quotedTokens[token] = true;
             }
-            this.allBalances[tokenLC] = (0, formatter_1.toBigInt)(b.balance || 0);
-            this.allTokens.push(tokenLC);
+            this.allBalances[token] = balance;
         });
-        this.enabledTokenMask = (0, formatter_1.toBigInt)(payload.enabledTokenMask || 0);
-        this.isDeleting = false;
-        this.version = payload.version;
-        this.repayAmount = (0, formatter_1.toBigInt)(payload.repayAmount || 0);
-        this.liquidationAmount = (0, formatter_1.toBigInt)(payload.liquidationAmount || 0);
-        this.canBeClosed = payload.canBeClosed;
+        this.schedultedWithdrawals = payload.schedultedWithdrawals.map(w => ({
+            tokenIndex: w.tokenIndex,
+            maturity: w.maturity,
+            token: w.token.toLowerCase(),
+            amount: (0, sdk_gov_1.toBigInt)(w.amount),
+        }));
+    }
+    setDeleteInProgress(d) {
+        this.isDeleting = d;
     }
     balancesSorted(prices, tokens) {
         return CreditAccountData.sortBalances(this.balances, prices, tokens).map(([token, balance]) => ({ token, balance }));
@@ -96,21 +132,14 @@ class CreditAccountData {
     static amountAbcComparator(t1, t2) {
         return t1 > t2 ? -1 : 1;
     }
-    calcBorrowAmountPlusInterestRate(currentCumulativeIndex) {
-        return ((this.borrowedAmount * currentCumulativeIndex) /
-            this.cumulativeIndexAtOpen);
-    }
     isForbidden(token) {
-        return this.balances[token] === undefined;
+        return !!this.forbiddenTokens[token];
+    }
+    isQuoted(token) {
+        return !!this.quotedTokens[token];
     }
-    updateHealthFactor(creditManager, currentCumulativeIndex, priceOracle) {
-        const twvUSDValue = this.collateralTokens
-            .filter((_, num) => CreditAccountData.isTokenEnabled(num, this.enabledTokenMask))
-            .map(token => priceOracle.convertToUSD(this.balances[token], token) *
-            creditManager.liquidationThresholds[token])
-            .reduce((a, b) => a + b);
-        this.healthFactor = Number(priceOracle.convertFromUSD(twvUSDValue, this.underlyingToken) /
-            this.calcBorrowAmountPlusInterestRate(currentCumulativeIndex));
+    isTokenEnabled(index) {
+        return ((2n ** BigInt(index)) & this.enabledTokenMask) !== 0n;
     }
     static isTokenEnabled(index, enabledTokenMask) {
         return ((2n ** BigInt(index)) & enabledTokenMask) !== 0n;

package/lib/core/creditManager.d.ts

@@ -1,52 +1,42 @@
-import { ethers, Signer } from "ethers";
 import { MultiCall } from "../pathfinder/core";
-import { ChartsCreditManagerPayload, CreditManagerDataPayload } from "../payload/creditManager";
-import { ICreditManager } from "../types";
+import { ChartsCreditManagerPayload, CreditManagerDataPayload, QuotaInfo } from "../payload/creditManager";
+import { LinearModel } from "../payload/pool";
 export declare class CreditManagerData {
     readonly address: string;
     readonly underlyingToken: string;
     readonly pool: string;
-    readonly isWETH: boolean;
-    readonly canBorrow: boolean;
-    readonly borrowRate: number;
-    readonly minAmount: bigint;
-    readonly maxAmount: bigint;
-    readonly maxLeverageFactor: number;
-    readonly availableLiquidity: bigint;
-    readonly collateralTokens: Array<string>;
-    readonly supportedTokens: Record<string, true>;
-    readonly adapters: Record<string, string>;
-    readonly liquidationThresholds: Record<string, bigint>;
-    readonly version: number;
     readonly creditFacade: string;
     readonly creditConfigurator: string;
-    readonly isDegenMode: boolean;
     readonly degenNFT: string;
-    readonly isIncreaseDebtForbidden: boolean;
+    readonly isDegenMode: boolean;
+    readonly version: number;
+    readonly isPaused: boolean;
     readonly forbiddenTokenMask: bigint;
     readonly maxEnabledTokensLength: number;
+    readonly borrowRate: number;
+    readonly minDebt: bigint;
+    readonly maxDebt: bigint;
+    readonly availableToBorrow: bigint;
+    readonly totalDebt: bigint;
+    readonly totalDebtLimit: bigint;
     readonly feeInterest: number;
     readonly feeLiquidation: number;
     readonly liquidationDiscount: number;
     readonly feeLiquidationExpired: number;
     readonly liquidationDiscountExpired: number;
-    readonly totalDebt: {
-        currentTotalDebt: bigint;
-        totalDebtLimit: bigint;
-    } | undefined;
-    readonly isPaused: boolean;
+    readonly collateralTokens: Array<string>;
+    readonly supportedTokens: Record<string, true>;
+    readonly adapters: Record<string, string>;
+    readonly liquidationThresholds: Record<string, bigint>;
+    readonly quotas: Array<QuotaInfo>;
+    readonly interestModel: LinearModel;
     constructor(payload: CreditManagerDataPayload);
-    getContractETH(signer: Signer | ethers.providers.Provider): ICreditManager;
-    contractToAdapter(contractAddress: string): string | undefined;
     encodeAddCollateral(accountAddress: string, tokenAddress: string, amount: bigint): MultiCall;
     encodeIncreaseDebt(amount: bigint): MultiCall;
     encodeDecreaseDebt(amount: bigint): MultiCall;
     encodeEnableToken(token: string): MultiCall;
     encodeDisableToken(token: string): MultiCall;
     static withdrawAllAndUnwrap_Convex(address: string, claim: boolean): MultiCall;
-    validateOpenAccount(collateral: bigint, debt: bigint): true;
-    protected validateOpenAccountV1(collateral: bigint, debt: bigint): true;
-    protected validateOpenAccountV2(debt: bigint): true;
     get id(): string;
 }
 export declare class ChartsCreditManagerData {