Merge branch 'DefiLlama:main' into main

Author: crispyfisherman

package-lock.json

@@ -29,6 +29,7 @@
     "@solana/web3.js": "^1.87.6",
     "@solendprotocol/solend-sdk": "^0.4.3",
     "@supercharge/promise-pool": "^2.1.0",
+    "async-retry": "^1.3.3",
     "axios": "^1.6.5",
     "bignumber.js": "^9.0.1",
     "blakejs": "^1.2.1",

package.json

@@ -0,0 +1,12 @@
+const ADDRESSES = require('../helper/coreAssets.json')
+const { sumTokensExport, nullAddress } = require('../helper/unwrapLPs')
+
+const config = {
+  ethereum: { contract: '0xDFcB2aB25b7978C112E9E08a2c70d52b035F1776', tokens: [nullAddress, ADDRESSES.ethereum.WETH, '0x8d0d000ee44948fc98c9b98a4fa4921476f08b0d'] }
+}
+
+Object.keys(config).forEach(chain => {
+  module.exports[chain] = {
+    tvl: sumTokensExport({ owner: config[chain].contract, tokens: config[chain].tokens, })
+  }
+})

projects/1776meme/index.js

@@ -8,6 +8,8 @@ async function eos() {
         ["eosio.token", "EOS", "eos"],
         ["usdt.xsat", "USDT", "tether"],
         ["btc.xsat", "BTC", "bitcoin"],
+        ["core.vaulta", "A", "vaulta"],
+        ["usdc.xsat", "USDC", "usd-coin"],
     ];
     return await get_account_tvl(accounts, tokens, "eos");
 }

projects/1dex/index.js

@@ -5,6 +5,13 @@ const config = require("./1inch/config");
 
 module.exports = {}
 
+const WETH = '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2';
+const ETH_PLACEHOLDER = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee';
+
+function normalizeToken(address) {
+  return address.toLowerCase() === ETH_PLACEHOLDER ? WETH : address;
+}
+
 Object.keys(config).forEach(chain => {
   const { blacklistedTokens = [], factories } = config[chain]
   module.exports[chain] = {
@@ -19,9 +26,12 @@ Object.keys(config).forEach(chain => {
           onlyArgs: true,
           fromBlock,
         })
-        logs.forEach(i => ownerTokens.push([[i.token1, i.token2], i.mooniswap]))
+
+        logs.forEach(({ token1, token2, mooniswap }) => {
+          ownerTokens.push([[normalizeToken(token1), normalizeToken(token2)], mooniswap]);
+        });
       }
-      return sumTokens2({ api, ownerTokens, blacklistedTokens, sumChunkSize: 50, })
+      return sumTokens2({ api, ownerTokens, blacklistedTokens, sumChunkSize: 1000, sumChunkSleep: 2000 })
     }
   }
 })

projects/1inch.js

@@ -42,7 +42,8 @@ module.exports = {
       '0x3fa729b4548becbad4eab6ef18413470e6d5324c',
       '0xcd62b1c403fa761baadfc74c525ce2b51780b184',
       '0x30dcf96a8a0c742aa1f534fac79e99d320c97901',
-      '0xfbc4f3f645c4003a2e4f4e9b51077d2daa9a9341'
+      '0xfbc4f3f645c4003a2e4f4e9b51077d2daa9a9341',
+      '0x18acf236eb40c0d4824fb8f2582ebbecd325ef6a'
     ]
   },
 }

projects/1inch/config.js

@@ -1,10 +1,5 @@
-const { uniTvlExport } = require("../helper/calculateUniTvl.js");
 
-module.exports = {
-  misrepresentedTokens: true,
-    start: '2022-11-06',
-  arbitrum: {
-    tvl: uniTvlExport("0xD158bd9E8b6efd3ca76830B66715Aa2b7Bad2218", "arbitrum", undefined, undefined, { hasStablePools: true, useDefaultCoreAssets: true, }),
-  },
-  hallmarks: [[1668038400, "Emissions started"]],
-};
+const { uniTvlExports } = require('../helper/unknownTokens')
+module.exports = uniTvlExports({
+  'arbitrum': '0xD158bd9E8b6efd3ca76830B66715Aa2b7Bad2218'
+}, { hasStablePools: true, hallmarks: [[1668038400, "Emissions started"]], })

projects/3xcalibur/index.js

@@ -2,22 +2,26 @@ const { erc4626Abi, fortyAcresAbi } = require('./abi');
 
 const vaultMapping = {
   optimism: '0x08dCDBf7baDe91Ccd42CB2a4EA8e5D199d285957',
-  base: '0xB99B6dF96d4d5448cC0a5B3e0ef7896df9507Cf5'
+  base: '0xB99B6dF96d4d5448cC0a5B3e0ef7896df9507Cf5',
+  avax: '0xbeD7C02887EfD6b5Eb9A547Ac1A4D5e582791647'
 }
 
 const fortyAcresMapping = {
     optimism: '0xf132bD888897254521D13e2c401e109caABa06A7',
-    base: '0x87f18b377e625b62c708D5f6EA96EC193558EFD0'
+    base: '0x87f18b377e625b62c708D5f6EA96EC193558EFD0',
+    avax: '0xf6A044c3b2a3373eF2909E2474f3229f23279B5F'
 }
 
 const baseTokenMapping = {
     optimism: '0x3c8B650257cFb5f272f799F5e2b4e65093a11a05', // VELO
     base: '0x940181a94A35A4569E4529A3CDfB74e38FD98631', // AERO
+    avax: '0xaaab9d12a30504559b0c5a9a5977fee4a6081c6b' // PHAR
 }
 
 const veNftMapping = {
     optimism: '0xFAf8FD17D9840595845582fCB047DF13f006787d', // veVELO
     base: '0xeBf418Fe2512e7E6bd9b87a8F0f294aCDC67e6B4', // veAERO
+    avax: '0xAAAEa1fB9f3DE3F70E89f37B69Ab11B47eb9Ce6F' // vePHAR
 }
 
 // get the underlying asset of each erc4626 vault

projects/40acres/helpers.js

@@ -4,7 +4,7 @@ const { unwrapSolidlyVeNft } = require('../helper/unwrapLPs');
 
 
 async function getLockedVeNFTBalance(api) {
-  await unwrapSolidlyVeNft({ api, baseToken: baseTokenMapping[api.chain], veNft: veNftMapping[api.chain], owner: fortyAcresMapping[api.chain] })
+  await unwrapSolidlyVeNft({ api, baseToken: baseTokenMapping[api.chain], veNft: veNftMapping[api.chain], owner: fortyAcresMapping[api.chain], isAltAbi: api.chain === 'avax' });
   await api.sumTokens({ owner: fortyAcresMapping[api.chain], tokens: [baseTokenMapping[api.chain]] },)
 }
 
@@ -28,4 +28,5 @@ module.exports = {
   methodology: `TVL is comprised of tokens deposited to the protocol as collateral and tokens deposited to the vault for lending. Borrowed tokens are not counted towards TVL.`,
   base: { tvl: tvl, borrowed: borrowed },
   optimism: { tvl: tvl, borrowed: borrowed },
+  avax : { tvl: tvl, borrowed: borrowed }
 }

projects/40acres/index.js

@@ -1,23 +1,10 @@
-const sdk = require('@defillama/sdk')
+const { sumTokensExport, nullAddress } = require('../helper/unwrapLPs')
 
 const CORE_POOL_ADDRESS = "0xC439be7A5623bA800E7450F2cb6eDBc5A1983685"
-const CORE_CHAIN = "core"
-
-async function coreTvl(timestamp, block, chainBlocks) {
-    const balances = {}
-    const balance = await sdk.api.eth.getBalance({
-        target: CORE_POOL_ADDRESS,
-        block: chainBlocks[CORE_CHAIN],
-        chain: CORE_CHAIN
-    })
-    sdk.util.sumSingleBalance(balances, "core:0x0000000000000000000000000000000000000000", balance.output)
-    return balances
-}
 
 module.exports = {
     methodology: 'counts the number of NATIVE tokens in the Pool Bonding contract.',
-    start: 24495957,
     core: {
-        tvl:coreTvl,
+        tvl:sumTokensExport({ owner: CORE_POOL_ADDRESS, tokens: [nullAddress]}),
     }
 }