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

package/src/aaveV4/lend.ts

@@ -7,26 +7,9 @@ import {
   EthereumProvider,
   NetworkNumber,
 } from '../types/common';
+import { AaveV4TokenizationSpokeDataParsed } from '../types/aaveV4';
 
-export interface AaveV4TokenizationSpokeData {
-  underlyingAsset: EthAddress;
-  assetId: string;
-  decimals: number;
-  spoke: EthAddress;
-  spokeActive: boolean;
-  spokeHalted: boolean;
-  spokeDepositCap: string;
-  spokeTotalAssets: string;
-  spokeTotalShares: string;
-  hub: EthAddress;
-  hubLiquidity: string;
-  hubDrawnRate: string;
-  convertToShares: string;
-  convertToAssets: string;
-  user: EthAddress;
-  userSuppliedAssets: string;
-  userSuppliedShares: string;
-}
+export type { AaveV4TokenizationSpokeData, AaveV4TokenizationSpokeDataParsed } from '../types/aaveV4';
 
 export const AAVE_V4_TOKENIZED_SPOKES: Record<string, EthAddress> = {
   EURC_CORE: '0x6D9e2Cdd61CaF69af99b275704B6e272C41c6718',
@@ -102,34 +85,6 @@ export const aaveV4GetTokenizedVaultAddress = (
   return AAVE_V4_TOKENIZED_SPOKES[key];
 };
 
-/** Parsed tokenization spoke data with human-readable supplied amounts for display */
-export interface AaveV4TokenizationSpokeDataParsed {
-  vaultAddress: EthAddress;
-  key: string | null;
-  symbol: string;
-  hubKey: string;
-  // ---- Spoke ----
-  spokeActive: boolean;
-  spokeHalted: boolean;
-  /** Deposit cap in asset units (wei string) */
-  spokeDepositCap: string;
-  /** Total assets currently in spoke in asset units (wei string) */
-  spokeTotalAssets: string;
-  // ---- Hub ----
-  /** Available hub liquidity in asset units (wei string) */
-  hubLiquidity: string;
-  /** The conversion rate from assets to shares expressed in asset units. */
-  convertToShares: string;
-  // ---- User ----
-  userSuppliedAssetsEth: string;
-  userSuppliedSharesEth: string;
-  userSuppliedAssets: string;
-  userSuppliedShares: string;
-  underlyingAsset: EthAddress;
-  spoke: EthAddress;
-  decimals: number;
-}
-
 const AAVE_V4_TOKENIZED_SPOKE_ADDRESS_TO_KEY: Record<string, string> = Object.entries(
   AAVE_V4_TOKENIZED_SPOKES,
 ).reduce((acc, [k, v]) => {
@@ -189,4 +144,3 @@ export async function getAaveV4TokenizationSpokesData(
   }).filter(item => item != null);
 }
 
-

package/src/claiming/aaveV3.ts

@@ -1,7 +1,9 @@
 import { Client } from 'viem';
 import Dec from 'decimal.js';
 import { EthAddress, NetworkNumber } from '../types';
-import { ClaimableToken, ClaimType, MerklRewardsClaimableToken } from '../types/claiming';
+import {
+  AaveRewardsClaimableToken, ClaimableToken, ClaimType, MerklRewardsClaimableToken,
+} from '../types/claiming';
 import {
   AaveIncentiveDataProviderV3ContractViem,
   AaveRewardsControllerViem,
@@ -37,7 +39,7 @@ export async function getUnclaimedRewardsForAllMarkets(
   network: NetworkNumber,
   walletAddress: EthAddress,
   marketAddress: EthAddress,
-): Promise<ClaimableToken[]> {
+): Promise<AaveRewardsClaimableToken[]> {
   const contract = AaveIncentiveDataProviderV3ContractViem(provider, network);
   const tokensData = await contract.read.getUserReservesIncentivesData([marketAddress, walletAddress]);
   const allTokensDataArrays = tokensData.reduce((acc: any[], val) => {

package/src/claiming/ethena.ts

@@ -2,7 +2,7 @@ import { getAssetInfo } from '@defisaver/tokens';
 import Dec from 'decimal.js';
 import { getAddress } from 'viem';
 import { EthAddress } from '../types/common';
-import { ClaimType } from '../types/claiming';
+import { ClaimType, EthenaAirdropClaimableToken } from '../types/claiming';
 import { getEthAmountForDecimals } from '../services/utils';
 
 export const fetchEthenaAirdropReward = async (address: EthAddress) => {
@@ -23,11 +23,11 @@ export const fetchEthenaAirdropReward = async (address: EthAddress) => {
   }
 };
 
-export const fetchEthenaAirdropRewards = async (walletAddresses: EthAddress[]): Promise<Record<string, any[]>> => {
+export const fetchEthenaAirdropRewards = async (walletAddresses: EthAddress[]): Promise<Record<string, EthenaAirdropClaimableToken[]>> => {
   const apiDataPromises = walletAddresses.map(address => fetchEthenaAirdropReward(address));
   const apiDataArray = await Promise.all(apiDataPromises);
 
-  const results: Record<string, any[]> = {};
+  const results: Record<string, EthenaAirdropClaimableToken[]> = {};
   for (let i = 0; i < walletAddresses.length; i++) {
     const walletAddress = walletAddresses[i];
     const data = apiDataArray[i];
@@ -36,7 +36,7 @@ export const fetchEthenaAirdropRewards = async (walletAddresses: EthAddress[]):
       continue;
     }
 
-    const processedRewards = [];
+    const processedRewards: EthenaAirdropClaimableToken[] = [];
     const assetInfo = getAssetInfo('sENA');
 
     const amount = getEthAmountForDecimals(data.events[0].awardAmount, assetInfo.decimals);
@@ -47,7 +47,7 @@ export const fetchEthenaAirdropRewards = async (walletAddresses: EthAddress[]):
         underlyingSymbol: assetInfo.symbol,
         amount,
         claimType: ClaimType.ETHENA_AIRDROP,
-        tokenAddress: assetInfo.address,
+        tokenAddress: assetInfo.address as EthAddress,
         walletAddress,
         label: 'Ethena Airdrop',
       });

package/src/claiming/king.ts

@@ -3,7 +3,7 @@ import { assetAmountInEth } from '@defisaver/tokens';
 import { Client } from 'viem';
 import { UUPSViem } from '../contracts';
 import { EthAddress, HexString, NetworkNumber } from '../types/common';
-import { ClaimType } from '../types/claiming';
+import { ClaimType, KingRewardsClaimableToken } from '../types/claiming';
 
 export const fetchKingRewards = async (walletAddress: EthAddress) => {
   try {
@@ -19,7 +19,7 @@ export const fetchKingRewards = async (walletAddress: EthAddress) => {
   }
 };
 
-export const getKingRewards = async (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]) => {
+export const getKingRewards = async (provider: Client, network: NetworkNumber, walletAddresses: EthAddress[]): Promise<Record<string, KingRewardsClaimableToken[]>> => {
   // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
   const apiDataPromises = walletAddresses.map(address => fetchKingRewards(address));
   const apiDataArray = await Promise.all(apiDataPromises);
@@ -31,7 +31,7 @@ export const getKingRewards = async (provider: Client, network: NetworkNumber, w
   const cumulativeResults = await Promise.all(cumulativePromises);
 
   // Process results
-  const results: Record<string, any[]> = {};
+  const results: Record<string, KingRewardsClaimableToken[]> = {};
 
   for (let i = 0; i < walletAddresses.length; i++) {
     const walletAddress = walletAddresses[i];

package/src/claiming/spark.ts

@@ -7,7 +7,9 @@ import {
   SparkRewardsControllerViem,
 } from '../contracts';
 import { EthAddress, NetworkNumber } from '../types/common';
-import { ClaimType, SparkAirdropType, SparkRewardsClaimableToken } from '../types/claiming';
+import {
+  ClaimType, SparkAirdropClaimableToken, SparkAirdropType, SparkRewardsClaimableToken,
+} from '../types/claiming';
 import { compareAddresses, getEthAmountForDecimals } from '../services/utils';
 
 const IGNITION_REWARDS = '0xCBA0C0a2a0B6Bb11233ec4EA85C5bFfea33e724d';
@@ -50,7 +52,7 @@ export const fetchSparkAirdropRewards = async (
   provider: Client,
   network: NetworkNumber,
   walletAddresses: EthAddress[],
-) => {
+): Promise<Record<string, SparkAirdropClaimableToken[]>> => {
   // Fetch all API data in parallel (these are external API calls, can't be batched with multicall)
   const apiDataPromises = walletAddresses.map(address => fetchSpkAirdropRewards(address));
   const apiDataArray = await Promise.all(apiDataPromises);
@@ -92,7 +94,7 @@ export const fetchSparkAirdropRewards = async (
   const cumulativeClaimedAmounts = await getCumulativeClaimedSpkAirdrop(provider, network, contractCallsData);
 
   // Process results
-  const results: Record<string, any[]> = {};
+  const results: Record<string, SparkAirdropClaimableToken[]> = {};
   let contractCallIndex = 0;
 
   for (const { walletAddress, data } of allClaimData) {
@@ -101,7 +103,7 @@ export const fetchSparkAirdropRewards = async (
       continue;
     }
 
-    const processedRewards = [];
+    const processedRewards: SparkAirdropClaimableToken[] = [];
     for (let i = 0; i < data.length; i++) {
       const rewardInfo = data[i];
       const assetInfo = getAssetInfoByAddress(rewardInfo.token_address);

package/src/curveUsd/index.ts

@@ -14,6 +14,13 @@ 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: string) => {
+  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 = async (provider: Client, network: NetworkNumber, selectedMarket: CrvUSDMarketData, _minBand: string, _maxBand: string) => {
   const contract = CrvUSDViewContractViem(provider, network);
@@ -69,15 +76,8 @@ export const _getCurveUsdGlobalData = async (provider: Client, network: NetworkN
   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 = await getAndFormatBands(provider, network, selectedMarket, data.minBand.toString(), data.maxBand.toString());
 
@@ -164,13 +164,22 @@ export const getCrvUsdAccountBalances = async (
   controllerAddress: EthAddress,
 ): Promise<PositionBalances> => _getCrvUsdAccountBalances(getViemProvider(provider, network), network, block, addressMapping, address, controllerAddress);
 
-export const _getCurveUsdUserData = async (provider: Client, 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 const _getCurveUsdUserData = async (provider: Client, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData, activeBand: string, borrowRate?: string): Promise<CrvUSDUserData> => {
   const contract = CrvUSDViewContractViem(provider, network);
-
-  const data = await contract.read.userData([selectedMarket.controllerAddress, address]);
   const collAsset = selectedMarket.collAsset;
   const debtAsset = selectedMarket.baseAsset;
 
+  const [data, collStakingApy, marketBorrowRate] = await 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);
@@ -202,7 +211,7 @@ export const _getCurveUsdUserData = async (provider: Client, network: NetworkNum
       isBorrowed: new Dec(debtBorrowed).gt('0'),
       symbol: 'crvUSD',
       price: '1',
-      interestRate: '0',
+      interestRate: marketBorrowRate,
     },
   } : {};
 
@@ -232,8 +241,15 @@ export const _getCurveUsdUserData = async (provider: Client, network: NetworkNum
     numOfBands: data.N.toString(),
     usedAssets,
     status,
+    borrowRate: marketBorrowRate,
     ...getCrvUsdAggregatedData({
-      loanExists: data.loanExists, usedAssets, network: NetworkNumber.Eth, selectedMarket, numOfBands: data.N.toString(),
+      loanExists: data.loanExists,
+      usedAssets,
+      network: NetworkNumber.Eth,
+      selectedMarket,
+      numOfBands: data.N.toString(),
+      borrowRate: marketBorrowRate,
+      collStakingApy,
     }),
     userBands,
   };
@@ -245,10 +261,11 @@ export const getCurveUsdUserData = async (
   address: EthAddress,
   selectedMarket: CrvUSDMarketData,
   activeBand: string,
-): Promise<CrvUSDUserData> => _getCurveUsdUserData(getViemProvider(provider, network), network, address, selectedMarket, activeBand);
+  borrowRate?: string,
+): Promise<CrvUSDUserData> => _getCurveUsdUserData(getViemProvider(provider, network), network, address, selectedMarket, activeBand, borrowRate);
 
 export const getCurveUsdFullPositionData = async (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, selectedMarket: CrvUSDMarketData): Promise<CrvUSDUserData> => {
   const marketData = await getCurveUsdGlobalData(provider, network, selectedMarket);
-  const positionData = await getCurveUsdUserData(provider, network, address, selectedMarket, marketData.activeBand);
+  const positionData = await getCurveUsdUserData(provider, network, address, selectedMarket, marketData.activeBand, marketData.borrowRate);
   return positionData;
 };

package/src/fluid/index.ts

@@ -10,6 +10,7 @@ import {
   FluidAggregatedVaultData,
   FluidAssetData,
   FluidAssetsData,
+  FluidEarnPositionData,
   FluidFTokenDataStructOutput,
   FluidMarketData,
   FluidMarketInfo,
@@ -1597,7 +1598,7 @@ export const getFluidTokenData = async (
   token: string,
 ) => _getFluidTokenData(getViemProvider(provider, network), network, token);
 
-const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPosition: FluidUserEarnPositionStructOutput, apiData: any, fTokenAddress?: string) => {
+const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPosition: FluidUserEarnPositionStructOutput, apiData: any, fTokenAddress?: string): FluidEarnPositionData => {
   const decimals = fTokenData.decimals.toString();
   const depositRate = new Dec(getEthAmountForDecimals(fTokenData.convertToShares.toString(), decimals)).toString();
   const withdrawRate = new Dec(getEthAmountForDecimals(fTokenData.convertToAssets.toString(), decimals)).toString();
@@ -1645,7 +1646,7 @@ export const getFluidDepositData = async (
   address: EthAddress,
 ) => _getFluidDepositData(getViemProvider(provider, network), network, token, address);
 
-export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, network: NetworkNumber, user: EthAddress) => {
+export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, network: NetworkNumber, user: EthAddress): Promise<FluidEarnPositionData[]> => {
   const view = FluidViewContractViem(provider, network);
   const [
     [userPositions, fTokensData],
@@ -1664,7 +1665,7 @@ export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, netw
     rewardsData = await rewardsApiResponse.json();
   }
 
-  const parsedRes = fTokensData.reduce<ReturnType<typeof parseFDepositTokenData>[]>((acc, fTokenData, i) => {
+  const parsedRes = fTokensData.reduce<FluidEarnPositionData[]>((acc, fTokenData, i) => {
     const userPosition = userPositions[i];
     const deposited = userPosition?.underlyingAssets;
 
@@ -1830,3 +1831,43 @@ export const _getUserPositionsPortfolio = async (provider: PublicClient, network
     userData: userData[i],
   })).filter(md => md.marketData !== undefined);
 };
+
+
+export const _getAllFluidMarketDataPortfolio = async (provider: PublicClient, network: NetworkNumber): Promise<Record<string, FluidMarketData>> => {
+  const versions = getFluidVersionsDataForNetwork(network);
+  if (versions.length === 0) return {};
+
+  const view = FluidViewContractViem(provider, network);
+  const vaultsData = await 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] = await Promise.all([
+    getTokensPricesForPortfolio(tokens, provider, network),
+    getFluidMerklCampaigns(network),
+  ]);
+
+  const parsedMarketsData = await Promise.all(vaultsData.map(async (vaultData) => parseMarketData(provider, vaultData, network, tokenPrices)));
+
+  const marketsData: Record<string, FluidMarketData> = {};
+  parsedMarketsData.forEach((marketData, i) => {
+    if (!marketData) return;
+    marketsData[versions[i].value] = attachFluidMerklIncentives(marketData, merklCampaigns);
+  });
+
+  return marketsData;
+};
+
+export const getAllFluidMarketDataPortfolio = async (
+  provider: EthereumProvider,
+  network: NetworkNumber,
+): Promise<Record<string, FluidMarketData>> => _getAllFluidMarketDataPortfolio(getViemProvider(provider, network, { batch: { multicall: true } }), network);

package/src/helpers/aaveHelpers/index.ts

@@ -2,7 +2,7 @@ import Dec from 'decimal.js';
 import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { Client } from 'viem';
 import {
-  AaveAssetData, AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions,
+  AaveAssetData, AaveHelperCommon, AaveMarketInfo, AaveV3AggregatedPositionData, AaveV3AssetsData, AaveV3UsedAsset, AaveV3UsedAssets, AaveVersions, EModeCategoriesData,
 } from '../../types';
 import { getNativeAssetFromWrapped, getWrappedNativeAssetFromUnwrapped } from '../../services/utils';
 import {
@@ -24,6 +24,13 @@ export const isAaveV3 = ({ selectedMarket }: { selectedMarket: Partial<AaveMarke
 export const aaveV3IsInIsolationMode = ({ usedAssets, assetsData }: { usedAssets: AaveV3UsedAssets, assetsData: AaveV3AssetsData }) => Object.values(usedAssets).some(({ symbol, collateral }) => collateral && assetsData[symbol].isIsolated);
 export const aaveV3IsInSiloedMode = ({ usedAssets, assetsData }: { usedAssets: AaveV3UsedAssets, assetsData: AaveV3AssetsData }) => Object.values(usedAssets).some(({ symbol, debt }) => debt && assetsData[symbol].isSiloed);
 
+export const aaveV3IsEmodeIsolated = ({ eModeCategory, eModeCategoriesData }: { eModeCategory: number, eModeCategoriesData?: EModeCategoriesData }) => eModeCategory !== 0 && !!eModeCategoriesData?.[eModeCategory]?.isolated;
+
+export const aaveV3CanBeCollateralInEmode = ({ eModeCategory, eModeCategoriesData }: { eModeCategory: number, eModeCategoriesData?: EModeCategoriesData }, _asset: string) => {
+  if (!aaveV3IsEmodeIsolated({ eModeCategory, eModeCategoriesData })) return true;
+  return eModeCategoriesData![eModeCategory].collateralAssets.includes(getNativeAssetFromWrapped(_asset));
+};
+
 export const aaveAnyGetCollSuppliedAssets = ({ usedAssets }: { usedAssets: AaveV3UsedAssets }) => Object.values(usedAssets)
   .filter(({ isSupplied, collateral }: { isSupplied: boolean, collateral: boolean }) => isSupplied && collateral);
 
@@ -37,14 +44,18 @@ export const aaveAnyGetSuppliableAssets = ({
   const collAccountAssets = aaveAnyGetCollSuppliedAssets(data);
   const marketAssets = Object.values(assetsData) as AaveAssetData[];
 
-  if (collAccountAssets.length === 0 || !isAaveV3(data)) return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: true }));
+  if (!isAaveV3(data)) return marketAssets.filter(({ canBeSupplied }) => canBeSupplied).map(({ symbol }) => ({ symbol, canBeCollateral: true }));
+
+  const canBeCollateralInEmode = (symbol: string) => 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 = ({
@@ -62,8 +73,8 @@ export const aaveAnyGetEmodeMutableProps = (
   const asset = getNativeAssetFromWrapped(_asset);
 
   const assetData = assetsData[asset];
-  const eModeCategoryData: { collateralAssets: string[], collateralFactor: string, liquidationRatio: string, ltvZeroAssets: string[] } = eModeCategoriesData?.[eModeCategory] || {
-    collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0',
+  const eModeCategoryData: { collateralAssets: string[], collateralFactor: string, liquidationRatio: string, ltvZeroAssets: string[], isolated?: boolean } = eModeCategoriesData?.[eModeCategory] || {
+    collateralAssets: [], ltvZeroAssets: [], collateralFactor: '0', liquidationRatio: '0', isolated: false,
   };
 
   if (
@@ -72,6 +83,9 @@ export const aaveAnyGetEmodeMutableProps = (
     || 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)) return ({ liquidationRatio: '0', collateralFactor: '0' });
@@ -118,7 +132,10 @@ export const aaveAnyGetUserReserveLtvAndLltv = (
     || !eModeCategoryData.collateralAssets.includes(asset)
     || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)
   ) {
-    return { ltv: assetData.collateralFactor, lltv: assetData.liquidationRatio };
+    const ltv = eModeCategory !== 0 && eModeCategoryData?.isolated && !eModeCategoryData.collateralAssets.includes(asset)
+      ? '0'
+      : assetData.collateralFactor;
+    return { ltv, lltv: assetData.liquidationRatio };
   }
 
   const ltv = eModeCategoryData.ltvZeroAssets.includes(asset) ? '0' : eModeCategoryData.collateralFactor;
@@ -169,6 +186,9 @@ export const aaveAnyGetAggregatedPositionData = ({
     },
   );
   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/src/helpers/aaveV4Helpers/index.ts

@@ -270,6 +270,7 @@ export const aaveV4GetAggregatedPositionData = ({
   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/src/helpers/compoundHelpers/index.ts

@@ -139,6 +139,7 @@ export const getCompoundV2AggregatedData = ({
   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) => {
@@ -185,6 +186,7 @@ export const getCompoundV3AggregatedData = ({
   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/src/helpers/curveUsdHelpers/index.ts

@@ -2,14 +2,21 @@ import Dec from 'decimal.js';
 import { CrvUSDAggregatedPositionData, CrvUSDMarketData, CrvUSDUsedAssets } from '../../types';
 import { MMUsedAssets, NetworkNumber } from '../../types/common';
 import {
-  calcLeverageLiqPrice, getAssetsTotal, getExposure, isLeveragedPos,
+  calcLeverageLiqPrice, getAssetsTotal, getExposure, getSafetyRatioFromCollateralRatio, isLeveragedPos,
 } from '../../moneymarket';
 import { mapRange } from '../../services/utils';
+import { calculateNetApyFromRates } from '../../staking';
 
 export const getCrvUsdAggregatedData = ({
-  loanExists, usedAssets, network, selectedMarket, numOfBands, ...rest
+  loanExists, usedAssets, network, selectedMarket, numOfBands, borrowRate = '0', collStakingApy = '0', ...rest
 }:{
-  loanExists: boolean, usedAssets: CrvUSDUsedAssets, network: NetworkNumber, selectedMarket: CrvUSDMarketData, numOfBands: number | string
+  loanExists: boolean,
+  usedAssets: CrvUSDUsedAssets,
+  network: NetworkNumber,
+  selectedMarket: CrvUSDMarketData,
+  numOfBands: number | string,
+  borrowRate?: string, // market borrow APY in %, see `CrvUSDGlobalMarketData.borrowRate`
+  collStakingApy?: string, // native yield APY in % of the collateral asset, if it is a staked asset
 }): CrvUSDAggregatedPositionData => {
   const payload = {} as CrvUSDAggregatedPositionData;
   payload.supplied = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ supplied }: { supplied: string }) => supplied); // this is wrong if we are in soft-liquidations
@@ -26,6 +33,7 @@ export const getCrvUsdAggregatedData = ({
 
   // 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 = usedAssets?.[selectedMarket.collAsset]?.isSupplied
@@ -42,5 +50,17 @@ export const getCrvUsdAggregatedData = ({
 
   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: usedAssets?.[selectedMarket.collAsset]?.suppliedUsd || '0' }],
+  });
+  payload.netApy = netApy;
+  payload.totalInterestUsd = totalInterestUsd;
+  payload.incentiveUsd = incentiveUsd;
+
   return payload;
 };

package/src/helpers/fluidHelpers/index.ts

@@ -143,6 +143,7 @@ borrowShares?: string,
   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;

package/src/helpers/liquityV2Helpers/index.ts

@@ -69,6 +69,7 @@ export const getLiquityV2AggregatedPositionData = ({
   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;

package/src/helpers/llamaLendHelpers/index.ts

@@ -4,7 +4,7 @@ import {
 } from '../../types';
 import { MMAssetsData, MMUsedAssets, NetworkNumber } from '../../types/common';
 import {
-  calcLeverageLiqPrice, getAssetsTotal, getExposure, isLeveragedPos,
+  calcLeverageLiqPrice, getAssetsTotal, getExposure, getSafetyRatioFromCollateralRatio, isLeveragedPos,
 } from '../../moneymarket';
 import { mapRange } from '../../services/utils';
 import { calculateNetApy } from '../../staking';
@@ -38,6 +38,7 @@ export const getLlamaLendAggregatedData = ({
 
   // 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 = usedAssets?.[collAsset]?.isSupplied

package/src/helpers/makerHelpers/index.ts

@@ -10,6 +10,7 @@ export const parseCollateralInfo = (
   _rate: string,
   _spot: string,
   _line: string,
+  _dust: string,
   _duty: string,
   _futureRate: string,
   _chop: string,
@@ -20,7 +21,7 @@ export const parseCollateralInfo = (
   const rate = new Dec(_rate).toString();
   const spot = new Dec(_spot).div(1e27).toString();
   const line = new Dec(_line).div(1e45).toString();
-  const dust = new Dec(_rate).div(1e45).toString();
+  const dust = new Dec(_dust).div(1e45).toString(); // Vat.ilks.dust, rad (1e45) -> DAI
   const duty = new Dec(_duty).toString();
   const futureRate = new Dec(_futureRate).toString();
   const chop = new Dec(_chop).div(1e18).toString();

package/src/helpers/morphoBlueHelpers/index.ts

@@ -54,6 +54,8 @@ export const getMorphoBlueAggregatedPositionData = ({ usedAssets, assetsData, ma
   payload.ltv = new Dec(usedAssets[loanToken]?.borrowed || 0).div(oracle).div(usedAssets[collateralToken]?.supplied || 1).toString(); // default to 1 because can't div 0
   payload.ratio = new Dec(usedAssets[collateralToken]?.supplied || 0).mul(oracle).div(usedAssets[loanToken]?.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 Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
 
   const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
   payload.leveragedType = leveragedType;

package/src/helpers/morphoMidnightHelpers/index.ts

@@ -102,6 +102,8 @@ export const getMorphoMidnightAggregatedPositionData = ({
   payload.ltv = new Dec(payload.suppliedCollateralUsd).eq(0) ? '0' : new Dec(payload.borrowedUsd).div(payload.suppliedCollateralUsd).toString();
   payload.ratio = new Dec(payload.borrowedUsd).eq(0) ? '0' : new Dec(payload.suppliedCollateralUsd).div(payload.borrowedUsd).mul(100).toString();
   payload.healthRatio = new Dec(payload.borrowedUsd).eq(0) ? 'Infinity' : new Dec(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 Dec(payload.borrowLimitUsd).div(payload.borrowedUsd).mul(100).toString() : '0';
 
   const { leveragedType, leveragedAsset } = isLeveragedPos(usedAssets);
   payload.leveragedType = leveragedType;

package/src/helpers/sparkHelpers/index.ts

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