fix astroport

Author: g1nt0ki

projects/astroport/index.js

@@ -11,7 +11,9 @@ module.exports = {
         tvl: getFactoryTvl("terra14x9fr055x5hvr48hzy2t4q7kvjvfttsvxusa4xsdcy702mnzsvuqprer8r")
     },
     neutron: {
-        tvl: getFactoryTvl("neutron1hptk0k5kng7hjy35vmh009qd5m6l33609nypgf2yc6nqnewduqasxplt4e")
+        tvl: getFactoryTvl("neutron1hptk0k5kng7hjy35vmh009qd5m6l33609nypgf2yc6nqnewduqasxplt4e", {
+            blacklistedPairs: ['neutron14hn88erzgqskhvvczvdncu79tz4xqncrun5l5yqkwecmzrlpqnjquqp33f']
+        })
     },
     sei: {
         tvl: getFactoryTvl("sei1xr3rq8yvd7qplsw5yx90ftsr2zdhg4e9z60h5duusgxpv72hud3shh3qfl")

projects/helper/coreAssets.json

@@ -1880,5 +1880,8 @@
     "WETH": "0x6b48c2e6a32077ec17e8ba0d98ffc676dfab1a30",
     "USDC": "0x3B860c0b53f2e8bd5264AA7c3451d41263C933F2",
     "RUSD": "0xa9f32a851b1800742e47725da54a09a7ef2556a3"
+  },
+  "neutron": {
+    "NTRN": "untrn"
   }
 }

projects/terraswap/factoryTvl.js

@@ -16,14 +16,15 @@ function getAssetInfo(asset) {
   return [extractTokenInfo(asset), Number(asset.amount)]
 }
 
-async function getAllPairs(factory, chain) {
+async function getAllPairs(factory, chain, { blacklistedPairs = [] } = {}) {
+  const blacklist = new Set(blacklistedPairs)
   let allPairs = []
   let currentPairs;
   const limit = factory === 'terra14x9fr055x5hvr48hzy2t4q7kvjvfttsvxusa4xsdcy702mnzsvuqprer8r' ? 29 : 30 // some weird native token issue at one of the pagination query
   do {
     const queryStr = `{"pairs": { "limit": ${limit} ${allPairs.length ? `,"start_after":${JSON.stringify(allPairs[allPairs.length - 1].asset_infos)}` : ""} }}`
     currentPairs = (await queryContract({ contract: factory, chain, data: queryStr })).pairs
-    allPairs.push(...currentPairs)
+    allPairs.push(...currentPairs.filter(pair => !blacklist.has(pair.contract_addr)))
   } while (currentPairs.length > 0)
   const dtos = []
   const getPairPool = (async (pair) => {
@@ -47,17 +48,17 @@ async function getAllPairs(factory, chain) {
   return dtos
 }
 
-function getFactoryTvl(factory) {
-  return async (_, _1, _2, { chain }) => {
-    const pairs = (await getAllPairs(factory, chain)).filter(pair => (pair.assets[0].balance && pair.assets[1].balance))
+function getFactoryTvl(factory, { blacklistedPairs = []} = {}) {
+  return async (api) => {
+    const pairs = (await getAllPairs(factory, api.chain, { blacklistedPairs })).filter(pair => (pair.assets[0].balance && pair.assets[1].balance))
 
     const data = pairs.map(({ assets }) => ({
       token0: assets[0].addr,
       token0Bal: assets[0].balance,
       token1: assets[1].addr,
       token1Bal: assets[1].balance,
     }))
-    return transformDexBalances({ chain, data })
+    return transformDexBalances({ api, data })
   }
 }