@drift-labs/vaults-sdk 0.1.188 → 0.1.190

package/lib/vaultClient.d.ts

@@ -5,9 +5,14 @@ import { BN, DriftClient, UserMap } from '@drift-labs/sdk';
 import { Program, ProgramAccount } from '@coral-xyz/anchor';
 import { DriftVaults } from './types/drift_vaults';
 import { CompetitionsClient } from '@drift-labs/competitions-sdk';
-import { PublicKey, SetComputeUnitLimitParams, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
+import { PublicKey, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 import { Vault, VaultDepositor, WithdrawUnit } from './types/types';
 import { UserMapConfig } from '@drift-labs/sdk/lib/userMap/userMapConfig';
+export type TxParams = {
+    cuLimit?: number;
+    cuPriceMicroLamports?: number;
+    simulateTransaction?: boolean;
+};
 export declare class VaultClient {
     driftClient: DriftClient;
     program: Program<DriftVaults>;
@@ -110,7 +115,7 @@ export declare class VaultClient {
         vault: PublicKey;
     }): Promise<TransactionSignature>;
     requestWithdraw(vaultDepositor: PublicKey, amount: BN, withdrawUnit: WithdrawUnit): Promise<TransactionSignature>;
-    withdraw(vaultDepositor: PublicKey): Promise<TransactionSignature>;
+    withdraw(vaultDepositor: PublicKey, txParams?: TxParams): Promise<TransactionSignature>;
     forceWithdraw(vaultDepositor: PublicKey): Promise<TransactionSignature>;
     cancelRequestWithdraw(vaultDepositor: PublicKey): Promise<TransactionSignature>;
     /**
@@ -123,7 +128,7 @@ export declare class VaultClient {
     /**
      * Used for UI wallet adapters compatibility
      */
-    createAndSendTxn(ixs: TransactionInstruction[], computeUnitParams?: SetComputeUnitLimitParams): Promise<TransactionSignature>;
+    createAndSendTxn(vaultIxs: TransactionInstruction[], txParams?: TxParams): Promise<TransactionSignature>;
     /**
      * Initializes an insurance fund stake for the vault.
      * @param vault vault address to update

package/lib/vaultClient.js

@@ -316,7 +316,7 @@ class VaultClient {
             remainingAccounts,
         });
         return this.createAndSendTxn([ix], {
-            units: 1000000,
+            cuLimit: 1000000,
         });
     }
     async managerUpdateVault(vault, params) {
@@ -496,11 +496,12 @@ class VaultClient {
                 remainingAccounts,
             });
             return await this.createAndSendTxn([requestWithdrawIx], {
-                units: 650000,
+                cuLimit: 650000,
             });
         }
     }
-    async withdraw(vaultDepositor) {
+    async withdraw(vaultDepositor, txParams) {
+        var _a;
         const vaultDepositorAccount = await this.program.account.vaultDepositor.fetch(vaultDepositor);
         const vaultAccount = await this.program.account.vault.fetch(vaultDepositorAccount.vault);
         const user = await this.getSubscribedVaultUser(vaultAccount.user);
@@ -543,7 +544,8 @@ class VaultClient {
                 remainingAccounts,
             });
             return await this.createAndSendTxn([withdrawIx], {
-                units: 650000,
+                cuLimit: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.cuLimit) !== null && _a !== void 0 ? _a : 650000,
+                ...txParams,
             });
         }
     }
@@ -678,14 +680,34 @@ class VaultClient {
     /**
      * Used for UI wallet adapters compatibility
      */
-    async createAndSendTxn(ixs, computeUnitParams) {
-        const tx = new web3_js_1.Transaction();
-        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit(computeUnitParams || {
-            units: 400000,
-        }));
-        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1000000 }));
-        tx.add(...ixs);
-        const { txSig } = await this.driftClient.sendTransaction(tx, [], this.driftClient.opts);
+    async createAndSendTxn(vaultIxs, txParams) {
+        var _a, _b;
+        const ixs = [
+            web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+                units: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.cuLimit) !== null && _a !== void 0 ? _a : 400000,
+            }),
+            web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                microLamports: (_b = txParams === null || txParams === void 0 ? void 0 : txParams.cuPriceMicroLamports) !== null && _b !== void 0 ? _b : 1000000,
+            }),
+            ...vaultIxs,
+        ];
+        const tx = await this.driftClient.txSender.getVersionedTransaction(ixs, [], undefined, undefined);
+        let txSig = bytes_1.bs58.encode(tx.signatures[0]);
+        if (txParams === null || txParams === void 0 ? void 0 : txParams.simulateTransaction) {
+            const resp = await this.driftClient.connection.simulateTransaction(tx, {
+                // replaceRecentBlockhash: true,
+                sigVerify: false,
+                commitment: this.driftClient.connection.commitment,
+            });
+            console.log(`Simulated transaction:\n${JSON.stringify(resp, null, 2)}`);
+        }
+        else {
+            const resp = await this.driftClient.sendTransaction(tx, [], this.driftClient.opts);
+            if (resp.txSig !== txSig) {
+                console.error(`Transaction signature mismatch with self calculated value: ${resp.txSig} !== ${txSig}`);
+                txSig = resp.txSig;
+            }
+        }
         return txSig;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drift-labs/vaults-sdk",
-  "version": "0.1.188",
+  "version": "0.1.190",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "directories": {

package/src/vaultClient.ts

@@ -23,10 +23,8 @@ import {
 import {
 	ComputeBudgetProgram,
 	PublicKey,
-	SetComputeUnitLimitParams,
 	SystemProgram,
 	SYSVAR_RENT_PUBKEY,
-	Transaction,
 	TransactionInstruction,
 	TransactionSignature,
 } from '@solana/web3.js';
@@ -38,6 +36,12 @@ import { Vault, VaultDepositor, WithdrawUnit } from './types/types';
 import { bs58 } from '@coral-xyz/anchor/dist/cjs/utils/bytes';
 import { UserMapConfig } from '@drift-labs/sdk/lib/userMap/userMapConfig';
 
+export type TxParams = {
+	cuLimit?: number;
+	cuPriceMicroLamports?: number;
+	simulateTransaction?: boolean;
+};
+
 export class VaultClient {
 	driftClient: DriftClient;
 	program: Program<DriftVaults>;
@@ -505,7 +509,7 @@ export class VaultClient {
 			remainingAccounts,
 		});
 		return this.createAndSendTxn([ix], {
-			units: 1_000_000,
+			cuLimit: 1_000_000,
 		});
 	}
 
@@ -784,13 +788,14 @@ export class VaultClient {
 			);
 
 			return await this.createAndSendTxn([requestWithdrawIx], {
-				units: 650_000,
+				cuLimit: 650_000,
 			});
 		}
 	}
 
 	public async withdraw(
-		vaultDepositor: PublicKey
+		vaultDepositor: PublicKey,
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const vaultDepositorAccount =
 			await this.program.account.vaultDepositor.fetch(vaultDepositor);
@@ -854,7 +859,8 @@ export class VaultClient {
 			});
 
 			return await this.createAndSendTxn([withdrawIx], {
-				units: 650_000,
+				cuLimit: txParams?.cuLimit ?? 650_000,
+				...txParams,
 			});
 		}
 	}
@@ -1041,28 +1047,49 @@ export class VaultClient {
 	 * Used for UI wallet adapters compatibility
 	 */
 	public async createAndSendTxn(
-		ixs: TransactionInstruction[],
-		computeUnitParams?: SetComputeUnitLimitParams
+		vaultIxs: TransactionInstruction[],
+		txParams?: TxParams
 	): Promise<TransactionSignature> {
-		const tx = new Transaction();
-		tx.add(
-			ComputeBudgetProgram.setComputeUnitLimit(
-				computeUnitParams || {
-					units: 400_000,
-				}
-			)
-		);
-		tx.add(
-			ComputeBudgetProgram.setComputeUnitPrice({ microLamports: 1_000_000 })
-		);
-		tx.add(...ixs);
-		const { txSig } = await this.driftClient.sendTransaction(
-			tx,
+		const ixs = [
+			ComputeBudgetProgram.setComputeUnitLimit({
+				units: txParams?.cuLimit ?? 400_000,
+			}),
+			ComputeBudgetProgram.setComputeUnitPrice({
+				microLamports: txParams?.cuPriceMicroLamports ?? 1_000_000,
+			}),
+			...vaultIxs,
+		];
+
+		const tx = await this.driftClient.txSender.getVersionedTransaction(
+			ixs,
 			[],
-			this.driftClient.opts
+			undefined,
+			undefined
 		);
 
-		return txSig;
+		let txSig = bs58.encode(tx.signatures[0]);
+		if (txParams?.simulateTransaction) {
+			const resp = await this.driftClient.connection.simulateTransaction(tx, {
+				// replaceRecentBlockhash: true,
+				sigVerify: false,
+				commitment: this.driftClient.connection.commitment,
+			});
+			console.log(`Simulated transaction:\n${JSON.stringify(resp, null, 2)}`);
+		} else {
+			const resp = await this.driftClient.sendTransaction(
+				tx,
+				[],
+				this.driftClient.opts
+			);
+			if (resp.txSig !== txSig) {
+				console.error(
+					`Transaction signature mismatch with self calculated value: ${resp.txSig} !== ${txSig}`
+				);
+				txSig = resp.txSig;
+			}
+		}
+
+		return txSig!;
 	}
 
 	/**