@defisaver/positions-sdk 2.1.167 → 2.1.168

package/cjs/aaveV2/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAaveV2FullPositionData = exports.getAaveV2AccountData = exports._getAaveV2AccountData = exports.getAaveV2AccountBalances = exports._getAaveV2AccountBalances = exports.getAaveV2MarketsData = exports._getAaveV2MarketsData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
+const aaveBalances_1 = require("../helpers/aaveBalances");
 const common_1 = require("../types/common");
 const staking_1 = require("../staking");
 const utils_1 = require("../services/utils");
@@ -93,36 +94,14 @@ exports._getAaveV2MarketsData = _getAaveV2MarketsData;
 const getAaveV2MarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAaveV2MarketsData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket); });
 exports.getAaveV2MarketsData = getAaveV2MarketsData;
 const _getAaveV2AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
-    let balances = {
-        collateral: {},
-        debt: {},
-    };
-    if (!address) {
+    var _a;
+    const balances = yield (0, aaveBalances_1.getAaveLikeBalances)(provider, network, block, addressMapping, address, aave_1.AAVE_V2, 'AaveLoanInfoV2');
+    if (!address)
         return balances;
-    }
-    const market = aave_1.AAVE_V2;
-    const loanInfoContract = (0, contracts_1.AaveLoanInfoV2ContractViem)(provider, network, block);
-    const marketAddress = market.providerAddress;
-    // @ts-ignore
-    const protocolDataProviderContract = (0, contracts_1.createViemContractFromConfigFunc)(market.protocolData, market.protocolDataAddress)(provider, network);
-    // @ts-ignore
-    const reserveTokens = yield protocolDataProviderContract.read.getAllReservesTokens((0, viem_1.setViemBlockNumber)(block));
-    const symbols = reserveTokens.map(({ symbol }) => symbol);
-    const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);
-    const loanInfo = yield loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses], (0, viem_1.setViemBlockNumber)(block));
-    loanInfo.forEach((_tokenInfo, i) => {
-        const asset = (0, utils_1.wethToEth)(symbols[i]);
-        const assetAddr = (0, utils_1.wethToEthByAddress)(_addresses[i], network).toLowerCase();
-        const tokenInfo = Object.assign({}, _tokenInfo);
-        // known bug: stETH leaves 1 wei on every transfer
-        if (asset === 'stETH' && tokenInfo.balance.toString() === '1') {
-            tokenInfo.balance = '0';
-        }
-        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 decimal_js_1.default(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString() }),
-        };
-    });
+    // Preserve the legacy getter's stETH transfer-dust convention.
+    const key = addressMapping ? (0, tokens_1.getAssetInfo)('stETH', network).address.toLowerCase() : 'stETH';
+    if (((_a = balances.collateral) === null || _a === void 0 ? void 0 : _a[key]) === '1')
+        balances.collateral[key] = '0';
     return balances;
 });
 exports._getAaveV2AccountBalances = _getAaveV2AccountBalances;

package/cjs/aaveV3/index.js

@@ -17,6 +17,7 @@ exports._getAaveV3MarketData = _getAaveV3MarketData;
 exports.getAaveV3MarketData = getAaveV3MarketData;
 const tokens_1 = require("@defisaver/tokens");
 const decimal_js_1 = __importDefault(require("decimal.js"));
+const aaveBalances_1 = require("../helpers/aaveBalances");
 const contracts_1 = require("../contracts");
 const aaveHelpers_1 = require("../helpers/aaveHelpers");
 const aave_1 = require("../markets/aave");
@@ -345,37 +346,7 @@ exports.EMPTY_AAVE_DATA = {
     exposure: 'N/A',
 };
 const _getAaveV3AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
-    let balances = {
-        collateral: {},
-        debt: {},
-    };
-    if (!address) {
-        return balances;
-    }
-    const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network, block);
-    const market = (0, aave_1.AAVE_V3)(network);
-    const marketAddress = market.providerAddress;
-    // @ts-ignore
-    const protocolDataProviderContract = (0, contracts_1.createViemContractFromConfigFunc)(market.protocolData, market.protocolDataAddress)(provider, network);
-    // @ts-ignore
-    const reserveTokens = yield protocolDataProviderContract.read.getAllReservesTokens((0, viem_1.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)], (0, viem_1.setViemBlockNumber)(block)),
-        loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses.slice(middleAddressIndex, _addresses.length)], (0, viem_1.setViemBlockNumber)(block)),
-    ]);
-    const loanInfo = [...tokenBalances1, ...tokenBalances2];
-    loanInfo.forEach((tokenInfo, i) => {
-        const asset = (0, utils_1.wethToEth)(symbols[i]);
-        const assetAddr = (0, utils_1.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 decimal_js_1.default(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString() }),
-        };
-    });
+    const balances = yield (0, aaveBalances_1.getAaveLikeBalances)(provider, network, block, addressMapping, address, (0, aave_1.AAVE_V3)(network), 'AaveV3View');
     return balances;
 });
 exports._getAaveV3AccountBalances = _getAaveV3AccountBalances;

package/cjs/aaveV4/index.d.ts

@@ -5,6 +5,31 @@ export { getAaveV4MerkleCampaigns } from './merkl';
 export declare function _getAaveV4SpokeData(provider: Client, network: NetworkNumber, market: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function getAaveV4SpokeData(provider: EthereumProvider, network: NetworkNumber, spoke: AaveV4SpokeInfo, blockNumber?: 'latest' | number): Promise<AaveV4SpokeData>;
 export declare function _getAaveV4AccountData(provider: Client, network: NetworkNumber, spokeData: AaveV4SpokeData, address: EthAddress, blockNumber?: 'latest' | number): Promise<AaveV4AccountData>;
+/** Shared raw read; no spoke metadata or market enrichment. */
+export declare const _getAaveV4LoanBalances: (provider: Client, network: NetworkNumber, block: Blockish, address: EthAddress, spoke: EthAddress) => Promise<{
+    user: `0x${string}`;
+    riskPremium: bigint;
+    avgCollateralFactor: bigint;
+    healthFactor: bigint;
+    totalCollateralInUsd: bigint;
+    totalDebtInUsdRay: bigint;
+    activeCollateralCount: bigint;
+    borrowCount: bigint;
+    reserves: readonly {
+        reserveId: bigint;
+        assetId: number;
+        underlying: `0x${string}`;
+        supplied: bigint;
+        drawn: bigint;
+        premium: bigint;
+        totalDebt: bigint;
+        collateralFactor: number;
+        maxLiquidationBonus: number;
+        liquidationFee: number;
+        isUsingAsCollateral: boolean;
+        isBorrowing: boolean;
+    }[];
+}>;
 /**
  * Lightweight existence check for Loan Shifter / UI discovery.
  * Reads only `getLoanData(spoke, user)` and returns whether any reserve has

package/cjs/aaveV4/index.js

@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveV4AccountBalances = exports._getAaveV4AccountBalances = exports._getAaveV4AccountHasAnyBalance = exports.getAaveV4MerkleCampaigns = exports.lend = void 0;
+exports.getAaveV4AccountBalances = exports._getAaveV4AccountBalances = exports._getAaveV4AccountHasAnyBalance = exports._getAaveV4LoanBalances = exports.getAaveV4MerkleCampaigns = exports.lend = void 0;
 exports._getAaveV4SpokeData = _getAaveV4SpokeData;
 exports.getAaveV4SpokeData = getAaveV4SpokeData;
 exports._getAaveV4AccountData = _getAaveV4AccountData;
@@ -296,6 +296,9 @@ function _getAaveV4AccountData(provider_1, network_1, spokeData_1, address_1) {
             riskPremiumBps });
     });
 }
+/** Shared raw read; no spoke metadata or market enrichment. */
+const _getAaveV4LoanBalances = (provider, network, block, address, spoke) => ((0, contracts_1.AaveV4ViewContractViem)(provider, network, block).read.getLoanData([spoke, address], (0, viem_1.setViemBlockNumber)(block)));
+exports._getAaveV4LoanBalances = _getAaveV4LoanBalances;
 /**
  * Lightweight existence check for Loan Shifter / UI discovery.
  * Reads only `getLoanData(spoke, user)` and returns whether any reserve has

package/cjs/compoundV2/index.d.ts

@@ -17,7 +17,7 @@ export declare const EMPTY_COMPOUND_DATA: {
     borrowStableSupplyUnstable: boolean;
     exposure: string;
 };
-export declare const _getCompoundV2AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
+export declare const _getCompoundV2AccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, tokens?: EthAddress[]) => Promise<PositionBalances>;
 export declare const getCompoundV2AccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
 export declare const _getCompoundV2AccountData: (provider: Client, network: NetworkNumber, address: EthAddress, assetsData: CompoundV2AssetsData) => Promise<CompoundV2PositionData>;
 export declare const getCompoundV2AccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, assetsData: CompoundV2AssetsData) => Promise<CompoundV2PositionData>;

package/cjs/compoundV2/index.js

@@ -109,7 +109,7 @@ const getAllMarketAddresses = (provider, network, block) => __awaiter(void 0, vo
     const contract = (0, contracts_1.ComptrollerContractViem)(provider, network);
     return contract.read.getAllMarkets((0, viem_1.setViemBlockNumber)(block));
 });
-const _getCompoundV2AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
+const _getCompoundV2AccountBalances = (provider, network, block, addressMapping, address, tokens) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
         collateral: {},
         debt: {},
@@ -117,7 +117,7 @@ const _getCompoundV2AccountBalances = (provider, network, block, addressMapping,
     if (!address) {
         return balances;
     }
-    const assets = yield getAllMarketAddresses(provider, network, block);
+    const assets = tokens || (yield getAllMarketAddresses(provider, network, block));
     const assetInfo = assets.map(a => (0, tokens_1.getAssetInfoByAddress)(a, network));
     const loanInfoContract = (0, contracts_1.CompoundLoanInfoContractViem)(provider, network, block);
     const loanInfo = yield loanInfoContract.read.getTokenBalances([address, assets], (0, viem_1.setViemBlockNumber)(block));

package/cjs/curveUsd/index.d.ts

@@ -3,7 +3,7 @@ import { CrvUSDGlobalMarketData, CrvUSDMarketData, CrvUSDUserData } from '../typ
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
 export declare const _getCurveUsdGlobalData: (provider: Client, network: NetworkNumber, selectedMarket: CrvUSDMarketData) => Promise<CrvUSDGlobalMarketData>;
 export declare const getCurveUsdGlobalData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: CrvUSDMarketData) => Promise<CrvUSDGlobalMarketData>;
-export declare const _getCrvUsdAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
+export declare const _getCrvUsdAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress, includeDeposited?: boolean) => Promise<PositionBalances>;
 export declare const getCrvUsdAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
 /**
  * @param borrowRate market borrow APY in % (`CrvUSDGlobalMarketData.borrowRate`); when omitted it is read from the view contract

package/cjs/curveUsd/index.js

@@ -107,7 +107,7 @@ const getStatusForUser = (bandRange, activeBand, crvUSDSupplied, collSupplied, h
         return types_1.CrvUSDStatus.SoftLiquidated; // or is fully soft liquidated
     return types_1.CrvUSDStatus.Nonexistant;
 };
-const _getCrvUsdAccountBalances = (provider, network, block, addressMapping, address, controllerAddress) => __awaiter(void 0, void 0, void 0, function* () {
+const _getCrvUsdAccountBalances = (provider_1, network_1, block_1, addressMapping_1, address_1, controllerAddress_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, block_1, addressMapping_1, address_1, controllerAddress_1, ...args_1], void 0, function* (provider, network, block, addressMapping, address, controllerAddress, includeDeposited = false) {
     let balances = {
         collateral: {},
         debt: {},
@@ -126,6 +126,11 @@ const _getCrvUsdAccountBalances = (provider, network, block, addressMapping, add
             [addressMapping ? (0, tokens_1.getAssetInfo)((0, utils_1.wethToEth)(selectedMarket.baseAsset), network).address.toLowerCase() : (0, utils_1.wethToEth)(selectedMarket.baseAsset)]: data.debtAmount.toString(),
         },
     };
+    if (includeDeposited) {
+        balances.deposited = {
+            [addressMapping ? (0, tokens_1.getAssetInfo)((0, utils_1.wethToEth)(selectedMarket.baseAsset), network).address.toLowerCase() : (0, utils_1.wethToEth)(selectedMarket.baseAsset)]: data.curveUsdCollateralAmount.toString(),
+        };
+    }
     return balances;
 });
 exports._getCrvUsdAccountBalances = _getCrvUsdAccountBalances;

package/cjs/fluid/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllFluidMarketDataPortfolio = exports._getAllFluidMarketDataPortfolio = exports._getUserPositionsPortfolio = exports.getUserPositions = exports._getUserPositions = exports.getAllUserEarnPositionsWithFTokens = exports._getAllUserEarnPositionsWithFTokens = exports.getFluidDepositData = exports._getFluidDepositData = exports.getFluidTokenData = exports._getFluidTokenData = exports.getAllFluidMarketDataChunked = exports._getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports._getFluidPositionWithMarket = exports.getFluidPosition = exports._getFluidPosition = exports.getFluidVaultIdsForUser = exports._getFluidVaultIdsForUser = exports.getFluidMarketData = exports._getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = exports.attachFluidMerklIncentives = exports.getFluidMerklCampaigns = exports.buildFluidMerklRewardMap = exports.FluidMerklOpportunityType = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
+const fluidBalances_1 = require("../helpers/fluidBalances");
 const common_1 = require("../types/common");
 const types_1 = require("../types");
 const contracts_1 = require("../contracts");
@@ -935,8 +936,8 @@ const parseT1UserData = (userPositionData, vaultData) => {
     const collAsset = (0, tokens_1.getAssetInfo)(marketData.collAsset0);
     const debtAsset = (0, tokens_1.getAssetInfo)(marketData.debtAsset0);
     // for T2 and T4 - this is the number of shares
-    const supplied = (0, utils_1.getEthAmountForDecimals)(userPositionData.supply.toString(), collAsset.decimals);
-    const borrowed = (0, utils_1.getEthAmountForDecimals)(userPositionData.borrow.toString(), debtAsset.decimals);
+    const supplied = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.supply, collAsset.decimals);
+    const borrowed = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.borrow, debtAsset.decimals);
     const collUsedAsset = Object.assign(Object.assign({}, exports.EMPTY_USED_ASSET), { symbol: collAsset.symbol, collateral: true, supplied, suppliedUsd: new decimal_js_1.default(supplied).mul(assetsData[collAsset.symbol].price).toString(), isSupplied: new decimal_js_1.default(supplied).gt(0) });
     const debtUsedAsset = Object.assign(Object.assign({}, exports.EMPTY_USED_ASSET), { symbol: debtAsset.symbol, collateral: false, borrowed, borrowedUsd: new decimal_js_1.default(borrowed).mul(assetsData[debtAsset.symbol].price).toString(), isBorrowed: new decimal_js_1.default(borrowed).gt(0) });
     const usedAssets = {
@@ -956,9 +957,9 @@ const parseT2UserData = (userPositionData, vaultData) => {
     const collAsset1 = (0, tokens_1.getAssetInfo)(marketData.collAsset1);
     const debtAsset = (0, tokens_1.getAssetInfo)(marketData.debtAsset0);
     const supplyShares = (0, utils_1.getEthAmountForDecimals)(userPositionData.supply.toString(), 18); // this is supplied in coll shares
-    const borrowed = (0, utils_1.getEthAmountForDecimals)(userPositionData.borrow.toString(), debtAsset.decimals); // this is actual token borrow
-    const supplied0 = new decimal_js_1.default(supplyShares).mul(assetsData[collAsset0.symbol].tokenPerSupplyShare).toString();
-    const supplied1 = new decimal_js_1.default(supplyShares).mul(assetsData[collAsset1.symbol].tokenPerSupplyShare).toString();
+    const borrowed = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.borrow, debtAsset.decimals); // this is actual token borrow
+    const supplied0 = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.supply, collAsset0.decimals, assetsData[collAsset0.symbol].tokenPerSupplyShare);
+    const supplied1 = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.supply, collAsset1.decimals, assetsData[collAsset1.symbol].tokenPerSupplyShare);
     const collUsedAsset0 = {
         symbol: collAsset0.symbol,
         collateral: true,
@@ -1001,10 +1002,10 @@ const parseT3UserData = (userPositionData, vaultData) => {
     const collAsset = (0, tokens_1.getAssetInfo)(marketData.collAsset0);
     const debtAsset0 = (0, tokens_1.getAssetInfo)(marketData.debtAsset0);
     const debtAsset1 = (0, tokens_1.getAssetInfo)(marketData.debtAsset1);
-    const supplied = (0, utils_1.getEthAmountForDecimals)(userPositionData.supply.toString(), collAsset.decimals); // this is actual token supply
+    const supplied = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.supply, collAsset.decimals); // this is actual token supply
     const borrowShares = (0, utils_1.getEthAmountForDecimals)(userPositionData.borrow.toString(), 18); // this is actual token borrow
-    const borrowed0 = new decimal_js_1.default(borrowShares).mul(assetsData[debtAsset0.symbol].tokenPerBorrowShare).toString();
-    const borrowed1 = new decimal_js_1.default(borrowShares).mul(assetsData[debtAsset1.symbol].tokenPerBorrowShare).toString();
+    const borrowed0 = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.borrow, debtAsset0.decimals, assetsData[debtAsset0.symbol].tokenPerBorrowShare);
+    const borrowed1 = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.borrow, debtAsset1.decimals, assetsData[debtAsset1.symbol].tokenPerBorrowShare);
     const collUsedAsset = {
         symbol: collAsset.symbol,
         collateral: true,
@@ -1049,10 +1050,10 @@ const parseT4UserData = (userPositionData, vaultData) => {
     const debtAsset1 = (0, tokens_1.getAssetInfo)(marketData.debtAsset1);
     const supplyShares = (0, utils_1.getEthAmountForDecimals)(userPositionData.supply.toString(), 18); // this is actual token supply
     const borrowShares = (0, utils_1.getEthAmountForDecimals)(userPositionData.borrow.toString(), 18); // this is actual token borrow
-    const supplied0 = new decimal_js_1.default(supplyShares).mul(assetsData[collAsset0.symbol].tokenPerSupplyShare).toString();
-    const supplied1 = new decimal_js_1.default(supplyShares).mul(assetsData[collAsset1.symbol].tokenPerSupplyShare).toString();
-    const borrowed0 = new decimal_js_1.default(borrowShares).mul(assetsData[debtAsset0.symbol].tokenPerBorrowShare).toString();
-    const borrowed1 = new decimal_js_1.default(borrowShares).mul(assetsData[debtAsset1.symbol].tokenPerBorrowShare).toString();
+    const supplied0 = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.supply, collAsset0.decimals, assetsData[collAsset0.symbol].tokenPerSupplyShare);
+    const supplied1 = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.supply, collAsset1.decimals, assetsData[collAsset1.symbol].tokenPerSupplyShare);
+    const borrowed0 = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.borrow, debtAsset0.decimals, assetsData[debtAsset0.symbol].tokenPerBorrowShare);
+    const borrowed1 = (0, fluidBalances_1.fluidTokenAmount)(userPositionData.borrow, debtAsset1.decimals, assetsData[debtAsset1.symbol].tokenPerBorrowShare);
     const collUsedAsset0 = {
         symbol: collAsset0.symbol,
         collateral: true,

package/cjs/helpers/aaveBalances.d.ts

@@ -0,0 +1,5 @@
+import { Client } from 'viem';
+import { AaveMarketInfo, SparkMarketData } from '../types';
+import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
+/** Raw token balances shared by Aave/Spark getters and lending previews. */
+export declare 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>;

package/cjs/helpers/aaveBalances.js

@@ -0,0 +1,51 @@
+"use strict";
+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());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAaveLikeBalances = getAaveLikeBalances;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
+const contracts_1 = require("../contracts");
+const viem_1 = require("../services/viem");
+const utils_1 = require("../services/utils");
+/** Raw token balances shared by Aave/Spark getters and lending previews. */
+function getAaveLikeBalances(client, network, block, addressMapping, address, market, view, tokens) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const balances = { collateral: {}, debt: {} };
+        if (!address)
+            return balances;
+        let reserves;
+        if (tokens)
+            reserves = tokens.map(tokenAddress => ({ tokenAddress, symbol: (0, tokens_1.getAssetInfoByAddress)(tokenAddress, network).symbol }));
+        else {
+            if (!market.protocolData)
+                throw new Error('Missing protocol data provider');
+            reserves = [...yield (0, contracts_1.createViemContractFromConfigFunc)(market.protocolData, market.protocolDataAddress)(client, network)
+                    .read.getAllReservesTokens((0, viem_1.setViemBlockNumber)(block))];
+        }
+        const addresses = reserves.map(token => token.tokenAddress);
+        const contract = (0, contracts_1.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 = (yield Promise.all((tokens ? parts.filter(part => part.length) : parts)
+            .map(part => contract.read.getTokenBalances([market.providerAddress, address, part], (0, viem_1.setViemBlockNumber)(block))))).flat();
+        data.forEach((token, i) => {
+            // The views leave token.token unset; input order identifies the reserve.
+            const key = addressMapping ? (0, utils_1.wethToEthByAddress)(reserves[i].tokenAddress, network).toLowerCase() : (0, utils_1.wethToEth)(reserves[i].symbol);
+            balances.collateral[key] = token.balance.toString();
+            balances.debt[key] = new decimal_js_1.default(token.borrowsStable.toString()).add(token.borrowsVariable.toString()).toString();
+        });
+        return balances;
+    });
+}

package/cjs/helpers/fluidBalances.d.ts

@@ -0,0 +1,6 @@
+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 declare const fluidTokenAmount: (amount: bigint, decimals: number, perShare?: string) => string;
+/** The same token/share conversion used by the full Fluid user parsers, without prices or yield. */
+export declare function parseFluidBalances(position: FluidUserPositionStructOutputStruct, vault: FluidVaultDataStructOutputStruct, network: NetworkNumber): PositionBalances;

package/cjs/helpers/fluidBalances.js

@@ -0,0 +1,36 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fluidTokenAmount = void 0;
+exports.parseFluidBalances = parseFluidBalances;
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
+/** Convert raw tokens, or raw 18-decimal shares with a human-readable token/share ratio. */
+const fluidTokenAmount = (amount, decimals, perShare) => (new decimal_js_1.default(amount.toString()).div(new decimal_js_1.default(10).pow(perShare === undefined ? decimals : 18)).mul(perShare !== null && perShare !== void 0 ? perShare : 1).toString());
+exports.fluidTokenAmount = fluidTokenAmount;
+/** The same token/share conversion used by the full Fluid user parsers, without prices or yield. */
+function parseFluidBalances(position, vault, network) {
+    const type = Number(vault.vaultType);
+    if (![10000, 20000, 30000, 40000].includes(type))
+        throw new Error('Unsupported Fluid vault');
+    const side = (amount, tokens, ratios) => {
+        const balances = {};
+        tokens.forEach((address, i) => {
+            const token = (0, tokens_1.getAssetInfoByAddress)(address, network);
+            if (!Number.isFinite(token.decimals) || !token.symbol)
+                throw new Error('Fluid token metadata unavailable');
+            const perShare = ratios ? (0, exports.fluidTokenAmount)(ratios[i], token.decimals) : undefined;
+            const value = (0, exports.fluidTokenAmount)(amount, token.decimals, perShare);
+            balances[token.symbol] = new decimal_js_1.default(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/cjs/liquityV2/index.d.ts

@@ -11,6 +11,14 @@ export type SPYieldGainParameters = {
 };
 export declare const _getLiquityV2MarketData: (provider: Client, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo) => Promise<LiquityV2MarketData>;
 export declare const getLiquityV2MarketData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo) => Promise<LiquityV2MarketData>;
+export declare const nftContractCreationBlockMapping: {
+    liquityv2eth: number;
+    liquityv2wsteth: number;
+    liquityv2reth: number;
+    liquityv2ethlegacy: number;
+    liquityv2wstethlegacy: number;
+    liquityv2rethlegacy: number;
+};
 export declare const _getLiquityV2UserTroveIds: (provider: PublicClient, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, account: EthAddress) => Promise<{
     troves: {
         troveId: string;

package/cjs/liquityV2/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLiquitySAndYBold = exports.getLiquityV2Staking = exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports._getLiquityV2TroveData = exports.getDebtInFrontForInterestRateLiquityV2 = exports.getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = exports.calculateDebtInFrontLiquityV2 = exports.getLiquityV2UserTroveIds = exports._getLiquityV2UserTroveIds = exports.getLiquityV2MarketData = exports._getLiquityV2MarketData = void 0;
+exports.getLiquitySAndYBold = exports.getLiquityV2Staking = exports.getLiquityV2ClaimableCollateral = exports.getLiquityV2TroveData = exports._getLiquityV2TroveData = exports.getDebtInFrontForInterestRateLiquityV2 = exports.getDebtInFrontForInterestRateIncludingNewDebtLiquityV2 = exports.calculateDebtInFrontLiquityV2 = exports.getLiquityV2UserTroveIds = exports._getLiquityV2UserTroveIds = exports.nftContractCreationBlockMapping = exports.getLiquityV2MarketData = exports._getLiquityV2MarketData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const contracts_1 = require("../contracts");
@@ -120,7 +120,7 @@ const getUserTroves = (provider_1, network_1, isLegacy_1, account_1, marketAddre
         return { troves: existingTroves.filter((trove) => trove.ownedByUser), nextFreeTroveIndex };
     return getUserTroves(provider, network, isLegacy, account, marketAddress, newStartIndex, newStartIndex + 100, existingTroves);
 });
-const nftContractCreationBlockMapping = {
+exports.nftContractCreationBlockMapping = {
     [types_1.LiquityV2Versions.LiquityV2Eth]: 22516079,
     [types_1.LiquityV2Versions.LiquityV2WstEth]: 22516099,
     [types_1.LiquityV2Versions.LiquityV2REth]: 22516118,
@@ -131,7 +131,7 @@ const nftContractCreationBlockMapping = {
 };
 const getTransferredTroves = (provider, network, troveNFTAddress, limitBlocksForEventFetching, market, account) => __awaiter(void 0, void 0, void 0, function* () {
     const nftContract = (0, contracts_1.createViemContractFromConfigFunc)('LiquityV2TroveNFT', troveNFTAddress)(provider, network);
-    const nftContractCreationBlock = nftContractCreationBlockMapping[market];
+    const nftContractCreationBlock = exports.nftContractCreationBlockMapping[market];
     const currentBlock = +(yield provider.getBlockNumber()).toString();
     const _events = yield nftContract.getEvents.Transfer({}, { fromBlock: limitBlocksForEventFetching ? BigInt(currentBlock - 1000) : BigInt(nftContractCreationBlock) });
     const events = _events.map((event) => ({

package/cjs/llamaLend/index.d.ts

@@ -3,7 +3,7 @@ import { LlamaLendGlobalMarketData, LlamaLendMarketData, LlamaLendUserData } fro
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
 export declare const _getLlamaLendGlobalData: (provider: Client, network: NetworkNumber, selectedMarket: LlamaLendMarketData) => Promise<LlamaLendGlobalMarketData>;
 export declare const getLlamaLendGlobalData: (provider: EthereumProvider, network: NetworkNumber, selectedMarket: LlamaLendMarketData) => Promise<LlamaLendGlobalMarketData>;
-export declare const _getLlamaLendAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
+export declare const _getLlamaLendAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress, includeDeposited?: boolean) => Promise<PositionBalances>;
 export declare const getLlamaLendAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
 export declare const _getLlamaLendUserData: (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: LlamaLendMarketData, marketData: LlamaLendGlobalMarketData) => Promise<LlamaLendUserData>;
 export declare const getLlamaLendUserData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: LlamaLendMarketData, marketData: LlamaLendGlobalMarketData) => Promise<LlamaLendUserData>;

package/cjs/llamaLend/index.js

@@ -161,7 +161,7 @@ const getStatusForUser = (bandRange, activeBand, debtSupplied, collSupplied, hea
         return types_1.LlamaLendStatus.SoftLiquidated; // or is fully soft liquidated
     return types_1.LlamaLendStatus.Nonexistant;
 };
-const _getLlamaLendAccountBalances = (provider, network, block, addressMapping, address, controllerAddress) => __awaiter(void 0, void 0, void 0, function* () {
+const _getLlamaLendAccountBalances = (provider_1, network_1, block_1, addressMapping_1, address_1, controllerAddress_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, block_1, addressMapping_1, address_1, controllerAddress_1, ...args_1], void 0, function* (provider, network, block, addressMapping, address, controllerAddress, includeDeposited = false) {
     let balances = {
         collateral: {},
         debt: {},
@@ -180,6 +180,11 @@ const _getLlamaLendAccountBalances = (provider, network, block, addressMapping,
             [addressMapping ? (0, tokens_1.getAssetInfo)((0, utils_1.wethToEth)(selectedMarket.baseAsset), network).address.toLowerCase() : (0, utils_1.wethToEth)(selectedMarket.baseAsset)]: data.debtAmount.toString(),
         },
     };
+    if (includeDeposited) {
+        balances.deposited = {
+            [addressMapping ? (0, tokens_1.getAssetInfo)((0, utils_1.wethToEth)(selectedMarket.baseAsset), network).address.toLowerCase() : (0, utils_1.wethToEth)(selectedMarket.baseAsset)]: data.debtTokenCollateralAmount.toString(),
+        };
+    }
     return balances;
 });
 exports._getLlamaLendAccountBalances = _getLlamaLendAccountBalances;

package/cjs/morphoMidnight/index.d.ts

@@ -5,7 +5,7 @@ export declare function _getMorphoMidnightMarketData(provider: Client, network:
 export declare function getMorphoMidnightMarketData(provider: EthereumProvider, network: NetworkNumber, selectedMarket: MorphoMidnightMarketData): Promise<MorphoMidnightMarketInfo>;
 export declare function _getMorphoMidnightAccountData(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<MorphoMidnightPositionData>;
 export declare function getMorphoMidnightAccountData(provider: EthereumProvider, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<MorphoMidnightPositionData>;
-export declare const _getMorphoMidnightAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData) => Promise<PositionBalances>;
+export declare const _getMorphoMidnightAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData, includeCredit?: boolean) => Promise<PositionBalances>;
 export declare const getMorphoMidnightAccountBalances: (provider: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, selectedMarket: MorphoMidnightMarketData) => Promise<PositionBalances>;
 export declare function getMorphoMidnightEarn(provider: Client, network: NetworkNumber, account: EthAddress, selectedMarket: MorphoMidnightMarketData, marketInfo: MorphoMidnightMarketInfo): Promise<{
     apy: string;

package/cjs/morphoMidnight/index.js

@@ -221,7 +221,7 @@ function getMorphoMidnightAccountData(provider, network, account, selectedMarket
         return _getMorphoMidnightAccountData((0, viem_1.getViemProvider)(provider, network), network, account, selectedMarket, marketInfo);
     });
 }
-const _getMorphoMidnightAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+const _getMorphoMidnightAccountBalances = (provider_1, network_1, block_1, addressMapping_1, address_1, selectedMarket_1, ...args_1) => __awaiter(void 0, [provider_1, network_1, block_1, addressMapping_1, address_1, selectedMarket_1, ...args_1], void 0, function* (provider, network, block, addressMapping, address, selectedMarket, includeCredit = false) {
     const balances = { collateral: {}, debt: {} };
     if (!address)
         return balances;
@@ -241,6 +241,11 @@ const _getMorphoMidnightAccountBalances = (provider, network, block, addressMapp
         collateral[addressMapping ? collInfo.address.toLowerCase() : (0, utils_1.wethToEth)(collInfo.symbol)] = (0, tokens_1.assetAmountInEth)(rawAmount, (0, utils_1.wethToEth)(collInfo.symbol));
     });
     balances.collateral = collateral;
+    if (includeCredit) {
+        balances.deposited = {
+            [addressMapping ? loanTokenInfo.address.toLowerCase() : (0, utils_1.wethToEth)(loanTokenInfo.symbol)]: (0, tokens_1.assetAmountInEth)(positionInfo.credit.toString(), (0, utils_1.wethToEth)(loanTokenInfo.symbol)),
+        };
+    }
     return balances;
 });
 exports._getMorphoMidnightAccountBalances = _getMorphoMidnightAccountBalances;

package/cjs/portfolio/index.d.ts

@@ -11,3 +11,4 @@ export declare function getShifterPortfolioData(provider: EthereumProvider, netw
     markets: PortfolioMarketsData;
 }>;
 export * from './discovery';
+export { getWalletLendingSummaries } from './lendingSummaries';

package/cjs/portfolio/index.js

@@ -26,6 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWalletLendingSummaries = void 0;
 exports.getPortfolioData = getPortfolioData;
 exports.getShifterPortfolioData = getShifterPortfolioData;
 const decimal_js_1 = __importDefault(require("decimal.js"));
@@ -886,3 +887,5 @@ function getShifterPortfolioData(provider_1, network_1, defaultProvider_1, addre
     });
 }
 __exportStar(require("./discovery"), exports);
+var lendingSummaries_1 = require("./lendingSummaries");
+Object.defineProperty(exports, "getWalletLendingSummaries", { enumerable: true, get: function () { return lendingSummaries_1.getWalletLendingSummaries; } });

package/cjs/portfolio/lendingSummaries.d.ts

@@ -0,0 +1,7 @@
+import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
+import { LendingSummaryOptions, WalletLendingSummaries } from '../types/lendingSummary';
+/** Lending-only balances at one snapshot, valued with caller-supplied market prices.
+ * One shared client/limiter covers every wallet. Failed reads remain partial; cancellation
+ * discards results. Morpho Blue earn deposits, rewards and savings are excluded.
+ */
+export declare function getWalletLendingSummaries(provider: EthereumProvider, network: NetworkNumber, walletAddresses: EthAddress[], options: LendingSummaryOptions): Promise<WalletLendingSummaries>;