@defisaver/positions-sdk 2.1.166 → 2.1.168-stable-pair-dev

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

package/esm/aaveV4/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfoByAddress } from '@defisaver/tokens';
-import { getViemProvider } from '../services/viem';
+import { getViemProvider, setViemBlockNumber } from '../services/viem';
 import { IncentiveKind, } from '../types';
 import { AaveV4ViewContractViem } from '../contracts';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
@@ -251,6 +251,8 @@ export function _getAaveV4AccountData(provider_1, network_1, spokeData_1, addres
             riskPremiumBps });
     });
 }
+/** Shared raw read; no spoke metadata or market enrichment. */
+export const _getAaveV4LoanBalances = (provider, network, block, address, spoke) => (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/esm/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/esm/compoundV2/index.js

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

package/esm/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/esm/curveUsd/index.js

@@ -99,7 +99,7 @@ const getStatusForUser = (bandRange, activeBand, crvUSDSupplied, collSupplied, h
         return CrvUSDStatus.SoftLiquidated; // or is fully soft liquidated
     return CrvUSDStatus.Nonexistant;
 };
-export const _getCrvUsdAccountBalances = (provider, network, block, addressMapping, address, controllerAddress) => __awaiter(void 0, void 0, void 0, function* () {
+export 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: {},
@@ -118,6 +118,11 @@ export const _getCrvUsdAccountBalances = (provider, network, block, addressMappi
             [addressMapping ? getAssetInfo(wethToEth(selectedMarket.baseAsset), network).address.toLowerCase() : wethToEth(selectedMarket.baseAsset)]: data.debtAmount.toString(),
         },
     };
+    if (includeDeposited) {
+        balances.deposited = {
+            [addressMapping ? getAssetInfo(wethToEth(selectedMarket.baseAsset), network).address.toLowerCase() : wethToEth(selectedMarket.baseAsset)]: data.curveUsdCollateralAmount.toString(),
+        };
+    }
     return balances;
 });
 export const getCrvUsdAccountBalances = (provider, network, block, addressMapping, address, controllerAddress) => __awaiter(void 0, void 0, void 0, function* () { return _getCrvUsdAccountBalances(getViemProvider(provider, network), network, block, addressMapping, address, controllerAddress); });

package/esm/fluid/index.js

@@ -9,6 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress, } from '@defisaver/tokens';
+import { fluidTokenAmount } from '../helpers/fluidBalances';
 import { IncentiveKind, NetworkNumber, } from '../types/common';
 import { FluidVaultType, } from '../types';
 import { BTCPriceFeedContractViem, DFSFeedRegistryContractViem, ETHPriceFeedContractViem, FeedRegistryContractViem, FluidViewContractViem, } from '../contracts';
@@ -925,8 +926,8 @@ const parseT1UserData = (userPositionData, vaultData) => {
     const collAsset = getAssetInfo(marketData.collAsset0);
     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 = Object.assign(Object.assign({}, EMPTY_USED_ASSET), { symbol: collAsset.symbol, collateral: true, supplied, suppliedUsd: new Dec(supplied).mul(assetsData[collAsset.symbol].price).toString(), isSupplied: new Dec(supplied).gt(0) });
     const debtUsedAsset = Object.assign(Object.assign({}, EMPTY_USED_ASSET), { symbol: debtAsset.symbol, collateral: false, borrowed, borrowedUsd: new Dec(borrowed).mul(assetsData[debtAsset.symbol].price).toString(), isBorrowed: new Dec(borrowed).gt(0) });
     const usedAssets = {
@@ -946,9 +947,9 @@ const parseT2UserData = (userPositionData, vaultData) => {
     const collAsset1 = getAssetInfo(marketData.collAsset1);
     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 supplied0 = new Dec(supplyShares).mul(assetsData[collAsset0.symbol].tokenPerSupplyShare).toString();
-    const supplied1 = new Dec(supplyShares).mul(assetsData[collAsset1.symbol].tokenPerSupplyShare).toString();
+    const borrowed = fluidTokenAmount(userPositionData.borrow, debtAsset.decimals); // this is actual token borrow
+    const supplied0 = fluidTokenAmount(userPositionData.supply, collAsset0.decimals, assetsData[collAsset0.symbol].tokenPerSupplyShare);
+    const supplied1 = fluidTokenAmount(userPositionData.supply, collAsset1.decimals, assetsData[collAsset1.symbol].tokenPerSupplyShare);
     const collUsedAsset0 = {
         symbol: collAsset0.symbol,
         collateral: true,
@@ -991,10 +992,10 @@ const parseT3UserData = (userPositionData, vaultData) => {
     const collAsset = getAssetInfo(marketData.collAsset0);
     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 = {
         symbol: collAsset.symbol,
         collateral: true,
@@ -1039,10 +1040,10 @@ const parseT4UserData = (userPositionData, vaultData) => {
     const debtAsset1 = getAssetInfo(marketData.debtAsset1);
     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 borrowed0 = new Dec(borrowShares).mul(assetsData[debtAsset0.symbol].tokenPerBorrowShare).toString();
-    const borrowed1 = new Dec(borrowShares).mul(assetsData[debtAsset1.symbol].tokenPerBorrowShare).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 = fluidTokenAmount(userPositionData.borrow, debtAsset0.decimals, assetsData[debtAsset0.symbol].tokenPerBorrowShare);
+    const borrowed1 = fluidTokenAmount(userPositionData.borrow, debtAsset1.decimals, assetsData[debtAsset1.symbol].tokenPerBorrowShare);
     const collUsedAsset0 = {
         symbol: collAsset0.symbol,
         collateral: true,

package/esm/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/esm/helpers/aaveBalances.js

@@ -0,0 +1,45 @@
+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 Dec from 'decimal.js';
+import { getAssetInfoByAddress } from '@defisaver/tokens';
+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 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: getAssetInfoByAddress(tokenAddress, network).symbol }));
+        else {
+            if (!market.protocolData)
+                throw new Error('Missing protocol data provider');
+            reserves = [...yield createViemContractFromConfigFunc(market.protocolData, market.protocolDataAddress)(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 = (yield 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/esm/helpers/aaveV4Helpers/index.js

@@ -151,12 +151,15 @@ export const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
     let supplyUnstable = 0;
     let longAsset = '';
     let shortAsset = '';
+    let stableCollAsset = '';
     Object.values(usedAssets).forEach(({ symbol, suppliedUsd, borrowedUsd, collateral, reserveId, }) => {
         const spokeAsset = `${symbol}-${reserveId}`;
         const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
         const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
-        if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral)
+        if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) {
             supplyStable += 1;
+            stableCollAsset = spokeAsset;
+        }
         if (isBorrowed && STABLE_ASSETS.includes(symbol))
             borrowStable += 1;
         if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
@@ -171,6 +174,7 @@ export const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
     const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
     const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
     const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
+    const isStablePair = supplyStable === 1 && borrowStable === 1 && supplyUnstable === 0 && borrowUnstable === 0;
     if (isLong) {
         return {
             leveragedType: LeverageType.Long,
@@ -189,6 +193,12 @@ export const isLeveragedPosAaveV4 = (usedAssets, dustLimit = 5) => {
             leveragedAsset: longAsset,
         };
     }
+    if (isStablePair) {
+        return {
+            leveragedType: LeverageType.StablePair,
+            leveragedAsset: stableCollAsset,
+        };
+    }
     return {
         leveragedType: LeverageType.None,
         leveragedAsset: '',

package/esm/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/esm/helpers/fluidBalances.js

@@ -0,0 +1,28 @@
+import Dec from 'decimal.js';
+import { getAssetInfoByAddress } from '@defisaver/tokens';
+/** Convert raw tokens, or raw 18-decimal shares with a human-readable token/share ratio. */
+export const fluidTokenAmount = (amount, decimals, perShare) => (new Dec(amount.toString()).div(new Dec(10).pow(perShare === undefined ? decimals : 18)).mul(perShare !== null && perShare !== void 0 ? perShare : 1).toString());
+/** The same token/share conversion used by the full Fluid user parsers, without prices or yield. */
+export 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 = 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/esm/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/esm/liquityV2/index.js

@@ -112,7 +112,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 = {
+export const nftContractCreationBlockMapping = {
     [LiquityV2Versions.LiquityV2Eth]: 22516079,
     [LiquityV2Versions.LiquityV2WstEth]: 22516099,
     [LiquityV2Versions.LiquityV2REth]: 22516118,

package/esm/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/esm/llamaLend/index.js

@@ -153,7 +153,7 @@ const getStatusForUser = (bandRange, activeBand, debtSupplied, collSupplied, hea
         return LlamaLendStatus.SoftLiquidated; // or is fully soft liquidated
     return LlamaLendStatus.Nonexistant;
 };
-export const _getLlamaLendAccountBalances = (provider, network, block, addressMapping, address, controllerAddress) => __awaiter(void 0, void 0, void 0, function* () {
+export 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: {},
@@ -172,6 +172,11 @@ export const _getLlamaLendAccountBalances = (provider, network, block, addressMa
             [addressMapping ? getAssetInfo(wethToEth(selectedMarket.baseAsset), network).address.toLowerCase() : wethToEth(selectedMarket.baseAsset)]: data.debtAmount.toString(),
         },
     };
+    if (includeDeposited) {
+        balances.deposited = {
+            [addressMapping ? getAssetInfo(wethToEth(selectedMarket.baseAsset), network).address.toLowerCase() : wethToEth(selectedMarket.baseAsset)]: data.debtTokenCollateralAmount.toString(),
+        };
+    }
     return balances;
 });
 export const getLlamaLendAccountBalances = (provider, network, block, addressMapping, address, controllerAddress) => __awaiter(void 0, void 0, void 0, function* () { return _getLlamaLendAccountBalances(getViemProvider(provider, network), network, block, addressMapping, address, controllerAddress); });

package/esm/markets/morphoBlue/index.d.ts

@@ -46,7 +46,6 @@ export declare const MORPHO_BLUE_SUSDS_USDT_965: (networkId?: NetworkNumber) =>
 export declare const MORPHO_BLUE_MORPHO_USDC_625: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_LBTC_WBTC_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_SWBTC_WBTC_945: (networkId?: NetworkNumber) => MorphoBlueMarketData;
-export declare const MORPHO_BLUE_OSETH_ETH_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_WOETH_ETH_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_PTWEETH_USDA_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
 export declare const MORPHO_BLUE_PRIME_PYUSD_860: (networkId?: NetworkNumber) => MorphoBlueMarketData;
@@ -156,7 +155,6 @@ export declare const MorphoBlueMarkets: (networkId: NetworkNumber) => {
     readonly morphobluersetheth_945: MorphoBlueMarketData;
     readonly morphobluerswetheth_945: MorphoBlueMarketData;
     readonly morphoblueweetheth_860: MorphoBlueMarketData;
-    readonly morphoblueosetheth_860: MorphoBlueMarketData;
     readonly morphobluewoetheth_860: MorphoBlueMarketData;
     readonly morphoblueptweethusda_860: MorphoBlueMarketData;
     readonly morphoblueswbtcwbtc_945: MorphoBlueMarketData;

package/esm/markets/morphoBlue/index.js

@@ -706,21 +706,6 @@ export const MORPHO_BLUE_SWBTC_WBTC_945 = (networkId = NetworkNumber.Eth) => ({
     marketId: '0x514efda728a646dcafe4fdc9afe4ea214709e110ac1b2b78185ae00c1782cc82',
     protocolName: 'morpho-blue',
 });
-export const MORPHO_BLUE_OSETH_ETH_860 = (networkId = NetworkNumber.Eth) => ({
-    chainIds: [NetworkNumber.Eth],
-    label: 'Morpho Blue',
-    shortLabel: 'osETH/ETH',
-    value: MorphoBlueVersions.MorphoBlueOsEthEth_860,
-    url: 'osethweth-d5211d0e',
-    loanToken: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-    collateralToken: '0xf1C9acDc66974dFB6dEcB12aA385b9cD01190E38',
-    oracle: '0x224F2F1333b45E34fFCfC3bD01cE43C73A914498',
-    oracleType: MorphoBlueOracleType.MARKET_RATE,
-    irm: '0x870aC11D48B15DB9a138Cf899d20F13F79Ba00BC',
-    lltv: 0.86,
-    marketId: '0xd5211d0e3f4a30d5c98653d988585792bb7812221f04801be73a44ceecb11e89',
-    protocolName: 'morpho-blue',
-});
 export const MORPHO_BLUE_WOETH_ETH_860 = (networkId = NetworkNumber.Eth) => ({
     chainIds: [NetworkNumber.Eth],
     label: 'Morpho Blue',
@@ -1869,7 +1854,6 @@ export const MorphoBlueMarkets = (networkId) => ({
     [MorphoBlueVersions.MorphoBlueRsEthEth_945]: MORPHO_BLUE_RSETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueRswEthEth_945]: MORPHO_BLUE_RSWETH_ETH_945(networkId),
     [MorphoBlueVersions.MorphoBlueWeEthEth_860]: MORPHO_BLUE_WEETH_ETH_860(networkId),
-    [MorphoBlueVersions.MorphoBlueOsEthEth_860]: MORPHO_BLUE_OSETH_ETH_860(networkId),
     [MorphoBlueVersions.MorphoBlueWoEthEth_860]: MORPHO_BLUE_WOETH_ETH_860(networkId),
     [MorphoBlueVersions.MorphoBluePTweETHUSDA_860]: MORPHO_BLUE_PTWEETH_USDA_860(networkId),
     [MorphoBlueVersions.MorphoBlueSwBTCWBTC_945]: MORPHO_BLUE_SWBTC_WBTC_945(networkId),

package/esm/moneymarket/moneymarketCommonService.js

@@ -11,7 +11,7 @@ export const calcShortLiqPrice = (assetPrice, borrowedUsd, borrowLimitUsd) => ne
 export const calcLeverageLiqPrice = (leverageType, assetPrice, borrowedUsd, borrowLimitUsd) => {
     if (leverageType === LeverageType.Short || leverageType === LeverageType.VolatilePairReverse)
         return calcShortLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
-    if (leverageType === LeverageType.Long || leverageType === LeverageType.VolatilePair)
+    if (leverageType === LeverageType.Long || leverageType === LeverageType.VolatilePair || leverageType === LeverageType.StablePair)
         return calcLongLiqPrice(assetPrice, borrowedUsd, borrowLimitUsd);
     console.error('invalid leverageType', leverageType);
     return '0';
@@ -33,11 +33,14 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     let supplyUnstable = 0;
     let longAsset = '';
     let shortAsset = '';
+    let stableCollAsset = '';
     Object.values(usedAssets).forEach(({ symbol, suppliedUsd, borrowedUsd, collateral, }) => {
         const isSupplied = (+suppliedUsd) > dustLimit; // ignore dust like <limit leftover supply
         const isBorrowed = (+borrowedUsd) > dustLimit; // ignore dust like <limit leftover supply
-        if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral)
+        if (isSupplied && STABLE_ASSETS.includes(symbol) && collateral) {
             supplyStable += 1;
+            stableCollAsset = symbol;
+        }
         if (isBorrowed && STABLE_ASSETS.includes(symbol))
             borrowStable += 1;
         if (isBorrowed && !STABLE_ASSETS.includes(symbol)) {
@@ -52,6 +55,7 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
     const isLong = borrowStable > 0 && borrowUnstable === 0 && supplyUnstable === 1 && supplyStable === 0;
     const isShort = supplyStable > 0 && supplyUnstable === 0 && borrowUnstable === 1 && borrowStable === 0;
     const isVolatilePair = supplyUnstable === 1 && borrowUnstable === 1 && supplyStable === 0 && borrowStable === 0;
+    const isStablePair = supplyStable === 1 && borrowStable === 1 && supplyUnstable === 0 && borrowUnstable === 0;
     if (isLong) {
         return {
             leveragedType: LeverageType.Long,
@@ -70,6 +74,12 @@ export const isLeveragedPos = (usedAssets, dustLimit = 5) => {
             leveragedAsset: longAsset,
         };
     }
+    if (isStablePair) {
+        return {
+            leveragedType: LeverageType.StablePair,
+            leveragedAsset: stableCollAsset,
+        };
+    }
     return {
         leveragedType: LeverageType.None,
         leveragedAsset: '',

package/esm/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/esm/morphoMidnight/index.js

@@ -210,7 +210,7 @@ export function getMorphoMidnightAccountData(provider, network, account, selecte
         return _getMorphoMidnightAccountData(getViemProvider(provider, network), network, account, selectedMarket, marketInfo);
     });
 }
-export const _getMorphoMidnightAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+export 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;
@@ -230,6 +230,11 @@ export const _getMorphoMidnightAccountBalances = (provider, network, block, addr
         collateral[addressMapping ? collInfo.address.toLowerCase() : wethToEth(collInfo.symbol)] = assetAmountInEth(rawAmount, wethToEth(collInfo.symbol));
     });
     balances.collateral = collateral;
+    if (includeCredit) {
+        balances.deposited = {
+            [addressMapping ? loanTokenInfo.address.toLowerCase() : wethToEth(loanTokenInfo.symbol)]: assetAmountInEth(positionInfo.credit.toString(), wethToEth(loanTokenInfo.symbol)),
+        };
+    }
     return balances;
 });
 export const getMorphoMidnightAccountBalances = (provider, network, block, addressMapping, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return _getMorphoMidnightAccountBalances(getViemProvider(provider, network), network, block, addressMapping, address, selectedMarket); });