@drift-labs/sdk 2.63.0-beta.2 → 2.63.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.63.0-beta.2
+2.63.0-beta.4

package/lib/driftClient.js

@@ -304,7 +304,7 @@ class DriftClient {
      * @param includeDelegates
      */
     async updateWallet(newWallet, subAccountIds, activeSubAccountId, includeDelegates, authoritySubaccountMap) {
-        var _a, _b;
+        var _a, _b, _c;
         const newProvider = new anchor_1.AnchorProvider(this.connection, 
         // @ts-ignore
         newWallet, this.opts);
@@ -337,18 +337,20 @@ class DriftClient {
             : subAccountIds
                 ? new Map([[this.authority.toString(), subAccountIds]])
                 : new Map();
+        /* Reset user stats account */
+        if ((_c = this.userStats) === null || _c === void 0 ? void 0 : _c.isSubscribed) {
+            await this.userStats.unsubscribe();
+        }
+        this.userStats = undefined;
+        this.userStats = new userStats_1.UserStats({
+            driftClient: this,
+            userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
+            accountSubscription: this.userStatsAccountSubscriptionConfig,
+        });
+        await this.userStats.subscribe();
         let success = true;
         if (this.isSubscribed) {
             await Promise.all(this.unsubscribeUsers());
-            if (this.userStats) {
-                await this.userStats.unsubscribe();
-                this.userStats = new userStats_1.UserStats({
-                    driftClient: this,
-                    userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
-                    accountSubscription: this.userStatsAccountSubscriptionConfig,
-                });
-                await this.userStats.subscribe();
-            }
             this.users.clear();
             success = await this.addAndSubscribeToUsers();
         }

package/lib/userMap/userMap.d.ts

@@ -1,4 +1,4 @@
-import { User, DriftClient, UserAccount, OrderRecord, WrappedEvent, DLOB } from '..';
+import { User, DriftClient, UserAccount, OrderRecord, WrappedEvent, DLOB, UserSubscriptionConfig } from '..';
 import { PublicKey } from '@solana/web3.js';
 import { UserAccountFilterCriteria as UserFilterCriteria, UserMapConfig } from './userMapConfig';
 export interface UserMapInterface {
@@ -31,7 +31,7 @@ export declare class UserMap implements UserMapInterface {
      */
     constructor(config: UserMapConfig);
     subscribe(): Promise<void>;
-    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount, slot?: number): Promise<void>;
+    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount, slot?: number, accountSubscription?: UserSubscriptionConfig): Promise<void>;
     has(key: string): boolean;
     /**
      * gets the User for a particular userAccountPublicKey, if no User exists, undefined is returned
@@ -44,7 +44,7 @@ export declare class UserMap implements UserMapInterface {
      * @param key userAccountPublicKey to get User for
      * @returns  User
      */
-    mustGet(key: string): Promise<User>;
+    mustGet(key: string, accountSubscription?: UserSubscriptionConfig): Promise<User>;
     /**
      * gets the Authority for a particular userAccountPublicKey, if no User exists, undefined is returned
      * @param key userAccountPublicKey to get User for

package/lib/userMap/userMap.js

@@ -72,11 +72,11 @@ class UserMap {
         }
         await this.subscription.subscribe();
     }
-    async addPubkey(userAccountPublicKey, userAccount, slot) {
+    async addPubkey(userAccountPublicKey, userAccount, slot, accountSubscription) {
         const user = new __1.User({
             driftClient: this.driftClient,
             userAccountPublicKey,
-            accountSubscription: {
+            accountSubscription: accountSubscription !== null && accountSubscription !== void 0 ? accountSubscription : {
                 type: 'custom',
                 userAccountSubscriber: new __1.OneShotUserAccountSubscriber(this.driftClient.program, userAccountPublicKey, userAccount, slot, this.commitment),
             },
@@ -100,9 +100,9 @@ class UserMap {
      * @param key userAccountPublicKey to get User for
      * @returns  User
      */
-    async mustGet(key) {
+    async mustGet(key, accountSubscription) {
         if (!this.has(key)) {
-            await this.addPubkey(new web3_js_1.PublicKey(key));
+            await this.addPubkey(new web3_js_1.PublicKey(key), undefined, undefined, accountSubscription);
         }
         const user = this.userMap.get(key);
         return user;

package/package.json

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

package/src/driftClient.ts

@@ -586,23 +586,25 @@ export class DriftClient {
 			? new Map([[this.authority.toString(), subAccountIds]])
 			: new Map<string, number[]>();
 
-		let success = true;
+		/* Reset user stats account */
+		if (this.userStats?.isSubscribed) {
+			await this.userStats.unsubscribe();
+		}
 
-		if (this.isSubscribed) {
-			await Promise.all(this.unsubscribeUsers());
+		this.userStats = undefined;
 
-			if (this.userStats) {
-				await this.userStats.unsubscribe();
+		this.userStats = new UserStats({
+			driftClient: this,
+			userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
+			accountSubscription: this.userStatsAccountSubscriptionConfig,
+		});
 
-				this.userStats = new UserStats({
-					driftClient: this,
-					userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
-					accountSubscription: this.userStatsAccountSubscriptionConfig,
-				});
+		await this.userStats.subscribe();
 
-				await this.userStats.subscribe();
-			}
+		let success = true;
 
+		if (this.isSubscribed) {
+			await Promise.all(this.unsubscribeUsers());
 			this.users.clear();
 			success = await this.addAndSubscribeToUsers();
 		}

package/src/userMap/userMap.ts

@@ -15,6 +15,7 @@ import {
 	DLOB,
 	OneShotUserAccountSubscriber,
 	BN,
+	UserSubscriptionConfig,
 } from '..';
 
 import {
@@ -131,12 +132,13 @@ export class UserMap implements UserMapInterface {
 	public async addPubkey(
 		userAccountPublicKey: PublicKey,
 		userAccount?: UserAccount,
-		slot?: number
+		slot?: number,
+		accountSubscription?: UserSubscriptionConfig
 	) {
 		const user = new User({
 			driftClient: this.driftClient,
 			userAccountPublicKey,
-			accountSubscription: {
+			accountSubscription: accountSubscription ?? {
 				type: 'custom',
 				userAccountSubscriber: new OneShotUserAccountSubscriber(
 					this.driftClient.program,
@@ -169,9 +171,17 @@ export class UserMap implements UserMapInterface {
 	 * @param key userAccountPublicKey to get User for
 	 * @returns  User
 	 */
-	public async mustGet(key: string): Promise<User> {
+	public async mustGet(
+		key: string,
+		accountSubscription?: UserSubscriptionConfig
+	): Promise<User> {
 		if (!this.has(key)) {
-			await this.addPubkey(new PublicKey(key));
+			await this.addPubkey(
+				new PublicKey(key),
+				undefined,
+				undefined,
+				accountSubscription
+			);
 		}
 		const user = this.userMap.get(key);
 		return user;