fix vicuna

Author: g1nt0ki

projects/helper/unwrapLPs.js

@@ -616,7 +616,7 @@ async function sumTokens2({
     // nftAddress
     // nftIdFetcher
   },
-  resolveICHIVault = false,
+  resolveIchiVault = false,
   solidlyVeNfts = [],
   convexRewardPools = [],
   auraPools = [],
@@ -715,22 +715,12 @@ async function sumTokens2({
   log(chain, 'summing tokens', tokensAndOwners.length)
 
 
-  let ichiVaultToAs = []
-  if (resolveICHIVault) {
-    const symbols = (await api.multiCall({ abi: 'erc20:symbol', calls: tokensAndOwners.map(t => t[0]) }))
-    tokensAndOwners.filter(([token, owner], i) => {
-      if (isICHIVaultToken(symbols[i], token, api.chain)) {
-        ichiVaultToAs.push([token, owner])
-        return false
-      }
-      return true
-    })
-  }
-
   await sumTokens(balances, tokensAndOwners, block, chain, transformAddress, { resolveLP, unwrapAll, blacklistedLPs, skipFixBalances: true, abis, permitFailure, sumChunkSize, })
 
-  if (ichiVaultToAs.length)
-    await unwrapICHIVaults()
+
+  if (resolveIchiVault)
+    await unwrapICHIVaults({ api })
+
 
   if (!skipFixBalances) {
     const fixBalances = await getFixBalances(chain)
@@ -743,30 +733,39 @@ async function sumTokens2({
     toa = toa.map(i => i.join('-'))
     return getUniqueAddresses(toa, chain).map(i => i.split('-'))
   }
+}
 
+async function unwrapICHIVaults({ api }) {
+  let chain = api.chain
+  const balances = api.getBalances()
+  let tokens = Object.keys(balances).filter(t => t.startsWith(chain + ':')).map(t => t.split(':')[1])
+  const symbols = (await api.multiCall({ abi: 'erc20:symbol', calls: tokens, permitFailure: true })).map(i => i || '')
+  const lps = tokens.filter((t, i) => isICHIVaultToken(symbols[i], t, chain))
 
-  async function unwrapICHIVaults() {
-    const lps = ichiVaultToAs.map(i => i[0])
-    const balanceOfCalls = ichiVaultToAs.map(t => ({ params: t[1], target: t[0] }))
-    const [
-      token0s, token1s, supplies, uBalances, tokenBalances
-    ] = await Promise.all([
-      api.multiCall({ abi: 'address:token0', calls: lps }),
-      api.multiCall({ abi: 'address:token1', calls: lps }),
-      api.multiCall({ abi: 'uint256:totalSupply', calls: lps }),
-      api.multiCall({ abi: 'function getTotalAmounts() view returns (uint256 token0Bal, uint256 token1Bal)', calls: lps }),
-      api.multiCall({ abi: 'erc20:balanceOf', calls: balanceOfCalls }),
-    ])
-
-    tokenBalances.forEach((bal, i) => {
-      const ratio = bal / supplies[i]
-      const token0Bal = uBalances[i][0] * ratio
-      const token1Bal = uBalances[i][1] * ratio
-      sdk.util.sumSingleBalance(balances, token0s[i], token0Bal)
-      sdk.util.sumSingleBalance(balances, token1s[i], token1Bal)
-    })
-    return balances
-  }
+  if (!lps.length) return api.getBalances()
+
+  const [
+    token0s, token1s, supplies, uBalances,
+  ] = await Promise.all([
+    api.multiCall({ abi: 'address:token0', calls: lps }),
+    api.multiCall({ abi: 'address:token1', calls: lps }),
+    api.multiCall({ abi: 'uint256:totalSupply', calls: lps }),
+    api.multiCall({ abi: 'function getTotalAmounts() view returns (uint256 token0Bal, uint256 token1Bal)', calls: lps }),
+  ])
+
+  lps.forEach((_, i) => {
+    const lpToken = `${chain}:${lps[i]}`
+    const bal = balances[lpToken]
+    if (!bal) return;
+    const ratio = bal / supplies[i]
+    const token0Bal = uBalances[i][0] * ratio
+    const token1Bal = uBalances[i][1] * ratio
+    api.add(token0s[i], token0Bal)
+    api.add(token1s[i], token1Bal)
+    api.removeTokenBalance(lpToken)
+  })
+
+  return api.getBalances()
 }
 
 function sumTokensExport({ balances, tokensAndOwners, tokensAndOwners2, tokens, owner, owners, transformAddress, unwrapAll, resolveLP, blacklistedLPs, blacklistedTokens, skipFixBalances, ownerTokens, resolveUniV3, resolveSlipstream, resolveArtBlocks, resolveNFTs, fetchCoValentTokens, logCalls, ...args }) {

projects/helper/utils.js

@@ -52,7 +52,7 @@ const blacklisted_LPS = new Set([
 
 function isICHIVaultToken(symbol, token, chain) {
   if (symbol === 'ICHI_Vault_LP') return true
-  if (chain === 'bsc' && symbol.startsWith('IV-') && symbol.endsWith('-THE')) return true
+  if (symbol.startsWith('IV-')) return true
   return false
 }
 
@@ -94,7 +94,7 @@ function isLP(symbol, token, chain) {
   if (chain === 'optimism' && /(-ZS)/.test(symbol)) return true
   if (chain === 'arbitrum' && /^(crAMM|vrAMM)-/.test(symbol)) return true // ramses LP
   if (chain === 'arbitrum' && /^(DLP|LP-)/.test(symbol)) return false // DODO or Wombat
-  if (chain === 'base' && /^(v|s)-/.test(symbol)) return true // Equalizer LP
+  if (['base', 'sonic',].includes(chain) && /^(v|s)-/.test(symbol)) return true // Equalizer LP
   if (chain === 'bsc' && /(-APE-LP-S)/.test(symbol)) return false
   if (chain === 'scroll' && /(cSLP|sSLP)$/.test(symbol)) return true //syncswap LP
   if (chain === 'btn' && /(XLT)$/.test(symbol)) return true //xenwave LP

projects/vicuna/index.js

@@ -3,15 +3,15 @@ const { sumTokens2 } = require("../helper/unwrapLPs");
 
 module.exports = {
   sonic: {
-      tvl: async (api) => {
-        const pools = await getConfig('vicuna','https://raw.githubusercontent.com/VicunaFinance-com/vicuna-frontend/refs/heads/main/config/sonic.json');
-        
-        // Extract earnedTokenAddress from each pool
-        const vaults = pools.map(pool => pool.vaultAddress)
-        const tokens = await api.multiCall({  abi: 'address:want', calls: vaults})
-        const balances = await api.multiCall({  abi: 'uint256:balance', calls: vaults})
-        api.add(tokens, balances)
-        return sumTokens2({ resolveLP: true, api})
-      }
+    tvl: async (api) => {
+      const pools = await getConfig('vicuna', 'https://raw.githubusercontent.com/VicunaFinance-com/vicuna-frontend/refs/heads/main/config/sonic.json');
+
+      // Extract earnedTokenAddress from each pool
+      const vaults = pools.map(pool => pool.vaultAddress)
+      const tokens = await api.multiCall({ abi: 'address:want', calls: vaults })
+      const balances = await api.multiCall({ abi: 'uint256:balance', calls: vaults })
+      api.add(tokens, balances)
+      return sumTokens2({ resolveLP: true, api, resolveIchiVault: true, })
     }
-  }
+  }
+}