@drift-labs/vaults-sdk 0.1.8 → 0.1.10

package/cli/cli.ts

@@ -13,6 +13,7 @@ import {
     deposit,
     requestWithdraw,
     withdraw,
+    forceWithdraw,
     listDepositorsForVault,
     managerUpdateMarginTradingEnabled
 } from "./commands";
@@ -135,6 +136,11 @@ program
     .addOption(new Option("--vault-depositor-address <vaultDepositorAddress>", "VaultDepositor address").makeOptionMandatory(false))
     .addOption(new Option("--authority <vaultDepositorAuthority>", "VaultDepositor authority address").makeOptionMandatory(false))
     .action((opts) => withdraw(program, opts));
+program
+    .command("force-withdraw")
+    .description("Forces the vault to send out a withdraw after the redeem period has passed")
+    .addOption(new Option("--vault-depositor-address <vaultDepositorAddress>", "VaultDepositor address").makeOptionMandatory(false))
+    .action((opts) => forceWithdraw(program, opts));
 
 program.parseAsync().then(() => {
     process.exit(0);

package/cli/commands/forceWithdraw.ts

@@ -0,0 +1,24 @@
+import { PublicKey } from "@solana/web3.js";
+import {
+    OptionValues,
+    Command
+} from "commander";
+import { getCommandContext } from "../utils";
+
+export const forceWithdraw = async (program: Command, cmdOpts: OptionValues) => {
+
+    let vaultDepositorAddress: PublicKey;
+    try {
+        vaultDepositorAddress = new PublicKey(cmdOpts.vaultDepositorAddress as string);
+    } catch (err) {
+        console.error("Invalid vault depositor address");
+        process.exit(1);
+    }
+
+    const {
+        driftVault
+    } = await getCommandContext(program, true);
+
+    const tx = await driftVault.forceWithdraw(vaultDepositorAddress);
+    console.log(`Forced withdraw from vault: ${tx}`);
+};

package/cli/commands/index.ts

@@ -11,6 +11,7 @@ export * from './applyProfitShare';
 export * from './initVaultDepositor';
 export * from './deposit';
 export * from './requestWithdraw';
+export * from './forceWithdraw';
 export * from './withdraw';
 export * from './listDepositorsForVault';
 export * from './managerUpdateMarginTradingEnabled';

package/cli/commands/initVault.ts

@@ -108,7 +108,7 @@ export const initVault = async (program: Command, cmdOpts: OptionValues) => {
     });
     console.log('');
     const answer = await new Promise(resolve => {
-        readline.question('Is the above information correct? (yes/no) ', (answer) => {
+        readline.question('Is the above information correct? (yes/no) ', (answer: string) => {
             readline.close();
             resolve(answer);
         });

package/cli/commands/managerUpdateVault.ts

@@ -90,7 +90,7 @@ export const managerUpdateVault = async (program: Command, cmdOpts: OptionValues
     });
     console.log('');
     const answer = await new Promise(resolve => {
-        readline.question('Is the above information correct? (yes/no) ', (answer) => {
+        readline.question('Is the above information correct? (yes/no) ', (answer: string) => {
             readline.close();
             resolve(answer);
         });

package/cli/utils.ts

@@ -1,5 +1,5 @@
 import { DriftClient, Wallet, loadKeypair } from "@drift-labs/sdk";
-import { VAULT_PROGRAM_ID, Vault, VaultClient, decodeName } from "../src";
+import { VAULT_PROGRAM_ID, Vault, VaultClient, VaultDepositor, decodeName } from "../src";
 import { Command } from "commander";
 import { Connection, Keypair } from "@solana/web3.js";
 import { AnchorProvider } from "@coral-xyz/anchor";
@@ -54,7 +54,7 @@ export function printVault(vault: Vault) {
     };
 }
 
-export function printVaultDepositor(vaultDepositor) {
+export function printVaultDepositor(vaultDepositor: VaultDepositor) {
     console.log(`vault:          ${vaultDepositor.vault.toBase58()}`);
     console.log(`pubkey:         ${vaultDepositor.pubkey.toBase58()}`);
     console.log(`authority:      ${vaultDepositor.authority.toBase58()}`);

package/lib/vaultClient.d.ts

@@ -93,6 +93,7 @@ export declare class VaultClient {
     }): Promise<TransactionSignature>;
     requestWithdraw(vaultDepositor: PublicKey, amount: BN, withdrawUnit: WithdrawUnit): Promise<TransactionSignature>;
     withdraw(vaultDepositor: PublicKey): Promise<TransactionSignature>;
+    forceWithdraw(vaultDepositor: PublicKey): Promise<TransactionSignature>;
     cancelRequestWithdraw(vaultDepositor: PublicKey): Promise<TransactionSignature>;
     /**
      * Liquidates (become delegate for) a vault.

package/lib/vaultClient.js

@@ -527,6 +527,60 @@ class VaultClient {
             return await this.createAndSendTxn([withdrawIx]);
         }
     }
+    async forceWithdraw(vaultDepositor) {
+        const vaultDepositorAccount = await this.program.account.vaultDepositor.fetch(vaultDepositor);
+        const vaultAccount = await this.program.account.vault.fetch(vaultDepositorAccount.vault);
+        const user = new sdk_1.User({
+            driftClient: this.driftClient,
+            userAccountPublicKey: vaultAccount.user,
+        });
+        await user.subscribe();
+        const remainingAccounts = this.driftClient.getRemainingAccounts({
+            userAccounts: [user.getUserAccount()],
+            writableSpotMarketIndexes: [vaultAccount.spotMarketIndex],
+        });
+        const userStatsKey = (0, sdk_1.getUserStatsAccountPublicKey)(this.driftClient.program.programId, vaultDepositorAccount.vault);
+        const driftStateKey = await this.driftClient.getStatePublicKey();
+        const spotMarket = this.driftClient.getSpotMarketAccount(vaultAccount.spotMarketIndex);
+        if (!spotMarket) {
+            throw new Error(`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`);
+        }
+        const accounts = {
+            manager: this.driftClient.wallet.publicKey,
+            vault: vaultDepositorAccount.vault,
+            vaultDepositor,
+            vaultTokenAccount: vaultAccount.tokenAccount,
+            driftUserStats: userStatsKey,
+            driftUser: vaultAccount.user,
+            driftState: driftStateKey,
+            driftSpotMarketVault: spotMarket.vault,
+            driftSigner: this.driftClient.getStateAccount().signer,
+            userTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, vaultDepositorAccount.authority, true),
+            driftProgram: this.driftClient.program.programId,
+            tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+        };
+        if (this.cliMode) {
+            return await this.program.methods
+                .forceWithdraw()
+                .preInstructions([
+                web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+                    units: 400000,
+                }),
+            ])
+                .accounts(accounts)
+                .remainingAccounts(remainingAccounts)
+                .rpc();
+        }
+        else {
+            const forceWithdrawIx = this.program.instruction.forceWithdraw({
+                accounts: {
+                    ...accounts,
+                },
+                remainingAccounts,
+            });
+            return await this.createAndSendTxn([forceWithdrawIx]);
+        }
+    }
     async cancelRequestWithdraw(vaultDepositor) {
         const vaultDepositorAccount = await this.program.account.vaultDepositor.fetch(vaultDepositor);
         const vaultAccount = await this.program.account.vault.fetch(vaultDepositorAccount.vault);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drift-labs/vaults-sdk",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "directories": {
@@ -9,7 +9,7 @@
   "dependencies": {
     "@coral-xyz/anchor": "^0.26.0",
     "@drift-labs/competitions-sdk": "^0.2.5",
-    "@drift-labs/sdk": "2.44.0-beta.0",
+    "@drift-labs/sdk": "2.45.0-beta.0",
     "@solana/web3.js": "1.73.2",
     "commander": "^11.0.0",
     "dotenv": "^16.3.1",

package/src/vaultClient.ts

@@ -814,6 +814,82 @@ export class VaultClient {
 		}
 	}
 
+	public async forceWithdraw(
+		vaultDepositor: PublicKey
+	): Promise<TransactionSignature> {
+		const vaultDepositorAccount =
+			await this.program.account.vaultDepositor.fetch(vaultDepositor);
+		const vaultAccount = await this.program.account.vault.fetch(
+			vaultDepositorAccount.vault
+		);
+
+		const user = new User({
+			driftClient: this.driftClient,
+			userAccountPublicKey: vaultAccount.user,
+		});
+		await user.subscribe();
+		const remainingAccounts = this.driftClient.getRemainingAccounts({
+			userAccounts: [user.getUserAccount()],
+			writableSpotMarketIndexes: [vaultAccount.spotMarketIndex],
+		});
+
+		const userStatsKey = getUserStatsAccountPublicKey(
+			this.driftClient.program.programId,
+			vaultDepositorAccount.vault
+		);
+
+		const driftStateKey = await this.driftClient.getStatePublicKey();
+
+		const spotMarket = this.driftClient.getSpotMarketAccount(
+			vaultAccount.spotMarketIndex
+		);
+		if (!spotMarket) {
+			throw new Error(
+				`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`
+			);
+		}
+
+		const accounts = {
+			manager: this.driftClient.wallet.publicKey,
+			vault: vaultDepositorAccount.vault,
+			vaultDepositor,
+			vaultTokenAccount: vaultAccount.tokenAccount,
+			driftUserStats: userStatsKey,
+			driftUser: vaultAccount.user,
+			driftState: driftStateKey,
+			driftSpotMarketVault: spotMarket.vault,
+			driftSigner: this.driftClient.getStateAccount().signer,
+			userTokenAccount: getAssociatedTokenAddressSync(
+				spotMarket.mint,
+				vaultDepositorAccount.authority,
+				true
+			),
+			driftProgram: this.driftClient.program.programId,
+			tokenProgram: TOKEN_PROGRAM_ID,
+		};
+
+		if (this.cliMode) {
+			return await this.program.methods
+				.forceWithdraw()
+				.preInstructions([
+					ComputeBudgetProgram.setComputeUnitLimit({
+						units: 400_000,
+					}),
+				])
+				.accounts(accounts)
+				.remainingAccounts(remainingAccounts)
+				.rpc();
+		} else {
+			const forceWithdrawIx = this.program.instruction.forceWithdraw({
+				accounts: {
+					...accounts,
+				},
+				remainingAccounts,
+			});
+			return await this.createAndSendTxn([forceWithdrawIx]);
+		}
+	}
+
 	public async cancelRequestWithdraw(
 		vaultDepositor: PublicKey
 	): Promise<TransactionSignature> {

package/tsconfig.json

@@ -5,15 +5,19 @@
 		"esModuleInterop": true,
 		"declaration": true,
 		"outDir": "./lib",
+		"rootDirs": [
+			"src",
+			"cli"
+		],
 		"resolveJsonModule": true,
 		"skipLibCheck": true,
 		"strict": true
 	},
 	"include": [
-		"src"
+		"src/**/*"
 	],
 	"exclude": [
 		"node_modules",
 		"tests"
 	]
-}
+}