@gearbox-protocol/sdk 0.0.101 → 0.0.102

package/lib/apy/convexAPY.js

@@ -92,8 +92,8 @@ function getConvexApy(pool, provider, networkType, getTokenPrice) {
                     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 +102,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 +190,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,15 @@ 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 lidoOracleAddress = contracts_1.contractParams.LIDO_STETH_GATEWAY
+    .oracle;
 var lidoStEthAddress = {
-    Mainnet: "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
-    Kovan: ""
+    Mainnet: token_1.tokenDataByNetwork.Mainnet.STETH,
+    Kovan: token_1.tokenDataByNetwork.Kovan.STETH
 };
 function getLidoApy(provider, networkType) {
     return __awaiter(this, void 0, void 0, function () {
@@ -60,7 +60,7 @@ function getLidoApy(provider, networkType) {
                     if (!lidoStEthAddress[networkType]) {
                         throw "No Lido stETH found on current network: ".concat(networkType);
                     }
-                    return [4 /*yield*/, geLidoData(lidoOracleAddress[networkType], lidoStEthAddress[networkType], provider)];
+                    return [4 /*yield*/, geLidoData(lidoOracleAddress[networkType], lidoStEthAddress[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,23 +74,30 @@ function getLidoApy(provider, networkType) {
     });
 }
 exports.getLidoApy = getLidoApy;
-function geLidoData(lidoOracleAddress, stETHAddress, provider) {
+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]];
+            }
         });
     });
 }

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;

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;

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,13 +70,13 @@ 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)
+        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);
+        return totalPrice1.eq(totalPrice2)
             ? tokensAbcComparator(token1, token2)
-            : assetValue1.gt(assetValue2)
+            : totalPrice1.gt(totalPrice2)
                 ? -1
                 : 1;
     });

package/lib/core/creditManager.js

@@ -54,13 +54,13 @@ 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 || "";

package/lib/core/price.d.ts

@@ -1,4 +1,2 @@
 import { BigNumber } from "ethers";
-import { TokenData } from "../tokens/tokenData";
-export declare const PRICE_DECIMALS = 1000;
-export declare const priceCalc: (price: number, amount: BigNumber, token: TokenData | undefined) => BigNumber;
+export declare const calcTotalPrice: (price: BigNumber, amount: BigNumber, decimals?: number) => BigNumber;

package/lib/core/price.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.priceCalc = exports.PRICE_DECIMALS = void 0;
+exports.calcTotalPrice = void 0;
 var ethers_1 = require("ethers");
-exports.PRICE_DECIMALS = 1000;
-var priceCalc = function (price, amount, token) {
-    var _a = (token || {}).decimals, decimals = _a === void 0 ? 18 : _a;
-    return amount
-        .mul(Math.floor(exports.PRICE_DECIMALS * price))
-        .div(ethers_1.BigNumber.from(10).pow(decimals));
+var calcTotalPrice = function (price, amount, decimals) {
+    if (decimals === void 0) { decimals = 18; }
+    return amount.mul(price).div(ethers_1.BigNumber.from(10).pow(decimals));
 };
-exports.priceCalc = priceCalc;
+exports.calcTotalPrice = calcTotalPrice;

package/lib/core/strategy.d.ts

@@ -1,3 +1,4 @@
+import { BigNumber } from "ethers";
 export interface StrategyPayload {
     apy?: number;
     name: string;
@@ -11,6 +12,11 @@ interface PoolStats {
     borrowRate: number;
 }
 declare type PoolList = Record<string, PoolStats>;
+interface TokenDescription {
+    price: BigNumber;
+    amount: BigNumber;
+    decimals: number | undefined;
+}
 export declare class Strategy {
     apy: number | undefined;
     name: string;
@@ -20,11 +26,9 @@ export declare class Strategy {
     leveragableCollateral: Array<string>;
     baseAssets: Array<string>;
     constructor(payload: StrategyPayload);
-    roiMax(apy: number, maxLeverage: number, poolApy: PoolList): number;
+    maxAPY(apy: number, maxLeverage: number, poolApy: PoolList): number;
     overallAPY(apy: number, leverage: number, depositCollateral: string, borrowAPY: number): number;
-    liquidationPrice(leverage: number, ltStrategy: number, ltCollateral: number, depositCollateral: string): number;
-    ltStrategyLP(maxLeverage: number): number;
-    maxLeverage(ltStrategyLP: number): number;
+    liquidationPrice(borrowed: TokenDescription, collateral: TokenDescription, lp: TokenDescription, ltCollateral: BigNumber): BigNumber;
     private roi;
     private minBorrowApy;
     private farmLev;

package/lib/core/strategy.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Strategy = void 0;
+var ethers_1 = require("ethers");
 var constants_1 = require("../core/constants");
+var price_1 = require("../core/price");
 var Strategy = /** @class */ (function () {
     function Strategy(payload) {
         this.apy = payload.apy;
@@ -12,7 +14,7 @@ var Strategy = /** @class */ (function () {
         this.leveragableCollateral = payload.leveragableCollateral;
         this.baseAssets = payload.baseAssets;
     }
-    Strategy.prototype.roiMax = function (apy, maxLeverage, poolApy) {
+    Strategy.prototype.maxAPY = function (apy, maxLeverage, poolApy) {
         var minApy = this.minBorrowApy(poolApy);
         return this.roi(apy, maxLeverage, maxLeverage - constants_1.LEVERAGE_DECIMALS, minApy);
     };
@@ -20,18 +22,15 @@ var Strategy = /** @class */ (function () {
         var farmLev = this.farmLev(leverage, depositCollateral);
         return this.roi(apy, farmLev, leverage - constants_1.LEVERAGE_DECIMALS, borrowAPY);
     };
-    Strategy.prototype.liquidationPrice = function (leverage, ltStrategy, ltCollateral, depositCollateral) {
-        var farmLev = this.farmLev(leverage, depositCollateral);
-        return (1 -
-            (leverage - constants_1.LEVERAGE_DECIMALS - ltCollateral * (leverage - farmLev)) /
-                (ltStrategy * farmLev));
-    };
-    Strategy.prototype.ltStrategyLP = function (maxLeverage) {
-        return 1 - constants_1.LEVERAGE_DECIMALS / maxLeverage;
-    };
-    Strategy.prototype.maxLeverage = function (ltStrategyLP) {
-        var leverage = Math.floor(1 / (1 - ltStrategyLP));
-        return Math.floor(leverage * constants_1.LEVERAGE_DECIMALS);
+    Strategy.prototype.liquidationPrice = function (borrowed, collateral, lp, ltCollateral) {
+        var borrowedMoney = (0, price_1.calcTotalPrice)(borrowed.price, borrowed.amount, borrowed.decimals);
+        var collateralMoney = (0, price_1.calcTotalPrice)(collateral.price, collateral.amount, collateral.decimals)
+            .mul(ltCollateral)
+            .div(constants_1.PERCENTAGE_FACTOR);
+        var lpMoney = (0, price_1.calcTotalPrice)(lp.price, lp.amount, lp.decimals);
+        return lpMoney.gt(0)
+            ? borrowedMoney.sub(collateralMoney).mul(constants_1.WAD).div(lpMoney)
+            : ethers_1.BigNumber.from(0);
     };
     Strategy.prototype.roi = function (apy, farmLev, debtLev, borrowAPY) {
         return (apy * farmLev - borrowAPY * debtLev) / constants_1.LEVERAGE_DECIMALS;

package/lib/pathfinder/yVault.js

@@ -51,7 +51,7 @@ var YearnVaultPathFinder = /** @class */ (function () {
     }
     YearnVaultPathFinder.prototype.findWithdrawPaths = function (p) {
         return __awaiter(this, void 0, void 0, function () {
-            var vaultBalances, _i, _a, _b, yVault, tokenData, currentBalance, vaultList, multicallData, prices, i, vault, vb;
+            var vaultBalances, _i, _a, _b, yVault, tokenData, currentBalance, vaultList, multicallData, prices, i, vault, vb, tokenAddress, adapterAddress, callData;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -81,13 +81,10 @@ var YearnVaultPathFinder = /** @class */ (function () {
                             vault = vaultList[i];
                             vb = vaultBalances[vault];
                             p.balances[vb.token] = (p.balances[vb.token] || ethers_1.BigNumber.from(0)).add(ethers_1.BigNumber.from((vb === null || vb === void 0 ? void 0 : vb.balance) || 0).mul(prices[i]));
-                            // !!!!!!!!!
-                            // p.calls.push({
-                            //   targetContract:
-                            //     p.creditManager.adapters[tokenDataByNetwork[p.networkType][vault]],
-                            //   callData:
-                            //     IYVault__factory.createInterface().encodeFunctionData("withdraw()")
-                            // });
+                            tokenAddress = token_1.tokenDataByNetwork[p.networkType][vault];
+                            adapterAddress = p.creditManager.adapters[tokenAddress];
+                            callData = types_1.IYVault__factory.createInterface().encodeFunctionData("withdraw()");
+                            p.calls.push({ target: adapterAddress, callData: callData });
                         }
                         return [4 /*yield*/, p.withdrawTokens()];
                     case 2: return [2 /*return*/, _c.sent()];

package/lib/payload/creditAccount.d.ts

@@ -1,4 +1,4 @@
-import { CreditAccountDataStructOutput } from "../types/contracts/core/DataCompressor";
-export declare type TokenBalancePayload = CreditAccountDataStructOutput["balances"];
-export declare type CreditAccountDataPayload = CreditAccountDataStructOutput;
-export declare type CreditAccountDataExtendedPayload = CreditAccountDataStructOutput;
+import { CreditAccountDataStruct } from "../types/contracts/core/DataCompressor";
+export declare type TokenBalancePayload = CreditAccountDataStruct["balances"];
+export declare type CreditAccountDataPayload = CreditAccountDataStruct;
+export declare type CreditAccountDataExtendedPayload = CreditAccountDataStruct;

package/lib/payload/creditManager.d.ts

@@ -1,21 +1,11 @@
-import { BigNumberish, BigNumber } from "ethers";
-import { CreditManagerDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+import { BigNumberish } from "ethers";
+import { CreditManagerDataStruct } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
 export interface AdapterPayload {
     allowedContract: string;
     adapter: string;
 }
-export declare type CreditManagerDataPayload = CreditManagerDataStructOutput;
+export declare type CreditManagerDataPayload = CreditManagerDataStruct;
 export interface CreditManagerStatPayload extends CreditManagerDataPayload {
-    addr: string;
-    underlyingToken?: string;
-    isWETH: boolean;
-    canBorrow: boolean;
-    borrowRate: BigNumber;
-    minAmount: BigNumber;
-    maxAmount: BigNumber;
-    maxLeverageFactor: BigNumber;
-    availableLiquidity: BigNumber;
-    allowedTokens: Array<string>;
     allowedContracts?: Array<string>;
     uniqueUsers: number;
     openedAccountsCount?: number;

package/lib/payload/pool.d.ts

@@ -1,2 +1,2 @@
-import { PoolDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
-export declare type PoolDataPayload = PoolDataStructOutput;
+import { PoolDataStruct } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+export declare type PoolDataPayload = PoolDataStruct;

package/lib/tokens/token.js

@@ -151,10 +151,10 @@ exports.tokenDataByNetwork = {
         stkcvxsteCRV: "0xd8bAbB7EfBF7F931a69B209f71b27421F8b18516",
         stkcvxcrvPlain3andSUSD: "0x6b45Cab756B41a7204973b71362ef5F73E67F6DA",
         //GEARBOX
-        dDAI: "0x0d06D2e31781A0585feE334F63beF43543496e5d",
-        dUSDC: "0xcCc83353856A79c94EaDa39Df76B9c7C4c762dBF",
-        dWBTC: "0x4cCb374472C8c73b067c8c40b9420a221Ef014ca",
-        dWETH: "0x3B1e0Db6C960b32beEDf82af9db2da63F15Ba01E",
+        dDAI: "0x077a3Ce0D572b72436F6644793Fc7721353aF1f4",
+        dUSDC: "0x8147e00456c8A3128182730bFFdFd9D1E6bbC048",
+        dWBTC: "0x34D9B3c13B25632879B2DaabBde702F612902238",
+        dWETH: "0x19e4F905749D3b487CA4927b54e55b64625a1143",
         GEAR: "0xe01c5d0297c56e992dab3886057a1441485ff7c7"
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "0.0.101",
+  "version": "0.0.102",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",

package/src/apy/convexAPY.ts

@@ -28,8 +28,9 @@ import { AwaitedRes } from "../utils/types";
 import {
   SECONDS_PER_YEAR,
   WAD,
-  WAD_DECIMALS,
-  NetworkType
+  WAD_DECIMALS_POW,
+  NetworkType,
+  PRICE_DECIMALS
 } from "../core/constants";
 
 type SupportedPools = Extract<
@@ -100,8 +101,8 @@ export async function getConvexApy(
   const crvPerYear = crvPerUnderlying.mul(SECONDS_PER_YEAR);
   const cvxPerYear = getCVXMintAmount(crvPerYear, cvxSupply);
 
-  const crvAPY = crvPerYear.mul(cvxPrice).div(WAD);
-  const cvxAPY = cvxPerYear.mul(crvPrice).div(WAD);
+  const crvAPY = crvPerYear.mul(cvxPrice).div(PRICE_DECIMALS);
+  const cvxAPY = cvxPerYear.mul(crvPrice).div(PRICE_DECIMALS);
 
   const extraAPRs = await Promise.all(
     extraPoolAddresses.map(async (_, index) => {
@@ -113,7 +114,7 @@ export async function getConvexApy(
 
       const extraPrise = getTokenPrice(tokenList[extraRewardSymbol]);
 
-      const extraAPY = perYear.mul(extraPrise).div(WAD);
+      const extraAPY = perYear.mul(extraPrise).div(PRICE_DECIMALS);
 
       return extraAPY;
     })
@@ -242,7 +243,7 @@ export async function getCurveBaseApy(
 
     const { baseApy = 0 } = result.data.apys[poolName] || {};
 
-    return toBN((baseApy / RESPONSE_DECIMALS).toString(), WAD_DECIMALS);
+    return toBN((baseApy / RESPONSE_DECIMALS).toString(), WAD_DECIMALS_POW);
   } catch (e) {
     return BigNumber.from(0);
   }

package/src/apy/lidoAPY.ts

@@ -1,6 +1,8 @@
 import { providers } from "ethers";
 
 import { multicall, MCall } from "../utils/multicall";
+import { contractParams, LidoParams } from "../contracts/contracts";
+import { tokenDataByNetwork } from "../tokens/token";
 
 import { WAD, SECONDS_PER_YEAR, NetworkType } from "../core/constants";
 
@@ -15,14 +17,12 @@ type ILidoOracleInterface = ILidoOracle["interface"];
 
 type IstETHInterface = IstETH["interface"];
 
-const lidoOracleAddress: Record<NetworkType, string> = {
-  Mainnet: "0x442af784A788A5bd6F42A01Ebe9F287a871243fb",
-  Kovan: ""
-};
+const lidoOracleAddress = (contractParams.LIDO_STETH_GATEWAY as LidoParams)
+  .oracle;
 
 const lidoStEthAddress: Record<NetworkType, string> = {
-  Mainnet: "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
-  Kovan: ""
+  Mainnet: tokenDataByNetwork.Mainnet.STETH,
+  Kovan: tokenDataByNetwork.Kovan.STETH
 };
 
 export async function getLidoApy(
@@ -40,7 +40,8 @@ export async function getLidoApy(
     await geLidoData(
       lidoOracleAddress[networkType],
       lidoStEthAddress[networkType],
-      provider
+      provider,
+      networkType
     );
 
   const lidoAPRRay = postTotalPooledEther
@@ -55,27 +56,33 @@ export async function getLidoApy(
 async function geLidoData(
   lidoOracleAddress: string,
   stETHAddress: string,
-  provider: providers.Provider
+  provider: providers.Provider,
+  network: NetworkType
 ) {
-  const calls: [MCall<ILidoOracleInterface>, MCall<IstETHInterface>] = [
-    {
-      address: lidoOracleAddress,
-      interface: ILidoOracle__factory.createInterface(),
-      method: "getLastCompletedReportDelta()"
-    },
-    {
+  const calls: [MCall<ILidoOracleInterface>, ...Array<MCall<IstETHInterface>>] =
+    [
+      {
+        address: lidoOracleAddress,
+        interface: ILidoOracle__factory.createInterface(),
+        method: "getLastCompletedReportDelta()"
+      }
+    ];
+
+  if (network !== "Kovan")
+    calls.push({
       address: stETHAddress,
       interface: IstETH__factory.createInterface(),
       method: "getFee()"
-    }
-  ];
+    });
 
-  return multicall<
+  const [stats, fee = Math.floor(LIDO_FEE_DECIMALS / 10)] = await multicall<
     [
       Awaited<ReturnType<ILidoOracle["getLastCompletedReportDelta"]>>,
       Awaited<ReturnType<IstETH["getFee"]>>
     ]
   >(calls, provider);
+
+  return [stats, fee] as const;
 }
 
 export const LIDO_FEE_DECIMALS = 10000;

package/src/contracts/contractsRegister.ts

@@ -27,10 +27,25 @@ export const deployedContracts: Record<string, string> = {
   "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"
 };
 
 const contractNames = Object.entries(contractsByAddress).reduce<

package/src/core/constants.ts

@@ -22,11 +22,14 @@ export const getNetworkType = (chainId: number): NetworkType => {
   }
 };
 
-export const RAY_DECIMALS = 27;
-export const RAY = BigNumber.from(10).pow(RAY_DECIMALS);
+export const RAY_DECIMALS_POW = 27;
+export const RAY = BigNumber.from(10).pow(RAY_DECIMALS_POW);
 export const halfRAY = RAY.div(2);
-export const WAD_DECIMALS = 18;
-export const WAD = BigNumber.from(10).pow(WAD_DECIMALS);
+export const WAD_DECIMALS_POW = 18;
+export const WAD = BigNumber.from(10).pow(WAD_DECIMALS_POW);
+
+export const PRICE_DECIMALS_POW = 8;
+export const PRICE_DECIMALS = BigNumber.from(10).pow(PRICE_DECIMALS_POW);
 
 export const SECONDS_PER_YEAR = 365 * 24 * 3600;
 

package/src/core/creditAccount.ts

@@ -3,9 +3,14 @@ import {
   CreditAccountDataExtendedPayload,
   CreditAccountDataPayload
 } from "../payload/creditAccount";
-import { PERCENTAGE_FACTOR, RAY, PERCENTAGE_DECIMALS } from "./constants";
+import {
+  PERCENTAGE_FACTOR,
+  RAY,
+  PERCENTAGE_DECIMALS,
+  PRICE_DECIMALS
+} from "./constants";
 import { TokenData } from "../tokens/tokenData";
-import { priceCalc } from "./price";
+import { calcTotalPrice } from "./price";
 
 export type Balance = { address: string; balance: BigNumber };
 
@@ -62,12 +67,10 @@ export class CreditAccountData {
   }
 
   balancesSorted(
-    prices: Record<string, number>,
+    prices: Record<string, BigNumber>,
     tokens: Record<string, TokenData>
   ): Array<Balance> {
-    const safeBalances = this.balances || [];
-
-    return sortBalances(safeBalances, prices, tokens).map(
+    return sortBalances(this.balances, prices, tokens).map(
       ([address, balance]) => ({ address, balance })
     );
   }
@@ -75,7 +78,7 @@ export class CreditAccountData {
 
 export function sortBalances(
   balances: Record<string, BigNumber>,
-  prices: Record<string, number>,
+  prices: Record<string, BigNumber>,
   tokens: Record<string, TokenData>
 ) {
   return Object.entries(balances).sort(([addr1, amount1], [addr2, amount2]) => {
@@ -85,15 +88,15 @@ export function sortBalances(
     const token1 = tokens[addr1Lc];
     const token2 = tokens[addr2Lc];
 
-    const price1 = prices[addr1Lc] || 1;
-    const price2 = prices[addr2Lc] || 1;
+    const price1 = prices[addr1Lc] || PRICE_DECIMALS;
+    const price2 = prices[addr2Lc] || PRICE_DECIMALS;
 
-    const assetValue1 = priceCalc(price1, amount1, token1);
-    const assetValue2 = priceCalc(price2, amount2, token2);
+    const totalPrice1 = calcTotalPrice(price1, amount1, token1?.decimals);
+    const totalPrice2 = calcTotalPrice(price2, amount2, token2?.decimals);
 
-    return assetValue1.eq(assetValue2)
+    return totalPrice1.eq(totalPrice2)
       ? tokensAbcComparator(token1, token2)
-      : assetValue1.gt(assetValue2)
+      : totalPrice1.gt(totalPrice2)
       ? -1
       : 1;
   });

package/src/core/creditManager.ts

@@ -74,16 +74,17 @@ export class CreditManagerData {
       {}
     );
 
-    this.liquidationThresholds = payload.liquidationThresholds.reduce<
+    this.liquidationThresholds = (payload.liquidationThresholds || []).reduce<
       Record<string, BigNumber>
     >((acc, threshold, index) => {
       const address = payload.collateralTokens[index];
 
-      if (address) acc[address.toLowerCase()] = threshold;
+      if (address) acc[address.toLowerCase()] = BigNumber.from(threshold);
 
       return acc;
     }, {});
-    this.version = payload.version || 1;
+
+    this.version = BigNumber.from(payload.version || 1).toNumber();
     this.creditFacade = payload.creditFacade || "";
     this.isDegenMode = payload.isDegenMode || false;
     this.degenNFT = payload.degenNFT || "";

package/src/core/price.ts

@@ -1,16 +1,9 @@
 import { BigNumber } from "ethers";
-import { TokenData } from "../tokens/tokenData";
 
-export const PRICE_DECIMALS = 1000;
-
-export const priceCalc = (
-  price: number,
+export const calcTotalPrice = (
+  price: BigNumber,
   amount: BigNumber,
-  token: TokenData | undefined
+  decimals: number = 18
 ) => {
-  const { decimals = 18 } = token || {};
-
-  return amount
-    .mul(Math.floor(PRICE_DECIMALS * price))
-    .div(BigNumber.from(10).pow(decimals));
+  return amount.mul(price).div(BigNumber.from(10).pow(decimals));
 };

package/src/core/strategy.ts

@@ -1,4 +1,6 @@
-import { LEVERAGE_DECIMALS } from "../core/constants";
+import { BigNumber } from "ethers";
+import { LEVERAGE_DECIMALS, PERCENTAGE_FACTOR, WAD } from "../core/constants";
+import { calcTotalPrice } from "../core/price";
 
 export interface StrategyPayload {
   apy?: number;
@@ -19,6 +21,12 @@ interface PoolStats {
 
 type PoolList = Record<string, PoolStats>;
 
+interface TokenDescription {
+  price: BigNumber;
+  amount: BigNumber;
+  decimals: number | undefined;
+}
+
 export class Strategy {
   apy: number | undefined;
 
@@ -42,7 +50,7 @@ export class Strategy {
     this.baseAssets = payload.baseAssets;
   }
 
-  public roiMax(apy: number, maxLeverage: number, poolApy: PoolList) {
+  public maxAPY(apy: number, maxLeverage: number, poolApy: PoolList) {
     const minApy = this.minBorrowApy(poolApy);
 
     return this.roi(apy, maxLeverage, maxLeverage - LEVERAGE_DECIMALS, minApy);
@@ -60,29 +68,28 @@ export class Strategy {
   }
 
   public liquidationPrice(
-    leverage: number,
-
-    ltStrategy: number,
-    ltCollateral: number,
-
-    depositCollateral: string
+    borrowed: TokenDescription,
+    collateral: TokenDescription,
+    lp: TokenDescription,
+    ltCollateral: BigNumber
   ) {
-    const farmLev = this.farmLev(leverage, depositCollateral);
-
-    return (
-      1 -
-      (leverage - LEVERAGE_DECIMALS - ltCollateral * (leverage - farmLev)) /
-        (ltStrategy * farmLev)
+    const borrowedMoney = calcTotalPrice(
+      borrowed.price,
+      borrowed.amount,
+      borrowed.decimals
     );
-  }
-
-  public ltStrategyLP(maxLeverage: number) {
-    return 1 - LEVERAGE_DECIMALS / maxLeverage;
-  }
-
-  public maxLeverage(ltStrategyLP: number) {
-    const leverage = Math.floor(1 / (1 - ltStrategyLP));
-    return Math.floor(leverage * LEVERAGE_DECIMALS);
+    const collateralMoney = calcTotalPrice(
+      collateral.price,
+      collateral.amount,
+      collateral.decimals
+    )
+      .mul(ltCollateral)
+      .div(PERCENTAGE_FACTOR);
+    const lpMoney = calcTotalPrice(lp.price, lp.amount, lp.decimals);
+
+    return lpMoney.gt(0)
+      ? borrowedMoney.sub(collateralMoney).mul(WAD).div(lpMoney)
+      : BigNumber.from(0);
   }
 
   private roi(

package/src/pathfinder/yVault.ts

@@ -61,13 +61,13 @@ export class YearnVaultPathFinder implements LPWithdrawPathFinder {
         BigNumber.from(vb?.balance || 0).mul(prices[i])
       );
 
-      // !!!!!!!!!
-      // p.calls.push({
-      //   targetContract:
-      //     p.creditManager.adapters[tokenDataByNetwork[p.networkType][vault]],
-      //   callData:
-      //     IYVault__factory.createInterface().encodeFunctionData("withdraw()")
-      // });
+      const tokenAddress = tokenDataByNetwork[p.networkType][vault];
+      const adapterAddress = p.creditManager.adapters[tokenAddress];
+
+      const callData =
+        IYVault__factory.createInterface().encodeFunctionData("withdraw()");
+
+      p.calls.push({ target: adapterAddress, callData });
     }
 
     return await p.withdrawTokens();

package/src/payload/creditAccount.ts

@@ -1,7 +1,7 @@
-import { CreditAccountDataStructOutput } from "../types/contracts/core/DataCompressor";
+import { CreditAccountDataStruct } from "../types/contracts/core/DataCompressor";
 
-export type TokenBalancePayload = CreditAccountDataStructOutput["balances"];
+export type TokenBalancePayload = CreditAccountDataStruct["balances"];
 
-export type CreditAccountDataPayload = CreditAccountDataStructOutput;
+export type CreditAccountDataPayload = CreditAccountDataStruct;
 
-export type CreditAccountDataExtendedPayload = CreditAccountDataStructOutput;
+export type CreditAccountDataExtendedPayload = CreditAccountDataStruct;

package/src/payload/creditManager.ts

@@ -1,24 +1,14 @@
-import { BigNumberish, BigNumber } from "ethers";
-import { CreditManagerDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+import { BigNumberish } from "ethers";
+import { CreditManagerDataStruct } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
 
 export interface AdapterPayload {
   allowedContract: string;
   adapter: string;
 }
 
-export type CreditManagerDataPayload = CreditManagerDataStructOutput;
+export type CreditManagerDataPayload = CreditManagerDataStruct;
 
 export interface CreditManagerStatPayload extends CreditManagerDataPayload {
-  addr: string;
-  underlyingToken?: string;
-  isWETH: boolean;
-  canBorrow: boolean;
-  borrowRate: BigNumber;
-  minAmount: BigNumber;
-  maxAmount: BigNumber;
-  maxLeverageFactor: BigNumber;
-  availableLiquidity: BigNumber;
-  allowedTokens: Array<string>;
   allowedContracts?: Array<string>;
   uniqueUsers: number;
   openedAccountsCount?: number;

package/src/payload/pool.ts

@@ -1,3 +1,3 @@
-import { PoolDataStructOutput } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
+import { PoolDataStruct } from "../types/contracts/interfaces/IDataCompressor.sol/IDataCompressor";
 
-export type PoolDataPayload = PoolDataStructOutput;
+export type PoolDataPayload = PoolDataStruct;

package/src/tokens/token.ts

@@ -218,10 +218,10 @@ export const tokenDataByNetwork: Record<
     stkcvxcrvPlain3andSUSD: "0x6b45Cab756B41a7204973b71362ef5F73E67F6DA",
 
     //GEARBOX
-    dDAI: "0x0d06D2e31781A0585feE334F63beF43543496e5d",
-    dUSDC: "0xcCc83353856A79c94EaDa39Df76B9c7C4c762dBF",
-    dWBTC: "0x4cCb374472C8c73b067c8c40b9420a221Ef014ca",
-    dWETH: "0x3B1e0Db6C960b32beEDf82af9db2da63F15Ba01E",
+    dDAI: "0x077a3Ce0D572b72436F6644793Fc7721353aF1f4",
+    dUSDC: "0x8147e00456c8A3128182730bFFdFd9D1E6bbC048",
+    dWBTC: "0x34D9B3c13B25632879B2DaabBde702F612902238",
+    dWETH: "0x19e4F905749D3b487CA4927b54e55b64625a1143",
 
     GEAR: "0xe01c5d0297c56e992dab3886057a1441485ff7c7"
   }