@1delta/margin-fetcher 0.0.33 → 0.0.35

package/dist/lending/user-data/aave-v2-type/userCallBuild.d.ts

@@ -1,4 +1,4 @@
-import { Call } from "../../../utils/multicall";
+import { Call } from '../../../utils/multicall';
 import { Lender } from '@1delta/lender-registry';
-export declare const buildAaveV2UserCall: (chainId: string, lender: Lender, account: string) => Call[];
+export declare const buildAaveV2UserCall: (chainId: string, lender: Lender, account: string, assets?: string[]) => Call[];
 //# sourceMappingURL=userCallBuild.d.ts.map

package/dist/lending/user-data/aave-v2-type/userCallBuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/aave-v2-type/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAmBhD,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,EAAE,QAAQ,MAAM,EAAE,SAAS,MAAM,KAAG,IAAI,EAiG1F,CAAA"}
+{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/aave-v2-type/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AA0BhD,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,KAChB,IAAI,EA+EN,CAAA"}

package/dist/lending/user-data/aave-v2-type/userCallBuild.js

@@ -1,6 +1,6 @@
 import { Lender } from '@1delta/lender-registry';
-import { getAaveAssets, getAaveStyleProtocolTokenMap, getAaveTypePoolDataProviderAddress } from "../../../assets";
-import { getAaveTypeIncentivesControllerAddress, getAaveTypeMultiFeeDistribution } from "../../addresses";
+import { getAaveAssets, getAaveStyleProtocolTokenMap, getAaveTypePoolDataProviderAddress, } from '../../../assets';
+import { getAaveTypeIncentivesControllerAddress, getAaveTypeMultiFeeDistribution, } from '../../addresses';
 const getBaseAaveV2Calls = (chainId, account, lender, assetsToQuery) => {
     return assetsToQuery.flatMap((tk) => [
         {
@@ -10,11 +10,11 @@ const getBaseAaveV2Calls = (chainId, account, lender, assetsToQuery) => {
         },
     ]);
 };
-export const buildAaveV2UserCall = (chainId, lender, account) => {
+export const buildAaveV2UserCall = (chainId, lender, account, assets) => {
     switch (lender) {
         case Lender.AURELIUS: {
             const rewarder = getAaveTypeIncentivesControllerAddress(chainId, lender);
-            const assetsToQuery = getAaveAssets(chainId, lender);
+            const assetsToQuery = assets ?? getAaveAssets(chainId, lender);
             const aaveTokenMap = getAaveStyleProtocolTokenMap(chainId, lender);
             const aTokens = Object.values(aaveTokenMap).map((a) => a.aToken);
             const vTokens = Object.values(aaveTokenMap).map((a) => a.vToken);
@@ -24,13 +24,10 @@ export const buildAaveV2UserCall = (chainId, lender, account) => {
                     address: rewarder,
                     name: 'getAllUserRewardsBalance',
                     params: [
-                        [
-                            ...Object.values(aTokens),
-                            ...Object.values(vTokens)
-                        ],
-                        account
+                        [...Object.values(aTokens), ...Object.values(vTokens)],
+                        account,
                     ],
-                }
+                },
             ];
         }
         case Lender.MERIDIAN:
@@ -76,7 +73,7 @@ export const buildAaveV2UserCall = (chainId, lender, account) => {
             return [
                 ...getBaseAaveV2Calls(chainId, account, lender, assetsToQuery),
                 rewardsBalance,
-                unclaimedRewards
+                unclaimedRewards,
             ];
         }
         default: {

package/dist/lending/user-data/aave-v2-type/userCallParse.js

@@ -223,8 +223,8 @@ function createAaveV2Entry(i, data, chainId, asset, prices, pricesHist, claimabl
     const price = prices[key] ?? 1;
     const priceHist = pricesHist?.[key] ?? price;
     const dataForAsset = {
-        poolId: asset,
-        underlying: asset,
+        poolId: asset.address,
+        underlying: asset.address,
         deposits: currentATokenBalance,
         depositsRaw: currentATokenBalanceRaw,
         debtStable: currentStableDebt,

package/dist/lending/user-data/aave-v3-type/userCallBuild.d.ts

@@ -1,4 +1,4 @@
 import { Lender } from '@1delta/lender-registry';
-import { Call } from "../../../utils/multicall";
-export declare const buildAaveV3UserCall: (chainId: string, lender: Lender, account: string) => Call[];
+import { Call } from '../../../utils/multicall';
+export declare const buildAaveV3UserCall: (chainId: string, lender: Lender, account: string, assets?: string[]) => Call[];
 //# sourceMappingURL=userCallBuild.d.ts.map

package/dist/lending/user-data/aave-v3-type/userCallBuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/aave-v3-type/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAmB/C,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,EAAE,QAAQ,MAAM,EAAE,SAAS,MAAM,KAAG,IAAI,EAqB1F,CAAA"}
+{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/aave-v3-type/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAuB/C,eAAO,MAAM,mBAAmB,GAC9B,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,KAChB,IAAI,EAcN,CAAA"}

package/dist/lending/user-data/aave-v3-type/userCallBuild.js

@@ -1,19 +1,17 @@
-import { getAaveAssets, getAaveTypePoolDataProviderAddress, getAaveTypePoolAddress } from "../../../assets";
-import { isYLDR } from "../../../utils";
+import { getAaveAssets, getAaveTypePoolDataProviderAddress, getAaveTypePoolAddress, } from '../../../assets';
+import { isYLDR } from '../../../utils';
 const getBaseAaveV3Calls = (chainId, account, lender, assetsToQuery) => {
     return assetsToQuery.flatMap((tk) => [
         {
             address: getAaveTypePoolDataProviderAddress(chainId, lender),
             name: 'getUserReserveData',
             params: [tk, account],
-        }
+        },
     ]);
 };
-export const buildAaveV3UserCall = (chainId, lender, account) => {
-    const assetsToQuery = getAaveAssets(chainId, lender);
-    const calls = [
-        ...getBaseAaveV3Calls(chainId, account, lender, assetsToQuery),
-    ];
+export const buildAaveV3UserCall = (chainId, lender, account, assets) => {
+    const assetsToQuery = assets ?? getAaveAssets(chainId, lender);
+    const calls = [...getBaseAaveV3Calls(chainId, account, lender, assetsToQuery)];
     if (!isYLDR(lender)) {
         const callDataEmode = {
             address: getAaveTypePoolAddress(chainId, lender),

package/dist/lending/user-data/aave-v3-type/userCallParse.js

@@ -63,8 +63,8 @@ function createAaveV3Entry(i, data, chainId, asset, prices, pricesHist) {
     const price = prices[key] ?? 1;
     const priceHist = pricesHist?.[key] ?? price;
     const dataForAsset = {
-        poolId: asset,
-        underlying: asset,
+        poolId: asset.address,
+        underlying: asset.address,
         deposits: currentATokenBalance,
         depositsRaw: currentATokenBalanceRaw,
         debtStable: currentStableDebt,

package/dist/lending/user-data/aave-v3-type/userCallParseYldr.js

@@ -16,7 +16,7 @@ export const getYldrUserDataConverter = (lender, chainId, account, prices, price
             let totalDeposits24h = 0;
             for (let i = 0; i < assetsToQuery.length; i++) {
                 const asset = assetsToQuery[i];
-                const { dataForAsset, addedDebt, addedDeposits } = createAaveV3Entry(i, data, chainId, lenderData[asset].asset ``, prices, pricesHist);
+                const { dataForAsset, addedDebt, addedDeposits } = createAaveV3Entry(i, data, chainId, lenderData[asset].asset, prices, pricesHist);
                 if (!dataForAsset)
                     continue;
                 totalDebt24h += addedDebt;
@@ -60,8 +60,8 @@ function createAaveV3Entry(i, data, chainId, asset, prices, pricesHist) {
     const price = prices[key] ?? 1;
     const priceHist = pricesHist?.[key] ?? price;
     const dataForAsset = {
-        poolId: asset,
-        underlying: asset,
+        poolId: asset.address,
+        underlying: asset.address,
         deposits: currentATokenBalance,
         depositsRaw: currentATokenBalanceRaw,
         debtStable: '0',

package/dist/lending/user-data/compound-v3/userCallBuild.d.ts

@@ -1,4 +1,4 @@
 import { Lender } from '@1delta/lender-registry';
 import { Call } from '../../../utils/multicall';
-export declare const buildCompoundV3UserCall: (chainId: string, lender: Lender, account: string) => Call[];
+export declare const buildCompoundV3UserCall: (chainId: string, lender: Lender, account: string, assetsOverride?: string[]) => Call[];
 //# sourceMappingURL=userCallBuild.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/compound-v3/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAQ/C,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,SAAS,MAAM,KACd,IAAI,EAkCN,CAAA"}
+{"version":3,"file":"userCallBuild.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/compound-v3/userCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAQ/C,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,QAAQ,MAAM,EACd,SAAS,MAAM,EACf,iBAAiB,MAAM,EAAE,KACxB,IAAI,EAkCN,CAAA"}

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

@@ -1,9 +1,9 @@
 import { getLenderAssets } from '../../../utils';
 import { getCompoundV3BaseAsset, getCompoundV3CometAddress, getCompoundV3CometRewardsAddress, } from '../../addresses/compoundV3';
-export const buildCompoundV3UserCall = (chainId, lender, account) => {
+export const buildCompoundV3UserCall = (chainId, lender, account, assetsOverride) => {
     const baseAsset = getCompoundV3BaseAsset(lender, chainId)?.baseAsset;
     const cometContractAddress = getCompoundV3CometAddress(chainId, lender);
-    const assets = getLenderAssets(chainId, lender);
+    const assets = assetsOverride ?? getLenderAssets(chainId, lender);
     const assetsNoBase = assets.filter((a) => a !== baseAsset);
     const baseCalls = [
         {

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

@@ -1 +1 @@
-{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/compound-v3/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAA;AASxD,eAAO,MAAM,8BAA8B,GACzC,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,6BAA6B,GAAG,SAAS,EAAE,MAAM,CAmHrE,CAAA"}
+{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/compound-v3/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAChD,OAAO,EAAE,6BAA6B,EAAE,MAAM,UAAU,CAAA;AAMxD,eAAO,MAAM,8BAA8B,GACzC,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,6BAA6B,GAAG,SAAS,EAAE,MAAM,CAkHrE,CAAA"}

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

@@ -1,4 +1,4 @@
-import { toGenericPriceKey, toOracleKey, } from '../../../assets';
+import { toGenericPriceKey, toOracleKey } from '../../../assets';
 import { getCompoundV3BaseAsset } from '../../addresses/compoundV3';
 import { parseRawAmount } from '../../../utils/parsing';
 import { createBaseTypeUserState } from '../utils';

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

@@ -8,6 +8,7 @@ import { GetEvmClientFunction } from '../../types';
  * @param allowFailure - multicall can fail in single call, default is true - note that this might mess with the retries as it will never error
  * @param batchSize - multicall batch size, default is 4096
  * @param logs - show multicall error logs, default is false
+ * @param lenderData - optional public lender data to dynamically use pols and assets provided externally
  * @returns The raw results from the multicall, "0x" for failures
  */
 export declare const getLenderUserDataResult: (chainId: string, queriesRaw: LenderUserQuery[], getEvmClient: GetEvmClientFunction, allowFailure?: boolean, batchSize?: number, retries?: number, logs?: boolean) => Promise<any[]>;

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":"AAcA,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AA6FlD;;;;;;;;;GASG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,cAAc,oBAAoB,EAClC,sBAAmB,EACnB,kBAAwC,EACxC,gBAAW,EACX,cAAY,KACX,OAAO,CAAC,GAAG,EAAE,CAgCf,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;CAsCzB,CAAA"}
+{"version":3,"file":"fetchUserData.d.ts","sourceRoot":"","sources":["../../../src/lending/user-data/fetchUserData.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,eAAe,EAAuB,MAAM,SAAS,CAAA;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAgGlD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,MAAM,EACf,YAAY,eAAe,EAAE,EAC7B,cAAc,oBAAoB,EAClC,sBAAmB,EACnB,kBAAwC,EACxC,gBAAW,EACX,cAAY,KACX,OAAO,CAAC,GAAG,EAAE,CAgCf,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;CAoCzB,CAAA"}

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

@@ -13,16 +13,16 @@ 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) {
+function buildUserCall(chainId, lender, account, params, assets) {
     if (isAaveV2Type(lender))
-        return buildAaveV2UserCall(chainId, lender, account);
+        return buildAaveV2UserCall(chainId, lender, account, assets);
     if (isAaveV3Type(lender))
-        return buildAaveV3UserCall(chainId, lender, account);
+        return buildAaveV3UserCall(chainId, lender, account, assets);
     if (isInit(lender))
         return buildInitUserCall(chainId, lender, account);
     if (isMorphoType(lender))
         return buildMorphoUserCallWithLens(chainId, account, lender, params);
-    return buildCompoundV3UserCall(chainId, lender, account);
+    return buildCompoundV3UserCall(chainId, lender, account, assets);
 }
 function getUserDataConverter(lender, chainId, account, prices, pricesHist, lenderPublicState, params) {
     if (isYLDR(lender))
@@ -45,6 +45,7 @@ function getUserDataConverter(lender, chainId, account, prices, pricesHist, lend
  * @param allowFailure - multicall can fail in single call, default is true - note that this might mess with the retries as it will never error
  * @param batchSize - multicall batch size, default is 4096
  * @param logs - show multicall error logs, default is false
+ * @param lenderData - optional public lender data to dynamically use pols and assets provided externally
  * @returns The raw results from the multicall, "0x" for failures
  */
 export const getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient, allowFailure = true, batchSize = MULTICALL_DEFAULT_BATCH_SIZE, retries = 3, logs = false) => {
@@ -52,7 +53,7 @@ export const getLenderUserDataResult = async (chainId, queriesRaw, getEvmClient,
     const queries = organizeUserQueries(queriesRaw);
     for (const query of queries) {
         const abi = getAbi(query.lender);
-        const callData = buildUserCall(chainId, query.lender, query.account, query.params);
+        const callData = buildUserCall(chainId, query.lender, query.account, query.params, query.assets);
         const mappedCalls = callData.map((call) => ({ call, abi }));
         calls = [...calls, ...mappedCalls];
     }

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,yBAAyB,CAAA;AAEhD,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAiDpD,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,CA6FP,CAAA"}
+{"version":3,"file":"userCallParse.d.ts","sourceRoot":"","sources":["../../../../src/lending/user-data/morpho/userCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAA;AAEhD,OAAO,EAAE,yBAAyB,EAAE,MAAM,UAAU,CAAA;AAiDpD,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,CA2FP,CAAA"}

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

@@ -8,6 +8,8 @@ export interface LenderUserQuery {
     account: string;
     /** custom parameters for fetching e.g. multi-market lenders */
     params?: any[];
+    /** custom parameters for spceifying assets */
+    assets?: any[];
 }
 /** Filter all morphos into one for querying */
 export declare function organizeUserQueries(queries: LenderUserQuery[]): LenderUserQuery[];

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,12 +1,16 @@
 import { Lender } from '@1delta/lender-registry';
+import { isMorphoType } from '../../utils';
 /** 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 morphos = queries.filter((q) => isMorphoType(q.lender));
+    if (morphos.length === 0)
+        return queries;
+    const nonMorphos = queries.filter((q) => !isMorphoType(q.lender));
     const morphosCollapsed = {
         lender: Lender.MORPHO_BLUE,
         account: queries[0].account,
         params: morphos.map((p) => p.lender),
+        assets: undefined
     };
     return [...nonMorphos, morphosCollapsed];
 }

package/dist/utils/index.d.ts

@@ -8,7 +8,6 @@ export declare function isAaveV2Type(lender: string): boolean;
 export declare function isYLDR(lender: string): lender is Lender.YLDR;
 export declare function isAaveV32Type(lender: string): boolean;
 export declare function isAaveType(lender: string): boolean;
-export declare function isSwaylend(lender: string): boolean;
 export declare const getLendersForChain: (c: string) => string[];
 /** Filter lenders by protocol list */
 export declare const filterLendersByProtocol: (allLenders: string[], protocolList?: string[]) => string[];

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,EAGL,MAAM,EAEP,MAAM,yBAAyB,CAAA;AAehC,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,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAID,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;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,aA2B3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAClC,YAAY,MAAM,EAAE,EACpB,eAAe,MAAM,EAAE,KACtB,MAAM,EAaR,CAAA;AAED,mCAAmC;AACnC,eAAO,MAAM,gBAAgB;;CAS5B,CAAA;AAED,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;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EAEP,MAAM,yBAAyB,CAAA;AAehC,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,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,WAE1C;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,eAAO,MAAM,kBAAkB,GAAI,GAAG,MAAM,aA2B3C,CAAA;AAED,sCAAsC;AACtC,eAAO,MAAM,uBAAuB,GAClC,YAAY,MAAM,EAAE,EACpB,eAAe,MAAM,EAAE,KACtB,MAAM,EAaR,CAAA;AAED,mCAAmC;AACnC,eAAO,MAAM,gBAAgB;;CAS5B,CAAA;AAED,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;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,WAE3C"}

package/dist/utils/index.js

@@ -16,7 +16,6 @@ export function isInit(lender) {
 export function isMorphoType(lender) {
     return lender?.startsWith('MORPHO_BLUE');
 }
-const SWAYLEND_KEY = 'SWAYLEND';
 export function isAaveV3Type(lender) {
     return AAVE_V3_LENDERS.includes(lender);
 }
@@ -32,9 +31,6 @@ export function isAaveV32Type(lender) {
 export function isAaveType(lender) {
     return [...AAVE_V3_LENDERS, ...AAVE_V2_LENDERS].includes(lender);
 }
-export function isSwaylend(lender) {
-    return lender?.startsWith(SWAYLEND_KEY);
-}
 export const getLendersForChain = (c) => {
     let lenders = [];
     // aaves

package/package.json

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

package/src/lending/user-data/aave-v2-type/userCallBuild.ts

@@ -1,7 +1,14 @@
-import { Call } from "../../../utils/multicall"
+import { Call } from '../../../utils/multicall'
 import { Lender } from '@1delta/lender-registry'
-import { getAaveAssets, getAaveStyleProtocolTokenMap, getAaveTypePoolDataProviderAddress } from "../../../assets"
-import { getAaveTypeIncentivesControllerAddress, getAaveTypeMultiFeeDistribution } from "../../addresses"
+import {
+  getAaveAssets,
+  getAaveStyleProtocolTokenMap,
+  getAaveTypePoolDataProviderAddress,
+} from '../../../assets'
+import {
+  getAaveTypeIncentivesControllerAddress,
+  getAaveTypeMultiFeeDistribution,
+} from '../../addresses'
 
 const getBaseAaveV2Calls = (
   chainId: string,
@@ -18,11 +25,16 @@ const getBaseAaveV2Calls = (
   ])
 }
 
-export const buildAaveV2UserCall = (chainId: string, lender: Lender, account: string): Call[] => {
+export const buildAaveV2UserCall = (
+  chainId: string,
+  lender: Lender,
+  account: string,
+  assets?: string[],
+): Call[] => {
   switch (lender) {
     case Lender.AURELIUS: {
       const rewarder = getAaveTypeIncentivesControllerAddress(chainId, lender)
-      const assetsToQuery = getAaveAssets(chainId, lender)
+      const assetsToQuery = assets ?? getAaveAssets(chainId, lender)
 
       const aaveTokenMap = getAaveStyleProtocolTokenMap(chainId, lender)
 
@@ -30,23 +42,15 @@ export const buildAaveV2UserCall = (chainId: string, lender: Lender, account: st
       const vTokens = Object.values(aaveTokenMap).map((a: any) => a.vToken)
 
       return [
-        ...getBaseAaveV2Calls(
-          chainId,
-          account,
-          lender,
-          assetsToQuery,
-        ),
+        ...getBaseAaveV2Calls(chainId, account, lender, assetsToQuery),
         {
           address: rewarder,
           name: 'getAllUserRewardsBalance',
           params: [
-            [
-              ...Object.values(aTokens),
-              ...Object.values(vTokens)
-            ],
-            account
+            [...Object.values(aTokens), ...Object.values(vTokens)],
+            account,
           ],
-        }
+        },
       ]
     }
     case Lender.MERIDIAN:
@@ -95,24 +99,14 @@ export const buildAaveV2UserCall = (chainId: string, lender: Lender, account: st
       }
 
       return [
-        ...getBaseAaveV2Calls(
-          chainId,
-          account,
-          lender,
-          assetsToQuery
-        ),
+        ...getBaseAaveV2Calls(chainId, account, lender, assetsToQuery),
         rewardsBalance,
-        unclaimedRewards
+        unclaimedRewards,
       ]
     }
     default: {
       const assetsToQuery = getAaveAssets(chainId, lender)
-      return getBaseAaveV2Calls(
-        chainId,
-        account,
-        lender,
-        assetsToQuery,
-      )
+      return getBaseAaveV2Calls(chainId, account, lender, assetsToQuery)
     }
   }
-} 
+}

package/src/lending/user-data/aave-v2-type/userCallParse.ts

@@ -375,8 +375,8 @@ function createAaveV2Entry(
   const priceHist = pricesHist?.[key] ?? price
 
   const dataForAsset = {
-    poolId: asset,
-    underlying: asset,
+    poolId: asset.address,
+    underlying: asset.address,
     deposits: currentATokenBalance,
     depositsRaw: currentATokenBalanceRaw,
     debtStable: currentStableDebt,

package/src/lending/user-data/aave-v3-type/userCallBuild.ts

@@ -1,7 +1,11 @@
 import { Lender } from '@1delta/lender-registry'
-import { Call } from "../../../utils/multicall"
-import { getAaveAssets, getAaveTypePoolDataProviderAddress, getAaveTypePoolAddress } from "../../../assets"
-import { isYLDR } from "../../../utils"
+import { Call } from '../../../utils/multicall'
+import {
+  getAaveAssets,
+  getAaveTypePoolDataProviderAddress,
+  getAaveTypePoolAddress,
+} from '../../../assets'
+import { isYLDR } from '../../../utils'
 
 const getBaseAaveV3Calls = (
   chainId: string,
@@ -14,21 +18,19 @@ const getBaseAaveV3Calls = (
       address: getAaveTypePoolDataProviderAddress(chainId, lender),
       name: 'getUserReserveData',
       params: [tk, account],
-    }
+    },
   ])
 }
 
-export const buildAaveV3UserCall = (chainId: string, lender: Lender, account: string): Call[] => {
-  const assetsToQuery = getAaveAssets(chainId, lender)
+export const buildAaveV3UserCall = (
+  chainId: string,
+  lender: Lender,
+  account: string,
+  assets?: string[],
+): Call[] => {
+  const assetsToQuery = assets ?? getAaveAssets(chainId, lender)
 
-  const calls = [
-    ...getBaseAaveV3Calls(
-      chainId,
-      account,
-      lender,
-      assetsToQuery,
-    ),
-  ]
+  const calls = [...getBaseAaveV3Calls(chainId, account, lender, assetsToQuery)]
   if (!isYLDR(lender)) {
     const callDataEmode = {
       address: getAaveTypePoolAddress(chainId, lender),
@@ -39,4 +41,4 @@ export const buildAaveV3UserCall = (chainId: string, lender: Lender, account: st
   }
 
   return calls
-} 
+}

package/src/lending/user-data/aave-v3-type/userCallParse.ts

@@ -114,8 +114,8 @@ function createAaveV3Entry(
   const priceHist = pricesHist?.[key] ?? price
 
   const dataForAsset = {
-    poolId: asset,
-    underlying: asset,
+    poolId: asset.address,
+    underlying: asset.address,
     deposits: currentATokenBalance,
     depositsRaw: currentATokenBalanceRaw,
     debtStable: currentStableDebt,

package/src/lending/user-data/aave-v3-type/userCallParseYldr.ts

@@ -33,7 +33,7 @@ export const getYldrUserDataConverter = (
           i,
           data,
           chainId,
-          lenderData[asset].asset``,
+          lenderData[asset].asset,
           prices,
           pricesHist,
         )
@@ -103,8 +103,8 @@ function createAaveV3Entry(
   const priceHist = pricesHist?.[key] ?? price
 
   const dataForAsset = {
-    poolId: asset,
-    underlying: asset,
+    poolId: asset.address,
+    underlying: asset.address,
     deposits: currentATokenBalance,
     depositsRaw: currentATokenBalanceRaw,
     debtStable: '0',

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

@@ -11,10 +11,11 @@ export const buildCompoundV3UserCall = (
   chainId: string,
   lender: Lender,
   account: string,
+  assetsOverride?: string[],
 ): Call[] => {
   const baseAsset = getCompoundV3BaseAsset(lender, chainId)?.baseAsset
   const cometContractAddress = getCompoundV3CometAddress(chainId, lender)!
-  const assets = getLenderAssets(chainId, lender)
+  const assets = assetsOverride ?? getLenderAssets(chainId, lender)
   const assetsNoBase = assets.filter((a) => a !== baseAsset)
 
   const baseCalls = [

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

@@ -1,9 +1,6 @@
 import { Lender } from '@1delta/lender-registry'
 import { CompoundV3UserReserveResponse } from '../types'
-import {
-  toGenericPriceKey,
-  toOracleKey,
-} from '../../../assets'
+import { toGenericPriceKey, toOracleKey } from '../../../assets'
 import { getCompoundV3BaseAsset } from '../../addresses/compoundV3'
 import { parseRawAmount } from '../../../utils/parsing'
 import { createBaseTypeUserState } from '../utils'
@@ -116,7 +113,6 @@ export const getCompoundV3UserDataConverter = (
         },
         account,
       }
-
       const userData = createBaseTypeUserState(
         payload,
         lenderData,

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

@@ -32,13 +32,16 @@ function buildUserCall(
   lender: Lender,
   account: string,
   params?: any,
+  assets?: any[],
 ) {
-  if (isAaveV2Type(lender)) return buildAaveV2UserCall(chainId, lender, account)
-  if (isAaveV3Type(lender)) return buildAaveV3UserCall(chainId, lender, account)
+  if (isAaveV2Type(lender))
+    return buildAaveV2UserCall(chainId, lender, account, assets)
+  if (isAaveV3Type(lender))
+    return buildAaveV3UserCall(chainId, lender, account, assets)
   if (isInit(lender)) return buildInitUserCall(chainId, lender, account)
   if (isMorphoType(lender))
     return buildMorphoUserCallWithLens(chainId, account, lender, params)
-  return buildCompoundV3UserCall(chainId, lender, account)
+  return buildCompoundV3UserCall(chainId, lender, account, assets)
 }
 
 function getUserDataConverter(
@@ -114,6 +117,7 @@ function getUserDataConverter(
  * @param allowFailure - multicall can fail in single call, default is true - note that this might mess with the retries as it will never error
  * @param batchSize - multicall batch size, default is 4096
  * @param logs - show multicall error logs, default is false
+ * @param lenderData - optional public lender data to dynamically use pols and assets provided externally
  * @returns The raw results from the multicall, "0x" for failures
  */
 export const getLenderUserDataResult = async (
@@ -139,11 +143,11 @@ export const getLenderUserDataResult = async (
       query.lender,
       query.account,
       query.params,
+      query.assets,
     )
     const mappedCalls = callData.map((call) => ({ call, abi }))
     calls = [...calls, ...mappedCalls]
   }
-  
   return await multicallViemAbiArray(
     chainId,
     calls.map((call) => call.abi),
@@ -189,11 +193,9 @@ export const convertLenderUserDataResult = (
       lenderState[chainId],
       query.params,
     )
-
     try {
       const data = rawResults.slice(currentSlice, currentSlice + sliceLength)
       const convertedData = converter(data)
-
       if (convertedData) {
         if (isMultiMarket(query.lender)) {
           Object.keys(convertedData).forEach((market) => {

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

@@ -85,7 +85,6 @@ export const getMorphoUserDataConverterWithlens = (
       for (let i = 0; i < data.length; i++) {
         // get balance data array for chunk
         const balanceDatas = decodePackedDataset(data[i])
-
         // itereate of balanceDatas received in chunk
         balanceDatas.forEach((balanceData) => {
           // this will get the market by index
@@ -94,7 +93,6 @@ export const getMorphoUserDataConverterWithlens = (
           marketsHandled.push(markeId)
 
           const market = lenderData[markeId]?.params?.market
-
           const { dataForMarket, addedDebt, addedDeposits } =
             createMorphoEntryFromMarketWithLens(
               balanceData,
@@ -183,9 +181,9 @@ function createMorphoEntryFromMarketWithLens(
     }
 
   const collateralAddress = market.collateralAddress.toLowerCase()
-  
+
   const collateralAssetMeta = lenderData[collateralAddress].asset
-  
+
   // loan asset deposits
   const loanDepositNumber = parseRawAmount(
     deposits.toString(),

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

@@ -1,5 +1,6 @@
 import { Lender } from '@1delta/lender-registry'
 import { BaseYields, RewardsMap } from '../aave-v3-type/types'
+import { isMorphoType } from '../../utils'
 
 export type SerializedBigNumber = string
 export type SerializedNumber = string
@@ -11,17 +12,20 @@ export interface LenderUserQuery {
   account: string
   /** custom parameters for fetching e.g. multi-market lenders */
   params?: any[]
+  /** custom parameters for spceifying assets */
+  assets?: any[]
 }
 
-
 /** Filter all morphos into one for querying */
 export function organizeUserQueries(queries: LenderUserQuery[]) {
-  const morphos = queries.filter((q) => q.lender?.startsWith('MORPHO_BLUE'))
-  const nonMorphos = queries.filter((q) => !q.lender?.startsWith('MORPHO_BLUE'))
+  const morphos = queries.filter((q) => isMorphoType(q.lender))
+  if (morphos.length === 0) return queries
+  const nonMorphos = queries.filter((q) => !isMorphoType(q.lender))
   const morphosCollapsed = {
     lender: Lender.MORPHO_BLUE,
     account: queries[0].account,
     params: morphos.map((p) => p.lender),
+    assets: undefined
   }
   return [...nonMorphos, morphosCollapsed]
 }

package/src/utils/index.ts

@@ -34,8 +34,6 @@ export function isMorphoType(lender: string) {
   return lender?.startsWith('MORPHO_BLUE')
 }
 
-const SWAYLEND_KEY = 'SWAYLEND'
-
 export function isAaveV3Type(lender: string) {
   return AAVE_V3_LENDERS.includes(lender as any)
 }
@@ -56,10 +54,6 @@ export function isAaveType(lender: string) {
   return [...AAVE_V3_LENDERS, ...AAVE_V2_LENDERS].includes(lender as any)
 }
 
-export function isSwaylend(lender: string) {
-  return lender?.startsWith(SWAYLEND_KEY)
-}
-
 export const getLendersForChain = (c: string) => {
   let lenders: string[] = []
   // aaves

package/test/userDataAaveMainnet.test.ts

@@ -7,8 +7,9 @@ import { getEvmClient } from '@1delta/providers'
 import { Chain } from '@1delta/chain-registry'
 import { prettyPrint } from './utils'
 import { TestDataMainnet } from './dataMainnet'
+import { fetchLenderMetaFromDirAndInitialize } from '../src/lending'
 
-export const queries = {
+const queries = {
   '1': [
     {
       account: '0xbadA9c382165b31419F4CC0eDf0Fa84f80A3C8E5',
@@ -83,17 +84,15 @@ describe(
     it.only(
       'should fetch user data for Morpho on Base',
       async () => {
-        try {
-          const { userData } = await getUserData([Chain.ETHEREUM_MAINNET])
+        await fetchLenderMetaFromDirAndInitialize()
 
-          prettyPrint(userData)
+        const { userData } = await getUserData([Chain.ETHEREUM_MAINNET])
 
-          // Basic validation
-          expect(userData).toBeDefined()
-          expect(typeof userData).toBe('object')
-        } catch (error) {
-          console.log('Error fetching Morpho Base data:', error)
-        }
+        prettyPrint(userData)
+
+        // Basic validation
+        expect(userData).toBeDefined()
+        expect(typeof userData).toBe('object')
       },
       { timeout: 30000 },
     )

package/test/userDataMorphoEthereum.test.ts

@@ -3,39 +3,44 @@ import {
   getLenderUserDataResult,
   convertLenderUserDataResult,
 } from '../src/lending/user-data/fetchUserData'
-import { getEvmClient } from '@1delta/providers'
+import { getEvmClient, getEvmClientWithCustomRpcs } from '@1delta/providers'
 import { Chain } from '@1delta/chain-registry'
 import { Lender } from '@1delta/lender-registry'
 import { LenderUserQuery } from '../src/lending/user-data/types'
 import { prettyPrint } from './utils'
+import { fetchLenderMetaFromDirAndInitialize } from '../src/lending'
 
 // random user with ETH
 const TEST_ADDRESS = '0xbadA9c382165b31419F4CC0eDf0Fa84f80A3C8E5'
-let prices
+let prices, pricesHist
 
 async function getUserData(chainId: Chain, publicData: any) {
   // Define user queries
   const queries: LenderUserQuery[] = Object.keys(publicData.data).map((m) => ({
     lender: m,
     account: TEST_ADDRESS.toLowerCase(),
+    assets: Object.keys(publicData.data[m].data), // map the assets to query
     // params: lenders,
   }))
 
-// console.log("queries", queries)
+  // console.log("queries", queries)
 
   // Fetch raw user data
   const rawUserData = await getLenderUserDataResult(
     chainId,
     queries,
-    getEvmClient,
+    getEvmClientWithCustomRpcs,
   )
+
+  // console.log('rawUserData', rawUserData)
+
   // Convert raw data to structured format
   const userData = convertLenderUserDataResult(
     chainId,
     queries,
     rawUserData,
     prices as any,
-    prices as any,
+    pricesHist as any,
     { [chainId]: publicData },
   )
 
@@ -48,28 +53,21 @@ describe(
     it(
       'should fetch user data for Morpho on KATANA',
       async () => {
-        try {
-          const chainId = Chain.ETHEREUM_MAINNET
-          const all = await fetch(
-            `https://margin-data.1delta.io/lending-multi?chains=${chainId}`,
-          ).then((a) => a.json())
-          prices = all.prices
-
-          const publicData = all.data[chainId]
-          const { userData } = await getUserData(chainId, publicData)
+        await fetchLenderMetaFromDirAndInitialize()
+        const chainId = Chain.ETHEREUM_MAINNET
+        const all = await fetch(
+          `https://margin-data.1delta.io/lending-multi?chains=${chainId}`,
+        ).then((a) => a.json())
+        prices = all.prices
+        pricesHist = all.pricesHist
+        const publicData = all.data[chainId]
+        const { userData } = await getUserData(chainId, publicData)
 
-          prettyPrint(
-            userData[
-              'MORPHO_BLUE_C4E18EB6D0E9B0FA90A15BC0A98190CBF3D5BA763AF410346F5174B014CEFD8D'
-            ],
-          )
+        prettyPrint(userData)
 
-          // Basic validation
-          expect(userData).toBeDefined()
-          expect(typeof userData).toBe('object')
-        } catch (error) {
-          console.log('Error fetching Morpho KATANA data:', error)
-        }
+        // Basic validation
+        expect(userData).toBeDefined()
+        expect(typeof userData).toBe('object')
       },
       { timeout: 30000 },
     )