@gearbox-protocol/sdk 0.0.54 → 0.0.55

package/lib/core/transactions.js

@@ -72,7 +72,7 @@ var TxAddLiquidity = /** @class */ (function (_super) {
         return _this;
     }
     TxAddLiquidity.prototype.toString = function (tokenData) {
-        var token = tokenData[this.underlyingToken];
+        var token = tokenData[this.underlyingToken.toLowerCase()];
         return "".concat((0, contractsRegister_1.getContractName)(this.pool), ": Deposit ").concat((0, formatter_1.formatBN)(this.amount, (token === null || token === void 0 ? void 0 : token.decimals) || 18), " ").concat((token === null || token === void 0 ? void 0 : token.symbol) || "");
     };
     TxAddLiquidity.prototype.serialize = function () {
@@ -99,7 +99,7 @@ var TxRemoveLiquidity = /** @class */ (function (_super) {
         return _this;
     }
     TxRemoveLiquidity.prototype.toString = function (tokenData) {
-        var dtoken = tokenData[this.dieselToken];
+        var dtoken = tokenData[this.dieselToken.toLowerCase()];
         return "".concat((0, contractsRegister_1.getContractName)(this.pool), ": Withdraw ").concat((0, formatter_1.formatBN)(this.amount, (dtoken === null || dtoken === void 0 ? void 0 : dtoken.decimals) || 18), " ").concat((dtoken === null || dtoken === void 0 ? void 0 : dtoken.symbol) || "");
     };
     TxRemoveLiquidity.prototype.serialize = function () {
@@ -130,10 +130,10 @@ var TXSwap = /** @class */ (function (_super) {
         return _this;
     }
     TXSwap.prototype.toString = function (tokenData) {
-        var tokenFrom = tokenData[this.tokenFrom];
+        var tokenFrom = tokenData[this.tokenFrom.toLowerCase()];
         var toPart = "";
         if (this.tokenTo && this.amountTo) {
-            var tokenTo = tokenData[this.tokenTo];
+            var tokenTo = tokenData[this.tokenTo.toLowerCase()];
             toPart = " \u21D2  ".concat((0, formatter_1.formatBN)(this.amountTo, (tokenTo === null || tokenTo === void 0 ? void 0 : tokenTo.decimals) || 18), " ").concat((tokenTo === null || tokenTo === void 0 ? void 0 : tokenTo.symbol) || "");
         }
         return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": ").concat(this.operation, " ").concat((0, formatter_1.formatBN)(this.amountFrom, (tokenFrom === null || tokenFrom === void 0 ? void 0 : tokenFrom.decimals) || 18), " ").concat((tokenFrom === null || tokenFrom === void 0 ? void 0 : tokenFrom.symbol) || "", " ").concat(toPart, " on ").concat((0, contractsRegister_1.getContractName)(this.protocol));
@@ -162,7 +162,7 @@ var TxAddCollateral = /** @class */ (function (_super) {
         return _this;
     }
     TxAddCollateral.prototype.toString = function (tokenData) {
-        var addedToken = tokenData[this.addedToken];
+        var addedToken = tokenData[this.addedToken.toLowerCase()];
         return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": Added ").concat((0, formatter_1.formatBN)(this.amount, addedToken.decimals), " ").concat(addedToken.symbol, " as collateral");
     };
     TxAddCollateral.prototype.serialize = function () {
@@ -189,7 +189,7 @@ var TxIncreaseBorrowAmount = /** @class */ (function (_super) {
         return _this;
     }
     TxIncreaseBorrowAmount.prototype.toString = function (tokenData) {
-        var token = tokenData[this.underlyingToken];
+        var token = tokenData[this.underlyingToken.toLowerCase()];
         return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": Borrowed amount was increased for ").concat((0, formatter_1.formatBN)(this.amount, (token === null || token === void 0 ? void 0 : token.decimals) || 18), " ").concat(token === null || token === void 0 ? void 0 : token.symbol);
     };
     TxIncreaseBorrowAmount.prototype.serialize = function () {
@@ -217,7 +217,7 @@ var TxOpenAccount = /** @class */ (function (_super) {
         return _this;
     }
     TxOpenAccount.prototype.toString = function (tokenData) {
-        var token = tokenData[this.underlyingToken];
+        var token = tokenData[this.underlyingToken.toLowerCase()];
         return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": opening ").concat((0, formatter_1.formatBN)(this.amount, (token === null || token === void 0 ? void 0 : token.decimals) || 18), " ").concat(token === null || token === void 0 ? void 0 : token.symbol, " x ").concat(this.leverage.toFixed(2), " \u21D2 \n    ").concat((0, formatter_1.formatBN)(this.amount
             .mul(Math.floor(this.leverage * constants_1.LEVERAGE_DECIMALS))
             .div(constants_1.LEVERAGE_DECIMALS), (token === null || token === void 0 ? void 0 : token.decimals) || 18), " ").concat(token === null || token === void 0 ? void 0 : token.symbol);
@@ -243,7 +243,7 @@ var TxRepayAccount = /** @class */ (function (_super) {
         _this.creditManager = opts.creditManager;
         return _this;
     }
-    TxRepayAccount.prototype.toString = function (_tokenData) {
+    TxRepayAccount.prototype.toString = function (_) {
         return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": Repaying account");
     };
     TxRepayAccount.prototype.serialize = function () {
@@ -267,7 +267,7 @@ var TxCloseAccount = /** @class */ (function (_super) {
         _this.creditManager = opts.creditManager;
         return _this;
     }
-    TxCloseAccount.prototype.toString = function (_tokenData) {
+    TxCloseAccount.prototype.toString = function (_) {
         return "Credit account ".concat((0, contractsRegister_1.getContractName)(this.creditManager), ": Closing account");
     };
     TxCloseAccount.prototype.serialize = function () {
@@ -292,7 +292,7 @@ var TxApprove = /** @class */ (function (_super) {
         return _this;
     }
     TxApprove.prototype.toString = function (tokenData) {
-        var token = tokenData[this.token];
+        var token = tokenData[this.token.toLowerCase()];
         return "Approve ".concat(token === null || token === void 0 ? void 0 : token.symbol);
     };
     TxApprove.prototype.serialize = function () {

package/lib/index.d.ts

@@ -6,6 +6,7 @@ export * from "./core/contracts";
 export * from "./core/events";
 export * from "./core/errors";
 export * from "./core/pool";
+export * from "./core/protocols";
 export * from "./core/priceFeeds";
 export * from "./core/operations";
 export * from "./core/oracles";
@@ -34,3 +35,4 @@ export { MultiCallContract } from "./utils/multicall";
 export { callRepeater } from "./utils/repeater";
 export { getContractName } from "./core/contractsRegister";
 export { AdapterInterface } from "./core/adapters";
+export { objectEntries, swapKeyValue, keyToLowercase } from "./utils/mappers";

package/lib/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdapterInterface = exports.getContractName = exports.callRepeater = exports.MultiCallContract = void 0;
+exports.keyToLowercase = exports.swapKeyValue = exports.objectEntries = exports.AdapterInterface = exports.getContractName = exports.callRepeater = exports.MultiCallContract = void 0;
 __exportStar(require("./core/constants"), exports);
 __exportStar(require("./core/creditAccount"), exports);
 __exportStar(require("./core/creditManager"), exports);
@@ -23,6 +23,7 @@ __exportStar(require("./core/contracts"), exports);
 __exportStar(require("./core/events"), exports);
 __exportStar(require("./core/errors"), exports);
 __exportStar(require("./core/pool"), exports);
+__exportStar(require("./core/protocols"), exports);
 __exportStar(require("./core/priceFeeds"), exports);
 __exportStar(require("./core/operations"), exports);
 __exportStar(require("./core/oracles"), exports);
@@ -54,3 +55,7 @@ var contractsRegister_1 = require("./core/contractsRegister");
 Object.defineProperty(exports, "getContractName", { enumerable: true, get: function () { return contractsRegister_1.getContractName; } });
 var adapters_1 = require("./core/adapters");
 Object.defineProperty(exports, "AdapterInterface", { enumerable: true, get: function () { return adapters_1.AdapterInterface; } });
+var mappers_1 = require("./utils/mappers");
+Object.defineProperty(exports, "objectEntries", { enumerable: true, get: function () { return mappers_1.objectEntries; } });
+Object.defineProperty(exports, "swapKeyValue", { enumerable: true, get: function () { return mappers_1.swapKeyValue; } });
+Object.defineProperty(exports, "keyToLowercase", { enumerable: true, get: function () { return mappers_1.keyToLowercase; } });

package/lib/utils/mappers.d.ts

@@ -0,0 +1,6 @@
+declare type SupportedValue = string | number;
+declare const objectEntries: <K extends SupportedValue, T>(o: Record<K, T>) => [K, T][];
+declare const swapKeyValue: <K extends SupportedValue, T extends SupportedValue>(o: Record<K, T>) => Record<T, K>;
+declare const keyToLowercase: <K extends SupportedValue, T extends SupportedValue>(o: Record<K, T>) => Record<K, T>;
+export type { SupportedValue };
+export { objectEntries, swapKeyValue, keyToLowercase };

package/lib/utils/mappers.js

@@ -0,0 +1,33 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.keyToLowercase = exports.swapKeyValue = exports.objectEntries = void 0;
+var objectEntries = function (o) { return Object.entries(o); };
+exports.objectEntries = objectEntries;
+var swapKeyValue = function (o) {
+    return objectEntries(o).reduce(function (sum, _a) {
+        var _b;
+        var key = _a[0], value = _a[1];
+        return __assign(__assign({}, sum), (_b = {}, _b[value] = key, _b));
+    }, {});
+};
+exports.swapKeyValue = swapKeyValue;
+var keyToLowercase = function (o) {
+    return objectEntries(o).reduce(function (sum, _a) {
+        var _b;
+        var key = _a[0], value = _a[1];
+        var keyTransformed = typeof key === "string" ? key.toLowerCase() : key;
+        return __assign(__assign({}, sum), (_b = {}, _b[keyTransformed] = value, _b));
+    }, {});
+};
+exports.keyToLowercase = keyToLowercase;

package/package.json

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

package/src/core/adapters.ts

@@ -1,16 +1,14 @@
 export enum AdapterInterface {
-    NO_SWAP, // 0 - 1
-    UNISWAP_V2_ROUTER, // 1 - 2
-    UNISWAP_V3_ROUTER, // 2 - 4
-    CURVE_V1_2ASSETS, // 3 - 8
-    CURVE_V1_3ASSETS, // 4 - 16
-    CURVE_V1_4ASSETS, // 5 - 32
-    CURVE_V1_STECRV_POOL, // 6 - 64
-    YEARN_V2, // 7 - 128
-    CONVEX_V1_BASE_REWARD_POOL, // 8 - 256
-    CONVEX_V1_BOOSTER, // 9 - 512
-    CONVEX_V1_CLAIM_ZAP, // 10 - 1024
-    LIDO_V1 // 11 - 2048
-  }
-  
-  
+  NO_SWAP, // 0 - 1
+  UNISWAP_V2_ROUTER, // 1 - 2
+  UNISWAP_V3_ROUTER, // 2 - 4
+  CURVE_V1_2ASSETS, // 3 - 8
+  CURVE_V1_3ASSETS, // 4 - 16
+  CURVE_V1_4ASSETS, // 5 - 32
+  CURVE_V1_STECRV_POOL, // 6 - 64
+  YEARN_V2, // 7 - 128
+  CONVEX_V1_BASE_REWARD_POOL, // 8 - 256
+  CONVEX_V1_BOOSTER, // 9 - 512
+  CONVEX_V1_CLAIM_ZAP, // 10 - 1024
+  LIDO_V1 // 11 - 2048
+}

package/src/core/contracts.ts

@@ -3,12 +3,16 @@
  * Gearbox. Generalized leverage protocol, which allows to take leverage and then use it across other DeFi protocols and platforms in a composable way.
  * (c) Gearbox.fi, 2021
  */
-
+import { objectEntries, keyToLowercase, swapKeyValue } from "../utils/mappers";
 import { AdapterInterface } from "./adapters";
 import { NetworkType } from "./constants";
 import { Protocols } from "./protocols";
-import { CurveLPToken, NormalToken, ConvexStakedPhantomToken, tokenDataByNetwork } from "./token";
-
+import {
+  CurveLPToken,
+  NormalToken,
+  ConvexStakedPhantomToken,
+  tokenDataByNetwork
+} from "./token";
 
 export type UniswapV2Contract = "UNISWAP_V2_ROUTER" | "SUSHISWAP_ROUTER";
 
@@ -119,77 +123,101 @@ export const contractsByNetwork: Record<
 
 export const UNISWAP_V3_QUOTER = "0xb27308f9f90d607463bb33ea1bebb41c27ce5ab6";
 
-export interface CurveSteCRVPoolParams {
+export interface BaseContractParams {
+  name: string;
+}
+
+type UniswapV2Params = {
+  protocol: Protocols.Uniswap | Protocols.Sushiswap;
+  type: AdapterInterface.UNISWAP_V2_ROUTER;
+} & BaseContractParams;
+
+type UniswapV3Params = {
+  protocol: Protocols.Uniswap;
+  type: AdapterInterface.UNISWAP_V3_ROUTER;
+  quoter: string;
+} & BaseContractParams;
+
+type CurveParams = {
+  protocol: Protocols.Curve;
+  type:
+    | AdapterInterface.CURVE_V1_2ASSETS
+    | AdapterInterface.CURVE_V1_3ASSETS
+    | AdapterInterface.CURVE_V1_4ASSETS;
+  lpToken: CurveLPToken;
+  tokens: Array<NormalToken | CurveLPToken>;
+} & BaseContractParams;
+
+export type CurveSteCRVPoolParams = {
   protocol: Protocols.Curve;
   type: AdapterInterface.CURVE_V1_STECRV_POOL;
   pool: Record<NetworkType, string>;
   lpToken: "steCRV";
-}
+} & BaseContractParams;
+
+type YearnParams = {
+  protocol: Protocols.Yearn;
+  type: AdapterInterface.YEARN_V2;
+} & BaseContractParams;
+
+type ConvexParams = {
+  protocol: Protocols.Convex;
+  type:
+    | AdapterInterface.CONVEX_V1_BOOSTER
+    | AdapterInterface.CONVEX_V1_CLAIM_ZAP;
+} & BaseContractParams;
+
+type ConvexPoolParams = {
+  protocol: Protocols.Convex;
+  type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL;
+  stakedToken: ConvexStakedPhantomToken;
+} & BaseContractParams;
 
-export interface LidoParams {
+export type LidoParams = {
   protocol: Protocols.Lido;
   type: AdapterInterface.LIDO_V1;
   contract: Record<NetworkType, string>;
-}
+  lpToken: "steCRV";
+} & BaseContractParams;
 
 export type ContractParams =
-  | {
-      protocol: Protocols.Uniswap | Protocols.Sushiswap;
-      type: AdapterInterface.UNISWAP_V2_ROUTER;
-    }
-  | {
-      protocol: Protocols.Uniswap;
-      type: AdapterInterface.UNISWAP_V3_ROUTER;
-      quoter: string;
-    }
-  | {
-      protocol: Protocols.Curve;
-      type:
-        | AdapterInterface.CURVE_V1_2ASSETS
-        | AdapterInterface.CURVE_V1_3ASSETS
-        | AdapterInterface.CURVE_V1_4ASSETS;
-      lpToken: CurveLPToken;
-      tokens: Array<NormalToken | CurveLPToken>;
-    }
+  | UniswapV2Params
+  | UniswapV3Params
+  | CurveParams
   | CurveSteCRVPoolParams
-  | {
-      protocol: Protocols.Yearn;
-      type: AdapterInterface.YEARN_V2;
-    }
-  | {
-      protocol: Protocols.Convex;
-      type:
-        | AdapterInterface.CONVEX_V1_BOOSTER
-        | AdapterInterface.CONVEX_V1_CLAIM_ZAP;
-    }
-  | {
-      protocol: Protocols.Convex;
-      type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL;
-      stakedToken: ConvexStakedPhantomToken;
-    }
+  | YearnParams
+  | ConvexParams
+  | ConvexPoolParams
   | LidoParams;
 
 export const contractParams: Record<SupportedContract, ContractParams> = {
   UNISWAP_V2_ROUTER: {
+    name: "Uniswap V2",
     protocol: Protocols.Uniswap,
     type: AdapterInterface.UNISWAP_V2_ROUTER
   },
   UNISWAP_V3_ROUTER: {
+    name: "Uniswap V3",
     protocol: Protocols.Uniswap,
     quoter: UNISWAP_V3_QUOTER,
     type: AdapterInterface.UNISWAP_V3_ROUTER
   },
+
   SUSHISWAP_ROUTER: {
+    name: "Sushiswap",
     protocol: Protocols.Sushiswap,
     type: AdapterInterface.UNISWAP_V2_ROUTER
   },
+
   CURVE_3CRV_POOL: {
+    name: "Curve 3Pool",
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_3ASSETS,
     lpToken: "3Crv",
     tokens: ["DAI", "USDC", "USDT"]
   },
   CURVE_STETH_GATEWAY: {
+    name: "Curve stETH",
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_STECRV_POOL,
     pool: {
@@ -199,93 +227,120 @@ export const contractParams: Record<SupportedContract, ContractParams> = {
     lpToken: "steCRV"
   },
   CURVE_FRAX_POOL: {
+    name: "Curve FRAX",
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_2ASSETS,
     lpToken: "FRAX3CRV",
     tokens: ["3Crv", "FRAX"]
   },
   CURVE_LUSD_POOL: {
+    name: "Curve LUSD",
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_2ASSETS,
     lpToken: "LUSD3CRV",
     tokens: ["3Crv", "LUSD"]
   },
   CURVE_SUSD_POOL: {
+    name: "Curve SUSD",
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_4ASSETS,
     lpToken: "crvPlain3andSUSD",
     tokens: ["DAI", "USDC", "USDT", "sUSD"]
   },
   CURVE_GUSD_POOL: {
+    name: "Curve GUSD",
     protocol: Protocols.Curve,
     type: AdapterInterface.CURVE_V1_2ASSETS,
     lpToken: "gusd3CRV",
     tokens: ["3Crv", "FRAX"]
   },
+
   YEARN_DAI_VAULT: {
+    name: "Yearn DAI",
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
-
   YEARN_USDC_VAULT: {
+    name: "Yearn USDC",
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
   YEARN_WETH_VAULT: {
+    name: "Yearn WETH",
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
   YEARN_WBTC_VAULT: {
+    name: "Yearn WBTC",
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
   YEARN_CURVE_FRAX_VAULT: {
+    name: "Yearn Curve FRAX",
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
   YEARN_CURVE_STETH_VAULT: {
+    name: "Yearn Curve STETH",
     protocol: Protocols.Yearn,
     type: AdapterInterface.YEARN_V2
   },
+
   CONVEX_BOOSTER: {
+    name: "Convex BOOSTER",
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BOOSTER
   },
   CONVEX_3CRV_POOL: {
+    name: "Convex 3crv",
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvx3Crv"
   },
   CONVEX_GUSD_POOL: {
+    name: "Convex GUSD",
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvxgusd3CRV"
   },
   CONVEX_SUSD_POOL: {
+    name: "Convex SUSD",
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvxcrvPlain3andSUSD"
   },
   CONVEX_STECRV_POOL: {
+    name: "Convex STECRV",
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvxsteCRV"
   },
   CONVEX_FRAX3CRV_POOL: {
+    name: "Convex FRAX3CRV",
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_BASE_REWARD_POOL,
     stakedToken: "stkcvxFRAX3CRV"
   },
   CONVEX_CLAIM_ZAP: {
+    name: "Convex ZAP",
     protocol: Protocols.Convex,
     type: AdapterInterface.CONVEX_V1_CLAIM_ZAP
   },
+
   LIDO_STETH_GATEWAY: {
+    name: "Lido STETH",
     protocol: Protocols.Lido,
     type: AdapterInterface.LIDO_V1,
     contract: {
       Mainnet: "0xae7ab96520de3a18e5e111b5eaab095312d7fe84",
       Kovan: ""
-    }
+    },
+    lpToken: "steCRV"
   }
 };
+
+export const contractsByAddress = objectEntries(contractsByNetwork).reduce<
+  Record<string, SupportedContract>
+>((sum, [_, contracts]) => {
+  return { ...sum, ...keyToLowercase(swapKeyValue(contracts)) };
+}, {});

package/src/core/contractsRegister.ts

@@ -1,4 +1,5 @@
-
+import { keyToLowercase } from "../utils/mappers";
+import { contractsByAddress, contractParams } from "./contracts";
 
 export const deployedContracts: Record<string, string> = {
   // MAINNET
@@ -11,8 +12,6 @@ export const deployedContracts: Record<string, string> = {
   "0xB2A015c71c17bCAC6af36645DEad8c572bA08A08": "WBTC",
   "0xC38478B0A4bAFE964C3526EEFF534d70E1E09017": "WBTC",
 
-
-
   // [UNISWAP_V2_ROUTER]: "Uniswap V2",
   // [UNISWAP_V3_ROUTER]: "Uniswap V3",
   // [CURVE_3CRV_POOL_ADDRESS]: "Curve 3Pool",
@@ -28,17 +27,26 @@ 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"
 };
 
+const contractNames = Object.entries(contractsByAddress).reduce<
+  Record<string, string>
+>((sum, [addr, cSymbol]) => {
+  const params = contractParams[cSymbol];
+  if (!params) return sum;
 
+  return { ...sum, [addr]: params.name };
+}, {});
+
+const contractsFullList = {
+  ...keyToLowercase(deployedContracts),
+  ...contractNames
+};
 
 export function getContractName(address: string): string {
-  Object.entries(deployedContracts).forEach(([addr, name]) => {
-    deployedContracts[addr.toLowerCase()] = name;
-  });
-  return deployedContracts[address.toLowerCase()] || address;
+  return contractsFullList[address.toLowerCase()] || address;
 }

package/src/core/creditAccount.ts

@@ -64,25 +64,39 @@ export class CreditAccountData {
     prices: Record<string, number>,
     tokens: Record<string, TokenData>
   ): Array<Balance> {
-    const priceCalc = (addr: string, amount: BigNumber) =>
-      amount
-        .mul(Math.floor(1000 * prices[addr.toLowerCase() || ""] || 0))
-        .div(BigNumber.from(10).pow(tokens[addr]?.decimals || 18));
-
-    const tokensAbcComparator = (t1?: TokenData, t2?: TokenData) =>
-      (t1?.symbol || "") > (t2?.symbol || "") ? 1 : -1;
-
-    return tokens
-      ? Object.entries(this.balances || [])
-          .sort(([addr1, amount1], [addr2, amount2]) => {
-            return priceCalc(addr1, amount1).eq(priceCalc(addr2, amount2))
-              ? tokensAbcComparator(tokens[addr1], tokens[addr2])
-              : priceCalc(addr1, amount1).gt(priceCalc(addr2, amount2))
-              ? -1
-              : 1;
-          })
-          .map(([address, balance]) => ({ address, balance }))
-      : [];
+    const priceCalc = (addr: string, amount: BigNumber) => {
+      const price = prices[addr] || 0;
+      const { decimals = 18 } = tokens[addr] || {};
+
+      return amount
+        .mul(Math.floor(1000 * price))
+        .div(BigNumber.from(10).pow(decimals));
+    };
+
+    const tokensAbcComparator = (t1?: TokenData, t2?: TokenData) => {
+      const { symbol: symbol1 = "" } = t1 || {};
+      const { symbol: symbol2 = "" } = t2 || {};
+
+      return symbol1 > symbol2 ? 1 : -1;
+    };
+
+    const safeBalances = this.balances || [];
+
+    return Object.entries(safeBalances)
+      .sort(([addr1, amount1], [addr2, amount2]) => {
+        const addr1Lc = addr1.toLowerCase();
+        const addr2Lc = addr2.toLowerCase();
+
+        const price1 = priceCalc(addr1Lc, amount1);
+        const price2 = priceCalc(addr2Lc, amount2);
+
+        return price1.eq(price2)
+          ? tokensAbcComparator(tokens[addr1Lc], tokens[addr2Lc])
+          : price1.gt(price2)
+          ? -1
+          : 1;
+      })
+      .map(([address, balance]) => ({ address, balance }));
   }
 }