@defisaver/positions-sdk 2.1.8 → 2.1.9-dev-spark-2

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

package/cjs/helpers/sparkHelpers/index.js

@@ -38,8 +38,8 @@ exports.sparkIsInIsolationMode = sparkIsInIsolationMode;
 const sparkGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets).filter(({ isSupplied, collateral }) => isSupplied && collateral);
 exports.sparkGetCollSuppliedAssets = sparkGetCollSuppliedAssets;
 const sparkGetSuppliableAssets = (_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.sparkGetCollSuppliedAssets)(data);
     const marketAssets = Object.values(assetsData);
     if ((0, exports.sparkIsInIsolationMode)(data)) {
@@ -50,27 +50,27 @@ const sparkGetSuppliableAssets = (_a) => {
 };
 exports.sparkGetSuppliableAssets = sparkGetSuppliableAssets;
 const sparkGetSuppliableAsCollAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    return (0, exports.sparkGetSuppliableAssets)(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.sparkGetSuppliableAssets)(Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
 };
 exports.sparkGetSuppliableAsCollAssets = sparkGetSuppliableAsCollAssets;
-const sparkGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
-    var _a;
-    const asset = (0, utils_1.wethToEth)(_asset);
+const sparkGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _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
-        || assetData.eModeCategory !== eModeCategory
-        || new decimal_js_1.default(((_a = assetData === null || assetData === void 0 ? void 0 : assetData.eModeCategoryData) === null || _a === void 0 ? void 0 : _a.collateralFactor) || 0).eq(0)) {
+        || !eModeCategoryData.collateralAssets.includes(asset)
+        || new decimal_js_1.default(eModeCategoryData.collateralFactor || 0).eq(0)) {
         const { liquidationRatio, collateralFactor } = assetData;
         return ({ liquidationRatio, collateralFactor });
     }
-    const { liquidationRatio, collateralFactor } = assetData.eModeCategoryData;
+    const { liquidationRatio, collateralFactor } = eModeCategoryData;
     return ({ liquidationRatio, collateralFactor });
 };
 exports.sparkGetEmodeMutableProps = sparkGetEmodeMutableProps;
 const sparkGetAggregatedPositionData = (_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, eModeCategoriesData, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategoriesData", "assetsData", "selectedMarket", "network"]);
+    const data = Object.assign({ usedAssets, eModeCategory, eModeCategoriesData, 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/fluid/index.d.ts

@@ -244,17 +244,21 @@ export declare const FluidFTokens: (networkId: NetworkNumber) => {
     wstETH: string;
     GHO: string;
     sUSDS: string;
+    USDtb: string;
 } | {
     ETH: string;
     USDC: string;
     USDT: string;
     wstETH: string;
     ARB: string;
+    GHO: string;
+    sUSDS: string;
 } | {
     ETH: string;
     USDC: string;
     EURC: string;
     wstETH: string;
     sUSDS: string;
+    GHO: string;
 };
 export declare const getFTokenAddress: (token: string, networkId: NetworkNumber) => any;

package/cjs/markets/fluid/index.js

@@ -2415,6 +2415,7 @@ const FluidMainnetFTokenAddresses = {
     [types_1.FluidMainnetDepositToken.wstETH]: '0x2411802D8BEA09be0aF8fD8D08314a63e706b29C',
     [types_1.FluidMainnetDepositToken.GHO]: '0x6A29A46E21C730DcA1d8b23d637c101cec605C5B',
     [types_1.FluidMainnetDepositToken.sUSDS]: '0x2BBE31d63E6813E3AC858C04dae43FB2a72B0D11',
+    [types_1.FluidMainnetDepositToken.USDtb]: '0x15e8c742614b5D8Db4083A41Df1A14F5D2bFB400',
 };
 const FluidArbitrumFTokenAddresses = {
     [types_1.FluidArbitrumDepositToken.ETH]: '0x45Df0656F8aDf017590009d2f1898eeca4F0a205',
@@ -2422,6 +2423,8 @@ const FluidArbitrumFTokenAddresses = {
     [types_1.FluidArbitrumDepositToken.USDT]: '0x4A03F37e7d3fC243e3f99341d36f4b829BEe5E03',
     [types_1.FluidArbitrumDepositToken.wstETH]: '0x66C25Cd75EBdAA7E04816F643d8E46cecd3183c9',
     [types_1.FluidArbitrumDepositToken.ARB]: '0xbE3860FD4c3facDf8ad57Aa8c1A36D6dc4390a49',
+    [types_1.FluidArbitrumDepositToken.GHO]: '0x037dFf1C12805707d7c29F163E0F09fC9102657A',
+    [types_1.FluidArbitrumDepositToken.sUSDS]: '0x3459fcc94390C3372c0F7B4cD3F8795F0E5aFE96',
 };
 const FluidBaseFTokenAddresses = {
     [types_1.FluidBaseDepositToken.ETH]: '0x9272D6153133175175Bc276512B2336BE3931CE9',
@@ -2429,6 +2432,7 @@ const FluidBaseFTokenAddresses = {
     [types_1.FluidBaseDepositToken.EURC]: '0x1943FA26360f038230442525Cf1B9125b5DCB401',
     [types_1.FluidBaseDepositToken.wstETH]: '0x896E39f0E9af61ECA9dD2938E14543506ef2c2b5',
     [types_1.FluidBaseDepositToken.sUSDS]: '0xf62e339f21d8018940f188F6987Bcdf02A849619',
+    [types_1.FluidBaseDepositToken.GHO]: '0x8DdbfFA3CFda2355a23d6B11105AC624BDbE3631',
 };
 const FluidFTokens = (networkId) => {
     switch (networkId) {

package/cjs/portfolio/index.js

@@ -452,7 +452,7 @@ function getPortfolioData(provider, network, defaultProvider, addresses, summerF
             }))).flat(),
             ...sparkMarkets.map((market) => allAddresses.map((address) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData });
+                    const accData = yield (0, spark_1._getSparkAccountData)(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData, eModeCategoriesData: sparkMarketsData[market.value].eModeCategoriesData });
                     if (new decimal_js_1.default(accData.suppliedUsd).gt(0))
                         positions[address.toLowerCase()].spark[market.value] = { error: '', data: accData };
                 }

package/cjs/spark/index.d.ts

@@ -1,6 +1,6 @@
 import { Client } from 'viem';
 import { Blockish, EthAddress, EthereumProvider, NetworkNumber, PositionBalances } from '../types/common';
-import { SparkEModeCategoryDataMapping, SparkAssetsData, SparkMarketData, SparkMarketsData, SparkPositionData, SparkUsedAssets } from '../types';
+import { SparkEModeCategoryDataMapping, SparkAssetsData, SparkMarketData, SparkMarketsData, SparkPositionData, SparkUsedAssets, EModeCategoriesData } from '../types';
 export declare const sparkEmodeCategoriesMapping: (extractedState: {
     assetsData: SparkAssetsData;
 }, usedAssets: SparkUsedAssets) => {
@@ -32,9 +32,11 @@ export declare const getSparkAccountBalances: (provider: EthereumProvider, netwo
 export declare const _getSparkAccountData: (provider: Client, network: NetworkNumber, address: EthAddress, extractedState: {
     selectedMarket: SparkMarketData;
     assetsData: SparkAssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 }) => Promise<SparkPositionData>;
 export declare const getSparkAccountData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, extractedState: {
     selectedMarket: SparkMarketData;
     assetsData: SparkAssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 }) => Promise<SparkPositionData>;
 export declare const getSparkFullPositionData: (provider: EthereumProvider, network: NetworkNumber, address: EthAddress, market: SparkMarketData) => Promise<SparkPositionData>;

package/cjs/spark/index.js

@@ -28,7 +28,6 @@ const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
     const usedAssetsValues = Object.values(usedAssets);
     const categoriesMapping = {};
     Object.values(assetsData).forEach((a) => {
-        var _a;
         const borrowingOnlyFromCategory = a.eModeCategory === 0
             ? true
             : !usedAssetsValues.filter(u => u.isBorrowed && u.eModeCategory !== a.eModeCategory).length;
@@ -39,8 +38,6 @@ const sparkEmodeCategoriesMapping = (extractedState, usedAssets) => {
             enteringTerms,
             canEnterCategory: !enteringTerms.includes(false),
             id: a.eModeCategory,
-            data: a.eModeCategoryData,
-            assets: a.eModeCategory === 0 ? [] : [...(((_a = categoriesMapping[a.eModeCategory]) === null || _a === void 0 ? void 0 : _a.assets) || []), a.symbol],
             enabledData: {
                 ratio: afterEnteringCategory.ratio,
                 liqRatio: afterEnteringCategory.liqRatio,
@@ -56,18 +53,17 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
     const marketAddress = selectedMarket.providerAddress;
     const loanInfoContract = (0, contracts_1.SparkViewContractViem)(provider, network);
     const sparkIncentivesContract = (0, contracts_1.SparkIncentiveDataProviderContractViem)(provider, network);
-    const [loanInfo, _rewardInfo] = yield Promise.all([
+    // eslint-disable-next-line prefer-const
+    let [loanInfo, rewardInfo] = yield Promise.all([
         loanInfoContract.read.getFullTokensInfo([marketAddress, selectedMarket.assets.map(a => (0, tokens_1.getAssetInfo)((0, utils_1.ethToWeth)(a)).address)]),
-        network === common_1.NetworkNumber.Opt ? sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]) : [],
+        sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]),
     ]);
-    let rewardInfo = [];
-    if (network === common_1.NetworkNumber.Opt) {
-        rewardInfo = rewardInfo.reduce((all, market) => {
-            // eslint-disable-next-line no-param-reassign
-            all[market.underlyingAsset] = market;
-            return all;
-        }, {});
-    }
+    rewardInfo = rewardInfo.reduce((all, market) => {
+        // eslint-disable-next-line no-param-reassign
+        all[market.underlyingAsset] = market;
+        return all;
+    }, {});
+    const eModeCategoriesData = {};
     const assetsData = yield Promise.all(loanInfo
         .map((market, i) => __awaiter(void 0, void 0, void 0, function* () {
         const symbol = selectedMarket.assets[i];
@@ -82,6 +78,15 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
         if (new decimal_js_1.default(marketLiquidity).lt(0)) {
             marketLiquidity = '0';
         }
+        eModeCategoriesData[+market.emodeCategory.toString()] = {
+            id: +market.emodeCategory.toString(),
+            label: market.label,
+            liquidationBonus: new decimal_js_1.default(market.liquidationBonus).div(10000).toString(),
+            liquidationRatio: new decimal_js_1.default(market.liquidationThreshold).div(10000).toString(),
+            collateralFactor: new decimal_js_1.default(market.ltv).div(10000).toString(),
+            collateralAssets: eModeCategoriesData[+market.emodeCategory.toString()] ? [...eModeCategoriesData[+market.emodeCategory.toString()].collateralAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
+            borrowAssets: eModeCategoriesData[+market.emodeCategory.toString()] ? [...eModeCategoriesData[+market.emodeCategory.toString()].borrowAssets, selectedMarket.assets[i]] : [selectedMarket.assets[i]],
+        };
         return ({
             symbol: selectedMarket.assets[i],
             isIsolated: new decimal_js_1.default(market.debtCeilingForIsolationMode.toString()).gt(0),
@@ -116,13 +121,6 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
             isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
             isFlashLoanEnabled: market.isFlashLoanEnabled,
             aTokenAddress: market.aTokenAddress,
-            eModeCategoryData: {
-                label: market.label,
-                liquidationBonus: new decimal_js_1.default(market.liquidationBonus).div(10000).toString(),
-                liquidationRatio: new decimal_js_1.default(market.liquidationThreshold).div(10000).toString(),
-                collateralFactor: new decimal_js_1.default(market.ltv).div(10000).toString(),
-                priceSource: market.priceSource,
-            },
             supplyIncentives: [],
             borrowIncentives: [],
         });
@@ -154,7 +152,7 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
             return;
         rewardForMarket.aIncentiveData.rewardsTokenInformation.forEach(supplyRewardData => {
             if (supplyRewardData) {
-                if (supplyRewardData.emissionEndTimestamp * 1000 < Date.now())
+                if (+(supplyRewardData.emissionEndTimestamp.toString()) * 1000 < Date.now())
                     return;
                 const supplyEmissionPerSecond = supplyRewardData.emissionPerSecond;
                 const supplyRewardPrice = new decimal_js_1.default(supplyRewardData.rewardPriceFeed).div(Math.pow(10, supplyRewardData.priceFeedDecimals))
@@ -175,7 +173,7 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
         });
         rewardForMarket.vIncentiveData.rewardsTokenInformation.forEach(borrowRewardData => {
             if (borrowRewardData) {
-                if (borrowRewardData.emissionEndTimestamp * 1000 < Date.now())
+                if (+(borrowRewardData.emissionEndTimestamp.toString()) * 1000 < Date.now())
                     return;
                 const supplyEmissionPerSecond = borrowRewardData.emissionPerSecond;
                 const supplyRewardPrice = new decimal_js_1.default(borrowRewardData.rewardPriceFeed).div(Math.pow(10, borrowRewardData.priceFeedDecimals))
@@ -207,7 +205,9 @@ const _getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(vo
         .forEach((assetData, i) => {
         payload[assetData.symbol] = Object.assign(Object.assign({}, assetData), { sortIndex: i });
     });
-    return { assetsData: payload };
+    eModeCategoriesData[0].collateralAssets = Object.values(payload).map(a => a.symbol);
+    eModeCategoriesData[0].borrowAssets = Object.values(payload).map(a => a.symbol);
+    return { assetsData: payload, eModeCategoriesData };
 });
 exports._getSparkMarketsData = _getSparkMarketsData;
 const getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return (0, exports._getSparkMarketsData)((0, viem_1.getViemProvider)(provider, network), network, selectedMarket); });
@@ -349,7 +349,7 @@ const getSparkAccountData = (provider, network, address, extractedState) => __aw
 exports.getSparkAccountData = getSparkAccountData;
 const getSparkFullPositionData = (provider, network, address, market) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield (0, exports.getSparkMarketsData)(provider, network, market);
-    const positionData = yield (0, exports.getSparkAccountData)(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
+    const positionData = yield (0, exports.getSparkAccountData)(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market, eModeCategoriesData: marketData.eModeCategoriesData });
     return positionData;
 });
 exports.getSparkFullPositionData = getSparkFullPositionData;

package/cjs/types/fluid.d.ts

@@ -149,21 +149,25 @@ export declare enum FluidMainnetDepositToken {
     USDC = "USDC",
     USDT = "USDT",
     GHO = "GHO",
-    sUSDS = "sUSDS"
+    sUSDS = "sUSDS",
+    USDtb = "USDtb"
 }
 export declare enum FluidArbitrumDepositToken {
     ETH = "ETH",
     wstETH = "wstETH",
     USDC = "USDC",
     USDT = "USDT",
-    ARB = "ARB"
+    ARB = "ARB",
+    GHO = "GHO",
+    sUSDS = "sUSDS"
 }
 export declare enum FluidBaseDepositToken {
     ETH = "ETH",
     USDC = "USDC",
     wstETH = "wstETH",
     EURC = "EURC",
-    sUSDS = "sUSDS"
+    sUSDS = "sUSDS",
+    GHO = "GHO"
 }
 export type FluidDepositTokenByNetwork = {
     [NetworkNumber.Eth]: FluidMainnetDepositToken;

package/cjs/types/fluid.js

@@ -136,6 +136,7 @@ var FluidMainnetDepositToken;
     FluidMainnetDepositToken["USDT"] = "USDT";
     FluidMainnetDepositToken["GHO"] = "GHO";
     FluidMainnetDepositToken["sUSDS"] = "sUSDS";
+    FluidMainnetDepositToken["USDtb"] = "USDtb";
 })(FluidMainnetDepositToken || (exports.FluidMainnetDepositToken = FluidMainnetDepositToken = {}));
 var FluidArbitrumDepositToken;
 (function (FluidArbitrumDepositToken) {
@@ -144,6 +145,8 @@ var FluidArbitrumDepositToken;
     FluidArbitrumDepositToken["USDC"] = "USDC";
     FluidArbitrumDepositToken["USDT"] = "USDT";
     FluidArbitrumDepositToken["ARB"] = "ARB";
+    FluidArbitrumDepositToken["GHO"] = "GHO";
+    FluidArbitrumDepositToken["sUSDS"] = "sUSDS";
 })(FluidArbitrumDepositToken || (exports.FluidArbitrumDepositToken = FluidArbitrumDepositToken = {}));
 var FluidBaseDepositToken;
 (function (FluidBaseDepositToken) {
@@ -152,6 +155,7 @@ var FluidBaseDepositToken;
     FluidBaseDepositToken["wstETH"] = "wstETH";
     FluidBaseDepositToken["EURC"] = "EURC";
     FluidBaseDepositToken["sUSDS"] = "sUSDS";
+    FluidBaseDepositToken["GHO"] = "GHO";
 })(FluidBaseDepositToken || (exports.FluidBaseDepositToken = FluidBaseDepositToken = {}));
 var FluidVaultType;
 (function (FluidVaultType) {

package/cjs/types/spark.d.ts

@@ -1,3 +1,4 @@
+import { EModeCategoriesData } from './aave';
 import { EthAddress, MMAssetData, MMPositionData, MMUsedAsset, NetworkNumber } from './common';
 export declare enum SparkVersions {
     SparkV1 = "v1default"
@@ -13,8 +14,6 @@ export interface SparkEModeCategoryDataMapping {
     enteringTerms: boolean[];
     canEnterCategory: boolean;
     id: number;
-    data: SparkEModeCategoryData;
-    assets: string[];
     enabledData: {
         ratio: string;
         liqRatio: string;
@@ -45,7 +44,6 @@ export interface SparkAssetData extends MMAssetData {
     usageAsCollateralEnabled: boolean;
     isIsolated: boolean;
     eModeCategory: number;
-    eModeCategoryData: SparkEModeCategoryData;
     liquidationRatio: string;
 }
 export interface SparkAssetsData {
@@ -53,6 +51,7 @@ export interface SparkAssetsData {
 }
 export type SparkMarketsData = {
     assetsData: SparkAssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 };
 export interface SparkUsedAsset extends MMUsedAsset {
     stableBorrowRate: string;
@@ -71,7 +70,7 @@ export interface SparkUsedAssets {
 export interface SparkHelperCommon {
     usedAssets: SparkUsedAssets;
     eModeCategory: number;
-    eModeCategories?: object;
+    eModeCategoriesData?: EModeCategoriesData;
     assetsData: SparkAssetsData;
     selectedMarket?: SparkMarketData;
     network?: NetworkNumber;

package/esm/fluid/index.js

@@ -1081,19 +1081,21 @@ export const _getFluidTokenData = (provider, network, token) => __awaiter(void 0
     };
 });
 export const getFluidTokenData = (provider, network, token) => __awaiter(void 0, void 0, void 0, function* () { return _getFluidTokenData(getViemProvider(provider, network), network, token); });
-const parseFDepositTokenData = (fTokenData, userPosition, fTokenAddress) => {
-    const supplyRate = new Dec(fTokenData.supplyRate).div(100).toString();
-    const rewardsRate = new Dec(fTokenData.rewardsRate).div(1e12).toString();
+const parseFDepositTokenData = (fTokenData, userPosition, apiData, fTokenAddress) => {
+    var _a, _b;
     const decimals = fTokenData.decimals.toString();
     const depositRate = new Dec(getEthAmountForDecimals(fTokenData.convertToShares.toString(), decimals)).toString();
     const withdrawRate = new Dec(getEthAmountForDecimals(fTokenData.convertToAssets.toString(), decimals)).toString();
+    const supplyRate = new Dec((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 Dec(item.rate || '0').div(100)), new Dec(0))) || '0';
+    const stakeRate = new Dec(((_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: getEthAmountForDecimals(fTokenData.totalAssets.toString(), decimals),
         withdrawable: getEthAmountForDecimals(fTokenData.withdrawable.toString(), decimals),
-        apy: new Dec(supplyRate).add(rewardsRate).toString(),
+        apy: new Dec(supplyRate).plus(rewardRates).plus(stakeRate).toString(),
         depositRate,
         withdrawRate,
         deposited: getEthAmountForDecimals(userPosition.underlyingAssets.toString(), decimals),
@@ -1103,19 +1105,42 @@ const parseFDepositTokenData = (fTokenData, userPosition, fTokenAddress) => {
 export const _getFluidDepositData = (provider, network, token, address) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContractViem(provider, network);
     const fTokenAddress = 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);
 });
 export const getFluidDepositData = (provider, network, token, address) => __awaiter(void 0, void 0, void 0, function* () { return _getFluidDepositData(getViemProvider(provider, network), network, token, address); });
 export const _getAllUserEarnPositionsWithFTokens = (provider, network, user) => __awaiter(void 0, void 0, void 0, function* () {
     const view = 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: 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) => compareAddresses(item.address, fTokenAddress));
+            acc.push(parseFDepositTokenData(fTokenData, userPosition, apiData, fTokenAddress));
         }
         return acc;
     }, []);
@@ -1160,19 +1185,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 Dec('105276929').div(1e8).toString();
+        return new Dec('107057929').div(1e8).toString();
     }
     if (token === 'USDA') {
         return new Dec('100000000').div(1e8).toString();
     }
+    if (token === 'wstUSR') {
+        return new Dec('111280000').div(1e8).toString();
+    }
     if (token === 'ezETH') {
-        return new Dec(prices.ETH).mul(1.049).toString();
+        return new Dec(prices.ETH).mul(1.06).toString();
     }
     if (token === 'rsETH') {
-        return new Dec(prices.wstETH).mul(1.0454).toString();
+        return new Dec(prices.wstETH).mul(1.0557).toString();
     }
     if (token === 'weETHs') {
-        return new Dec(prices.wstETH).mul(1.026).toString();
+        return new Dec(prices.wstETH).mul(1.032).toString();
     }
     if (token === 'LBTC') {
         return prices.WBTC;

package/esm/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;