@1delta/margin-fetcher 0.0.11 → 0.0.13

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

@@ -37,6 +37,7 @@ export const getCompoundV3UserDataConverter = (lender, chainId, account, prices,
                     depositsUSD: Number(deposits) * price,
                     debtStableUSD: 0,
                     debt: "0",
+                    debtStable: "0",
                     debtUSD: 0,
                     collateralActive: true,
                     // user depos raw

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

@@ -1,5 +1,5 @@
-import { LenderUserQuery } from "./types";
-import { GetEvmClientFunction } from "../../types";
+import { LenderUserQuery } from './types';
+import { GetEvmClientFunction } from '../../types';
 /**
  * Builds the multicall calls for the given queries and returns the raw results
  * @param chainId - The chain ID
@@ -7,7 +7,7 @@ import { GetEvmClientFunction } from "../../types";
  * @param getEvmClient - Injected function to get EVM client
  * @returns The raw results from the multicall
  */
-export declare const getLenderUserDataResult: (chainId: string, queries: LenderUserQuery[], getEvmClient: GetEvmClientFunction) => Promise<any[]>;
+export declare const getLenderUserDataResult: (chainId: string, queriesRaw: LenderUserQuery[], getEvmClient: GetEvmClientFunction) => Promise<any[]>;
 /**
  * Converts the raw results into the desired format
  * @param chainId - The chain ID
@@ -18,7 +18,7 @@ export declare const getLenderUserDataResult: (chainId: string, queries: LenderU
  * @param lenderState - The state of the lender
  * @returns The converted data
  */
-export declare const convertLenderUserDataResult: (chainId: string, queries: LenderUserQuery[], rawResults: any[], prices: any, pricesHist: any, lenderState: any) => {
+export declare const convertLenderUserDataResult: (chainId: string, queriesRaw: LenderUserQuery[], rawResults: any[], prices: any, pricesHist: any, lenderState: any) => {
     [lender: string]: any;
 };
 //# sourceMappingURL=fetchUserData.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fetchUserData.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/fetchUserData.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AACzC,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAsClD;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,SAAS,eAAe,EAAE,EAC1B,cAAc,oBAAoB,KACjC,OAAO,CAAC,GAAG,EAAE,CAsBf,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,SAAS,eAAe,EAAE,EAC1B,YAAY,GAAG,EAAE,EACjB,QAAQ,GAAG,EACX,YAAY,GAAG,EACf,aAAa,GAAG,KACf;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CA6BzB,CAAA"}
+{"version":3,"file":"fetchUserData.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/fetchUserData.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA6FlD;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,cAAc,oBAAoB,KACjC,OAAO,CAAC,GAAG,EAAE,CA4Bf,CAAA;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,YAAY,GAAG,EAAE,EACjB,QAAQ,GAAG,EACX,YAAY,GAAG,EACf,aAAa,GAAG,KACf;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CA0CzB,CAAA"}

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

@@ -1,33 +1,40 @@
-import { multicallViemAbiArray } from "../../utils/multicall";
-import { isAaveV2Type, isAaveV3Type, isInit, isYLDR } from "../../utils";
-import { buildAaveV2UserCall } from "./aave-v2-type/userCallBuild";
-import { buildAaveV3UserCall } from "./aave-v3-type/userCallBuild";
-import { buildInitUserCall } from "./init/userCallBuild";
-import { buildCompoundV3UserCall } from "./compound-v3/userCallBuild";
-import { getAbi } from "./abis";
-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, lender, account) {
+import { multicallViemAbiArray } from '../../utils/multicall';
+import { isAaveV2Type, isAaveV3Type, isInit, isMorphoType, isMultiMarket, isYLDR, } from '../../utils';
+import { organizeUserQueries } from './types';
+import { buildAaveV2UserCall } from './aave-v2-type/userCallBuild';
+import { buildAaveV3UserCall } from './aave-v3-type/userCallBuild';
+import { buildInitUserCall } from './init/userCallBuild';
+import { buildCompoundV3UserCall } from './compound-v3/userCallBuild';
+import { getAbi } from './abis';
+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';
+import { buildMorphoUserCallWithLens } from './morpho/userCallBuild';
+import { getMorphoUserDataConverterWithlens } from './morpho/userCallParse';
+function buildUserCall(chainId, lender, account, params) {
     if (isAaveV2Type(lender))
         return buildAaveV2UserCall(chainId, lender, account);
     if (isAaveV3Type(lender))
         return buildAaveV3UserCall(chainId, lender, account);
     if (isInit(lender))
         return buildInitUserCall(chainId, lender, account);
+    if (isMorphoType(lender))
+        return buildMorphoUserCallWithLens(chainId, account, lender, params);
     return buildCompoundV3UserCall(chainId, lender, account);
 }
-function getUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState) {
+function getUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState, params) {
     if (isYLDR(lender))
-        return getYldrUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState);
+        return getYldrUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState?.data?.[lender]?.data);
     if (isAaveV2Type(lender))
-        return getAaveV2UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState);
+        return getAaveV2UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState?.data?.[lender]?.data);
     if (isAaveV3Type(lender))
-        return getAaveV3UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState);
+        return getAaveV3UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState?.data?.[lender]?.data);
     if (isInit(lender))
-        return getInitUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState);
+        return getInitUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState?.data?.[lender]?.data);
+    if (isMorphoType(lender))
+        return getMorphoUserDataConverterWithlens(lender, chainId, account, params, prices, pricesHist, lenderPublicState?.data);
     return getCompoundV3UserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState);
 }
 /**
@@ -37,11 +44,12 @@ function getUserDataConverter(lender, chainId, account, prices, pricesHist, lend
  * @param getEvmClient - Injected function to get EVM client
  * @returns The raw results from the multicall
  */
-export const getLenderUserDataResult = async (chainId, queries, getEvmClient) => {
+export const getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient) => {
     let calls = [];
+    const queries = organizeUserQueries(queriesRaw);
     for (const query of queries) {
         const abi = getAbi(query.lender);
-        const callData = buildUserCall(chainId, query.lender, query.account);
+        const callData = buildUserCall(chainId, query.lender, query.account, query.params);
         const mappedCalls = callData.map((call) => ({ call, abi }));
         calls = [...calls, ...mappedCalls];
     }
@@ -57,21 +65,34 @@ export const getLenderUserDataResult = async (chainId, queries, getEvmClient) =>
  * @param lenderState - The state of the lender
  * @returns The converted data
  */
-export const convertLenderUserDataResult = (chainId, queries, rawResults, prices, pricesHist, lenderState) => {
+export const convertLenderUserDataResult = (chainId, queriesRaw, rawResults, prices, pricesHist, lenderState) => {
+    const queries = organizeUserQueries(queriesRaw);
     const lenderData = {};
     let currentSlice = 0;
     for (const query of queries) {
-        const [converter, sliceLength] = getUserDataConverter(query.lender, chainId, query.account, prices, pricesHist, lenderState[chainId]?.data?.[query.lender]?.data);
+        const [converter, sliceLength] = getUserDataConverter(query.lender, chainId, query.account, prices, pricesHist, lenderState[chainId], query.params);
         try {
             const data = rawResults.slice(currentSlice, currentSlice + sliceLength);
             const convertedData = converter(data);
             if (convertedData) {
-                // map it to the user address
-                lenderData[query.lender] = { [query.account.toLowerCase()]: convertedData };
+                if (isMultiMarket(query.lender)) {
+                    Object.keys(convertedData).forEach((market) => {
+                        lenderData[market] = {
+                            // @ts-ignore
+                            [query.account.toLowerCase()]: convertedData[market],
+                        };
+                    });
+                }
+                else {
+                    // map it to the user address
+                    lenderData[query.lender] = {
+                        [query.account.toLowerCase()]: convertedData,
+                    };
+                }
             }
         }
         catch (e) {
-            console.log("Error parsing for", query.lender, "on", chainId, e);
+            console.log('Error parsing for', query.lender, 'on', chainId, e);
         }
         currentSlice += sliceLength;
     }

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

@@ -1,6 +1,5 @@
-import { Lender } from "@1delta/asset-registry";
-import { Call } from "../../../utils/multicall";
-import { MorphoMarket } from "../../morpho/types";
-export declare const buildMorphoUserCall: (chainId: string, account: string, lender: Lender, marketsToQuery: MorphoMarket[]) => Call[];
-export declare const buildMorphoUserCallWithLens: (chainId: string, account: string, lender: Lender, marketsToQuery: MorphoMarket[]) => Call[];
+import { Lender } from '@1delta/asset-registry';
+import { Call } from '../../../utils/multicall';
+export declare const buildMorphoUserCall: (chainId: string, account: string, lender: Lender, marketsToQuery: string[]) => Call[];
+export declare const buildMorphoUserCallWithLens: (chainId: string, account: string, lender: Lender, marketsToQuery: string[]) => Call[];
 //# sourceMappingURL=userCallBuild.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAyB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AA6BjD,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,QAAQ,MAAM,EAAE,gBAAgB,YAAY,EAAE,KAAG,IAAI,EAW1H,CAAA;AAID,eAAO,MAAM,2BAA2B,GAAI,SAAS,MAAM,EAAE,SAAS,MAAM,EAAE,QAAQ,MAAM,EAAE,gBAAgB,YAAY,EAAE,KAAG,IAAI,EAWlI,CAAA"}
+{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAyB,MAAM,wBAAwB,CAAA;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAgC/C,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,gBAAgB,MAAM,EAAE,KACvB,IAAI,EAIN,CAAA;AAED,eAAO,MAAM,2BAA2B,GACtC,SAAS,MAAM,EACf,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,gBAAgB,MAAM,EAAE,KACvB,IAAI,EAaN,CAAA"}

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

@@ -1,27 +1,29 @@
-import { Chain, MORPHO_BLUE_POOL_DATA } from "@1delta/asset-registry";
-import { chunk } from "lodash";
+import { Chain, MORPHO_BLUE_POOL_DATA } from '@1delta/asset-registry';
+import { chunk } from 'lodash';
 const MORPHO_LENS = {
-    [Chain.BASE]: "0x98542B95B44a4732EffB1F4F01A696F1546236d3"
+    [Chain.BASE]: '0x98542B95B44a4732EffB1F4F01A696F1546236d3',
+    [Chain.POLYGON_MAINNET]: '0x105eb87D2b3127f43B1b4C0F125dbEb0EDF3d6C6',
+    [Chain.OP_MAINNET]: '0xd184c5315B728c1C990f59dDD275c8155f8e255c',
+    [Chain.ARBITRUM_ONE]: '0xF64F862Fb7D687411585e06C08711B612e156530',
 };
 const getBaseMorphoCalls = (lender, chainId, account, marketsToQuery) => {
-    return marketsToQuery.flatMap(({ id }) => [
+    return marketsToQuery.flatMap(id => [
         {
             // @ts-ignore
             address: MORPHO_BLUE_POOL_DATA[lender][chainId],
             name: 'position',
-            params: [id, account],
+            params: ["0x" + id.split("_")[1], account],
         },
         {
             // @ts-ignore
             address: MORPHO_BLUE_POOL_DATA[lender][chainId],
             name: 'market',
-            params: [id],
+            params: ["0x" + id.split("_")[1]],
         },
     ]);
 };
 export const buildMorphoUserCall = (chainId, account, lender, marketsToQuery) => {
     const calls = getBaseMorphoCalls(lender, chainId, account, marketsToQuery);
-    console.log("calls", calls);
     return calls;
 };
 export const buildMorphoUserCallWithLens = (chainId, account, lender, marketsToQuery) => {
@@ -30,7 +32,11 @@ export const buildMorphoUserCallWithLens = (chainId, account, lender, marketsToQ
     return marketSlices.flatMap((marketsInChunk) => ({
         address: MORPHO_LENS[chainId],
         name: 'getUserDataCompact',
-        // @ts-ignore
-        params: [marketsInChunk.map(a => a.id), account, MORPHO_BLUE_POOL_DATA[lender][chainId]],
+        params: [
+            marketsInChunk.map(a => a.replace("MORPHO_BLUE_", "0x")),
+            account,
+            // @ts-ignore
+            MORPHO_BLUE_POOL_DATA[lender][chainId],
+        ],
     }));
 };

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

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

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;AAGpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAGjD,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EACf,SAAS,YAAY,EAAE,EACvB,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,CA0DvF,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,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,yBAAyB,CAAA;CAAE,GAAG,SAAS,EAAE,MAAM,CA2DvF,CAAA"}

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

@@ -18,7 +18,8 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                 let totalDebt24h = 0;
                 let totalDeposits24h = 0;
                 const balanceData = returnDatas[i];
-                const market = markets[balanceData.index];
+                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;
@@ -31,7 +32,7 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
                     rewards: {},
                     userEMode: 0,
                 };
-                const userData = createBaseTypeUserState(payload, lenderData, totalDeposits24h, totalDebt24h);
+                const userData = createBaseTypeUserState(payload, lenderData[markeId].data, totalDeposits24h, totalDebt24h);
                 datas[market.lender] = {
                     ...payload,
                     ...userData,
@@ -44,8 +45,9 @@ export const getMorphoUserDataConverterWithlens = (lender, chainId, account, mar
     ];
 };
 function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, prices, pricesHist) {
-    const loanMeta = getAssetMeta(chainId, market.loanAddress);
-    const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(market.loanAddress, chainId);
+    const loanAddress = market.loanAddress.toLowerCase();
+    const loanMeta = getAssetMeta(chainId, loanAddress);
+    const loanKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId);
     // prices
     const priceLoan = prices[loanKey] ?? 1;
     const priceHistLoan = pricesHist?.[loanKey] ?? priceLoan;
@@ -54,8 +56,8 @@ function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, pr
     const depositDec = parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
     const borrowDec = parseRawAmount(borrow.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18);
     const dataForLoanAsset = {
-        poolId: market.loanAddress,
-        underlying: market.loanAddress,
+        poolId: loanAddress,
+        underlying: loanAddress,
         deposits: parseRawAmount(deposits.toString(), market.loanDecimals ?? loanMeta?.decimals ?? 18),
         depositsRaw: deposits.toString(),
         debtStable: "0",
@@ -67,16 +69,17 @@ function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, pr
         collateralActive: true,
         claimableRewards: 0,
     };
-    const assetMeta = getAssetMeta(chainId, market.collateralAddress);
+    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(market.collateralAddress, chainId);
+    const key = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(collateralAddress, chainId);
     // prices
     const price = prices[key] ?? 1;
     const priceHist = pricesHist?.[key] ?? price;
     const dataForCollateralAsset = {
-        poolId: market.collateralAddress,
-        underlying: market.collateralAddress,
+        poolId: collateralAddress,
+        underlying: collateralAddress,
         deposits: collateralDec,
         depositsRaw: balanceInfo.collateral.toString(),
         debtStable: "0",
@@ -90,8 +93,8 @@ function createMorphoEntryFromMarketWithLens(i, balanceInfo, chainId, market, pr
     };
     return {
         dataForMarket: {
-            [market.loanAddress]: dataForLoanAsset,
-            [market.collateralAddress]: dataForCollateralAsset
+            [loanAddress]: dataForLoanAsset,
+            [collateralAddress]: dataForCollateralAsset
         },
         addedDeposits: Number(depositDec) * priceHistLoan + Number(collateralDec) * priceHist,
         addedDebt: Number(borrowDec) * priceHistLoan

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

@@ -1,17 +1,17 @@
-import { Lender } from "@1delta/asset-registry";
-import { BaseYields, RewardsMap } from "../aave-v3-type/types";
+import { BaseYields, RewardsMap } from '../aave-v3-type/types';
 export type SerializedBigNumber = string;
 export type SerializedNumber = string;
 export interface LenderUserQuery {
-    lender: Lender;
+    /** the lender enum (Note that for multi-market ones, it is not the lender but the group)  */
+    lender: any;
+    /** user address */
     account: string;
+    /** custom parameters for fetching e.g. multi-market lenders */
+    params?: any[];
 }
-export interface AllowanceData {
-    allowanceWithdrawal: string;
-    allowanceBorrowingVariable: string;
-    allowanceBorrowingStable: string;
-}
-export interface UserLendingPosition extends AllowanceData {
+/** Filter all morphos into one for querying */
+export declare function organizeUserQueries(queries: LenderUserQuery[]): LenderUserQuery[];
+export interface UserLendingPosition {
     deposits: number;
     debt: number;
     debtStable: number;
@@ -32,7 +32,7 @@ export interface LenderUserResponse {
     account: string;
     lendingPositions: {
         [lender: string]: {
-            [tokenSymbol: string]: UserLendingPosition;
+            [poolId: string]: UserLendingPosition;
         };
     };
     rewards: UserRewardEntry;
@@ -64,15 +64,15 @@ export interface AaveV2UserReserveResponse {
     account: string;
     lendingPositions: {
         [id: string]: {
-            [tokenSymbol: string]: AavelendingPositions;
+            [poolId: string]: AavelendingPositions;
         };
     };
     rewards: UserRewardEntry;
 }
-interface AavelendingPositions extends AllowanceData {
-    deposits: number;
-    debt: number;
-    debtStable: number;
+interface AavelendingPositions {
+    deposits: string;
+    debt: string;
+    debtStable: string;
     depositsUSD: number;
     debtUSD: number;
     debtStableUSD: number;
@@ -83,17 +83,28 @@ export interface AaveV3UserReserveResponse {
     chainId: string;
     lendingPositions: {
         [id: string]: {
-            [tokenSymbol: string]: AavelendingPositions;
+            [poolId: string]: AavelendingPositions;
         };
     };
     userEMode: number;
     rewards?: any;
     account: string;
 }
+export interface MorphoUserReserveResponse {
+    chainId: string;
+    lendingPositions: {
+        [id: string]: {
+            [poolId: string]: AavelendingPositions;
+        };
+    };
+    id: string;
+    rewards?: any;
+    account: string;
+}
 export interface CompoundV3UserReserveResponse {
     lendingPositions: {
         [id: string]: {
-            [tokenSymbol: string]: {
+            [poolId: string]: {
                 deposits: number;
                 debt: number;
                 debtStable: number;
@@ -191,12 +202,12 @@ export interface InitUserReserveResponse {
     lendingPositions: {
         [posId: string]: {
             mode: any;
-            [tokenSymbol: string]: {
+            [poolId: string]: {
                 deposits: number;
                 debt: number;
                 depositsUSD: number;
                 debtUSD: number;
-                debtStable: "0";
+                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/types.js

@@ -1,3 +1,15 @@
+import { Lender } from '@1delta/asset-registry';
+/** Filter all morphos into one for querying */
+export function organizeUserQueries(queries) {
+    const morphos = queries.filter((q) => q.lender.startsWith('MORPHO_BLUE'));
+    const nonMorphos = queries.filter((q) => !q.lender.startsWith('MORPHO_BLUE'));
+    const morphosCollapsed = {
+        lender: Lender.MORPHO_BLUE,
+        account: queries[0].account,
+        params: morphos.map((p) => p.lender),
+    };
+    return [...nonMorphos, morphosCollapsed];
+}
 // Aave V2 specific enums
 export var AaveV2TypeGetUserReserveData;
 (function (AaveV2TypeGetUserReserveData) {

package/dist/lending/user-data/utils/createGeneralUserState.d.ts

@@ -1,4 +1,4 @@
-import { AaveV2Public, AaveV2UserReserveResponse, AaveV3Public, AaveV3UserReserveResponse, CompoundV3Public, CompoundV3UserReserveResponse } from "../types";
+import { AaveV2Public, AaveV2UserReserveResponse, AaveV3Public, AaveV3UserReserveResponse, CompoundV3Public, CompoundV3UserReserveResponse } from '../types';
 type LenderUserData = AaveV3UserReserveResponse | AaveV2UserReserveResponse | CompoundV3UserReserveResponse;
 type LenderState = AaveV3Public | AaveV2Public | CompoundV3Public;
 export declare function createBaseTypeUserState(payload: LenderUserData, lenderData: {
@@ -7,7 +7,7 @@ export declare function createBaseTypeUserState(payload: LenderUserData, lenderD
     account: string;
     chainId: string;
     balanceData: {
-        "0": {
+        '0': {
             rewards?: any;
             borrowDiscountedCollateral: number;
             collateral: number;
@@ -21,7 +21,7 @@ export declare function createBaseTypeUserState(payload: LenderUserData, lenderD
         };
     };
     aprData: {
-        "0": {
+        '0': {
             apr: number;
             borrowApr: number;
             depositApr: number;
@@ -35,7 +35,7 @@ export declare function createBaseTypeUserState(payload: LenderUserData, lenderD
         };
     };
     userConfigs: {
-        "0": {
+        '0': {
             selectedMode: number;
             id: string;
         };

package/dist/lending/user-data/utils/createGeneralUserState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createGeneralUserState.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/utils/createGeneralUserState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,yBAAyB,EAAE,YAAY,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAA;AAG5J,KAAK,cAAc,GAAG,yBAAyB,GAAG,yBAAyB,GAAG,6BAA6B,CAAA;AAC3G,KAAK,WAAW,GAAG,YAAY,GAAG,YAAY,GAAG,gBAAgB,CAAA;AAEjE,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,EACxC,gBAAgB,GAAE,MAAU,EAC5B,YAAY,GAAE,MAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0GzB"}
+{"version":3,"file":"createGeneralUserState.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/utils/createGeneralUserState.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,yBAAyB,EACzB,YAAY,EACZ,yBAAyB,EACzB,gBAAgB,EAChB,6BAA6B,EAC9B,MAAM,UAAU,CAAA;AAGjB,KAAK,cAAc,GACf,yBAAyB,GACzB,yBAAyB,GACzB,6BAA6B,CAAA;AACjC,KAAK,WAAW,GAAG,YAAY,GAAG,YAAY,GAAG,gBAAgB,CAAA;AAEjE,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,cAAc,EACvB,UAAU,EAAE;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,WAAW,CAAA;CAAE,EACxC,gBAAgB,GAAE,MAAU,EAC5B,YAAY,GAAE,MAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwHzB"}

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

@@ -1,7 +1,7 @@
-import { divideAccrualsToAprs } from ".";
-import { safeDivide } from "./formatting";
+import { divideAccrualsToAprs } from '.';
+import { safeDivide } from './formatting';
 export function createBaseTypeUserState(payload, lenderData, totalDeposits24h = 0, totalDebt24h = 0) {
-    let assetKeys = Object.keys(payload.lendingPositions["0"] ?? {});
+    let assetKeys = Object.keys(payload.lendingPositions['0'] ?? {});
     const { chainId, account } = payload;
     const mode = Number(payload.userEMode ?? 0);
     // organic yields
@@ -24,19 +24,22 @@ export function createBaseTypeUserState(payload, lenderData, totalDeposits24h =
         const asset = assetKeys[i];
         if (!lenderData?.[asset])
             continue;
-        const { depositsUSD, debtStableUSD, debtUSD, collateralActive } = payload.lendingPositions["0"][asset];
-        const { depositRate, stakingYield, variableBorrowRate, stableBorrowRate, rewards } = lenderData[asset];
+        const { depositsUSD, debtStableUSD, debtUSD, collateralActive } = payload.lendingPositions['0'][asset];
+        const { depositRate, stakingYield, variableBorrowRate, stableBorrowRate, rewards, } = lenderData[asset];
         // amounts
         deposits += depositsUSD;
         debt += debtStableUSD;
         debt += debtUSD;
-        // rewards 
+        // rewards
         Object.entries(rewards ?? {}).forEach(([key, rewardData]) => {
             rewardDepositAccrual += rewardData.depositRate * depositsUSD;
-            rewardBorrowAccrual += rewardData.variableBorrowRate * debtUSD + (rewardData.stableBorrowRate ?? 0) * debtStableUSD;
+            rewardBorrowAccrual +=
+                rewardData.variableBorrowRate * debtUSD +
+                    (rewardData.stableBorrowRate ?? 0) * debtStableUSD;
             // totals
             const rewDepo = rewardData.depositRate * depositsUSD;
-            const rewDebt = rewardData.variableBorrowRate * debtUSD + (rewardData.stableBorrowRate ?? 0) * (debtStableUSD ?? 0);
+            const rewDebt = rewardData.variableBorrowRate * debtUSD +
+                (rewardData.stableBorrowRate ?? 0) * (debtStableUSD ?? 0);
             if (!rewardsPerAsset[key])
                 rewardsPerAsset[key] = { depositApr: 0, borrowApr: 0 };
             if (rewDepo > 0)
@@ -49,17 +52,21 @@ export function createBaseTypeUserState(payload, lenderData, totalDeposits24h =
         stakingBorrowAccrual += (stakingYield ?? 0) * (debtStableUSD + debtUSD);
         if (collateralActive) {
             // risk adjusted
-            collateral += (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
-            borrowDiscountedCollateral += (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) * depositsUSD;
+            collateral +=
+                (lenderData[asset].config[mode]?.collateralFactor ?? 1) * depositsUSD;
+            borrowDiscountedCollateral +=
+                (lenderData[asset].config[mode]?.borrowCollateralFactor ?? 1) *
+                    depositsUSD;
         }
         // IRs
         depositInterest += depositRate * depositsUSD;
-        borrowInterest += debtStableUSD * stableBorrowRate + debtUSD * variableBorrowRate;
+        borrowInterest +=
+            debtStableUSD * stableBorrowRate + debtUSD * variableBorrowRate;
     }
     const nav = deposits - debt;
     // aggregated balance data
     const balanceData = {
-        "0": {
+        '0': {
             borrowDiscountedCollateral,
             collateral,
             deposits,
@@ -69,12 +76,12 @@ export function createBaseTypeUserState(payload, lenderData, totalDeposits24h =
             deposits24h: totalDeposits24h,
             debt24h: totalDebt24h,
             nav24h: totalDeposits24h - totalDebt24h,
-            ...(payload.rewards ? { rewards: payload.rewards } : {})
-        }
+            ...(payload.rewards ? { rewards: payload.rewards } : {}),
+        },
     };
     // aggregated apr data
     const aprData = {
-        "0": {
+        '0': {
             apr: safeDivide(depositInterest - borrowInterest, nav),
             borrowApr: safeDivide(borrowInterest, debt),
             depositApr: safeDivide(depositInterest, deposits),
@@ -85,9 +92,9 @@ export function createBaseTypeUserState(payload, lenderData, totalDeposits24h =
             stakingApr: safeDivide(stakingDepositAccrual - stakingBorrowAccrual, nav),
             stakingDepositApr: safeDivide(stakingDepositAccrual, deposits),
             stakingBorrowApr: safeDivide(stakingBorrowAccrual, debt),
-        }
+        },
     };
-    const userConfigs = { "0": { selectedMode: mode, id: account } };
+    const userConfigs = { '0': { selectedMode: mode, id: account } };
     return {
         account,
         chainId,

package/dist/utils/index.d.ts

@@ -1,4 +1,8 @@
 import { Lender } from "@1delta/asset-registry";
+export declare function isCompoundV3(lender: string): boolean;
+export declare function isCompoundV3Type(lender: string): boolean;
+export declare function isInit(lender: string): lender is Lender.INIT;
+export declare function isMorphoType(lender: string): boolean;
 export declare const AAVE_V3_2_PROTOCOLS: Lender[];
 export declare function isAaveV3Type(lender: string): boolean;
 export declare function isAaveV3Original(lender: string): boolean;
@@ -6,9 +10,6 @@ export declare function isAaveV2Type(lender: string): boolean;
 export declare function isYLDR(lender: string): lender is Lender.YLDR;
 export declare function isAaveV32Type(lender: Lender): boolean;
 export declare function isAaveType(lender: string): boolean;
-export declare function isCompoundV3(lender: string): boolean;
-export declare function isCompoundV3Type(lender: string): boolean;
-export declare function isInit(lender: string): lender is Lender.INIT;
 export declare function isSwaylend(lender: string): boolean;
 export declare const getLendersForChain: (c: string) => string[];
 /** Filter lenders by protocol list */
@@ -19,4 +20,5 @@ export declare const AAVES_PER_CHAIN: {
 };
 export declare const getComposerAddress: (chainId: string) => string;
 export declare const getLenderAssets: (chainId: string | number | undefined, lendingProtocol?: Lender) => string[];
+export declare function isMultiMarket(lender: string): boolean;
 //# sourceMappingURL=index.d.ts.map

package/dist/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,MAAM,EAGP,MAAM,wBAAwB,CAAA;AAQ/B,eAAO,MAAM,mBAAmB,UAAkE,CAAA;AAElG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAE9C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAE9C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,aAqB3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAAI,YAAY,MAAM,EAAE,EAAE,eAAe,MAAM,EAAE,KAAG,MAAM,EAQ7F,CAAA;AAaD,mCAAmC;AACnC,eAAO,MAAM,eAAe;;CAAqB,CAAA;AAEjD,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAA;AAED,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,wBAAgC,KAAG,MAAM,EAO9G,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,MAAM,EAIP,MAAM,wBAAwB,CAAA;AAO/B,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAA+C;AAE1F,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAA+C;AAE9F,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAAmC;AAExE,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAI1C;AAID,eAAO,MAAM,mBAAmB,UAAkE,CAAA;AAElG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,WAE9C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,MAAM,CAAC,MAAM,EAAE,MAAM,yBAEpC;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,WAExC;AAED,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,aA4B3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAAI,YAAY,MAAM,EAAE,EAAE,eAAe,MAAM,EAAE,KAAG,MAAM,EAS7F,CAAA;AAaD,mCAAmC;AACnC,eAAO,MAAM,eAAe;;CAAqB,CAAA;AAEjD,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,KAAG,MAEpD,CAAA;AAED,eAAO,MAAM,eAAe,GAC1B,SAAS,MAAM,GAAG,MAAM,GAAG,SAAS,EACpC,wBAAgC,KAC/B,MAAM,EAOR,CAAA;AAGD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C"}