@1delta/margin-fetcher 0.0.1 → 0.0.2

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

@@ -0,0 +1,116 @@
+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 * 4
+  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,
+        )
+        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 * 4]
+
+  const currentATokenBalanceRaw = reserveData[YldrTypeGetUserReserveIndexes.currentYTokenBalance]?.toString()
+  const currentVariableDebtRaw = reserveData[YldrTypeGetUserReserveIndexes.currentVariableDebt]?.toString()
+
+  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,
+    // allowances
+    allowanceWithdrawal: data[i * 4 + 1]?.toString(),
+    allowanceBorrowingVariable: "0",
+    allowanceBorrowingStable: data[i * 4 + 3]?.toString(),
+  }
+
+  return {
+    dataForAsset,
+    addedDeposits: Number(currentATokenBalance) * priceHist,
+    addedDebt: Number(currentVariableDebt) * priceHist
+  }
+}

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

@@ -1,5 +1,5 @@
 import { Lender } from "@1delta/asset-registry"
-import { isAaveV2Type, isAaveV3Type, isCompoundV3, isInit, isAaveV32Type } from "../../utils"
+import { isAaveV2Type, isAaveV3Type, isCompoundV3, isInit, isAaveV32Type, isYLDR } from "../../utils"
 import { IncentivesControllerAbi } from "../../abis/lendle/IncentivesController"
 import { RewarderAbi } from "../../abis/aurelius/Rewarder"
 import { AavePoolV3UpgradedAbi } from "../../abis/aave/AavePoolV3Upgraded"
@@ -14,32 +14,37 @@ 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"
 
 export const getAbi = (lender: Lender) => {
-    if (isAaveV2Type(lender as any)) return [
-      ...AavePoolAndDataProviderAbi,
-      ...VariableDebtTokenAbi,
-      ...RewarderAbi,
-      ...PullRewardsIncentivesController,
-      ...IncentivesControllerAbi,
-      ...MultiFeeDistributionAbi
-    ]
-  
-    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 (isInit(lender as any)) return InitLensAbi
-    return []
-  }
+  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 (isInit(lender as any)) return InitLensAbi
+  return []
+}

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

@@ -1,6 +1,6 @@
 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_USDC_E): string | undefined {
+export function getCompoundV3CometAddress(chainId: string, lender = Lender.COMPOUND_V3_USDCE): string | undefined {
     return COMETS_PER_CHAIN_MAP[chainId]?.[lender]
   }
   

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

@@ -1,7 +1,7 @@
 import { Lender } from "@1delta/asset-registry"
 import { formatUnits } from "viem"
 import { CompoundV3UserReserveResponse, UserLendingPosition, UserRewardEntry } from "../types"
-import { getAssetMeta, getCompoundV3Assets, toOracleKey } from "../../../assets"
+import { getAssetMeta, getCompoundV3Assets, toGenericPriceKey, toOracleKey } from "../../../assets"
 import { getCompoundV3BaseAsset } from "./addresses"
 import { parseRawAmount } from "../../../utils/parsing"
 import { Asset as SupportedAssets } from "@1delta/asset-registry"
@@ -38,9 +38,10 @@ export const getCompoundV3UserDataConverter = (
         const decimals = assetMeta?.decimals ?? 18
         const depositsRaw = data[i][0]?.toString()
         const deposits = parseRawAmount(depositsRaw, decimals)
-        const price = prices[toOracleKey(assetMeta.assetGroup)] ?? 1
+        const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(assetMeta.baseAsset, chainId)
+        const price = prices[key] ?? 1
 
-        const priceHist = pricesHist?.[toOracleKey(assetMeta.assetGroup)] ?? price
+        const priceHist = pricesHist?.[key] ?? price
 
         // accure
         totalDeposits24h += Number(deposits) * priceHist
@@ -67,8 +68,9 @@ export const getCompoundV3UserDataConverter = (
       const baseDecimals = baseMeta.decimals ?? 18
       const deposits = parseRawAmount(depositsRaw, baseDecimals)
       const debt = parseRawAmount(debtRaw, baseDecimals)
-      const priceBase = prices[toOracleKey(baseMeta.assetGroup)]
-      const priceBaseHist = pricesHist?.[toOracleKey(baseMeta.assetGroup)] ?? priceBase
+      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

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

@@ -1,6 +1,6 @@
 import { Call, multicallViemAbiArray } from "../../utils/multicall"
 import { Lender } from "@1delta/asset-registry"
-import { isAaveV2Type, isAaveV3Type, isInit } from "../../utils"
+import { isAaveV2Type, isAaveV3Type, isInit, isYLDR } from "../../utils"
 import { LenderUserQuery } from "./types"
 import { GetEvmClientFunction } from "../../types"
 import { buildAaveV2UserCall } from "./aave-v2-type/userCallBuild"
@@ -12,6 +12,7 @@ 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"
 
 function buildUserCall(
   chainId: string,
@@ -32,9 +33,10 @@ function getUserDataConverter(
   pricesHist: { [a: string]: number },
   lenderPublicState: any
 ) {
+  if (isYLDR(lender)) return getYldrUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState)
   if (isAaveV2Type(lender)) return getAaveV2UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState)
   if (isAaveV3Type(lender)) return getAaveV3UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState)
-  if (lender === Lender.INIT) return getInitUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState)
+  if (isInit(lender)) return getInitUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState)
   return getCompoundV3UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState)
 }
 

package/src/prices/main-prices/addresses/aaveOracles.ts

@@ -82,24 +82,24 @@ export const AAVE_STYLE_ORACLES = {
     "COLEND_LSTBTC": {
         "1116": "0xE48Cd3BBb290b317FC5651b145556A3c821f6a7A",
     },
-    "PAC_FINANCE": {
+    "PAC": {
         "81457": "0xAf77325317F109ee21459AFeEDE51b16C231e6b1",
     },
-    "AVALON_SOLV_BTC": {
+    "AVALON_SOLVBTC": {
         "1": "0x7db0217b628240f583fA8Cb01fb98B79B80e99F1",
         "56": "0xC204f75f22Ec427869aBf80b1b8Cf98e028f7Fc1",
         "34443": "0x90Ad8dCAD1455cD7FacE0f72De8eB5AB5ea1E6E6",
         "167000": "0xde32a52507BA4829fd433BCA44df340d96e1927E",
         "21000000": "0x8d116e023E3751C950C690B3f803cE2904D66783",
     },
-    "AVALON_PUMP_BTC": {
+    "AVALON_PUMPBTC": {
         "1": "0x1C0F8bfCc56D44d6a6f29b2B986E655D75853e8b",
         "56": "0x16e6B2BdAA245819989425dcA8E70EF4f5C86323",
         "7000": "0x90Ad8dCAD1455cD7FacE0f72De8eB5AB5ea1E6E6",
         "42161": "0x406010dA9450f62339FBF9e0aBBB2cEF6e426918",
         "21000000": "0xDc6b05dA37cEC58F0F31CCeb857503f1df0D0Ad9",
     },
-    "AVALON_SWELL_BTC": {
+    "AVALON_SWELLBTC": {
         "1": "0x82c3D86Ad6A48204b9e8953a98a5013d8B91D0Ad",
     },
     "AVALON_EBTC_LBTC": {
@@ -110,7 +110,6 @@ export const AAVE_STYLE_ORACLES = {
         "4200": "0x5223FDB92ce3f183AB40215be8b89bcc6a2021E0",
         "4689": "0xcC61B45A0F4C886afaB3be7051ffa1e55314ce30",
         "34443": "0x6f1e7D4cEDc797955417A7f0f6006b5B78D2696c",
-        "42161": "0x406010dA9450f62339FBF9e0aBBB2cEF6e426918",
         "60808": "0x89d2E832EDaAfF8C228A57a1602a1f7950Ea2D39",
         "200901": "0x7595DAC82A694cb03bfa4E83a2FEb5Fda55d481d",
     },
@@ -244,7 +243,7 @@ export const AAVE_STYLE_ORACLES = {
         "8453": "0xe9E53c7d3cF37aeb73e8f9b92bfA6150a7EC6a68",
         "42161": "0x2a61760f0413C7FC9e3120E3d51c961f6bb17452",
     },
-    "IRONCLAD_FINANCE": {
+    "IRONCLAD": {
         "34443": "0xE4F4F36FcBb2D53c0bAB95F5D117489579553CaA",
     },
     "MOLEND": {
@@ -273,7 +272,7 @@ export const AAVE_STYLE_ORACLES = {
     "KLAYBANK": {
         "8217": "0x4649B164EA320488c6129A9508D7eb1AD7E10fDC",
     },
-    "VALAS_FINANCE": {
+    "VALAS": {
         "56": "0x3436c4B4A27B793539844090e271591cbCb0303c",
     },
 }

package/src/utils/index.ts

@@ -6,7 +6,7 @@ export const AAVE_V3_2_PROTOCOLS = [
     Lender.AAVE_V3,
     Lender.AAVE_V3_ETHER_FI,
     Lender.AAVE_V3_PRIME,
-  ]
+]
 
 export function isAaveV3Type(lender: string) { return AAVE_V3_LENDERS.includes(lender as any) }
 
@@ -15,6 +15,8 @@ export function isAaveV3Original(lender: string) { return lender.startsWith(AAVE
 
 export function isAaveV2Type(lender: string) { return AAVE_V2_LENDERS.includes(lender as any) }
 
+export function isYLDR(lender: string) { return lender === Lender.YLDR }
+
 export function isAaveV32Type(lender: Lender) { return AAVE_V3_2_PROTOCOLS.includes(lender) }
 
 export function isAaveType(lender: string) { return [...AAVE_V3_LENDERS, ...AAVE_V2_LENDERS].includes(lender as any) }
@@ -77,11 +79,11 @@ export const getComposerAddress = (chainId: string): string => {
 export const getLenderAssets = (
     chainId: string | number | undefined,
     lendingProtocol = Lender.AAVE_V3
-  ): string[] => {
+): string[] => {
     if (!chainId) return []
     if (isAaveType(lendingProtocol)) return AAVE_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId] ?? []
     if (isCompoundV3(lendingProtocol)) return COMPOUND_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId] ?? []
     if (isInit(lendingProtocol)) return INIT_STYLE_RESERVE_ASSETS[lendingProtocol]?.[chainId] ?? []
     if (isSwaylend(lendingProtocol)) return SWAYLEND_RESERVE_ASSETS[lendingProtocol]?.[chainId ?? 0] ?? []
     return []
-  }
+}

package/src/utils/parsing.ts

@@ -46,7 +46,7 @@ export const formatAaveYieldToNumber = (n?: string | bigint): number => {
 export const calculateRateForCompound = (
     n: string,
     chainId: string,
-    lender = Lender.COMPOUND_V3_USDC_E,
+    lender = Lender.COMPOUND_V3_USDCE,
 ): number => {
     let scale = TimeScale.MS
     if (isCompoundV3(lender) || Lender.COMPOUND_V2) {

package/test/lenderData.test.ts

@@ -2712,7 +2712,7 @@ const testdata ={
           },
           "chainId": "137"
         },
-        "COMPOUND_V3_USDC_E": {
+        "COMPOUND_V3_USDCE": {
           "data": {
             "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619": {
               "poolId": "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619",

package/test/userdata.test.ts

@@ -62,6 +62,26 @@ describe(
       ]);
     }, 30000);
 
+
+    it(
+      "should fetch user data for YLDR on Polygon",
+      async () => {
+        try {
+          const { userData } = await getUserData(Chain.POLYGON_MAINNET, [Lender.YLDR]);
+
+          console.log("YLSE Polygon user data:", userData);
+
+          // Basic validation
+          expect(userData).toBeDefined();
+          expect(typeof userData).toBe("object");
+        } catch (error) {
+          console.log("Error fetching YLSE Polygon data:", error);
+        }
+      },
+      { timeout: 30000 }
+    );
+
+
     it(
       "should fetch user data for AAVE V3 on Base",
       async () => {
@@ -86,7 +106,7 @@ describe(
         try {
           const { userData, queries } = await getUserData(
             Chain.ARBITRUM_ONE,
-            [Lender.AAVE_V3, Lender.COMPOUND_V3_USDC, Lender.COMPOUND_V3_USDC_E]
+            [Lender.AAVE_V3, Lender.COMPOUND_V3_USDC, Lender.COMPOUND_V3_USDCE]
           );
 
           console.log("Arbitrum multi-protocol user data:", userData);