@1delta/margin-fetcher 0.0.14 → 0.0.15

package/dist/lending/user-data/morpho/userCallParse.d.ts

@@ -1,5 +1,5 @@
-import { Lender } from "@1delta/asset-registry";
-import { MorphoUserReserveResponse } from "../types";
+import { Lender } from '@1delta/asset-registry';
+import { MorphoUserReserveResponse } from '../types';
 export declare const getMorphoUserDataConverterWithlens: (lender: Lender, chainId: string, account: string, markets: string[], prices: {
     [asset: string]: number;
 }, pricesHist: {

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

@@ -1 +1 @@
-{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAMpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,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;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAAE,MAAM,CA2DvF,CAAA"}
+{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAE/C,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAMpD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,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,CACD,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAC5E,MAAM,CAwDP,CAAA"}

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

@@ -1,18 +1,17 @@
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets";
-import { createBaseTypeUserState } from "../utils";
-import { parseRawAmount } from "../../../utils/parsing";
-import { decodePackedDataset } from "./decoder";
+import { getAssetMeta, toGenericPriceKey, toOracleKey } from '../../../assets';
+import { createBaseTypeUserState } from '../utils';
+import { parseRawAmount } from '../../../utils/parsing';
+import { decodePackedDataset } from './decoder';
 export const getMorphoUserDataConverterWithlens = (lender, chainId, account, markets, prices, pricesHist, lenderData) => {
-    const expectedNumberOfCalls = markets.length * 2;
+    const expectedNumberOfCalls = Math.ceil(markets.length / 100);
     return [
         (data) => {
             // chunksizes depend on markets
-            const slices = Math.ceil(markets.length / 100);
-            if (data.length !== slices) {
+            if (data.length !== expectedNumberOfCalls) {
                 return undefined;
             }
             // de-chunk the calldata
-            const returnDatas = data.flatMap(d => decodePackedDataset(d));
+            const returnDatas = data.flatMap((d) => decodePackedDataset(d));
             let datas = {};
             for (let i = 0; i < returnDatas.length; i++) {
                 let totalDebt24h = 0;
@@ -20,15 +19,13 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                 const balanceData = returnDatas[i];
                 const markeId = markets[balanceData.index];
                 const market = lenderData[markeId]?.params?.market;
-                const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(i, balanceData, chainId, market, prices, pricesHist);
-                if (!dataForMarket)
-                    continue;
+                const { dataForMarket, addedDebt, addedDeposits } = createMorphoEntryFromMarketWithLens(balanceData, chainId, market, prices, pricesHist);
                 totalDebt24h += addedDebt;
                 totalDeposits24h += addedDeposits;
                 const payload = {
                     chainId,
                     account,
-                    lendingPositions: { "0": dataForMarket },
+                    lendingPositions: { '0': dataForMarket },
                     rewards: {},
                     userEMode: 0,
                 };
@@ -36,7 +33,7 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                 datas[market.lender] = {
                     ...payload,
                     ...userData,
-                    id: market.id
+                    id: market.id,
                 };
             }
             return datas;
@@ -44,7 +41,7 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
         expectedNumberOfCalls,
     ];
 };
-function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, prices, pricesHist) {
+function createMorphoEntryFromMarketWithLens(balanceInfo, chainId, market, prices, pricesHist) {
     const loanAddress = market.loanAddress.toLowerCase();
     const loanMeta = getAssetMeta(chainId, loanAddress);
     const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId);
@@ -53,27 +50,36 @@ function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, pr
     const priceHistLoan = pricesHist?.[loanKey] ?? priceLoan;
     const deposits = balanceInfo.supplyAssets;
     const borrow = balanceInfo.borrowAssets;
+    const collateral = balanceInfo.collateral;
+    // return early if there are zeros
+    if (deposits === 0n && borrow === 0n && collateral === 0n)
+        return {
+            dataForMarket: {},
+            addedDeposits: 0,
+            addedDebt: 0,
+        };
+    const collateralAddress = market.collateralAddress.toLowerCase();
+    const assetMeta = getAssetMeta(chainId, collateralAddress);
+    const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18;
     const depositDec = parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
+    const collateralDec = parseRawAmount(collateral.toString(), decimals);
     const borrowDec = parseRawAmount(borrow.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
     const dataForLoanAsset = {
         poolId: loanAddress,
         underlying: loanAddress,
         deposits: parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18),
         depositsRaw: deposits.toString(),
-        debtStable: "0",
+        debtStable: '0',
         debt: borrowDec,
         depositsUSD: Number(depositDec) * priceLoan,
         debtStableUSD: 0,
         debtUSD: Number(borrowDec) * priceLoan,
-        stableBorrowRate: "0",
+        stableBorrowRate: '0',
         collateralActive: true,
         claimableRewards: 0,
     };
-    const collateralAddress = market.collateralAddress.toLowerCase();
-    const assetMeta = getAssetMeta(chainId, collateralAddress);
-    const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18;
-    const collateralDec = parseRawAmount(balanceInfo.collateral.toString(), decimals);
-    const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(collateralAddress, chainId);
+    const key = toOracleKey(assetMeta?.assetGroup) ??
+        toGenericPriceKey(collateralAddress, chainId);
     // prices
     const price = prices[key] ?? 1;
     const priceHist = pricesHist?.[key] ?? price;
@@ -82,21 +88,21 @@ function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, pr
         underlying: collateralAddress,
         deposits: collateralDec,
         depositsRaw: balanceInfo.collateral.toString(),
-        debtStable: "0",
-        debt: "0",
+        debtStable: '0',
+        debt: '0',
         depositsUSD: Number(collateralDec) * price,
         debtStableUSD: 0,
         debtUSD: 0,
-        stableBorrowRate: "0",
+        stableBorrowRate: '0',
         collateralActive: true,
         claimableRewards: 0,
     };
     return {
         dataForMarket: {
             [loanAddress]: dataForLoanAsset,
-            [collateralAddress]: dataForCollateralAsset
+            [collateralAddress]: dataForCollateralAsset,
         },
         addedDeposits: Number(depositDec) * priceHistLoan + Number(collateralDec) * priceHist,
-        addedDebt: Number(borrowDec) * priceHistLoan
+        addedDebt: Number(borrowDec) * priceHistLoan,
     };
 }

package/package.json

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

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

@@ -1,10 +1,10 @@
-import { Lender } from "@1delta/asset-registry"
-import { getAssetMeta, toGenericPriceKey, toOracleKey } from "../../../assets"
-import { MorphoUserReserveResponse } from "../types"
-import { createBaseTypeUserState } from "../utils"
-import { parseRawAmount } from "../../../utils/parsing"
-import { MorphoMarket } from "../../morpho/types"
-import { BalanceInfo, decodePackedDataset } from "./decoder"
+import { Lender } from '@1delta/asset-registry'
+import { getAssetMeta, toGenericPriceKey, toOracleKey } from '../../../assets'
+import { MorphoUserReserveResponse } from '../types'
+import { createBaseTypeUserState } from '../utils'
+import { parseRawAmount } from '../../../utils/parsing'
+import { MorphoMarket } from '../../morpho/types'
+import { BalanceInfo, decodePackedDataset } from './decoder'
 
 export const getMorphoUserDataConverterWithlens = (
   lender: Lender,
@@ -13,41 +13,36 @@ export const getMorphoUserDataConverterWithlens = (
   markets: string[],
   prices: { [asset: string]: number },
   pricesHist: { [asset: string]: number },
-  lenderData: any
-): [(data: any[]) => { [market: string]: MorphoUserReserveResponse } | undefined, number] => {
-
-  const expectedNumberOfCalls = markets.length * 2
+  lenderData: any,
+): [
+  (data: any[]) => { [market: string]: MorphoUserReserveResponse } | undefined,
+  number,
+] => {
+  const expectedNumberOfCalls = Math.ceil(markets.length / 100)
   return [
     (data: any[]) => {
       // chunksizes depend on markets
-      const slices = Math.ceil(markets.length /  100)
-      if (data.length !== slices) {
+      if (data.length !== expectedNumberOfCalls) {
         return undefined
       }
       // de-chunk the calldata
-      const returnDatas = data.flatMap(d => decodePackedDataset(d))
+      const returnDatas = data.flatMap((d) => decodePackedDataset(d))
 
       let datas: { [market: string]: MorphoUserReserveResponse } = {}
       for (let i = 0; i < returnDatas.length; i++) {
-
         let totalDebt24h = 0
         let totalDeposits24h = 0
         const balanceData = returnDatas[i]
         const markeId = markets[balanceData.index]
         const market = lenderData[markeId]?.params?.market
-        const {
-          dataForMarket,
-          addedDebt,
-          addedDeposits
-        } = createMorphoEntryFromMarketWithLens(
-          i,
-          balanceData,
-          chainId,
-          market,
-          prices,
-          pricesHist,
-        )
-        if (!dataForMarket) continue;
+        const { dataForMarket, addedDebt, addedDeposits } =
+          createMorphoEntryFromMarketWithLens(
+            balanceData,
+            chainId,
+            market,
+            prices,
+            pricesHist,
+          )
 
         totalDebt24h += addedDebt
         totalDeposits24h += addedDeposits
@@ -55,19 +50,23 @@ export const getMorphoUserDataConverterWithlens = (
         const payload = {
           chainId,
           account,
-          lendingPositions: { "0": dataForMarket },
+          lendingPositions: { '0': dataForMarket },
           rewards: {},
-          userEMode : 0,
+          userEMode: 0,
         }
 
-        const userData = createBaseTypeUserState(payload, lenderData[markeId].data, totalDeposits24h, totalDebt24h)
+        const userData = createBaseTypeUserState(
+          payload,
+          lenderData[markeId].data,
+          totalDeposits24h,
+          totalDebt24h,
+        )
 
         datas[market.lender] = {
           ...payload,
           ...userData,
-          id: market.id
+          id: market.id,
         }
-
       }
       return datas
     },
@@ -76,50 +75,70 @@ export const getMorphoUserDataConverterWithlens = (
 }
 
 function createMorphoEntryFromMarketWithLens(
-  i: number,
   balanceInfo: BalanceInfo,
   chainId: string,
   market: MorphoMarket,
   prices: any,
   pricesHist: any,
 ) {
-
   const loanAddress = market.loanAddress.toLowerCase()
   const loanMeta = getAssetMeta(chainId, loanAddress)
 
-  const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId)
+  const loanKey =
+    toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId)
   // prices
   const priceLoan = prices[loanKey] ?? 1
   const priceHistLoan = pricesHist?.[loanKey] ?? priceLoan
 
   const deposits = balanceInfo.supplyAssets
   const borrow = balanceInfo.borrowAssets
-  const depositDec = parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18)
-  const borrowDec = parseRawAmount(borrow.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18)
+  const collateral = balanceInfo.collateral
+
+  // return early if there are zeros
+  if (deposits === 0n && borrow === 0n && collateral === 0n)
+    return {
+      dataForMarket: {},
+      addedDeposits: 0,
+      addedDebt: 0,
+    }
+
+  const collateralAddress = market.collateralAddress.toLowerCase()
+  const assetMeta = getAssetMeta(chainId, collateralAddress)
+
+  const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18
+
+  const depositDec = parseRawAmount(
+    deposits.toString(),
+    market.loanDecimals ?? loanMeta?.decimals ?? 18,
+  )
+
+  const collateralDec = parseRawAmount(collateral.toString(), decimals)
+  const borrowDec = parseRawAmount(
+    borrow.toString(),
+    market.loanDecimals ?? loanMeta?.decimals ?? 18,
+  )
 
   const dataForLoanAsset = {
     poolId: loanAddress,
     underlying: loanAddress,
-    deposits: parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18),
+    deposits: parseRawAmount(
+      deposits.toString(),
+      market.loanDecimals ?? loanMeta?.decimals ?? 18,
+    ),
     depositsRaw: deposits.toString(),
-    debtStable: "0",
+    debtStable: '0',
     debt: borrowDec,
     depositsUSD: Number(depositDec) * priceLoan,
     debtStableUSD: 0,
     debtUSD: Number(borrowDec) * priceLoan,
-    stableBorrowRate: "0",
+    stableBorrowRate: '0',
     collateralActive: true,
     claimableRewards: 0,
   }
 
-
-  const collateralAddress = market.collateralAddress.toLowerCase()
-  const assetMeta = getAssetMeta(chainId, collateralAddress)
-  const decimals = market.collateralDecimals ?? assetMeta?.decimals ?? 18
-
-  const collateralDec = parseRawAmount(balanceInfo.collateral.toString(), decimals)
-
-  const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(collateralAddress, chainId)
+  const key =
+    toOracleKey(assetMeta?.assetGroup) ??
+    toGenericPriceKey(collateralAddress, chainId)
   // prices
   const price = prices[key] ?? 1
   const priceHist = pricesHist?.[key] ?? price
@@ -129,12 +148,12 @@ function createMorphoEntryFromMarketWithLens(
     underlying: collateralAddress,
     deposits: collateralDec,
     depositsRaw: balanceInfo.collateral.toString(),
-    debtStable: "0",
-    debt: "0",
+    debtStable: '0',
+    debt: '0',
     depositsUSD: Number(collateralDec) * price,
     debtStableUSD: 0,
     debtUSD: 0,
-    stableBorrowRate: "0",
+    stableBorrowRate: '0',
     collateralActive: true,
     claimableRewards: 0,
   }
@@ -142,9 +161,10 @@ function createMorphoEntryFromMarketWithLens(
   return {
     dataForMarket: {
       [loanAddress]: dataForLoanAsset,
-      [collateralAddress]: dataForCollateralAsset
+      [collateralAddress]: dataForCollateralAsset,
     },
-    addedDeposits: Number(depositDec) * priceHistLoan + Number(collateralDec) * priceHist,
-    addedDebt: Number(borrowDec) * priceHistLoan
+    addedDeposits:
+      Number(depositDec) * priceHistLoan + Number(collateralDec) * priceHist,
+    addedDebt: Number(borrowDec) * priceHistLoan,
   }
-}
+}

package/test/userDataMorpho.test.ts

@@ -61,6 +61,7 @@ describe(
         try {
           const { userData } = await getUserData(Chain.BASE, [
             'MORPHO_BLUE_6600AAE6C56D242FA6BA68BD527AFF1A146E77813074413186828FD3F1CDCA91',
+            'MORPHO_BLUE_3A4048C64BA1B375330D376B1CE40E4047D03B47AB4D48AF484EDEC9FEC801BA',
           ])
 
           prettyPrint(userData)