@defisaver/positions-sdk 2.1.167 → 2.1.168

package/cjs/portfolio/lendingSummaries.js

@@ -0,0 +1,262 @@
+"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.getWalletLendingSummaries = getWalletLendingSummaries;
+/* global BigInt */
+const decimal_js_1 = __importDefault(require("decimal.js"));
+const tokens_1 = require("@defisaver/tokens");
+const viem_1 = require("viem");
+const markets_1 = require("../markets");
+const types_1 = require("../types");
+const common_1 = require("../types/common");
+const contracts_1 = require("../contracts");
+const viem_2 = require("../services/viem");
+const utils_1 = require("../services/utils");
+const aaveBalances_1 = require("../helpers/aaveBalances");
+const fluidBalances_1 = require("../helpers/fluidBalances");
+const aaveV4_1 = require("../aaveV4");
+const compoundV2_1 = require("../compoundV2");
+const compoundV3_1 = require("../compoundV3");
+const curveUsd_1 = require("../curveUsd");
+const llamaLend_1 = require("../llamaLend");
+const morphoBlue_1 = require("../morphoBlue");
+const morphoMidnight_1 = require("../morphoMidnight");
+const liquity_1 = require("../liquity");
+const maker_1 = require("../maker");
+const liquityV2_1 = require("../liquityV2");
+const lendingSummaryTransport_1 = require("./lendingSummaryTransport");
+const nftAbi = (0, viem_1.parseAbi)([
+    'function troveNFT() view returns (address)', 'function balanceOf(address) view returns (uint256)',
+    'function ownerOf(uint256) view returns (address)',
+]);
+const transfer = (0, viem_1.parseAbiItem)('event Transfer(address indexed from, address indexed to, uint256 indexed tokenId)');
+const units = (value, decimals = 18) => new decimal_js_1.default(String(value)).div(new decimal_js_1.default(10).pow(decimals)).toString();
+const positive = (value) => new decimal_js_1.default(String(value)).gt(0);
+const supported = (list, network) => Object.values(list).filter(m => m.chainIds.includes(network));
+/** 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.
+ */
+function getWalletLendingSummaries(provider, network, walletAddresses, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e;
+        const addresses = [...new Set(walletAddresses.map(address => {
+                if (!/^0x[0-9a-f]{40}$/i.test(address))
+                    throw new Error('Invalid wallet address');
+                return address.toLowerCase();
+            }))];
+        const summaries = Object.fromEntries(addresses.map(address => [address, {
+                status: 'complete', positions: [], protocols: [], suppliedUsd: '0', valuationComplete: true, errors: [],
+            }]));
+        if (!addresses.length || ((_a = options.signal) === null || _a === void 0 ? void 0 : _a.aborted))
+            return { summaries: {}, rateLimited: false };
+        const maxCalldataBytes = options.isSim ? 2000 : 32000;
+        const transport = (0, lendingSummaryTransport_1.lendingSummaryTransport)(provider, options.signal, options.blockNumber, maxCalldataBytes);
+        const client = (0, viem_2.getViemProvider)(transport.provider, network, {
+            transport: (0, viem_1.custom)(transport.provider, { retryCount: 0 }), batch: { multicall: { batchSize: maxCalldataBytes } },
+        });
+        let snapshot;
+        try {
+            snapshot = (_b = options.blockNumber) !== null && _b !== void 0 ? _b : yield client.getBlockNumber();
+            transport.pinBlock(snapshot);
+        }
+        catch (error) {
+            if ((_c = options.signal) === null || _c === void 0 ? void 0 : _c.aborted)
+                return { summaries: {}, rateLimited: transport.isRateLimited() };
+            for (const summary of Object.values(summaries)) {
+                summary.status = 'failed';
+                summary.errors.push(String(error));
+            }
+            return { summaries, rateLimited: transport.isRateLimited() };
+        }
+        const block = Number(snapshot);
+        // Dynamic ABI boundary for user-scoped CDP/NFT reads; money markets use their existing readers.
+        const read = (name, functionName, args = []) => client.readContract({
+            address: (0, contracts_1.getConfigContractAddress)(name, network, block), abi: (0, contracts_1.getConfigContractAbi)(name, network, block), functionName, args,
+        });
+        const nftRead = (address, functionName, args = []) => client.readContract({
+            address, abi: nftAbi, functionName, args,
+        });
+        const cache = new Map();
+        const shared = (key, fetch) => {
+            if (!cache.has(key))
+                cache.set(key, fetch());
+            return cache.get(key);
+        };
+        const tasks = [];
+        const tokens = new Set();
+        const valuations = [];
+        let prices = {};
+        const run = (address, protocol, key, work) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            try {
+                if (!((_a = options.signal) === null || _a === void 0 ? void 0 : _a.aborted))
+                    yield work();
+            }
+            catch (error) {
+                summaries[address].errors.push(`${protocol}:${key}: ${String(error).split('\n')[0]}`);
+            }
+        });
+        const add = (address_1, protocol_1, key_1, balances_1, ...args_1) => __awaiter(this, [address_1, protocol_1, key_1, balances_1, ...args_1], void 0, function* (address, protocol, key, balances, human = false) {
+            const supply = Object.entries(balances.collateral || {}).concat(Object.entries(balances.deposited || {}));
+            const debt = Object.entries(balances.debt || {});
+            if (![...supply, ...debt].some(([, amount]) => positive(amount)))
+                return;
+            const entry = {
+                id: `${protocol}:${key}`,
+                protocol,
+                suppliedUsd: (supply.some(([, amount]) => positive(amount)) ? null : '0'),
+                debtUsd: (debt.some(([, amount]) => positive(amount)) ? null : '0'),
+            };
+            summaries[address].positions.push(entry);
+            const normalize = (amounts) => {
+                const result = {};
+                amounts.filter(([, amount]) => positive(amount)).forEach(([symbol, amount]) => {
+                    const token = symbol.startsWith('0x') ? (0, tokens_1.getAssetInfoByAddress)(symbol, network) : (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(symbol), network);
+                    if (!token.address || !Number.isFinite(token.decimals))
+                        throw new Error(`Token metadata unavailable: ${symbol}`);
+                    const id = token.address.toLowerCase();
+                    tokens.add(id);
+                    result[id] = (result[id] || new decimal_js_1.default(0)).add(human ? amount : units(amount, token.decimals));
+                });
+                return result;
+            };
+            const amounts = [normalize(supply), normalize(debt)];
+            valuations.push(() => {
+                ['suppliedUsd', 'debtUsd'].forEach((field, i) => {
+                    try {
+                        entry[field] = Object.entries(amounts[i]).reduce((total, [token, amount]) => {
+                            const price = new decimal_js_1.default(prices[token] || 0);
+                            if (!price.isFinite() || !price.gt(0))
+                                throw new Error(`Price unavailable: ${token}`);
+                            return total.add(amount.mul(price));
+                        }, new decimal_js_1.default(0)).toString();
+                    }
+                    catch (error) {
+                        summaries[address].errors.push(`${entry.id}: ${String(error)}`);
+                    }
+                });
+            });
+        });
+        const balanceTask = (address, protocol, key, fetch, human = false) => tasks.push(run(address, protocol, key, () => __awaiter(this, void 0, void 0, function* () { return add(address, protocol, key, yield fetch(), human); })));
+        for (const address of addresses) {
+            const aaveMarkets = supported((0, markets_1.AaveMarkets)(network), network).filter(m => [types_1.AaveVersions.AaveV2, types_1.AaveVersions.AaveV3, types_1.AaveVersions.AaveV3Lido, types_1.AaveVersions.AaveV3Etherfi].includes(m.value));
+            for (const market of [...aaveMarkets, ...supported((0, markets_1.SparkMarkets)(network), network)]) {
+                const v2 = market.value === types_1.AaveVersions.AaveV2;
+                const spark = !aaveMarkets.some(m => m.value === market.value);
+                balanceTask(address, spark ? 'spark' : v2 ? 'aaveV2' : 'aaveV3', market.value, () => (0, aaveBalances_1.getAaveLikeBalances)(client, network, block, false, address, market, spark ? 'SparkView' : v2 ? 'AaveLoanInfoV2' : 'AaveV3View', market.assets.map(asset => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(asset), network).address)));
+            }
+            for (const spoke of supported((0, markets_1.AaveV4Spokes)(network), network)) {
+                balanceTask(address, 'aaveV4', spoke.value, () => __awaiter(this, void 0, void 0, function* () {
+                    const { reserves } = yield (0, aaveV4_1._getAaveV4LoanBalances)(client, network, block, address, spoke.address);
+                    const balances = { collateral: {}, debt: {} };
+                    reserves.forEach(r => {
+                        balances.collateral[r.underlying] = new decimal_js_1.default(balances.collateral[r.underlying] || 0).add(r.supplied.toString()).toString();
+                        balances.debt[r.underlying] = new decimal_js_1.default(balances.debt[r.underlying] || 0).add(r.totalDebt.toString()).toString();
+                    });
+                    return balances;
+                }));
+            }
+            for (const market of supported((0, markets_1.CompoundMarkets)(network), network)) {
+                const v2 = market.value === types_1.CompoundVersions.CompoundV2;
+                balanceTask(address, v2 ? 'compoundV2' : 'compoundV3', market.value, () => (v2
+                    ? (0, compoundV2_1._getCompoundV2AccountBalances)(client, network, block, false, address, markets_1.compoundV2CollateralAssets.map(a => a.address))
+                    : (0, compoundV3_1._getCompoundV3AccountBalances)(client, network, block, false, address, market.baseMarketAddress)));
+            }
+            for (const market of supported((0, markets_1.MorphoBlueMarkets)(network), network))
+                balanceTask(address, 'morphoBlue', market.value, () => (0, morphoBlue_1._getMorphoBlueAccountBalances)(client, network, block, false, address, market), true);
+            for (const market of supported((0, markets_1.MorphoMidnightMarkets)(network), network))
+                balanceTask(address, 'morphoMidnight', market.value, () => (0, morphoMidnight_1._getMorphoMidnightAccountBalances)(client, network, block, false, address, market, true), true);
+            if (network === common_1.NetworkNumber.Eth)
+                for (const market of supported((0, markets_1.CrvUsdMarkets)(network), network))
+                    balanceTask(address, 'crvUsd', market.value, () => (0, curveUsd_1._getCrvUsdAccountBalances)(client, network, block, false, address, market.controllerAddress, true));
+            if ([common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb].includes(network))
+                for (const market of supported((0, markets_1.LlamaLendMarkets)(network), network))
+                    balanceTask(address, 'llamaLend', market.value, () => (0, llamaLend_1._getLlamaLendAccountBalances)(client, network, block, false, address, market.controllerAddress, true));
+            if (network === common_1.NetworkNumber.Eth) {
+                balanceTask(address, 'liquity', 'trove', () => (0, liquity_1._getLiquityAccountBalances)(client, network, block, false, address));
+                tasks.push(run(address, 'maker', 'discovery', () => __awaiter(this, void 0, void 0, function* () {
+                    const cdps = yield (0, maker_1._getUserCdps)(client, network, address);
+                    yield Promise.all(cdps.map(cdp => run(address, 'maker', String(cdp.id), () => __awaiter(this, void 0, void 0, function* () {
+                        const [collateral, debt] = yield read('McdVat', 'urns', [cdp.ilk, cdp.urn]);
+                        const rate = positive(debt) ? (yield shared(`maker:${cdp.ilk}`, () => read('McdVat', 'ilks', [cdp.ilk])))[1] : 0;
+                        yield add(address, 'maker', String(cdp.id), { collateral: { [cdp.asset]: units(collateral) }, debt: { DAI: new decimal_js_1.default(units(debt)).mul(units(rate, 27)).toString() } }, true);
+                    }))));
+                })));
+                for (const market of supported((0, markets_1.LiquityV2Markets)(network), network)) {
+                    tasks.push(run(address, 'liquityV2', market.value, () => __awaiter(this, void 0, void 0, function* () {
+                        const nft = yield shared(`nft:${market.value}`, () => nftRead(market.marketAddress, 'troveNFT'));
+                        const count = yield nftRead(nft, 'balanceOf', [address]);
+                        if (count === BigInt(0))
+                            return;
+                        const logs = yield client.getLogs({
+                            address: nft, event: transfer, args: { to: address }, fromBlock: BigInt(liquityV2_1.nftContractCreationBlockMapping[market.value]), toBlock: snapshot,
+                        });
+                        const owned = (yield Promise.all([...new Set(logs.map(log => log.args.tokenId))].map((id) => __awaiter(this, void 0, void 0, function* () {
+                            try {
+                                return (yield nftRead(nft, 'ownerOf', [id])).toLowerCase() === address ? id : null;
+                            }
+                            catch (_a) {
+                                return null;
+                            }
+                        })))).filter((id) => id !== null);
+                        if (BigInt(owned.length) !== count)
+                            summaries[address].errors.push(`liquityV2:${market.value}: Not all owned troves could be discovered`);
+                        yield Promise.all(owned.map(id => run(address, 'liquityV2', `${market.value}:${id}`, () => __awaiter(this, void 0, void 0, function* () {
+                            const data = yield read(market.isLegacy ? 'LiquityV2LegacyView' : 'LiquityV2View', 'getTroveInfo', [market.marketAddress, id]);
+                            if (data.owner.toLowerCase() !== address)
+                                throw new Error('Trove ownership changed');
+                            yield add(address, 'liquityV2', `${market.value}:${id}`, { collateral: { [market.collateralToken]: data.collAmount.toString() }, debt: { [market.debtToken]: data.debtAmount.toString() } });
+                        }))));
+                    })));
+                }
+            }
+            if ([common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Base, common_1.NetworkNumber.Plasma].includes(network)) {
+                tasks.push(run(address, 'fluid', 'discovery', () => __awaiter(this, void 0, void 0, function* () {
+                    const [positions, vaults] = yield read('FluidView', 'getUserPositions', [address]);
+                    yield Promise.all(positions.map((p, i) => run(address, 'fluid', String(p.nftId), () => __awaiter(this, void 0, void 0, function* () {
+                        if (positive(p.supply) || positive(p.borrow))
+                            yield add(address, 'fluid', String(p.nftId), (0, fluidBalances_1.parseFluidBalances)(p, vaults[i], network), true);
+                    }))));
+                })));
+            }
+        }
+        yield Promise.all(tasks);
+        if ((_d = options.signal) === null || _d === void 0 ? void 0 : _d.aborted)
+            return { summaries: {}, rateLimited: transport.isRateLimited() };
+        if (tokens.size) {
+            try {
+                prices = yield options.resolvePrices(network, [...tokens], options.signal);
+            }
+            catch (error) {
+                for (const summary of Object.values(summaries))
+                    if (summary.positions.length)
+                        summary.errors.push(`Prices: ${String(error)}`);
+            }
+        }
+        if ((_e = options.signal) === null || _e === void 0 ? void 0 : _e.aborted)
+            return { summaries: {}, rateLimited: transport.isRateLimited() };
+        valuations.forEach(value => value());
+        for (const summary of Object.values(summaries)) {
+            summary.positions.sort((a, b) => a.id.localeCompare(b.id));
+            summary.protocols = [...new Set(summary.positions.map(p => p.protocol))];
+            summary.suppliedUsd = summary.positions.reduce((total, p) => total.add(p.suppliedUsd || 0), new decimal_js_1.default(0)).toString();
+            summary.valuationComplete = summary.positions.every(p => p.suppliedUsd !== null && p.debtUsd !== null);
+            summary.errors = [...new Set(summary.errors)];
+            if (summary.errors.length)
+                summary.status = 'partial';
+        }
+        return { summaries, rateLimited: transport.isRateLimited() };
+    });
+}

package/cjs/portfolio/lendingSummaryTransport.d.ts

@@ -0,0 +1,8 @@
+import { EthereumProvider } from '../types/common';
+export declare const isLendingSummaryRateLimit: (error: unknown) => boolean;
+/** One limiter for all reads, including split multicalls. No retries after cancellation/429. */
+export declare function lendingSummaryTransport(provider: EthereumProvider, signal?: AbortSignal, blockNumber?: bigint, maxCalldataBytes?: number): {
+    provider: EthereumProvider;
+    isRateLimited: () => boolean;
+    pinBlock: (value: bigint) => void;
+};

package/cjs/portfolio/lendingSummaryTransport.js

@@ -0,0 +1,109 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLendingSummaryRateLimit = void 0;
+exports.lendingSummaryTransport = lendingSummaryTransport;
+const viem_1 = require("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));
+const isLendingSummaryRateLimit = (error) => !oversized(error) && !logRangeLimit(error) && /429|rate.?limit|too many requests|compute units|limit exceeded/i.test(errorText(error));
+exports.isLendingSummaryRateLimit = isLendingSummaryRateLimit;
+/** One limiter for all reads, including split multicalls. No retries after cancellation/429. */
+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 ((0, exports.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] } = (0, viem_1.decodeFunctionData)({ abi: viem_1.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 = (0, viem_1.encodeFunctionData)({ abi: viem_1.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(...(0, viem_1.decodeFunctionResult)({ abi: viem_1.multicall3Abi, functionName: 'aggregate3', data: encoded }));
+            }
+            return (0, viem_1.encodeFunctionResult)({ abi: viem_1.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/cjs/spark/index.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSparkFullPositionData = exports.getSparkAccountData = exports._getSparkAccountData = exports.getSparkAccountBalances = exports._getSparkAccountBalances = exports.EMPTY_SPARK_DATA = exports.getSparkMarketsData = exports._getSparkMarketsData = exports.sparkEmodeCategoriesMapping = 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 utils_1 = require("../services/utils");
 const staking_1 = require("../staking");
@@ -237,37 +238,7 @@ exports.EMPTY_SPARK_DATA = {
     exposure: 'N/A',
 };
 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 = (0, contracts_1.SparkViewContractViem)(provider, network, block);
-    const market = (0, spark_1.SPARK_V1)(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, spark_1.SPARK_V1)(network), 'SparkView');
     return balances;
 });
 exports._getSparkAccountBalances = _getSparkAccountBalances;

package/cjs/types/index.d.ts

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

package/cjs/types/index.js

@@ -31,3 +31,4 @@ __exportStar(require("./merkl"), exports);
 __exportStar(require("./savings"), exports);
 __exportStar(require("./common"), exports);
 __exportStar(require("./aaveV4"), exports);
+__exportStar(require("./lendingSummary"), exports);

package/cjs/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/cjs/types/lendingSummary.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/esm/aaveV2/index.js

@@ -9,16 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo } from '@defisaver/tokens';
+import { getAaveLikeBalances } from '../helpers/aaveBalances';
 import { IncentiveKind, } from '../types/common';
 import { calculateNetApy, getStakingApy } from '../staking';
-import { ethToWeth, wethToEth, wethToEthByAddress } from '../services/utils';
-import { AaveLoanInfoV2ContractViem, createViemContractFromConfigFunc } from '../contracts';
+import { ethToWeth } from '../services/utils';
+import { AaveLoanInfoV2ContractViem } from '../contracts';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
 import { EMPTY_AAVE_DATA } from '../aaveV3';
 import { AAVE_V2 } from '../markets/aave';
 import { aaveAnyGetAggregatedPositionData } from '../helpers/aaveHelpers';
 import { getEthPrice } from '../services/priceService';
-import { getViemProvider, setViemBlockNumber } from '../services/viem';
+import { getViemProvider } from '../services/viem';
 export const _getAaveV2MarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     const _addresses = selectedMarket.assets.map(a => getAssetInfo(ethToWeth(a)).address);
     const loanInfoContract = AaveLoanInfoV2ContractViem(provider, network);
@@ -85,36 +86,14 @@ export const _getAaveV2MarketsData = (provider, network, selectedMarket) => __aw
 });
 export const getAaveV2MarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return _getAaveV2MarketsData(getViemProvider(provider, network), network, selectedMarket); });
 export 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 getAaveLikeBalances(provider, network, block, addressMapping, address, AAVE_V2, 'AaveLoanInfoV2');
+    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 = yield protocolDataProviderContract.read.getAllReservesTokens(setViemBlockNumber(block));
-    const symbols = reserveTokens.map(({ symbol }) => symbol);
-    const _addresses = reserveTokens.map(({ tokenAddress }) => tokenAddress);
-    const loanInfo = yield loanInfoContract.read.getTokenBalances([marketAddress, address, _addresses], setViemBlockNumber(block));
-    loanInfo.forEach((_tokenInfo, i) => {
-        const asset = wethToEth(symbols[i]);
-        const assetAddr = 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 Dec(tokenInfo.borrowsStable.toString()).add(tokenInfo.borrowsVariable.toString()).toString() }),
-        };
-    });
+    // Preserve the legacy getter's stETH transfer-dust convention.
+    const key = addressMapping ? 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;
 });
 export const getAaveV2AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return _getAaveV2AccountBalances(getViemProvider(provider, network), network, block, addressMapping, address); });

package/esm/aaveV3/index.js

@@ -9,11 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
 import Dec from 'decimal.js';
+import { getAaveLikeBalances } from '../helpers/aaveBalances';
 import { AaveIncentiveDataProviderV3ContractViem, AaveIncentivesControllerViem, AaveV3ViewContractViem, createViemContractFromConfigFunc, getConfigContractAbi, StkAAVEViem, } from '../contracts';
 import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
 import { AAVE_V3 } from '../markets/aave';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
-import { getWrappedNativeAssetFromUnwrapped, isEnabledOnBitmap, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { getWrappedNativeAssetFromUnwrapped, isEnabledOnBitmap, } from '../services/utils';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { IncentiveKind, NetworkNumber, } from '../types/common';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
@@ -334,37 +335,7 @@ export const EMPTY_AAVE_DATA = {
     exposure: 'N/A',
 };
 export 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 = 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 = 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, AAVE_V3(network), 'AaveV3View');
     return balances;
 });
 export const getAaveV3AccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () { return _getAaveV3AccountBalances(getViemProvider(provider, network), network, block, addressMapping, address); });

package/esm/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