Merge branch 'DefiLlama:main' into main

Author: DackieSwap

package-lock.json

@@ -13,6 +13,7 @@
     "tvl": "cd utils;npm i; cd ..; node utils/testInteractive",
     "treasury": "cd utils;npm i; cd ..; node utils/testInteractive treasury",
     "entities": "cd utils;npm i; cd ..; node utils/testInteractive entities",
+    "useTokenLabels": "node utils/scripts/useTokenLabels.js",
     "postinstall": "echo 'run \"npm update @defillama/sdk\" if you want lastest sdk changes' "
   },
   "author": "",

package.json

@@ -1,22 +1,11 @@
-const TOKEN_CONTRACT_NOTE = '0x4e71A2E537B7f9D9413D3991D37958c0b5e1e503';
+const ADDRESSES = require('../helper/coreAssets.json');
+const { sumTokensExport } = require('../helper/unwrapLPs');
 const MARKET_1155TECH_CONTRACT = '0x33b77fAf955Ed3eDAf939ae66C4D7a2D78bc30C6';
 
-async function tvl(_, _1, _2, { api }) {
-    const balance = await api.call({
-        abi: 'erc20:balanceOf',
-        target: TOKEN_CONTRACT_NOTE,
-        params: [MARKET_1155TECH_CONTRACT],
-    });
-
-    api.add(TOKEN_CONTRACT_NOTE, balance)
-}
-
 module.exports = {
-    timetravel: true,
-    misrepresentedTokens: false,
-    methodology: 'Value of all Keys across all art markets is TVL in the protocol',
-    start: 7280880,
-    canto: {
-        tvl
-    }
+  methodology: 'Value of all Keys across all art markets is TVL in the protocol',
+  start: 7280880,
+  canto: {
+    tvl: sumTokensExport({ owner: MARKET_1155TECH_CONTRACT, tokens: [ADDRESSES.canto.NOTE] })
+  }
 };

projects/1155Tech/index.js

@@ -9,6 +9,7 @@ module.exports = {
   polygon_zkevm: { tvl, },
   avax: { tvl, },
   base: { tvl, },
+  arbitrum: { tvl, },
   methodology:
     "TVL comes from the DEX liquidity pools"
 };

projects/FlashLiquidity/index.js

@@ -0,0 +1,11 @@
+const { uniTvlExport } = require('../helper/calculateUniTvl.js')
+
+module.exports = {
+  misrepresentedTokens: true,
+  zeta: {
+    tvl: uniTvlExport("0x769d1BcB5FDf30F5a9D19f1ab8A3cF8b60a6e855", undefined, undefined, {
+      allPairsLength: 'uint256:allPoolsLength',
+      allPairs: 'function allPools(uint256) view returns (address)',
+    }, { fetchBalances: true, useDefaultCoreAssets: true, hasStablePools: true, }),
+  },
+}

projects/Omnidrome/index.js

@@ -0,0 +1,7 @@
+const { getUniTVL } = require("../helper/unknownTokens");
+module.exports = {
+  misrepresentedTokens: true,
+  mode: {
+    tvl: getUniTVL({ factory: "0xfb926356BAf861c93C3557D7327Dbe8734A71891", useDefaultCoreAssets: true, }),
+  },
+};

projects/SwapMode/index.js

@@ -10,8 +10,12 @@ function v3(chain) {
     params = ['0x9E7B73ffD9D2026F3ff4212c29E209E09C8A91F5', undefined, ['0x99411FC17Ad1B56f49719E3850B2CDcc0f9bBFd8']]
   else if (chain === 'base')
     params = ['0x2f6571d3Eb9a4e350C68C36bCD2afe39530078E2', undefined, ['0x2d8A3C5677189723C4cB8873CfC9C8976FDF38Ac']]
-    else if (chain === 'xdai')
+  else if (chain === 'xdai')
     params = ['0x36616cf17557639614c1cdDb356b1B83fc0B2132', undefined, ['0x501B4c19dd9C2e06E94dA7b6D5Ed4ddA013EC741']]
+  else if (chain === 'scroll')
+    params = ['0xFBedc64AeE24921cb43004312B9eF367a4162b57', undefined, ['0xa99F4E69acF23C6838DE90dD1B5c02EA928A53ee']]
+  else if (chain === 'bsc')
+    params = ['0x117684358D990E42Eb1649E7e8C4691951dc1E71', undefined, ['0x41585C50524fb8c3899B43D7D797d9486AAc94DB']]
   const section = borrowed => aaveChainTvl(chain, ...params, borrowed, true);
   return {
     tvl: section(false),
@@ -22,7 +26,7 @@ function v3(chain) {
 module.exports = {
   methodology: `Counts the tokens locked in the contracts to be used as collateral to borrow or to earn yield. Borrowed coins are not counted towards the TVL, so only the coins actually locked in the contracts are counted. There's multiple reasons behind this but one of the main ones is to avoid inflating the TVL through cycled lending`,
   avax: v3("avax"),
-  ...["optimism", "fantom", "harmony", "arbitrum", "polygon", "ethereum", "metis", "base", "xdai"].reduce((t, c) => ({ ...t, [c]: v3(c) }), {}),
+  ...["optimism", "fantom", "harmony", "arbitrum", "polygon", "ethereum", "metis", "base", "xdai", "scroll", "bsc"].reduce((t, c) => ({ ...t, [c]: v3(c) }), {}),
   hallmarks: [
     [1659630089, "Start OP Rewards"],
     [1650471689, "Start AVAX Rewards"]

projects/aave/v3.js

@@ -1,5 +1,6 @@
+const ADDRESSES = require('../helper/coreAssets.json')
 const euphrates = '0x7Fe92EC600F15cD25253b421bc151c51b0276b7D';
-const ldotAddr = '0x0000000000000000000100000000000000000003';
+const ldotAddr = ADDRESSES.acala.LDOT;
 const wtdotAddr = '0xe1bD4306A178f86a9214c39ABCD53D021bEDb0f9';
 
 async function tvl(timestamp) {

projects/acala-euphrates/index.js

@@ -0,0 +1,77 @@
+const ADDRESSES = require('../helper/coreAssets.json');
+const { sumTokens2 } = require('../helper/unwrapLPs');
+
+const REGISTRY = "0x5b1eFC3057E941439C487E67761F348D19Dd4100";
+
+const REGISTRY_KEYS = {
+  "ambit.asset.storage":
+    "0x7267fae8044d9c0f406ec1d6bfdfdb3a4afea229fceedb3c88cc26df2ac97809",
+  "ambit.depositorVault":
+    "0x970bffd07196f826592058a2977d8df91d0b38816ca31aaaa6a628eda0328dbe",
+  "ambit.depositorVault.token":
+    "0x8e9a5206de4051330868a4fdef94140eaddce6206903c36de600007efb237b8d",
+  "ambit.market":
+    "0xcc0fa1d8c6527b2fc2cd5cbed9e80e1843330af5cd1d34a45c3f125a60dc07aa",
+};
+
+const ABI = {
+  IAddressRegistry: {
+    getAddresses:
+      "function getAddresses(bytes32[] calldata keys) view returns (address[] memory)",
+  },
+  IAssetStorage: {
+    getAssets:
+      "function getAssets() view returns ((address,address,address,address,uint16,uint16,uint256,(address,uint16))[])",
+  },
+  ICustodian: {
+    getTotalAssets: "function getTotalAssets() view returns (uint256)",
+  },
+  IDepositorVault: {
+    getTotalAssets: "function getTotalAssets() view returns (uint256)",
+    getLiabilities:
+      "function getLiabilities(address account) view returns (uint256)",
+  },
+};
+
+const AUSD = "0xf328ed974e586b6eea7997a87ea2ab1de149b186";
+
+async function tvl(_, _1, _2, { api }) {
+  const tokensAndOwners = []
+  const [storage, depositorVault] = await api.call({
+    abi: ABI["IAddressRegistry"]["getAddresses"],
+    target: REGISTRY,
+    params: [
+      [
+        REGISTRY_KEYS["ambit.asset.storage"],
+        REGISTRY_KEYS["ambit.depositorVault"],
+      ],
+    ],
+  });
+  tokensAndOwners.push([ADDRESSES.bsc.USDT, depositorVault]);
+  // supply side
+  const assets = await api.call({ abi: ABI["IAssetStorage"]["getAssets"], target: storage, });
+  assets.forEach(i => tokensAndOwners.push([i[0], i[1]]))
+  return sumTokens2({ api, tokensAndOwners, blacklistedTokens: [AUSD] });
+}
+
+async function borrowed(_, _1, _2, { api }) {
+  const [depositorVault, market] = await api.call({
+    abi: ABI["IAddressRegistry"]["getAddresses"],
+    target: REGISTRY,
+    params: [
+      [REGISTRY_KEYS["ambit.depositorVault"], REGISTRY_KEYS["ambit.market"]],
+    ],
+  });
+
+  const liabilities = await api.call({ abi: ABI["IDepositorVault"]["getLiabilities"], target: depositorVault, params: market });
+  api.add(ADDRESSES.bsc.USDT, liabilities);
+  return api.getBalances()
+}
+
+module.exports = {
+  bsc: {
+    tvl,
+    borrowed,
+  },
+  methodology: "Gets the TVL for the protocol",
+};

projects/ambit-finance/index.js

@@ -1,24 +1,40 @@
-const tokens = [
-  '0xEf5AAcB3c38a5Be7785a361008e27fb0328a62B5', // secured private credit token
-  // '0xE16f2eC94E8a0819EB93022c45E05D582f4E5c15', // private credit token
-];
+const ADDRESSES = require('../helper/coreAssets.json')
+
+// Anzen Secured Private Credit Token
+// minted by depositing USDC
+const SPCT = '0xEf5AAcB3c38a5Be7785a361008e27fb0328a62B5';
 
 async function tvl(_, _1, _2, { api }) {
-  const uTokens = await api.multiCall({ abi: 'address:usdc', calls: tokens })
-  return api.sumTokens({ tokensAndOwners2: [uTokens, tokens,] })
+  const uTokens = await api.multiCall({ abi: 'address:usdc', calls: [SPCT] })
+  const bals = (await api.multiCall({ abi: 'uint256:totalPooledUSD', calls: [SPCT] })).map(i => i / 1e12)
+
+  api.add(uTokens, bals)
+  return api.getBalances()
 }
+
 async function borrowed(_, _1, _2, { api }) {
-  const uTokens = await api.multiCall({ abi: 'address:usdc', calls: tokens })
-  const bals = (await api.multiCall({ abi: 'uint256:totalPooledUSD', calls: tokens })).map(i => i / 1e12)
-  const inContracts = (await api.multiCall({ abi: 'address:reserveUSD', calls: tokens })).map(i => i * -1)
-  api.add(uTokens, bals)
-  api.add(uTokens, inContracts)
+  // Borrowed amount in shares of pool
+  const executedShares = await api.call({
+    target: SPCT,
+    abi: 'uint256:executedShares'
+  });
+
+  // Borrowed amount in USD
+  const pooledUSDByShares = await api.call({
+    target: SPCT,
+    abi: 'function getPooledUSDByShares(uint256 _sharesAmount) public view returns (uint256)',
+    params: [executedShares]
+  });
+
+  api.add(ADDRESSES.ethereum.USDC, pooledUSDByShares/1e12);
   return api.getBalances()
 }
 
 module.exports = {
-  methodology: "Sums the locked collateral amounts and depositor token balances.",
+  methodology: "Sums the total USDC value deposited to mint SPCT.",
+  misrepresentedTokens: true,
   ethereum: {
-    tvl, borrowed,
+    tvl,
+    borrowed,
   },
 };