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

package/esm/services/priceService.d.ts

@@ -1,8 +1,31 @@
 import Web3 from 'web3';
+import Dec from 'decimal.js';
 import { NetworkNumber } from '../types/common';
 export declare const getEthPrice: (web3: Web3) => Promise<string>;
 export declare const getUSDCPrice: (web3: Web3) => Promise<string>;
 export declare const getCompPrice: (web3: Web3) => Promise<string>;
 export declare const getWstETHPrice: (web3: Web3) => Promise<string>;
+export declare const getWstETHChainLinkPriceCalls: (web3: Web3, network: NetworkNumber) => {
+    target: string;
+    abiItem: import("web3-utils").AbiItem | undefined;
+    params: never[];
+}[];
+export declare const getWeETHChainLinkPriceCalls: (web3: Web3, network: NetworkNumber) => {
+    target: string;
+    abiItem: import("web3-utils").AbiItem | undefined;
+    params: never[];
+}[];
+export declare const parseWstETHPriceCalls: (_ethPrice: string, wstETHrate: {
+    answer: string;
+}, decimals: string) => {
+    ethPrice: Dec;
+    wstETHRate: string;
+};
+export declare const parseWeETHPriceCalls: (_ethPrice: string, weETHrate: {
+    answer: string;
+}, decimals: string) => {
+    ethPrice: Dec;
+    weETHRate: string;
+};
 export declare const getWstETHPriceFluid: (web3: Web3, network: NetworkNumber) => Promise<string>;
 export declare const getChainlinkAssetAddress: (symbol: string, network: NetworkNumber) => string;

package/esm/services/priceService.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import Dec from 'decimal.js';
 import { getAssetInfo } from '@defisaver/tokens';
-import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
+import { COMPPriceFeedContract, ETHPriceFeedContract, USDCPriceFeedContract, WeETHPriceFeedContract, WstETHPriceFeedContract, } from '../contracts';
 import { NetworkNumber } from '../types/common';
 import { multicall } from '../multicall';
 import { getEthAmountForDecimals } from './utils';
@@ -48,8 +48,7 @@ export const getWstETHPrice = (web3) => __awaiter(void 0, void 0, void 0, functi
     const wstETHRate = new Dec(multicallRes[1].answer).div(1e8);
     return new Dec(ethPrice).mul(wstETHRate).toString();
 });
-// this is a fixed version, the original version is above but requires to refactor comp v3 function, so it's easier to just copy the function for now
-export const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+export const getWstETHChainLinkPriceCalls = (web3, network) => {
     const wstETHFeedContract = WstETHPriceFeedContract(web3, network);
     const ethFeedContract = ETHPriceFeedContract(web3, network);
     const calls = [
@@ -69,9 +68,45 @@ export const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0,
             params: [],
         },
     ];
+    return calls;
+};
+export const getWeETHChainLinkPriceCalls = (web3, network) => {
+    const weETHFeedContract = WeETHPriceFeedContract(web3, network);
+    const ethFeedContract = ETHPriceFeedContract(web3, network);
+    const calls = [
+        {
+            target: ethFeedContract.options.address,
+            abiItem: ethFeedContract.options.jsonInterface.find(({ name }) => name === 'latestAnswer'),
+            params: [],
+        },
+        {
+            target: weETHFeedContract.options.address,
+            abiItem: weETHFeedContract.options.jsonInterface.find(({ name }) => name === 'latestRoundData'),
+            params: [],
+        },
+        {
+            target: weETHFeedContract.options.address,
+            abiItem: weETHFeedContract.options.jsonInterface.find(({ name }) => name === 'decimals'),
+            params: [],
+        },
+    ];
+    return calls;
+};
+export const parseWstETHPriceCalls = (_ethPrice, wstETHrate, decimals) => {
+    const ethPrice = new Dec(_ethPrice).div(1e8);
+    const wstETHRate = getEthAmountForDecimals(wstETHrate.answer, decimals);
+    return { ethPrice, wstETHRate };
+};
+export const parseWeETHPriceCalls = (_ethPrice, weETHrate, decimals) => {
+    const ethPrice = new Dec(_ethPrice).div(1e8);
+    const weETHRate = getEthAmountForDecimals(weETHrate.answer, decimals);
+    return { ethPrice, weETHRate };
+};
+// this is a fixed version, the original version is above but requires to refactor comp v3 function, so it's easier to just copy the function for now
+export const getWstETHPriceFluid = (web3, network) => __awaiter(void 0, void 0, void 0, function* () {
+    const calls = getWstETHChainLinkPriceCalls(web3, network);
     const multicallRes = yield multicall(calls, web3, network);
-    const ethPrice = new Dec(multicallRes[0][0]).div(1e8);
-    const wstETHRate = getEthAmountForDecimals(multicallRes[1].answer, multicallRes[2][0]);
+    const { ethPrice, wstETHRate } = parseWstETHPriceCalls(multicallRes[0][0], multicallRes[1], multicallRes[2][0]);
     return new Dec(ethPrice).mul(wstETHRate).toString();
 });
 // chainlink price feed available only on mainnet

package/esm/types/contracts/generated/FluidView.d.ts

@@ -3,7 +3,7 @@ import type BN from "bn.js";
 import type { ContractOptions } from "web3-eth-contract";
 import type { EventLog } from "web3-core";
 import type { EventEmitter } from "events";
-import type { Callback, NonPayableTransactionObject, BlockType, BaseContract } from "./types";
+import type { Callback, PayableTransactionObject, NonPayableTransactionObject, BlockType, BaseContract } from "./types";
 export interface EventOptions {
     filter?: object;
     fromBlock?: BlockType;
@@ -150,6 +150,198 @@ export declare namespace FluidView {
         tickId: string;
     };
     type UserPositionStructOutput = UserPositionStructOutputArray & UserPositionStructOutputStruct;
+    type DexSupplyDataStruct = [
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+    ] | {
+        dexPool: string;
+        dexId: number | string | BN;
+        fee: number | string | BN;
+        lastStoredPrice: number | string | BN;
+        centerPrice: number | string | BN;
+        token0Utilization: number | string | BN;
+        token1Utilization: number | string | BN;
+        totalSupplyShares: number | string | BN;
+        maxSupplyShares: number | string | BN;
+        token0Supplied: number | string | BN;
+        token1Supplied: number | string | BN;
+        sharesWithdrawable: number | string | BN;
+        token0Withdrawable: number | string | BN;
+        token1Withdrawable: number | string | BN;
+        token0PerSupplyShare: number | string | BN;
+        token1PerSupplyShare: number | string | BN;
+        token0SupplyRate: number | string | BN;
+        token1SupplyRate: number | string | BN;
+        quoteToken: string;
+        quoteTokensPerShare: number | string | BN;
+        supplyToken0Reserves: number | string | BN;
+        supplyToken1Reserves: number | string | BN;
+    };
+    type DexSupplyDataStructOutputArray = [
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string
+    ];
+    type DexSupplyDataStructOutputStruct = {
+        dexPool: string;
+        dexId: string;
+        fee: string;
+        lastStoredPrice: string;
+        centerPrice: string;
+        token0Utilization: string;
+        token1Utilization: string;
+        totalSupplyShares: string;
+        maxSupplyShares: string;
+        token0Supplied: string;
+        token1Supplied: string;
+        sharesWithdrawable: string;
+        token0Withdrawable: string;
+        token1Withdrawable: string;
+        token0PerSupplyShare: string;
+        token1PerSupplyShare: string;
+        token0SupplyRate: string;
+        token1SupplyRate: string;
+        quoteToken: string;
+        quoteTokensPerShare: string;
+        supplyToken0Reserves: string;
+        supplyToken1Reserves: string;
+    };
+    type DexSupplyDataStructOutput = DexSupplyDataStructOutputArray & DexSupplyDataStructOutputStruct;
+    type DexBorrowDataStruct = [
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+    ] | {
+        dexPool: string;
+        dexId: number | string | BN;
+        fee: number | string | BN;
+        lastStoredPrice: number | string | BN;
+        centerPrice: number | string | BN;
+        token0Utilization: number | string | BN;
+        token1Utilization: number | string | BN;
+        totalBorrowShares: number | string | BN;
+        maxBorrowShares: number | string | BN;
+        token0Borrowed: number | string | BN;
+        token1Borrowed: number | string | BN;
+        sharesBorrowable: number | string | BN;
+        token0Borrowable: number | string | BN;
+        token1Borrowable: number | string | BN;
+        token0PerBorrowShare: number | string | BN;
+        token1PerBorrowShare: number | string | BN;
+        token0BorrowRate: number | string | BN;
+        token1BorrowRate: number | string | BN;
+        quoteToken: string;
+        quoteTokensPerShare: number | string | BN;
+        borrowToken0Reserves: number | string | BN;
+        borrowToken1Reserves: number | string | BN;
+    };
+    type DexBorrowDataStructOutputArray = [
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string,
+        string
+    ];
+    type DexBorrowDataStructOutputStruct = {
+        dexPool: string;
+        dexId: string;
+        fee: string;
+        lastStoredPrice: string;
+        centerPrice: string;
+        token0Utilization: string;
+        token1Utilization: string;
+        totalBorrowShares: string;
+        maxBorrowShares: string;
+        token0Borrowed: string;
+        token1Borrowed: string;
+        sharesBorrowable: string;
+        token0Borrowable: string;
+        token1Borrowable: string;
+        token0PerBorrowShare: string;
+        token1PerBorrowShare: string;
+        token0BorrowRate: string;
+        token1BorrowRate: string;
+        quoteToken: string;
+        quoteTokensPerShare: string;
+        borrowToken0Reserves: string;
+        borrowToken1Reserves: string;
+    };
+    type DexBorrowDataStructOutput = DexBorrowDataStructOutputArray & DexBorrowDataStructOutputStruct;
     type VaultDataStruct = [
         string,
         number | string | BN,
@@ -196,7 +388,9 @@ export declare namespace FluidView {
         number | string | BN,
         number | string | BN,
         number | string | BN,
-        number | string | BN
+        number | string | BN,
+        FluidView.DexSupplyDataStruct,
+        FluidView.DexBorrowDataStruct
     ] | {
         vault: string;
         vaultId: number | string | BN;
@@ -244,6 +438,8 @@ export declare namespace FluidView {
         borrowExpandDuration: number | string | BN;
         baseBorrowLimit: number | string | BN;
         minimumBorrowing: number | string | BN;
+        dexSupplyData: FluidView.DexSupplyDataStruct;
+        dexBorrowData: FluidView.DexBorrowDataStruct;
     };
     type VaultDataStructOutputArray = [
         string,
@@ -291,7 +487,9 @@ export declare namespace FluidView {
         string,
         string,
         string,
-        string
+        string,
+        FluidView.DexSupplyDataStructOutput,
+        FluidView.DexBorrowDataStructOutput
     ];
     type VaultDataStructOutputStruct = {
         vault: string;
@@ -340,6 +538,8 @@ export declare namespace FluidView {
         borrowExpandDuration: string;
         baseBorrowLimit: string;
         minimumBorrowing: string;
+        dexSupplyData: FluidView.DexSupplyDataStructOutput;
+        dexBorrowData: FluidView.DexBorrowDataStructOutput;
     };
     type VaultDataStructOutput = VaultDataStructOutputArray & VaultDataStructOutputStruct;
     type NftWithVaultStruct = [number | string | BN, number | string | BN, string] | {
@@ -359,6 +559,12 @@ export interface FluidView extends BaseContract {
     constructor(jsonInterface: any[], address?: string, options?: ContractOptions): FluidView;
     clone(): FluidView;
     methods: {
+        estimateBorrow(_vault: string, _token0Amount: number | string | BN, _token1Amount: number | string | BN, _maxSharesAmount: number | string | BN): NonPayableTransactionObject<string>;
+        estimateDeposit(_vault: string, _token0Amount: number | string | BN, _token1Amount: number | string | BN, _minSharesAmount: number | string | BN): PayableTransactionObject<string>;
+        estimateDexPositionCollateralInOneToken(_nftId: number | string | BN, _minToken0AmountToAccept: number | string | BN, _minToken1AmountToAccept: number | string | BN): NonPayableTransactionObject<string>;
+        estimateDexPositionDebtInOneToken(_nftId: number | string | BN, _maxToken0AmountToPayback: number | string | BN, _maxToken1AmountToPayback: number | string | BN): NonPayableTransactionObject<string>;
+        estimatePayback(_vault: string, _token0Amount: number | string | BN, _token1Amount: number | string | BN, _minSharesAmount: number | string | BN): NonPayableTransactionObject<string>;
+        estimateWithdraw(_vault: string, _token0Amount: number | string | BN, _token1Amount: number | string | BN, _maxSharesAmount: number | string | BN): NonPayableTransactionObject<string>;
         getAllFTokens(): NonPayableTransactionObject<string[]>;
         getAllFTokensData(): NonPayableTransactionObject<FluidView.FTokenDataStructOutput[]>;
         getAllUserEarnPositionsWithFTokens(_user: string): NonPayableTransactionObject<[
@@ -368,6 +574,17 @@ export interface FluidView extends BaseContract {
             userPositions: FluidView.UserEarnPositionStructOutput[];
             fTokensData: FluidView.FTokenDataStructOutput[];
         }>;
+        getDexShareRates(_vault: string): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string
+        ] & {
+            token0PerSupplyShare: string;
+            token1PerSupplyShare: string;
+            token0PerBorrowShare: string;
+            token1PerBorrowShare: string;
+        }>;
         getFTokenData(_fToken: string): NonPayableTransactionObject<FluidView.FTokenDataStructOutput>;
         getPositionByNftId(_nftId: number | string | BN): NonPayableTransactionObject<[
             FluidView.UserPositionStructOutput,

package/esm/types/contracts/generated/WeETHPriceFeed.d.ts

@@ -0,0 +1,135 @@
+/// <reference types="node" />
+import type BN from "bn.js";
+import type { ContractOptions } from "web3-eth-contract";
+import type { EventLog } from "web3-core";
+import type { EventEmitter } from "events";
+import type { Callback, NonPayableTransactionObject, BlockType, ContractEventLog, BaseContract } from "./types";
+export interface EventOptions {
+    filter?: object;
+    fromBlock?: BlockType;
+    topics?: string[];
+}
+export type AnswerUpdated = ContractEventLog<{
+    current: string;
+    roundId: string;
+    updatedAt: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type NewRound = ContractEventLog<{
+    roundId: string;
+    startedBy: string;
+    startedAt: string;
+    0: string;
+    1: string;
+    2: string;
+}>;
+export type OwnershipTransferRequested = ContractEventLog<{
+    from: string;
+    to: string;
+    0: string;
+    1: string;
+}>;
+export type OwnershipTransferred = ContractEventLog<{
+    from: string;
+    to: string;
+    0: string;
+    1: string;
+}>;
+export interface WeETHPriceFeed extends BaseContract {
+    constructor(jsonInterface: any[], address?: string, options?: ContractOptions): WeETHPriceFeed;
+    clone(): WeETHPriceFeed;
+    methods: {
+        acceptOwnership(): NonPayableTransactionObject<void>;
+        accessController(): NonPayableTransactionObject<string>;
+        aggregator(): NonPayableTransactionObject<string>;
+        confirmAggregator(_aggregator: string): NonPayableTransactionObject<void>;
+        decimals(): NonPayableTransactionObject<string>;
+        description(): NonPayableTransactionObject<string>;
+        getAnswer(_roundId: number | string | BN): NonPayableTransactionObject<string>;
+        getRoundData(_roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        getTimestamp(_roundId: number | string | BN): NonPayableTransactionObject<string>;
+        latestAnswer(): NonPayableTransactionObject<string>;
+        latestRound(): NonPayableTransactionObject<string>;
+        latestRoundData(): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        latestTimestamp(): NonPayableTransactionObject<string>;
+        owner(): NonPayableTransactionObject<string>;
+        phaseAggregators(arg0: number | string | BN): NonPayableTransactionObject<string>;
+        phaseId(): NonPayableTransactionObject<string>;
+        proposeAggregator(_aggregator: string): NonPayableTransactionObject<void>;
+        proposedAggregator(): NonPayableTransactionObject<string>;
+        proposedGetRoundData(_roundId: number | string | BN): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        proposedLatestRoundData(): NonPayableTransactionObject<[
+            string,
+            string,
+            string,
+            string,
+            string
+        ] & {
+            roundId: string;
+            answer: string;
+            startedAt: string;
+            updatedAt: string;
+            answeredInRound: string;
+        }>;
+        setController(_accessController: string): NonPayableTransactionObject<void>;
+        transferOwnership(_to: string): NonPayableTransactionObject<void>;
+        version(): NonPayableTransactionObject<string>;
+    };
+    events: {
+        AnswerUpdated(cb?: Callback<AnswerUpdated>): EventEmitter;
+        AnswerUpdated(options?: EventOptions, cb?: Callback<AnswerUpdated>): EventEmitter;
+        NewRound(cb?: Callback<NewRound>): EventEmitter;
+        NewRound(options?: EventOptions, cb?: Callback<NewRound>): EventEmitter;
+        OwnershipTransferRequested(cb?: Callback<OwnershipTransferRequested>): EventEmitter;
+        OwnershipTransferRequested(options?: EventOptions, cb?: Callback<OwnershipTransferRequested>): EventEmitter;
+        OwnershipTransferred(cb?: Callback<OwnershipTransferred>): EventEmitter;
+        OwnershipTransferred(options?: EventOptions, cb?: Callback<OwnershipTransferred>): EventEmitter;
+        allEvents(options?: EventOptions, cb?: Callback<EventLog>): EventEmitter;
+    };
+    once(event: "AnswerUpdated", cb: Callback<AnswerUpdated>): void;
+    once(event: "AnswerUpdated", options: EventOptions, cb: Callback<AnswerUpdated>): void;
+    once(event: "NewRound", cb: Callback<NewRound>): void;
+    once(event: "NewRound", options: EventOptions, cb: Callback<NewRound>): void;
+    once(event: "OwnershipTransferRequested", cb: Callback<OwnershipTransferRequested>): void;
+    once(event: "OwnershipTransferRequested", options: EventOptions, cb: Callback<OwnershipTransferRequested>): void;
+    once(event: "OwnershipTransferred", cb: Callback<OwnershipTransferred>): void;
+    once(event: "OwnershipTransferred", options: EventOptions, cb: Callback<OwnershipTransferred>): void;
+}

package/esm/types/contracts/generated/WeETHPriceFeed.js

@@ -0,0 +1,4 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export {};

package/esm/types/contracts/generated/index.d.ts

@@ -64,6 +64,7 @@ export type { SparkView } from "./SparkView";
 export type { TroveManager } from "./TroveManager";
 export type { USDCPriceFeed } from "./USDCPriceFeed";
 export type { UniMulticall } from "./UniMulticall";
+export type { WeETHPriceFeed } from "./WeETHPriceFeed";
 export type { WstETHPriceFeed } from "./WstETHPriceFeed";
 export type { CETHv3 } from "./CETHv3";
 export type { CUSDCev3 } from "./CUSDCev3";

package/esm/types/fluid.d.ts

@@ -9,8 +9,10 @@ export interface FluidMarketInfo {
     marketAddress: string;
     hasSmartCollateral: boolean;
     hasSmartDebt: boolean;
-    collateralAsset: string;
-    debtAsset: string;
+    collateralAsset0: string;
+    collateralAsset1?: string;
+    debtAsset0: string;
+    debtAsset1?: string;
     ethBased?: boolean;
     btcBased?: boolean;
     wstETHBased?: boolean;
@@ -167,6 +169,13 @@ export interface FluidAssetData {
     canBeBorrowed: boolean;
     supplyRate: string;
     borrowRate: string;
+    utilization?: string;
+    withdrawable?: string;
+    borrowable?: string;
+    tokenPerSupplyShare?: string;
+    tokenPerBorrowShare?: string;
+    supplyReserves?: string;
+    borrowReserves?: string;
 }
 export type FluidAssetsData = {
     [key: string]: FluidAssetData;
@@ -193,19 +202,37 @@ export interface InnerFluidMarketData {
     totalSupplyVaultUsd: string;
     totalBorrowVault: string;
     totalBorrowVaultUsd: string;
-    withdrawalLimit: string;
-    withdrawableUntilLimit: string;
+    withdrawalLimit?: string;
+    withdrawableUntilLimit?: string;
     withdrawable: string;
-    borrowLimit: string;
-    borrowableUntilLimit: string;
+    withdrawableDex?: string;
+    borrowLimit?: string;
+    borrowableUntilLimit?: string;
     borrowable: string;
-    borrowLimitUtilization: string;
-    maxBorrowLimit: string;
-    baseBorrowLimit: string;
-    minimumBorrowing: string;
+    borrowableDex?: string;
+    borrowLimitUtilization?: string;
+    maxBorrowLimit?: string;
+    baseBorrowLimit?: string;
+    minimumBorrowing?: string;
     supplyRate: string;
     borrowRate: string;
     liquidationMaxLimit: string;
+    collSharePrice?: string;
+    maxSupplyShares?: string;
+    withdrawableUSD?: string;
+    totalSupplyToken0?: string;
+    totalSupplyToken1?: string;
+    withdrawableToken0?: string;
+    withdrawableToken1?: string;
+    collDexFee?: string;
+    debtSharePrice?: string;
+    maxBorrowShares?: string;
+    borrowableUSD?: string;
+    borrowableToken0?: string;
+    borrowableToken1?: string;
+    totalBorrowToken0?: string;
+    totalBorrowToken1?: string;
+    borrowDexFee?: string;
 }
 export interface FluidMarketData {
     assetsData: FluidAssetsData;
@@ -250,5 +277,7 @@ export interface BaseFluidVaultData {
     isSubscribedToAutomation: boolean;
     automationResubscribeRequired: boolean;
     lastUpdated: number;
+    supplyShares?: string;
+    borrowShares?: string;
 }
 export type FluidVaultData = FluidAggregatedVaultData & BaseFluidVaultData;