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

package/cjs/spark/index.js

@@ -56,18 +56,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 +81,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),
@@ -154,7 +162,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 +183,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 +215,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 +359,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/staking/eligibility.js

@@ -24,12 +24,6 @@ const isEligibleForEthenaUSDeRewards = (usedAssets, { healthRatio }) => {
     const anythingBorrowedNotAllowed = Object.values(usedAssets).some((asset) => asset.isBorrowed && !allowedBorrowAssets.includes(asset.symbol));
     if (anythingBorrowedNotAllowed)
         return { isEligible: false, eligibleUSDAmount: '0' };
-    const totalAmountBorrowed = Object.values(usedAssets).reduce((acc, asset) => {
-        if (asset.isBorrowed) {
-            return acc.add(asset.borrowedUsd);
-        }
-        return acc;
-    }, new decimal_js_1.default(0)).toString();
     if (new decimal_js_1.default(healthRatio).gte(2.5))
         return { isEligible: false, eligibleUSDAmount: '0' }; // health ratio must be below 2.5
     const halfAmountSupplied = new decimal_js_1.default(totalAmountSupplied).div(2).toString();
@@ -63,4 +57,5 @@ exports.EligibilityMapping = {
     [common_1.IncentiveEligibilityId.AaveV3EthenaLiquidLeverage]: exports.isEligibleForEthenaUSDeRewards,
     [common_1.IncentiveEligibilityId.AaveV3ArbitrumEthSupply]: exports.isEligibleForAaveV3ArbitrumEthSupply,
     [common_1.IncentiveEligibilityId.AaveV3ArbitrumETHLSBorrow]: exports.isEligibleForAaveV3ArbitrumETHLSBorrow,
+    [common_1.IncentiveEligibilityId.AaveV3EthenaLiquidLeveragePlasma]: exports.isEligibleForEthenaUSDeRewards,
 };

package/cjs/types/common.d.ts

@@ -5,7 +5,8 @@ export declare enum IncentiveKind {
 export declare enum IncentiveEligibilityId {
     AaveV3EthenaLiquidLeverage = "0x7361e6f04060154e0268a8402b073cbf97e11ae3BORROW_BL",
     AaveV3ArbitrumEthSupply = "0x5d16261c6715a653248269861bbacf68a9774cde",
-    AaveV3ArbitrumETHLSBorrow = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351"
+    AaveV3ArbitrumETHLSBorrow = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351",
+    AaveV3EthenaLiquidLeveragePlasma = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL"
 }
 export interface IncentiveData {
     token: string;
@@ -23,7 +24,8 @@ export declare enum NetworkNumber {
     Opt = 10,
     Arb = 42161,
     Base = 8453,
-    Linea = 59144
+    Linea = 59144,
+    Plasma = 9745
 }
 export type Networkish = string | NetworkNumber;
 export interface MMAssetData {

package/cjs/types/common.js

@@ -11,6 +11,7 @@ var IncentiveEligibilityId;
     IncentiveEligibilityId["AaveV3EthenaLiquidLeverage"] = "0x7361e6f04060154e0268a8402b073cbf97e11ae3BORROW_BL";
     IncentiveEligibilityId["AaveV3ArbitrumEthSupply"] = "0x5d16261c6715a653248269861bbacf68a9774cde";
     IncentiveEligibilityId["AaveV3ArbitrumETHLSBorrow"] = "0x0c84331e39d6658Cd6e6b9ba04736cC4c4734351";
+    IncentiveEligibilityId["AaveV3EthenaLiquidLeveragePlasma"] = "0x67264783f1e9a2af8627a235853057a6fc975bd2BORROW_BL";
 })(IncentiveEligibilityId || (exports.IncentiveEligibilityId = IncentiveEligibilityId = {}));
 var NetworkNumber;
 (function (NetworkNumber) {
@@ -19,4 +20,5 @@ var NetworkNumber;
     NetworkNumber[NetworkNumber["Arb"] = 42161] = "Arb";
     NetworkNumber[NetworkNumber["Base"] = 8453] = "Base";
     NetworkNumber[NetworkNumber["Linea"] = 59144] = "Linea";
+    NetworkNumber[NetworkNumber["Plasma"] = 9745] = "Plasma";
 })(NetworkNumber || (exports.NetworkNumber = NetworkNumber = {}));

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"
@@ -53,6 +54,7 @@ export interface SparkAssetsData {
 }
 export type SparkMarketsData = {
     assetsData: SparkAssetsData;
+    eModeCategoriesData: EModeCategoriesData;
 };
 export interface SparkUsedAsset extends MMUsedAsset {
     stableBorrowRate: string;
@@ -71,7 +73,7 @@ export interface SparkUsedAssets {
 export interface SparkHelperCommon {
     usedAssets: SparkUsedAssets;
     eModeCategory: number;
-    eModeCategories?: object;
+    eModeCategoriesData?: EModeCategoriesData;
     assetsData: SparkAssetsData;
     selectedMarket?: SparkMarketData;
     network?: NetworkNumber;

package/esm/aaveV3/index.js

@@ -13,7 +13,7 @@ import { AaveIncentiveDataProviderV3ContractViem, AaveIncentivesControllerViem,
 import { aaveAnyGetAggregatedPositionData, aaveV3IsInIsolationMode, aaveV3IsInSiloedMode } from '../helpers/aaveHelpers';
 import { AAVE_V3 } from '../markets/aave';
 import { aprToApy, calculateBorrowingAssetLimit } from '../moneymarket';
-import { ethToWeth, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
+import { getWrappedNativeAssetFromUnwrapped, isEnabledOnBitmap, isLayer2Network, wethToEth, wethToEthByAddress, } from '../services/utils';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 import { IncentiveKind, NetworkNumber, } from '../types/common';
 import { getViemProvider, setViemBlockNumber } from '../services/viem';
@@ -47,12 +47,12 @@ export const aaveV3EmodeCategoriesMapping = (extractedState, usedAssets) => {
 };
 export function _getAaveV3MarketData(provider_1, network_1, market_1) {
     return __awaiter(this, arguments, void 0, function* (provider, network, market, blockNumber = 'latest') {
-        const _addresses = market.assets.map(a => getAssetInfo(ethToWeth(a), network).address);
+        const _addresses = market.assets.map(a => getAssetInfo(getWrappedNativeAssetFromUnwrapped(a), network).address);
         const isL2 = isLayer2Network(network);
         const loanInfoContract = AaveV3ViewContractViem(provider, network);
         const aaveIncentivesContract = AaveIncentiveDataProviderV3ContractViem(provider, network);
         const marketAddress = market.providerAddress;
-        const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea];
+        const networksWithIncentives = [NetworkNumber.Eth, NetworkNumber.Arb, NetworkNumber.Opt, NetworkNumber.Linea, NetworkNumber.Plasma];
         // eslint-disable-next-line prefer-const
         let [loanInfo, eModesInfo, isBorrowAllowed, rewardInfo, merkleRewardsMap, meritRewardsMap] = yield Promise.all([
             loanInfoContract.read.getFullTokensInfo([marketAddress, _addresses], setViemBlockNumber(blockNumber)),
@@ -353,7 +353,7 @@ export const _getAaveV3AccountData = (provider_1, network_1, address_1, extracte
     const loanInfoContract = AaveV3ViewContractViem(provider, network);
     const lendingPoolContract = createViemContractFromConfigFunc(market.lendingPool, market.lendingPoolAddress)(provider, network);
     const marketAddress = market.providerAddress;
-    const _addresses = market.assets.map((a) => getAssetInfo(ethToWeth(a), network).address);
+    const _addresses = market.assets.map((a) => getAssetInfo(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], setViemBlockNumber(blockNumber)),

package/esm/aaveV3/merit.js

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

package/esm/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/esm/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/esm/config/contracts.js

@@ -227,6 +227,11 @@ export const AaveV3View = {
                     "address": "0xc9D6EfA6e08B66a5Cdc516Bcd5807c2fa69E0f2A"
                 }
             },
+        },
+        "9745": {
+            "address": "0xD8E67968d8a0df4beCf2D50daE1e34d4d80C701C",
+            "createdBlock": 1880799,
+            "oldVersions": {},
         }
     }
 };
@@ -247,6 +252,9 @@ export const AaveV3PoolAddressesProvider = {
         },
         "59144": {
             "address": "0x89502c3731F69DDC95B65753708A07F8Cd0373F4"
+        },
+        "9745": {
+            "address": "0x061D8e131F26512348ee5FA42e2DF1bA9d6505E9"
         }
     }
 };
@@ -283,6 +291,9 @@ export const AaveV3LendingPool = {
         },
         "59144": {
             "address": "0xc47b8C00b0f69a36fa203Ffeac0334874574a8Ac"
+        },
+        "9745": {
+            "address": "0x925a2A7214Ed92428B5b1B090F80b25700095e12"
         }
     }
 };
@@ -319,6 +330,9 @@ export const AaveV3ProtocolDataProvider = {
         },
         "59144": {
             "address": "0x47cd4b507B81cB831669c71c7077f4daF6762FF4"
+        },
+        "9745": {
+            "address": "0xf2D6E38B407e31E7E7e4a16E6769728b76c7419F"
         }
     }
 };
@@ -355,6 +369,9 @@ export const AaveUiIncentiveDataProviderV3 = {
         },
         "59144": {
             "address": "0x117684358D990E42Eb1649E7e8C4691951dc1E71"
+        },
+        "9745": {
+            "address": "0xcb85C501B3A5e9851850d66648d69B26A4c90942"
         }
     }
 };
@@ -1205,6 +1222,9 @@ export const AaveRewardsController = {
         },
         "59144": {
             "address": "0xc67bb8F2314fA0df50cBa314c6509A7bdAD500C0"
+        },
+        "9745": {
+            "address": "0x3A57eAa3Ca3794D66977326af7991eB3F6dD5a5A"
         }
     }
 };

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/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/esm/helpers/aaveHelpers/index.js

@@ -21,7 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import Dec from 'decimal.js';
 import { assetAmountInWei, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { AaveVersions, } from '../../types';
-import { ethToWeth, wethToEth } from '../../services/utils';
+import { getNativeAssetFromWrapped, getWrappedNativeAssetFromUnwrapped } from '../../services/utils';
 import { aprToApy, calcLeverageLiqPrice, getAssetsTotal, isLeveragedPos, } from '../../moneymarket';
 import { calculateNetApy } from '../../staking';
 import { borrowOperations } from '../../constants';
@@ -52,7 +52,7 @@ export const aaveAnyGetSuppliableAsCollAssets = (_a) => {
     return aaveAnyGetSuppliableAssets(Object.assign({ usedAssets, eModeCategory, assetsData, selectedMarket, network }, rest)).filter(({ canBeCollateral }) => canBeCollateral);
 };
 export const aaveAnyGetEmodeMutableProps = ({ eModeCategory, eModeCategoriesData, assetsData, }, _asset) => {
-    const asset = wethToEth(_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
@@ -110,7 +110,7 @@ const getApyAfterValuesEstimationInner = (selectedMarket, actions, client, netwo
     const params = actions.map(({ action, asset, amount }) => {
         const isDebtAsset = borrowOperations.includes(action);
         const amountInWei = assetAmountInWei(amount, asset);
-        const assetInfo = getAssetInfo(ethToWeth(asset), network);
+        const assetInfo = getAssetInfo(getWrappedNativeAssetFromUnwrapped(asset), network);
         let liquidityAdded;
         let liquidityTaken;
         if (isDebtAsset) {
@@ -132,7 +132,7 @@ const getApyAfterValuesEstimationInner = (selectedMarket, actions, client, netwo
     const data = yield viewContract.read.getApyAfterValuesEstimation([selectedMarket.providerAddress, params]);
     const rates = {};
     data.forEach((d) => {
-        const asset = wethToEth(getAssetInfoByAddress(d.reserveAddress, network).symbol);
+        const asset = getNativeAssetFromWrapped(getAssetInfoByAddress(d.reserveAddress, network).symbol);
         rates[asset] = {
             supplyRate: aprToApy(new Dec(d.supplyRate.toString()).div(1e25).toString()),
             borrowRate: aprToApy(new Dec(d.variableBorrowRate.toString()).div(1e25).toString()),
@@ -151,8 +151,10 @@ export const getAaveUnderlyingSymbol = (_symbol = '') => {
         .replace(/^aEth/, '')
         .replace(/^aArb/, '')
         .replace(/^aOpt/, '')
+        .replace(/^aLin/, '')
+        .replace(/^aPla/, '')
         .replace(/^aBas/, '');
     if (symbol.startsWith('a'))
         symbol = symbol.slice(1);
-    return wethToEth(symbol);
+    return getNativeAssetFromWrapped(symbol);
 };

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