@1delta/margin-fetcher 0.0.2 → 0.0.4

package/dist/lending/user-data/compound-v3/userCallParse.js

@@ -23,7 +23,7 @@ export const getCompoundV3UserDataConverter = (lender, chainId, account, prices,
                 const decimals = assetMeta?.decimals ?? 18;
                 const depositsRaw = data[i][0]?.toString();
                 const deposits = parseRawAmount(depositsRaw, decimals);
-                const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(assetMeta.baseAsset, chainId);
+                const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
                 const price = prices[key] ?? 1;
                 const priceHist = pricesHist?.[key] ?? price;
                 // accure

package/dist/lending/user-data/fetchUserData.js

@@ -61,7 +61,7 @@ export const convertLenderUserDataResult = (chainId, queries, rawResults, prices
     const lenderData = {};
     let currentSlice = 0;
     for (const query of queries) {
-        const [converter, sliceLength] = getUserDataConverter(query.lender, chainId, query.account, prices, pricesHist, lenderState[query.lender]?.[chainId]?.lenderData);
+        const [converter, sliceLength] = getUserDataConverter(query.lender, chainId, query.account, prices, pricesHist, lenderState[chainId]?.data?.[query.lender]?.data);
         try {
             const data = rawResults.slice(currentSlice, currentSlice + sliceLength);
             const convertedData = converter(data);

package/dist/lending/user-data/init/userCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/init/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,uBAAuB,EAAwC,MAAM,UAAU,CAAA;AAQxF,eAAO,MAAM,wBAAwB,GACnC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,uBAAuB,GAAG,SAAS,EAAE,MAAM,CAiG/D,CAAA"}
+{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/init/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAA;AAQlD,eAAO,MAAM,wBAAwB,GACnC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,YAAY;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACvC,YAAY,GAAG,KACd,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,uBAAuB,GAAG,SAAS,EAAE,MAAM,CAkG/D,CAAA"}

package/dist/lending/user-data/init/userCallParse.js

@@ -1,4 +1,3 @@
-import { Lender } from "@1delta/asset-registry";
 import { getInitFlashAggregatorAddress } from "./userCallBuild";
 import { InitGetUserPositionDataIndexes } from "../../init/types";
 import { getLenderAssets } from "../../../utils";
@@ -17,7 +16,7 @@ export const getInitUserDataConverter = (lender, chainId, account, prices, price
             const [data] = _data;
             // filter for owner
             const indexes = data[InitGetUserPositionDataIndexes.posMeta].map((e, i) => { return { e, i }; }).filter((a) => a.e.owner.toLowerCase() === validOwner).map((a) => a.i);
-            const assets = getLenderAssets(chainId, Lender.INIT);
+            const assets = getLenderAssets(chainId, lender);
             let histData = {};
             // map data
             const result = Object.assign({}, ...indexes.map((index) => {
@@ -35,6 +34,7 @@ export const getInitUserDataConverter = (lender, chainId, account, prices, price
                     const decimals = getAssetMeta(chainId, asset)?.decimals ?? 18;
                     return { [asset]: { debt: parseRawAmount(c.amount.toString(), decimals) } };
                 }));
+                // sub account to asset data
                 return {
                     [id]: {
                         mode,
@@ -52,6 +52,7 @@ export const getInitUserDataConverter = (lender, chainId, account, prices, price
                             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,

package/dist/lending/user-data/types.d.ts

@@ -190,18 +190,16 @@ export interface InitUserReserveResponse {
     chainId: string;
     lendingPositions: {
         [posId: string]: {
-            mode: number;
-            positions: {
-                [tokenSymbol: string]: {
-                    deposits: number;
-                    debt: number;
-                    depositsUSD: number;
-                    debtUSD: number;
-                    debtStable: 0;
-                    debtStableUSD: 0;
-                    collateralActive: boolean;
-                    isAllowed: boolean;
-                };
+            mode: any;
+            [tokenSymbol: string]: {
+                deposits: number;
+                debt: number;
+                depositsUSD: number;
+                debtUSD: number;
+                debtStable: 0;
+                debtStableUSD: 0;
+                collateralActive: boolean;
+                isAllowed: boolean;
             };
         };
     };

package/dist/lending/user-data/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/types.ts"],"names":[],"mappings":"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"}

package/dist/lending/user-data/utils/createMultiAccountStyleUserState.js

@@ -36,7 +36,7 @@ export function createMultiAccountTypeUserState(payload, lenderData, histData) {
         let adjustedDebt = 0;
         for (let i = 0; i < assetKeys.length; i++) {
             const asset = assetKeys[i];
-            const { depositsUSD, debtUSD } = payload.lendingPositions[posId].positions[asset];
+            const { depositsUSD, debtUSD } = payload.lendingPositions[posId][asset];
             if (!lenderData?.[asset])
                 continue;
             const { depositRate, stakingYield, variableBorrowRate, rewards } = lenderData[asset];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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

@@ -38,7 +38,7 @@ export const getCompoundV3UserDataConverter = (
         const decimals = assetMeta?.decimals ?? 18
         const depositsRaw = data[i][0]?.toString()
         const deposits = parseRawAmount(depositsRaw, decimals)
-        const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(assetMeta.baseAsset, chainId)
+        const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)
         const price = prices[key] ?? 1
 
         const priceHist = pricesHist?.[key] ?? price

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

@@ -103,7 +103,7 @@ export const convertLenderUserDataResult = (
       query.account,
       prices,
       pricesHist,
-      lenderState[query.lender]?.[chainId]?.lenderData
+      lenderState[chainId]?.data?.[query.lender]?.data
     )
 
     try {

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

@@ -1,6 +1,5 @@
 import { Lender } from "@1delta/asset-registry"
-import { formatUnits } from "viem"
-import { InitUserReserveResponse, UserLendingPosition, UserRewardEntry } from "../types"
+import { InitUserReserveResponse } from "../types"
 import { getInitFlashAggregatorAddress } from "./userCallBuild"
 import { InitGetUserPositionDataIndexes } from "../../init/types"
 import { getLenderAssets } from "../../../utils"
@@ -27,33 +26,33 @@ export const getInitUserDataConverter = (
       const [data] = _data
       // filter for owner
       const indexes = data[InitGetUserPositionDataIndexes.posMeta].map(
-        (e: any, i: any) => { return { e, i } }
-      ).filter((a: { e: { owner: string } }) => a.e.owner.toLowerCase() === validOwner).map((a: { i: any }) => a.i)
-      const assets = getLenderAssets(chainId, Lender.INIT)
+        (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: { [id: string]: { totalDebt24h: number; totalDeposits24h: number } } = {}
+      let histData: any = {}
 
       // map data
       const result: any = Object.assign(
         {},
-        ...indexes.map((index: string | number) => {
+        ...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: { underlying: string; amount: { toString: () => any } }) => {
+          const collatData = Object.assign({}, ...data[InitGetUserPositionDataIndexes.collaterals][index].map((c: any) => {
             const asset = c.underlying.toLowerCase()
             const decimals = getAssetMeta(chainId, 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: { underlying: string; amount: { toString: () => string | undefined } }) => {
+          const debtData = Object.assign({}, ...data[InitGetUserPositionDataIndexes.debts][index].map((c: any) => {
             const asset = c.underlying.toLowerCase()
             const decimals = getAssetMeta(chainId, asset)?.decimals ?? 18
             return { [asset]: { debt: parseRawAmount(c.amount.toString(), decimals) } }
           })
           )
-
+          // sub account to asset data
           return {
             [id]: {
               mode,
@@ -72,6 +71,7 @@ export const getInitUserDataConverter = (
                 histData[id].totalDebt24h += Number(debt) * priceHist
                 histData[id].totalDeposits24h += Number(deposits) * priceHist
 
+                // asset to data
                 return {
                   [a]: {
                     poolId: a,
@@ -112,4 +112,4 @@ export const getInitUserDataConverter = (
     },
     expectedNumberOfCalls,
   ]
-} 
+}

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

@@ -66,7 +66,7 @@ export enum AaveV3TypeGetUserReserveData {
   liquidityRate,
   stableRateLastUpdated,
   usageAsCollateralEnabled,
-} 
+}
 
 ///////
 export interface AaveV2UserReserveResponse {
@@ -249,18 +249,16 @@ export interface InitUserReserveResponse {
   lendingPositions: {
     // positionId is the NFT id
     [posId: string]: {
-      mode: number;
-      positions: {
-        [tokenSymbol: string]: {
-          deposits: number
-          debt: number,
-          depositsUSD: number
-          debtUSD: number,
-          debtStable: 0,
-          debtStableUSD: 0,
-          collateralActive: boolean
-          isAllowed: boolean
-        }
+      mode: any;
+      [tokenSymbol: string]: {
+        deposits: number
+        debt: number,
+        depositsUSD: number
+        debtUSD: number,
+        debtStable: 0,
+        debtStableUSD: 0,
+        collateralActive: boolean
+        isAllowed: boolean
       }
     }
   }

package/src/lending/user-data/utils/createMultiAccountStyleUserState.ts

@@ -48,7 +48,7 @@ export function createMultiAccountTypeUserState(
     let adjustedDebt = 0
     for (let i = 0; i < assetKeys.length; i++) {
       const asset = assetKeys[i]
-      const { depositsUSD, debtUSD } = payload.lendingPositions[posId].positions[asset]
+      const { depositsUSD, debtUSD } = payload.lendingPositions[posId][asset]
       if (!lenderData?.[asset]) continue;
       const { depositRate, stakingYield, variableBorrowRate, rewards } = lenderData[asset]
       // amounts

package/test/userdata.test.ts

@@ -18,13 +18,15 @@ let prices, yields;
 
 async function getUserData(chainId: Chain, lenders: Lender[]) {
   const _lenders = getLendersForChain(chainId);
-  const publicData = await getLenderPublicData(
-    chainId,
-    _lenders as any,
-    prices as any,
-    yields as any,
-    multicallRetry
-  );
+  const publicData = {
+    data: await getLenderPublicData(
+      chainId,
+      _lenders as any,
+      prices as any,
+      yields as any,
+      multicallRetry
+    )
+  }
 
   // Define user queries
   const queries: LenderUserQuery[] = lenders.map((lender) => ({
@@ -46,7 +48,7 @@ async function getUserData(chainId: Chain, lenders: Lender[]) {
     rawUserData,
     prices as any,
     prices as any,
-    publicData
+    { [chainId]: publicData }
   );
 
   return { userData, rawUserData, publicData, queries };
@@ -63,19 +65,39 @@ describe(
     }, 30000);
 
 
+    it(
+      "should fetch user data for INIT on Mantle",
+      async () => {
+        try {
+          const { userData } = await getUserData(Chain.MANTLE, [Lender.INIT]);
+
+          console.log("INIT Mantle user data:", userData);
+
+          // Basic validation
+          expect(userData).toBeDefined();
+          expect(typeof userData).toBe("object");
+        } catch (error) {
+          console.log("Error fetching INIT Mantle data:", error);
+        }
+      },
+      { timeout: 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);
+          console.log("YLDR Polygon user data:", userData[Lender.YLDR].balanceData);
+          console.log("YLDR Polygon user aprData:", userData[Lender.YLDR].aprData);
 
           // Basic validation
           expect(userData).toBeDefined();
           expect(typeof userData).toBe("object");
         } catch (error) {
-          console.log("Error fetching YLSE Polygon data:", error);
+          console.log("Error fetching YLDR Polygon data:", error);
         }
       },
       { timeout: 30000 }