Fix: Arcadia-v2 (#13138)

DefiLlama · Jan 17, 2025 · 9eab7a0 · 9eab7a0
1 parent 9610fd2
commit 9eab7a0
Showing 1 changed file with 46 additions and 47 deletions.
diff --git a/projects/arcadia-finance-v2/index.js b/projects/arcadia-finance-v2/index.js
@@ -1,24 +1,22 @@
-const { sumTokens2, unwrapSlipstreamNFT, } = require("../helper/unwrapLPs");
+const { sumTokens2, unwrapSlipstreamNFT } = require("../helper/unwrapLPs");
 
 const config = {
-  base: {
-    factory: "0xDa14Fdd72345c4d2511357214c5B89A919768e59",
-    pools: {
-      wethPool: "0x803ea69c7e87D1d6C86adeB40CB636cC0E6B98E2",
-      usdcPool: "0x3ec4a293Fb906DD2Cd440c20dECB250DeF141dF1",
-      cbbtcPool: "0xa37E9b4369dc20940009030BfbC2088F09645e3B"
-    },
-    uniNFT: "0x03a520b32c04bf3beef7beb72e919cf822ed34f1",
-    alienBaseNFT: "0xb7996d1ecd07fb227e8dca8cd5214bdfb04534e5",
-    slipNFT: "0x827922686190790b37229fd06084350e74485b72",
-    wAeroNFT: "0x17B5826382e3a5257b829cF0546A08Bd77409270".toLowerCase(),
-    sAeroNFT: "0x9f42361B7602Df1A8Ae28Bf63E6cb1883CD44C27".toLowerCase(),
-    sSlipNFT: "0x1Dc7A0f5336F52724B650E39174cfcbbEdD67bF1".toLowerCase(),
-  },
+  factory: "0xDa14Fdd72345c4d2511357214c5B89A919768e59",
+  uniNFT: "0x03a520b32c04bf3beef7beb72e919cf822ed34f1",
+  alienBaseNFT: "0xb7996d1ecd07fb227e8dca8cd5214bdfb04534e5",
+  slipNFT: "0x827922686190790b37229fd06084350e74485b72",
+  wAeroNFT: "0x17B5826382e3a5257b829cF0546A08Bd77409270".toLowerCase(),
+  sAeroNFT: "0x9f42361B7602Df1A8Ae28Bf63E6cb1883CD44C27".toLowerCase(),
+  sSlipNFT: "0x1Dc7A0f5336F52724B650E39174cfcbbEdD67bF1".toLowerCase(),
+  pools: [
+    "0x803ea69c7e87D1d6C86adeB40CB636cC0E6B98E2", // wethPool
+    "0x3ec4a293Fb906DD2Cd440c20dECB250DeF141dF1", // usdcPool
+    "0xa37E9b4369dc20940009030BfbC2088F09645e3B"  // cbbtcPool
+  ]
 };
 
-async function unwrapArcadiaAeroLP({ api, ownerIds, }) {
-  const { wAeroNFT, sAeroNFT, sSlipNFT } = config[api.chain]
+async function unwrapArcadiaAeroLP({ api, ownerIds }) {
+  const { wAeroNFT, sAeroNFT, sSlipNFT } = config
   const wAERONFTIds = []
   const sAERONFTIds = []
   const sSlipNftIds = []
@@ -45,53 +43,57 @@ async function unwrapArcadiaAeroLP({ api, ownerIds, }) {
     }
   }
 
-  const wrappedData = await api.multiCall({ abi: abi.wrappedAeroPositionState, calls: wAERONFTIds, target: wAeroNFT, });
-  const stakedData = await api.multiCall({ abi: abi.stakedAeroPositionState, calls: sAERONFTIds, target: sAeroNFT, });
+  const wrappedData = await api.multiCall({ abi: abi.positionState, calls: wAERONFTIds, target: wAeroNFT });
+  const stakedData = await api.multiCall({ abi: abi.stakedAeroPositionState, calls: sAERONFTIds, target: sAeroNFT });
   wrappedData.forEach((data) => api.add(data.pool, data.amountWrapped));
   stakedData.forEach((data) => api.add(data.pool, data.amountStaked));
 
-  await uwrapStakedSlipstreamLP({ api, sSlipNftIds, });
+  await uwrapStakedSlipstreamLP({ api, sSlipNftIds });
 }
 
 async function uwrapStakedSlipstreamLP({ api, sSlipNftIds, }) {
-  const { slipNFT } = config[api.chain];
+  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: {} });
 }
 
-async function tvl(api) {
-  let { factory, pools, uniNFT, slipNFT, wAeroNFT, sAeroNFT, sSlipNFT, alienBaseNFT } = config[api.chain];
-  pools = Object.values(pools);
+async function tvl (api) {
+  const { factory, pools, uniNFT, slipNFT, wAeroNFT, sAeroNFT, sSlipNFT, alienBaseNFT } = config;
+  const ownerTokens = []
+  const ownerIds = []
+  const accs = []
+
   const uTokens = await api.multiCall({ abi: "address:asset", calls: pools });
-  await api.sumTokens({ tokensAndOwners2: [uTokens, pools] });
-  const accounts = await api.fetchList({ lengthAbi: 'allAccountsLength', itemAbi: 'allAccounts', target: factory, });
+  const accounts = await api.fetchList({ lengthAbi: 'allAccountsLength', itemAbi: 'allAccounts', target: factory, })
+  const assetDatas = await api.multiCall({ abi: abi.generateAssetData, calls: accounts, permitFailure: true })
+
+  accounts.forEach((account, i) => {
+    const assetData = assetDatas[i];
+    if (!assetData || !assetData.assets || !assetData.assets.length ) return;
+    ownerTokens.push([assetData.assets, account])
+    if (!assetData[0].length || !assetData[1].length) return;
+    ownerIds.push([assetData[0], assetData[1], account])
+    accs.push(account)
+  })
+
   if (alienBaseNFT)
-    await sumTokens2({ api, owners: accounts, uniV3ExtraConfig: { nftAddress: alienBaseNFT } })
-
-  const assetData = await api.multiCall({ abi: abi.assetData, calls: accounts, });
-  const ownerTokens = accounts.map((account, i) => [assetData[i].assets, account])
-  const ownerIds = accounts.map((account, i) => [
-    assetData[i][0],
-    assetData[i][1],
-    account,
-  ]);
+    await sumTokens2({ api, owners: accs, uniV3ExtraConfig: { nftAddress: alienBaseNFT } })
+
   // add all simple ERC20s
-  await api.sumTokens({ ownerTokens, blacklistedTokens: [uniNFT, slipNFT, wAeroNFT, sAeroNFT, sSlipNFT, alienBaseNFT,], });
+  await api.sumTokens({ ownerTokens, blacklistedTokens: [uniNFT, slipNFT, wAeroNFT, sAeroNFT, sSlipNFT, alienBaseNFT], tokensAndOwners2: [uTokens, pools] });
 
   // add all Arcadia-wrapped LP positions
   await unwrapArcadiaAeroLP({ api, ownerIds });
 
   // add all native LP positions
-  return sumTokens2({ api, owners: accounts, resolveUniV3: true, resolveSlipstream: true })
-
+  return sumTokens2({ api, owners: accs, resolveUniV3: true, resolveSlipstream: true })
 }
 
 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.",
+  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 },
   start: '2024-03-25', // Mon Mar 25 2024 18:00:00 GMT+0000
   hallmarks: [
@@ -100,10 +102,7 @@ module.exports = {
 };
 
 const abi = {
-  assetData:
-    "function generateAssetData() view returns (address[] assets, uint256[], uint256[])",
-  wrappedAeroPositionState:
-    "function positionState(uint256 tokenId) view returns ((uint128 fee0PerLiquidity, uint128 fee1PerLiquidity, uint128 fee0, uint128 fee1, uint128 amountWrapped, address pool))",
-  stakedAeroPositionState:
-    "function positionState(uint256 tokenId) view returns ((address pool, uint128 amountStaked, uint128 lastRewardPerTokenPosition, uint128 lastRewardPosition))",
-};
+  generateAssetData: 'function generateAssetData() view returns (address[] assets, uint256[], uint256[])',
+  positionState: 'function positionState(uint256 tokenId) view returns ((uint128 fee0PerLiquidity, uint128 fee1PerLiquidity, uint128 fee0, uint128 fee1, uint128 amountWrapped, address pool))',
+  stakedAeroPositionState: 'function positionState(uint256 tokenId) view returns ((address pool, uint128 amountStaked, uint128 lastRewardPerTokenPosition, uint128 lastRewardPosition))'
+}