@defisaver/tokens 1.4.18 → 1.4.21

package/README.md

@@ -51,7 +51,7 @@
 
 #### Defined in
 
-[types.ts:62](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/types.ts#L62)
+[types.ts:62](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/types.ts#L62)
 
 ___
 
@@ -65,7 +65,7 @@ ___
 
 #### Defined in
 
-[types.ts:6](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/types.ts#L6)
+[types.ts:6](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/types.ts#L6)
 
 ___
 
@@ -94,7 +94,7 @@ Chain-specific asset info type
 
 #### Defined in
 
-[types.ts:30](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/types.ts#L30)
+[types.ts:30](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/types.ts#L30)
 
 ___
 
@@ -122,7 +122,7 @@ Chain-agnostic asset info type
 
 #### Defined in
 
-[types.ts:13](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/types.ts#L13)
+[types.ts:13](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/types.ts#L13)
 
 ___
 
@@ -132,7 +132,7 @@ ___
 
 #### Defined in
 
-[types.ts:69](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/types.ts#L69)
+[types.ts:69](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/types.ts#L69)
 
 ___
 
@@ -160,7 +160,7 @@ Maker ilk info type
 
 #### Defined in
 
-[types.ts:48](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/types.ts#L48)
+[types.ts:48](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/types.ts#L48)
 
 ## Variables
 
@@ -170,7 +170,7 @@ Maker ilk info type
 
 #### Defined in
 
-[index.ts:27](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L27)
+[index.ts:27](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L27)
 
 ___
 
@@ -180,7 +180,7 @@ ___
 
 #### Defined in
 
-[aaveV2Markets.ts:3](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/aaveV2Markets.ts#L3)
+[aaveV2Markets.ts:3](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/aaveV2Markets.ts#L3)
 
 ___
 
@@ -190,7 +190,7 @@ ___
 
 #### Defined in
 
-[assets.ts:231](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/assets.ts#L231)
+[assets.ts:231](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/assets.ts#L231)
 
 ___
 
@@ -200,7 +200,7 @@ ___
 
 #### Defined in
 
-[ilks.ts:5](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/ilks.ts#L5)
+[ilks.ts:5](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/ilks.ts#L5)
 
 ___
 
@@ -210,7 +210,7 @@ ___
 
 #### Defined in
 
-[reflexerCollTypes.ts:3](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/reflexerCollTypes.ts#L3)
+[reflexerCollTypes.ts:3](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/reflexerCollTypes.ts#L3)
 
 ___
 
@@ -228,7 +228,7 @@ ___
 
 #### Defined in
 
-[index.ts:25](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L25)
+[index.ts:25](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L25)
 
 ## Functions
 
@@ -249,7 +249,7 @@ ___
 
 #### Defined in
 
-[index.ts:147](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L147)
+[index.ts:148](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L148)
 
 ___
 
@@ -270,7 +270,7 @@ ___
 
 #### Defined in
 
-[index.ts:168](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L168)
+[index.ts:169](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L169)
 
 ___
 
@@ -290,13 +290,13 @@ ___
 
 #### Defined in
 
-[index.ts:140](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L140)
+[index.ts:141](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L141)
 
 ___
 
 ### getAssetInfo
 
-▸ `Const` **getAssetInfo**(`symbol?`): [`AssetData`](README.md#assetdata)
+▸ `Const` **getAssetInfo**(`symbol?`, `chainId?`): [`AssetData`](README.md#assetdata)
 
 Returns asset info.
 Warning: will not throw if asset not found. Instead, will return a placeholder object.
@@ -306,6 +306,7 @@ Warning: will not throw if asset not found. Instead, will return a placeholder o
 | Name | Type | Default value |
 | :------ | :------ | :------ |
 | `symbol` | `string` | `''` |
+| `chainId?` | `number` | `undefined` |
 
 #### Returns
 
@@ -313,19 +314,20 @@ Warning: will not throw if asset not found. Instead, will return a placeholder o
 
 #### Defined in
 
-[index.ts:59](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L59)
+[index.ts:60](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L60)
 
 ___
 
 ### getAssetInfoByAddress
 
-▸ `Const` **getAssetInfoByAddress**(`address?`): [`AssetData`](README.md#assetdata)
+▸ `Const` **getAssetInfoByAddress**(`address?`, `chainId?`): [`AssetData`](README.md#assetdata)
 
 #### Parameters
 
 | Name | Type | Default value |
 | :------ | :------ | :------ |
 | `address` | `string` | `''` |
+| `chainId?` | `number` | `undefined` |
 
 #### Returns
 
@@ -333,7 +335,7 @@ ___
 
 #### Defined in
 
-[index.ts:94](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L94)
+[index.ts:95](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L95)
 
 ___
 
@@ -356,7 +358,7 @@ Warning: will not throw if ilk not found. Instead, will return a placeholder obj
 
 #### Defined in
 
-[index.ts:72](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L72)
+[index.ts:73](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L73)
 
 ___
 
@@ -376,7 +378,7 @@ ___
 
 #### Defined in
 
-[index.ts:99](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L99)
+[index.ts:100](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L100)
 
 ___
 
@@ -397,7 +399,7 @@ ___
 
 #### Defined in
 
-[index.ts:21](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L21)
+[index.ts:21](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L21)
 
 ___
 
@@ -420,7 +422,7 @@ Token symbol
 
 #### Defined in
 
-[index.ts:120](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L120)
+[index.ts:121](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L121)
 
 ___
 
@@ -442,7 +444,7 @@ Token symbol
 
 #### Defined in
 
-[index.ts:132](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L132)
+[index.ts:133](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L133)
 
 ___
 
@@ -464,4 +466,4 @@ Token symbol
 
 #### Defined in
 
-[index.ts:138](https://github.com/defisaver/defisaver-tokens/blob/2df18f4/src/index.ts#L138)
+[index.ts:139](https://github.com/defisaver/defisaver-tokens/blob/117ec02/src/index.ts#L139)

package/esm/assets.js

@@ -890,4 +890,10 @@ export const assets = [
     Object.assign(Object.assign({}, assetProto), { symbol: 'cFEI', underlyingAsset: 'FEI', name: 'Fei Protocol', addresses: {
             1: cFeiAddress,
         }, exchange: false, compoundCollateral: true, decimals: 8 }),
+    Object.assign(Object.assign({}, assetProto), { symbol: 'rETH', name: 'Rocket Pool ETH', addresses: {
+            1: '0xae78736cd615f374d3085123a210448e74fc6393',
+        }, exchange: true, decimals: 18 }),
+    Object.assign(Object.assign({}, assetProto), { symbol: 'OP', name: 'Optimism', addresses: {
+            10: '0x4200000000000000000000000000000000000042',
+        }, exchange: true, decimals: 18 }),
 ];

package/esm/index.d.ts

@@ -21,9 +21,10 @@ export declare const MAXUINT: string;
  * Warning: will not throw if asset not found. Instead, will return a placeholder object.
  *
  * @param symbol {string}
+ * @param chainId {number}
  * @return {AssetData}
  */
-export declare const getAssetInfo: (symbol?: string) => AssetData;
+export declare const getAssetInfo: (symbol?: string, chainId?: number | undefined) => AssetData;
 /**
  * Returns Maker or Reflexer ilk info, and asset info as `assetData` attribute.
  * Warning: will not throw if ilk not found. Instead, will return a placeholder object.
@@ -32,7 +33,7 @@ export declare const getAssetInfo: (symbol?: string) => AssetData;
  * @returns {ExtendedIlkData}
  */
 export declare const getIlkInfo: (ilk?: string) => ExtendedIlkData;
-export declare const getAssetInfoByAddress: (address?: string) => AssetData;
+export declare const getAssetInfoByAddress: (address?: string, chainId?: number | undefined) => AssetData;
 export declare const ilkToAsset: (ilk?: string) => string;
 /** @private **/
 export declare const compoundAsset: (underlyingAsset: string) => string;

package/esm/index.js

@@ -29,8 +29,8 @@ 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] || '' });
+const _addChainSpecificData = (assetDataBase, chainId) => {
+    const assetData = Object.assign(Object.assign({}, assetDataBase), { address: assetDataBase.addresses[chainId || config.network] || '' });
     if (config.iconFunc)
         assetData.icon = config.iconFunc(Object.assign({}, assetData));
     return assetData;
@@ -40,13 +40,14 @@ const _addChainSpecificData = (assetDataBase) => {
  * Warning: will not throw if asset not found. Instead, will return a placeholder object.
  *
  * @param symbol {string}
+ * @param chainId {number}
  * @return {AssetData}
  */
-export const getAssetInfo = (symbol = '') => {
+export const getAssetInfo = (symbol = '', chainId) => {
     let assetData = assets.find(t => compare(t.symbol, handleWBTCLegacy(symbol)));
     if (!assetData)
         assetData = Object.assign({}, assetProto);
-    return _addChainSpecificData(assetData);
+    return _addChainSpecificData(assetData, chainId);
 };
 /**
  * Returns Maker or Reflexer ilk info, and asset info as `assetData` attribute.
@@ -73,9 +74,9 @@ export const getIlkInfo = (ilk = '') => {
     const assetData = getAssetInfo(ilkData.asset);
     return Object.assign(Object.assign({}, ilkData), { assetData });
 };
-export const getAssetInfoByAddress = (address = '') => {
-    const assetDataBase = assets.find(t => { var _a; return ((_a = t.addresses[config.network]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === address.toLowerCase(); });
-    return _addChainSpecificData(assetDataBase || Object.assign({}, assetProto));
+export const getAssetInfoByAddress = (address = '', chainId) => {
+    const assetDataBase = assets.find(t => { var _a; return ((_a = t.addresses[chainId || config.network]) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === address.toLowerCase(); });
+    return _addChainSpecificData(assetDataBase || Object.assign({}, assetProto), chainId);
 };
 export const ilkToAsset = (ilk = '') => {
     var _a;

package/package.json

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

package/src/assets.ts

@@ -2419,4 +2419,24 @@ export const assets: AssetDataBase[] = [
     compoundCollateral: true,
     decimals: 8,
   },
+  {
+    ...assetProto,
+    symbol: 'rETH',
+    name: 'Rocket Pool ETH',
+    addresses: {
+      1: '0xae78736cd615f374d3085123a210448e74fc6393',
+    },
+    exchange: true,
+    decimals: 18,
+  },
+  {
+    ...assetProto,
+    symbol: 'OP',
+    name: 'Optimism',
+    addresses: {
+      10: '0x4200000000000000000000000000000000000042',
+    },
+    exchange: true,
+    decimals: 18,
+  },
 ];

package/src/index.ts

@@ -40,10 +40,10 @@ Dec.set({
  */
 const handleWBTCLegacy = (symbol:string = ''):string => (symbol === 'WBTC Legacy' ? 'WBTC' : symbol);
 
-const _addChainSpecificData = (assetDataBase:AssetDataBase):AssetData => {
+const _addChainSpecificData = (assetDataBase:AssetDataBase, chainId?: number):AssetData => {
   const assetData = {
     ...assetDataBase,
-    address: assetDataBase.addresses[config.network] || ''
+    address: assetDataBase.addresses[chainId || config.network] || ''
   };
   if (config.iconFunc) assetData.icon = config.iconFunc({ ...assetData });
   return assetData;
@@ -54,12 +54,13 @@ const _addChainSpecificData = (assetDataBase:AssetDataBase):AssetData => {
  * Warning: will not throw if asset not found. Instead, will return a placeholder object.
  *
  * @param symbol {string}
+ * @param chainId {number}
  * @return {AssetData}
  */
-export const getAssetInfo = (symbol:string = ''):AssetData => {
+export const getAssetInfo = (symbol:string = '', chainId?:number):AssetData => {
   let assetData = assets.find(t => compare(t.symbol, handleWBTCLegacy(symbol)));
   if (!assetData) assetData = { ...assetProto };
-  return _addChainSpecificData(assetData);
+  return _addChainSpecificData(assetData, chainId);
 }
 
 /**
@@ -91,9 +92,9 @@ export const getIlkInfo = (ilk:string = ''):ExtendedIlkData => {
   }
 };
 
-export const getAssetInfoByAddress = (address: string = ''):AssetData => {
-  const assetDataBase = assets.find(t => t.addresses[config.network]?.toLowerCase() === address.toLowerCase());
-  return _addChainSpecificData(assetDataBase || {...assetProto});
+export const getAssetInfoByAddress = (address: string = '', chainId?:number):AssetData => {
+  const assetDataBase = assets.find(t => t.addresses[chainId || config.network]?.toLowerCase() === address.toLowerCase());
+  return _addChainSpecificData(assetDataBase || {...assetProto}, chainId);
 }
 
 export const ilkToAsset = (ilk: string = ''):string => {

package/umd/index.js

@@ -89,9 +89,9 @@ var handleWBTCLegacy = function handleWBTCLegacy() {
   return symbol === 'WBTC Legacy' ? 'WBTC' : symbol;
 };
 
-var _addChainSpecificData = assetDataBase => {
+var _addChainSpecificData = (assetDataBase, chainId) => {
   var assetData = _objectSpread(_objectSpread({}, assetDataBase), {}, {
-    address: assetDataBase.addresses[config.network] || ''
+    address: assetDataBase.addresses[chainId || config.network] || ''
   });
 
   if (config.iconFunc) assetData.icon = config.iconFunc(_objectSpread({}, assetData));
@@ -102,15 +102,17 @@ var _addChainSpecificData = assetDataBase => {
  * Warning: will not throw if asset not found. Instead, will return a placeholder object.
  *
  * @param symbol {string}
+ * @param chainId {number}
  * @return {AssetData}
  */
 
 
 var getAssetInfo = function getAssetInfo() {
   var symbol = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var chainId = arguments.length > 1 ? arguments[1] : undefined;
   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);
-  return _addChainSpecificData(assetData);
+  return _addChainSpecificData(assetData, chainId);
 };
 /**
  * Returns Maker or Reflexer ilk info, and asset info as `assetData` attribute.
@@ -147,12 +149,13 @@ var getIlkInfo = function getIlkInfo() {
 };
 var getAssetInfoByAddress = function getAssetInfoByAddress() {
   var address = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var chainId = arguments.length > 1 ? arguments[1] : undefined;
   var assetDataBase = _assets__WEBPACK_IMPORTED_MODULE_1__.assets.find(t => {
-    var _t$addresses$config$n;
+    var _t$addresses;
 
-    return ((_t$addresses$config$n = t.addresses[config.network]) === null || _t$addresses$config$n === void 0 ? void 0 : _t$addresses$config$n.toLowerCase()) === address.toLowerCase();
+    return ((_t$addresses = t.addresses[chainId || config.network]) === null || _t$addresses === void 0 ? void 0 : _t$addresses.toLowerCase()) === address.toLowerCase();
   });
-  return _addChainSpecificData(assetDataBase || _objectSpread({}, _assets__WEBPACK_IMPORTED_MODULE_1__.assetProto));
+  return _addChainSpecificData(assetDataBase || _objectSpread({}, _assets__WEBPACK_IMPORTED_MODULE_1__.assetProto), chainId);
 };
 var ilkToAsset = function ilkToAsset() {
   var _ilkLabel$match;
@@ -2253,6 +2256,22 @@ var assets = [_objectSpread(_objectSpread({}, assetProto), {}, {
   exchange: false,
   compoundCollateral: true,
   decimals: 8
+}), _objectSpread(_objectSpread({}, assetProto), {}, {
+  symbol: 'rETH',
+  name: 'Rocket Pool ETH',
+  addresses: {
+    1: '0xae78736cd615f374d3085123a210448e74fc6393'
+  },
+  exchange: true,
+  decimals: 18
+}), _objectSpread(_objectSpread({}, assetProto), {}, {
+  symbol: 'OP',
+  name: 'Optimism',
+  addresses: {
+    10: '0x4200000000000000000000000000000000000042'
+  },
+  exchange: true,
+  decimals: 18
 })];
 
 /***/ }),