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

package/esm/types/fluid.js

@@ -74,8 +74,19 @@ export var FluidArbitrumVersion;
     FluidArbitrumVersion["ETH_ARB_9_ARB"] = "ETH_ARB_9_ARB";
     FluidArbitrumVersion["ARB_USDC_10_ARB"] = "ARB_USDC_10_ARB";
     FluidArbitrumVersion["ARB_USDT_11_ARB"] = "ARB_USDT_11_ARB";
+    FluidArbitrumVersion["WBTC_USDC_12_ARB"] = "WBTC_USDC_12_ARB";
+    FluidArbitrumVersion["WBTC_USDT_13_ARB"] = "WBTC_USDT_13_ARB";
     FluidArbitrumVersion["WSTETH_ETH_WSTETH_ETH_16_ARB"] = "WSTETH_ETH_WSTETH_ETH_16_ARB";
     FluidArbitrumVersion["WEETH_ETH_WSTETH_17_ARB"] = "WEETH_ETH_WSTETH_17_ARB";
+    FluidArbitrumVersion["WBTC_ETH_18_ARB"] = "WBTC_ETH_18_ARB";
+    FluidArbitrumVersion["ETH_WBTC_19_ARB"] = "ETH_WBTC_19_ARB";
+    FluidArbitrumVersion["WSTETH_WBTC_20_ARB"] = "WSTETH_WBTC_20_ARB";
+    FluidArbitrumVersion["WEETH_WBTC_21_ARB"] = "WEETH_WBTC_21_ARB";
+    FluidArbitrumVersion["USDC_ETH_USDC_ETH_22_ARB"] = "USDC_ETH_USDC_ETH_22_ARB";
+    FluidArbitrumVersion["ETH_USDC_USDT_23_ARB"] = "ETH_USDC_USDT_23_ARB";
+    FluidArbitrumVersion["WSTETH_USDC_USDT_24_ARB"] = "WSTETH_USDC_USDT_24_ARB";
+    FluidArbitrumVersion["WEETH_USDC_USDT_25_ARB"] = "WEETH_USDC_USDT_25_ARB";
+    FluidArbitrumVersion["WBTC_USDC_USDT_26_ARB"] = "WBTC_USDC_USDT_26_ARB";
 })(FluidArbitrumVersion || (FluidArbitrumVersion = {}));
 export var FluidBaseVersions;
 (function (FluidBaseVersions) {
@@ -95,6 +106,9 @@ export var FluidBaseVersions;
     FluidBaseVersions["ETH_CBBTC_14_BASE"] = "ETH_CBBTC_14_BASE";
     FluidBaseVersions["WEETH_CBBTC_15_BASE"] = "WEETH_CBBTC_15_BASE";
     FluidBaseVersions["WSTETH_CBBTC_16_BASE"] = "WSTETH_CBBTC_16_BASE";
+    FluidBaseVersions["ETH_SUSDS_17_BASE"] = "ETH_SUSDS_17_BASE";
+    FluidBaseVersions["WSTETH_SUSDS_18_BASE"] = "WSTETH_SUSDS_18_BASE";
+    FluidBaseVersions["CBBTC_SUSDS_19_BASE"] = "CBBTC_SUSDS_19_BASE";
 })(FluidBaseVersions || (FluidBaseVersions = {}));
 export var FluidMainnetDepositToken;
 (function (FluidMainnetDepositToken) {
@@ -103,6 +117,7 @@ export var FluidMainnetDepositToken;
     FluidMainnetDepositToken["USDC"] = "USDC";
     FluidMainnetDepositToken["USDT"] = "USDT";
     FluidMainnetDepositToken["GHO"] = "GHO";
+    FluidMainnetDepositToken["sUSDS"] = "sUSDS";
 })(FluidMainnetDepositToken || (FluidMainnetDepositToken = {}));
 export var FluidArbitrumDepositToken;
 (function (FluidArbitrumDepositToken) {
@@ -118,6 +133,7 @@ export var FluidBaseDepositToken;
     FluidBaseDepositToken["USDC"] = "USDC";
     FluidBaseDepositToken["wstETH"] = "wstETH";
     FluidBaseDepositToken["EURC"] = "EURC";
+    FluidBaseDepositToken["sUSDS"] = "sUSDS";
 })(FluidBaseDepositToken || (FluidBaseDepositToken = {}));
 export var FluidVaultType;
 (function (FluidVaultType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defisaver/positions-sdk",
-  "version": "0.0.201-fluid-dev-2",
+  "version": "0.0.201-fluid-dev-4",
   "description": "",
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/src/fluid/index.ts

@@ -1,6 +1,6 @@
 import Web3 from 'web3';
 import Dec from 'decimal.js';
-import { getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
+import { assetAmountInEth, getAssetInfo, getAssetInfoByAddress } from '@defisaver/tokens';
 import { EthAddress, NetworkNumber } from '../types/common';
 import {
   FluidAggregatedVaultData,
@@ -17,7 +17,7 @@ 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 { getFluidMarketInfoById, getFluidVersionsDataForNetwork, getFTokenAddress } from '../markets';
 import { USD_QUOTE } from '../constants';
 import { getChainlinkAssetAddress, getWstETHPrice } from '../services/priceService';
 
@@ -106,6 +106,7 @@ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutput
   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(10_000).toString();
 
   const marketData = {
@@ -127,7 +128,7 @@ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutput
     totalSupplyVault,
     totalBorrowVault,
     totalSupplyVaultUsd: new Dec(totalSupplyVault).mul(collAssetData.price).toString(),
-    totalBorrowVaultUsd: new Dec(totalSupplyVault).mul(debtAssetData.price).toString(),
+    totalBorrowVaultUsd: new Dec(totalBorrowVault).mul(debtAssetData.price).toString(),
     withdrawalLimit: getEthAmountForDecimals(data.withdrawalLimit, collAsset.decimals),
     withdrawableUntilLimit: getEthAmountForDecimals(data.withdrawableUntilLimit, collAsset.decimals),
     withdrawable: getEthAmountForDecimals(data.withdrawable, collAsset.decimals),
@@ -138,6 +139,7 @@ const parseMarketData = async (web3: Web3, data: FluidView.VaultDataStructOutput
     maxBorrowLimit: getEthAmountForDecimals(data.maxBorrowLimit, debtAsset.decimals),
     baseBorrowLimit: getEthAmountForDecimals(data.baseBorrowLimit, debtAsset.decimals),
     minimumBorrowing: getEthAmountForDecimals(data.minimumBorrowing, debtAsset.decimals),
+    liquidationMaxLimit,
     borrowRate,
     supplyRate,
   };
@@ -273,5 +275,24 @@ export const getAllFluidMarketDataChunked = async (network: NetworkNumber, web3:
   }));
 
   const data = await chunkAndMulticall(calls, 10, 'latest', web3, network);
+  // @ts-ignore
   return Promise.all(data.map(async (item, i) => parseMarketData(web3, item.vaultData, network)));
-};
+};
+
+export const getFluidTokenData = async (web3: Web3, network: NetworkNumber, token: string) => {
+  const view = FluidViewContract(web3, network);
+  const fTokenAddress = getFTokenAddress(token, network);
+  const data = await view.methods.getFTokenData(fTokenAddress).call();
+  const supplyRate = new Dec(data.supplyRate).div(100).toString();
+  const decimals = data.decimals;
+  const rewardsRate = new Dec(assetAmountInEth(data.rewardsRate)).div(100).toString();
+  return {
+    fTokenAddress,
+    fTokenSymbol: data.symbol,
+    decimals,
+    totalDeposited: getEthAmountForDecimals(data.totalAssets, decimals),
+    withdrawable: getEthAmountForDecimals(data.withdrawable, decimals),
+    apy: new Dec(supplyRate).add(rewardsRate).toString(),
+  };
+};
+