more fixes

Author: g1nt0ki

projects/agora/index.js

@@ -1,10 +1,7 @@
 const sdk = require("@defillama/sdk");
 const { compoundExports } = require("../helper/compound");
-const { transformMetisAddress } = require("../helper/portedTokens");
 const {calculateUsdUniTvl} = require('../helper/getUsdUniTvl.js')
 
-
-
 const factory = '0x3c4063B964B1b3bF229315fCc4df61a694B0aE84'
 const metis = '0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000'
 const agora = '0x0Ed0Ca6872073E02cd3aE005BaF04bA43BE947fA'
@@ -25,15 +22,14 @@ const { tvl: agoraTvl, borrowed: agoraBorrowed } = compoundExports(
   "metis",
   "0xcFd482DcE13cA1d27834D381AF1b570E9E6C6810",
   metis,
-  transformMetisAddress(),
 );
 
 const { tvl: agoraPlusTvl, borrowed: agoraPlusBorrowed } = compoundExports(
   "0x92DcecEaF4c0fDA373899FEea00032E8E8Da58Da",
   "metis",
   "0xE85A1ae1A2A21135c49ADEd398D3FD5Ed032B28e",
   metis,
-  transformMetisAddress(),
+  undefined,
   symbol => symbol.indexOf('appuffNetswap') > -1
 );
 
@@ -42,15 +38,15 @@ const { tvl: agoraStakeTvl, borrowed: agoraStakeBorrowed } = compoundExports(
   "metis",
   "0xc3034143816398d37Ec9447c9CA17c407e96Dc12",
   metis,
-  transformMetisAddress(),
+  undefined,
 );
 
 const { tvl: agoraFarmTvl, borrowed: agoraFarmBorrowed } = compoundExports(
   "0xEC1A06f320E6e295Ab6892BB4e0f9e29c712F11F",
   "metis",
   "0x13Cb104a1D94A89a260b27DfAAB07C862da622E5",
   metis,
-  transformMetisAddress(),
+  undefined,
 );
 
 const chainTvl = calculateUsdUniTvl(

projects/avalaunch/index.js

@@ -1,6 +1,5 @@
 const sdk = require('@defillama/sdk')
 const { unwrapUniswapLPs } = require('../helper/unwrapLPs')
-const {fixAvaxBalances} = require('../helper/portedTokens')
 
 const xavaAddress = "0xd1c3f94DE7e5B45fa4eDBBA472491a9f4B166FC4";
 const stakingContracts = [
@@ -26,7 +25,6 @@ async function pool2(timestamp, ethBlock, chainBlocks){
         token: lp,
         balance: lpLocked.output
     }], block, 'avax', addr=>`avax:${addr}`);
-    fixAvaxBalances(balances);
     return balances;
 };
 async function staking(timestamp, ethBlock, chainBlocks){

projects/bodhfinance/index.js

@@ -1,13 +1,11 @@
 const { compoundExports } = require('../helper/compound')
-const { transformBobaAddress } = require('../helper/portedTokens')
 
 const WETH = "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
 const bETH = "0xe970c37243F3d0B2AeB041b855Ef6466CB140BcA"
 const unitroller = "0x97b491744587d05ca33e84bB18B61Df9B3986DcE"
 
 const { tvl, borrowed } = compoundExports(
-    unitroller, "boba", bETH, WETH, transformBobaAddress(),
-);
+    unitroller, "boba", bETH, WETH, );
 
 module.exports = {
     timetravel: true,

projects/demeter.js

@@ -1,13 +1,13 @@
 const retry = require('./helper/retry')
 const axios = require("axios");
 const sdk = require('@defillama/sdk');
-const { transformHecoAddress } = require('./helper/portedTokens');
+const { getChainTransform } = require('./helper/portedTokens');
 const { unwrapUniswapLPs } = require("./helper/unwrapLPs");
 const { getBlock } = require('./helper/getBlock')
 
 async function tvl(timestamp, block, chainBlocks) {
   let balances = {};
-  const transform = await transformHecoAddress();
+  const transform = await getChainTransform('heco');
 
   let liquidity = (await retry(async bail => 
     await axios.get('https://demeter.xyz/app/api/market_global_data', {
@@ -27,7 +27,7 @@ async function tvl(timestamp, block, chainBlocks) {
 
 async function staking(timestamp, block, chainBlocks) {
     let balances = {};
-    const transform = await transformHecoAddress();
+    const transform = await getChainTransform('heco');
     block = await getBlock(timestamp, 'heco', chainBlocks);
 
     let liquidity = (await retry(async bail => 

projects/domfi/index.js

@@ -1,14 +1,14 @@
 const sdk = require("@defillama/sdk");
-const { sumTokens, unwrapUniswapLPs } = require("../helper/unwrapLPs");
-const { transformPolygonAddress, transformBobaAddress } = require("../helper/portedTokens");
+const { sumTokens, } = require("../helper/unwrapLPs");
+const { getChainTransform } = require("../helper/portedTokens");
 const { getBlock } = require("../helper/getBlock");
 const abi = require("./abi");
 const { Chain, lsps, uniswapFactory, ZERO_ADDRESS, usdc } = require("./registry");
 
 const makeUniswapReserves = (chain, makeAddressTransform) => {
   return async (timestamp, block, chainBlocks) => {
     const balances = {};
-    const transform = await makeAddressTransform?.();
+    const transform = await getChainTransform(chain);
     block = await getBlock(timestamp, chain, chainBlocks);
 
     const getLongToken = abi["LongShortPair.longToken"];
@@ -78,7 +78,7 @@ const makeUniswapReserves = (chain, makeAddressTransform) => {
 const makeLspTvl = (chain, makeAddressTransform) => {
   return async (timestamp, block, chainBlocks) => {
     const balances = {};
-    const transform = await makeAddressTransform?.();
+    const transform = await getChainTransform(chain);
     block = await getBlock(timestamp, chain, chainBlocks);
 
     const getCollateralToken = abi["LongShortPair.collateralToken"];
@@ -104,15 +104,8 @@ const makeLspTvl = (chain, makeAddressTransform) => {
   }
 }
 
-const transformers = {
-  [Chain.ETHEREUM]: undefined,
-  [Chain.POLYGON]: transformPolygonAddress,
-  [Chain.BOBA]: transformBobaAddress,
-}
-
 const run = (chain, f) => {
-  const transform = transformers[chain];
-  return f(chain, transform);
+  return f(chain);
 }
 
 const runAll = (chain, fs) => {

projects/drachma/index.js

@@ -1,6 +1,6 @@
 const sdk = require("@defillama/sdk");
-const { transformMetisAddress } = require("../helper/portedTokens");
 const contracts = require('./contracts.json');
+const { sumTokens2 } = require('../helper/unwrapLPs')
 
 const { compoundExports } = require("../helper/compound");
 const comptroller = "0xB6ef08Ffbbb0691a3D9E6c41db4b1d2F97D8D49a";
@@ -14,37 +14,10 @@ const { tvl: drachmaTvl, borrowed: drachmaBorrowed } = compoundExports(
 //tvl for drachma app
 function tvl(chain) {
   return async (timestamp, block, chainBlocks) => {
-    const transform = await transformMetisAddress()
-    const balances = {};
-
-    const [tokenBalances, usdcBalances] = await Promise.all([
-      sdk.api.abi.multiCall({
-        calls: contracts[chain].map((c) => ({
-          target: c.token,
-          params: [c.address],
-        })),
-        abi: "erc20:balanceOf",
-        block: chainBlocks[chain],
-        chain,
-      }),
-
-      sdk.api.abi.multiCall({
-        calls: contracts[chain].map((c) => ({
-          target: contracts.usdc[chain],
-          params: [c.address],
-        })),
-        abi: "erc20:balanceOf",
-        block: chainBlocks[chain],
-        chain,
-      }),
-    ]);
-
-    await Promise.all([
-      sdk.util.sumMultiBalanceOf(balances, tokenBalances, true, transform),
-      sdk.util.sumMultiBalanceOf(balances, usdcBalances, true, transform),
-    ]);
-
-    return balances;
+    const toa = []
+    toa.push(...contracts[chain].map(c => ([c.token, c.address])))
+    toa.push(...contracts[chain].map(c => ([contracts.usdc[chain], c.address])))
+    return sumTokens2({ chain, tokensAndOwners: toa, block: chainBlocks[chain], resolveLP: true, })
   };
 };
 

projects/farmhero/index.js

@@ -4,9 +4,7 @@ const { stakings } = require("../helper/staking");
 const { pool2s } = require("../helper/pool2");
 const { unwrapUniswapLPs } = require("../helper/unwrapLPs");
 const {
-  transformBscAddress,
-  transformPolygonAddress,
-  transformOkexAddress,
+  getChainTransform,
 } = require("../helper/portedTokens");
 
 // --- BSC Addresses ---
@@ -204,7 +202,7 @@ const calcTvl = async (
 const bscTvl = async (chainBlocks) => {
   const balances = {};
 
-  const transformAddress = await transformBscAddress();
+  const transformAddress = await getChainTransform('bsc');
 
   await calcTvl(
     balances,
@@ -221,7 +219,7 @@ const bscTvl = async (chainBlocks) => {
 const polygonTvl = async (chainBlocks) => {
   const balances = {};
 
-  const transformAddress = await transformPolygonAddress();
+  const transformAddress = await getChainTransform('polygon');
 
   await calcTvl(
     balances,
@@ -238,7 +236,7 @@ const polygonTvl = async (chainBlocks) => {
 const okexTvl = async (chainBlocks) => {
   const balances = {};
 
-  const transformAddress = await transformOkexAddress();
+  const transformAddress = await getChainTransform('okexchain');
 
   await calcTvl(
     balances,

projects/fountain.js

@@ -1,15 +1,13 @@
 const { compoundExports } = require("./helper/compound");
-const { transformOasisAddressBase } = require('./helper/portedTokens')
 
 module.exports = {
     timetravel: true,
-    aurora: {
+    oasis: {
         ...compoundExports(
             '0xA7684aE7e07Dac91113900342b3ef25B9Fd1D841',
             'oasis',
             '0xD7d588bAbFb99E82Cd6dd0cA7677A5599AA678B5',
             '0x21C718C22D52d0F3a789b752D4c2fD5908a8A733',
-            transformOasisAddressBase,
             )
     },
 }; // node test.js projects/fountain.js

projects/helper/compound.js

@@ -4,8 +4,7 @@ const abi = require('./abis/compound.json');
 const { getBlock } = require('./getBlock');
 const { unwrapUniswapLPs } = require('./unwrapLPs');
 const { requery } = require("./requery");
-const { getUniqueAddresses } = require("./utils");
-const { transformMetisAddress, getChainTransform, getFixBalances, } = require('./portedTokens');
+const { getChainTransform, getFixBalances, } = require('./portedTokens');
 const { usdtAddress } = require('./balances');
 const agoraAbi = require("./../agora/abi.json");
 // ask comptroller for all markets array
@@ -97,8 +96,7 @@ async function unwrapPuffTokens(balances, lpPositions, block) {
     balances,
     newLpPositions,
     block,
-    'metis',
-    transformMetisAddress()
+    'metis'
   );
 };
 
@@ -270,11 +268,11 @@ function compoundExports(comptroller, chain, cether, cetheEquivalent, transformA
 function compoundExportsWithAsyncTransform(comptroller, chain, cether, cetheEquivalent, transformAdressConstructor) {
   return {
     tvl: async (...args) => {
-      const transformAddress = await transformAdressConstructor()
+      const transformAddress = await getChainTransform(chain)
       return getCompoundV2Tvl(comptroller, chain, transformAddress, cether, cetheEquivalent)(...args)
     },
     borrowed: async (...args) => {
-      const transformAddress = await transformAdressConstructor()
+      const transformAddress = await getChainTransform(chain)
       return getCompoundV2Tvl(comptroller, chain, transformAddress, cether, cetheEquivalent, true)(...args)
     },
   }

projects/helper/hodltree/calculateBalances.js

@@ -5,7 +5,7 @@ const {
     polygonContracts,
     dexTypes
 } = require('../../config/hodltree');
-const { transformPolygonAddress, transformEthereumAddress } = require('../portedTokens');
+const { getChainTransform } = require('../portedTokens');
 const { calculateEM } = require('./calculateEM');
 const { calculateFlashloan } = require('./calculateFlashloan');
 const { calculateLendBorrow } = require('./calculateLendBorrow');
@@ -38,12 +38,12 @@ async function calculateHodltreeBalances(dexes, chain, chainBlocks, transform) {
 }
 
 async function calculateHodltreeBalancesEth(timestamp, block, chainBlocks) {
-    const transform = await transformEthereumAddress();
+    const transform = await getChainTransform('ethereum');
     return calculateHodltreeBalances(ethContracts, 'ethereum', chainBlocks, transform);
 }
 
 async function calculateHodltreeBalancesPolygon(timestamp, block, chainBlocks) {
-    const transform = await transformPolygonAddress()
+    const transform = await getChainTransform('polygon')
     return calculateHodltreeBalances(polygonContracts, 'polygon', chainBlocks, transform);
 
 }