@defisaver/positions-sdk 0.0.201-fluid-dev → 0.0.201-fluid-dev-1

package/esm/markets/index.d.ts

@@ -6,4 +6,4 @@ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets } from './liquityV2';
 export { EulerV2Markets } from './euler';
-export { FluidMarkets } from './fluid';
+export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById } from './fluid';

package/esm/markets/index.js

@@ -6,4 +6,4 @@ export { MorphoBlueMarkets, findMorphoBlueMarket } from './morphoBlue';
 export { LlamaLendMarkets } from './llamaLend';
 export { LiquityV2Markets } from './liquityV2';
 export { EulerV2Markets } from './euler';
-export { FluidMarkets } from './fluid';
+export { FluidMarkets, getFluidVersionsDataForNetwork, getFluidMarketInfoById } from './fluid';

package/esm/morphoBlue/index.js

@@ -13,10 +13,9 @@ import { NetworkNumber, } from '../types/common';
 import { DFSFeedRegistryContract, FeedRegistryContract, MorphoBlueViewContract } from '../contracts';
 import { USD_QUOTE, WAD } from '../constants';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
-import { wethToEth } from '../services/utils';
+import { isMainnetNetwork, wethToEth } from '../services/utils';
 import { getBorrowRate, getMorphoBlueAggregatedPositionData, getRewardsForMarket, getSupplyRate, } from '../helpers/morphoBlueHelpers';
 import { getChainlinkAssetAddress } from '../services/priceService';
-const isMainnetNetwork = (network) => network === NetworkNumber.Eth;
 export function getMorphoBlueMarketData(web3, network, selectedMarket, mainnetWeb3) {
     return __awaiter(this, void 0, void 0, function* () {
         const { loanToken, collateralToken, oracle, irm, lltv, oracleType, } = selectedMarket;

package/esm/multicall/index.d.ts

@@ -1,3 +1,4 @@
 import Web3 from 'web3';
 import { NetworkNumber } from '../types/common';
 export declare const multicall: (calls: any[], web3: Web3, network?: NetworkNumber, blockNumber?: 'latest' | number) => Promise<any[]>;
+export declare const chunkAndMulticall: (calls: any[], chunkSize: number, blockNumber: number | "latest" | undefined, web3: Web3, network?: NetworkNumber) => Promise<any[]>;

package/esm/multicall/index.js

@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { chunk } from 'lodash';
 import { UniMulticallContract } from '../contracts';
 import { NetworkNumber } from '../types/common';
 export const multicall = (calls, web3, network = NetworkNumber.Eth, blockNumber = 'latest') => __awaiter(void 0, void 0, void 0, function* () {
@@ -25,3 +26,8 @@ export const multicall = (calls, web3, network = NetworkNumber.Eth, blockNumber
     });
     return formattedResult;
 });
+export const chunkAndMulticall = (calls, chunkSize, blockNumber = 'latest', web3, network = NetworkNumber.Eth) => __awaiter(void 0, void 0, void 0, function* () {
+    const chunkedCalls = chunk(calls, chunkSize);
+    const results = yield Promise.all(chunkedCalls.map((cnk) => multicall(cnk, web3, network, blockNumber)));
+    return results.flat(1);
+});

package/esm/services/utils.d.ts

@@ -22,3 +22,4 @@ export declare const mapRange: (input: number | string, minInput: number | strin
 export declare const isEnabledOnBitmap: (bitmap: number, assetId: number) => bigint;
 export declare const MAXUINT: string;
 export declare const isMaxuint: (amount: string) => boolean;
+export declare const isMainnetNetwork: (network: NetworkNumber) => boolean;

package/esm/services/utils.js

@@ -35,3 +35,4 @@ export const mapRange = (input, minInput, maxInput, minOutput, maxOutput) => {
 export const isEnabledOnBitmap = (bitmap, assetId) => (BigInt(bitmap) >> BigInt(assetId)) & BigInt(1);
 export const MAXUINT = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
 export const isMaxuint = (amount) => compareAddresses(MAXUINT, amount);
+export const isMainnetNetwork = (network) => network === NetworkNumber.Eth;

package/esm/types/contracts/generated/FluidView.d.ts

@@ -100,10 +100,6 @@ export declare namespace FluidView {
         number | string | BN,
         number | string | BN,
         number | string | BN,
-        number | string | BN,
-        number | string | BN,
-        number | string | BN,
-        number | string | BN,
         number | string | BN
     ] | {
         vault: string;
@@ -128,10 +124,6 @@ export declare namespace FluidView {
         oracle: string;
         oraclePriceOperate: number | string | BN;
         oraclePriceLiquidate: number | string | BN;
-        priceOfSupplyToken0InUSD: number | string | BN;
-        priceOfSupplyToken1InUSD: number | string | BN;
-        priceOfBorrowToken0InUSD: number | string | BN;
-        priceOfBorrowToken1InUSD: number | string | BN;
         vaultSupplyExchangePrice: number | string | BN;
         vaultBorrowExchangePrice: number | string | BN;
         supplyRateVault: number | string | BN;
@@ -203,10 +195,6 @@ export declare namespace FluidView {
         string,
         string,
         string,
-        string,
-        string,
-        string,
-        string,
         string
     ];
     type VaultDataStructOutputStruct = {
@@ -232,10 +220,6 @@ export declare namespace FluidView {
         oracle: string;
         oraclePriceOperate: string;
         oraclePriceLiquidate: string;
-        priceOfSupplyToken0InUSD: string;
-        priceOfSupplyToken1InUSD: string;
-        priceOfBorrowToken0InUSD: string;
-        priceOfBorrowToken1InUSD: string;
         vaultSupplyExchangePrice: string;
         vaultBorrowExchangePrice: string;
         supplyRateVault: string;
@@ -267,14 +251,6 @@ export interface FluidView extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): FluidView;
     clone(): FluidView;
     methods: {
-        feedRegistry(): NonPayableTransactionObject<string>;
-        getAaveTokenPriceInETH(_tokenAddr: string): NonPayableTransactionObject<string>;
-        getAaveTokenPriceInUSD(_tokenAddr: string): NonPayableTransactionObject<string>;
-        getAaveV3TokenPriceInETH(_tokenAddr: string): NonPayableTransactionObject<string>;
-        getAaveV3TokenPriceInUSD(_tokenAddr: string): NonPayableTransactionObject<string>;
-        getAddrForChainlinkOracle(_inputTokenAddr: string): NonPayableTransactionObject<string>;
-        getChainlinkPriceInETH(_inputTokenAddr: string): NonPayableTransactionObject<string>;
-        getChainlinkPriceInUSD(_inputTokenAddr: string, _useFallback: boolean): NonPayableTransactionObject<string>;
         getPositionByNftId(_nftId: number | string | BN): NonPayableTransactionObject<[
             FluidView.UserPositionStructOutput,
             FluidView.VaultDataStructOutput
@@ -282,23 +258,7 @@ export interface FluidView extends BaseContract {
             position: FluidView.UserPositionStructOutput;
             vault: FluidView.VaultDataStructOutput;
         }>;
-        getPriceInETH(_inputTokenAddr: string): NonPayableTransactionObject<string>;
-        getPriceInUSD(_inputTokenAddr: string): NonPayableTransactionObject<string>;
         getRatio(_nftId: number | string | BN): NonPayableTransactionObject<string>;
-        "getRoundInfo(address,uint80,address)"(_inputTokenAddr: string, _roundId: number | string | BN, aggregator: string): NonPayableTransactionObject<[
-            string,
-            string
-        ] & {
-            updateTimestamp: string;
-        }>;
-        "getRoundInfo(address,uint80)"(_inputTokenAddr: string, _roundId: number | string | BN): NonPayableTransactionObject<[
-            string,
-            string
-        ] & {
-            updateTimestamp: string;
-        }>;
-        getSparkTokenPriceInETH(_tokenAddr: string): NonPayableTransactionObject<string>;
-        getSparkTokenPriceInUSD(_tokenAddr: string): NonPayableTransactionObject<string>;
         getUserNftIds(_user: string): NonPayableTransactionObject<string[]>;
         getUserPositions(_user: string): NonPayableTransactionObject<[
             FluidView.UserPositionStructOutput[],
@@ -309,8 +269,6 @@ export interface FluidView extends BaseContract {
         }>;
         getVaultAddresses(_ids: number | string | BN[], _fetchAll: boolean): NonPayableTransactionObject<string[]>;
         getVaultData(_vault: string): NonPayableTransactionObject<FluidView.VaultDataStructOutput>;
-        getWBtcPrice(_btcPrice: number | string | BN): NonPayableTransactionObject<string>;
-        getWStEthPrice(_stEthPrice: number | string | BN): NonPayableTransactionObject<string>;
     };
     events: {
         allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;

package/esm/types/fluid.d.ts

@@ -11,6 +11,10 @@ export interface FluidMarketInfo {
     hasSmartDebt: boolean;
     collateralAsset: string;
     debtAsset: string;
+    ethBased?: boolean;
+    btcBased?: boolean;
+    wstETHBased?: boolean;
+    type: FluidVaultType;
 }
 export declare enum FluidMainnetVersion {
     ETH_USDC_1 = "ETH_USDC_1",
@@ -158,17 +162,22 @@ export interface InnerFluidMarketData {
     isSmartDebt: boolean;
     marketAddress: string;
     vaultType: FluidVaultType;
+    vaultValue?: FluidVersions;
     oracle: string;
     liquidationPenaltyPercent: string;
     collFactor: string;
     liquidationRatio: string;
+    liqFactor: string;
+    minRatio: string;
     collAsset0: string;
     collAsset1?: string;
     debtAsset0: string;
     debtAsset1?: string;
     totalPositions: string;
     totalSupplyVault: string;
+    totalSupplyVaultUsd: string;
     totalBorrowVault: string;
+    totalBorrowVaultUsd: string;
     withdrawalLimit: string;
     withdrawableUntilLimit: string;
     withdrawable: string;
@@ -179,6 +188,8 @@ export interface InnerFluidMarketData {
     maxBorrowLimit: string;
     baseBorrowLimit: string;
     minimumBorrowing: string;
+    supplyRate: string;
+    borrowRate: string;
 }
 export interface FluidMarketData {
     assetsData: FluidAssetsData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.201-fluid-dev",
+  "version": "0.0.201-fluid-dev-1",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",
@@ -23,10 +23,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@defisaver/tokens": "^1.5.54",
+    "@types/lodash": "^4.17.15",
+    "@defisaver/tokens": "^1.5.55",
     "@ethersproject/bignumber": "^5.7.0",
     "@morpho-org/morpho-aave-v3-sdk": "^1.5.3",
-    "decimal.js": "^10.4.3"
+    "decimal.js": "^10.4.3",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@defisaver/eslint-config": "^1.0.1",

package/src/config/contracts.js

@@ -1107,9 +1107,9 @@ module.exports = {
     }
   },
   "FluidView": {
-    "abi": [{"inputs":[],"name":"feedRegistry","outputs":[{"internalType":"contract IFeedRegistry","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_tokenAddr","type":"address"}],"name":"getAaveTokenPriceInETH","outputs":[{"internalType":"uint256","name":"price","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_tokenAddr","type":"address"}],"name":"getAaveTokenPriceInUSD","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_tokenAddr","type":"address"}],"name":"getAaveV3TokenPriceInETH","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_tokenAddr","type":"address"}],"name":"getAaveV3TokenPriceInUSD","outputs":[{"internalType":"uint256","name":"price","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_inputTokenAddr","type":"address"}],"name":"getAddrForChainlinkOracle","outputs":[{"internalType":"address","name":"tokenAddrForChainlinkUsage","type":"address"}],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"address","name":"_inputTokenAddr","type":"address"}],"name":"getChainlinkPriceInETH","outputs":[{"internalType":"int256","name":"chainlinkPriceInETH","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_inputTokenAddr","type":"address"},{"internalType":"bool","name":"_useFallback","type":"bool"}],"name":"getChainlinkPriceInUSD","outputs":[{"internalType":"int256","name":"chainlinkPriceInUSD","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_nftId","type":"uint256"}],"name":"getPositionByNftId","outputs":[{"components":[{"internalType":"uint256","name":"nftId","type":"uint256"},{"internalType":"address","name":"owner","type":"address"},{"internalType":"bool","name":"isLiquidated","type":"bool"},{"internalType":"bool","name":"isSupplyPosition","type":"bool"},{"internalType":"uint256","name":"supply","type":"uint256"},{"internalType":"uint256","name":"borrow","type":"uint256"},{"internalType":"uint256","name":"ratio","type":"uint256"},{"internalType":"int256","name":"tick","type":"int256"},{"internalType":"uint256","name":"tickId","type":"uint256"}],"internalType":"struct FluidView.UserPosition","name":"position","type":"tuple"},{"components":[{"internalType":"address","name":"vault","type":"address"},{"internalType":"uint256","name":"vaultId","type":"uint256"},{"internalType":"uint256","name":"vaultType","type":"uint256"},{"internalType":"bool","name":"isSmartColl","type":"bool"},{"internalType":"bool","name":"isSmartDebt","type":"bool"},{"internalType":"address","name":"supplyToken0","type":"address"},{"internalType":"address","name":"supplyToken1","type":"address"},{"internalType":"address","name":"borrowToken0","type":"address"},{"internalType":"address","name":"borrowToken1","type":"address"},{"internalType":"uint256","name":"supplyToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"supplyToken1Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken1Decimals","type":"uint256"},{"internalType":"uint16","name":"collateralFactor","type":"uint16"},{"internalType":"uint16","name":"liquidationThreshold","type":"uint16"},{"internalType":"uint16","name":"liquidationMaxLimit","type":"uint16"},{"internalType":"uint16","name":"withdrawalGap","type":"uint16"},{"internalType":"uint16","name":"liquidationPenalty","type":"uint16"},{"internalType":"uint16","name":"borrowFee","type":"uint16"},{"internalType":"address","name":"oracle","type":"address"},{"internalType":"uint256","name":"oraclePriceOperate","type":"uint256"},{"internalType":"uint256","name":"oraclePriceLiquidate","type":"uint256"},{"internalType":"uint256","name":"priceOfSupplyToken0InUSD","type":"uint256"},{"internalType":"uint256","name":"priceOfSupplyToken1InUSD","type":"uint256"},{"internalType":"uint256","name":"priceOfBorrowToken0InUSD","type":"uint256"},{"internalType":"uint256","name":"priceOfBorrowToken1InUSD","type":"uint256"},{"internalType":"uint256","name":"vaultSupplyExchangePrice","type":"uint256"},{"internalType":"uint256","name":"vaultBorrowExchangePrice","type":"uint256"},{"internalType":"int256","name":"supplyRateVault","type":"int256"},{"internalType":"int256","name":"borrowRateVault","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateSupply","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateBorrow","type":"int256"},{"internalType":"uint256","name":"totalPositions","type":"uint256"},{"internalType":"uint256","name":"totalSupplyVault","type":"uint256"},{"internalType":"uint256","name":"totalBorrowVault","type":"uint256"},{"internalType":"uint256","name":"withdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawable","type":"uint256"},{"internalType":"uint256","name":"baseWithdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandPercent","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandDuration","type":"uint256"},{"internalType":"uint256","name":"borrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"borrowable","type":"uint256"},{"internalType":"uint256","name":"borrowLimitUtilization","type":"uint256"},{"internalType":"uint256","name":"maxBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowExpandPercent","type":"uint256"},{"internalType":"uint256","name":"borrowExpandDuration","type":"uint256"},{"internalType":"uint256","name":"baseBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"minimumBorrowing","type":"uint256"}],"internalType":"struct FluidView.VaultData","name":"vault","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_inputTokenAddr","type":"address"}],"name":"getPriceInETH","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_inputTokenAddr","type":"address"}],"name":"getPriceInUSD","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_nftId","type":"uint256"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_inputTokenAddr","type":"address"},{"internalType":"uint80","name":"_roundId","type":"uint80"},{"internalType":"contract IAggregatorV3","name":"aggregator","type":"address"}],"name":"getRoundInfo","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"updateTimestamp","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_inputTokenAddr","type":"address"},{"internalType":"uint80","name":"_roundId","type":"uint80"}],"name":"getRoundInfo","outputs":[{"internalType":"uint256","name":"","type":"uint256"},{"internalType":"uint256","name":"updateTimestamp","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_tokenAddr","type":"address"}],"name":"getSparkTokenPriceInETH","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_tokenAddr","type":"address"}],"name":"getSparkTokenPriceInUSD","outputs":[{"internalType":"uint256","name":"price","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"}],"name":"getUserNftIds","outputs":[{"internalType":"uint256[]","name":"","type":"uint256[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"}],"name":"getUserPositions","outputs":[{"components":[{"internalType":"uint256","name":"nftId","type":"uint256"},{"internalType":"address","name":"owner","type":"address"},{"internalType":"bool","name":"isLiquidated","type":"bool"},{"internalType":"bool","name":"isSupplyPosition","type":"bool"},{"internalType":"uint256","name":"supply","type":"uint256"},{"internalType":"uint256","name":"borrow","type":"uint256"},{"internalType":"uint256","name":"ratio","type":"uint256"},{"internalType":"int256","name":"tick","type":"int256"},{"internalType":"uint256","name":"tickId","type":"uint256"}],"internalType":"struct FluidView.UserPosition[]","name":"positions","type":"tuple[]"},{"components":[{"internalType":"address","name":"vault","type":"address"},{"internalType":"uint256","name":"vaultId","type":"uint256"},{"internalType":"uint256","name":"vaultType","type":"uint256"},{"internalType":"bool","name":"isSmartColl","type":"bool"},{"internalType":"bool","name":"isSmartDebt","type":"bool"},{"internalType":"address","name":"supplyToken0","type":"address"},{"internalType":"address","name":"supplyToken1","type":"address"},{"internalType":"address","name":"borrowToken0","type":"address"},{"internalType":"address","name":"borrowToken1","type":"address"},{"internalType":"uint256","name":"supplyToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"supplyToken1Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken1Decimals","type":"uint256"},{"internalType":"uint16","name":"collateralFactor","type":"uint16"},{"internalType":"uint16","name":"liquidationThreshold","type":"uint16"},{"internalType":"uint16","name":"liquidationMaxLimit","type":"uint16"},{"internalType":"uint16","name":"withdrawalGap","type":"uint16"},{"internalType":"uint16","name":"liquidationPenalty","type":"uint16"},{"internalType":"uint16","name":"borrowFee","type":"uint16"},{"internalType":"address","name":"oracle","type":"address"},{"internalType":"uint256","name":"oraclePriceOperate","type":"uint256"},{"internalType":"uint256","name":"oraclePriceLiquidate","type":"uint256"},{"internalType":"uint256","name":"priceOfSupplyToken0InUSD","type":"uint256"},{"internalType":"uint256","name":"priceOfSupplyToken1InUSD","type":"uint256"},{"internalType":"uint256","name":"priceOfBorrowToken0InUSD","type":"uint256"},{"internalType":"uint256","name":"priceOfBorrowToken1InUSD","type":"uint256"},{"internalType":"uint256","name":"vaultSupplyExchangePrice","type":"uint256"},{"internalType":"uint256","name":"vaultBorrowExchangePrice","type":"uint256"},{"internalType":"int256","name":"supplyRateVault","type":"int256"},{"internalType":"int256","name":"borrowRateVault","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateSupply","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateBorrow","type":"int256"},{"internalType":"uint256","name":"totalPositions","type":"uint256"},{"internalType":"uint256","name":"totalSupplyVault","type":"uint256"},{"internalType":"uint256","name":"totalBorrowVault","type":"uint256"},{"internalType":"uint256","name":"withdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawable","type":"uint256"},{"internalType":"uint256","name":"baseWithdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandPercent","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandDuration","type":"uint256"},{"internalType":"uint256","name":"borrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"borrowable","type":"uint256"},{"internalType":"uint256","name":"borrowLimitUtilization","type":"uint256"},{"internalType":"uint256","name":"maxBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowExpandPercent","type":"uint256"},{"internalType":"uint256","name":"borrowExpandDuration","type":"uint256"},{"internalType":"uint256","name":"baseBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"minimumBorrowing","type":"uint256"}],"internalType":"struct FluidView.VaultData[]","name":"vaults","type":"tuple[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256[]","name":"_ids","type":"uint256[]"},{"internalType":"bool","name":"_fetchAll","type":"bool"}],"name":"getVaultAddresses","outputs":[{"internalType":"address[]","name":"","type":"address[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_vault","type":"address"}],"name":"getVaultData","outputs":[{"components":[{"internalType":"address","name":"vault","type":"address"},{"internalType":"uint256","name":"vaultId","type":"uint256"},{"internalType":"uint256","name":"vaultType","type":"uint256"},{"internalType":"bool","name":"isSmartColl","type":"bool"},{"internalType":"bool","name":"isSmartDebt","type":"bool"},{"internalType":"address","name":"supplyToken0","type":"address"},{"internalType":"address","name":"supplyToken1","type":"address"},{"internalType":"address","name":"borrowToken0","type":"address"},{"internalType":"address","name":"borrowToken1","type":"address"},{"internalType":"uint256","name":"supplyToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"supplyToken1Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken1Decimals","type":"uint256"},{"internalType":"uint16","name":"collateralFactor","type":"uint16"},{"internalType":"uint16","name":"liquidationThreshold","type":"uint16"},{"internalType":"uint16","name":"liquidationMaxLimit","type":"uint16"},{"internalType":"uint16","name":"withdrawalGap","type":"uint16"},{"internalType":"uint16","name":"liquidationPenalty","type":"uint16"},{"internalType":"uint16","name":"borrowFee","type":"uint16"},{"internalType":"address","name":"oracle","type":"address"},{"internalType":"uint256","name":"oraclePriceOperate","type":"uint256"},{"internalType":"uint256","name":"oraclePriceLiquidate","type":"uint256"},{"internalType":"uint256","name":"priceOfSupplyToken0InUSD","type":"uint256"},{"internalType":"uint256","name":"priceOfSupplyToken1InUSD","type":"uint256"},{"internalType":"uint256","name":"priceOfBorrowToken0InUSD","type":"uint256"},{"internalType":"uint256","name":"priceOfBorrowToken1InUSD","type":"uint256"},{"internalType":"uint256","name":"vaultSupplyExchangePrice","type":"uint256"},{"internalType":"uint256","name":"vaultBorrowExchangePrice","type":"uint256"},{"internalType":"int256","name":"supplyRateVault","type":"int256"},{"internalType":"int256","name":"borrowRateVault","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateSupply","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateBorrow","type":"int256"},{"internalType":"uint256","name":"totalPositions","type":"uint256"},{"internalType":"uint256","name":"totalSupplyVault","type":"uint256"},{"internalType":"uint256","name":"totalBorrowVault","type":"uint256"},{"internalType":"uint256","name":"withdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawable","type":"uint256"},{"internalType":"uint256","name":"baseWithdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandPercent","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandDuration","type":"uint256"},{"internalType":"uint256","name":"borrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"borrowable","type":"uint256"},{"internalType":"uint256","name":"borrowLimitUtilization","type":"uint256"},{"internalType":"uint256","name":"maxBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowExpandPercent","type":"uint256"},{"internalType":"uint256","name":"borrowExpandDuration","type":"uint256"},{"internalType":"uint256","name":"baseBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"minimumBorrowing","type":"uint256"}],"internalType":"struct FluidView.VaultData","name":"vaultData","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"int256","name":"_btcPrice","type":"int256"}],"name":"getWBtcPrice","outputs":[{"internalType":"int256","name":"wBtcPrice","type":"int256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"int256","name":"_stEthPrice","type":"int256"}],"name":"getWStEthPrice","outputs":[{"internalType":"int256","name":"wStEthPrice","type":"int256"}],"stateMutability":"view","type":"function"}],
+    "abi": [{"inputs":[{"internalType":"uint256","name":"_nftId","type":"uint256"}],"name":"getPositionByNftId","outputs":[{"components":[{"internalType":"uint256","name":"nftId","type":"uint256"},{"internalType":"address","name":"owner","type":"address"},{"internalType":"bool","name":"isLiquidated","type":"bool"},{"internalType":"bool","name":"isSupplyPosition","type":"bool"},{"internalType":"uint256","name":"supply","type":"uint256"},{"internalType":"uint256","name":"borrow","type":"uint256"},{"internalType":"uint256","name":"ratio","type":"uint256"},{"internalType":"int256","name":"tick","type":"int256"},{"internalType":"uint256","name":"tickId","type":"uint256"}],"internalType":"struct FluidView.UserPosition","name":"position","type":"tuple"},{"components":[{"internalType":"address","name":"vault","type":"address"},{"internalType":"uint256","name":"vaultId","type":"uint256"},{"internalType":"uint256","name":"vaultType","type":"uint256"},{"internalType":"bool","name":"isSmartColl","type":"bool"},{"internalType":"bool","name":"isSmartDebt","type":"bool"},{"internalType":"address","name":"supplyToken0","type":"address"},{"internalType":"address","name":"supplyToken1","type":"address"},{"internalType":"address","name":"borrowToken0","type":"address"},{"internalType":"address","name":"borrowToken1","type":"address"},{"internalType":"uint256","name":"supplyToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"supplyToken1Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken1Decimals","type":"uint256"},{"internalType":"uint16","name":"collateralFactor","type":"uint16"},{"internalType":"uint16","name":"liquidationThreshold","type":"uint16"},{"internalType":"uint16","name":"liquidationMaxLimit","type":"uint16"},{"internalType":"uint16","name":"withdrawalGap","type":"uint16"},{"internalType":"uint16","name":"liquidationPenalty","type":"uint16"},{"internalType":"uint16","name":"borrowFee","type":"uint16"},{"internalType":"address","name":"oracle","type":"address"},{"internalType":"uint256","name":"oraclePriceOperate","type":"uint256"},{"internalType":"uint256","name":"oraclePriceLiquidate","type":"uint256"},{"internalType":"uint256","name":"vaultSupplyExchangePrice","type":"uint256"},{"internalType":"uint256","name":"vaultBorrowExchangePrice","type":"uint256"},{"internalType":"int256","name":"supplyRateVault","type":"int256"},{"internalType":"int256","name":"borrowRateVault","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateSupply","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateBorrow","type":"int256"},{"internalType":"uint256","name":"totalPositions","type":"uint256"},{"internalType":"uint256","name":"totalSupplyVault","type":"uint256"},{"internalType":"uint256","name":"totalBorrowVault","type":"uint256"},{"internalType":"uint256","name":"withdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawable","type":"uint256"},{"internalType":"uint256","name":"baseWithdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandPercent","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandDuration","type":"uint256"},{"internalType":"uint256","name":"borrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"borrowable","type":"uint256"},{"internalType":"uint256","name":"borrowLimitUtilization","type":"uint256"},{"internalType":"uint256","name":"maxBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowExpandPercent","type":"uint256"},{"internalType":"uint256","name":"borrowExpandDuration","type":"uint256"},{"internalType":"uint256","name":"baseBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"minimumBorrowing","type":"uint256"}],"internalType":"struct FluidView.VaultData","name":"vault","type":"tuple"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_nftId","type":"uint256"}],"name":"getRatio","outputs":[{"internalType":"uint256","name":"ratio","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"}],"name":"getUserNftIds","outputs":[{"internalType":"uint256[]","name":"","type":"uint256[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_user","type":"address"}],"name":"getUserPositions","outputs":[{"components":[{"internalType":"uint256","name":"nftId","type":"uint256"},{"internalType":"address","name":"owner","type":"address"},{"internalType":"bool","name":"isLiquidated","type":"bool"},{"internalType":"bool","name":"isSupplyPosition","type":"bool"},{"internalType":"uint256","name":"supply","type":"uint256"},{"internalType":"uint256","name":"borrow","type":"uint256"},{"internalType":"uint256","name":"ratio","type":"uint256"},{"internalType":"int256","name":"tick","type":"int256"},{"internalType":"uint256","name":"tickId","type":"uint256"}],"internalType":"struct FluidView.UserPosition[]","name":"positions","type":"tuple[]"},{"components":[{"internalType":"address","name":"vault","type":"address"},{"internalType":"uint256","name":"vaultId","type":"uint256"},{"internalType":"uint256","name":"vaultType","type":"uint256"},{"internalType":"bool","name":"isSmartColl","type":"bool"},{"internalType":"bool","name":"isSmartDebt","type":"bool"},{"internalType":"address","name":"supplyToken0","type":"address"},{"internalType":"address","name":"supplyToken1","type":"address"},{"internalType":"address","name":"borrowToken0","type":"address"},{"internalType":"address","name":"borrowToken1","type":"address"},{"internalType":"uint256","name":"supplyToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"supplyToken1Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken1Decimals","type":"uint256"},{"internalType":"uint16","name":"collateralFactor","type":"uint16"},{"internalType":"uint16","name":"liquidationThreshold","type":"uint16"},{"internalType":"uint16","name":"liquidationMaxLimit","type":"uint16"},{"internalType":"uint16","name":"withdrawalGap","type":"uint16"},{"internalType":"uint16","name":"liquidationPenalty","type":"uint16"},{"internalType":"uint16","name":"borrowFee","type":"uint16"},{"internalType":"address","name":"oracle","type":"address"},{"internalType":"uint256","name":"oraclePriceOperate","type":"uint256"},{"internalType":"uint256","name":"oraclePriceLiquidate","type":"uint256"},{"internalType":"uint256","name":"vaultSupplyExchangePrice","type":"uint256"},{"internalType":"uint256","name":"vaultBorrowExchangePrice","type":"uint256"},{"internalType":"int256","name":"supplyRateVault","type":"int256"},{"internalType":"int256","name":"borrowRateVault","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateSupply","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateBorrow","type":"int256"},{"internalType":"uint256","name":"totalPositions","type":"uint256"},{"internalType":"uint256","name":"totalSupplyVault","type":"uint256"},{"internalType":"uint256","name":"totalBorrowVault","type":"uint256"},{"internalType":"uint256","name":"withdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawable","type":"uint256"},{"internalType":"uint256","name":"baseWithdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandPercent","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandDuration","type":"uint256"},{"internalType":"uint256","name":"borrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"borrowable","type":"uint256"},{"internalType":"uint256","name":"borrowLimitUtilization","type":"uint256"},{"internalType":"uint256","name":"maxBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowExpandPercent","type":"uint256"},{"internalType":"uint256","name":"borrowExpandDuration","type":"uint256"},{"internalType":"uint256","name":"baseBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"minimumBorrowing","type":"uint256"}],"internalType":"struct FluidView.VaultData[]","name":"vaults","type":"tuple[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256[]","name":"_ids","type":"uint256[]"},{"internalType":"bool","name":"_fetchAll","type":"bool"}],"name":"getVaultAddresses","outputs":[{"internalType":"address[]","name":"","type":"address[]"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_vault","type":"address"}],"name":"getVaultData","outputs":[{"components":[{"internalType":"address","name":"vault","type":"address"},{"internalType":"uint256","name":"vaultId","type":"uint256"},{"internalType":"uint256","name":"vaultType","type":"uint256"},{"internalType":"bool","name":"isSmartColl","type":"bool"},{"internalType":"bool","name":"isSmartDebt","type":"bool"},{"internalType":"address","name":"supplyToken0","type":"address"},{"internalType":"address","name":"supplyToken1","type":"address"},{"internalType":"address","name":"borrowToken0","type":"address"},{"internalType":"address","name":"borrowToken1","type":"address"},{"internalType":"uint256","name":"supplyToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"supplyToken1Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken0Decimals","type":"uint256"},{"internalType":"uint256","name":"borrowToken1Decimals","type":"uint256"},{"internalType":"uint16","name":"collateralFactor","type":"uint16"},{"internalType":"uint16","name":"liquidationThreshold","type":"uint16"},{"internalType":"uint16","name":"liquidationMaxLimit","type":"uint16"},{"internalType":"uint16","name":"withdrawalGap","type":"uint16"},{"internalType":"uint16","name":"liquidationPenalty","type":"uint16"},{"internalType":"uint16","name":"borrowFee","type":"uint16"},{"internalType":"address","name":"oracle","type":"address"},{"internalType":"uint256","name":"oraclePriceOperate","type":"uint256"},{"internalType":"uint256","name":"oraclePriceLiquidate","type":"uint256"},{"internalType":"uint256","name":"vaultSupplyExchangePrice","type":"uint256"},{"internalType":"uint256","name":"vaultBorrowExchangePrice","type":"uint256"},{"internalType":"int256","name":"supplyRateVault","type":"int256"},{"internalType":"int256","name":"borrowRateVault","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateSupply","type":"int256"},{"internalType":"int256","name":"rewardsOrFeeRateBorrow","type":"int256"},{"internalType":"uint256","name":"totalPositions","type":"uint256"},{"internalType":"uint256","name":"totalSupplyVault","type":"uint256"},{"internalType":"uint256","name":"totalBorrowVault","type":"uint256"},{"internalType":"uint256","name":"withdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawable","type":"uint256"},{"internalType":"uint256","name":"baseWithdrawalLimit","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandPercent","type":"uint256"},{"internalType":"uint256","name":"withdrawExpandDuration","type":"uint256"},{"internalType":"uint256","name":"borrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowableUntilLimit","type":"uint256"},{"internalType":"uint256","name":"borrowable","type":"uint256"},{"internalType":"uint256","name":"borrowLimitUtilization","type":"uint256"},{"internalType":"uint256","name":"maxBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"borrowExpandPercent","type":"uint256"},{"internalType":"uint256","name":"borrowExpandDuration","type":"uint256"},{"internalType":"uint256","name":"baseBorrowLimit","type":"uint256"},{"internalType":"uint256","name":"minimumBorrowing","type":"uint256"}],"internalType":"struct FluidView.VaultData","name":"vaultData","type":"tuple"}],"stateMutability":"view","type":"function"}],
     "networks": {
-      "1": { "address": "0xBAc6dc3edB72Bc705Ab4e31F2a2151Fe06550D9B" }
+      "1": { "address": "0x72B2A658d2009fF3c3e133d3a042fFE705808aC5" }
     }
   }
 }

package/src/fluid/index.ts

@@ -12,10 +12,14 @@ import {
   FluidVaultData,
   FluidVaultType, InnerFluidMarketData,
 } from '../types';
-import { FluidViewContract } from '../contracts';
-import { getEthAmountForDecimals } from '../services/utils';
+import { DFSFeedRegistryContract, FeedRegistryContract, FluidViewContract } from '../contracts';
+import { getEthAmountForDecimals, isMainnetNetwork } from '../services/utils';
 import { getFluidAggregatedData } from '../helpers/fluidHelpers';
 import { FluidView } from '../types/contracts/generated';
+import { chunkAndMulticall } from '../multicall';
+import { getFluidMarketInfoById, getFluidVersionsDataForNetwork } from '../markets/fluid';
+import { USD_QUOTE } from '../constants';
+import { getChainlinkAssetAddress, getWstETHPrice } from '../services/priceService';
 
 export const EMPTY_USED_ASSET = {
   isSupplied: false,
@@ -38,41 +42,75 @@ const parseVaultType = (vaultType: number) => {
   }
 };
 
-const parseMarketData = (data: FluidView.VaultDataStructOutputStruct) => {
+const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutputStruct, network: NetworkNumber) => {
   const collAsset = getAssetInfoByAddress(data.supplyToken0);
   const debtAsset = getAssetInfoByAddress(data.borrowToken0);
 
+  const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
+  const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
+
+  const oracleScaleFactor = new Dec(27).add(debtAsset.decimals).sub(collAsset.decimals).toString();
+  const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
+  const oraclePrice = new Dec(data.oraclePriceOperate).div(oracleScale).toString();
+
+  const isTokenUSDA = debtAsset.symbol === 'USDA';
+  const isMainnet = isMainnetNetwork(network);
+  const loanTokenFeedAddress = getChainlinkAssetAddress(debtAsset.symbol, network);
+
+  let loanTokenPrice;
+  if (debtAsset.symbol === 'wstETH') {
+    // need to handle wstETH for l2s inside getWstETHPrice
+    loanTokenPrice = await getWstETHPrice(web3);
+  } else if (isMainnet) {
+    const feedRegistryContract = FeedRegistryContract(web3, NetworkNumber.Eth);
+    loanTokenPrice = isTokenUSDA ? '100000000' : await feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call();
+  } else {
+    // Currently only base network is supported
+    const feedRegistryContract = DFSFeedRegistryContract(web3, network);
+    const roundPriceData = isTokenUSDA ? { answer: '100000000' } : await feedRegistryContract.methods.latestRoundData(loanTokenFeedAddress, USD_QUOTE).call();
+    loanTokenPrice = roundPriceData.answer;
+  }
+
+  const debtPriceParsed = new Dec(loanTokenPrice).div(1e8).toString();
+
   const collAssetData: FluidAssetData = {
     symbol: collAsset.symbol,
     address: collAsset.address,
-    price: getEthAmountForDecimals(data.priceOfSupplyToken0InUSD, 8),
+    price: new Dec(debtPriceParsed).mul(oraclePrice).toString(),
     totalSupply: data.totalSupplyVault,
     totalBorrow: data.totalBorrowVault,
     canBeSupplied: true,
     canBeBorrowed: false,
-    supplyRate: new Dec(data.supplyRateVault).div(100).toString(),
+    supplyRate,
     borrowRate: '0',
   };
 
   const debtAssetData: FluidAssetData = {
     symbol: debtAsset.symbol,
     address: debtAsset.address,
-    price: getEthAmountForDecimals(data.priceOfBorrowToken0InUSD, 8),
+    price: debtPriceParsed,
     totalSupply: data.totalSupplyVault,
     totalBorrow: data.totalBorrowVault,
     canBeSupplied: false,
     canBeBorrowed: true,
     supplyRate: '0',
-    borrowRate: new Dec(data.borrowRateVault).div(100).toString(),
+    borrowRate,
   };
 
   const assetsData = {
     [collAsset.symbol]: collAssetData,
     [debtAsset.symbol]: debtAssetData,
   };
+  const marketInfo = getFluidMarketInfoById(+data.vaultId, network);
+  const totalSupplyVault = getEthAmountForDecimals(data.totalSupplyVault, collAsset.decimals);
+  const totalBorrowVault = getEthAmountForDecimals(data.totalBorrowVault, debtAsset.decimals);
+
+  const liqRatio = new Dec(data.liquidationThreshold).div(100).toString();
+  const liqFactor = new Dec(data.liquidationThreshold).div(10_000).toString();
 
   const marketData = {
     vaultId: +data.vaultId,
+    vaultValue: marketInfo?.value,
     isSmartColl: data.isSmartColl,
     isSmartDebt: data.isSmartDebt,
     marketAddress: data.vault,
@@ -80,12 +118,16 @@ const parseMarketData = (data: FluidView.VaultDataStructOutputStruct) => {
     oracle: data.oracle,
     liquidationPenaltyPercent: new Dec(data.liquidationPenalty).div(100).toString(),
     collFactor: new Dec(data.collateralFactor).div(10000).toString(), // we want actual factor, not in %, so we divide by 10000 instead of 100
-    liquidationRatio: new Dec(data.liquidationThreshold).div(100).toString(),
+    liquidationRatio: liqRatio,
+    liqFactor,
+    minRatio: new Dec(1).div(liqFactor).mul(100).toString(),
     collAsset0: collAsset.symbol,
     debtAsset0: debtAsset.symbol,
     totalPositions: data.totalPositions,
-    totalSupplyVault: getEthAmountForDecimals(data.totalSupplyVault, collAsset.decimals),
-    totalBorrowVault: getEthAmountForDecimals(data.totalBorrowVault, debtAsset.decimals),
+    totalSupplyVault,
+    totalBorrowVault,
+    totalSupplyVaultUsd: new Dec(totalSupplyVault).mul(collAssetData.price).toString(),
+    totalBorrowVaultUsd: new Dec(totalSupplyVault).mul(debtAssetData.price).toString(),
     withdrawalLimit: getEthAmountForDecimals(data.withdrawalLimit, collAsset.decimals),
     withdrawableUntilLimit: getEthAmountForDecimals(data.withdrawableUntilLimit, collAsset.decimals),
     withdrawable: getEthAmountForDecimals(data.withdrawable, collAsset.decimals),
@@ -96,6 +138,8 @@ const parseMarketData = (data: FluidView.VaultDataStructOutputStruct) => {
     maxBorrowLimit: getEthAmountForDecimals(data.maxBorrowLimit, debtAsset.decimals),
     baseBorrowLimit: getEthAmountForDecimals(data.baseBorrowLimit, debtAsset.decimals),
     minimumBorrowing: getEthAmountForDecimals(data.minimumBorrowing, debtAsset.decimals),
+    borrowRate,
+    supplyRate,
   };
 
   return {
@@ -177,7 +221,7 @@ export const getFluidMarketData = async (web3: Web3, network: NetworkNumber, mar
 
   const data = await view.methods.getVaultData(market.marketAddress).call();
 
-  return parseMarketData(data);
+  return parseMarketData(web3, data, network);
 };
 
 export const getFluidVaultIdsForUser = async (web3: Web3,
@@ -210,11 +254,24 @@ export const getFluidPosition = async (
 export const getFluidPositionWithMarket = async (web3: Web3, network: NetworkNumber, vaultId: string) => {
   const view = FluidViewContract(web3, network);
   const data = await view.methods.getPositionByNftId(vaultId).call();
-  const marketData = parseMarketData(data.vault);
+  const marketData = await parseMarketData(web3, data.vault, network);
   const userData = parseUserData(data.position, marketData);
 
   return {
     userData,
     marketData,
   };
+};
+
+export const getAllFluidMarketDataChunked = async (network: NetworkNumber, web3: Web3) => {
+  const versions = getFluidVersionsDataForNetwork(network);
+  const view = FluidViewContract(web3, network);
+  const calls = versions.map((version) => ({
+    target: view.options.address,
+    abiItem: view.options.jsonInterface.find((item) => item.name === 'getVaultData'),
+    params: [version.marketAddress],
+  }));
+
+  const data = await chunkAndMulticall(calls, 10, 'latest', web3, network);
+  return Promise.all(data.map(async (item, i) => parseMarketData(web3, item.vaultData, network)));
 };