@gearbox-protocol/sdk 2.1.34 → 3.0.0-next.10

package/lib/core/assets.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetUtils = void 0;
 const math_1 = require("../utils/math");
+const price_1 = require("../utils/price");
 const creditAccount_1 = require("./creditAccount");
 class AssetUtils {
     static nextAsset({ allowedTokens, selectedAssets, balances, tokensList, prices = {}, }) {
@@ -33,24 +34,34 @@ class AssetUtils {
         }, {});
         return record;
     }
-    static memoWrapETH = (ethAddress, wethAddress) => function wrapETH(assets) {
+    static memoWrap = (unwrappedAddress, wrappedAddress, prices, tokensList) => function wrap(assets) {
         const assetsRecord = AssetUtils.constructAssetRecord(assets);
-        const weth = assetsRecord[wethAddress];
-        const { balance: wethAmount = 0n } = weth || {};
-        const eth = assetsRecord[ethAddress];
-        const { balance: ethAmount = 0n } = eth || {};
-        const wethOrETH = weth || eth;
-        if (wethOrETH) {
-            assetsRecord[wethAddress] = {
-                ...wethOrETH,
-                token: wethAddress,
-                balance: (0, math_1.nonNegativeBn)(ethAmount) + (0, math_1.nonNegativeBn)(wethAmount),
+        const unwrapped = assetsRecord[unwrappedAddress];
+        const { balance: unwrappedAmount = 0n } = unwrapped || {};
+        const wrapped = assetsRecord[wrappedAddress];
+        const { balance: wrappedAmount = 0n } = wrapped || {};
+        // if there unwrapped token
+        if (unwrapped) {
+            const unwrappedToken = tokensList[unwrappedAddress];
+            const unwrappedPrice = prices[unwrappedAddress] || 0n;
+            const wrappedToken = tokensList[wrappedAddress];
+            const wrappedPrice = prices[wrappedAddress] || 0n;
+            // convert unwrapped into wrapped by price
+            const unwrappedInWrapped = price_1.PriceUtils.convertByPrice(price_1.PriceUtils.calcTotalPrice(unwrappedPrice, (0, math_1.nonNegativeBn)(unwrappedAmount), unwrappedToken.decimals), {
+                price: wrappedPrice,
+                decimals: wrappedToken.decimals,
+            });
+            // sum them
+            assetsRecord[wrappedAddress] = {
+                token: wrappedAddress,
+                balance: (0, math_1.nonNegativeBn)(wrappedAmount) + unwrappedInWrapped,
             };
+            // remove unwrapped
+            delete assetsRecord[unwrappedAddress];
+            return [Object.values(assetsRecord), unwrappedInWrapped, wrappedAmount];
         }
-        if (eth) {
-            delete assetsRecord[ethAddress];
-        }
-        return [Object.values(assetsRecord), ethAmount, wethAmount];
+        // else no actions needed
+        return [Object.values(assetsRecord), unwrappedAmount, wrappedAmount];
     };
     /**
      * Sums the the second assets list into the first assets list

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

@@ -1,73 +1,107 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreditAccountData = void 0;
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const apy_1 = require("../apy");
-const decimals_1 = require("../tokens/decimals");
-const token_1 = require("../tokens/token");
 const formatter_1 = require("../utils/formatter");
 const price_1 = require("../utils/price");
-const constants_1 = require("./constants");
 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) *
-            constants_1.PERCENTAGE_FACTOR *
-            constants_1.PERCENTAGE_DECIMALS) /
-            constants_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 }));
@@ -78,8 +112,8 @@ class CreditAccountData {
             const addr2Lc = addr2.toLowerCase();
             const token1 = tokens[addr1Lc];
             const token2 = tokens[addr2Lc];
-            const price1 = prices[addr1Lc] || constants_1.PRICE_DECIMALS;
-            const price2 = prices[addr2Lc] || constants_1.PRICE_DECIMALS;
+            const price1 = prices[addr1Lc] || sdk_gov_1.PRICE_DECIMALS;
+            const price2 = prices[addr2Lc] || sdk_gov_1.PRICE_DECIMALS;
             const totalPrice1 = price_1.PriceUtils.calcTotalPrice(price1, amount1, token1?.decimals);
             const totalPrice2 = price_1.PriceUtils.calcTotalPrice(price2, amount2, token2?.decimals);
             if (totalPrice1 === totalPrice2) {
@@ -98,26 +132,19 @@ 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;
     }
-    static calcMaxDebtIncrease(healthFactor, borrowAmountPlusInterest, underlyingLT, minHf = Number(constants_1.PERCENTAGE_FACTOR)) {
+    static calcMaxDebtIncrease(healthFactor, borrowAmountPlusInterest, underlyingLT, minHf = Number(sdk_gov_1.PERCENTAGE_FACTOR)) {
         const result = (borrowAmountPlusInterest * BigInt(healthFactor - minHf)) /
             BigInt(minHf - underlyingLT);
         return result < 0 ? 0n : result;
@@ -131,30 +158,30 @@ class CreditAccountData {
             return undefined;
         const assetAPYMoney = caAssets.reduce((acc, { token: tokenAddress, balance: amount }) => {
             const tokenAddressLC = tokenAddress.toLowerCase();
-            const symbol = token_1.tokenSymbolByAddress[tokenAddressLC];
+            const symbol = sdk_gov_1.tokenSymbolByAddress[tokenAddressLC];
             if (!(0, apy_1.isTokenWithAPY)(symbol))
                 return acc;
             const apy = lpAPY[symbol] || 0;
             const price = prices[tokenAddressLC] || 0n;
-            const tokenDecimals = decimals_1.decimals[symbol];
+            const tokenDecimals = sdk_gov_1.decimals[symbol];
             const money = price_1.PriceUtils.calcTotalPrice(price, amount, tokenDecimals);
             const apyMoney = money * BigInt(apy);
             return acc + apyMoney;
         }, 0n);
         const underlyingTokenAddressLC = underlyingToken.toLowerCase();
-        const underlyingTokenSymbol = token_1.tokenSymbolByAddress[underlyingTokenAddressLC] || "";
-        const underlyingTokenDecimals = decimals_1.decimals[underlyingTokenSymbol] || 18;
-        const underlyingPrice = prices[underlyingTokenAddressLC] || constants_1.PRICE_DECIMALS;
+        const underlyingTokenSymbol = sdk_gov_1.tokenSymbolByAddress[underlyingTokenAddressLC] || "";
+        const underlyingTokenDecimals = sdk_gov_1.decimals[underlyingTokenSymbol] || 18;
+        const underlyingPrice = prices[underlyingTokenAddressLC] || sdk_gov_1.PRICE_DECIMALS;
         const assetAPYAmountInUnderlying = price_1.PriceUtils.convertByPrice(assetAPYMoney, {
             price: underlyingPrice,
             decimals: underlyingTokenDecimals,
         });
         const debtAPY = debt * BigInt(borrowRate);
         const yourAssets = totalValue - debt;
-        const apyInPercent = ((assetAPYAmountInUnderlying - debtAPY) * constants_1.WAD) /
+        const apyInPercent = ((assetAPYAmountInUnderlying - debtAPY) * sdk_gov_1.WAD) /
             yourAssets /
-            constants_1.PERCENTAGE_FACTOR;
-        return Number((0, formatter_1.toSignificant)(apyInPercent, constants_1.WAD_DECIMALS_POW));
+            sdk_gov_1.PERCENTAGE_FACTOR;
+        return Number((0, formatter_1.toSignificant)(apyInPercent, sdk_gov_1.WAD_DECIMALS_POW));
     }
     hash() {
         return CreditAccountData.hash(this.creditManager, this.borrower);
@@ -164,17 +191,17 @@ class CreditAccountData {
     }
     static calcHealthFactor({ assets, prices, liquidationThresholds, underlyingToken, borrowed, }) {
         const assetLTMoney = assets.reduce((acc, { token: tokenAddress, balance: amount }) => {
-            const tokenSymbol = token_1.tokenSymbolByAddress[tokenAddress.toLowerCase()];
-            const tokenDecimals = decimals_1.decimals[tokenSymbol];
+            const tokenSymbol = sdk_gov_1.tokenSymbolByAddress[tokenAddress.toLowerCase()];
+            const tokenDecimals = sdk_gov_1.decimals[tokenSymbol];
             const lt = liquidationThresholds[tokenAddress.toLowerCase()] || 0n;
             const price = prices[tokenAddress.toLowerCase()] || 0n;
             const money = price_1.PriceUtils.calcTotalPrice(price, amount, tokenDecimals);
             const ltMoney = money * lt;
             return acc + ltMoney;
         }, 0n);
-        const underlyingSymbol = token_1.tokenSymbolByAddress[underlyingToken.toLowerCase()];
-        const underlyingDecimals = decimals_1.decimals[underlyingSymbol];
-        const underlyingPrice = prices[underlyingToken.toLowerCase()] || constants_1.PRICE_DECIMALS;
+        const underlyingSymbol = sdk_gov_1.tokenSymbolByAddress[underlyingToken.toLowerCase()];
+        const underlyingDecimals = sdk_gov_1.decimals[underlyingSymbol];
+        const underlyingPrice = prices[underlyingToken.toLowerCase()] || sdk_gov_1.PRICE_DECIMALS;
         const borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice, borrowed, underlyingDecimals);
         const hfInPercent = borrowedMoney > 0n ? assetLTMoney / borrowedMoney : 0n;
         return Number(hfInPercent);

package/lib/core/creditAccount.spec.js

@@ -1,50 +1,48 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const sdk_gov_1 = require("@gearbox-protocol/sdk-gov");
 const chai_1 = require("chai");
-const decimals_1 = require("../tokens/decimals");
-const token_1 = require("../tokens/token");
 const formatter_1 = require("../utils/formatter");
 const price_1 = require("../utils/price");
 const assets_1 = require("./assets");
-const constants_1 = require("./constants");
 const creditAccount_1 = require("./creditAccount");
 const prices = {
-    [token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: (0, formatter_1.toBN)("1738.11830000", constants_1.PRICE_DECIMALS_POW),
-    [token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: (0, formatter_1.toBN)("0.99941103", constants_1.PRICE_DECIMALS_POW),
-    [token_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase()]: (0, formatter_1.toBN)("1703.87588096", constants_1.PRICE_DECIMALS_POW),
+    [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: (0, formatter_1.toBN)("1738.11830000", sdk_gov_1.PRICE_DECIMALS_POW),
+    [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: (0, formatter_1.toBN)("0.99941103", sdk_gov_1.PRICE_DECIMALS_POW),
+    [sdk_gov_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase()]: (0, formatter_1.toBN)("1703.87588096", sdk_gov_1.PRICE_DECIMALS_POW),
 };
 const lpAPY = { STETH: 38434 };
 const caWithoutLP = {
     assets: [
         {
-            balance: (0, formatter_1.toBN)("54780", decimals_1.decimals.DAI),
-            token: token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+            balance: (0, formatter_1.toBN)("54780", sdk_gov_1.decimals.DAI),
+            token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
         },
         {
-            balance: (0, formatter_1.toBN)("3.5", decimals_1.decimals.WETH),
-            token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+            balance: (0, formatter_1.toBN)("3.5", sdk_gov_1.decimals.WETH),
+            token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
         },
     ],
-    totalValue: (0, formatter_1.toBN)("60860", decimals_1.decimals.DAI),
-    debt: (0, formatter_1.toBN)("54780", decimals_1.decimals.DAI),
+    totalValue: (0, formatter_1.toBN)("60860", sdk_gov_1.decimals.DAI),
+    debt: (0, formatter_1.toBN)("54780", sdk_gov_1.decimals.DAI),
     borrowRate: 7712,
-    underlyingToken: token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+    underlyingToken: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
 };
 const caWithLP = {
     assets: [
         {
-            balance: (0, formatter_1.toBN)("119.999999999999999997", decimals_1.decimals.STETH),
-            token: token_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase(),
+            balance: (0, formatter_1.toBN)("119.999999999999999997", sdk_gov_1.decimals.STETH),
+            token: sdk_gov_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase(),
         },
         {
-            balance: (0, formatter_1.toBN)("3.5", decimals_1.decimals.WETH),
-            token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+            balance: (0, formatter_1.toBN)("3.5", sdk_gov_1.decimals.WETH),
+            token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
         },
     ],
-    totalValue: (0, formatter_1.toBN)("117.635897231615362429", decimals_1.decimals.WETH),
-    debt: (0, formatter_1.toBN)("90.000000000000000000", decimals_1.decimals.WETH),
+    totalValue: (0, formatter_1.toBN)("117.635897231615362429", sdk_gov_1.decimals.WETH),
+    debt: (0, formatter_1.toBN)("90.000000000000000000", sdk_gov_1.decimals.WETH),
     borrowRate: 5736,
-    underlyingToken: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+    underlyingToken: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
 };
 describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
     it("overall APY calculation for caWithoutLP is correct", () => {
@@ -136,24 +134,24 @@ describe("CreditAccount calcMaxIncreaseBorrow test", () => {
     });
 });
 const liquidationThresholds = {
-    [token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: 9300n,
-    [token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: 8500n,
+    [sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: 9300n,
+    [sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: 8500n,
 };
 const defaultCA = {
     assets: [
         {
-            balance: (0, formatter_1.toBN)("156552", decimals_1.decimals.DAI),
-            token: token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+            balance: (0, formatter_1.toBN)("156552", sdk_gov_1.decimals.DAI),
+            token: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
         },
         {
-            balance: (0, formatter_1.toBN)("10", decimals_1.decimals.WETH),
-            token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+            balance: (0, formatter_1.toBN)("10", sdk_gov_1.decimals.WETH),
+            token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
         },
     ],
-    debt: (0, formatter_1.toBN)("156552", decimals_1.decimals.DAI),
+    debt: (0, formatter_1.toBN)("156552", sdk_gov_1.decimals.DAI),
     healthFactor: 10244,
-    underlyingToken: token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
-    underlyingDecimals: decimals_1.decimals.DAI,
+    underlyingToken: sdk_gov_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+    underlyingDecimals: sdk_gov_1.decimals.DAI,
 };
 describe("CreditManager calcHealthFactor test", () => {
     it("health factor calculation is calculated correctly", () => {
@@ -178,8 +176,8 @@ describe("CreditManager calcHealthFactor test", () => {
     });
     it("health factor after add collateral is calculated  correctly", () => {
         const collateral = {
-            balance: (0, formatter_1.toBN)("10", decimals_1.decimals.WETH),
-            token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+            balance: (0, formatter_1.toBN)("10", sdk_gov_1.decimals.WETH),
+            token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
         };
         const afterAdd = assets_1.AssetUtils.sumAssets(defaultCA.assets, [collateral]);
         const result = creditAccount_1.CreditAccountData.calcHealthFactor({
@@ -233,11 +231,11 @@ describe("CreditManager calcHealthFactor test", () => {
             token: defaultCA.underlyingToken,
         };
         const underlyingPrice = prices[defaultCA.underlyingToken];
-        const wethPrice = prices[token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()];
-        const getAmount = price_1.PriceUtils.convertByPrice(price_1.PriceUtils.calcTotalPrice(underlyingPrice, defaultCA.debt, defaultCA.underlyingDecimals), { price: wethPrice, decimals: decimals_1.decimals.WETH });
+        const wethPrice = prices[sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()];
+        const getAmount = price_1.PriceUtils.convertByPrice(price_1.PriceUtils.calcTotalPrice(underlyingPrice, defaultCA.debt, defaultCA.underlyingDecimals), { price: wethPrice, decimals: sdk_gov_1.decimals.WETH });
         const getAsset = {
             balance: getAmount,
-            token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+            token: sdk_gov_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
         };
         const afterSub = assets_1.AssetUtils.subAssets(defaultCA.assets, [swapAsset]);
         const afterSwap = assets_1.AssetUtils.sumAssets(afterSub, [getAsset]);

package/lib/core/creditManager.d.ts

@@ -1,52 +1,47 @@
-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: Record<string, 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;
+    encodeAddCollateralV2(account: string, tokenAddress: string, amount: bigint): MultiCall;
+    encodeAddCollateralV3(tokenAddress: string, amount: bigint): MultiCall;
+    encodeIncreaseDebtV2(amount: bigint): MultiCall;
+    encodeIncreaseDebtV3(amount: bigint): MultiCall;
+    encodeDecreaseDebtV2(amount: bigint): MultiCall;
+    encodeDecreaseDebtV3(amount: bigint): MultiCall;
+    encodeEnableTokenV2(token: string): MultiCall;
+    encodeEnableTokenV3(token: string): MultiCall;
+    encodeDisableTokenV2(token: string): MultiCall;
+    encodeDisableTokenV3(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 {