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

package/lib/accounts/types.d.ts

@@ -10,6 +10,7 @@ export interface AccountSubscriber<T> {
     subscribe(onChange: (data: T) => void): Promise<void>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
+    setData(userAccount: T): void;
 }
 export declare class NotSubscribedError extends Error {
     name: string;
@@ -47,7 +48,7 @@ export interface UserAccountEvents {
 export interface UserAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
     isSubscribed: boolean;
-    subscribe(): Promise<boolean>;
+    subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     getUserAccountAndSlot(): DataAndSlot<UserAccount>;
@@ -106,7 +107,7 @@ export interface UserStatsAccountEvents {
 export interface UserStatsAccountSubscriber {
     eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
     isSubscribed: boolean;
-    subscribe(): Promise<boolean>;
+    subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;

package/lib/accounts/webSocketAccountSubscriber.d.ts

@@ -13,6 +13,7 @@ export declare class WebSocketAccountSubscriber<T> implements AccountSubscriber<
     listenerId?: number;
     constructor(accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => T);
     subscribe(onChange: (data: T) => void): Promise<void>;
+    setData(data: T): void;
     fetch(): Promise<void>;
     handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void;
     decodeBuffer(buffer: Buffer): T;

package/lib/accounts/webSocketAccountSubscriber.js

@@ -14,11 +14,22 @@ class WebSocketAccountSubscriber {
             return;
         }
         this.onChange = onChange;
-        await this.fetch();
+        if (!this.dataAndSlot) {
+            await this.fetch();
+        }
         this.listenerId = this.program.provider.connection.onAccountChange(this.accountPublicKey, (accountInfo, context) => {
             this.handleRpcResponse(context, accountInfo);
         }, this.program.provider.opts.commitment);
     }
+    setData(data) {
+        if (this.dataAndSlot) {
+            return;
+        }
+        this.dataAndSlot = {
+            data,
+            slot: undefined,
+        };
+    }
     async fetch() {
         const rpcResponse = await this.program.provider.connection.getAccountInfoAndContext(this.accountPublicKey, this.program.provider.opts.commitment);
         this.handleRpcResponse(rpcResponse.context, rpcResponse === null || rpcResponse === void 0 ? void 0 : rpcResponse.value);

package/lib/accounts/webSocketUserAccountSubscriber.d.ts

@@ -12,7 +12,7 @@ export declare class WebSocketUserAccountSubscriber implements UserAccountSubscr
     userAccountPublicKey: PublicKey;
     userDataAccountSubscriber: AccountSubscriber<UserAccount>;
     constructor(program: Program, userAccountPublicKey: PublicKey);
-    subscribe(): Promise<boolean>;
+    subscribe(userAccount?: UserAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;

package/lib/accounts/webSocketUserAccountSubscriber.js

@@ -11,11 +11,14 @@ class WebSocketUserAccountSubscriber {
         this.userAccountPublicKey = userAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
     }
-    async subscribe() {
+    async subscribe(userAccount) {
         if (this.isSubscribed) {
             return true;
         }
         this.userDataAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('user', this.program, this.userAccountPublicKey);
+        if (userAccount) {
+            this.userDataAccountSubscriber.setData(userAccount);
+        }
         await this.userDataAccountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('userAccountUpdate', data);
             this.eventEmitter.emit('update');

package/lib/accounts/webSocketUserStatsAccountSubsriber.d.ts

@@ -12,7 +12,7 @@ export declare class WebSocketUserStatsAccountSubscriber implements UserStatsAcc
     userStatsAccountPublicKey: PublicKey;
     userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
     constructor(program: Program, userStatsAccountPublicKey: PublicKey);
-    subscribe(): Promise<boolean>;
+    subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;
     assertIsSubscribed(): void;

package/lib/accounts/webSocketUserStatsAccountSubsriber.js

@@ -11,11 +11,14 @@ class WebSocketUserStatsAccountSubscriber {
         this.userStatsAccountPublicKey = userStatsAccountPublicKey;
         this.eventEmitter = new events_1.EventEmitter();
     }
-    async subscribe() {
+    async subscribe(userStatsAccount) {
         if (this.isSubscribed) {
             return true;
         }
         this.userStatsAccountSubscriber = new webSocketAccountSubscriber_1.WebSocketAccountSubscriber('userStats', this.program, this.userStatsAccountPublicKey);
+        if (userStatsAccount) {
+            this.userStatsAccountSubscriber.setData(userStatsAccount);
+        }
         await this.userStatsAccountSubscriber.subscribe((data) => {
             this.eventEmitter.emit('userStatsAccountUpdate', data);
             this.eventEmitter.emit('update');

package/lib/driftClientConfig.d.ts

@@ -19,7 +19,7 @@ export declare type DriftClientConfig = {
     userStats?: boolean;
     authority?: PublicKey;
 };
-declare type DriftClientSubscriptionConfig = {
+export declare type DriftClientSubscriptionConfig = {
     type: 'websocket';
 } | {
     type: 'polling';

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.10.0-beta.2",
+    "version": "2.10.0-beta.4",
     "name": "drift",
     "instructions": [
         {

package/lib/user.d.ts

@@ -22,7 +22,7 @@ export declare class User {
      * Subscribe to User state accounts
      * @returns SusbcriptionSuccess result
      */
-    subscribe(): Promise<boolean>;
+    subscribe(userAccount?: UserAccount): Promise<boolean>;
     /**
      *	Forces the accountSubscriber to fetch account updates from rpc
      */

package/lib/user.js

@@ -35,8 +35,8 @@ class User {
      * Subscribe to User state accounts
      * @returns SusbcriptionSuccess result
      */
-    async subscribe() {
-        this.isSubscribed = await this.accountSubscriber.subscribe();
+    async subscribe(userAccount) {
+        this.isSubscribed = await this.accountSubscriber.subscribe(userAccount);
         return this.isSubscribed;
     }
     /**

package/lib/userMap/userMap.js

@@ -11,6 +11,7 @@ class UserMap {
     }
     async fetchAllUsers() {
         const userArray = [];
+        const userAccountArray = [];
         const programUserAccounts = (await this.driftClient.program.account.user.all());
         for (const programUserAccount of programUserAccounts) {
             if (this.userMap.has(programUserAccount.publicKey.toString())) {
@@ -22,10 +23,14 @@ class UserMap {
                 accountSubscription: this.accountSubscription,
             });
             userArray.push(user);
+            userAccountArray.push(programUserAccount.account);
         }
         if (this.accountSubscription.type === 'polling') {
             await (0, __1.bulkPollingUserSubscribe)(userArray, this.accountSubscription.accountLoader);
         }
+        else {
+            await Promise.all(userArray.map((user, i) => user.subscribe(userAccountArray[i])));
+        }
         for (const user of userArray) {
             this.userMap.set(user.getUserAccountPublicKey().toString(), user);
         }

package/lib/userMap/userStatsMap.js

@@ -14,6 +14,7 @@ class UserStatsMap {
     }
     async fetchAllUserStats() {
         const userStatArray = [];
+        const userStatsAccountArray = [];
         const programUserAccounts = (await this.driftClient.program.account.userStats.all());
         for (const programUserAccount of programUserAccounts) {
             const userStat = programUserAccount.account;
@@ -26,10 +27,14 @@ class UserStatsMap {
                 accountSubscription: this.accountSubscription,
             });
             userStatArray.push(chUserStat);
+            userStatsAccountArray.push(userStat);
         }
         if (this.accountSubscription.type === 'polling') {
             await (0, __1.bulkPollingUserStatsSubscribe)(userStatArray, this.accountSubscription.accountLoader);
         }
+        else {
+            await Promise.all(userStatArray.map((userStat, i) => userStat.subscribe(userStatsAccountArray[i])));
+        }
         for (const userStat of userStatArray) {
             this.userStatsMap.set(userStat.getAccount().authority.toString(), userStat);
         }

package/lib/userStats.d.ts

@@ -9,7 +9,7 @@ export declare class UserStats {
     accountSubscriber: UserStatsAccountSubscriber;
     isSubscribed: boolean;
     constructor(config: UserStatsConfig);
-    subscribe(): Promise<boolean>;
+    subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
     fetchAccounts(): Promise<void>;
     unsubscribe(): Promise<void>;
     getAccountAndSlot(): DataAndSlot<UserStatsAccount>;

package/lib/userStats.js

@@ -17,8 +17,8 @@ class UserStats {
             this.accountSubscriber = new webSocketUserStatsAccountSubsriber_1.WebSocketUserStatsAccountSubscriber(config.driftClient.program, config.userStatsAccountPublicKey);
         }
     }
-    async subscribe() {
-        this.isSubscribed = await this.accountSubscriber.subscribe();
+    async subscribe(userStatsAccount) {
+        this.isSubscribed = await this.accountSubscriber.subscribe(userStatsAccount);
         return this.isSubscribed;
     }
     async fetchAccounts() {

package/package.json

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

package/src/accounts/types.ts

@@ -17,6 +17,8 @@ export interface AccountSubscriber<T> {
 	subscribe(onChange: (data: T) => void): Promise<void>;
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
+
+	setData(userAccount: T): void;
 }
 
 export class NotSubscribedError extends Error {
@@ -69,7 +71,7 @@ export interface UserAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 	isSubscribed: boolean;
 
-	subscribe(): Promise<boolean>;
+	subscribe(userAccount?: UserAccount): Promise<boolean>;
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
@@ -144,7 +146,7 @@ export interface UserStatsAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
 	isSubscribed: boolean;
 
-	subscribe(): Promise<boolean>;
+	subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean>;
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 

package/src/accounts/webSocketAccountSubscriber.ts

@@ -32,7 +32,9 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		}
 
 		this.onChange = onChange;
-		await this.fetch();
+		if (!this.dataAndSlot) {
+			await this.fetch();
+		}
 
 		this.listenerId = this.program.provider.connection.onAccountChange(
 			this.accountPublicKey,
@@ -43,6 +45,17 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		);
 	}
 
+	setData(data: T): void {
+		if (this.dataAndSlot) {
+			return;
+		}
+
+		this.dataAndSlot = {
+			data,
+			slot: undefined,
+		};
+	}
+
 	async fetch(): Promise<void> {
 		const rpcResponse =
 			await this.program.provider.connection.getAccountInfoAndContext(

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -27,7 +27,7 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 		this.eventEmitter = new EventEmitter();
 	}
 
-	async subscribe(): Promise<boolean> {
+	async subscribe(userAccount?: UserAccount): Promise<boolean> {
 		if (this.isSubscribed) {
 			return true;
 		}
@@ -37,6 +37,11 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 			this.program,
 			this.userAccountPublicKey
 		);
+
+		if (userAccount) {
+			this.userDataAccountSubscriber.setData(userAccount);
+		}
+
 		await this.userDataAccountSubscriber.subscribe((data: UserAccount) => {
 			this.eventEmitter.emit('userAccountUpdate', data);
 			this.eventEmitter.emit('update');

package/src/accounts/webSocketUserStatsAccountSubsriber.ts

@@ -29,7 +29,7 @@ export class WebSocketUserStatsAccountSubscriber
 		this.eventEmitter = new EventEmitter();
 	}
 
-	async subscribe(): Promise<boolean> {
+	async subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean> {
 		if (this.isSubscribed) {
 			return true;
 		}
@@ -39,6 +39,11 @@ export class WebSocketUserStatsAccountSubscriber
 			this.program,
 			this.userStatsAccountPublicKey
 		);
+
+		if (userStatsAccount) {
+			this.userStatsAccountSubscriber.setData(userStatsAccount);
+		}
+
 		await this.userStatsAccountSubscriber.subscribe(
 			(data: UserStatsAccount) => {
 				this.eventEmitter.emit('userStatsAccountUpdate', data);

package/src/driftClientConfig.ts

@@ -21,7 +21,7 @@ export type DriftClientConfig = {
 	authority?: PublicKey; // explicitly pass an authority if signer is delegate
 };
 
-type DriftClientSubscriptionConfig =
+export type DriftClientSubscriptionConfig =
 	| {
 			type: 'websocket';
 	  }

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.10.0-beta.2",
+  "version": "2.10.0-beta.4",
   "name": "drift",
   "instructions": [
     {

package/src/user.ts

@@ -103,8 +103,8 @@ export class User {
 	 * Subscribe to User state accounts
 	 * @returns SusbcriptionSuccess result
 	 */
-	public async subscribe(): Promise<boolean> {
-		this.isSubscribed = await this.accountSubscriber.subscribe();
+	public async subscribe(userAccount?: UserAccount): Promise<boolean> {
+		this.isSubscribed = await this.accountSubscriber.subscribe(userAccount);
 		return this.isSubscribed;
 	}
 

package/src/userMap/userMap.ts

@@ -44,6 +44,7 @@ export class UserMap implements UserMapInterface {
 
 	public async fetchAllUsers() {
 		const userArray: User[] = [];
+		const userAccountArray: UserAccount[] = [];
 
 		const programUserAccounts =
 			(await this.driftClient.program.account.user.all()) as ProgramAccount<UserAccount>[];
@@ -58,6 +59,7 @@ export class UserMap implements UserMapInterface {
 				accountSubscription: this.accountSubscription,
 			});
 			userArray.push(user);
+			userAccountArray.push(programUserAccount.account);
 		}
 
 		if (this.accountSubscription.type === 'polling') {
@@ -65,6 +67,10 @@ export class UserMap implements UserMapInterface {
 				userArray,
 				this.accountSubscription.accountLoader
 			);
+		} else {
+			await Promise.all(
+				userArray.map((user, i) => user.subscribe(userAccountArray[i]))
+			);
 		}
 
 		for (const user of userArray) {

package/src/userMap/userStatsMap.ts

@@ -39,6 +39,7 @@ export class UserStatsMap {
 
 	public async fetchAllUserStats() {
 		const userStatArray: UserStats[] = [];
+		const userStatsAccountArray: UserStatsAccount[] = [];
 
 		const programUserAccounts =
 			(await this.driftClient.program.account.userStats.all()) as ProgramAccount<UserStatsAccount>[];
@@ -58,6 +59,7 @@ export class UserStatsMap {
 				accountSubscription: this.accountSubscription,
 			});
 			userStatArray.push(chUserStat);
+			userStatsAccountArray.push(userStat);
 		}
 
 		if (this.accountSubscription.type === 'polling') {
@@ -65,6 +67,12 @@ export class UserStatsMap {
 				userStatArray,
 				this.accountSubscription.accountLoader
 			);
+		} else {
+			await Promise.all(
+				userStatArray.map((userStat, i) =>
+					userStat.subscribe(userStatsAccountArray[i])
+				)
+			);
 		}
 
 		for (const userStat of userStatArray) {

package/src/userStats.ts

@@ -33,8 +33,12 @@ export class UserStats {
 		}
 	}
 
-	public async subscribe(): Promise<boolean> {
-		this.isSubscribed = await this.accountSubscriber.subscribe();
+	public async subscribe(
+		userStatsAccount?: UserStatsAccount
+	): Promise<boolean> {
+		this.isSubscribed = await this.accountSubscriber.subscribe(
+			userStatsAccount
+		);
 		return this.isSubscribed;
 	}