@defisaver/tokens 1.4.1 → 1.4.4

package/README.md

@@ -4,7 +4,10 @@
 
 ### Type aliases
 
+- [AaveMarketData](README.md#aavemarketdata)
+- [AddressMapping](README.md#addressmapping)
 - [AssetData](README.md#assetdata)
+- [AssetDataBase](README.md#assetdatabase)
 - [ExtendedIlkData](README.md#extendedilkdata)
 - [IlkData](README.md#ilkdata)
 
@@ -33,11 +36,44 @@
 
 ## Type aliases
 
+### AaveMarketData
+
+Ƭ **AaveMarketData**: `Object`
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `dataProvider` | `string` |
+| `lendingPool` | `string` |
+| `lendingPoolAddressProvider` | `string` |
+| `name` | `string` |
+
+#### Defined in
+
+[types.ts:61](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/types.ts#L61)
+
+___
+
+### AddressMapping
+
+Ƭ **AddressMapping**: `Object`
+
+#### Index signature
+
+▪ [key: `number`]: `string`
+
+#### Defined in
+
+[types.ts:6](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/types.ts#L6)
+
+___
+
 ### AssetData
 
 Ƭ **AssetData**: `Object`
 
-Asset info type
+Chain-specific asset info type
 
 #### Type declaration
 
@@ -45,7 +81,35 @@ Asset info type
 | :------ | :------ |
 | `aaveCollateral` | `boolean` |
 | `address` | `string` |
-| `addresses` | `AddressMapping` |
+| `addresses` | [`AddressMapping`](README.md#addressmapping) |
+| `compoundCollateral` | `boolean` |
+| `decimals` | `number` |
+| `exchange` | `boolean` |
+| `icon` | `Function` |
+| `isStable` | `boolean` |
+| `name` | `string` |
+| `symbol` | `string` |
+| `underlyingAsset` | `string` |
+| `yearnCollateral` | `boolean` |
+
+#### Defined in
+
+[types.ts:30](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/types.ts#L30)
+
+___
+
+### AssetDataBase
+
+Ƭ **AssetDataBase**: `Object`
+
+Chain-agnostic asset info type
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `aaveCollateral` | `boolean` |
+| `addresses` | [`AddressMapping`](README.md#addressmapping) |
 | `compoundCollateral` | `boolean` |
 | `decimals` | `number` |
 | `exchange` | `boolean` |
@@ -58,7 +122,7 @@ Asset info type
 
 #### Defined in
 
-[types.ts:13](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/types.ts#L13)
+[types.ts:13](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/types.ts#L13)
 
 ___
 
@@ -68,7 +132,7 @@ ___
 
 #### Defined in
 
-[types.ts:51](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/types.ts#L51)
+[types.ts:68](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/types.ts#L68)
 
 ___
 
@@ -95,7 +159,7 @@ Maker ilk info type
 
 #### Defined in
 
-[types.ts:31](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/types.ts#L31)
+[types.ts:48](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/types.ts#L48)
 
 ## Variables
 
@@ -105,27 +169,27 @@ Maker ilk info type
 
 #### Defined in
 
-[index.ts:27](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L27)
+[index.ts:27](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L27)
 
 ___
 
 ### aaveV2Markets
 
-• **aaveV2Markets**: `AaveMarketData`[]
+• **aaveV2Markets**: [`AaveMarketData`](README.md#aavemarketdata)[]
 
 #### Defined in
 
-[aaveV2Markets.ts:3](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/aaveV2Markets.ts#L3)
+[aaveV2Markets.ts:3](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/aaveV2Markets.ts#L3)
 
 ___
 
 ### assets
 
-• **assets**: [`AssetData`](README.md#assetdata)[]
+• **assets**: [`AssetDataBase`](README.md#assetdatabase)[]
 
 #### Defined in
 
-[assets.ts:230](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/assets.ts#L230)
+[assets.ts:229](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/assets.ts#L229)
 
 ___
 
@@ -135,7 +199,7 @@ ___
 
 #### Defined in
 
-[ilks.ts:5](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/ilks.ts#L5)
+[ilks.ts:5](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/ilks.ts#L5)
 
 ___
 
@@ -145,7 +209,7 @@ ___
 
 #### Defined in
 
-[reflexerCollTypes.ts:3](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/reflexerCollTypes.ts#L3)
+[reflexerCollTypes.ts:3](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/reflexerCollTypes.ts#L3)
 
 ___
 
@@ -163,7 +227,7 @@ ___
 
 #### Defined in
 
-[index.ts:25](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L25)
+[index.ts:25](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L25)
 
 ## Functions
 
@@ -184,7 +248,7 @@ ___
 
 #### Defined in
 
-[index.ts:142](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L142)
+[index.ts:144](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L144)
 
 ___
 
@@ -205,13 +269,13 @@ ___
 
 #### Defined in
 
-[index.ts:163](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L163)
+[index.ts:165](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L165)
 
 ___
 
 ### getAaveV2MarketInfo
 
-▸ `Const` **getAaveV2MarketInfo**(`name?`): `void` \| `AaveMarketData`
+▸ `Const` **getAaveV2MarketInfo**(`name?`): `void` \| [`AaveMarketData`](README.md#aavemarketdata)
 
 #### Parameters
 
@@ -221,11 +285,11 @@ ___
 
 #### Returns
 
-`void` \| `AaveMarketData`
+`void` \| [`AaveMarketData`](README.md#aavemarketdata)
 
 #### Defined in
 
-[index.ts:135](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L135)
+[index.ts:137](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L137)
 
 ___
 
@@ -248,7 +312,7 @@ Warning: will not throw if asset not found. Instead, will return a placeholder o
 
 #### Defined in
 
-[index.ts:49](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L49)
+[index.ts:58](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L58)
 
 ___
 
@@ -268,7 +332,7 @@ ___
 
 #### Defined in
 
-[index.ts:85](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L85)
+[index.ts:92](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L92)
 
 ___
 
@@ -291,7 +355,7 @@ Warning: will not throw if ilk not found. Instead, will return a placeholder obj
 
 #### Defined in
 
-[index.ts:64](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L64)
+[index.ts:71](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L71)
 
 ___
 
@@ -311,7 +375,7 @@ ___
 
 #### Defined in
 
-[index.ts:87](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L87)
+[index.ts:97](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L97)
 
 ___
 
@@ -332,7 +396,7 @@ ___
 
 #### Defined in
 
-[index.ts:21](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L21)
+[index.ts:21](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L21)
 
 ___
 
@@ -355,7 +419,7 @@ Token symbol
 
 #### Defined in
 
-[index.ts:115](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L115)
+[index.ts:117](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L117)
 
 ___
 
@@ -377,7 +441,7 @@ Token symbol
 
 #### Defined in
 
-[index.ts:127](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L127)
+[index.ts:129](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L129)
 
 ___
 
@@ -399,4 +463,4 @@ Token symbol
 
 #### Defined in
 
-[index.ts:133](https://github.com/DecenterApps/defisaver-tokens/blob/5d144eb/src/index.ts#L133)
+[index.ts:135](https://github.com/DecenterApps/defisaver-tokens/blob/de5eef3/src/index.ts#L135)

package/esm/assets.d.ts

@@ -1,3 +1,3 @@
-import { AssetData } from './types';
-export declare const assetProto: AssetData;
-export declare const assets: AssetData[];
+import { AssetDataBase } from './types';
+export declare const assetProto: AssetDataBase;
+export declare const assets: AssetDataBase[];

package/esm/assets.js

@@ -209,7 +209,6 @@ const GuniDaiUsdc2Address = "0x50379f632ca68D36E50cfBC8F78fe16bd1499d1e";
 export const assetProto = {
     symbol: '?',
     name: 'Unknown',
-    address: '0x0000000000000000000000000000000000000000',
     addresses: {},
     decimals: 18,
     icon: () => {

package/esm/index.d.ts

@@ -6,8 +6,8 @@ import { reflexerCollTypes } from './reflexerCollTypes';
 export { reflexerCollTypes };
 import { aaveV2Markets } from './aaveV2Markets';
 export { aaveV2Markets };
-import type { AaveMarketData, AssetData, ExtendedIlkData, IlkData } from './types';
-export type { AssetData, ExtendedIlkData, IlkData };
+import type { AaveMarketData, AssetDataBase, AssetData, ExtendedIlkData, IlkData, AddressMapping } from './types';
+export type { AaveMarketData, AssetDataBase, AssetData, ExtendedIlkData, IlkData, AddressMapping };
 import { stringToBytes, bytesToString, compare } from './utils';
 export declare const set: (key: string, value: any) => void;
 export declare const utils: {
@@ -35,14 +35,6 @@ export declare const getIlkInfo: (ilk?: string) => ExtendedIlkData;
 export declare const getAssetInfoByAddress: (address?: string) => AssetData;
 export declare const ilkToAsset: (ilk?: string) => string;
 /** @private **/
-export declare const compoundCollateralAssets: AssetData[];
-/** @private **/
-export declare const aaveCollateralAssets: AssetData[];
-/** @private **/
-export declare const yearnCollateralAssets: AssetData[];
-/** @private **/
-export declare const exchangeAssets: AssetData[];
-/** @private **/
 export declare const compoundAsset: (underlyingAsset: string) => string;
 /** @private **/
 export declare const aaveAsset: (underlyingAsset: string) => string;

package/esm/index.js

@@ -28,6 +28,12 @@ Dec.set({
  * @return symbol {string}
  */
 const handleWBTCLegacy = (symbol = '') => (symbol === 'WBTC Legacy' ? 'WBTC' : symbol);
+const _addChainSpecificData = (assetDataBase) => {
+    const assetData = Object.assign(Object.assign({}, assetDataBase), { address: assetDataBase.addresses[config.network] || '0x0000000000000000000000000000000000000000' });
+    if (config.iconFunc)
+        assetData.icon = config.iconFunc(Object.assign({}, assetData));
+    return assetData;
+};
 /**
  * Returns asset info.
  * Warning: will not throw if asset not found. Instead, will return a placeholder object.
@@ -39,10 +45,7 @@ export const getAssetInfo = (symbol = '') => {
     let assetData = assets.find(t => compare(t.symbol, handleWBTCLegacy(symbol)));
     if (!assetData)
         assetData = Object.assign({}, assetProto);
-    if (config.iconFunc)
-        assetData.icon = config.iconFunc(Object.assign(Object.assign({}, assetData), { symbol }));
-    assetData.address = assetData.addresses[config.network] || '0x0000000000000000000000000000000000000000';
-    return assetData;
+    return _addChainSpecificData(assetData);
 };
 /**
  * Returns Maker or Reflexer ilk info, and asset info as `assetData` attribute.
@@ -68,7 +71,10 @@ export const getIlkInfo = (ilk = '') => {
     const assetData = getAssetInfo(ilkData.asset);
     return Object.assign(Object.assign({}, ilkData), { assetData });
 };
-export const getAssetInfoByAddress = (address = '') => assets.find(t => t.address.toLowerCase() === address.toLowerCase()) || Object.assign({}, assetProto);
+export const getAssetInfoByAddress = (address = '') => {
+    const assetDataBase = assets.find(t => t.addresses[config.network].toLowerCase() === address.toLowerCase());
+    return _addChainSpecificData(assetDataBase || Object.assign({}, assetProto));
+};
 export const ilkToAsset = (ilk = '') => {
     var _a;
     let ilkLabel = ilk.substr(0, 2) === '0x' ? bytesToString(ilk) : ilk;
@@ -84,14 +90,6 @@ export const ilkToAsset = (ilk = '') => {
     return asset;
 };
 /** @private **/
-export const compoundCollateralAssets = assets.filter(t => t.compoundCollateral);
-/** @private **/
-export const aaveCollateralAssets = assets.filter(t => t.aaveCollateral);
-/** @private **/
-export const yearnCollateralAssets = assets.filter(t => t.yearnCollateral);
-/** @private **/
-export const exchangeAssets = assets.filter(t => t.exchange);
-/** @private **/
 export const compoundAsset = (underlyingAsset) => `c${underlyingAsset.toUpperCase()}`;
 /** @private **/
 export const aaveAsset = (underlyingAsset) => `a${underlyingAsset.toUpperCase()}`;
@@ -137,7 +135,7 @@ export const assetAmountInEth = (amount, asset = 'ETH') => {
         decimals = 18;
     else
         decimals = getAssetInfo(asset).decimals;
-    return new Dec(amount && amount.toString() || 0).div(Math.pow(10, decimals)).toString();
+    return new Dec(amount && amount.toString() || 0).div(Math.pow(10, decimals)).toDP(decimals).toString();
 };
 /**
  * @param amount {Number|String|Object} Amount in eth

package/esm/types.d.ts

@@ -6,7 +6,23 @@ declare type AddressMapping = {
     [key: number]: string;
 };
 /**
- * Asset info type
+ * Chain-agnostic asset info type
+ */
+declare type AssetDataBase = {
+    symbol: string;
+    name: string;
+    addresses: AddressMapping;
+    decimals: number;
+    icon: Function;
+    underlyingAsset: string;
+    exchange: boolean;
+    compoundCollateral: boolean;
+    aaveCollateral: boolean;
+    yearnCollateral: boolean;
+    isStable: boolean;
+};
+/**
+ * Chain-specific asset info type
  */
 declare type AssetData = {
     symbol: string;
@@ -46,4 +62,4 @@ declare type AaveMarketData = {
 declare type ExtendedIlkData = IlkData | {
     assetData: AssetData;
 };
-export { AssetData, IlkData, ExtendedIlkData, AaveMarketData, Config, };
+export { AddressMapping, AssetDataBase, AssetData, IlkData, ExtendedIlkData, AaveMarketData, Config, };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/tokens",
-  "version": "1.4.1",
+  "version": "1.4.4",
   "description": "Centralized asset data & utility functions",
   "main": "umd/index.js",
   "module": "esm/index.js",

package/src/assets.ts

@@ -1,4 +1,4 @@
-import { AssetData } from './types';
+import { AssetDataBase } from './types';
 
 const ETHAddress = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
 const DAIAddress = "0x6b175474e89094c44da98b954eedeac495271d0f";
@@ -209,10 +209,9 @@ const cUSDPAddress = "0x041171993284df560249B57358F931D9eB7b925D";
 const GuniDaiUsdc1Address = "0xAbDDAfB225e10B90D798bB8A886238Fb835e2053";
 const GuniDaiUsdc2Address = "0x50379f632ca68D36E50cfBC8F78fe16bd1499d1e";
 
-export const assetProto: AssetData = {
+export const assetProto: AssetDataBase = {
   symbol: '?',
   name: 'Unknown',
-  address: '0x0000000000000000000000000000000000000000',
   addresses: {},
   decimals: 18,
   icon: () => {
@@ -227,7 +226,7 @@ export const assetProto: AssetData = {
   isStable: false,
 };
 
-export const assets: AssetData[] = [
+export const assets: AssetDataBase[] = [
   {
     ...assetProto,
     symbol: 'ETH',

package/src/index.ts

@@ -8,8 +8,8 @@ export {reflexerCollTypes}
 import {aaveV2Markets} from './aaveV2Markets';
 export {aaveV2Markets}
 
-import type {AaveMarketData, AssetData, ExtendedIlkData, IlkData, Config} from './types';
-export type {AssetData, ExtendedIlkData, IlkData};
+import type {AaveMarketData, AssetDataBase, AssetData, ExtendedIlkData, IlkData, AddressMapping, Config} from './types';
+export type {AaveMarketData, AssetDataBase, AssetData, ExtendedIlkData, IlkData, AddressMapping};
 
 import {stringToBytes, bytesToString, compare} from './utils';
 
@@ -39,6 +39,15 @@ Dec.set({
  */
 const handleWBTCLegacy = (symbol:string = ''):string => (symbol === 'WBTC Legacy' ? 'WBTC' : symbol);
 
+const _addChainSpecificData = (assetDataBase:AssetDataBase):AssetData => {
+  const assetData = {
+    ...assetDataBase,
+    address: assetDataBase.addresses[config.network] || '0x0000000000000000000000000000000000000000'
+  };
+  if (config.iconFunc) assetData.icon = config.iconFunc({ ...assetData });
+  return assetData;
+}
+
 /**
  * Returns asset info.
  * Warning: will not throw if asset not found. Instead, will return a placeholder object.
@@ -49,9 +58,7 @@ const handleWBTCLegacy = (symbol:string = ''):string => (symbol === 'WBTC Legacy
 export const getAssetInfo = (symbol:string = ''):AssetData => {
   let assetData = assets.find(t => compare(t.symbol, handleWBTCLegacy(symbol)));
   if (!assetData) assetData = { ...assetProto };
-  if (config.iconFunc) assetData.icon = config.iconFunc({ ...assetData, symbol });
-  assetData.address = assetData.addresses[config.network] || '0x0000000000000000000000000000000000000000';
-  return assetData;
+  return _addChainSpecificData(assetData);
 }
 
 /**
@@ -82,7 +89,10 @@ export const getIlkInfo = (ilk:string = ''):ExtendedIlkData => {
   }
 };
 
-export const getAssetInfoByAddress = (address: string = ''):AssetData => assets.find(t => t.address.toLowerCase() === address.toLowerCase()) || {...assetProto};
+export const getAssetInfoByAddress = (address: string = ''):AssetData => {
+  const assetDataBase = assets.find(t => t.addresses[config.network].toLowerCase() === address.toLowerCase());
+  return _addChainSpecificData(assetDataBase || {...assetProto});
+}
 
 export const ilkToAsset = (ilk: string = ''):string => {
   let ilkLabel = ilk.substr(0, 2) === '0x' ? bytesToString(ilk) : ilk;
@@ -94,14 +104,6 @@ export const ilkToAsset = (ilk: string = ''):string => {
   return asset;
 }
 
-/** @private **/
-export const compoundCollateralAssets:AssetData[] = assets.filter(t => t.compoundCollateral);
-/** @private **/
-export const aaveCollateralAssets:AssetData[] = assets.filter(t => t.aaveCollateral);
-/** @private **/
-export const yearnCollateralAssets:AssetData[] = assets.filter(t => t.yearnCollateral);
-/** @private **/
-export const exchangeAssets:AssetData[] = assets.filter(t => t.exchange);
 /** @private **/
 export const compoundAsset = (underlyingAsset: string):string => `c${underlyingAsset.toUpperCase()}`;
 /** @private **/
@@ -152,7 +154,7 @@ export const assetAmountInEth = (amount: number | string | object, asset: string
 
   else decimals = getAssetInfo(asset).decimals;
 
-  return new Dec(amount && amount.toString() || 0).div(10 ** decimals).toString();
+  return new Dec(amount && amount.toString() || 0).div(10 ** decimals).toDP(decimals).toString();
 };
 
 /**

package/src/types.ts

@@ -8,7 +8,24 @@ type AddressMapping = {
 }
 
 /**
- * Asset info type
+ * Chain-agnostic asset info type
+ */
+type AssetDataBase = {
+  symbol: string;
+  name: string;
+  addresses: AddressMapping,
+  decimals: number;
+  icon: Function;
+  underlyingAsset: string;
+  exchange: boolean;
+  compoundCollateral: boolean;
+  aaveCollateral: boolean;
+  yearnCollateral: boolean;
+  isStable: boolean;
+};
+
+/**
+ * Chain-specific asset info type
  */
 type AssetData = {
   symbol: string;
@@ -51,6 +68,8 @@ type AaveMarketData = {
 type ExtendedIlkData = IlkData | { assetData: AssetData }
 
 export {
+  AddressMapping,
+  AssetDataBase,
   AssetData,
   IlkData,
   ExtendedIlkData,

package/umd/index.js

@@ -27,10 +27,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "getIlkInfo": () => /* binding */ getIlkInfo,
 /* harmony export */   "getAssetInfoByAddress": () => /* binding */ getAssetInfoByAddress,
 /* harmony export */   "ilkToAsset": () => /* binding */ ilkToAsset,
-/* harmony export */   "compoundCollateralAssets": () => /* binding */ compoundCollateralAssets,
-/* harmony export */   "aaveCollateralAssets": () => /* binding */ aaveCollateralAssets,
-/* harmony export */   "yearnCollateralAssets": () => /* binding */ yearnCollateralAssets,
-/* harmony export */   "exchangeAssets": () => /* binding */ exchangeAssets,
 /* harmony export */   "compoundAsset": () => /* binding */ compoundAsset,
 /* harmony export */   "aaveAsset": () => /* binding */ aaveAsset,
 /* harmony export */   "tokenFromJoin": () => /* binding */ tokenFromJoin,
@@ -91,6 +87,15 @@ var handleWBTCLegacy = function handleWBTCLegacy() {
   var symbol = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   return symbol === 'WBTC Legacy' ? 'WBTC' : symbol;
 };
+
+var _addChainSpecificData = assetDataBase => {
+  var assetData = _objectSpread(_objectSpread({}, assetDataBase), {}, {
+    address: assetDataBase.addresses[config.network] || '0x0000000000000000000000000000000000000000'
+  });
+
+  if (config.iconFunc) assetData.icon = config.iconFunc(_objectSpread({}, assetData));
+  return assetData;
+};
 /**
  * Returns asset info.
  * Warning: will not throw if asset not found. Instead, will return a placeholder object.
@@ -104,11 +109,7 @@ var getAssetInfo = function getAssetInfo() {
   var symbol = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var assetData = _assets__WEBPACK_IMPORTED_MODULE_1__.assets.find(t => (0,_utils__WEBPACK_IMPORTED_MODULE_5__.compare)(t.symbol, handleWBTCLegacy(symbol)));
   if (!assetData) assetData = _objectSpread({}, _assets__WEBPACK_IMPORTED_MODULE_1__.assetProto);
-  if (config.iconFunc) assetData.icon = config.iconFunc(_objectSpread(_objectSpread({}, assetData), {}, {
-    symbol
-  }));
-  assetData.address = assetData.addresses[config.network] || '0x0000000000000000000000000000000000000000';
-  return assetData;
+  return _addChainSpecificData(assetData);
 };
 /**
  * Returns Maker or Reflexer ilk info, and asset info as `assetData` attribute.
@@ -144,7 +145,8 @@ var getIlkInfo = function getIlkInfo() {
 };
 var getAssetInfoByAddress = function getAssetInfoByAddress() {
   var address = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  return _assets__WEBPACK_IMPORTED_MODULE_1__.assets.find(t => t.address.toLowerCase() === address.toLowerCase()) || _objectSpread({}, _assets__WEBPACK_IMPORTED_MODULE_1__.assetProto);
+  var assetDataBase = _assets__WEBPACK_IMPORTED_MODULE_1__.assets.find(t => t.addresses[config.network].toLowerCase() === address.toLowerCase());
+  return _addChainSpecificData(assetDataBase || _objectSpread({}, _assets__WEBPACK_IMPORTED_MODULE_1__.assetProto));
 };
 var ilkToAsset = function ilkToAsset() {
   var _ilkLabel$match;
@@ -160,18 +162,6 @@ var ilkToAsset = function ilkToAsset() {
 };
 /** @private **/
 
-var compoundCollateralAssets = _assets__WEBPACK_IMPORTED_MODULE_1__.assets.filter(t => t.compoundCollateral);
-/** @private **/
-
-var aaveCollateralAssets = _assets__WEBPACK_IMPORTED_MODULE_1__.assets.filter(t => t.aaveCollateral);
-/** @private **/
-
-var yearnCollateralAssets = _assets__WEBPACK_IMPORTED_MODULE_1__.assets.filter(t => t.yearnCollateral);
-/** @private **/
-
-var exchangeAssets = _assets__WEBPACK_IMPORTED_MODULE_1__.assets.filter(t => t.exchange);
-/** @private **/
-
 var compoundAsset = underlyingAsset => "c".concat(underlyingAsset.toUpperCase());
 /** @private **/
 
@@ -222,7 +212,7 @@ var assetAmountInEth = function assetAmountInEth(amount) {
 
   if (asset.substr(0, 4) === 'MCD-') decimals = 18; // Compound returns borrowing power in USD with 18 decimals
   else if (asset === 'USD') decimals = 18;else decimals = getAssetInfo(asset).decimals;
-  return new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(amount && amount.toString() || 0).div(10 ** decimals).toString();
+  return new (decimal_js__WEBPACK_IMPORTED_MODULE_0___default())(amount && amount.toString() || 0).div(10 ** decimals).toDP(decimals).toString();
 };
 /**
  * @param amount {Number|String|Object} Amount in eth
@@ -470,7 +460,6 @@ var GuniDaiUsdc2Address = "0x50379f632ca68D36E50cfBC8F78fe16bd1499d1e";
 var assetProto = {
   symbol: '?',
   name: 'Unknown',
-  address: '0x0000000000000000000000000000000000000000',
   addresses: {},
   decimals: 18,
   icon: () => {