@1delta/margin-fetcher 0.0.13 → 0.0.15

package/dist/lending/morpho/convertPublic.js

@@ -108,8 +108,8 @@ export function convertMarketsToMorphoResponse(response, chainId, additionalYiel
                     lltv,
                     oracle: oracleAddress,
                     irm: irmAddress,
-                    collateralAddress: collateralAsset.address,
-                    loanAddress: loanAsset.address,
+                    collateralAddress: collateralAssetAddress,
+                    loanAddress: loanAssetAddress,
                 },
             };
             data[m].chainId = chainId;

package/dist/lending/user-data/fetchUserData.js

@@ -35,7 +35,7 @@ function getUserDataConverter(lender, chainId, account, prices, pricesHist, lend
         return getInitUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState?.data?.[lender]?.data);
     if (isMorphoType(lender))
         return getMorphoUserDataConverterWithlens(lender, chainId, account, params, prices, pricesHist, lenderPublicState?.data);
-    return getCompoundV3UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState);
+    return getCompoundV3UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState?.data?.[lender]?.data);
 }
 /**
  * Builds the multicall calls for the given queries and returns the raw results

package/dist/lending/user-data/morpho/userCallParse.d.ts

@@ -1,5 +1,5 @@
-import { Lender } from "@1delta/asset-registry";
-import { MorphoUserReserveResponse } from "../types";
+import { Lender } from '@1delta/asset-registry';
+import { MorphoUserReserveResponse } from '../types';
 export declare const getMorphoUserDataConverterWithlens: (lender: Lender, chainId: string, account: string, markets: string[], prices: {
     [asset: string]: number;
 }, pricesHist: {

package/dist/lending/user-data/morpho/userCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAMpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAAE,MAAM,CA2DvF,CAAA"}
+{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAMpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CAwDP,CAAA"}

package/dist/lending/user-data/morpho/userCallParse.js

@@ -1,18 +1,17 @@
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets";
-import { createBaseTypeUserState } from "../utils";
-import { parseRawAmount } from "../../../utils/parsing";
-import { decodePackedDataset } from "./decoder";
+import { getAssetMeta, toGenericPriceKey, toOracleKey } from '../../../assets';
+import { createBaseTypeUserState } from '../utils';
+import { parseRawAmount } from '../../../utils/parsing';
+import { decodePackedDataset } from './decoder';
 export const getMorphoUserDataConverterWithlens = (lender, chainId, account, markets, prices, pricesHist, lenderData) => {
-    const expectedNumberOfCalls = markets.length * 2;
+    const expectedNumberOfCalls = Math.ceil(markets.length / 100);
     return [
         (data) => {
             // chunksizes depend on markets
-            const slices = Math.ceil(markets.length / 100);
-            if (data.length !== slices) {
+            if (data.length !== expectedNumberOfCalls) {
                 return undefined;
             }
             // de-chunk the calldata
-            const returnDatas = data.flatMap(d => decodePackedDataset(d));
+            const returnDatas = data.flatMap((d) => decodePackedDataset(d));
             let datas = {};
             for (let i = 0; i < returnDatas.length; i++) {
                 let totalDebt24h = 0;
@@ -20,15 +19,13 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                 const balanceData = returnDatas[i];
                 const markeId = markets[balanceData.index];
                 const market = lenderData[markeId]?.params?.market;
-                const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(i, balanceData, chainId, market, prices, pricesHist);
-                if (!dataForMarket)
-                    continue;
+                const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(balanceData, chainId, market, prices, pricesHist);
                 totalDebt24h += addedDebt;
                 totalDeposits24h += addedDeposits;
                 const payload = {
                     chainId,
                     account,
-                    lendingPositions: { "0": dataForMarket },
+                    lendingPositions: { '0': dataForMarket },
                     rewards: {},
                     userEMode: 0,
                 };
@@ -36,7 +33,7 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                 datas[market.lender] = {
                     ...payload,
                     ...userData,
-                    id: market.id
+                    id: market.id,
                 };
             }
             return datas;
@@ -44,7 +41,7 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
         expectedNumberOfCalls,
     ];
 };
-function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, prices, pricesHist) {
+function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, prices, pricesHist) {
     const loanAddress = market.loanAddress.toLowerCase();
     const loanMeta = getAssetMeta(chainId, loanAddress);
     const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId);
@@ -53,27 +50,36 @@ function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, pr
     const priceHistLoan = pricesHist?.[loanKey] ?? priceLoan;
     const deposits = balanceInfo.supplyAssets;
     const borrow = balanceInfo.borrowAssets;
+    const collateral = balanceInfo.collateral;
+    // return early if there are zeros
+    if (deposits === 0n && borrow === 0n && collateral === 0n)
+        return {
+            dataForMarket: {},
+            addedDeposits: 0,
+            addedDebt: 0,
+        };
+    const collateralAddress = market.collateralAddress.toLowerCase();
+    const assetMeta = getAssetMeta(chainId, collateralAddress);
+    const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18;
     const depositDec = parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
+    const collateralDec = parseRawAmount(collateral.toString(), decimals);
     const borrowDec = parseRawAmount(borrow.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
     const dataForLoanAsset = {
         poolId: loanAddress,
         underlying: loanAddress,
         deposits: parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18),
         depositsRaw: deposits.toString(),
-        debtStable: "0",
+        debtStable: '0',
         debt: borrowDec,
         depositsUSD: Number(depositDec) * priceLoan,
         debtStableUSD: 0,
         debtUSD: Number(borrowDec) * priceLoan,
-        stableBorrowRate: "0",
+        stableBorrowRate: '0',
         collateralActive: true,
         claimableRewards: 0,
     };
-    const collateralAddress = market.collateralAddress.toLowerCase();
-    const assetMeta = getAssetMeta(chainId, collateralAddress);
-    const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18;
-    const collateralDec = parseRawAmount(balanceInfo.collateral.toString(), decimals);
-    const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(collateralAddress, chainId);
+    const key = toOracleKey(assetMeta?.assetGroup) ??
+        toGenericPriceKey(collateralAddress, chainId);
     // prices
     const price = prices[key] ?? 1;
     const priceHist = pricesHist?.[key] ?? price;
@@ -82,21 +88,21 @@ function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, pr
         underlying: collateralAddress,
         deposits: collateralDec,
         depositsRaw: balanceInfo.collateral.toString(),
-        debtStable: "0",
-        debt: "0",
+        debtStable: '0',
+        debt: '0',
         depositsUSD: Number(collateralDec) * price,
         debtStableUSD: 0,
         debtUSD: 0,
-        stableBorrowRate: "0",
+        stableBorrowRate: '0',
         collateralActive: true,
         claimableRewards: 0,
     };
     return {
         dataForMarket: {
             [loanAddress]: dataForLoanAsset,
-            [collateralAddress]: dataForCollateralAsset
+            [collateralAddress]: dataForCollateralAsset,
         },
         addedDeposits: Number(depositDec) * priceHistLoan + Number(collateralDec) * priceHist,
-        addedDebt: Number(borrowDec) * priceHistLoan
+        addedDebt: Number(borrowDec) * priceHistLoan,
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/lending/morpho/convertPublic.ts

@@ -141,8 +141,8 @@ export function convertMarketsToMorphoResponse(
           lltv,
           oracle: oracleAddress,
           irm: irmAddress,
-          collateralAddress: collateralAsset.address,
-          loanAddress: loanAsset.address,
+          collateralAddress: collateralAssetAddress,
+          loanAddress: loanAssetAddress,
         },
       }
       data[m].chainId = chainId

package/src/lending/user-data/fetchUserData.ts

@@ -98,7 +98,7 @@ function getUserDataConverter(
     account,
     prices,
     pricesHist,
-    lenderPublicState,
+    lenderPublicState?.data?.[lender]?.data,
   )
 }
 

package/src/lending/user-data/morpho/userCallParse.ts

@@ -1,10 +1,10 @@
-import { Lender } from "@1delta/asset-registry"
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets"
-import { MorphoUserReserveResponse } from "../types"
-import { createBaseTypeUserState } from "../utils"
-import { parseRawAmount } from "../../../utils/parsing"
-import { MorphoMarket } from "../../morpho/types"
-import { BalanceInfo, decodePackedDataset } from "./decoder"
+import { Lender } from '@1delta/asset-registry'
+import { getAssetMeta, toGenericPriceKey, toOracleKey } from '../../../assets'
+import { MorphoUserReserveResponse } from '../types'
+import { createBaseTypeUserState } from '../utils'
+import { parseRawAmount } from '../../../utils/parsing'
+import { MorphoMarket } from '../../morpho/types'
+import { BalanceInfo, decodePackedDataset } from './decoder'
 
 export const getMorphoUserDataConverterWithlens = (
   lender: Lender,
@@ -13,41 +13,36 @@ export const getMorphoUserDataConverterWithlens = (
   markets: string[],
   prices: { [asset: string]: number },
   pricesHist: { [asset: string]: number },
-  lenderData: any
-): [(data: any[]) => { [market: string]: MorphoUserReserveResponse } | undefined, number] => {
-
-  const expectedNumberOfCalls = markets.length * 2
+  lenderData: any,
+): [
+  (data: any[]) => { [market: string]: MorphoUserReserveResponse } | undefined,
+  number,
+] => {
+  const expectedNumberOfCalls = Math.ceil(markets.length / 100)
   return [
     (data: any[]) => {
       // chunksizes depend on markets
-      const slices = Math.ceil(markets.length /  100)
-      if (data.length !== slices) {
+      if (data.length !== expectedNumberOfCalls) {
         return undefined
       }
       // de-chunk the calldata
-      const returnDatas = data.flatMap(d => decodePackedDataset(d))
+      const returnDatas = data.flatMap((d) => decodePackedDataset(d))
 
       let datas: { [market: string]: MorphoUserReserveResponse } = {}
       for (let i = 0; i < returnDatas.length; i++) {
-
         let totalDebt24h = 0
         let totalDeposits24h = 0
         const balanceData = returnDatas[i]
         const markeId = markets[balanceData.index]
         const market = lenderData[markeId]?.params?.market
-        const {
-          dataForMarket,
-          addedDebt,
-          addedDeposits
-        } = createMorphoEntryFromMarketWithLens(
-          i,
-          balanceData,
-          chainId,
-          market,
-          prices,
-          pricesHist,
-        )
-        if (!dataForMarket) continue;
+        const { dataForMarket, addedDebt, addedDeposits } =
+          createMorphoEntryFromMarketWithLens(
+            balanceData,
+            chainId,
+            market,
+            prices,
+            pricesHist,
+          )
 
         totalDebt24h += addedDebt
         totalDeposits24h += addedDeposits
@@ -55,19 +50,23 @@ export const getMorphoUserDataConverterWithlens = (
         const payload = {
           chainId,
           account,
-          lendingPositions: { "0": dataForMarket },
+          lendingPositions: { '0': dataForMarket },
           rewards: {},
-          userEMode : 0,
+          userEMode: 0,
         }
 
-        const userData = createBaseTypeUserState(payload, lenderData[markeId].data, totalDeposits24h, totalDebt24h)
+        const userData = createBaseTypeUserState(
+          payload,
+          lenderData[markeId].data,
+          totalDeposits24h,
+          totalDebt24h,
+        )
 
         datas[market.lender] = {
           ...payload,
           ...userData,
-          id: market.id
+          id: market.id,
         }
-
       }
       return datas
     },
@@ -76,50 +75,70 @@ export const getMorphoUserDataConverterWithlens = (
 }
 
 function createMorphoEntryFromMarketWithLens(
-  i: number,
   balanceInfo: BalanceInfo,
   chainId: string,
   market: MorphoMarket,
   prices: any,
   pricesHist: any,
 ) {
-
   const loanAddress = market.loanAddress.toLowerCase()
   const loanMeta = getAssetMeta(chainId, loanAddress)
 
-  const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId)
+  const loanKey =
+    toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId)
   // prices
   const priceLoan = prices[loanKey] ?? 1
   const priceHistLoan = pricesHist?.[loanKey] ?? priceLoan
 
   const deposits = balanceInfo.supplyAssets
   const borrow = balanceInfo.borrowAssets
-  const depositDec = parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18)
-  const borrowDec = parseRawAmount(borrow.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18)
+  const collateral = balanceInfo.collateral
+
+  // return early if there are zeros
+  if (deposits === 0n && borrow === 0n && collateral === 0n)
+    return {
+      dataForMarket: {},
+      addedDeposits: 0,
+      addedDebt: 0,
+    }
+
+  const collateralAddress = market.collateralAddress.toLowerCase()
+  const assetMeta = getAssetMeta(chainId, collateralAddress)
+
+  const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18
+
+  const depositDec = parseRawAmount(
+    deposits.toString(),
+    market.loanDecimals ?? loanMeta?.decimals ?? 18,
+  )
+
+  const collateralDec = parseRawAmount(collateral.toString(), decimals)
+  const borrowDec = parseRawAmount(
+    borrow.toString(),
+    market.loanDecimals ?? loanMeta?.decimals ?? 18,
+  )
 
   const dataForLoanAsset = {
     poolId: loanAddress,
     underlying: loanAddress,
-    deposits: parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18),
+    deposits: parseRawAmount(
+      deposits.toString(),
+      market.loanDecimals ?? loanMeta?.decimals ?? 18,
+    ),
     depositsRaw: deposits.toString(),
-    debtStable: "0",
+    debtStable: '0',
     debt: borrowDec,
     depositsUSD: Number(depositDec) * priceLoan,
     debtStableUSD: 0,
     debtUSD: Number(borrowDec) * priceLoan,
-    stableBorrowRate: "0",
+    stableBorrowRate: '0',
     collateralActive: true,
     claimableRewards: 0,
   }
 
-
-  const collateralAddress = market.collateralAddress.toLowerCase()
-  const assetMeta = getAssetMeta(chainId, collateralAddress)
-  const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18
-
-  const collateralDec = parseRawAmount(balanceInfo.collateral.toString(), decimals)
-
-  const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(collateralAddress, chainId)
+  const key =
+    toOracleKey(assetMeta?.assetGroup) ??
+    toGenericPriceKey(collateralAddress, chainId)
   // prices
   const price = prices[key] ?? 1
   const priceHist = pricesHist?.[key] ?? price
@@ -129,12 +148,12 @@ function createMorphoEntryFromMarketWithLens(
     underlying: collateralAddress,
     deposits: collateralDec,
     depositsRaw: balanceInfo.collateral.toString(),
-    debtStable: "0",
-    debt: "0",
+    debtStable: '0',
+    debt: '0',
     depositsUSD: Number(collateralDec) * price,
     debtStableUSD: 0,
     debtUSD: 0,
-    stableBorrowRate: "0",
+    stableBorrowRate: '0',
     collateralActive: true,
     claimableRewards: 0,
   }
@@ -142,9 +161,10 @@ function createMorphoEntryFromMarketWithLens(
   return {
     dataForMarket: {
       [loanAddress]: dataForLoanAsset,
-      [collateralAddress]: dataForCollateralAsset
+      [collateralAddress]: dataForCollateralAsset,
     },
-    addedDeposits: Number(depositDec) * priceHistLoan + Number(collateralDec) * priceHist,
-    addedDebt: Number(borrowDec) * priceHistLoan
+    addedDeposits:
+      Number(depositDec) * priceHistLoan + Number(collateralDec) * priceHist,
+    addedDebt: Number(borrowDec) * priceHistLoan,
   }
-}
+}

package/test/userDataMorpho.test.ts

@@ -61,6 +61,7 @@ describe(
         try {
           const { userData } = await getUserData(Chain.BASE, [
             'MORPHO_BLUE_6600AAE6C56D242FA6BA68BD527AFF1A146E77813074413186828FD3F1CDCA91',
+            'MORPHO_BLUE_3A4048C64BA1B375330D376B1CE40E4047D03B47AB4D48AF484EDEC9FEC801BA',
           ])
 
           prettyPrint(userData)

package/test/userdata.test.ts

@@ -1,45 +1,45 @@
-import { describe, it, expect, beforeAll } from "vitest";
+import { describe, it, expect, beforeAll } from 'vitest'
 import {
   getLenderUserDataResult,
   convertLenderUserDataResult,
-} from "../src/lending/user-data/fetchUserData";
+} from '../src/lending/user-data/fetchUserData'
 import {
   fetchGeneralYields,
   fetchMainPrices,
   getLenderPublicData,
-} from "../src";
-import { multicallRetry, getEvmClient } from "@1delta/providers";
-import { Chain, Lender } from "@1delta/asset-registry";
-import { LenderUserQuery } from "../src/lending/user-data/types";
-import { getLendersForChain } from "../src/utils";
+} from '../src'
+import { multicallRetry, getEvmClient } from '@1delta/providers'
+import { Chain, Lender } from '@1delta/asset-registry'
+import { LenderUserQuery } from '../src/lending/user-data/types'
+import { getLendersForChain } from '../src/utils'
 
-const TEST_ADDRESS = "0x91ae002a960e63Ccb0E5bDE83A8C13E51e1cB91A";
-let prices, yields;
+const TEST_ADDRESS = '0xbadA9c382165b31419F4CC0eDf0Fa84f80A3C8E5'
+let prices, yields
 
 async function getUserData(chainId: Chain, lenders: Lender[]) {
-  const _lenders = getLendersForChain(chainId);
+  const _lenders = getLendersForChain(chainId)
   const publicData = {
     data: await getLenderPublicData(
       chainId,
       _lenders as any,
       prices as any,
       yields as any,
-      multicallRetry
-    )
+      multicallRetry,
+    ),
   }
 
   // Define user queries
   const queries: LenderUserQuery[] = lenders.map((lender) => ({
     lender,
     account: TEST_ADDRESS.toLowerCase(),
-  }));
+  }))
 
   // Fetch raw user data
   const rawUserData = await getLenderUserDataResult(
     chainId,
     queries,
-    getEvmClient
-  );
+    getEvmClient,
+  )
 
   // Convert raw data to structured format
   const userData = convertLenderUserDataResult(
@@ -48,142 +48,170 @@ async function getUserData(chainId: Chain, lenders: Lender[]) {
     rawUserData,
     prices as any,
     prices as any,
-    { [chainId]: publicData }
-  );
+    { [chainId]: publicData },
+  )
 
-  return { userData, rawUserData, publicData, queries };
+  return { userData, rawUserData, publicData, queries }
 }
 
 describe(
-  "user data fetching",
+  'user data fetching',
   () => {
     beforeAll(async () => {
-      [prices, yields] = await Promise.all([
+      ;[prices, yields] = await Promise.all([
         fetchMainPrices([Chain.MANTLE], getEvmClient),
         fetchGeneralYields(),
-      ]);
-    }, 30000);
+      ])
+    }, 30000)
 
     it(
-      "should fetch user data for LENDLE PT CMETH on Mantle",
+      'should fetch user data for LENDLE PT CMETH on Mantle',
       async () => {
         try {
-          const { userData } = await getUserData(Chain.MANTLE, [Lender.LENDLE_PT_CMETH]);
+          const { userData } = await getUserData(Chain.MANTLE, [
+            Lender.LENDLE_PT_CMETH,
+          ])
 
-          console.log("LENDLE PT CMETH Mantle user data:", userData[Lender.LENDLE_PT_CMETH][TEST_ADDRESS.toLowerCase()]);
+          console.log(
+            'LENDLE PT CMETH Mantle user data:',
+            userData[Lender.LENDLE_PT_CMETH][TEST_ADDRESS.toLowerCase()],
+          )
 
           // Basic validation
-          expect(userData).toBeDefined();
-          expect(typeof userData).toBe("object");
+          expect(userData).toBeDefined()
+          expect(typeof userData).toBe('object')
         } catch (error) {
-          console.log("Error fetching LENDLE PT CMETH Mantle data:", error);
+          console.log('Error fetching LENDLE PT CMETH Mantle data:', error)
         }
       },
-      { timeout: 30000 }
-    );
+      { timeout: 30000 },
+    )
+
+    it(
+      'should fetch user data for COMET on Arb',
+      async () => {
+        try {
+          const { userData } = await getUserData(Chain.ARBITRUM_ONE, [
+            Lender.COMPOUND_V3_USDC,
+          ])
 
+          console.log('COMET Mantle user data:', userData[Lender.COMPOUND_V3_USDC]?.[TEST_ADDRESS.toLowerCase()])
 
+          // Basic validation
+          expect(userData).toBeDefined()
+          expect(typeof userData).toBe('object')
+        } catch (error) {
+          console.log('Error fetching INIT Mantle data:', error)
+        }
+      },
+      { timeout: 30000 },
+    )
 
     it(
-      "should fetch user data for INIT on Mantle",
+      'should fetch user data for INIT on Mantle',
       async () => {
         try {
-          const { userData } = await getUserData(Chain.MANTLE, [Lender.INIT]);
+          const { userData } = await getUserData(Chain.MANTLE, [Lender.INIT])
 
-          console.log("INIT Mantle user data:", userData);
+          console.log('INIT Mantle user data:', userData)
 
           // Basic validation
-          expect(userData).toBeDefined();
-          expect(typeof userData).toBe("object");
+          expect(userData).toBeDefined()
+          expect(typeof userData).toBe('object')
         } catch (error) {
-          console.log("Error fetching INIT Mantle data:", error);
+          console.log('Error fetching INIT Mantle data:', error)
         }
       },
-      { timeout: 30000 }
-    );
-
+      { timeout: 30000 },
+    )
 
     it(
-      "should fetch user data for AAVE V3 on Polygon",
+      'should fetch user data for AAVE V3 on Polygon',
       async () => {
         try {
-          const { userData } = await getUserData(Chain.ARBITRUM_ONE, [Lender.AAVE_V3]);
+          const { userData } = await getUserData(Chain.ARBITRUM_ONE, [
+            Lender.AAVE_V3,
+          ])
 
-          console.log("AAVE_V3 Polygon user data:", userData[Lender.AAVE_V3][TEST_ADDRESS.toLowerCase()].lendingPositions);
-          console.log("AAVE_V3 Polygon user aprData:", userData[Lender.AAVE_V3]);
+          console.log(
+            'AAVE_V3 Polygon user data:',
+            userData[Lender.AAVE_V3][TEST_ADDRESS.toLowerCase()]
+              .lendingPositions,
+          )
+          console.log('AAVE_V3 Polygon user aprData:', userData[Lender.AAVE_V3])
 
           // Basic validation
-          expect(userData).toBeDefined();
-          expect(typeof userData).toBe("object");
+          expect(userData).toBeDefined()
+          expect(typeof userData).toBe('object')
         } catch (error) {
-          console.log("Error fetching AAVE_V3 Polygon data:", error);
+          console.log('Error fetching AAVE_V3 Polygon data:', error)
         }
       },
-      { timeout: 30000 }
-    );
-
+      { timeout: 30000 },
+    )
 
     it(
-      "should fetch user data for AAVE V3 on Base",
+      'should fetch user data for AAVE V3 on Base',
       async () => {
         try {
-          const { userData } = await getUserData(Chain.BASE, [Lender.AAVE_V3]);
+          const { userData } = await getUserData(Chain.BASE, [Lender.AAVE_V3])
 
-          console.log("AAVE V3 Base user data:", userData);
+          console.log('AAVE V3 Base user data:', userData)
 
           // Basic validation
-          expect(userData).toBeDefined();
-          expect(typeof userData).toBe("object");
+          expect(userData).toBeDefined()
+          expect(typeof userData).toBe('object')
         } catch (error) {
-          console.log("Error fetching AAVE V3 Base data:", error);
+          console.log('Error fetching AAVE V3 Base data:', error)
         }
       },
-      { timeout: 30000 }
-    );
+      { timeout: 30000 },
+    )
 
     it(
-      "should fetch user data for multiple protocols on Arbitrum",
+      'should fetch user data for multiple protocols on Arbitrum',
       async () => {
         try {
-          const { userData, queries } = await getUserData(
-            Chain.ARBITRUM_ONE,
-            [Lender.AAVE_V3, Lender.COMPOUND_V3_USDC, Lender.COMPOUND_V3_USDCE]
-          );
+          const { userData, queries } = await getUserData(Chain.ARBITRUM_ONE, [
+            Lender.AAVE_V3,
+            Lender.COMPOUND_V3_USDC,
+            Lender.COMPOUND_V3_USDCE,
+          ])
 
-          console.log("Arbitrum multi-protocol user data:", userData);
+          console.log('Arbitrum multi-protocol user data:', userData)
 
-          expect(userData).toBeDefined();
-          expect(typeof userData).toBe("object");
+          expect(userData).toBeDefined()
+          expect(typeof userData).toBe('object')
 
           // Check that we get data for each queried protocol
           queries.forEach((query) => {
             if (userData[query.lender]) {
-              console.log(`Found data for ${query.lender} on Arbitrum`);
-              expect(userData[query.lender]).toBeDefined();
+              console.log(`Found data for ${query.lender} on Arbitrum`)
+              expect(userData[query.lender]).toBeDefined()
             }
-          });
+          })
         } catch (error) {
-          console.log("Error fetching Arbitrum multi-protocol data:", error);
+          console.log('Error fetching Arbitrum multi-protocol data:', error)
         }
       },
-      { timeout: 30000 }
-    );
+      { timeout: 30000 },
+    )
 
     it(
-      "should fetch user data across multiple chains",
+      'should fetch user data across multiple chains',
       async () => {
         const testChains = [
           Chain.ETHEREUM_MAINNET,
           Chain.POLYGON_MAINNET,
           Chain.BASE,
-        ];
+        ]
 
         try {
           for (const chainId of testChains) {
-            const lenders = getLendersForChain(chainId);
+            const lenders = getLendersForChain(chainId)
             if (lenders.length === 0) {
-              console.log(`No lenders available on ${chainId}`);
-              continue;
+              console.log(`No lenders available on ${chainId}`)
+              continue
             }
 
             const publicData = await getLenderPublicData(
@@ -191,19 +219,19 @@ describe(
               lenders as any,
               prices as any,
               yields as any,
-              multicallRetry
-            );
+              multicallRetry,
+            )
 
-            const firstLender = lenders[0] as Lender;
+            const firstLender = lenders[0] as Lender
             const queries: LenderUserQuery[] = [
               { lender: firstLender, account: TEST_ADDRESS.toLowerCase() }, // test first lender
-            ];
+            ]
 
             const rawUserData = await getLenderUserDataResult(
               chainId,
               queries,
-              getEvmClient
-            );
+              getEvmClient,
+            )
 
             const userData = convertLenderUserDataResult(
               chainId,
@@ -211,51 +239,46 @@ describe(
               rawUserData,
               prices as any,
               prices as any,
-              publicData
-            );
+              publicData,
+            )
 
-            console.log(`${chainId} - ${firstLender} user data:`, userData);
+            console.log(`${chainId} - ${firstLender} user data:`, userData)
 
-            expect(userData).toBeDefined();
-            expect(typeof userData).toBe("object");
+            expect(userData).toBeDefined()
+            expect(typeof userData).toBe('object')
           }
         } catch (error) {
-          console.log("Error in multi-chain test:", error);
+          console.log('Error in multi-chain test:', error)
         }
       },
-      { timeout: 60000 }
-    );
+      { timeout: 60000 },
+    )
 
     it(
-      "should fetch user data for Init protocol on Mantle",
+      'should fetch user data for Init protocol on Mantle',
       async () => {
-        const chainId = Chain.MANTLE;
+        const chainId = Chain.MANTLE
 
         try {
-          const { userData } = await getUserData(
-            Chain.MANTLE,
-            [Lender.INIT]
-          );
+          const { userData } = await getUserData(Chain.MANTLE, [Lender.INIT])
 
-          console.log("Init protocol Mantle user data:", userData);
+          console.log('Init protocol Mantle user data:', userData)
 
-          expect(userData).toBeDefined();
-          expect(typeof userData).toBe("object");
+          expect(userData).toBeDefined()
+          expect(typeof userData).toBe('object')
         } catch (error) {
-          console.log("Error fetching Init protocol data:", error);
+          console.log('Error fetching Init protocol data:', error)
         }
       },
-      { timeout: 30000 }
-    );
-
-    it("should handle empty queries", async () => {
-      const { userData } = await getUserData(Chain.BASE, []);
-
-      expect(userData).toBeDefined();
-      expect(Object.keys(userData)).toHaveLength(0);
-    });
+      { timeout: 30000 },
+    )
 
+    it('should handle empty queries', async () => {
+      const { userData } = await getUserData(Chain.BASE, [])
 
+      expect(userData).toBeDefined()
+      expect(Object.keys(userData)).toHaveLength(0)
+    })
   },
-  { timeout: 90000 }
-);
+  { timeout: 90000 },
+)