@1delta/margin-fetcher 0.0.46 → 0.0.47

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

@@ -1,218 +0,0 @@
-import {
-  Call,
-  MULTICALL_DEFAULT_BATCH_SIZE,
-  multicallViemAbiArray,
-} from '../../utils/multicall'
-import { Lender } from '@1delta/lender-registry'
-import {
-  isAaveV2Type,
-  isAaveV3Type,
-  isInit,
-  isMorphoType,
-  isMultiMarket,
-  isYLDR,
-} from '../../utils'
-import { LenderUserQuery, organizeUserQueries } from '../../types/lenderTypes'
-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,
-  assets?: any[],
-) {
-  if (isAaveV2Type(lender))
-    return buildAaveV2UserCall(chainId, lender, account, assets)
-  if (isAaveV3Type(lender))
-    return buildAaveV3UserCall(chainId, lender, account, assets)
-  if (isInit(lender)) return buildInitUserCall(chainId, lender, account)
-  if (isMorphoType(lender))
-    return buildMorphoUserCallWithLens(chainId, account, lender, params)
-  return buildCompoundV3UserCall(chainId, lender, account, assets)
-}
-
-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
- * @param allowFailure - multicall can fail in single call, default is true - note that this might mess with the retries as it will never error
- * @param batchSize - multicall batch size, default is 4096
- * @param logs - show multicall error logs, default is false
- * @param lenderData - optional public lender data to dynamically use pols and assets provided externally
- * @returns The raw results from the multicall, "0x" for failures
- */
-export const getLenderUserDataResult = async (
-  chainId: string,
-  queriesRaw: LenderUserQuery[],
-  getEvmClient: GetEvmClientFunction,
-  allowFailure = true,
-  batchSize = MULTICALL_DEFAULT_BATCH_SIZE,
-  retries = 3,
-  logs = false,
-): 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,
-      query.assets,
-    )
-    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,
-    retries,
-    allowFailure,
-    batchSize,
-    logs,
-  )
-}
-
-/**
- * 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) {}
-    currentSlice += sliceLength
-  }
-  return lenderData
-}

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

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

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

@@ -1,30 +0,0 @@
-import { Chain } from '@1delta/chain-registry'
-import { Lender } from '@1delta/lender-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]
-}

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

@@ -1,115 +0,0 @@
-import { Lender } from '@1delta/lender-registry'
-import { InitUserReserveResponse } from "../../../types/lenderTypes"
-import { getInitFlashAggregatorAddress } from "./userCallBuild"
-import { getLenderAssets } from "../../../utils"
-import { toOracleKey } from "../../../assets"
-import { parseRawAmount } from "../../../utils/parsing"
-import { createMultiAccountTypeUserState } from "../utils/createMultiAccountStyleUserState"
-import { InitGetUserPositionDataIndexes } from '../../../types/lender/init-types'
-
-export const getInitUserDataConverter = (
-  lender: Lender,
-  chainId: string,
-  account: string,
-  prices: { [asset: string]: number },
-  pricesHist: { [asset: string]: number },
-  lenderData: any
-): [(data: any[]) => InitUserReserveResponse | undefined, number] => {
-  const validOwner = account.toLowerCase()
-  const brokerAddress = getInitFlashAggregatorAddress(chainId) ?? ''
-  const expectedNumberOfCalls = 1
-  return [
-    (_data: any[]) => {
-      if (_data.length !== expectedNumberOfCalls) {
-        return undefined
-      }
-      const [data] = _data
-      // filter for owner
-      const indexes = data[InitGetUserPositionDataIndexes.posMeta].map(
-        (e: any, i: number) => { return { e, i } }
-      ).filter((a: any) => a.e.owner.toLowerCase() === validOwner).map((a: any) => a.i)
-      const assets = getLenderAssets(chainId, lender)
-
-      let histData: any = {}
-
-      // map data
-      const result: any = Object.assign(
-        {},
-        ...indexes.map((index: any) => {
-          const entry = data[InitGetUserPositionDataIndexes.posMeta][index]
-          const mode = entry.mode
-          const id = entry.posId.toString()
-          const collatData = Object.assign({}, ...data[InitGetUserPositionDataIndexes.collaterals][index].map((c: any) => {
-            const asset = c.underlying.toLowerCase()
-            const decimals = lenderData[asset].asset?.decimals ?? 18
-            const depositsRaw = c.amount.toString()
-            return { [asset]: { deposits: parseRawAmount(depositsRaw, decimals), depositsRaw } }
-          })
-          )
-          const debtData = Object.assign({}, ...data[InitGetUserPositionDataIndexes.debts][index].map((c: any) => {
-            const asset = c.underlying.toLowerCase()
-            const decimals =  lenderData[asset]?.asset?.decimals ?? 18
-            return { [asset]: { debt: parseRawAmount(c.amount.toString(), decimals) } }
-          })
-          )
-          // sub account to asset data
-          return {
-            [id]: {
-              mode,
-              ...Object.assign({}, ...assets.map(a => {
-                const ams = toOracleKey(lenderData[a]?.asset?.assetGroup!)
-                const price = prices[ams] ?? 1
-                const priceHist = pricesHist?.[ams] ?? price
-                if (!histData[id]) histData[id] = {
-                  totalDebt24h: 0,
-                  totalDeposits24h: 0,
-                }
-                const debt = debtData[a]?.debt ?? 0
-                const deposits = collatData[a]?.deposits ?? 0
-                const depositsRaw = collatData[a]?.depositsRaw ?? "0"
-
-                histData[id].totalDebt24h += Number(debt) * priceHist
-                histData[id].totalDeposits24h += Number(deposits) * priceHist
-
-                // asset to data
-                return {
-                  [a]: {
-                    poolId: a,
-                    underlying: a,
-                    deposits: deposits,
-                    depositsRaw,
-                    debt: debt,
-                    debtStable: "0",
-                    debtStableUSD: 0,
-                    depositsUSD: price * Number(deposits),
-                    debtUSD: price * Number(debt),
-                    collateralActive: true,
-                    isAllowed: entry.approved.toLowerCase() === brokerAddress.toLowerCase(),
-                  }
-                }
-              })
-              )
-            }
-          }
-        })
-      )
-
-      const payload = {
-        chainId,
-        lendingPositions: result,
-        account
-      }
-
-      const userState = createMultiAccountTypeUserState(
-        { ...payload, assets },
-        lenderData,
-        histData
-      )
-      return {
-        ...payload,
-        ...userState
-      } as any
-    },
-    expectedNumberOfCalls,
-  ]
-}

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

@@ -1,71 +0,0 @@
-export interface BalanceInfo {
-  index: number;           // uint16 (2 bytes)
-  supplyShares: bigint;    // uint256 (32 bytes)
-  borrowShares: bigint;    // uint128 (16 bytes)
-  supplyAssets: bigint;    // uint256 (32 bytes)
-  borrowAssets: bigint;    // uint256 (32 bytes)
-  collateral: bigint;      // uint128 (16 bytes)
-}
-
-const WORD = 32;
-const HALF = 16;
-
-/** Read `len` bytes at `off` as a big‐endian BigInt. */
-function readBigIntBE(buf: Uint8Array, off: number, len: number): bigint {
-  let v = 0n;
-  for (let i = 0; i < len; i++) {
-    v = (v << 8n) | BigInt(buf[off + i]);
-  }
-  return v;
-}
-
-/**
- * Decode:
- *  [ uint256 count (32 bytes) ]
- *  then for each of `count` records:
- *    uint16  index (2 bytes),
- *    uint256 supplyShares (32 bytes),
- *    uint128 borrowShares (16 bytes),
- *    uint256 supplyAssets (32 bytes),
- *    uint256 borrowAssets (32 bytes),
- *    uint128 collateral   (16 bytes)
- */
-export function decodePackedDataset(hex: string): BalanceInfo[] {
-  if (hex.startsWith("0x")) hex = hex.slice(2);
-  const buf = Uint8Array.from(hex.match(/.{1,2}/g)!.map((b) => parseInt(b, 16)));
-
-  // 1) count (uint256)
-  const count = Number(readBigIntBE(buf, 0, 2));
-  const out: BalanceInfo[] = [];
-
-  let off = 2;
-  for (let i = 0; i < count; i++) {
-    // 2) index (uint16)
-    const index = Number(readBigIntBE(buf, off, 2)); 
-    off += 2;
-
-    // 3) supplyShares (uint256)
-    const supplyShares = readBigIntBE(buf, off, WORD);
-    off += WORD;
-
-    // 4) borrowShares (uint128)
-    const borrowShares = readBigIntBE(buf, off, HALF);
-    off += HALF;
-
-    // 5) supplyAssets (uint256)
-    const supplyAssets = readBigIntBE(buf, off, WORD);
-    off += WORD;
-
-    // 6) borrowAssets (uint256)
-    const borrowAssets = readBigIntBE(buf, off, WORD);
-    off += WORD;
-
-    // 7) collateral (uint128)
-    const collateral = readBigIntBE(buf, off, HALF);
-    off += HALF;
-
-    out.push({ index, supplyShares, borrowShares, supplyAssets, borrowAssets, collateral });
-  }
-
-  return out;
-}

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

@@ -1,61 +0,0 @@
-// Constants
-const VIRTUAL_SHARES = 10n ** 6n;
-const VIRTUAL_ASSETS = 1n;
-
-
-function mulDivDown(x: bigint, y: bigint, d: bigint): bigint {
-    return (x * y) / d;
-}
-
-function mulDivUp(x: bigint, y: bigint, d: bigint): bigint {
-    return (x * y + (d - 1n)) / d;
-}
-
-
-export function toSharesDown(
-    assets: bigint,
-    totalAssets: bigint,
-    totalShares: bigint
-): bigint {
-    return mulDivDown(
-        assets,
-        totalShares + VIRTUAL_SHARES,
-        totalAssets + VIRTUAL_ASSETS
-    );
-}
-
-export function toAssetsDown(
-    shares: bigint,
-    totalAssets: bigint,
-    totalShares: bigint
-): bigint {
-    return mulDivDown(
-        shares,
-        totalAssets + VIRTUAL_ASSETS,
-        totalShares + VIRTUAL_SHARES
-    );
-}
-
-export function toSharesUp(
-    assets: bigint,
-    totalAssets: bigint,
-    totalShares: bigint
-): bigint {
-    return mulDivUp(
-        assets,
-        totalShares + VIRTUAL_SHARES,
-        totalAssets + VIRTUAL_ASSETS
-    );
-}
-
-export function toAssetsUp(
-    shares: bigint,
-    totalAssets: bigint,
-    totalShares: bigint
-): bigint {
-    return mulDivUp(
-        shares,
-        totalAssets + VIRTUAL_ASSETS,
-        totalShares + VIRTUAL_SHARES
-    );
-}

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

@@ -1,12 +0,0 @@
-export enum MorphoPositionParams {
-    supplyShares = 0,
-    borrowShares,
-    collateral,
-}
-
-export enum MorphoMarketParams {
-    totalSupplyAssets = 0,
-    totalSupplyShares,
-    totalBorrowAssets,
-    totalBorrowShares,
-}

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

@@ -1,72 +0,0 @@
-import { Lender } from '@1delta/lender-registry'
-import { Chain } from '@1delta/chain-registry'
-import { Call } from '../../../utils/multicall'
-import { chunk } from 'lodash'
-import { morphoPools } from '@1delta/data-sdk'
-
-export const MORPHO_LENS: { [c: string]: string } = {
-  [Chain.HEMI_NETWORK]: '0x1170Ef5B1A7f9c4F0ce34Ddf66CC0e6090Fd107E',
-  [Chain.BASE]: '0x05f3f58716a88A52493Be45aA0871c55b3748f18',
-  [Chain.POLYGON_MAINNET]: '0x04102873b1A80647879Aa8B8a119F07aE08f457a',
-  [Chain.OP_MAINNET]: '0x61895aEB0a42679E2Df8EE64334C405a8d47D244',
-  [Chain.ARBITRUM_ONE]: '0xeaC918F73Ba5b11D21D31a72BD00ca4A22865C3f',
-  [Chain.KATANA]: '0xCe434378adacC51d54312c872113D687Ac19B516',
-  [Chain.HYPEREVM]: '0x6Bc6aCB905c1216B0119C87Bf9E178ce298310FA',
-  [Chain.SONEIUM]: '0x4b5458BB47dCBC1a41B31b41e1a8773dE312BE9d',
-  [Chain.ETHEREUM_MAINNET]: '0x4b5458BB47dCBC1a41B31b41e1a8773dE312BE9d',
-  [Chain.PLASMA_MAINNET]: '0xcB6Eb8df68153cebF60E1872273Ef52075a5C297',
-}
-
-const getBaseMorphoCalls = (
-  lender: string,
-  chainId: string,
-  account: string,
-  marketsToQuery: string[],
-) => {
-  const mbPool = morphoPools()?.[lender]?.[chainId]
-  return marketsToQuery.flatMap((id) => [
-    {
-      // @ts-ignore
-      address: mbPool,
-      name: 'position',
-      params: ['0x' + id.split('_')[1], account],
-    },
-    {
-      // @ts-ignore
-      address: mbPool,
-      name: 'market',
-      params: ['0x' + id.split('_')[1]],
-    },
-  ])
-}
-
-export const buildMorphoUserCall = (
-  chainId: string,
-  account: string,
-  lender: Lender,
-  marketsToQuery: string[],
-): Call[] => {
-  const calls = getBaseMorphoCalls(lender, chainId, account, marketsToQuery)
-
-  return calls
-}
-
-export const buildMorphoUserCallWithLens = (
-  chainId: string,
-  account: string,
-  lender: Lender,
-  marketsToQuery: string[],
-): Call[] => {
-  // 100 per call
-  const marketSlices = chunk(marketsToQuery, 100)
-  return marketSlices.flatMap((marketsInChunk) => ({
-    address: MORPHO_LENS[chainId],
-    name: 'getUserDataCompact',
-    params: [
-      marketsInChunk.map((a) => a.replace('MORPHO_BLUE_', '0x')),
-      account,
-      // @ts-ignore
-      morphoPools()?.[lender]?.[chainId],
-    ],
-  }))
-}