@defisaver/positions-sdk 0.0.201-fluid-dev-1 → 0.0.201-fluid-dev-3

package/src/types/contracts/generated/FluidView.ts

@@ -22,6 +22,112 @@ export interface EventOptions {
 }
 
 export declare namespace FluidView {
+  export type FTokenDataStruct =
+    | [
+        string,
+        boolean,
+        string,
+        string,
+        number | string | BN,
+        string,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        boolean,
+        number | string | BN,
+        number | string | BN
+      ]
+    | {
+        tokenAddress: string;
+        isNativeUnderlying: boolean;
+        name: string;
+        symbol: string;
+        decimals: number | string | BN;
+        asset: string;
+        totalAssets: number | string | BN;
+        totalSupply: number | string | BN;
+        convertToShares: number | string | BN;
+        convertToAssets: number | string | BN;
+        rewardsRate: number | string | BN;
+        supplyRate: number | string | BN;
+        withdrawable: number | string | BN;
+        modeWithInterest: boolean;
+        expandPercent: number | string | BN;
+        expandDuration: number | string | BN;
+      };
+
+  export type FTokenDataStructOutputArray = [
+    string,
+    boolean,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    string,
+    boolean,
+    string,
+    string
+  ];
+  export type FTokenDataStructOutputStruct = {
+    tokenAddress: string;
+    isNativeUnderlying: boolean;
+    name: string;
+    symbol: string;
+    decimals: string;
+    asset: string;
+    totalAssets: string;
+    totalSupply: string;
+    convertToShares: string;
+    convertToAssets: string;
+    rewardsRate: string;
+    supplyRate: string;
+    withdrawable: string;
+    modeWithInterest: boolean;
+    expandPercent: string;
+    expandDuration: string;
+  };
+  export type FTokenDataStructOutput = FTokenDataStructOutputArray &
+    FTokenDataStructOutputStruct;
+
+  export type UserEarnPositionStruct =
+    | [
+        number | string | BN,
+        number | string | BN,
+        number | string | BN,
+        number | string | BN
+      ]
+    | {
+        fTokenShares: number | string | BN;
+        underlyingAssets: number | string | BN;
+        underlyingBalance: number | string | BN;
+        allowance: number | string | BN;
+      };
+
+  export type UserEarnPositionStructOutputArray = [
+    string,
+    string,
+    string,
+    string
+  ];
+  export type UserEarnPositionStructOutputStruct = {
+    fTokenShares: string;
+    underlyingAssets: string;
+    underlyingBalance: string;
+    allowance: string;
+  };
+  export type UserEarnPositionStructOutput = UserEarnPositionStructOutputArray &
+    UserEarnPositionStructOutputStruct;
+
   export type UserPositionStruct =
     | [
         number | string | BN,
@@ -267,6 +373,23 @@ export declare namespace FluidView {
   };
   export type VaultDataStructOutput = VaultDataStructOutputArray &
     VaultDataStructOutputStruct;
+
+  export type NftWithVaultStruct =
+    | [number | string | BN, number | string | BN, string]
+    | {
+        nftId: number | string | BN;
+        vaultId: number | string | BN;
+        vaultAddr: string;
+      };
+
+  export type NftWithVaultStructOutputArray = [string, string, string];
+  export type NftWithVaultStructOutputStruct = {
+    nftId: string;
+    vaultId: string;
+    vaultAddr: string;
+  };
+  export type NftWithVaultStructOutput = NftWithVaultStructOutputArray &
+    NftWithVaultStructOutputStruct;
 }
 
 export interface FluidView extends BaseContract {
@@ -277,6 +400,28 @@ export interface FluidView extends BaseContract {
   ): FluidView;
   clone(): FluidView;
   methods: {
+    getAllFTokens(): NonPayableTransactionObject<string[]>;
+
+    getAllFTokensData(): NonPayableTransactionObject<
+      FluidView.FTokenDataStructOutput[]
+    >;
+
+    getAllUserEarnPositionsWithFTokens(
+      _user: string
+    ): NonPayableTransactionObject<
+      [
+        FluidView.UserEarnPositionStructOutput[],
+        FluidView.FTokenDataStructOutput[]
+      ] & {
+        userPositions: FluidView.UserEarnPositionStructOutput[];
+        fTokensData: FluidView.FTokenDataStructOutput[];
+      }
+    >;
+
+    getFTokenData(
+      _fToken: string
+    ): NonPayableTransactionObject<FluidView.FTokenDataStructOutput>;
+
     getPositionByNftId(
       _nftId: number | string | BN
     ): NonPayableTransactionObject<
@@ -288,8 +433,30 @@ export interface FluidView extends BaseContract {
 
     getRatio(_nftId: number | string | BN): NonPayableTransactionObject<string>;
 
+    getUserEarnPosition(
+      _fToken: string,
+      _user: string
+    ): NonPayableTransactionObject<FluidView.UserEarnPositionStructOutput>;
+
+    getUserEarnPositionWithFToken(
+      _fToken: string,
+      _user: string
+    ): NonPayableTransactionObject<
+      [
+        FluidView.UserEarnPositionStructOutput,
+        FluidView.FTokenDataStructOutput
+      ] & {
+        userPosition: FluidView.UserEarnPositionStructOutput;
+        fTokenData: FluidView.FTokenDataStructOutput;
+      }
+    >;
+
     getUserNftIds(_user: string): NonPayableTransactionObject<string[]>;
 
+    getUserNftIdsWithVaultIds(
+      _user: string
+    ): NonPayableTransactionObject<FluidView.NftWithVaultStructOutput[]>;
+
     getUserPositions(
       _user: string
     ): NonPayableTransactionObject<
@@ -302,11 +469,6 @@ export interface FluidView extends BaseContract {
       }
     >;
 
-    getVaultAddresses(
-      _ids: number | string | BN[],
-      _fetchAll: boolean
-    ): NonPayableTransactionObject<string[]>;
-
     getVaultData(
       _vault: string
     ): NonPayableTransactionObject<FluidView.VaultDataStructOutput>;

package/src/types/fluid.ts

@@ -15,6 +15,7 @@ export interface FluidMarketInfo {
   ethBased?: boolean,
   btcBased?: boolean,
   wstETHBased?: boolean,
+  stableBased?: boolean,
   type: FluidVaultType
 }
 
@@ -75,6 +76,9 @@ export enum FluidMainnetVersion {
   RSETH_ETH_WSTETH_78 = 'RSETH_ETH_WSTETH_78',
   RSETH_WSTETH_79 = 'RSETH_WSTETH_79',
   WEETHS_ETH_WSTETH_80 = 'WEETHS_ETH_WSTETH_80',
+  SUSDE_USDT_USDT_92 = 'SUSDE_USDT_USDT_92',
+  USDE_USDT_USDT_93 = 'USDE_USDT_USDT_93',
+  LBTC_CBBTC_WBTC_97 = 'LBTC_CBBTC_WBTC_97',
 }
 
 export enum FluidArbitrumVersion {
@@ -89,8 +93,19 @@ export 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',
+  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 enum FluidBaseVersions {
@@ -110,6 +125,9 @@ export enum FluidBaseVersions {
   ETH_CBBTC_14_BASE = 'ETH_CBBTC_14_BASE',
   WEETH_CBBTC_15_BASE = 'WEETH_CBBTC_15_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;
@@ -201,6 +219,7 @@ export interface InnerFluidMarketData {
   minimumBorrowing: string,
   supplyRate: string,
   borrowRate: string,
+  liquidationMaxLimit: string,
 }
 
 export interface FluidMarketData {