@everstake/wallet-sdk-hysp-solana 1.1.0 → 1.1.2

package/dist/index.d.mts

@@ -211,6 +211,13 @@ declare class HyspSolana extends Blockchain {
      * @returns Returns a promise that resolves with the user's token balance amount.
      */
     getUserBalance(userAddress: Address): Promise<ApiResponse<Decimal>>;
+    /**
+     * Fetches the maximum available liquidity amount in the vaults allocations' reserves.
+     *
+     * @throws Throws an error if there's an issue loading vault's state or reserves.
+     *
+     * @returns Returns a promise that resolves with the maximum available liquidity amount as Decimal.
+     */
     getVaultLiquidityAmount(): Promise<ApiResponse<Decimal>>;
     /**
      * Creates a deposit transaction to the vault.

package/dist/index.d.ts

@@ -211,6 +211,13 @@ declare class HyspSolana extends Blockchain {
      * @returns Returns a promise that resolves with the user's token balance amount.
      */
     getUserBalance(userAddress: Address): Promise<ApiResponse<Decimal>>;
+    /**
+     * Fetches the maximum available liquidity amount in the vaults allocations' reserves.
+     *
+     * @throws Throws an error if there's an issue loading vault's state or reserves.
+     *
+     * @returns Returns a promise that resolves with the maximum available liquidity amount as Decimal.
+     */
     getVaultLiquidityAmount(): Promise<ApiResponse<Decimal>>;
     /**
      * Creates a deposit transaction to the vault.

package/dist/index.js

@@ -251,12 +251,27 @@ var HyspSolana = class extends Blockchain {
       throw this.handleError("GET_BALANCE_ERROR", error);
     }
   }
+  /**
+   * Fetches the maximum available liquidity amount in the vaults allocations' reserves.
+   *
+   * @throws Throws an error if there's an issue loading vault's state or reserves.
+   *
+   * @returns Returns a promise that resolves with the maximum available liquidity amount as Decimal.
+   */
   async getVaultLiquidityAmount() {
     try {
       const state = await this.vault.getState();
-      const liquidityAmount = state.tokenAvailable / 10 ** state.tokenMintDecimals;
+      const reserves = await this.vault.client.loadVaultReserves(state);
+      const mintFactor = new import_decimal.Decimal(10).pow(
+        new import_decimal.Decimal(state.tokenMintDecimals.toString())
+      );
+      let totalLiquiditty = new import_decimal.Decimal(state.tokenAvailable.toString());
+      for (const [, reserve] of reserves) {
+        const reserveLiquidity = reserve.getLiquidityAvailableAmount();
+        totalLiquiditty = totalLiquiditty.add(reserveLiquidity);
+      }
       return {
-        result: this.convertToDecimal(liquidityAmount.toString())
+        result: totalLiquiditty.div(mintFactor)
       };
     } catch (error) {
       throw this.handleError("VAULT_LOAD_ERROR", error);
@@ -282,6 +297,7 @@ var HyspSolana = class extends Blockchain {
       } else {
         decimalAmount = this.convertToDecimal(amount);
       }
+      const vaultState = await this.vault.getState();
       const depositIxs = await this.vault.depositIxs(signer, decimalAmount);
       const mergedDepositIxs = [];
       depositIxs.depositIxs.forEach((instruction) => {
@@ -293,7 +309,8 @@ var HyspSolana = class extends Blockchain {
       const transactionMessage = await this.buildTx(
         userAddress.toString(),
         mergedDepositIxs,
-        params
+        params,
+        [vaultState.vaultLookupTable]
       );
       return {
         result: transactionMessage
@@ -322,6 +339,7 @@ var HyspSolana = class extends Blockchain {
       } else {
         sharesDecimal = this.convertToDecimal(sharesAmount);
       }
+      const vaultState = await this.vault.getState();
       const withdrawIxs = await this.vault.withdrawIxs(signer, sharesDecimal);
       const mergedWithdrawIxs = [];
       withdrawIxs.unstakeFromFarmIfNeededIxs.forEach((instruction) => {
@@ -336,7 +354,8 @@ var HyspSolana = class extends Blockchain {
       const transactionMessage = await this.buildTx(
         userAddress.toString(),
         mergedWithdrawIxs,
-        params
+        params,
+        [vaultState.vaultLookupTable]
       );
       return {
         result: transactionMessage
@@ -345,7 +364,7 @@ var HyspSolana = class extends Blockchain {
       throw this.handleError("WITHDRAW_ERROR", error);
     }
   }
-  async buildTx(sender, instructions, params) {
+  async buildTx(sender, instructions, params, lookupTableAddresses) {
     let transactionMessage = (0, import_kit2.pipe)(
       (0, import_kit2.createTransactionMessage)({ version: 0 }),
       (tx) => (0, import_kit2.setTransactionMessageFeePayer)((0, import_kit2.address)(sender), tx)
@@ -384,6 +403,16 @@ var HyspSolana = class extends Blockchain {
         );
       }
     }
+    if (lookupTableAddresses && lookupTableAddresses.length > 0) {
+      const fetchedTables = await (0, import_kit2.fetchAddressesForLookupTables)(
+        lookupTableAddresses,
+        this.connection
+      );
+      transactionMessage = (0, import_kit2.compressTransactionMessageUsingAddressLookupTables)(
+        transactionMessage,
+        fetchedTables
+      );
+    }
     const finalLatestBlockhash = params?.finalLatestBlockhash || (await this.connection.getLatestBlockhash().send()).value;
     const txMessageWithBlockhashLifetime = (0, import_kit2.setTransactionMessageLifetimeUsingBlockhash)(
       finalLatestBlockhash,

package/dist/index.mjs

@@ -8,7 +8,9 @@ import {
   setTransactionMessageFeePayer,
   setTransactionMessageLifetimeUsingBlockhash,
   appendTransactionMessageInstruction,
-  prependTransactionMessageInstruction
+  prependTransactionMessageInstruction,
+  compressTransactionMessageUsingAddressLookupTables,
+  fetchAddressesForLookupTables
 } from "@solana/kit";
 import {
   getSetComputeUnitLimitInstruction,
@@ -234,12 +236,27 @@ var HyspSolana = class extends Blockchain {
       throw this.handleError("GET_BALANCE_ERROR", error);
     }
   }
+  /**
+   * Fetches the maximum available liquidity amount in the vaults allocations' reserves.
+   *
+   * @throws Throws an error if there's an issue loading vault's state or reserves.
+   *
+   * @returns Returns a promise that resolves with the maximum available liquidity amount as Decimal.
+   */
   async getVaultLiquidityAmount() {
     try {
       const state = await this.vault.getState();
-      const liquidityAmount = state.tokenAvailable / 10 ** state.tokenMintDecimals;
+      const reserves = await this.vault.client.loadVaultReserves(state);
+      const mintFactor = new Decimal(10).pow(
+        new Decimal(state.tokenMintDecimals.toString())
+      );
+      let totalLiquiditty = new Decimal(state.tokenAvailable.toString());
+      for (const [, reserve] of reserves) {
+        const reserveLiquidity = reserve.getLiquidityAvailableAmount();
+        totalLiquiditty = totalLiquiditty.add(reserveLiquidity);
+      }
       return {
-        result: this.convertToDecimal(liquidityAmount.toString())
+        result: totalLiquiditty.div(mintFactor)
       };
     } catch (error) {
       throw this.handleError("VAULT_LOAD_ERROR", error);
@@ -265,6 +282,7 @@ var HyspSolana = class extends Blockchain {
       } else {
         decimalAmount = this.convertToDecimal(amount);
       }
+      const vaultState = await this.vault.getState();
       const depositIxs = await this.vault.depositIxs(signer, decimalAmount);
       const mergedDepositIxs = [];
       depositIxs.depositIxs.forEach((instruction) => {
@@ -276,7 +294,8 @@ var HyspSolana = class extends Blockchain {
       const transactionMessage = await this.buildTx(
         userAddress.toString(),
         mergedDepositIxs,
-        params
+        params,
+        [vaultState.vaultLookupTable]
       );
       return {
         result: transactionMessage
@@ -305,6 +324,7 @@ var HyspSolana = class extends Blockchain {
       } else {
         sharesDecimal = this.convertToDecimal(sharesAmount);
       }
+      const vaultState = await this.vault.getState();
       const withdrawIxs = await this.vault.withdrawIxs(signer, sharesDecimal);
       const mergedWithdrawIxs = [];
       withdrawIxs.unstakeFromFarmIfNeededIxs.forEach((instruction) => {
@@ -319,7 +339,8 @@ var HyspSolana = class extends Blockchain {
       const transactionMessage = await this.buildTx(
         userAddress.toString(),
         mergedWithdrawIxs,
-        params
+        params,
+        [vaultState.vaultLookupTable]
       );
       return {
         result: transactionMessage
@@ -328,7 +349,7 @@ var HyspSolana = class extends Blockchain {
       throw this.handleError("WITHDRAW_ERROR", error);
     }
   }
-  async buildTx(sender, instructions, params) {
+  async buildTx(sender, instructions, params, lookupTableAddresses) {
     let transactionMessage = pipe(
       createTransactionMessage({ version: 0 }),
       (tx) => setTransactionMessageFeePayer(address2(sender), tx)
@@ -367,6 +388,16 @@ var HyspSolana = class extends Blockchain {
         );
       }
     }
+    if (lookupTableAddresses && lookupTableAddresses.length > 0) {
+      const fetchedTables = await fetchAddressesForLookupTables(
+        lookupTableAddresses,
+        this.connection
+      );
+      transactionMessage = compressTransactionMessageUsingAddressLookupTables(
+        transactionMessage,
+        fetchedTables
+      );
+    }
     const finalLatestBlockhash = params?.finalLatestBlockhash || (await this.connection.getLatestBlockhash().send()).value;
     const txMessageWithBlockhashLifetime = setTransactionMessageLifetimeUsingBlockhash(
       finalLatestBlockhash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@everstake/wallet-sdk-hysp-solana",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "HYSP Solana - Everstake Wallet SDK",
   "publishConfig": {
     "access": "public"
@@ -42,7 +42,7 @@
   },
   "homepage": "https://github.com/everstake/wallet-sdk#readme",
   "dependencies": {
-    "@kamino-finance/klend-sdk": "^7.2.4",
+    "@kamino-finance/klend-sdk": "^7.3.4",
     "@solana-program/compute-budget": "^0.7.0",
     "@solana/kit": "^3.0.3",
     "decimal.js": "^10.6.0"

package/src/hysp.ts

@@ -14,6 +14,8 @@ import {
   setTransactionMessageLifetimeUsingBlockhash,
   appendTransactionMessageInstruction,
   prependTransactionMessageInstruction,
+  compressTransactionMessageUsingAddressLookupTables,
+  fetchAddressesForLookupTables,
   TransactionMessage,
   TransactionMessageWithLifetime,
   Rpc,
@@ -178,15 +180,29 @@ export class HyspSolana extends Blockchain {
       throw this.handleError('GET_BALANCE_ERROR', error);
     }
   }
-
+  /**
+   * Fetches the maximum available liquidity amount in the vaults allocations' reserves.
+   *
+   * @throws Throws an error if there's an issue loading vault's state or reserves.
+   *
+   * @returns Returns a promise that resolves with the maximum available liquidity amount as Decimal.
+   */
   async getVaultLiquidityAmount(): Promise<ApiResponse<Decimal>> {
     try {
       const state = await this.vault.getState();
-      const liquidityAmount =
-        state.tokenAvailable / 10 ** state.tokenMintDecimals;
+      const reserves = await this.vault.client.loadVaultReserves(state);
+
+      const mintFactor = new Decimal(10).pow(
+        new Decimal(state.tokenMintDecimals.toString()),
+      );
+      let totalLiquiditty = new Decimal(state.tokenAvailable.toString());
+      for (const [, reserve] of reserves) {
+        const reserveLiquidity = reserve.getLiquidityAvailableAmount();
+        totalLiquiditty = totalLiquiditty.add(reserveLiquidity);
+      }
 
       return {
-        result: this.convertToDecimal(liquidityAmount.toString()),
+        result: totalLiquiditty.div(mintFactor),
       };
     } catch (error) {
       throw this.handleError('VAULT_LOAD_ERROR', error);
@@ -218,6 +234,7 @@ export class HyspSolana extends Blockchain {
         decimalAmount = this.convertToDecimal(amount);
       }
 
+      const vaultState = await this.vault.getState();
       const depositIxs = await this.vault.depositIxs(signer, decimalAmount);
 
       const mergedDepositIxs: Instruction[] = [];
@@ -233,6 +250,7 @@ export class HyspSolana extends Blockchain {
         userAddress.toString(),
         mergedDepositIxs,
         params,
+        [vaultState.vaultLookupTable],
       );
 
       return {
@@ -268,6 +286,7 @@ export class HyspSolana extends Blockchain {
         sharesDecimal = this.convertToDecimal(sharesAmount);
       }
 
+      const vaultState = await this.vault.getState();
       const withdrawIxs = await this.vault.withdrawIxs(signer, sharesDecimal);
 
       const mergedWithdrawIxs: Instruction[] = [];
@@ -286,6 +305,7 @@ export class HyspSolana extends Blockchain {
         userAddress.toString(),
         mergedWithdrawIxs,
         params,
+        [vaultState.vaultLookupTable],
       );
 
       return {
@@ -300,6 +320,7 @@ export class HyspSolana extends Blockchain {
     sender: string,
     instructions: Instruction[],
     params?: Params,
+    lookupTableAddresses?: Address[],
   ): Promise<TransactionMessageWithLifetime> {
     let transactionMessage: TransactionMessage = pipe(
       createTransactionMessage({ version: 0 }),
@@ -351,6 +372,17 @@ export class HyspSolana extends Blockchain {
       }
     }
 
+    if (lookupTableAddresses && lookupTableAddresses.length > 0) {
+      const fetchedTables = await fetchAddressesForLookupTables(
+        lookupTableAddresses,
+        this.connection,
+      );
+      transactionMessage = compressTransactionMessageUsingAddressLookupTables(
+        transactionMessage,
+        fetchedTables,
+      );
+    }
+
     const finalLatestBlockhash =
       params?.finalLatestBlockhash ||
       (await this.connection.getLatestBlockhash().send()).value;