@gearbox-protocol/sdk 1.22.4 → 1.23.1

package/lib/core/chains.js

@@ -1,46 +1,9 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.detectNetwork = exports.isSupportedNetwork = exports.getNetworkType = exports.CHAINS = exports.ARBITRUM_NETWORK = exports.HARDHAT_NETWORK = exports.TENDERLY_NETWORK = exports.LOCAL_NETWORK = exports.POLYGON_NETWORK = exports.OPTIMISM_NETWORK = exports.GOERLI_NETWORK = exports.MAINNET_NETWORK = void 0;
-var token_1 = require("../tokens/token");
-var types_1 = require("../types");
-var constants_1 = require("./constants");
+const token_1 = require("../tokens/token");
+const types_1 = require("../types");
+const constants_1 = require("./constants");
 exports.MAINNET_NETWORK = 1;
 exports.GOERLI_NETWORK = 5;
 exports.OPTIMISM_NETWORK = 10;
@@ -59,15 +22,16 @@ exports.CHAINS = {
     Polygon: exports.POLYGON_NETWORK,
     Arbiturum: exports.ARBITRUM_NETWORK,
 };
-var SUPPORTED_CHAINS = (_a = {},
-    _a[exports.CHAINS.Mainnet] = "Mainnet",
-    _a[exports.CHAINS.Goerli] = "Goerli",
-    _a[exports.CHAINS.Local] = "Mainnet",
-    _a[exports.CHAINS.Tenderly] = "Mainnet",
-    _a);
-var getNetworkType = function (chainId, localAs) {
-    if (localAs === void 0) { localAs = "Mainnet"; }
-    var chainType = SUPPORTED_CHAINS[chainId];
+const SUPPORTED_CHAINS = {
+    [exports.CHAINS.Mainnet]: "Mainnet",
+    [exports.CHAINS.Goerli]: "Goerli",
+    [exports.CHAINS.Local]: "Mainnet",
+    [exports.CHAINS.Tenderly]: "Mainnet",
+    // [CHAINS.Optimism]: "Optimism",
+    // [CHAINS.Polygon]: "Polygon",
+};
+const getNetworkType = (chainId, localAs = "Mainnet") => {
+    const chainType = SUPPORTED_CHAINS[chainId];
     if (chainId === exports.CHAINS.Local) {
         return localAs;
     }
@@ -77,37 +41,23 @@ var getNetworkType = function (chainId, localAs) {
     throw new Error("Unsupported network");
 };
 exports.getNetworkType = getNetworkType;
-var isSupportedNetwork = function (chainId) { return chainId !== undefined && !!SUPPORTED_CHAINS[chainId]; };
+const isSupportedNetwork = (chainId) => chainId !== undefined && !!SUPPORTED_CHAINS[chainId];
 exports.isSupportedNetwork = isSupportedNetwork;
-function detectNetwork(provider) {
-    return __awaiter(this, void 0, void 0, function () {
-        var usdcMainnet, _a, usdcMainnet, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    _c.trys.push([0, 2, , 7]);
-                    usdcMainnet = types_1.IERC20__factory.connect(token_1.tokenDataByNetwork.Mainnet.USDC, provider);
-                    return [4 /*yield*/, usdcMainnet.balanceOf(constants_1.ADDRESS_0X0)];
-                case 1:
-                    _c.sent();
-                    return [2 /*return*/, "Mainnet"];
-                case 2:
-                    _a = _c.sent();
-                    _c.label = 3;
-                case 3:
-                    _c.trys.push([3, 5, , 6]);
-                    usdcMainnet = types_1.IERC20__factory.connect(token_1.tokenDataByNetwork.Goerli.USDC, provider);
-                    return [4 /*yield*/, usdcMainnet.balanceOf(constants_1.ADDRESS_0X0)];
-                case 4:
-                    _c.sent();
-                    return [2 /*return*/, "Goerli"];
-                case 5:
-                    _b = _c.sent();
-                    throw new Error("Unsupported network");
-                case 6: return [3 /*break*/, 7];
-                case 7: return [2 /*return*/];
-            }
-        });
-    });
+async function detectNetwork(provider) {
+    try {
+        const usdcMainnet = types_1.IERC20__factory.connect(token_1.tokenDataByNetwork.Mainnet.USDC, provider);
+        await usdcMainnet.balanceOf(constants_1.ADDRESS_0X0);
+        return "Mainnet";
+    }
+    catch {
+        try {
+            const usdcMainnet = types_1.IERC20__factory.connect(token_1.tokenDataByNetwork.Goerli.USDC, provider);
+            await usdcMainnet.balanceOf(constants_1.ADDRESS_0X0);
+            return "Goerli";
+        }
+        catch {
+            throw new Error("Unsupported network");
+        }
+    }
 }
 exports.detectNetwork = detectNetwork;

package/lib/core/constants.d.ts

@@ -1,19 +1,18 @@
-import { BigNumber } from "ethers";
-export declare const MAX_INT: BigNumber;
+export declare const MAX_INT: bigint;
 export declare const RAY_DECIMALS_POW = 27;
-export declare const RAY: BigNumber;
-export declare const halfRAY: BigNumber;
+export declare const RAY: bigint;
+export declare const halfRAY: bigint;
 export declare const WAD_DECIMALS_POW = 18;
-export declare const WAD: BigNumber;
+export declare const WAD: bigint;
 export declare const PRICE_DECIMALS_POW = 8;
-export declare const PRICE_DECIMALS: BigNumber;
+export declare const PRICE_DECIMALS: bigint;
 export declare const SECONDS_PER_YEAR: number;
 export declare const MS_PER_YEAR: number;
-export declare const PERCENTAGE_DECIMALS = 100;
-export declare const PERCENTAGE_FACTOR = 10000;
+export declare const PERCENTAGE_DECIMALS = 100n;
+export declare const PERCENTAGE_FACTOR = 10000n;
 export declare const timeRanges: Record<string, number>;
-export declare const LEVERAGE_DECIMALS = 100;
-export declare const SLIPPAGE_DECIMALS = 100;
+export declare const LEVERAGE_DECIMALS = 100n;
+export declare const SLIPPAGE_DECIMALS = 100n;
 export declare const ADDRESS_0X0 = "0x0000000000000000000000000000000000000000";
 export declare const DUMB_ADDRESS = "0xC4375B7De8af5a38a93548eb8453a498222C4fF2";
 export declare const DUMB_ADDRESS2 = "0x93548eB8453a498222C4FF2C4375b7De8af5A38a";

package/lib/core/constants.js

@@ -1,21 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DUMB_ADDRESS4 = exports.DUMB_ADDRESS3 = exports.DUMB_ADDRESS2 = exports.DUMB_ADDRESS = exports.ADDRESS_0X0 = exports.SLIPPAGE_DECIMALS = exports.LEVERAGE_DECIMALS = exports.timeRanges = exports.PERCENTAGE_FACTOR = exports.PERCENTAGE_DECIMALS = exports.MS_PER_YEAR = exports.SECONDS_PER_YEAR = exports.PRICE_DECIMALS = exports.PRICE_DECIMALS_POW = exports.WAD = exports.WAD_DECIMALS_POW = exports.halfRAY = exports.RAY = exports.RAY_DECIMALS_POW = exports.MAX_INT = void 0;
-var ethers_1 = require("ethers");
-exports.MAX_INT = ethers_1.BigNumber.from("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
+exports.MAX_INT = BigInt("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 exports.RAY_DECIMALS_POW = 27;
-exports.RAY = ethers_1.BigNumber.from(10).pow(exports.RAY_DECIMALS_POW);
-exports.halfRAY = exports.RAY.div(2);
+exports.RAY = 10n ** BigInt(exports.RAY_DECIMALS_POW);
+exports.halfRAY = exports.RAY / 2n;
 exports.WAD_DECIMALS_POW = 18;
-exports.WAD = ethers_1.BigNumber.from(10).pow(exports.WAD_DECIMALS_POW);
+exports.WAD = 10n ** BigInt(exports.WAD_DECIMALS_POW);
 exports.PRICE_DECIMALS_POW = 8;
-exports.PRICE_DECIMALS = ethers_1.BigNumber.from(10).pow(exports.PRICE_DECIMALS_POW);
+exports.PRICE_DECIMALS = 10n ** BigInt(exports.PRICE_DECIMALS_POW);
 exports.SECONDS_PER_YEAR = 365 * 24 * 3600;
 exports.MS_PER_YEAR = exports.SECONDS_PER_YEAR * 1000;
-exports.PERCENTAGE_DECIMALS = 100;
-exports.PERCENTAGE_FACTOR = 1e4;
-// export const LIQUIDATION_DISCOUNTED_SUM = 9600;
-// export const UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = 9400;
+exports.PERCENTAGE_DECIMALS = 100n;
+exports.PERCENTAGE_FACTOR = 10000n;
 exports.timeRanges = {
     // "1H": 3600,
     "1D": 3600 * 24,
@@ -23,8 +20,8 @@ exports.timeRanges = {
     "1M": 3600 * 24 * 30,
     "1Y": 3600 * 24 * 365,
 };
-exports.LEVERAGE_DECIMALS = 100;
-exports.SLIPPAGE_DECIMALS = 100;
+exports.LEVERAGE_DECIMALS = 100n;
+exports.SLIPPAGE_DECIMALS = 100n;
 exports.ADDRESS_0X0 = "0x0000000000000000000000000000000000000000";
 // Used in tests
 exports.DUMB_ADDRESS = "0xC4375B7De8af5a38a93548eb8453a498222C4fF2";

package/lib/core/creditAccount.d.ts

@@ -1,4 +1,3 @@
-import { BigNumber } from "ethers";
 import { LpTokensAPY } from "../apy";
 import { CreditAccountDataPayload } from "../payload/creditAccount";
 import { TokenData } from "../tokens/tokenData";
@@ -12,41 +11,42 @@ export declare class CreditAccountData {
     readonly creditManager: string;
     readonly underlyingToken: string;
     readonly since: number;
-    readonly cumulativeIndexAtOpen: BigNumber;
-    readonly borrowedAmount: BigNumber;
-    readonly borrowedAmountPlusInterestAndFees: BigNumber;
-    borrowedAmountPlusInterest: BigNumber;
-    totalValue: BigNumber;
+    readonly cumulativeIndexAtOpen: bigint;
+    readonly borrowedAmount: bigint;
+    readonly borrowedAmountPlusInterestAndFees: bigint;
+    borrowedAmountPlusInterest: bigint;
+    totalValue: bigint;
     healthFactor: number;
     borrowRate: number;
     readonly collateralTokens: Array<string>;
     readonly allTokens: Array<string>;
-    balances: Record<string, BigNumber>;
-    allBalances: Record<string, BigNumber>;
+    balances: Record<string, bigint>;
+    allBalances: Record<string, bigint>;
     isDeleting: boolean;
-    enabledTokenMask: BigNumber;
+    enabledTokenMask: bigint;
     readonly version: number;
-    readonly repayAmount: BigNumber;
-    readonly liquidationAmount: BigNumber;
+    readonly repayAmount: bigint;
+    readonly liquidationAmount: bigint;
     readonly canBeClosed: boolean;
     constructor(payload: CreditAccountDataPayload);
-    balancesSorted(prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<Asset>;
-    calcBorrowAmountPlusInterestRate(currentCumulativeIndex: BigNumber): BigNumber;
-    updateHealthFactor(creditManager: CreditManagerData, currentCumulativeIndex: BigNumber, priceOracle: PriceOracleData): void;
-    static calcMaxIncreaseBorrow(healthFactor: number, borrowAmountPlusInterest: BigNumber, maxLeverageFactor: number, underlyingLT: number, minHf?: number): BigNumber;
+    balancesSorted(prices: Record<string, bigint>, tokens: Record<string, TokenData>): Array<Asset>;
+    calcBorrowAmountPlusInterestRate(currentCumulativeIndex: bigint): bigint;
+    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;
     hash(): string;
     static hash(creditManager: string, borrower: string): string;
 }
-export declare function sortBalances(balances: Record<string, BigNumber>, prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<[string, BigNumber]>;
+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: BigNumber, t2: BigNumber): 1 | -1;
+export declare function amountAbcComparator(t1: bigint, t2: bigint): 1 | -1;
 export interface CalcOverallAPYProps {
     caAssets: Array<Asset>;
     lpAPY: LpTokensAPY | undefined;
-    prices: Record<string, BigNumber>;
-    totalValue: BigNumber | undefined;
-    debt: BigNumber | undefined;
+    prices: Record<string, bigint>;
+    totalValue: bigint | undefined;
+    debt: bigint | undefined;
     borrowRate: number;
     underlyingToken: string;
 }

package/lib/core/creditAccount.js

@@ -1,124 +1,121 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calcOverallAPY = exports.amountAbcComparator = exports.tokensAbcComparator = exports.sortBalances = exports.CreditAccountData = void 0;
-var ethers_1 = require("ethers");
-var apy_1 = require("../apy");
-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 constants_1 = require("./constants");
-var CreditAccountData = /** @class */ (function () {
-    function CreditAccountData(payload) {
-        var _this = this;
-        this.collateralTokens = [];
-        this.allTokens = [];
-        this.balances = {};
-        this.allBalances = {};
-        this.version = 1;
+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;
+    underlyingToken;
+    since;
+    cumulativeIndexAtOpen;
+    borrowedAmount;
+    borrowedAmountPlusInterestAndFees;
+    borrowedAmountPlusInterest;
+    totalValue;
+    healthFactor;
+    borrowRate;
+    collateralTokens = [];
+    allTokens = [];
+    balances = {};
+    allBalances = {};
+    isDeleting;
+    enabledTokenMask;
+    version = 1;
+    /// V1 Artifacts
+    repayAmount;
+    liquidationAmount;
+    canBeClosed;
+    constructor(payload) {
         this.addr = payload.addr.toLowerCase();
         this.borrower = payload.borrower.toLowerCase();
         this.inUse = payload.inUse;
         this.creditManager = payload.creditManager.toLowerCase();
         this.underlyingToken = payload.underlying.toLowerCase();
-        this.since = ethers_1.BigNumber.from(payload.since).toNumber();
-        this.cumulativeIndexAtOpen = payload.cumulativeIndexAtOpen;
-        this.borrowedAmount = payload.borrowedAmount;
-        this.borrowedAmountPlusInterest = payload.borrowedAmountPlusInterest;
-        this.borrowedAmountPlusInterestAndFees =
-            payload.borrowedAmountPlusInterestAndFees;
-        this.totalValue = payload.totalValue;
+        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 = payload.borrowRate
-            .mul(constants_1.PERCENTAGE_FACTOR)
-            .mul(constants_1.PERCENTAGE_DECIMALS)
-            .div(constants_1.RAY)
-            .toNumber();
-        payload.balances.forEach(function (b) {
-            var tokenLC = b.token.toLowerCase();
+        this.borrowRate = Number(((0, formatter_1.toBigInt)(payload.borrowRate || 0) *
+            constants_1.PERCENTAGE_FACTOR *
+            constants_1.PERCENTAGE_DECIMALS) /
+            constants_1.RAY);
+        payload.balances.forEach(b => {
+            const tokenLC = b.token.toLowerCase();
             if (b.isAllowed) {
-                _this.balances[tokenLC] = b.balance;
-                _this.collateralTokens.push(tokenLC);
+                this.balances[tokenLC] = (0, formatter_1.toBigInt)(b.balance || 0);
+                this.collateralTokens.push(tokenLC);
             }
-            _this.allBalances[tokenLC] = b.balance;
-            _this.allTokens.push(tokenLC);
+            this.allBalances[tokenLC] = (0, formatter_1.toBigInt)(b.balance || 0);
+            this.allTokens.push(tokenLC);
         });
-        this.enabledTokenMask = payload.enabledTokenMask;
+        this.enabledTokenMask = (0, formatter_1.toBigInt)(payload.enabledTokenMask || 0);
         this.isDeleting = false;
         this.version = payload.version;
-        this.repayAmount = payload.repayAmount;
-        this.liquidationAmount = payload.liquidationAmount;
+        this.repayAmount = (0, formatter_1.toBigInt)(payload.repayAmount || 0);
+        this.liquidationAmount = (0, formatter_1.toBigInt)(payload.liquidationAmount || 0);
         this.canBeClosed = payload.canBeClosed;
     }
-    CreditAccountData.prototype.balancesSorted = function (prices, tokens) {
-        return sortBalances(this.balances, prices, tokens).map(function (_a) {
-            var token = _a[0], balance = _a[1];
-            return ({ token: token, balance: balance });
-        });
-    };
-    CreditAccountData.prototype.calcBorrowAmountPlusInterestRate = function (currentCumulativeIndex) {
-        return this.borrowedAmount
-            .mul(currentCumulativeIndex)
-            .div(this.cumulativeIndexAtOpen);
-    };
-    CreditAccountData.prototype.updateHealthFactor = function (creditManager, currentCumulativeIndex, priceOracle) {
-        var _this = this;
-        var twvUSDValue = this.collateralTokens
-            .filter(function (_, num) {
-            return !ethers_1.BigNumber.from(2).pow(num).and(_this.enabledTokenMask).isZero();
-        })
-            .map(function (token) {
-            return priceOracle
-                .convertToUSD(_this.balances[token], token)
-                .mul(creditManager.liquidationThresholds[token]);
-        })
-            .reduce(function (a, b) { return a.add(b); });
-        this.healthFactor = priceOracle
-            .convertFromUSD(twvUSDValue, this.underlyingToken)
-            .div(this.calcBorrowAmountPlusInterestRate(currentCumulativeIndex))
-            .toNumber();
-    };
-    CreditAccountData.calcMaxIncreaseBorrow = function (healthFactor, borrowAmountPlusInterest, maxLeverageFactor, underlyingLT, minHf) {
-        if (minHf === void 0) { minHf = constants_1.PERCENTAGE_FACTOR; }
-        var minHealthFactor = maxLeverageFactor > 0
-            ? Math.floor((underlyingLT * (maxLeverageFactor + constants_1.LEVERAGE_DECIMALS)) /
+    balancesSorted(prices, tokens) {
+        return sortBalances(this.balances, prices, tokens).map(([token, balance]) => ({ token, balance }));
+    }
+    calcBorrowAmountPlusInterestRate(currentCumulativeIndex) {
+        return ((this.borrowedAmount * currentCumulativeIndex) /
+            this.cumulativeIndexAtOpen);
+    }
+    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));
+    }
+    static isTokenEnabled(index, enabledTokenMask) {
+        return ((2n ** BigInt(index)) & enabledTokenMask) !== 0n;
+    }
+    static calcMaxIncreaseBorrow(healthFactor, borrowAmountPlusInterest, maxLeverageFactor, underlyingLT, minHf = constants_1.PERCENTAGE_FACTOR) {
+        const minHealthFactor = maxLeverageFactor > 0
+            ? Math.floor((underlyingLT * (maxLeverageFactor + Number(constants_1.LEVERAGE_DECIMALS))) /
                 maxLeverageFactor)
-            : minHf;
-        var result = borrowAmountPlusInterest
-            .mul(healthFactor - minHealthFactor)
-            .div(minHealthFactor - underlyingLT);
-        return result.isNegative() ? ethers_1.BigNumber.from(0) : result;
-    };
-    Object.defineProperty(CreditAccountData.prototype, "id", {
-        get: function () {
-            return this.creditManager;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    CreditAccountData.prototype.hash = function () {
+            : Number(minHf);
+        const result = (borrowAmountPlusInterest * BigInt(healthFactor - minHealthFactor)) /
+            BigInt(minHealthFactor - underlyingLT);
+        return result < 0 ? 0n : result;
+    }
+    get id() {
+        return this.creditManager;
+    }
+    hash() {
         return CreditAccountData.hash(this.creditManager, this.borrower);
-    };
-    CreditAccountData.hash = function (creditManager, borrower) {
-        return "".concat(creditManager.toLowerCase(), ":").concat(borrower.toLowerCase());
-    };
-    return CreditAccountData;
-}());
+    }
+    static hash(creditManager, borrower) {
+        return `${creditManager.toLowerCase()}:${borrower.toLowerCase()}`;
+    }
+}
 exports.CreditAccountData = CreditAccountData;
 function sortBalances(balances, prices, tokens) {
-    return Object.entries(balances).sort(function (_a, _b) {
-        var addr1 = _a[0], amount1 = _a[1];
-        var addr2 = _b[0], amount2 = _b[1];
-        var addr1Lc = addr1.toLowerCase();
-        var addr2Lc = addr2.toLowerCase();
-        var token1 = tokens[addr1Lc];
-        var token2 = tokens[addr2Lc];
-        var price1 = prices[addr1Lc] || constants_1.PRICE_DECIMALS;
-        var price2 = prices[addr2Lc] || constants_1.PRICE_DECIMALS;
-        var totalPrice1 = (0, price_1.calcTotalPrice)(price1, amount1, token1 === null || token1 === void 0 ? void 0 : token1.decimals);
-        var totalPrice2 = (0, price_1.calcTotalPrice)(price2, amount2, token2 === null || token2 === void 0 ? void 0 : token2.decimals);
-        if (totalPrice1.eq(totalPrice2)) {
-            return amount1.eq(amount2)
+    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);
         }
@@ -127,51 +124,43 @@ function sortBalances(balances, prices, tokens) {
 }
 exports.sortBalances = sortBalances;
 function tokensAbcComparator(t1, t2) {
-    var _a = (t1 || {}).symbol, symbol1 = _a === void 0 ? "" : _a;
-    var _b = (t2 || {}).symbol, symbol2 = _b === void 0 ? "" : _b;
+    const { symbol: symbol1 = "" } = t1 || {};
+    const { symbol: symbol2 = "" } = t2 || {};
     return symbol1 > symbol2 ? 1 : -1;
 }
 exports.tokensAbcComparator = tokensAbcComparator;
 function amountAbcComparator(t1, t2) {
-    return t1.gt(t2) ? -1 : 1;
+    return t1 > t2 ? -1 : 1;
 }
 exports.amountAbcComparator = amountAbcComparator;
-function calcOverallAPY(_a) {
-    var caAssets = _a.caAssets, lpAPY = _a.lpAPY, prices = _a.prices, totalValue = _a.totalValue, debt = _a.debt, borrowRate = _a.borrowRate, underlyingToken = _a.underlyingToken;
-    if (!lpAPY ||
-        !totalValue ||
-        totalValue.lte(0) ||
-        !debt ||
-        totalValue.lte(debt))
+function calcOverallAPY({ caAssets, lpAPY, prices, totalValue, debt, borrowRate, underlyingToken, }) {
+    if (!lpAPY || !totalValue || totalValue <= 0n || !debt || totalValue <= debt)
         return undefined;
-    var assetAPYMoney = caAssets.reduce(function (acc, _a) {
-        var tokenAddress = _a.token, amount = _a.balance;
-        var tokenAddressLC = tokenAddress.toLowerCase();
-        var symbol = token_1.tokenSymbolByAddress[tokenAddressLC];
+    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;
-        var apy = lpAPY[symbol] || 0;
-        var price = prices[tokenAddressLC] || ethers_1.BigNumber.from(0);
-        var tokenDecimals = decimals_1.decimals[symbol];
-        var money = (0, price_1.calcTotalPrice)(price, amount, tokenDecimals);
-        var apyMoney = money.mul(ethers_1.BigNumber.from(apy));
-        return acc.add(apyMoney);
-    }, ethers_1.BigNumber.from(0));
-    var underlyingTokenAddressLC = underlyingToken.toLowerCase();
-    var underlyingTokenSymbol = token_1.tokenSymbolByAddress[underlyingTokenAddressLC] || "";
-    var underlyingTokenDecimals = decimals_1.decimals[underlyingTokenSymbol] || 18;
-    var underlyingPrice = prices[underlyingTokenAddressLC] || constants_1.PRICE_DECIMALS;
-    var assetAPYAmountInUnderlying = (0, price_1.convertByPrice)(assetAPYMoney, {
+        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,
     });
-    var debtAPY = debt.mul(ethers_1.BigNumber.from(borrowRate));
-    var yourAssets = totalValue.sub(debt);
-    var apyInPercent = assetAPYAmountInUnderlying
-        .sub(debtAPY)
-        .mul(constants_1.WAD)
-        .div(yourAssets)
-        .div(constants_1.PERCENTAGE_FACTOR);
+    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;