@defisaver/positions-sdk 2.1.161 → 2.1.163

package/cjs/types/aave.d.ts

@@ -40,6 +40,7 @@ export interface EModeCategoryData {
     borrowAssets: string[];
     ltvzeroBitmap?: string;
     ltvZeroAssets: string[];
+    isolated: boolean;
 }
 export interface EModeCategoryDataMapping {
     enteringTerms: boolean[];
@@ -126,6 +127,7 @@ export interface AavePositionData extends MMPositionData {
     minRatio: string;
     collRatio: string;
     safetyRatioWithLtvZeroFallback?: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;
@@ -159,6 +161,7 @@ export interface AaveV3AggregatedPositionData {
     collRatio: string;
     borrowLimitWithLtvZeroFallbackUsd: string;
     safetyRatioWithLtvZeroFallback: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;

package/cjs/types/aaveV4.d.ts

@@ -169,6 +169,7 @@ export interface AaveV4AggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     liqRatio: string;
     liqPercent: string;
     leveragedType: LeverageType;

package/cjs/types/compound.d.ts

@@ -96,6 +96,7 @@ export interface CompoundAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -115,6 +116,7 @@ export interface CompoundAggregatedPositionData {
 export interface CompoundPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;

package/cjs/types/curveUsd.d.ts

@@ -73,6 +73,9 @@ export interface CrvUSDAggregatedPositionData {
     collFactor: string;
     leveragedType: LeverageType;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
     leveragedAsset?: string;
     liquidationPrice?: string;
 }
@@ -113,4 +116,7 @@ export interface CrvUSDUserData {
     collateralPrice: string;
     collRatio: string;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }

package/cjs/types/fluid.d.ts

@@ -323,6 +323,7 @@ export interface FluidAggregatedVaultData {
     merklBorrowIncentives: IncentiveData[];
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     minRatio: string;
     totalInterestUsd: string;
     leveragedType?: LeverageType;

package/cjs/types/liquity.d.ts

@@ -24,7 +24,11 @@ export interface LiquityTroveInfo {
     totalETH: string;
     totalLUSD: string;
     minCollateralRatio: number;
+    safetyRatio: string;
     priceForRecovery: string;
     debtInFront: string;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }

package/cjs/types/liquityV2.d.ts

@@ -94,6 +94,7 @@ export interface LiquityV2AggregatedTroveData {
     liquidationPrice: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     exposure: string;
 }
 export interface LiquityV2TroveData {
@@ -101,6 +102,7 @@ export interface LiquityV2TroveData {
     troveId: string;
     ratio: string;
     collRatio: string;
+    safetyRatio?: string;
     liqRatio: string;
     borrowLimitRatio: string;
     interestRate: string;

package/cjs/types/maker.d.ts

@@ -43,6 +43,7 @@ export interface CdpData {
     debtAssetMarketPrice: string;
     liquidationPrice: string;
     ratio: string;
+    safetyRatio: string;
     liqRatio: string;
     liqPercent: number;
     assetPrice: string;
@@ -58,4 +59,7 @@ export interface CdpData {
     liquidationFee: string;
     lastUpdated: number;
     exposure: string;
+    netApy: string;
+    totalInterestUsd: string;
+    incentiveUsd: string;
 }

package/cjs/types/morphoBlue.d.ts

@@ -185,6 +185,7 @@ export interface MorphoBlueAggregatedPositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
+    safetyRatio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;
@@ -207,6 +208,7 @@ export interface MorphoBluePositionData {
     totalInterestUsd: string;
     ltv: string;
     ratio: string;
+    safetyRatio?: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;

package/cjs/types/morphoMidnight.d.ts

@@ -170,6 +170,7 @@ export interface MorphoMidnightAggregatedPositionData {
     ltv: string;
     ratio: string;
     healthRatio: string;
+    safetyRatio: string;
     leveragedType: LeverageType;
     leveragedAsset?: string;
     currentVolatilePairRatio?: string;

package/cjs/types/portfolio.d.ts

@@ -1,15 +1,16 @@
-import { AaveV2PositionData, AaveV3PositionData, AaveVersions } from './aave';
-import { AaveV4AccountData, AaveV4SpokesType } from './aaveV4';
+import { AaveV2MarketData, AaveV2PositionData, AaveV3MarketData, AaveV3PositionData, AaveVersions } from './aave';
+import { AaveV4AccountData, AaveV4SpokeData, AaveV4SpokesType } from './aaveV4';
 import { EthAddress } from './common';
-import { CompoundV2PositionData, CompoundV3PositionData, CompoundVersions } from './compound';
-import { CrvUSDUserData, CrvUSDVersions } from './curveUsd';
-import { FluidVaultData } from './fluid';
+import { CompoundV2MarketsData, CompoundV2PositionData, CompoundV3MarketsData, CompoundV3PositionData, CompoundVersions } from './compound';
+import { CrvUSDGlobalMarketData, CrvUSDUserData, CrvUSDVersions } from './curveUsd';
+import { FluidMarketData, FluidVaultData } from './fluid';
 import { LiquityTroveInfo } from './liquity';
-import { LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
-import { CdpData } from './maker';
-import { MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
-import { MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
-import { SparkPositionData, SparkVersions } from './spark';
+import { LiquityV2MarketData } from './liquityV2';
+import { LlamaLendGlobalMarketData, LlamaLendUserData, LlamaLendVersionsType } from './llamaLend';
+import { CdpData, IlkInfo } from './maker';
+import { MorphoBlueMarketInfo, MorphoBluePositionData, MorphoBlueVersions } from './morphoBlue';
+import { MorphoMidnightMarketInfo, MorphoMidnightPositionData, MorphoMidnightVersions } from './morphoMidnight';
+import { SparkMarketsData, SparkPositionData, SparkVersions } from './spark';
 export interface PortfolioProtocolData<T> {
     error: string;
     data: T | null;
@@ -59,3 +60,18 @@ export interface PortfolioPositionsDataForAddress {
 export interface PortfolioPositionsData {
     [key: EthAddress]: PortfolioPositionsDataForAddress;
 }
+export interface PortfolioMarketsData {
+    morphoMarketsData: Record<string, MorphoBlueMarketInfo>;
+    morphoMidnightMarketsData: Record<string, MorphoMidnightMarketInfo>;
+    compoundV3MarketsData: Record<string, CompoundV3MarketsData>;
+    sparkMarketsData: Record<string, SparkMarketsData>;
+    aaveV3MarketsData: Record<string, AaveV3MarketData>;
+    aaveV2MarketsData: Record<string, AaveV2MarketData>;
+    compoundV2MarketsData: Record<string, CompoundV2MarketsData>;
+    crvUsdMarketsData: Record<string, CrvUSDGlobalMarketData>;
+    llamaLendMarketsData: Record<string, LlamaLendGlobalMarketData>;
+    liquityV2MarketsData: Record<string, LiquityV2MarketData>;
+    aaveV4SpokesData: Record<string, AaveV4SpokeData>;
+    fluidMarketsData: Record<string, FluidMarketData>;
+    makerMarketsData: Record<string, IlkInfo>;
+}

package/cjs/types/spark.d.ts

@@ -85,6 +85,7 @@ export interface SparkAggregatedPositionData {
     leftToBorrowUsd: string;
     ratio: string;
     collRatio: string;
+    safetyRatio: string;
     netApy: string;
     incentiveUsd: string;
     totalInterestUsd: string;
@@ -104,6 +105,7 @@ export interface SparkPositionData extends MMPositionData {
     ratio: string;
     minRatio: string;
     collRatio: string;
+    safetyRatio?: string;
     suppliedUsd: string;
     borrowedUsd: string;
     borrowLimitUsd: string;

package/esm/aaveV2/index.js

@@ -167,6 +167,8 @@ export const _getAaveV2AccountData = (provider, network, address, assetsData, ma
     payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
         ? new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString()
         : '0';
+    // Aave v2 has no LTV-0 fallback (AaveV3View only), so its safety ratio is the plain ratio.
+    payload.safetyRatio = payload.ratio;
     // Calculate borrow limits per asset
     Object.values(payload.usedAssets).forEach((item) => {
         if (item.isBorrowed) {

package/esm/aaveV3/index.js

@@ -31,7 +31,10 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
             : !usedAssetsValues.filter(u => u.isBorrowed && !e.borrowAssets.includes(u.symbol)).length;
         const afterEnteringCategory = aaveAnyGetAggregatedPositionData(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: e.id }));
         const willStayOverCollateralized = new Dec(afterEnteringCategory.ratio === 'NaN' ? '0' : afterEnteringCategory.ratio).eq(0) || new Dec(afterEnteringCategory.ratio).gt(afterEnteringCategory.liqPercent);
-        const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized];
+        const collateralOnlyFromCategory = e.id === 0 || !e.isolated
+            ? true
+            : !usedAssetsValues.filter(u => u.isSupplied && u.collateral && !e.collateralAssets.includes(u.symbol)).length;
+        const enteringTerms = [borrowingOnlyFromCategory, willStayOverCollateralized, collateralOnlyFromCategory];
         categoriesMapping[e.id] = {
             enteringTerms,
             canEnterCategory: !enteringTerms.includes(false),
@@ -48,6 +51,7 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 };
 export function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
+        var _a;
         const _addresses = market.assets.map(a => getAssetInfo(getWrappedNativeAssetFromUnwrapped(a), network).address);
         const loanInfoContract = AaveV3ViewContractViem(provider, network);
         const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
@@ -81,6 +85,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
                     borrowableBitmap: eModesInfo[i].borrowableBitmap.toString(),
                     collateralBitmap: eModesInfo[i].collateralBitmap.toString(),
                     ltvzeroBitmap: eModesInfo[i].ltvzeroBitmap.toString(),
+                    isolated: (_a = eModesInfo[i].isolated) !== null && _a !== void 0 ? _a : false,
                     borrowAssets: [],
                     collateralAssets: [],
                     ltvZeroAssets: [],
@@ -296,6 +301,7 @@ export function _getAaveV3MarketData(provider_1, network_1, market_1) {
             collateralAssets: assetsData.map((a) => a.symbol),
             borrowAssets: assetsData.map((a) => a.symbol),
             ltvZeroAssets: [],
+            isolated: false,
         };
         return { assetsData: payload, eModeCategoriesData };
     });

package/esm/curveUsd/index.d.ts

@@ -5,6 +5,9 @@ export declare const _getCurveUsdGlobalData: (provider: Client, network: Network
 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: EthereumProvider, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress, controllerAddress: EthAddress) => Promise<PositionBalances>;
-export declare const _getCurveUsdUserData: (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string) => Promise<CrvUSDUserData>;
-export declare const getCurveUsdUserData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string) => Promise<CrvUSDUserData>;
+/**
+ * @param borrowRate market borrow APY in % (`CrvUSDGlobalMarketData.borrowRate`); when omitted it is read from the view contract
+ */
+export declare const _getCurveUsdUserData: (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string) => Promise<CrvUSDUserData>;
+export declare const getCurveUsdUserData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string) => Promise<CrvUSDUserData>;
 export declare const getCurveUsdFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData) => Promise<CrvUSDUserData>;

package/esm/curveUsd/index.js

@@ -16,6 +16,12 @@ import { getCrvUsdAggregatedData } from '../helpers/curveUsdHelpers';
 import { CrvUsdMarkets } from '../markets';
 import { wethToEth } from '../services/utils';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
+/** Converts a per-second AMM rate (wei, 18 decimals) into a yearly compounded borrow APY in %. */
+const ammRateToBorrowApy = (rateWei) => {
+    const exponent = new Dec(assetAmountInEth(rateWei)).mul(365).mul(86400);
+    return new Dec(new Dec(2.718281828459).pow(exponent).minus(1)).mul(100).toString();
+};
 const getAndFormatBands = (provider, network, selectedMarket, _minBand, _maxBand) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = CrvUSDViewContractViem(provider, network);
     const minBand = parseInt(_minBand, 10);
@@ -65,14 +71,8 @@ export const _getCurveUsdGlobalData = (provider, network, selectedMarket) => __a
     // all prices are in 18 decimals
     const totalDebt = assetAmountInEth(data.totalDebt.toString(), debtAsset);
     const ammPrice = assetAmountInEth(data.ammPrice.toString(), debtAsset);
-    const rate = assetAmountInEth(data.ammRate.toString());
-    const futureRate = assetAmountInEth(data.monetaryPolicyRate.toString());
-    const exponentRate = new Dec(rate).mul(365).mul(86400);
-    const exponentFutureRate = new Dec(futureRate).mul(365).mul(86400);
-    const borrowRate = new Dec(new Dec(2.718281828459).pow(exponentRate).minus(1)).mul(100)
-        .toString();
-    const futureBorrowRate = new Dec(new Dec(2.718281828459).pow(exponentFutureRate).minus(1)).mul(100)
-        .toString();
+    const borrowRate = ammRateToBorrowApy(data.ammRate.toString());
+    const futureBorrowRate = ammRateToBorrowApy(data.monetaryPolicyRate.toString());
     const bandsData = yield getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString());
     const leftToBorrow = new Dec(debtCeiling.toString()).minus(totalDebt).toString();
     const loanDiscount = assetAmountInEth(loanDiscountWei.toString(), debtAsset);
@@ -121,11 +121,20 @@ export const _getCrvUsdAccountBalances = (provider, network, block, addressMappi
     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); });
-export const _getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand) => __awaiter(void 0, void 0, void 0, function* () {
+/**
+ * @param borrowRate market borrow APY in % (`CrvUSDGlobalMarketData.borrowRate`); when omitted it is read from the view contract
+ */
+export const _getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand, borrowRate) => __awaiter(void 0, void 0, void 0, function* () {
     const contract = CrvUSDViewContractViem(provider, network);
-    const data = yield contract.read.userData([selectedMarket.controllerAddress, address]);
     const collAsset = selectedMarket.collAsset;
     const debtAsset = selectedMarket.baseAsset;
+    const [data, collStakingApy, marketBorrowRate] = yield Promise.all([
+        contract.read.userData([selectedMarket.controllerAddress, address]),
+        STAKING_ASSETS.includes(collAsset) ? getStakingApy(collAsset) : Promise.resolve('0'),
+        borrowRate !== undefined
+            ? Promise.resolve(borrowRate)
+            : contract.read.globalData([selectedMarket.controllerAddress]).then((globalData) => ammRateToBorrowApy(globalData.ammRate.toString())),
+    ]);
     const health = assetAmountInEth(data.health.toString());
     const healthPercent = new Dec(health).mul(100).toString();
     const collPrice = assetAmountInEth(data.collateralPrice.toString(), debtAsset);
@@ -156,7 +165,7 @@ export const _getCurveUsdUserData = (provider, network, address, selectedMarket,
             isBorrowed: new Dec(debtBorrowed).gt('0'),
             symbol: 'crvUSD',
             price: '1',
-            interestRate: '0',
+            interestRate: marketBorrowRate,
         },
     } : {};
     const priceHigh = assetAmountInEth(data.priceHigh.toString());
@@ -168,13 +177,19 @@ export const _getCurveUsdUserData = (provider, network, address, selectedMarket,
         healthPercent,
         priceHigh,
         priceLow, liquidationDiscount: assetAmountInEth(data.liquidationDiscount.toString()), numOfBands: data.N.toString(), usedAssets,
-        status }), getCrvUsdAggregatedData({
-        loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket, numOfBands: data.N.toString(),
+        status, borrowRate: marketBorrowRate }), getCrvUsdAggregatedData({
+        loanExists: data.loanExists,
+        usedAssets,
+        network: NetworkNumber.Eth,
+        selectedMarket,
+        numOfBands: data.N.toString(),
+        borrowRate: marketBorrowRate,
+        collStakingApy,
     })), { userBands });
 });
-export const getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand) => __awaiter(void 0, void 0, void 0, function* () { return _getCurveUsdUserData(getViemProvider(provider, network), network, address, selectedMarket, activeBand); });
+export const getCurveUsdUserData = (provider, network, address, selectedMarket, activeBand, borrowRate) => __awaiter(void 0, void 0, void 0, function* () { return _getCurveUsdUserData(getViemProvider(provider, network), network, address, selectedMarket, activeBand, borrowRate); });
 export const getCurveUsdFullPositionData = (provider, network, address, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield getCurveUsdGlobalData(provider, network, selectedMarket);
-    const positionData = yield getCurveUsdUserData(provider, network, address, selectedMarket, marketData.activeBand);
+    const positionData = yield getCurveUsdUserData(provider, network, address, selectedMarket, marketData.activeBand, marketData.borrowRate);
     return positionData;
 });

package/esm/fluid/index.d.ts

@@ -133,6 +133,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 +168,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 +203,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 +224,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/esm/fluid/index.js

@@ -1381,3 +1381,36 @@ export const _getUserPositionsPortfolio = (provider, network, user) => __awaiter
         userData: userData[i],
     })).filter(md => md.marketData !== undefined);
 });
+export const _getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const versions = getFluidVersionsDataForNetwork(network);
+    if (versions.length === 0)
+        return {};
+    const view = 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 = [getAssetInfoByAddress(vaultData.supplyToken0, network).symbol, getAssetInfoByAddress(vaultData.borrowToken0, network).symbol];
+        if (vaultData.supplyToken1 && !compareAddresses(ZERO_ADDRESS, vaultData.supplyToken1))
+            vaultTokens.push(getAssetInfoByAddress(vaultData.supplyToken1, network).symbol);
+        if (vaultData.borrowToken1 && !compareAddresses(ZERO_ADDRESS, vaultData.borrowToken1))
+            vaultTokens.push(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),
+        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] = attachFluidMerklIncentives(marketData, merklCampaigns);
+    });
+    return marketsData;
+});
+export const getAllFluidMarketDataPortfolio = (provider, network) => __awaiter(void 0, void 0, void 0, function* () { return _getAllFluidMarketDataPortfolio(getViemProvider(provider, network, { batch: { multicall: true } }), network); });

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

@@ -33,6 +33,12 @@ export const isAaveV2 = ({ selectedMarket }) => selectedMarket.value === AaveVer
 export const isAaveV3 = ({ selectedMarket }) => AAVE_V3_MARKETS.includes(selectedMarket.value);
 export const aaveV3IsInIsolationMode = ({ usedAssets, assetsData }) => Object.values(usedAssets).some(({ symbol, collateral }) => collateral && assetsData[symbol].isIsolated);
 export const aaveV3IsInSiloedMode = ({ usedAssets, assetsData }) => Object.values(usedAssets).some(({ symbol, debt }) => debt && assetsData[symbol].isSiloed);
+export 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); };
+export const aaveV3CanBeCollateralInEmode = ({ eModeCategory, eModeCategoriesData }, _asset) => {
+    if (!aaveV3IsEmodeIsolated({ eModeCategory, eModeCategoriesData }))
+        return true;
+    return eModeCategoriesData[eModeCategory].collateralAssets.includes(getNativeAssetFromWrapped(_asset));
+};
 export const aaveAnyGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets)
     .filter(({ isSupplied, collateral }) => isSupplied && collateral);
 export const aaveAnyGetSuppliableAssets = (_a) => {
@@ -40,13 +46,16 @@ export const aaveAnyGetSuppliableAssets = (_a) => {
     const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const collAccountAssets = aaveAnyGetCollSuppliedAssets(data);
     const marketAssets = Object.values(assetsData);
-    if (collAccountAssets.length === 0 || !isAaveV3(data))
+    if (!isAaveV3(data))
         return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: true }));
+    const canBeCollateralInEmode = (symbol) => aaveV3CanBeCollateralInEmode(data, symbol);
+    if (collAccountAssets.length === 0)
+        return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: canBeCollateralInEmode(symbol) }));
     if (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) }));
 };
 export const aaveAnyGetSuppliableAsCollAssets = (_a) => {
     var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
@@ -56,12 +65,15 @@ export const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData
     const asset = 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 Dec(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))
@@ -96,7 +108,10 @@ export const aaveAnyGetUserReserveLtvAndLltv = ({ eModeCategory, eModeCategories
         || !eModeCategoryData
         || !eModeCategoryData.collateralAssets.includes(asset)
         || new Dec(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 };
@@ -125,6 +140,9 @@ export const aaveAnyGetAggregatedPositionData = (_a) => {
         return new Dec(suppliedUsd).mul(effectiveLtv);
     });
     payload.safetyRatioWithLtvZeroFallback = +payload.suppliedUsd ? new Dec(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 Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);

package/esm/helpers/aaveV4Helpers/index.js

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

package/esm/helpers/compoundHelpers/index.js

@@ -93,6 +93,7 @@ export const getCompoundV2AggregatedData = (_a) => {
     payload.collRatio = payload.borrowedUsd && payload.borrowedUsd !== '0'
         ? new Dec(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) {
@@ -134,6 +135,7 @@ export const getCompoundV3AggregatedData = (_a) => {
     payload.incentiveUsd = incentiveUsd;
     payload.totalInterestUsd = totalInterestUsd;
     payload.minRatio = '100';
+    payload.safetyRatio = payload.ratio;
     payload.liqRatio = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).toString();
     payload.liqPercent = new Dec(payload.borrowLimitUsd).div(payload.liquidationLimitUsd).mul(100).toString();
     payload.minDebt = assetsData[selectedMarket.baseAsset].minDebt;

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

@@ -10,11 +10,12 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import Dec from 'decimal.js';
-import { calcLeverageLiqPrice, getAssetsTotal, getExposure, isLeveragedPos, } from '../../moneymarket';
+import { calcLeverageLiqPrice, getAssetsTotal, getExposure, getSafetyRatioFromCollateralRatio, isLeveragedPos, } from '../../moneymarket';
 import { mapRange } from '../../services/utils';
+import { calculateNetApyFromRates } from '../../staking';
 export 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 = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ supplied }) => supplied); // this is wrong if we are in soft-liquidations
     payload.borrowed = getAssetsTotal(usedAssets, ({ isBorrowed }) => isBorrowed, ({ borrowed }) => borrowed);
@@ -28,6 +29,7 @@ export const getCrvUsdAggregatedData = (_a) => {
         : '0';
     // this is all approximation
     payload.minAllowedRatio = mapRange(numOfBands, 4, 50, 115, 140); // collateral ratio
+    payload.safetyRatio = loanExists ? getSafetyRatioFromCollateralRatio(payload.ratio, payload.minAllowedRatio) : '0';
     payload.collFactor = new Dec(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)
@@ -41,5 +43,16 @@ export const getCrvUsdAggregatedData = (_a) => {
         payload.liquidationPrice = calcLeverageLiqPrice(leveragedType, usedAssets[selectedMarket.collAsset].price, payload.borrowedUsd, payload.borrowLimitUsd);
     }
     payload.exposure = 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 } = 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;
 };

package/esm/helpers/fluidHelpers/index.js

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

package/esm/helpers/liquityV2Helpers/index.js

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