@drift-labs/sdk 0.1.22 → 0.1.23-master.0

package/lib/accounts/bulkUserSubscription.js

@@ -16,8 +16,46 @@ exports.bulkPollingUserSubscribe = void 0;
  */
 function bulkPollingUserSubscribe(users, accountLoader) {
     return __awaiter(this, void 0, void 0, function* () {
+        if (users.length === 0) {
+            yield accountLoader.load();
+            return;
+        }
+        // Fetch all the accounts first
+        const program = users[0].clearingHouse.program;
+        let userProgramAccounts;
+        let orderProgramAccounts;
+        yield Promise.all([
+            (() => __awaiter(this, void 0, void 0, function* () {
+                userProgramAccounts = yield program.account.user.all();
+            }))(),
+            (() => __awaiter(this, void 0, void 0, function* () {
+                orderProgramAccounts = yield program.account.userOrders.all();
+            }))(),
+        ]);
+        // Create a map of the authority to keys
+        const authorityToKeys = new Map();
+        const userToAuthority = new Map();
+        for (const userProgramAccount of userProgramAccounts) {
+            const userAccountPublicKey = userProgramAccount.publicKey;
+            const userAccount = userProgramAccount.account;
+            authorityToKeys.set(userAccount.authority.toString(), {
+                user: userAccountPublicKey,
+                userPositions: userAccount.positions,
+                userOrders: undefined,
+            });
+            userToAuthority.set(userAccountPublicKey.toString(), userAccount.authority.toString());
+        }
+        for (const orderProgramAccount of orderProgramAccounts) {
+            const userOrderAccountPublicKey = orderProgramAccount.publicKey;
+            const userOrderAccount = orderProgramAccount.account;
+            const authority = userToAuthority.get(userOrderAccount.user.toString());
+            const userPublicKeys = authorityToKeys.get(authority);
+            userPublicKeys.userOrders = userOrderAccountPublicKey;
+        }
         yield Promise.all(users.map((user) => {
-            return user.accountSubscriber.addToAccountLoader();
+            // Pull the keys from the authority map so we can skip fetching them in addToAccountLoader
+            const userPublicKeys = authorityToKeys.get(user.authority.toString());
+            return user.accountSubscriber.addToAccountLoader(userPublicKeys);
         }));
         yield accountLoader.load();
         yield Promise.all(users.map((user) => __awaiter(this, void 0, void 0, function* () {

package/lib/accounts/pollingUserAccountSubscriber.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { AccountToPoll, UserAccountEvents, UserAccountSubscriber } from './types';
+import { AccountToPoll, UserAccountEvents, UserAccountSubscriber, UserPublicKeys } from './types';
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
@@ -21,7 +21,7 @@ export declare class PollingUserAccountSubscriber implements UserAccountSubscrib
     type: ClearingHouseConfigType;
     constructor(program: Program, authority: PublicKey, accountLoader: BulkAccountLoader);
     subscribe(): Promise<boolean>;
-    addToAccountLoader(): Promise<void>;
+    addToAccountLoader(userPublicKeys?: UserPublicKeys): Promise<void>;
     fetchIfUnloaded(): Promise<void>;
     fetch(): Promise<void>;
     unsubscribe(): Promise<void>;

package/lib/accounts/pollingUserAccountSubscriber.js

@@ -36,34 +36,55 @@ class PollingUserAccountSubscriber {
             return true;
         });
     }
-    addToAccountLoader() {
+    addToAccountLoader(userPublicKeys) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.accountsToPoll.size > 0) {
                 return;
             }
-            const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
-            const userAccount = (yield this.program.account.user.fetch(userPublicKey));
-            this.accountsToPoll.set(userPublicKey.toString(), {
-                key: 'user',
-                publicKey: userPublicKey,
-                eventType: 'userAccountData',
-            });
-            this.accountsToPoll.set(userAccount.positions.toString(), {
-                key: 'userPositions',
-                publicKey: userAccount.positions,
-                eventType: 'userPositionsData',
-            });
-            const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
-            const userOrdersExist = (yield this.program.provider.connection.getParsedAccountInfo(userOrdersPublicKey)).value !== null;
-            if (userOrdersExist) {
+            if (!userPublicKeys) {
+                const userPublicKey = yield addresses_1.getUserAccountPublicKey(this.program.programId, this.authority);
+                const userAccount = (yield this.program.account.user.fetch(userPublicKey));
+                this.accountsToPoll.set(userPublicKey.toString(), {
+                    key: 'user',
+                    publicKey: userPublicKey,
+                    eventType: 'userAccountData',
+                });
+                this.accountsToPoll.set(userAccount.positions.toString(), {
+                    key: 'userPositions',
+                    publicKey: userAccount.positions,
+                    eventType: 'userPositionsData',
+                });
+                const userOrdersPublicKey = yield addresses_1.getUserOrdersAccountPublicKey(this.program.programId, userPublicKey);
                 this.accountsToPoll.set(userOrdersPublicKey.toString(), {
                     key: 'userOrders',
                     publicKey: userOrdersPublicKey,
                     eventType: 'userOrdersData',
                 });
             }
+            else {
+                this.accountsToPoll.set(userPublicKeys.user.toString(), {
+                    key: 'user',
+                    publicKey: userPublicKeys.user,
+                    eventType: 'userAccountData',
+                });
+                this.accountsToPoll.set(userPublicKeys.userPositions.toString(), {
+                    key: 'userPositions',
+                    publicKey: userPublicKeys.userPositions,
+                    eventType: 'userPositionsData',
+                });
+                if (userPublicKeys.userOrders) {
+                    this.accountsToPoll.set(userPublicKeys.userOrders.toString(), {
+                        key: 'userOrders',
+                        publicKey: userPublicKeys.userOrders,
+                        eventType: 'userOrdersData',
+                    });
+                }
+            }
             for (const [_, accountToPoll] of this.accountsToPoll) {
                 accountToPoll.callbackId = this.accountLoader.addAccount(accountToPoll.publicKey, (buffer) => {
+                    if (!buffer) {
+                        return;
+                    }
                     const account = this.program.account[accountToPoll.key].coder.accounts.decode(utils_1.capitalize(accountToPoll.key), buffer);
                     this[accountToPoll.key] = account;
                     // @ts-ignore

package/lib/accounts/types.d.ts

@@ -48,6 +48,11 @@ export interface ClearingHouseAccountSubscriber {
     getOrderHistoryAccount(): OrderHistoryAccount;
     type: ClearingHouseConfigType;
 }
+export declare type UserPublicKeys = {
+    user: PublicKey;
+    userPositions: PublicKey;
+    userOrders: PublicKey | undefined;
+};
 export interface UserAccountEvents {
     userAccountData: (payload: UserAccount) => void;
     userPositionsData: (payload: UserPositionsAccount) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "0.1.22",
+	"version": "0.1.23-master.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/accounts/bulkUserSubscription.ts

@@ -1,6 +1,9 @@
 import { ClearingHouseUser } from '../clearingHouseUser';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { PollingUserAccountSubscriber } from './pollingUserAccountSubscriber';
+import { UserAccount, UserOrdersAccount } from '../types';
+import { UserPublicKeys } from './types';
+import { ProgramAccount } from '@project-serum/anchor';
 
 /**
  * @param users
@@ -10,11 +13,58 @@ export async function bulkPollingUserSubscribe(
 	users: ClearingHouseUser[],
 	accountLoader: BulkAccountLoader
 ): Promise<void> {
+	if (users.length === 0) {
+		await accountLoader.load();
+		return;
+	}
+
+	// Fetch all the accounts first
+	const program = users[0].clearingHouse.program;
+	let userProgramAccounts: ProgramAccount[];
+	let orderProgramAccounts: ProgramAccount[];
+	await Promise.all([
+		(async () => {
+			userProgramAccounts = await program.account.user.all();
+		})(),
+		(async () => {
+			orderProgramAccounts = await program.account.userOrders.all();
+		})(),
+	]);
+
+	// Create a map of the authority to keys
+	const authorityToKeys = new Map<string, UserPublicKeys>();
+	const userToAuthority = new Map<string, string>();
+	for (const userProgramAccount of userProgramAccounts) {
+		const userAccountPublicKey = userProgramAccount.publicKey;
+		const userAccount = userProgramAccount.account as UserAccount;
+
+		authorityToKeys.set(userAccount.authority.toString(), {
+			user: userAccountPublicKey,
+			userPositions: userAccount.positions,
+			userOrders: undefined,
+		});
+
+		userToAuthority.set(
+			userAccountPublicKey.toString(),
+			userAccount.authority.toString()
+		);
+	}
+	for (const orderProgramAccount of orderProgramAccounts) {
+		const userOrderAccountPublicKey = orderProgramAccount.publicKey;
+		const userOrderAccount = orderProgramAccount.account as UserOrdersAccount;
+
+		const authority = userToAuthority.get(userOrderAccount.user.toString());
+		const userPublicKeys = authorityToKeys.get(authority);
+		userPublicKeys.userOrders = userOrderAccountPublicKey;
+	}
+
 	await Promise.all(
 		users.map((user) => {
+			// Pull the keys from the authority map so we can skip fetching them in addToAccountLoader
+			const userPublicKeys = authorityToKeys.get(user.authority.toString());
 			return (
 				user.accountSubscriber as PollingUserAccountSubscriber
-			).addToAccountLoader();
+			).addToAccountLoader(userPublicKeys);
 		})
 	);
 

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -3,6 +3,7 @@ import {
 	NotSubscribedError,
 	UserAccountEvents,
 	UserAccountSubscriber,
+	UserPublicKeys,
 } from './types';
 import { Program } from '@project-serum/anchor';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -58,55 +59,73 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		return true;
 	}
 
-	async addToAccountLoader(): Promise<void> {
+	async addToAccountLoader(userPublicKeys?: UserPublicKeys): Promise<void> {
 		if (this.accountsToPoll.size > 0) {
 			return;
 		}
 
-		const userPublicKey = await getUserAccountPublicKey(
-			this.program.programId,
-			this.authority
-		);
+		if (!userPublicKeys) {
+			const userPublicKey = await getUserAccountPublicKey(
+				this.program.programId,
+				this.authority
+			);
 
-		const userAccount = (await this.program.account.user.fetch(
-			userPublicKey
-		)) as UserAccount;
+			const userAccount = (await this.program.account.user.fetch(
+				userPublicKey
+			)) as UserAccount;
 
-		this.accountsToPoll.set(userPublicKey.toString(), {
-			key: 'user',
-			publicKey: userPublicKey,
-			eventType: 'userAccountData',
-		});
+			this.accountsToPoll.set(userPublicKey.toString(), {
+				key: 'user',
+				publicKey: userPublicKey,
+				eventType: 'userAccountData',
+			});
 
-		this.accountsToPoll.set(userAccount.positions.toString(), {
-			key: 'userPositions',
-			publicKey: userAccount.positions,
-			eventType: 'userPositionsData',
-		});
+			this.accountsToPoll.set(userAccount.positions.toString(), {
+				key: 'userPositions',
+				publicKey: userAccount.positions,
+				eventType: 'userPositionsData',
+			});
+
+			const userOrdersPublicKey = await getUserOrdersAccountPublicKey(
+				this.program.programId,
+				userPublicKey
+			);
 
-		const userOrdersPublicKey = await getUserOrdersAccountPublicKey(
-			this.program.programId,
-			userPublicKey
-		);
-
-		const userOrdersExist =
-			(
-				await this.program.provider.connection.getParsedAccountInfo(
-					userOrdersPublicKey
-				)
-			).value !== null;
-		if (userOrdersExist) {
 			this.accountsToPoll.set(userOrdersPublicKey.toString(), {
 				key: 'userOrders',
 				publicKey: userOrdersPublicKey,
 				eventType: 'userOrdersData',
 			});
+		} else {
+			this.accountsToPoll.set(userPublicKeys.user.toString(), {
+				key: 'user',
+				publicKey: userPublicKeys.user,
+				eventType: 'userAccountData',
+			});
+
+			this.accountsToPoll.set(userPublicKeys.userPositions.toString(), {
+				key: 'userPositions',
+				publicKey: userPublicKeys.userPositions,
+				eventType: 'userPositionsData',
+			});
+
+			if (userPublicKeys.userOrders) {
+				this.accountsToPoll.set(userPublicKeys.userOrders.toString(), {
+					key: 'userOrders',
+					publicKey: userPublicKeys.userOrders,
+					eventType: 'userOrdersData',
+				});
+			}
 		}
 
 		for (const [_, accountToPoll] of this.accountsToPoll) {
 			accountToPoll.callbackId = this.accountLoader.addAccount(
 				accountToPoll.publicKey,
 				(buffer) => {
+					if (!buffer) {
+						return;
+					}
+
 					const account = this.program.account[
 						accountToPoll.key
 					].coder.accounts.decode(capitalize(accountToPoll.key), buffer);

package/src/accounts/types.ts

@@ -82,6 +82,12 @@ export interface ClearingHouseAccountSubscriber {
 	type: ClearingHouseConfigType;
 }
 
+export type UserPublicKeys = {
+	user: PublicKey;
+	userPositions: PublicKey;
+	userOrders: PublicKey | undefined;
+};
+
 export interface UserAccountEvents {
 	userAccountData: (payload: UserAccount) => void;
 	userPositionsData: (payload: UserPositionsAccount) => void;