fix etherfi

Author: g1nt0ki

projects/etherfi-cash-collateral-management/index.js

@@ -1,87 +1,50 @@
-const ADDRESSES = require('../helper/coreAssets.json')
-const sdk = require('@defillama/sdk');
-
+const ADDRESSES = require('../helper/coreAssets.json');
+const { sliceIntoChunks } = require('../helper/utils');
 
 const EtherFiCashFactory = '0xF4e147Db314947fC1275a8CbB6Cde48c510cd8CF';
 const CashBorrowerHelperContract = '0xF0df37503714f08d0fCA5B434F1FFA2b8b1AF34B';
 
+const abi = {
+  getTotalCollateralForSafesWithIndex: 'function getTotalCollateralForSafesWithIndex(uint256 startIndex, uint256 n) view returns (tuple(address token, uint256 amount)[])',
+}
 
-//Get all the collateral held by cash borrow mode vaults which can be used to borrow against
-async function getCollateralInCashBorrowMode(api, config) {
-
-  const collateralTokensToAmount = {};
-
-  const { timestamp } = api;
-  const scroll_api = new sdk.ChainApi({ timestamp, chain: 'scroll' });
-
+async function tvl(api) {
   //get last collateral mode vault
-  const lastCollateralModeVault = (await scroll_api.call({
+  const lastCollateralModeVault = (await api.call({
     target: EtherFiCashFactory,
     abi: 'function numContractsDeployed() view returns (uint256)',
   })) - 1;
-  
-  const batch_size = 100;
-  
+
+  const batch_size = 50;
+
+
   const calls = [];
   for (let i = 0; i < Number(lastCollateralModeVault); i += batch_size) {
     const startIndex = i;
     const endIndex = Math.min(i + batch_size, lastCollateralModeVault);
     const n = endIndex - startIndex;
-    
+
     calls.push({
       target: CashBorrowerHelperContract,
-      abi: 'function getTotalCollateralForSafesWithIndex(uint256 startIndex, uint256 n) view returns (tuple(address token, uint256 amount)[])',
       params: [startIndex, n],
     });
   }
 
-  const parallelBatchSize = 30;
-  const batches = [];
-  for (let i = 0; i < calls.length; i += parallelBatchSize) {
-    batches.push(calls.slice(i, Math.min(i + parallelBatchSize, calls.length)));
-  }
-
-  // Execute batches in parallel
-  for (const [batchIndex, batch] of batches.entries()) {
-      const batchPromises = batch.map(call => scroll_api.call(call));
-      const batchResults = await Promise.all(batchPromises);
-      
-      // Process results
-      batchResults.forEach((result, index) => {
-        if (Array.isArray(result)) {
-          for (const [token, amount] of result) {
-            // Validate amount before adding
-            if (amount && amount !== 'Infinity' && !isNaN(Number(amount))) {
-              collateralTokensToAmount[token] = (collateralTokensToAmount[token] || 0n) + BigInt(amount);
-            } else {
-              console.warn('Invalid amount for token:', token, amount)
-            }
-          }
-        }
-      });
-  }
-
-  const result = {};
-  for (const [token, amount] of Object.entries(collateralTokensToAmount)) {
-    result[token] = amount.toString();
+  const chunks = sliceIntoChunks(calls, 100);
+  let i = 0
+  for (const chunk of chunks) {
+    const res = await api.multiCall({ abi: abi.getTotalCollateralForSafesWithIndex, calls: chunk })
+    res.forEach(batchResult => {
+      batchResult.forEach(({ token, amount }) => api.add(token, amount))
+    })
+    api.log(`Processed chunk ${++i}/${chunks.length}`)
   }
-
-  return result;
-}
-
-async function tvl(api) {
-  const collateralTokensToAmount = await getCollateralInCashBorrowMode(api);
-  for (const [token, amount] of Object.entries(collateralTokensToAmount)) {
-    api.add(token, amount);
-  } 
 }
 
 async function borrow(api) {
   const cashDebitCore = '0x0078C5a459132e279056B2371fE8A8eC973A9553'
   const usdcScroll = ADDRESSES.scroll.USDC
-  const { timestamp } = api;
-  const scroll_api = new sdk.ChainApi({ timestamp, chain: 'scroll' });
-  const borrowingAmount  = await scroll_api.call({
+  const borrowingAmount = await api.call({
     target: cashDebitCore,
     abi: 'function totalBorrowingAmount(address borrowToken) view returns (uint256)',
     params: [usdcScroll],
@@ -90,9 +53,9 @@ async function borrow(api) {
 }
 
 module.exports = {
-  misrepresentedTokens: true,
+  isHeavyProtocol: true,
   scroll: {
-    tvl, 
+    tvl,
     borrowed: borrow,
   },
 };