@drift-labs/sdk 2.112.0-beta.6 → 2.112.0-beta.7

package/VERSION

@@ -1 +1 @@
-2.112.0-beta.6
+2.112.0-beta.7

package/lib/browser/driftClient.d.ts

@@ -125,6 +125,7 @@ export declare class DriftClient {
     /** @deprecated use fetchAllLookupTableAccounts() */
     fetchMarketLookupTableAccount(): Promise<AddressLookupTableAccount>;
     fetchAllLookupTableAccounts(): Promise<AddressLookupTableAccount[]>;
+    private getTxVersionForNewWallet;
     /**
      * Update the wallet to use for drift transactions and linked user account
      * @param newWallet

package/lib/browser/driftClient.js

@@ -110,7 +110,8 @@ class DriftClient {
         this.authority = (_e = config.authority) !== null && _e !== void 0 ? _e : this.wallet.publicKey;
         this.activeSubAccountId = (_f = config.activeSubAccountId) !== null && _f !== void 0 ? _f : 0;
         this.skipLoadUsers = (_g = config.skipLoadUsers) !== null && _g !== void 0 ? _g : false;
-        this.txVersion = (_h = config.txVersion) !== null && _h !== void 0 ? _h : 0;
+        this.txVersion =
+            (_h = config.txVersion) !== null && _h !== void 0 ? _h : this.getTxVersionForNewWallet(config.wallet);
         this.txParams = {
             computeUnits: (_k = (_j = config.txParams) === null || _j === void 0 ? void 0 : _j.computeUnits) !== null && _k !== void 0 ? _k : 600000,
             computeUnitsPrice: (_m = (_l = config.txParams) === null || _l === void 0 ? void 0 : _l.computeUnitsPrice) !== null && _m !== void 0 ? _m : 0,
@@ -395,6 +396,14 @@ class DriftClient {
         this.lookupTableAccounts = lookupTableAccounts;
         return lookupTableAccounts;
     }
+    getTxVersionForNewWallet(newWallet) {
+        var _a, _b, _c;
+        if (!(newWallet === null || newWallet === void 0 ? void 0 : newWallet.supportedTransactionVersions))
+            return 0; // Assume versioned txs supported if wallet doesn't have a supportedTransactionVersions property
+        const walletSupportsVersionedTxns = ((_a = newWallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.has(0)) ||
+            ((_c = (_b = newWallet.supportedTransactionVersions) === null || _b === void 0 ? void 0 : _b.size) !== null && _c !== void 0 ? _c : 0) > 1;
+        return walletSupportsVersionedTxns ? 0 : 'legacy';
+    }
     /**
      * Update the wallet to use for drift transactions and linked user account
      * @param newWallet
@@ -403,7 +412,7 @@ class DriftClient {
      * @param includeDelegates
      */
     async updateWallet(newWallet, subAccountIds, activeSubAccountId, includeDelegates, authoritySubaccountMap) {
-        var _a, _b, _c;
+        var _a;
         const newProvider = new anchor_1.AnchorProvider(this.connection, 
         // @ts-ignore
         newWallet, this.opts);
@@ -419,10 +428,7 @@ class DriftClient {
         this.activeSubAccountId = activeSubAccountId;
         this.userStatsAccountPublicKey = undefined;
         this.includeDelegates = includeDelegates !== null && includeDelegates !== void 0 ? includeDelegates : false;
-        const walletSupportsVersionedTxns = 
-        //@ts-expect-error
-        ((_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';
+        this.txVersion = this.getTxVersionForNewWallet(this.wallet);
         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');
         }
@@ -438,7 +444,7 @@ class DriftClient {
                 ? new Map([[this.authority.toString(), subAccountIds]])
                 : new Map();
         /* Reset user stats account */
-        if ((_c = this.userStats) === null || _c === void 0 ? void 0 : _c.isSubscribed) {
+        if ((_a = this.userStats) === null || _a === void 0 ? void 0 : _a.isSubscribed) {
             await this.userStats.unsubscribe();
         }
         this.userStats = undefined;
@@ -467,19 +473,16 @@ class DriftClient {
      * @param emulateAuthority
      */
     async emulateAccount(emulateAuthority) {
-        var _a, _b, _c;
+        var _a;
         this.skipLoadUsers = false;
         // Update provider for txSender with new wallet details
         this.authority = emulateAuthority;
         this.userStatsAccountPublicKey = undefined;
         this.includeDelegates = true;
-        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';
+        this.txVersion = this.getTxVersionForNewWallet(this.wallet);
         this.authoritySubAccountMap = new Map();
         /* Reset user stats account */
-        if ((_c = this.userStats) === null || _c === void 0 ? void 0 : _c.isSubscribed) {
+        if ((_a = this.userStats) === null || _a === void 0 ? void 0 : _a.isSubscribed) {
             await this.userStats.unsubscribe();
         }
         this.userStats = undefined;

package/lib/browser/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { Keypair, PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
+import { Keypair, PublicKey, Transaction, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { BN } from '.';
 export type MappedRecord<A extends Record<string, unknown>, B> = {
     [K in keyof A]: B;
@@ -1262,6 +1262,7 @@ export interface IWallet {
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     publicKey: PublicKey;
     payer?: Keypair;
+    supportedTransactionVersions?: ReadonlySet<TransactionVersion> | null | undefined;
 }
 export interface IVersionedWallet {
     signVersionedTransaction(tx: VersionedTransaction): Promise<VersionedTransaction>;

package/lib/node/driftClient.d.ts

@@ -125,6 +125,7 @@ export declare class DriftClient {
     /** @deprecated use fetchAllLookupTableAccounts() */
     fetchMarketLookupTableAccount(): Promise<AddressLookupTableAccount>;
     fetchAllLookupTableAccounts(): Promise<AddressLookupTableAccount[]>;
+    private getTxVersionForNewWallet;
     /**
      * Update the wallet to use for drift transactions and linked user account
      * @param newWallet

package/lib/node/driftClient.js

@@ -110,7 +110,8 @@ class DriftClient {
         this.authority = (_e = config.authority) !== null && _e !== void 0 ? _e : this.wallet.publicKey;
         this.activeSubAccountId = (_f = config.activeSubAccountId) !== null && _f !== void 0 ? _f : 0;
         this.skipLoadUsers = (_g = config.skipLoadUsers) !== null && _g !== void 0 ? _g : false;
-        this.txVersion = (_h = config.txVersion) !== null && _h !== void 0 ? _h : 0;
+        this.txVersion =
+            (_h = config.txVersion) !== null && _h !== void 0 ? _h : this.getTxVersionForNewWallet(config.wallet);
         this.txParams = {
             computeUnits: (_k = (_j = config.txParams) === null || _j === void 0 ? void 0 : _j.computeUnits) !== null && _k !== void 0 ? _k : 600000,
             computeUnitsPrice: (_m = (_l = config.txParams) === null || _l === void 0 ? void 0 : _l.computeUnitsPrice) !== null && _m !== void 0 ? _m : 0,
@@ -395,6 +396,14 @@ class DriftClient {
         this.lookupTableAccounts = lookupTableAccounts;
         return lookupTableAccounts;
     }
+    getTxVersionForNewWallet(newWallet) {
+        var _a, _b, _c;
+        if (!(newWallet === null || newWallet === void 0 ? void 0 : newWallet.supportedTransactionVersions))
+            return 0; // Assume versioned txs supported if wallet doesn't have a supportedTransactionVersions property
+        const walletSupportsVersionedTxns = ((_a = newWallet.supportedTransactionVersions) === null || _a === void 0 ? void 0 : _a.has(0)) ||
+            ((_c = (_b = newWallet.supportedTransactionVersions) === null || _b === void 0 ? void 0 : _b.size) !== null && _c !== void 0 ? _c : 0) > 1;
+        return walletSupportsVersionedTxns ? 0 : 'legacy';
+    }
     /**
      * Update the wallet to use for drift transactions and linked user account
      * @param newWallet
@@ -403,7 +412,7 @@ class DriftClient {
      * @param includeDelegates
      */
     async updateWallet(newWallet, subAccountIds, activeSubAccountId, includeDelegates, authoritySubaccountMap) {
-        var _a, _b, _c;
+        var _a;
         const newProvider = new anchor_1.AnchorProvider(this.connection, 
         // @ts-ignore
         newWallet, this.opts);
@@ -419,10 +428,7 @@ class DriftClient {
         this.activeSubAccountId = activeSubAccountId;
         this.userStatsAccountPublicKey = undefined;
         this.includeDelegates = includeDelegates !== null && includeDelegates !== void 0 ? includeDelegates : false;
-        const walletSupportsVersionedTxns = 
-        //@ts-expect-error
-        ((_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';
+        this.txVersion = this.getTxVersionForNewWallet(this.wallet);
         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');
         }
@@ -438,7 +444,7 @@ class DriftClient {
                 ? new Map([[this.authority.toString(), subAccountIds]])
                 : new Map();
         /* Reset user stats account */
-        if ((_c = this.userStats) === null || _c === void 0 ? void 0 : _c.isSubscribed) {
+        if ((_a = this.userStats) === null || _a === void 0 ? void 0 : _a.isSubscribed) {
             await this.userStats.unsubscribe();
         }
         this.userStats = undefined;
@@ -467,19 +473,16 @@ class DriftClient {
      * @param emulateAuthority
      */
     async emulateAccount(emulateAuthority) {
-        var _a, _b, _c;
+        var _a;
         this.skipLoadUsers = false;
         // Update provider for txSender with new wallet details
         this.authority = emulateAuthority;
         this.userStatsAccountPublicKey = undefined;
         this.includeDelegates = true;
-        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';
+        this.txVersion = this.getTxVersionForNewWallet(this.wallet);
         this.authoritySubAccountMap = new Map();
         /* Reset user stats account */
-        if ((_c = this.userStats) === null || _c === void 0 ? void 0 : _c.isSubscribed) {
+        if ((_a = this.userStats) === null || _a === void 0 ? void 0 : _a.isSubscribed) {
             await this.userStats.unsubscribe();
         }
         this.userStats = undefined;

package/lib/node/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="bn.js" />
 /// <reference types="node" />
 /// <reference types="node" />
-import { Keypair, PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
+import { Keypair, PublicKey, Transaction, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { BN } from '.';
 export type MappedRecord<A extends Record<string, unknown>, B> = {
     [K in keyof A]: B;
@@ -1262,6 +1262,7 @@ export interface IWallet {
     signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
     publicKey: PublicKey;
     payer?: Keypair;
+    supportedTransactionVersions?: ReadonlySet<TransactionVersion> | null | undefined;
 }
 export interface IVersionedWallet {
     signVersionedTransaction(tx: VersionedTransaction): Promise<VersionedTransaction>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.112.0-beta.6",
+	"version": "2.112.0-beta.7",
 	"main": "lib/node/index.js",
 	"types": "lib/node/index.d.ts",
 	"browser": "./lib/browser/index.js",

package/src/driftClient.ts

@@ -278,7 +278,8 @@ export class DriftClient {
 		this.authority = config.authority ?? this.wallet.publicKey;
 		this.activeSubAccountId = config.activeSubAccountId ?? 0;
 		this.skipLoadUsers = config.skipLoadUsers ?? false;
-		this.txVersion = config.txVersion ?? 0;
+		this.txVersion =
+			config.txVersion ?? this.getTxVersionForNewWallet(config.wallet);
 		this.txParams = {
 			computeUnits: config.txParams?.computeUnits ?? 600_000,
 			computeUnitsPrice: config.txParams?.computeUnitsPrice ?? 0,
@@ -732,6 +733,16 @@ export class DriftClient {
 		return lookupTableAccounts;
 	}
 
+	private getTxVersionForNewWallet(newWallet: IWallet) {
+		if (!newWallet?.supportedTransactionVersions) return 0; // Assume versioned txs supported if wallet doesn't have a supportedTransactionVersions property
+
+		const walletSupportsVersionedTxns =
+			newWallet.supportedTransactionVersions?.has(0) ||
+			(newWallet.supportedTransactionVersions?.size ?? 0) > 1;
+
+		return walletSupportsVersionedTxns ? 0 : 'legacy';
+	}
+
 	/**
 	 * Update the wallet to use for drift transactions and linked user account
 	 * @param newWallet
@@ -769,10 +780,7 @@ export class DriftClient {
 		this.activeSubAccountId = activeSubAccountId;
 		this.userStatsAccountPublicKey = undefined;
 		this.includeDelegates = includeDelegates ?? false;
-		const walletSupportsVersionedTxns =
-			//@ts-expect-error
-			(this.wallet.supportedTransactionVersions?.size ?? 0) > 1;
-		this.txVersion = walletSupportsVersionedTxns ? 0 : 'legacy';
+		this.txVersion = this.getTxVersionForNewWallet(this.wallet);
 
 		if (includeDelegates && subAccountIds) {
 			throw new Error(
@@ -842,10 +850,7 @@ export class DriftClient {
 		this.authority = emulateAuthority;
 		this.userStatsAccountPublicKey = undefined;
 		this.includeDelegates = true;
-		const walletSupportsVersionedTxns =
-			//@ts-ignore
-			this.wallet.supportedTransactionVersions?.size ?? 0 > 1;
-		this.txVersion = walletSupportsVersionedTxns ? 0 : 'legacy';
+		this.txVersion = this.getTxVersionForNewWallet(this.wallet);
 
 		this.authoritySubAccountMap = new Map<string, number[]>();
 

package/src/types.ts

@@ -2,6 +2,7 @@ import {
 	Keypair,
 	PublicKey,
 	Transaction,
+	TransactionVersion,
 	VersionedTransaction,
 } from '@solana/web3.js';
 import { BN, ZERO } from '.';
@@ -1232,6 +1233,10 @@ export interface IWallet {
 	signAllTransactions(txs: Transaction[]): Promise<Transaction[]>;
 	publicKey: PublicKey;
 	payer?: Keypair;
+	supportedTransactionVersions?:
+		| ReadonlySet<TransactionVersion>
+		| null
+		| undefined;
 }
 export interface IVersionedWallet {
 	signVersionedTransaction(