@defisaver/positions-sdk 2.1.7 → 2.1.9-dev-spark-1

package/.mocharc.json

@@ -1,4 +1,4 @@
-{
-    "require": "ts-node/register",
-    "extension": ["ts"]
-}
+{
+    "require": "ts-node/register",
+    "extension": ["ts"]
+}

package/.nvmrc

@@ -1 +1 @@
-v20.17.0
+v20.17.0

package/README.md

@@ -1,64 +1,64 @@
-# 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)
-- [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)
-
-## 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 { compoundV3 } from '@defisaver/positions-sdk';
-
-
-// every protocol has market data and user data getters
-const {
-    getCompoundV3MarketsData,
-    getCompoundV3AccountData,
-} = compoundV3;
-
-const provider = 'Your RPC provider';
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    provider, // 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
-    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    provider,
-    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)
-
-## Testing
-
-`npm run test` - Run all tests
-
-`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest
+# 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)
+- [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)
+
+## 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 { compoundV3 } from '@defisaver/positions-sdk';
+
+
+// every protocol has market data and user data getters
+const {
+    getCompoundV3MarketsData,
+    getCompoundV3AccountData,
+} = compoundV3;
+
+const provider = 'Your RPC provider';
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    provider, // 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
+    provider, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    provider,
+    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)
+
+## Testing
+
+`npm run test` - Run all tests
+
+`npm run test-single --name=your_test_name` - Run single test for specified name e.g. for MyTest.js test name is MyTest

package/cjs/aaveV3/index.js

@@ -58,12 +58,12 @@ 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') {
-        const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
+        const _addresses = market.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
         const isL2 = (0, utils_1.isLayer2Network)(network);
         const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
         const aaveIncentivesContract = (0, contracts_1.AaveIncentiveDataProviderV3ContractViem)(provider, network);
         const marketAddress = market.providerAddress;
-        const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt, common_1.NetworkNumber.Linea];
+        const networksWithIncentives = [common_1.NetworkNumber.Eth, common_1.NetworkNumber.Arb, common_1.NetworkNumber.Opt, common_1.NetworkNumber.Linea, common_1.NetworkNumber.Plasma];
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap, meritRewardsMap] = yield Promise.all([
             loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], (0, viem_1.setViemBlockNumber)(blockNumber)),
@@ -366,7 +366,7 @@ const _getAaveV3AccountData = (provider_1, network_1, address_1, extractedState_
     const loanInfoContract = (0, contracts_1.AaveV3ViewContractViem)(provider, network);
     const lendingPoolContract = (0, contracts_1.createViemContractFromConfigFunc)(market.lendingPool, market.lendingPoolAddress)(provider, network);
     const marketAddress = market.providerAddress;
-    const _addresses = market.assets.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a), network).address);
+    const _addresses = market.assets.map((a) => (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(a), network).address);
     const middleAddressIndex = Math.floor(_addresses.length / 2); // split addresses in half to avoid gas limit by multicall
     const [eModeCategory, tokenBalances1, tokenBalances2] = yield Promise.all([
         lendingPoolContract.read.getUserEMode([address], (0, viem_1.setViemBlockNumber)(blockNumber)),

package/cjs/aaveV3/merit.js

@@ -45,6 +45,9 @@ const MERIT_DATA_MAP = {
     [common_1.NetworkNumber.Linea]: {
         [types_1.AaveVersions.AaveV3]: {},
     },
+    [common_1.NetworkNumber.Plasma]: {
+        [types_1.AaveVersions.AaveV3]: {},
+    },
 };
 /**
  * Fetches merit rewards data from Aave API

package/cjs/aaveV3/merkl.d.ts

@@ -1,6 +1,6 @@
 import { MerkleRewardMap } from '../types';
 import { NetworkNumber } from '../types/common';
-export declare const getAaveUnderlyingSymbol: (_symbol?: string) => any;
+export declare const getAaveUnderlyingSymbol: (_symbol?: string) => string;
 /**
  * aEthLidoUSDC -> aUSDC
  * USDC -> USDC

package/cjs/config/contracts.d.ts

@@ -28303,6 +28303,11 @@ export declare const AaveV3View: {
                 };
             };
         };
+        readonly "9745": {
+            readonly address: "0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C";
+            readonly createdBlock: 1880799;
+            readonly oldVersions: {};
+        };
     };
 };
 export declare const AaveV3PoolAddressesProvider: {
@@ -28763,6 +28768,9 @@ export declare const AaveV3PoolAddressesProvider: {
         readonly "59144": {
             readonly address: "0x89502c3731F69DDC95B65753708A07F8Cd0373F4";
         };
+        readonly "9745": {
+            readonly address: "0x061D8e131F26512348ee5FA42e2DF1bA9d6505E9";
+        };
     };
 };
 export declare const AaveV3LidoPoolAddressesProvider: {
@@ -31133,6 +31141,9 @@ export declare const AaveV3LendingPool: {
         readonly "59144": {
             readonly address: "0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac";
         };
+        readonly "9745": {
+            readonly address: "0x925a2A7214Ed92428B5b1B090F80b25700095e12";
+        };
     };
 };
 export declare const AaveV3LidoLendingPool: {
@@ -34467,6 +34478,9 @@ export declare const AaveV3ProtocolDataProvider: {
         readonly "59144": {
             readonly address: "0x47cd4b507B81cB831669c71c7077f4daF6762FF4";
         };
+        readonly "9745": {
+            readonly address: "0xf2D6E38B407e31E7E7e4a16E6769728b76c7419F";
+        };
     };
 };
 export declare const AaveV3LidoProtocolDataProvider: {
@@ -35805,6 +35819,9 @@ export declare const AaveUiIncentiveDataProviderV3: {
         readonly "59144": {
             readonly address: "0x117684358D990E42Eb1649E7e8C4691951dc1E71";
         };
+        readonly "9745": {
+            readonly address: "0xcb85C501B3A5e9851850d66648d69B26A4c90942";
+        };
     };
 };
 export declare const cUSDCv3: {
@@ -84964,6 +84981,9 @@ export declare const AaveRewardsController: {
         readonly "59144": {
             readonly address: "0xc67bb8F2314fA0df50cBa314c6509A7bdAD500C0";
         };
+        readonly "9745": {
+            readonly address: "0x3A57eAa3Ca3794D66977326af7991eB3F6dD5a5A";
+        };
     };
 };
 export declare const LiquityV2ActivePool: {

package/cjs/config/contracts.js

@@ -231,6 +231,11 @@ exports.AaveV3View = {
                     "address": "0xc9D6EfA6e08B66a5Cdc516Bcd5807c2fa69E0f2A"
                 }
             },
+        },
+        "9745": {
+            "address": "0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C",
+            "createdBlock": 1880799,
+            "oldVersions": {},
         }
     }
 };
@@ -251,6 +256,9 @@ exports.AaveV3PoolAddressesProvider = {
         },
         "59144": {
             "address": "0x89502c3731F69DDC95B65753708A07F8Cd0373F4"
+        },
+        "9745": {
+            "address": "0x061D8e131F26512348ee5FA42e2DF1bA9d6505E9"
         }
     }
 };
@@ -287,6 +295,9 @@ exports.AaveV3LendingPool = {
         },
         "59144": {
             "address": "0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac"
+        },
+        "9745": {
+            "address": "0x925a2A7214Ed92428B5b1B090F80b25700095e12"
         }
     }
 };
@@ -323,6 +334,9 @@ exports.AaveV3ProtocolDataProvider = {
         },
         "59144": {
             "address": "0x47cd4b507B81cB831669c71c7077f4daF6762FF4"
+        },
+        "9745": {
+            "address": "0xf2D6E38B407e31E7E7e4a16E6769728b76c7419F"
         }
     }
 };
@@ -359,6 +373,9 @@ exports.AaveUiIncentiveDataProviderV3 = {
         },
         "59144": {
             "address": "0x117684358D990E42Eb1649E7e8C4691951dc1E71"
+        },
+        "9745": {
+            "address": "0xcb85C501B3A5e9851850d66648d69B26A4c90942"
         }
     }
 };
@@ -1209,6 +1226,9 @@ exports.AaveRewardsController = {
         },
         "59144": {
             "address": "0xc67bb8F2314fA0df50cBa314c6509A7bdAD500C0"
+        },
+        "9745": {
+            "address": "0x3A57eAa3Ca3794D66977326af7991eB3F6dD5a5A"
         }
     }
 };

package/cjs/fluid/index.js

@@ -1099,19 +1099,21 @@ const _getFluidTokenData = (provider, network, token) => __awaiter(void 0, void
 exports._getFluidTokenData = _getFluidTokenData;
 const getFluidTokenData = (provider, network, token) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getFluidTokenData)((0, viem_1.getViemProvider)(provider, network), network, token); });
 exports.getFluidTokenData = getFluidTokenData;
-const parseFDepositTokenData = (fTokenData, userPosition, fTokenAddress) => {
-    const supplyRate = new decimal_js_1.default(fTokenData.supplyRate).div(100).toString();
-    const rewardsRate = new decimal_js_1.default(fTokenData.rewardsRate).div(1e12).toString();
+const parseFDepositTokenData = (fTokenData, userPosition, apiData, fTokenAddress) => {
+    var _a, _b;
     const decimals = fTokenData.decimals.toString();
     const depositRate = new decimal_js_1.default((0, utils_1.getEthAmountForDecimals)(fTokenData.convertToShares.toString(), decimals)).toString();
     const withdrawRate = new decimal_js_1.default((0, utils_1.getEthAmountForDecimals)(fTokenData.convertToAssets.toString(), decimals)).toString();
+    const supplyRate = new decimal_js_1.default((apiData === null || apiData === void 0 ? void 0 : apiData.supplyRate) || '0').div(100).toString();
+    const rewardRates = ((_a = apiData === null || apiData === void 0 ? void 0 : apiData.rewards) === null || _a === void 0 ? void 0 : _a.reduce((acc, item) => acc.add(new decimal_js_1.default(item.rate || '0').div(100)), new decimal_js_1.default(0))) || '0';
+    const stakeRate = new decimal_js_1.default(((_b = apiData === null || apiData === void 0 ? void 0 : apiData.asset) === null || _b === void 0 ? void 0 : _b.stakingApr) || '0').div(100).toString();
     return {
         fTokenAddress,
         fTokenSymbol: fTokenData.symbol,
         decimals,
         totalDeposited: (0, utils_1.getEthAmountForDecimals)(fTokenData.totalAssets.toString(), decimals),
         withdrawable: (0, utils_1.getEthAmountForDecimals)(fTokenData.withdrawable.toString(), decimals),
-        apy: new decimal_js_1.default(supplyRate).add(rewardsRate).toString(),
+        apy: new decimal_js_1.default(supplyRate).plus(rewardRates).plus(stakeRate).toString(),
         depositRate,
         withdrawRate,
         deposited: (0, utils_1.getEthAmountForDecimals)(userPosition.underlyingAssets.toString(), decimals),
@@ -1121,21 +1123,44 @@ const parseFDepositTokenData = (fTokenData, userPosition, fTokenAddress) => {
 const _getFluidDepositData = (provider, network, token, address) => __awaiter(void 0, void 0, void 0, function* () {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
     const fTokenAddress = (0, markets_1.getFTokenAddress)(token, network);
-    const [userPosition, fTokenData] = yield view.read.getUserEarnPositionWithFToken([fTokenAddress, address]);
-    return parseFDepositTokenData(fTokenData, userPosition, fTokenAddress);
+    const [[userPosition, fTokenData], rewardsApiResponse,] = yield Promise.all([
+        view.read.getUserEarnPositionWithFToken([fTokenAddress, address]),
+        fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens/${fTokenAddress}`),
+    ]);
+    let rewardsData = { rewards: [] };
+    if (!rewardsApiResponse.ok) {
+        console.log('External API Failure: Failed to fetch fluid rewards APY');
+    }
+    else {
+        rewardsData = yield rewardsApiResponse.json();
+    }
+    return parseFDepositTokenData(fTokenData, userPosition, rewardsData, fTokenAddress);
 });
 exports._getFluidDepositData = _getFluidDepositData;
 const getFluidDepositData = (provider, network, token, address) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getFluidDepositData)((0, viem_1.getViemProvider)(provider, network), network, token, address); });
 exports.getFluidDepositData = getFluidDepositData;
 const _getAllUserEarnPositionsWithFTokens = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () {
     const view = (0, contracts_1.FluidViewContractViem)(provider, network);
-    const [userPositions, fTokensData] = yield view.read.getAllUserEarnPositionsWithFTokens([user]);
+    const [[userPositions, fTokensData], rewardsApiResponse,] = yield Promise.all([
+        view.read.getAllUserEarnPositionsWithFTokens([user]),
+        fetch(`https://api.fluid.instadapp.io/v2/lending/${network}/tokens`),
+    ]);
+    let rewardsData = {
+        data: [{ address: constants_1.ZERO_ADDRESS, rewards: [] }],
+    };
+    if (!rewardsApiResponse.ok) {
+        console.log('External API Failure: Failed to fetch fluid rewards APY');
+    }
+    else {
+        rewardsData = yield rewardsApiResponse.json();
+    }
     const parsedRes = fTokensData.reduce((acc, fTokenData, i) => {
         const userPosition = userPositions[i];
         const deposited = userPosition === null || userPosition === void 0 ? void 0 : userPosition.underlyingAssets;
         if (Number(deposited) > 0) {
             const fTokenAddress = fTokenData.tokenAddress;
-            acc.push(parseFDepositTokenData(fTokenData, userPosition, fTokenAddress));
+            const apiData = rewardsData.data.find((item) => (0, utils_1.compareAddresses)(item.address, fTokenAddress));
+            acc.push(parseFDepositTokenData(fTokenData, userPosition, apiData, fTokenAddress));
         }
         return acc;
     }, []);
@@ -1184,19 +1209,22 @@ const getTokenPricePortfolio = (token, provider, network) => __awaiter(void 0, v
 const tokensWithoutChainlinkPrices = ['sUSDS', 'USDA', 'ezETH', 'rsETH', 'weETHs', 'LBTC'];
 const handleTokenWithoutChainlinkPrice = (token, prices) => {
     if (token === 'sUSDS') {
-        return new decimal_js_1.default('105276929').div(1e8).toString();
+        return new decimal_js_1.default('107057929').div(1e8).toString();
     }
     if (token === 'USDA') {
         return new decimal_js_1.default('100000000').div(1e8).toString();
     }
+    if (token === 'wstUSR') {
+        return new decimal_js_1.default('111280000').div(1e8).toString();
+    }
     if (token === 'ezETH') {
-        return new decimal_js_1.default(prices.ETH).mul(1.049).toString();
+        return new decimal_js_1.default(prices.ETH).mul(1.06).toString();
     }
     if (token === 'rsETH') {
-        return new decimal_js_1.default(prices.wstETH).mul(1.0454).toString();
+        return new decimal_js_1.default(prices.wstETH).mul(1.0557).toString();
     }
     if (token === 'weETHs') {
-        return new decimal_js_1.default(prices.wstETH).mul(1.026).toString();
+        return new decimal_js_1.default(prices.wstETH).mul(1.032).toString();
     }
     if (token === 'LBTC') {
         return prices.WBTC;

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

@@ -44,4 +44,4 @@ export declare const getApyAfterValuesEstimation: (selectedMarket: AaveMarketInf
 /**
  * won't cover all cases
  */
-export declare const getAaveUnderlyingSymbol: (_symbol?: string) => any;
+export declare const getAaveUnderlyingSymbol: (_symbol?: string) => string;

package/cjs/helpers/aaveHelpers/index.js

@@ -65,7 +65,7 @@ const aaveAnyGetSuppliableAsCollAssets = (_a) => {
 };
 exports.aaveAnyGetSuppliableAsCollAssets = aaveAnyGetSuppliableAsCollAssets;
 const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
-    const asset = (0, utils_1.wethToEth)(_asset);
+    const asset = (0, utils_1.getNativeAssetFromWrapped)(_asset);
     const assetData = assetsData[asset];
     const eModeCategoryData = (eModeCategoriesData === null || eModeCategoriesData === void 0 ? void 0 : eModeCategoriesData[eModeCategory]) || { collateralAssets: [], collateralFactor: '0', liquidationRatio: '0' };
     if (eModeCategory === 0
@@ -125,7 +125,7 @@ const getApyAfterValuesEstimationInner = (selectedMarket, actions, client, netwo
     const params = actions.map(({ action, asset, amount }) => {
         const isDebtAsset = constants_1.borrowOperations.includes(action);
         const amountInWei = (0, tokens_1.assetAmountInWei)(amount, asset);
-        const assetInfo = (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(asset), network);
+        const assetInfo = (0, tokens_1.getAssetInfo)((0, utils_1.getWrappedNativeAssetFromUnwrapped)(asset), network);
         let liquidityAdded;
         let liquidityTaken;
         if (isDebtAsset) {
@@ -147,7 +147,7 @@ const getApyAfterValuesEstimationInner = (selectedMarket, actions, client, netwo
     const data = yield viewContract.read.getApyAfterValuesEstimation([selectedMarket.providerAddress, params]);
     const rates = {};
     data.forEach((d) => {
-        const asset = (0, utils_1.wethToEth)((0, tokens_1.getAssetInfoByAddress)(d.reserveAddress, network).symbol);
+        const asset = (0, utils_1.getNativeAssetFromWrapped)((0, tokens_1.getAssetInfoByAddress)(d.reserveAddress, network).symbol);
         rates[asset] = {
             supplyRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(d.supplyRate.toString()).div(1e25).toString()),
             borrowRate: (0, moneymarket_1.aprToApy)(new decimal_js_1.default(d.variableBorrowRate.toString()).div(1e25).toString()),
@@ -167,9 +167,11 @@ const getAaveUnderlyingSymbol = (_symbol = '') => {
         .replace(/^aEth/, '')
         .replace(/^aArb/, '')
         .replace(/^aOpt/, '')
+        .replace(/^aLin/, '')
+        .replace(/^aPla/, '')
         .replace(/^aBas/, '');
     if (symbol.startsWith('a'))
         symbol = symbol.slice(1);
-    return (0, utils_1.wethToEth)(symbol);
+    return (0, utils_1.getNativeAssetFromWrapped)(symbol);
 };
 exports.getAaveUnderlyingSymbol = getAaveUnderlyingSymbol;

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

@@ -56,4 +56,4 @@ export declare const getRewardsForMarket: (marketId: string, network?: NetworkNu
     supplyApy: string;
     borrowApy: string;
 }>;
-export declare const getMorphoUnderlyingSymbol: (_symbol: string) => any;
+export declare const getMorphoUnderlyingSymbol: (_symbol: string) => string;

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -128,73 +128,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, provider, network)
 });
 exports.getApyAfterValuesEstimation = getApyAfterValuesEstimation;
 const API_URL = 'https://blue-api.morpho.org/graphql';
-const MARKET_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-        reallocatableLiquidityAssets
-        targetBorrowUtilization
-        loanAsset {
-          address
-          decimals
-          priceUsd
-        }
-        state {
-          liquidityAssets
-          borrowAssets
-          supplyAssets
-        }
-        publicAllocatorSharedLiquidity {
-          assets
-          vault {
-            address
-            name
-          }
-          allocationMarket {
-            uniqueKey
-            loanAsset {
-              address
-            }
-            collateralAsset {
-              address
-            }
-            irmAddress
-            oracle {
-              address
-            }
-            lltv
-          }
-        }
-        loanAsset {
-          address
-        }
-        collateralAsset {
-          address
-        }
-        oracle {
-          address
-        }
-        irmAddress
-        lltv  
-      }
-    }
+const MARKET_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+        reallocatableLiquidityAssets
+        targetBorrowUtilization
+        loanAsset {
+          address
+          decimals
+          priceUsd
+        }
+        state {
+          liquidityAssets
+          borrowAssets
+          supplyAssets
+        }
+        publicAllocatorSharedLiquidity {
+          assets
+          vault {
+            address
+            name
+          }
+          allocationMarket {
+            uniqueKey
+            loanAsset {
+              address
+            }
+            collateralAsset {
+              address
+            }
+            irmAddress
+            oracle {
+              address
+            }
+            lltv
+          }
+        }
+        loanAsset {
+          address
+        }
+        collateralAsset {
+          address
+        }
+        oracle {
+          address
+        }
+        irmAddress
+        lltv  
+      }
+    }
 `;
-const REWARDS_QUERY = `
-  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
-      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
-      uniqueKey
-      state {
-        rewards {
-          amountPerSuppliedToken
-          supplyApr
-          amountPerBorrowedToken
-          borrowApr
-          asset {
-            address
-          }
-        }
-      }
-    }
-    }
+const REWARDS_QUERY = `
+  query MarketByUniqueKey($uniqueKey: String!, $chainId: Int!) {
+      marketByUniqueKey(uniqueKey: $uniqueKey, chainId: $chainId) {
+      uniqueKey
+      state {
+        rewards {
+          amountPerSuppliedToken
+          supplyApr
+          amountPerBorrowedToken
+          borrowApr
+          asset {
+            address
+          }
+        }
+      }
+    }
+    }
 `;
 /**
  * Get reallocatable liquidity to a given market and target borrow utilization

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

@@ -7,19 +7,19 @@ export declare const sparkIsInIsolationMode: ({ usedAssets, assetsData }: {
 export declare const sparkGetCollSuppliedAssets: ({ usedAssets }: {
     usedAssets: SparkUsedAssets;
 }) => import("../../types").SparkUsedAsset[];
-export declare const sparkGetSuppliableAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
+export declare const sparkGetSuppliableAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
+export declare const sparkGetSuppliableAsCollAssets: ({ usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => {
     symbol: string;
     canBeCollateral: boolean;
 }[];
-export declare const sparkGetEmodeMutableProps: ({ eModeCategory, assetsData, }: SparkHelperCommon, _asset: string) => {
+export declare const sparkGetEmodeMutableProps: ({ eModeCategory, eModeCategoriesData, assetsData, }: SparkHelperCommon, _asset: string) => {
     liquidationRatio: string;
     collateralFactor: string;
 };
-export declare const sparkGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => SparkAggregatedPositionData;
+export declare const sparkGetAggregatedPositionData: ({ usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network, ...rest }: SparkHelperCommon) => SparkAggregatedPositionData;
 export declare const getApyAfterValuesEstimation: (selectedMarket: SparkMarketData, actions: [{
     action: string;
     amount: string;