@1delta/margin-fetcher 0.0.17 → 0.0.19

package/src/lending/aave-v3-type/publicCallBuild.ts

@@ -1,13 +1,16 @@
-import { Lender } from "@1delta/asset-registry"
-import { Call } from "../../utils/multicall"
-import { getAaveAssets, getAaveTypePoolAddress, getAaveTypePoolDataProviderAddress } from "../../assets"
-
+import { Lender } from '@1delta/asset-registry'
+import { Call } from '../../utils/multicall'
+import {
+  getAaveAssets,
+  getAaveTypePoolAddress,
+  getAaveTypePoolDataProviderAddress,
+} from '../../assets'
+import { isAaveV32Type } from '../../utils'
 
 export const AAVE_V3_EMODES = [0, 1, 2, 3, 4, 5, 6]
 
 function yldrBaseline(assetsToQuery: string[], providerAddress: string) {
-
-  return assetsToQuery.flatMap(tk => [
+  return assetsToQuery.flatMap((tk) => [
     {
       address: providerAddress,
       name: 'getReserveData',
@@ -17,13 +20,16 @@ function yldrBaseline(assetsToQuery: string[], providerAddress: string) {
       address: providerAddress,
       name: 'getReserveConfigurationData',
       params: [tk],
-    }
+    },
   ])
 }
 
-
-
-function aaveV3baseline(assetsToQuery: string[], providerAddress: string, poolAddress: string, legacy = false) {
+function aaveV3baseline(
+  assetsToQuery: string[],
+  providerAddress: string,
+  poolAddress: string,
+  legacy = false,
+) {
   const callDecimals: Call = {
     address: providerAddress,
     name: 'getDebtCeilingDecimals',
@@ -36,7 +42,7 @@ function aaveV3baseline(assetsToQuery: string[], providerAddress: string, poolAd
     params: [],
   }
 
-  const callsBase = assetsToQuery.flatMap(tk => [
+  const callsBase = assetsToQuery.flatMap((tk) => [
     {
       address: providerAddress,
       name: 'getReserveData',
@@ -62,64 +68,67 @@ function aaveV3baseline(assetsToQuery: string[], providerAddress: string, poolAd
       name: 'getDebtCeiling',
       params: [tk],
     },
-    ...legacy ? [{
-      address: providerAddress,
-      name: 'getReserveEModeCategory',
-      params: [tk],
-    }
-    ] : []
+    ...(legacy
+      ? [
+          {
+            address: providerAddress,
+            name: 'getReserveEModeCategory',
+            params: [tk],
+          },
+        ]
+      : []),
   ])
 
   return {
     callsBase,
     callReservesList,
-    callDecimals
+    callDecimals,
   }
 }
 
-export const buildAaveV3StyleLenderReserveCall = (chainId: string, lender: Lender) => {
+export const buildAaveV3StyleLenderReserveCall = (
+  chainId: string,
+  lender: Lender,
+) => {
   const providerAddress = getAaveTypePoolDataProviderAddress(chainId, lender)
   const assetsToQuery = getAaveAssets(chainId, lender)
   const poolAddress = getAaveTypePoolAddress(chainId, lender)
-  switch (lender) {
-    case Lender.AAVE_V3:
-    case Lender.AAVE_V3_ETHER_FI:
-    case Lender.AAVE_V3_PRIME: {
-      const getEModeCategoryData: Call[] = AAVE_V3_EMODES.flatMap((eMode) => {
-        return [
-          {
-            address: poolAddress,
-            name: 'getEModeCategoryData',
-            params: [eMode],
-          },
-          {
-            address: poolAddress,
-            name: 'getEModeCategoryBorrowableBitmap',
-            params: [eMode],
-          },
-          {
-            address: poolAddress,
-            name: 'getEModeCategoryCollateralBitmap',
-            params: [eMode],
-          }
-        ]
-      })
-
-      const {
-        callDecimals,
-        callReservesList,
-        callsBase
-      } = aaveV3baseline(assetsToQuery, providerAddress, poolAddress)
-
-
-      const calls = [
-        ...callsBase,
-        ...getEModeCategoryData,
-        callReservesList,
-        callDecimals
+  if (isAaveV32Type(lender)) {
+    const getEModeCategoryData: Call[] = AAVE_V3_EMODES.flatMap((eMode) => {
+      return [
+        {
+          address: poolAddress,
+          name: 'getEModeCategoryData',
+          params: [eMode],
+        },
+        {
+          address: poolAddress,
+          name: 'getEModeCategoryBorrowableBitmap',
+          params: [eMode],
+        },
+        {
+          address: poolAddress,
+          name: 'getEModeCategoryCollateralBitmap',
+          params: [eMode],
+        },
       ]
-      return calls
-    }
+    })
+
+    const { callDecimals, callReservesList, callsBase } = aaveV3baseline(
+      assetsToQuery,
+      providerAddress,
+      poolAddress,
+    )
+
+    const calls = [
+      ...callsBase,
+      ...getEModeCategoryData,
+      callReservesList,
+      callDecimals,
+    ]
+    return calls
+  }
+  switch (lender) {
     case Lender.YLDR: {
       const calls = yldrBaseline(assetsToQuery, providerAddress)
       return calls
@@ -131,18 +140,15 @@ export const buildAaveV3StyleLenderReserveCall = (chainId: string, lender: Lende
         params: [eMode],
       }))
 
-      const {
-        callDecimals,
-        callsBase
-      } = aaveV3baseline(assetsToQuery, providerAddress, poolAddress, true)
+      const { callDecimals, callsBase } = aaveV3baseline(
+        assetsToQuery,
+        providerAddress,
+        poolAddress,
+        true,
+      )
 
-
-      const calls = [
-        ...callsBase,
-        ...getEModeCategoryData,
-        callDecimals
-      ]
+      const calls = [...callsBase, ...getEModeCategoryData, callDecimals]
       return calls
     }
   }
-}
+}

package/src/lending/aave-v3-type/publicCallParse.ts

@@ -17,6 +17,7 @@ import {
   toOracleKey,
 } from '../../assets'
 import { GenericTokenList } from '../types'
+import { isAaveV32Type } from '../../utils'
 
 export const getAaveV3ReservesDataConverter = (
   lender: Lender,
@@ -25,7 +26,7 @@ export const getAaveV3ReservesDataConverter = (
   additionalYields: AdditionalYields,
   tokenList: GenericTokenList = {},
 ): [(data: any[]) => AaveV3GeneralPublicResponse | undefined, number] => {
-  if (lender.startsWith('AAVE_V3'))
+  if (isAaveV32Type(lender))
     return parseAave32(
       chainId,
       lender,
@@ -250,7 +251,11 @@ function isReserveEnabledOnBitmap(
   bitmap: bigint,
   reserveIndex: number,
 ): boolean {
-  return ((bitmap >> BigInt(reserveIndex)) & 1n) !== 0n
+  try {
+    return ((bitmap >> BigInt(reserveIndex)) & 1n) !== 0n
+  } catch {
+    return false
+  }
 }
 
 export function parseYLDRCall(
@@ -399,6 +404,7 @@ function parseAave32(
       if (data.length !== expectedNumberOfCalls) {
         return undefined
       }
+
       const emodeDataResult = data.slice(
         assetsToQuery.length * 5,
         assetsToQuery.length * 5 + AAVE_V3_EMODES.length * 3,

package/src/lending/compound-v3/publicCallParse.ts

@@ -53,6 +53,9 @@ export const getCompoundV3ReservesDataConverter = (
         const oracleKey =
           toOracleKey(assetMeta?.assetGroup) ??
           toGenericPriceKey(asset, chainId)
+
+        const totalUsd = Number(totals) * (prices[oracleKey] ?? 1)
+
         result[asset] = {
           poolId: asset,
           underlying: asset,
@@ -87,13 +90,15 @@ export const getCompoundV3ReservesDataConverter = (
           // debt and liquidity are zero
           totalDebt: 0,
           totalDebtUSD: 0,
-          totalLiquidity: 0,
-          totalLiquidityUSD: 0,
+          totalLiquidity: totals,
+          totalLiquidityUSD: totalUsd,
           // deposits are different outputs for base asset and others
           totalDeposits: totals,
-          totalDepositsUSD: Number(totals) * (prices[oracleKey] ?? 1),
+          totalDepositsUSD: totalUsd,
           // rewards
           rewards: {},
+          isActive: true,
+          isFrozen: false,
           borrowingEnabled: false,
         }
       }
@@ -192,6 +197,8 @@ export const getCompoundV3ReservesDataConverter = (
             },
           },
           borrowingEnabled: true,
+          isActive: true,
+          isFrozen: false,
           stakingYield: additionalYields.intrinsicYields[oracleKeyBase] ?? 0,
         },
       }

package/src/lending/fetchLender.ts

@@ -18,7 +18,7 @@ import { IrgetterAbi } from '../abis/compound-v3/IrGetter'
 
 import {
   isAaveV2Type,
-  isAaveV3Original,
+  isAaveV32Type,
   isAaveV3Type,
   isCompoundV3,
   isInit,
@@ -102,7 +102,7 @@ const getAbi = (lender: string) => {
       ...IncentivesControllerAbi,
     ]
 
-  if (isAaveV3Original(lender))
+  if (isAaveV32Type(lender))
     return [...AavePoolV3UpgradedAbi, ...AaveV3ProtocolDataProviderAbi]
   if (lender === Lender.YLDR) return [...YLDRProtocolDataProviderAbi]
 

package/src/lending/morpho/convertPublic.ts

@@ -113,7 +113,7 @@ export function convertMarketsToMorphoResponse(
         totalDebtStable: 0,
         totalDebt: 0,
         totalLiquidity: 0,
-        totalLiquidityUSD: 0,
+        totalLiquidityUSD: Number(state.collateralAssetsUsd),
         totalDepositsUSD: Number(state.collateralAssetsUsd),
         totalDebtStableUSD: 0,
         totalDebtUSD: 0,

package/src/lending/user-data/aave-v3-type/userCallParse.ts

@@ -16,11 +16,13 @@ export const getAaveV3UserDataConverter = (
 
   const assetsToQuery = getAaveAssets(chainId, lender)
   const expectedNumberOfCalls = assetsToQuery.length + 1
+  
   return [
     (data: any[]) => {
       if (data.length !== expectedNumberOfCalls) {
         return undefined
       }
+
       const userEMode = Number(data[expectedNumberOfCalls - 1])
       const lendingPositions: { [asset: string]: any } = {}
 

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

@@ -195,11 +195,8 @@ export const convertLenderUserDataResult = (
           }
         }
       }
-    } catch (e) {
-      console.log('Error parsing for', query.lender, 'on', chainId, e)
-    }
+    } catch (e) {}
     currentSlice += sliceLength
   }
-
   return lenderData
 }

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

@@ -112,7 +112,8 @@ export const getMorphoUserDataConverterWithlens = (
         }
       }
 
-      for (const [marketId, pubData] of Object.entries(lenderData ?? {})) {
+      for (const marketId of markets) {
+        const pubData = lenderData[marketId]
         if (marketsHandled.includes(marketId)) continue;
         const payload = {
           chainId,

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

@@ -16,8 +16,8 @@ export interface LenderUserQuery {
 
 /** Filter all morphos into one for querying */
 export function organizeUserQueries(queries: LenderUserQuery[]) {
-  const morphos = queries.filter((q) => q.lender.startsWith('MORPHO_BLUE'))
-  const nonMorphos = queries.filter((q) => !q.lender.startsWith('MORPHO_BLUE'))
+  const morphos = queries.filter((q) => q.lender?.startsWith('MORPHO_BLUE'))
+  const nonMorphos = queries.filter((q) => !q.lender?.startsWith('MORPHO_BLUE'))
   const morphosCollapsed = {
     lender: Lender.MORPHO_BLUE,
     account: queries[0].account,