@defisaver/positions-sdk 0.0.146 → 0.0.147

package/README.md

@@ -1,63 +1,63 @@
-# DeFi Saver Positions SDK
-
-Supported protocols: 
-- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
-- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
-- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
-- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
-- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
-- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
-- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## Setup
-Supported Node version is v10.
-
-- run `npm install` (first time)
-- run `npm run build`
-
-`build` command will generate contracts and build ejs and esm folders
-
-## How to use
-[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
-
-This is a Compound V3 example, and every other protocol is similar
-```js
-import Web3 from 'web3';
-import { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-const web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
-    1, // network
-    selectedMarket, // market object like in /src/markets/compound/index.ts
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    1, // network
-    userAddress, // EOA or DSProxy
-    '', // proxy address of the user, or just empty string if checking for EOA
-    {
-        selectedMarket, // market object as in /src/markets/compound/index.ts
-        assetsData,
-    }
-);
-```
-
-More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)
+# DeFi Saver Positions SDK
+
+Supported protocols: 
+- [Maker](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/maker)
+- [Spark](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/spark)
+- [CrvUSD](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/curveUsd)
+- [Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV2)
+- [Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/aaveV3)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [Compound V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV2)
+- [Compound V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/compoundV3)
+- [Liquity](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/liquity)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## Setup
+Supported Node version is v10.
+
+- run `npm install` (first time)
+- run `npm run build`
+
+`build` command will generate contracts and build ejs and esm folders
+
+## How to use
+[All available imports](https://github.com/defisaver/defisaver-positions-sdk/blob/main/src/index.ts)
+
+This is a Compound V3 example, and every other protocol is similar
+```js
+import Web3 from 'web3';
+import { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+const web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // rpc for the network you are using (note: can be tenderly or any other testnet rpc)
+    1, // network
+    selectedMarket, // market object like in /src/markets/compound/index.ts
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    1, // network
+    userAddress, // EOA or DSProxy
+    '', // proxy address of the user, or just empty string if checking for EOA
+    {
+        selectedMarket, // market object as in /src/markets/compound/index.ts
+        assetsData,
+    }
+);
+```
+
+More examples found [here](https://github.com/defisaver/defisaver-positions-sdk/tree/main/tests)

package/cjs/aaveV3/index.js

@@ -72,8 +72,6 @@ const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     return categoriesMapping;
 };
 exports.aaveV3EmodeCategoriesMapping = aaveV3EmodeCategoriesMapping;
-// eslint-disable-next-line no-bitwise
-const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
 function getAaveV3MarketData(web3, network, market, defaultWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
@@ -153,9 +151,9 @@ function getAaveV3MarketData(web3, network, market, defaultWeb3) {
             const nativeAsset = symbol === 'GHO';
             // eslint-disable-next-line guard-for-in
             for (const eModeIndex in eModeCategoriesData) {
-                if (isEnabledOnBitmap(Number(eModeCategoriesData[eModeIndex].collateralBitmap), Number(tokenMarket.assetId)))
+                if ((0, utils_1.isEnabledOnBitmap)(Number(eModeCategoriesData[eModeIndex].collateralBitmap), Number(tokenMarket.assetId)))
                     eModeCategoriesData[eModeIndex].collateralAssets.push(symbol);
-                if (isEnabledOnBitmap(Number(eModeCategoriesData[eModeIndex].borrowableBitmap), Number(tokenMarket.assetId)))
+                if ((0, utils_1.isEnabledOnBitmap)(Number(eModeCategoriesData[eModeIndex].borrowableBitmap), Number(tokenMarket.assetId)))
                     eModeCategoriesData[eModeIndex].borrowAssets.push(symbol);
             }
             let borrowCap = tokenMarket.borrowCap;

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

@@ -28,11 +28,11 @@ export declare const aaveV3IsInSiloedMode: ({ usedAssets, assetsData }: {
 export declare const aaveAnyGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: AaveV3UsedAssets;
 }) => import("../../types").AaveV3UsedAsset[];
-export declare const aaveAnyGetSuppliableAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
+export declare const aaveAnyGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const aaveAnyGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
+export declare const aaveAnyGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
@@ -40,7 +40,7 @@ export declare const aaveAnyGetEmodeMutableProps: ({ eModeCategory, eModeCategor
     liquidationRatio: any;
     collateralFactor: any;
 };
-export declare const aaveAnyGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => AaveV3AggregatedPositionData;
+export declare const aaveAnyGetAggregatedPositionData: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => AaveV3AggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInfo, actions: [{
     action: string;
     amount: string;

package/cjs/helpers/aaveHelpers/index.js

@@ -51,8 +51,8 @@ const aaveAnyGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAsset
     .filter(({ isSupplied, collateral }) => isSupplied && collateral);
 exports.aaveAnyGetCollSuppliedAssets = aaveAnyGetCollSuppliedAssets;
 const aaveAnyGetSuppliableAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const collAccountAssets = (0, exports.aaveAnyGetCollSuppliedAssets)(data);
     const marketAssets = Object.values(assetsData);
     if ((0, exports.isMorphoAave)({ selectedMarket })) {
@@ -68,8 +68,8 @@ const aaveAnyGetSuppliableAssets = (_a) => {
 };
 exports.aaveAnyGetSuppliableAssets = aaveAnyGetSuppliableAssets;
 const aaveAnyGetSuppliableAsCollAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    return (0, exports.aaveAnyGetSuppliableAssets)(Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    return (0, exports.aaveAnyGetSuppliableAssets)(Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
 };
 exports.aaveAnyGetSuppliableAsCollAssets = aaveAnyGetSuppliableAsCollAssets;
 const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
@@ -87,8 +87,8 @@ const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, asset
 };
 exports.aaveAnyGetEmodeMutableProps = aaveAnyGetEmodeMutableProps;
 const aaveAnyGetAggregatedPositionData = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const payload = {};
     payload.suppliedUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = (0, moneymarket_1.getAssetsTotal)(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);

package/cjs/markets/aave/marketAssets.js

@@ -10,7 +10,7 @@ exports.aaveV1AssetsDefaultMarket = [
 exports.aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 exports.morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
 exports.morphoAaveV3AssetEthMarket = [
-    'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT',
+    'ETH', 'wstETH', 'USDC', 'WBTC', 'rETH', 'cbETH', 'USDT',
 ];
 exports.aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS'];
 exports.aaveV3AssetsDefaultMarketOpt = [

package/cjs/morphoAaveV3/index.d.ts

@@ -1,7 +1,7 @@
 import Web3 from 'web3';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
-import { MorphoAaveV3AssetsData, MorphoAaveV3MarketData, MorphoAaveV3MarketInfo, MorphoAaveV3PositionData } from '../types';
+import { EModeCategoriesData, MorphoAaveV3AssetsData, MorphoAaveV3MarketData, MorphoAaveV3MarketInfo, MorphoAaveV3PositionData } from '../types';
 export declare const getMorphoAaveV3MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: MorphoAaveV3MarketInfo, mainnetWeb3: Web3) => Promise<MorphoAaveV3MarketData>;
 export declare const getMorphoAaveV3AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const getMorphoAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: MorphoAaveV3AssetsData, delegator: string, selectedMarket: MorphoAaveV3MarketInfo) => Promise<MorphoAaveV3PositionData>;
+export declare const getMorphoAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: MorphoAaveV3AssetsData, eModeCategoriesData: EModeCategoriesData, delegator: string, selectedMarket: MorphoAaveV3MarketInfo) => Promise<MorphoAaveV3PositionData>;
 export declare const getMorphoAaveV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, delegator: string, market: MorphoAaveV3MarketInfo, mainnetWeb3: Web3) => Promise<MorphoAaveV3PositionData>;

package/cjs/morphoAaveV3/index.js

@@ -83,7 +83,7 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
     const aaveLendingPoolContract = (0, contracts_1.createContractWrapper)(web3, network, selectedMarket.aaveLendingPool, selectedMarket.aaveLendingPoolAddress);
     const _addresses = selectedMarket.assets.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address);
     const splitStart = Math.floor(_addresses.length / 2);
-    const loanInfoCallsToSkip = 2; // skipping getFullTokensInfo calls at the start of multicallArray
+    const loanInfoCallsToSkip = 3; // skipping getFullTokensInfo calls at the start of multicallArray
     const AaveV3ViewAddress = (0, contracts_1.getConfigContractAddress)('AaveV3View', network);
     const AaveV3ViewAbi = (0, contracts_1.getConfigContractAbi)('AaveV3View');
     const multicallArray = [
@@ -97,6 +97,11 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
             abiItem: (0, utils_1.getAbiItem)(AaveV3ViewAbi, 'getFullTokensInfo'),
             params: [selectedMarket.providerAddress, _addresses.slice(splitStart, _addresses.length)],
         },
+        {
+            target: AaveV3ViewAddress,
+            abiItem: (0, utils_1.getAbiItem)(AaveV3ViewAbi, 'getAllEmodes'),
+            params: [selectedMarket.providerAddress],
+        },
         ...(_addresses.map((underlyingAddress) => ([{
                 target: lendingPoolContract.options.address,
                 abiItem: (0, utils_1.getAbiItem)(lendingPoolContract.options.jsonInterface, 'market'),
@@ -111,6 +116,18 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
     ];
     const multicallResponse = yield (0, multicall_1.multicall)(multicallArray, web3, network);
     const loanInfo = [...multicallResponse[0][0], ...multicallResponse[1][0]];
+    // Morpho Aave V3 ETH optimizer is hardcoded to use e mode category 1
+    const eModeCategoryData = {
+        label: multicallResponse[2][0][0].label,
+        id: 1,
+        liquidationBonus: new decimal_js_1.default(multicallResponse[2][0][0].liquidationBonus).div(10000).toString(),
+        liquidationRatio: new decimal_js_1.default(multicallResponse[2][0][0].liquidationThreshold).div(10000).toString(),
+        collateralFactor: new decimal_js_1.default(multicallResponse[2][0][0].ltv).div(10000).toString(),
+        borrowableBitmap: multicallResponse[2][0][0].borrowableBitmap,
+        collateralBitmap: multicallResponse[2][0][0].collateralBitmap,
+        borrowAssets: [],
+        collateralAssets: [],
+    };
     const IVariableDebtTokenAbi = (0, contracts_1.getConfigContractAbi)('IVariableDebtToken');
     const IATokenAbi = (0, contracts_1.getConfigContractAbi)('IAToken');
     const scaledBalanceMulticall = [
@@ -143,11 +160,14 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
         const morphoMarketData = Object.assign(Object.assign({}, multicallResponse[(2 * i) + loanInfoCallsToSkip][0]), { scaledMorphoBorrowOnPool: scaledBalanceResponse.value[2 * i][0], scaledMorphoSupplyOnPool: scaledBalanceResponse.value[(2 * i) + 1][0] });
         const marketData = computeMorphoMarketData(info, morphoMarketData, multicallResponse[(2 * i) + (loanInfoCallsToSkip + 1)][0]);
         const { symbol, address } = (0, tokens_1.getAssetInfoByAddress)((0, utils_1.wethToEthByAddress)(marketData.underlyingTokenAddress));
+        if ((0, utils_1.isEnabledOnBitmap)(Number(eModeCategoryData.collateralBitmap), Number(info.assetId)) && marketData.isCollateral)
+            eModeCategoryData.collateralAssets.push(symbol);
+        if ((0, utils_1.isEnabledOnBitmap)(Number(eModeCategoryData.borrowableBitmap), Number(info.assetId)))
+            eModeCategoryData.borrowAssets.push(symbol);
         const data = {
             symbol,
             morphoMarketData,
             hasDelta: new decimal_js_1.default(marketData.p2pSupplyAPY).minus(marketData.p2pBorrowAPY).gte(0.3),
-            eModeCategory: +marketData.emodeCategory,
             aTokenAddress: marketData.aTokenAddress,
             underlyingTokenAddress: address,
             price: new decimal_js_1.default(marketData.price.toString()).div(1e8).toString(),
@@ -198,13 +218,6 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
                 .div(new decimal_js_1.default(marketData.totalSupply.toString()))
                 .times(100)
                 .toString(),
-            eModeCategoryData: {
-                label: marketData.label,
-                liquidationBonus: new decimal_js_1.default(marketData.liquidationBonus).div(10000).toString(),
-                liquidationRatio: new decimal_js_1.default(marketData.liquidationThreshold).div(10000).toString(),
-                collateralFactor: new decimal_js_1.default(marketData.ltv).div(10000).toString(),
-                priceSource: marketData.priceSource,
-            },
             incentiveSupplyToken: 'MORPHO',
             incentiveBorrowToken: 'MORPHO',
             incentiveSupplyApy: ((_c = (_a = morphoRewardsData === null || morphoRewardsData === void 0 ? void 0 : morphoRewardsData.markets) === null || _a === void 0 ? void 0 : _a[(_b = marketData.underlyingTokenAddress) === null || _b === void 0 ? void 0 : _b.toLowerCase()]) === null || _c === void 0 ? void 0 : _c.morphoRatePerSecondSupplySide) || '0',
@@ -241,7 +254,7 @@ const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainnetWeb3)
         .forEach((assetData, i) => {
         payload[assetData.symbol] = Object.assign(Object.assign({}, assetData), { sortIndex: i });
     });
-    return { assetsData: payload };
+    return { assetsData: payload, eModeCategoriesData: { 1: eModeCategoryData } };
 });
 exports.getMorphoAaveV3MarketsData = getMorphoAaveV3MarketsData;
 const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
@@ -317,7 +330,7 @@ const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapping, ad
     return balances;
 });
 exports.getMorphoAaveV3AccountBalances = getMorphoAaveV3AccountBalances;
-const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegator, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+const getMorphoAaveV3AccountData = (web3, network, address, assetsData, eModeCategoriesData, delegator, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     var _g;
     if (!address) {
         throw new Error('No address provided.');
@@ -388,7 +401,6 @@ const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegato
         if (new decimal_js_1.default(supplied).gt(0) || new decimal_js_1.default(borrowed).gt(0)) {
             payload.usedAssets[symbol] = {
                 symbol,
-                eModeCategory: market.eModeCategory,
                 supplied,
                 suppliedP2P,
                 suppliedPool,
@@ -422,8 +434,9 @@ const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegato
             };
         }
     });
+    payload.eModeCategory = eModeCategory;
     payload = Object.assign(Object.assign({}, payload), (0, aaveHelpers_1.aaveAnyGetAggregatedPositionData)({
-        usedAssets: payload.usedAssets, assetsData, eModeCategory, selectedMarket,
+        usedAssets: payload.usedAssets, assetsData, eModeCategory, selectedMarket, eModeCategoriesData,
     }));
     // Calculate borrow limits per asset
     Object.values(payload.usedAssets).forEach((item) => {
@@ -437,7 +450,7 @@ const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegato
 exports.getMorphoAaveV3AccountData = getMorphoAaveV3AccountData;
 const getMorphoAaveV3FullPositionData = (web3, network, address, delegator, market, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield (0, exports.getMorphoAaveV3MarketsData)(web3, network, market, mainnetWeb3);
-    const positionData = yield (0, exports.getMorphoAaveV3AccountData)(web3, network, address, marketData.assetsData, delegator, market);
+    const positionData = yield (0, exports.getMorphoAaveV3AccountData)(web3, network, address, marketData.assetsData, marketData.eModeCategoriesData, delegator, market);
     return positionData;
 });
 exports.getMorphoAaveV3FullPositionData = getMorphoAaveV3FullPositionData;

package/cjs/services/utils.d.ts

@@ -19,3 +19,4 @@ export declare const bytesToString: (hex: string) => string;
  * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
  */
 export declare const mapRange: (input: number | string, minInput: number | string, maxInput: number | string, minOutput: number | string, maxOutput: number | string) => number;
+export declare const isEnabledOnBitmap: (bitmap: number, assetId: number) => bigint;

package/cjs/services/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mapRange = exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.isLayer2Network = void 0;
+exports.isEnabledOnBitmap = exports.mapRange = exports.bytesToString = exports.ethToWethByAddress = exports.wethToEthByAddress = exports.handleWbtcLegacy = exports.getEthAmountForDecimals = exports.getWeiAmountForDecimals = exports.compareAddresses = exports.isAddress = exports.ADDRESS_REGEX = exports.getAbiItem = exports.wstEthToStEth = exports.stEthToWstEth = exports.wethToEth = exports.ethToWeth = exports.addToObjectIf = exports.isLayer2Network = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -53,3 +53,6 @@ const mapRange = (input, minInput, maxInput, minOutput, maxOutput) => {
     return new decimal_js_1.default(minOutput).plus(new decimal_js_1.default(slope).mul(new decimal_js_1.default(input).minus(minInput))).toDP(2).toNumber();
 };
 exports.mapRange = mapRange;
+// eslint-disable-next-line no-bitwise
+const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
+exports.isEnabledOnBitmap = isEnabledOnBitmap;

package/cjs/types/aave.d.ts

@@ -111,6 +111,7 @@ export type AaveV3MarketData = {
 export type MorphoAaveV3AssetsData = AaveAssetsData<MorphoAaveV3AssetData>;
 export type MorphoAaveV3MarketData = {
     assetsData: MorphoAaveV3AssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 };
 export interface AaveUsedAsset extends MMUsedAsset {
     stableBorrowRate: string;
@@ -139,7 +140,6 @@ export interface MorphoAaveV2UsedAsset extends Omit<AaveV2UsedAsset, 'debt'> {
 }
 export interface AaveV3UsedAsset extends AaveUsedAsset {
     discountedBorrowRate: string;
-    eModeCategory: number;
     supplyRate: string;
     borrowRate: string;
     interestMode: string;

package/esm/aaveV3/index.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
 import { AaveIncentiveDataProviderV3Contract, AaveV3ViewContract, createContractWrapper, getConfigContractAbi, getConfigContractAddress, GhoTokenContract, } from '../contracts';
-import { addToObjectIf, ethToWeth, getAbiItem, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { addToObjectIf, ethToWeth, getAbiItem, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { NetworkNumber, } from '../types/common';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { multicall } from '../multicall';
@@ -63,8 +63,6 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
     });
     return categoriesMapping;
 };
-// eslint-disable-next-line no-bitwise
-const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
 export function getAaveV3MarketData(web3, network, market, defaultWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);

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

@@ -28,11 +28,11 @@ export declare const aaveV3IsInSiloedMode: ({ usedAssets, assetsData }: {
 export declare const aaveAnyGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: AaveV3UsedAssets;
 }) => import("../../types").AaveV3UsedAsset[];
-export declare const aaveAnyGetSuppliableAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
+export declare const aaveAnyGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const aaveAnyGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
+export declare const aaveAnyGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
@@ -40,7 +40,7 @@ export declare const aaveAnyGetEmodeMutableProps: ({ eModeCategory, eModeCategor
     liquidationRatio: any;
     collateralFactor: any;
 };
-export declare const aaveAnyGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => AaveV3AggregatedPositionData;
+export declare const aaveAnyGetAggregatedPositionData: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: AaveHelperCommon) => AaveV3AggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInfo, actions: [{
     action: string;
     amount: string;

package/esm/helpers/aaveHelpers/index.js

@@ -37,8 +37,8 @@ export const aaveV3IsInSiloedMode = ({ usedAssets, assetsData }) => Object.value
 export const aaveAnyGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets)
     .filter(({ isSupplied, collateral }) => isSupplied && collateral);
 export const aaveAnyGetSuppliableAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const collAccountAssets = aaveAnyGetCollSuppliedAssets(data);
     const marketAssets = Object.values(assetsData);
     if (isMorphoAave({ selectedMarket })) {
@@ -53,8 +53,8 @@ export const aaveAnyGetSuppliableAssets = (_a) => {
     return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated }));
 };
 export const aaveAnyGetSuppliableAsCollAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    return aaveAnyGetSuppliableAssets(Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    return aaveAnyGetSuppliableAssets(Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
 };
 export const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
     const asset = wethToEth(_asset);
@@ -70,8 +70,8 @@ export const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData
     return ({ liquidationRatio, collateralFactor });
 };
 export const aaveAnyGetAggregatedPositionData = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    const data = Object.assign({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network }, rest);
+    var { usedAssets, eModeCategory, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "assetsData", "selectedMarket", "network"]);
+    const data = Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest);
     const payload = {};
     payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);

package/esm/markets/aave/marketAssets.js

@@ -7,7 +7,7 @@ export const aaveV1AssetsDefaultMarket = [
 export const aaveV2AssetsDefaultMarket = ['USDT', 'WBTC', 'ETH', 'YFI', 'ZRX', 'UNI', 'AAVE', 'BAT', 'BUSD', 'DAI', 'ENJ', 'KNCL', 'LINK', 'MANA', 'MKR', 'REN', 'SNX', 'SUSD', 'TUSD', 'USDC', 'CRV', 'GUSD', 'BAL', 'xSUSHI', 'RENFIL', 'RAI', 'AMPL', 'USDP', 'DPI', 'FRAX', 'FEI', 'stETH', 'ENS', 'UST', 'CVX', '1INCH', 'LUSD'];
 export const morphoAaveV2AssetDefaultMarket = ['DAI', 'ETH', 'USDC', 'USDT', 'WBTC', 'stETH', 'CRV'];
 export const morphoAaveV3AssetEthMarket = [
-    'ETH', 'wstETH', 'DAI', 'USDC', 'WBTC', 'rETH', 'cbETH', 'sDAI', 'USDT',
+    'ETH', 'wstETH', 'USDC', 'WBTC', 'rETH', 'cbETH', 'USDT',
 ];
 export const aaveV3AssetsDefaultMarketEth = ['ETH', 'wstETH', 'WBTC', 'USDC', 'DAI', 'LINK', 'AAVE', 'cbETH', 'USDT', 'rETH', 'LUSD', 'CRV', 'MKR', 'SNX', 'BAL', 'UNI', 'LDO', 'ENS', '1INCH', 'FRAX', 'GHO', 'RPL', 'sDAI', 'STG', 'KNC', 'FXS', 'crvUSD', 'PYUSD', 'weETH', 'osETH', 'USDe', 'ETHx', 'sUSDe', 'tBTC', 'cbBTC', 'USDS'];
 export const aaveV3AssetsDefaultMarketOpt = [

package/esm/morphoAaveV3/index.d.ts

@@ -1,7 +1,7 @@
 import Web3 from 'web3';
 import { Blockish, EthAddress, NetworkNumber, PositionBalances } from '../types/common';
-import { MorphoAaveV3AssetsData, MorphoAaveV3MarketData, MorphoAaveV3MarketInfo, MorphoAaveV3PositionData } from '../types';
+import { EModeCategoriesData, MorphoAaveV3AssetsData, MorphoAaveV3MarketData, MorphoAaveV3MarketInfo, MorphoAaveV3PositionData } from '../types';
 export declare const getMorphoAaveV3MarketsData: (web3: Web3, network: NetworkNumber, selectedMarket: MorphoAaveV3MarketInfo, mainnetWeb3: Web3) => Promise<MorphoAaveV3MarketData>;
 export declare const getMorphoAaveV3AccountBalances: (web3: Web3, network: NetworkNumber, block: Blockish, addressMapping: boolean, address: EthAddress) => Promise<PositionBalances>;
-export declare const getMorphoAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: MorphoAaveV3AssetsData, delegator: string, selectedMarket: MorphoAaveV3MarketInfo) => Promise<MorphoAaveV3PositionData>;
+export declare const getMorphoAaveV3AccountData: (web3: Web3, network: NetworkNumber, address: string, assetsData: MorphoAaveV3AssetsData, eModeCategoriesData: EModeCategoriesData, delegator: string, selectedMarket: MorphoAaveV3MarketInfo) => Promise<MorphoAaveV3PositionData>;
 export declare const getMorphoAaveV3FullPositionData: (web3: Web3, network: NetworkNumber, address: string, delegator: string, market: MorphoAaveV3MarketInfo, mainnetWeb3: Web3) => Promise<MorphoAaveV3PositionData>;

package/esm/morphoAaveV3/index.js

@@ -13,7 +13,7 @@ import PoolInterestRates from '@morpho-org/morpho-aave-v3-sdk/lib/maths/PoolInte
 import P2PInterestRates from '@morpho-org/morpho-aave-v3-sdk/lib/maths/P2PInterestRates';
 import { BigNumber } from '@ethersproject/bignumber';
 import Dec from 'decimal.js';
-import { ethToWeth, ethToWethByAddress, getAbiItem, wethToEthByAddress, } from '../services/utils';
+import { ethToWeth, ethToWethByAddress, getAbiItem, isEnabledOnBitmap, wethToEthByAddress, } from '../services/utils';
 import { createContractWrapper, getConfigContractAbi, getConfigContractAddress, } from '../contracts';
 import { multicall } from '../multicall';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
@@ -77,7 +77,7 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
     const aaveLendingPoolContract = createContractWrapper(web3, network, selectedMarket.aaveLendingPool, selectedMarket.aaveLendingPoolAddress);
     const _addresses = selectedMarket.assets.map((a) => getAssetInfo(ethToWeth(a)).address);
     const splitStart = Math.floor(_addresses.length / 2);
-    const loanInfoCallsToSkip = 2; // skipping getFullTokensInfo calls at the start of multicallArray
+    const loanInfoCallsToSkip = 3; // skipping getFullTokensInfo calls at the start of multicallArray
     const AaveV3ViewAddress = getConfigContractAddress('AaveV3View', network);
     const AaveV3ViewAbi = getConfigContractAbi('AaveV3View');
     const multicallArray = [
@@ -91,6 +91,11 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
             abiItem: getAbiItem(AaveV3ViewAbi, 'getFullTokensInfo'),
             params: [selectedMarket.providerAddress, _addresses.slice(splitStart, _addresses.length)],
         },
+        {
+            target: AaveV3ViewAddress,
+            abiItem: getAbiItem(AaveV3ViewAbi, 'getAllEmodes'),
+            params: [selectedMarket.providerAddress],
+        },
         ...(_addresses.map((underlyingAddress) => ([{
                 target: lendingPoolContract.options.address,
                 abiItem: getAbiItem(lendingPoolContract.options.jsonInterface, 'market'),
@@ -105,6 +110,18 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
     ];
     const multicallResponse = yield multicall(multicallArray, web3, network);
     const loanInfo = [...multicallResponse[0][0], ...multicallResponse[1][0]];
+    // Morpho Aave V3 ETH optimizer is hardcoded to use e mode category 1
+    const eModeCategoryData = {
+        label: multicallResponse[2][0][0].label,
+        id: 1,
+        liquidationBonus: new Dec(multicallResponse[2][0][0].liquidationBonus).div(10000).toString(),
+        liquidationRatio: new Dec(multicallResponse[2][0][0].liquidationThreshold).div(10000).toString(),
+        collateralFactor: new Dec(multicallResponse[2][0][0].ltv).div(10000).toString(),
+        borrowableBitmap: multicallResponse[2][0][0].borrowableBitmap,
+        collateralBitmap: multicallResponse[2][0][0].collateralBitmap,
+        borrowAssets: [],
+        collateralAssets: [],
+    };
     const IVariableDebtTokenAbi = getConfigContractAbi('IVariableDebtToken');
     const IATokenAbi = getConfigContractAbi('IAToken');
     const scaledBalanceMulticall = [
@@ -137,11 +154,14 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
         const morphoMarketData = Object.assign(Object.assign({}, multicallResponse[(2 * i) + loanInfoCallsToSkip][0]), { scaledMorphoBorrowOnPool: scaledBalanceResponse.value[2 * i][0], scaledMorphoSupplyOnPool: scaledBalanceResponse.value[(2 * i) + 1][0] });
         const marketData = computeMorphoMarketData(info, morphoMarketData, multicallResponse[(2 * i) + (loanInfoCallsToSkip + 1)][0]);
         const { symbol, address } = getAssetInfoByAddress(wethToEthByAddress(marketData.underlyingTokenAddress));
+        if (isEnabledOnBitmap(Number(eModeCategoryData.collateralBitmap), Number(info.assetId)) && marketData.isCollateral)
+            eModeCategoryData.collateralAssets.push(symbol);
+        if (isEnabledOnBitmap(Number(eModeCategoryData.borrowableBitmap), Number(info.assetId)))
+            eModeCategoryData.borrowAssets.push(symbol);
         const data = {
             symbol,
             morphoMarketData,
             hasDelta: new Dec(marketData.p2pSupplyAPY).minus(marketData.p2pBorrowAPY).gte(0.3),
-            eModeCategory: +marketData.emodeCategory,
             aTokenAddress: marketData.aTokenAddress,
             underlyingTokenAddress: address,
             price: new Dec(marketData.price.toString()).div(1e8).toString(),
@@ -192,13 +212,6 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
                 .div(new Dec(marketData.totalSupply.toString()))
                 .times(100)
                 .toString(),
-            eModeCategoryData: {
-                label: marketData.label,
-                liquidationBonus: new Dec(marketData.liquidationBonus).div(10000).toString(),
-                liquidationRatio: new Dec(marketData.liquidationThreshold).div(10000).toString(),
-                collateralFactor: new Dec(marketData.ltv).div(10000).toString(),
-                priceSource: marketData.priceSource,
-            },
             incentiveSupplyToken: 'MORPHO',
             incentiveBorrowToken: 'MORPHO',
             incentiveSupplyApy: ((_c = (_a = morphoRewardsData === null || morphoRewardsData === void 0 ? void 0 : morphoRewardsData.markets) === null || _a === void 0 ? void 0 : _a[(_b = marketData.underlyingTokenAddress) === null || _b === void 0 ? void 0 : _b.toLowerCase()]) === null || _c === void 0 ? void 0 : _c.morphoRatePerSecondSupplySide) || '0',
@@ -235,7 +248,7 @@ export const getMorphoAaveV3MarketsData = (web3, network, selectedMarket, mainne
         .forEach((assetData, i) => {
         payload[assetData.symbol] = Object.assign(Object.assign({}, assetData), { sortIndex: i });
     });
-    return { assetsData: payload };
+    return { assetsData: payload, eModeCategoriesData: { 1: eModeCategoryData } };
 });
 export const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapping, address) => __awaiter(void 0, void 0, void 0, function* () {
     let balances = {
@@ -309,7 +322,7 @@ export const getMorphoAaveV3AccountBalances = (web3, network, block, addressMapp
     });
     return balances;
 });
-export const getMorphoAaveV3AccountData = (web3, network, address, assetsData, delegator, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
+export const getMorphoAaveV3AccountData = (web3, network, address, assetsData, eModeCategoriesData, delegator, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () {
     var _g;
     if (!address) {
         throw new Error('No address provided.');
@@ -380,7 +393,6 @@ export const getMorphoAaveV3AccountData = (web3, network, address, assetsData, d
         if (new Dec(supplied).gt(0) || new Dec(borrowed).gt(0)) {
             payload.usedAssets[symbol] = {
                 symbol,
-                eModeCategory: market.eModeCategory,
                 supplied,
                 suppliedP2P,
                 suppliedPool,
@@ -414,8 +426,9 @@ export const getMorphoAaveV3AccountData = (web3, network, address, assetsData, d
             };
         }
     });
+    payload.eModeCategory = eModeCategory;
     payload = Object.assign(Object.assign({}, payload), aaveAnyGetAggregatedPositionData({
-        usedAssets: payload.usedAssets, assetsData, eModeCategory, selectedMarket,
+        usedAssets: payload.usedAssets, assetsData, eModeCategory, selectedMarket, eModeCategoriesData,
     }));
     // Calculate borrow limits per asset
     Object.values(payload.usedAssets).forEach((item) => {
@@ -428,6 +441,6 @@ export const getMorphoAaveV3AccountData = (web3, network, address, assetsData, d
 });
 export const getMorphoAaveV3FullPositionData = (web3, network, address, delegator, market, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield getMorphoAaveV3MarketsData(web3, network, market, mainnetWeb3);
-    const positionData = yield getMorphoAaveV3AccountData(web3, network, address, marketData.assetsData, delegator, market);
+    const positionData = yield getMorphoAaveV3AccountData(web3, network, address, marketData.assetsData, marketData.eModeCategoriesData, delegator, market);
     return positionData;
 });

package/esm/services/utils.d.ts

@@ -19,3 +19,4 @@ export declare const bytesToString: (hex: string) => string;
  * Map an input value from one range (minInput, maxInput) to a value in another range (minOutput, maxOutput)
  */
 export declare const mapRange: (input: number | string, minInput: number | string, maxInput: number | string, minOutput: number | string, maxOutput: number | string) => number;
+export declare const isEnabledOnBitmap: (bitmap: number, assetId: number) => bigint;