Fix: Harvest-Finance (#13066)

DefiLlama · Jan 13, 2025 · e32539e · e32539e
1 parent 90fd373
commit e32539e
Showing 1 changed file with 26 additions and 18 deletions.
diff --git a/projects/harvest.js b/projects/harvest.js
@@ -11,21 +11,29 @@ const chains = {
   polygon: 'matic'
 }
 
-module.exports = {}
-Object.keys(chains).forEach(chain => {
-  module.exports[chain] = {
-    tvl: async (api) => {
-      const response = await getConfig('harvest', endpoint)
-      const vaults = Object.values(response[chains[chain]]).map(i => i.vaultAddress)
-      const strategy = await api.multiCall({ abi: 'address:strategy', calls: vaults })
-      const tokensV = await api.multiCall({ abi: 'address:underlying', calls: vaults, permitFailure: true })
-      const tokens = await api.multiCall({ abi: 'address:underlying', calls: strategy, permitFailure: true })
-      const bals2 = await api.multiCall({ abi: 'uint256:underlyingBalanceWithInvestment', calls: vaults, permitFailure: true })
-      tokens.forEach((token, idx) => {
-        if (!token) token = tokensV[idx]
-        if (token) api.add(token, bals2[idx])
-      })
-      return sumTokens2({ api, resolveLP: true, owners: vaults, resolveUniV3: chain !== 'base', permitFailure: true })
-    }
-  }
-})
+const tvl = async (api) => {
+  const response = await getConfig('harvest', endpoint)
+  const rawVaults = Object.values(response[chains[api.chain]]).map(i => i.vaultAddress)
+  const strategies = await api.multiCall({ abi: 'address:strategy', calls: rawVaults, permitFailure: true })
+
+  const vaults = rawVaults.map((vault, i) => {
+    const strategy = strategies[i]
+    if (!strategy) return null
+    return { vault, strategy }
+  }).filter(Boolean)
+
+  const tokensV = await api.multiCall({ abi: 'address:underlying', calls: vaults.map(({ vault }) => ({ target: vault })), permitFailure: true })
+  const tokens = await api.multiCall({ abi: 'address:underlying', calls: vaults.map(({ strategy }) => ({ target: strategy })), permitFailure: true })
+  const bals2 = await api.multiCall({ abi: 'uint256:underlyingBalanceWithInvestment', calls: vaults.map(({ vault }) => ({ target: vault })), permitFailure: true })
+
+  tokens.forEach((token, i) => {
+    if (!token) token = tokensV[i]
+    if (token) api.add(token, bals2[i])
+  })
+
+  return sumTokens2({ api, resolveLP: true, owners: vaults.map(({ vault }) => vault), resolveUniV3: api.chain !== 'base', permitFailure: true })
+}
+
+Object.keys(chains).forEach((chain) => {
+  module.exports[chain] = { tvl }
+})