@drift-labs/sdk 2.65.0-beta.5 → 2.65.0-beta.6

package/VERSION

@@ -1 +1 @@
-2.65.0-beta.5
+2.65.0-beta.6

package/lib/userMap/userMap.d.ts

@@ -4,7 +4,7 @@ import { UserAccountFilterCriteria as UserFilterCriteria, UserMapConfig } from '
 export interface UserMapInterface {
     subscribe(): Promise<void>;
     unsubscribe(): Promise<void>;
-    addPubkey(userAccountPublicKey: PublicKey): Promise<void>;
+    addPubkey(userAccountPublicKey: PublicKey, userAccount?: UserAccount, slot?: number, accountSubscription?: UserSubscriptionConfig): Promise<void>;
     has(key: string): boolean;
     get(key: string): User | undefined;
     getWithSlot(key: string): DataAndSlot<User> | undefined;

package/lib/userMap/userMap.js

@@ -73,19 +73,16 @@ class UserMap {
         await this.subscription.subscribe();
     }
     async addPubkey(userAccountPublicKey, userAccount, slot, accountSubscription) {
-        var _a;
+        var _a, _b;
         const user = new __1.User({
             driftClient: this.driftClient,
             userAccountPublicKey,
-            accountSubscription: accountSubscription !== null && accountSubscription !== void 0 ? accountSubscription : {
-                type: 'custom',
-                userAccountSubscriber: new __1.OneShotUserAccountSubscriber(this.driftClient.program, userAccountPublicKey, userAccount, slot, this.commitment),
-            },
+            accountSubscription: accountSubscription !== null && accountSubscription !== void 0 ? accountSubscription : this.driftClient.userAccountSubscriptionConfig,
         });
         await user.subscribe(userAccount);
         this.userMap.set(userAccountPublicKey.toString(), {
             data: user,
-            slot: (_a = user.getUserAccountAndSlot().slot) !== null && _a !== void 0 ? _a : -1,
+            slot: (_b = (_a = user.getUserAccountAndSlot().slot) !== null && _a !== void 0 ? _a : slot) !== null && _b !== void 0 ? _b : -1,
         });
     }
     has(key) {

package/package.json

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

package/src/userMap/userMap.ts

@@ -13,7 +13,6 @@ import {
 	LPRecord,
 	StateAccount,
 	DLOB,
-	OneShotUserAccountSubscriber,
 	BN,
 	UserSubscriptionConfig,
 	DataAndSlot,
@@ -38,7 +37,12 @@ import { decodeUser } from '../decode/user';
 export interface UserMapInterface {
 	subscribe(): Promise<void>;
 	unsubscribe(): Promise<void>;
-	addPubkey(userAccountPublicKey: PublicKey): Promise<void>;
+	addPubkey(
+		userAccountPublicKey: PublicKey,
+		userAccount?: UserAccount,
+		slot?: number,
+		accountSubscription?: UserSubscriptionConfig
+	): Promise<void>;
 	has(key: string): boolean;
 	get(key: string): User | undefined;
 	getWithSlot(key: string): DataAndSlot<User> | undefined;
@@ -150,21 +154,13 @@ export class UserMap implements UserMapInterface {
 		const user = new User({
 			driftClient: this.driftClient,
 			userAccountPublicKey,
-			accountSubscription: accountSubscription ?? {
-				type: 'custom',
-				userAccountSubscriber: new OneShotUserAccountSubscriber(
-					this.driftClient.program,
-					userAccountPublicKey,
-					userAccount,
-					slot,
-					this.commitment
-				),
-			},
+			accountSubscription:
+				accountSubscription ?? this.driftClient.userAccountSubscriptionConfig,
 		});
 		await user.subscribe(userAccount);
 		this.userMap.set(userAccountPublicKey.toString(), {
 			data: user,
-			slot: user.getUserAccountAndSlot().slot ?? -1,
+			slot: user.getUserAccountAndSlot().slot ?? slot ?? -1,
 		});
 	}