Merge branch 'main' into nibiru/silverswap

Author: Unique-Divine

projects/9summits/index.js

@@ -1,21 +1,21 @@
 const { getCuratorExport } = require("../helper/curators");
 
 const configs = {
-  methodology: 'Count all assets are depoisted in all vaults curated by 9Summits.',
+  methodology: 'Count all assets are deposited in all vaults curated by 9Summits.',
   blockchains: {
     ethereum: {
+      morphoVaultOwners: [
+        '0x23E6aecB76675462Ad8f2B31eC7C492060c2fAEF',
+      ],
       morpho: [
-        '0xb5e4576C2FAA16b0cC59D1A2f3366164844Ef9E0',
-        '0xD5Ac156319f2491d4ad1Ec4aA5ed0ED48C0fa173',
-        '0x1E2aAaDcF528b9cC08F43d4fd7db488cE89F5741',
-        '0x00B6f2C15E4439749f192D10c70f65354848Cf4b',
-        '0x0bB2751a90fFF62e844b1521637DeD28F3f5046A',
+        '0xb5e4576C2FAA16b0cC59D1A2f3366164844Ef9E0', // co-curator with tulip-capital
+        '0x1E2aAaDcF528b9cC08F43d4fd7db488cE89F5741', // co-curator with tulip-capital
+        '0x0bB2751a90fFF62e844b1521637DeD28F3f5046A', // co-curator with tulip-capital
       ],
     },
     base: {
-      morpho: [
-        '0x5496b42ad0deCebFab0db944D83260e60D54f667',
-        '0xF540D790413FCFAedAC93518Ae99EdDacE82cb78'
+      morphoVaultOwners: [
+        '0x23E6aecB76675462Ad8f2B31eC7C492060c2fAEF',
       ],
     },
   }

projects/Fountain-Protocol/index.js

@@ -11,4 +11,7 @@ module.exports= mergeExports([
   [unitroller_lpt_oasis, '0x63f1fe2e1da490611fc16e4a5d92b7ec7d0911a9'],
 ].map( ([comptroller, cether]) => ({
   oasis: compoundExports2({ comptroller, cether, }),
-})))
+})))
+
+module.exports.deadFrom = '2023-06-22'
+module.exports.oasis.borrowed=  () => ({})

projects/SMARDEX-P2P-Lending/index.js

@@ -0,0 +1,49 @@
+const headers = {
+  origin: "https://subgraph.smardex.io",
+  referer: "https://subgraph.smardex.io",
+  "x-api-key": process.env.SMARDEX_SUBGRAPH_API_KEY,
+};
+
+const subgraphUrl = "https://subgraph.smardex.io/ethereum/spro";
+
+const getTokenMetrics = async () => {
+  const tokenMetricsQuery = `{
+    tokenMetrics_collection {
+      id
+      totalCollateralAmount
+      totalBorrowedAmount
+    }
+  }`;
+
+  const result = await fetch(subgraphUrl, {
+    method: "POST",
+    headers,
+    body: JSON.stringify({
+      query: tokenMetricsQuery,
+    }),
+  }).then((res) => res.json());
+  return result?.data?.tokenMetrics_collection || [];
+};
+
+async function getP2pData(isBorrowed = false) {
+  const tokenMetrics = await getTokenMetrics();
+
+  return tokenMetrics.reduce((acc, token) => {
+    const totalBorrowedAmount = parseFloat(token.totalBorrowedAmount);
+
+    return {
+      ...acc,
+      [token.id]:
+        // We only need to add the total collateral amount if it's not borrowed
+        totalBorrowedAmount + parseFloat(isBorrowed ? 0 : token.totalCollateralAmount),
+    };
+  }, {});
+}
+
+module.exports = {
+  ethereum: {
+    tvl: () => getP2pData(),
+    borrowed: () => getP2pData(true),
+  },
+};
+// node test.js projects/p2p-lending/index.js

projects/SMARDEX-USDN/index.js

@@ -0,0 +1,33 @@
+const ADDRESSES = require('../helper/coreAssets.json')
+
+const USDN_PROTOCOL_ADDRESS = "0x656cB8C6d154Aad29d8771384089be5B5141f01a";
+const WSTETH_TOKEN_ADDRESS = ADDRESSES.ethereum.WSTETH;
+const REBALANCER_ADDRESS = "0xaebcc85a5594e687f6b302405e6e92d616826e03";
+
+async function fetchUSDNData(api) {
+
+  const balanceVault = await api.call({ target: USDN_PROTOCOL_ADDRESS, abi: "uint256:getBalanceVault", });
+  const balanceLong = await api.call({ target: USDN_PROTOCOL_ADDRESS, abi: "uint256:getBalanceLong", });
+  const rebalancerCurrentStateData = await api.call({
+    target: REBALANCER_ADDRESS,
+    abi: "function getCurrentStateData() view returns (uint128 pendingAssets_, uint256 maxLeverage_, (int24 tick, uint256 tickVersion, uint256 index) currentPosId_)",
+  });
+
+  return {
+    getBalanceVault: balanceVault,
+    getBalanceLong: balanceLong,
+    rebalancerPendingAssets: rebalancerCurrentStateData.pendingAssets_,
+  };
+}
+
+const getEthereumTVL = async (api, block, chainBlocks) => {
+  const usdnData = await fetchUSDNData(api);
+
+  api.add(WSTETH_TOKEN_ADDRESS, Object.values(usdnData))
+  return api.getBalances();
+};
+
+module.exports["ethereum"] = {
+  timetravel: true,
+  tvl: getEthereumTVL
+};

projects/SmarDex/index.js

@@ -10,32 +10,11 @@ const config = {
 };
 
 const ethereumFactory = "0xB878DC600550367e14220d4916Ff678fB284214F";
-const USDN_PROTOCOL_ADDRESS = "0x656cB8C6d154Aad29d8771384089be5B5141f01a";
-const WSTETH_TOKEN_ADDRESS = ADDRESSES.ethereum.WSTETH;
-const REBALANCER_ADDRESS = "0xaebcc85a5594e687f6b302405e6e92d616826e03";
-
-async function fetchUSDNData(api) {
-
-  const balanceVault = await api.call({ target: USDN_PROTOCOL_ADDRESS, abi: "uint256:getBalanceVault", });
-  const balanceLong = await api.call({ target: USDN_PROTOCOL_ADDRESS, abi: "uint256:getBalanceLong", });
-  const rebalancerCurrentStateData = await api.call({
-    target: REBALANCER_ADDRESS,
-    abi: "function getCurrentStateData() view returns (uint128 pendingAssets_, uint256 maxLeverage_, (int24 tick, uint256 tickVersion, uint256 index) currentPosId_)",
-  });
-
-  return {
-    getBalanceVault: balanceVault,
-    getBalanceLong: balanceLong,
-    rebalancerPendingAssets: rebalancerCurrentStateData.pendingAssets_,
-  };
-}
 
 const getEthereumTVL = async (api, block, chainBlocks) => {
-  const usdnData = await fetchUSDNData(api);
   const uniTVL = await getUniTVL({ factory: ethereumFactory, fetchBalances: true, useDefaultCoreAssets: false })(api, block, chainBlocks);
 
   api.addBalances(uniTVL)
-  api.add(WSTETH_TOKEN_ADDRESS, Object.values(usdnData))
   return api.getBalances();
 };
 

projects/TowerDEX/factoryTvl.js

@@ -49,7 +49,7 @@ async function getAllPairs(factory, chain, {blacklistedPairs = []} = {}) {
   return dtos
 }
 
-const isNotXYK = (pair) => pair.pair_type && pair.pair_type.custom === 'concentrated'
+const isNotXYK = (pair) => pair.pair_type && pair.pair_type.concentrated
 
 function getFactoryTvl(factory, {blacklistedPairs = []} = {}) {
   return async (api) => {

projects/acryptos/index.js

@@ -20,7 +20,8 @@ function fetchallchain(chainId) {
 
 module.exports = {
   timetravel: false,
-    methodology: "Acryptos TVL is the USD value of token within the vault and farm contracts",
+  methodology: "Acryptos TVL is the USD value of token within the vault and farm contracts",
+  misrepresentedTokens: true,
   ethereum: {
     tvl: fetchallchain(1),
   },

projects/alphaping/index.js

@@ -1,14 +1,11 @@
 const { getCuratorExport } = require("../helper/curators");
 
 const configs = {
-  methodology: 'Count all assets are depoisted in all vaults curated by Alphaping.',
+  methodology: 'Count all assets are deposited in all vaults curated by Alphaping.',
   blockchains: {
     ethereum: {
-      morpho: [
-        '0xb0f05E4De970A1aaf77f8C2F823953a367504BA9',
-        '0x6619F92861C760AD11BA0D56E8ED63A33EccE22B',
-        '0xFa7ED49Eb24A6117D8a3168EEE69D26b45C40C63',
-        '0x47fe8Ab9eE47DD65c24df52324181790b9F47EfC'
+      morphoVaultOwners: [
+        '0xEB4Af6fA3AFA08B10d593EC8fF87efB03BC04645',
       ],
     },
   }

projects/alterscope/index.js

@@ -1,34 +1,11 @@
 const { getCuratorExport } = require("../helper/curators");
 
 const configs = {
-  methodology: 'Count all assets are depoisted in all vaults curated by Alterscope.',
+  methodology: 'Count all assets are deposited in all vaults curated by Alterscope.',
   blockchains: {
     ethereum: {
-      euler: [
-        '0x45c3B59d53e2e148Aaa6a857521059676D5c0489',
-        '0x6d18F74AAD8494B789aE34b5455816F79664d209',
-        '0x29D824d54Fd5118543E81637b8f865d045191F30',
-        '0xd6506dB835B465d5d823add8667362d7b86cFe5F',
-        '0xa2f045eC60C624c46F1075FC589Df0f936F822C2',
-        '0xFc323C1727853872A85098EA89a6882853B708dd',
-        '0x1987c2DCf5674Cf90bEceBAd502714c357ce126a',
-        '0x25C538cc5c5B4cDdf9a9A656f90d2d8129E841B2',
-        '0xE5b9686c0cc4Be8a47eb4ed265d4203EA8232f94',
-        '0xdFD25B2304f4F08031b4125ee49ea2Df6aB8B19b',
-        '0x9167Ff08C18Ea05d70D5CBf0c576A33DCeE6de06',
-        '0x99ba39845C4A12341C4B8cCEba1F11F4f6f84046',
-        '0xD1552d878FE4869539ba4D03D207B54913a5C273',
-        '0xfC67343ac17B158deb69de67Ba8A2eD7C47F0C74',
-        '0x5a0064007ddDEa2C8d6547A7B1E862c619500994',
-        '0x41722452C0348501825C494ec6C1579e9c32D277',
-        '0xF69FF7901E199AE4Fc354048DA09C23c7699716c',
-        '0xEd667E0DE292C040CF2183302c8DBDe1C06447d7',
-        '0xB77e25555C2b3e6BCe5329D83eFD248534A907Aa',
-        '0x28c6F8D44179ac93a5EBAe24189d887eeEF38cea',
-        '0x6fc6BeCAe0fFAA08f699ec072f31983821a4D7ce',
-        '0xaE4D563FC348e0FC3697Ed940b23a86779e095C8',
-        '0xb4f7761C459D09f414e1190df275be3E24535750',
-        '0xd005125E525664feC9394CEE5466Da15262fFe01',
+      eulerVaultOwners: [
+        '0x0d8249DD621fB1c386A7A7A949504035Dd3436A3',
       ],
     },
   }

projects/ampere/index.js

@@ -1,7 +1,4 @@
-const ADDRESSES = require('../helper/coreAssets.json')
 const { tombTvl } = require("../helper/tomb");
-const FUSE_ON_ETH = "0x970b9bb2c0444f5e81e9d0efb84c8ccdcdcaf84d";
-const FUSE_ON_FUSE = ADDRESSES.fuse.WFUSE;
 const AMP = "0x2b09179D26FdDB27a24ee25328890791c7A984c2".toLowerCase();
 const CURRENT = "0x3B1292FEf70C3F9Fb933DD2e2F4B734DcB35648d".toLowerCase();
 
@@ -12,24 +9,18 @@ const fuseLPs = [
 
 const rewardPool = "0x8Cdc3584B455b49634b9272247AD2AccEef58c98".toLowerCase();
 const masonry = "0x335C392DB4F0AD43f782B0646959E41FC1134350".toLowerCase();
-const genesisBlock = 1650700800;
-
-const transform = (addr) => {
-  if (addr.toLowerCase() === FUSE_ON_FUSE.toLowerCase()) return FUSE_ON_ETH;
-  return "fuse:" + addr;
-};
 
 module.exports = {
   methodology: "Pool2 deposits consist of AMP/FUSE and CURRENT/FUSE LP tokens deposits while the staking TVL consists of the CURRENT tokens locked within the Masonry contract, priced using Fuse on Ethereum mainnet.",
-  start: genesisBlock,
+  start: 1650700800,
   ...tombTvl(
     AMP,
     CURRENT,
     rewardPool,
     masonry,
     fuseLPs,
     "fuse",
-    transform,
+    undefined,
     false,
     fuseLPs[1]
   ),

projects/apostro/index.js

@@ -4,61 +4,29 @@ const configs = {
   methodology: 'Count all assets are depoisted in all vaults curated by Apostro.',
   blockchains: {
     ethereum: {
-      morpho: [
-        '0x214B47C50057eFaa7adc1B1C2608C3751Cd77D78',
-        '0x5085Dd6FAd07c12e38fae01bc2a4938d2C08B1Bc',
-        '0x4EDfaB296F8Eb15aC0907CF9eCb7079b1679Da57',
+      morphoVaultOwners: [
+        '0x3B8DfE237895f737271371F339eEcbd66Face43e',
+        '0xf726311F85D45a7fECfFbC94bD8508a0A39958c6',
       ],
-      euler: [
-        '0x315F93a074D0948E4D068e98a34092750ea8A38C',
-        '0xc60400289B32E840909795a063aeccFb093E0b47',
-        '0xE0c1bdab9A7d487c4fEcd402cb9b4f8B347e73c3',
-        '0xe3Fd841FE4701bBA147e478CfBc46889116B7d3d',
-        '0xc27B9587414f7d725e89b989aA63948a93f8DB71',
-        '0x3A8992754E2EF51D8F90620d2766278af5C59b90',
-        '0xcBC9B61177444A793B85442D3a953B90f6170b7D',
-        '0x81fa50cBe6C7Ed61961fE601B7c5AC334c2c84bB',
-        '0x7f1d29e70C644c387ded640B28E106e29E349074',
-        '0x9f12d29c7CC72bb3d237E2D042A6D890421f9899',
-        '0x396fD980c0463Ccb285d3ec6830978D5D97976EC',
-        '0xA2038a5B7Ce1C195F0C52b77134c5369CCfe0148',
-        '0xBc99605074737d36266f45E0d192dDe6CFDFd72a',
-        '0x82D2CE1f71cbe391c05E21132811e5172d51A6EE',
-        '0x29A9E5A004002Ff9E960bb8BB536E076F53cbDF1',
-        '0xe11a462235A39C90921C4a59D4E8B2707330BCf2',
-        '0xC605471aE09e0b7daA9e8813707d0DDbf9429Ad2',
-        '0xD7B67cF0e7EDA8268b0f42de82dF87DfCC9a8537',
-        '0xf9a23b059858CdD0e3ED0DDE89864BB82B88aa19',
+      eulerVaultOwners: [
+        '0x3B8DfE237895f737271371F339eEcbd66Face43e',
+        '0xf726311F85D45a7fECfFbC94bD8508a0A39958c6',
       ],
     },
     base: {
-      morpho: [
-        '0xcdDCDd18A16ED441F6CB10c3909e5e7ec2B9e8f3',
-        '0xC484D83F667b779cc9907248101214235642258B',
+      morphoVaultOwners: [
+        '0x3B8DfE237895f737271371F339eEcbd66Face43e',
+        '0xf726311F85D45a7fECfFbC94bD8508a0A39958c6',
+      ],
+      eulerVaultOwners: [
+        '0x3B8DfE237895f737271371F339eEcbd66Face43e',
+        '0xf726311F85D45a7fECfFbC94bD8508a0A39958c6',
       ],
-      euler: [
-        '0x596dBb33131fa2991cf5651cB57e4b15682C7F93',
-        '0xEdCc195Ca09c9FCC1DD30b152C0b82045Ff2F91f',
-        '0x29Dbce367F5157B924Af5093617bb128477D7A5C',
-        '0xC063C3b3625DF5F362F60f35B0bcd98e0fa650fb',
-        '0x5ce15fC058E762A6F9722fC6521A0c0F5eECD9BA',
-        '0x1E2F1e8A97E96a2FDD6A8Da427603Ed1c8b3847F',
-        '0x3F131Ac9D408926a8B36C1e03ce105f44DCD26Af',
-        '0x34ABB4501419b1E5f836567C58300c861164101A',
-      ]
     },
     bsc: {
-      euler: [
-        '0xc27d44A8aEA0CDa482600136c0d0876e807f6C1a',
-        '0x19C1d7E5a2b821D4e05fd9cFB8ba372C2cAA551B',
-        '0x36AEb594689205878E1B57bFc011e0956D82ed08',
-        '0xC6767dd1fFaA730f6fc90b353d5928E6e9d55C1b',
-        '0xC0C13008711cE250699E3A94dCEED5EFd4e8e02a',
-        '0x6078b5dE9d10587cb466ECbBF55C95898AFe99C2',
-        '0xeEC4561f621C3629F2b36a07B207A7E06377e0D5',
-        '0x3135551ce7945c03C18df7985E089DDBC763cEE8',
-        '0x9AE0Da6ACc874119470b52f4f5647B74D042b18B',
-        '0xa6282FfCDBC1d23dDAd65e97B9d033C4517Ec05E',
+      eulerVaultOwners: [
+        '0x3B8DfE237895f737271371F339eEcbd66Face43e',
+        '0xf726311F85D45a7fECfFbC94bD8508a0A39958c6',
       ],
     },
   }

projects/arkis/index.js

@@ -1,6 +1,7 @@
 const { getLogs } = require("../helper/cache/getLogs");
 const ADDRESSES = require('../helper/coreAssets.json');
 const { sumTokens2 } = require("../helper/unwrapLPs");
+const axios = require("axios");
 
 const native = "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE";
 
@@ -24,6 +25,8 @@ const abis = {
   totalBorrowed: "function totalBorrowed() returns (uint256)",
 }
 
+const arkis_wrapped_hype_vault = "0x454F936D5877Daf9366Ef1Fca1bDF888201Bb127";
+
 const fetchFactoryLogs = async (api, type) => {
   const fromBlock = 21069508;
   const topic = type === "agreement" ? topics.agreementCreated : topics.accountDeployed;
@@ -76,7 +79,16 @@ const borrowed = async (api) => {
   })
 }
 
+async function tvlHyperliquid(api) {
+  const response = await axios.get(`https://www.hyperscan.com/api/v2/addresses/${arkis_wrapped_hype_vault}`);
+  const hypeBalance = response.data.coin_balance || '0';
+  api.add(ADDRESSES.null, hypeBalance);
+}
+
+
 module.exports = {
-  methodology: "TVL is calculated by summing the balances of leverage assets, collaterals, and whitelisted tokens held in agreements and margin accounts deployed by factory contracts. Native tokens and LP tokens are also included.",
-  ethereum : { tvl, borrowed }
-}
+  methodology: "On Ethereum, TVL includes leverage assets, collaterals, whitelisted tokens, ETH, and LP tokens held in agreements and margin accounts created by factory contracts. " +
+             "On Hyperliquid, TVL reflects the native HYPE held at the Arkis Wrapped HYPE Vault (0x454F936D5877Daf9366Ef1Fca1bDF888201Bb127), which backs the arkisHYPE token issued on Ethereum.",
+  ethereum: { tvl, borrowed },
+  hyperliquid: { tvl: tvlHyperliquid },
+}

projects/asymmetry-usdaf/index.js

@@ -0,0 +1,11 @@
+const { getLiquityV2Tvl } = require('../helper/liquity')
+
+const config = {
+  ethereum: '0xCFf0DcAb01563e5324ef9D0AdB0677d9C167d791'
+}
+
+Object.keys(config).forEach(chain => {
+  module.exports[chain] = {
+    tvl: getLiquityV2Tvl(config[chain])
+  }
+})