@drift-labs/vaults-sdk 0.1.190 → 0.1.192

package/lib/vaultClient.js

@@ -515,6 +515,12 @@ class VaultClient {
         if (!spotMarket) {
             throw new Error(`Spot market ${vaultAccount.spotMarketIndex} not found on driftClient`);
         }
+        const userAta = (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, this.driftClient.wallet.publicKey, true);
+        let createAtaIx = undefined;
+        const userAtaExists = await this.driftClient.connection.getAccountInfo(userAta);
+        if (userAtaExists === null) {
+            createAtaIx = (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.driftClient.wallet.publicKey, userAta, this.driftClient.wallet.publicKey, spotMarket.mint);
+        }
         const accounts = {
             vault: vaultDepositorAccount.vault,
             vaultDepositor,
@@ -524,7 +530,7 @@ class VaultClient {
             driftState: driftStateKey,
             driftSpotMarketVault: spotMarket.vault,
             driftSigner: this.driftClient.getStateAccount().signer,
-            userTokenAccount: (0, spl_token_1.getAssociatedTokenAddressSync)(spotMarket.mint, this.driftClient.wallet.publicKey, true),
+            userTokenAccount: userAta,
             driftProgram: this.driftClient.program.programId,
             tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
         };
@@ -536,15 +542,20 @@ class VaultClient {
                 .rpc();
         }
         else {
-            const withdrawIx = this.program.instruction.withdraw({
-                accounts: {
-                    authority: this.driftClient.wallet.publicKey,
-                    ...accounts,
-                },
-                remainingAccounts,
-            });
-            return await this.createAndSendTxn([withdrawIx], {
-                cuLimit: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.cuLimit) !== null && _a !== void 0 ? _a : 650000,
+            const ixs = [
+                this.program.instruction.withdraw({
+                    accounts: {
+                        authority: this.driftClient.wallet.publicKey,
+                        ...accounts,
+                    },
+                    remainingAccounts,
+                }),
+            ];
+            if (createAtaIx) {
+                ixs.unshift(createAtaIx);
+            }
+            return await this.createAndSendTxn(ixs, {
+                cuLimit: ((_a = txParams === null || txParams === void 0 ? void 0 : txParams.cuLimit) !== null && _a !== void 0 ? _a : 650000) + (createAtaIx ? 100000 : 0),
                 ...txParams,
             });
         }
@@ -681,7 +692,7 @@ class VaultClient {
      * Used for UI wallet adapters compatibility
      */
     async createAndSendTxn(vaultIxs, txParams) {
-        var _a, _b;
+        var _a, _b, _c;
         const ixs = [
             web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
                 units: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.cuLimit) !== null && _a !== void 0 ? _a : 400000,
@@ -691,15 +702,20 @@ class VaultClient {
             }),
             ...vaultIxs,
         ];
-        const tx = await this.driftClient.txSender.getVersionedTransaction(ixs, [], undefined, undefined);
+        const tx = await this.driftClient.txSender.getVersionedTransaction(ixs, [], undefined, this.driftClient.opts);
         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)}`);
+            try {
+                const resp = await this.driftClient.connection.simulateTransaction(tx, {
+                    sigVerify: false,
+                    commitment: this.driftClient.connection.commitment,
+                });
+                console.log(`Simulated transaction:\n${JSON.stringify(resp, null, 2)}`);
+            }
+            catch (e) {
+                const err = e;
+                console.error(`Error simulating transaction: ${err.message}\n:${(_c = err.stack) !== null && _c !== void 0 ? _c : ''}`);
+            }
         }
         else {
             const resp = await this.driftClient.sendTransaction(tx, [], this.driftClient.opts);

package/package.json

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

package/src/vaultClient.ts

@@ -29,6 +29,7 @@ import {
 	TransactionSignature,
 } from '@solana/web3.js';
 import {
+	createAssociatedTokenAccountInstruction,
 	getAssociatedTokenAddressSync,
 	TOKEN_PROGRAM_ID,
 } from '@solana/spl-token';
@@ -825,6 +826,25 @@ export class VaultClient {
 			);
 		}
 
+		const userAta = getAssociatedTokenAddressSync(
+			spotMarket.mint,
+			this.driftClient.wallet.publicKey,
+			true
+		);
+
+		let createAtaIx: TransactionInstruction | undefined = undefined;
+		const userAtaExists = await this.driftClient.connection.getAccountInfo(
+			userAta
+		);
+		if (userAtaExists === null) {
+			createAtaIx = createAssociatedTokenAccountInstruction(
+				this.driftClient.wallet.publicKey,
+				userAta,
+				this.driftClient.wallet.publicKey,
+				spotMarket.mint
+			);
+		}
+
 		const accounts = {
 			vault: vaultDepositorAccount.vault,
 			vaultDepositor,
@@ -834,11 +854,7 @@ export class VaultClient {
 			driftState: driftStateKey,
 			driftSpotMarketVault: spotMarket.vault,
 			driftSigner: this.driftClient.getStateAccount().signer,
-			userTokenAccount: getAssociatedTokenAddressSync(
-				spotMarket.mint,
-				this.driftClient.wallet.publicKey,
-				true
-			),
+			userTokenAccount: userAta,
 			driftProgram: this.driftClient.program.programId,
 			tokenProgram: TOKEN_PROGRAM_ID,
 		};
@@ -850,16 +866,21 @@ export class VaultClient {
 				.remainingAccounts(remainingAccounts)
 				.rpc();
 		} else {
-			const withdrawIx = this.program.instruction.withdraw({
-				accounts: {
-					authority: this.driftClient.wallet.publicKey,
-					...accounts,
-				},
-				remainingAccounts,
-			});
+			const ixs = [
+				this.program.instruction.withdraw({
+					accounts: {
+						authority: this.driftClient.wallet.publicKey,
+						...accounts,
+					},
+					remainingAccounts,
+				}),
+			];
+			if (createAtaIx) {
+				ixs.unshift(createAtaIx);
+			}
 
-			return await this.createAndSendTxn([withdrawIx], {
-				cuLimit: txParams?.cuLimit ?? 650_000,
+			return await this.createAndSendTxn(ixs, {
+				cuLimit: (txParams?.cuLimit ?? 650_000) + (createAtaIx ? 100_000 : 0),
 				...txParams,
 			});
 		}
@@ -1064,17 +1085,23 @@ export class VaultClient {
 			ixs,
 			[],
 			undefined,
-			undefined
+			this.driftClient.opts
 		);
 
 		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)}`);
+			try {
+				const resp = await this.driftClient.connection.simulateTransaction(tx, {
+					sigVerify: false,
+					commitment: this.driftClient.connection.commitment,
+				});
+				console.log(`Simulated transaction:\n${JSON.stringify(resp, null, 2)}`);
+			} catch (e) {
+				const err = e as Error;
+				console.error(
+					`Error simulating transaction: ${err.message}\n:${err.stack ?? ''}`
+				);
+			}
 		} else {
 			const resp = await this.driftClient.sendTransaction(
 				tx,