@gearbox-protocol/sdk 0.0.109 → 1.0.1-next.1

package/lib/contracts/contracts.js

@@ -12,10 +12,10 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contractsByAddress = exports.contractParams = exports.UNISWAP_V3_QUOTER = exports.contractsByNetwork = void 0;
+var token_1 = require("../tokens/token");
 var mappers_1 = require("../utils/mappers");
 var adapters_1 = require("./adapters");
 var protocols_1 = require("./protocols");
-var token_1 = require("../tokens/token");
 exports.contractsByNetwork = {
     Mainnet: {
         UNISWAP_V2_ROUTER: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
@@ -46,69 +46,64 @@ exports.contractsByNetwork = {
         CONVEX_LUSD3CRV_POOL: "0x2ad92A7aE036a038ff02B96c88de868ddf3f8190",
         CONVEX_CLAIM_ZAP: "0x92Cf9E5e4D1Dfbf7dA0d2BB3e884a68416a65070",
         // LIDO
-        LIDO_STETH_GATEWAY: "0x55045Eaae19d92680E02231e4Ce7bBEB4814ca64"
+        LIDO_STETH_GATEWAY: "0x55045Eaae19d92680E02231e4Ce7bBEB4814ca64",
     },
-    ///
-    ///
-    /// KOVAN
-    ///
-    ///
-    Kovan: {
+    Goerli: {
         UNISWAP_V2_ROUTER: "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
         UNISWAP_V3_ROUTER: "0xE592427A0AEce92De3Edee1F18E0157C05861564",
         SUSHISWAP_ROUTER: "0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506",
         // CURVE
-        CURVE_3CRV_POOL: "0x5C07cB1e8510DCC0DA262A71bb532B0e85368250",
-        CURVE_STETH_GATEWAY: "0xed4439dc6D555b5712E1B3815848B7a80E0bd8a2",
-        CURVE_FRAX_POOL: token_1.tokenDataByNetwork.Kovan.FRAX3CRV,
-        CURVE_LUSD_POOL: token_1.tokenDataByNetwork.Kovan.LUSD3CRV,
-        CURVE_SUSD_POOL: "0xcD0d789E7b0BCCa84ea23F309f9154B186606f4F",
-        CURVE_SUSD_DEPOSIT: "0x1F447F916649248cF091723e58c695F619d27BFf",
-        CURVE_GUSD_POOL: "0x08543E4CbE76C3461871A83C63E1d59684A66d7b",
+        CURVE_3CRV_POOL: "0x6491f8A62678c90C84b237791d9D7cF21b4D1418",
+        CURVE_STETH_GATEWAY: "TODO: DEPLOY ME",
+        CURVE_FRAX_POOL: token_1.tokenDataByNetwork.Goerli.FRAX3CRV,
+        CURVE_LUSD_POOL: token_1.tokenDataByNetwork.Goerli.LUSD3CRV,
+        CURVE_SUSD_POOL: "0x2A1b874C86734feA5be050d32fAb02FCF9eB1Bc2",
+        CURVE_SUSD_DEPOSIT: "0x9782f1fF1AEFb387F01cae72F668F13E8061d9Dd",
+        CURVE_GUSD_POOL: "0x8C954d89C2fB2c96F0195738b8c5538B34D5344E",
         // YEARN
-        YEARN_DAI_VAULT: token_1.tokenDataByNetwork.Kovan.yvDAI,
-        YEARN_USDC_VAULT: token_1.tokenDataByNetwork.Kovan.yvUSDC,
-        YEARN_WETH_VAULT: token_1.tokenDataByNetwork.Kovan.yvWETH,
-        YEARN_WBTC_VAULT: token_1.tokenDataByNetwork.Kovan.yvWBTC,
-        YEARN_CURVE_FRAX_VAULT: token_1.tokenDataByNetwork.Kovan.yvCurve_FRAX,
-        YEARN_CURVE_STETH_VAULT: token_1.tokenDataByNetwork.Kovan.yvCurve_stETH,
+        YEARN_DAI_VAULT: token_1.tokenDataByNetwork.Goerli.yvDAI,
+        YEARN_USDC_VAULT: token_1.tokenDataByNetwork.Goerli.yvUSDC,
+        YEARN_WETH_VAULT: token_1.tokenDataByNetwork.Goerli.yvWETH,
+        YEARN_WBTC_VAULT: token_1.tokenDataByNetwork.Goerli.yvWBTC,
+        YEARN_CURVE_FRAX_VAULT: token_1.tokenDataByNetwork.Goerli.yvCurve_FRAX,
+        YEARN_CURVE_STETH_VAULT: token_1.tokenDataByNetwork.Goerli.yvCurve_stETH,
         // CONVEX
-        CONVEX_BOOSTER: "0x56E507256808FB2692476181aA978e00Ca24d40f",
-        CONVEX_3CRV_POOL: "0xc2c705a619CF48241A9339763c6Cfd32Ca8C9deB",
-        CONVEX_STECRV_POOL: "0x25edfea00131DAF9b23a8E07720Eea2382d58E71",
-        CONVEX_SUSD_POOL: "0xE9998a1c357dc62550f2ED72b736a7CaEB262823",
-        CONVEX_FRAX3CRV_POOL: "0xEBE0A1B948eB83333906EB80eE4b87Ee0b5CC84f",
-        CONVEX_LUSD3CRV_POOL: "0x493Bd59EEcFfCa1BF88611CEd478aA5b74427e06",
-        CONVEX_GUSD_POOL: "0xE7370DA7FD3d511dAB095Dd7d10388653d5cDE21",
-        CONVEX_CLAIM_ZAP: "0x1330C2E5Cd8c333683aE511550f82d25918FFdd5",
+        CONVEX_BOOSTER: "0xc9E1e57764a3aC374CFc945A3efF6383400ac4A7",
+        CONVEX_3CRV_POOL: "0x7A0bb35B1E0cfE9127B65CB816C04eEBc992FaD1",
+        CONVEX_STECRV_POOL: "0xa98b3C36Fdd697504c348402E7B47DC8E213e4f5",
+        CONVEX_SUSD_POOL: "0xC0baFa477eAB4F470f746e367bb5dC900997a93A",
+        CONVEX_FRAX3CRV_POOL: "0xbC7AF66374440f674D6bb4788Aa45D3326a8C902",
+        CONVEX_LUSD3CRV_POOL: "0x92C077f2599025C56ba335D87fc12718f04890D1",
+        CONVEX_GUSD_POOL: "0x75151C40CAD6060ff3786f7e734fF53B5A8a1940",
+        CONVEX_CLAIM_ZAP: "0x6767c6492Df4920Be1e7667531046Bd483eb177E",
         // LIDO
-        LIDO_STETH_GATEWAY: "0x7C1C4eC1f1510E3978a96a1d024D7689F05a7Ca1"
-    }
+        LIDO_STETH_GATEWAY: "TODO: DEPLOY ME",
+    },
 };
 exports.UNISWAP_V3_QUOTER = "0xb27308f9f90d607463bb33ea1bebb41c27ce5ab6";
 exports.contractParams = {
     UNISWAP_V2_ROUTER: {
         name: "Uniswap V2",
         protocol: protocols_1.Protocols.Uniswap,
-        type: adapters_1.AdapterInterface.UNISWAP_V2_ROUTER
+        type: adapters_1.AdapterInterface.UNISWAP_V2_ROUTER,
     },
     UNISWAP_V3_ROUTER: {
         name: "Uniswap V3",
         protocol: protocols_1.Protocols.Uniswap,
         quoter: exports.UNISWAP_V3_QUOTER,
-        type: adapters_1.AdapterInterface.UNISWAP_V3_ROUTER
+        type: adapters_1.AdapterInterface.UNISWAP_V3_ROUTER,
     },
     SUSHISWAP_ROUTER: {
         name: "Sushiswap",
         protocol: protocols_1.Protocols.Sushiswap,
-        type: adapters_1.AdapterInterface.UNISWAP_V2_ROUTER
+        type: adapters_1.AdapterInterface.UNISWAP_V2_ROUTER,
     },
     CURVE_3CRV_POOL: {
         name: "Curve 3Pool",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_3ASSETS,
         lpToken: "3Crv",
-        tokens: ["DAI", "USDC", "USDT"]
+        tokens: ["DAI", "USDC", "USDT"],
     },
     CURVE_STETH_GATEWAY: {
         name: "Curve stETH",
@@ -116,24 +111,24 @@ exports.contractParams = {
         type: adapters_1.AdapterInterface.CURVE_V1_STECRV_POOL,
         pool: {
             Mainnet: "0xDC24316b9AE028F1497c275EB9192a3Ea0f67022",
-            Kovan: "0xF5C73b58B70709e89aA1D322d48b0D0C71123cB4"
+            Goerli: "0x604a4aC025FbD873fB99EC67B1184a495Cc4f6D1", // CURVE_STECRV_POOL
         },
         tokens: ["WETH", "STETH"],
-        lpToken: "steCRV"
+        lpToken: "steCRV",
     },
     CURVE_FRAX_POOL: {
         name: "Curve FRAX",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
         lpToken: "FRAX3CRV",
-        tokens: ["FRAX", "3Crv"]
+        tokens: ["FRAX", "3Crv"],
     },
     CURVE_LUSD_POOL: {
         name: "Curve LUSD",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_2ASSETS,
         lpToken: "LUSD3CRV",
-        tokens: ["LUSD", "3Crv"]
+        tokens: ["LUSD", "3Crv"],
     },
     CURVE_SUSD_POOL: {
         name: "Curve SUSD",
@@ -141,81 +136,81 @@ exports.contractParams = {
         type: adapters_1.AdapterInterface.CURVE_V1_4ASSETS,
         lpToken: "crvPlain3andSUSD",
         tokens: ["DAI", "USDC", "USDT", "sUSD"],
-        wrapper: "CURVE_SUSD_DEPOSIT"
+        wrapper: "CURVE_SUSD_DEPOSIT",
     },
     CURVE_SUSD_DEPOSIT: {
         name: "Curve SUSD",
         protocol: protocols_1.Protocols.Curve,
         type: adapters_1.AdapterInterface.CURVE_V1_WRAPPER,
         lpToken: "crvPlain3andSUSD",
-        tokens: ["DAI", "USDC", "USDT", "sUSD"]
+        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: ["GUSD", "3Crv"]
+        tokens: ["GUSD", "3Crv"],
     },
     YEARN_DAI_VAULT: {
         name: "Yearn DAI",
         protocol: protocols_1.Protocols.Yearn,
         type: adapters_1.AdapterInterface.YEARN_V2,
-        shareToken: "yvDAI"
+        shareToken: "yvDAI",
     },
     YEARN_USDC_VAULT: {
         name: "Yearn USDC",
         protocol: protocols_1.Protocols.Yearn,
         type: adapters_1.AdapterInterface.YEARN_V2,
-        shareToken: "yvUSDC"
+        shareToken: "yvUSDC",
     },
     YEARN_WETH_VAULT: {
         name: "Yearn WETH",
         protocol: protocols_1.Protocols.Yearn,
         type: adapters_1.AdapterInterface.YEARN_V2,
-        shareToken: "yvWETH"
+        shareToken: "yvWETH",
     },
     YEARN_WBTC_VAULT: {
         name: "Yearn WBTC",
         protocol: protocols_1.Protocols.Yearn,
         type: adapters_1.AdapterInterface.YEARN_V2,
-        shareToken: "yvWBTC"
+        shareToken: "yvWBTC",
     },
     YEARN_CURVE_FRAX_VAULT: {
         name: "Yearn Curve FRAX",
         protocol: protocols_1.Protocols.Yearn,
         type: adapters_1.AdapterInterface.YEARN_V2,
-        shareToken: "yvCurve_FRAX"
+        shareToken: "yvCurve_FRAX",
     },
     YEARN_CURVE_STETH_VAULT: {
         name: "Yearn Curve STETH",
         protocol: protocols_1.Protocols.Yearn,
         type: adapters_1.AdapterInterface.YEARN_V2,
-        shareToken: "yvCurve_stETH"
+        shareToken: "yvCurve_stETH",
     },
     CONVEX_BOOSTER: {
         name: "Convex BOOSTER",
         protocol: protocols_1.Protocols.Convex,
-        type: adapters_1.AdapterInterface.CONVEX_V1_BOOSTER
+        type: adapters_1.AdapterInterface.CONVEX_V1_BOOSTER,
     },
     CONVEX_CLAIM_ZAP: {
         name: "Convex ZAP",
         protocol: protocols_1.Protocols.Convex,
-        type: adapters_1.AdapterInterface.CONVEX_V1_CLAIM_ZAP
+        type: adapters_1.AdapterInterface.CONVEX_V1_CLAIM_ZAP,
     },
     CONVEX_3CRV_POOL: {
         name: "Convex 3crv",
         protocol: protocols_1.Protocols.Convex,
         type: adapters_1.AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
         stakedToken: "stkcvx3Crv",
-        extraRewards: []
+        extraRewards: [],
     },
     CONVEX_GUSD_POOL: {
         name: "Convex GUSD",
         protocol: protocols_1.Protocols.Convex,
         type: adapters_1.AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
         stakedToken: "stkcvxgusd3CRV",
-        extraRewards: []
+        extraRewards: [],
     },
     CONVEX_SUSD_POOL: {
         name: "Convex SUSD",
@@ -227,10 +222,10 @@ exports.contractParams = {
                 rewardToken: "SNX",
                 poolAddress: {
                     Mainnet: "0x81fCe3E10D12Da6c7266a1A169c4C96813435263",
-                    Kovan: "0x26a535146557FA58FA37e3078FEAc523b554939C"
-                }
-            }
-        ]
+                    Goerli: "0x7b8584d108DC235f5eBcFcbF18FcadF7C9A5c973", // CONVEX_SUSD_POOL_EXTRA_SNX
+                },
+            },
+        ],
     },
     CONVEX_STECRV_POOL: {
         name: "Convex STECRV",
@@ -242,10 +237,10 @@ exports.contractParams = {
                 rewardToken: "LDO",
                 poolAddress: {
                     Mainnet: "0x008aEa5036b819B4FEAEd10b2190FBb3954981E8",
-                    Kovan: "0xd0B1CC3B4839363b1eC92F35eF45794CB07B1183"
-                }
-            }
-        ]
+                    Goerli: "0xf054E0a4880645BF931B38d3e5e0ebB662Fec61B", // CONVEX_STECRV_POOL_EXTRA_LDO
+                },
+            },
+        ],
     },
     CONVEX_FRAX3CRV_POOL: {
         name: "Convex FRAX3CRV",
@@ -257,10 +252,10 @@ exports.contractParams = {
                 rewardToken: "FXS",
                 poolAddress: {
                     Mainnet: "0xcDEC6714eB482f28f4889A0c122868450CDBF0b0",
-                    Kovan: "0x89869c2e79FC6EFf51e714F1239D53702B5CDFCD"
-                }
-            }
-        ]
+                    Goerli: "0x1cC308372C200E1BCDC13228984C0aF5cD2EC21C", // CONVEX_FRAX3CRV_POOL_EXTRA_FXS
+                },
+            },
+        ],
     },
     CONVEX_LUSD3CRV_POOL: {
         name: "Convex LUSD3CRV",
@@ -272,10 +267,10 @@ exports.contractParams = {
                 rewardToken: "LQTY",
                 poolAddress: {
                     Mainnet: "0x55d59b791f06dc519B176791c4E037E8Cf2f6361",
-                    Kovan: ""
-                }
-            }
-        ]
+                    Goerli: "0xB1375A1cb890D1fA98Bb68aA250333f455E6a4c6", // CONVEX_LUSD3CRV_POOL_EXTRA_LQTY
+                },
+            },
+        ],
     },
     LIDO_STETH_GATEWAY: {
         name: "Lido STETH",
@@ -283,10 +278,10 @@ exports.contractParams = {
         type: adapters_1.AdapterInterface.LIDO_V1,
         oracle: {
             Mainnet: "0x442af784A788A5bd6F42A01Ebe9F287a871243fb",
-            Kovan: "0x65EBFF1D5C02418AaeCd0f953da518cF6a6c68A0"
+            Goerli: "0x2840CeAeeA3d0Af1beDBeB64539406793180709E", // LIDO_ORACLE
         },
-        lpToken: "steCRV"
-    }
+        lpToken: "steCRV",
+    },
 };
 exports.contractsByAddress = (0, mappers_1.objectEntries)(exports.contractsByNetwork).reduce(function (acc, _a) {
     var contracts = _a[1];

package/lib/contracts/contractsRegister.js

@@ -12,6 +12,7 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getContractName = exports.deployedContracts = void 0;
+var formatter_1 = require("../utils/formatter");
 var mappers_1 = require("../utils/mappers");
 var contracts_1 = require("./contracts");
 exports.deployedContracts = {
@@ -53,7 +54,7 @@ exports.deployedContracts = {
     "0xA7b1C8f322596C40A04dBd3DffaE37a0849B8b59": "DAI",
     "0xb8ecDB926F07FCbd870eafE72d116413A0BEb236": "USDC",
     "0xAda6b2747295b2ba6ba52ce2d0D5e681D25D63D8": "WETH",
-    "0x85c54CCCf27466eEa1C74a73F75CbE385C271EE4": "WBTC"
+    "0x85c54CCCf27466eEa1C74a73F75CbE385C271EE4": "WBTC",
 };
 var contractNames = Object.entries(contracts_1.contractsByAddress).reduce(function (acc, _a) {
     var _b;
@@ -65,6 +66,6 @@ var contractNames = Object.entries(contracts_1.contractsByAddress).reduce(functi
 }, {});
 var contractsFullList = __assign(__assign({}, (0, mappers_1.keyToLowercase)(exports.deployedContracts)), contractNames);
 function getContractName(address) {
-    return contractsFullList[address.toLowerCase()] || address;
+    return contractsFullList[address.toLowerCase()] || (0, formatter_1.shortAddress)(address);
 }
 exports.getContractName = getContractName;

package/lib/contracts/protocols.js

@@ -14,26 +14,26 @@ var Protocols;
 exports.protocolData = (_a = {},
     _a[Protocols.Uniswap] = {
         name: "Uniswap",
-        icon: "/protocols/uniswap.png"
+        icon: "/protocols/uniswap.png",
     },
     _a[Protocols.Sushiswap] = {
         name: "Sushiswap",
-        icon: "/protocols/sushi.svg"
+        icon: "/protocols/sushi.svg",
     },
     _a[Protocols.Curve] = {
         name: "Curve",
-        icon: "/protocols/curve.svg"
+        icon: "/protocols/curve.svg",
     },
     _a[Protocols.Yearn] = {
         name: "Yearn",
-        icon: "/protocols/yearn.svg"
+        icon: "/protocols/yearn.svg",
     },
     _a[Protocols.Convex] = {
         name: "Convex",
-        icon: "/protocols/convex.svg"
+        icon: "/protocols/convex.svg",
     },
     _a[Protocols.Lido] = {
         name: "Lido",
-        icon: "/protocols/lido.svg"
+        icon: "/protocols/lido.svg",
     },
     _a);

package/lib/core/constants.d.ts

@@ -1,9 +1,10 @@
 import { BigNumber } from "ethers";
 export declare const MAX_INT: BigNumber;
 export declare const MAINNET_NETWORK = 1;
-export declare const KOVAN_NETWORK = 42;
+export declare const GOERLI_NETWORK = 5;
 export declare const LOCAL_NETWORK = 1337;
-export declare type NetworkType = "Mainnet" | "Kovan";
+export declare const HARDHAT_NETWORK = 31337;
+export declare type NetworkType = "Mainnet" | "Goerli";
 export declare const getNetworkType: (chainId: number) => NetworkType;
 export declare const RAY_DECIMALS_POW = 27;
 export declare const RAY: BigNumber;

package/lib/core/constants.js

@@ -1,18 +1,19 @@
 "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.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;
+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.HARDHAT_NETWORK = exports.LOCAL_NETWORK = exports.GOERLI_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;
-exports.KOVAN_NETWORK = 42;
+exports.GOERLI_NETWORK = 5;
 exports.LOCAL_NETWORK = 1337;
+exports.HARDHAT_NETWORK = 31337;
 var getNetworkType = function (chainId) {
     switch (chainId) {
         case exports.MAINNET_NETWORK:
         case exports.LOCAL_NETWORK:
             return "Mainnet";
-        case exports.KOVAN_NETWORK:
-            return "Kovan";
+        case exports.GOERLI_NETWORK:
+            return "Goerli";
         default:
             throw new Error("unknown network");
     }
@@ -35,7 +36,7 @@ exports.timeRanges = {
     "1D": 3600 * 24,
     "1W": 3600 * 24 * 7,
     "1M": 3600 * 24 * 30,
-    "1Y": 3600 * 24 * 365
+    "1Y": 3600 * 24 * 365,
 };
 exports.LEVERAGE_DECIMALS = 100;
 exports.SLIPPAGE_DECIMALS = 100;

package/lib/core/creditAccount.d.ts

@@ -1,10 +1,10 @@
 import { BigNumber } from "ethers";
 import { CreditAccountDataExtendedPayload, CreditAccountDataPayload } from "../payload/creditAccount";
 import { TokenData } from "../tokens/tokenData";
-export declare type Balance = {
+export interface Balance {
     address: string;
     balance: BigNumber;
-};
+}
 export declare class CreditAccountData {
     readonly id: string;
     readonly addr: string;
@@ -25,8 +25,9 @@ export declare class CreditAccountData {
     constructor(payload: CreditAccountDataPayload);
     balancesSorted(prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<Balance>;
 }
-export declare function sortBalances(balances: Record<string, BigNumber>, prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): [string, BigNumber][];
+export declare function sortBalances(balances: Record<string, BigNumber>, prices: Record<string, BigNumber>, tokens: Record<string, TokenData>): Array<[string, BigNumber]>;
 export declare function tokensAbcComparator(t1?: TokenData, t2?: TokenData): 1 | -1;
+export declare function amountAbcComparator(t1: BigNumber, t2: BigNumber): 1 | -1;
 export declare class CreditAccountDataExtended extends CreditAccountData {
     readonly repayAmount: BigNumber;
     readonly liquidationAmount: BigNumber;

package/lib/core/creditAccount.js

@@ -15,10 +15,10 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CreditAccountDataExtended = exports.tokensAbcComparator = exports.sortBalances = exports.CreditAccountData = void 0;
+exports.CreditAccountDataExtended = exports.amountAbcComparator = exports.tokensAbcComparator = exports.sortBalances = exports.CreditAccountData = void 0;
 var ethers_1 = require("ethers");
+var price_1 = require("../utils/price");
 var constants_1 = require("./constants");
-var price_1 = require("./price");
 var CreditAccountData = /** @class */ (function () {
     function CreditAccountData(payload) {
         var _this = this;
@@ -27,12 +27,12 @@ var CreditAccountData = /** @class */ (function () {
         this.balances = {};
         this.allBalances = {};
         this.version = 1;
-        this.id = payload.creditManager;
-        this.addr = payload.addr;
-        this.borrower = payload.borrower;
+        this.id = payload.creditManager.toLowerCase();
+        this.addr = payload.addr.toLowerCase();
+        this.borrower = payload.borrower.toLowerCase();
         this.inUse = payload.inUse;
-        this.creditManager = payload.creditManager;
-        this.underlyingToken = payload.underlying;
+        this.creditManager = payload.creditManager.toLowerCase();
+        this.underlyingToken = payload.underlying.toLowerCase();
         this.borrowedAmountPlusInterest = ethers_1.BigNumber.from(payload.borrowedAmountPlusInterest);
         this.totalValue = ethers_1.BigNumber.from(payload.totalValue);
         this.healthFactor =
@@ -44,12 +44,13 @@ var CreditAccountData = /** @class */ (function () {
                 .div(constants_1.RAY)
                 .toNumber() / constants_1.PERCENTAGE_FACTOR;
         (payload.balances || []).forEach(function (b) {
+            var tokenLC = b.token.toLowerCase();
             if (b.isAllowed) {
-                _this.balances[b.token] = ethers_1.BigNumber.from(b.balance);
-                _this.allowedTokens.push(b.token);
+                _this.balances[tokenLC] = ethers_1.BigNumber.from(b.balance);
+                _this.allowedTokens.push(tokenLC);
             }
-            _this.allBalances[b.token] = ethers_1.BigNumber.from(b.balance);
-            _this.allTokens.push(b.token);
+            _this.allBalances[tokenLC] = ethers_1.BigNumber.from(b.balance);
+            _this.allTokens.push(tokenLC);
         });
         this.isDeleting = false;
     }
@@ -75,7 +76,9 @@ function sortBalances(balances, prices, tokens) {
         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);
+            return amount1.eq(amount2)
+                ? tokensAbcComparator(token1, token2)
+                : amountAbcComparator(amount1, amount2);
         }
         if (totalPrice1.gt(totalPrice2)) {
             return -1;
@@ -90,6 +93,10 @@ function tokensAbcComparator(t1, t2) {
     return symbol1 > symbol2 ? 1 : -1;
 }
 exports.tokensAbcComparator = tokensAbcComparator;
+function amountAbcComparator(t1, t2) {
+    return (t1 === null || t1 === void 0 ? void 0 : t1.gt(t2)) ? -1 : 1;
+}
+exports.amountAbcComparator = amountAbcComparator;
 var CreditAccountDataExtended = /** @class */ (function (_super) {
     __extends(CreditAccountDataExtended, _super);
     function CreditAccountDataExtended(payload) {

package/lib/core/creditManager.d.ts

@@ -29,7 +29,9 @@ export declare class CreditManagerData {
     encodeAddCollateral(accountAddress: string, tokenAddress: string, amount: BigNumber): MultiCall;
     encodeIncreaseDebt(amount: BigNumber): MultiCall;
     encodeDecreaseDebt(amount: BigNumber): MultiCall;
-    validateOpenAccount(totalAmount: BigNumber, leverage: number): true;
+    validateOpenAccount(collateral: BigNumber, debt: BigNumber): true;
+    protected validateOpenAccountV1(collateral: BigNumber, debt: BigNumber): true;
+    protected validateOpenAccountV2(debt: BigNumber): true;
 }
 export declare function calcMaxIncreaseBorrow(healthFactor: number, borrowAmountPlusInterest: BigNumber, maxLeverageFactor: number): BigNumber;
 export declare function calcHealthFactorAfterIncreasingBorrow(healthFactor: number | undefined, borrowAmountPlusInterest: BigNumber | undefined, additional: BigNumber): number;

package/lib/core/creditManager.js

@@ -60,7 +60,7 @@ var CreditManagerData = /** @class */ (function () {
         this.liquidationThresholds = (payload.liquidationThresholds || []).reduce(function (acc, threshold, index) {
             var address = payload.collateralTokens[index];
             if (address)
-                acc[address] = ethers_1.BigNumber.from(threshold);
+                acc[address.toLowerCase()] = ethers_1.BigNumber.from(threshold);
             return acc;
         }, {});
         this.version = ethers_1.BigNumber.from(payload.version || 1).toNumber();
@@ -81,7 +81,7 @@ var CreditManagerData = /** @class */ (function () {
             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])
+            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("addCollateral", [accountAddress, tokenAddress, amount]),
         };
     };
     CreditManagerData.prototype.encodeIncreaseDebt = function (amount) {
@@ -89,7 +89,7 @@ var CreditManagerData = /** @class */ (function () {
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("increaseDebt", [amount])
+            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("increaseDebt", [amount]),
         };
     };
     CreditManagerData.prototype.encodeDecreaseDebt = function (amount) {
@@ -97,20 +97,34 @@ var CreditManagerData = /** @class */ (function () {
             throw new Error("Multicall is eligible only for version 2");
         return {
             target: this.creditFacade,
-            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("decreaseDebt", [amount])
+            callData: types_1.ICreditFacade__factory.createInterface().encodeFunctionData("decreaseDebt", [amount]),
         };
     };
-    CreditManagerData.prototype.validateOpenAccount = function (totalAmount, leverage) {
-        if (totalAmount.lt(this.minAmount))
+    CreditManagerData.prototype.validateOpenAccount = function (collateral, debt) {
+        return this.version === 2
+            ? this.validateOpenAccountV2(debt)
+            : this.validateOpenAccountV1(collateral, debt);
+    };
+    CreditManagerData.prototype.validateOpenAccountV1 = function (collateral, debt) {
+        if (collateral.lt(this.minAmount))
             throw new errors_1.OpenAccountError("amountLessMin", this.minAmount);
-        if (totalAmount.gt(this.maxAmount))
+        if (collateral.gt(this.maxAmount))
             throw new errors_1.OpenAccountError("amountGreaterMax", this.maxAmount);
+        var leverage = debt.mul(constants_1.LEVERAGE_DECIMALS).div(collateral).toNumber();
+        if (!leverage || leverage < 0)
+            throw new errors_1.OpenAccountError("wrongLeverage", ethers_1.BigNumber.from(0));
         if (leverage > this.maxLeverageFactor)
             throw new errors_1.OpenAccountError("leverageGreaterMax", ethers_1.BigNumber.from(this.maxLeverageFactor));
-        if (totalAmount
-            .mul(leverage)
-            .div(constants_1.LEVERAGE_DECIMALS)
-            .gt(this.availableLiquidity))
+        if (debt.gt(this.availableLiquidity))
+            throw new errors_1.OpenAccountError("insufficientPoolLiquidity", ethers_1.BigNumber.from(this.availableLiquidity));
+        return true;
+    };
+    CreditManagerData.prototype.validateOpenAccountV2 = function (debt) {
+        if (debt.lt(this.minAmount))
+            throw new errors_1.OpenAccountError("amountLessMin", this.minAmount);
+        if (debt.gt(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));
         return true;
     };

package/lib/core/creditSession.d.ts

@@ -1,6 +1,6 @@
 import { BigNumber } from "ethers";
-import { CreditOperation } from "./creditOperation";
 import { CreditSessionPayload } from "../payload/creditSession";
+import { CreditOperation } from "./creditOperation";
 export declare type CreditSessionStatus = "active" | "closed" | "repaid" | "liquidated";
 export declare class CreditSession {
     readonly id: string;

package/lib/core/creditSession.js

@@ -22,7 +22,7 @@ var statusEnum = [
     "active",
     "closed",
     "repaid",
-    "liquidated"
+    "liquidated",
 ];
 var CreditSession = /** @class */ (function () {
     function CreditSession(payload) {

package/lib/core/errors.d.ts

@@ -25,7 +25,7 @@ export declare class PathNotFoundError extends Error {
 export declare class AccountsInAlllCreditManagersError extends Error {
     constructor();
 }
-export declare type OpenAccountErrorTypes = "insufficientPoolLiquidity" | "leverageGreaterMax" | "amountGreaterMax" | "amountLessMin";
+export declare type OpenAccountErrorTypes = "insufficientPoolLiquidity" | "leverageGreaterMax" | "wrongLeverage" | "amountGreaterMax" | "amountLessMin";
 export declare class OpenAccountError extends Error {
     message: OpenAccountErrorTypes;
     payload: {

package/lib/core/eventOrTx.d.ts

@@ -1,7 +1,7 @@
 import { TokenData } from "../tokens/tokenData";
 import type { TxSerialized } from "./transactions";
 export interface Display {
-    toString(tokenData: Record<string, TokenData>): string;
+    toString: (tokenData: Record<string, TokenData>) => string;
 }
 export declare type TxStatus = "pending" | "success" | "reverted";
 export interface EventOrTxProps {
@@ -28,7 +28,7 @@ export declare abstract class EVMEvent extends EventOrTx {
 declare type OptionalFields = "block" | "txStatus";
 export declare type EVMTxProps = Omit<EventOrTxProps, OptionalFields> & Partial<Pick<EventOrTxProps, OptionalFields>>;
 export declare abstract class EVMTx extends EventOrTx {
-    constructor({ txHash, block, txStatus, timestamp }: EVMTxProps);
+    constructor({ txHash, block, txStatus, timestamp, }: EVMTxProps);
     abstract serialize(): TxSerialized;
     revert(block: number): void;
     success(block: number): void;

package/lib/core/eventOrTx.js

@@ -77,7 +77,7 @@ var EVMTx = /** @class */ (function (_super) {
             block: block,
             txStatus: txStatus,
             txHash: txHash,
-            timestamp: timestamp
+            timestamp: timestamp,
         }) || this;
         if (_this.txStatus !== "pending" && _this.block === 0) {
             throw new Error("Block not specified for non-pending tx");