refactor(sdk): abstract createDepositTxn

drift-labs · Jul 2, 2024 · b5a4ccd · b5a4ccd
1 parent ad28ed3
commit b5a4ccd
Show file tree

Hide file tree

Showing 2 changed files with 100 additions and 37 deletions.
diff --git a/ts/sdk/bun.lockb b/ts/sdk/bun.lockb
diff --git a/ts/sdk/src/vaultClient.ts b/ts/sdk/src/vaultClient.ts
@@ -437,6 +437,7 @@ export class VaultClient {
 				.rpc();
 		} else {
 			const requestWithdrawIx = this.program.instruction.managerRequestWithdraw(
+				// @ts-ignore
 				amount,
 				withdrawUnit,
 				{
@@ -681,22 +682,14 @@ export class VaultClient {
 		}
 	}
 
-	/**
-	 * Depositor funds into the specified vault.
-	 * @param vaultDepositor
-	 * @param amount
-	 * @param initVaultDepositor If true, will initialize the vault depositor account
-	 * @returns
-	 */
-	public async deposit(
+	public async prepDepositTx(
 		vaultDepositor: PublicKey,
 		amount: BN,
 		initVaultDepositor?: {
 			authority: PublicKey;
 			vault: PublicKey;
-		},
-		txParams?: TxParams
-	): Promise<TransactionSignature> {
+		}
+	) {
 		let vaultPubKey: PublicKey;
 		if (initVaultDepositor) {
 			vaultPubKey = initVaultDepositor.vault;
@@ -747,7 +740,68 @@ export class VaultClient {
 			tokenProgram: TOKEN_PROGRAM_ID,
 		};
 
+		return {
+			vaultAccount, accounts, remainingAccounts
+		};
+	}
+
+	public async createDepositTx(
+		vaultDepositor: PublicKey,
+		amount: BN,
+		initVaultDepositor?: {
+			authority: PublicKey;
+			vault: PublicKey;
+		},
+		txParams?: TxParams
+	): Promise<VersionedTransaction> {
+		const { vaultAccount, accounts, remainingAccounts } = await this.prepDepositTx(
+			vaultDepositor,
+			amount,
+			initVaultDepositor
+		);
+
+		const depositIx = this.program.instruction.deposit(amount, {
+			accounts: {
+				authority: this.driftClient.wallet.publicKey,
+				...accounts,
+			},
+			remainingAccounts,
+		});
+
+		if (initVaultDepositor) {
+			const initIx = this.createInitVaultDepositorIx(
+				vaultAccount.pubkey,
+				initVaultDepositor.authority
+			);
+			return await this.createTxn([initIx, depositIx], txParams);
+		} else {
+			return await this.createTxn([depositIx], txParams);
+		}
+	}
+
+	/**
+	 * Depositor funds into the specified vault.
+	 * @param vaultDepositor
+	 * @param amount
+	 * @param initVaultDepositor If true, will initialize the vault depositor account
+	 * @returns
+	 */
+	public async deposit(
+		vaultDepositor: PublicKey,
+		amount: BN,
+		initVaultDepositor?: {
+			authority: PublicKey;
+			vault: PublicKey;
+		},
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
 		if (this.cliMode) {
+			const { vaultAccount, accounts, remainingAccounts } = await this.prepDepositTx(
+				vaultDepositor,
+				amount,
+				initVaultDepositor
+			);
+
 			if (initVaultDepositor) {
 				await this.initializeVaultDepositor(
 					vaultAccount.pubkey,
@@ -760,23 +814,14 @@ export class VaultClient {
 				.remainingAccounts(remainingAccounts)
 				.rpc();
 		} else {
-			const depositIx = this.program.instruction.deposit(amount, {
-				accounts: {
-					authority: this.driftClient.wallet.publicKey,
-					...accounts,
-				},
-				remainingAccounts,
-			});
+			const depositTxn = await this.createDepositTx(
+				vaultDepositor,
+			amount,
+			initVaultDepositor,
+			txParams
+			);
 
-			if (initVaultDepositor) {
-				const initIx = this.createInitVaultDepositorIx(
-					vaultAccount.pubkey,
-					initVaultDepositor.authority
-				);
-				return await this.createAndSendTxn([initIx, depositIx], txParams);
-			} else {
-				return await this.createAndSendTxn([depositIx], txParams);
-			}
+			return this.sendTxn(depositTxn, txParams?.simulateTransaction);
 		}
 	}
 
@@ -821,6 +866,7 @@ export class VaultClient {
 				.rpc();
 		} else {
 			const requestWithdrawIx = this.program.instruction.requestWithdraw(
+				// @ts-ignore
 				amount,
 				withdrawUnit,
 				{
@@ -1111,13 +1157,10 @@ export class VaultClient {
 		}
 	}
 
-	/**
-	 * Used for UI wallet adapters compatibility
-	 */
-	public async createAndSendTxn(
+	public async createTxn(
 		vaultIxs: TransactionInstruction[],
 		txParams?: TxParams
-	): Promise<TransactionSignature> {
+	): Promise<VersionedTransaction> {
 		const ixs = [
 			ComputeBudgetProgram.setComputeUnitLimit({
 				units: txParams?.cuLimit ?? 400_000,
@@ -1128,7 +1171,7 @@ export class VaultClient {
 			...vaultIxs,
 		];
 
-		const tx = (await this.driftClient.txHandler.buildTransaction({
+		return (await this.driftClient.txHandler.buildTransaction({
 			connection: this.driftClient.connection,
 			instructions: ixs,
 			lookupTables: txParams?.lookupTables ?? [],
@@ -1138,10 +1181,16 @@ export class VaultClient {
 			fetchMarketLookupTableAccount:
 				this.driftClient.fetchMarketLookupTableAccount.bind(this.driftClient),
 		})) as VersionedTransaction;
-		let txSig = bs58.encode(tx.signatures[0]);
-		if (txParams?.simulateTransaction) {
+	}
+
+	public async sendTxn(
+		transaction: VersionedTransaction,
+		simulateTransaction?: boolean,
+	): Promise<TransactionSignature> {
+		let txSig = bs58.encode(transaction.signatures[0]);
+		if (simulateTransaction) {
 			try {
-				const resp = await this.driftClient.connection.simulateTransaction(tx, {
+				const resp = await this.driftClient.connection.simulateTransaction(transaction, {
 					sigVerify: false,
 					commitment: this.driftClient.connection.commitment,
 				});
@@ -1154,7 +1203,7 @@ export class VaultClient {
 			}
 		} else {
 			const resp = await this.driftClient.sendTransaction(
-				tx,
+				transaction,
 				[],
 				this.driftClient.opts
 			);
@@ -1167,6 +1216,20 @@ export class VaultClient {
 		}
 
 		return txSig!;
+
+	}
+
+	/**
+	 * Used for UI wallet adapters compatibility
+	 */
+	public async createAndSendTxn(
+		vaultIxs: TransactionInstruction[],
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const tx = await this.createTxn(vaultIxs, txParams);
+		const txSig = await this.sendTxn(tx, txParams?.simulateTransaction);
+
+		return txSig;
 	}
 
 	/**