@defisaver/positions-sdk 2.1.8 → 2.1.9

package/.mocharc.json

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

package/.nvmrc

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

package/CLAUDE.md

@@ -0,0 +1,32 @@
+# DeFiSaver Positions SDK
+
+TypeScript SDK for DeFi positions tracking and management.
+
+## Commands
+
+```bash
+# Development
+npm run dev          # Watch mode compilation
+npm run build        # Lint and build both CJS and ESM
+npm run build:cjs    # Build CommonJS
+npm run build:esm    # Build ES modules
+
+# Linting
+npm run lint         # Lint and fix
+npm run lint-check   # Lint without fixing
+
+# Testing
+npm run test         # Run all tests
+npm run test-single  # Run single test (use --name=filename)
+npm run test:debugger # Run tests with debugger
+
+# Versioning
+npm run version-bump # Commit and bump patch version
+```
+
+## Project Structure
+
+- `src/` - TypeScript source code
+- `tests/` - Test files
+- `esm/` - ES module build output
+- `cjs/` - CommonJS build output

package/README.md

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

package/cjs/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/morphoBlueHelpers/index.js

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

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