@gearbox-protocol/sdk 1.25.0 → 1.25.2

package/lib/core/assets.js

@@ -13,7 +13,7 @@ class AssetUtils {
             const alreadySelected = selectedRecord[allowedToken.toLowerCase()];
             return !alreadySelected;
         });
-        const sorted = (0, creditAccount_1.sortBalances)(AssetUtils.getBalances(notSelected, balances), prices, tokensList);
+        const sorted = creditAccount_1.CreditAccountData.sortBalances(AssetUtils.getBalances(notSelected, balances), prices, tokensList);
         const [address] = sorted[0] || [];
         return address;
     }

package/lib/core/chains.d.ts

@@ -17,7 +17,7 @@ export declare const CHAINS: {
     readonly Polygon: 137;
 };
 export declare const supportedChains: readonly ["Mainnet", "Arbitrum"];
-export type NetworkType = typeof supportedChains[number];
+export type NetworkType = (typeof supportedChains)[number];
 export declare const getNetworkType: (chainId: number, localAs?: NetworkType) => NetworkType;
 export declare const isSupportedNetwork: (chainId: number | undefined) => chainId is number;
 export declare function detectNetwork(provider: ethers.providers.Provider): Promise<NetworkType>;

package/lib/core/creditAccount.d.ts

@@ -4,6 +4,22 @@ 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;
+    prices: Record<string, bigint>;
+    totalValue: bigint | undefined;
+    debt: bigint | undefined;
+    borrowRate: number;
+    underlyingToken: string;
+}
+export interface CalcHealthFactorProps {
+    assets: Array<Asset>;
+    prices: Record<string, bigint>;
+    liquidationThresholds: Record<string, bigint>;
+    underlyingToken: string;
+    borrowed: bigint;
+}
 export declare class CreditAccountData {
     readonly addr: string;
     readonly borrower: string;
@@ -14,40 +30,33 @@ export declare class CreditAccountData {
     readonly cumulativeIndexAtOpen: bigint;
     readonly borrowedAmount: bigint;
     readonly borrowedAmountPlusInterestAndFees: bigint;
-    borrowedAmountPlusInterest: bigint;
-    totalValue: bigint;
+    readonly borrowedAmountPlusInterest: bigint;
+    readonly totalValue: bigint;
     healthFactor: number;
-    borrowRate: number;
-    readonly collateralTokens: Array<string>;
-    readonly allTokens: Array<string>;
-    balances: Record<string, bigint>;
-    allBalances: Record<string, bigint>;
+    readonly borrowRate: number;
     isDeleting: boolean;
-    enabledTokenMask: bigint;
+    readonly enabledTokenMask: bigint;
     readonly version: number;
+    readonly collateralTokens: Array<string>;
+    readonly allTokens: Array<string>;
+    readonly forbiddenTokens: Array<string>;
+    readonly balances: Record<string, bigint>;
+    readonly allBalances: Record<string, bigint>;
     readonly repayAmount: bigint;
     readonly liquidationAmount: bigint;
     readonly canBeClosed: boolean;
     constructor(payload: CreditAccountDataPayload);
     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;
     static isTokenEnabled(index: number, enabledTokenMask: bigint): boolean;
     static calcMaxIncreaseBorrow(healthFactor: number, borrowAmountPlusInterest: bigint, maxLeverageFactor: number, underlyingLT: number, minHf?: bigint): bigint;
-    get id(): string;
+    static calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }: CalcOverallAPYProps): number | undefined;
     hash(): string;
     static hash(creditManager: string, borrower: string): string;
+    static calcHealthFactor({ assets, prices, liquidationThresholds, underlyingToken, borrowed, }: CalcHealthFactorProps): number;
 }
-export declare function sortBalances(balances: Record<string, bigint>, prices: Record<string, bigint>, tokens: Record<string, TokenData>): Array<[string, bigint]>;
-export declare function tokensAbcComparator(t1?: TokenData, t2?: TokenData): 1 | -1;
-export declare function amountAbcComparator(t1: bigint, t2: bigint): 1 | -1;
-export interface CalcOverallAPYProps {
-    caAssets: Array<Asset>;
-    lpAPY: LpTokensAPY | undefined;
-    prices: Record<string, bigint>;
-    totalValue: bigint | undefined;
-    debt: bigint | undefined;
-    borrowRate: number;
-    underlyingToken: string;
-}
-export declare function calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }: CalcOverallAPYProps): number | undefined;

package/lib/core/creditAccount.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calcOverallAPY = exports.amountAbcComparator = exports.tokensAbcComparator = exports.sortBalances = exports.CreditAccountData = void 0;
+exports.CreditAccountData = void 0;
 const apy_1 = require("../apy");
 const decimals_1 = require("../tokens/decimals");
 const token_1 = require("../tokens/token");
@@ -21,13 +21,14 @@ class CreditAccountData {
     totalValue;
     healthFactor;
     borrowRate;
+    isDeleting;
+    enabledTokenMask;
+    version = 1;
     collateralTokens = [];
     allTokens = [];
+    forbiddenTokens = [];
     balances = {};
     allBalances = {};
-    isDeleting;
-    enabledTokenMask;
-    version = 1;
     /// V1 Artifacts
     repayAmount;
     liquidationAmount;
@@ -55,6 +56,9 @@ class CreditAccountData {
                 this.balances[tokenLC] = (0, formatter_1.toBigInt)(b.balance || 0);
                 this.collateralTokens.push(tokenLC);
             }
+            else {
+                this.forbiddenTokens.push(tokenLC);
+            }
             this.allBalances[tokenLC] = (0, formatter_1.toBigInt)(b.balance || 0);
             this.allTokens.push(tokenLC);
         });
@@ -66,12 +70,41 @@ class CreditAccountData {
         this.canBeClosed = payload.canBeClosed;
     }
     balancesSorted(prices, tokens) {
-        return sortBalances(this.balances, prices, tokens).map(([token, balance]) => ({ token, balance }));
+        return CreditAccountData.sortBalances(this.balances, prices, tokens).map(([token, balance]) => ({ token, balance }));
+    }
+    static sortBalances(balances, prices, tokens) {
+        return Object.entries(balances).sort(([addr1, amount1], [addr2, amount2]) => {
+            const addr1Lc = addr1.toLowerCase();
+            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 totalPrice1 = price_1.PriceUtils.calcTotalPrice(price1, amount1, token1?.decimals);
+            const totalPrice2 = price_1.PriceUtils.calcTotalPrice(price2, amount2, token2?.decimals);
+            if (totalPrice1 === totalPrice2) {
+                return amount1 === amount2
+                    ? CreditAccountData.tokensAbcComparator(token1, token2)
+                    : CreditAccountData.amountAbcComparator(amount1, amount2);
+            }
+            return CreditAccountData.amountAbcComparator(totalPrice1, totalPrice2);
+        });
+    }
+    static tokensAbcComparator(t1, t2) {
+        const { symbol: symbol1 = "" } = t1 || {};
+        const { symbol: symbol2 = "" } = t2 || {};
+        return symbol1 > symbol2 ? 1 : -1;
+    }
+    static amountAbcComparator(t1, t2) {
+        return t1 > t2 ? -1 : 1;
     }
     calcBorrowAmountPlusInterestRate(currentCumulativeIndex) {
         return ((this.borrowedAmount * currentCumulativeIndex) /
             this.cumulativeIndexAtOpen);
     }
+    isForbidden(token) {
+        return this.balances[token] === undefined;
+    }
     updateHealthFactor(creditManager, currentCumulativeIndex, priceOracle) {
         const twvUSDValue = this.collateralTokens
             .filter((_, num) => CreditAccountData.isTokenEnabled(num, this.enabledTokenMask))
@@ -93,8 +126,39 @@ class CreditAccountData {
             BigInt(minHealthFactor - underlyingLT);
         return result < 0 ? 0n : result;
     }
-    get id() {
-        return this.creditManager;
+    static calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }) {
+        if (!lpAPY ||
+            !totalValue ||
+            totalValue <= 0n ||
+            !debt ||
+            totalValue <= debt)
+            return undefined;
+        const assetAPYMoney = caAssets.reduce((acc, { token: tokenAddress, balance: amount }) => {
+            const tokenAddressLC = tokenAddress.toLowerCase();
+            const symbol = token_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 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 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) /
+            yourAssets /
+            constants_1.PERCENTAGE_FACTOR;
+        return Number((0, formatter_1.toSignificant)(apyInPercent, constants_1.WAD_DECIMALS_POW));
     }
     hash() {
         return CreditAccountData.hash(this.creditManager, this.borrower);
@@ -102,65 +166,22 @@ class CreditAccountData {
     static hash(creditManager, borrower) {
         return `${creditManager.toLowerCase()}:${borrower.toLowerCase()}`;
     }
+    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 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 borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice, borrowed, underlyingDecimals);
+        const hfInPercent = borrowedMoney > 0n ? assetLTMoney / borrowedMoney : 0n;
+        return Number(hfInPercent);
+    }
 }
 exports.CreditAccountData = CreditAccountData;
-function sortBalances(balances, prices, tokens) {
-    return Object.entries(balances).sort(([addr1, amount1], [addr2, amount2]) => {
-        const addr1Lc = addr1.toLowerCase();
-        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 totalPrice1 = (0, price_1.calcTotalPrice)(price1, amount1, token1?.decimals);
-        const totalPrice2 = (0, price_1.calcTotalPrice)(price2, amount2, token2?.decimals);
-        if (totalPrice1 === totalPrice2) {
-            return amount1 === amount2
-                ? tokensAbcComparator(token1, token2)
-                : amountAbcComparator(amount1, amount2);
-        }
-        return amountAbcComparator(totalPrice1, totalPrice2);
-    });
-}
-exports.sortBalances = sortBalances;
-function tokensAbcComparator(t1, t2) {
-    const { symbol: symbol1 = "" } = t1 || {};
-    const { symbol: symbol2 = "" } = t2 || {};
-    return symbol1 > symbol2 ? 1 : -1;
-}
-exports.tokensAbcComparator = tokensAbcComparator;
-function amountAbcComparator(t1, t2) {
-    return t1 > t2 ? -1 : 1;
-}
-exports.amountAbcComparator = amountAbcComparator;
-function calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }) {
-    if (!lpAPY || !totalValue || totalValue <= 0n || !debt || totalValue <= debt)
-        return undefined;
-    const assetAPYMoney = caAssets.reduce((acc, { token: tokenAddress, balance: amount }) => {
-        const tokenAddressLC = tokenAddress.toLowerCase();
-        const symbol = token_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 money = (0, price_1.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 assetAPYAmountInUnderlying = (0, price_1.convertByPrice)(assetAPYMoney, {
-        price: underlyingPrice,
-        decimals: underlyingTokenDecimals,
-    });
-    const debtAPY = debt * BigInt(borrowRate);
-    const yourAssets = totalValue - debt;
-    const apyInPercent = ((assetAPYAmountInUnderlying - debtAPY) * constants_1.WAD) /
-        yourAssets /
-        constants_1.PERCENTAGE_FACTOR;
-    return Number((0, formatter_1.toSignificant)(apyInPercent, constants_1.WAD_DECIMALS_POW));
-}
-exports.calcOverallAPY = calcOverallAPY;

package/lib/core/creditAccount.spec.js

@@ -4,6 +4,8 @@ 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 = {
@@ -44,9 +46,9 @@ const caWithLP = {
     borrowRate: 5736,
     underlyingToken: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
 };
-describe("CreditAccount calcOverallAPY test", () => {
+describe("CreditAccount CreditAccountData.calcOverallAPY test", () => {
     it("overall APY calculation for caWithoutLP is correct", () => {
-        const result = (0, creditAccount_1.calcOverallAPY)({
+        const result = creditAccount_1.CreditAccountData.calcOverallAPY({
             caAssets: caWithoutLP.assets,
             totalValue: caWithoutLP.totalValue,
             debt: caWithoutLP.debt,
@@ -58,7 +60,7 @@ describe("CreditAccount calcOverallAPY test", () => {
         (0, chai_1.expect)(result).to.be.eq(-6.94841);
     });
     it("overall APY calculation for caWithLP is correct", () => {
-        const result = (0, creditAccount_1.calcOverallAPY)({
+        const result = creditAccount_1.CreditAccountData.calcOverallAPY({
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
@@ -70,7 +72,7 @@ describe("CreditAccount calcOverallAPY test", () => {
         (0, chai_1.expect)(result).to.be.eq(14.4919);
     });
     it("overall APY is undefined when !lpAPY", () => {
-        const result = (0, creditAccount_1.calcOverallAPY)({
+        const result = creditAccount_1.CreditAccountData.calcOverallAPY({
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: caWithLP.debt,
@@ -82,7 +84,7 @@ describe("CreditAccount calcOverallAPY test", () => {
         (0, chai_1.expect)(result).to.be.eq(undefined);
     });
     it("overall APY is undefined when !totalValue", () => {
-        const result = (0, creditAccount_1.calcOverallAPY)({
+        const result = creditAccount_1.CreditAccountData.calcOverallAPY({
             caAssets: caWithLP.assets,
             totalValue: undefined,
             debt: caWithLP.debt,
@@ -94,7 +96,7 @@ describe("CreditAccount calcOverallAPY test", () => {
         (0, chai_1.expect)(result).to.be.eq(undefined);
     });
     it("overall APY is undefined when !debt", () => {
-        const result = (0, creditAccount_1.calcOverallAPY)({
+        const result = creditAccount_1.CreditAccountData.calcOverallAPY({
             caAssets: caWithLP.assets,
             totalValue: caWithLP.totalValue,
             debt: undefined,
@@ -106,7 +108,7 @@ describe("CreditAccount calcOverallAPY test", () => {
         (0, chai_1.expect)(result).to.be.eq(undefined);
     });
     it("overall APY is undefined when totalValue lte 0", () => {
-        const result = (0, creditAccount_1.calcOverallAPY)({
+        const result = creditAccount_1.CreditAccountData.calcOverallAPY({
             caAssets: caWithLP.assets,
             totalValue: 0n,
             debt: undefined,
@@ -133,3 +135,119 @@ describe("CreditAccount calcMaxIncreaseBorrow test", () => {
         (0, chai_1.expect)(result.toString()).to.be.eq("19095785778950228315970");
     });
 });
+const liquidationThresholds = {
+    [token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: 9300n,
+    [token_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)("10", decimals_1.decimals.WETH),
+            token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+        },
+    ],
+    debt: (0, formatter_1.toBN)("156552", decimals_1.decimals.DAI),
+    healthFactor: 10244,
+    underlyingToken: token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
+    underlyingDecimals: decimals_1.decimals.DAI,
+};
+describe("CreditManager calcHealthFactor test", () => {
+    it("health factor calculation is calculated correctly", () => {
+        const result = creditAccount_1.CreditAccountData.calcHealthFactor({
+            assets: defaultCA.assets,
+            prices,
+            liquidationThresholds,
+            underlyingToken: defaultCA.underlyingToken,
+            borrowed: defaultCA.debt,
+        });
+        (0, chai_1.expect)(result).to.be.eq(defaultCA.healthFactor);
+    });
+    it("health factor calculation has no division by zero error", () => {
+        const result = creditAccount_1.CreditAccountData.calcHealthFactor({
+            assets: [],
+            prices: {},
+            liquidationThresholds: {},
+            underlyingToken: "",
+            borrowed: 0n,
+        });
+        (0, chai_1.expect)(result).to.be.eq(0);
+    });
+    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(),
+        };
+        const afterAdd = assets_1.AssetUtils.sumAssets(defaultCA.assets, [collateral]);
+        const result = creditAccount_1.CreditAccountData.calcHealthFactor({
+            assets: afterAdd,
+            prices,
+            liquidationThresholds,
+            underlyingToken: defaultCA.underlyingToken,
+            borrowed: defaultCA.debt,
+        });
+        (0, chai_1.expect)(result).to.be.eq(11188);
+    });
+    it("health factor after decrease debt is calculated  correctly", () => {
+        const amountDecrease = (0, formatter_1.toBN)("10000", defaultCA.underlyingDecimals);
+        const debtDecrease = {
+            balance: amountDecrease,
+            token: defaultCA.underlyingToken,
+        };
+        const afterDecrease = assets_1.AssetUtils.subAssets(defaultCA.assets, [
+            debtDecrease,
+        ]);
+        const result = creditAccount_1.CreditAccountData.calcHealthFactor({
+            assets: afterDecrease,
+            prices,
+            liquidationThresholds,
+            underlyingToken: defaultCA.underlyingToken,
+            borrowed: defaultCA.debt - amountDecrease,
+        });
+        (0, chai_1.expect)(result).to.be.eq(10308);
+    });
+    it("health factor after increase debt is calculated  correctly", () => {
+        const amountIncrease = (0, formatter_1.toBN)("20000", defaultCA.underlyingDecimals);
+        const debtIncrease = {
+            balance: amountIncrease,
+            token: defaultCA.underlyingToken,
+        };
+        const afterIncrease = assets_1.AssetUtils.sumAssets(defaultCA.assets, [
+            debtIncrease,
+        ]);
+        const result = creditAccount_1.CreditAccountData.calcHealthFactor({
+            assets: afterIncrease,
+            prices,
+            liquidationThresholds,
+            underlyingToken: defaultCA.underlyingToken,
+            borrowed: defaultCA.debt + amountIncrease,
+        });
+        (0, chai_1.expect)(result).to.be.eq(10137);
+    });
+    it("health factor after swap is calculated  correctly", () => {
+        const swapAsset = {
+            balance: defaultCA.debt,
+            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 getAsset = {
+            balance: getAmount,
+            token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
+        };
+        const afterSub = assets_1.AssetUtils.subAssets(defaultCA.assets, [swapAsset]);
+        const afterSwap = assets_1.AssetUtils.sumAssets(afterSub, [getAsset]);
+        const result = creditAccount_1.CreditAccountData.calcHealthFactor({
+            assets: afterSwap,
+            prices,
+            liquidationThresholds,
+            underlyingToken: defaultCA.underlyingToken,
+            borrowed: defaultCA.debt,
+        });
+        (0, chai_1.expect)(result).to.be.eq(9444);
+    });
+});

package/lib/core/creditManager.d.ts

@@ -2,7 +2,6 @@ import { ethers, Signer } from "ethers";
 import { MultiCall } from "../pathfinder/core";
 import { ChartsCreditManagerPayload, CreditManagerDataPayload } from "../payload/creditManager";
 import { ICreditManager } from "../types";
-import { Asset } from "./assets";
 export declare class CreditManagerData {
     readonly address: string;
     readonly underlyingToken: string;
@@ -85,11 +84,3 @@ export declare class ChartsCreditManagerData {
     readonly liquidationThresholds: Record<string, bigint>;
     constructor(payload: ChartsCreditManagerPayload);
 }
-export interface CalcHealthFactorProps {
-    assets: Array<Asset>;
-    prices: Record<string, bigint>;
-    liquidationThresholds: Record<string, bigint>;
-    underlyingToken: string;
-    borrowed: bigint;
-}
-export declare function calcHealthFactor({ assets, prices, liquidationThresholds, underlyingToken, borrowed, }: CalcHealthFactorProps): number;

package/lib/core/creditManager.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calcHealthFactor = exports.ChartsCreditManagerData = exports.CreditManagerData = void 0;
+exports.ChartsCreditManagerData = exports.CreditManagerData = void 0;
 const txParser_1 = require("../parsers/txParser");
-const decimals_1 = require("../tokens/decimals");
 const token_1 = require("../tokens/token");
 const types_1 = require("../types");
 const formatter_1 = require("../utils/formatter");
-const price_1 = require("../utils/price");
 const constants_1 = require("./constants");
 const errors_1 = require("./errors");
 class CreditManagerData {
@@ -242,21 +240,3 @@ class ChartsCreditManagerData {
     }
 }
 exports.ChartsCreditManagerData = ChartsCreditManagerData;
-function 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 lt = liquidationThresholds[tokenAddress.toLowerCase()] || 0n;
-        const price = prices[tokenAddress.toLowerCase()] || 0n;
-        const money = (0, price_1.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 borrowedMoney = (0, price_1.calcTotalPrice)(underlyingPrice, borrowed, underlyingDecimals);
-    const hfInPercent = borrowedMoney > 0n ? assetLTMoney / borrowedMoney : 0n;
-    return Number(hfInPercent);
-}
-exports.calcHealthFactor = calcHealthFactor;

package/lib/core/eventOrTx.js

@@ -25,7 +25,7 @@ class EventOrTx {
         if (!this.isPending && item.isPending) {
             return 1;
         }
-        return this.block > item.block ? -1 : 1;
+        return item.block - this.block;
     }
 }
 exports.EventOrTx = EventOrTx;

package/lib/core/pool/data.d.ts

@@ -7,6 +7,7 @@ export declare class PoolData {
     readonly underlyingToken: string;
     readonly dieselToken: string;
     readonly isWETH: boolean;
+    readonly isWSTETH: boolean;
     readonly expectedLiquidity: bigint;
     readonly expectedLiquidityLimit: bigint;
     readonly availableLiquidity: bigint;

package/lib/core/pool/data.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserPoolData = exports.ChartsPoolData = exports.PoolData = void 0;
+const token_1 = require("../../tokens/token");
 const types_1 = require("../../types");
 const formatter_1 = require("../../utils/formatter");
 const constants_1 = require("../constants");
@@ -10,6 +11,7 @@ class PoolData {
     underlyingToken;
     dieselToken;
     isWETH;
+    isWSTETH;
     // Information
     expectedLiquidity;
     expectedLiquidityLimit;
@@ -30,6 +32,8 @@ class PoolData {
         this.underlyingToken = payload.underlying.toLowerCase();
         this.dieselToken = payload.dieselToken.toLowerCase();
         this.isWETH = payload.isWETH || false;
+        this.isWSTETH =
+            token_1.tokenSymbolByAddress[payload.underlying.toLowerCase()] === "wstETH";
         this.expectedLiquidity = (0, formatter_1.toBigInt)(payload.expectedLiquidity || 0);
         this.expectedLiquidityLimit = (0, formatter_1.toBigInt)(payload.expectedLiquidityLimit || 0);
         this.availableLiquidity = (0, formatter_1.toBigInt)(payload.availableLiquidity || 0);

package/lib/core/rewardConvex.spec.js

@@ -54,13 +54,13 @@ describe("RewardConvex test", () => {
             //   method: "earned(address)",
             //   params: [CREDIT_ACCOUNT],
             // },
-            {
-                address: contracts_1.contractParams.CONVEX_FRAX3CRV_POOL
-                    .extraRewards[0].poolAddress.Mainnet,
-                interface: rewardConvex_1.RewardConvex.poolInterface,
-                method: "earned(address)",
-                params: [CREDIT_ACCOUNT],
-            },
+            // {
+            //   address: (contractParams.CONVEX_FRAX3CRV_POOL as ConvexPoolParams)
+            //     .extraRewards[0].poolAddress.Mainnet,
+            //   interface: RewardConvex.poolInterface,
+            //   method: "earned(address)",
+            //   params: [CREDIT_ACCOUNT],
+            // },
         ];
         const distribution = [
             {
@@ -88,8 +88,8 @@ describe("RewardConvex test", () => {
     it("parseResults parse data correctly", () => {
         const rewards = [
             ethers_1.BigNumber.from(1000n),
-            ethers_1.BigNumber.from(2000n),
-            ethers_1.BigNumber.from(4000n),
+            // BigNumber.from(2000n),
+            // BigNumber.from(4000n),
         ];
         const distribution = [
             {
@@ -126,19 +126,19 @@ describe("RewardConvex test", () => {
                     },
                 ],
             },
-            {
-                contract: "CONVEX_FRAX3CRV_POOL",
-                rewards: {
-                    CRV: 2000n,
-                    FXS: 4000n,
-                },
-                calls: [
-                    {
-                        target: ADAPTER_CONVEX_FRAX3CRV_POOL,
-                        callData,
-                    },
-                ],
-            },
+            // {
+            //   contract: "CONVEX_FRAX3CRV_POOL",
+            //   rewards: {
+            //     CRV: 2000n,
+            //     FXS: 4000n,
+            //   },
+            //   calls: [
+            //     {
+            //       target: ADAPTER_CONVEX_FRAX3CRV_POOL,
+            //       callData,
+            //     },
+            //   ],
+            // },
         ];
         (0, chai_1.expect)(parsed).to.be.eql(expected);
     });

package/lib/core/strategy.js

@@ -42,13 +42,13 @@ class Strategy {
         const underlyingTokenSymbol = token_1.tokenSymbolByAddress[underlyingTokenAddressLC];
         const underlyingTokenDecimals = decimals_1.decimals[underlyingTokenSymbol];
         const underlyingPrice = prices[underlyingTokenAddressLC] || constants_1.PRICE_DECIMALS;
-        const borrowedMoney = (0, price_1.calcTotalPrice)(underlyingPrice, borrowed, underlyingTokenDecimals);
+        const borrowedMoney = price_1.PriceUtils.calcTotalPrice(underlyingPrice, borrowed, underlyingTokenDecimals);
         const lpTokenAddressLC = lpToken.toLowerCase();
         const lpTokenSymbol = token_1.tokenSymbolByAddress[lpTokenAddressLC];
         const lpTokenDecimals = decimals_1.decimals[lpTokenSymbol];
         const lpLT = liquidationThresholds[lpTokenAddressLC] || 0n;
         const lpPrice = prices[lpTokenAddressLC] || constants_1.PRICE_DECIMALS;
-        const lpMoney = (0, price_1.calcTotalPrice)(lpPrice, lpAmount, lpTokenDecimals);
+        const lpMoney = price_1.PriceUtils.calcTotalPrice(lpPrice, lpAmount, lpTokenDecimals);
         const lpLTMoney = (lpMoney * lpLT) / constants_1.PERCENTAGE_FACTOR;
         if (lpLTMoney > 0) {
             const lqPrice = (borrowedMoney * constants_1.WAD) / lpLTMoney;

package/lib/parsers/uniV3AdapterParser.spec.js

@@ -23,30 +23,41 @@ describe("UniswapV3AdapterParser test", () => {
     it("swap functions works well", () => {
         let parser = new uniV3AdapterParser_1.UniswapV3AdapterParser("UNISWAP_V3_ROUTER", false);
         const ifc = types_1.IUniswapV3Adapter__factory.createInterface();
-        let parsed = parser.parse(ifc.encodeFunctionData("exactInputSingle", [
-            {
-                tokenIn: token_1.tokenDataByNetwork.Arbitrum["1INCH"],
-                tokenOut: token_1.tokenDataByNetwork.Arbitrum["3Crv"],
-                fee: 3000,
-                recipient: constants_1.DUMB_ADDRESS,
-                deadline: 12300,
-                amountIn: constants_1.WAD * 1299000n,
-                amountOutMinimum: constants_1.WAD * 10200n,
-                sqrtPriceLimitX96: 0,
-            },
-        ]));
-        (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactInputSingle(amountIn: 1.29M [1299000000000000000000000], amountOutMinimum: 10.20K [10200000000000000000000],  path: 1INCH ==(fee: 3000)==> 3Crv)", "Incorrect parse swapExactTokensForTokens");
-        parsed = parser.parse(ifc.encodeFunctionData("exactAllInputSingle", [
-            {
-                tokenIn: token_1.tokenDataByNetwork.Arbitrum["1INCH"],
-                tokenOut: token_1.tokenDataByNetwork.Arbitrum["3Crv"],
-                fee: 3000,
-                deadline: 12300,
-                rateMinRAY: constants_1.RAY * 1200n,
-                sqrtPriceLimitX96: 0,
-            },
-        ]));
-        (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactAllInputSingle(rate: 1.20K,  path: 1INCH ==(fee: 3000)==> 3Crv)", "Incorrect parse swapExactTokensForTokens");
+        let parsed;
+        // let parsed = parser.parse(
+        //   ifc.encodeFunctionData("exactInputSingle", [
+        //     {
+        //       tokenIn: tokenDataByNetwork.Arbitrum["1INCH"],
+        //       tokenOut: tokenDataByNetwork.Arbitrum["3Crv"],
+        //       fee: 3000,
+        //       recipient: DUMB_ADDRESS,
+        //       deadline: 12300,
+        //       amountIn: WAD * 1299000n,
+        //       amountOutMinimum: WAD * 10200n,
+        //       sqrtPriceLimitX96: 0,
+        //     },
+        //   ]),
+        // );
+        // expect(parsed).to.be.eq(
+        //   "UniswapV3Adapter[UNISWAP_V3_ROUTER].exactInputSingle(amountIn: 1.29M [1299000000000000000000000], amountOutMinimum: 10.20K [10200000000000000000000],  path: 1INCH ==(fee: 3000)==> 3Crv)",
+        //   "Incorrect parse swapExactTokensForTokens",
+        // );
+        // parsed = parser.parse(
+        //   ifc.encodeFunctionData("exactAllInputSingle", [
+        //     {
+        //       tokenIn: tokenDataByNetwork.Arbitrum["1INCH"],
+        //       tokenOut: tokenDataByNetwork.Arbitrum["3Crv"],
+        //       fee: 3000,
+        //       deadline: 12300,
+        //       rateMinRAY: RAY * 1200n,
+        //       sqrtPriceLimitX96: 0,
+        //     },
+        //   ]),
+        // );
+        // expect(parsed).to.be.eq(
+        //   "UniswapV3Adapter[UNISWAP_V3_ROUTER].exactAllInputSingle(rate: 1.20K,  path: 1INCH ==(fee: 3000)==> 3Crv)",
+        //   "Incorrect parse swapExactTokensForTokens",
+        // );
         parsed = parser.parse(ifc.encodeFunctionData("exactInput", [
             {
                 path: pathToUniV3Path([
@@ -73,19 +84,24 @@ describe("UniswapV3AdapterParser test", () => {
             },
         ]));
         (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactAllInput(rate: 1.20K,  path: AAVE ==(fee: 3000)==> LINK ==(fee: 3000)==> USDC", "Incorrect parse swapExactTokensForTokens");
-        parsed = parser.parse(ifc.encodeFunctionData("exactOutputSingle", [
-            {
-                tokenIn: token_1.tokenDataByNetwork.Arbitrum["1INCH"],
-                tokenOut: token_1.tokenDataByNetwork.Arbitrum.USDC,
-                fee: 10000,
-                recipient: constants_1.DUMB_ADDRESS,
-                deadline: 12300,
-                amountInMaximum: (constants_1.WAD * 149n) / 1000n,
-                amountOut: 102e6,
-                sqrtPriceLimitX96: 0,
-            },
-        ]));
-        (0, chai_1.expect)(parsed).to.be.eq("UniswapV3Adapter[UNISWAP_V3_ROUTER].exactOutputSingle(amountInMaximum: 0.14 [149000000000000000], amountOut: 102.00 [102000000],  path: 1INCH ==(fee: 10000)==> USDC)", "Incorrect parse swapExactTokensForTokens");
+        // parsed = parser.parse(
+        //   ifc.encodeFunctionData("exactOutputSingle", [
+        //     {
+        //       tokenIn: tokenDataByNetwork.Arbitrum["1INCH"],
+        //       tokenOut: tokenDataByNetwork.Arbitrum.USDC,
+        //       fee: 10000,
+        //       recipient: DUMB_ADDRESS,
+        //       deadline: 12300,
+        //       amountInMaximum: (WAD * 149n) / 1000n,
+        //       amountOut: 102e6,
+        //       sqrtPriceLimitX96: 0,
+        //     },
+        //   ]),
+        // );
+        // expect(parsed).to.be.eq(
+        //   "UniswapV3Adapter[UNISWAP_V3_ROUTER].exactOutputSingle(amountInMaximum: 0.14 [149000000000000000], amountOut: 102.00 [102000000],  path: 1INCH ==(fee: 10000)==> USDC)",
+        //   "Incorrect parse swapExactTokensForTokens",
+        // );
         parsed = parser.parse(ifc.encodeFunctionData("exactOutput", [
             {
                 path: pathToUniV3Path([

package/lib/utils/price.d.ts

@@ -1,7 +1,9 @@
-export declare const calcTotalPrice: (price: bigint, amount: bigint, decimals?: number) => bigint;
 interface Target {
     price: bigint;
     decimals: number | undefined;
 }
-export declare function convertByPrice(totalMoney: bigint, { price: targetPrice, decimals: targetDecimals }: Target): bigint;
+export declare class PriceUtils {
+    static calcTotalPrice: (price: bigint, amount: bigint, decimals?: number) => bigint;
+    static convertByPrice(totalMoney: bigint, { price: targetPrice, decimals: targetDecimals }: Target): bigint;
+}
 export {};

package/lib/utils/price.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertByPrice = exports.calcTotalPrice = void 0;
+exports.PriceUtils = void 0;
 const constants_1 = require("../core/constants");
-const calcTotalPrice = (price, amount, decimals = 18) => (amount * constants_1.WAD * price) / 10n ** BigInt(decimals) / constants_1.PRICE_DECIMALS;
-exports.calcTotalPrice = calcTotalPrice;
-function convertByPrice(totalMoney, { price: targetPrice, decimals: targetDecimals = 18 }) {
-    if (targetPrice <= 0n)
-        return 0n;
-    return ((totalMoney * 10n ** BigInt(targetDecimals) * constants_1.PRICE_DECIMALS) /
-        targetPrice /
-        constants_1.WAD);
+class PriceUtils {
+    static calcTotalPrice = (price, amount, decimals = 18) => (amount * constants_1.WAD * price) / 10n ** BigInt(decimals) / constants_1.PRICE_DECIMALS;
+    static convertByPrice(totalMoney, { price: targetPrice, decimals: targetDecimals = 18 }) {
+        if (targetPrice <= 0n)
+            return 0n;
+        return ((totalMoney * 10n ** BigInt(targetDecimals) * constants_1.PRICE_DECIMALS) /
+            targetPrice /
+            constants_1.WAD);
+    }
 }
-exports.convertByPrice = convertByPrice;
+exports.PriceUtils = PriceUtils;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "1.25.0",
+  "version": "1.25.2",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -12,10 +12,10 @@
   "license": "MIT",
   "scripts": {
     "clean": "rm -rf lib",
-    "build": "tsc && rm -rf lib/scripts && mv ./lib/src/* ./lib",
+    "build": "tsc --p tsconfig.build.json",
     "bindings": "yarn ts-node ./scripts/generate.ts",
-    "dev": "tsc -w",
-    "pub": "rm -rf ./src/types/hardhat.ts && cp ./src/types/*.d.ts ./lib/types && tsc && yarn publish",
+    "dev": "tsc -w --p tsconfig.build.json",
+    "pub": "rm -rf ./src/types/hardhat.ts && cp ./src/types/*.d.ts ./lib/types && tsc --p tsconfig.build.json && yarn publish",
     "copyTypes": "node ./scripts/copyTypes.js",
     "prepare": "husky install",
     "prettier": "prettier --write .",

package/lib/core/creditManager.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/core/creditManager.spec.js

@@ -1,131 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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 creditManager_1 = require("./creditManager");
-const liquidationThresholds = {
-    [token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()]: 9300n,
-    [token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()]: 8500n,
-};
-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),
-};
-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)("10", decimals_1.decimals.WETH),
-            token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
-        },
-    ],
-    debt: (0, formatter_1.toBN)("156552", decimals_1.decimals.DAI),
-    healthFactor: 10244,
-    underlyingToken: token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
-    underlyingDecimals: decimals_1.decimals.DAI,
-};
-describe("CreditManager calcHealthFactor test", () => {
-    it("health factor calculation is calculated correctly", () => {
-        const result = (0, creditManager_1.calcHealthFactor)({
-            assets: defaultCA.assets,
-            prices,
-            liquidationThresholds,
-            underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
-        });
-        (0, chai_1.expect)(result).to.be.eq(defaultCA.healthFactor);
-    });
-    it("health factor calculation has no division by zero error", () => {
-        const result = (0, creditManager_1.calcHealthFactor)({
-            assets: [],
-            prices: {},
-            liquidationThresholds: {},
-            underlyingToken: "",
-            borrowed: 0n,
-        });
-        (0, chai_1.expect)(result).to.be.eq(0);
-    });
-    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(),
-        };
-        const afterAdd = assets_1.AssetUtils.sumAssets(defaultCA.assets, [collateral]);
-        const result = (0, creditManager_1.calcHealthFactor)({
-            assets: afterAdd,
-            prices,
-            liquidationThresholds,
-            underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
-        });
-        (0, chai_1.expect)(result).to.be.eq(11188);
-    });
-    it("health factor after decrease debt is calculated  correctly", () => {
-        const amountDecrease = (0, formatter_1.toBN)("10000", defaultCA.underlyingDecimals);
-        const debtDecrease = {
-            balance: amountDecrease,
-            token: defaultCA.underlyingToken,
-        };
-        const afterDecrease = assets_1.AssetUtils.subAssets(defaultCA.assets, [
-            debtDecrease,
-        ]);
-        const result = (0, creditManager_1.calcHealthFactor)({
-            assets: afterDecrease,
-            prices,
-            liquidationThresholds,
-            underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt - amountDecrease,
-        });
-        (0, chai_1.expect)(result).to.be.eq(10308);
-    });
-    it("health factor after increase debt is calculated  correctly", () => {
-        const amountIncrease = (0, formatter_1.toBN)("20000", defaultCA.underlyingDecimals);
-        const debtIncrease = {
-            balance: amountIncrease,
-            token: defaultCA.underlyingToken,
-        };
-        const afterIncrease = assets_1.AssetUtils.sumAssets(defaultCA.assets, [
-            debtIncrease,
-        ]);
-        const result = (0, creditManager_1.calcHealthFactor)({
-            assets: afterIncrease,
-            prices,
-            liquidationThresholds,
-            underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt + amountIncrease,
-        });
-        (0, chai_1.expect)(result).to.be.eq(10137);
-    });
-    it("health factor after swap is calculated  correctly", () => {
-        const swapAsset = {
-            balance: defaultCA.debt,
-            token: defaultCA.underlyingToken,
-        };
-        const underlyingPrice = prices[defaultCA.underlyingToken];
-        const wethPrice = prices[token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()];
-        const getAmount = (0, price_1.convertByPrice)((0, price_1.calcTotalPrice)(underlyingPrice, defaultCA.debt, defaultCA.underlyingDecimals), { price: wethPrice, decimals: decimals_1.decimals.WETH });
-        const getAsset = {
-            balance: getAmount,
-            token: token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase(),
-        };
-        const afterSub = assets_1.AssetUtils.subAssets(defaultCA.assets, [swapAsset]);
-        const afterSwap = assets_1.AssetUtils.sumAssets(afterSub, [getAsset]);
-        const result = (0, creditManager_1.calcHealthFactor)({
-            assets: afterSwap,
-            prices,
-            liquidationThresholds,
-            underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt,
-        });
-        (0, chai_1.expect)(result).to.be.eq(9444);
-    });
-});