@defisaver/positions-sdk 1.0.10 → 1.0.11-fluid-dev

package/esm/fluid/index.js

@@ -8,16 +8,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import Dec from 'decimal.js';
-import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress, } from '@defisaver/tokens';
 import { NetworkNumber } from '../types/common';
 import { FluidVaultType, } from '../types';
 import { DFSFeedRegistryContract, FeedRegistryContract, FluidViewContract } from '../contracts';
 import { getEthAmountForDecimals, isMainnetNetwork } from '../services/utils';
-import { getFluidAggregatedData } from '../helpers/fluidHelpers';
+import { getFluidAggregatedData, mergeAssetData, mergeUsedAssets, parseDexBorrowData, parseDexSupplyData, } from '../helpers/fluidHelpers';
 import { chunkAndMulticall } from '../multicall';
 import { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
 import { USD_QUOTE } from '../constants';
-import { getChainlinkAssetAddress, getWstETHPriceFluid } from '../services/priceService';
+import { getChainlinkAssetAddress, getWeETHChainLinkPriceCalls, getWstETHChainLinkPriceCalls, getWstETHPriceFluid, parseWeETHPriceCalls, parseWstETHPriceCalls, } from '../services/priceService';
 import { getStakingApy, STAKING_ASSETS } from '../staking';
 export const EMPTY_USED_ASSET = {
     isSupplied: false,
@@ -38,19 +38,67 @@ const parseVaultType = (vaultType) => {
         default: return FluidVaultType.Unknown;
     }
 };
-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();
-    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 getChainLinkPricesForTokens = (tokens, network, web3) => __awaiter(void 0, void 0, void 0, function* () {
     const isMainnet = isMainnetNetwork(network);
-    const loanTokenFeedAddress = getChainlinkAssetAddress(debtAsset.symbol, network);
+    const noDuplicateTokens = new Array(...new Set(tokens));
+    const calls = noDuplicateTokens.flatMap((address) => {
+        const assetInfo = getAssetInfoByAddress(address, network);
+        const isTokenUSDA = assetInfo.symbol === 'USDA';
+        if (isTokenUSDA)
+            return;
+        const chainLinkFeedAddress = getChainlinkAssetAddress(assetInfo.symbol, network);
+        if (assetInfo.symbol === 'wstETH')
+            return getWstETHChainLinkPriceCalls(web3, network);
+        if (assetInfo.symbol === 'weETH')
+            return getWeETHChainLinkPriceCalls(web3, network);
+        if (isMainnet) {
+            const feedRegistryContract = FeedRegistryContract(web3, NetworkNumber.Eth);
+            return ({
+                target: feedRegistryContract.options.address,
+                abiItem: feedRegistryContract.options.jsonInterface.find(({ name }) => name === 'latestAnswer'),
+                params: [chainLinkFeedAddress, USD_QUOTE],
+            });
+        }
+        const feedRegistryContract = DFSFeedRegistryContract(web3, network);
+        return ({
+            target: feedRegistryContract.options.address,
+            abiItem: feedRegistryContract.options.jsonInterface.find(({ name }) => name === 'latestRoundData'),
+            params: [chainLinkFeedAddress, USD_QUOTE],
+        });
+    });
+    const prices = yield chunkAndMulticall(calls, 10, 'latest', web3, network);
+    let offset = 0; // wstETH has 3 calls, while others have only 1, so we need to keep track
+    return noDuplicateTokens.reduce((acc, token, i) => {
+        const assetInfo = getAssetInfoByAddress(token, network);
+        switch (assetInfo.symbol) {
+            case 'USDA':
+                acc[token] = '100000000';
+                break;
+            case 'wstETH': {
+                const { ethPrice, wstETHRate, } = parseWstETHPriceCalls(prices[i + offset][0], prices[i + offset + 1], prices[i + offset + 2][0]);
+                offset += 2;
+                acc[token] = new Dec(ethPrice).mul(wstETHRate).toString();
+                break;
+            }
+            case 'weETH': {
+                const { ethPrice, weETHRate, } = parseWeETHPriceCalls(prices[i + offset][0], prices[i + offset + 1], prices[i + offset + 2][0]);
+                offset += 2;
+                acc[token] = new Dec(ethPrice).mul(weETHRate).toString();
+                break;
+            }
+            default:
+                acc[token] = new Dec(prices[i + offset].answer).div(1e8).toString();
+                break;
+        }
+        return acc;
+    }, {});
+});
+const getTokenPriceFromChainlink = (asset, network, web3) => __awaiter(void 0, void 0, void 0, function* () {
+    const isTokenUSDA = asset.symbol === 'USDA';
+    const isMainnet = isMainnetNetwork(network);
+    const loanTokenFeedAddress = getChainlinkAssetAddress(asset.symbol, network);
     let loanTokenPrice;
-    if (debtAsset.symbol === 'wstETH') {
+    if (asset.symbol === 'wstETH') {
         // need to handle wstETH for l2s inside getWstETHPrice
         loanTokenPrice = yield getWstETHPriceFluid(web3, network);
     }
@@ -64,7 +112,17 @@ const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0,
         const roundPriceData = isTokenUSDA ? { answer: '100000000' } : yield feedRegistryContract.methods.latestRoundData(loanTokenFeedAddress, USD_QUOTE).call();
         loanTokenPrice = roundPriceData.answer;
     }
-    const debtPriceParsed = new Dec(loanTokenPrice).div(1e8).toString();
+    return new Dec(loanTokenPrice).div(1e8).toString();
+});
+const parseT1MarketData = (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();
+    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 debtPriceParsed = yield getTokenPriceFromChainlink(debtAsset, network, web3);
     const collAssetData = {
         symbol: collAsset.symbol,
         address: collAsset.address,
@@ -95,6 +153,10 @@ const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0,
         debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
         debtAssetData.incentiveBorrowToken = debtAsset.symbol;
     }
+    if (STAKING_ASSETS.includes(debtAssetData.symbol)) {
+        debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
+        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
+    }
     const assetsData = {
         [collAsset.symbol]: collAssetData,
         [debtAsset.symbol]: debtAssetData,
@@ -144,6 +206,398 @@ const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0,
         marketData,
     };
 });
+const parseT2MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
+    const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
+    const debtAsset = getAssetInfoByAddress(data.borrowToken0, network);
+    // 18 because collateral is represented in shares for which they use 18 decimals
+    const oracleScaleFactor = new Dec(27).add(debtAsset.decimals).sub(18).toString();
+    const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
+    const oraclePrice = new Dec(data.oraclePriceOperate).div(oracleScale).toString();
+    const prices = yield getChainLinkPricesForTokens([collAsset0.address, collAsset1.address, debtAsset.address], network, web3);
+    const { supplyDexFee, totalSupplyShares, supplyRate1, totalSupplyToken1, token0PerSupplyShare, token1PerSupplyShare, totalSupplyToken0, maxSupplyShares, withdrawableToken0, withdrawable0, withdrawableToken1, withdrawable1, supplyRate0, utilizationSupply0, utilizationSupply1, withdrawableShares, reservesSupplyToken0, reservesSupplyToken1, } = parseDexSupplyData(data.dexSupplyData, collAsset0.symbol, collAsset1.symbol);
+    const collFirstAssetData = {
+        symbol: collAsset0.symbol,
+        address: collAsset0.address,
+        price: prices[collAsset0.address],
+        totalSupply: new Dec(totalSupplyShares).mul(token0PerSupplyShare).toString(),
+        canBeSupplied: true,
+        supplyRate: supplyRate0,
+        utilization: utilizationSupply0,
+        withdrawable: withdrawable0,
+        tokenPerSupplyShare: token0PerSupplyShare,
+        supplyReserves: reservesSupplyToken0,
+    };
+    if (STAKING_ASSETS.includes(collFirstAssetData.symbol)) {
+        collFirstAssetData.incentiveSupplyApy = yield getStakingApy(collAsset0.symbol, mainnetWeb3);
+        collFirstAssetData.incentiveSupplyToken = collAsset0.symbol;
+    }
+    const collSecondAssetData = {
+        symbol: collAsset1.symbol,
+        address: collAsset1.address,
+        price: prices[collAsset1.address],
+        totalSupply: new Dec(totalSupplyShares).mul(token1PerSupplyShare).toString(),
+        canBeSupplied: true,
+        supplyRate: supplyRate1,
+        withdrawable: withdrawable1,
+        utilization: utilizationSupply1,
+        tokenPerSupplyShare: token1PerSupplyShare,
+        supplyReserves: reservesSupplyToken1,
+    };
+    if (STAKING_ASSETS.includes(collFirstAssetData.symbol)) {
+        collFirstAssetData.incentiveSupplyApy = yield getStakingApy(collAsset1.symbol, mainnetWeb3);
+        collFirstAssetData.incentiveSupplyToken = collAsset1.symbol;
+    }
+    const borrowRate = new Dec(data.borrowRateVault).div(100).toString();
+    const debtAssetData = {
+        symbol: debtAsset.symbol,
+        address: debtAsset.address,
+        price: prices[debtAsset.address],
+        totalBorrow: data.totalBorrowVault,
+        canBeBorrowed: true,
+        borrowRate,
+    };
+    if (STAKING_ASSETS.includes(debtAssetData.symbol)) {
+        debtAssetData.incentiveBorrowApy = yield getStakingApy(debtAsset.symbol, mainnetWeb3);
+        debtAssetData.incentiveBorrowToken = debtAsset.symbol;
+    }
+    const assetsData = [
+        [collAsset0.symbol, collFirstAssetData],
+        [collAsset1.symbol, collSecondAssetData],
+        [debtAsset.symbol, debtAssetData],
+    ]
+        .reduce((acc, [symbol, partialData]) => (Object.assign(Object.assign({}, acc), { [symbol]: mergeAssetData(acc[symbol], partialData) })), {});
+    const marketInfo = getFluidMarketInfoById(+data.vaultId, network);
+    const totalBorrowVault = getEthAmountForDecimals(data.totalBorrowVault, debtAsset.decimals);
+    const liqRatio = new Dec(data.liquidationThreshold).div(100).toString();
+    const liquidationMaxLimit = new Dec(data.liquidationMaxLimit).div(100).toString();
+    const liqFactor = new Dec(data.liquidationThreshold).div(10000).toString();
+    const totalSupplySharesInVault = assetAmountInEth(data.totalSupplyVault);
+    const collSharePrice = new Dec(oraclePrice).mul(prices[debtAsset.address]).toString();
+    const totalSupplyVaultUsd = new Dec(totalSupplySharesInVault).mul(collSharePrice).toString();
+    const withdrawableUSD = new Dec(withdrawableShares).mul(collSharePrice).toString();
+    const marketData = {
+        vaultId: +data.vaultId,
+        vaultValue: marketInfo === null || marketInfo === void 0 ? void 0 : marketInfo.value,
+        isSmartColl: data.isSmartColl,
+        isSmartDebt: data.isSmartDebt,
+        marketAddress: data.vault,
+        vaultType: parseVaultType(+data.vaultType),
+        oracle: data.oracle,
+        liquidationPenaltyPercent: new Dec(data.liquidationPenalty).div(100).toString(),
+        collFactor: new Dec(data.collateralFactor).div(10000).toString(),
+        liquidationRatio: liqRatio,
+        liqFactor,
+        minRatio: new Dec(1).div(liqFactor).mul(100).toString(),
+        collAsset0: collAsset0.symbol,
+        collAsset1: collAsset1.symbol,
+        debtAsset0: debtAsset.symbol,
+        totalPositions: data.totalPositions,
+        totalSupplyVault: totalSupplyShares,
+        totalBorrowVault,
+        totalSupplyVaultUsd,
+        collSharePrice,
+        totalBorrowVaultUsd: new Dec(totalBorrowVault).mul(assetsData[debtAsset.symbol].price).toString(),
+        borrowLimit: getEthAmountForDecimals(data.borrowLimit, debtAsset.decimals),
+        borrowableUntilLimit: getEthAmountForDecimals(data.borrowableUntilLimit, debtAsset.decimals),
+        borrowable: getEthAmountForDecimals(data.borrowable, debtAsset.decimals),
+        borrowLimitUtilization: getEthAmountForDecimals(data.borrowLimitUtilization, debtAsset.decimals),
+        maxBorrowLimit: getEthAmountForDecimals(data.maxBorrowLimit, debtAsset.decimals),
+        baseBorrowLimit: getEthAmountForDecimals(data.baseBorrowLimit, debtAsset.decimals),
+        minimumBorrowing: getEthAmountForDecimals(data.minimumBorrowing, debtAsset.decimals),
+        liquidationMaxLimit,
+        borrowRate,
+        supplyRate: '0',
+        totalSupplyToken0,
+        totalSupplyToken1,
+        withdrawableToken0,
+        withdrawableToken1,
+        withdrawableUSD,
+        withdrawable: withdrawableShares,
+        widthdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
+        maxSupplyShares,
+        collDexFee: supplyDexFee,
+    };
+    return {
+        assetsData,
+        marketData,
+    };
+});
+const parseT3MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const collAsset = getAssetInfoByAddress(data.supplyToken0, network);
+    const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
+    const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
+    const { borrowableShares, maxBorrowShares, borrowDexFee, utilizationBorrow0, utilizationBorrow1, borrowable0, borrowable1, borrowRate0, borrowRate1, totalBorrowShares, token0PerBorrowShare, token1PerBorrowShare, borrowableToken0, borrowableToken1, totalBorrowToken0, totalBorrowToken1, reservesBorrowToken0, reservesBorrowToken1, } = parseDexBorrowData(data.dexBorrowData, debtAsset0.symbol, debtAsset1.symbol);
+    // 18 because debt is represented in shares for which they use 18 decimals
+    const oracleScaleFactor = new Dec(27).add(18).sub(collAsset.decimals).toString();
+    const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
+    const oraclePrice = new Dec(1).div(new Dec(data.oraclePriceOperate).div(oracleScale)).toString();
+    const prices = yield getChainLinkPricesForTokens([collAsset.address, debtAsset0.address, debtAsset1.address], network, web3);
+    const supplyRate = new Dec(data.supplyRateVault).div(100).toString();
+    const collAssetData = {
+        symbol: collAsset.symbol,
+        address: collAsset.address,
+        price: prices[collAsset.address],
+        totalSupply: data.totalSupplyVault,
+        canBeSupplied: true,
+        supplyRate,
+    };
+    if (STAKING_ASSETS.includes(collAssetData.symbol)) {
+        collAssetData.incentiveSupplyApy = yield getStakingApy(collAsset.symbol, mainnetWeb3);
+        collAssetData.incentiveSupplyToken = collAsset.symbol;
+    }
+    const debtAsset0Data = {
+        symbol: debtAsset0.symbol,
+        address: debtAsset0.address,
+        price: prices[debtAsset0.address],
+        totalBorrow: new Dec(totalBorrowShares).mul(token0PerBorrowShare).toString(),
+        canBeBorrowed: true,
+        borrowRate: borrowRate0,
+        borrowable: borrowable0,
+        utilization: utilizationBorrow0,
+        tokenPerBorrowShare: token0PerBorrowShare,
+        borrowReserves: reservesBorrowToken0,
+    };
+    if (STAKING_ASSETS.includes(debtAsset0Data.symbol)) {
+        debtAsset0Data.incentiveSupplyApy = yield getStakingApy(debtAsset0.symbol, mainnetWeb3);
+        debtAsset0Data.incentiveSupplyToken = debtAsset0.symbol;
+    }
+    const debtAsset1Data = {
+        symbol: debtAsset1.symbol,
+        address: debtAsset1.address,
+        price: prices[debtAsset1.address],
+        totalBorrow: new Dec(totalBorrowShares).mul(token1PerBorrowShare).toString(),
+        canBeBorrowed: true,
+        borrowRate: borrowRate1,
+        borrowable: borrowable1,
+        utilization: utilizationBorrow1,
+        tokenPerBorrowShare: token1PerBorrowShare,
+        borrowReserves: reservesBorrowToken1,
+    };
+    if (STAKING_ASSETS.includes(debtAsset1Data.symbol)) {
+        debtAsset1Data.incentiveSupplyApy = yield getStakingApy(debtAsset1.symbol, mainnetWeb3);
+        debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
+    }
+    const assetsData = [
+        [collAsset.symbol, collAssetData],
+        [debtAsset0.symbol, debtAsset0Data],
+        [debtAsset1.symbol, debtAsset1Data],
+    ]
+        .reduce((acc, [symbol, partialData]) => (Object.assign(Object.assign({}, acc), { [symbol]: mergeAssetData(acc[symbol], partialData) })), {});
+    const marketInfo = getFluidMarketInfoById(+data.vaultId, network);
+    const totalSupplyVault = getEthAmountForDecimals(data.totalSupplyVault, collAsset.decimals);
+    const liqRatio = new Dec(data.liquidationThreshold).div(100).toString();
+    const liquidationMaxLimit = new Dec(data.liquidationMaxLimit).div(100).toString();
+    const liqFactor = new Dec(data.liquidationThreshold).div(10000).toString();
+    const debtSharePrice = new Dec(oraclePrice).mul(prices[collAsset.address]).toString();
+    const totalBorrowSharesInVault = assetAmountInEth(data.totalBorrowVault);
+    const totalBorrowVaultUsd = new Dec(totalBorrowSharesInVault).mul(debtSharePrice).toString();
+    const borrowableUSD = new Dec(borrowableShares).mul(debtSharePrice).toString();
+    const marketData = {
+        vaultId: +data.vaultId,
+        vaultValue: marketInfo === null || marketInfo === void 0 ? void 0 : marketInfo.value,
+        isSmartColl: data.isSmartColl,
+        isSmartDebt: data.isSmartDebt,
+        marketAddress: data.vault,
+        vaultType: parseVaultType(+data.vaultType),
+        oracle: data.oracle,
+        liquidationPenaltyPercent: new Dec(data.liquidationPenalty).div(100).toString(),
+        collFactor: new Dec(data.collateralFactor).div(10000).toString(),
+        liquidationRatio: liqRatio,
+        liqFactor,
+        minRatio: new Dec(1).div(liqFactor).mul(100).toString(),
+        collAsset0: collAsset.symbol,
+        debtAsset0: debtAsset0.symbol,
+        debtAsset1: debtAsset1.symbol,
+        totalPositions: data.totalPositions,
+        totalSupplyVault,
+        totalBorrowVault: totalBorrowShares,
+        totalSupplyVaultUsd: new Dec(totalSupplyVault).mul(assetsData[collAsset.symbol].price).toString(),
+        totalBorrowVaultUsd,
+        withdrawalLimit: getEthAmountForDecimals(data.withdrawalLimit, collAsset.decimals),
+        withdrawableUntilLimit: getEthAmountForDecimals(data.withdrawableUntilLimit, collAsset.decimals),
+        withdrawable: getEthAmountForDecimals(data.withdrawable, collAsset.decimals),
+        liquidationMaxLimit,
+        borrowRate: '0',
+        supplyRate,
+        borrowableToken0,
+        borrowableToken1,
+        totalBorrowToken0,
+        totalBorrowToken1,
+        borrowableUSD,
+        borrowable: borrowableShares,
+        borrowableDex: new Dec(maxBorrowShares).minus(totalBorrowShares).toString(),
+        maxBorrowShares,
+        borrowDexFee,
+        debtSharePrice,
+    };
+    return {
+        assetsData,
+        marketData,
+    };
+});
+const parseT4MarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const collAsset0 = getAssetInfoByAddress(data.supplyToken0, network);
+    const collAsset1 = getAssetInfoByAddress(data.supplyToken1, network);
+    const debtAsset0 = getAssetInfoByAddress(data.borrowToken0, network);
+    const debtAsset1 = getAssetInfoByAddress(data.borrowToken1, network);
+    const quoteToken = getAssetInfoByAddress(data.dexBorrowData.quoteToken, network);
+    // 27 - 18 + 18
+    const oracleScaleFactor = new Dec(27).toString();
+    const oracleScale = new Dec(10).pow(oracleScaleFactor).toString();
+    const oraclePrice = new Dec(data.oraclePriceOperate).div(oracleScale).toString();
+    const prices = yield getChainLinkPricesForTokens([collAsset0.address, collAsset1.address, debtAsset0.address, debtAsset1.address], network, web3);
+    const { supplyDexFee, totalSupplyShares, supplyRate1, token0PerSupplyShare, token1PerSupplyShare, totalSupplyToken0, totalSupplyToken1, maxSupplyShares, withdrawableToken0, withdrawable0, withdrawableToken1, withdrawable1, supplyRate0, utilizationSupply0, utilizationSupply1, withdrawableShares, reservesSupplyToken0, reservesSupplyToken1, } = parseDexSupplyData(data.dexSupplyData, collAsset0.symbol, collAsset1.symbol);
+    const { borrowableShares, maxBorrowShares, borrowDexFee, utilizationBorrow0, utilizationBorrow1, borrowable0, borrowable1, borrowRate0, borrowRate1, totalBorrowShares, token0PerBorrowShare, token1PerBorrowShare, borrowableToken0, borrowableToken1, totalBorrowToken0, totalBorrowToken1, quoteTokensPerShare, reservesBorrowToken0, reservesBorrowToken1, } = parseDexBorrowData(data.dexBorrowData, debtAsset0.symbol, debtAsset1.symbol);
+    const collAsset0Data = {
+        symbol: collAsset0.symbol,
+        address: collAsset0.address,
+        price: prices[collAsset0.address],
+        totalSupply: new Dec(totalSupplyShares).mul(token0PerSupplyShare).toString(),
+        canBeSupplied: true,
+        supplyRate: supplyRate0,
+        utilization: utilizationSupply0,
+        withdrawable: withdrawable0,
+        tokenPerSupplyShare: token0PerSupplyShare,
+        supplyReserves: reservesSupplyToken0,
+    };
+    if (STAKING_ASSETS.includes(collAsset0Data.symbol)) {
+        collAsset0Data.incentiveSupplyApy = yield getStakingApy(collAsset0.symbol, mainnetWeb3);
+        collAsset0Data.incentiveSupplyToken = collAsset0.symbol;
+    }
+    const collAsset1Data = {
+        symbol: collAsset1.symbol,
+        address: collAsset1.address,
+        price: prices[collAsset1.address],
+        totalSupply: new Dec(totalSupplyShares).mul(token1PerSupplyShare).toString(),
+        canBeSupplied: true,
+        supplyRate: supplyRate1,
+        withdrawable: withdrawable1,
+        utilization: utilizationSupply1,
+        tokenPerSupplyShare: token1PerSupplyShare,
+        supplyReserves: reservesSupplyToken1,
+    };
+    if (STAKING_ASSETS.includes(collAsset1Data.symbol)) {
+        collAsset1Data.incentiveSupplyApy = yield getStakingApy(collAsset1.symbol, mainnetWeb3);
+        collAsset1Data.incentiveSupplyToken = collAsset1.symbol;
+    }
+    const debtAsset0Data = {
+        symbol: debtAsset0.symbol,
+        address: debtAsset0.address,
+        price: prices[debtAsset0.address],
+        totalBorrow: new Dec(totalBorrowShares).mul(token0PerBorrowShare).toString(),
+        canBeBorrowed: true,
+        borrowRate: borrowRate0,
+        borrowable: borrowable0,
+        utilization: utilizationBorrow0,
+        tokenPerBorrowShare: token0PerBorrowShare,
+        borrowReserves: reservesBorrowToken0,
+    };
+    if (STAKING_ASSETS.includes(debtAsset0Data.symbol)) {
+        debtAsset0Data.incentiveSupplyApy = yield getStakingApy(debtAsset0.symbol, mainnetWeb3);
+        debtAsset0Data.incentiveSupplyToken = debtAsset0.symbol;
+    }
+    const debtAsset1Data = {
+        symbol: debtAsset1.symbol,
+        address: debtAsset1.address,
+        price: prices[debtAsset1.address],
+        totalBorrow: new Dec(totalBorrowShares).mul(token1PerBorrowShare).toString(),
+        canBeBorrowed: true,
+        borrowRate: borrowRate1,
+        borrowable: borrowable1,
+        utilization: utilizationBorrow1,
+        tokenPerBorrowShare: token1PerBorrowShare,
+        borrowReserves: reservesBorrowToken1,
+    };
+    if (STAKING_ASSETS.includes(debtAsset1Data.symbol)) {
+        debtAsset1Data.incentiveSupplyApy = yield getStakingApy(debtAsset1.symbol, mainnetWeb3);
+        debtAsset1Data.incentiveSupplyToken = debtAsset1.symbol;
+    }
+    const assetsData = [
+        [collAsset0.symbol, collAsset0Data],
+        [collAsset1.symbol, collAsset1Data],
+        [debtAsset0.symbol, debtAsset0Data],
+        [debtAsset1.symbol, debtAsset1Data],
+    ]
+        .reduce((acc, [symbol, partialData]) => (Object.assign(Object.assign({}, acc), { [symbol]: mergeAssetData(acc[symbol], partialData) })), {});
+    const marketInfo = getFluidMarketInfoById(+data.vaultId, network);
+    const liqRatio = new Dec(data.liquidationThreshold).div(100).toString();
+    const liquidationMaxLimit = new Dec(data.liquidationMaxLimit).div(100).toString();
+    const liqFactor = new Dec(data.liquidationThreshold).div(10000).toString();
+    const totalBorrowSharesInVault = assetAmountInEth(data.totalBorrowVault);
+    const debtSharePrice = new Dec(quoteTokensPerShare).mul(prices[quoteToken.address]).toString();
+    const totalBorrowVaultUsd = new Dec(totalBorrowSharesInVault).mul(debtSharePrice).toString();
+    const borrowableUSD = new Dec(borrowableShares).mul(debtSharePrice).toString();
+    const totalSupplySharesInVault = assetAmountInEth(data.totalSupplyVault);
+    const collSharePrice = new Dec(oraclePrice).mul(debtSharePrice).toString();
+    const totalSupplyVaultUsd = new Dec(totalSupplySharesInVault).mul(collSharePrice).toString();
+    const withdrawableUSD = new Dec(withdrawableShares).mul(collSharePrice).toString();
+    const marketData = {
+        vaultId: +data.vaultId,
+        vaultValue: marketInfo === null || marketInfo === void 0 ? void 0 : marketInfo.value,
+        isSmartColl: data.isSmartColl,
+        isSmartDebt: data.isSmartDebt,
+        marketAddress: data.vault,
+        vaultType: parseVaultType(+data.vaultType),
+        oracle: data.oracle,
+        liquidationPenaltyPercent: new Dec(data.liquidationPenalty).div(100).toString(),
+        collFactor: new Dec(data.collateralFactor).div(10000).toString(),
+        liquidationRatio: liqRatio,
+        liqFactor,
+        minRatio: new Dec(1).div(liqFactor).mul(100).toString(),
+        collAsset0: collAsset0.symbol,
+        collAsset1: collAsset1.symbol,
+        debtAsset0: debtAsset0.symbol,
+        debtAsset1: debtAsset1.symbol,
+        totalPositions: data.totalPositions,
+        totalSupplyVault: totalSupplyShares,
+        totalBorrowVault: totalBorrowShares,
+        totalSupplyVaultUsd,
+        totalBorrowVaultUsd,
+        liquidationMaxLimit,
+        borrowRate: '0',
+        supplyRate: '0',
+        borrowableToken0,
+        borrowableToken1,
+        totalBorrowToken0,
+        totalBorrowToken1,
+        borrowableUSD,
+        borrowable: borrowableShares,
+        borrowableDex: new Dec(maxBorrowShares).minus(totalBorrowShares).toString(),
+        maxBorrowShares,
+        borrowDexFee,
+        totalSupplyToken0,
+        totalSupplyToken1,
+        withdrawableToken0,
+        withdrawableToken1,
+        withdrawableUSD,
+        withdrawable: withdrawableShares,
+        widthdrawableDex: new Dec(maxSupplyShares).minus(totalSupplyShares).toString(),
+        maxSupplyShares,
+        collDexFee: supplyDexFee,
+        collSharePrice,
+        debtSharePrice,
+    };
+    return {
+        assetsData,
+        marketData,
+    };
+});
+const parseMarketData = (web3, data, network, mainnetWeb3) => __awaiter(void 0, void 0, void 0, function* () {
+    const vaultType = parseVaultType(+data.vaultType);
+    switch (vaultType) {
+        case FluidVaultType.T1:
+            return parseT1MarketData(web3, data, network, mainnetWeb3);
+        case FluidVaultType.T2:
+            return parseT2MarketData(web3, data, network, mainnetWeb3);
+        case FluidVaultType.T3:
+            return parseT3MarketData(web3, data, network, mainnetWeb3);
+        case FluidVaultType.T4:
+            return parseT4MarketData(web3, data, network, mainnetWeb3);
+        default:
+            throw new Error(`Unknown vault type: ${vaultType}`);
+    }
+});
 export const EMPTY_FLUID_DATA = {
     usedAssets: {},
     suppliedUsd: '0',
@@ -159,11 +613,12 @@ export const EMPTY_FLUID_DATA = {
     automationResubscribeRequired: false,
     lastUpdated: Date.now(),
 };
-const parseUserData = (userPositionData, vaultData) => {
+const parseT1UserData = (userPositionData, vaultData) => {
     const { assetsData, marketData, } = vaultData;
     const payload = Object.assign(Object.assign({ owner: userPositionData.owner, vaultId: marketData.vaultId }, EMPTY_FLUID_DATA), { lastUpdated: Date.now() });
     const collAsset = getAssetInfo(marketData.collAsset0);
     const debtAsset = getAssetInfo(marketData.debtAsset0);
+    // for T2 and T4 - this is the number of shares
     const supplied = getEthAmountForDecimals(userPositionData.supply, collAsset.decimals);
     const borrowed = getEthAmountForDecimals(userPositionData.borrow, debtAsset.decimals);
     const collUsedAsset = Object.assign(Object.assign({}, EMPTY_USED_ASSET), { symbol: collAsset.symbol, collateral: true, supplied, suppliedUsd: new Dec(supplied).mul(assetsData[collAsset.symbol].price).toString(), isSupplied: new Dec(supplied).gt(0) });
@@ -178,6 +633,174 @@ const parseUserData = (userPositionData, vaultData) => {
         marketData,
     }));
 };
+const parseT2UserData = (userPositionData, vaultData) => {
+    const { assetsData, marketData, } = vaultData;
+    const payload = Object.assign(Object.assign({ owner: userPositionData.owner, vaultId: marketData.vaultId }, EMPTY_FLUID_DATA), { lastUpdated: Date.now() });
+    const collAsset0 = getAssetInfo(marketData.collAsset0);
+    const collAsset1 = getAssetInfo(marketData.collAsset1);
+    const debtAsset = getAssetInfo(marketData.debtAsset0);
+    const supplyShares = getEthAmountForDecimals(userPositionData.supply, 18); // this is supplied in coll shares
+    const borrowed = getEthAmountForDecimals(userPositionData.borrow, debtAsset.decimals); // this is actual token borrow
+    const supplied0 = new Dec(supplyShares).mul(assetsData[collAsset0.symbol].tokenPerSupplyShare).toString();
+    const supplied1 = new Dec(supplyShares).mul(assetsData[collAsset1.symbol].tokenPerSupplyShare).toString();
+    const collUsedAsset0 = {
+        symbol: collAsset0.symbol,
+        collateral: true,
+        supplied: supplied0,
+        suppliedUsd: new Dec(supplied0).mul(assetsData[collAsset0.symbol].price).toString(),
+        isSupplied: new Dec(supplied0).gt(0),
+    };
+    const collUsedAsset1 = {
+        symbol: collAsset1.symbol,
+        collateral: true,
+        supplied: supplied1,
+        suppliedUsd: new Dec(supplied1).mul(assetsData[collAsset1.symbol].price).toString(),
+        isSupplied: new Dec(supplied1).gt(0),
+    };
+    const debtUsedAsset = {
+        symbol: debtAsset.symbol,
+        collateral: false,
+        borrowed,
+        borrowedUsd: new Dec(borrowed).mul(assetsData[debtAsset.symbol].price).toString(),
+        isBorrowed: new Dec(borrowed).gt(0),
+    };
+    const usedAssets = [
+        [collAsset0.symbol, collUsedAsset0],
+        [collAsset1.symbol, collUsedAsset1],
+        [debtAsset.symbol, debtUsedAsset],
+    ]
+        .reduce((acc, [symbol, partialData]) => {
+        acc[symbol] = mergeUsedAssets(acc[symbol], partialData);
+        return acc;
+    }, {});
+    return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
+        supplyShares }), getFluidAggregatedData({
+        usedAssets,
+        assetsData,
+        marketData,
+    }, supplyShares));
+};
+const parseT3UserData = (userPositionData, vaultData) => {
+    const { assetsData, marketData, } = vaultData;
+    const payload = Object.assign(Object.assign({ owner: userPositionData.owner, vaultId: marketData.vaultId }, EMPTY_FLUID_DATA), { lastUpdated: Date.now() });
+    const collAsset = getAssetInfo(marketData.collAsset0);
+    const debtAsset0 = getAssetInfo(marketData.debtAsset0);
+    const debtAsset1 = getAssetInfo(marketData.debtAsset1);
+    const supplied = getEthAmountForDecimals(userPositionData.supply, collAsset.decimals); // this is actual token supply
+    const borrowShares = getEthAmountForDecimals(userPositionData.borrow, 18); // this is actual token borrow
+    const borrowed0 = new Dec(borrowShares).mul(assetsData[debtAsset0.symbol].tokenPerBorrowShare).toString();
+    const borrowed1 = new Dec(borrowShares).mul(assetsData[debtAsset1.symbol].tokenPerBorrowShare).toString();
+    const collUsedAsset = {
+        symbol: collAsset.symbol,
+        collateral: true,
+        supplied,
+        suppliedUsd: new Dec(supplied).mul(assetsData[collAsset.symbol].price).toString(),
+        isSupplied: new Dec(supplied).gt(0),
+    };
+    const debtUsedAsset0 = {
+        symbol: debtAsset0.symbol,
+        collateral: false,
+        borrowed: borrowed0,
+        borrowedUsd: new Dec(borrowed0).mul(assetsData[debtAsset0.symbol].price).toString(),
+        isBorrowed: new Dec(borrowed0).gt(0),
+    };
+    const debtUsedAsset1 = {
+        symbol: debtAsset1.symbol,
+        collateral: false,
+        borrowed: borrowed1,
+        borrowedUsd: new Dec(borrowed1).mul(assetsData[debtAsset1.symbol].price).toString(),
+        isBorrowed: new Dec(borrowed1).gt(0),
+    };
+    const usedAssets = [
+        [collAsset.symbol, collUsedAsset],
+        [debtAsset0.symbol, debtUsedAsset0],
+        [debtAsset1.symbol, debtUsedAsset1],
+    ]
+        .reduce((acc, [symbol, partialData]) => {
+        acc[symbol] = mergeUsedAssets(acc[symbol], partialData);
+        return acc;
+    }, {});
+    return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
+        borrowShares }), getFluidAggregatedData({
+        usedAssets,
+        assetsData,
+        marketData,
+    }, '', borrowShares));
+};
+const parseT4UserData = (userPositionData, vaultData) => {
+    const { assetsData, marketData, } = vaultData;
+    const payload = Object.assign(Object.assign({ owner: userPositionData.owner, vaultId: marketData.vaultId }, EMPTY_FLUID_DATA), { lastUpdated: Date.now() });
+    const collAsset0 = getAssetInfo(marketData.collAsset0);
+    const collAsset1 = getAssetInfo(marketData.collAsset1);
+    const debtAsset0 = getAssetInfo(marketData.debtAsset0);
+    const debtAsset1 = getAssetInfo(marketData.debtAsset1);
+    const supplyShares = getEthAmountForDecimals(userPositionData.supply, 18); // this is actual token supply
+    const borrowShares = getEthAmountForDecimals(userPositionData.borrow, 18); // this is actual token borrow
+    const supplied0 = new Dec(supplyShares).mul(assetsData[collAsset0.symbol].tokenPerSupplyShare).toString();
+    const supplied1 = new Dec(supplyShares).mul(assetsData[collAsset1.symbol].tokenPerSupplyShare).toString();
+    const borrowed0 = new Dec(borrowShares).mul(assetsData[debtAsset0.symbol].tokenPerBorrowShare).toString();
+    const borrowed1 = new Dec(borrowShares).mul(assetsData[debtAsset1.symbol].tokenPerBorrowShare).toString();
+    const collUsedAsset0 = {
+        symbol: collAsset0.symbol,
+        collateral: true,
+        supplied: supplied0,
+        suppliedUsd: new Dec(supplied0).mul(assetsData[collAsset0.symbol].price).toString(),
+        isSupplied: new Dec(supplied0).gt(0),
+    };
+    const collUsedAsset1 = {
+        symbol: collAsset1.symbol,
+        collateral: true,
+        supplied: supplied1,
+        suppliedUsd: new Dec(supplied1).mul(assetsData[collAsset1.symbol].price).toString(),
+        isSupplied: new Dec(supplied1).gt(0),
+    };
+    const debtUsedAsset0 = {
+        symbol: debtAsset0.symbol,
+        collateral: false,
+        borrowed: borrowed0,
+        borrowedUsd: new Dec(borrowed0).mul(assetsData[debtAsset0.symbol].price).toString(),
+        isBorrowed: new Dec(borrowed0).gt(0),
+    };
+    const debtUsedAsset1 = {
+        symbol: debtAsset1.symbol,
+        collateral: false,
+        borrowed: borrowed1,
+        borrowedUsd: new Dec(borrowed1).mul(assetsData[debtAsset1.symbol].price).toString(),
+        isBorrowed: new Dec(borrowed1).gt(0),
+    };
+    const usedAssets = [
+        [collAsset0.symbol, collUsedAsset0],
+        [collAsset1.symbol, collUsedAsset1],
+        [debtAsset0.symbol, debtUsedAsset0],
+        [debtAsset1.symbol, debtUsedAsset1],
+    ]
+        .reduce((acc, [symbol, partialData]) => {
+        acc[symbol] = mergeUsedAssets(acc[symbol], partialData);
+        return acc;
+    }, {});
+    return Object.assign(Object.assign(Object.assign({}, payload), { usedAssets,
+        supplyShares,
+        borrowShares }), getFluidAggregatedData({
+        usedAssets,
+        assetsData,
+        marketData,
+    }, supplyShares, borrowShares));
+};
+const parseUserData = (userPositionData, vaultData) => {
+    const vaultType = vaultData.marketData.vaultType;
+    switch (vaultType) {
+        case FluidVaultType.T1:
+            return parseT1UserData(userPositionData, vaultData);
+        case FluidVaultType.T2:
+            return parseT2UserData(userPositionData, vaultData);
+        case FluidVaultType.T3:
+            return parseT3UserData(userPositionData, vaultData);
+        case FluidVaultType.T4:
+            return parseT4UserData(userPositionData, vaultData);
+        default:
+            throw new Error(`Unknown vault type: ${vaultType}`);
+    }
+};
 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();