cleanup

Author: g1nt0ki

projects/cookfinance/index.js

@@ -1,11 +1,6 @@
-const sdk = require("@defillama/sdk");
 const { staking } = require("../helper/staking.js");
-const { pool2, pool2s } = require("../helper/pool2");
-const yieldyakAbi = require("./yieldyakAbi.json");
-const alpacaFinanceAbi = require("../alpaca-finance/abi.json");
-const BigNumber = require("bignumber.js");
+const { pool2, } = require("../helper/pool2");
 const { sumTokens2 } = require('../helper/unwrapLPs')
-const { getSymbols } = require('../helper/utils')
 
 const stakingContractHeco = "0xF0979F9692966D110E39d82a44655c9934F5cC73";
 const COOK_heco = "0x74189862b069e2be5f7c8e6ff08ea8e1b1948519";
@@ -37,110 +32,27 @@ const ethIndexes = [
 const getComponentsABI = "address[]:getComponents"
 const getCKsABI = "address[]:getCKs"
 
-async function getTvl({ chain, block, indices }) {
-  const indexCalls = indices.map(i => ({ target: i }))
-  const { output: components } = await sdk.api.abi.multiCall({
-    abi: getComponentsABI,
-    calls: indexCalls,
-    block, chain,
-  })
-
-  const tokensAndOwners = []
-  components.forEach(({ output }, i) => {
-    output.forEach(t => tokensAndOwners.push([t, indices[i]]))
-  })
-
-  return sumTokens2({ tokensAndOwners, block, chain, })
+async function getTvl({ api, indices }) {
+  const components = await api.multiCall({    abi: getComponentsABI,    calls: indices,  })
+  const ownerTokens = indices.map((v, i) => [components[i], v])
+  return sumTokens2({ ownerTokens, api,  })
 
 }
 
-async function ethTvl(timestamp, block) {
-  return getTvl({ indices: ethIndexes })
+async function ethTvl(api) {
+  return getTvl({ indices: ethIndexes, api })
 }
 
-async function avaTvl(timestamp, ethBlock, chainBlocks) {
-  const block = chainBlocks.avax;
-  const chain = 'avax'
+async function avaTvl(api) {
   const CONTROLLER_ADDRESS = "0xE565711e7a59800e110c959E156121988E6F4704";
-  let { output: avaIndexes } = await sdk.api.abi.call({
-    target: CONTROLLER_ADDRESS,
-    abi: getCKsABI,
-    chain, block,
-  });
-  const balances = await getTvl({ indices: avaIndexes, chain, block, })
-  Object.entries(balances).forEach(([token, balance]) => {
-    delete balances[token]
-    balances[token.toLowerCase()] = balance
-  })
-
-  const symbols = await getSymbols(chain, Object.keys(balances))
-  const calls = []
-  const balanceCalls = []
-  Object.entries(symbols).forEach(([token, symbol]) => {
-    if (symbol && symbol.startsWith('YRT')) {
-      calls.push({ target: token })
-      balanceCalls.push({ target: token, params: [balances['avax:' + token]] })
-    }
-  })
-  const [
-    { output: token },
-    { output: newBalance },
-  ] = await Promise.all([
-    sdk.api.abi.multiCall({ abi: yieldyakAbi.depositToken, calls, chain, block, }),
-    sdk.api.abi.multiCall({ abi: yieldyakAbi.getDepositTokensForShares, calls: balanceCalls, chain, block, }),
-  ])
-
-  token.forEach(({ output, input }, i) => {
-    const origToken = `avax:${input.target}`
-    const balance = newBalance[i].output
-    delete balances[origToken]
-    sdk.util.sumSingleBalance(balances, 'avax:' + output, balance)
-  })
-
-  return balances
+  let avaIndexes = await api.call({    target: CONTROLLER_ADDRESS,    abi: getCKsABI,  });
+  return getTvl({ indices: avaIndexes, api })
 }
 
-async function bscTvl(timestamp, ethBlock, chainBlocks) {
-  const block = chainBlocks.bsc;
-  const chain = 'bsc'
+async function bscTvl(api) {
   const CONTROLLER_ADDRESS = "0x822aeB433A4Ea7A97b76287cB513C3985034a2Bd";
-  let { output: bscIndexes } = await sdk.api.abi.call({
-    target: CONTROLLER_ADDRESS,
-    abi: getCKsABI,
-    chain: "bsc",
-    block,
-  });
-
-  const balances = await getTvl({ indices: bscIndexes, chain, block, })
-  // const symbols = await getSymbols(chain, Object.keys(balances))
-  const calls = []
-  // Object.entries(symbols).forEach(([token, symbol]) => {
-  //   if (symbol.startsWith('ib')) calls.push({ target: token })
-  // })
-  const [
-    { output: token },
-    { output: totalToken },
-    { output: totalSupply },
-  ] = await Promise.all([
-    sdk.api.abi.multiCall({ abi: alpacaFinanceAbi.token, calls, chain, block, }),
-    sdk.api.abi.multiCall({ abi: alpacaFinanceAbi.totalToken, calls, chain, block, }),
-    sdk.api.abi.multiCall({ abi: alpacaFinanceAbi.totalSupply, calls, chain, block, }),
-  ])
-
-  token.forEach(({ output, input }, i) => {
-    const origToken = `bsc:${input.target}`
-    const origBalance = balances[origToken]
-    if (!origBalance) {
-      return;
-    }
-    const totalT = totalToken[i].output
-    const totalS = totalSupply[i].output
-    const balance = BigNumber(origBalance).times(totalT).idiv(totalS).toFixed(0)
-    delete balances[origToken]
-    sdk.util.sumSingleBalance(balances, 'bsc:' + output, balance)
-  })
-
-  return balances
+  let bscIndexes = await api.call({    target: CONTROLLER_ADDRESS,    abi: getCKsABI,  });
+  return getTvl({ indices: bscIndexes, api })
 }
 
 module.exports = {
@@ -151,7 +63,6 @@ module.exports = {
     pool2: staking(
       ["0x4b21da40dd8d9f4363e69a9a1620d7cdb49123be"],
       ethPool2LPs,
-      "ethereum"
     ),
     staking: staking(stakingPool, cookToken),
   },
@@ -161,20 +72,16 @@ module.exports = {
     staking: staking(
       "0x35bE7982bC5E40A8C9aF39A639bDDcE32081102e",
       "0x637afeff75ca669ff92e4570b14d6399a658902f",
-      "avax",
-      //"avax:0x637afeff75ca669ff92e4570b14d6399a658902f"
     ),
   },
   bsc: {
     pool2: staking(
       ["0x47b517061841e6bFaaeB6336C939724F47e5E263"],
       bscPool2LPs,
-      "bsc"
     ),
     staking: staking(
       "0x1Abeaa9D633162586a4c80389160c33327C9Aff5",
       "0x965b0df5bda0e7a0649324d78f03d5f7f2de086a",
-      "bsc"
     ),
     tvl: bscTvl,
   },

projects/keeper-dao/index.js

@@ -1,144 +1,45 @@
 const ADDRESSES = require('../helper/coreAssets.json')
 
-const sdk = require('@defillama/sdk');
-const BigNumber = require('bignumber.js');
-const { sumTokens2 } = require('../helper/unwrapLPs');
-const liquidityAbi = require('./abi/liquidity.json');
+const liquidityAbi = {
+  "registeredTokens": "function registeredTokens(uint256) view returns (address)",
+  "getAllMarkets": "address[]:getAllMarkets",
+}
 
 const LIQUIDITY_POOL_CONTRACTS = {
   liquidityPoolContractV3: '0x35fFd6E268610E764fF6944d07760D0EFe5E40E5',
   liquidityPoolContractV4: '0x4F868C1aa37fCf307ab38D215382e88FCA6275E2'
 }
-const HIDING_VAULT_START_BLOCK_NUMBER = 12690306;
 const HIDING_VAULT_CONTRACT = '0xE2aD581Fc01434ee426BB3F471C4cB0317Ee672E';
 const COMPOUND_COMPTROLLER_ADDRESS = '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B';
 
-async function getToken(block, index, liquidityPool) {
-  try {
-    return (await sdk.api.abi.call({
-      block,
-      target: liquidityPool,
-      params: [index],
-      abi: liquidityAbi['registeredTokens'],
-    })).output
-  } catch (e) { return null}
-}
-
-async function getAllTokens(block, liquidityPool) {
-  let tokens = []
-  for (let i = 0; ; i++) {
-    const token = await getToken(block, i, liquidityPool)
-
-    if (!token) {
-      break;
-    }
-
-    tokens.push(token)
-  }
-
-  return tokens;
-}
-
 // Calculates all the token balances in Hiding Vault NFTs minted till the given block
-async function getHidingVaultBalances(timestamp, block) {
-  let hidingVaultBalances = {}
-
-  // Track TVL of Hiding Vaults after it went live
-  if (block > HIDING_VAULT_START_BLOCK_NUMBER) {
-    // Get total Hiding Vault NFT count by calling totalSupply on Hiding Vault Contract
-    // Using erc20 lib as erc721 lib isn't supported yet.
-    let noOfHidingVaults = (await sdk.api.erc20.totalSupply({
-      target: HIDING_VAULT_CONTRACT,
-      block: block
-    })).output;
-
-    // numberRange to iterate over indexes of NFTs. Can migrate to any supported util func of erc721 when it is supported.
-    const indexRange = [];
-    for (let i = 0; i < +noOfHidingVaults; i++)
-      indexRange.push(i)
-
-    // Query Hiding Vault Contract's 'tokenByIndex' with index to get individual HidingVaultNFTs
-    let totalHidingVaultNFTs = (await sdk.api.abi.multiCall({
-      target: HIDING_VAULT_CONTRACT,
-      calls: indexRange.map((index) => ({
-        params: [index],
-      })),
-      abi: liquidityAbi['tokenByIndex'],
-      block: block
-    })).output;
-
-    totalHidingVaultNFTs = totalHidingVaultNFTs.map(hidingVaultNFT => hidingVaultNFT.output);
-
+async function getHidingVaultBalances(api) {
+  const nfts = await api.fetchList({  lengthAbi: 'totalSupply', itemAbi: 'tokenByIndex', target: HIDING_VAULT_CONTRACT})
     // all of Compound's supply & borrow assets adresses
-    const { output: cTokens } = await sdk.api.abi.call(
+    const cTokens  = await api.call(
       {
-        block,
         target: COMPOUND_COMPTROLLER_ADDRESS,
-        params: [],
         abi: liquidityAbi["getAllMarkets"]
       }
     )
-
-    // for each of Compound's cTokens get all of hidingVaultNFT balance and the underlying token address
-    await Promise.all(cTokens.map(async (cTokenAddress) => {
-      // get the underlying token address
-      const isCEth = cTokenAddress.toLowerCase() === "0x4ddc2d193948926d02f9b1fe9e1daa0718270ed5"
-      const { output: token } = isCEth
-        ? { output: ADDRESSES.null } // ETH has no underlying asset on Compound
-        : await sdk.api.abi.call(
-          {
-            block,
-            target: cTokenAddress,
-            params: [],
-            abi: liquidityAbi["underlying"]
-          }
-        )
-
-      // making a call to get the asset balance for each hidingVaultNFT
-      const calls = []
-
-      totalHidingVaultNFTs.forEach(hidingVaultNFT => {
-        calls.push({
-          target: cTokenAddress,
-          params: [hidingVaultNFT]
-        })
-      })
-
-      const underlyingBalances = await sdk.api.abi.multiCall({
-        abi: liquidityAbi["balanceOfUnderlying"],
-        calls,
-        block,
-      });
-
-      // accumulating all our hidingVaultNFT balances to calculate the TVL for this cToken
-      const sumTotal = underlyingBalances.output.map(({ output }) => output).reduce((acc, val) => {
-        return (new BigNumber(acc).plus(new BigNumber(val))).toString(10)
-      }, "0")
-
-      hidingVaultBalances[token] = (new BigNumber(hidingVaultBalances[token] || "0").plus(new BigNumber(sumTotal))).toString(10);
-    }));
-  }
-
-  return hidingVaultBalances;
+    return api.sumTokens({ owners: nfts, tokens: cTokens})
 }
 
 // Calculates the token balances in Liquidity Pool Contracts till the given block
-async function getLiquidityPoolBalances(timestamp, block, api) {
-  const toa = []
-
-  await Promise.all(Object.values(LIQUIDITY_POOL_CONTRACTS).map(async liquidityPool => {
-    let tokens = await getAllTokens(block, liquidityPool)
-    tokens.forEach(i => toa.push([i, liquidityPool]))
-  }))
-  return toa
+async function getLiquidityPoolBalances(api) {
+  const pools = Object.values(LIQUIDITY_POOL_CONTRACTS)
+  return api.sumTokens({ owners: pools, tokens: [
+    ADDRESSES.null,
+    ADDRESSES.ethereum.USDC,
+    ADDRESSES.ethereum.WETH,
+    '0xeb4c2781e4eba804ce9a9803c67d0893436bb27d',
+    ADDRESSES.ethereum.DAI,
+  ]})
 }
 
 async function tvl(api) {
-  const { timestamp, block } = api
-  const tokensAndOwners = await getLiquidityPoolBalances(timestamp, block);
-  const balances = await getHidingVaultBalances(timestamp, block);
-
-  return sumTokens2({ api, balances, tokensAndOwners });
+  await getLiquidityPoolBalances(api);
+  await getHidingVaultBalances(api);
 }
 
 module.exports = {