@gearbox-protocol/sdk 0.0.101 → 0.0.104

package/lib/tokens/token.js

@@ -80,7 +80,7 @@ exports.tokenDataByNetwork = {
         yvWBTC: "0xA696a63cc78DfFa1a63E9E50587C197387FF6C7E",
         yvCurve_stETH: "0xdCD90C7f6324cfa40d7169ef80b12031770B4325",
         yvCurve_FRAX: "0xB4AdA607B9d6b2c9Ee07A275e9616B84AC560139",
-        //GEARBOX
+        // GEARBOX
         dDAI: "0x6CFaF95457d7688022FC53e7AbE052ef8DFBbdBA",
         dUSDC: "0xc411dB5f5Eb3f7d552F9B8454B2D74097ccdE6E3",
         dWBTC: "0xe753260F1955e8678DCeA8887759e07aa57E8c54",
@@ -150,15 +150,15 @@ exports.tokenDataByNetwork = {
         stkcvxgusd3CRV: "0x9A74e8106f6c28b21b1B6a0F985cf1227BE05F04",
         stkcvxsteCRV: "0xd8bAbB7EfBF7F931a69B209f71b27421F8b18516",
         stkcvxcrvPlain3andSUSD: "0x6b45Cab756B41a7204973b71362ef5F73E67F6DA",
-        //GEARBOX
-        dDAI: "0x0d06D2e31781A0585feE334F63beF43543496e5d",
-        dUSDC: "0xcCc83353856A79c94EaDa39Df76B9c7C4c762dBF",
-        dWBTC: "0x4cCb374472C8c73b067c8c40b9420a221Ef014ca",
-        dWETH: "0x3B1e0Db6C960b32beEDf82af9db2da63F15Ba01E",
+        // GEARBOX
+        dDAI: "0x077a3Ce0D572b72436F6644793Fc7721353aF1f4",
+        dUSDC: "0x8147e00456c8A3128182730bFFdFd9D1E6bbC048",
+        dWBTC: "0x34D9B3c13B25632879B2DaabBde702F612902238",
+        dWETH: "0x19e4F905749D3b487CA4927b54e55b64625a1143",
         GEAR: "0xe01c5d0297c56e992dab3886057a1441485ff7c7"
     }
 };
 exports.tokenSymbolByAddress = (0, mappers_1.objectEntries)(exports.tokenDataByNetwork).reduce(function (acc, _a) {
-    var _ = _a[0], tokens = _a[1];
-    return __assign(__assign({}, acc), (0, mappers_1.filterEmptyKeys)((0, mappers_1.keyToLowercase)((0, mappers_1.swapKeyValue)(tokens))));
+    var tokens = _a[1];
+    return (__assign(__assign({}, acc), (0, mappers_1.filterEmptyKeys)((0, mappers_1.keyToLowercase)((0, mappers_1.swapKeyValue)(tokens)))));
 }, {});

package/lib/tokens/tokenData.d.ts

@@ -2,13 +2,14 @@ import { BigNumber } from "ethers";
 import { TokenDataPayload } from "../payload/token";
 import { NetworkType } from "../core/constants";
 import { SupportedToken } from "./token";
+declare type SymbolReplacements = Record<string, string>;
 export declare class TokenData {
     readonly id: string;
     readonly symbol: string;
     readonly address: string;
     readonly decimals: number;
     readonly icon?: string;
-    constructor(payload: TokenDataPayload);
+    constructor(payload: TokenDataPayload, symbolReplacements?: SymbolReplacements);
     compareBySymbol(b: TokenData): number;
 }
 export interface TokenBalance {
@@ -22,3 +23,4 @@ export interface TokenAllowance {
 export declare const WETHToken: Record<NetworkType, string>;
 export declare const connectors: Record<NetworkType, Array<SupportedToken>>;
 export declare function getConnectors(networkType: NetworkType): string[];
+export {};

package/lib/tokens/tokenData.js

@@ -3,16 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConnectors = exports.connectors = exports.WETHToken = exports.TokenData = void 0;
 var config_1 = require("../config");
 var token_1 = require("./token");
+var defaultSymbolReplacement = {
+    dWETH: "dETH",
+    WETH: "ETH"
+};
 var TokenData = /** @class */ (function () {
-    function TokenData(payload) {
+    function TokenData(payload, symbolReplacements) {
+        if (symbolReplacements === void 0) { symbolReplacements = defaultSymbolReplacement; }
         var _a;
         this.id = payload.addr;
         this.address = payload.addr;
         // this.name = payload.name;
-        this.symbol = payload.symbol;
-        if (this.symbol === "WETH" || this.symbol === "dWETH") {
-            this.symbol = this.symbol.replace("WETH", "ETH");
-        }
+        this.symbol = symbolReplacements[payload.symbol] || payload.symbol;
         this.decimals = payload.decimals;
         this.icon = "".concat(config_1.STATIC_TOKEN).concat((_a = payload.symbol) === null || _a === void 0 ? void 0 : _a.toLowerCase(), ".svg");
     }
@@ -24,7 +26,7 @@ var TokenData = /** @class */ (function () {
 exports.TokenData = TokenData;
 exports.WETHToken = {
     Mainnet: "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-    Kovan: "0xd0a1e359811322d97991e03f863a0c30c2cf029c",
+    Kovan: "0xd0a1e359811322d97991e03f863a0c30c2cf029c"
 };
 exports.connectors = {
     Mainnet: [
@@ -33,7 +35,7 @@ exports.connectors = {
         "DAI",
         "USDC",
         // "USDT",
-        "WBTC",
+        "WBTC"
         // "stETH",
         // "PAX",
         // "TUSD",
@@ -41,7 +43,7 @@ exports.connectors = {
         // "BAL",
         // "sUSD",
     ],
-    Kovan: ["WETH", "DAI", "USDC", "WBTC"],
+    Kovan: ["WETH", "DAI", "USDC", "WBTC"]
 };
 function getConnectors(networkType) {
     return exports.connectors[networkType].map(function (e) {

package/lib/tokens/yearn.d.ts

@@ -1,6 +1,7 @@
+import type { YearnVaultContract } from "src/contracts/contracts";
 import { TradeAction } from "../pathfinder/tradeTypes";
-import { TokenBase } from "./token";
-import { CurveLPToken } from "./curveLP";
+import type { TokenBase } from "./token";
+import type { CurveLPToken } from "./curveLP";
 import { NormalToken } from "./normal";
 import { TokenType } from "./tokenType";
 export declare type YearnLPToken = "yvDAI" | "yvUSDC" | "yvWETH" | "yvWBTC" | "yvCurve_stETH" | "yvCurve_FRAX";
@@ -9,17 +10,20 @@ export declare type YearnVaultTokenData = {
     type: TokenType.YEARN_VAULT;
     underlying: NormalToken;
     lpActions: Array<TradeAction>;
+    vault: YearnVaultContract;
 } & TokenBase;
 export declare type YearnVaultOfCurveLPTokenData = {
     symbol: YearnLPToken;
     type: TokenType.YEARN_VAULT_OF_CURVE_LP;
     underlying: CurveLPToken;
     lpActions: Array<TradeAction>;
+    vault: YearnVaultContract;
 } & TokenBase;
 export declare type YearnVaultOfMetaCurveLPTokenData = {
     symbol: YearnLPToken;
     type: TokenType.YEARN_VAULT_OF_META_CURVE_LP;
     underlying: CurveLPToken;
     lpActions: Array<TradeAction>;
+    vault: YearnVaultContract;
 } & TokenBase;
 export declare const yearnTokens: Record<YearnLPToken, YearnVaultTokenData | YearnVaultOfCurveLPTokenData | YearnVaultOfMetaCurveLPTokenData>;

package/lib/tokens/yearn.js

@@ -11,6 +11,7 @@ exports.yearnTokens = {
         symbol: "yvDAI",
         type: tokenType_1.TokenType.YEARN_VAULT,
         underlying: "DAI",
+        vault: "YEARN_DAI_VAULT",
         lpActions: [
             {
                 type: tradeTypes_1.TradeType.YearnWithdraw,
@@ -25,6 +26,7 @@ exports.yearnTokens = {
         symbol: "yvUSDC",
         type: tokenType_1.TokenType.YEARN_VAULT,
         underlying: "USDC",
+        vault: "YEARN_USDC_VAULT",
         lpActions: [
             {
                 type: tradeTypes_1.TradeType.YearnWithdraw,
@@ -39,6 +41,7 @@ exports.yearnTokens = {
         symbol: "yvWETH",
         type: tokenType_1.TokenType.YEARN_VAULT,
         underlying: "WETH",
+        vault: "YEARN_WETH_VAULT",
         lpActions: [
             {
                 type: tradeTypes_1.TradeType.YearnWithdraw,
@@ -53,6 +56,7 @@ exports.yearnTokens = {
         symbol: "yvWBTC",
         type: tokenType_1.TokenType.YEARN_VAULT,
         underlying: "WBTC",
+        vault: "YEARN_WBTC_VAULT",
         lpActions: [
             {
                 type: tradeTypes_1.TradeType.YearnWithdraw,
@@ -68,6 +72,7 @@ exports.yearnTokens = {
         symbol: "yvCurve_stETH",
         type: tokenType_1.TokenType.YEARN_VAULT_OF_CURVE_LP,
         underlying: "steCRV",
+        vault: "YEARN_CURVE_STETH_VAULT",
         lpActions: [
             {
                 type: tradeTypes_1.TradeType.YearnWithdraw,
@@ -82,6 +87,7 @@ exports.yearnTokens = {
         symbol: "yvCurve_FRAX",
         type: tokenType_1.TokenType.YEARN_VAULT_OF_META_CURVE_LP,
         underlying: "FRAX3CRV",
+        vault: "YEARN_CURVE_FRAX_VAULT",
         lpActions: [
             {
                 type: tradeTypes_1.TradeType.YearnWithdraw,

package/lib/utils/errors.d.ts

@@ -0,0 +1,6 @@
+interface IMetamaskError {
+    code: number;
+    message: string;
+}
+export declare const isMetamaskError: (e: any) => e is IMetamaskError;
+export {};

package/lib/utils/errors.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMetamaskError = void 0;
+var isMetamaskError = function (e) {
+    if (!e)
+        return false;
+    if (typeof e !== "object")
+        return false;
+    if (typeof e.code !== "number" || typeof e.message !== "string")
+        return false;
+    return true;
+};
+exports.isMetamaskError = isMetamaskError;

package/lib/utils/formatter.d.ts

@@ -1,7 +1,7 @@
 import { BigNumber, BigNumberish } from "ethers";
 export declare function rayToNumber(num: BigNumberish): number;
 export declare function formatRAY(num?: BigNumber): string;
-export declare function formatBN(num: BigNumberish | undefined, decimals: number, precision?: number): string;
+export declare function formatBN(numArg: BigNumberish | undefined, decimals: number, precisionArg?: number): string;
 export declare function formatBn4dig(num: BigNumber, precision?: number): string;
 export declare function toHumanFormat(num: BigNumber, precision?: number): string;
 export declare function toSignificant(num: BigNumber, decimals: number): string;

package/lib/utils/formatter.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatLeverage = exports.formatHf = exports.formatDate = exports.formatRate = exports.shortHash = exports.shortAddress = exports.toBN = exports.toSignificant = exports.toHumanFormat = exports.formatBn4dig = exports.formatBN = exports.formatRAY = exports.rayToNumber = void 0;
 var ethers_1 = require("ethers");
-var constants_1 = require("../core/constants");
 var decimal_js_light_1 = __importDefault(require("decimal.js-light"));
+var constants_1 = require("../core/constants");
 function rayToNumber(num) {
     return (ethers_1.BigNumber.from(num).div(ethers_1.BigNumber.from(10).pow(21)).toNumber() / 1000000);
 }
@@ -15,7 +15,9 @@ function formatRAY(num) {
     return toSignificant(num || ethers_1.BigNumber.from(0), 27);
 }
 exports.formatRAY = formatRAY;
-function formatBN(num, decimals, precision) {
+function formatBN(numArg, decimals, precisionArg) {
+    var num = numArg;
+    var precision = precisionArg;
     if (!num)
         return "-";
     // if (BigNumber.from(num).gt(BigNumber.from(10).pow(37))) {
@@ -54,22 +56,20 @@ function formatBn4dig(num, precision) {
     if (numStr.length < 6)
         numStr = "0".repeat(6 - numStr.length) + numStr;
     return numStr.length <= 6
-        ? "0." + numStr.slice(0, precision)
-        : numStr.slice(0, numStr.length - 6) +
-            "." +
-            numStr.slice(numStr.length - 6, numStr.length - 6 + precision);
+        ? "0.".concat(numStr.slice(0, precision))
+        : "".concat(numStr.slice(0, numStr.length - 6), ".").concat(numStr.slice(numStr.length - 6, numStr.length - 6 + precision));
 }
 exports.formatBn4dig = formatBn4dig;
 function toHumanFormat(num, precision) {
     if (precision === void 0) { precision = 2; }
     if (num.gte(1e15)) {
-        return formatBn4dig(num.div(1e9), precision) + "Bn";
+        return "".concat(formatBn4dig(num.div(1e9), precision), "Bn");
     }
     if (num.gte(1e12)) {
-        return formatBn4dig(num.div(1e6), precision) + "M";
+        return "".concat(formatBn4dig(num.div(1e6), precision), "M");
     }
     if (num.gte(1e9)) {
-        return formatBn4dig(num.div(1e3), precision) + "K";
+        return "".concat(formatBn4dig(num.div(1e3), precision), "K");
     }
     return formatBn4dig(num, precision);
 }
@@ -102,20 +102,23 @@ function shortHash(address) {
 exports.shortHash = shortHash;
 var formatRate = function (rate) {
     return rate
-        ? (ethers_1.BigNumber.from(rate)
+        ? "".concat((ethers_1.BigNumber.from(rate)
             .mul(constants_1.PERCENTAGE_FACTOR)
             .mul(100)
             .div(constants_1.RAY)
-            .toNumber() / constants_1.PERCENTAGE_FACTOR).toFixed(2) + "%"
+            .toNumber() / constants_1.PERCENTAGE_FACTOR).toFixed(2), "%")
         : "0.00%";
 };
 exports.formatRate = formatRate;
 function formatDate(date) {
-    var d = new Date(date), month = "" + (d.getMonth() + 1), day = "" + d.getDate(), year = d.getFullYear();
+    var d = new Date(date);
+    var month = "".concat(d.getMonth() + 1);
+    var day = "".concat(d.getDate());
+    var year = d.getFullYear();
     if (month.length < 2)
-        month = "0" + month;
+        month = "0".concat(month);
     if (day.length < 2)
-        day = "0" + day;
+        day = "0".concat(day);
     return [year, month, day].join("-");
 }
 exports.formatDate = formatDate;

package/lib/utils/loading.d.ts

@@ -1 +1,2 @@
-export declare function loadingProgress(...params: Array<unknown>): number;
+export declare function allLoaded(itemsToLoad: Array<unknown>): boolean;
+export declare function loadingProgress(itemsToLoad: Array<unknown>): number;

package/lib/utils/loading.js

@@ -1,17 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadingProgress = void 0;
-function loadingProgress() {
-    var params = [];
-    for (var _i = 0; _i < arguments.length; _i++) {
-        params[_i] = arguments[_i];
-    }
-    var isLoaded = 0;
-    for (var _a = 0, params_1 = params; _a < params_1.length; _a++) {
-        var item = params_1[_a];
-        if (item !== undefined)
-            isLoaded++;
-    }
-    return Math.floor((isLoaded / params.length) * 100);
+exports.loadingProgress = exports.allLoaded = void 0;
+var isLoaded = function (v) { return v !== undefined; };
+function allLoaded(itemsToLoad) {
+    return itemsToLoad.reduce(function (acc, item) { return acc && isLoaded(item); }, true);
+}
+exports.allLoaded = allLoaded;
+function loadingProgress(itemsToLoad) {
+    var loaded = itemsToLoad.reduce(function (acc, item) { return (isLoaded(item) ? acc + 1 : acc); }, 0);
+    return Math.floor((loaded / itemsToLoad.length) * 100);
 }
 exports.loadingProgress = loadingProgress;

package/lib/utils/mappers.js

@@ -18,7 +18,7 @@ var swapKeyValue = function (o) {
     return objectEntries(o).reduce(function (acc, _a) {
         var _b;
         var key = _a[0], value = _a[1];
-        return __assign(__assign({}, acc), (_b = {}, _b[value] = key, _b));
+        return (__assign(__assign({}, acc), (_b = {}, _b[value] = key, _b)));
     }, {});
 };
 exports.swapKeyValue = swapKeyValue;
@@ -35,7 +35,7 @@ var filterEmptyKeys = function (o) {
     return objectEntries(o).reduce(function (acc, _a) {
         var _b;
         var key = _a[0], value = _a[1];
-        return !!key ? __assign(__assign({}, acc), (_b = {}, _b[key] = value, _b)) : acc;
+        return (key ? __assign(__assign({}, acc), (_b = {}, _b[key] = value, _b)) : acc);
     }, {});
 };
 exports.filterEmptyKeys = filterEmptyKeys;

package/lib/utils/network.js

@@ -48,7 +48,7 @@ function detectNetwork(provider) {
                 case 0:
                     _c.trys.push([0, 2, , 7]);
                     usdcMainnet = types_1.ERC20__factory.connect(token_1.tokenDataByNetwork.Mainnet.USDC, provider);
-                    return [4 /*yield*/, usdcMainnet.balanceOf(constants_1.ADDRESS_0x0)];
+                    return [4 /*yield*/, usdcMainnet.balanceOf(constants_1.ADDRESS_0X0)];
                 case 1:
                     _c.sent();
                     return [2 /*return*/, "Mainnet"];
@@ -58,7 +58,7 @@ function detectNetwork(provider) {
                 case 3:
                     _c.trys.push([3, 5, , 6]);
                     usdcMainnet = types_1.ERC20__factory.connect(token_1.tokenDataByNetwork.Kovan.USDC, provider);
-                    return [4 /*yield*/, usdcMainnet.balanceOf(constants_1.ADDRESS_0x0)];
+                    return [4 /*yield*/, usdcMainnet.balanceOf(constants_1.ADDRESS_0X0)];
                 case 4:
                     _c.sent();
                     return [2 /*return*/, "Kovan"];

package/lib/utils/repeater.js

@@ -40,32 +40,20 @@ exports.callRepeater = void 0;
 function callRepeater(call, step) {
     if (step === void 0) { step = 0; }
     return __awaiter(this, void 0, void 0, function () {
-        var _this = this;
         return __generator(this, function (_a) {
-            return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                    var _a, e_1;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
-                            case 0:
-                                _b.trys.push([0, 2, , 3]);
-                                _a = resolve;
-                                return [4 /*yield*/, call()];
-                            case 1:
-                                _a.apply(void 0, [_b.sent()]);
-                                return [3 /*break*/, 3];
-                            case 2:
-                                e_1 = _b.sent();
-                                console.error("Error ".concat(step, ": ").concat(e_1));
-                                if (step > 5 || e_1.code !== -32000)
-                                    reject(e_1);
-                                else {
-                                    setTimeout(function () { return resolve(callRepeater(call, step + 1)); }, 200);
-                                }
-                                return [3 /*break*/, 3];
-                            case 3: return [2 /*return*/];
+            return [2 /*return*/, new Promise(function (resolve, reject) {
+                    try {
+                        call().then(function (r) { return resolve(r); });
+                    }
+                    catch (e) {
+                        console.error("Error ".concat(step, ": ").concat(e));
+                        if (step > 5 || e.code !== -32000)
+                            reject(e);
+                        else {
+                            setTimeout(function () { return resolve(callRepeater(call, step + 1)); }, 200);
                         }
-                    });
-                }); })];
+                    }
+                })];
         });
     });
 }

package/lib/utils/validate.js

@@ -6,7 +6,7 @@ function isPositiveFloat(val) {
     if (!floatRegex.test(val))
         return false;
     var valF = parseFloat(val);
-    if (isNaN(valF))
+    if (Number.isNaN(valF))
         return false;
     return true;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "0.0.101",
+  "version": "0.0.104",
   "description": "Gearbox SDK",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -9,22 +9,39 @@
   "scripts": {
     "build": "tsc",
     "dev": "tsc -w",
-    "pub": "rm -rf ./src/types/hardhat.ts && cp ./src/types/*.d.ts ./lib/types && tsc && yarn publish"
+    "pub": "rm -rf ./src/types/hardhat.ts && cp ./src/types/*.d.ts ./lib/types && tsc && yarn publish",
+    "lint": "eslint . --ext .tsx,.ts --fix",
+    "prepush": "yarn lint --max-warnings=0",
+    "prepare": "husky install"
   },
   "dependencies": {
     "decimal.js-light": "^2.5.1",
     "moment": "^2.29.1"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.4",
-    "@types/node": "^14.0.23",
+    "@types/jest": "^26.0.15",
+    "@types/node": "^17.0.41",
+    "@typescript-eslint/eslint-plugin": "^5.7.0",
+    "@typescript-eslint/parser": "^5.7.0",
     "axios": "^0.27.2",
     "dotenv": "^16.0.1",
-    "ethers": "^5.6.5",
+    "eslint": "^7.11.0",
+    "eslint-config-airbnb": "^19.0.2",
+    "eslint-config-airbnb-typescript": "^16.1.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-import-resolver-typescript": "^2.5.0",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsx-a11y": "^6.5.1",
+    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-react": "^7.27.1",
+    "eslint-plugin-react-hooks": "^4.3.0",
+    "ethers": "5.6.9",
+    "husky": "^8.0.0",
+    "husky-init": "^8.0.0",
     "jest": "^26.1.0",
-    "prettier": "^2.3.0",
+    "prettier": "^2.7.1",
     "ts-node": "^10.1.0",
     "tslog": "^3.3.3",
-    "typescript": "^4.2.4"
+    "typescript": "^4.7.3"
   }
 }

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<
@@ -72,14 +73,14 @@ export async function getConvexApy(
     poolParams.stakedToken
   ] as ConvexPhantomTokenData;
 
-  const underlying = stakedTokenParams.underlying;
+  const { underlying } = stakedTokenParams;
   const basePoolAddress = contractsList[pool];
   const swapPoolAddress = contractsList[curveSwapByPool[pool]];
   const cvxAddress = tokenList.CVX;
 
-  const extraPoolAddresses = poolParams.extraRewards.map(d => {
-    return d.poolAddress[networkType];
-  });
+  const extraPoolAddresses = poolParams.extraRewards.map(
+    d => d.poolAddress[networkType]
+  );
 
   const [basePoolRate, basePoolSupply, vPrice, cvxSupply, ...extra] =
     await getPoolData(
@@ -90,8 +91,8 @@ export async function getConvexApy(
       provider
     );
 
-  const cvxPrice = getTokenPrice(tokenList["CVX"]);
-  const crvPrice = getTokenPrice(tokenList["CRV"]);
+  const cvxPrice = getTokenPrice(tokenList.CVX);
+  const crvPrice = getTokenPrice(tokenList.CRV);
 
   const crvPerSecond = basePoolRate;
   const virtualSupply = basePoolSupply.mul(vPrice).div(WAD);
@@ -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,32 +17,32 @@ type ILidoOracleInterface = ILidoOracle["interface"];
 
 type IstETHInterface = IstETH["interface"];
 
-const lidoOracleAddress: Record<NetworkType, string> = {
-  Mainnet: "0x442af784A788A5bd6F42A01Ebe9F287a871243fb",
-  Kovan: ""
-};
+const lidoOracles = (contractParams.LIDO_STETH_GATEWAY as LidoParams).oracle;
 
-const lidoStEthAddress: Record<NetworkType, string> = {
-  Mainnet: "0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84",
-  Kovan: ""
+const lidoStEth: Record<NetworkType, string> = {
+  Mainnet: tokenDataByNetwork.Mainnet.STETH,
+  Kovan: tokenDataByNetwork.Kovan.STETH
 };
 
 export async function getLidoApy(
   provider: providers.Provider,
   networkType: NetworkType
 ) {
-  if (!lidoOracleAddress[networkType]) {
-    throw `No Lido APR oracle found on current network: ${networkType}`;
+  if (!lidoOracles[networkType]) {
+    throw new Error(
+      `No Lido APR oracle found on current network: ${networkType}`
+    );
   }
-  if (!lidoStEthAddress[networkType]) {
-    throw `No Lido stETH found on current network: ${networkType}`;
+  if (!lidoStEth[networkType]) {
+    throw new Error(`No Lido stETH found on current network: ${networkType}`);
   }
 
   const [{ postTotalPooledEther, preTotalPooledEther, timeElapsed }, fee] =
     await geLidoData(
-      lidoOracleAddress[networkType],
-      lidoStEthAddress[networkType],
-      provider
+      lidoOracles[networkType],
+      lidoStEth[networkType],
+      provider,
+      networkType
     );
 
   const lidoAPRRay = postTotalPooledEther
@@ -52,30 +54,36 @@ export async function getLidoApy(
   return [lidoAPRRay, fee] as const;
 }
 
+export const LIDO_FEE_DECIMALS = 10000;
+
 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);
-}
 
-export const LIDO_FEE_DECIMALS = 10000;
+  return [stats, fee] as const;
+}