@1delta/margin-fetcher 0.0.14 → 0.0.15-0.2

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

@@ -1,124 +0,0 @@
-import { Lender } from "@1delta/asset-registry"
-import { getAaveAssets, getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets"
-import { AaveV3UserReserveResponse } from "../types"
-import { createBaseTypeUserState } from "../utils"
-import { YldrTypeGetUserReserveIndexes } from "../../aave-v3-type/types"
-import { parseRawAmount } from "../../../utils/parsing"
-
-/** Like Aave V3, not stable debt data and no emode */
-export const getYldrUserDataConverter = (
-  lender: Lender,
-  chainId: string,
-  account: string,
-  prices: { [asset: string]: number },
-  pricesHist: { [asset: string]: number },
-  lenderData: any
-): [(data: any[]) => AaveV3UserReserveResponse | undefined, number] => {
-
-  const assetsToQuery = getAaveAssets(chainId, lender)
-  const expectedNumberOfCalls = assetsToQuery.length
-  return [
-    (data: any[]) => {
-      if (data.length !== expectedNumberOfCalls) {
-        return undefined
-      }
-      const lendingPositions: { [asset: string]: any } = {}
-
-      let totalDebt24h = 0
-      let totalDeposits24h = 0
-
-      for (let i = 0; i < assetsToQuery.length; i++) {
-        const asset = assetsToQuery[i]
-        const {
-          dataForAsset,
-          addedDebt,
-          addedDeposits
-        } = createAaveV3Entry(
-          i,
-          data,
-          chainId,
-          asset,
-          prices,
-          pricesHist,
-        )
-        if (!dataForAsset) continue;
-        totalDebt24h += addedDebt
-        totalDeposits24h += addedDeposits
-        lendingPositions[asset] = dataForAsset
-      }
-
-      const payload = {
-        chainId,
-        account,
-        lendingPositions: { "0": lendingPositions },
-        rewards: {},
-        userEMode: 0,
-      }
-
-      const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h)
-      return {
-        ...payload,
-        ...userData
-      }
-    },
-    expectedNumberOfCalls,
-  ]
-}
-
-function createAaveV3Entry(
-  i: number,
-  data: any[],
-  chainId: string,
-  asset: string,
-  prices: any,
-  pricesHist: any,
-) {
-  const reserveData = data[i]
-
-  const currentATokenBalanceRaw = reserveData[YldrTypeGetUserReserveIndexes.currentYTokenBalance]?.toString()
-  const currentVariableDebtRaw = reserveData[YldrTypeGetUserReserveIndexes.currentVariableDebt]?.toString()
-
-
-  if (
-    currentATokenBalanceRaw === "0" &&
-    currentVariableDebtRaw === "0") {
-    return {
-      dataForAsset: undefined,
-      addedDeposits: 0,
-      addedDebt: 0
-    }
-  }
-
-  const assetMeta = getAssetMeta(chainId, asset)
-  const decimals = assetMeta?.decimals ?? 18
-
-  const currentATokenBalance = parseRawAmount(currentATokenBalanceRaw, decimals)
-  const currentVariableDebt = parseRawAmount(currentVariableDebtRaw, decimals)
-
-
-  const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)
-  // prices
-  const price = prices[key] ?? 1
-  const priceHist = pricesHist?.[key] ?? price
-
-  const dataForAsset = {
-    poolId: asset,
-    underlying: asset,
-    deposits: currentATokenBalance,
-    depositsRaw: currentATokenBalanceRaw,
-    debtStable: "0",
-    debt: currentVariableDebt,
-    depositsUSD: Number(currentATokenBalance) * price,
-    debtStableUSD: 0,
-    debtUSD: Number(currentVariableDebt) * price,
-    stableBorrowRate: 0,
-    collateralActive: Boolean(reserveData[YldrTypeGetUserReserveIndexes.usageAsCollateralEnabled]),
-    claimableRewards: 0,
-  }
-
-  return {
-    dataForAsset,
-    addedDeposits: Number(currentATokenBalance) * priceHist,
-    addedDebt: Number(currentVariableDebt) * priceHist
-  }
-}

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

@@ -1,53 +0,0 @@
-import { Lender } from "@1delta/asset-registry"
-import { isAaveV2Type, isAaveV3Type, isCompoundV3, isInit, isAaveV32Type, isYLDR, isMorphoType } from "../../utils"
-import { IncentivesControllerAbi } from "../../abis/lendle/IncentivesController"
-import { RewarderAbi } from "../../abis/aurelius/Rewarder"
-import { AavePoolV3UpgradedAbi } from "../../abis/aave/AavePoolV3Upgraded"
-import { AaveV3ProtocolDataProviderAbi } from "../../abis/aave/AaveV3ProtocolDataProvider"
-import { InitLensAbi } from "../../abis/init/InitLens"
-import { CometAbi } from "../../abis/compound-v3/Comet"
-import { CometExtAbi } from "../../abis/compound-v3/CometExt"
-import { AavePoolLegacyAbi } from "../../abis/aave-v3/AavePoolLegacy"
-import { AavePoolDataProviderLegacyAbi } from "../../abis/aave-v3/AavePoolDataProviderLegacy"
-import { AavePoolAndDataProviderAbi } from "../../abis/aave/AavePoolAndDataProvider"
-import { VariableDebtTokenAbi } from "../../abis/aave/VariableDebtToken"
-import { MultiFeeDistributionAbi } from "../../abis/lendle/MultiFeeDistribution"
-import { PullRewardsIncentivesController } from "../../abis/meridian/PullRewardsIncentivesController"
-import { CometRewardsAbi } from "../../abis/compound-v3/CometRewards"
-import { YLDRAbi } from "../../abis/aave-v3/YLDR"
-import { MorphoBlueAbi } from "../../abis/morpho/blue"
-import { MorphoLensAbi } from "../../abis/morpho/lens"
-
-export const getAbi = (lender: Lender) => {
-  if (isAaveV2Type(lender as any)) return [
-    ...AavePoolAndDataProviderAbi,
-    ...VariableDebtTokenAbi,
-    ...RewarderAbi,
-    ...PullRewardsIncentivesController,
-    ...IncentivesControllerAbi,
-    ...MultiFeeDistributionAbi
-  ]
-  if (isYLDR(lender as any)) return [
-    ...VariableDebtTokenAbi,
-    ...YLDRAbi
-  ]
-
-  if (isAaveV32Type(lender as any)) return [
-    ...AavePoolV3UpgradedAbi,
-    ...AaveV3ProtocolDataProviderAbi
-  ]
-
-  if (isAaveV3Type(lender as any)) return [
-    ...AavePoolLegacyAbi,
-    ...VariableDebtTokenAbi,
-    ...AavePoolDataProviderLegacyAbi
-  ]
-  if (isCompoundV3(lender as any)) return [
-    ...CometAbi,
-    ...CometExtAbi,
-    ...CometRewardsAbi,
-  ]
-  if(isMorphoType(lender)) return [...MorphoBlueAbi, ...MorphoLensAbi]
-  if (isInit(lender as any)) return InitLensAbi
-  return []
-}

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

@@ -1,59 +0,0 @@
-import {
-  Chain,
-  COMETS_PER_CHAIN_MAP,
-  COMPOUND_BASE_TOKENS,
-  Lender,
-  SWAYLEND_BASE_TOKENS,
-} from "@1delta/asset-registry";
-
-export function getCompoundV3CometAddress(
-  chainId: string,
-  lender = Lender.COMPOUND_V3_USDCE
-): string | undefined {
-  return COMETS_PER_CHAIN_MAP[chainId]?.[lender];
-}
-
-export function getCompoundV3CometRewardsAddress(chainId: string) {
-  return addressesCompoundV3.cometRewards[
-    chainId as keyof typeof addressesCompoundV3.cometRewards
-  ];
-}
-
-export function getCompoundV3CometIRGetterAddress(chainId: string) {
-  return addressesCompoundV3.lens[
-    chainId as keyof typeof addressesCompoundV3.lens
-  ];
-}
-
-export function getCompoundV3CometLens(chainId: string) {
-  return addressesCompoundV3.lens[
-    chainId as keyof typeof addressesCompoundV3.lens
-  ];
-}
-
-const addressesCompoundV3 = {
-  lens: {
-    [Chain.POLYGON_MAINNET]: "0x4eDA401658c5286d16c4d342884F32280B4E8b1b",
-    [Chain.MANTLE]: "0x32B31A066c8dd3F7b77283Ba1d89Ddaf6DA0a8aE",
-    [Chain.ARBITRUM_ONE]: "0x13D9c35f4901491Ac4FFebd3100238BBfFBD7181",
-    [Chain.BASE]: "0x7e2D250E4FD0EeD6BD2cB3DC525A2b9f12508152",
-    [Chain.OP_MAINNET]: "0xA453ba397c61B0c292EA3959A858821145B2707F",
-  },
-  cometRewards: {
-    [Chain.POLYGON_MAINNET]: "0x45939657d1CA34A8FA39A924B71D28Fe8431e581",
-    [Chain.MANTLE]: "0xCd83CbBFCE149d141A5171C3D6a0F0fCCeE225Ab",
-    [Chain.ARBITRUM_ONE]: "0x88730d254A2f7e6AC8388c3198aFd694bA9f7fae",
-    [Chain.BASE]: "0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1",
-    [Chain.OP_MAINNET]: "0x443EA0340cb75a160F31A440722dec7b5bc3C2E9",
-  },
-};
-
-export function getCompoundV3BaseAsset(
-  lender: Lender | string,
-  chainId: string
-) {
-  return (
-    COMPOUND_BASE_TOKENS[lender]?.[chainId] ??
-    SWAYLEND_BASE_TOKENS[lender]?.[chainId]
-  );
-}

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

@@ -1,3 +0,0 @@
-export * from "./userCallBuild"
-export * from "./userCallParse"
-export * from "./addresses"

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

@@ -1,53 +0,0 @@
-import { Lender } from "@1delta/asset-registry"
-import { Call } from "../../../utils/multicall"
-import { getComposerAddress, getLenderAssets } from "../../../utils"
-import { getCompoundV3BaseAsset, getCompoundV3CometAddress, getCompoundV3CometRewardsAddress } from "./addresses"
-
-export const buildCompoundV3UserCall = (chainId: string, lender: Lender, account: string): Call[] => {
-
-  const baseAsset = getCompoundV3BaseAsset(lender, chainId).baseAsset
-  const cometContractAddress = getCompoundV3CometAddress(chainId, lender)!
-  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,
-      name: 'balanceOf',
-      params: [account],
-    },
-    {
-      address: cometContractAddress,
-      name: 'borrowBalanceOf',
-      params: [account],
-    }
-  ]
-
-  const callsNonBase: Call[] = assetsNoBase.map((tk) => {
-    return {
-      address: cometContractAddress,
-      name: 'userCollateral',
-      params: [account, tk],
-    }
-  })
-
-  const callEarnedBalances = {
-    address: getCompoundV3CometRewardsAddress(chainId),
-    name: 'getRewardOwed',
-    params: [cometContractAddress, account],
-  }
-  const calls = [
-    ...callsNonBase,
-    ...baseCalls,
-    allowedCall,
-    callEarnedBalances
-  ]
-  return calls
-
-}

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

@@ -1,126 +0,0 @@
-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,
-  chainId: string,
-  account: string,
-  prices: { [asset: string]: number },
-  pricesHist: { [asset: string]: number },
-  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
-  return [
-    (data: any[]) => {
-      if (data.length !== expectedNumberOfCalls) {
-        return undefined
-      }
-
-      const isAllowed = Boolean(data[expectedNumberOfCalls - 2])
-
-      let totalDebt24h = 0
-      let totalDeposits24h = 0
-
-      let result: { [asset: string]: any } = {}
-      for (let i = 0; i < assetsNoBase.length; i++) {
-        const asset = assetsNoBase[i]
-        const assetMeta = getAssetMeta(chainId, asset)
-        const decimals = assetMeta?.decimals ?? 18
-        const depositsRaw = data[i][0]?.toString()
-        if(depositsRaw === "0") continue; 
-        const deposits = parseRawAmount(depositsRaw, decimals)
-        const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)
-        const price = prices[key] ?? 1
-
-        const priceHist = pricesHist?.[key] ?? price
-
-        // accure
-        totalDeposits24h += Number(deposits) * priceHist
-
-        result[asset] = {
-          poolId: asset,
-          underlying: asset,
-          deposits,
-          depositsUSD: Number(deposits) * price,
-          debtStableUSD: 0,
-          debt: "0",
-          debtStable: "0",
-          debtUSD: 0,
-          collateralActive: true,
-          // user depos raw
-          depositsRaw,
-          // flag for allowance
-          isAllowed,
-        }
-      }
-
-      const depositsRaw = data[assetsNoBase.length]?.toString()
-      const debtRaw = data[assetsNoBase.length + 1]?.toString()
-      const baseMeta = getAssetMeta(chainId, baseAsset)
-      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 priceBase = prices[oracleKeyBase]
-      const priceBaseHist = pricesHist?.[oracleKeyBase] ?? priceBase
-
-      // accrue base data
-      totalDebt24h += Number(debt) * priceBaseHist
-      totalDeposits24h += Number(deposits) * priceBaseHist
-
-      const resultBase = {
-        [baseAsset]: {
-          poolId: baseAsset,
-          underlying: baseAsset,
-          deposits,
-          debt,
-          depositsUSD: Number(deposits) * priceBase,
-          debtUSD: Number(debt) * priceBase,
-          // populate values for totals
-          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 payload = {
-        lendingPositions: { [0]: { ...result, ...resultBase } },
-        chainId,
-        baseAsset,
-        rewards: {
-          [SupportedAssets.COMP]: {
-            totalRewards: compRewards,
-            claimableRewards: compRewards
-          }
-        },
-        account
-      }
-
-      const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h)
-      return {
-        ...payload,
-        ...userData
-      }
-    },
-    expectedNumberOfCalls,
-  ]
-} 

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

@@ -1,205 +0,0 @@
-import { Call, multicallViemAbiArray } from '../../utils/multicall'
-import { Lender } from '@1delta/asset-registry'
-import {
-  isAaveV2Type,
-  isAaveV3Type,
-  isInit,
-  isMorphoType,
-  isMultiMarket,
-  isYLDR,
-} from '../../utils'
-import { LenderUserQuery, organizeUserQueries } from './types'
-import { GetEvmClientFunction } from '../../types'
-import { buildAaveV2UserCall } from './aave-v2-type/userCallBuild'
-import { buildAaveV3UserCall } from './aave-v3-type/userCallBuild'
-import { buildInitUserCall } from './init/userCallBuild'
-import { buildCompoundV3UserCall } from './compound-v3/userCallBuild'
-import { getAbi } from './abis'
-import { getAaveV2UserDataConverter } from './aave-v2-type/userCallParse'
-import { getAaveV3UserDataConverter } from './aave-v3-type/userCallParse'
-import { getInitUserDataConverter } from './init/userCallParse'
-import { getCompoundV3UserDataConverter } from './compound-v3/userCallParse'
-import { getYldrUserDataConverter } from './aave-v3-type/userCallParseYldr'
-import { buildMorphoUserCallWithLens } from './morpho/userCallBuild'
-import { getMorphoUserDataConverterWithlens } from './morpho/userCallParse'
-
-function buildUserCall(
-  chainId: string,
-  lender: Lender,
-  account: string,
-  params?: any,
-) {
-  if (isAaveV2Type(lender)) return buildAaveV2UserCall(chainId, lender, account)
-  if (isAaveV3Type(lender)) return buildAaveV3UserCall(chainId, lender, account)
-  if (isInit(lender)) return buildInitUserCall(chainId, lender, account)
-  if (isMorphoType(lender))
-    return buildMorphoUserCallWithLens(chainId, account, lender, params)
-  return buildCompoundV3UserCall(chainId, lender, account)
-}
-
-function getUserDataConverter(
-  lender: Lender,
-  chainId: string,
-  account: string,
-  prices: { [a: string]: number },
-  pricesHist: { [a: string]: number },
-  lenderPublicState: any,
-  params?: any,
-) {
-  if (isYLDR(lender))
-    return getYldrUserDataConverter(
-      lender,
-      chainId,
-      account,
-      prices,
-      pricesHist,
-      lenderPublicState?.data?.[lender]?.data,
-    )
-  if (isAaveV2Type(lender))
-    return getAaveV2UserDataConverter(
-      lender,
-      chainId,
-      account,
-      prices,
-      pricesHist,
-      lenderPublicState?.data?.[lender]?.data,
-    )
-  if (isAaveV3Type(lender))
-    return getAaveV3UserDataConverter(
-      lender,
-      chainId,
-      account,
-      prices,
-      pricesHist,
-      lenderPublicState?.data?.[lender]?.data,
-    )
-  if (isInit(lender))
-    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?.data?.[lender]?.data,
-  )
-}
-
-/**
- * Builds the multicall calls for the given queries and returns the raw results
- * @param chainId - The chain ID
- * @param queries - The queries to fetch data for
- * @param getEvmClient - Injected function to get EVM client
- * @returns The raw results from the multicall
- */
-export const getLenderUserDataResult = async (
-  chainId: string,
-  queriesRaw: LenderUserQuery[],
-  getEvmClient: GetEvmClientFunction,
-): Promise<any[]> => {
-  let calls: {
-    call: Call
-    abi: any
-  }[] = []
-
-  const queries = organizeUserQueries(queriesRaw)
-  for (const query of queries) {
-    const abi = getAbi(query.lender)
-    const callData = buildUserCall(
-      chainId,
-      query.lender,
-      query.account,
-      query.params,
-    )
-    const mappedCalls = callData.map((call) => ({ call, abi }))
-    calls = [...calls, ...mappedCalls]
-  }
-
-  return await multicallViemAbiArray(
-    chainId,
-    calls.map((call) => call.abi),
-    calls.map((call) => call.call),
-    getEvmClient,
-    true,
-    0,
-    3,
-  )
-}
-
-/**
- * Converts the raw results into the desired format
- * @param chainId - The chain ID
- * @param queries - The queries to fetch data for
- * @param rawResults - The raw results from the multicall (getLenderUserDataResult)
- * @param prices - The prices for the assets
- * @param pricesHist - The historical prices for the assets
- * @param lenderState - The state of the lender
- * @returns The converted data
- */
-export const convertLenderUserDataResult = (
-  chainId: string,
-  queriesRaw: LenderUserQuery[],
-  rawResults: any[],
-  prices: any,
-  pricesHist: any,
-  lenderState: any,
-): { [lender: string]: any } => {
-  const queries = organizeUserQueries(queriesRaw)
-
-  const lenderData: { [lender: string]: any } = {}
-  let currentSlice = 0
-  for (const query of queries) {
-    const [converter, sliceLength] = getUserDataConverter(
-      query.lender,
-      chainId,
-      query.account,
-      prices,
-      pricesHist,
-      lenderState[chainId],
-      query.params,
-    )
-
-    try {
-      const data = rawResults.slice(currentSlice, currentSlice + sliceLength)
-      const convertedData = converter(data)
-
-      if (convertedData) {
-        if (isMultiMarket(query.lender)) {
-          Object.keys(convertedData).forEach((market) => {
-            lenderData[market] = {
-              // @ts-ignore
-              [query.account.toLowerCase()]: convertedData[market],
-            }
-          })
-        } else {
-          // map it to the user address
-          lenderData[query.lender] = {
-            [query.account.toLowerCase()]: convertedData,
-          }
-        }
-      }
-    } catch (e) {
-      console.log('Error parsing for', query.lender, 'on', chainId, e)
-    }
-    currentSlice += sliceLength
-  }
-
-  return lenderData
-}

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

@@ -1,2 +0,0 @@
-export * from "./fetchUserData"
-export * from "./types" 

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

@@ -1,26 +0,0 @@
-import { Chain, Lender } from "@1delta/asset-registry"
-import { Call } from "../../../utils/multicall"
-import { getInitLensAddress } from "../../addresses/init"
-
-export const initBrokerAddresses = {
-  [Chain.MANTLE]: '0xc08BFef7E778f3519D79E96780b77066F5d4FCC0'
-}
-
-export function getInitFlashAggregatorAddress(chainId?: string) {
-  if (!chainId) return undefined
-  return initBrokerAddresses[chainId as keyof typeof initBrokerAddresses]
-}
-
-export const buildInitUserCall = (chainId: string, lender: Lender, account: string): Call[] => {
-  const lensContract = getInitLensAddress(chainId)
-  const brokerAddress = getInitFlashAggregatorAddress(chainId)
-
-  const call: Call = {
-    address: lensContract,
-    name: 'getUserPositionData',
-    params: [account, brokerAddress],
-  }
-
-  return [call]
-
-}