minor fix

Author: g1nt0ki

projects/saharadao/index.js

@@ -1,6 +1,4 @@
-const BigNumber = require('bignumber.js')
 const Abis = require("./abi.json");
-const sdk = require("@defillama/sdk");
 
 const Contracts = {
   cronos: {
@@ -11,128 +9,25 @@ const Contracts = {
     bankMusd: "0xa23608087908F3812219886bCec68c4FA77A9eE5",
     multiFeeDistribution: "0xE6F7ADf2F2aCd219Ca68136cd47C2C826a3Ba1A9",
     chef: "0x6F132536069F8E35ED029CEd563710CF68fE8E54",
-    mmfLps: [
-      {
-        address: "0xa7bE5cB8Be6484c06aBb8942fe682797bb9A76Ec", // MNG_MMF_LP
-        isToken0: true
-      },
-      {
-        address: "0x80fdDa345e707dd9e518094b9B50027D9AF148F4", // MMFX_MMF_LP
-        isToken0: true
-      }
-    ],
-    musdLps: [
-      {
-        address: "0x6b4D24758a65c5bB2fC377B3b45e8b020ba6A4c1", // MNG_MUSD_LP
-        isToken0: true
-      },
-      {
-        address: "0xE516830c6dE6E1b653230370CD236c78DB9F66bf", // MMUSD_MUSD_LP
-        isToken0: true
-      }
-    ]
   },
 };
 
-async function calcTvl(timestamp, ethBlock, chainBlocks) {
-  const block = chainBlocks.cronos;
-  const chain = "cronos";
-
-  const bankBalance = await sdk.api.abi.call({
-    target: Contracts.cronos.bank,
-    abi: Abis.bank.usableCollateralBalance,
-    chain: chain,
-    block,
-  });
-
-  const bankBalanceMusd = await sdk.api.abi.call({
-    target: Contracts.cronos.bankMusd,
-    abi: Abis.bank.usableCollateralBalance,
-    chain: chain,
-    block,
-  });
-
-  return {
-    [`cronos:${Contracts.cronos.mmf}`]: bankBalance.output,
-    [`cronos:${Contracts.cronos.musd}`]: bankBalanceMusd.output,
-  };
-}
-
-async function calcStaking(timestamp, ethBlock, chainBlocks) {
-  const block = chainBlocks.cronos;
-  const chain = "cronos";
-
-  const stakingData = await sdk.api.abi.call({
-    target: Contracts.cronos.multiFeeDistribution,
-    abi: Abis.multiFeeDistribution.totalSupply,
-    chain: chain,
-    block,
-  });
-
-  return {
-    [`cronos:${Contracts.cronos.mng}`]: stakingData.output
-  };
-}
-
-async function calcLp(lps, block, chain, baseToken) {
-  const reserves = (
-    await sdk.api.abi.multiCall({
-      calls: lps.map((lp) => ({
-        target: lp.address,
-        params: [],
-      })),
-      abi: Abis.pair.getReserves,
-      block,
-      chain,
-    })
-  ).output;
-  const totalSupplies = (
-    await sdk.api.abi.multiCall({
-      calls: lps.map((lp) => ({
-        target: lp.address,
-        params: [],
-      })),
-      abi: "erc20:totalSupply",
-      block,
-      chain,
-    })
-  ).output;
-  const balances = (
-    await sdk.api.abi.multiCall({
-      calls: lps.map((lp) => ({
-        target: lp.address,
-        params: [Contracts.cronos.chef],
-      })),
-      abi: "erc20:balanceOf",
-      block,
-      chain,
-    })
-  ).output;
-
-  const results = lps.map((lp, index) => (
-    new BigNumber(reserves[index].output[lp.isToken0 ? "_reserve0" : "_reserve1"])
-      .times(2)
-      .times(new BigNumber(balances[index].output))
-      .idiv(new BigNumber(totalSupplies[index].output))
-  ));
-  const total = results.reduce((total, num) => total.plus(num), new BigNumber(0));
-
-  return {
-    [`cronos:${baseToken}`]: total.toString(10),
-  };
+async function calcTvl(api) {
+  const bankBalance = await api.call({ target: Contracts.cronos.bank, abi: Abis.bank.usableCollateralBalance, });
+  const bankBalanceMusd = await api.call({ target: Contracts.cronos.bankMusd, abi: Abis.bank.usableCollateralBalance, });
+  api.add(Contracts.cronos.mmf, bankBalance);
+  api.add(Contracts.cronos.musd, bankBalanceMusd);
 }
 
-async function calcChef(timestamp, block, chainBlocks) {
-  const farm = await calcLp(Contracts.cronos.mmfLps, chainBlocks.cronos, "cronos", Contracts.cronos.mmf);
-  const farmMusd = await calcLp(Contracts.cronos.musdLps, chainBlocks.cronos, "cronos", Contracts.cronos.musd);
-
-  return { ...farm, ...farmMusd };
+async function calcStaking(api) {
+  const stakingData = await api.call({    target: Contracts.cronos.multiFeeDistribution,    abi: Abis.multiFeeDistribution.totalSupply,  });
+  api.add(Contracts.cronos.mng, stakingData);
 }
 
 module.exports = {
   cronos: {
     tvl: calcTvl,
-    pool2: calcChef,
+    pool2: () => ({}),
     staking: calcStaking,
   },
 };

projects/sakeperp/abi.json

@@ -1,125 +1,24 @@
+const { getUniTVL } = require('../helper/unknownTokens')
+const { staking } = require('../helper/staking')
 const ADDRESSES = require('../helper/coreAssets.json')
 const sdk = require("@defillama/sdk");
-const abi = require("./abi.json");
 
 const ethSake = "0x066798d9ef0833ccc719076Dab77199eCbd178b0";
-const ethFactory = "0x75e48C954594d64ef9613AeEF97Ad85370F13807";
 const ethSakebar = "0x5fe808a4889b714496E7b821c8542e26be2f8f67";
 const bscSake = "0x8BD778B12b15416359A227F0533Ce2D91844e1eD";
-const bscFactory = "0xA534cf041Dcd2C95B4220254A0dCb4B905307Fd8";
 const bscSakebar = "0xbC83FAdA7D0881F772daaB2B4295F949FA309B59";
 const perpVault = "0xa34dA41edB2b15A20893d2208377E24D8dcdeB6e";
-const bUsd = ADDRESSES.bsc.BUSD;
-
-async function tvl(factory, block, chain) {
-  let balances = {};
-  let poolsLength = (
-    await sdk.api.abi.call({
-      target: factory,
-      abi: abi.allPairsLength,
-      block,
-      chain,
-    })
-  ).output;
-  let allPools = (
-    await sdk.api.abi.multiCall({
-      calls: Array.from({ length: Number(poolsLength) }, (_, k) => ({
-        target: factory,
-        params: k,
-      })),
-      abi: abi.allPairs,
-      block,
-      chain,
-    })
-  ).output;
-  let reserves = (
-    await sdk.api.abi.multiCall({
-      calls: allPools.map((p) => ({
-        target: p.output,
-      })),
-      abi: abi.getReserves,
-      block,
-      chain,
-    })
-  ).output;
-  let token0s = (
-    await sdk.api.abi.multiCall({
-      calls: allPools.map((p) => ({
-        target: p.output,
-      })),
-      abi: abi.token0,
-      block,
-      chain,
-    })
-  ).output;
-  let token1s = (
-    await sdk.api.abi.multiCall({
-      calls: allPools.map((p) => ({
-        target: p.output,
-      })),
-      abi: abi.token1,
-      block,
-      chain,
-    })
-  ).output;
-  for (let i = 0; i < reserves.length; i++) {
-    sdk.util.sumSingleBalance(
-      balances,
-      `${chain}:${token0s[i].output}`,
-      reserves[i].output._reserve0
-    );
-    sdk.util.sumSingleBalance(
-      balances,
-      `${chain}:${token1s[i].output}`,
-      reserves[i].output._reserve1
-    );
-  }
-  return balances;
-}
-
-async function staking(sake, sakebar, block, chain) {
-  let balances = {};
-  let balance = (
-    await sdk.api.erc20.balanceOf({
-      target: sake,
-      owner: sakebar,
-      block,
-      chain,
-    })
-  ).output;
-  sdk.util.sumSingleBalance(balances, `${chain}:${sake}`, balance);
-  return balances;
-}
-
-async function ethTvl(timestamp, block) {
-  return await tvl(ethFactory, block, "ethereum");
-}
-
-async function bscTvl(timestamp, block, chainBlocks) {
-  return await tvl(bscFactory, chainBlocks.bsc, "bsc");
-}
-
-async function ethStaking(timestamp, block) {
-  return await staking(ethSake, ethSakebar, block);
-}
-
-async function bscStaking(timestamp, block, chainBlocks) {
-  return await staking(bscSake, bscSakebar, chainBlocks.bsc);
-}
-
-async function perpVaultTvl(timestamp, block, chainBlocks) {
-  return await staking(bUsd, perpVault, chainBlocks.bsc);
-}
 
 module.exports = {
+  misrepresentedTokens: true,
   methodology:
     "TVL consists of pools in the factory contract and the BUSD in the PerpVault contract. Staking consists of SAKE in SakeBar.",
   ethereum: {
-    tvl: ethTvl,
-    staking: ethStaking,
+    tvl: getUniTVL({ factory: '0x75e48C954594d64ef9613AeEF97Ad85370F13807', useDefaultCoreAssets: true, }),
+    staking: staking(ethSakebar, ethSake, ),
   },
   bsc: {
-    tvl: sdk.util.sumChainTvls([bscTvl, perpVaultTvl]),
-    staking: bscStaking,
+    tvl: sdk.util.sumChainTvls([getUniTVL({ factory: '0xA534cf041Dcd2C95B4220254A0dCb4B905307Fd8', useDefaultCoreAssets: true, }), staking(perpVault, ADDRESSES.bsc.BUSD,)]),
+    staking: staking(bscSakebar, bscSake, ),
   },
 };