@talismn/token-rates 2.0.11 → 3.0.0

package/dist/talismn-token-rates.cjs.dev.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var dexie = require('dexie');
+var chaindataProvider = require('@talismn/chaindata-provider');
 
 class TalismanTokenRatesDatabase extends dexie.Dexie {
   constructor() {
@@ -146,22 +147,18 @@ const DEFAULT_COINSAPI_CONFIG = {
 };
 async function fetchTokenRates(tokens, currencyIds = ALL_CURRENCY_IDS, config = DEFAULT_COINSAPI_CONFIG) {
   // create a map from `coingeckoId` -> `tokenId` for each token
-  const coingeckoIdToTokenIds = Object.values(tokens)
-  // ignore testnet tokens
-  .filter(({
-    isTestnet
-  }) => !isTestnet).flatMap(token => {
+  const coingeckoIdToTokenIds = Object.values(tokens).flatMap(token => {
     // BEGIN: LP tokens have a rate which is calculated later on, using the rates of two other tokens.
     //
     // This section contains the logic such that: if token is an LP token, then fetch the rates for the two underlying tokens.
     if (token.type === "evm-uniswapv2") {
-      if (!token.evmNetwork) return [];
+      if (token.platform !== "ethereum") return [];
       const getToken = (evmNetworkId, tokenAddress, coingeckoId) => ({
-        id: evmErc20TokenId(evmNetworkId, tokenAddress),
+        id: chaindataProvider.evmErc20TokenId(evmNetworkId, tokenAddress),
         coingeckoId
       });
-      const token0 = token.coingeckoId0 ? [getToken(token.evmNetwork.id, token.tokenAddress0, token.coingeckoId0)] : [];
-      const token1 = token.coingeckoId1 ? [getToken(token.evmNetwork.id, token.tokenAddress1, token.coingeckoId1)] : [];
+      const token0 = token.coingeckoId0 ? [getToken(token.networkId, token.tokenAddress0, token.coingeckoId0)] : [];
+      const token1 = token.coingeckoId1 ? [getToken(token.networkId, token.tokenAddress1, token.coingeckoId1)] : [];
       return [...token0, ...token1];
     }
     // END: LP tokens have a rate which is calculated later on, using the rates of two other tokens.
@@ -237,10 +234,6 @@ async function fetchTokenRates(tokens, currencyIds = ALL_CURRENCY_IDS, config =
   return ratesList;
 }
 
-// TODO: Move this into a common module which can then be imported both here and into EvmErc20Module
-// We can't import this directly from EvmErc20Module because this package doesn't depend on `@talismn/balances`
-const evmErc20TokenId = (chainId, tokenContractAddress) => `${chainId}-evm-erc20-${tokenContractAddress}`.toLowerCase();
-
 // To save on bandwidth and work around response size limits, values are returned without json property names
 // (e.g. [[[12, 12332, 0.5]]] instead of { dot : {usd: { value: 12, marketCap: 12332, change24h: 0.5 }} })
 

package/dist/talismn-token-rates.cjs.prod.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var dexie = require('dexie');
+var chaindataProvider = require('@talismn/chaindata-provider');
 
 class TalismanTokenRatesDatabase extends dexie.Dexie {
   constructor() {
@@ -146,22 +147,18 @@ const DEFAULT_COINSAPI_CONFIG = {
 };
 async function fetchTokenRates(tokens, currencyIds = ALL_CURRENCY_IDS, config = DEFAULT_COINSAPI_CONFIG) {
   // create a map from `coingeckoId` -> `tokenId` for each token
-  const coingeckoIdToTokenIds = Object.values(tokens)
-  // ignore testnet tokens
-  .filter(({
-    isTestnet
-  }) => !isTestnet).flatMap(token => {
+  const coingeckoIdToTokenIds = Object.values(tokens).flatMap(token => {
     // BEGIN: LP tokens have a rate which is calculated later on, using the rates of two other tokens.
     //
     // This section contains the logic such that: if token is an LP token, then fetch the rates for the two underlying tokens.
     if (token.type === "evm-uniswapv2") {
-      if (!token.evmNetwork) return [];
+      if (token.platform !== "ethereum") return [];
       const getToken = (evmNetworkId, tokenAddress, coingeckoId) => ({
-        id: evmErc20TokenId(evmNetworkId, tokenAddress),
+        id: chaindataProvider.evmErc20TokenId(evmNetworkId, tokenAddress),
         coingeckoId
       });
-      const token0 = token.coingeckoId0 ? [getToken(token.evmNetwork.id, token.tokenAddress0, token.coingeckoId0)] : [];
-      const token1 = token.coingeckoId1 ? [getToken(token.evmNetwork.id, token.tokenAddress1, token.coingeckoId1)] : [];
+      const token0 = token.coingeckoId0 ? [getToken(token.networkId, token.tokenAddress0, token.coingeckoId0)] : [];
+      const token1 = token.coingeckoId1 ? [getToken(token.networkId, token.tokenAddress1, token.coingeckoId1)] : [];
       return [...token0, ...token1];
     }
     // END: LP tokens have a rate which is calculated later on, using the rates of two other tokens.
@@ -237,10 +234,6 @@ async function fetchTokenRates(tokens, currencyIds = ALL_CURRENCY_IDS, config =
   return ratesList;
 }
 
-// TODO: Move this into a common module which can then be imported both here and into EvmErc20Module
-// We can't import this directly from EvmErc20Module because this package doesn't depend on `@talismn/balances`
-const evmErc20TokenId = (chainId, tokenContractAddress) => `${chainId}-evm-erc20-${tokenContractAddress}`.toLowerCase();
-
 // To save on bandwidth and work around response size limits, values are returned without json property names
 // (e.g. [[[12, 12332, 0.5]]] instead of { dot : {usd: { value: 12, marketCap: 12332, change24h: 0.5 }} })
 

package/dist/talismn-token-rates.esm.js

@@ -1,4 +1,5 @@
 import { Dexie } from 'dexie';
+import { evmErc20TokenId } from '@talismn/chaindata-provider';
 
 class TalismanTokenRatesDatabase extends Dexie {
   constructor() {
@@ -144,22 +145,18 @@ const DEFAULT_COINSAPI_CONFIG = {
 };
 async function fetchTokenRates(tokens, currencyIds = ALL_CURRENCY_IDS, config = DEFAULT_COINSAPI_CONFIG) {
   // create a map from `coingeckoId` -> `tokenId` for each token
-  const coingeckoIdToTokenIds = Object.values(tokens)
-  // ignore testnet tokens
-  .filter(({
-    isTestnet
-  }) => !isTestnet).flatMap(token => {
+  const coingeckoIdToTokenIds = Object.values(tokens).flatMap(token => {
     // BEGIN: LP tokens have a rate which is calculated later on, using the rates of two other tokens.
     //
     // This section contains the logic such that: if token is an LP token, then fetch the rates for the two underlying tokens.
     if (token.type === "evm-uniswapv2") {
-      if (!token.evmNetwork) return [];
+      if (token.platform !== "ethereum") return [];
       const getToken = (evmNetworkId, tokenAddress, coingeckoId) => ({
         id: evmErc20TokenId(evmNetworkId, tokenAddress),
         coingeckoId
       });
-      const token0 = token.coingeckoId0 ? [getToken(token.evmNetwork.id, token.tokenAddress0, token.coingeckoId0)] : [];
-      const token1 = token.coingeckoId1 ? [getToken(token.evmNetwork.id, token.tokenAddress1, token.coingeckoId1)] : [];
+      const token0 = token.coingeckoId0 ? [getToken(token.networkId, token.tokenAddress0, token.coingeckoId0)] : [];
+      const token1 = token.coingeckoId1 ? [getToken(token.networkId, token.tokenAddress1, token.coingeckoId1)] : [];
       return [...token0, ...token1];
     }
     // END: LP tokens have a rate which is calculated later on, using the rates of two other tokens.
@@ -235,10 +232,6 @@ async function fetchTokenRates(tokens, currencyIds = ALL_CURRENCY_IDS, config =
   return ratesList;
 }
 
-// TODO: Move this into a common module which can then be imported both here and into EvmErc20Module
-// We can't import this directly from EvmErc20Module because this package doesn't depend on `@talismn/balances`
-const evmErc20TokenId = (chainId, tokenContractAddress) => `${chainId}-evm-erc20-${tokenContractAddress}`.toLowerCase();
-
 // To save on bandwidth and work around response size limits, values are returned without json property names
 // (e.g. [[[12, 12332, 0.5]]] instead of { dot : {usd: { value: 12, marketCap: 12332, change24h: 0.5 }} })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talismn/token-rates",
-  "version": "2.0.11",
+  "version": "3.0.0",
   "author": "Talisman",
   "homepage": "https://talisman.xyz",
   "license": "GPL-3.0-or-later",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "dexie": "^4.0.9",
-    "@talismn/chaindata-provider": "0.11.0"
+    "@talismn/chaindata-provider": "1.0.0"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",