@defisaver/positions-sdk 2.1.161-portfolio-api-1-dev → 2.1.161-portfolio-api-3-dev

package/cjs/fluid/index.d.ts

@@ -1,6 +1,6 @@
 import { Client, PublicClient } from 'viem';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { FluidAssetsData, FluidMarketData, FluidMarketInfo, FluidUsedAssets, FluidVaultData, InnerFluidMarketData } from '../types';
+import { FluidAssetsData, FluidEarnPositionData, FluidMarketData, FluidMarketInfo, FluidUsedAssets, FluidVaultData, InnerFluidMarketData } from '../types';
 export { FluidMerklOpportunityType, buildFluidMerklRewardMap, getFluidMerklCampaigns, attachFluidMerklIncentives, } from './merkl';
 export declare const EMPTY_USED_ASSET: {
     isSupplied: boolean;
@@ -71,54 +71,10 @@ export declare const getFluidTokenData: (provider: EthereumProvider, network: Ne
     depositRate: string;
     withdrawRate: string;
 }>;
-export declare const _getFluidDepositData: (provider: Client, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
-    fTokenAddress: string | undefined;
-    fTokenSymbol: string;
-    decimals: string;
-    totalDeposited: string;
-    withdrawable: string;
-    apy: string;
-    depositRate: string;
-    withdrawRate: string;
-    deposited: string;
-    depositedShares: string;
-}>;
-export declare const getFluidDepositData: (provider: EthereumProvider, network: NetworkNumber, token: string, address: EthAddress) => Promise<{
-    fTokenAddress: string | undefined;
-    fTokenSymbol: string;
-    decimals: string;
-    totalDeposited: string;
-    withdrawable: string;
-    apy: string;
-    depositRate: string;
-    withdrawRate: string;
-    deposited: string;
-    depositedShares: string;
-}>;
-export declare const _getAllUserEarnPositionsWithFTokens: (provider: Client, network: NetworkNumber, user: EthAddress) => Promise<{
-    fTokenAddress: string | undefined;
-    fTokenSymbol: string;
-    decimals: string;
-    totalDeposited: string;
-    withdrawable: string;
-    apy: string;
-    depositRate: string;
-    withdrawRate: string;
-    deposited: string;
-    depositedShares: string;
-}[]>;
-export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<{
-    fTokenAddress: string | undefined;
-    fTokenSymbol: string;
-    decimals: string;
-    totalDeposited: string;
-    withdrawable: string;
-    apy: string;
-    depositRate: string;
-    withdrawRate: string;
-    deposited: string;
-    depositedShares: string;
-}[]>;
+export declare const _getFluidDepositData: (provider: Client, network: NetworkNumber, token: string, address: EthAddress) => Promise<FluidEarnPositionData>;
+export declare const getFluidDepositData: (provider: EthereumProvider, network: NetworkNumber, token: string, address: EthAddress) => Promise<FluidEarnPositionData>;
+export declare const _getAllUserEarnPositionsWithFTokens: (provider: Client, network: NetworkNumber, user: EthAddress) => Promise<FluidEarnPositionData[]>;
+export declare const getAllUserEarnPositionsWithFTokens: (provider: EthereumProvider, network: NetworkNumber, user: EthAddress) => Promise<FluidEarnPositionData[]>;
 export declare const _getUserPositions: (provider: PublicClient, network: NetworkNumber, user: EthAddress) => Promise<{
     marketData: FluidMarketData | undefined;
     userData: {
@@ -133,6 +89,7 @@ export declare const _getUserPositions: (provider: PublicClient, network: Networ
         merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
+        safetyRatio: string;
         minRatio: string;
         totalInterestUsd: string;
         leveragedType?: import("../types").LeverageType;
@@ -167,6 +124,7 @@ export declare const getUserPositions: (provider: EthereumProvider, network: Net
         merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
+        safetyRatio: string;
         minRatio: string;
         totalInterestUsd: string;
         leveragedType?: import("../types").LeverageType;
@@ -201,6 +159,7 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         merklBorrowIncentives: import("../types").IncentiveData[];
         ratio: string;
         collRatio: string;
+        safetyRatio: string;
         minRatio: string;
         totalInterestUsd: string;
         leveragedType?: import("../types").LeverageType;
@@ -221,3 +180,5 @@ export declare const _getUserPositionsPortfolio: (provider: PublicClient, networ
         nftId: string;
     } | undefined;
 }[]>;
+export declare const _getAllFluidMarketDataPortfolio: (provider: PublicClient, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;
+export declare const getAllFluidMarketDataPortfolio: (provider: EthereumProvider, network: NetworkNumber) => Promise<Record<string, FluidMarketData>>;

package/cjs/fluid/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._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;
+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 common_1 = require("../types/common");
@@ -1410,3 +1410,38 @@ const _getUserPositionsPortfolio = (provider, network, user) => __awaiter(void 0
     })).filter(md => md.marketData !== undefined);
 });
 exports._getUserPositionsPortfolio = _getUserPositionsPortfolio;
+const _getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const versions = (0, markets_1.getFluidVersionsDataForNetwork)(network);
+    if (versions.length === 0)
+        return {};
+    const view = (0, contracts_1.FluidViewContractViem)(provider, network);
+    const vaultsData = yield Promise.all(versions.map((version) => view.read.getVaultData([version.marketAddress])));
+    const tokens = Array.from(new Set(vaultsData.map((vaultData) => {
+        const vaultTokens = [(0, tokens_1.getAssetInfoByAddress)(vaultData.supplyToken0, network).symbol, (0, tokens_1.getAssetInfoByAddress)(vaultData.borrowToken0, network).symbol];
+        if (vaultData.supplyToken1 && !(0, utils_1.compareAddresses)(constants_1.ZERO_ADDRESS, vaultData.supplyToken1))
+            vaultTokens.push((0, tokens_1.getAssetInfoByAddress)(vaultData.supplyToken1, network).symbol);
+        if (vaultData.borrowToken1 && !(0, utils_1.compareAddresses)(constants_1.ZERO_ADDRESS, vaultData.borrowToken1))
+            vaultTokens.push((0, tokens_1.getAssetInfoByAddress)(vaultData.borrowToken1, network).symbol);
+        return vaultTokens;
+    }).flat()));
+    // ETH and WBTC needed for other tokens prices
+    if (!tokens.includes('ETH'))
+        tokens.push('ETH');
+    if (!tokens.includes('WBTC'))
+        tokens.push('WBTC');
+    const [tokenPrices, merklCampaigns] = yield Promise.all([
+        getTokensPricesForPortfolio(tokens, provider, network),
+        (0, merkl_1.getFluidMerklCampaigns)(network),
+    ]);
+    const parsedMarketsData = yield Promise.all(vaultsData.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(provider, vaultData, network, tokenPrices); })));
+    const marketsData = {};
+    parsedMarketsData.forEach((marketData, i) => {
+        if (!marketData)
+            return;
+        marketsData[versions[i].value] = (0, merkl_1.attachFluidMerklIncentives)(marketData, merklCampaigns);
+    });
+    return marketsData;
+});
+exports._getAllFluidMarketDataPortfolio = _getAllFluidMarketDataPortfolio;
+const getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getAllFluidMarketDataPortfolio)((0, viem_1.getViemProvider)(provider, network, { batch: { multicall: true } }), network); });
+exports.getAllFluidMarketDataPortfolio = getAllFluidMarketDataPortfolio;

package/cjs/helpers/aaveHelpers/index.d.ts

@@ -1,4 +1,4 @@
-import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions } from '../../types';
+import { AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions, EModeCategoriesData } from '../../types';
 import { EthereumProvider, NetworkNumber } from '../../types/common';
 export declare const AAVE_V3_MARKETS: AaveVersions[];
 export declare const isAaveV2: ({ selectedMarket }: {
@@ -15,6 +15,14 @@ export declare const aaveV3IsInSiloedMode: ({ usedAssets, assetsData }: {
     usedAssets: AaveV3UsedAssets;
     assetsData: AaveV3AssetsData;
 }) => boolean;
+export declare const aaveV3IsEmodeIsolated: ({ eModeCategory, eModeCategoriesData }: {
+    eModeCategory: number;
+    eModeCategoriesData?: EModeCategoriesData;
+}) => boolean;
+export declare const aaveV3CanBeCollateralInEmode: ({ eModeCategory, eModeCategoriesData }: {
+    eModeCategory: number;
+    eModeCategoriesData?: EModeCategoriesData;
+}, _asset: string) => boolean;
 export declare const aaveAnyGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: AaveV3UsedAssets;
 }) => AaveV3UsedAsset[];

package/cjs/helpers/aaveHelpers/index.js

@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAaveUnderlyingSymbol = exports.getApyAfterValuesEstimation = exports.aaveAnyGetAggregatedPositionData = exports.aaveAnyGetUserReserveLtvAndLltv = exports.aaveAnyGetEmodeMutableProps = exports.aaveAnyGetSuppliableAsCollAssets = exports.aaveAnyGetSuppliableAssets = exports.aaveAnyGetCollSuppliedAssets = exports.aaveV3IsInSiloedMode = exports.aaveV3IsInIsolationMode = exports.isAaveV3 = exports.isAaveV2 = exports.AAVE_V3_MARKETS = void 0;
+exports.getAaveUnderlyingSymbol = exports.getApyAfterValuesEstimation = exports.aaveAnyGetAggregatedPositionData = exports.aaveAnyGetUserReserveLtvAndLltv = exports.aaveAnyGetEmodeMutableProps = exports.aaveAnyGetSuppliableAsCollAssets = exports.aaveAnyGetSuppliableAssets = exports.aaveAnyGetCollSuppliedAssets = exports.aaveV3CanBeCollateralInEmode = exports.aaveV3IsEmodeIsolated = exports.aaveV3IsInSiloedMode = exports.aaveV3IsInIsolationMode = exports.isAaveV3 = exports.isAaveV2 = exports.AAVE_V3_MARKETS = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const types_1 = require("../../types");
@@ -43,6 +43,14 @@ const aaveV3IsInIsolationMode = ({ usedAssets, assetsData }) => Object.values(us
 exports.aaveV3IsInIsolationMode = aaveV3IsInIsolationMode;
 const aaveV3IsInSiloedMode = ({ usedAssets, assetsData }) => Object.values(usedAssets).some(({ symbol, debt }) => debt && assetsData[symbol].isSiloed);
 exports.aaveV3IsInSiloedMode = aaveV3IsInSiloedMode;
+const aaveV3IsEmodeIsolated = ({ eModeCategory, eModeCategoriesData }) => { var _a; return eModeCategory !== 0 && !!((_a = eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) === null || _a === void 0 ? void 0 : _a.isolated); };
+exports.aaveV3IsEmodeIsolated = aaveV3IsEmodeIsolated;
+const aaveV3CanBeCollateralInEmode = ({ eModeCategory, eModeCategoriesData }, _asset) => {
+    if (!(0, exports.aaveV3IsEmodeIsolated)({ eModeCategory, eModeCategoriesData }))
+        return true;
+    return eModeCategoriesData[eModeCategory].collateralAssets.includes((0, utils_1.getNativeAssetFromWrapped)(_asset));
+};
+exports.aaveV3CanBeCollateralInEmode = aaveV3CanBeCollateralInEmode;
 const aaveAnyGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets)
     .filter(({ isSupplied, collateral }) => isSupplied && collateral);
 exports.aaveAnyGetCollSuppliedAssets = aaveAnyGetCollSuppliedAssets;
@@ -51,13 +59,16 @@ const aaveAnyGetSuppliableAssets = (_a) => {
     const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const collAccountAssets = (0, exports.aaveAnyGetCollSuppliedAssets)(data);
     const marketAssets = Object.values(assetsData);
-    if (collAccountAssets.length === 0 || !(0, exports.isAaveV3)(data))
+    if (!(0, exports.isAaveV3)(data))
         return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: true }));
+    const canBeCollateralInEmode = (symbol) => (0, exports.aaveV3CanBeCollateralInEmode)(data, symbol);
+    if (collAccountAssets.length === 0)
+        return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: canBeCollateralInEmode(symbol) }));
     if ((0, exports.aaveV3IsInIsolationMode)(data)) {
         const collAsset = collAccountAssets[0].symbol;
-        return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset }));
+        return marketAssets.filter(d => d.canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: symbol === collAsset && canBeCollateralInEmode(symbol) }));
     }
-    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated }));
+    return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated && canBeCollateralInEmode(symbol) }));
 };
 exports.aaveAnyGetSuppliableAssets = aaveAnyGetSuppliableAssets;
 const aaveAnyGetSuppliableAsCollAssets = (_a) => {
@@ -69,12 +80,15 @@ const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, asset
     const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
     const assetData = assetsData[asset];
     const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || {
-        collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0',
+        collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0', isolated: false,
     };
     if (eModeCategory === 0
         || !eModeCategoryData.collateralAssets.includes(asset)
         || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
         const { liquidationRatio, collateralFactor } = assetData;
+        if (eModeCategory !== 0 && eModeCategoryData.isolated && !eModeCategoryData.collateralAssets.includes(asset)) {
+            return ({ liquidationRatio, collateralFactor: '0' });
+        }
         return ({ liquidationRatio, collateralFactor });
     }
     if (eModeCategoryData.ltvZeroAssets.includes(asset))
@@ -110,7 +124,10 @@ const aaveAnyGetUserReserveLtvAndLltv = ({ eModeCategory, eModeCategoriesData, a
         || !eModeCategoryData
         || !eModeCategoryData.collateralAssets.includes(asset)
         || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
-        return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
+        const ltv = eModeCategory !== 0 && (eModeCategoryData === null || eModeCategoryData === void 0 ? void 0 : eModeCategoryData.isolated) && !eModeCategoryData.collateralAssets.includes(asset)
+            ? '0'
+            : assetData.collateralFactor;
+        return { ltv, lltv: assetData.liquidationRatio };
     }
     const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
     return { ltv, lltv: eModeCategoryData.liquidationRatio };
@@ -140,6 +157,9 @@ const aaveAnyGetAggregatedPositionData = (_a) => {
         return new decimal_js_1.default(suppliedUsd).mul(effectiveLtv);
     });
     payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitWithLtvZeroFallbackUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    // Normalised safety ratio (100 = liquidation on every protocol): the automation ratio above, falling back
+    // to the regular ratio when the fallback carries its '0' placeholder.
+    payload.safetyRatio = +payload.safetyRatioWithLtvZeroFallback ? payload.safetyRatioWithLtvZeroFallback : payload.ratio;
     payload.liqRatio = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);

package/cjs/helpers/aaveV4Helpers/index.js

@@ -219,6 +219,7 @@ const aaveV4GetAggregatedPositionData = ({ usedAssets, assetsData, network, useU
     payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.minRatio = '100';
     payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.safetyRatio = payload.ratio;
     payload.liqRatio = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = (0, exports.isLeveragedPosAaveV4)(usedAssets);

package/cjs/helpers/compoundHelpers/index.js

@@ -102,6 +102,7 @@ const getCompoundV2AggregatedData = (_a) => {
     payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
         ? new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
         : '0';
+    payload.safetyRatio = payload.ratio;
     // Calculate borrow limits per asset
     Object.values(usedAssets).forEach((item) => {
         if (item.isBorrowed) {
@@ -144,6 +145,7 @@ const getCompoundV3AggregatedData = (_a) => {
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
     payload.minRatio = '100';
+    payload.safetyRatio = payload.ratio;
     payload.liqRatio = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new decimal_js_1.default(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     payload.minDebt = assetsData[selectedMarket.baseAsset].minDebt;

package/cjs/helpers/curveUsdHelpers/index.d.ts

@@ -1,9 +1,11 @@
 import { CrvUSDAggregatedPositionData, CrvUSDMarketData, CrvUSDUsedAssets } from '../../types';
 import { NetworkNumber } from '../../types/common';
-export declare const getCrvUsdAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, numOfBands, ...rest }: {
+export declare const getCrvUsdAggregatedData: ({ loanExists, usedAssets, network, selectedMarket, numOfBands, borrowRate, collStakingApy, ...rest }: {
     loanExists: boolean;
     usedAssets: CrvUSDUsedAssets;
     network: NetworkNumber;
     selectedMarket: CrvUSDMarketData;
     numOfBands: number | string;
+    borrowRate?: string;
+    collStakingApy?: string;
 }) => CrvUSDAggregatedPositionData;

package/cjs/helpers/curveUsdHelpers/index.js

@@ -18,9 +18,10 @@ exports.getCrvUsdAggregatedData = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const moneymarket_1 = require("../../moneymarket");
 const utils_1 = require("../../services/utils");
+const staking_1 = require("../../staking");
 const getCrvUsdAggregatedData = (_a) => {
-    var _b;
-    var { loanExists, usedAssets, network, selectedMarket, numOfBands } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands"]);
+    var _b, _c;
+    var { loanExists, usedAssets, network, selectedMarket, numOfBands, borrowRate = '0', collStakingApy = '0' } = _a, rest = __rest(_a, ["loanExists", "usedAssets", "network", "selectedMarket", "numOfBands", "borrowRate", "collStakingApy"]);
     const payload = {};
     payload.supplied = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ supplied }) => supplied); // this is wrong if we are in soft-liquidations
     payload.borrowed = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowed }) => borrowed);
@@ -34,6 +35,7 @@ const getCrvUsdAggregatedData = (_a) => {
         : '0';
     // this is all approximation
     payload.minAllowedRatio = (0, utils_1.mapRange)(numOfBands, 4, 50, 115, 140); // collateral ratio
+    payload.safetyRatio = loanExists ? (0, moneymarket_1.getSafetyRatioFromCollateralRatio)(payload.ratio, payload.minAllowedRatio) : '0';
     payload.collFactor = new decimal_js_1.default(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
     // only take in consideration collAsset
     payload.borrowLimitUsd = ((_b = usedAssets === null || usedAssets === void 0 ? void 0 : usedAssets[selectedMarket.collAsset]) === null || _b === void 0 ? void 0 : _b.isSupplied)
@@ -47,6 +49,17 @@ const getCrvUsdAggregatedData = (_a) => {
         payload.liquidationPrice = (0, moneymarket_1.calcLeverageLiqPrice)(leveragedType, usedAssets[selectedMarket.collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
     }
     payload.exposure = (0, moneymarket_1.getExposure)(payload.borrowedUsd, payload.suppliedUsd);
+    // crvUSD debt accrues the market borrow rate. Collateral (including crvUSD held during soft liquidation) earns
+    // nothing from the protocol itself; only the native yield of staked collateral is counted, as an incentive.
+    const { netApy, totalInterestUsd, incentiveUsd } = (0, staking_1.calculateNetApyFromRates)({
+        suppliedUsd: payload.suppliedUsd,
+        borrowedUsd: payload.borrowedUsd,
+        borrowRate,
+        incentives: [{ apy: collStakingApy, amountUsd: ((_c = usedAssets === null || usedAssets === void 0 ? void 0 : usedAssets[selectedMarket.collAsset]) === null || _c === void 0 ? void 0 : _c.suppliedUsd) || '0' }],
+    });
+    payload.netApy = netApy;
+    payload.totalInterestUsd = totalInterestUsd;
+    payload.incentiveUsd = incentiveUsd;
     return payload;
 };
 exports.getCrvUsdAggregatedData = getCrvUsdAggregatedData;

package/cjs/helpers/fluidHelpers/index.js

@@ -85,6 +85,7 @@ const getFluidAggregatedData = ({ usedAssets, assetsData, marketData, }, supplyS
     payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.minRatio = marketData.minRatio;
+    payload.safetyRatio = payload.ratio;
     const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
     payload.leveragedType = leveragedType;
     payload.liquidationPrice = '';

package/cjs/helpers/liquityV2Helpers/index.js

@@ -48,6 +48,7 @@ const getLiquityV2AggregatedPositionData = ({ usedAssets, assetsData, minCollRat
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     payload.ratio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = (+payload.suppliedUsd && +payload.borrowedUsd) ? new decimal_js_1.default(payload.suppliedUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.safetyRatio = payload.ratio;
     const { netApy, incentiveUsd, totalInterestUsd } = (0, exports.calculateNetApyLiquityV2)(usedAssets, assetsData, interestRate);
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;

package/cjs/helpers/llamaLendHelpers/index.js

@@ -42,6 +42,7 @@ const getLlamaLendAggregatedData = (_a) => {
         : '0';
     // this is all approximation
     payload.minAllowedRatio = (0, utils_1.mapRange)(numOfBands, 4, 50, 115, 140); // collateral ratio
+    payload.safetyRatio = loanExists ? (0, moneymarket_1.getSafetyRatioFromCollateralRatio)(payload.ratio, payload.minAllowedRatio) : '0';
     payload.collFactor = new decimal_js_1.default(1).div(payload.minAllowedRatio).mul(100).toString(); // collateral factor = 1 / collateral ratio
     // only take in consideration collAsset
     payload.borrowLimitUsd = ((_b = usedAssets === null || usedAssets === void 0 ? void 0 : usedAssets[collAsset]) === null || _b === void 0 ? void 0 : _b.isSupplied)

package/cjs/helpers/makerHelpers/index.d.ts

@@ -1,4 +1,4 @@
-export declare const parseCollateralInfo: (ilk: string, _par: string, _mat: string, _art: string, _rate: string, _spot: string, _line: string, _duty: string, _futureRate: string, _chop: string) => {
+export declare const parseCollateralInfo: (ilk: string, _par: string, _mat: string, _art: string, _rate: string, _spot: string, _line: string, _dust: string, _duty: string, _futureRate: string, _chop: string) => {
     ilkLabel: string;
     currentRate: string;
     futureRate: string;

package/cjs/helpers/makerHelpers/index.js

@@ -7,14 +7,14 @@ exports.parseCollateralInfo = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const constants_1 = require("../../constants");
 const utils_1 = require("../../services/utils");
-const parseCollateralInfo = (ilk, _par, _mat, _art, _rate, _spot, _line, _duty, _futureRate, _chop) => {
+const parseCollateralInfo = (ilk, _par, _mat, _art, _rate, _spot, _line, _dust, _duty, _futureRate, _chop) => {
     const par = new decimal_js_1.default(_par).div(1e27).toString();
     const mat = new decimal_js_1.default(_mat).div(1e27).toString();
     const art = new decimal_js_1.default(_art).toString();
     const rate = new decimal_js_1.default(_rate).toString();
     const spot = new decimal_js_1.default(_spot).div(1e27).toString();
     const line = new decimal_js_1.default(_line).div(1e45).toString();
-    const dust = new decimal_js_1.default(_rate).div(1e45).toString();
+    const dust = new decimal_js_1.default(_dust).div(1e45).toString(); // Vat.ilks.dust, rad (1e45) -> DAI
     const duty = new decimal_js_1.default(_duty).toString();
     const futureRate = new decimal_js_1.default(_futureRate).toString();
     const chop = new decimal_js_1.default(_chop).div(1e18).toString();

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -46,6 +46,8 @@ const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, marketInf
     payload.ltv = new decimal_js_1.default(((_c = usedAssets[loanToken]) === null || _c === void 0 ? void 0 : _c.borrowed) || 0).div(oracle).div(((_d = usedAssets[collateralToken]) === null || _d === void 0 ? void 0 : _d.supplied) || 1).toString(); // default to 1 because can't div 0
     payload.ratio = new decimal_js_1.default(((_e = usedAssets[collateralToken]) === null || _e === void 0 ? void 0 : _e.supplied) || 0).mul(oracle).div(((_f = usedAssets[loanToken]) === null || _f === void 0 ? void 0 : _f.borrowed) || 1).mul(100)
         .toString();
+    // Borrow limit over debt, so 100 sits on the market's LLTV however low it is (`ratio` is the raw collateral ratio).
+    payload.safetyRatio = +payload.borrowedUsd > 0 ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
     payload.leveragedType = leveragedType;
     payload.liquidationPrice = '';

package/cjs/helpers/morphoMidnightHelpers/index.js

@@ -77,6 +77,8 @@ const getMorphoMidnightAggregatedPositionData = ({ usedAssets, assetsData, marke
     payload.ltv = new decimal_js_1.default(payload.suppliedCollateralUsd).eq(0) ? '0' : new decimal_js_1.default(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
     payload.ratio = new decimal_js_1.default(payload.borrowedUsd).eq(0) ? '0' : new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString();
     payload.healthRatio = new decimal_js_1.default(payload.borrowedUsd).eq(0) ? 'Infinity' : new decimal_js_1.default(payload.liquidationLimitUsd).div(payload.borrowedUsd).toDP(4).toString();
+    // Borrow limit over debt, so 100 sits on the market's LLTV however low it is (`ratio` is the raw collateral ratio).
+    payload.safetyRatio = +payload.borrowedUsd > 0 ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     const { leveragedType, leveragedAsset } = (0, moneymarket_1.isLeveragedPos)(usedAssets);
     payload.leveragedType = leveragedType;
     payload.liquidationPrice = '';

package/cjs/helpers/sparkHelpers/index.js

@@ -81,6 +81,7 @@ const sparkGetAggregatedPositionData = (_a) => {
     payload.leftToBorrowUsd = leftToBorrowUsd.lte('0') ? '0' : leftToBorrowUsd.toString();
     payload.ratio = +payload.suppliedUsd ? new decimal_js_1.default(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
     payload.collRatio = +payload.suppliedUsd ? new decimal_js_1.default(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
+    payload.safetyRatio = payload.ratio;
     const { netApy, incentiveUsd, totalInterestUsd } = (0, staking_1.calculateNetApy)({ usedAssets, assetsData });
     payload.netApy = netApy;
     payload.incentiveUsd = incentiveUsd;

package/cjs/liquity/index.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-import { LiquityTroveInfo } from '../types';
+import { LiquityStakingData, LiquityTroveInfo } from '../types';
 export declare const LIQUITY_NORMAL_MODE_RATIO = 110;
 export declare const LIQUITY_RECOVERY_MODE_RATIO = 150;
 export declare const _getLiquityAccountBalances: (provider: Client, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
@@ -8,14 +8,4 @@ export declare const getLiquityAccountBalances: (provider: EthereumProvider, net
 export declare const getDebtInFront: (provider: EthereumProvider, address: EthAddress) => Promise<string>;
 export declare const _getLiquityTroveInfo: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
 export declare const getLiquityTroveInfo: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress) => Promise<LiquityTroveInfo>;
-export declare const getLiquityStakingData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<{
-    totalLUSDDeposited: string;
-    totalLQTYStaked: string;
-    stakedLQTY: string;
-    stakedLUSDBalance: string;
-    rewardETH: string;
-    rewardLUSD: string;
-    stabilityRewardETH: string;
-    stabilityRewardLQTY: string;
-    showStakingBalances: boolean;
-}>;
+export declare const getLiquityStakingData: (provider: Client, network: NetworkNumber, address: EthAddress) => Promise<LiquityStakingData>;

package/cjs/liquity/index.js

@@ -22,6 +22,7 @@ const constants_1 = require("../constants");
 const viem_1 = require("../services/viem");
 const utils_1 = require("../services/utils");
 const moneymarket_1 = require("../moneymarket");
+const staking_1 = require("../staking");
 exports.LIQUITY_NORMAL_MODE_RATIO = 110; // MCR
 exports.LIQUITY_RECOVERY_MODE_RATIO = 150; // CCR
 const _getLiquityAccountBalances = (provider, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
@@ -77,6 +78,14 @@ const _getLiquityTroveInfo = (provider, network, address) => __awaiter(void 0, v
         _getDebtInFront(viewContract, address),
     ]);
     const recoveryMode = troveInfo[6];
+    const minCollateralRatio = recoveryMode ? exports.LIQUITY_RECOVERY_MODE_RATIO : exports.LIQUITY_NORMAL_MODE_RATIO;
+    const collateral = (0, tokens_1.assetAmountInEth)(troveInfo[1].toString());
+    const debtInAsset = (0, tokens_1.assetAmountInEth)(troveInfo[2].toString());
+    const collateralUsd = new decimal_js_1.default(collateral).mul((0, tokens_1.assetAmountInEth)(assetPrice.toString())).toString();
+    const collRatio = +debtInAsset ? new decimal_js_1.default(collateralUsd).div(debtInAsset).mul(100).toString() : '0';
+    // LUSD debt is interest free (only a one-off borrowing fee on issuance) and ETH collateral earns no yield,
+    // so a trove's net APY is always 0. It is exposed for parity with the other protocols.
+    const { netApy, totalInterestUsd, incentiveUsd } = (0, staking_1.calculateNetApyFromRates)({ suppliedUsd: collateralUsd, borrowedUsd: debtInAsset });
     const payload = {
         troveStatus: types_1.LIQUITY_TROVE_STATUS_ENUM[+(troveInfo[0].toString())],
         collateral: (0, tokens_1.assetAmountInEth)(troveInfo[1].toString()),
@@ -89,10 +98,14 @@ const _getLiquityTroveInfo = (provider, network, address) => __awaiter(void 0, v
         totalETH: totalETH.toString(),
         totalLUSD: totalLUSD.toString(),
         debtInFront: debtInFront.toString(),
-        minCollateralRatio: recoveryMode ? exports.LIQUITY_RECOVERY_MODE_RATIO : exports.LIQUITY_NORMAL_MODE_RATIO,
+        minCollateralRatio,
+        safetyRatio: (0, moneymarket_1.getSafetyRatioFromCollateralRatio)(collRatio, minCollateralRatio),
         priceForRecovery: new decimal_js_1.default(recoveryMode ? exports.LIQUITY_RECOVERY_MODE_RATIO : exports.LIQUITY_NORMAL_MODE_RATIO).mul(totalLUSD).div(totalETH).div(100)
             .toString(),
-        exposure: (0, moneymarket_1.getExposure)((0, tokens_1.assetAmountInEth)(troveInfo[2].toString()), new decimal_js_1.default((0, tokens_1.assetAmountInEth)(troveInfo[1].toString())).mul(assetPrice).toString()),
+        exposure: (0, moneymarket_1.getExposure)(debtInAsset, collateralUsd),
+        netApy,
+        totalInterestUsd,
+        incentiveUsd,
     };
     return payload;
 });

package/cjs/liquityV2/index.d.ts

@@ -1,6 +1,6 @@
 import { Client, PublicClient } from 'viem';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../types/common';
-import { LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2TroveData, LiquityV2Versions } from '../types';
+import { LiquityV2AssetsData, LiquityV2MarketData, LiquityV2MarketInfo, LiquityV2SBoldYBoldData, LiquityV2StakingData, LiquityV2TroveData, LiquityV2Versions } from '../types';
 export type SPYieldGainParameters = {
     P: string;
     aggWeightedDebtSum: string;
@@ -11,6 +11,11 @@ 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>;
+/**
+ * The trove ids of several accounts in one market: the market's NFT transfers are read once for all of them, rather
+ * than once per account as _getLiquityV2UserTroveIds does.
+ */
+export declare const _getLiquityV2UsersTroveIds: (provider: PublicClient, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, accounts: EthAddress[]) => Promise<Record<EthAddress, string[]>>;
 export declare const _getLiquityV2UserTroveIds: (provider: PublicClient, network: NetworkNumber, selectedMarket: LiquityV2MarketInfo, troveNFTAddress: EthAddress, limitBlocksForEventFetching: boolean, account: EthAddress) => Promise<{
     troves: {
         troveId: string;
@@ -44,25 +49,5 @@ export type sBoldYieldParameters = {
     wsETH: string;
     rETH: string;
 };
-export declare const getLiquityV2Staking: (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => Promise<{
-    totalBOLDDeposited: string;
-    stakedBOLDBalance: string;
-    stabilityRewardColl: string;
-    stabilityRewardYield: string;
-    showStakingBalances: boolean;
-    debtTokenBalance: string;
-    stabilityPoolApy: string;
-}>;
-export declare const getLiquitySAndYBold: (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => Promise<{
-    spApy: string;
-    yBoldApy: string;
-    totalBoldDepositedSBold: string;
-    boldRateSBold: string;
-    maxWithdrawSBold: string;
-    totalBoldDepositedYBold: string;
-    boldRateYBold: string;
-    maxWithdrawYBold: string;
-    sBoldBalance: string;
-    yBoldBalance: string;
-    stYBoldBalance: string;
-}>;
+export declare const getLiquityV2Staking: (provider: Client, network: NetworkNumber, market: LiquityV2Versions, user: EthAddress) => Promise<LiquityV2StakingData>;
+export declare const getLiquitySAndYBold: (provider: Client, network: NetworkNumber, markets: any, user: EthAddress) => Promise<LiquityV2SBoldYBoldData>;

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._getLiquityV2UsersTroveIds = 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");
@@ -129,36 +129,54 @@ const nftContractCreationBlockMapping = {
     [types_1.LiquityV2Versions.LiquityV2WstEthLegacy]: 21686238,
     [types_1.LiquityV2Versions.LiquityV2REthLegacy]: 21686257,
 };
-const getTransferredTroves = (provider, network, troveNFTAddress, limitBlocksForEventFetching, market, account) => __awaiter(void 0, void 0, void 0, function* () {
+/** Every Transfer of a market's trove NFT since the contract was created (or, on a fork, in the last 1000 blocks). */
+const getTroveTransfers = (provider, network, troveNFTAddress, limitBlocksForEventFetching, market) => __awaiter(void 0, void 0, void 0, function* () {
     const nftContract = (0, contracts_1.createViemContractFromConfigFunc)('LiquityV2TroveNFT', troveNFTAddress)(provider, network);
     const nftContractCreationBlock = 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) => ({
+    return _events.map((event) => ({
         from: event.args.from, to: event.args.to, tokenId: event.args.tokenId.toString(), blockNumber: +(event.blockNumber.toString()),
     }));
-    const userTransferredTroves = events.filter((event) => (0, utils_1.compareAddresses)(event.to, account));
-    // check if the last know transfer address is the user
-    userTransferredTroves.forEach((event, index) => {
-        const otherTransfers = events.filter((e) => event.blockNumber < e.blockNumber && e.tokenId === event.tokenId);
-        // @ts-ignore
-        userTransferredTroves[index].invalid = !!otherTransfers.length;
-    });
-    // @ts-ignore
-    return userTransferredTroves.filter((event) => !event.invalid).map((event) => ({ troveId: event.tokenId }));
 });
-const _getLiquityV2UserTroveIds = (provider, network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account) => __awaiter(void 0, void 0, void 0, function* () {
-    const [{ troves: userTroves, nextFreeTroveIndex }, userTransferredTroves] = yield Promise.all([
-        getUserTroves(provider, network, selectedMarket.isLegacy, account, selectedMarket.marketAddress),
-        getTransferredTroves(provider, network, troveNFTAddress, limitBlocksForEventFetching, selectedMarket.value, account),
-    ]);
+/** The troves transferred to an account that it still holds: no later transfer of the same trove. */
+const getAccountTransferredTroves = (events, account) => events
+    .filter((event) => (0, utils_1.compareAddresses)(event.to, account))
+    .filter((event) => !events.some((e) => event.blockNumber < e.blockNumber && e.tokenId === event.tokenId))
+    .map((event) => ({ troveId: event.tokenId }));
+const getTransferredTroves = (provider, network, troveNFTAddress, limitBlocksForEventFetching, market, account) => __awaiter(void 0, void 0, void 0, function* () {
+    return (getAccountTransferredTroves(yield getTroveTransfers(provider, network, troveNFTAddress, limitBlocksForEventFetching, market), account));
+});
+/** The troves an account opened and still owns, then the ones transferred to it, each once. */
+const mergeTroveIds = (userTroves, userTransferredTroves) => {
     const troves = [...userTroves.map(({ troveId }) => ({ troveId })), ...userTransferredTroves];
     const filteredTroves = troves.filter((value, index, self) => index === self.findIndex((t) => (t.troveId === value.troveId)));
     const troveIds = filteredTroves.map((trove) => trove.troveId);
     const troveIdsSet = new Set(troveIds);
     const troveIdsArray = Array.from(troveIdsSet);
-    const trovesNoDuplicates = troveIdsArray.map((troveId) => troves.find((trove) => trove.troveId === troveId));
-    return { troves: trovesNoDuplicates, nextFreeTroveIndex };
+    return troveIdsArray.map((troveId) => troves.find((trove) => trove.troveId === troveId));
+};
+/**
+ * The trove ids of several accounts in one market: the market's NFT transfers are read once for all of them, rather
+ * than once per account as _getLiquityV2UserTroveIds does.
+ */
+const _getLiquityV2UsersTroveIds = (provider, network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, accounts) => __awaiter(void 0, void 0, void 0, function* () {
+    const [userTroves, events] = yield Promise.all([
+        Promise.all(accounts.map((account) => getUserTroves(provider, network, selectedMarket.isLegacy, account, selectedMarket.marketAddress))),
+        getTroveTransfers(provider, network, troveNFTAddress, limitBlocksForEventFetching, selectedMarket.value),
+    ]);
+    return Object.fromEntries(accounts.map((account, i) => [
+        account,
+        mergeTroveIds(userTroves[i].troves, getAccountTransferredTroves(events, account)).map(({ troveId }) => troveId),
+    ]));
+});
+exports._getLiquityV2UsersTroveIds = _getLiquityV2UsersTroveIds;
+const _getLiquityV2UserTroveIds = (provider, network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account) => __awaiter(void 0, void 0, void 0, function* () {
+    const [{ troves: userTroves, nextFreeTroveIndex }, userTransferredTroves] = yield Promise.all([
+        getUserTroves(provider, network, selectedMarket.isLegacy, account, selectedMarket.marketAddress),
+        getTransferredTroves(provider, network, troveNFTAddress, limitBlocksForEventFetching, selectedMarket.value, account),
+    ]);
+    return { troves: mergeTroveIds(userTroves, userTransferredTroves), nextFreeTroveIndex };
 });
 exports._getLiquityV2UserTroveIds = _getLiquityV2UserTroveIds;
 const getLiquityV2UserTroveIds = (provider, network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getLiquityV2UserTroveIds)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket, troveNFTAddress, limitBlocksForEventFetching, account); });