fix kibbleswap

Author: g1nt0ki

projects/KibbleSwap/index.js

@@ -13,6 +13,7 @@ module.exports = {
       factory: '0xF4bc79D32A7dEfd87c8A9C100FD83206bbF19Af5',
       blacklist: [
         '0xe52CE89E16c4C596D30D111f3b5c137da412dEb8',
+        '0xbe14fbbccd4587b276549e734cc80294fc4b0f83',
       ]
     }),
     staking: staking({

projects/farmhero/index.js

@@ -2,7 +2,7 @@ const sdk = require("@defillama/sdk");
 const abi = require("./abi.json");
 const { stakings } = require("../helper/staking");
 const { pool2s } = require("../helper/pool2");
-const { unwrapUniswapLPs } = require("../helper/unwrapLPs");
+const { unwrapUniswapLPs, sumTokens2, } = require("../helper/unwrapLPs");
 const {
   getChainTransform,
 } = require("../helper/portedTokens");
@@ -120,14 +120,7 @@ const pool2StratsOkex = [
   "0xfa065195657A07f9c9F0A0a5e16DcD0Dff4AF11a",
 ];
 
-const calcTvl = async (
-  balances,
-  chain,
-  block,
-  masterchef,
-  transformAddress,
-  excludePool2
-) => {
+const calcTvl = async (balances, chain, block, masterchef, transformAddress, excludePool2) => {
   const poolLength = (
     await sdk.api.abi.call({
       abi: abi.poolLength,
@@ -137,66 +130,21 @@ const calcTvl = async (
     })
   ).output;
 
-  const lpPositions = [];
+  const toa = [];
+  const calls = [];
 
-  for (let index = 0; index < poolLength; index++) {
-    const strat = (
-      await sdk.api.abi.call({
-        abi: abi.poolInfo,
-        target: masterchef,
-        params: index,
-        chain,
-        block,
-      })
-    ).output.strat;
-   
-    const want = (
-      await sdk.api.abi.call({
-        abi: abi.poolInfo,
-        target: masterchef,
-        params: index,
-        chain,
-        block,
-      })
-    ).output.want;
-  
-    const strat_bal = (
-      await sdk.api.abi.call({
-        abi: 'erc20:balanceOf',
-        target: want,
-        params: strat,
-        chain,
-        block,
-      })
-    ).output;
-  
-    const symbol = (
-      await sdk.api.abi.call({
-        abi: abi.symbol,
-        target: want,
-        chain,
-        block,
-      })
-    ).output;
- 
-    if (
-      excludePool2.some((addr) => addr.toLowerCase() === want.toLowerCase()) ||
-      symbol.includes("HC") ||
-      symbol.includes("GC") ||
-      symbol.includes("HERO") ||
-      symbol.includes("HONOR")
-    ) {
-    } else if (symbol.includes("LP") || symbol.includes("UNI-V2")) {
-      lpPositions.push({
-        token: want,
-        balance: strat_bal,
-      });
-    } else {
-      sdk.util.sumSingleBalance(balances, `${chain}:${want}`, strat_bal);
-    }
-  }
+  for (let index = 0; index < poolLength; index++) calls.push({ params: index })
 
-  await unwrapUniswapLPs(balances, lpPositions, block, chain, transformAddress);
+  const { output: data } = await sdk.api.abi.multiCall({
+    target: masterchef,
+    abi: abi.poolInfo,
+    calls,
+    chain, block,
+  })
+
+  data.forEach(i => toa.push([i.output.want, i.output.strat]))
+
+  return sumTokens2({ balances, chain, block, tokensAndOwners: toa, resolveLP: true, blacklistedTokens: excludePool2 })
 };
 
 const bscTvl = async (chainBlocks) => {