@defisaver/positions-sdk 2.1.161 → 2.1.162

package/cjs/aaveV3/index.js

@@ -41,7 +41,10 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
             : !usedAssetsValues.filter(u => u.isBorrowed && !e.borrowAssets.includes(u.symbol)).length;
         const afterEnteringCategory = (0, aaveHelpers_1.aaveAnyGetAggregatedPositionData)(Object.assign(Object.assign({}, extractedState), { usedAssets, eModeCategory: e.id }));
         const willStayOverCollateralized = new decimal_js_1.default(afterEnteringCategory.ratio === 'NaN' ? '0' : afterEnteringCategory.ratio).eq(0) || new decimal_js_1.default(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),
@@ -59,6 +62,7 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
 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 => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
         const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
         const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3ContractViem)(provider, network);
@@ -92,6 +96,7 @@ 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: [],
@@ -307,6 +312,7 @@ 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/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 };

package/cjs/spark/index.js

@@ -88,6 +88,7 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
             collateralAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
             borrowAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
             ltvZeroAssets: [],
+            isolated: false,
         };
         return ({
             symbol: selectedMarket.assets[i],

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[];

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/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 };

package/esm/spark/index.js

@@ -81,6 +81,7 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
             collateralAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
             borrowAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
             ltvZeroAssets: [],
+            isolated: false,
         };
         return ({
             symbol: selectedMarket.assets[i],

package/esm/types/aave.d.ts

@@ -40,6 +40,7 @@ export interface EModeCategoryData {
     borrowAssets: string[];
     ltvzeroBitmap?: string;
     ltvZeroAssets: string[];
+    isolated: boolean;
 }
 export interface EModeCategoryDataMapping {
     enteringTerms: boolean[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.161",
+  "version": "2.1.162",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/aaveV3/index.ts

@@ -61,7 +61,10 @@ export const aaveV3EmodeCategoriesMapping = (extractedState: any, usedAssets: Aa
       ...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),
@@ -118,6 +121,7 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
         borrowableBitmap: eModesInfo[i].borrowableBitmap.toString(),
         collateralBitmap: eModesInfo[i].collateralBitmap.toString(),
         ltvzeroBitmap: eModesInfo[i].ltvzeroBitmap.toString(),
+        isolated: eModesInfo[i].isolated ?? false,
         borrowAssets: [],
         collateralAssets: [],
         ltvZeroAssets: [],
@@ -345,6 +349,7 @@ export async function _getAaveV3MarketData(provider: Client, network: NetworkNum
     collateralAssets: assetsData.map((a) => a.symbol),
     borrowAssets: assetsData.map((a) => a.symbol),
     ltvZeroAssets: [],
+    isolated: false,
   };
 
   return { assetsData: payload, eModeCategoriesData };

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;

package/src/spark/index.ts

@@ -108,6 +108,7 @@ export const _getSparkMarketsData = async (provider: Client, network: NetworkNum
         collateralAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
         borrowAssets: eModeCategoriesData[emodeCategoryId] ? [...eModeCategoriesData[emodeCategoryId].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
         ltvZeroAssets: [],
+        isolated: false,
       };
 
       return ({

package/src/types/aave.ts

@@ -48,6 +48,7 @@ export interface EModeCategoryData {
   borrowAssets: string[],
   ltvzeroBitmap?: string,
   ltvZeroAssets: string[],
+  isolated: boolean,
 }
 export interface EModeCategoryDataMapping {
   enteringTerms: boolean[],