@1delta/margin-fetcher 0.0.10 → 0.0.13

package/dist/lending/aave-v2-type/types.d.ts

@@ -1,4 +1,5 @@
 import { RewardsMap } from "../aave-v3-type/types";
+import { GenericCurrency } from "../types";
 export declare enum AaveV2TypeGetReserveDataIndexes {
     availableLiquidity = 0,
     totalStableDebt = 1,
@@ -44,6 +45,7 @@ export declare enum AaveV2TypeIncentivesControllerPoolInfoIndexes {
 export interface AaveV2GeneralPublicResponse {
     data: {
         [tokenSymbol: string]: {
+            asset: GenericCurrency;
             totalDeposits: number;
             totalDebtStable: number;
             totalDebt: number;

package/dist/lending/aave-v2-type/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/aave-v2-type/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGnD,oBAAY,+BAA+B;IACzC,kBAAkB,IAAI;IACtB,eAAe,IAAA;IACf,iBAAiB,IAAA;IACjB,aAAa,IAAA;IACb,kBAAkB,IAAA;IAClB,gBAAgB,IAAA;IAChB,uBAAuB,IAAA;IACvB,cAAc,IAAA;IACd,mBAAmB,IAAA;IACnB,mBAAmB,IAAA;CACpB;AAED,oBAAY,qCAAqC;IAC/C,QAAQ,IAAI;IACZ,GAAG,IAAA;IACH,oBAAoB,IAAA;IACpB,gBAAgB,IAAA;IAChB,aAAa,IAAA;IACb,wBAAwB,IAAA;IACxB,gBAAgB,IAAA;IAChB,uBAAuB,IAAA;IACvB,QAAQ,IAAA;IACR,QAAQ,IAAA;CACT;AAED,oBAAY,4BAA4B;IACtC,oBAAoB,IAAI;IACxB,iBAAiB,IAAA;IACjB,mBAAmB,IAAA;IACnB,mBAAmB,IAAA;IACnB,kBAAkB,IAAA;IAClB,gBAAgB,IAAA;IAChB,aAAa,IAAA;IACb,qBAAqB,IAAA;IACrB,wBAAwB,IAAA;CACzB;AAGD,oBAAY,6CAA6C;IACvD,WAAW,IAAI;IACf,UAAU,IAAA;IACV,cAAc,IAAA;IACd,iBAAiB,IAAA;IACjB,gBAAgB,IAAA;CACjB;AAID,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE;QACJ,CAAC,WAAW,EAAE,MAAM,GAAG;YAErB,aAAa,EAAE,MAAM,CAAC;YACtB,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;YAElB,gBAAgB,EAAE,MAAM,CAAC;YACzB,kBAAkB,EAAE,MAAM,CAAC;YAC3B,YAAY,EAAE,MAAM,CAAC;YAGrB,WAAW,EAAE,MAAM,CAAA;YACnB,kBAAkB,EAAE,MAAM,CAAA;YAC1B,gBAAgB,EAAE,MAAM,CAAA;YACxB,mBAAmB,CAAC,EAAE,MAAM,CAAA;YAC5B,YAAY,EAAE,MAAM,CAAA;YAGpB,OAAO,CAAC,EAAE,UAAU,CAAA;YAGpB,QAAQ,CAAC,EAAE,MAAM,CAAA;YACjB,wBAAwB,CAAC,EAAE,OAAO,CAAA;YAElC,MAAM,EAAE;gBACN,CAAC,CAAC,CAAC,EAAE;oBACH,QAAQ,EAAE,CAAC,CAAC;oBAEZ,sBAAsB,EAAE,MAAM,CAAC;oBAC/B,gBAAgB,EAAE,MAAM,CAAC;oBACzB,YAAY,EAAE,MAAM,CAAA;iBACrB,CAAA;aACF,CAAA;YAGD,gBAAgB,EAAE,OAAO,CAAC;YAC1B,gBAAgB,EAAE,OAAO,CAAC;YAC1B,SAAS,EAAE,OAAO,CAAC;YACnB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAA;KACF,CAAA;IACD,OAAO,EAAE,MAAM,CAAA;CAChB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/aave-v2-type/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,oBAAY,+BAA+B;IACzC,kBAAkB,IAAI;IACtB,eAAe,IAAA;IACf,iBAAiB,IAAA;IACjB,aAAa,IAAA;IACb,kBAAkB,IAAA;IAClB,gBAAgB,IAAA;IAChB,uBAAuB,IAAA;IACvB,cAAc,IAAA;IACd,mBAAmB,IAAA;IACnB,mBAAmB,IAAA;CACpB;AAED,oBAAY,qCAAqC;IAC/C,QAAQ,IAAI;IACZ,GAAG,IAAA;IACH,oBAAoB,IAAA;IACpB,gBAAgB,IAAA;IAChB,aAAa,IAAA;IACb,wBAAwB,IAAA;IACxB,gBAAgB,IAAA;IAChB,uBAAuB,IAAA;IACvB,QAAQ,IAAA;IACR,QAAQ,IAAA;CACT;AAED,oBAAY,4BAA4B;IACtC,oBAAoB,IAAI;IACxB,iBAAiB,IAAA;IACjB,mBAAmB,IAAA;IACnB,mBAAmB,IAAA;IACnB,kBAAkB,IAAA;IAClB,gBAAgB,IAAA;IAChB,aAAa,IAAA;IACb,qBAAqB,IAAA;IACrB,wBAAwB,IAAA;CACzB;AAGD,oBAAY,6CAA6C;IACvD,WAAW,IAAI;IACf,UAAU,IAAA;IACV,cAAc,IAAA;IACd,iBAAiB,IAAA;IACjB,gBAAgB,IAAA;CACjB;AAID,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE;QACJ,CAAC,WAAW,EAAE,MAAM,GAAG;YACrB,KAAK,EAAE,eAAe,CAAA;YAEtB,aAAa,EAAE,MAAM,CAAC;YACtB,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;YAElB,gBAAgB,EAAE,MAAM,CAAC;YACzB,kBAAkB,EAAE,MAAM,CAAC;YAC3B,YAAY,EAAE,MAAM,CAAC;YAGrB,WAAW,EAAE,MAAM,CAAA;YACnB,kBAAkB,EAAE,MAAM,CAAA;YAC1B,gBAAgB,EAAE,MAAM,CAAA;YACxB,mBAAmB,CAAC,EAAE,MAAM,CAAA;YAC5B,YAAY,EAAE,MAAM,CAAA;YAGpB,OAAO,CAAC,EAAE,UAAU,CAAA;YAGpB,QAAQ,CAAC,EAAE,MAAM,CAAA;YACjB,wBAAwB,CAAC,EAAE,OAAO,CAAA;YAElC,MAAM,EAAE;gBACN,CAAC,CAAC,CAAC,EAAE;oBACH,QAAQ,EAAE,CAAC,CAAC;oBAEZ,sBAAsB,EAAE,MAAM,CAAC;oBAC/B,gBAAgB,EAAE,MAAM,CAAC;oBACzB,YAAY,EAAE,MAAM,CAAA;iBACrB,CAAA;aACF,CAAA;YAGD,gBAAgB,EAAE,OAAO,CAAC;YAC1B,gBAAgB,EAAE,OAAO,CAAC;YAC1B,SAAS,EAAE,OAAO,CAAC;YACnB,QAAQ,EAAE,OAAO,CAAC;YAClB,QAAQ,EAAE,OAAO,CAAC;SACnB,CAAA;KACF,CAAA;IACD,OAAO,EAAE,MAAM,CAAA;CAChB"}

package/dist/lending/compound-v3/publicCallParse.d.ts

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

package/dist/lending/compound-v3/publicCallParse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/compound-v3/publicCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAA4B,+BAA+B,EAAE,MAAM,SAAS,CAAA;AAInF,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAM3C,eAAO,MAAM,kCAAkC,GAC7C,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,+BAA+B,GAAG,SAAS,EAAE,MAAM,CA8HvE,CAAA"}
+{"version":3,"file":"publicCallParse.d.ts","sourceRoot":"","sources":["../../../src/lending/compound-v3/publicCallParse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAEL,+BAA+B,EAChC,MAAM,SAAS,CAAA;AAUhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAM3C,eAAO,MAAM,kCAAkC,GAC7C,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,+BAA+B,GAAG,SAAS,EAAE,MAAM,CA8KvE,CAAA"}

package/dist/lending/compound-v3/publicCallParse.js

@@ -1,14 +1,14 @@
-import { CometInterestRateIndexes } from "./types";
-import { getAssetMeta, getCompoundV3Assets, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey } from "../../assets";
-import { getCompoundV3BaseAsset } from "../addresses/compoundV3";
-import { calculateRateForCompound, parseRawAmount } from "../../utils/parsing";
+import { CometInterestRateIndexes, } from './types';
+import { getAssetMeta, getCompoundV3Assets, LENDER_MODE_NO_MODE, toGenericPriceKey, toOracleKey, } from '../../assets';
+import { getCompoundV3BaseAsset } from '../addresses/compoundV3';
+import { calculateRateForCompound, parseRawAmount } from '../../utils/parsing';
 const COMET_RISK_DECIMALS = 18;
 const SECONDS_PER_DAY = 3600 * 24;
 const DAYS_IN_YEAR = 365;
 export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, additionalYields, tokenList = {}) => {
     const assetsToQuery = getCompoundV3Assets(chainId, lender);
     const baseAssetData = getCompoundV3BaseAsset(lender, chainId);
-    const tokensNoBase = assetsToQuery.filter(a => a !== baseAssetData.baseAsset);
+    const tokensNoBase = assetsToQuery.filter((a) => a !== baseAssetData.baseAsset);
     const baseLength = tokensNoBase.length * 2;
     const expectedNumberOfCalls = baseLength + 6;
     return [
@@ -21,10 +21,14 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                 const asset = tokensNoBase[i];
                 const resultsAssetInfo = data[i * 2];
                 const resultsTotals = 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 totals = parseRawAmount(resultsTotals[0], decimals);
-                const oracleKey = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(asset, chainId);
+                const oracleKey = toOracleKey(assetMeta?.assetGroup) ??
+                    toGenericPriceKey(asset, chainId);
                 result[asset] = {
                     poolId: asset,
                     underlying: asset,
@@ -35,8 +39,8 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                             // collateral factors
                             borrowCollateralFactor: parseRawAmount(resultsAssetInfo.borrowCollateralFactor.toString(), COMET_RISK_DECIMALS),
                             collateralFactor: parseRawAmount(resultsAssetInfo.liquidateCollateralFactor.toString(), COMET_RISK_DECIMALS),
-                            borrowFactor: 1
-                        }
+                            borrowFactor: 1,
+                        },
                     },
                     supplyCap: parseRawAmount(resultsAssetInfo.supplyCap.toString(), decimals),
                     // interest rates
@@ -55,10 +59,13 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                     totalDepositsUSD: Number(totals) * (prices[oracleKey] ?? 1),
                     // rewards
                     rewards: {},
-                    borrowingEnabled: false
+                    borrowingEnabled: false,
                 };
             }
-            const baseMeta = getAssetMeta(chainId, baseAssetData.baseAsset);
+            const baseMeta = tokenList[baseAssetData.baseAsset] ?? {
+                ...getAssetMeta(chainId, baseAssetData.baseAsset),
+                address: baseAssetData.baseAsset,
+            };
             // parse data for rewards calculation
             const decimals = baseMeta?.decimals ?? 18;
             const resultsSupplyRewards = Number(data[baseLength]?.toString());
@@ -66,17 +73,19 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
             const resultsIndexScale = data[baseLength + 2]?.toString();
             const resultsSupply = parseRawAmount(data[baseLength + 3]?.toString(), decimals);
             const resultsBorrow = parseRawAmount(data[baseLength + 4]?.toString(), decimals);
-            const compToSuppliersPerDay = resultsSupplyRewards / Number(resultsIndexScale) * SECONDS_PER_DAY;
-            const compToBorrowersPerDay = resultsBorrowRewards / Number(resultsIndexScale) * SECONDS_PER_DAY;
+            const compToSuppliersPerDay = (resultsSupplyRewards / Number(resultsIndexScale)) * SECONDS_PER_DAY;
+            const compToBorrowersPerDay = (resultsBorrowRewards / Number(resultsIndexScale)) * SECONDS_PER_DAY;
             const resultsInterest = data[baseLength + 5];
-            const oracleKeyBase = toOracleKey(baseMeta?.assetGroup) ?? toGenericPriceKey(baseAssetData.baseAsset, chainId);
+            const oracleKeyBase = toOracleKey(baseMeta?.assetGroup) ??
+                toGenericPriceKey(baseAssetData.baseAsset, chainId);
             const price = prices[oracleKeyBase] ?? 1;
             const liquidity = Number(resultsSupply) - Number(resultsBorrow);
-            const compPrice = prices["COMP"];
+            const compPrice = prices['COMP'];
             const baseData = {
                 [baseAssetData.baseAsset]: {
                     poolId: baseAssetData.baseAsset,
                     underlying: baseAssetData.baseAsset,
+                    asset: baseMeta,
                     // collateral factots
                     borrowCollateralFactor: 0,
                     collateralFactor: 0,
@@ -87,8 +96,8 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                             // collateral factors
                             borrowCollateralFactor: 0,
                             collateralFactor: 0,
-                            borrowFactor: 1
-                        }
+                            borrowFactor: 1,
+                        },
                     },
                     // interest rates
                     variableBorrowRate: calculateRateForCompound(resultsInterest[CometInterestRateIndexes.borrowRate].toString(), chainId, lender),
@@ -104,17 +113,23 @@ export const getCompoundV3ReservesDataConverter = (lender, chainId, prices, addi
                     // rewards
                     rewards: {
                         COMP: {
-                            depositRate: (compPrice * compToSuppliersPerDay / Number(resultsSupply)) * DAYS_IN_YEAR * 100 / price,
-                            variableBorrowRate: (compPrice * compToBorrowersPerDay / Number(resultsBorrow)) * DAYS_IN_YEAR * 100 / price,
+                            depositRate: (((compPrice * compToSuppliersPerDay) / Number(resultsSupply)) *
+                                DAYS_IN_YEAR *
+                                100) /
+                                price,
+                            variableBorrowRate: (((compPrice * compToBorrowersPerDay) / Number(resultsBorrow)) *
+                                DAYS_IN_YEAR *
+                                100) /
+                                price,
                             stableBorrowRate: 0,
-                        }
+                        },
                     },
                     borrowingEnabled: true,
                     stakingYield: additionalYields.intrinsicYields[oracleKeyBase] ?? 0,
-                }
+                },
             };
             return { data: { ...result, ...baseData }, chainId };
         },
-        expectedNumberOfCalls
+        expectedNumberOfCalls,
     ];
 };

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

@@ -1 +1 @@
-{"version":3,"file":"fetchLender.d.ts","sourceRoot":"","sources":["../../src/lending/fetchLender.ts"],"names":[],"mappings":"AAoBA,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;AAwD1C,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,CAA6B,KACrE,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CA8CnC,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,CAqDnC,CAAA"}

package/dist/lending/fetchLender.js

@@ -12,7 +12,7 @@ import { InitLensAbi } from '../abis/init/InitLens';
 import { CometAbi } from '../abis/compound-v3/Comet';
 import { CometExtAbi } from '../abis/compound-v3/CometExt';
 import { IrgetterAbi } from '../abis/compound-v3/IrGetter';
-import { isAaveV2Type, isAaveV3Original, isAaveV3Type, isCompoundV3, isInit } from '../utils';
+import { isAaveV2Type, isAaveV3Original, isAaveV3Type, isCompoundV3, isInit, } from '../utils';
 import { buildAaveV2StyleLenderReserveCall } from './aave-v2-type/publicCallBuild';
 import { buildAaveV3StyleLenderReserveCall } from './aave-v3-type/publicCallBuild';
 import { buildInitStyleLenderReserveCall } from './init/publicCallBuild';
@@ -30,18 +30,22 @@ function buildLenderCall(chainId, lender) {
         return buildAaveV2StyleLenderReserveCall(chainId, lender);
     if (isAaveV3Type(lender))
         return buildAaveV3StyleLenderReserveCall(chainId, lender);
+    if (isCompoundV3(lender))
+        return buildCompoundV3StyleLenderReserveCall(chainId, lender);
     if (isInit(lender))
         return buildInitStyleLenderReserveCall(chainId, lender);
-    return buildCompoundV3StyleLenderReserveCall(chainId, lender);
+    return [];
 }
 function getLenderDataConverter(lender, chainId, prices, additionalYields, tokenList = {}) {
     if (isAaveV2Type(lender))
         return getAaveV2ReservesDataConverter(lender, chainId, prices, additionalYields, tokenList);
     if (isAaveV3Type(lender))
         return getAaveV3ReservesDataConverter(lender, chainId, prices, additionalYields, tokenList);
+    if (isCompoundV3(lender))
+        return getCompoundV3ReservesDataConverter(lender, chainId, prices, additionalYields, tokenList);
     if (isInit(lender))
         return getInitReservesDataConverter(lender, chainId, prices, additionalYields, tokenList);
-    return getCompoundV3ReservesDataConverter(lender, chainId, prices, additionalYields, tokenList);
+    return [() => null, 0];
 }
 const getAbi = (lender) => {
     if (isAaveV2Type(lender))
@@ -49,33 +53,23 @@ const getAbi = (lender) => {
             ...ProtocolDataProviderAbi,
             ...UniswapV2PairAbi,
             ...RewarderAbi,
-            ...IncentivesControllerAbi
+            ...IncentivesControllerAbi,
         ];
     if (isAaveV3Original(lender))
-        return [
-            ...AavePoolV3UpgradedAbi,
-            ...AaveV3ProtocolDataProviderAbi
-        ];
+        return [...AavePoolV3UpgradedAbi, ...AaveV3ProtocolDataProviderAbi];
     if (lender === Lender.YLDR)
-        return [
-            ...YLDRProtocolDataProviderAbi,
-        ];
+        return [...YLDRProtocolDataProviderAbi];
     if (isAaveV3Type(lender))
-        return [
-            ...AavePoolLegacyAbi,
-            ...AavePoolDataProviderLegacyAbi
-        ];
+        return [...AavePoolLegacyAbi, ...AavePoolDataProviderLegacyAbi];
     if (isCompoundV3(lender))
-        return [
-            ...IrgetterAbi,
-            ...CometAbi,
-            ...CometExtAbi
-        ];
+        return [...IrgetterAbi, ...CometAbi, ...CometExtAbi];
     if (isInit(lender))
         return InitLensAbi;
     return [];
 };
-export const getLenderPublicData = async (chainId, lenders, prices, additionalYields, multicallRetry, tokenList = async () => { return {}; }) => {
+export const getLenderPublicData = async (chainId, lenders, prices, additionalYields, multicallRetry, tokenList = async () => {
+    return {};
+}) => {
     let calls = [];
     for (const lender of lenders) {
         const abi = getAbi(lender);
@@ -94,15 +88,17 @@ export const getLenderPublicData = async (chainId, lenders, prices, additionalYi
     let currentSlice = 0;
     for (const lender of lenders) {
         const [converter, sliceLength] = getLenderDataConverter(lender, chainId, prices, additionalYields, list);
-        const data = rawResults.slice(currentSlice, currentSlice + sliceLength);
-        const convertedData = converter(data);
-        if (!convertedData) {
-            invalidLenders.push(lender);
-        }
-        else {
-            lenderData[lender] = convertedData;
+        if (sliceLength > 0) {
+            const data = rawResults.slice(currentSlice, currentSlice + sliceLength);
+            const convertedData = converter(data);
+            if (!convertedData) {
+                invalidLenders.push(lender);
+            }
+            else {
+                lenderData[lender] = convertedData;
+            }
+            currentSlice += sliceLength;
         }
-        currentSlice += sliceLength;
     }
     return lenderData;
 };

package/dist/lending/fetchLenderAll.d.ts

@@ -1,8 +1,9 @@
 import { AdditionalYields, MulticallRetryFunction } from '../types';
 import { Lender } from '@1delta/asset-registry';
+import { GenericTokenList } from './types';
 export declare const getLenderPublicDataAll: (chainId: string, lenders: Lender[], prices: {
     [asset: string]: number;
-}, additionalYields: AdditionalYields, multicallRetry: MulticallRetryFunction) => Promise<{
+}, additionalYields: AdditionalYields, multicallRetry: MulticallRetryFunction, tokenList?: () => Promise<GenericTokenList>) => Promise<{
     [lender: string]: any;
 }>;
 //# sourceMappingURL=fetchLenderAll.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fetchLenderAll.d.ts","sourceRoot":"","sources":["../../src/lending/fetchLenderAll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAM/C,eAAO,MAAM,sBAAsB,GACjC,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,gBAAgB,sBAAsB,KACrC,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAcnC,CAAA"}
+{"version":3,"file":"fetchLenderAll.d.ts","sourceRoot":"","sources":["../../src/lending/fetchLenderAll.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAA;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAG/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAI1C,eAAO,MAAM,sBAAsB,GACjC,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,gBAAgB,sBAAsB,EACtC,YAAY,MAAM,OAAO,CAAC,gBAAgB,CAAC,KAC1C,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAcnC,CAAA"}

package/dist/lending/fetchLenderAll.js

@@ -2,11 +2,11 @@ import { Lender } from '@1delta/asset-registry';
 import { getLenderPublicData } from './fetchLender';
 import { getLenderPublicDataViaApi } from './fetchLenderExt';
 const LENDERS_VIA_API = [Lender.MORPHO_BLUE];
-export const getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields, multicallRetry) => {
+export const getLenderPublicDataAll = async (chainId, lenders, prices, additionalYields, multicallRetry, tokenList) => {
     const lendersApi = lenders.filter(l => LENDERS_VIA_API.includes(l));
     const lendersOnChain = lenders.filter(l => !LENDERS_VIA_API.includes(l));
-    const onChain = getLenderPublicData(chainId, lendersOnChain, prices, additionalYields, multicallRetry);
-    const api = getLenderPublicDataViaApi(chainId, lendersApi, prices, additionalYields);
+    const onChain = getLenderPublicData(chainId, lendersOnChain, prices, additionalYields, multicallRetry, tokenList);
+    const api = getLenderPublicDataViaApi(chainId, lendersApi, prices, additionalYields, tokenList);
     const [onChainRes, apiRes] = await Promise.all([onChain, api]);
     return { ...onChainRes, ...apiRes };
 };

package/dist/lending/fetchLenderExt.d.ts

@@ -1,8 +1,9 @@
 import { AdditionalYields } from '../types';
 import { Lender } from '@1delta/asset-registry';
+import { GenericTokenList } from './types';
 export declare const getLenderPublicDataViaApi: (chainId: string, lenders: Lender[], prices: {
     [asset: string]: number;
-}, additionalYields: AdditionalYields) => Promise<{
+}, additionalYields: AdditionalYields, tokenList?: () => Promise<GenericTokenList>) => Promise<{
     [lender: string]: any;
 }>;
 //# sourceMappingURL=fetchLenderExt.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"fetchLenderExt.d.ts","sourceRoot":"","sources":["../../src/lending/fetchLenderExt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAc/C,eAAO,MAAM,yBAAyB,GACpC,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,KACjC,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CAuBnC,CAAA"}
+{"version":3,"file":"fetchLenderExt.d.ts","sourceRoot":"","sources":["../../src/lending/fetchLenderExt.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAA;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AA2B1C,eAAO,MAAM,yBAAyB,GACpC,SAAS,MAAM,EACf,SAAS,MAAM,EAAE,EACjB,QAAQ;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EACnC,kBAAkB,gBAAgB,EAClC,YAAW,MAAM,OAAO,CAAC,gBAAgB,CAExC,KACA,OAAO,CAAC;IAAE,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,CA2CnC,CAAA"}

package/dist/lending/fetchLenderExt.js

@@ -1,27 +1,41 @@
 import { isMorphoType, isMultiMarket } from '../utils';
-import { fetchMorphoPublicData } from './morpho/publicCallBuild';
-async function getgetLenderDataFromApi(lender, chainId, prices, additionalYields) {
+import { fetchMorphoMarkets } from './morpho/fetchPublic';
+import { convertMarketsToMorphoResponse } from './morpho/convertPublic';
+async function getLenderDataFromApi(lender, chainId, prices, additionalYields) {
     if (isMorphoType(lender))
-        return await fetchMorphoPublicData(chainId, additionalYields);
+        return await fetchMorphoMarkets(chainId);
     return {};
 }
-export const getLenderPublicDataViaApi = async (chainId, lenders, prices, additionalYields) => {
+function convertLenderDataFromApi(lender, chainId, data, prices, additionalYields, list = {}) {
+    if (isMorphoType(lender))
+        return convertMarketsToMorphoResponse(data, chainId, additionalYields, list);
+    return {};
+}
+export const getLenderPublicDataViaApi = async (chainId, lenders, prices, additionalYields, tokenList = async () => {
+    return {};
+}) => {
     let promises = [];
     for (const lender of lenders) {
-        promises.push(getgetLenderDataFromApi(lender, chainId, prices, additionalYields));
+        promises.push(getLenderDataFromApi(lender, chainId, prices, additionalYields));
     }
-    const results = await Promise.all(promises);
+    const [list, ...results] = await Promise.all([tokenList(), ...promises]);
     const lenderData = {};
     for (let i = 0; i < lenders.length; i++) {
-        const lender = lenders[i];
-        if (isMultiMarket(lender)) {
-            const dataObtained = results[i];
-            Object.keys(dataObtained.data).forEach((marketId) => {
-                lenderData[marketId] = dataObtained.data[marketId];
-            });
+        try {
+            const lender = lenders[i];
+            if (isMultiMarket(lender)) {
+                const dataObtained = results[i];
+                const converted = convertLenderDataFromApi(lender, chainId, dataObtained, prices, additionalYields, list);
+                Object.keys(converted).forEach((marketId) => {
+                    lenderData[marketId] = converted[marketId];
+                });
+            }
+            else {
+                lenderData[lender] = convertLenderDataFromApi(lender, chainId, results[i], prices, additionalYields, list);
+            }
         }
-        else {
-            lenderData[lender] = results[i];
+        catch (e) {
+            console.log('error fetching from API on', chainId, ':', e);
         }
     }
     return lenderData;

package/dist/lending/index.d.ts

@@ -1,4 +1,6 @@
 export * from "./fetchLender";
+export * from "./fetchLenderExt";
+export * from "./fetchLenderAll";
 export * from "./user-data";
 export * from "./types";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lending/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lending/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAA;AAC7B,cAAc,kBAAkB,CAAA;AAChC,cAAc,kBAAkB,CAAA;AAChC,cAAc,aAAa,CAAA;AAC3B,cAAc,SAAS,CAAA"}

package/dist/lending/index.js

@@ -1,3 +1,5 @@
 export * from "./fetchLender";
+export * from "./fetchLenderExt";
+export * from "./fetchLenderAll";
 export * from "./user-data";
 export * from "./types";

package/dist/lending/morpho/convertPublic.d.ts

@@ -1,9 +1,7 @@
 import { MorphoGeneralPublicResponse, GetMarketsResponse } from './types';
 import { AdditionalYields } from '../../types';
-export declare function convertMarketsToMorphoResponse(response: GetMarketsResponse, chainId: string, additionalYields?: AdditionalYields): {
-    chainId: string;
-    data: {
-        [m: string]: MorphoGeneralPublicResponse;
-    };
+import { GenericTokenList } from '../types';
+export declare function convertMarketsToMorphoResponse(response: GetMarketsResponse, chainId: string, additionalYields?: AdditionalYields, tokens?: GenericTokenList): {
+    [m: string]: MorphoGeneralPublicResponse;
 };
 //# sourceMappingURL=convertPublic.d.ts.map

package/dist/lending/morpho/convertPublic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convertPublic.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/convertPublic.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAc,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAErF,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAkB9C,wBAAgB,8BAA8B,CAC1C,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,MAAM,EACf,gBAAgB,GAAE,gBAA2E,GAC9F;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,2BAA2B,CAAA;KAAE,CAAA;CAAE,CAiHzE"}
+{"version":3,"file":"convertPublic.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/convertPublic.ts"],"names":[],"mappings":"AACA,OAAO,EACL,2BAA2B,EAE3B,kBAAkB,EACnB,MAAM,SAAS,CAAA;AAEhB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAc3C,wBAAgB,8BAA8B,CAC5C,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,MAAM,EACf,gBAAgB,GAAE,gBAIjB,EACD,MAAM,GAAE,gBAAqB,GAC3B;IAAE,CAAC,CAAC,EAAE,MAAM,GAAG,2BAA2B,CAAA;CAAE,CAyH/C"}

package/dist/lending/morpho/convertPublic.js

@@ -1,24 +1,26 @@
 import { formatUnits } from 'viem';
 import { apyToApr } from '../user-data/utils';
-import { getAssetMeta } from '../../assets';
 function parseLtv(ltv) {
     let str = 0;
     try {
         str = Number(formatUnits(BigInt(ltv), 18));
     }
-    catch (e) {
-    }
+    catch (e) { }
     return str;
 }
 function formatNr(n, d) {
     return Number(formatUnits(BigInt(n ?? 0), d));
 }
-export function convertMarketsToMorphoResponse(response, chainId, additionalYields = { intrinsicYields: {}, lenderRewards: {}, loaded: true }) {
+export function convertMarketsToMorphoResponse(response, chainId, additionalYields = {
+    intrinsicYields: {},
+    lenderRewards: {},
+    loaded: true,
+}, tokens = {}) {
     const data = {};
     response.markets.items.forEach((market) => {
         const { uniqueKey, lltv, irmAddress, oracleAddress, loanAsset, collateralAsset, state, } = market;
         if (collateralAsset && loanAsset && oracleAddress) {
-            const m = "MORPHO_BLUE_" + collateralAsset.symbol?.toUpperCase() + "_" + loanAsset.symbol?.toUpperCase() + "_" + uniqueKey.slice(2).toUpperCase();
+            const m = 'MORPHO_BLUE_' + uniqueKey.slice(2).toUpperCase();
             // @ts-ignore
             if (!data[m])
                 data[m] = { data: {} };
@@ -32,9 +34,11 @@ export function convertMarketsToMorphoResponse(response, chainId, additionalYiel
             //     }
             // })
             const loanAssetAddress = loanAsset.address.toLowerCase();
+            const meta = tokens[loanAssetAddress] ?? loanAsset;
             data[m].data[loanAssetAddress] = {
                 poolId: loanAssetAddress,
                 underlying: loanAssetAddress,
+                asset: meta,
                 totalDeposits: formatNr(state.supplyAssets, loanAsset.decimals),
                 totalDebtStable: 0,
                 totalDebt: formatNr(state.borrowAssets, loanAsset.decimals),
@@ -44,7 +48,7 @@ export function convertMarketsToMorphoResponse(response, chainId, additionalYiel
                 depositRate: apyToApr(Number(state.supplyApy)) * 100,
                 variableBorrowRate: apyToApr(Number(state.borrowApy)) * 100,
                 stableBorrowRate: 0,
-                stakingYield: additionalYields.intrinsicYields[getAssetMeta(chainId, loanAssetAddress)?.assetGroup] ?? 0,
+                stakingYield: additionalYields.intrinsicYields[meta?.assetGroup] ?? 0,
                 rewards: Object.keys(loanRewards).length > 0 ? loanRewards : undefined,
                 decimals: loanAsset.decimals,
                 config: {
@@ -63,10 +67,12 @@ export function convertMarketsToMorphoResponse(response, chainId, additionalYiel
             };
             const ltv = parseLtv(lltv);
             const collateralAssetAddress = collateralAsset.address.toLowerCase();
+            const metaCollateral = tokens[collateralAssetAddress] ?? collateralAsset;
             // 2. COLLATERAL asset entry
             data[m].data[collateralAssetAddress] = {
                 poolId: collateralAssetAddress,
                 underlying: collateralAssetAddress,
+                asset: metaCollateral,
                 totalDeposits: formatNr(state.collateralAssets, collateralAsset.decimals),
                 totalDebtStable: 0,
                 totalDebt: 0,
@@ -76,7 +82,7 @@ export function convertMarketsToMorphoResponse(response, chainId, additionalYiel
                 depositRate: 0,
                 variableBorrowRate: 0,
                 stableBorrowRate: 0,
-                stakingYield: additionalYields.intrinsicYields[getAssetMeta(chainId, collateralAssetAddress)?.assetGroup] ?? 0,
+                stakingYield: additionalYields.intrinsicYields[metaCollateral?.assetGroup] ?? 0,
                 rewards: undefined,
                 decimals: collateralAsset.decimals,
                 config: {
@@ -104,12 +110,10 @@ export function convertMarketsToMorphoResponse(response, chainId, additionalYiel
                     irm: irmAddress,
                     collateralAddress: collateralAsset.address,
                     loanAddress: loanAsset.address,
-                }
+                },
             };
+            data[m].chainId = chainId;
         }
     });
-    return {
-        data,
-        chainId
-    };
+    return data;
 }

package/dist/lending/morpho/fetchPublic.js

@@ -54,7 +54,7 @@ query GetMarkets {
 const BASE_URL = "https://blue-api.morpho.org/graphql";
 export async function fetchMorphoMarkets(chainId) {
     const requestBody = {
-        query: query(500, 0, chainId),
+        query: query(200, 0, chainId),
         variables: {},
     };
     const response = await fetch(BASE_URL, {

package/dist/lending/morpho/publicCallBuild.d.ts

@@ -1,8 +1,5 @@
 import { AdditionalYields } from "../../types";
 export declare function fetchMorphoPublicData(chainId: string, yields?: AdditionalYields): Promise<{
-    chainId: string;
-    data: {
-        [m: string]: import("./types").MorphoGeneralPublicResponse;
-    };
+    [m: string]: import("./types").MorphoGeneralPublicResponse;
 }>;
 //# sourceMappingURL=publicCallBuild.d.ts.map

package/dist/lending/morpho/publicCallBuild.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"publicCallBuild.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/publicCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAI9C,wBAAsB,qBAAqB,CACvC,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,gBAA2E;;;;;GAItF"}
+{"version":3,"file":"publicCallBuild.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/publicCallBuild.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAI9C,wBAAsB,qBAAqB,CACvC,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,gBAA2E;;GAItF"}

package/dist/lending/morpho/types.d.ts

@@ -1,3 +1,4 @@
+import { GenericCurrency } from "../types";
 export type GetMarketsResponse = {
     markets: {
         items: {
@@ -70,6 +71,7 @@ export interface MorphoGeneralPublicResponse {
         [tokenSymbol: string]: {
             poolId: string;
             underlying: string;
+            asset: GenericCurrency;
             totalDeposits: number;
             totalDebtStable: 0;
             totalDebt: number;

package/dist/lending/morpho/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lending/morpho/types.ts"],"names":[],"mappings":"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"}

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,wBAAwB,CAAA;AAC/C,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAuB/C,eAAO,MAAM,mBAAmB,GAAI,SAAS,MAAM,EAAE,QAAQ,MAAM,EAAE,SAAS,MAAM,KAAG,IAAI,EAuB1F,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,wBAAwB,CAAA;AAC/C,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"}

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

@@ -1,8 +1,6 @@
-import { getAaveAssets, getAaveStyleProtocolTokenMap, getAaveTypePoolDataProviderAddress, getAaveTypePoolAddress } from "../../../assets";
-import { getComposerAddress, isYLDR } from "../../../utils";
-const fallbackDebtToken = '0x52A1CeB68Ee6b7B5D13E0376A1E0E4423A8cE26e';
-const getBaseAaveV3Calls = (chainId, account, lender, assetsToQuery, aaveTokenMap) => {
-    const broker = getComposerAddress(chainId);
+import { getAaveAssets, getAaveTypePoolDataProviderAddress, getAaveTypePoolAddress } from "../../../assets";
+import { isYLDR } from "../../../utils";
+const getBaseAaveV3Calls = (chainId, account, lender, assetsToQuery) => {
     return assetsToQuery.flatMap((tk) => [
         {
             address: getAaveTypePoolDataProviderAddress(chainId, lender),
@@ -13,9 +11,8 @@ const getBaseAaveV3Calls = (chainId, account, lender, assetsToQuery, aaveTokenMa
 };
 export const buildAaveV3UserCall = (chainId, lender, account) => {
     const assetsToQuery = getAaveAssets(chainId, lender);
-    const aaveTokenMap = getAaveStyleProtocolTokenMap(chainId, lender);
     const calls = [
-        ...getBaseAaveV3Calls(chainId, account, lender, assetsToQuery, aaveTokenMap),
+        ...getBaseAaveV3Calls(chainId, account, lender, assetsToQuery),
     ];
     if (!isYLDR(lender)) {
         const callDataEmode = {