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

package/cjs/fluid/index.d.ts

@@ -37,3 +37,11 @@ export declare const getFluidPositionWithMarket: (web3: Web3, network: NetworkNu
     marketData: FluidMarketData;
 }>;
 export declare const getAllFluidMarketDataChunked: (network: NetworkNumber, web3: Web3) => Promise<FluidMarketData[]>;
+export declare const getFluidTokenData: (web3: Web3, network: NetworkNumber, token: string) => Promise<{
+    fTokenAddress: any;
+    fTokenSymbol: string;
+    decimals: string;
+    totalDeposited: string;
+    withdrawable: string;
+    apy: string;
+}>;

package/cjs/fluid/index.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports.getFluidPosition = exports.getFluidVaultIdsForUser = exports.getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = void 0;
+exports.getFluidTokenData = exports.getAllFluidMarketDataChunked = exports.getFluidPositionWithMarket = exports.getFluidPosition = exports.getFluidVaultIdsForUser = exports.getFluidMarketData = exports.EMPTY_FLUID_DATA = exports.EMPTY_USED_ASSET = void 0;
 const decimal_js_1 = __importDefault(require("decimal.js"));
 const tokens_1 = require("@defisaver/tokens");
 const common_1 = require("../types/common");
@@ -21,7 +21,7 @@ const contracts_1 = require("../contracts");
 const utils_1 = require("../services/utils");
 const fluidHelpers_1 = require("../helpers/fluidHelpers");
 const multicall_1 = require("../multicall");
-const fluid_1 = require("../markets/fluid");
+const markets_1 = require("../markets");
 const constants_1 = require("../constants");
 const priceService_1 = require("../services/priceService");
 exports.EMPTY_USED_ASSET = {
@@ -96,10 +96,11 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
         [collAsset.symbol]: collAssetData,
         [debtAsset.symbol]: debtAssetData,
     };
-    const marketInfo = (0, fluid_1.getFluidMarketInfoById)(+data.vaultId, network);
+    const marketInfo = (0, markets_1.getFluidMarketInfoById)(+data.vaultId, network);
     const totalSupplyVault = (0, utils_1.getEthAmountForDecimals)(data.totalSupplyVault, collAsset.decimals);
     const totalBorrowVault = (0, utils_1.getEthAmountForDecimals)(data.totalBorrowVault, debtAsset.decimals);
     const liqRatio = new decimal_js_1.default(data.liquidationThreshold).div(100).toString();
+    const liquidationMaxLimit = new decimal_js_1.default(data.liquidationMaxLimit).div(100).toString();
     const liqFactor = new decimal_js_1.default(data.liquidationThreshold).div(10000).toString();
     const marketData = {
         vaultId: +data.vaultId,
@@ -120,7 +121,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
         totalSupplyVault,
         totalBorrowVault,
         totalSupplyVaultUsd: new decimal_js_1.default(totalSupplyVault).mul(collAssetData.price).toString(),
-        totalBorrowVaultUsd: new decimal_js_1.default(totalSupplyVault).mul(debtAssetData.price).toString(),
+        totalBorrowVaultUsd: new decimal_js_1.default(totalBorrowVault).mul(debtAssetData.price).toString(),
         withdrawalLimit: (0, utils_1.getEthAmountForDecimals)(data.withdrawalLimit, collAsset.decimals),
         withdrawableUntilLimit: (0, utils_1.getEthAmountForDecimals)(data.withdrawableUntilLimit, collAsset.decimals),
         withdrawable: (0, utils_1.getEthAmountForDecimals)(data.withdrawable, collAsset.decimals),
@@ -131,6 +132,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
         maxBorrowLimit: (0, utils_1.getEthAmountForDecimals)(data.maxBorrowLimit, debtAsset.decimals),
         baseBorrowLimit: (0, utils_1.getEthAmountForDecimals)(data.baseBorrowLimit, debtAsset.decimals),
         minimumBorrowing: (0, utils_1.getEthAmountForDecimals)(data.minimumBorrowing, debtAsset.decimals),
+        liquidationMaxLimit,
         borrowRate,
         supplyRate,
     };
@@ -203,7 +205,7 @@ const getFluidPositionWithMarket = (web3, network, vaultId) => __awaiter(void 0,
 });
 exports.getFluidPositionWithMarket = getFluidPositionWithMarket;
 const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0, void 0, function* () {
-    const versions = (0, fluid_1.getFluidVersionsDataForNetwork)(network);
+    const versions = (0, markets_1.getFluidVersionsDataForNetwork)(network);
     const view = (0, contracts_1.FluidViewContract)(web3, network);
     const calls = versions.map((version) => ({
         target: view.options.address,
@@ -211,6 +213,24 @@ const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0, void 0
         params: [version.marketAddress],
     }));
     const data = yield (0, multicall_1.chunkAndMulticall)(calls, 10, 'latest', web3, network);
+    // @ts-ignore
     return Promise.all(data.map((item, i) => __awaiter(void 0, void 0, void 0, function* () { return parseMarketData(web3, item.vaultData, network); })));
 });
 exports.getAllFluidMarketDataChunked = getAllFluidMarketDataChunked;
+const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = (0, contracts_1.FluidViewContract)(web3, network);
+    const fTokenAddress = (0, markets_1.getFTokenAddress)(token, network);
+    const data = yield view.methods.getFTokenData(fTokenAddress).call();
+    const supplyRate = new decimal_js_1.default(data.supplyRate).div(100).toString();
+    const decimals = data.decimals;
+    const rewardsRate = new decimal_js_1.default((0, tokens_1.assetAmountInEth)(data.rewardsRate)).div(100).toString();
+    return {
+        fTokenAddress,
+        fTokenSymbol: data.symbol,
+        decimals,
+        totalDeposited: (0, utils_1.getEthAmountForDecimals)(data.totalAssets, decimals),
+        withdrawable: (0, utils_1.getEthAmountForDecimals)(data.withdrawable, decimals),
+        apy: new decimal_js_1.default(supplyRate).add(rewardsRate).toString(),
+    };
+});
+exports.getFluidTokenData = getFluidTokenData;

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

@@ -65,8 +65,19 @@ export declare const WEETH_USDT_8_ARB: (networkId?: NetworkNumber) => FluidMarke
 export declare const ETH_ARB_9_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const ARB_USDC_10_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const ARB_USDT_11_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const WBTC_USDC_12_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const WBTC_USDT_13_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_ETH_WSTETH_ETH_16_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_ETH_WSTETH_17_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const WBTC_ETH_18_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const ETH_WBTC_19_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const WSTETH_WBTC_20_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const WEETH_WBTC_21_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const USDC_ETH_USDC_ETH_22_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const ETH_USDC_USDT_23_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const WSTETH_USDC_USDT_24_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const WEETH_USDC_USDT_25_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const WBTC_USDC_USDT_26_ARB: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const ETH_USDC_1_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_USDC_2_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_ETH_3_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
@@ -83,6 +94,9 @@ export declare const CBBTC_ETH_13_BASE: (networkId?: NetworkNumber) => FluidMark
 export declare const ETH_CBBTC_14_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WEETH_CBBTC_15_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const WSTETH_CBBTC_16_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const ETH_SUSDS_17_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const WSTETH_SUSDS_18_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
+export declare const CBBTC_SUSDS_19_BASE: (networkId?: NetworkNumber) => FluidMarketInfo;
 export declare const FluidMarkets: (networkId: NetworkNumber) => {
     ETH_USDC_1: FluidMarketInfo;
     ETH_USDT_2: FluidMarketInfo;
@@ -149,8 +163,19 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     ETH_ARB_9_ARB: FluidMarketInfo;
     ARB_USDC_10_ARB: FluidMarketInfo;
     ARB_USDT_11_ARB: FluidMarketInfo;
+    WBTC_USDC_12_ARB: FluidMarketInfo;
+    WBTC_USDT_13_ARB: FluidMarketInfo;
     WSTETH_ETH_WSTETH_ETH_16_ARB: FluidMarketInfo;
     WEETH_ETH_WSTETH_17_ARB: FluidMarketInfo;
+    WBTC_ETH_18_ARB: FluidMarketInfo;
+    ETH_WBTC_19_ARB: FluidMarketInfo;
+    WSTETH_WBTC_20_ARB: FluidMarketInfo;
+    WEETH_WBTC_21_ARB: FluidMarketInfo;
+    USDC_ETH_USDC_ETH_22_ARB: FluidMarketInfo;
+    ETH_USDC_USDT_23_ARB: FluidMarketInfo;
+    WSTETH_USDC_USDT_24_ARB: FluidMarketInfo;
+    WEETH_USDC_USDT_25_ARB: FluidMarketInfo;
+    WBTC_USDC_USDT_26_ARB: FluidMarketInfo;
     ETH_USDC_1_BASE: FluidMarketInfo;
     WSTETH_USDC_2_BASE: FluidMarketInfo;
     WSTETH_ETH_3_BASE: FluidMarketInfo;
@@ -167,6 +192,30 @@ export declare const FluidMarkets: (networkId: NetworkNumber) => {
     ETH_CBBTC_14_BASE: FluidMarketInfo;
     WEETH_CBBTC_15_BASE: FluidMarketInfo;
     WSTETH_CBBTC_16_BASE: FluidMarketInfo;
+    ETH_SUSDS_17_BASE: FluidMarketInfo;
+    WSTETH_SUSDS_18_BASE: FluidMarketInfo;
+    CBBTC_SUSDS_19_BASE: FluidMarketInfo;
 };
 export declare const getFluidVersionsDataForNetwork: (network: NetworkNumber) => FluidMarketInfo[];
 export declare const getFluidMarketInfoById: (vaultId: number, network?: NetworkNumber) => FluidMarketInfo | undefined;
+export declare const FluidFTokens: (networkId: NetworkNumber) => {
+    ETH: string;
+    USDC: string;
+    USDT: string;
+    wstETH: string;
+    GHO: string;
+    sUSDS: string;
+} | {
+    ETH: string;
+    USDC: string;
+    USDT: string;
+    wstETH: string;
+    ARB: string;
+} | {
+    ETH: string;
+    USDC: string;
+    EURC: string;
+    wstETH: string;
+    sUSDS: string;
+};
+export declare const getFTokenAddress: (token: string, networkId: NetworkNumber) => any;