@drift-labs/sdk 0.1.36-master.7 → 0.2.0-master.0

package/src/accounts/bulkUserSubscription.ts

@@ -1,9 +1,6 @@
 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
@@ -18,53 +15,12 @@ export async function bulkPollingUserSubscribe(
 		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(userPublicKeys);
+			).addToAccountLoader();
 		})
 	);
 

package/src/accounts/fetch.ts

@@ -0,0 +1,33 @@
+import { Connection, PublicKey } from '@solana/web3.js';
+import { UserAccount } from '../types';
+import { getUserAccountPublicKey } from '../addresses/pda';
+import { Program } from '@project-serum/anchor';
+
+export async function fetchUserAccounts(
+	connection: Connection,
+	program: Program,
+	authority: PublicKey,
+	limit = 8
+): Promise<(UserAccount | undefined)[]> {
+	const userAccountPublicKeys = new Array<PublicKey>();
+	for (let i = 0; i < limit; i++) {
+		userAccountPublicKeys.push(
+			await getUserAccountPublicKey(program.programId, authority, i)
+		);
+	}
+
+	const accountInfos = await connection.getMultipleAccountsInfo(
+		userAccountPublicKeys,
+		'confirmed'
+	);
+
+	return accountInfos.map((accountInfo) => {
+		if (!accountInfo) {
+			return undefined;
+		}
+		return program.account.user.coder.accounts.decode(
+			'User',
+			accountInfo.data
+		) as UserAccount;
+	});
+}