@1delta/margin-fetcher 0.0.46 → 0.0.47

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

@@ -1,141 +0,0 @@
-import { Lender } from '@1delta/lender-registry'
-import {
-  toGenericPriceKey,
-  toOracleKey,
-} from '../../../assets'
-import { AaveV3UserReserveResponse } from '../../../types/lenderTypes'
-import { createBaseTypeUserState } from '../utils'
-import { parseRawAmount } from '../../../utils/parsing'
-import { AaveTypeGetUserReserveIndexes } from '../../../types/lender/aave-v3-types'
-import { GenericCurrency } from '../../../types'
-
-export const getAaveV3UserDataConverter = (
-  lender: Lender,
-  chainId: string,
-  account: string,
-  prices: { [asset: string]: number },
-  pricesHist: { [asset: string]: number },
-  lenderData: any,
-): [(data: any[]) => AaveV3UserReserveResponse | undefined, number] => {
-  const assetsToQuery = Object.keys(lenderData)
-  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 } = {}
-
-      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,
-          lenderData[asset].asset,
-          prices,
-          pricesHist,
-        )
-        if (!dataForAsset) continue
-
-        totalDebt24h += addedDebt
-        totalDeposits24h += addedDeposits
-        lendingPositions[asset] = dataForAsset
-      }
-
-      const payload = {
-        chainId,
-        account,
-        lendingPositions: { '0': lendingPositions },
-        rewards: {},
-        userEMode,
-      }
-      const userData = createBaseTypeUserState(
-        payload,
-        lenderData,
-        totalDeposits24h,
-        totalDebt24h,
-      )
-      return {
-        ...payload,
-        ...userData,
-      }
-    },
-    expectedNumberOfCalls,
-  ]
-}
-
-function createAaveV3Entry(
-  i: number,
-  data: any[],
-  chainId: string,
-  asset: GenericCurrency,
-  prices: any,
-  pricesHist: any,
-) {
-  const reserveData = data[i]
-
-  const currentATokenBalanceRaw =
-    reserveData[AaveTypeGetUserReserveIndexes.currentATokenBalance]?.toString()
-  const currentStableDebtRaw =
-    reserveData[AaveTypeGetUserReserveIndexes.currentStableDebt]?.toString()
-  const currentVariableDebtRaw =
-    reserveData[AaveTypeGetUserReserveIndexes.currentVariableDebt]?.toString()
-
-  if (
-    currentATokenBalanceRaw === '0' &&
-    currentStableDebtRaw === '0' &&
-    currentVariableDebtRaw === '0'
-  ) {
-    return {
-      dataForAsset: undefined,
-      addedDeposits: 0,
-      addedDebt: 0,
-    }
-  }
-
-  const assetMeta = asset
-  const decimals = assetMeta?.decimals ?? 18
-
-  const currentATokenBalance = parseRawAmount(currentATokenBalanceRaw, decimals)
-  const currentStableDebt = parseRawAmount(currentStableDebtRaw, decimals)
-  const currentVariableDebt = parseRawAmount(currentVariableDebtRaw, decimals)
-
-  const key =
-    toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset.address, chainId)
-  // prices
-  const price = prices[key] ?? 1
-  const priceHist = pricesHist?.[key] ?? price
-
-  const dataForAsset = {
-    poolId: asset.address,
-    underlying: asset.address,
-    deposits: currentATokenBalance,
-    depositsRaw: currentATokenBalanceRaw,
-    debtStable: currentStableDebt,
-    debt: currentVariableDebt,
-    depositsUSD: Number(currentATokenBalance) * price,
-    debtStableUSD: Number(currentStableDebt) * price,
-    debtUSD: Number(currentVariableDebt) * price,
-    stableBorrowRate:
-      reserveData[AaveTypeGetUserReserveIndexes.stableBorrowRate]?.toString() ??
-      '0',
-    collateralActive: Boolean(
-      reserveData[AaveTypeGetUserReserveIndexes.usageAsCollateralEnabled],
-    ),
-    claimableRewards: 0,
-  }
-
-  return {
-    dataForAsset,
-    addedDeposits: Number(currentATokenBalance) * priceHist,
-    addedDebt:
-      (Number(currentVariableDebt) + Number(currentStableDebt)) * priceHist,
-  }
-}

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

@@ -1,127 +0,0 @@
-import { Lender } from '@1delta/lender-registry'
-import { toGenericPriceKey, toOracleKey } from '../../../assets'
-import { AaveV3UserReserveResponse } from '../../../types/lenderTypes'
-import { createBaseTypeUserState } from '../utils'
-import { parseRawAmount } from '../../../utils/parsing'
-import { GenericCurrency } from '../../../types'
-import { YldrTypeGetUserReserveIndexes } from '../../../types/lender/aave-v3-types'
-
-/** 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 = Object.keys(lenderData)
-  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,
-          lenderData[asset].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: GenericCurrency,
-  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 = asset
-  const decimals = assetMeta?.decimals ?? 18
-
-  const currentATokenBalance = parseRawAmount(currentATokenBalanceRaw, decimals)
-  const currentVariableDebt = parseRawAmount(currentVariableDebtRaw, decimals)
-
-  const key =
-    toOracleKey(assetMeta?.assetGroup) ??
-    toGenericPriceKey(asset.address, chainId)
-  // prices
-  const price = prices[key] ?? 1
-  const priceHist = pricesHist?.[key] ?? price
-
-  const dataForAsset = {
-    poolId: asset.address,
-    underlying: asset.address,
-    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/lender-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/index.ts

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

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

@@ -1,49 +0,0 @@
-import { Lender } from '@1delta/lender-registry'
-import { Call } from '../../../utils/multicall'
-import { getLenderAssets } from '../../../utils'
-import {
-  getCompoundV3BaseAsset,
-  getCompoundV3CometAddress,
-  getCompoundV3CometRewardsAddress,
-} from '../../addresses/compoundV3'
-
-export const buildCompoundV3UserCall = (
-  chainId: string,
-  lender: Lender,
-  account: string,
-  assetsOverride?: string[],
-): Call[] => {
-  const baseAsset = getCompoundV3BaseAsset(lender, chainId)?.baseAsset
-  const cometContractAddress = getCompoundV3CometAddress(chainId, lender)!
-  const assets = assetsOverride ?? getLenderAssets(chainId, lender)
-  const assetsNoBase = assets.filter((a) => a !== baseAsset)
-
-  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, callEarnedBalances]
-  return calls
-}

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

@@ -1,129 +0,0 @@
-import { Lender } from '@1delta/lender-registry'
-import { CompoundV3UserReserveResponse } from '../../../types/lenderTypes'
-import { toGenericPriceKey, toOracleKey } from '../../../assets'
-import { getCompoundV3BaseAsset } from '../../addresses/compoundV3'
-import { parseRawAmount } from '../../../utils/parsing'
-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 = Object.keys(lenderData)
-  const baseAsset = getCompoundV3BaseAsset(lender, chainId)?.baseAsset
-  const assetsNoBase = assetAddresses.filter((a) => a !== baseAsset)
-  const expectedNumberOfCalls = assetsNoBase.length + 2 + 1
-  return [
-    (data: any[]) => {
-      if (data.length !== expectedNumberOfCalls) {
-        return undefined
-      }
-
-      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 = lenderData[asset].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
-        }
-      }
-
-      const depositsRaw = data[assetsNoBase.length]?.toString()
-      const debtRaw = data[assetsNoBase.length + 1]?.toString()
-      const baseMeta = lenderData[baseAsset].asset
-      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
-        },
-      }
-
-      // 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: {
-          ['COMP']: {
-            totalRewards: compRewards,
-            claimableRewards: compRewards,
-          },
-        },
-        account,
-      }
-      const userData = createBaseTypeUserState(
-        payload,
-        lenderData,
-        totalDeposits24h,
-        totalDebt24h,
-      )
-      return {
-        ...payload,
-        ...userData,
-      }
-    },
-    expectedNumberOfCalls,
-  ]
-}