@drift-labs/sdk 2.41.0-beta.1 → 2.41.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.41.0-beta.1
+2.41.0-beta.2

package/lib/driftClient.js

@@ -925,29 +925,27 @@ class DriftClient {
      * @param reduceOnly
      */
     async deposit(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false) {
-        const tx = new web3_js_1.Transaction();
-        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: 600000,
-        }));
+        const ixs = [];
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const signerAuthority = this.wallet.publicKey;
         const createWSOLTokenAccount = isSolMarket && associatedTokenAccount.equals(signerAuthority);
         if (createWSOLTokenAccount) {
-            const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
+            const { ixs: wrappedSolIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             associatedTokenAccount = pubkey;
-            ixs.forEach((ix) => {
-                tx.add(ix);
+            wrappedSolIxs.forEach((ix) => {
+                ixs.push(ix);
             });
         }
         const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly, true);
-        tx.add(depositCollateralIx);
+        ixs.push(depositCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAccount, signerAuthority, signerAuthority, []));
+            ixs.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAccount, signerAuthority, signerAuthority, []));
         }
-        const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
+        console.log(ixs);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(ixs, { computeUnits: 600000 }, 0), additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.41.0-beta.1",
+	"version": "2.41.0-beta.2",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/driftClient.ts

@@ -1557,12 +1557,7 @@ export class DriftClient {
 		subAccountId?: number,
 		reduceOnly = false
 	): Promise<TransactionSignature> {
-		const tx = new Transaction();
-		tx.add(
-			ComputeBudgetProgram.setComputeUnitLimit({
-				units: 600_000,
-			})
-		);
+		const ixs: Array<TransactionInstruction> = [];
 
 		const additionalSigners: Array<Signer> = [];
 
@@ -1576,15 +1571,13 @@ export class DriftClient {
 			isSolMarket && associatedTokenAccount.equals(signerAuthority);
 
 		if (createWSOLTokenAccount) {
-			const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(
-				amount,
-				true
-			);
+			const { ixs: wrappedSolIxs, pubkey } =
+				await this.getWrappedSolAccountCreationIxs(amount, true);
 
 			associatedTokenAccount = pubkey;
 
-			ixs.forEach((ix) => {
-				tx.add(ix);
+			wrappedSolIxs.forEach((ix) => {
+				ixs.push(ix);
 			});
 		}
 
@@ -1597,11 +1590,11 @@ export class DriftClient {
 			true
 		);
 
-		tx.add(depositCollateralIx);
+		ixs.push(depositCollateralIx);
 
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
-			tx.add(
+			ixs.push(
 				createCloseAccountInstruction(
 					associatedTokenAccount,
 					signerAuthority,
@@ -1611,8 +1604,9 @@ export class DriftClient {
 			);
 		}
 
+		console.log(ixs);
 		const { txSig, slot } = await this.sendTransaction(
-			tx,
+			await this.buildTransaction(ixs, { computeUnits: 600_000 }, 0),
 			additionalSigners,
 			this.opts
 		);