@voltr/vault-sdk 0.1.4 → 0.1.6

package/dist/client.d.ts

@@ -1,6 +1,6 @@
 import { Program, AnchorProvider, Idl, BN } from "@coral-xyz/anchor";
 import { Connection, Keypair, PublicKey, TransactionInstruction } from "@solana/web3.js";
-import { VaultParams, VaultConfig, VoltrVault, InitializeStrategyArgs, DepositStrategyArgs, WithdrawStrategyArgs, InitializeDirectWithdrawStrategyArgs, DirectWithdrawStrategyArgs } from "./types";
+import { VaultParams, VaultConfig, VoltrVault, InitializeStrategyArgs, DepositStrategyArgs, WithdrawStrategyArgs, InitializeDirectWithdrawStrategyArgs, DirectWithdrawStrategyArgs, WithdrawVaultArgs } from "./types";
 declare class AccountUtils {
     conn: Connection;
     constructor(conn: Connection);
@@ -231,7 +231,10 @@ export declare class VoltrClient extends AccountUtils {
     /**
      * Creates a withdraw instruction for a vault
      *
-     * @param amount - Amount of LP tokens to withdraw
+     * @param {WithdrawVaultArgs} obj - Arguments for withdrawing from the vault
+     * @param {BN} obj.amount - Amount of LP tokens to withdraw
+     * @param {boolean} obj.isAmountInLp - Whether the amount is in LP tokens
+     * @param {boolean} obj.isWithdrawAll - Whether to withdraw all assets
      * @param {Object} params - Withdraw parameters
      * @param {PublicKey} params.userAuthority - Public key of the user authority
      * @param {PublicKey} params.vault - Public key of the vault
@@ -243,7 +246,11 @@ export declare class VoltrClient extends AccountUtils {
      *
      * @example
      * const ix = await client.createWithdrawVaultIx(
-     *   new BN('1000000000'),
+     *   {
+     *     amount: new BN('1000000000'),
+     *     isAmountInLp: true,
+     *     isWithdrawAll: false,
+     *   },
      *   {
      *     userAuthority: userPubkey,
      *     vault: vaultPubkey,
@@ -252,7 +259,7 @@ export declare class VoltrClient extends AccountUtils {
      *   }
      * );
      */
-    createWithdrawVaultIx(amount: BN, { userAuthority, vault, vaultAssetMint, assetTokenProgram, }: {
+    createWithdrawVaultIx({ amount, isAmountInLp, isWithdrawAll }: WithdrawVaultArgs, { userAuthority, vault, vaultAssetMint, assetTokenProgram, }: {
         userAuthority: PublicKey;
         vault: PublicKey;
         vaultAssetMint: PublicKey;
@@ -495,9 +502,11 @@ export declare class VoltrClient extends AccountUtils {
     }): Promise<TransactionInstruction>;
     /**
      * Creates an instruction to withdraw assets from a direct withdraw strategy
-     * @param {DirectWithdrawStrategyArgs} withdrawArgs - Withdrawal arguments
-     * @param {BN} withdrawArgs.withdrawAmount - Amount of assets to withdraw
-     * @param {Buffer | null} [withdrawArgs.userArgs] - Optional user arguments for the instruction
+     * @param {DirectWithdrawStrategyArgs} directWithdrawArgs - Withdrawal arguments
+     * @param {BN} directWithdrawArgs.amount - Amount of assets to withdraw
+     * @param {boolean} directWithdrawArgs.isAmountInLp - Whether the amount is in LP tokens
+     * @param {boolean} directWithdrawArgs.isWithdrawAll - Whether to withdraw all assets
+     * @param {Buffer | null} [directWithdrawArgs.userArgs] - Optional user arguments for the instruction
      * @param {Object} params - Parameters for withdrawing assets from direct withdraw strategy
      * @param {PublicKey} params.user - Public key of the user
      * @param {PublicKey} params.vault - Public key of the vault
@@ -513,7 +522,9 @@ export declare class VoltrClient extends AccountUtils {
      * ```typescript
      * const ix = await client.createDirectWithdrawStrategyIx(
      *   {
-     *     withdrawAmount: new BN('1000000000'),
+     *     amount: new BN('1000000000'),
+     *     isAmountInLp: true,
+     *     isWithdrawAll: false,
      *     userArgs: Buffer.from('...')
      *   },
      *   {
@@ -528,7 +539,7 @@ export declare class VoltrClient extends AccountUtils {
      * );
      * ```
      */
-    createDirectWithdrawStrategyIx({ withdrawAmount, userArgs }: DirectWithdrawStrategyArgs, { user, vault, strategy, vaultAssetMint, assetTokenProgram, adaptorProgram, remainingAccounts, }: {
+    createDirectWithdrawStrategyIx({ amount, isAmountInLp, isWithdrawAll, userArgs, }: DirectWithdrawStrategyArgs, { user, vault, strategy, vaultAssetMint, assetTokenProgram, adaptorProgram, remainingAccounts, }: {
         user: PublicKey;
         vault: PublicKey;
         strategy: PublicKey;

package/dist/client.js

@@ -367,7 +367,10 @@ class VoltrClient extends AccountUtils {
     /**
      * Creates a withdraw instruction for a vault
      *
-     * @param amount - Amount of LP tokens to withdraw
+     * @param {WithdrawVaultArgs} obj - Arguments for withdrawing from the vault
+     * @param {BN} obj.amount - Amount of LP tokens to withdraw
+     * @param {boolean} obj.isAmountInLp - Whether the amount is in LP tokens
+     * @param {boolean} obj.isWithdrawAll - Whether to withdraw all assets
      * @param {Object} params - Withdraw parameters
      * @param {PublicKey} params.userAuthority - Public key of the user authority
      * @param {PublicKey} params.vault - Public key of the vault
@@ -379,7 +382,11 @@ class VoltrClient extends AccountUtils {
      *
      * @example
      * const ix = await client.createWithdrawVaultIx(
-     *   new BN('1000000000'),
+     *   {
+     *     amount: new BN('1000000000'),
+     *     isAmountInLp: true,
+     *     isWithdrawAll: false,
+     *   },
      *   {
      *     userAuthority: userPubkey,
      *     vault: vaultPubkey,
@@ -388,9 +395,9 @@ class VoltrClient extends AccountUtils {
      *   }
      * );
      */
-    async createWithdrawVaultIx(amount, { userAuthority, vault, vaultAssetMint, assetTokenProgram, }) {
+    async createWithdrawVaultIx({ amount, isAmountInLp, isWithdrawAll }, { userAuthority, vault, vaultAssetMint, assetTokenProgram, }) {
         return await this.vaultProgram.methods
-            .withdrawVault(amount)
+            .withdrawVault(amount, isAmountInLp, isWithdrawAll)
             .accounts({
             userTransferAuthority: userAuthority,
             vault,
@@ -655,9 +662,11 @@ class VoltrClient extends AccountUtils {
     }
     /**
      * Creates an instruction to withdraw assets from a direct withdraw strategy
-     * @param {DirectWithdrawStrategyArgs} withdrawArgs - Withdrawal arguments
-     * @param {BN} withdrawArgs.withdrawAmount - Amount of assets to withdraw
-     * @param {Buffer | null} [withdrawArgs.userArgs] - Optional user arguments for the instruction
+     * @param {DirectWithdrawStrategyArgs} directWithdrawArgs - Withdrawal arguments
+     * @param {BN} directWithdrawArgs.amount - Amount of assets to withdraw
+     * @param {boolean} directWithdrawArgs.isAmountInLp - Whether the amount is in LP tokens
+     * @param {boolean} directWithdrawArgs.isWithdrawAll - Whether to withdraw all assets
+     * @param {Buffer | null} [directWithdrawArgs.userArgs] - Optional user arguments for the instruction
      * @param {Object} params - Parameters for withdrawing assets from direct withdraw strategy
      * @param {PublicKey} params.user - Public key of the user
      * @param {PublicKey} params.vault - Public key of the vault
@@ -673,7 +682,9 @@ class VoltrClient extends AccountUtils {
      * ```typescript
      * const ix = await client.createDirectWithdrawStrategyIx(
      *   {
-     *     withdrawAmount: new BN('1000000000'),
+     *     amount: new BN('1000000000'),
+     *     isAmountInLp: true,
+     *     isWithdrawAll: false,
      *     userArgs: Buffer.from('...')
      *   },
      *   {
@@ -688,9 +699,9 @@ class VoltrClient extends AccountUtils {
      * );
      * ```
      */
-    async createDirectWithdrawStrategyIx({ withdrawAmount, userArgs = null }, { user, vault, strategy, vaultAssetMint, assetTokenProgram, adaptorProgram = constants_1.DEFAULT_ADAPTOR_PROGRAM_ID, remainingAccounts, }) {
+    async createDirectWithdrawStrategyIx({ amount, isAmountInLp, isWithdrawAll, userArgs = null, }, { user, vault, strategy, vaultAssetMint, assetTokenProgram, adaptorProgram = constants_1.DEFAULT_ADAPTOR_PROGRAM_ID, remainingAccounts, }) {
         return await this.vaultProgram.methods
-            .directWithdrawStrategy(withdrawAmount, userArgs)
+            .directWithdrawStrategy(amount, isAmountInLp, isWithdrawAll, userArgs)
             .accounts({
             userTransferAuthority: user,
             strategy,

package/dist/idl/voltr_vault.json

@@ -462,10 +462,6 @@
                 {
                     "name": "asset_token_program"
                 },
-                {
-                    "name": "lp_token_program",
-                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
-                },
                 {
                     "name": "adaptor_program"
                 }
@@ -1284,6 +1280,14 @@
                     "name": "amount",
                     "type": "u64"
                 },
+                {
+                    "name": "is_amount_in_lp",
+                    "type": "bool"
+                },
+                {
+                    "name": "is_withdraw_all",
+                    "type": "bool"
+                },
                 {
                     "name": "user_args",
                     "type": {
@@ -2468,10 +2472,6 @@
                 },
                 {
                     "name": "asset_token_program"
-                },
-                {
-                    "name": "lp_token_program",
-                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
                 }
             ],
             "args": [
@@ -2805,6 +2805,14 @@
                 {
                     "name": "amount",
                     "type": "u64"
+                },
+                {
+                    "name": "amount_in_lp",
+                    "type": "bool"
+                },
+                {
+                    "name": "withdraw_all",
+                    "type": "bool"
                 }
             ]
         }

package/dist/types/vault.d.ts

@@ -25,7 +25,11 @@ export interface WithdrawStrategyArgs extends InitializeStrategyArgs {
 export interface InitializeDirectWithdrawStrategyArgs extends InitializeStrategyArgs {
     allowUserArgs?: boolean;
 }
-export interface DirectWithdrawStrategyArgs {
-    withdrawAmount: BN;
+export interface WithdrawVaultArgs {
+    amount: BN;
+    isAmountInLp: boolean;
+    isWithdrawAll: boolean;
+}
+export interface DirectWithdrawStrategyArgs extends WithdrawVaultArgs {
     userArgs?: Buffer | null;
 }

package/dist/types/voltr_vault.d.ts

@@ -468,10 +468,6 @@ export type VoltrVault = {
                 {
                     "name": "assetTokenProgram";
                 },
-                {
-                    "name": "lpTokenProgram";
-                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
-                },
                 {
                     "name": "adaptorProgram";
                 }
@@ -1290,6 +1286,14 @@ export type VoltrVault = {
                     "name": "amount";
                     "type": "u64";
                 },
+                {
+                    "name": "isAmountInLp";
+                    "type": "bool";
+                },
+                {
+                    "name": "isWithdrawAll";
+                    "type": "bool";
+                },
                 {
                     "name": "userArgs";
                     "type": {
@@ -2474,10 +2478,6 @@ export type VoltrVault = {
                 },
                 {
                     "name": "assetTokenProgram";
-                },
-                {
-                    "name": "lpTokenProgram";
-                    "address": "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
                 }
             ];
             "args": [
@@ -2811,6 +2811,14 @@ export type VoltrVault = {
                 {
                     "name": "amount";
                     "type": "u64";
+                },
+                {
+                    "name": "amountInLp";
+                    "type": "bool";
+                },
+                {
+                    "name": "withdrawAll";
+                    "type": "bool";
                 }
             ];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltr/vault-sdk",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "SDK for interacting with Voltr Protocol",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",