Merge branch 'DefiLlama:main' into main

Author: 0xShad0w

package-lock.json

@@ -1,27 +1,12 @@
-const ADDRESSES = require('../helper/coreAssets.json')
-const { sumTokens2 } = require('../helper/solana')
+const { sumTokensExport } = require('../helper/solana')
 
-async function tvl() {
-  const tokens = [
-    ADDRESSES.solana.USDC,
-    ADDRESSES.solana.SOL,
-    ADDRESSES.solana.USDT,
-    "7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs",
-    "9n4nbM75f5Ui33ZbPYXn59EwSgE8CGsHtAeTH5YFeJ9E",
-    "mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So",
-    "9vMJfxuKxXBoEa7rM12mYLMwTacLMLDJqHozw96WQL8i",
-  ]
-  const owner = 'HjHSNe8hhvZ8hKCRrhKg1DGiGPd9NYQbUjT1SQRDo4kZ'
-
-  return sumTokens2({ owner, tokens })
-}
 module.exports = {
   hallmarks:[
     [1667865600, "FTX collapse"]
   ],
   timetravel: false,
   solana: {
-    tvl,
+    tvl: sumTokensExport({ owner: 'HjHSNe8hhvZ8hKCRrhKg1DGiGPd9NYQbUjT1SQRDo4kZ' }),
   },
   methodology: `To obtain the tvl we're getting the vault accounts information where user deposited collateral is stored.`,
 }

projects/01/index.js

@@ -0,0 +1,13 @@
+const { getUniTVL } = require('../helper/unknownTokens')
+
+const FACTORY = "0x2b6852CeDEF193ece9814Ee99BE4A4Df7F463557" // This factory is on AirDAO Mainnet (Chain Id: 16718)
+
+const dexTVL = getUniTVL({ factory: FACTORY, useDefaultCoreAssets: true, fetchBalances: true, })
+
+module.exports = {
+  misrepresentedTokens: true,
+  methodology: `Uses factory(${FACTORY}) address to find and price Liquidity Pool pairs.`,
+  airdao: {
+    tvl: dexTVL
+  }
+};

projects/Astra/index.js

@@ -2,14 +2,14 @@ const sdk = require('@defillama/sdk');
 //Polygon FeedPrice contract address
 const DFeedPriceAddress = "0x7d4d68f18d1be3410ab8d827fb7ebc690f938d2d"
 const tokenListAbi = "function getAllTokenRecords() view returns (tuple(uint256 chainId, address tokenAddress, uint64 tokenType)[])"
-
+ 
 async function getTokenList(tokenAPI, chainId) {
   return (await tokenAPI.call({
     target: DFeedPriceAddress,
     abi: tokenListAbi
   })).filter(item => item[0] == chainId && item[2] == '1').map(item => item[1]);
 }
-
+ 
 module.exports = {
   ethereum: {
     tvl: async (api) => {
@@ -19,5 +19,14 @@ module.exports = {
       api.addTokens(tokens, tokenSupplies)
       return api.getBalances()
     }
+  },
+  arbitrum: {
+    tvl: async (api) => {
+      const tokenAPI = new sdk.ChainApi({ chain: 'polygon', timestamp: api.timestamp, });
+      const tokens = await getTokenList(tokenAPI, api.chainId)
+      const tokenSupplies = await api.multiCall({  abi: 'uint256:totalSupply', calls: tokens})
+      api.addTokens(tokens, tokenSupplies)
+      return api.getBalances()
+    }
   }
 };

projects/DigiFT/index.js

@@ -1,34 +1,10 @@
-const { getOwnerAllAccount, getTokenAccountBalance,getSolBalance } = require('../helper/solana')
-const ADDRESSES = require('../helper/coreAssets.json')
-
-const sdk = require('@defillama/sdk')
-const { PublicKey } = require("@solana/web3.js")
+const { sumTokens2 } = require('../helper/solana')
 
 const DROP = 'DropTpWcDmP7kVRUEoKSJaMVi62hGo9jp19Hz19JVsjh';
-const PYTH = 'HZ1JovNiVvGrGNiiYvEozEVgZ58xaU3RKwX8eACQBCt3';
 const PARIMUTUEL_WALLET = 'DCa1Xir4zDEtz78beFcXCHUNXdeBnrxBiRuuapHrBE3F';
-const PARIMUTUEL_ACCOUNT = 'mD62sAqPAiVbHGPTTeEianTYa1AytkKqqcxMvQxF3S3';
-
-const predictionTokens = [
-    DROP,
-    PYTH
-]
-async function tvl(api) {
 
-    // get the total tokens deposited in the games
-    const tokensInAccount = await getOwnerAllAccount(PARIMUTUEL_WALLET);
-    tokensInAccount.forEach((pToken) => {
-        const total = pToken.uiAmount;
-        const tokenMint = pToken.mint;
-        // check to make sure it's one of the tokens used for predicting
-        if (predictionTokens.includes(tokenMint))
-        {
-            //sdk.log('#found',tokenMint)
-            api.add(tokenMint,total);
-	}
-    });
-    const sols = await getSolBalance(PARIMUTUEL_WALLET);
-    api.add(ADDRESSES.solana.SOL,sols);
+async function tvl() {
+    return sumTokens2({ owner: PARIMUTUEL_WALLET, solOwners: [PARIMUTUEL_WALLET], blacklistedTokens: [DROP]})
 }
 
 module.exports = {

projects/DropCopy/index.js

@@ -11,7 +11,6 @@ async function stakingAvax(timestamp, ethBlock, chainBlocks) {
 }
 
 module.exports = {
-  broken: 'Api is no longer reachable',
   methodology: "TVL comes from NFT Farming, Jungle Pools, MasterChef and Vaults",
   avax:{
     staking: stakingAvax,

projects/GajFinance/index.js

@@ -0,0 +1,8 @@
+const { sumTokensExport, nullAddress } = require("../helper/unwrapLPs");
+
+const RR_ETHEREUM = '0x5ec1e43163b303b13fea20a892cba7e5568d8a8f';
+
+module.exports = {
+    methodology: `Total ETH held in the Random Reward contract, available for distribution.`,
+    ethereum: { tvl: sumTokensExport({ owner: RR_ETHEREUM, tokens: [nullAddress]}), },
+  };

projects/RandomReward/index.js

@@ -5,6 +5,7 @@ module.exports = {
     [1655251200, "Rug Pull"]
   ],
   timetravel: false, 
+  deadFrom: 1655251200,
   solana: {
     tvl: () => 0,
   },

projects/Solily/index.js

@@ -5,7 +5,7 @@ async function tvl(api) {
   return api.sumTokens({ owner: VAULT_CONTRACT_ADDRESS, tokens: [
     ADDRESSES.arbitrum.WETH,
     ADDRESSES.arbitrum.USDC,
-    '0x17FC002b466eEc40DaE837Fc4bE5c67993ddBd6F', //FRAX
+    ADDRESSES.arbitrum.FRAX, //FRAX
     ADDRESSES.arbitrum.USDC_CIRCLE,
     ADDRESSES.arbitrum.WSTETH,
     ADDRESSES.arbitrum.DAI,

projects/aark/index.js

@@ -1,5 +1,6 @@
-const { aaveChainTvl } = require('../helper/aave');
+const { aaveChainTvl, aaveExports } = require('../helper/aave');
 const methodologies = require('../helper/methodologies');
+const { mergeExports } = require('../helper/utils');
 
 const v3params = ["0x770ef9f4fe897e59daCc474EF11238303F9552b6", undefined, ["0x69FA688f1Dc47d4B5d8029D5a35FB7a548310654"]]
 
@@ -24,13 +25,16 @@ function v3(chain) {
   }
 }
 
-module.exports = {
+module.exports = mergeExports({
   methodology: methodologies.lendingMarket,
   avax: v3("avax"),
   ...["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"]
   ],
-};
+}, {
+  // Lido pool
+  ethereum: aaveExports(undefined,  "0x770ef9f4fe897e59daCc474EF11238303F9552b6", undefined, ["0xa3206d66cF94AA1e93B21a9D8d409d6375309F4A"], { v3: true, }),
+});
 // node test.js projects/aave/index.js