@1delta/margin-fetcher 0.0.3 → 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1delta/margin-fetcher",
-  "version": "0.0.3",
+  "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/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,7 +65,7 @@ describe(
     }, 30000);
 
 
-    it.only(
+    it(
       "should fetch user data for INIT on Mantle",
       async () => {
         try {
@@ -88,7 +90,8 @@ describe(
         try {
           const { userData } = await getUserData(Chain.POLYGON_MAINNET, [Lender.YLDR]);
 
-          console.log("YLDR 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();