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

package/esm/helpers/sparkHelpers/index.js

@@ -22,7 +22,7 @@ import Dec from 'decimal.js';
 import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
-import { ethToWeth, wethToEth } from '../../services/utils';
+import { ethToWeth, getNativeAssetFromWrapped, wethToEth } from '../../services/utils';
 import { SparkViewContractViem } from '../../contracts';
 import { NetworkNumber } from '../../types/common';
 import { borrowOperations } from '../../constants';
@@ -30,8 +30,8 @@ import { getViemProvider } from '../../services/viem';
 export const sparkIsInIsolationMode = ({ usedAssets, assetsData }) => Object.values(usedAssets).some(({ symbol, collateral }) => collateral && assetsData[symbol].isIsolated);
 export const sparkGetCollSuppliedAssets = ({ usedAssets }) => Object.values(usedAssets).filter(({ isSupplied, collateral }) => isSupplied && collateral);
 export 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 = sparkGetCollSuppliedAssets(data);
     const marketAssets = Object.values(assetsData);
     if (sparkIsInIsolationMode(data)) {
@@ -41,25 +41,25 @@ export const sparkGetSuppliableAssets = (_a) => {
     return marketAssets.filter(d => d.canBeSupplied).map(({ symbol, isIsolated }) => ({ symbol, canBeCollateral: !isIsolated }));
 };
 export const sparkGetSuppliableAsCollAssets = (_a) => {
-    var { usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network } = _a, rest = __rest(_a, ["usedAssets", "eModeCategory", "eModeCategories", "assetsData", "selectedMarket", "network"]);
-    return 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 sparkGetSuppliableAssets(Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
 };
-export const sparkGetEmodeMutableProps = ({ eModeCategory, assetsData, }, _asset) => {
-    var _a;
-    const asset = wethToEth(_asset);
+export const sparkGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
+    const asset = 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 Dec(((_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 Dec(eModeCategoryData.collateralFactor || 0).eq(0)) {
         const { liquidationRatio, collateralFactor } = assetData;
         return ({ liquidationRatio, collateralFactor });
     }
-    const { liquidationRatio, collateralFactor } = assetData.eModeCategoryData;
+    const { liquidationRatio, collateralFactor } = eModeCategoryData;
     return ({ liquidationRatio, collateralFactor });
 };
 export 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 = getAssetsTotal(usedAssets, ({ isSupplied }) => isSupplied, ({ suppliedUsd }) => suppliedUsd);
     payload.suppliedCollateralUsd = getAssetsTotal(usedAssets, ({ isSupplied, collateral }) => isSupplied && collateral, ({ suppliedUsd }) => suppliedUsd);

package/esm/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/esm/markets/fluid/index.js

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

package/esm/portfolio/index.js

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

package/esm/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/esm/spark/index.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { assetAmountInEth, assetAmountInWei, getAssetInfo } from '@defisaver/tokens';
-import { IncentiveKind, NetworkNumber, } from '../types/common';
+import { IncentiveKind, } from '../types/common';
 import { ethToWeth, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { calculateNetApy, getStakingApy, STAKING_ASSETS, } from '../staking';
 import { SparkViewContractViem, SparkIncentiveDataProviderContractViem, createViemContractFromConfigFunc, } from '../contracts';
@@ -22,7 +22,6 @@ export 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;
@@ -33,8 +32,6 @@ export 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,
@@ -49,18 +46,17 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
     const marketAddress = selectedMarket.providerAddress;
     const loanInfoContract = SparkViewContractViem(provider, network);
     const sparkIncentivesContract = 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 => getAssetInfo(ethToWeth(a)).address)]),
-        network === NetworkNumber.Opt ? sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]) : [],
+        sparkIncentivesContract.read.getReservesIncentivesData([marketAddress]),
     ]);
-    let rewardInfo = [];
-    if (network === 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];
@@ -75,6 +71,15 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
         if (new Dec(marketLiquidity).lt(0)) {
             marketLiquidity = '0';
         }
+        eModeCategoriesData[+market.emodeCategory.toString()] = {
+            id: +market.emodeCategory.toString(),
+            label: market.label,
+            liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
+            liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
+            collateralFactor: new Dec(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 Dec(market.debtCeilingForIsolationMode.toString()).gt(0),
@@ -109,13 +114,6 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
             isolationModeBorrowingEnabled: market.isolationModeBorrowingEnabled,
             isFlashLoanEnabled: market.isFlashLoanEnabled,
             aTokenAddress: market.aTokenAddress,
-            eModeCategoryData: {
-                label: market.label,
-                liquidationBonus: new Dec(market.liquidationBonus).div(10000).toString(),
-                liquidationRatio: new Dec(market.liquidationThreshold).div(10000).toString(),
-                collateralFactor: new Dec(market.ltv).div(10000).toString(),
-                priceSource: market.priceSource,
-            },
             supplyIncentives: [],
             borrowIncentives: [],
         });
@@ -147,7 +145,7 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
             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 Dec(supplyRewardData.rewardPriceFeed).div(Math.pow(10, supplyRewardData.priceFeedDecimals))
@@ -168,7 +166,7 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
         });
         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 Dec(borrowRewardData.rewardPriceFeed).div(Math.pow(10, borrowRewardData.priceFeedDecimals))
@@ -200,7 +198,9 @@ export const _getSparkMarketsData = (provider, network, selectedMarket) => __awa
         .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 };
 });
 export const getSparkMarketsData = (provider, network, selectedMarket) => __awaiter(void 0, void 0, void 0, function* () { return _getSparkMarketsData(getViemProvider(provider, network), network, selectedMarket); });
 export const EMPTY_SPARK_DATA = {
@@ -336,6 +336,6 @@ export const _getSparkAccountData = (provider, network, address, extractedState)
 export const getSparkAccountData = (provider, network, address, extractedState) => __awaiter(void 0, void 0, void 0, function* () { return _getSparkAccountData(getViemProvider(provider, network), network, address, extractedState); });
 export const getSparkFullPositionData = (provider, network, address, market) => __awaiter(void 0, void 0, void 0, function* () {
     const marketData = yield getSparkMarketsData(provider, network, market);
-    const positionData = yield getSparkAccountData(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market });
+    const positionData = yield getSparkAccountData(provider, network, address, { assetsData: marketData.assetsData, selectedMarket: market, eModeCategoriesData: marketData.eModeCategoriesData });
     return positionData;
 });

package/esm/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/esm/types/fluid.js

@@ -133,6 +133,7 @@ export var FluidMainnetDepositToken;
     FluidMainnetDepositToken["USDT"] = "USDT";
     FluidMainnetDepositToken["GHO"] = "GHO";
     FluidMainnetDepositToken["sUSDS"] = "sUSDS";
+    FluidMainnetDepositToken["USDtb"] = "USDtb";
 })(FluidMainnetDepositToken || (FluidMainnetDepositToken = {}));
 export var FluidArbitrumDepositToken;
 (function (FluidArbitrumDepositToken) {
@@ -141,6 +142,8 @@ export var FluidArbitrumDepositToken;
     FluidArbitrumDepositToken["USDC"] = "USDC";
     FluidArbitrumDepositToken["USDT"] = "USDT";
     FluidArbitrumDepositToken["ARB"] = "ARB";
+    FluidArbitrumDepositToken["GHO"] = "GHO";
+    FluidArbitrumDepositToken["sUSDS"] = "sUSDS";
 })(FluidArbitrumDepositToken || (FluidArbitrumDepositToken = {}));
 export var FluidBaseDepositToken;
 (function (FluidBaseDepositToken) {
@@ -149,6 +152,7 @@ export var FluidBaseDepositToken;
     FluidBaseDepositToken["wstETH"] = "wstETH";
     FluidBaseDepositToken["EURC"] = "EURC";
     FluidBaseDepositToken["sUSDS"] = "sUSDS";
+    FluidBaseDepositToken["GHO"] = "GHO";
 })(FluidBaseDepositToken || (FluidBaseDepositToken = {}));
 export var FluidVaultType;
 (function (FluidVaultType) {

package/esm/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "2.1.8",
+  "version": "2.1.9-dev-spark-2",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -12,7 +12,7 @@
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint src/ --fix",
     "lint-check": "eslint src/",
-    "test": "mocha tests/*",
+    "test": "mocha tests/spark.ts",
     "test-single": "mocha ./tests/$npm_config_name.ts",
     "test:debugger": "mocha --inspect-brk tests/*",
     "version-bump": "git commit -am \"Version bump to $(npm version patch | cut -c 2-)\""

package/src/fluid/index.ts

@@ -1458,21 +1458,20 @@ export const getFluidTokenData = async (
   token: string,
 ) => _getFluidTokenData(getViemProvider(provider, network), network, token);
 
-const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPosition: FluidUserEarnPositionStructOutput, fTokenAddress?: string) => {
-  const supplyRate = new Dec(fTokenData.supplyRate).div(100).toString();
-  const rewardsRate = new Dec(fTokenData.rewardsRate).div(1e12).toString();
+const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPosition: FluidUserEarnPositionStructOutput, apiData: any, fTokenAddress?: string) => {
   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?.supplyRate || '0').div(100).toString();
+  const rewardRates = apiData?.rewards?.reduce((acc: Dec, item: any) => acc.add(new Dec(item.rate || '0').div(100)), new Dec(0)) || '0';
+  const stakeRate = new Dec(apiData?.asset?.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),
@@ -1483,9 +1482,21 @@ const parseFDepositTokenData = (fTokenData: FluidFTokenDataStructOutput, userPos
 export const _getFluidDepositData = async (provider: Client, network: NetworkNumber, token: string, address: EthAddress) => {
   const view = FluidViewContractViem(provider, network);
   const fTokenAddress = getFTokenAddress(token, network);
-  const [userPosition, fTokenData] = await view.read.getUserEarnPositionWithFToken([fTokenAddress, address]);
+  const [
+    [userPosition, fTokenData],
+    rewardsApiResponse,
+  ] = await 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 = await rewardsApiResponse.json();
+  }
 
-  return parseFDepositTokenData(fTokenData, userPosition, fTokenAddress);
+  return parseFDepositTokenData(fTokenData, userPosition, rewardsData, fTokenAddress);
 };
 
 export const getFluidDepositData = async (
@@ -1497,7 +1508,22 @@ export const getFluidDepositData = async (
 
 export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, network: NetworkNumber, user: EthAddress) => {
   const view = FluidViewContractViem(provider, network);
-  const [userPositions, fTokensData] = await view.read.getAllUserEarnPositionsWithFTokens([user]);
+  const [
+    [userPositions, fTokensData],
+    rewardsApiResponse,
+  ] = await 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 = await rewardsApiResponse.json();
+  }
 
   const parsedRes = fTokensData.reduce<ReturnType<typeof parseFDepositTokenData>[]>((acc, fTokenData, i) => {
     const userPosition = userPositions[i];
@@ -1505,7 +1531,8 @@ export const _getAllUserEarnPositionsWithFTokens = async (provider: Client, netw
 
     if (Number(deposited) > 0) {
       const fTokenAddress = fTokenData.tokenAddress;
-      acc.push(parseFDepositTokenData(fTokenData, userPosition, fTokenAddress));
+      const apiData = rewardsData.data.find((item: any) => compareAddresses(item.address, fTokenAddress));
+      acc.push(parseFDepositTokenData(fTokenData, userPosition, apiData, fTokenAddress));
     }
 
     return acc;
@@ -1572,19 +1599,22 @@ const tokensWithoutChainlinkPrices = ['sUSDS', 'USDA', 'ezETH', 'rsETH', 'weETHs
 
 const handleTokenWithoutChainlinkPrice = (token: string, prices: Record<string, string>) => {
   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/src/helpers/sparkHelpers/index.ts

@@ -8,7 +8,7 @@ import {
   SparkAssetsData, SparkHelperCommon, SparkMarketData, SparkUsedAssets,
 } from '../../types';
 import { calculateNetApy } from '../../staking';
-import { ethToWeth, wethToEth } from '../../services/utils';
+import { ethToWeth, getNativeAssetFromWrapped, wethToEth } from '../../services/utils';
 import { SparkViewContractViem } from '../../contracts';
 import { EthAddress, EthereumProvider, NetworkNumber } from '../../types/common';
 import { borrowOperations } from '../../constants';
@@ -19,10 +19,10 @@ export const sparkIsInIsolationMode = ({ usedAssets, assetsData }: { usedAssets:
 export const sparkGetCollSuppliedAssets = ({ usedAssets }: { usedAssets: SparkUsedAssets }) => Object.values(usedAssets).filter(({ isSupplied, collateral }) => isSupplied && collateral);
 
 export const sparkGetSuppliableAssets = ({
-  usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest
+  usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest
 }: SparkHelperCommon) => {
   const data = {
-    usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
+    usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest,
   };
 
   const collAccountAssets = sparkGetCollSuppliedAssets(data);
@@ -37,41 +37,44 @@ export const sparkGetSuppliableAssets = ({
 };
 
 export const sparkGetSuppliableAsCollAssets = ({
-  usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest
+  usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest
 }: SparkHelperCommon) => sparkGetSuppliableAssets({
-  usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
+  usedAssets, eModeCategory, assetsData, selectedMarket, network, ...rest,
 }).filter(({ canBeCollateral }) => canBeCollateral);
 
 export const sparkGetEmodeMutableProps = ({
   eModeCategory,
+  eModeCategoriesData,
   assetsData,
 }: SparkHelperCommon, _asset: string) => {
-  const asset = wethToEth(_asset);
+  const asset = getNativeAssetFromWrapped(_asset);
 
   const assetData = assetsData[asset];
+  const eModeCategoryData: { collateralAssets: string[], collateralFactor: string, liquidationRatio: string } = eModeCategoriesData?.[eModeCategory] || { collateralAssets: [], collateralFactor: '0', liquidationRatio: '0' };
+
   if (
     eModeCategory === 0
-    || assetData.eModeCategory !== eModeCategory
-    || new Dec(assetData?.eModeCategoryData?.collateralFactor || 0).eq(0)
+      || !eModeCategoryData.collateralAssets.includes(asset)
+      || new Dec(eModeCategoryData.collateralFactor || 0).eq(0)
   ) {
     const { liquidationRatio, collateralFactor } = assetData;
     return ({ liquidationRatio, collateralFactor });
   }
-  const { liquidationRatio, collateralFactor } = assetData.eModeCategoryData;
+  const { liquidationRatio, collateralFactor } = eModeCategoryData;
   return ({ liquidationRatio, collateralFactor });
 };
 
 export const sparkGetAggregatedPositionData = ({
   usedAssets,
   eModeCategory,
-  eModeCategories,
+  eModeCategoriesData,
   assetsData,
   selectedMarket,
   network,
   ...rest
 }: SparkHelperCommon): SparkAggregatedPositionData => {
   const data = {
-    usedAssets, eModeCategory, eModeCategories, assetsData, selectedMarket, network, ...rest,
+    usedAssets, eModeCategory, eModeCategoriesData, assetsData, selectedMarket, network, ...rest,
   };
   const payload = {} as SparkAggregatedPositionData;
   payload.suppliedUsd = getAssetsTotal(usedAssets, ({ isSupplied }: { isSupplied: boolean }) => isSupplied, ({ suppliedUsd }: { suppliedUsd: string }) => suppliedUsd);

package/src/markets/fluid/index.ts

@@ -2421,6 +2421,7 @@ const FluidMainnetFTokenAddresses = {
   [FluidMainnetDepositToken.wstETH]: '0x2411802D8BEA09be0aF8fD8D08314a63e706b29C',
   [FluidMainnetDepositToken.GHO]: '0x6A29A46E21C730DcA1d8b23d637c101cec605C5B',
   [FluidMainnetDepositToken.sUSDS]: '0x2BBE31d63E6813E3AC858C04dae43FB2a72B0D11',
+  [FluidMainnetDepositToken.USDtb]: '0x15e8c742614b5D8Db4083A41Df1A14F5D2bFB400',
 };
 
 const FluidArbitrumFTokenAddresses = {
@@ -2429,6 +2430,8 @@ const FluidArbitrumFTokenAddresses = {
   [FluidArbitrumDepositToken.USDT]: '0x4A03F37e7d3fC243e3f99341d36f4b829BEe5E03',
   [FluidArbitrumDepositToken.wstETH]: '0x66C25Cd75EBdAA7E04816F643d8E46cecd3183c9',
   [FluidArbitrumDepositToken.ARB]: '0xbE3860FD4c3facDf8ad57Aa8c1A36D6dc4390a49',
+  [FluidArbitrumDepositToken.GHO]: '0x037dFf1C12805707d7c29F163E0F09fC9102657A',
+  [FluidArbitrumDepositToken.sUSDS]: '0x3459fcc94390C3372c0F7B4cD3F8795F0E5aFE96',
 };
 
 const FluidBaseFTokenAddresses = {
@@ -2437,6 +2440,7 @@ const FluidBaseFTokenAddresses = {
   [FluidBaseDepositToken.EURC]: '0x1943FA26360f038230442525Cf1B9125b5DCB401',
   [FluidBaseDepositToken.wstETH]: '0x896E39f0E9af61ECA9dD2938E14543506ef2c2b5',
   [FluidBaseDepositToken.sUSDS]: '0xf62e339f21d8018940f188F6987Bcdf02A849619',
+  [FluidBaseDepositToken.GHO]: '0x8DdbfFA3CFda2355a23d6B11105AC624BDbE3631',
 };
 
 export const FluidFTokens = (networkId: NetworkNumber) => {

package/src/portfolio/index.ts

@@ -456,7 +456,7 @@ export async function getPortfolioData(provider: EthereumProvider, network: Netw
     })).flat(),
     ...sparkMarkets.map((market) => allAddresses.map(async (address) => {
       try {
-        const accData = await _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData });
+        const accData = await _getSparkAccountData(client, network, address, { selectedMarket: market, assetsData: sparkMarketsData[market.value].assetsData, eModeCategoriesData: sparkMarketsData[market.value].eModeCategoriesData });
         if (new Dec(accData.suppliedUsd).gt(0)) positions[address.toLowerCase() as EthAddress].spark[market.value] = { error: '', data: accData };
       } catch (error) {
         console.error(`Error fetching Spark account data for address ${address} on market ${market.value}:`, error);