code refactor

Author: g1nt0ki

projects/photon-protocol/index.js

@@ -1,24 +1,15 @@
 const ADDRESSES = require('../helper/coreAssets.json')
 const { stakingUnknownPricedLP } = require("../helper/staking");
-const { sumTokensAndLPsSharedOwners } = require("../helper/unwrapLPs");
+const { sumTokensExport } = require("../helper/unwrapLPs");
 
 const photon = "0x2F1305F0619ADa14688A4291953bd7d284f9C2a5";
 const stakingContract = "0x81177472Ce36A9b1AB573804CD215C72cEb76F36";
 const photonbusd = "0xEBAa17dA7D5C616441290669E9D2c982c8B1Da25"; //PHOTON-BUSD
 const treasury = "0x0f90591b01DE6F832e8B8E4ec3525efD423BCaD1";
-const treasuryTokens = [
-    [ADDRESSES.bsc.BUSD, false], // BUSD
-];
-
-async function tvl (timestamp, block, chainBlocks) {
-    let balances = {};
-    await sumTokensAndLPsSharedOwners(balances, treasuryTokens, [treasury], chainBlocks.bsc, "bsc", addr=>`bsc:${addr}`);
-    return balances;
-}
 
 module.exports = {
-    bsc: {
-        tvl,
-        staking: stakingUnknownPricedLP(stakingContract, photon, "bsc", photonbusd, addr=>`bsc:${addr}`)
-    }
+  bsc: {
+    tvl: sumTokensExport({ tokens: [ADDRESSES.bsc.BUSD], owner: treasury }),
+    staking: stakingUnknownPricedLP(stakingContract, photon, "bsc", photonbusd, addr => `bsc:${addr}`)
+  }
 }

projects/piggybankdao/index.js

@@ -1,33 +1,17 @@
-const ADDRESSES = require('../helper/coreAssets.json')
-const {sumTokensAndLPsSharedOwners, sumLPWithOnlyOneToken} = require('../helper/unwrapLPs')
 const { stakingPricedLP } = require('../helper/staking')
 
 
-const treasury = "0x6687379035822ee15e2164f9C1280fBEAd0D7627";
 const PB_TOKEN = "0x0E75CDb914DdCcA683357dD94d26Caa39BC14B16"
 const LP_TOKEN = "0xd3a6eebbe6f6d9197a7fc2aaaf94d8b0ec51f8a8";
 const STAKING_ADDRESS = "0xE4738791690AF507C8C7Bf5981ef541568C7C312"
 const COREASSETNAME = "magic-internet-money";
 const CHAIN = "avax";
-const MIM = "0x130966628846bfd36ff31a822705796e8cb8c18d"
-
-
-async function avaxTvl(time, ethBlock, chainBlocks){
-    const balances = {}
-    const transform = addr => 'avax:'+addr
-    await sumLPWithOnlyOneToken(balances, "0xd3a6eebbe6f6d9197a7fc2aaaf94d8b0ec51f8a8", treasury, MIM, chainBlocks.avax, "avax", transform)
-    await sumTokensAndLPsSharedOwners(balances, [
-        [MIM, false],
-        [ADDRESSES.avax.WBTC_e, false]
-    ], [treasury], chainBlocks.avax, "avax", transform)
-    return balances
-}
 
 module.exports={
     deadFrom: 1648765747,
     misrepresentedTokens: true,
     avax:{
-        tvl: avaxTvl,
+        tvl: () => ({}),
         staking: stakingPricedLP(STAKING_ADDRESS, PB_TOKEN, CHAIN, LP_TOKEN, COREASSETNAME, true),
     }
 }

projects/purefi/index.js

@@ -1,5 +1,4 @@
 const { staking, stakings } = require("../helper/staking");
-const { sumTokensAndLPsSharedOwners } = require("../helper/unwrapLPs");
 
 /*** Ethereum Addresses ***/
 const UFI = "0xcDa4e840411C00a614aD9205CAEC807c7458a0E3";
@@ -51,23 +50,8 @@ const farmingStakingContracts_polygon = [
   "0xF1a44C75E4D92f4DA737485f96b0c2a1327d91b2",
 ];
 
-const polygonTvl = async (chainBlocks) => {
-  const balances = {};
-
-  let transformAddress = i => `polygon:${i}`;
-  await sumTokensAndLPsSharedOwners(
-    balances,
-    [
-      [SAFLE_polygon, false],
-      [SCA_polygon, false],
-    ],
-    farmingStakingContracts_polygon,
-    chainBlocks["polygon"],
-    "polygon",
-    transformAddress
-  );
-
-  return balances;
+const polygonTvl = async (api) => {
+  return api.sumTokens({ owners: farmingStakingContracts_polygon, tokens: [SAFLE_polygon, SCA_polygon,] });
 };
 
 module.exports = {
@@ -82,6 +66,5 @@ module.exports = {
     staking: stakings(farmingStakingContracts_polygon, UFI_polygon),
     tvl: polygonTvl,
   },
-  //tvl: (tvl) => ({}),
   methodology: "Counts tvl of the assets staked on the Farming seccion thgough Farming Contracts",
 };

projects/redacted/index.js

@@ -1,6 +1,5 @@
 const ADDRESSES = require('../helper/coreAssets.json')
-const { sumTokensAndLPsSharedOwners, sumTokens2, genericUnwrapCvx } = require('../helper/unwrapLPs')
-const sdk = require('@defillama/sdk')
+const { sumTokens2, genericUnwrapCvx } = require('../helper/unwrapLPs')
 
 const treasuries = ["0xa52fd396891e7a74b641a2cb1a6999fcf56b077e", "0x086c98855df3c78c6b481b6e1d47bef42e9ac36b"]
 
@@ -20,110 +19,72 @@ const BTRFLYV2 = '0xc55126051B22eBb829D00368f4B12Bde432de5Da'
 const cvxCRVPool = '0x0392321e86F42C2F94FBb0c6853052487db521F0'
 
 const rlBTRFLYAbi = {
-    lockedSupply: "uint256:lockedSupply",
-} 
-
-async function tvl(timestamp, block, chainBlocks){
-    const balances = {}
-    
-    //Add tokens/curve LPs in wallet
-    await sumTokensAndLPsSharedOwners(balances, [
-        [CVX, false],
-        [cvxCRV, false],
-        [FXS, false],
-        [CRV, false],
-        [AURA, false],
-        // BTRFLY/ETH Curve LP
-        ['0x7483Dd57f6488b0e194A151C57Df6Ec85C00aCE9', false],
-        [ADDRESSES.ethereum.USDC, false],
-        [ADDRESSES.ethereum.FRAX, false],
-    ], treasuries, block)
-    
-    //Add UniswapV3 LPs
-    await sumTokens2({ balances, owners: treasuries, block, resolveUniV3: true, })
-
-    //Add convex deposited curve LPs
-    await genericUnwrapCvx(balances, treasuries[0], cvxCRVPool, block, 'ethereum')
-    
-    //This causes an error and not sure why
-    //await genericUnwrapCvx(balances, treasuries[0], cvxFXSPool, block, 'ethereum')
-    
-    //Add vlCVX as CVX
-    const vlCVXBalance = await sdk.api.erc20.balanceOf({
-        target: ADDRESSES.ethereum.vlCVX,
-        owner: treasuries[0],
-        chain: 'ethereum',
-        block: chainBlocks['ethereum']
-    }).then(result => result.output)
-    sdk.util.sumSingleBalance(balances, CVX, vlCVXBalance)
+  lockedSupply: "uint256:lockedSupply",
+}
 
-    //Add vlAURA as AURA
-    const vlAURABalance = await sdk.api.erc20.balanceOf({
-        target: AURALocker,
-        owner: treasuries[0],
-        chain: 'ethereum',
-        block: chainBlocks['ethereum']
-    }).then(result => result.output)
-    sdk.util.sumSingleBalance(balances, AURA, vlAURABalance)
+async function tvl(api) {
+  const block = api.block
+  const balances = api.getBalances()
+  const tokens = [
+    CVX,
+    cvxCRV,
+    FXS,
+    CRV,
+    AURA,
+    // BTRFLY/ETH Curve LP
+    '0x7483Dd57f6488b0e194A151C57Df6Ec85C00aCE9',
+    ADDRESSES.ethereum.USDC,
+    ADDRESSES.ethereum.FRAX,
+  ]
 
-    //Add staked cvxCRV as cvxCRV
-    const cvxCRVStakedBalance = await sdk.api.erc20.balanceOf({
-        target: cvxCRVStaking,
-        owner: treasuries[0],
-        chain: 'ethereum',
-        block: chainBlocks['ethereum']
-    }).then(result => result.output)
-    sdk.util.sumSingleBalance(balances, cvxCRV, cvxCRVStakedBalance)
+  //Add tokens/curve LPs in wallet
+  await api.sumTokens({ owners: treasuries, tokens })
 
-    //Add veFXS as  1/4 FXS since locked for 4 years
-    const veFXSBalance = await sdk.api.erc20.balanceOf({
-        target: veFXS,
-        owner: treasuries[0],
-        chain: 'ethereum',
-        block: chainBlocks['ethereum']
-    }).then(result => result.output)
-    sdk.util.sumSingleBalance(balances, FXS, veFXSBalance/4)
+  //Add UniswapV3 LPs
+  await sumTokens2({ api, owners: treasuries, resolveUniV3: true, })
 
-    //Add veCRV as 1 CRV since locked for 4 years
-    const veCRVBalance = await sdk.api.erc20.balanceOf({
-        target: veCRV,
-        owner: treasuries[0],
-        chain: 'ethereum',
-        block: chainBlocks['ethereum']
-    }).then(result => result.output)
-    sdk.util.sumSingleBalance(balances, CRV, veCRVBalance)
+  //Add convex deposited curve LPs
+  await genericUnwrapCvx(balances, treasuries[0], cvxCRVPool, block)
 
-    //Add sOHM as OHM since 1:1
-    const sOHMBalance = await sdk.api.erc20.balanceOf({
-        target: sOHM,
-        owner: treasuries[1],
-        chain: 'ethereum',
-        block: chainBlocks['ethereum']
-    }).then(result => result.output)
-    sdk.util.sumSingleBalance(balances, OHM, sOHMBalance)
+  //This causes an error and not sure why
+  //await genericUnwrapCvx(balances, treasuries[0], cvxFXSPool, block, 'ethereum')
 
-    return balances
+  //Add vlCVX as CVX
+  const [vlCVXBalance, vlAURABalance, cvxCRVStakedBalance, veFXSBalance, veCRVBalance, sOHMBalance] = await api.multiCall({
+    abi: 'erc20:balanceOf',
+    calls: [
+      { target: ADDRESSES.ethereum.vlCVX, params: treasuries[0] },
+      { target: AURALocker, params: treasuries[0] },
+      { target: cvxCRVStaking, params: treasuries[0] },
+      { target: veFXS, params: treasuries[0] },
+      { target: veCRV, params: treasuries[0] },
+      { target: sOHM, params: treasuries[1] },
+    ]
+  })
+  api.add(CVX, vlCVXBalance)
+  api.add(AURA, vlAURABalance)
+  api.add(cvxCRV, cvxCRVStakedBalance)
+  api.add(CRV, veCRVBalance)
+  api.add(OHM, sOHMBalance)
+  api.add(FXS, veFXSBalance / 4)
+  //Add vlAURA as AURA
+  //Add staked cvxCRV as cvxCRV
+  //Add veFXS as  1/4 FXS since locked for 4 years
+  //Add veCRV as 1 CRV since locked for 4 years
+  //Add sOHM as OHM since 1:1
 }
 
-async function staking(timestamp, block, chainBlocks) {
-    const balances = {}
-    
-    //Adding locked BTRFLY
-    const lockedBTRFLY = await sdk.api.abi.call({
-        abi: rlBTRFLYAbi.lockedSupply,
-        target: rlBTRFLY,
-        chain: 'ethereum',
-        block: chainBlocks['ethereum'],
-    }).then(result => result.output)
-    sdk.util.sumSingleBalance(balances, BTRFLYV2, lockedBTRFLY)
-    
-    return balances
+async function staking(api) {
+
+  //Adding locked BTRFLY
+  const lockedBTRFLY = await api.call({    abi: rlBTRFLYAbi.lockedSupply,    target: rlBTRFLY,  })
+  api.add(BTRFLYV2, lockedBTRFLY)
 }
 
 module.exports = {
-        methodology: "tvl = Treasury assets (bonding). staking = rlBTRFLY (locked tokens)",
-    ethereum:{
-        tvl,
-        staking
-    },
+  methodology: "tvl = Treasury assets (bonding). staking = rlBTRFLY (locked tokens)",
+  ethereum: {
+    tvl,
+    staking
+  },
 }