@1delta/margin-fetcher 0.0.235 → 0.0.236

package/dist/index.d.ts

@@ -4,6 +4,7 @@ export { fetchGeneralYields, fetchGeneralYieldsByMarketUid } from './yields';
 export { fetchPendlePrices, fetchOraclePrices, selectAssetGroupPrices, type TokenListInput, type FetchOraclePricesOptions, type OraclePriceEntry, type StructuredOraclePrices, type USDPriceMap, type MorphoMarketOverrides, type ListaMarketOverrides, type OracleDiagnostics, type OraclePricesResult, type ChainDiagnostic, type TrackerDiagnostic, type StaleFeedEntry, } from './prices';
 export { getLendersForChain, filterLendersByProtocol, getAavesForChain, getLenderAssets, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isAaveV3Type, isAaveV2Type, isYLDR, isAaveV32Type, isAaveType, isMultiMarket, createMarketUid, } from './utils';
 export { fetchFlashLiquidityForChain, attachPricesToFlashLiquidity, } from './flash-liquidity';
+export { buildFluidFTokensCall, getFluidFTokensConverter, fetchFluidFTokens, type FluidFToken, type FluidFTokens, } from './vaults';
 export { type GenericCurrency, type GenericTokenList, type ParsedResponse, type ChainLinkResponse, type LenderRewardsMap, type NumberMap, type FullLenderRewardsMap, type AdditionalYields, type TokenList, type LenderUserQuery, type UserLendingPosition, type LenderUserResponse, type AaveV2UserReserveResponse, type AaveV3UserReserveResponse, type MorphoUserReserveResponse, type CompoundV3UserReserveResponse, type AaveV3Public, type LenderPublicBase, type LenderYields, type LenderTotalAmounts, type LenderConfigMap, type LenderConfigData, type ModeBase, type EModeData, type AaveV2Public, type CompoundV3Public, type UserApr, type InitUserReserveResponse, type InitPublic, type LenderData, type PoolData, type ConfigEntry, } from './types';
 export { computeDepositDelta, computeWithdrawDelta, computeBorrowDelta, computeRepayDelta, getHealthFactor, getBorrowCapacity, getAssetConfig, computePostTradeMetrics, EMPTY_BALANCE, } from './lending/margin/base';
 export type { PostTradeMetrics } from './lending/margin/base';

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -1,11 +1,11 @@
 import { parseAbi, formatEther, BaseError, encodeFunctionData, formatUnits, decodeFunctionResult, decodeAbiParameters, AbiEncodingLengthMismatchError, concatHex, isAddress, InvalidAddressError, pad, stringToHex, boolToHex, integerRegex, numberToHex, bytesRegex, BytesSizeMismatchError, arrayRegex, UnsupportedPackedAbiType } from './chunk-ZVIJSUIM.js';
 import './chunk-BYTNVMX7.js';
 import './chunk-PR4QN5HX.js';
-import { Lender, isAaveType, isCompoundV3, isMultiMarket, isSiloV2Type, isSiloV3Type, isAaveV4Type, isInit, isMorphoType, isCompoundV2Type, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isAaveV2Type, isAaveV32Type, isAaveV3Type, isEulerType, isYLDR, isCompoundV3Type, isLista, isTectonicType, isBenqiType } from '@1delta/lender-registry';
+import { Lender, isAaveType, isCompoundV3, isMultiMarket, isSiloV2Type, isSiloV3Type, isAaveV4Type, isInit, isMorphoType, isCompoundV2Type, isVenusType, isSumerType, AAVE_V3_LENDERS, AAVE_V2_LENDERS, isAaveV2Type, isAaveV32Type, isAaveV3Type, isEulerType, isFluid, isYLDR, isCompoundV3Type, isLista, isTectonicType, isBenqiType } from '@1delta/lender-registry';
 export { isAaveType, isAaveV2Type, isAaveV32Type, isAaveV3Type, isCompoundV3, isCompoundV3Type, isInit, isMorphoType, isMultiMarket, isYLDR } from '@1delta/lender-registry';
 import lodash from 'lodash';
 import { getEvmChain, getEvmClient, getEvmClientUniversal, multicallRetryUniversal } from '@1delta/providers';
-import { MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, MorphoBlueAbi } from '@1delta/abis';
+import { FluidLendingResolverAbi, MorphoLensAbi, AaveV4SpokeAbi, AaveV4OracleAbi, AaveV4HubAbi, FluidVaultResolverAbi, MorphoBlueAbi } from '@1delta/abis';
 export { MorphoLensAbi } from '@1delta/abis';
 import { prepareDebitDataMulticall, prepareLenderDebitMulticall, parseDebitDataResult, parseLenderDebitResult, getPermit2ContractAddress, getCompoundV3CometAddress as getCompoundV3CometAddress$1, getMorphoAddress, getAaveCollateralTokenAddress, getSiloHalfForUnderlying, InitMarginAddresses } from '@1delta/calldata-sdk';
 import { BALANCER_V2_FORKS, BALANCER_V3_FORKS, UNISWAP_V4_FORKS, isFlashLoanSourceExcluded, FLASH_LOAN_IDS } from '@1delta/dex-registry';
@@ -6281,7 +6281,9 @@ globalThis[GLOBAL_LENDER_DATA_KEY] = {
   siloMarkets: {},
   siloPeripherals: {},
   siloMarketsV3: {},
-  siloPeripheralsV3: {}
+  siloPeripheralsV3: {},
+  fluidResolvers: {},
+  fluidVaults: {}
 };
 function getGlobalData2() {
   return globalThis[GLOBAL_LENDER_DATA_KEY];
@@ -6309,6 +6311,7 @@ var aaveV4Spokes = () => getGlobalData2()?.aaveV4Spokes;
 var aaveV4Oracles = () => getGlobalData2()?.aaveV4Oracles;
 var siloMarkets = () => getGlobalData2()?.siloMarkets;
 var siloMarketsV3 = () => getGlobalData2()?.siloMarketsV3;
+var fluidResolvers = () => getGlobalData2()?.fluidResolvers;
 function aaveV4SpokeLenderKey(spoke) {
   if (!spoke || !spoke.startsWith("0x") || spoke.length !== 42) {
     throw new Error(`aaveV4SpokeLenderKey: invalid spoke address ${spoke}`);
@@ -6402,6 +6405,7 @@ var LENDER_SHORT_NAMES = {
   [Lender.COMPOUND_V3_WETH]: "Comp. WETH",
   [Lender.COMPOUND_V3_WSTETH]: "Comp. wstETH",
   [Lender.EULER_V2]: "Euler V2",
+  [Lender.FLUID]: "Fluid",
   [Lender.FLUX_FINANCE]: "Flux",
   [Lender.GRANARY]: "Granary",
   [Lender.HANA]: "Hana",
@@ -6412,7 +6416,7 @@ var LENDER_SHORT_NAMES = {
   [Lender.MERIDIAN]: "Meridian"
 };
 function formatUnderscoreString(input) {
-  const _in = input.replace("MORPHO_BLUE", "MB");
+  const _in = input.replace("MORPHO_BLUE", "MB").replace(/^FLUID_/, "Fluid ");
   return _in.split("_").map((word, index) => {
     if (index === 0) {
       return word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
@@ -6421,6 +6425,7 @@ function formatUnderscoreString(input) {
   }).join(" ");
 }
 function lenderShortName(lender) {
+  if (lender?.startsWith("FLUID")) return "Fluid";
   return LENDER_SHORT_NAMES[lender] ?? formatUnderscoreString(lender);
 }
 
@@ -19140,8 +19145,211 @@ var getSiloV3ReservesDataConverter = (lender, chainId, prices, additionalYields,
     SILO_V3_CALLS_PER_PAIR
   ];
 };
+var { chunk: chunk4 } = lodash;
+var buildFluidCall = (chainId, _lender) => {
+  const resolvers = fluidResolvers()?.[chainId];
+  if (!resolvers) return [];
+  return [
+    {
+      address: resolvers.vaultResolver,
+      name: "getVaultsEntireData",
+      params: []
+    }
+  ];
+};
 
-// src/lending/public-data/fetchLender.ts
+// src/lending/public-data/fluid/publicCallParse.ts
+var FLUID_EEE_LOWER = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+var normalizeUnderlying = (addr) => addr === FLUID_EEE_LOWER ? zeroAddress : addr;
+var FLUID_RATE_SCALE = 100;
+var scaleFluidRate = (raw) => {
+  if (raw === void 0 || raw === null) return 0;
+  return Number(raw) / FLUID_RATE_SCALE;
+};
+var getFluidPublicDataConverter = (_lender, chainId, prices, additionalYields, tokenList = {}) => {
+  const expectedNumberOfCalls = 1;
+  return [
+    (data) => {
+      if (data.length !== expectedNumberOfCalls) return void 0;
+      const [vaultEntireData] = data;
+      const out = {};
+      for (const vault of vaultEntireData ?? []) {
+        const parsed = parseVault(
+          vault,
+          chainId,
+          prices,
+          additionalYields,
+          tokenList
+        );
+        if (parsed) {
+          out[parsed.lender] = {
+            data: parsed.data,
+            params: parsed.params,
+            chainId
+          };
+        }
+      }
+      return out;
+    },
+    expectedNumberOfCalls
+  ];
+};
+function parseVault(vault, chainId, prices, additionalYields, tokenList) {
+  const vaultAddress = (vault.vault ?? "").toLowerCase();
+  const constants = vault.constantVariables;
+  const configs = vault.configs;
+  const rates = vault.exchangePricesAndRates;
+  const totals = vault.totalSupplyAndBorrow;
+  const limits = vault.limitsAndAvailability;
+  if (!vaultAddress || !constants || !configs || !rates || !totals) {
+    return void 0;
+  }
+  if (vault.isSmartCol || vault.isSmartDebt) return void 0;
+  const rawCollateral = (constants.supplyToken?.token0 ?? constants.supplyToken ?? "").toString().toLowerCase();
+  const rawLoan = (constants.borrowToken?.token0 ?? constants.borrowToken ?? "").toString().toLowerCase();
+  if (!rawCollateral || !rawLoan) return void 0;
+  const collateralAddress = normalizeUnderlying(rawCollateral);
+  const loanAddress = normalizeUnderlying(rawLoan);
+  const vaultId = Number(constants.vaultId ?? 0);
+  const lender = `FLUID_${vaultId}`;
+  const collateralMeta = tokenList[collateralAddress];
+  const loanMeta = tokenList[loanAddress];
+  const colDecimals = Number(
+    constants.supplyDecimals ?? collateralMeta?.decimals ?? 18
+  );
+  const borrowDecimals = Number(
+    constants.borrowDecimals ?? loanMeta?.decimals ?? 18
+  );
+  const totalSupply = Number(
+    parseRawAmount(totals.totalSupplyVault?.toString(), colDecimals)
+  );
+  const totalBorrow = Number(
+    parseRawAmount(totals.totalBorrowVault?.toString(), borrowDecimals)
+  );
+  const borrowable = Number(
+    parseRawAmount(limits?.borrowable?.toString(), borrowDecimals)
+  );
+  const collateralPriceKey = toOracleKey(collateralMeta?.assetGroup) ?? toGenericPriceKey(collateralAddress, chainId);
+  const loanPriceKey = toOracleKey(loanMeta?.assetGroup) ?? toGenericPriceKey(loanAddress, chainId);
+  const collateralPrice = prices[collateralPriceKey] ?? 0;
+  const loanPrice = prices[loanPriceKey] ?? 0;
+  const ltv = Number(configs.collateralFactor ?? 0) / BPS;
+  const liquidationThreshold = Number(configs.liquidationThreshold ?? 0) / BPS;
+  const liquidationPenalty = Number(configs.liquidationPenalty ?? 0) / BPS;
+  const supplyRate = scaleFluidRate(rates.supplyRateVault);
+  const borrowRate = scaleFluidRate(rates.borrowRateVault);
+  const utilization = totalSupply > 0 ? totalBorrow / totalSupply : 0;
+  const data = {};
+  const collateralMarketUid = createMarketUid(chainId, lender, collateralAddress);
+  data[collateralMarketUid] = {
+    marketUid: collateralMarketUid,
+    name: "Collateral " + (collateralMeta?.symbol ?? ""),
+    poolId: collateralAddress,
+    underlying: collateralAddress,
+    asset: collateralMeta,
+    totalDeposits: totalSupply,
+    totalDebtStable: 0,
+    totalDebt: 0,
+    totalLiquidity: totalSupply,
+    borrowLiquidity: 0,
+    totalDepositsUSD: totalSupply * collateralPrice,
+    totalDebtStableUSD: 0,
+    totalDebtUSD: 0,
+    totalLiquidityUSD: totalSupply * collateralPrice,
+    borrowLiquidityUSD: 0,
+    utilization: 0,
+    depositRate: supplyRate,
+    // vault collateral earns the supply side rate
+    variableBorrowRate: 0,
+    stableBorrowRate: 0,
+    intrinsicYield: additionalYields?.intrinsicYields?.[collateralPriceKey] ?? 0,
+    rewards: [],
+    decimals: colDecimals,
+    config: {
+      "0": {
+        category: 0,
+        borrowCollateralFactor: ltv,
+        collateralFactor: liquidationThreshold,
+        borrowFactor: 1,
+        collateralDisabled: false,
+        debtDisabled: true
+      }
+    },
+    liquidationBonus: liquidationPenalty,
+    collateralActive: true,
+    borrowingEnabled: false,
+    depositsEnabled: true,
+    hasStable: false,
+    isActive: true,
+    isFrozen: false
+  };
+  const loanMarketUid = createMarketUid(chainId, lender, loanAddress);
+  data[loanMarketUid] = {
+    marketUid: loanMarketUid,
+    name: "Loan " + (loanMeta?.symbol ?? ""),
+    poolId: loanAddress,
+    underlying: loanAddress,
+    asset: loanMeta,
+    totalDeposits: 0,
+    totalDebtStable: 0,
+    totalDebt: totalBorrow,
+    totalLiquidity: borrowable,
+    borrowLiquidity: borrowable,
+    totalDepositsUSD: 0,
+    totalDebtStableUSD: 0,
+    totalDebtUSD: totalBorrow * loanPrice,
+    totalLiquidityUSD: borrowable * loanPrice,
+    borrowLiquidityUSD: borrowable * loanPrice,
+    utilization,
+    depositRate: 0,
+    variableBorrowRate: borrowRate,
+    stableBorrowRate: 0,
+    intrinsicYield: additionalYields?.intrinsicYields?.[loanPriceKey] ?? 0,
+    rewards: [],
+    decimals: borrowDecimals,
+    config: {
+      "0": {
+        category: 0,
+        borrowCollateralFactor: 0,
+        collateralFactor: 0,
+        borrowFactor: 1,
+        collateralDisabled: true,
+        debtDisabled: false
+      }
+    },
+    liquidationBonus: 0,
+    collateralActive: false,
+    borrowingEnabled: true,
+    depositsEnabled: false,
+    hasStable: false,
+    isActive: true,
+    isFrozen: false
+  };
+  return {
+    lender,
+    data,
+    params: {
+      vault: {
+        lender,
+        vaultAddress,
+        vaultId,
+        collateralAddress,
+        loanAddress,
+        collateralDecimals: colDecimals,
+        loanDecimals: borrowDecimals,
+        oracle: configs.oracle,
+        rebalancer: configs.rebalancer,
+        liquidationThreshold,
+        ltv,
+        liquidationPenalty,
+        oraclePriceOperate: configs.oraclePriceOperate?.toString(),
+        oraclePriceLiquidate: configs.oraclePriceLiquidate?.toString(),
+        isSmartCol: !!vault.isSmartCol,
+        isSmartDebt: !!vault.isSmartDebt
+      }
+    }
+  };
+}
 function getMorphoTypeMarketConverter(lender, chainId, prices, additionalYields, tokenList = {}, marketsOverride) {
   if (lender.startsWith("LISTA_DAO"))
     return getListaMarketDataConverter(
@@ -19178,6 +19386,7 @@ function buildLenderCall(chainId, lender) {
   if (isAaveV4Type(lender)) return buildAaveV4LenderReserveCall(chainId, lender);
   if (isSiloV2Type(lender)) return buildSiloV2LenderReserveCall(chainId, lender);
   if (isSiloV3Type(lender)) return buildSiloV3LenderReserveCall(chainId, lender);
+  if (isFluid(lender)) return buildFluidCall(chainId);
   return [];
 }
 function getLenderDataConverter(lender, chainId, prices, additionalYields, tokenList = {}) {
@@ -19262,6 +19471,14 @@ function getLenderDataConverter(lender, chainId, prices, additionalYields, token
       additionalYields,
       tokenList
     );
+  if (isFluid(lender))
+    return getFluidPublicDataConverter(
+      lender,
+      chainId,
+      prices,
+      additionalYields,
+      tokenList
+    );
   return [() => null, 0];
 }
 var getAbi = (lender) => {
@@ -19286,6 +19503,8 @@ var getAbi = (lender) => {
     return [...SiloAbi, ...SiloLensAbi, ...InterestRateModelV2Abi];
   if (isSiloV3Type(lender))
     return [...SiloAbi, ...SiloLensAbi, ...InterestRateModelV2Abi];
+  if (isFluid(lender))
+    return [...FluidVaultResolverAbi];
   if (isSumerType(lender)) return [...SumerLensAbi, ...SumerComptrollerAbi];
   if (lender === Lender.TAKARA) return [...TakaraMarketStateAbi];
   if (isCompoundV2Type(lender)) return VenusLensAbi;
@@ -32537,6 +32756,89 @@ function attachPricesToFlashLiquidity(chainId, liq, prices, list = {}) {
   return liqCopy;
 }
 
+// src/vaults/fluid/publicCallBuild.ts
+var buildFluidFTokensCall = (chainId) => {
+  const resolvers = fluidResolvers()?.[chainId];
+  if (!resolvers) return [];
+  return [
+    {
+      address: resolvers.lendingResolver,
+      name: "getFTokensEntireData",
+      params: []
+    }
+  ];
+};
+
+// src/vaults/fluid/publicCallParse.ts
+var FLUID_EEE_LOWER2 = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+var normalizeUnderlying2 = (addr) => addr === FLUID_EEE_LOWER2 ? zeroAddress : addr;
+var FLUID_RATE_SCALE2 = 100;
+var scaleFluidRate2 = (raw) => {
+  if (raw === void 0 || raw === null) return 0;
+  return Number(raw) / FLUID_RATE_SCALE2;
+};
+var getFluidFTokensConverter = (chainId, prices = {}, tokenList = {}) => {
+  const expectedNumberOfCalls = 1;
+  return [
+    (data) => {
+      if (data.length !== expectedNumberOfCalls) return void 0;
+      const [fTokenDetails] = data;
+      return parseFTokens(fTokenDetails ?? [], chainId, prices, tokenList);
+    },
+    expectedNumberOfCalls
+  ];
+};
+function parseFTokens(fTokens, chainId, prices, tokenList) {
+  const out = {};
+  for (const ft of fTokens) {
+    const rawAsset = (ft.asset ?? "").toString().toLowerCase();
+    if (!rawAsset) continue;
+    const underlying = normalizeUnderlying2(rawAsset);
+    const assetMeta = tokenList[underlying];
+    const decimals = Number(ft.decimals ?? assetMeta?.decimals ?? 18);
+    const totalAssetsFormatted = Number(
+      parseRawAmount(ft.totalAssets?.toString(), decimals)
+    );
+    const oracleKey = toOracleKey(assetMeta?.assetGroup) ?? toGenericPriceKey(underlying, chainId);
+    const priceUsd = prices[oracleKey] ?? 0;
+    const supplyRate = scaleFluidRate2(ft.supplyRate);
+    const rewardsRate = scaleFluidRate2(ft.rewardsRate);
+    const entry = {
+      address: ft.tokenAddress,
+      underlying,
+      symbol: ft.symbol ?? "",
+      name: ft.name ?? "",
+      decimals,
+      totalAssets: ft.totalAssets?.toString() ?? "0",
+      totalSupply: ft.totalSupply?.toString() ?? "0",
+      convertToShares: ft.convertToShares?.toString() ?? "0",
+      convertToAssets: ft.convertToAssets?.toString() ?? "0",
+      supplyRate,
+      rewardsRate,
+      depositRate: supplyRate + rewardsRate,
+      isNativeUnderlying: !!ft.isNativeUnderlying,
+      eip2612Deposits: !!ft.eip2612Deposits,
+      asset: assetMeta,
+      priceUsd: priceUsd || void 0,
+      totalAssetsFormatted,
+      totalAssetsUsd: totalAssetsFormatted * priceUsd
+    };
+    out[underlying] = entry;
+  }
+  return out;
+}
+var fetchFluidFTokens = async (chainId, multicallRetry, prices = {}, tokenList = {}) => {
+  const calls = buildFluidFTokensCall(chainId);
+  if (calls.length === 0) return {};
+  const raw = await multicallRetry({
+    chain: chainId,
+    calls,
+    abi: calls.map(() => FluidLendingResolverAbi)
+  });
+  const [converter] = getFluidFTokensConverter(chainId, prices, tokenList);
+  return converter(raw) ?? {};
+};
+
 // src/lending/margin/e-mode/index.ts
 function computeEModeSwitchHealth(positions, lenderMeta, currentCollateral, currentAdjustedDebt, currentMode, targetMode) {
   if (currentAdjustedDebt === 0) return null;
@@ -33023,6 +33325,6 @@ async function fetchTokenBalances(chainId, account, tokens, options = {}) {
   return parseTokenBalanceResult(rawResult, prepared.query);
 }
 
-export { EMPTY_BALANCE, MORPHO_LENS, MaxParamThresholds, applyPositionDelta, attachPricesToFlashLiquidity, buildLoopResult, buildMorphoTypeCall, buildMorphoTypeUserCallWithLens, buildPortfolioTotals, buildSumerAccumulators, buildSummaries, calculateLeverage, calculateNetApr, calculateOverallNetApr, calculateWeightedAverage, computeBorrowDelta2 as computeBorrowDelta, computeCloseTradeDeltas, computeCollateralSwapDeltas, computeDebtSwapDeltas, computeDepositDelta2 as computeDepositDelta, computeEModeAnalysis, computeOpenTradeDeltas, computePostTradeMetrics, computeRepayDelta2 as computeRepayDelta, computeSumerBorrowDelta, computeSumerDepositDelta, computeSumerRepayDelta, computeSumerWaterfall, computeSumerWithdrawDelta, computeWithdrawDelta2 as computeWithdrawDelta, computeZapTradeDeltas, convertLenderUserDataResult, createMarketUid, createMulticallRpcCall, createRawRpcCalls, decodeListaMarkets, decodeMarkets, decodePackedListaUserDataset, decodePackedMorphoUserDataset, encodeBalanceFetcherCalldata, fetchEulerSubAccountIndexes, fetchFlashLiquidityForChain, fetchGeneralYields, fetchGeneralYieldsByMarketUid, fetchOraclePrices, fetchPendlePrices, fetchTokenBalances, fetchTokenMetadata, filterActiveLenders, filterLendersByProtocol, fuseLenderData, generateLendingPools, getAavesForChain, getAssetConfig, getBalanceForMarketUid, getBorrowCapacity, getHealthFactor, getLenderAssets, getLenderPublicData, getLenderPublicDataAll, getLenderPublicDataViaApi, getLenderUserDataMulti, getLenderUserDataResult, getLendersForChain, getMaxAmountClose, getMaxAmountCollateralSwap, getMaxAmountDebtSwap, getMaxAmountOpen, getMergedUserData, getMorphoTypeMarketConverter, getSubAccountAddress, getSubAccountIndex, keysFromMaps, multicall3Abi, nanTo, needsLenderApproval, needsTokenApproval, noOpResult, normalizeToBytes, parseBalanceFetcherResult, parseMergedResult, parseMulticallRpcResponses, parseRawRpcBatchResponses, parseRawRpcResponses, parseTokenBalanceResult, positivePart2 as positivePart, prepareLenderUserDataRpcCalls, prepareMergedMulticallParams, prepareMergedRpcCalls, prepareMulticallInputs, prepareTokenBalanceRpcCalls, selectAssetGroupPrices, unflattenLenderData };
+export { EMPTY_BALANCE, MORPHO_LENS, MaxParamThresholds, applyPositionDelta, attachPricesToFlashLiquidity, buildFluidFTokensCall, buildLoopResult, buildMorphoTypeCall, buildMorphoTypeUserCallWithLens, buildPortfolioTotals, buildSumerAccumulators, buildSummaries, calculateLeverage, calculateNetApr, calculateOverallNetApr, calculateWeightedAverage, computeBorrowDelta2 as computeBorrowDelta, computeCloseTradeDeltas, computeCollateralSwapDeltas, computeDebtSwapDeltas, computeDepositDelta2 as computeDepositDelta, computeEModeAnalysis, computeOpenTradeDeltas, computePostTradeMetrics, computeRepayDelta2 as computeRepayDelta, computeSumerBorrowDelta, computeSumerDepositDelta, computeSumerRepayDelta, computeSumerWaterfall, computeSumerWithdrawDelta, computeWithdrawDelta2 as computeWithdrawDelta, computeZapTradeDeltas, convertLenderUserDataResult, createMarketUid, createMulticallRpcCall, createRawRpcCalls, decodeListaMarkets, decodeMarkets, decodePackedListaUserDataset, decodePackedMorphoUserDataset, encodeBalanceFetcherCalldata, fetchEulerSubAccountIndexes, fetchFlashLiquidityForChain, fetchFluidFTokens, fetchGeneralYields, fetchGeneralYieldsByMarketUid, fetchOraclePrices, fetchPendlePrices, fetchTokenBalances, fetchTokenMetadata, filterActiveLenders, filterLendersByProtocol, fuseLenderData, generateLendingPools, getAavesForChain, getAssetConfig, getBalanceForMarketUid, getBorrowCapacity, getFluidFTokensConverter, getHealthFactor, getLenderAssets, getLenderPublicData, getLenderPublicDataAll, getLenderPublicDataViaApi, getLenderUserDataMulti, getLenderUserDataResult, getLendersForChain, getMaxAmountClose, getMaxAmountCollateralSwap, getMaxAmountDebtSwap, getMaxAmountOpen, getMergedUserData, getMorphoTypeMarketConverter, getSubAccountAddress, getSubAccountIndex, keysFromMaps, multicall3Abi, nanTo, needsLenderApproval, needsTokenApproval, noOpResult, normalizeToBytes, parseBalanceFetcherResult, parseMergedResult, parseMulticallRpcResponses, parseRawRpcBatchResponses, parseRawRpcResponses, parseTokenBalanceResult, positivePart2 as positivePart, prepareLenderUserDataRpcCalls, prepareMergedMulticallParams, prepareMergedRpcCalls, prepareMulticallInputs, prepareTokenBalanceRpcCalls, selectAssetGroupPrices, unflattenLenderData };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map