@gearbox-protocol/sdk 0.0.101 → 0.0.104

package/.eslintignore

@@ -0,0 +1,5 @@
+node_modules
+lib
+src/types
+.eslintrc.js
+*.d.ts

package/.eslintrc.js

@@ -0,0 +1,52 @@
+module.exports = {
+  root: true,
+  parser: "@typescript-eslint/parser",
+  parserOptions: {
+    project: ["./tsconfig.json"],
+    tsconfigRootDir: __dirname
+  },
+  plugins: ["@typescript-eslint", "prettier"],
+  extends: [
+    "airbnb-base",
+    "airbnb-typescript/base",
+    "plugin:import/recommended",
+    "prettier"
+  ],
+  settings: {
+    "import/resolver": {
+      typescript: {},
+      node: {
+        extensions: [".js", ".jsx", ".ts", ".tsx"],
+        moduleDirectory: ["node_modules", "./"]
+      }
+    },
+    react: {
+      version: "detect"
+    }
+  },
+  rules: {
+    "prettier/prettier": "error",
+    "import/no-extraneous-dependencies": ["error", { devDependencies: true }],
+    "@typescript-eslint/no-use-before-define": [
+      "error",
+      {
+        functions: false,
+        classes: false
+      }
+    ],
+    "no-console": ["error", { allow: ["warn", "error", "debug"] }],
+    "@typescript-eslint/default-param-last": ["warn"],
+
+    "no-nested-ternary": ["warn"],
+    "@typescript-eslint/no-unused-vars": ["warn"],
+    "no-underscore-dangle": ["error", { allowAfterThis: true }],
+
+    "react/no-unused-prop-types": ["off"], // switch on when necessary
+    "max-classes-per-file": ["off"],
+    "react/jsx-props-no-spreading": ["off"],
+    "react/no-array-index-key": ["off"],
+    "react/require-default-props": ["off"],
+    "import/prefer-default-export": ["off"],
+    "react/jsx-no-useless-fragment": ["off"]
+  }
+};

package/.husky/pre-push

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+yarn prepush

package/lib/apy/convexAPY.js

@@ -79,21 +79,19 @@ function getConvexApy(pool, provider, networkType, getTokenPrice) {
                     basePoolAddress = contractsList[pool];
                     swapPoolAddress = contractsList[curveSwapByPool[pool]];
                     cvxAddress = tokenList.CVX;
-                    extraPoolAddresses = poolParams.extraRewards.map(function (d) {
-                        return d.poolAddress[networkType];
-                    });
+                    extraPoolAddresses = poolParams.extraRewards.map(function (d) { return d.poolAddress[networkType]; });
                     return [4 /*yield*/, getPoolData(basePoolAddress, swapPoolAddress, cvxAddress, extraPoolAddresses, provider)];
                 case 1:
                     _a = _b.sent(), basePoolRate = _a[0], basePoolSupply = _a[1], vPrice = _a[2], cvxSupply = _a[3], extra = _a.slice(4);
-                    cvxPrice = getTokenPrice(tokenList["CVX"]);
-                    crvPrice = getTokenPrice(tokenList["CRV"]);
+                    cvxPrice = getTokenPrice(tokenList.CVX);
+                    crvPrice = getTokenPrice(tokenList.CRV);
                     crvPerSecond = basePoolRate;
                     virtualSupply = basePoolSupply.mul(vPrice).div(constants_1.WAD);
                     crvPerUnderlying = crvPerSecond.mul(constants_1.WAD).div(virtualSupply);
                     crvPerYear = crvPerUnderlying.mul(constants_1.SECONDS_PER_YEAR);
                     cvxPerYear = getCVXMintAmount(crvPerYear, cvxSupply);
-                    crvAPY = crvPerYear.mul(cvxPrice).div(constants_1.WAD);
-                    cvxAPY = cvxPerYear.mul(crvPrice).div(constants_1.WAD);
+                    crvAPY = crvPerYear.mul(cvxPrice).div(constants_1.PRICE_DECIMALS);
+                    cvxAPY = cvxPerYear.mul(crvPrice).div(constants_1.PRICE_DECIMALS);
                     return [4 /*yield*/, Promise.all(extraPoolAddresses.map(function (_, index) { return __awaiter(_this, void 0, void 0, function () {
                             var extraRewardSymbol, extraPoolRate, perUnderlying, perYear, extraPrise, extraAPY;
                             return __generator(this, function (_a) {
@@ -102,7 +100,7 @@ function getConvexApy(pool, provider, networkType, getTokenPrice) {
                                 perUnderlying = extraPoolRate.mul(constants_1.WAD).div(virtualSupply);
                                 perYear = perUnderlying.mul(constants_1.SECONDS_PER_YEAR);
                                 extraPrise = getTokenPrice(tokenList[extraRewardSymbol]);
-                                extraAPY = perYear.mul(extraPrise).div(constants_1.WAD);
+                                extraAPY = perYear.mul(extraPrise).div(constants_1.PRICE_DECIMALS);
                                 return [2 /*return*/, extraAPY];
                             });
                         }); }))];
@@ -190,7 +188,7 @@ function getCurveBaseApy(curveLPToken) {
                 case 2:
                     result = _b.sent();
                     _a = (result.data.apys[poolName] || {}).baseApy, baseApy = _a === void 0 ? 0 : _a;
-                    return [2 /*return*/, (0, formatter_1.toBN)((baseApy / RESPONSE_DECIMALS).toString(), constants_1.WAD_DECIMALS)];
+                    return [2 /*return*/, (0, formatter_1.toBN)((baseApy / RESPONSE_DECIMALS).toString(), constants_1.WAD_DECIMALS_POW)];
                 case 3:
                     e_1 = _b.sent();
                     return [2 /*return*/, ethers_1.BigNumber.from(0)];

package/lib/apy/lidoAPY.js

@@ -38,15 +38,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIDO_FEE_DECIMALS = exports.getLidoApy = void 0;
 var multicall_1 = require("../utils/multicall");
+var contracts_1 = require("../contracts/contracts");
+var token_1 = require("../tokens/token");
 var constants_1 = require("../core/constants");
 var types_1 = require("../types");
-var lidoOracleAddress = {
-    Mainnet: "0x442af784A788A5bd6F42A01Ebe9F287a871243fb",
-    Kovan: ""
-};
-var lidoStEthAddress = {
-    Mainnet: "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
-    Kovan: ""
+var lidoOracles = contracts_1.contractParams.LIDO_STETH_GATEWAY.oracle;
+var lidoStEth = {
+    Mainnet: token_1.tokenDataByNetwork.Mainnet.STETH,
+    Kovan: token_1.tokenDataByNetwork.Kovan.STETH
 };
 function getLidoApy(provider, networkType) {
     return __awaiter(this, void 0, void 0, function () {
@@ -54,13 +53,13 @@ function getLidoApy(provider, networkType) {
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    if (!lidoOracleAddress[networkType]) {
-                        throw "No Lido APR oracle found on current network: ".concat(networkType);
+                    if (!lidoOracles[networkType]) {
+                        throw new Error("No Lido APR oracle found on current network: ".concat(networkType));
                     }
-                    if (!lidoStEthAddress[networkType]) {
-                        throw "No Lido stETH found on current network: ".concat(networkType);
+                    if (!lidoStEth[networkType]) {
+                        throw new Error("No Lido stETH found on current network: ".concat(networkType));
                     }
-                    return [4 /*yield*/, geLidoData(lidoOracleAddress[networkType], lidoStEthAddress[networkType], provider)];
+                    return [4 /*yield*/, geLidoData(lidoOracles[networkType], lidoStEth[networkType], provider, networkType)];
                 case 1:
                     _a = _c.sent(), _b = _a[0], postTotalPooledEther = _b.postTotalPooledEther, preTotalPooledEther = _b.preTotalPooledEther, timeElapsed = _b.timeElapsed, fee = _a[1];
                     lidoAPRRay = postTotalPooledEther
@@ -74,24 +73,31 @@ function getLidoApy(provider, networkType) {
     });
 }
 exports.getLidoApy = getLidoApy;
-function geLidoData(lidoOracleAddress, stETHAddress, provider) {
+exports.LIDO_FEE_DECIMALS = 10000;
+function geLidoData(lidoOracleAddress, stETHAddress, provider, network) {
     return __awaiter(this, void 0, void 0, function () {
-        var calls;
-        return __generator(this, function (_a) {
-            calls = [
-                {
-                    address: lidoOracleAddress,
-                    interface: types_1.ILidoOracle__factory.createInterface(),
-                    method: "getLastCompletedReportDelta()"
-                },
-                {
-                    address: stETHAddress,
-                    interface: types_1.IstETH__factory.createInterface(),
-                    method: "getFee()"
-                }
-            ];
-            return [2 /*return*/, (0, multicall_1.multicall)(calls, provider)];
+        var calls, _a, stats, _b, fee;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    calls = [
+                        {
+                            address: lidoOracleAddress,
+                            interface: types_1.ILidoOracle__factory.createInterface(),
+                            method: "getLastCompletedReportDelta()"
+                        }
+                    ];
+                    if (network !== "Kovan")
+                        calls.push({
+                            address: stETHAddress,
+                            interface: types_1.IstETH__factory.createInterface(),
+                            method: "getFee()"
+                        });
+                    return [4 /*yield*/, (0, multicall_1.multicall)(calls, provider)];
+                case 1:
+                    _a = _c.sent(), stats = _a[0], _b = _a[1], fee = _b === void 0 ? Math.floor(exports.LIDO_FEE_DECIMALS / 10) : _b;
+                    return [2 /*return*/, [stats, fee]];
+            }
         });
     });
 }
-exports.LIDO_FEE_DECIMALS = 10000;

package/lib/contracts/contracts.d.ts

@@ -1,8 +1,9 @@
+import type { YearnLPToken } from "src/tokens/yearn";
 import { AdapterInterface } from "./adapters";
 import { NetworkType } from "../core/constants";
 import { Protocols } from "./protocols";
 import { ConvexStakedPhantomToken } from "../tokens/convex";
-import { CurveLPToken } from "../tokens/curveLP";
+import type { CurveLPToken } from "../tokens/curveLP";
 import { NormalToken } from "../tokens/normal";
 export declare type UniswapV2Contract = "UNISWAP_V2_ROUTER" | "SUSHISWAP_ROUTER";
 export declare type CurvePoolContract = "CURVE_3CRV_POOL" | "CURVE_STETH_GATEWAY" | "CURVE_FRAX_POOL" | "CURVE_LUSD_POOL" | "CURVE_GUSD_POOL" | "CURVE_SUSD_POOL" | "CURVE_SUSD_DEPOSIT";
@@ -34,11 +35,13 @@ export declare type CurveSteCRVPoolParams = {
     protocol: Protocols.Curve;
     type: AdapterInterface.CURVE_V1_STECRV_POOL;
     pool: Record<NetworkType, string>;
+    tokens: ["WETH", "STETH"];
     lpToken: "steCRV";
 } & BaseContractParams;
-declare type YearnParams = {
+export declare type YearnParams = {
     protocol: Protocols.Yearn;
     type: AdapterInterface.YEARN_V2;
+    shareToken: YearnLPToken;
 } & BaseContractParams;
 declare type ConvexParams = {
     protocol: Protocols.Convex;

package/lib/contracts/contracts.js

@@ -12,11 +12,6 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contractsByAddress = exports.contractParams = exports.UNISWAP_V3_QUOTER = exports.contractsByNetwork = void 0;
-/*
- * SPDX-License-Identifier: BSL-1.1
- * Gearbox. Generalized leverage protocol, which allows to take leverage and then use it across other DeFi protocols and platforms in a composable way.
- * (c) Gearbox.fi, 2021
- */
 var mappers_1 = require("../utils/mappers");
 var adapters_1 = require("./adapters");
 var protocols_1 = require("./protocols");
@@ -123,6 +118,7 @@ exports.contractParams = {
             Mainnet: "0xDC24316b9AE028F1497c275EB9192a3Ea0f67022",
             Kovan: "0xF5C73b58B70709e89aA1D322d48b0D0C71123cB4"
         },
+        tokens: ["WETH", "STETH"],
         lpToken: "steCRV"
     },
     CURVE_FRAX_POOL: {
@@ -130,14 +126,14 @@ exports.contractParams = {
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
         lpToken: "FRAX3CRV",
-        tokens: ["3Crv", "FRAX"]
+        tokens: ["FRAX", "3Crv"]
     },
     CURVE_LUSD_POOL: {
         name: "Curve LUSD",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
         lpToken: "LUSD3CRV",
-        tokens: ["3Crv", "LUSD"]
+        tokens: ["LUSD", "3Crv"]
     },
     CURVE_SUSD_POOL: {
         name: "Curve SUSD",
@@ -152,45 +148,50 @@ exports.contractParams = {
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_WRAPPER,
         lpToken: "crvPlain3andSUSD",
-        tokens: ["DAI", "USDC", "USDT", "sUSD"],
-        wrapper: "CURVE_SUSD_DEPOSIT"
+        tokens: ["DAI", "USDC", "USDT", "sUSD"]
     },
     CURVE_GUSD_POOL: {
         name: "Curve GUSD",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
         lpToken: "gusd3CRV",
-        tokens: ["3Crv", "FRAX"]
+        tokens: ["GUSD", "3Crv"]
     },
     YEARN_DAI_VAULT: {
         name: "Yearn DAI",
         protocol: protocols_1.Protocols.Yearn,
-        type: adapters_1.AdapterInterface.YEARN_V2
+        type: adapters_1.AdapterInterface.YEARN_V2,
+        shareToken: "yvDAI"
     },
     YEARN_USDC_VAULT: {
         name: "Yearn USDC",
         protocol: protocols_1.Protocols.Yearn,
-        type: adapters_1.AdapterInterface.YEARN_V2
+        type: adapters_1.AdapterInterface.YEARN_V2,
+        shareToken: "yvUSDC"
     },
     YEARN_WETH_VAULT: {
         name: "Yearn WETH",
         protocol: protocols_1.Protocols.Yearn,
-        type: adapters_1.AdapterInterface.YEARN_V2
+        type: adapters_1.AdapterInterface.YEARN_V2,
+        shareToken: "yvWETH"
     },
     YEARN_WBTC_VAULT: {
         name: "Yearn WBTC",
         protocol: protocols_1.Protocols.Yearn,
-        type: adapters_1.AdapterInterface.YEARN_V2
+        type: adapters_1.AdapterInterface.YEARN_V2,
+        shareToken: "yvWBTC"
     },
     YEARN_CURVE_FRAX_VAULT: {
         name: "Yearn Curve FRAX",
         protocol: protocols_1.Protocols.Yearn,
-        type: adapters_1.AdapterInterface.YEARN_V2
+        type: adapters_1.AdapterInterface.YEARN_V2,
+        shareToken: "yvCurve_FRAX"
     },
     YEARN_CURVE_STETH_VAULT: {
         name: "Yearn Curve STETH",
         protocol: protocols_1.Protocols.Yearn,
-        type: adapters_1.AdapterInterface.YEARN_V2
+        type: adapters_1.AdapterInterface.YEARN_V2,
+        shareToken: "yvCurve_stETH"
     },
     CONVEX_BOOSTER: {
         name: "Convex BOOSTER",
@@ -288,6 +289,6 @@ exports.contractParams = {
     }
 };
 exports.contractsByAddress = (0, mappers_1.objectEntries)(exports.contractsByNetwork).reduce(function (acc, _a) {
-    var _ = _a[0], contracts = _a[1];
-    return __assign(__assign({}, acc), (0, mappers_1.filterEmptyKeys)((0, mappers_1.keyToLowercase)((0, mappers_1.swapKeyValue)(contracts))));
+    var contracts = _a[1];
+    return (__assign(__assign({}, acc), (0, mappers_1.filterEmptyKeys)((0, mappers_1.keyToLowercase)((0, mappers_1.swapKeyValue)(contracts)))));
 }, {});

package/lib/contracts/contractsRegister.js

@@ -38,10 +38,22 @@ exports.deployedContracts = {
     "0xe04b4db67127d1930D36f16B51653120C4285708": "WBTC",
     "0x600073357c29d169aAF3E543A4519749830553F1": "WETH",
     "0xdBAd1361d9A03B81Be8D3a54Ef0dc9e39a1bA5b3": "USDC",
-    "0x50d1fA47b0D88BA0D108148B8481b4A762eFB99e": "DAI"
+    "0x50d1fA47b0D88BA0D108148B8481b4A762eFB99e": "DAI",
     // [YEARN_DAI_VAULT_KOVAN_MOCK]: "Yearn DAI",
     // [YEARN_USDC_VAULT_KOVAN_MOCK]: "Yearn USDC",
     // [SUSHISWAP_KOVAN]: "Sushiswap"
+    "0x94cd5F09727ae04d7D6fd36A9c9DD96D0d54646B": "DAI",
+    "0x53B4a7389EA369a9299DfF524f916EC3cB77ffF4": "USDC",
+    "0xE6631f7b18744651A385a02ea2C89634d20D7819": "WETH",
+    "0x4d2cBA0E43Ad3B3E1C3B1922fe6E8e910b8C3ae0": "WBTC",
+    "0x6Ae9Ed829AF469Df9526FA7443E876bfaBC79eff": "DAI V2",
+    "0x8E0a874E3475de1C16490E386b7E2904CdC03086": "USDC V2",
+    "0x816a74B75D60839247C848518545fb17cedDC460": "WETH V2",
+    // pools
+    "0xA7b1C8f322596C40A04dBd3DffaE37a0849B8b59": "DAI",
+    "0xb8ecDB926F07FCbd870eafE72d116413A0BEb236": "USDC",
+    "0xAda6b2747295b2ba6ba52ce2d0D5e681D25D63D8": "WETH",
+    "0x85c54CCCf27466eEa1C74a73F75CbE385C271EE4": "WBTC"
 };
 var contractNames = Object.entries(contracts_1.contractsByAddress).reduce(function (acc, _a) {
     var _b;

package/lib/core/constants.d.ts

@@ -5,11 +5,13 @@ export declare const KOVAN_NETWORK = 42;
 export declare const LOCAL_NETWORK = 1337;
 export declare type NetworkType = "Mainnet" | "Kovan";
 export declare const getNetworkType: (chainId: number) => NetworkType;
-export declare const RAY_DECIMALS = 27;
+export declare const RAY_DECIMALS_POW = 27;
 export declare const RAY: BigNumber;
 export declare const halfRAY: BigNumber;
-export declare const WAD_DECIMALS = 18;
+export declare const WAD_DECIMALS_POW = 18;
 export declare const WAD: BigNumber;
+export declare const PRICE_DECIMALS_POW = 8;
+export declare const PRICE_DECIMALS: BigNumber;
 export declare const SECONDS_PER_YEAR: number;
 export declare const PERCENTAGE_DECIMALS = 100;
 export declare const PERCENTAGE_FACTOR = 10000;
@@ -18,4 +20,4 @@ export declare const UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = 9300;
 export declare const timeRanges: Record<string, number>;
 export declare const LEVERAGE_DECIMALS = 100;
 export declare const SLIPPAGE_DECIMALS = 100;
-export declare const ADDRESS_0x0 = "0x0000000000000000000000000000000000000000";
+export declare const ADDRESS_0X0 = "0x0000000000000000000000000000000000000000";

package/lib/core/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ADDRESS_0x0 = exports.SLIPPAGE_DECIMALS = exports.LEVERAGE_DECIMALS = exports.timeRanges = exports.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = exports.LIQUIDATION_DISCOUNTED_SUM = exports.PERCENTAGE_FACTOR = exports.PERCENTAGE_DECIMALS = exports.SECONDS_PER_YEAR = exports.WAD = exports.WAD_DECIMALS = exports.halfRAY = exports.RAY = exports.RAY_DECIMALS = exports.getNetworkType = exports.LOCAL_NETWORK = exports.KOVAN_NETWORK = exports.MAINNET_NETWORK = exports.MAX_INT = void 0;
+exports.ADDRESS_0X0 = exports.SLIPPAGE_DECIMALS = exports.LEVERAGE_DECIMALS = exports.timeRanges = exports.UNDERLYING_TOKEN_LIQUIDATION_THRESHOLD = exports.LIQUIDATION_DISCOUNTED_SUM = exports.PERCENTAGE_FACTOR = exports.PERCENTAGE_DECIMALS = 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.getNetworkType = exports.LOCAL_NETWORK = exports.KOVAN_NETWORK = exports.MAINNET_NETWORK = exports.MAX_INT = void 0;
 var ethers_1 = require("ethers");
 exports.MAX_INT = ethers_1.BigNumber.from("0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
 exports.MAINNET_NETWORK = 1;
@@ -18,11 +18,13 @@ var getNetworkType = function (chainId) {
     }
 };
 exports.getNetworkType = getNetworkType;
-exports.RAY_DECIMALS = 27;
-exports.RAY = ethers_1.BigNumber.from(10).pow(exports.RAY_DECIMALS);
+exports.RAY_DECIMALS_POW = 27;
+exports.RAY = ethers_1.BigNumber.from(10).pow(exports.RAY_DECIMALS_POW);
 exports.halfRAY = exports.RAY.div(2);
-exports.WAD_DECIMALS = 18;
-exports.WAD = ethers_1.BigNumber.from(10).pow(exports.WAD_DECIMALS);
+exports.WAD_DECIMALS_POW = 18;
+exports.WAD = ethers_1.BigNumber.from(10).pow(exports.WAD_DECIMALS_POW);
+exports.PRICE_DECIMALS_POW = 8;
+exports.PRICE_DECIMALS = ethers_1.BigNumber.from(10).pow(exports.PRICE_DECIMALS_POW);
 exports.SECONDS_PER_YEAR = 365 * 24 * 3600;
 exports.PERCENTAGE_DECIMALS = 100;
 exports.PERCENTAGE_FACTOR = 1e4;
@@ -37,4 +39,4 @@ exports.timeRanges = {
 };
 exports.LEVERAGE_DECIMALS = 100;
 exports.SLIPPAGE_DECIMALS = 100;
-exports.ADDRESS_0x0 = "0x0000000000000000000000000000000000000000";
+exports.ADDRESS_0X0 = "0x0000000000000000000000000000000000000000";

package/lib/core/creditAccount.d.ts

@@ -23,9 +23,9 @@ export declare class CreditAccountData {
     isDeleting: boolean;
     readonly version: number;
     constructor(payload: CreditAccountDataPayload);
-    balancesSorted(prices: Record<string, number>, tokens: Record<string, TokenData>): Array<Balance>;
+    balancesSorted(prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<Balance>;
 }
-export declare function sortBalances(balances: Record<string, BigNumber>, prices: Record<string, number>, tokens: Record<string, TokenData>): [string, BigNumber][];
+export declare function sortBalances(balances: Record<string, BigNumber>, prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): [string, BigNumber][];
 export declare function tokensAbcComparator(t1?: TokenData, t2?: TokenData): 1 | -1;
 export declare class CreditAccountDataExtended extends CreditAccountData {
     readonly repayAmount: BigNumber;

package/lib/core/creditAccount.js

@@ -54,8 +54,7 @@ var CreditAccountData = /** @class */ (function () {
         this.isDeleting = false;
     }
     CreditAccountData.prototype.balancesSorted = function (prices, tokens) {
-        var safeBalances = this.balances || [];
-        return sortBalances(safeBalances, prices, tokens).map(function (_a) {
+        return sortBalances(this.balances, prices, tokens).map(function (_a) {
             var address = _a[0], balance = _a[1];
             return ({ address: address, balance: balance });
         });
@@ -71,15 +70,17 @@ function sortBalances(balances, prices, tokens) {
         var addr2Lc = addr2.toLowerCase();
         var token1 = tokens[addr1Lc];
         var token2 = tokens[addr2Lc];
-        var price1 = prices[addr1Lc] || 1;
-        var price2 = prices[addr2Lc] || 1;
-        var assetValue1 = (0, price_1.priceCalc)(price1, amount1, token1);
-        var assetValue2 = (0, price_1.priceCalc)(price2, amount2, token2);
-        return assetValue1.eq(assetValue2)
-            ? tokensAbcComparator(token1, token2)
-            : assetValue1.gt(assetValue2)
-                ? -1
-                : 1;
+        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 tokensAbcComparator(token1, token2);
+        }
+        if (totalPrice1.gt(totalPrice2)) {
+            return -1;
+        }
+        return 1;
     });
 }
 exports.sortBalances = sortBalances;

package/lib/core/creditManager.d.ts

@@ -22,8 +22,8 @@ export declare class CreditManagerData {
     readonly degenNFT: string;
     readonly isIncreaseDebtForbidden: boolean;
     readonly forbiddenTokenMask: BigNumber;
+    readonly isPaused: boolean;
     constructor(payload: CreditManagerDataPayload);
-    get isPaused(): boolean;
     getContractETH(signer: Signer | ethers.providers.Provider): ICreditManager;
     contractToAdapter(contractAddress: string): string | undefined;
     encodeAddCollateral(accountAddress: string, tokenAddress: string, amount: BigNumber): MultiCall;

package/lib/core/creditManager.js

@@ -33,6 +33,7 @@ var constants_1 = require("./constants");
 var errors_1 = require("./errors");
 var CreditManagerData = /** @class */ (function () {
     function CreditManagerData(payload) {
+        this.isPaused = false;
         this.id = payload.addr;
         this.address = payload.addr;
         this.underlyingToken = payload.underlying || "";
@@ -54,26 +55,19 @@ var CreditManagerData = /** @class */ (function () {
             var allowedContract = _a.allowedContract, adapter = _a.adapter;
             return (__assign(__assign({}, acc), (_b = {}, _b[allowedContract] = adapter, _b)));
         }, {});
-        this.liquidationThresholds = payload.liquidationThresholds.reduce(function (acc, threshold, index) {
+        this.liquidationThresholds = (payload.liquidationThresholds || []).reduce(function (acc, threshold, index) {
             var address = payload.collateralTokens[index];
             if (address)
-                acc[address.toLowerCase()] = threshold;
+                acc[address.toLowerCase()] = ethers_1.BigNumber.from(threshold);
             return acc;
         }, {});
-        this.version = payload.version || 1;
+        this.version = ethers_1.BigNumber.from(payload.version || 1).toNumber();
         this.creditFacade = payload.creditFacade || "";
         this.isDegenMode = payload.isDegenMode || false;
         this.degenNFT = payload.degenNFT || "";
         this.isIncreaseDebtForbidden = payload.isIncreaseDebtForbidden || false;
         this.forbiddenTokenMask = ethers_1.BigNumber.from(payload.forbiddenTokenMask || 0);
     }
-    Object.defineProperty(CreditManagerData.prototype, "isPaused", {
-        get: function () {
-            return false;
-        },
-        enumerable: false,
-        configurable: true
-    });
     CreditManagerData.prototype.getContractETH = function (signer) {
         return types_1.ICreditManager__factory.connect(this.address, signer);
     };

package/lib/core/creditSession.js

@@ -1,4 +1,15 @@
 "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);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -11,7 +22,7 @@ var statusEnum = [
     "active",
     "closed",
     "repaid",
-    "liquidated",
+    "liquidated"
 ];
 var CreditSession = /** @class */ (function () {
     function CreditSession(payload) {
@@ -33,8 +44,8 @@ var CreditSession = /** @class */ (function () {
             ethers_1.BigNumber.from(payload.healthFactor || 0).toNumber() / constants_1.PERCENTAGE_FACTOR;
         this.score = payload.score;
         this.operations = (payload.operations || []).map(function (op) {
-            op.date = (0, moment_1.default)(op.timestamp * 1000).format("Do MMM YYYY");
-            return op;
+            var formattedOp = __assign(__assign({}, op), { date: (0, moment_1.default)(op.timestamp * 1000).format("Do MMM YYYY") });
+            return formattedOp;
         });
         this.sinceDate = (0, moment_1.default)(payload.sinceTimestamp * 1000).format("Do MMM YYYY");
         this.closedAtDate = (0, moment_1.default)(payload.closedAtTimestamp * 1000).format("Do MMM YYYY");

package/lib/core/eventOrTx.d.ts

@@ -1,5 +1,5 @@
 import { TokenData } from "../tokens/tokenData";
-import { TxSerialized } from "./transactions";
+import type { TxSerialized } from "./transactions";
 export interface Display {
     toString(tokenData: Record<string, TokenData>): string;
 }