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

package/esm/fluid/index.js

@@ -9,10 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { NetworkNumber } from '../types/common';
 import { FluidVaultType, } 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 { 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,
     isBorrowed: false,
@@ -32,37 +37,67 @@ const parseVaultType = (vaultType) => {
         default: return FluidVaultType.Unknown;
     }
 };
-const parseMarketData = (data) => {
+const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void 0, function* () {
     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 = yield getWstETHPrice(web3);
+    }
+    else if (isMainnet) {
+        const feedRegistryContract = FeedRegistryContract(web3, NetworkNumber.Eth);
+        loanTokenPrice = isTokenUSDA ? '100000000' : yield feedRegistryContract.methods.latestAnswer(loanTokenFeedAddress, USD_QUOTE).call();
+    }
+    else {
+        // Currently only base network is supported
+        const feedRegistryContract = DFSFeedRegistryContract(web3, network);
+        const roundPriceData = isTokenUSDA ? { answer: '100000000' } : yield feedRegistryContract.methods.latestRoundData(loanTokenFeedAddress, USD_QUOTE).call();
+        loanTokenPrice = roundPriceData.answer;
+    }
+    const debtPriceParsed = new Dec(loanTokenPrice).div(1e8).toString();
     const collAssetData = {
         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 = {
         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(10000).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,
@@ -70,12 +105,16 @@ const parseMarketData = (data) => {
         oracle: data.oracle,
         liquidationPenaltyPercent: new Dec(data.liquidationPenalty).div(100).toString(),
         collFactor: new Dec(data.collateralFactor).div(10000).toString(),
-        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),
@@ -86,12 +125,14 @@ const parseMarketData = (data) => {
         maxBorrowLimit: getEthAmountForDecimals(data.maxBorrowLimit, debtAsset.decimals),
         baseBorrowLimit: getEthAmountForDecimals(data.baseBorrowLimit, debtAsset.decimals),
         minimumBorrowing: getEthAmountForDecimals(data.minimumBorrowing, debtAsset.decimals),
+        borrowRate,
+        supplyRate,
     };
     return {
         assetsData,
         marketData,
     };
-};
+});
 export const EMPTY_FLUID_DATA = {
     usedAssets: {},
     suppliedUsd: '0',
@@ -129,7 +170,7 @@ const parseUserData = (userPositionData, vaultData) => {
 export const getFluidMarketData = (web3, network, market) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContract(web3, network);
     const data = yield view.methods.getVaultData(market.marketAddress).call();
-    return parseMarketData(data);
+    return parseMarketData(web3, data, network);
 });
 export const getFluidVaultIdsForUser = (web3, network, user) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContract(web3, network);
@@ -144,10 +185,21 @@ export const getFluidPosition = (web3, network, vaultId, extractedState) => __aw
 export const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0, void 0, void 0, function* () {
     const view = FluidViewContract(web3, network);
     const data = yield view.methods.getPositionByNftId(vaultId).call();
-    const marketData = parseMarketData(data.vault);
+    const marketData = yield parseMarketData(web3, data.vault, network);
     const userData = parseUserData(data.position, marketData);
     return {
         userData,
         marketData,
     };
 });
+export const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0, void 0, function* () {
+    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 = yield chunkAndMulticall(calls, 10, 'latest', web3, network);
+    return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network); })));
+});

package/esm/markets/fluid/index.d.ts

@@ -6,8 +6,6 @@ export declare const WSTETH_ETH_3: (networkId?: NetworkNumber) => FluidMarketInf
 export declare const WSTETH_USDC_4: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_USDT_5: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_WSTETH_6: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const SUSDE_USDC_7: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const SUSDE_USDT_8: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_USDC_9: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_USDT_10: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const ETH_USDC_11: (networkId?: NetworkNumber) => FluidMarketInfo;
@@ -32,7 +30,6 @@ export declare const CBBTC_USDC_29: (networkId?: NetworkNumber) => FluidMarketIn
 export declare const CBBTC_USDT_30: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const ETH_CBBTC_31: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_CBBTC_32: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const WSTETH_CBBTC_33: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_ETH_WSTETH_ETH_44: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const ETH_USDC_USDT_45: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_USDC_USDT_46: (networkId?: NetworkNumber) => FluidMarketInfo;
@@ -48,14 +45,15 @@ export declare const WSTETH_GHO_55: (networkId?: NetworkNumber) => FluidMarketIn
 export declare const SUSDE_GHO_56: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_GHO_57: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const SUSDS_GHO_58: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const WBTC_GHO_59: (networkId?: NetworkNumber) => FluidMarketInfo;
-export declare const CBBTC_GHO_60: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const GHO_USDC_GHO_USDC_61: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_ETH_WSTETH_74: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const USDC_ETH_USDC_ETH_77: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const RSETH_ETH_WSTETH_78: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const RSETH_WSTETH_79: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETHS_ETH_WSTETH_80: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const SUSDE_USDT_USDT_92: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const USDE_USDT_USDT_93: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const LBTC_CBBTC_WBTC_97: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const ETH_USDC_1_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const ETH_USDT_2_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_USDC_3_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
@@ -92,8 +90,6 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     WSTETH_USDC_4: FluidMarketInfo;
     WSTETH_USDT_5: FluidMarketInfo;
     WEETH_WSTETH_6: FluidMarketInfo;
-    SUSDE_USDC_7: FluidMarketInfo;
-    SUSDE_USDT_8: FluidMarketInfo;
     WEETH_USDC_9: FluidMarketInfo;
     WEETH_USDT_10: FluidMarketInfo;
     ETH_USDC_11: FluidMarketInfo;
@@ -118,7 +114,6 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     CBBTC_USDT_30: FluidMarketInfo;
     ETH_CBBTC_31: FluidMarketInfo;
     WEETH_CBBTC_32: FluidMarketInfo;
-    WSTETH_CBBTC_33: FluidMarketInfo;
     WSTETH_ETH_WSTETH_ETH_44: FluidMarketInfo;
     ETH_USDC_USDT_45: FluidMarketInfo;
     WSTETH_USDC_USDT_46: FluidMarketInfo;
@@ -134,14 +129,15 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     SUSDE_GHO_56: FluidMarketInfo;
     WEETH_GHO_57: FluidMarketInfo;
     SUSDS_GHO_58: FluidMarketInfo;
-    WBTC_GHO_59: FluidMarketInfo;
-    CBBTC_GHO_60: FluidMarketInfo;
     GHO_USDC_GHO_USDC_61: FluidMarketInfo;
     WEETH_ETH_WSTETH_74: FluidMarketInfo;
     USDC_ETH_USDC_ETH_77: FluidMarketInfo;
     RSETH_ETH_WSTETH_78: FluidMarketInfo;
     RSETH_WSTETH_79: FluidMarketInfo;
     WEETHS_ETH_WSTETH_80: FluidMarketInfo;
+    SUSDE_USDT_USDT_92: FluidMarketInfo;
+    USDE_USDT_USDT_93: FluidMarketInfo;
+    LBTC_CBBTC_WBTC_97: FluidMarketInfo;
     ETH_USDC_1_ARB: FluidMarketInfo;
     ETH_USDT_2_ARB: FluidMarketInfo;
     WSTETH_USDC_3_ARB: FluidMarketInfo;
@@ -172,3 +168,5 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     WEETH_CBBTC_15_BASE: FluidMarketInfo;
     WSTETH_CBBTC_16_BASE: FluidMarketInfo;
 };
+export declare const getFluidVersionsDataForNetwork: (network: NetworkNumber) => FluidMarketInfo[];
+export declare const getFluidMarketInfoById: (vaultId: number, network?: NetworkNumber) => FluidMarketInfo | undefined;