Merge branch 'DefiLlama:main' into main

Author: DackieSwap

package-lock.json

@@ -14,6 +14,7 @@
     "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",
+    "biggest-files": "find ./projects -name '*.js' -not -path './projects/helper/*' -not -path './projects/curve/*' -not -path './projects/sigmao/*' -exec du -sh {} \\; | sort -rh | head -n 100",
     "postinstall": "echo 'run \"npm update @defillama/sdk\" if you want lastest sdk changes' "
   },
   "author": "",

package.json

@@ -22,7 +22,7 @@ const xTAROT = "0x74D1D2A851e339B8cB953716445Be7E8aBdf92F4"
 
 const fBEET = "0xfcef8a994209d6916EB2C86cDD2AFD60Aa6F54b1"
 
-async function tvl(time, ethBlock, chainBlocks) {
+async function tvl(_, __, chainBlocks) {
     // 0xDAO Master Chef
     const balances = {}
     const chain = 'fantom'

projects/0xDAO/index.js

@@ -1,104 +1,57 @@
-const ADDRESSES = require('../helper/coreAssets.json')
-const { GraphQLClient, gql } = require('graphql-request')
-const { getBlock } = require('../helper/http')
 const { staking } = require('../helper/staking')
-const sdk = require('@defillama/sdk')
 
 const CONFIG = {
   ethereum: {
-    uri: 'https://api.thegraph.com/subgraphs/name/0xnodes/system11',
-    strategy_token: ADDRESSES.ethereum.WETH, //wETH
     bios_token: '0xAACa86B876ca011844b5798ECA7a67591A9743C8',
     kernel_addr: '0xcfcff4eb4799cda732e5b27c3a36a9ce82dbabe0'
   },
   bsc: {
-    uri: 'https://api.thegraph.com/subgraphs/name/0xnodes/system11-bsc',
-    strategy_token: '0x418D75f65a02b3D53B2418FB8E1fe493759c7605', //wBNB
     bios_token: '0xcf87d3d50a98a7832f5cfdf99ae1b88c7cfba4a7',
     kernel_addr: '0x37c12de5367fa61ad05e2bf2d032d7ce5dd31793'
   },
   polygon: {
-    uri: 'https://api.thegraph.com/subgraphs/name/0xnodes/system11-polygon',
-    strategy_token: ADDRESSES.ethereum.MATIC, //wMATIC
     bios_token: '0xe20d2df5041f8ed06976846470f727295cdd4d23',
     kernel_addr: '0x267720b5d8dcbdb847fc333ccc68cb284648b816'
   },
   fantom: {
-    uri: 'https://api.thegraph.com/subgraphs/name/0xnodes/system11-fantom',
-    strategy_token: ADDRESSES.ethereum.FTM, //wFTM
     bios_token: '0x75e0eb8e6d92ab832bb11e46c041d06a89ac5f0d',
     kernel_addr: '0x9db0e84ea53c5a3c000a721bb4295a6053b3de78'
   },
   avax: {
-    uri: 'https://api.thegraph.com/subgraphs/name/0xnodes/system11-avalanche',
-    strategy_token: '0x85f138bfEE4ef8e540890CFb48F620571d67Eda3', //wAVAX
     bios_token: '0xd7783a275e53fc6746dedfbad4a06059937502a4',
     kernel_addr: '0x479ea3715682e6255234e788875bdbded6faae41'
   },
   metis: {
-    uri: 'https://andromeda-graph.metis.io/subgraphs/name/0xnodes/System11-metis',
-    strategy_token: '0x9E32b13ce7f2E80A01932B42553652E053D6ed8e', //METIS
     bios_token: '0x3405a1bd46b85c5c029483fbecf2f3e611026e45',
     kernel_addr: '0xa1DA47F6563e7B17075FcA61DeDC4622aE2F3912'
   },
 }
-function offset(chain) {
-  switch (chain) {
-    case 'ethereum':
-      return 110
-    case 'bsc':
-      return 600
-    case 'polygon':
-      return 750
-    case 'fantom':
-      return 1500
-    case 'metis':
-      return 500
-    case 'avax':
-      return 750
-  }
-}
-function chainTvl(chain) {
-    return async (timestamp, ethBlock, chainBlocks) => {
-      if (timestamp > 1659527340) return {}
-        const { [chain]:{ uri }} = CONFIG
-        const { [chain]:{ strategy_token }} = CONFIG
-        var graphQLClient = new GraphQLClient(uri)
-        const block = (await getBlock(timestamp, chain, chainBlocks)) - offset(chain)
-        var query = gql`{strategyTokenBalances(block: {number: `+block+`}){amount}}`
-        const results =  await graphQLClient.request(query)
-        let amount = 0
-        for (let i = 0; i < results.strategyTokenBalances.length; i++) {  //loop through the array
-          amount += Number(results.strategyTokenBalances[i].amount); //Do the math!
-        }
-        const balances = {}
-        sdk.util.sumSingleBalance(balances, strategy_token, amount)
-        return balances
-    }
-}
+
 function stakingTvl(chain) {
       const { [chain]:{ bios_token }} = CONFIG
       const { [chain]:{ kernel_addr }} = CONFIG
-      return staking(kernel_addr, bios_token, chain)
+      return staking(kernel_addr, bios_token)
 }
-function chainExports(chainTvl, stakingTvl, chains){
+
+function chainExports(chains){
   const chainTvls = chains.reduce((obj, chain) => ({
     ...obj,
     [chain]: {
-      tvl:chainTvl(chain),
+      tvl: () => ({}),
       staking: stakingTvl(chain)
     }
   }), {})
   return chainTvls
 }
-const tvlExports = chainExports(chainTvl, stakingTvl , ['ethereum', 'bsc', 'polygon', 'fantom', 'metis', 'avax'])
+const tvlExports = chainExports(['ethereum', 'bsc', 'polygon', 'fantom', 'metis', 'avax'])
 module.exports = {
   hallmarks: [
         [1659527340, "Protocol declared insolvent"],
     ],
   methodology: ` Counts the number of wrapped native tokens in all yield strategies across all the chains the protocol is deployed on
   + staking counts the number of BIOS tokens staked in the kernels across all the chains (PFA: Protocol Fee Accruals by staking assets)`,
   start: 1633046400, // Friday 1. October 2021 00:00:00 GMT
-  ...tvlExports
+  ...tvlExports,
+  deadFrom: 1659527340,
 }
 

projects/0x_nodes/index.js

@@ -9,7 +9,7 @@ const Contracts = {
   }
 }
 
-const moonbeamTvl = async (timestamp, ethBlock, chainBlocks, { api }) => {
+const moonbeamTvl = async (api) => {
   const pools = Object.values(Contracts.moonbeam.pools)
   const tokens = await api.multiCall({  abi: Abis.getTokens, calls: pools })
   const bals = await api.multiCall({  abi: Abis.getTokenBalances, calls: pools })

projects/1beam/index.js

@@ -8,7 +8,7 @@ module.exports = {}
 Object.keys(config).forEach(chain => {
   const { blacklistedTokens = [], factories } = config[chain]
   module.exports[chain] = {
-    tvl: async (_, _b, _2, { api }) => {
+    tvl: async (api) => {
       const ownerTokens = []
       for (const { MooniswapFactory, fromBlock} of factories) {
         const logs = await getLogs({

projects/1inch.js

@@ -16,7 +16,7 @@ const Contracts = {
 };
 
 
-const tvl = async (timestamp, ethBlock, chainBlocks, { api }) => {
+const tvl = async (api) => {
   const ownerTokens = []
   const poolTvl = async (pool) => {
     ownerTokens.push([await api.call({ target: pool, abi: abiMoonriver.getTokens, }), pool])

projects/1swap/index.js

@@ -2,12 +2,13 @@ const { getLogs } = require('../helper/cache/getLogs')
 
 const config = {
   polygon: { factory: '0x4760847023fa0833221ae76E01Db1E483A5D20e0', fromBlock: 49852705 },
+  linea: { factory: '0x65c6FD9B3a2A892096881e28f07c732ed128893E', fromBlock: 3045954 },
 }
 
 Object.keys(config).forEach(chain => {
   const { factory, fromBlock, } = config[chain]
   module.exports[chain] = {
-    tvl: async (_, _b, _cb, { api, }) => {
+    tvl: async (api) => {
       const logs = await getLogs({
         api,
         target: factory,
@@ -16,7 +17,7 @@ Object.keys(config).forEach(chain => {
         fromBlock,
       })
       const vaults = logs.map(log => log.vault)
-      const tokens = await api.multiCall({  abi: 'address[]:collaterals', calls: vaults})
+      const tokens = await api.multiCall({ abi: 'address[]:collaterals', calls: vaults })
       const ownerTokens = tokens.map((token, i) => [token, vaults[i]])
       return api.sumTokens({ ownerTokens })
     }

projects/3a-dao/index.js

@@ -0,0 +1,15 @@
+const { sumTokensExport } = require("../helper/unwrapLPs");
+
+const tokens = require("../helper/coreAssets.json");
+
+const TOKENS = [
+  tokens.null,
+];
+
+const ethereumContract = [
+    "0x66be1bc6C6aF47900BBD4F3711801bE6C2c6CB32",
+  ];
+
+module.exports = {
+  ethereum: { tvl: sumTokensExport({ owners: ethereumContract, tokens: TOKENS }) }
+};

projects/3fmutual/index.js

@@ -2,8 +2,7 @@ const { uniTvlExport } = require("../helper/calculateUniTvl.js");
 
 module.exports = {
   misrepresentedTokens: true,
-  timetravel: true,
-  start: 1667689200,
+    start: 1667689200,
   arbitrum: {
     tvl: uniTvlExport("0xD158bd9E8b6efd3ca76830B66715Aa2b7Bad2218", "arbitrum", undefined, undefined, { hasStablePools: true, useDefaultCoreAssets: true, }),
   },