@1delta/margin-fetcher 0.0.14 → 0.0.16

package/dist/lending/aave-v3-type/publicCallParse.d.ts

@@ -1,7 +1,7 @@
-import { AaveV3GeneralPublicResponse } from "./types";
-import { AdditionalYields } from "../../types";
-import { Lender } from "@1delta/asset-registry";
-import { GenericTokenList } from "../types";
+import { AaveV3GeneralPublicResponse } from './types';
+import { AdditionalYields } from '../../types';
+import { Lender } from '@1delta/asset-registry';
+import { GenericTokenList } from '../types';
 export declare const getAaveV3ReservesDataConverter: (lender: Lender, chainId: string, prices: {
     [asset: string]: number;
 }, additionalYields: AdditionalYields, tokenList?: GenericTokenList) => [(data: any[]) => AaveV3GeneralPublicResponse | undefined, number];

package/dist/lending/aave-v3-type/publicCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/aave-v3-type/publicCallParse.ts"],"names":[],"mappings":"AACA,OAAO,EACL,2BAA2B,EAK5B,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,eAAO,MAAM,8BAA8B,GACzC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,YAAW,gBAAqB,KAC/B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,2BAA2B,GAAG,SAAS,EAAE,MAAM,CAwHnE,CAAA;AA0BD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAAG,SAAS,EAAE,MAAM,CAAC,CAgF7J"}
+{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/aave-v3-type/publicCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAK5B,MAAM,SAAS,CAAA;AAEhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAQ/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,eAAO,MAAM,8BAA8B,GACzC,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,YAAW,gBAAqB,KAC/B,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,2BAA2B,GAAG,SAAS,EAAE,MAAM,CA2MnE,CAAA;AA0BD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,GAAG,EACrB,MAAM,EAAE,GAAG,EACX,SAAS,EAAE,GAAG,GACb,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAAG,SAAS,EAAE,MAAM,CAAC,CA0H5C"}

package/dist/lending/aave-v3-type/publicCallParse.js

@@ -1,14 +1,15 @@
-import { AaveV3GetreserveConfigDataIndexes, AaveV3GetReservesIndexes, YLDRTypeGetReserveConfigurationData, YLDRTypeGetReserveDataIndexes } from "./types";
-import { AAVE_V3_EMODES } from "./publicCallBuild";
-import { BPS, formatAaveRawApyToApr, parseRawAmount } from "../../utils/parsing";
-import { Lender } from "@1delta/asset-registry";
-import { getAaveAssets, getAssetMeta, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey } from "../../assets";
+import { AaveV3GetreserveConfigDataIndexes, AaveV3GetReservesIndexes, YLDRTypeGetReserveConfigurationData, YLDRTypeGetReserveDataIndexes, } from './types';
+import { AAVE_V3_EMODES } from './publicCallBuild';
+import { BPS, formatAaveRawApyToApr, parseRawAmount } from '../../utils/parsing';
+import { Lender } from '@1delta/asset-registry';
+import { getAaveAssets, getAssetMeta, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey, } from '../../assets';
 export const getAaveV3ReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
-    if (lender.includes("AAVE_V3"))
+    if (lender.startsWith('AAVE_V3'))
         return parseAave32(chainId, lender, prices, additionalYields, tokenList);
     switch (lender) {
         /** AAVE V3 style with rewards from state */
-        case Lender.YLDR: return parseYLDRCall(chainId, lender, additionalYields, prices, tokenList);
+        case Lender.YLDR:
+            return parseYLDRCall(chainId, lender, additionalYields, prices, tokenList);
         default: {
             const assetsToQuery = getAaveAssets(chainId, lender);
             const expectedNumberOfCalls = assetsToQuery.length * 6 + AAVE_V3_EMODES.length + 1;
@@ -29,7 +30,7 @@ export const getAaveV3ReservesDataConverter = (lender, chainId, prices, addition
                                 label: rawCfg.label,
                                 borrowCollateralFactor: rawCfg.ltv / BPS,
                                 collateralFactor: rawCfg.liquidationThreshold / BPS,
-                                borrowFactor: 1
+                                borrowFactor: 1,
                             };
                     });
                     for (let i = 0; i < assetsToQuery.length; i++) {
@@ -41,13 +42,19 @@ export const getAaveV3ReservesDataConverter = (lender, chainId, prices, addition
                         const reserveCaps = data[i * 6 + 3];
                         const debtCeiling = data[i * 6 + 4];
                         const reserveEMode = data[i * 6 + 5];
-                        const assetMeta = tokenList[asset] ?? { ...getAssetMeta(chainId, asset), address: asset };
+                        const assetMeta = tokenList[asset] ?? {
+                            ...getAssetMeta(chainId, asset),
+                            address: asset,
+                        };
                         const decimals = assetMeta?.decimals ?? 18;
                         const totalDeposits = parseRawAmount(reserveData?.[AaveV3GetReservesIndexes.totalAToken]?.toString(), decimals);
                         const totalDebtStable = parseRawAmount(reserveData?.[AaveV3GetReservesIndexes.totalStableDebt]?.toString(), decimals);
                         const totalDebt = parseRawAmount(reserveData?.[AaveV3GetReservesIndexes.totalVariableDebt]?.toString(), decimals);
-                        const liquidity = Number(totalDeposits) - Number(totalDebt) - Number(totalDebtStable);
-                        const price = prices[toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId)];
+                        const liquidity = Number(totalDeposits) -
+                            Number(totalDebt) -
+                            Number(totalDebtStable);
+                        const price = prices[toOracleKey(assetMeta?.assetGroup) ??
+                            toGenericPriceKey(asset, chainId)];
                         resultReserves[asset] = {
                             poolId: asset,
                             underlying: asset,
@@ -75,16 +82,20 @@ export const getAaveV3ReservesDataConverter = (lender, chainId, prices, addition
                             ...resultReserves[asset],
                             decimals: Number(configData?.[AaveV3GetreserveConfigDataIndexes.decimals]),
                             config: {
-                                ...populateEModes(Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) / BPS, Number(configData?.[AaveV3GetreserveConfigDataIndexes.liquidationThreshold]) / BPS),
-                                ...(eModeCategory !== 0 ? {
-                                    [eModeCategory]: {
-                                        category: eModeCategory,
-                                        label: eModeConfigs[eModeCategory]?.label ?? "Default",
-                                        borrowCollateralFactor: eModeConfigs[eModeCategory]?.borrowCollateralFactor ?? 0,
-                                        collateralFactor: eModeConfigs[eModeCategory]?.collateralFactor ?? 0,
-                                        borrowFactor: 1
+                                ...populateEModes(Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) /
+                                    BPS, Number(configData?.[AaveV3GetreserveConfigDataIndexes.liquidationThreshold]) / BPS),
+                                ...(eModeCategory !== 0
+                                    ? {
+                                        [eModeCategory]: {
+                                            category: eModeCategory,
+                                            label: eModeConfigs[eModeCategory]?.label ?? 'Default',
+                                            borrowCollateralFactor: eModeConfigs[eModeCategory]?.borrowCollateralFactor ??
+                                                0,
+                                            collateralFactor: eModeConfigs[eModeCategory]?.collateralFactor ?? 0,
+                                            borrowFactor: 1,
+                                        },
                                     }
-                                } : {})
+                                    : {}),
                             },
                             // flags
                             collateralActive: configData?.[AaveV3GetreserveConfigDataIndexes.usageAsCollateralEnabled],
@@ -97,13 +108,13 @@ export const getAaveV3ReservesDataConverter = (lender, chainId, prices, addition
                             // caps
                             borrowCap: Number(reserveCaps[0]?.toString()),
                             supplyCap: Number(reserveCaps[1]?.toString()),
-                            debtCeiling: parseRawAmount(debtCeiling[i]?.toString(), Number(decimalsCeiling?.toString()))
+                            debtCeiling: parseRawAmount(debtCeiling[i]?.toString(), Number(decimalsCeiling?.toString())),
                         };
                     }
                     return {
                         data: resultReserves,
                         chainId,
-                        eModes: eModeConfigs
+                        eModes: eModeConfigs,
                     };
                 },
                 expectedNumberOfCalls,
@@ -113,12 +124,12 @@ export const getAaveV3ReservesDataConverter = (lender, chainId, prices, addition
 };
 const populateEModes = (borrowCollateralFactor, collateralFactor) => {
     let data = {};
-    AAVE_V3_EMODES.forEach(e => {
+    AAVE_V3_EMODES.forEach((e) => {
         data[e] = {
             category: e,
             borrowCollateralFactor,
             collateralFactor,
-            borrowFactor: 1
+            borrowFactor: 1,
         };
     });
     return data;
@@ -140,12 +151,16 @@ export function parseYLDRCall(chainId, lender, additionalYields, prices, tokenLi
                 const asset = assetsToQuery[i];
                 const reserveData = data[i * 2];
                 const configData = data[i * 2 + 1];
-                const assetMeta = tokenList[asset] ?? { ...getAssetMeta(chainId, asset), address: asset };
+                const assetMeta = tokenList[asset] ?? {
+                    ...getAssetMeta(chainId, asset),
+                    address: asset,
+                };
                 const decimals = assetMeta?.decimals ?? 18;
                 const totalVariableDebt = parseRawAmount(reserveData?.[YLDRTypeGetReserveDataIndexes.totalVariableDebt]?.toString(), decimals);
                 const totalAToken = parseRawAmount(reserveData?.[YLDRTypeGetReserveDataIndexes.totalYToken]?.toString(), decimals);
                 const liquidity = Number(totalAToken) - Number(totalVariableDebt);
-                const oracleKey = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
+                const oracleKey = toOracleKey(assetMeta?.assetGroup) ??
+                    toGenericPriceKey(asset, chainId);
                 const price = prices[oracleKey] ?? 1;
                 const totalDepositsUSD = Number(totalAToken) * price;
                 const totalDebtUSD = Number(totalVariableDebt) * price;
@@ -177,8 +192,8 @@ export function parseYLDRCall(chainId, lender, additionalYields, prices, tokenLi
                             // collateral factors
                             borrowCollateralFactor: Number(configData?.[YLDRTypeGetReserveConfigurationData.ltv]?.toString()) / BPS,
                             collateralFactor: Number(configData?.[YLDRTypeGetReserveConfigurationData.liquidationThreshold]?.toString()) / BPS,
-                            borrowFactor: 1
-                        }
+                            borrowFactor: 1,
+                        },
                     },
                     liquidationBonus: Number(configData?.[YLDRTypeGetReserveConfigurationData.liquidationBonus]?.toString()) / BPS,
                     // flags
@@ -192,7 +207,7 @@ export function parseYLDRCall(chainId, lender, additionalYields, prices, tokenLi
             return {
                 data: resultReserves,
                 chainId,
-                eModes: {}
+                eModes: {},
             };
         },
         expectedNumberOfCalls,
@@ -221,13 +236,13 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
                         label: rawCfg.label,
                         borrowCollateralFactor: rawCfg.ltv / BPS,
                         collateralFactor: rawCfg.liquidationThreshold / BPS,
-                        borrowFactor: 1
+                        borrowFactor: 1,
                     };
                 debtBitmap[mode] = emodeDataResult[3 * index + 1];
                 collateralBitmap[mode] = emodeDataResult[3 * index + 2];
             });
             // we get the reserves list to obtain the index per reserve
-            const lowerReservesList = reservesList.map(a => a.toLowerCase());
+            const lowerReservesList = reservesList?.map((a) => a.toLowerCase());
             for (let i = 0; i < assetsToQuery.length; i++) {
                 const asset = assetsToQuery[i];
                 const reserveData = data[i * 5];
@@ -236,13 +251,17 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
                 // const siloedBorrowing = data[i * 5 + 2]
                 const reserveCaps = data[i * 5 + 3];
                 const debtCeiling = data[i * 5 + 4];
-                const assetMeta = tokenList[asset] ?? { ...getAssetMeta(chainId, asset), address: asset };
+                const assetMeta = tokenList[asset] ?? {
+                    ...getAssetMeta(chainId, asset),
+                    address: asset,
+                };
                 const decimals = assetMeta?.decimals ?? 18;
                 const totalDeposits = parseRawAmount(reserveData?.[AaveV3GetReservesIndexes.totalAToken]?.toString(), decimals);
                 const totalDebtStable = parseRawAmount(reserveData?.[AaveV3GetReservesIndexes.totalStableDebt]?.toString(), decimals);
                 const totalDebt = parseRawAmount(reserveData?.[AaveV3GetReservesIndexes.totalVariableDebt]?.toString(), decimals);
                 const liquidity = Number(totalDeposits) - Number(totalDebt) - Number(totalDebtStable);
-                const price = prices[toOracleKey(assetMeta?.assetGroup)] ?? toGenericPriceKey(asset, chainId);
+                const price = prices[toOracleKey(assetMeta?.assetGroup)] ??
+                    toGenericPriceKey(asset, chainId);
                 resultReserves[asset] = {
                     poolId: asset,
                     underlying: asset,
@@ -265,22 +284,27 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
                     // rewards
                     rewards: {},
                 };
-                const activeEmodes = AAVE_V3_EMODES.map(mode => isReserveEnabledOnBitmap(debtBitmap[mode], lowerReservesList.indexOf(asset)) || isReserveEnabledOnBitmap(collateralBitmap[mode], lowerReservesList.indexOf(asset)) ? mode : -1).filter(m => m !== undefined && m > 0);
+                const activeEmodes = AAVE_V3_EMODES.map((mode) => isReserveEnabledOnBitmap(debtBitmap[mode], lowerReservesList.indexOf(asset)) ||
+                    isReserveEnabledOnBitmap(collateralBitmap[mode], lowerReservesList.indexOf(asset))
+                    ? mode
+                    : -1).filter((m) => m !== undefined && m > 0);
                 const eModeCategory = activeEmodes.length === 0 ? 0 : activeEmodes[0]; // Number(emodeResult[index].toString())
                 resultReserves[asset] = {
                     ...resultReserves[asset],
                     decimals: Number(configData?.[AaveV3GetreserveConfigDataIndexes.decimals]),
                     config: {
                         ...populateEModes(Number(configData?.[AaveV3GetreserveConfigDataIndexes.ltv]) / BPS, Number(configData?.[AaveV3GetreserveConfigDataIndexes.liquidationThreshold]) / BPS),
-                        ...(eModeCategory !== 0 ? {
-                            [eModeCategory]: {
-                                category: eModeCategory,
-                                label: eModeConfigs[eModeCategory]?.label ?? "Default",
-                                borrowCollateralFactor: eModeConfigs[eModeCategory]?.borrowCollateralFactor ?? 0,
-                                collateralFactor: eModeConfigs[eModeCategory]?.collateralFactor ?? 0,
-                                borrowFactor: 1
+                        ...(eModeCategory !== 0
+                            ? {
+                                [eModeCategory]: {
+                                    category: eModeCategory,
+                                    label: eModeConfigs[eModeCategory]?.label ?? 'Default',
+                                    borrowCollateralFactor: eModeConfigs[eModeCategory]?.borrowCollateralFactor ?? 0,
+                                    collateralFactor: eModeConfigs[eModeCategory]?.collateralFactor ?? 0,
+                                    borrowFactor: 1,
+                                },
                             }
-                        } : {})
+                            : {}),
                     },
                     // flags
                     collateralActive: configData?.[AaveV3GetreserveConfigDataIndexes.usageAsCollateralEnabled],
@@ -293,13 +317,13 @@ function parseAave32(chainId, lender, prices, additionalYields, tokenList) {
                     // caps
                     borrowCap: Number(reserveCaps[0]?.toString()),
                     supplyCap: Number(reserveCaps[1]?.toString()),
-                    debtCeiling: parseRawAmount(debtCeiling[i]?.toString(), Number(decimalsCeiling?.toString()))
+                    debtCeiling: parseRawAmount(debtCeiling[i]?.toString(), Number(decimalsCeiling?.toString())),
                 };
             }
             return {
                 data: resultReserves,
                 chainId,
-                eModes: eModeConfigs
+                eModes: eModeConfigs,
             };
         },
         expectedNumberOfCalls,

package/dist/lending/fetchLender.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchLender.d.ts","sourceRoot":"","sources":["../../src/lending/fetchLender.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAWnE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AA+E1C,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,gBAAgB,sBAAsB,EACtC,YAAW,MAAM,OAAO,CAAC,gBAAgB,CAExC,KACA,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAqDnC,CAAA"}
+{"version":3,"file":"fetchLender.d.ts","sourceRoot":"","sources":["../../src/lending/fetchLender.ts"],"names":[],"mappings":"AAyBA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AAWnE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AA+E1C,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,gBAAgB,sBAAsB,EACtC,YAAW,MAAM,OAAO,CAAC,gBAAgB,CAExC,KACA,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAsDnC,CAAA"}

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;AA+CpD,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,CA8EP,CAAA"}

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

@@ -1,34 +1,72 @@
-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';
+const balanceData = {
+    '0': {
+        borrowDiscountedCollateral: 0,
+        collateral: 0,
+        deposits: 0,
+        debt: 0,
+        adjustedDebt: 0,
+        nav: 0,
+        deposits24h: 0,
+        debt24h: 0,
+        nav24h: 0,
+    },
+};
+// aggregated apr data
+const aprData = {
+    '0': {
+        apr: 0,
+        borrowApr: 0,
+        depositApr: 0,
+        rewards: 0,
+        rewardApr: 0,
+        rewardDepositApr: 0,
+        rewardBorrowApr: 0,
+        stakingApr: 0,
+        stakingDepositApr: 0,
+        stakingBorrowApr: 0,
+    },
+};
+const userDataEmpty = (account, chainId) => {
+    return {
+        account,
+        chainId,
+        balanceData,
+        aprData,
+        userConfigs: {
+            '0': { selectedMode: 0, id: account },
+        },
+    };
+};
 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;
             }
+            let marketsHandled = [];
             // 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;
                 let totalDeposits24h = 0;
                 const balanceData = returnDatas[i];
                 const markeId = markets[balanceData.index];
+                marketsHandled.push(markeId);
                 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 +74,26 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                 datas[market.lender] = {
                     ...payload,
                     ...userData,
-                    id: market.id
+                    id: market.id,
+                };
+            }
+            for (const [marketId, pubData] of Object.entries(lenderData ?? {})) {
+                if (marketsHandled.includes(marketId))
+                    continue;
+                const payload = {
+                    chainId,
+                    account,
+                    lendingPositions: { '0': {} },
+                    rewards: {},
+                    userEMode: 0,
+                };
+                const userData = userDataEmpty(account, chainId);
+                // @ts-ignore
+                datas[marketId] = {
+                    ...payload,
+                    ...userData,
+                    // @ts-ignore
+                    id: pubData?.params?.market.id,
                 };
             }
             return datas;
@@ -44,7 +101,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 +110,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 +148,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/dist/prices/main-prices/fetchOracleData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetchOracleData.d.ts","sourceRoot":"","sources":["../../../src/prices/main-prices/fetchOracleData.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAGlD,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,cAAY,KAAG,MAQ7D,CAAA;AAOD,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CACtB;AAID;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,EAAE,EAClB,cAAc,oBAAoB,KACjC,OAAO,CAAC,UAAU,CA8GpB,CAAA"}
+{"version":3,"file":"fetchOracleData.d.ts","sourceRoot":"","sources":["../../../src/prices/main-prices/fetchOracleData.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAGlD,eAAO,MAAM,eAAe,GAAI,OAAO,MAAM,EAAE,cAAY,KAAG,MAY7D,CAAA;AAOD,UAAU,UAAU;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CACtB;AAID;;GAEG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,EAAE,EAClB,cAAc,oBAAoB,KACjC,OAAO,CAAC,UAAU,CA8GpB,CAAA"}

package/dist/prices/main-prices/fetchOracleData.js

@@ -14,9 +14,14 @@ import { AAVE_STYLE_ORACLES } from './addresses/aaveOracles';
 import { AAVES_PER_CHAIN } from '../../utils';
 import { parseRawAmount } from '../../utils/parsing';
 export const formatAavePrice = (price, isV2 = false) => {
-    return Number(formatEther(BigInt(price ?? '0') *
-        // 10^(18 - decimals)
-        10n ** (isV2 ? 0n : 10n)));
+    try {
+        return Number(formatEther(BigInt(price ?? '0') *
+            // 10^(18 - decimals)
+            10n ** (isV2 ? 0n : 10n)));
+    }
+    catch {
+        return NaN;
+    }
 };
 const LENDLE_PAIR_MANTLE = '0x4c57BE599d0e0414785943569E9B6A66dA79Aa6b';
 const AU_PAIR_MANTLE = '0x709503fbb50b10f921e812c48fbd5c5522a0b20c';

package/dist/types/providers.d.ts

@@ -1,5 +1,5 @@
 import { PublicClient } from 'viem';
-export type MulticallRetryFunction = (chain: string, calls: any[], abi: any, batchSize?: number, maxRetries?: number, providerId?: number, allowFailure?: boolean) => Promise<any[]>;
+export type MulticallRetryFunction = (chain: string, calls: any[], abi: any, batchSize?: number, maxRetries?: number, providerId?: number, allowFailure?: boolean, orverrides?: any) => Promise<any[]>;
 export type GetEvmClientFunction = (chain: string, rpcId?: number) => PublicClient;
 export interface ProviderDependencies {
     multicallRetry: MulticallRetryFunction;

package/dist/types/providers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/types/providers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAEnC,MAAM,MAAM,sBAAsB,GAAG,CACnC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,GAAG,EAAE,EACZ,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,OAAO,KACnB,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;AAEnB,MAAM,MAAM,oBAAoB,GAAG,CACjC,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,KACX,YAAY,CAAA;AAEjB,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,sBAAsB,CAAA;IACtC,YAAY,EAAE,oBAAoB,CAAA;CACnC;AAED,MAAM,WAAW,4BAA4B;IAC3C,cAAc,CAAC,EAAE,sBAAsB,CAAA;IACvC,YAAY,CAAC,EAAE,oBAAoB,CAAA;CACpC"}
+{"version":3,"file":"providers.d.ts","sourceRoot":"","sources":["../../src/types/providers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAEnC,MAAM,MAAM,sBAAsB,GAAG,CACnC,KAAK,EAAE,MAAM,EACb,KAAK,EAAE,GAAG,EAAE,EACZ,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,UAAU,CAAC,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,OAAO,EACtB,UAAU,CAAC,EAAE,GAAG,KACb,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;AAEnB,MAAM,MAAM,oBAAoB,GAAG,CACjC,KAAK,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM,KACX,YAAY,CAAA;AAEjB,MAAM,WAAW,oBAAoB;IACnC,cAAc,EAAE,sBAAsB,CAAA;IACtC,YAAY,EAAE,oBAAoB,CAAA;CACnC;AAED,MAAM,WAAW,4BAA4B;IAC3C,cAAc,CAAC,EAAE,sBAAsB,CAAA;IACvC,YAAY,CAAC,EAAE,oBAAoB,CAAA;CACpC"}

package/package.json

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