@defisaver/positions-sdk 2.1.167 → 2.1.168

package/esm/portfolio/lendingSummaryTransport.js

@@ -0,0 +1,104 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { decodeFunctionData, decodeFunctionResult, encodeFunctionData, encodeFunctionResult, multicall3Abi, } from 'viem';
+const errorText = (error) => {
+    const detail = error;
+    return `${(detail === null || detail === void 0 ? void 0 : detail.message) || String(error)} ${(detail === null || detail === void 0 ? void 0 : detail.code) || ''} ${(detail === null || detail === void 0 ? void 0 : detail.status) || ''}`;
+};
+const logRangeLimit = (error) => /block range|too many (results|logs)|query returned|response.*size|range.*limit/i.test(errorText(error));
+const oversized = (error) => /413|request.*(large|size)|response.*(large|size)|out of gas|gas (required|limit)|exceeds.*gas|execution.*limit/i.test(errorText(error));
+export const isLendingSummaryRateLimit = (error) => !oversized(error) && !logRangeLimit(error) && /429|rate.?limit|too many requests|compute units|limit exceeded/i.test(errorText(error));
+/** One limiter for all reads, including split multicalls. No retries after cancellation/429. */
+export function lendingSummaryTransport(provider, signal, blockNumber, maxCalldataBytes = 32000) {
+    let pinnedBlock = blockNumber;
+    let active = 0;
+    let rateLimit;
+    const waiting = [];
+    const check = () => {
+        if (signal === null || signal === void 0 ? void 0 : signal.aborted)
+            throw new Error('Lending summary cancelled');
+        // Keep the provider's original error code/message, including plain RPC error objects.
+        // eslint-disable-next-line @typescript-eslint/no-throw-literal
+        if (rateLimit !== undefined)
+            throw rateLimit;
+    };
+    const send = (args) => __awaiter(this, void 0, void 0, function* () {
+        if (active >= 4)
+            yield new Promise(resolve => { waiting.push(resolve); });
+        else
+            active++;
+        try {
+            check();
+            return yield provider.request(args);
+        }
+        catch (error) {
+            if (isLendingSummaryRateLimit(error))
+                rateLimit = error;
+            throw error;
+        }
+        finally {
+            const next = waiting.shift();
+            if (next)
+                next();
+            else
+                active--;
+        }
+    });
+    const request = (args) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        check();
+        const params = [...(args.params || [])];
+        if (pinnedBlock !== undefined) {
+            const block = `0x${pinnedBlock.toString(16)}`;
+            if (args.method === 'eth_blockNumber')
+                return block;
+            if (['eth_call', 'eth_getCode'].includes(args.method))
+                params[1] = block;
+        }
+        const call = params[0];
+        const isMulticall = args.method === 'eth_call' && ((_a = call === null || call === void 0 ? void 0 : call.data) === null || _a === void 0 ? void 0 : _a.startsWith('0x82ad56cb'));
+        const splitMulticall = (error) => __awaiter(this, void 0, void 0, function* () {
+            const { args: [calls] } = decodeFunctionData({ abi: multicall3Abi, data: call.data });
+            if (!calls || calls.length < 2)
+                throw error;
+            // Sequential halves keep the same concurrency bound and retain per-call failures.
+            const results = [];
+            for (const half of [calls.slice(0, Math.ceil(calls.length / 2)), calls.slice(Math.ceil(calls.length / 2))]) {
+                const data = encodeFunctionData({ abi: multicall3Abi, functionName: 'aggregate3', args: [half] });
+                const encoded = yield request(Object.assign(Object.assign({}, args), { params: [Object.assign(Object.assign({}, call), { data }), ...params.slice(1)] }));
+                results.push(...decodeFunctionResult({ abi: multicall3Abi, functionName: 'aggregate3', data: encoded }));
+            }
+            return encodeFunctionResult({ abi: multicall3Abi, functionName: 'aggregate3', result: results });
+        });
+        // Viem's batch size counts inner calls only. Also bound the fully encoded calldata.
+        if (isMulticall && (call.data.length - 2) / 2 > maxCalldataBytes)
+            return splitMulticall(new Error('Single call exceeds summary calldata limit'));
+        try {
+            return yield send(Object.assign(Object.assign({}, args), { params }));
+        }
+        catch (error) {
+            check();
+            if (args.method === 'eth_getLogs' && logRangeLimit(error)) {
+                const from = BigInt(call.fromBlock);
+                const to = BigInt(call.toBlock);
+                if (from >= to)
+                    throw error;
+                const middle = (from + to) / BigInt(2);
+                const first = yield request(Object.assign(Object.assign({}, args), { params: [Object.assign(Object.assign({}, call), { toBlock: `0x${middle.toString(16)}` })] }));
+                const last = yield request(Object.assign(Object.assign({}, args), { params: [Object.assign(Object.assign({}, call), { fromBlock: `0x${(middle + BigInt(1)).toString(16)}` })] }));
+                return [...first, ...last];
+            }
+            if (!isMulticall || !oversized(error))
+                throw error;
+            return splitMulticall(error);
+        }
+    });
+    return { provider: { request }, isRateLimited: () => rateLimit !== undefined, pinBlock: (value) => { pinnedBlock = value; } };
+}

package/esm/spark/index.js

@@ -9,14 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
+import { getAaveLikeBalances } from '../helpers/aaveBalances';
 import { IncentiveKind, } from '../types/common';
-import { ethToWeth, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { ethToWeth, } from '../services/utils';
 import { calculateNetApy, getStakingApy, STAKING_ASSETS, } from '../staking';
 import { SparkViewContractViem, SparkIncentiveDataProviderContractViem, createViemContractFromConfigFunc, } from '../contracts';
 import { sparkGetAggregatedPositionData, sparkIsInIsolationMode } from '../helpers/sparkHelpers';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { SPARK_V1 } from '../markets/spark';
-import { getViemProvider, setViemBlockNumber } from '../services/viem';
+import { getViemProvider } from '../services/viem';
 export const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
     const { assetsData } = extractedState;
     const usedAssetsValues = Object.values(usedAssets);
@@ -228,37 +229,7 @@ export const EMPTY_SPARK_DATA = {
     exposure: 'N/A',
 };
 export const _getSparkAccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
-    let balances = {
-        collateral: {},
-        debt: {},
-    };
-    if (!address) {
-        return balances;
-    }
-    const loanInfoContract = SparkViewContractViem(provider, network, block);
-    const market = SPARK_V1(network);
-    const marketAddress = market.providerAddress;
-    // @ts-ignore
-    const protocolDataProviderContract = createViemContractFromConfigFunc(market.protocolData, market.protocolDataAddress)(provider, network);
-    // @ts-ignore
-    const reserveTokens = yield protocolDataProviderContract.read.getAllReservesTokens(setViemBlockNumber(block));
-    const symbols = reserveTokens.map(({ symbol }) => symbol);
-    const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);
-    // split addresses in half to avoid gas limit by multicall
-    const middleAddressIndex = Math.floor(_addresses.length / 2);
-    const [tokenBalances1, tokenBalances2] = yield Promise.all([
-        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex)], setViemBlockNumber(block)),
-        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)], setViemBlockNumber(block)),
-    ]);
-    const loanInfo = [...tokenBalances1, ...tokenBalances2];
-    loanInfo.forEach((tokenInfo, i) => {
-        const asset = wethToEth(symbols[i]);
-        const assetAddr = wethToEthByAddress(_addresses[i], network).toLowerCase();
-        balances = {
-            collateral: Object.assign(Object.assign({}, balances.collateral), { [addressMapping ? assetAddr : asset]: tokenInfo.balance.toString() }),
-            debt: Object.assign(Object.assign({}, balances.debt), { [addressMapping ? assetAddr : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString() }),
-        };
-    });
+    const balances = yield getAaveLikeBalances(provider, network, block, addressMapping, address, SPARK_V1(network), 'SparkView');
     return balances;
 });
 export const getSparkAccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return _getSparkAccountBalances(getViemProvider(provider, network, { batch: { multicall: true } }), network, block, addressMapping, address); });

package/esm/types/index.d.ts

@@ -15,3 +15,4 @@ export * from './merkl';
 export * from './savings';
 export * from './common';
 export * from './aaveV4';
+export * from './lendingSummary';

package/esm/types/index.js

@@ -15,3 +15,4 @@ export * from './merkl';
 export * from './savings';
 export * from './common';
 export * from './aaveV4';
+export * from './lendingSummary';

package/esm/types/lendingSummary.d.ts

@@ -0,0 +1,34 @@
+import { EthAddress, NetworkNumber } from './common';
+export type LendingSummaryPosition = {
+    id: string;
+    protocol: string;
+    /** Estimated decimal USD values; null means unavailable, never a verified zero. */
+    suppliedUsd: string | null;
+    debtUsd: string | null;
+};
+export type WalletLendingSummary = {
+    status: 'complete' | 'partial' | 'failed';
+    positions: LendingSummaryPosition[];
+    protocols: string[];
+    /** Sum of known supply values; check valuationComplete before ranking by value. */
+    suppliedUsd: string;
+    valuationComplete: boolean;
+    errors: string[];
+};
+/** Resolve distinct token addresses to USD prices keyed by lowercase address.
+ * Native tokens use their wrapped address. Missing/invalid prices remain unavailable.
+ * Prices are current market estimates; balances may come from a historical/fork snapshot.
+ */
+export type LendingSummaryPriceResolver = (network: NetworkNumber, tokens: EthAddress[], signal?: AbortSignal) => Promise<Record<string, string>>;
+export type LendingSummaryOptions = {
+    resolvePrices: LendingSummaryPriceResolver;
+    signal?: AbortSignal;
+    /** Defaults to a snapshot of the provider's latest block. */
+    blockNumber?: bigint;
+    /** Use the smaller 2 KB calldata limit required by simulation providers. */
+    isSim?: boolean;
+};
+export type WalletLendingSummaries = {
+    summaries: Record<string, WalletLendingSummary>;
+    rateLimited: boolean;
+};

package/esm/types/lendingSummary.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.167",
+  "version": "2.1.168",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV2/index.ts

@@ -1,12 +1,13 @@
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
 import { Client } from 'viem';
+import { getAaveLikeBalances } from '../helpers/aaveBalances';
 import {
   Blockish, EthAddress, EthereumProvider, IncentiveKind, NetworkNumber, PositionBalances,
 } from '../types/common';
 import { calculateNetApy, getStakingApy } from '../staking';
-import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
-import { AaveLoanInfoV2ContractViem, createViemContractFromConfigFunc } from '../contracts';
+import { ethToWeth, wethToEth } from '../services/utils';
+import { AaveLoanInfoV2ContractViem } from '../contracts';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import {
   AaveMarketInfo, AaveV2AssetData, AaveV2AssetsData, AaveV2PositionData, AaveV2UsedAsset, AaveV2UsedAssets,
@@ -89,52 +90,11 @@ export const _getAaveV2MarketsData = async (provider: Client, network: NetworkNu
 export const getAaveV2MarketsData = async (provider: EthereumProvider, network: NetworkNumber, selectedMarket: AaveMarketInfo) => _getAaveV2MarketsData(getViemProvider(provider, network), network, selectedMarket);
 
 export const _getAaveV2AccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
-  let balances: PositionBalances = {
-    collateral: {},
-    debt: {},
-  };
-
-  if (!address) {
-    return balances;
-  }
-
-  const market = AAVE_V2;
-
-  const loanInfoContract = AaveLoanInfoV2ContractViem(provider, network, block);
-
-  const marketAddress = market.providerAddress;
-  // @ts-ignore
-  const protocolDataProviderContract = createViemContractFromConfigFunc(market.protocolData, market.protocolDataAddress)(provider, network);
-
-  // @ts-ignore
-  const reserveTokens = await protocolDataProviderContract.read.getAllReservesTokens(setViemBlockNumber(block)) as { symbol: string, tokenAddress: EthAddress }[];
-  const symbols = reserveTokens.map(({ symbol }: { symbol: string }) => symbol);
-  const _addresses = reserveTokens.map(({ tokenAddress }: { tokenAddress: EthAddress }) => tokenAddress);
-
-  const loanInfo = await loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses as EthAddress[]], setViemBlockNumber(block));
-
-  loanInfo.forEach((_tokenInfo: any, i: number) => {
-    const asset = wethToEth(symbols[i]);
-    const assetAddr = wethToEthByAddress(_addresses[i], network).toLowerCase();
-    const tokenInfo = { ..._tokenInfo };
-
-    // known bug: stETH leaves 1 wei on every transfer
-    if (asset === 'stETH' && tokenInfo.balance.toString() === '1') {
-      tokenInfo.balance = '0';
-    }
-
-    balances = {
-      collateral: {
-        ...balances.collateral,
-        [addressMapping ? assetAddr : asset]: tokenInfo.balance.toString(),
-      },
-      debt: {
-        ...balances.debt,
-        [addressMapping ? assetAddr : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString(),
-      },
-    };
-  });
-
+  const balances = await getAaveLikeBalances(provider, network, block, addressMapping, address, AAVE_V2, 'AaveLoanInfoV2');
+  if (!address) return balances;
+  // Preserve the legacy getter's stETH transfer-dust convention.
+  const key = addressMapping ? getAssetInfo('stETH', network).address.toLowerCase() : 'stETH';
+  if (balances.collateral?.[key] === '1') balances.collateral[key] = '0';
   return balances;
 };
 

package/src/aaveV3/index.ts

@@ -1,6 +1,7 @@
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
 import { Client } from 'viem';
 import Dec from 'decimal.js';
+import { getAaveLikeBalances } from '../helpers/aaveBalances';
 import {
   AaveIncentiveDataProviderV3ContractViem,
   AaveIncentivesControllerViem,
@@ -17,7 +18,6 @@ import {
   isEnabledOnBitmap,
   isLayer2Network,
   wethToEth,
-  wethToEthByAddress,
 } from '../services/utils';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import {
@@ -384,53 +384,7 @@ export const EMPTY_AAVE_DATA = {
 };
 
 export const _getAaveV3AccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
-  let balances: PositionBalances = {
-    collateral: {},
-    debt: {},
-  };
-
-  if (!address) {
-    return balances;
-  }
-
-  const loanInfoContract = AaveV3ViewContractViem(provider, network, block);
-
-  const market = AAVE_V3(network);
-  const marketAddress = market.providerAddress;
-  // @ts-ignore
-  const protocolDataProviderContract = createViemContractFromConfigFunc(market.protocolData, market.protocolDataAddress)(provider, network);
-
-  // @ts-ignore
-  const reserveTokens = await protocolDataProviderContract.read.getAllReservesTokens(setViemBlockNumber(block)) as { symbol: string, tokenAddress: EthAddress }[];
-  const symbols = reserveTokens.map(({ symbol }: { symbol: string }) => symbol);
-  const _addresses = reserveTokens.map(({ tokenAddress }: { tokenAddress: EthAddress }) => tokenAddress);
-
-  // split addresses in half to avoid gas limit by multicall
-  const middleAddressIndex = Math.floor(_addresses.length / 2);
-
-  const [tokenBalances1, tokenBalances2] = await Promise.all([
-    loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(0, middleAddressIndex)], setViemBlockNumber(block)),
-    loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)], setViemBlockNumber(block)),
-  ]);
-
-  const loanInfo = [...tokenBalances1, ...tokenBalances2];
-
-  loanInfo.forEach((tokenInfo: any, i: number) => {
-    const asset = wethToEth(symbols[i]);
-    const assetAddr = wethToEthByAddress(_addresses[i], network).toLowerCase();
-
-    balances = {
-      collateral: {
-        ...balances.collateral,
-        [addressMapping ? assetAddr : asset]: tokenInfo.balance.toString(),
-      },
-      debt: {
-        ...balances.debt,
-        [addressMapping ? assetAddr : asset]: new Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString(),
-      },
-    };
-  });
-
+  const balances = await getAaveLikeBalances(provider, network, block, addressMapping, address, AAVE_V3(network), 'AaveV3View');
   return balances;
 };
 

package/src/aaveV4/index.ts

@@ -1,7 +1,7 @@
 import { Client } from 'viem';
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfoByAddress } from '@defisaver/tokens';
-import { getViemProvider } from '../services/viem';
+import { getViemProvider, setViemBlockNumber } from '../services/viem';
 import {
   AaveV4AccountData,
   AaveV4HubAssetOnChainData,
@@ -275,6 +275,11 @@ export async function _getAaveV4AccountData(provider: Client, network: NetworkNu
   };
 }
 
+/** Shared raw read; no spoke metadata or market enrichment. */
+export const _getAaveV4LoanBalances = (provider: Client, network: NetworkNumber, block: Blockish, address: EthAddress, spoke: EthAddress) => (
+  AaveV4ViewContractViem(provider, network, block).read.getLoanData([spoke, address], setViemBlockNumber(block))
+);
+
 /**
  * Lightweight existence check for Loan Shifter / UI discovery.
  * Reads only `getLoanData(spoke, user)` and returns whether any reserve has

package/src/compoundV2/index.ts

@@ -116,7 +116,7 @@ const getAllMarketAddresses = async (provider: Client, network: NetworkNumber, b
 };
 
 
-export const _getCompoundV2AccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress): Promise<PositionBalances> => {
+export const _getCompoundV2AccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, tokens?: EthAddress[]): Promise<PositionBalances> => {
   let balances: PositionBalances = {
     collateral: {},
     debt: {},
@@ -126,7 +126,7 @@ export const _getCompoundV2AccountBalances = async (provider: Client, network: N
     return balances;
   }
 
-  const assets = await getAllMarketAddresses(provider, network, block);
+  const assets = tokens || await getAllMarketAddresses(provider, network, block);
   const assetInfo = assets.map(a => getAssetInfoByAddress(a, network));
   const loanInfoContract = CompoundLoanInfoContractViem(provider, network, block);
   const loanInfo = await loanInfoContract.read.getTokenBalances([address, assets], setViemBlockNumber(block));

package/src/curveUsd/index.ts

@@ -128,7 +128,7 @@ const getStatusForUser = (bandRange: string[], activeBand: string, crvUSDSupplie
   return CrvUSDStatus.Nonexistant;
 };
 
-export const _getCrvUsdAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress): Promise<PositionBalances> => {
+export const _getCrvUsdAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress, includeDeposited = false): Promise<PositionBalances> => {
   let balances: PositionBalances = {
     collateral: {},
     debt: {},
@@ -152,6 +152,11 @@ export const _getCrvUsdAccountBalances = async (provider: Client, network: Netwo
     },
   };
 
+  if (includeDeposited) {
+    balances.deposited = {
+      [addressMapping ? getAssetInfo(wethToEth(selectedMarket.baseAsset), network).address.toLowerCase() : wethToEth(selectedMarket.baseAsset)]: data.curveUsdCollateralAmount.toString(),
+    };
+  }
   return balances;
 };
 

package/src/fluid/index.ts

@@ -3,6 +3,7 @@ import {
   assetAmountInEth, AssetData, getAssetInfo, getAssetInfoByAddress,
 } from '@defisaver/tokens';
 import { Client, PublicClient } from 'viem';
+import { fluidTokenAmount } from '../helpers/fluidBalances';
 import {
   EthAddress, EthereumProvider, IncentiveKind, NetworkNumber,
 } from '../types/common';
@@ -1178,8 +1179,8 @@ const parseT1UserData = (userPositionData: FluidUserPositionStructOutputStruct,
   const debtAsset = getAssetInfo(marketData.debtAsset0);
 
   // for T2 and T4 - this is the number of shares
-  const supplied = getEthAmountForDecimals(userPositionData.supply.toString(), collAsset.decimals);
-  const borrowed = getEthAmountForDecimals(userPositionData.borrow.toString(), debtAsset.decimals);
+  const supplied = fluidTokenAmount(userPositionData.supply, collAsset.decimals);
+  const borrowed = fluidTokenAmount(userPositionData.borrow, debtAsset.decimals);
 
   const collUsedAsset: FluidUsedAsset = {
     ...EMPTY_USED_ASSET,
@@ -1234,10 +1235,10 @@ const parseT2UserData = (userPositionData: FluidUserPositionStructOutputStruct,
   const debtAsset = getAssetInfo(marketData.debtAsset0);
 
   const supplyShares = getEthAmountForDecimals(userPositionData.supply.toString(), 18); // this is supplied in coll shares
-  const borrowed = getEthAmountForDecimals(userPositionData.borrow.toString(), debtAsset.decimals); // this is actual token borrow
+  const borrowed = fluidTokenAmount(userPositionData.borrow, debtAsset.decimals); // this is actual token borrow
 
-  const supplied0 = new Dec(supplyShares).mul(assetsData[collAsset0.symbol].tokenPerSupplyShare!).toString();
-  const supplied1 = new Dec(supplyShares).mul(assetsData[collAsset1.symbol].tokenPerSupplyShare!).toString();
+  const supplied0 = fluidTokenAmount(userPositionData.supply, collAsset0.decimals, assetsData[collAsset0.symbol].tokenPerSupplyShare!);
+  const supplied1 = fluidTokenAmount(userPositionData.supply, collAsset1.decimals, assetsData[collAsset1.symbol].tokenPerSupplyShare!);
 
   const collUsedAsset0: Partial<FluidUsedAsset> = {
     symbol: collAsset0.symbol,
@@ -1302,11 +1303,11 @@ const parseT3UserData = (userPositionData: FluidUserPositionStructOutputStruct,
   const debtAsset0 = getAssetInfo(marketData.debtAsset0);
   const debtAsset1 = getAssetInfo(marketData.debtAsset1);
 
-  const supplied = getEthAmountForDecimals(userPositionData.supply.toString(), collAsset.decimals); // this is actual token supply
+  const supplied = fluidTokenAmount(userPositionData.supply, collAsset.decimals); // this is actual token supply
   const borrowShares = getEthAmountForDecimals(userPositionData.borrow.toString(), 18); // this is actual token borrow
 
-  const borrowed0 = new Dec(borrowShares).mul(assetsData[debtAsset0.symbol].tokenPerBorrowShare!).toString();
-  const borrowed1 = new Dec(borrowShares).mul(assetsData[debtAsset1.symbol].tokenPerBorrowShare!).toString();
+  const borrowed0 = fluidTokenAmount(userPositionData.borrow, debtAsset0.decimals, assetsData[debtAsset0.symbol].tokenPerBorrowShare!);
+  const borrowed1 = fluidTokenAmount(userPositionData.borrow, debtAsset1.decimals, assetsData[debtAsset1.symbol].tokenPerBorrowShare!);
 
   const collUsedAsset: Partial<FluidUsedAsset> = {
     symbol: collAsset.symbol,
@@ -1374,11 +1375,11 @@ const parseT4UserData = (userPositionData: FluidUserPositionStructOutputStruct,
   const supplyShares = getEthAmountForDecimals(userPositionData.supply.toString(), 18); // this is actual token supply
   const borrowShares = getEthAmountForDecimals(userPositionData.borrow.toString(), 18); // this is actual token borrow
 
-  const supplied0 = new Dec(supplyShares).mul(assetsData[collAsset0.symbol].tokenPerSupplyShare!).toString();
-  const supplied1 = new Dec(supplyShares).mul(assetsData[collAsset1.symbol].tokenPerSupplyShare!).toString();
+  const supplied0 = fluidTokenAmount(userPositionData.supply, collAsset0.decimals, assetsData[collAsset0.symbol].tokenPerSupplyShare!);
+  const supplied1 = fluidTokenAmount(userPositionData.supply, collAsset1.decimals, assetsData[collAsset1.symbol].tokenPerSupplyShare!);
 
-  const borrowed0 = new Dec(borrowShares).mul(assetsData[debtAsset0.symbol].tokenPerBorrowShare!).toString();
-  const borrowed1 = new Dec(borrowShares).mul(assetsData[debtAsset1.symbol].tokenPerBorrowShare!).toString();
+  const borrowed0 = fluidTokenAmount(userPositionData.borrow, debtAsset0.decimals, assetsData[debtAsset0.symbol].tokenPerBorrowShare!);
+  const borrowed1 = fluidTokenAmount(userPositionData.borrow, debtAsset1.decimals, assetsData[debtAsset1.symbol].tokenPerBorrowShare!);
 
   const collUsedAsset0: Partial<FluidUsedAsset> = {
     symbol: collAsset0.symbol,

package/src/helpers/aaveBalances.ts

@@ -0,0 +1,41 @@
+import Dec from 'decimal.js';
+import { getAssetInfoByAddress } from '@defisaver/tokens';
+import { Client } from 'viem';
+import { AaveMarketInfo, SparkMarketData } from '../types';
+import {
+  Blockish, EthAddress, NetworkNumber, PositionBalances,
+} from '../types/common';
+import { createViemContractFromConfigFunc } from '../contracts';
+import { setViemBlockNumber } from '../services/viem';
+import { wethToEth, wethToEthByAddress } from '../services/utils';
+
+/** Raw token balances shared by Aave/Spark getters and lending previews. */
+export async function getAaveLikeBalances(
+  client: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean,
+  address: EthAddress, market: Pick<AaveMarketInfo | SparkMarketData, 'providerAddress' | 'protocolData' | 'protocolDataAddress'>,
+  view: 'AaveLoanInfoV2' | 'AaveV3View' | 'SparkView', tokens?: EthAddress[],
+): Promise<PositionBalances> {
+  const balances: PositionBalances = { collateral: {}, debt: {} };
+  if (!address) return balances;
+  let reserves: { tokenAddress: EthAddress; symbol: string }[];
+  if (tokens) reserves = tokens.map(tokenAddress => ({ tokenAddress, symbol: getAssetInfoByAddress(tokenAddress, network).symbol }));
+  else {
+    if (!market.protocolData) throw new Error('Missing protocol data provider');
+    reserves = [...await createViemContractFromConfigFunc(market.protocolData, market.protocolDataAddress as EthAddress)(client, network)
+      .read.getAllReservesTokens(setViemBlockNumber(block))];
+  }
+  const addresses = reserves.map(token => token.tokenAddress);
+  const contract = createViemContractFromConfigFunc(view)(client, network, block);
+  const middle = tokens ? Math.ceil(addresses.length / 2) : Math.floor(addresses.length / 2);
+  // Preserve legacy V2 single-call and V3/Spark two-call behavior.
+  const parts = !tokens && view === 'AaveLoanInfoV2' ? [addresses] : [addresses.slice(0, middle), addresses.slice(middle)];
+  const data = (await Promise.all((tokens ? parts.filter(part => part.length) : parts)
+    .map(part => contract.read.getTokenBalances([market.providerAddress, address, part], setViemBlockNumber(block))))).flat();
+  data.forEach((token, i) => {
+    // The views leave token.token unset; input order identifies the reserve.
+    const key = addressMapping ? wethToEthByAddress(reserves[i].tokenAddress, network).toLowerCase() : wethToEth(reserves[i].symbol);
+    balances.collateral![key] = token.balance.toString();
+    balances.debt![key] = new Dec(token.borrowsStable.toString()).add(token.borrowsVariable.toString()).toString();
+  });
+  return balances;
+}

package/src/helpers/fluidBalances.ts

@@ -0,0 +1,34 @@
+import Dec from 'decimal.js';
+import { getAssetInfoByAddress } from '@defisaver/tokens';
+import { FluidUserPositionStructOutputStruct, FluidVaultDataStructOutputStruct } from '../types';
+import { NetworkNumber, PositionBalances } from '../types/common';
+
+/** Convert raw tokens, or raw 18-decimal shares with a human-readable token/share ratio. */
+export const fluidTokenAmount = (amount: bigint, decimals: number, perShare?: string): string => (
+  new Dec(amount.toString()).div(new Dec(10).pow(perShare === undefined ? decimals : 18)).mul(perShare ?? 1).toString()
+);
+
+/** The same token/share conversion used by the full Fluid user parsers, without prices or yield. */
+export function parseFluidBalances(position: FluidUserPositionStructOutputStruct, vault: FluidVaultDataStructOutputStruct, network: NetworkNumber): PositionBalances {
+  const type = Number(vault.vaultType);
+  if (![10000, 20000, 30000, 40000].includes(type)) throw new Error('Unsupported Fluid vault');
+  const side = (amount: bigint, tokens: string[], ratios: bigint[] | undefined) => {
+    const balances: Record<string, string> = {};
+    tokens.forEach((address, i) => {
+      const token = getAssetInfoByAddress(address, network);
+      if (!Number.isFinite(token.decimals) || !token.symbol) throw new Error('Fluid token metadata unavailable');
+      const perShare = ratios ? fluidTokenAmount(ratios[i], token.decimals) : undefined;
+      const value = fluidTokenAmount(amount, token.decimals, perShare);
+      balances[token.symbol] = new Dec(balances[token.symbol] || 0).add(value).toString();
+    });
+    return balances;
+  };
+  const smartSupply = type === 20000 || type === 40000;
+  const smartDebt = type === 30000 || type === 40000;
+  return {
+    collateral: side(position.supply, smartSupply ? [vault.supplyToken0, vault.supplyToken1] : [vault.supplyToken0],
+      smartSupply ? [vault.dexSupplyData.token0PerSupplyShare, vault.dexSupplyData.token1PerSupplyShare] : undefined),
+    debt: side(position.borrow, smartDebt ? [vault.borrowToken0, vault.borrowToken1] : [vault.borrowToken0],
+      smartDebt ? [vault.dexBorrowData.token0PerBorrowShare, vault.dexBorrowData.token1PerBorrowShare] : undefined),
+  };
+}

package/src/liquityV2/index.ts

@@ -152,7 +152,7 @@ const getUserTroves = async (
   return getUserTroves(provider, network, isLegacy, account, marketAddress, newStartIndex, newStartIndex + 100, existingTroves);
 };
 
-const nftContractCreationBlockMapping = {
+export const nftContractCreationBlockMapping = {
   [LiquityV2Versions.LiquityV2Eth]: 22516079,
   [LiquityV2Versions.LiquityV2WstEth]: 22516099,
   [LiquityV2Versions.LiquityV2REth]: 22516118,

package/src/llamaLend/index.ts

@@ -168,7 +168,7 @@ const getStatusForUser = (bandRange: string[], activeBand: string, debtSupplied:
   return LlamaLendStatus.Nonexistant;
 };
 
-export const _getLlamaLendAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress): Promise<PositionBalances> => {
+export const _getLlamaLendAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress, includeDeposited = false): Promise<PositionBalances> => {
   let balances: PositionBalances = {
     collateral: {},
     debt: {},
@@ -192,6 +192,11 @@ export const _getLlamaLendAccountBalances = async (provider: Client, network: Ne
     },
   };
 
+  if (includeDeposited) {
+    balances.deposited = {
+      [addressMapping ? getAssetInfo(wethToEth(selectedMarket.baseAsset), network).address.toLowerCase() : wethToEth(selectedMarket.baseAsset)]: data.debtTokenCollateralAmount.toString(),
+    };
+  }
   return balances;
 };
 

package/src/morphoMidnight/index.ts

@@ -222,7 +222,7 @@ export async function getMorphoMidnightAccountData(provider: EthereumProvider, n
   return _getMorphoMidnightAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
 }
 
-export const _getMorphoMidnightAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData): Promise<PositionBalances> => {
+export const _getMorphoMidnightAccountBalances = async (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData, includeCredit = false): Promise<PositionBalances> => {
   const balances: PositionBalances = { collateral: {}, debt: {} };
   if (!address) return balances;
 
@@ -244,6 +244,11 @@ export const _getMorphoMidnightAccountBalances = async (provider: Client, networ
   });
   balances.collateral = collateral;
 
+  if (includeCredit) {
+    balances.deposited = {
+      [addressMapping ? loanTokenInfo.address.toLowerCase() : wethToEth(loanTokenInfo.symbol)]: assetAmountInEth(positionInfo.credit.toString(), wethToEth(loanTokenInfo.symbol)),
+    };
+  }
   return balances;
 };
 

package/src/portfolio/index.ts

@@ -849,3 +849,5 @@ export async function getShifterPortfolioData(provider: EthereumProvider, networ
 }
 
 export * from './discovery';
+
+export { getWalletLendingSummaries } from './lendingSummaries';