@drift-labs/sdk 2.42.0-beta.4 → 2.42.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.42.0-beta.4
+2.42.0-beta.6

package/lib/driftClient.d.ts

@@ -269,7 +269,7 @@ export declare class DriftClient {
      * @param bracketOrdersParams
      * @returns
      */
-    sendMarketOrderAndGetSignedFillTx(orderParams: OptionalOrderParams, userAccountPublicKey: PublicKey, userAccount: UserAccount, makerInfo?: MakerInfo | MakerInfo[], txParams?: TxParams, bracketOrdersParams?: OptionalOrderParams[], referrerInfo?: ReferrerInfo, useVersionedTx?: boolean): Promise<{
+    sendMarketOrderAndGetSignedFillTx(orderParams: OptionalOrderParams, userAccountPublicKey: PublicKey, userAccount: UserAccount, makerInfo?: MakerInfo | MakerInfo[], txParams?: TxParams, bracketOrdersParams?: OptionalOrderParams[], referrerInfo?: ReferrerInfo): Promise<{
         txSig: TransactionSignature;
         signedFillTx: Transaction;
     }>;

package/lib/driftClient.js

@@ -294,6 +294,7 @@ class DriftClient {
      * @param includeDelegates
      */
     async updateWallet(newWallet, subAccountIds, activeSubAccountId, includeDelegates, authoritySubaccountMap) {
+        var _a, _b;
         const newProvider = new anchor_1.AnchorProvider(this.connection, 
         // @ts-ignore
         newWallet, this.opts);
@@ -308,6 +309,10 @@ class DriftClient {
         this.activeSubAccountId = activeSubAccountId;
         this.userStatsAccountPublicKey = undefined;
         this.includeDelegates = includeDelegates !== null && includeDelegates !== void 0 ? includeDelegates : false;
+        const walletSupportsVersionedTxns = 
+        //@ts-ignore
+        (_b = (_a = this.wallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0 > 1;
+        this.txVersion = walletSupportsVersionedTxns ? 0 : 'legacy';
         if (includeDelegates && subAccountIds) {
             throw new Error('Can only pass one of includeDelegates or subAccountIds. If you want to specify subaccount ids for multiple authorities, pass authoritySubaccountMap instead');
         }
@@ -341,7 +346,7 @@ class DriftClient {
     }
     async switchActiveUser(subAccountId, authority) {
         var _a;
-        const authorityChanged = !((_a = this.authority) === null || _a === void 0 ? void 0 : _a.equals(authority));
+        const authorityChanged = authority && !((_a = this.authority) === null || _a === void 0 ? void 0 : _a.equals(authority));
         this.activeSubAccountId = subAccountId;
         this.authority = authority !== null && authority !== void 0 ? authority : this.authority;
         this.userStatsAccountPublicKey = (0, pda_1.getUserStatsAccountPublicKey)(this.program.programId, this.authority);
@@ -939,28 +944,25 @@ 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 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);
+        const instructions = [];
         if (createWSOLTokenAccount) {
             const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             associatedTokenAccount = pubkey;
-            ixs.forEach((ix) => {
-                tx.add(ix);
-            });
+            instructions.push(...ixs);
         }
         const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly, true);
-        tx.add(depositCollateralIx);
+        instructions.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, []));
+            instructions.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAccount, signerAuthority, signerAuthority, []));
         }
+        const txParams = { ...this.txParams, computeUnits: 600000 };
+        const tx = await this.buildTransaction(instructions, txParams);
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
@@ -1363,8 +1365,7 @@ class DriftClient {
      * @param bracketOrdersParams
      * @returns
      */
-    async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo, useVersionedTx = true) {
-        var _a, _b;
+    async sendMarketOrderAndGetSignedFillTx(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo) {
         const marketIndex = orderParams.marketIndex;
         const orderId = userAccount.nextOrderId;
         const bracketOrderIxs = [];
@@ -1377,11 +1378,8 @@ class DriftClient {
             orderId,
             marketIndex,
         }, makerInfo, referrerInfo);
-        const walletSupportsVersionedTxns = 
-        //@ts-ignore
-        (_b = (_a = this.wallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.size) !== null && _b !== void 0 ? _b : 0 > 1;
         // use versioned transactions if there is a lookup table account and wallet is compatible
-        if (walletSupportsVersionedTxns && useVersionedTx) {
+        if (this.txVersion === 0) {
             const versionedMarketOrderTx = await this.buildTransaction([placePerpOrderIx].concat(bracketOrderIxs), txParams, 0);
             const versionedFillTx = await this.buildTransaction([fillPerpOrderIx], txParams, 0);
             const [signedVersionedMarketOrderTx, signedVersionedFillTx] = await this.provider.wallet.signAllTransactions([
@@ -3252,12 +3250,11 @@ class DriftClient {
         return undefined;
     }
     sendTransaction(tx, additionalSigners, opts, preSigned) {
-        // @ts-ignore
-        if (!tx.message) {
-            return this.txSender.send(tx, additionalSigners, opts, preSigned);
+        if (tx instanceof web3_js_1.VersionedTransaction) {
+            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned);
         }
         else {
-            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned);
+            return this.txSender.send(tx, additionalSigners, opts, preSigned);
         }
     }
     async buildTransaction(instructions, txParams, txVersion, lookupTables) {

package/lib/types.d.ts

@@ -317,10 +317,10 @@ export declare class StakeAction {
         unstake: {};
     };
     static readonly UNSTAKE_TRANSFER: {
-        UnstakeTransfer: {};
+        unstakeTransfer: {};
     };
     static readonly STAKE_TRANSFER: {
-        StakeTransfer: {};
+        stakeTransfer: {};
     };
 }
 export declare function isVariant(object: unknown, type: string): boolean;

package/lib/types.js

@@ -201,8 +201,8 @@ StakeAction.STAKE = { stake: {} };
 StakeAction.UNSTAKE_REQUEST = { unstakeRequest: {} };
 StakeAction.UNSTAKE_CANCEL_REQUEST = { unstakeCancelRequest: {} };
 StakeAction.UNSTAKE = { unstake: {} };
-StakeAction.UNSTAKE_TRANSFER = { UnstakeTransfer: {} };
-StakeAction.STAKE_TRANSFER = { StakeTransfer: {} };
+StakeAction.UNSTAKE_TRANSFER = { unstakeTransfer: {} };
+StakeAction.STAKE_TRANSFER = { stakeTransfer: {} };
 function isVariant(object, type) {
     return object.hasOwnProperty(type);
 }

package/package.json

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

package/src/driftClient.ts

@@ -539,6 +539,10 @@ export class DriftClient {
 		this.activeSubAccountId = activeSubAccountId;
 		this.userStatsAccountPublicKey = undefined;
 		this.includeDelegates = includeDelegates ?? false;
+		const walletSupportsVersionedTxns =
+			//@ts-ignore
+			this.wallet.supportedTransactionVersions?.size ?? 0 > 1;
+		this.txVersion = walletSupportsVersionedTxns ? 0 : 'legacy';
 
 		if (includeDelegates && subAccountIds) {
 			throw new Error(
@@ -589,7 +593,7 @@ export class DriftClient {
 	}
 
 	public async switchActiveUser(subAccountId: number, authority?: PublicKey) {
-		const authorityChanged = !this.authority?.equals(authority);
+		const authorityChanged = authority && !this.authority?.equals(authority);
 
 		this.activeSubAccountId = subAccountId;
 		this.authority = authority ?? this.authority;
@@ -1574,13 +1578,6 @@ export class DriftClient {
 		subAccountId?: number,
 		reduceOnly = false
 	): Promise<TransactionSignature> {
-		const tx = new Transaction();
-		tx.add(
-			ComputeBudgetProgram.setComputeUnitLimit({
-				units: 600_000,
-			})
-		);
-
 		const additionalSigners: Array<Signer> = [];
 
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -1592,6 +1589,8 @@ export class DriftClient {
 		const createWSOLTokenAccount =
 			isSolMarket && associatedTokenAccount.equals(signerAuthority);
 
+		const instructions = [];
+
 		if (createWSOLTokenAccount) {
 			const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(
 				amount,
@@ -1600,9 +1599,7 @@ export class DriftClient {
 
 			associatedTokenAccount = pubkey;
 
-			ixs.forEach((ix) => {
-				tx.add(ix);
-			});
+			instructions.push(...ixs);
 		}
 
 		const depositCollateralIx = await this.getDepositInstruction(
@@ -1614,11 +1611,11 @@ export class DriftClient {
 			true
 		);
 
-		tx.add(depositCollateralIx);
+		instructions.push(depositCollateralIx);
 
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
-			tx.add(
+			instructions.push(
 				createCloseAccountInstruction(
 					associatedTokenAccount,
 					signerAuthority,
@@ -1628,6 +1625,10 @@ export class DriftClient {
 			);
 		}
 
+		const txParams = { ...this.txParams, computeUnits: 600_000 };
+
+		const tx = await this.buildTransaction(instructions, txParams);
+
 		const { txSig, slot } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -2442,8 +2443,7 @@ export class DriftClient {
 		makerInfo?: MakerInfo | MakerInfo[],
 		txParams?: TxParams,
 		bracketOrdersParams = new Array<OptionalOrderParams>(),
-		referrerInfo?: ReferrerInfo,
-		useVersionedTx = true
+		referrerInfo?: ReferrerInfo
 	): Promise<{ txSig: TransactionSignature; signedFillTx: Transaction }> {
 		const marketIndex = orderParams.marketIndex;
 		const orderId = userAccount.nextOrderId;
@@ -2469,12 +2469,8 @@ export class DriftClient {
 			referrerInfo
 		);
 
-		const walletSupportsVersionedTxns =
-			//@ts-ignore
-			this.wallet.supportedTransactionVersions?.size ?? 0 > 1;
-
 		// use versioned transactions if there is a lookup table account and wallet is compatible
-		if (walletSupportsVersionedTxns && useVersionedTx) {
+		if (this.txVersion === 0) {
 			const versionedMarketOrderTx = await this.buildTransaction(
 				[placePerpOrderIx].concat(bracketOrderIxs),
 				txParams,
@@ -5852,17 +5848,16 @@ export class DriftClient {
 		opts?: ConfirmOptions,
 		preSigned?: boolean
 	): Promise<TxSigAndSlot> {
-		// @ts-ignore
-		if (!tx.message) {
-			return this.txSender.send(
-				tx as Transaction,
+		if (tx instanceof VersionedTransaction) {
+			return this.txSender.sendVersionedTransaction(
+				tx as VersionedTransaction,
 				additionalSigners,
 				opts,
 				preSigned
 			);
 		} else {
-			return this.txSender.sendVersionedTransaction(
-				tx as VersionedTransaction,
+			return this.txSender.send(
+				tx as Transaction,
 				additionalSigners,
 				opts,
 				preSigned

package/src/types.ts

@@ -200,8 +200,8 @@ export class StakeAction {
 	static readonly UNSTAKE_REQUEST = { unstakeRequest: {} };
 	static readonly UNSTAKE_CANCEL_REQUEST = { unstakeCancelRequest: {} };
 	static readonly UNSTAKE = { unstake: {} };
-	static readonly UNSTAKE_TRANSFER = { UnstakeTransfer: {} };
-	static readonly STAKE_TRANSFER = { StakeTransfer: {} };
+	static readonly UNSTAKE_TRANSFER = { unstakeTransfer: {} };
+	static readonly STAKE_TRANSFER = { stakeTransfer: {} };
 }
 
 export function isVariant(object: unknown, type: string) {