@1delta/margin-fetcher 0.0.18 → 0.0.20

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

@@ -2,7 +2,7 @@
 import { ProtocolDataProviderAbi } from '../abis/aave-v2/ProtocolDataProvider'
 import { IncentivesControllerAbi } from '../abis/lendle/IncentivesController'
 import { RewarderAbi } from '../abis/aurelius/Rewarder'
-import { UniswapV2PairAbi } from '../abis/uniswap/UniswapV2Pair'
+import { UniswapV2PairAbi } from '../abis/oracle/UniswapV2Pair'
 
 // aave v3 style
 import { AavePoolV3UpgradedAbi } from '../abis/aave/AavePoolV3Upgraded'
@@ -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/compound-v3/userCallBuild.ts

@@ -1,6 +1,6 @@
 import { Lender } from "@1delta/asset-registry"
 import { Call } from "../../../utils/multicall"
-import { getComposerAddress, getLenderAssets } from "../../../utils"
+import { getLenderAssets } from "../../../utils"
 import { getCompoundV3BaseAsset, getCompoundV3CometAddress, getCompoundV3CometRewardsAddress } from "./addresses"
 
 export const buildCompoundV3UserCall = (chainId: string, lender: Lender, account: string): Call[] => {
@@ -10,12 +10,6 @@ export const buildCompoundV3UserCall = (chainId: string, lender: Lender, account
   const assets = getLenderAssets(chainId, lender)
   const assetsNoBase = assets.filter(a => a !== baseAsset)
 
-  const allowedCall = {
-    address: cometContractAddress,
-    name: 'isAllowed',
-    params: [account, getComposerAddress(chainId)],
-  }
-
   const baseCalls = [
     {
       address: cometContractAddress,
@@ -45,7 +39,6 @@ export const buildCompoundV3UserCall = (chainId: string, lender: Lender, account
   const calls = [
     ...callsNonBase,
     ...baseCalls,
-    allowedCall,
     callEarnedBalances
   ]
   return calls

package/src/lending/user-data/compound-v3/userCallParse.ts

@@ -1,10 +1,15 @@
-import { Lender } from "@1delta/asset-registry"
-import { CompoundV3UserReserveResponse } from "../types"
-import { getAssetMeta, getCompoundV3Assets, toGenericPriceKey, toOracleKey } from "../../../assets"
-import { getCompoundV3BaseAsset } from "./addresses"
-import { parseRawAmount } from "../../../utils/parsing"
-import { Asset as SupportedAssets } from "@1delta/asset-registry"
-import { createBaseTypeUserState } from "../utils"
+import { Lender } from '@1delta/asset-registry'
+import { CompoundV3UserReserveResponse } from '../types'
+import {
+  getAssetMeta,
+  getCompoundV3Assets,
+  toGenericPriceKey,
+  toOracleKey,
+} from '../../../assets'
+import { getCompoundV3BaseAsset } from './addresses'
+import { parseRawAmount } from '../../../utils/parsing'
+import { Asset as SupportedAssets } from '@1delta/asset-registry'
+import { createBaseTypeUserState } from '../utils'
 
 export const getCompoundV3UserDataConverter = (
   lender: Lender,
@@ -12,21 +17,18 @@ export const getCompoundV3UserDataConverter = (
   account: string,
   prices: { [asset: string]: number },
   pricesHist: { [asset: string]: number },
-  lenderData: any
+  lenderData: any,
 ): [(data: any[]) => CompoundV3UserReserveResponse | undefined, number] => {
-
   const assetAddresses = getCompoundV3Assets(chainId, lender)
   const baseAsset = getCompoundV3BaseAsset(lender, chainId).baseAsset
-  const assetsNoBase = assetAddresses.filter(a => a !== baseAsset)
-  const expectedNumberOfCalls = assetsNoBase.length + 2 + 1 + 1
+  const assetsNoBase = assetAddresses.filter((a) => a !== baseAsset)
+  const expectedNumberOfCalls = assetsNoBase.length + 2 + 1
   return [
     (data: any[]) => {
       if (data.length !== expectedNumberOfCalls) {
         return undefined
       }
 
-      const isAllowed = Boolean(data[expectedNumberOfCalls - 2])
-
       let totalDebt24h = 0
       let totalDeposits24h = 0
 
@@ -36,9 +38,11 @@ export const getCompoundV3UserDataConverter = (
         const assetMeta = getAssetMeta(chainId, asset)
         const decimals = assetMeta?.decimals ?? 18
         const depositsRaw = data[i][0]?.toString()
-        if(depositsRaw === "0") continue; 
+        if (depositsRaw === '0') continue
         const deposits = parseRawAmount(depositsRaw, decimals)
-        const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)
+        const key =
+          toOracleKey(assetMeta?.assetGroup) ??
+          toGenericPriceKey(asset, chainId)
         const price = prices[key] ?? 1
 
         const priceHist = pricesHist?.[key] ?? price
@@ -52,14 +56,13 @@ export const getCompoundV3UserDataConverter = (
           deposits,
           depositsUSD: Number(deposits) * price,
           debtStableUSD: 0,
-          debt: "0",
-          debtStable: "0",
+          debt: '0',
+          debtStable: '0',
           debtUSD: 0,
           collateralActive: true,
           // user depos raw
           depositsRaw,
           // flag for allowance
-          isAllowed,
         }
       }
 
@@ -69,7 +72,9 @@ export const getCompoundV3UserDataConverter = (
       const baseDecimals = baseMeta.decimals ?? 18
       const deposits = parseRawAmount(depositsRaw, baseDecimals)
       const debt = parseRawAmount(debtRaw, baseDecimals)
-      const oracleKeyBase = toOracleKey(baseMeta?.assetGroup) ?? toGenericPriceKey(baseMeta.baseAsset, chainId)
+      const oracleKeyBase =
+        toOracleKey(baseMeta?.assetGroup) ??
+        toGenericPriceKey(baseMeta.baseAsset, chainId)
       const priceBase = prices[oracleKeyBase]
       const priceBaseHist = pricesHist?.[oracleKeyBase] ?? priceBase
 
@@ -86,22 +91,22 @@ export const getCompoundV3UserDataConverter = (
           depositsUSD: Number(deposits) * priceBase,
           debtUSD: Number(debt) * priceBase,
           // populate values for totals
-          debtStable: "0",
+          debtStable: '0',
           debtStableUSD: 0,
           collateralActive: true,
           // user depos raw
           depositsRaw,
           // flag for allowance
-          isAllowed,
         },
       }
 
-
       // the result is an array: [tokenAddress, owedAmount] (tokenAddress should be always COMP)
       // so we take [1] to get the owedAmount
       const earnedBalances = data[expectedNumberOfCalls - 1]
 
-      const compRewards = Number(parseRawAmount(earnedBalances?.owed?.toString(), 18))
+      const compRewards = Number(
+        parseRawAmount(earnedBalances?.owed?.toString(), 18),
+      )
       const payload = {
         lendingPositions: { [0]: { ...result, ...resultBase } },
         chainId,
@@ -109,18 +114,23 @@ export const getCompoundV3UserDataConverter = (
         rewards: {
           [SupportedAssets.COMP]: {
             totalRewards: compRewards,
-            claimableRewards: compRewards
-          }
+            claimableRewards: compRewards,
+          },
         },
-        account
+        account,
       }
 
-      const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h)
+      const userData = createBaseTypeUserState(
+        payload,
+        lenderData,
+        totalDeposits24h,
+        totalDebt24h,
+      )
       return {
         ...payload,
-        ...userData
+        ...userData,
       }
     },
     expectedNumberOfCalls,
   ]
-} 
+}

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

@@ -7,6 +7,8 @@ const MORPHO_LENS: { [c: string]: string } = {
   [Chain.POLYGON_MAINNET]: '0x105eb87D2b3127f43B1b4C0F125dbEb0EDF3d6C6',
   [Chain.OP_MAINNET]: '0xd184c5315B728c1C990f59dDD275c8155f8e255c',
   [Chain.ARBITRUM_ONE]: '0xF64F862Fb7D687411585e06C08711B612e156530',
+  [Chain.KATANA]: '0xcB6Eb8df68153cebF60E1872273Ef52075a5C297',
+  [Chain.HYPEREVM]: '0xCe434378adacC51d54312c872113D687Ac19B516',
 }
 
 const getBaseMorphoCalls = (
@@ -15,18 +17,18 @@ const getBaseMorphoCalls = (
   account: string,
   marketsToQuery: string[],
 ) => {
-  return marketsToQuery.flatMap(id => [
+  return marketsToQuery.flatMap((id) => [
     {
       // @ts-ignore
       address: MORPHO_BLUE_POOL_DATA[lender][chainId],
       name: 'position',
-      params: ["0x" + id.split("_")[1], account],
+      params: ['0x' + id.split('_')[1], account],
     },
     {
       // @ts-ignore
       address: MORPHO_BLUE_POOL_DATA[lender][chainId],
       name: 'market',
-      params: ["0x" + id.split("_")[1]],
+      params: ['0x' + id.split('_')[1]],
     },
   ])
 }
@@ -54,7 +56,7 @@ export const buildMorphoUserCallWithLens = (
     address: MORPHO_LENS[chainId],
     name: 'getUserDataCompact',
     params: [
-      marketsInChunk.map(a=> a.replace("MORPHO_BLUE_", "0x")),
+      marketsInChunk.map((a) => a.replace('MORPHO_BLUE_', '0x')),
       account,
       // @ts-ignore
       MORPHO_BLUE_POOL_DATA[lender][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,