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

package/cjs/types/fluid.d.ts

@@ -90,8 +90,19 @@ export declare enum FluidArbitrumVersion {
     ETH_ARB_9_ARB = "ETH_ARB_9_ARB",
     ARB_USDC_10_ARB = "ARB_USDC_10_ARB",
     ARB_USDT_11_ARB = "ARB_USDT_11_ARB",
+    WBTC_USDC_12_ARB = "WBTC_USDC_12_ARB",
+    WBTC_USDT_13_ARB = "WBTC_USDT_13_ARB",
     WSTETH_ETH_WSTETH_ETH_16_ARB = "WSTETH_ETH_WSTETH_ETH_16_ARB",
-    WEETH_ETH_WSTETH_17_ARB = "WEETH_ETH_WSTETH_17_ARB"
+    WEETH_ETH_WSTETH_17_ARB = "WEETH_ETH_WSTETH_17_ARB",
+    WBTC_ETH_18_ARB = "WBTC_ETH_18_ARB",
+    ETH_WBTC_19_ARB = "ETH_WBTC_19_ARB",
+    WSTETH_WBTC_20_ARB = "WSTETH_WBTC_20_ARB",
+    WEETH_WBTC_21_ARB = "WEETH_WBTC_21_ARB",
+    USDC_ETH_USDC_ETH_22_ARB = "USDC_ETH_USDC_ETH_22_ARB",
+    ETH_USDC_USDT_23_ARB = "ETH_USDC_USDT_23_ARB",
+    WSTETH_USDC_USDT_24_ARB = "WSTETH_USDC_USDT_24_ARB",
+    WEETH_USDC_USDT_25_ARB = "WEETH_USDC_USDT_25_ARB",
+    WBTC_USDC_USDT_26_ARB = "WBTC_USDC_USDT_26_ARB"
 }
 export declare enum FluidBaseVersions {
     ETH_USDC_1_BASE = "ETH_USDC_1_BASE",
@@ -109,7 +120,10 @@ export declare enum FluidBaseVersions {
     CBBTC_ETH_13_BASE = "CBBTC_ETH_13_BASE",
     ETH_CBBTC_14_BASE = "ETH_CBBTC_14_BASE",
     WEETH_CBBTC_15_BASE = "WEETH_CBBTC_15_BASE",
-    WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE"
+    WSTETH_CBBTC_16_BASE = "WSTETH_CBBTC_16_BASE",
+    ETH_SUSDS_17_BASE = "ETH_SUSDS_17_BASE",
+    WSTETH_SUSDS_18_BASE = "WSTETH_SUSDS_18_BASE",
+    CBBTC_SUSDS_19_BASE = "CBBTC_SUSDS_19_BASE"
 }
 export type FluidVersions = FluidArbitrumVersion | FluidBaseVersions | FluidMainnetVersion;
 export declare enum FluidMainnetDepositToken {
@@ -117,7 +131,8 @@ export declare enum FluidMainnetDepositToken {
     wstETH = "wstETH",
     USDC = "USDC",
     USDT = "USDT",
-    GHO = "GHO"
+    GHO = "GHO",
+    sUSDS = "sUSDS"
 }
 export declare enum FluidArbitrumDepositToken {
     ETH = "ETH",
@@ -130,7 +145,8 @@ export declare enum FluidBaseDepositToken {
     ETH = "ETH",
     USDC = "USDC",
     wstETH = "wstETH",
-    EURC = "EURC"
+    EURC = "EURC",
+    sUSDS = "sUSDS"
 }
 export type FluidDepositTokenByNetwork = {
     [NetworkNumber.Eth]: FluidMainnetDepositToken;
@@ -194,6 +210,7 @@ export interface InnerFluidMarketData {
     minimumBorrowing: string;
     supplyRate: string;
     borrowRate: string;
+    liquidationMaxLimit: string;
 }
 export interface FluidMarketData {
     assetsData: FluidAssetsData;

package/cjs/types/fluid.js

@@ -77,8 +77,19 @@ 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 || (exports.FluidArbitrumVersion = FluidArbitrumVersion = {}));
 var FluidBaseVersions;
 (function (FluidBaseVersions) {
@@ -98,6 +109,9 @@ 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 || (exports.FluidBaseVersions = FluidBaseVersions = {}));
 var FluidMainnetDepositToken;
 (function (FluidMainnetDepositToken) {
@@ -106,6 +120,7 @@ var FluidMainnetDepositToken;
     FluidMainnetDepositToken["USDC"] = "USDC";
     FluidMainnetDepositToken["USDT"] = "USDT";
     FluidMainnetDepositToken["GHO"] = "GHO";
+    FluidMainnetDepositToken["sUSDS"] = "sUSDS";
 })(FluidMainnetDepositToken || (exports.FluidMainnetDepositToken = FluidMainnetDepositToken = {}));
 var FluidArbitrumDepositToken;
 (function (FluidArbitrumDepositToken) {
@@ -121,6 +136,7 @@ var FluidBaseDepositToken;
     FluidBaseDepositToken["USDC"] = "USDC";
     FluidBaseDepositToken["wstETH"] = "wstETH";
     FluidBaseDepositToken["EURC"] = "EURC";
+    FluidBaseDepositToken["sUSDS"] = "sUSDS";
 })(FluidBaseDepositToken || (exports.FluidBaseDepositToken = FluidBaseDepositToken = {}));
 var FluidVaultType;
 (function (FluidVaultType) {

package/esm/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/esm/fluid/index.js

@@ -8,14 +8,14 @@ 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 { 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';
 export const EMPTY_USED_ASSET = {
@@ -94,6 +94,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
     const totalSupplyVault = getEthAmountForDecimals(data.totalSupplyVault, collAsset.decimals);
     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 marketData = {
         vaultId: +data.vaultId,
@@ -114,7 +115,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
         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),
@@ -125,6 +126,7 @@ const parseMarketData = (web3, data, network) => __awaiter(void 0, void 0, void
         maxBorrowLimit: getEthAmountForDecimals(data.maxBorrowLimit, debtAsset.decimals),
         baseBorrowLimit: getEthAmountForDecimals(data.baseBorrowLimit, debtAsset.decimals),
         minimumBorrowing: getEthAmountForDecimals(data.minimumBorrowing, debtAsset.decimals),
+        liquidationMaxLimit,
         borrowRate,
         supplyRate,
     };
@@ -201,5 +203,22 @@ export const getAllFluidMarketDataChunked = (network, web3) => __awaiter(void 0,
         params: [version.marketAddress],
     }));
     const data = yield 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); })));
 });
+export const getFluidTokenData = (web3, network, token) => __awaiter(void 0, void 0, void 0, function* () {
+    const view = FluidViewContract(web3, network);
+    const fTokenAddress = getFTokenAddress(token, network);
+    const data = yield 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(),
+    };
+});

package/esm/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;