@gearbox-protocol/sdk 1.22.3 → 1.23.0

package/lib/core/creditManager.js

@@ -1,53 +1,66 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calcHealthFactor = exports.ChartsCreditManagerData = exports.CreditManagerData = void 0;
-var ethers_1 = require("ethers");
-var txParser_1 = require("../parsers/txParser");
-var decimals_1 = require("../tokens/decimals");
-var token_1 = require("../tokens/token");
-var types_1 = require("../types");
-var price_1 = require("../utils/price");
-var constants_1 = require("./constants");
-var errors_1 = require("./errors");
-var CreditManagerData = /** @class */ (function () {
-    function CreditManagerData(payload) {
-        this.isPaused = false;
+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 {
+    address;
+    underlyingToken;
+    pool;
+    isWETH;
+    canBorrow;
+    borrowRate;
+    minAmount;
+    maxAmount;
+    maxLeverageFactor; // for V1 only
+    availableLiquidity;
+    collateralTokens;
+    adapters;
+    liquidationThresholds;
+    version;
+    creditFacade; // V2 only: address of creditFacade
+    creditConfigurator; // V2 only: address of creditFacade
+    isDegenMode; // V2 only: true if contract is in Degen mode
+    degenNFT; // V2 only: degenNFT, address(0) if not in degen mode
+    isIncreaseDebtForbidden; // V2 only: true if increasing debt is forbidden
+    forbiddenTokenMask; // V2 only: mask which forbids some particular tokens
+    maxEnabledTokensLength;
+    feeInterest;
+    feeLiquidation;
+    liquidationDiscount;
+    feeLiquidationExpired;
+    liquidationDiscountExpired;
+    isPaused = false;
+    constructor(payload) {
         this.address = payload.addr.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
         this.pool = payload.pool.toLowerCase();
         this.isWETH = payload.isWETH;
         this.canBorrow = payload.canBorrow;
         this.maxEnabledTokensLength = payload.maxEnabledTokensLength;
-        this.borrowRate = payload.borrowRate
-            .mul(payload.feeInterest + constants_1.PERCENTAGE_FACTOR)
-            .mul(constants_1.PERCENTAGE_DECIMALS)
-            .div(constants_1.RAY)
-            .toNumber();
-        this.minAmount = payload.minAmount;
-        this.maxAmount = payload.maxAmount;
-        this.maxLeverageFactor = ethers_1.BigNumber.from(payload.maxLeverageFactor).toNumber();
-        this.availableLiquidity = payload.availableLiquidity;
-        this.collateralTokens = payload.collateralTokens.map(function (t) { return t.toLowerCase(); });
-        this.adapters = payload.adapters.reduce(function (acc, _a) {
-            var _b;
-            var allowedContract = _a.allowedContract, adapter = _a.adapter;
-            return (__assign(__assign({}, acc), (_b = {}, _b[allowedContract.toLowerCase()] = adapter.toLowerCase(), _b)));
-        }, {});
-        this.liquidationThresholds = payload.liquidationThresholds.reduce(function (acc, threshold, index) {
-            var address = payload.collateralTokens[index];
+        this.borrowRate = Number(((0, formatter_1.toBigInt)(payload.borrowRate || 0) *
+            ((0, formatter_1.toBigInt)(payload.feeInterest || 0) + constants_1.PERCENTAGE_FACTOR) *
+            constants_1.PERCENTAGE_DECIMALS) /
+            constants_1.RAY);
+        this.minAmount = (0, formatter_1.toBigInt)(payload.minAmount || 0);
+        this.maxAmount = (0, formatter_1.toBigInt)(payload.maxAmount || 0);
+        this.maxLeverageFactor = Number((0, formatter_1.toBigInt)(payload.maxLeverageFactor || 0));
+        this.availableLiquidity = (0, formatter_1.toBigInt)(payload.availableLiquidity || 0);
+        this.collateralTokens = payload.collateralTokens.map(t => t.toLowerCase());
+        this.adapters = payload.adapters.reduce((acc, { allowedContract, adapter }) => ({
+            ...acc,
+            [allowedContract.toLowerCase()]: adapter.toLowerCase(),
+        }), {});
+        this.liquidationThresholds = payload.liquidationThresholds.reduce((acc, threshold, index) => {
+            const address = payload.collateralTokens[index];
             if (address)
-                acc[address.toLowerCase()] = threshold;
+                acc[address.toLowerCase()] = (0, formatter_1.toBigInt)(threshold || 0);
             return acc;
         }, {});
         this.version = payload.version;
@@ -56,7 +69,7 @@ var CreditManagerData = /** @class */ (function () {
         this.isDegenMode = payload.isDegenMode;
         this.degenNFT = payload.degenNFT.toLowerCase();
         this.isIncreaseDebtForbidden = payload.isIncreaseDebtForbidden;
-        this.forbiddenTokenMask = payload.forbiddenTokenMask;
+        this.forbiddenTokenMask = (0, formatter_1.toBigInt)(payload.forbiddenTokenMask || 0);
         this.feeInterest = payload.feeInterest;
         this.feeLiquidation = payload.feeLiquidation;
         this.liquidationDiscount = payload.liquidationDiscount;
@@ -65,129 +78,157 @@ var CreditManagerData = /** @class */ (function () {
         txParser_1.TxParser.addCreditManager(this.address, this.version);
         if (this.creditFacade !== "" && this.creditFacade !== constants_1.ADDRESS_0X0) {
             txParser_1.TxParser.addCreditFacade(this.creditFacade, token_1.tokenSymbolByAddress[this.underlyingToken]);
-            txParser_1.TxParser.addAdapters(payload.adapters.map(function (a) { return ({
+            txParser_1.TxParser.addAdapters(payload.adapters.map(a => ({
                 adapter: a.adapter,
                 contract: a.allowedContract,
-            }); }));
+            })));
         }
     }
-    CreditManagerData.prototype.getContractETH = function (signer) {
+    getContractETH(signer) {
         return types_1.ICreditManager__factory.connect(this.address, signer);
-    };
-    CreditManagerData.prototype.contractToAdapter = function (contractAddress) {
+    }
+    contractToAdapter(contractAddress) {
         return this.adapters[contractAddress];
-    };
-    CreditManagerData.prototype.encodeAddCollateral = function (accountAddress, tokenAddress, amount) {
+    }
+    encodeAddCollateral(accountAddress, tokenAddress, amount) {
         if (this.version !== 2)
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
             callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("addCollateral", [accountAddress, tokenAddress, amount]),
         };
-    };
-    CreditManagerData.prototype.encodeIncreaseDebt = function (amount) {
+    }
+    encodeIncreaseDebt(amount) {
         if (this.version !== 2)
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
             callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("increaseDebt", [amount]),
         };
-    };
-    CreditManagerData.prototype.encodeDecreaseDebt = function (amount) {
+    }
+    encodeDecreaseDebt(amount) {
         if (this.version !== 2)
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
             callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("decreaseDebt", [amount]),
         };
-    };
-    CreditManagerData.prototype.validateOpenAccount = function (collateral, debt) {
+    }
+    validateOpenAccount(collateral, debt) {
         return this.version === 2
             ? this.validateOpenAccountV2(debt)
             : this.validateOpenAccountV1(collateral, debt);
-    };
-    CreditManagerData.prototype.validateOpenAccountV1 = function (collateral, debt) {
-        if (collateral.lt(this.minAmount))
+    }
+    validateOpenAccountV1(collateral, debt) {
+        if (collateral < this.minAmount)
             throw new errors_1.OpenAccountError("amountLessMin", this.minAmount);
-        if (collateral.gt(this.maxAmount))
+        if (collateral > this.maxAmount)
             throw new errors_1.OpenAccountError("amountGreaterMax", this.maxAmount);
-        var leverage = debt.mul(constants_1.LEVERAGE_DECIMALS).div(collateral).toNumber();
+        const leverage = Number((debt * constants_1.LEVERAGE_DECIMALS) / collateral);
         if (!leverage || leverage < 0)
-            throw new errors_1.OpenAccountError("wrongLeverage", ethers_1.BigNumber.from(0));
+            throw new errors_1.OpenAccountError("wrongLeverage", 0n);
         if (leverage > this.maxLeverageFactor)
-            throw new errors_1.OpenAccountError("leverageGreaterMax", ethers_1.BigNumber.from(this.maxLeverageFactor));
-        if (debt.gt(this.availableLiquidity))
-            throw new errors_1.OpenAccountError("insufficientPoolLiquidity", ethers_1.BigNumber.from(this.availableLiquidity));
+            throw new errors_1.OpenAccountError("leverageGreaterMax", (0, formatter_1.toBigInt)(this.maxLeverageFactor || 0));
+        if (debt > this.availableLiquidity)
+            throw new errors_1.OpenAccountError("insufficientPoolLiquidity", (0, formatter_1.toBigInt)(this.availableLiquidity || 0));
         return true;
-    };
-    CreditManagerData.prototype.validateOpenAccountV2 = function (debt) {
-        if (debt.lt(this.minAmount))
+    }
+    validateOpenAccountV2(debt) {
+        if (debt < this.minAmount)
             throw new errors_1.OpenAccountError("amountLessMin", this.minAmount);
-        if (debt.gt(this.maxAmount))
+        if (debt > this.maxAmount)
             throw new errors_1.OpenAccountError("amountGreaterMax", this.maxAmount);
-        if (debt.gt(this.availableLiquidity))
-            throw new errors_1.OpenAccountError("insufficientPoolLiquidity", ethers_1.BigNumber.from(this.availableLiquidity));
+        if (debt > this.availableLiquidity)
+            throw new errors_1.OpenAccountError("insufficientPoolLiquidity", this.availableLiquidity);
         return true;
-    };
-    Object.defineProperty(CreditManagerData.prototype, "id", {
-        get: function () {
-            return this.address;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return CreditManagerData;
-}());
+    }
+    get id() {
+        return this.address;
+    }
+}
 exports.CreditManagerData = CreditManagerData;
-var ChartsCreditManagerData = /** @class */ (function () {
-    function ChartsCreditManagerData(payload) {
+class ChartsCreditManagerData {
+    id;
+    address;
+    underlyingToken;
+    pool;
+    isWETH;
+    borrowRate;
+    borrowRateOld;
+    borrowRateChange;
+    minAmount;
+    maxAmount;
+    maxLeverageFactor; // for V1 only
+    availableLiquidity;
+    version;
+    feeInterest;
+    feeLiquidation;
+    feeLiquidationExpired;
+    openedAccountsCount;
+    totalOpenedAccounts;
+    totalClosedAccounts;
+    totalRepaidAccounts;
+    totalLiquidatedAccounts;
+    totalBorrowed;
+    totalBorrowedOld;
+    totalBorrowedChange;
+    totalRepaid;
+    totalProfit;
+    totalProfitOld;
+    pnlChange;
+    totalLosses;
+    totalLossesOld;
+    totalBorrowedInUSD;
+    totalLossesInUSD;
+    totalProfitInUSD;
+    totalRepaidInUSD;
+    availableLiquidityInUSD;
+    openedAccountsCountChange;
+    totalOpenedAccountsChange;
+    totalClosedAccountsChange;
+    totalLiquidatedAccountsChange;
+    liquidationThresholds;
+    constructor(payload) {
         this.id = (payload.addr || "").toLowerCase();
         this.address = (payload.addr || "").toLowerCase();
         this.underlyingToken = (payload.underlyingToken || "").toLowerCase();
         this.pool = (payload.poolAddress || "").toLowerCase();
         this.version = payload.version || 2;
         this.isWETH = payload.isWeth || false;
-        this.borrowRate = ethers_1.BigNumber.from(payload.borrowRate || 0)
-            .mul(payload.feeInterest + constants_1.PERCENTAGE_FACTOR)
-            .mul(constants_1.PERCENTAGE_DECIMALS)
-            .div(constants_1.RAY)
-            .toNumber();
-        this.borrowRateOld = ethers_1.BigNumber.from(payload.borrowRateOld || 0)
-            .mul(payload.feeInterest + constants_1.PERCENTAGE_FACTOR)
-            .mul(constants_1.PERCENTAGE_DECIMALS)
-            .div(constants_1.RAY)
-            .toNumber();
-        this.borrowRateChange =
-            (payload.borrowRate10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
-        this.maxLeverageFactor = ethers_1.BigNumber.from(payload.maxLeverageFactor || 0).toNumber();
+        this.borrowRate = Number(((0, formatter_1.toBigInt)(payload.borrowRate || 0) *
+            ((0, formatter_1.toBigInt)(payload.feeInterest || 0) + constants_1.PERCENTAGE_FACTOR) *
+            constants_1.PERCENTAGE_DECIMALS) /
+            constants_1.RAY);
+        this.borrowRateOld = Number(((0, formatter_1.toBigInt)(payload.borrowRateOld || 0) *
+            ((0, formatter_1.toBigInt)(payload.feeInterest || 0) + constants_1.PERCENTAGE_FACTOR) *
+            constants_1.PERCENTAGE_DECIMALS) /
+            constants_1.RAY);
+        this.borrowRateChange = Number((0, formatter_1.toBigInt)(payload.borrowRate10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS);
+        this.maxLeverageFactor = payload.maxLeverageFactor || 0;
         this.feeInterest = payload.feeInterest || 0;
         this.feeLiquidation = payload.feeLiquidation || 0;
         this.feeLiquidationExpired = payload.feeLiquidationExpired || 0;
-        this.minAmount = ethers_1.BigNumber.from(payload.minAmount || 0);
-        this.maxAmount = ethers_1.BigNumber.from(payload.maxAmount || 0);
-        this.availableLiquidity = ethers_1.BigNumber.from(payload.availableLiquidity || 0);
+        this.minAmount = (0, formatter_1.toBigInt)(payload.minAmount || 0);
+        this.maxAmount = (0, formatter_1.toBigInt)(payload.maxAmount || 0);
+        this.availableLiquidity = (0, formatter_1.toBigInt)(payload.availableLiquidity || 0);
         this.availableLiquidityInUSD = payload.availableLiquidityInUSD || 0;
-        this.liquidationThresholds = Object.fromEntries(Object.entries(payload.liquidityThresholds || {}).map(function (_a) {
-            var t = _a[0], tr = _a[1];
-            return [
-                t.toLowerCase(),
-                ethers_1.BigNumber.from(tr),
-            ];
-        }));
-        this.totalBorrowed = ethers_1.BigNumber.from(payload.totalBorrowed || 0);
-        this.totalBorrowedOld = ethers_1.BigNumber.from(payload.totalBorrowedBIOld || 0);
+        this.liquidationThresholds = Object.fromEntries(Object.entries(payload.liquidityThresholds || {}).map(([t, tr]) => [
+            t.toLowerCase(),
+            BigInt(tr),
+        ]));
+        this.totalBorrowed = (0, formatter_1.toBigInt)(payload.totalBorrowed || 0);
+        this.totalBorrowedOld = (0, formatter_1.toBigInt)(payload.totalBorrowedBIOld || 0);
         this.totalBorrowedInUSD = payload.totalBorrowedInUSD || 0;
-        this.totalBorrowedChange =
-            (payload.totalBorrowedBI10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
-        this.totalLosses = ethers_1.BigNumber.from(payload.totalLosses || 0);
-        this.totalLossesOld = ethers_1.BigNumber.from(payload.totalLossesOld || 0);
+        this.totalBorrowedChange = Number((0, formatter_1.toBigInt)(payload.totalBorrowedBI10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS);
+        this.totalLosses = (0, formatter_1.toBigInt)(payload.totalLosses || 0);
+        this.totalLossesOld = (0, formatter_1.toBigInt)(payload.totalLossesOld || 0);
         this.totalLossesInUSD = payload.totalLossesInUSD || 0;
-        this.totalRepaid = ethers_1.BigNumber.from(payload.totalRepaid || 0);
+        this.totalRepaid = (0, formatter_1.toBigInt)(payload.totalRepaid || 0);
         this.totalRepaidInUSD = payload.totalRepaidInUSD || 0;
-        this.totalProfit = ethers_1.BigNumber.from(payload.totalProfit || 0);
-        this.totalProfitOld = ethers_1.BigNumber.from(payload.totalProfitOld || 0);
+        this.totalProfit = (0, formatter_1.toBigInt)(payload.totalProfit || 0);
+        this.totalProfitOld = (0, formatter_1.toBigInt)(payload.totalProfitOld || 0);
         this.totalProfitInUSD = payload.totalProfitInUSD || 0;
-        this.pnlChange = (payload.pnl10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS;
+        this.pnlChange = Number((0, formatter_1.toBigInt)(payload.pnl10kBasis || 0) * constants_1.PERCENTAGE_DECIMALS);
         this.openedAccountsCount = payload.openedAccountsCount || 0;
         this.openedAccountsCountChange = payload.openedAccountsCountChange || 0;
         this.totalOpenedAccounts = payload.totalOpenedAccounts || 0;
@@ -199,28 +240,23 @@ var ChartsCreditManagerData = /** @class */ (function () {
         this.totalLiquidatedAccountsChange =
             payload.totalLiquidatedAccountsChange || 0;
     }
-    return ChartsCreditManagerData;
-}());
+}
 exports.ChartsCreditManagerData = ChartsCreditManagerData;
-function calcHealthFactor(_a) {
-    var assets = _a.assets, prices = _a.prices, liquidationThresholds = _a.liquidationThresholds, underlyingToken = _a.underlyingToken, borrowed = _a.borrowed;
-    var assetLTMoney = assets.reduce(function (acc, _a) {
-        var tokenAddress = _a.token, amount = _a.balance;
-        var tokenSymbol = token_1.tokenSymbolByAddress[tokenAddress.toLowerCase()];
-        var tokenDecimals = decimals_1.decimals[tokenSymbol];
-        var lt = liquidationThresholds[tokenAddress.toLowerCase()] || ethers_1.BigNumber.from(0);
-        var price = prices[tokenAddress.toLowerCase()] || ethers_1.BigNumber.from(0);
-        var money = (0, price_1.calcTotalPrice)(price, amount, tokenDecimals);
-        var ltMoney = money.mul(lt);
-        return acc.add(ltMoney);
-    }, ethers_1.BigNumber.from(0));
-    var underlyingSymbol = token_1.tokenSymbolByAddress[underlyingToken.toLowerCase()];
-    var underlyingDecimals = decimals_1.decimals[underlyingSymbol];
-    var underlyingPrice = prices[underlyingToken.toLowerCase()] || constants_1.PRICE_DECIMALS;
-    var borrowedMoney = (0, price_1.calcTotalPrice)(underlyingPrice, borrowed, underlyingDecimals);
-    var hfInPercent = borrowedMoney.gt(0)
-        ? assetLTMoney.div(borrowedMoney)
-        : ethers_1.BigNumber.from(0);
-    return hfInPercent.toNumber();
+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/creditManager.spec.js

@@ -1,25 +1,23 @@
 "use strict";
-var _a, _b;
 Object.defineProperty(exports, "__esModule", { value: true });
-var chai_1 = require("chai");
-var ethers_1 = require("ethers");
-var decimals_1 = require("../tokens/decimals");
-var token_1 = require("../tokens/token");
-var formatter_1 = require("../utils/formatter");
-var price_1 = require("../utils/price");
-var assets_1 = require("./assets");
-var constants_1 = require("./constants");
-var creditManager_1 = require("./creditManager");
-var liquidationThresholds = (_a = {},
-    _a[token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()] = ethers_1.BigNumber.from("9300"),
-    _a[token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()] = ethers_1.BigNumber.from("8500"),
-    _a);
-var prices = (_b = {},
-    _b[token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()] = (0, formatter_1.toBN)("1738.11830000", constants_1.PRICE_DECIMALS_POW),
-    _b[token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase()] = (0, formatter_1.toBN)("0.99941103", constants_1.PRICE_DECIMALS_POW),
-    _b[token_1.tokenDataByNetwork.Mainnet.STETH.toLowerCase()] = (0, formatter_1.toBN)("1703.87588096", constants_1.PRICE_DECIMALS_POW),
-    _b);
-var defaultCA = {
+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),
@@ -35,96 +33,96 @@ var defaultCA = {
     underlyingToken: token_1.tokenDataByNetwork.Mainnet.DAI.toLowerCase(),
     underlyingDecimals: decimals_1.decimals.DAI,
 };
-describe("CreditManager calcHealthFactor test", function () {
-    it("health factor calculation is calculated correctly", function () {
-        var result = (0, creditManager_1.calcHealthFactor)({
+describe("CreditManager calcHealthFactor test", () => {
+    it("health factor calculation is calculated correctly", () => {
+        const result = (0, creditManager_1.calcHealthFactor)({
             assets: defaultCA.assets,
-            prices: prices,
-            liquidationThresholds: liquidationThresholds,
+            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", function () {
-        var result = (0, creditManager_1.calcHealthFactor)({
+    it("health factor calculation has no division by zero error", () => {
+        const result = (0, creditManager_1.calcHealthFactor)({
             assets: [],
             prices: {},
             liquidationThresholds: {},
             underlyingToken: "",
-            borrowed: ethers_1.BigNumber.from(0),
+            borrowed: 0n,
         });
         (0, chai_1.expect)(result).to.be.eq(0);
     });
-    it("health factor after add collateral is calculated  correctly", function () {
-        var collateral = {
+    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(),
         };
-        var afterAdd = assets_1.AssetUtils.sumAssets(defaultCA.assets, [collateral]);
-        var result = (0, creditManager_1.calcHealthFactor)({
+        const afterAdd = assets_1.AssetUtils.sumAssets(defaultCA.assets, [collateral]);
+        const result = (0, creditManager_1.calcHealthFactor)({
             assets: afterAdd,
-            prices: prices,
-            liquidationThresholds: liquidationThresholds,
+            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", function () {
-        var amountDecrease = (0, formatter_1.toBN)("10000", defaultCA.underlyingDecimals);
-        var debtDecrease = {
+    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,
         };
-        var afterDecrease = assets_1.AssetUtils.subAssets(defaultCA.assets, [
+        const afterDecrease = assets_1.AssetUtils.subAssets(defaultCA.assets, [
             debtDecrease,
         ]);
-        var result = (0, creditManager_1.calcHealthFactor)({
+        const result = (0, creditManager_1.calcHealthFactor)({
             assets: afterDecrease,
-            prices: prices,
-            liquidationThresholds: liquidationThresholds,
+            prices,
+            liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt.sub(amountDecrease),
+            borrowed: defaultCA.debt - amountDecrease,
         });
         (0, chai_1.expect)(result).to.be.eq(10308);
     });
-    it("health factor after increase debt is calculated  correctly", function () {
-        var amountIncrease = (0, formatter_1.toBN)("20000", defaultCA.underlyingDecimals);
-        var debtIncrease = {
+    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,
         };
-        var afterIncrease = assets_1.AssetUtils.sumAssets(defaultCA.assets, [
+        const afterIncrease = assets_1.AssetUtils.sumAssets(defaultCA.assets, [
             debtIncrease,
         ]);
-        var result = (0, creditManager_1.calcHealthFactor)({
+        const result = (0, creditManager_1.calcHealthFactor)({
             assets: afterIncrease,
-            prices: prices,
-            liquidationThresholds: liquidationThresholds,
+            prices,
+            liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
-            borrowed: defaultCA.debt.add(amountIncrease),
+            borrowed: defaultCA.debt + amountIncrease,
         });
         (0, chai_1.expect)(result).to.be.eq(10137);
     });
-    it("health factor after swap is calculated  correctly", function () {
-        var swapAsset = {
+    it("health factor after swap is calculated  correctly", () => {
+        const swapAsset = {
             balance: defaultCA.debt,
             token: defaultCA.underlyingToken,
         };
-        var underlyingPrice = prices[defaultCA.underlyingToken];
-        var wethPrice = prices[token_1.tokenDataByNetwork.Mainnet.WETH.toLowerCase()];
-        var getAmount = (0, price_1.convertByPrice)((0, price_1.calcTotalPrice)(underlyingPrice, defaultCA.debt, defaultCA.underlyingDecimals), { price: wethPrice, decimals: decimals_1.decimals.WETH });
-        var getAsset = {
+        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(),
         };
-        var afterSub = assets_1.AssetUtils.subAssets(defaultCA.assets, [swapAsset]);
-        var afterSwap = assets_1.AssetUtils.sumAssets(afterSub, [getAsset]);
-        var result = (0, creditManager_1.calcHealthFactor)({
+        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: prices,
-            liquidationThresholds: liquidationThresholds,
+            prices,
+            liquidationThresholds,
             underlyingToken: defaultCA.underlyingToken,
             borrowed: defaultCA.debt,
         });

package/lib/core/creditSession.d.ts

@@ -1,4 +1,3 @@
-import { BigNumber } from "ethers";
 import { CreditSessionFilteredPayload, CreditSessionPayload, CreditSessionsAggregatedStatsPayload, UserCreditSessionsAggregatedStatsPayload } from "../payload/creditSession";
 import { AssetWithView } from "./assets";
 export type CreditSessionStatus = "active" | "closed" | "repaid" | "liquidated" | "liquidateExpired" | "liquidatePaused";
@@ -16,9 +15,9 @@ export declare class CreditSession {
     readonly sinceDate: string;
     readonly closedAt: number;
     readonly closedAtDate: string;
-    readonly initialAmount: BigNumber;
-    readonly borrowedAmount: BigNumber;
-    readonly totalValue: BigNumber;
+    readonly initialAmount: bigint;
+    readonly borrowedAmount: bigint;
+    readonly totalValue: bigint;
     readonly healthFactor: number;
     readonly profitInUSD: number;
     readonly profitInUnderlying: number;
@@ -32,16 +31,16 @@ export declare class CreditSession {
     readonly closePrice: number;
     readonly quoteToken: string;
     readonly tradingToken: string;
-    readonly borrowAPY_RAY: BigNumber;
+    readonly borrowAPY_RAY: bigint;
     readonly borrowAPY7DAverage: number;
     readonly totalValueUSD: number;
-    readonly debt: BigNumber;
+    readonly debt: bigint;
     readonly debtUSD: number;
     readonly leverage: number;
     readonly tfIndex: number;
-    readonly spotDebt: BigNumber;
-    readonly spotTotalValue: BigNumber;
-    readonly spotUserFunds: BigNumber;
+    readonly spotDebt: bigint;
+    readonly spotTotalValue: bigint;
+    readonly spotUserFunds: bigint;
     readonly cvxUnclaimedRewards: Array<AssetWithView>;
     readonly balances: Array<AssetWithView>;
     constructor(payload: CreditSessionPayload);
@@ -59,9 +58,9 @@ export declare class CreditSessionFiltered {
     readonly closedAtDate: string;
     readonly healthFactor: number;
     readonly leverage: number;
-    readonly debt: BigNumber;
+    readonly debt: bigint;
     readonly debtUSD: number;
-    readonly totalValue: BigNumber;
+    readonly totalValue: bigint;
     readonly totalValueUSD: number;
     readonly profitInUSD: number;
     readonly profitInUnderlying: number;
@@ -81,8 +80,8 @@ export type CreditSessionsAggregatedStats = Omit<CreditSessionsAggregatedStatsPa
     leverageChange: number;
     activeAccountsChange: number;
     openedAccountsChange: number;
-    healthFactor: BigNumber;
-    healthFactorOld: BigNumber;
+    healthFactor: bigint;
+    healthFactorOld: bigint;
 };
 export declare class UserCreditSessionsBuilder {
     static buildUserCreditSessions(payload: UserCreditSessionsAggregatedStatsPayload): UserCreditSessions;