@defisaver/positions-sdk 0.0.201-fluid-dev-11 → 0.0.201-fluid-dev-13

package/.mocharc.json

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

package/.nvmrc

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

package/README.md

@@ -1,69 +1,69 @@
-# 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)
-- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
-- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
-- [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)
-- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
-
-## 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 Web3 from 'web3';
-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 web3 = new Web3(provider);
-
-const user = '0x123...';
-
-const { assetsData } = await getCompoundV3MarketsData(
-    web3, // 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
-    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
-);
-
-const userData = await getCompoundV3AccountData(
-    web3,
-    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)
+- [Morpho Aave V2](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV2)
+- [Morpho Aave V3](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/morphoAaveV3)
+- [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)
+- [Chicken Bonds](https://github.com/defisaver/defisaver-positions-sdk/tree/main/src/chickenBonds)
+
+## 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 Web3 from 'web3';
+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 web3 = new Web3(provider);
+
+const user = '0x123...';
+
+const { assetsData } = await getCompoundV3MarketsData(
+    web3, // 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
+    web3, // this must be mainnet rpc - used for getting prices onchain and calculating apys
+);
+
+const userData = await getCompoundV3AccountData(
+    web3,
+    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.d.ts

@@ -26,17 +26,17 @@ export declare const EMPTY_FLUID_DATA: {
     automationResubscribeRequired: boolean;
     lastUpdated: number;
 };
-export declare const getFluidMarketData: (web3: Web3, network: NetworkNumber, market: FluidMarketInfo) => Promise<FluidMarketData>;
+export declare const getFluidMarketData: (web3: Web3, network: NetworkNumber, market: FluidMarketInfo, mainnetWeb3: Web3) => Promise<FluidMarketData>;
 export declare const getFluidVaultIdsForUser: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<string[]>;
 export declare const getFluidPosition: (web3: Web3, network: NetworkNumber, vaultId: string, extractedState: {
     assetsData: FluidAssetsData;
     marketData: InnerFluidMarketData;
 }) => Promise<FluidVaultData>;
-export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNumber, vaultId: string) => Promise<{
+export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNumber, vaultId: string, mainnetWeb3: Web3) => Promise<{
     userData: FluidVaultData;
     marketData: FluidMarketData;
 }>;
-export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3) => Promise<FluidMarketData[]>;
+export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3, mainnetWeb3: Web3) => Promise<FluidMarketData[]>;
 export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, token: string) => Promise<{
     fTokenAddress: any;
     fTokenSymbol: string;
@@ -59,7 +59,7 @@ export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, t
     deposited: string;
     depositedShares: string;
 }>;
-export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<{
+export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress, mainnetWeb3: Web3) => Promise<{
     marketData: FluidMarketData;
     userData: {
         nftId: string;

package/cjs/fluid/index.js

@@ -24,6 +24,7 @@ const multicall_1 = require("../multicall");
 const markets_1 = require("../markets");
 const constants_1 = require("../constants");
 const priceService_1 = require("../services/priceService");
+const staking_1 = require("../staking");
 exports.EMPTY_USED_ASSET = {
     isSupplied: false,
     isBorrowed: false,
@@ -43,7 +44,7 @@ const parseVaultType = (vaultType) => {
         default: return types_1.FluidVaultType.Unknown;
     }
 };
-const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void 0, function* () {
+const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset = (0, tokens_1.getAssetInfoByAddress)(data.supplyToken0, network);
     const debtAsset = (0, tokens_1.getAssetInfoByAddress)(data.borrowToken0, network);
     const supplyRate = new decimal_js_1.default(data.supplyRateVault).div(100).toString();
@@ -81,6 +82,10 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
         supplyRate,
         borrowRate: '0',
     };
+    if (staking_1.STAKING_ASSETS.includes(collAsset.symbol)) {
+        collAssetData.incentiveSupplyApy = yield (0, staking_1.getStakingApy)(collAsset.symbol, mainnetWeb3);
+        collAssetData.incentiveSupplyToken = collAsset.symbol;
+    }
     const debtAssetData = {
         symbol: debtAsset.symbol,
         address: debtAsset.address,
@@ -175,10 +180,10 @@ const parseUserData = (userPositionData, vaultData) => {
         marketData,
     }));
 };
-const getFluidMarketData = (web3, network, market) => __awaiter(void 0, void 0, void 0, function* () {
+const getFluidMarketData = (web3, network, market, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const view = (0, contracts_1.FluidViewContract)(web3, network);
     const data = yield view.methods.getVaultData(market.marketAddress).call();
-    return parseMarketData(web3, data, network);
+    return parseMarketData(web3, data, network, mainnetWeb3);
 });
 exports.getFluidMarketData = getFluidMarketData;
 const getFluidVaultIdsForUser = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
@@ -193,10 +198,10 @@ const getFluidPosition = (web3, network, vaultId, extractedState) => __awaiter(v
     return parseUserData(userPositionData, extractedState);
 });
 exports.getFluidPosition = getFluidPosition;
-const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0, void 0, void 0, function* () {
+const getFluidPositionWithMarket = (web3, network, vaultId, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const view = (0, contracts_1.FluidViewContract)(web3, network);
     const data = yield view.methods.getPositionByNftId(vaultId).call();
-    const marketData = yield parseMarketData(web3, data.vault, network);
+    const marketData = yield parseMarketData(web3, data.vault, network, mainnetWeb3);
     const userData = parseUserData(data.position, marketData);
     return {
         userData,
@@ -204,7 +209,7 @@ const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0,
     };
 });
 exports.getFluidPositionWithMarket = getFluidPositionWithMarket;
-const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0, void 0, function* () {
+const getAllFluidMarketDataChunked = (network, web3, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const versions = (0, markets_1.getFluidVersionsDataForNetwork)(network);
     const view = (0, contracts_1.FluidViewContract)(web3, network);
     const calls = versions.map((version) => ({
@@ -214,7 +219,7 @@ const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0
     }));
     const data = yield (0, multicall_1.chunkAndMulticall)(calls, 10, 'latest', web3, network);
     // @ts-ignore
-    return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network); })));
+    return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network, mainnetWeb3); })));
 });
 exports.getAllFluidMarketDataChunked = getAllFluidMarketDataChunked;
 const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, void 0, function* () {
@@ -261,10 +266,10 @@ const getFluidDepositData = (web3, network, token, address) => __awaiter(void 0,
     };
 });
 exports.getFluidDepositData = getFluidDepositData;
-const getUserPositions = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
+const getUserPositions = (web3, network, user, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const view = (0, contracts_1.FluidViewContract)(web3, network);
     const data = yield view.methods.getUserPositions(user).call();
-    const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network); })));
+    const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network, mainnetWeb3); })));
     const userData = data.positions.map((position, i) => (Object.assign(Object.assign({}, parseUserData(position, parsedMarketData[i])), { nftId: position.nftId })));
     return parsedMarketData.map((market, i) => ({
         marketData: market,

package/cjs/helpers/morphoBlueHelpers/index.js

@@ -115,73 +115,73 @@ const getApyAfterValuesEstimation = (selectedMarket, actions, web3, 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.js

@@ -1953,7 +1953,7 @@ const FluidMarkets = (networkId) => ({
     [types_1.FluidBaseVersions.WSTETH_CBBTC_16_BASE]: (0, exports.WSTETH_CBBTC_16_BASE)(networkId),
 });
 exports.FluidMarkets = FluidMarkets;
-const getFluidVersionsDataForNetwork = (network) => (Object.values((0, exports.FluidMarkets)(network)).filter(({ chainIds, marketAddress, type }) => !!marketAddress && chainIds.includes(network) && type === types_1.FluidVaultType.T1));
+const getFluidVersionsDataForNetwork = (network) => (Object.values((0, exports.FluidMarkets)(network)).filter(({ chainIds, marketAddress }) => !!marketAddress && chainIds.includes(network)));
 exports.getFluidVersionsDataForNetwork = getFluidVersionsDataForNetwork;
 const getFluidMarketInfoById = (vaultId, network = 1) => (0, exports.getFluidVersionsDataForNetwork)(network).find(({ id }) => id === vaultId);
 exports.getFluidMarketInfoById = getFluidMarketInfoById;

package/esm/fluid/index.d.ts

@@ -26,17 +26,17 @@ export declare const EMPTY_FLUID_DATA: {
     automationResubscribeRequired: boolean;
     lastUpdated: number;
 };
-export declare const getFluidMarketData: (web3: Web3, network: NetworkNumber, market: FluidMarketInfo) => Promise<FluidMarketData>;
+export declare const getFluidMarketData: (web3: Web3, network: NetworkNumber, market: FluidMarketInfo, mainnetWeb3: Web3) => Promise<FluidMarketData>;
 export declare const getFluidVaultIdsForUser: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<string[]>;
 export declare const getFluidPosition: (web3: Web3, network: NetworkNumber, vaultId: string, extractedState: {
     assetsData: FluidAssetsData;
     marketData: InnerFluidMarketData;
 }) => Promise<FluidVaultData>;
-export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNumber, vaultId: string) => Promise<{
+export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNumber, vaultId: string, mainnetWeb3: Web3) => Promise<{
     userData: FluidVaultData;
     marketData: FluidMarketData;
 }>;
-export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3) => Promise<FluidMarketData[]>;
+export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3, mainnetWeb3: Web3) => Promise<FluidMarketData[]>;
 export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, token: string) => Promise<{
     fTokenAddress: any;
     fTokenSymbol: string;
@@ -59,7 +59,7 @@ export declare const getFluidDepositData: (web3: Web3, network: NetworkNumber, t
     deposited: string;
     depositedShares: string;
 }>;
-export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress) => Promise<{
+export declare const getUserPositions: (web3: Web3, network: NetworkNumber, user: EthAddress, mainnetWeb3: Web3) => Promise<{
     marketData: FluidMarketData;
     userData: {
         nftId: string;

package/esm/fluid/index.js

@@ -18,6 +18,7 @@ import { chunkAndMulticall } from '../multicall';
 import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
 import { USD_QUOTE } from '../constants';
 import { getChainlinkAssetAddress, getWstETHPriceFluid } from '../services/priceService';
+import { getStakingApy, STAKING_ASSETS } from '../staking';
 export const EMPTY_USED_ASSET = {
     isSupplied: false,
     isBorrowed: false,
@@ -37,7 +38,7 @@ const parseVaultType = (vaultType) => {
         default: return FluidVaultType.Unknown;
     }
 };
-const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void 0, function* () {
+const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
     const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
     const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
@@ -75,6 +76,10 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
         supplyRate,
         borrowRate: '0',
     };
+    if (STAKING_ASSETS.includes(collAsset.symbol)) {
+        collAssetData.incentiveSupplyApy = yield getStakingApy(collAsset.symbol, mainnetWeb3);
+        collAssetData.incentiveSupplyToken = collAsset.symbol;
+    }
     const debtAssetData = {
         symbol: debtAsset.symbol,
         address: debtAsset.address,
@@ -169,10 +174,10 @@ const parseUserData = (userPositionData, vaultData) => {
         marketData,
     }));
 };
-export const getFluidMarketData = (web3, network, market) => __awaiter(void 0, void 0, void 0, function* () {
+export const getFluidMarketData = (web3, network, market, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContract(web3, network);
     const data = yield view.methods.getVaultData(market.marketAddress).call();
-    return parseMarketData(web3, data, network);
+    return parseMarketData(web3, data, network, mainnetWeb3);
 });
 export const getFluidVaultIdsForUser = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContract(web3, network);
@@ -184,17 +189,17 @@ export const getFluidPosition = (web3, network, vaultId, extractedState) => __aw
     const userPositionData = data[0];
     return parseUserData(userPositionData, extractedState);
 });
-export const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0, void 0, void 0, function* () {
+export const getFluidPositionWithMarket = (web3, network, vaultId, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContract(web3, network);
     const data = yield view.methods.getPositionByNftId(vaultId).call();
-    const marketData = yield parseMarketData(web3, data.vault, network);
+    const marketData = yield parseMarketData(web3, data.vault, network, mainnetWeb3);
     const userData = parseUserData(data.position, marketData);
     return {
         userData,
         marketData,
     };
 });
-export const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0, void 0, function* () {
+export const getAllFluidMarketDataChunked = (network, web3, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const versions = getFluidVersionsDataForNetwork(network);
     const view = FluidViewContract(web3, network);
     const calls = versions.map((version) => ({
@@ -204,7 +209,7 @@ export const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0,
     }));
     const data = yield chunkAndMulticall(calls, 10, 'latest', web3, network);
     // @ts-ignore
-    return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network); })));
+    return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network, mainnetWeb3); })));
 });
 export const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContract(web3, network);
@@ -248,10 +253,10 @@ export const getFluidDepositData = (web3, network, token, address) => __awaiter(
         depositedShares: getEthAmountForDecimals(userPosition.fTokenShares, decimals),
     };
 });
-export const getUserPositions = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
+export const getUserPositions = (web3, network, user, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContract(web3, network);
     const data = yield view.methods.getUserPositions(user).call();
-    const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network); })));
+    const parsedMarketData = yield Promise.all(data.vaults.map((vaultData) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, vaultData, network, mainnetWeb3); })));
     const userData = data.positions.map((position, i) => (Object.assign(Object.assign({}, parseUserData(position, parsedMarketData[i])), { nftId: position.nftId })));
     return parsedMarketData.map((market, i) => ({
         marketData: market,