remove usage of existing token labels

2026-01-12 16:53:02 +08:00 · 2023-04-29 20:49:26 +02:00
parent fcbe0a6ef4
commit 4da6bcdd22
17 changed files with 140 additions and 282 deletions
--- a/projects/cat-in-a-box/index.js
+++ b/projects/cat-in-a-box/index.js
@@ -1,11 +1,10 @@
 const { sumTokensExport } = require('../helper/unwrapLPs')
-const { tokensBare } = require('../helper/tokenMapping')

 module.exports = {
  ethereum: {
    tvl: sumTokensExport({ owners: [
      '0x7f0A0C7149a46Bf943cCd412da687144b49C6014',
      '0x24146D1B3339Cf76b455dC42e71Ea5Cdff4aE0d7',
-    ], tokens: [tokensBare.steth]})
+    ], tokens: ['0xae7ab96520de3a18e5e111b5eaab095312d7fe84']})
  }
 }
--- a/projects/citrus/index.js
+++ b/projects/citrus/index.js
@@ -1,4 +1,4 @@
-const { getProvider, tokens, } = require('../helper/solana');
+const { getProvider, } = require('../helper/solana');
 const { Program } = require("@project-serum/anchor");
 const { getConfig } = require('../helper/cache');
 const axios = require("axios");
@@ -38,11 +38,11 @@ async function getStats() {
 }

 const tvl = async () => {
-  return { [tokens.solana]: (await getStats()).tvl }
+  return { ['solana:So11111111111111111111111111111111111111112']: (await getStats()).tvl }
 };

 const borrowed = async () => {
-  return { [tokens.solana]: (await getStats()).borrowed }
+  return { ['solana:So11111111111111111111111111111111111111112']: (await getStats()).borrowed }
 }

 module.exports = {
--- a/projects/defisaver.js
+++ b/projects/defisaver.js
@@ -1,9 +1,9 @@
 const defisaverABIs = require("./config/defisaver/abis");
 const utils = require("./helper/utils");
-const { tokensBare, nullAddress, } = require("./helper/tokenMapping");
+const { nullAddress, } = require("./helper/tokenMapping");
 const sdk = require('@defillama/sdk')

-const dai = tokensBare.dai
+const dai = '0x6b175474e89094c44da98b954eedeac495271d0f'

 const {
  CompoundSubscriptions,
@@ -133,13 +133,13 @@ async function tvl(ts, block, _, { api }) {

 const assetMapping = {
  ETH: nullAddress,
-  DAI: tokensBare.dai,
-  BAT: tokensBare.BAT,
-  RETH: tokensBare.reth,
-  LINK: tokensBare.link,
-  WBTC: tokensBare.wbtc,
-  MATIC: tokensBare.matic,
-  WSTETH: tokensBare.wsteth,
+  DAI: '0x6b175474e89094c44da98b954eedeac495271d0f',
+  BAT: '0x0d8775f648430679a709e98d2b0cb6250d2887ef',
+  RETH: '0xae78736cd615f374d3085123a210448e74fc6393',
+  LINK: '0x514910771af9ca656af840dff83e8264ecf986ca',
+  WBTC: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+  MATIC: '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0',
+  WSTETH: '0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0'
 }

 module.exports = {
--- a/projects/ether-fi/index.js
+++ b/projects/ether-fi/index.js
@@ -1,12 +1,10 @@
-const { tokens } = require('../helper/tokenMapping')
-
 module.exports = {
  misrepresentedTokens: true,
  ethereum: {
    tvl: async (_, _1, _2, { api }) => {
      const tvl = await api.call({  abi: 'uint256:getContractTVL', target: '0x7623e9DC0DA6FF821ddb9EbABA794054E078f8c4'})
      return {
-        [tokens.ethereum]: tvl
+        'ethereum:0x0000000000000000000000000000000000000000': tvl
      }
    }
  }
--- a/projects/frakt/index.js
+++ b/projects/frakt/index.js
@@ -1,4 +1,4 @@
-const { getProvider, getSolBalances, tokens, } = require('../helper/solana')
+const { getProvider, getSolBalances, } = require('../helper/solana')
 const { Program, } = require("@project-serum/anchor");
 const { getConfig } = require('../helper/cache')

@@ -31,11 +31,11 @@ async function getData() {
 }

 const tvl = async () => {
-  return { [tokens.solana]: (await getData()).tvl }
+  return { ['solana:So11111111111111111111111111111111111111112']: (await getData()).tvl }
 };

 const borrowed = async () => {
-  return { [tokens.solana]: (await getData()).borrowed }
+  return { ['solana:So11111111111111111111111111111111111111112']: (await getData()).borrowed }
 }

 module.exports = {
--- a/projects/helper/cex.js
+++ b/projects/helper/cex.js
@@ -1,4 +1,3 @@
-const { tokensBare, } = require('./tokenMapping')
 const { nullAddress } = require('./unwrapLPs')
 const { sumTokensExport } = require('../helper/sumTokens')
 const sdk = require('@defillama/sdk')
@@ -6,11 +5,11 @@ const sdk = require('@defillama/sdk')
 const defaultTokens = {
  ethereum: [
    nullAddress,
-    tokensBare.usdt,
-    tokensBare.usdc,
-    tokensBare.link,
-    tokensBare.dai,
-    tokensBare.wbtc,
+    '0xdac17f958d2ee523a2206206994597c13d831ec7',
+    '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    '0x514910771af9ca656af840dff83e8264ecf986ca',
+    '0x6b175474e89094c44da98b954eedeac495271d0f',
+    '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
    '0x0000000000085d4780B73119b644AE5ecd22b376', // TUSD
    '0x4fabb145d64652a948d72533023f6e7a623c7c53', // BUSD
    '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0', // MATIC
--- a/projects/helper/chain/elrond.js
+++ b/projects/helper/chain/elrond.js
@@ -1,5 +1,5 @@
 const { get, graphQuery } = require('../http')
-const { getCoreAssets, tokens: TOKENS } = require('../tokenMapping')
+const { getCoreAssets, } = require('../tokenMapping')
 const { transformBalances } = require('../portedTokens')
 const sdk = require('@defillama/sdk')
 const chain = 'elrond'
@@ -33,6 +33,7 @@ async function getElrondBalance(address) {
  const { data: { account: { balance } } } = await get(`${API_HOST}/address/${address}`)
  return balance
 }
+const nullAddress = '0x0000000000000000000000000000000000000000'

 async function getTokens({ address, balances = {}, tokens = [], blacklistedTokens = [] }) {
  const prices = await getTokenPrices()
@@ -45,10 +46,10 @@ async function getTokens({ address, balances = {}, tokens = [], blacklistedToken
      if (blacklistedTokens.includes(token)) return; // skip blacklisted tokens
      if (!coreAssets.has(token)) {
        if (i.valueUsd)
-          return sdk.util.sumSingleBalance(balances, TOKENS.usdt, i.valueUsd * 1e6)
+          return sdk.util.sumSingleBalance(balances, 'ethereum:0xdac17f958d2ee523a2206206994597c13d831ec7', i.valueUsd * 1e6)

        if (prices[token])
-          return sdk.util.sumSingleBalance(balances, TOKENS.null, (prices[token] * i.balance).toFixed(0), chain)
+          return sdk.util.sumSingleBalance(balances, nullAddress, (prices[token] * i.balance).toFixed(0), chain)
      }
      return sdk.util.sumSingleBalance(balances, token, i.balance / (10 ** i.decimals), chain)
    })
@@ -62,10 +63,10 @@ async function sumTokens({ owners = [], tokens = [], balances = {}, blacklistedT
  }

  await Promise.all(owners.map(i => getTokens({ address: i, balances, tokens, blacklistedTokens, })))
-  if (!tokens.length || tokens.includes(TOKENS.null))
+  if (!tokens.length || tokens.includes(nullAddress))
    await Promise.all(owners.map(async i => {
      const bal = await getElrondBalance(i)
-      sdk.util.sumSingleBalance(balances, TOKENS.null, bal, chain)
+      sdk.util.sumSingleBalance(balances, nullAddress, bal, chain)
    }))
  return transformBalances(chain, balances)
 }
--- a/projects/helper/coreAssets.json
+++ b/projects/helper/coreAssets.json
@@ -1,47 +1,34 @@
 {
+  "null": "0x0000000000000000000000000000000000000000",
  "ethereum": {
    "WETH": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+    "WSTETH": "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0",
+    "STETH": "0xae7ab96520de3a18e5e111b5eaab095312d7fe84",
    "USDC": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
    "LINK": "0x514910771af9ca656af840dff83e8264ecf986ca",
+    "MATIC": "0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0",
+    "BAT": "0x0d8775f648430679a709e98d2b0cb6250d2887ef",
+    "RETH": "0xae78736cd615f374d3085123a210448e74fc6393",
+    "USDT": "0xdac17f958d2ee523a2206206994597c13d831ec7",
    "UNI": "0x1f9840a85d5af5bf1d1762f925bdaddc4201f984",
    "AAVE": "0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9",
    "WBTC": "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599",
    "SNX": "0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f",
    "YFI": "0x0bc529c00c6401aef6d220be8c6ea1667f6ad93e",
    "DAI": "0x6b175474e89094c44da98b954eedeac495271d0f",
-    "XMON": "0x3aada3e213abf8529606924d8d1c55cbdc70bf74",
-    "CONV": "0xc834fa996fa3bec7aad3693af486ae53d8aa8b50",
    "cvxFXS": "0xfeef77d3f69374f66429c91d732a244f074bdf74",
    "BNB": "0xb8c77482e45f1f44de1745f52c74426c631bdd52",
-    "BXH": "0xeb637a9ab6be83c7f8c79fdaa62e1043b65534f0",
    "tBTC": "0x18084fba666a33d37592fa2633fd49a74dd93a88",
-    "kUSD": "0xef779cf3d260dbe6177b30ff08b10db591a6dd9c",
-    "fUSD": "0x42ef9077d8e79689799673ae588e046f8832cb95",
-    "tWETH": "0xd3d13a578a53685b4ac36a1bab31912d2b2a2f36",
-    "tFRAX": "0x94671a3cee8c7a12ea72602978d1bb84e920efb2",
-    "tGAMMA": "0x2fc6e9c1b2c07e18632efe51879415a580ad22e1",
-    "tSNX": "0xeff721eae19885e17f5b80187d6527aad3ffc8de",
-    "tAPW": "0xdc0b02849bb8e0f126a216a2840275da829709b0",
-    "tTCR": "0x15a629f0665a3eb97d7ae9a7ce7abf73aeb79415",
-    "tFOX": "0x808d3e6b23516967ceae4f17a5f9038383ed5311",
-    "tSUSHI": "0xf49764c9c5d644ece6ae2d18ffd9f1e902629777",
-    "tALCX": "0xd3b5d9a561c293fb42b446fe7e237daa9bf9aa84",
-    "tFXS": "0xadf15ec41689fc5b6dca0db7c53c9bfe7981e655",
-    "XSTUSD": "0xc7d9c108d4e1dd1484d3e2568d7f74bfd763d356",
-    "stkDYDX": "0x65f7ba4ec257af7c55fd5854e5f6356bbd0fb8ec",
    "USX": "0x0a5e677a6a24b2f1a2bf4f3bffc443231d2fdec8",
-    "TIC": "0x2163383c1f4e74fe36c50e6154c7f18d9fd06d6f",
-    "sJPY": "0xf6b1c627e95bfc3c1b4c9b825a032ff0fbf3e07d",
-    "NEUY": "0xa80505c408c4defd9522981cd77e026f5a49fe63",
-    "sGBP": "0x97fe22e7341a0cd8db6f6c021a24dc8f4dad855f",
-    "sCHF": "0x0f83287ff768d1c1e17a42f44d644d7f22e8ee1d",
-    "EURN": "0x9fcf418b971134625cdf38448b949c8640971671",
-    "wibBTC": "0x8751d4196027d4e6da63716fa7786b5174f04c15",
-    "ARDN": "0xb1c9bc94acd2fae6aabf4ffae4429b93512a81d2",
-    "PAD": "0x5067006f830224960fb419d7f25a3a53e9919bb0",
    "TOKE": "0x2e9d63788249371f1dfc918a52f8d799f4a38c94",
-    "SUSHI": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2",
-    "maDAI": "0x36f8d0d0573ae92326827c4a82fe4ce4c244cab6"
+    "TUSD": "0x0000000000085d4780B73119b644AE5ecd22b376",
+    "BUSD": "0x4fabb145d64652a948d72533023f6e7a623c7c53",
+    "INU": "0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE",
+    "LIDO": "0x5a98fcbea516cf06857215779fd812ca3bef1b32",
+    "MKR": "0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2",
+    "CRV": "0xd533a949740bb3306d119cc777fa900ba034cd52",
+    "FTM": "0x4e15361fd6b4bb609fa63c81a2be19d873717870",
+    "SUSHI": "0x6b3595068778dd592e39a122f4f5a5cf09c90fe2"
  },
  "fantom": {
    "WFTM": "0x21be370d5312f44cb42ce377bc9b8a0cef1a4c83",
@@ -49,19 +36,8 @@
    "fUSDT": "0x049d68029688eabf473097a2fc38ef61633a3c7a",
    "DAI": "0x8d11ec38a3eb5e956b052f67da8bdc9bef8abf3e",
    "MIM": "0x82f0b8b456c1a451378467398982d4834b6829c1",
-    "FETH": "0x658b0c7613e890ee50b8c4bc6a3f41ef411208ad",
-    "mooFantomBIFI": "0xbf07093ccd6adfc3deb259c557b61e94c1f66945",
-    "mooScreamETH": "0x0a03d2c1cfca48075992d810cc69bd9fe026384a",
-    "mooScreamWBTC": "0x97927abfe1abbe5429cbe79260b290222fc9fbba",
-    "mooScreamLINK": "0x6dfe2aaea9daadadf0865b661b53040e842640f8",
-    "mooScreamDAI": "0x920786cff2a6f601975874bb24c63f0115df7dc8",
-    "mooScreamFTM": "0x49c68edb7aebd968f197121453e41b8704acde0c",
-    "mooBinSPIRIT": "0x7345a537a975d9ca588ee631befddfef34fd5e8f",
    "renBTC": "0xdbf31df14b66535af65aac99c32e9ea844e14501",
-    "USDL_Stablecoin": "0x4a89338a2079a01edbf5027330eac10b615024e5",
-    "Fantom_L": "0xc0d9784fdba39746919bbf236eb73bc015fd351d",
    "cUSD": "0xe3a486c1903ea794eed5d5fa0c9473c7d7708f40",
-    "SINGLE": "0x8cc97b50fe87f31770bcdcd6bc8603bc1558380b",
    "anyUSDC": "0x95bf7e307bc1ab0ba38ae10fc27084bc36fcd605",
    "nUSD": "0xc5cd01e988cd0794e05ab80f2bcdbdf13ce08bd3",
    "nICE": "0x7f620d7d0b3479b1655cefb1b0bc67fb0ef4e443"
@@ -82,6 +58,7 @@
  "avax": {
    "WAVAX": "0xb31f66aa3c1e785363f0875a1b74e27b85fd66c7",
    "USDC": "0xb97ef9ef8734c71904d8002f8b6bc66dd9c48a6e",
+    "DAI": "0xd586E7F844cEa2F87f50152665BCbc2C279D8d70",
    "USDT_e": "0xc7198437980c041c805a1edcba50c1ce5db95118",
    "USDt": "0x9702230a8ea53601f5cd2dc00fdbc13d4df4a8c7",
    "BTC_b": "0x152b9d0fdc40c096757f570a51e494bd4b943e50",
@@ -93,49 +70,25 @@
    "xJOE": "0x57319d41f71e81f3c65f2a47ca4e001ebafd4f33",
    "LVTX": "0x574679ec54972cf6d705e0a71467bb5bb362919d",
    "sUSDC": "0x2f28add68e59733d23d5f57d94c31fb965f835d0",
-    "sBUSD": "0xf04d3a8eb17b832fbebf43610e94bdc4fd5cf2dd",
-    "mooAaveAVAX": "0x1b156c5c75e9df4caab2a5cc5999ac58ff4f9090",
-    "mooAaveUSDC_e": "0xd795d70ec3c7b990ffed7a725a18be5a9579c3b9",
-    "mooAaveUSDT_e": "0xb6767518b205ea8b312d2ef4d992a2a08c2f2416",
-    "mooAaveDAI_e": "0xaf9f33df60ca764307b17e62dde86e9f7090426c",
-    "mooPangolinV2PNG": "0x808d5f0a62336917da14fa9a10e9575b1040f71c",
-    "sdav3CRV": "0x0665ef3556520b21368754fb644ed3ebf1993ad4",
-    "BXH": "0x90a424754ad0d72cebd440faba18cdc362bfe70a",
-    "mDAI": "0x9debca6ea3af87bf422cea9ac955618ceb56efb4"
+    "sBUSD": "0xf04d3a8eb17b832fbebf43610e94bdc4fd5cf2dd"
  },
  "bsc": {
-    "WBNB": "0xea7a82e0bc636667ab5c65623cd1438370620c3e",
+    "WBNB": "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
+    "BTCB": "0x7130d2a12b9bcbfae4f2634d864a1ee1ce3ead9c",
+    "BETH": "0x250632378e573c6be1ac2f97fcdf00515d0aa91b",
    "BUSD": "0xe9e7cea3dedca5984780bafc599bd69add087d56",
+    "BTUSD": "0x14016e85a25aeb13065688cafb43044c2ef86784",
    "USDC": "0x8ac76a51cc950d9822d68b83fe1ad97b32cd580d",
    "USDT": "0x55d398326f99059ff775485246999027b3197955",
    "ETH": "0x2170ed0880ac9a755fd29b2688956bd959f933f8",
    "AURA": "0x23c5d1164662758b3799103effe19cc064d897d6",
    "C98": "0xaec945e04baf28b135fa7c640f624f8d90f1c3a6",
-    "MOCHI": "0x055dab90880613a556a5ae2903b2682f8a5b8d27",
-    "bMOCHI": "0x2d0e75b683e8b56243b429b24f2b08bcc1ffd8da",
    "NMX": "0xd32d01a43c869edcd1117c640fbdcfcfd97d9d65",
-    "PinkS": "0x702b3f41772e321aaccdea91e1fcef682d21125d",
-    "Warden": "0x0feadcc3824e7f3c12f40e324a60c23ca51627fc",
-    "WSPP": "0x46d502fac9aea7c5bc7b13c8ec9d02378c33d36f",
-    "ABS": "0xf83849122f769a0a7386df183e633607c890f6c0",
-    "ZERO": "0x1f534d2b1ee2933f1fdf8e4b63a44b2249d77eaf",
-    "AFP": "0x9a3321e1acd3b9f6debee5e042dd2411a1742002",
-    "ELK": "0xe1c110e1b1b4a1ded0caf3e42bfbdbb7b5d7ce1c",
-    "PAX": "0xb7f8cd00c5a06c0537e2abff0b58033d02e5e094",
-    "2030Floki": "0xa35d95872d8eb056eb2cbd67d25124a6add7455e",
-    "BTCBR": "0x0cf8e180350253271f4b917ccfb0accc4862f262",
-    "DFL": "0x6ded0f2c886568fb4bb6f04f179093d3d167c9d7",
    "sUSDC": "0x2f28add68e59733d23d5f57d94c31fb965f835d0",
-    "USV": "0xaf6162dc717cfc8818efc8d6f46a41cf7042fcba",
-    "RADIO": "0x30807d3b851a31d62415b8bb7af7dca59390434a",
    "MAHA": "0xce86f7fcd3b40791f63b86c3ea3b8b355ce2685b",
-    "BUSDUSDC_APE_LP_S": "0xbb9858603b1fb9375f6df972650343e985186ac5",
-    "BUSDUSDT_APE_LP_S": "0xc5fb6476a6518dd35687e0ad2670cb8ab5a0d4c5",
    "valBUSD": "0xaed19dab3cd68e4267aec7b2479b1ed2144ad77f",
    "valUSDC": "0xa6fdea1655910c504e974f7f1b520b74be21857b",
    "valUSDT": "0x5f7f6cb266737b89f7af86b30f03ae94334b83e9",
-    "PAID": "0x532197ec38756b9956190b845d99b4b0a88e4ca9",
-    "BXH": "0x6d1b7b59e3fab85b7d3a3d86e505dd8e349ea7f3",
    "SPICE": "0x42586ef4495bb512a86cf7496f6ef85ae7d69a64",
    "iZi": "0x60d01ec2d5e98ac51c8b4cf84dfcce98d527c747",
    "iUSD": "0x0a3bb08b3a15a19b4de82f8acfc862606fb69a2d",
@@ -144,56 +97,26 @@
    "beltBTC": "0x51bd63f240fb13870550423d208452ca87c44444",
    "beltETH": "0xaa20e8cb61299df2357561c2ac2e1172bc68bc25",
    "YGG": "0x13ab6739368a4e4abf24695bf52959224367391f",
-    "ibBNB": "0xd7d069493685a581d27824fc46eda46b7efc0063",
-    "ibBUSD": "0x7c9e73d4c71dae564d41f78d56439bb4ba87592f",
-    "ibUSDT": "0x158da805682bdc8ee32d52833ad41e74bb951e59",
-    "ibBTCB": "0x08fc9ba2cac74742177e0afc3dc8aed6961c24e7",
-    "ibETH": "0xbff4a34a4644a113e8200d7f1d79b3555f723afe",
-    "ibTUSD": "0x3282d2a151ca00bfe7ed17aa16e42880248cd3cd",
-    "ibALPACA": "0xf1be8ecc990cbcb90e166b71e368299f0116d421",
-    "aUST": "0x8b04e56a8cd5f4d465b784ccf564899f30aaf88c",
    "IVN": "0x6a46d878401f46b4c7f665f065e0667580e031ec",
-    "1MIL": "0xa4ef4b0b23c1fc81d3f9ecf93510e64f58a4a016",
-    "APYS": "0x37dfacfaeda801437ff648a1559d73f4c40aacb7",
-    "BRZ": "0x5b1a9850f55d9282a7c4bf23a2a21b050e3beb2f",
-    "jBRL": "0x316622977073bbc3df32e7d2a9b3c77596a0a603",
-    "AUSD": "0xdcecf0664c33321ceca2effce701e710a2d28a3f",
-    "deUSDC": "0x1ddcaa4ed761428ae348befc6718bcb12e63bfaa",
-    "axlUSDC": "0x4268b8f0b87b6eae5d897996e6b845ddbd99adf3",
-    "dEPX": "0x772f317ec695ce20290b56466b3f48501ba81352",
-    "RAILBSC": "0x3f847b01d4d498a293e3197b186356039ecd737f",
    "ankrBNB": "0xe85afccdafbe7f2b096f268e31cce3da8da2990a",
    "aBNBb": "0xbb1aa6e59e5163d8722a122cd66eba614b59df0d"
  },
  "polygon": {
    "WMATIC": "0xfd28c7cea3c50a060cb4c0059e453c6d4dd9829d",
+    "WMATIC_1": "0x0000000000000000000000000000000000001010",
    "USDC": "0x2791bca1f2de4661ed88a30c99a7a9449aa84174",
+    "QUICK": "0xb5c064f955d8e7f38fe0460c556a72987494ee17",
+    "WBTC": "0x1bfd67037b42cf73acf2047067bd4f2c47d9bfd6",
    "USDT": "0xc2132d05d31c914a87c6611c10748aeb04b58e8f",
    "DAI": "0x8f3cf7ad23cd3cadbd9735aff958023239c6a063",
    "WETH": "0x6cacfaf65b1b1f9979acf463a393a112d0980982",
-    "MYT": "0x4535e52cdf3ab787b379b7b72b5990767e6747e4",
-    "MMF": "0x22a31bd4cb694433b6de19e0acc2899e553e9481",
-    "iZi": "0x60d01ec2d5e98ac51c8b4cf84dfcce98d527c747",
+    "WETH_1": "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619",
    "DINO": "0xaa9654becca45b5bdfa5ac646c939c62b527d394",
    "sUSDC": "0x2f28add68e59733d23d5f57d94c31fb965f835d0",
-    "moUSD": "0x9fffb2f49adfc231b44ddcff3ffcf0e81b06430a",
    "sBUSD": "0xf04d3a8eb17b832fbebf43610e94bdc4fd5cf2dd",
-    "sUSDC_e": "0x8eb3771a43a8c45aabe6d61ed709ece652281dc9",
    "RADIO": "0x613a489785c95afeb3b404cc41565ccff107b6e0",
-    "deUSDC": "0x1ddcaa4ed761428ae348befc6718bcb12e63bfaa",
    "YIN": "0x794baab6b878467f93ef17e2f2851ce04e3e34c8",
-    "mOCEAN": "0x282d8efce846a88b159800bd4130ad77443fa1a1",
-    "XSGD": "0x769434dca303597c8fc4997bf3dab233e961eda2",
-    "wTCAD": "0x6d3cc56dfc016151ee2613bdde0e03af9ba885cc",
-    "wTAUD": "0xe4f7761b541668f88d04fe9f2e9df10ca613aef7",
-    "wTGBP": "0x81a123f10c78216d32f8655eb1a88b5e9a3e9f2f",
-    "POP": "0xc5b57e9a1e7914fda753a88f24e5703e617ee50c",
-    "pLEO": "0xf826a91e8de52bc1baf40d88203e572dc2551aa3",
-    "pSPS": "0x28cead9e4ff96806c79f4189ef28fc61418e2216",
-    "rUSD": "0xfc40a4f89b410a1b855b5e205064a38fc29f5eb5",
-    "APYS": "0x14743e1c6f812154f7ecc980d890f0f5234103e7",
    "BNB": "0x5c4b7ccbf908e64f32e12c6650ec0c96d717f03f",
-    "IS3USD": "0xb4d09ff3da7f9e9a2ba029cb0a81a989fd7b8f17",
    "BUSD": "0x9c9e5fd8bbc25984b178fdce6117defa39d2db39",
    "WORK": "0x6002410dda2fb88b4d0dc3c1d562f7761191ea80"
  },
@@ -217,7 +140,6 @@
    "BTCK": "0x54e4622dc504176b3bb432dccaf504569699a7ff",
    "ETHK": "0xef71ca2ee68f45b9ad6f72fbdb33d707b872315c",
    "OKB": "0xdf54b6c6195ea4d948d03bfd818d365cf175cfc2",
-    "KST": "0xab0d1578216a545532882e420a8c61ea07b00b12",
    "CHE": "0x8179d97eb6488860d816e3ecafe694a4153f216c",
    "ELK": "0xe1c110e1b1b4a1ded0caf3e42bfbdbb7b5d7ce1c"
  },
@@ -228,12 +150,10 @@
    "DAI_HECO": "0x3d760a45d0887dfd89a2f5385a236b29cb46ed2a",
    "USDC_HECO": "0x9362bbef4b8313a8aa9f0c9808b80577aa26b73b",
    "COMP": "0xce0a5ca134fb59402b723412994b30e02f083842",
-    "lDOGE": "0x1ee8382be3007bd9249a89f636506284ddef6cc0",
    "DOGE": "0x40280e26a572745b1152a54d1d44f365daa51618",
    "TUSD": "0x5ee41ab6edd38cdfb9f6b4e6cf7f75c87e170d98",
    "XRP": "0xa2f3c2446a3e20049708838a779ff8782ce6645a",
-    "ADA": "0x843af718ef25708765a8e0942f89edeae1d88df0",
-    "APYS": "0x90e8896b12a92d51cd213b681c2cad83a9a6bd49"
+    "ADA": "0x843af718ef25708765a8e0942f89edeae1d88df0"
  },
  "hoo": {
    "wHOO": "0x3eff9d389d13d6352bfb498bcf616ef9b1beac87"
@@ -242,13 +162,12 @@
    "JEWEL": "0x72cb10c6bfa5624dd07ef608027e366bd690048f",
    "MIS": "0xd74433b187cf0ba998ad9be3486b929c76815215",
    "WONE": "0xcf664087a5bb0237a0bad6742852ec6c8d69a27a",
-    "hMOCHI": "0x0dd740db89b9fda3baadf7396ddad702b6e8d6f5",
    "xJEWEL": "0xa9ce83507d872c5e1273e745abcfda849daa654f",
    "AVAX": "0xb12c13e66ade1f72f71834f2fc5082db8c091358",
-    "RVRS": "0xed0b4b0f0e2c17646682fc98ace09feb99af3ade",
    "VIPER": "0xea589e93ff18b1a1f1e9bac7ef3e86ab62addc79"
  },
  "optimism": {
+    "OP": "0x4200000000000000000000000000000000000042",
    "WETH": "0x121ab82b49b2bc4c7901ca46b8277962b4350204",
    "BitANT": "0x5029c236320b8f15ef0a657054b84d90bfbeded3",
    "FEI": "0x35d48a789904e9b15705977192e5d95e2af7f1d3",
@@ -257,10 +176,10 @@
    "FRAX": "0x2e3d870790dc77a83dd1d18184acc7439a53f475",
    "gOHM": "0x0b5740c6b4a97f90ef2f0220651cca420b868ffb",
    "sUSD": "0x8c6f28f2f1a3c87f0f938b96d27520d9751ec8d9",
-    "sLINK": "0xc5db22719a06418028a40a9b5e9a7c02959d0d08",
    "sETH": "0xe405de8f52ba7559f9df3c368500b6e6ae6cee49",
    "USDT": "0x94b008aa00579c1307b0ef2c499ad98a8ce58e58",
-    "sBTC": "0x298b9b95708152ff6968aafd889c6586e9169f1d"
+    "USDC": "0x7F5c764cBc14f9669B88837ca1490cCa17c31607",
+    "DAI": "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1"
  },
  "moonriver": {
    "WMOVR": "0xe3c7487eb01c74b73b7184d198c7fbf46b34e5af",
@@ -281,7 +200,6 @@
    "USDT": "0x81ecac0d6be0550a00ff064a4f9dd2400585fe9c",
    "WETH": "0x6959027f7850adf4916ff5fdc898d958819e5375",
    "WBTC": "0xe57ebd2d67b462e9926e04a8e33f01cd0d64346d",
-    "DAI": "0xc234a67a4f840e61ade794be47de455361b52413",
    "MOVR": "0x1d4c2a246311bb9f827f4c768e277ff5787b7d7e",
    "xcUSDT": "0xffffffffea09fb06d082fd1275cd48b191cbcd1d",
    "BEPRO": "0x4edf8e0778967012d46968ceadb75436d0426f88",
@@ -297,7 +215,6 @@
    "ARBY": "0x09ad12552ec45f82be90b38dfe7b06332a680864",
    "MIM": "0xfea7a6a0b346362bf88a9e4a88416b77a57d6c2a",
    "renBTC": "0xdbf31df14b66535af65aac99c32e9ea844e14501",
-    "XDO": "0x9ef758ac000a354479e538b8b2f01b917b8e89e7",
    "DFL": "0x31635a2a3892daec7c399102676e344f55d20da7",
    "FEI": "0x4a717522566c7a09fd2774ccedc5a8c43c5f9fd2",
    "nUSD": "0x2913e812cf0dcca30fb28e6cac3d2dcff4497688",
@@ -362,7 +279,6 @@
    "WMETIS": "0x71802e8f394bb9d05a1b8e9d0562917609fd7325",
    "m_USDT": "0xbb06dca3ae6887fabf931640f67cab3e3a16f4dc",
    "WETH": "0x420000000000000000000000000000000000000a",
-    "USDO": "0x5801d0e1c7d977d78e4890880b8e579eb4943276",
    "m_USDC": "0xea32a96608495e54156ae48931a7c20f0dcc1a21",
    "BNB": "0x2692be44a6e38b698731fddf417d060f0d20a0cb",
    "WBTC": "0xa5b55ab1daf0f8e1efc0eb1931a957fd89b918f4",
@@ -450,11 +366,9 @@
  },
  "klaytn": {
    "WKLAY": "0x57d1a61e4fd09fbf16e35b04959e94dcf2032974",
-    "oDON": "0x5388ce775de8f7a69d17fd5caa9f7dbfee65dfce",
    "BORA": "0x02cbe46fb8a1f579254a9b485788f2d86cad51aa",
    "DAI": "0xcb2c7998696ef7a582dfd0aafadcd008d03e791a",
    "USDC": "0x608792deb376cce1c9fa4d0e6b7b44f507cffa6a",
-    "IJM": "0x0268dbed3832b87582b1fa508acf5958cbb1cd74",
    "USDT": "0x5c13e303a62fc5dedf5b52d66873f2e59fedadc2",
    "pUSD": "0x168439b5eebe8c83db9eef44a0d76c6f54767ae4",
    "KSD": "0x4fa62f1f404188ce860c8f0041d6ac3765a72e67",
@@ -483,9 +397,7 @@
    "NPT": "0xe06597d02a2c3aa7a9708de2cfa587b128bd3815"
  },
  "nova": {
-    "WSNT": "0x657a66332a65b535da6c5d67b8cd1d410c161a08",
-    "NUSD": "0x1f5396f254ee25377a5c1b9c6bff5f44e9294fff",
-    "null": "0x0000000000000000000000000000000000000000"
+    "NUSD": "0x1f5396f254ee25377a5c1b9c6bff5f44e9294fff"
  },
  "aurora": {
    "WETH": "0x274d83086c356e0cfc75933fbf838ca10a7e8274",
@@ -515,8 +427,7 @@
    "AKT": "0x39a65a74dc5a778ff93d1765ea51f57bc49c81b3",
    "SHIB": "0xbed48612bc69fa1cab67052b42a95fb30c1bcfee",
    "ATOM": "0xb888d8dd1733d72681b30c00ee76bde93ae7aa93",
-    "ELON": "0x02dccaf514c98451320a9365c5b46c61d3246ff3",
-    "CRK": "0x065de42e28e42d90c2052a1b49e7f83806af0e1f"
+    "ELON": "0x02dccaf514c98451320a9365c5b46c61d3246ff3"
  },
  "velas": {
    "WVLX": "0xe41c4324dcbd2926481101f8580d13930aff8a75",
@@ -552,6 +463,7 @@
    "SOL": "So11111111111111111111111111111111111111112",
    "BONK": "DezXAZ8z7PnrnRJjz3wXBoRgixCa6xjnB7YaB1pPB263",
    "USDC": "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+    "USDT": "Es9vMFrzaCERmJfrF4H2FYD4KCoNkY11McCe8BenwNYB",
    "pSOL": "9EaLkQrbjmbbuZG9Wdpo8qfNUEjHATJFSycEmw6f1rGX",
    "APT": "6LNeTYMqtNm1pBFN8PfhQaoLyegAH8GD32WmHU9erXKN",
    "DAI": "EjmyN6qEC1Tf1JxiG1ae7UTJhUxSwk1TCWNWqxWV4J6o",
@@ -579,7 +491,6 @@
    "ARSW": "0xde2578edec4669ba7f41c5d5d2386300bcea4678",
    "DOT": "0xffffffffffffffffffffffffffffffffffffffff",
    "DAI": "0x6de33698e9e9b787e09d3bd7771ef63557e148bb",
-    "ORU": "0xcdb32eed99aa19d39e5d6ec45ba74dc4afec549f",
    "MUUU": "0xc5bcac31cf55806646017395ad119af2441aee37",
    "NIKA": "0x6df98e5fbff3041105cb986b9d44c572a43fcd22",
    "oUSD": "0x29f6e49c6e3397c3a84f715885f9f233a441165c",
@@ -587,7 +498,6 @@
    "LAY": "0xc4335b1b76fa6d52877b3046eca68f6e708a27dd",
    "lUSDT": "0x430d50963d9635bbef5a2ff27bd0bddc26ed691f",
    "nASTR": "0xe511ed88575c57767bafb72bfd10775413e3f2b0",
-    "ESW": "0xb361dad0cc1a03404b650a69d9a5adb5af8a531f",
    "lUSDC": "0xc404e12d3466accb625c67dbab2e1a8a457def3c",
    "lDAI": "0x4dd9c468a44f3fef662c35c1e9a6108b70415c2c",
    "aBaiUsdc": "0xdbd71969ac2583a9a20af3fb81fe9c20547f30f3",
@@ -681,11 +591,9 @@
  "near": {
    "JUMBO": "token.jumbo_exchange.near",
    "PARAS": "token.paras.near",
-    "MARMAJ": "marmaj.tkn.near",
    "LINA": "linear-protocol.near",
    "PEMBROCK": "token.pembrock.near",
-    "BURROW": "token.burrow.near",
-    "MMRJ": "token.marmaj.near"
+    "BURROW": "token.burrow.near"
  },
  "multivac": {
    "WMTV": "0x8e321596267a4727746b2f48bc8736db5da26977",
@@ -794,14 +702,11 @@
    "USDT": "0x7f8e71dd5a7e445725f0ef94c7f01806299e877a",
    "WBTC": "0xd0c6179c43c00221915f1a61f8ec06a5aa32f9ec",
    "FRAX": "0x10d70831f9c3c11c5fe683b2f1be334503880db6",
-    "FXS": "0x97513e975a7fa9072c72c92d8000b0db90b163c5",
    "BUSD": "0x332730a4f6e03d9c55829435f10360e13cfa41ff",
    "BNB": "0x1fc532187b4848d2f9c564531b776a4f8e11201d",
    "QUICK": "0xb12c13e66ade1f72f71834f2fc5082db8c091358",
    "MATIC": "0xdc42728b0ea910349ed3c6e1c9dc06b5fb591f98",
-    "WETH": "0x9f4614e4ea4a0d7c4b1f946057ec030bee416cbb",
-    "_SAVIOR": "0xbfbb7b1d22ff521a541170cafe0c9a7f20d09c3b",
-    "DTools": "0x1df5c9b7789bd1416d005c15a42762481c95edc2"
+    "WETH": "0x9f4614e4ea4a0d7c4b1f946057ec030bee416cbb"
  },
  "canto": {
    "WCANTO": "0x826551890dc65655a0aceca109ab11abdbd7a07b",
@@ -858,7 +763,6 @@
    "USDT": "0x818ec0a7fe18ff94269904fced6ae3dae6d6dc0b",
    "JPYC": "0x735abe48e8782948a37c7765ecb76b98cde97b0f",
    "STND": "0x722377a047e89ca735f09eb7cccab780943c4cb4",
-    "ESW": "0xb4bca5955f26d2fa6b57842655d7acf2380ac854",
    "ETH": "0x765277eebeca2e31912c9946eae1021199b39c61",
    "BNB": "0x332730a4f6e03d9c55829435f10360e13cfa41ff",
    "BUSD": "0x65e66a61d0a8f1e686c2d6083ad611a10d84d97a"
@@ -872,13 +776,13 @@
    "wMATIC": "KT18fp5rcTW7mbWDmzFwjLDUhs5MeJmagDSZ-11",
    "MYH": "KT1BB1uMwVvJ1M3vVHXWALs1RWdgTp1rnXTR",
    "kUSD": "KT1K9gCRgaLRFKTErYt1wVxA3Frb9FjasjTV",
-    "USDT.e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-3",
+    "USDT_e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-3",
    "PXL": "KT1F1mn2jbqQCJcsNgYKVAQjvenecNMY2oPK",
-    "WBTC.e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-1",
+    "WBTC_e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-1",
    "kDAO": "KT1JkoE42rrMBP9b2oDhbx6EUr26GcySZMUH",
    "STKR": "KT1AEfeckNbdEYwaMKkytBwPJPycz7jdSGea",
    "wXTZ": "KT1VYsVfmobT7rsMVivvZ4J8i3bPiqz12NaH",
-    "MATIC.e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-4",
+    "MATIC_e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-4",
    "hDAO": "KT1AFA2mwNUMNd4SsujE1YYp29vd8BZejyKW",
    "WRAP": "KT1LRboPna9yQY9BrjtQYDS1DVxhKESK4VVd",
    "wBUSD": "KT18fp5rcTW7mbWDmzFwjLDUhs5MeJmagDSZ-1",
@@ -887,14 +791,14 @@
    "wUSDC": "KT18fp5rcTW7mbWDmzFwjLDUhs5MeJmagDSZ-17",
    "QUIPU": "KT193D4vozYnhGJQVtw7CoxxqphqUEEwK6Vb",
    "wWETH": "KT18fp5rcTW7mbWDmzFwjLDUhs5MeJmagDSZ-20",
-    "USDC.e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-2",
+    "USDC_e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-2",
    "PLENTY": "KT1GRSvLoikDsXujKgZPsGLX8k8VvR2Tq95b",
    "wUSDT": "KT18fp5rcTW7mbWDmzFwjLDUhs5MeJmagDSZ-18",
    "wDAI": "KT18fp5rcTW7mbWDmzFwjLDUhs5MeJmagDSZ-5",
    "SMAK": "KT1TwzD6zV3WeJ39ukuqxcfK2fJCnhvrdN1X",
-    "LINK.e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-5",
+    "LINK_e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY-5",
    "DOGA": "KT1Ha4yFVeyzw6KRAdkzq6TxDHB97KG4pZe8",
-    "WETH.e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY",
+    "WETH_e": "KT1UsSfaXyqcjSVPeiD7U1bWgKy3taYN7NWY",
    "INSTA": "KT19y6R8x53uDKiM46ahgguS6Tjqhdj2rSzZ",
    "GIF": "KT1XTxpQvo7oRCqp85LikEZgAZ22uDxhbWJv",
    "UNO": "KT1ErKVqEhG9jxXgUG2KGLW3bNM7zXHX8SDF",
@@ -1089,7 +993,6 @@
  },
  "iotex": {
    "WIOTX": "0xa00744882684c3e4747faefd68d283ea44099d03",
-    "MCN": "0x3fe04320885e6124231254c802004871be681218",
    "ELK": "0xe1ce1c0fa22ec693baca6f5076bcdc4d0183de1c",
    "ioUSDT": "0x6fbcdc1169b5130c59e72e51ed68a84841c98cd1",
    "USDT_matic": "0x3cdb7c48e70b854ed2fa392e21687501d84b3afc",
@@ -1112,7 +1015,6 @@
    "BNB_bsc": "0x97e6c48867fdc391a8dfe9d169ecd005d1d90283",
    "ZOOM": "0x86702a7f8898b172de396eb304d7d81207127915",
    "WMATIC": "0x8e66c0d6b70c0b23d39f4b21a1eac52bba8ed89a",
-    "iPEGG": "0x176cb5113b4885b3a194bd69056ac3fe37a4b95c",
    "CIOTX": "0x99b2b0efb56e62e36960c20cd5ca8ec6abd5557a"
  },
  "ronin": {
@@ -1266,12 +1168,6 @@
    "USDT": "USDT"
  },
  "elrond": {
-    "temp_12": "CYC-b4ed61",
-    "temp_13": "LPAD-84628f",
-    "temp_14": "EVLD-43f56f",
-    "temp_15": "FITY-73f8fc",
-    "temp_18": "erd1hmfwpvsqn8ktzw3dqd0ltpcyfyasgv8mr9w0qecnmpexyp280y8q47ca9d",
-    "temp_24": "UPARK-982dd6",
    "SUPER": "SUPER-507aa6",
    "WEGLD": "WEGLD-bd4d79",
    "LAND": "LAND-40f26f",
--- a/projects/helper/solana.js
+++ b/projects/helper/solana.js
@@ -1,16 +1,14 @@
 const axios = require("axios");
 const http = require('./http')
-const cache = require('./cache')
 const env = require('./env')
 const { transformBalances: transformBalancesOrig, transformDexBalances, } = require('./portedTokens.js')
-const { tokens, getUniqueAddresses } = require('./tokenMapping')
+const { getUniqueAddresses } = require('./tokenMapping')
 const { Connection, PublicKey, Keypair } = require("@solana/web3.js")
 const { AnchorProvider: Provider, Wallet, } = require("@project-serum/anchor");
 const { sleep, sliceIntoChunks, log, } = require('./utils')
 const { decodeAccount } = require('./utils/solana/layout')

 const sdk = require('@defillama/sdk')
-const tokenMapping = tokens

 const blacklistedTokens = [
  'CowKesoLUaHSbAMaUxJUj7eodHHsaLsS65cy8NFyRDGP',
@@ -335,7 +333,7 @@ async function sumTokens2({

  if (solOwners.length) {
    const solBalance = await getSolBalances(solOwners)
-    sdk.util.sumSingleBalance(balances, tokenMapping.solana, solBalance)
+    sdk.util.sumSingleBalance(balances, 'solana:So11111111111111111111111111111111111111112', solBalance)
  }

  blacklistedTokens.forEach(i => delete balances['solana:'+i])
@@ -368,7 +366,6 @@ function readBigUInt64LE(buffer, offset) {

 module.exports = {
  endpoint,
-  tokens,
  getTokenSupply,
  getTokenBalance,
  getTokenAccountBalance,
--- a/projects/helper/tokenMapping.js
+++ b/projects/helper/tokenMapping.js
@@ -16,30 +16,6 @@ const nullAddress = '0x0000000000000000000000000000000000000000'
 const ibcChains = ['ibc', 'terra', 'terra2', 'crescent', 'osmosis', 'kujira', 'stargaze', 'juno', 'injective', 'cosmos', 'comdex', 'stargaze', 'umee', 'orai', 'persistence', ]
 const caseSensitiveChains = [...ibcChains, 'solana', 'tezos', 'ton', 'algorand', 'aptos', 'near', 'bitcoin', 'waves', 'tron', 'litecoin', 'polkadot', 'ripple', 'elrond', 'cardano', 'stacks']

-const tokens = {
-  null: nullAddress,
-  aave: 'ethereum:0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9',
-  matic: 'ethereum:0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0',
-  bat: 'ethereum:0x0d8775f648430679a709e98d2b0cb6250d2887ef',
-  reth: 'ethereum:0xae78736cd615f374d3085123a210448e74fc6393',
-  steth: 'ethereum:0xae7ab96520de3a18e5e111b5eaab095312d7fe84',
-  solana: 'solana:So11111111111111111111111111111111111111112',
-  dai: 'ethereum:0x6b175474e89094c44da98b954eedeac495271d0f',
-  usdt: 'ethereum:0xdac17f958d2ee523a2206206994597c13d831ec7',
-  usdc: 'ethereum:0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-  ethereum: 'ethereum:' + nullAddress,
-  weth: 'ethereum:0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-  busd: 'bsc:0xe9e7cea3dedca5984780bafc599bd69add087d56',
-  bsc: 'bsc:' + nullAddress,
-  bnb: 'bsc:0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c',
-  link: 'ethereum:0x514910771af9ca656af840dff83e8264ecf986ca',
-  wbtc: 'ethereum:0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
-  wsteth: 'ethereum:0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0',
-}
-const tokensBare = {}
-for (const [label, value] of Object.entries(tokens))
-  tokensBare[label] = value.split(':')[1]
-
 const distressedAssts = new Set(Object.values({
  CRK: '0x065de42e28e42d90c2052a1b49e7f83806af0e1f',
  aBNBc: '0xe85afccdafbe7f2b096f268e31cce3da8da2990a',
@@ -135,8 +111,6 @@ const eulerTokens = [

 module.exports = {
  nullAddress,
-  tokens,
-  tokensBare,
  caseSensitiveChains,
  transformTokens,
  fixBalancesTokens,
--- a/projects/injective/index.js
+++ b/projects/injective/index.js
@@ -1,30 +1,31 @@
-const {  sumTokensExport } = require('../helper/unwrapLPs')
-const { tokensBare: tokens } = require('../helper/tokenMapping')
+const { sumTokensExport } = require('../helper/unwrapLPs')

 const newHolder = '0xf955c57f9ea9dc8781965feae0b6a2ace2bad6f3'
 module.exports = {
  ethereum: {
-    tvl: sumTokensExport({ owner: newHolder, tokens: [
-      tokens.weth,
-      tokens.dai,
-      tokens.usdc,
-      tokens.usdt,
-      tokens.link,
-      tokens.wbtc ,
-      '0xaaef88cea01475125522e117bfe45cf32044e238',
-      '0x4a220e6096b25eadb88358cb44068a3248254675',
-      '0xde4c5a791913838027a2185709e98c5c6027ea63',
-      '0x92d6c1e31e14520e676a687f0a93788b716beff5',
-      '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
-      '0xBB0E17EF65F82Ab018d8EDd776e8DD940327B28b',
-      '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84',
-      '0x4d224452801ACEd8B2F0aebE155379bb5D594381',
-      '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
-      '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9',
-      '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F',
-      '0x45804880De22913dAFE09f4980848ECE6EcbAf78',
-      '0x6B3595068778DD592e39A122f4f5a5cF09C90fE2',
-      '0xc944E90C64B2c07662A292be6244BDf05Cda44a7',
-    ]})
+    tvl: sumTokensExport({
+      owner: newHolder, tokens: [
+        '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+        '0x6b175474e89094c44da98b954eedeac495271d0f',
+        '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+        '0xdac17f958d2ee523a2206206994597c13d831ec7',
+        '0x514910771af9ca656af840dff83e8264ecf986ca',
+        '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+        '0xaaef88cea01475125522e117bfe45cf32044e238',
+        '0x4a220e6096b25eadb88358cb44068a3248254675',
+        '0xde4c5a791913838027a2185709e98c5c6027ea63',
+        '0x92d6c1e31e14520e676a687f0a93788b716beff5',
+        '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+        '0xBB0E17EF65F82Ab018d8EDd776e8DD940327B28b',
+        '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84',
+        '0x4d224452801ACEd8B2F0aebE155379bb5D594381',
+        '0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0',
+        '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9',
+        '0xC011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F',
+        '0x45804880De22913dAFE09f4980848ECE6EcbAf78',
+        '0x6B3595068778DD592e39A122f4f5a5cF09C90fE2',
+        '0xc944E90C64B2c07662A292be6244BDf05Cda44a7'
+      ]
+    })
  }
 }
--- a/projects/proteo-farms/index.js
+++ b/projects/proteo-farms/index.js
@@ -1,5 +1,4 @@
 const { sumTokens } = require('../helper/chain/elrond')
-const { tokens } = require('../helper/tokenMapping')
 const { get } = require('../helper/http')
 const sdk = require('@defillama/sdk')

@@ -30,8 +29,8 @@ async function getPrices() {

 async function tvl() {
  const tokensAndOwners = [
-    [tokens.null, 'erd1qqqqqqqqqqqqqpgqwqxfv48h9ssns5cc69yudvph297veqeeznyqr4l930'],
-    [tokens.null, 'erd1qqqqqqqqqqqqqpgqyhj3hk6kkw7405j42g20th3g2h5s8076znyqrpe2pr'],
+    ['0x0000000000000000000000000000000000000000', 'erd1qqqqqqqqqqqqqpgqwqxfv48h9ssns5cc69yudvph297veqeeznyqr4l930'],
+    ['0x0000000000000000000000000000000000000000', 'erd1qqqqqqqqqqqqqpgqyhj3hk6kkw7405j42g20th3g2h5s8076znyqrpe2pr'],
    ['USDC-c76f1f', 'erd1qqqqqqqqqqqqqpgq3lh80a92d49am3t2pfzheapdxtykzt5kznyqsjhfrx'],
    ['USDC-c76f1f', 'erd1qqqqqqqqqqqqqpgq25l7fgjdecaanxuuzxnquzs7k80q6mqaznyqzjclf5'],
    ['ZPAYWEGLD-34e5c1', 'erd1qqqqqqqqqqqqqpgqrpa6ezy0q4xuj6y9plgv85va43x7wy3dznyqr2rwcz'],
--- a/projects/treasury/gearbox.js
+++ b/projects/treasury/gearbox.js
@@ -1,5 +1,4 @@
 const { nullAddress, treasuryExports } = require("../helper/treasury");
-const { tokensBare: tokens } = require("../helper/tokenMapping");

 // Treasury
 const treasury = "0x7b065Fcb0760dF0CEA8CFd144e08554F3CeA73D1";
@@ -9,14 +8,14 @@ const GEAR = "0xBa3335588D9403515223F109EdC4eB7269a9Ab5D";
 module.exports = treasuryExports({
  ethereum: {
    tokens: [
-        // Ethereum Assets
-        nullAddress,
-        tokens.weth,
-        tokens.wbtc,
-        tokens.usdc,
-        tokens.dai,
-        "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0",//wsteth
-     ],
+      // Ethereum Assets
+      nullAddress,
+      '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+      '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+      '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+      '0x6b175474e89094c44da98b954eedeac495271d0f',
+      "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0",//wsteth
+    ],
    owners: [treasury],
    ownTokens: [GEAR]
  },
--- a/projects/unamano/index.js
+++ b/projects/unamano/index.js
@@ -1,5 +1,4 @@
 const { sumTokens2 } = require('../helper/unwrapLPs')
-const { tokensBare } = require('../helper/tokenMapping')

 const abis = {
  poolInfo: "function poolInfo(uint256) view returns (address candyToken, uint256 startBlock, uint256 endBlock, uint256 lastRewardBlock, uint256 accPerShare, uint256 candyPerBlock, uint256 lpSupply, uint256 candyBalance, uint256 le12, tuple(address creator, uint256 unlockTime, uint256 maximumStaking, uint8 status, address multisignatureWallet, address assetManagementAddr) una)",
@@ -10,7 +9,7 @@ module.exports = {
  ethereum:{
    tvl: async (_, b, cb, { api }) => {
      const info = await api.fetchList({  lengthAbi: abis.poolLength, itemAbi: abis.poolInfo, target: '0x078aadff42c94b01f135b0ab1d4b794902c67c3f'})
-      return sumTokens2({ api, tokens: [tokensBare.steth], owners: info.map(i => i.una.assetManagementAddr)})
+      return sumTokens2({ api, tokens: ['0xae7ab96520de3a18e5e111b5eaab095312d7fe84'], owners: info.map(i => i.una.assetManagementAddr)})
    },
  },
 }
--- a/projects/zharta/index.js
+++ b/projects/zharta/index.js
@@ -1,4 +1,3 @@
-const { tokensBare } = require('../helper/tokenMapping');
 const { sumTokensExport, } = require('../helper/unwrapLPs')

 // Vaults
@@ -12,7 +11,7 @@ module.exports = {
  ethereum: {
    tvl: sumTokensExport({
      owners: [collateralVault, punkVault, appraisalVault, LP_CORE],
-      tokens: [tokensBare.weth],
+      tokens: ['0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'],
      resolveNFTs: true,
    }),
  }
--- a/utils/scripts/changeCoreAssetsFormat2.js
+++ b/utils/scripts/changeCoreAssetsFormat2.js
@@ -2,38 +2,18 @@ const assets = require("../../projects/helper/coreAssets.json");
 const fs = require('fs')
 const axios = require('axios')

-const sdk = require('@defillama/sdk')
 const newJson = {}

 async function run() {
  const entries = Object.entries(assets)
-  for (const entry of entries) {
-    await getSymbols(entry)
-    fs.writeFileSync('./projects/helper/coreAssets.json', JSON.stringify(newJson, null, 2))
-  }
-}
-
-async function updateNames([chain, addresses]) {
-  if (!addresses.length) return;
-  const chainObj = {}
-  newJson[chain] = chainObj
-  if (!addresses[addresses.length -1].startsWith('0x') || ['starknet', 'aptos'].includes(chain)) {
-    addresses.forEach((v, i) => {
-      const key = 'temp_' + i
-      chainObj[key] = v
-    })
-    console.log('------- non-evm chain: ', chain)
-    return;
-  }
-  const symbols = await api.multiCall({  abi: 'string:symbol', calls: addresses, permitFailure: true})
-  addresses.forEach((v, i) => {
-    let key = symbols[i]
-    if (!key) {
-      key = v === '0x0000000000000000000000000000000000000000' ? 'null' : 'temp_' + i
-    }
-    key = key.replace(/\W+/g, '_')
-    chainObj[key] = v
-  })
+  await Promise.all(entries.map(checkSymbols))
+  // for (const entry of entries) {
+  //   await getSymbols(entry)
+  //   fs.writeFileSync('./projects/helper/coreAssets.json', JSON.stringify(newJson, null, 2))
+  // }
+  // for (const entry of entries) {
+  //   await checkSymbols(entry)
+  // }
 }

 async function getSymbols([chain, mapping]) {
@@ -41,18 +21,17 @@ async function getSymbols([chain, mapping]) {
  let reverseMapping = {}
  const tokens = Object.entries(mapping).map(([key, value]) => {
    if (!key.startsWith('temp_')) return;
-    const key2 = chain + ':'+value
+    const key2 = chain + ':' + value
    reverseMapping[key2] = key
    return key2
  }).filter(i => i)
  if (!tokens.length) return;
-  console.log('for ', chain, tokens)
-  const { data: { coins }} = await axios.get('https://coins.llama.fi/prices/current/'+tokens.join(','))
+  const { data: { coins } } = await axios.get('https://coins.llama.fi/prices/current/' + tokens.join(','))
  const symbolSet = new Set()
  Object.entries(coins).forEach(([key, { symbol }]) => {
    const key2 = reverseMapping[key]
    if (!key2) {
-      console.log('Bug: ',key, chain)
+      console.log('Bug: ', key, chain)
      throw new Error('Fix this')
    }
    const value = mapping[key2]
@@ -60,7 +39,7 @@ async function getSymbols([chain, mapping]) {
    let iterator = 0
    let label = symbol
    while (symbolSet.has(label)) {
-      label = symbol + '_'+ ++iterator
+      label = symbol + '_' + ++iterator
    }
    symbolSet.add(label)
    mapping[label] = value
@@ -68,6 +47,24 @@ async function getSymbols([chain, mapping]) {

 }

+async function checkSymbols([chain, mapping]) {
+  try {
+    if (chain === 'null') return;
+    newJson[chain] = mapping
+    let tokens = Object.entries(mapping).map(([key, value]) => {
+      return chain + ':' + value
+    })
+    if (!tokens.length) return;
+    const { data: { coins } } = await axios.get('https://coins.llama.fi/prices/current/' + tokens.join(','))
+    Object.entries(coins).forEach(([key, { symbol }]) => {
+      tokens = tokens.filter(i => i !== key)
+    })
+    if (tokens.length) console.log('failed to find price:', chain, tokens)
+  } catch (e) {
+    console.log('error in ', chain)
+  }
+}
+
 run().then(() => {
  console.log('done')
  process.exit(0)
--- a/utils/scripts/tokenMapping.js
+++ b/utils/scripts/tokenMapping.js
@@ -128,5 +128,5 @@ async function run() {
  })

  await Promise.all(promises)
-  writeToCache()
+  // writeToCache()
 }