Merge remote-tracking branch 'origin2/main'

# Conflicts:
#	projects/yel/index.js

Author: astroKo

README.md

@@ -20,7 +20,7 @@ Please send answers to questions there https://github.com/DefiLlama/DefiLlama-Ad
 
 ## Work in progress
 
-This is a work in progress. The goal is to eventually handle historical data. DefiLlama aims to be transparent, accurate and open source.
+This is a work in progress. DefiLlama aims to be transparent, accurate and open source.
 
 If you have any suggestions, want to contribute or want to chat, please join [our discord](https://discord.defillama.com/) and drop a message.
 
@@ -29,6 +29,8 @@ If you have any suggestions, want to contribute or want to chat, please join [ou
 node test.js projects/pangolin/index.js
 # Add a timestamp at the end to run the adapter at a historical timestamp
 node test.js projects/aave/v3.js 1729080692
+# or using YYYY-MM-DD
+node test.js projects/aave/v3.js 2024-10-16
 ```
 
 ## Changing RPC providers
@@ -39,7 +41,7 @@ BSC_RPC="..."
 POLYGON_RPC="..."
 ```
 
-The name of each rpc is `{CHAIN-NAME}_RPC`, and the name we use for each chain can be found [here](https://github.com/DefiLlama/defillama-sdk/blob/master/src/providers.json)
+The name of each rpc is `{CHAIN-NAME}_RPC`, and the name we use for each chain can be found [here](https://unpkg.com/@defillama/sdk@5.0.116/build/providers.json). If you run into issues with a chain make sure to update the sdk with `npm update @defillama/sdk`.
 
 ## Adapter rules
 - Never add extra npm packages, if you need a chain-level package for your chain, ask us and we'll consider it, but we can't accept any npm package that is project-specific

package-lock.json

@@ -0,0 +1,16 @@
+const STAKING_CONTRACT_V1 = "0xaa137EC3474ab407f3Be37b16576227dfE75Eb8D"
+const STAKING_CONTRACT_V2 = "0x83D1B4277454EDAcF54A14fc586326386648A959"
+const TOKEN_5IRE_ETH = "0x3bd7d4F524D09F4e331577247A048D56e4b67a7F"
+const { stakings } = require("../helper/staking")
+
+
+module.exports = {
+  methodology: 'Total staked tokens in 5ire Dapp Staking',
+  ethereum: {
+    tvl: () => ({}),
+    staking: stakings([STAKING_CONTRACT_V1, STAKING_CONTRACT_V2], TOKEN_5IRE_ETH),
+  },
+}
+
+
+

projects/5ire-dapp-staking/index.js

@@ -1,4 +1,3 @@
-const {fetchChainExports} = require('../helper/exports')
 const {fetchURL} = require('../helper/utils')
 
 const endpoint = "https://analytics.abracadabra.money/api/statistic/tvl"
@@ -18,10 +17,14 @@ function chainTvl(chain){
     }
 }
 
-module.exports = fetchChainExports(chainTvl, Object.keys(chainIds))
 module.exports.misrepresentedTokens = true;
 module.exports.hallmarks = [
     [1651881600, "UST depeg"],
     [1643245200, "0xSifu revealed as QuadrigaCX founder"],
     [1667826000, "FTX collapse, Alameda repays FTT loans"],
   ]
+
+
+Object.keys(chainIds).forEach(chain => {
+    module.exports[chain] = { tvl: chainTvl(chain) }
+  })

projects/abracadabra/api.js

@@ -1,4 +1,5 @@
-const ADDRESSES = require('../helper/coreAssets.json')
+const ADDRESSES = require('../helper/coreAssets.json');
+const { sumTokens2 } = require('../helper/unwrapLPs');
 
 const config = {
   "accumulate": [
@@ -70,6 +71,13 @@ const config = {
       }
     }
   ],
+  "artela": [
+    {
+      "artela": {
+        "LST": "0xcba2aeec821b0b119857a9ab39e09b034249681a"
+      },
+    }
+  ],
   "stETH": [
     {
       "ethereum": {
@@ -115,7 +123,7 @@ Object.entries(transformedConfig).forEach(([chain, configs]) => {
         totalSupply += parseInt(supply, 10);
         api.add(token ?? baseToken ?? ADDRESSES.null, supply, { skipChain: !!baseToken })
       }
-      return api.getBalances();
+      return sumTokens2({ api })
     },
   }
 })

projects/accumulated-finance/index.js

@@ -166,13 +166,6 @@ const ALPHAFI_BLUEFIN_TVL_IDS = [
     token0Type: ADDRESSES.sui.SUI, 
     token1Type: "0x2053d08c1e2bd02791056171aab0fd12bd7cd7efad2ab8f6b9c8902f14df2ff2::ausd::AUSD"
   },
-  { //alpha usdc
-    poolID: "0x4540c5e7de64088c0c2c30abc51f7e6bbe6bc48703667c108aa1de23f6aa40e6",
-    parentPoolID: "0x6595edf6d8c8b6894a5c6760843ae2fde81cb37d8586984dd1345b0f00bfecd8",
-    investorID: "0x187ca6f373d20465a730125c93e62a96c6a73354a1a8b35cbdd2b39278b7b141",
-    token0Type: "0xfe3afec26c59e874f3c1d60b8203cb3852d2bb2aa415df9548b8d688e6683f93::alpha::ALPHA",
-    token1Type: ADDRESSES.sui.USDC_CIRCLE
-  },
   { //wbtc usdc
     poolID: "0xbc0de037958d7988710c40f4e7317f8f3ffca4fa3cc9e1c18bc1ebd7ec65cd6e",
     parentPoolID: "0x38282481e3a024c50254c31ebfc4710e003fe1b219c0aa31482a860bd58c4ab0",
@@ -250,6 +243,20 @@ const ALPHAFI_BLUEFIN_TVL_IDS = [
     token0Type: ADDRESSES.sui.suiUSDT,
     token1Type: ADDRESSES.sui.USDC_CIRCLE
   },
+  { // stsui buck
+    poolID: "0xdee56209e25c0eafdd3e06ee9f4aae03d173478d158fb4c5c1fbae7c75d4cd72",
+    parentPoolID: "0x0bc35f5b7e7b77dadc62c2630e9efafb1beb4122fd5393bf3b99586abf3ca8b1",
+    investorID: "0xb5633adb8cfb5a4e6580002b21bc403d5d096dbca07495986b4882619ce05279",
+    token0Type: "0xd1b72982e40348d069bb1ff701e634c117bb5f741f44dff91e472d3b01461e55::stsui::STSUI",
+    token1Type: ADDRESSES.sui.BUCK
+  },
+  { // stsui musd
+    poolID: "0xb251e187a4e688dd3dbbf378e4aacfdd41de6a81e2a4bc10c7b80e056c1da630",
+    parentPoolID: "0x0da4bcb1669ae3b6ce80f024e3a2076e2c4e2cc899d4724fce94da0f729bc968",
+    investorID: "0xa8a705f8819e01396927c1ec179a140750597ed3b5268d205bbf5240979fda86",
+    token0Type: "0xd1b72982e40348d069bb1ff701e634c117bb5f741f44dff91e472d3b01461e55::stsui::STSUI",
+    token1Type: "0xe44df51c0b21a27ab915fa1fe2ca610cd3eaa6d9666fe5e62b988bf7f0bd8722::musd::MUSD"
+  },
 
 ]
 const ALPHAFI_BLUEFIN_AUTOBALANCE_TVL_IDS = [
@@ -274,6 +281,27 @@ const ALPHAFI_BLUEFIN_AUTOBALANCE_TVL_IDS = [
     token0Type: ADDRESSES.sui.suiUSDT,
     token1Type: ADDRESSES.sui.USDC_CIRCLE
   },
+  { //deep sui
+    poolID: "0x76fb78985fae4cf24bcd933ea5e8a6e818e9d4b51c091c4c4a78b6720199e81e",
+    parentPoolID: "0x1b06371d74082856a1be71760cf49f6a377d050eb57afd017f203e89b09c89a2",
+    investorID: "0x217a85380d0cf4b4c5a870b8f6d11b8e3bc66de87e86d0376080ca7e60e6506c",
+    token0Type: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP",
+    token1Type: ADDRESSES.sui.SUI
+  },
+  { //blue sui
+    poolID: "0xb8cf0bf8b39f465c1b845e5ee8c2c53424c3faf97fb8e0ef1139abb9001e844a",
+    parentPoolID: "0xde705d4f3ded922b729d9b923be08e1391dd4caeff8496326123934d0fb1c312",
+    investorID: "0xf7785cf8b3d3f9bee48bf4d90a142d7ec98b25d6784408ffedc11633d7124197",
+    token0Type: "0xe1b45a0e641b9955a20aa0ad1c1f4ad86aad8afb07296d4085e349a50e90bdca::blue::BLUE",
+    token1Type: ADDRESSES.sui.SUI
+  },
+  { //deep blue
+    poolID: "0x37671a77fb00a3323304f2586d18694bb93a6bc840e8184634ebe66d69eb48db",
+    parentPoolID: "0x4b8271fc4819078e44ee9a0506a824b77464789d57ace355d0562a4776c51840",
+    investorID: "0x90364be9cca6c1df042f269fb944fd49ba1c74688789fe33329aa6d40ac8552a",
+    token0Type: "0xdeeb7a4662eec9f2f3def03fb937a663dddaa2e215b8078a284d026b7946c270::deep::DEEP",
+    token1Type: "0xe1b45a0e641b9955a20aa0ad1c1f4ad86aad8afb07296d4085e349a50e90bdca::blue::BLUE"
+  },
 ]
 const ALPHAFI_NAVI_TVL_IDS = [
   {
@@ -331,6 +359,11 @@ const ALPHAFI_NAVI_TVL_IDS = [
     tokenType: "0xa99b8952d4f7d947ea77fe0ecdcc9e5fc0bcab2841d6e2a5aa00c3044e5544b5::navx::NAVX",
     expo: 9
   },
+  {
+    poolID: "0xd1125035ab6e2889239442031c130c641b75b430b71057bb79710ad578cc2867",
+    tokenType: "0xd1b72982e40348d069bb1ff701e634c117bb5f741f44dff91e472d3b01461e55::stsui::STSUI",
+    expo: 9
+  },
 ]
 const ALPHAFI_NAVI_LOOP_TVL_IDS = [
   { //sui vsui
@@ -386,6 +419,13 @@ const ALPHAFI_POOL2_IDS = [{
   token0Type: "0xfe3afec26c59e874f3c1d60b8203cb3852d2bb2aa415df9548b8d688e6683f93::alpha::ALPHA",
   token1Type: ADDRESSES.sui.USDC_CIRCLE
 },
+{ //alpha usdc
+  poolID: "0x4540c5e7de64088c0c2c30abc51f7e6bbe6bc48703667c108aa1de23f6aa40e6",
+  parentPoolID: "0x6595edf6d8c8b6894a5c6760843ae2fde81cb37d8586984dd1345b0f00bfecd8",
+  investorID: "0x187ca6f373d20465a730125c93e62a96c6a73354a1a8b35cbdd2b39278b7b141",
+  token0Type: "0xfe3afec26c59e874f3c1d60b8203cb3852d2bb2aa415df9548b8d688e6683f93::alpha::ALPHA",
+  token1Type: ADDRESSES.sui.USDC_CIRCLE
+},
 ]
 
 const ALPHA_POOL_ID = "0x6ee8f60226edf48772f81e5986994745dae249c2605a5b12de6602ef1b05b0c1"

projects/alphafi/index.js

@@ -5,10 +5,26 @@ const phoenixVaultAddress = '0xa6b88069EDC7a0C2F062226743C8985FF72bB2Eb';
 const phoenixStakingAddress = '0x3c9586567a429BA0467Bc63FD38ea71bB6B912E0';
 const phoenixAmpAddress = '0xca7F14F14d975bEFfEe190Cd3cD232a3a988Ab9C';
 
+const sonicVaultAddress = '0x11944027D4eDC1C17db2D5E9020530dcEcEfb85b';
+const sonicStakingAddress = '0xb382901Ff357afb612e3E239656fc5F2FDe250dc';
+const sonicAmpAddress = '0xAc611438AE5F3953DeDB47c2ea8d6650D601C1B4';
+
+const bscVaultAddress = '0xdcFaaf6f3bb71B270404992853588BE9B7fc89EA';
+const bscStakingAddress = '0x9fe50b66fc34cA06BbC684fF13242d61c860F190';
+const bscAmpAddress = '0x16DF3d8978d17fE725Dc307aD14FdE3B12E6Da75';
+
 module.exports = {
   start: '2024-06-06',
   lightlink_phoenix: {
-    staking: staking(phoenixStakingAddress, phoenixAmpAddress),
-    tvl: gmxExports({ vault: phoenixVaultAddress, })
+	staking: staking(phoenixStakingAddress, phoenixAmpAddress),
+	tvl: gmxExports({ vault: phoenixVaultAddress, })
+  },
+  bsc: {
+	staking: staking(bscStakingAddress, bscAmpAddress),
+	tvl: gmxExports({ vault: bscVaultAddress, })
   },
-};
+  sonic: {
+	staking: staking(sonicStakingAddress, sonicAmpAddress),
+	tvl: gmxExports({ vault: sonicVaultAddress, })
+  }
+};

projects/amped/index.js

@@ -53,11 +53,10 @@ async function unwrapArcadiaAeroLP({ api, ownerIds }) {
 
 async function uwrapStakedSlipstreamLP({ api, sSlipNftIds, }) {
   const { slipNFT } = config;
-  const balances = api.getBalances();
 
   // Arcadia's staked slipstream NFT wrapper issues a position with the same ID as the wrapped NFT
   // -> fetch the values of the wrapped IDs by simply fetching the values of those IDs on the native slipstream NFT
-  await unwrapSlipstreamNFT({ balances: balances, positionIds: sSlipNftIds, nftAddress: slipNFT, chain: 'base', blacklistedTokens: [], whitelistedTokens: [], uniV3ExtraConfig: {} });
+  await unwrapSlipstreamNFT({ api, positionIds: sSlipNftIds, nftAddress: slipNFT, });
 }
 
 async function tvl (api) {
@@ -67,6 +66,8 @@ async function tvl (api) {
   const accs = []
 
   const uTokens = await api.multiCall({ abi: "address:asset", calls: pools });
+  await api.sumTokens({ blacklistedTokens: [uniNFT, slipNFT, wAeroNFT, sAeroNFT, sSlipNFT, alienBaseNFT], tokensAndOwners2: [uTokens, pools] });
+  
   const accounts = await api.fetchList({ lengthAbi: 'allAccountsLength', itemAbi: 'allAccounts', target: factory, })
   const assetDatas = await api.multiCall({ abi: abi.generateAssetData, calls: accounts, permitFailure: true })
 
@@ -83,7 +84,7 @@ async function tvl (api) {
     await sumTokens2({ api, owners: accs, uniV3ExtraConfig: { nftAddress: alienBaseNFT } })
 
   // add all simple ERC20s
-  await api.sumTokens({ ownerTokens, blacklistedTokens: [uniNFT, slipNFT, wAeroNFT, sAeroNFT, sSlipNFT, alienBaseNFT], tokensAndOwners2: [uTokens, pools] });
+  await api.sumTokens({ ownerTokens, blacklistedTokens: [uniNFT, slipNFT, wAeroNFT, sAeroNFT, sSlipNFT, alienBaseNFT],});
 
   // add all Arcadia-wrapped LP positions
   await unwrapArcadiaAeroLP({ api, ownerIds });
@@ -95,6 +96,7 @@ async function tvl (api) {
 module.exports = {
   methodology: "TVL is calculated as the sum of all Account values and the available balance in the liquidity pools. Assets are not double counted.",
   base: { tvl },
+  isHeavyProtocol: true,
   start: '2024-03-25', // Mon Mar 25 2024 18:00:00 GMT+0000
   hallmarks: [
     [Math.floor(new Date("2024-04-03") / 1e3), "Points program announced."],

projects/arcadia-finance-v2/index.js

@@ -0,0 +1,4 @@
+const { uniTvlExports } = require('../helper/unknownTokens')
+module.exports = uniTvlExports({
+  'artela': '0xb1F3A78eaE0A85a0940AC87FCF98db8d05225FB9'
+})

projects/artexswap_xyz/index.js

@@ -0,0 +1,38 @@
+
+const atETH = '0x284D81e48fBc782Aa9186a03a226690aEA5cBe0E';
+const scETH = '0x3bce5cb273f0f148010bbea2470e7b5df84c7812';
+const WETH = '0x50c42deacd8fc9773493ed674b675be577f2634b';
+
+async function tvl(api) {
+    // swapx atETH-scETH AMO
+    const AMO_adapter_swapx_atETHscETH = '0x8c4c8ec44b10bcc62afaa3caa73c6b99469c48db';
+    const swapx_atETHscETH_gauge = '0xBBb10f33DCDd50BD4317459A4B051FC319B29585';
+    const swapx_atETHscETH_LP = "0x20737388dbc9F7E56f4Cc69D41DA62C96B355DB0"
+
+    const vault_AMO_owned = await api.call({
+        abi: 'erc20:balanceOf',
+        target: swapx_atETHscETH_gauge,
+        params: [AMO_adapter_swapx_atETHscETH],
+    });
+    const vault_total_supply = await api.call({
+        abi: 'erc20:totalSupply',
+        target: swapx_atETHscETH_LP,
+    });
+    const [vault_atETH_amount, vault_scETH_amount] = await api.call({
+        abi: 'function getTotalAmounts() view returns (uint256,uint256)',
+        target: swapx_atETHscETH_LP,
+    });
+
+    const AMO_atETH_amount = vault_atETH_amount * vault_AMO_owned / vault_total_supply
+    const AMO_scETH_amount = vault_scETH_amount * vault_AMO_owned / vault_total_supply
+    console.log(AMO_atETH_amount, AMO_scETH_amount)
+    api.addTokens([atETH, scETH], [AMO_atETH_amount, AMO_scETH_amount])
+
+}
+
+module.exports = {
+    methodology: 'AMO owned liquidity',
+    sonic: {
+        tvl,
+    }
+};