@drift-labs/sdk 2.25.4 → 2.26.0-beta.1

package/src/userMap/userMap.ts

@@ -2,7 +2,6 @@ import {
 	User,
 	DriftClient,
 	UserAccount,
-	bulkPollingUserSubscribe,
 	OrderRecord,
 	UserSubscriptionConfig,
 	WrappedEvent,
@@ -13,14 +12,17 @@ import {
 	SettlePnlRecord,
 	NewUserRecord,
 	LPRecord,
+	StateAccount,
+	DLOB,
 } from '..';
 
-import { AccountInfo, PublicKey } from '@solana/web3.js';
+import { PublicKey, RpcResponseAndContext } from '@solana/web3.js';
 import { Buffer } from 'buffer';
 import bs58 from 'bs58';
 
 export interface UserMapInterface {
-	fetchAllUsers(): Promise<void>;
+	subscribe(): Promise<void>;
+	unsubscribe(): Promise<void>;
 	addPubkey(userAccountPublicKey: PublicKey): Promise<void>;
 	has(key: string): boolean;
 	get(key: string): User | undefined;
@@ -34,59 +36,48 @@ export class UserMap implements UserMapInterface {
 	private userMap = new Map<string, User>();
 	private driftClient: DriftClient;
 	private accountSubscription: UserSubscriptionConfig;
+	private includeIdle: boolean;
+	private lastNumberOfSubAccounts;
+	private syncCallback = async (state: StateAccount) => {
+		if (state.numberOfSubAccounts !== this.lastNumberOfSubAccounts) {
+			await this.sync();
+			this.lastNumberOfSubAccounts = state.numberOfSubAccounts;
+		}
+	};
 
 	constructor(
 		driftClient: DriftClient,
-		accountSubscription: UserSubscriptionConfig
+		accountSubscription: UserSubscriptionConfig,
+		includeIdle = true
 	) {
 		this.driftClient = driftClient;
 		this.accountSubscription = accountSubscription;
+		this.includeIdle = includeIdle;
 	}
 
-	public async fetchAllUsers(includeIdle = true) {
-		const userArray: User[] = [];
-		const userAccountArray: UserAccount[] = [];
-
-		const programUserAccounts = await this.driftClient.fetchAllUserAccounts(
-			includeIdle
-		);
-		for (const programUserAccount of programUserAccounts) {
-			if (this.userMap.has(programUserAccount.publicKey.toString())) {
-				continue;
-			}
-
-			const user = new User({
-				driftClient: this.driftClient,
-				userAccountPublicKey: programUserAccount.publicKey,
-				accountSubscription: this.accountSubscription,
-			});
-			userArray.push(user);
-			userAccountArray.push(programUserAccount.account);
+	public async subscribe() {
+		if (this.size() > 0) {
+			return;
 		}
 
-		if (this.accountSubscription.type === 'polling') {
-			await bulkPollingUserSubscribe(
-				userArray,
-				this.accountSubscription.accountLoader
-			);
-		} else {
-			await Promise.all(
-				userArray.map((user, i) => user.subscribe(userAccountArray[i]))
-			);
-		}
+		await this.driftClient.subscribe();
+		this.lastNumberOfSubAccounts =
+			this.driftClient.getStateAccount().numberOfSubAccounts;
+		this.driftClient.eventEmitter.on('stateAccountUpdate', this.syncCallback);
 
-		for (const user of userArray) {
-			this.userMap.set(user.getUserAccountPublicKey().toString(), user);
-		}
+		await this.sync();
 	}
 
-	public async addPubkey(userAccountPublicKey: PublicKey) {
+	public async addPubkey(
+		userAccountPublicKey: PublicKey,
+		userAccount?: UserAccount
+	) {
 		const user = new User({
 			driftClient: this.driftClient,
 			userAccountPublicKey,
 			accountSubscription: this.accountSubscription,
 		});
-		await user.subscribe();
+		await user.subscribe(userAccount);
 		this.userMap.set(userAccountPublicKey.toString(), user);
 	}
 
@@ -129,6 +120,17 @@ export class UserMap implements UserMapInterface {
 		return chUser.getUserAccount().authority;
 	}
 
+	/**
+	 * implements the {@link DLOBSource} interface
+	 * create a DLOB from all the subscribed users
+	 * @param slot
+	 */
+	public async getDLOB(slot: number): Promise<DLOB> {
+		const dlob = new DLOB();
+		await dlob.initFromUserMap(this, slot);
+		return dlob;
+	}
+
 	public async updateWithOrderRecord(record: OrderRecord) {
 		if (!this.has(record.user.toString())) {
 			await this.addPubkey(record.user);
@@ -179,9 +181,9 @@ export class UserMap implements UserMapInterface {
 		return this.userMap.size;
 	}
 
-	public async sync(includeIdle = true) {
+	public async sync() {
 		let filters = undefined;
-		if (!includeIdle) {
+		if (!this.includeIdle) {
 			filters = [
 				{
 					memcmp: {
@@ -192,39 +194,88 @@ export class UserMap implements UserMapInterface {
 			];
 		}
 
-		const programAccounts =
-			await this.driftClient.connection.getProgramAccounts(
-				this.driftClient.program.programId,
-				{
-					commitment: this.driftClient.connection.commitment,
-					filters: [
-						{
-							memcmp: this.driftClient.program.coder.accounts.memcmp('User'),
-						},
-						...(Array.isArray(filters) ? filters : []),
-					],
-				}
-			);
+		const rpcRequestArgs = [
+			this.driftClient.program.programId.toBase58(),
+			{
+				commitment: this.driftClient.connection.commitment,
+				filters: [
+					{
+						memcmp: this.driftClient.program.coder.accounts.memcmp('User'),
+					},
+					...(Array.isArray(filters) ? filters : []),
+				],
+				encoding: 'base64',
+				withContext: true,
+			},
+		];
+
+		// @ts-ignore
+		const rpcJSONResponse: any = await this.driftClient.connection._rpcRequest(
+			'getProgramAccounts',
+			rpcRequestArgs
+		);
+
+		const rpcResponseAndContext: RpcResponseAndContext<
+			Array<{
+				pubkey: PublicKey;
+				account: {
+					data: [string, string];
+				};
+			}>
+		> = rpcJSONResponse.result;
+
+		const slot = rpcResponseAndContext.context.slot;
 
-		const programAccountMap = new Map<string, AccountInfo<Buffer>>();
-		for (const programAccount of programAccounts) {
-			programAccountMap.set(
+		const programAccountBufferMap = new Map<string, Buffer>();
+		for (const programAccount of rpcResponseAndContext.value) {
+			programAccountBufferMap.set(
 				programAccount.pubkey.toString(),
-				programAccount.account
+				// @ts-ignore
+				Buffer.from(
+					programAccount.account.data[0],
+					programAccount.account.data[1]
+				)
 			);
 		}
 
-		for (const key of programAccountMap.keys()) {
+		for (const [key, buffer] of programAccountBufferMap.entries()) {
 			if (!this.has(key)) {
-				await this.addPubkey(new PublicKey(key));
+				const userAccount =
+					this.driftClient.program.account.user.coder.accounts.decode(
+						'User',
+						buffer
+					);
+				await this.addPubkey(new PublicKey(key), userAccount);
 			}
 		}
 
 		for (const [key, user] of this.userMap.entries()) {
-			if (!programAccountMap.has(key)) {
+			if (!programAccountBufferMap.has(key)) {
 				await user.unsubscribe();
 				this.userMap.delete(key);
+			} else {
+				const userAccount =
+					this.driftClient.program.account.user.coder.accounts.decode(
+						'User',
+						programAccountBufferMap.get(key)
+					);
+				user.accountSubscriber.updateData(userAccount, slot);
 			}
 		}
 	}
+
+	public async unsubscribe() {
+		for (const [key, user] of this.userMap.entries()) {
+			await user.unsubscribe();
+			this.userMap.delete(key);
+		}
+
+		if (this.lastNumberOfSubAccounts) {
+			this.driftClient.eventEmitter.removeListener(
+				'stateAccountUpdate',
+				this.syncCallback
+			);
+			this.lastNumberOfSubAccounts = undefined;
+		}
+	}
 }

package/src/userMap/userStatsMap.ts

@@ -5,7 +5,6 @@ import {
 	UserStatsAccount,
 	UserStats,
 	UserStatsSubscriptionConfig,
-	bulkPollingUserStatsSubscribe,
 	WrappedEvent,
 	DepositRecord,
 	FundingPaymentRecord,
@@ -15,8 +14,8 @@ import {
 	NewUserRecord,
 	LPRecord,
 	InsuranceFundStakeRecord,
+	StateAccount,
 } from '..';
-import { ProgramAccount } from '@coral-xyz/anchor';
 import { AccountInfo, PublicKey } from '@solana/web3.js';
 
 import { UserMap } from './userMap';
@@ -29,6 +28,13 @@ export class UserStatsMap {
 	private userStatsMap = new Map<string, UserStats>();
 	private driftClient: DriftClient;
 	private accountSubscription: UserStatsSubscriptionConfig;
+	private lastNumberOfAuthorities;
+	private syncCallback = async (state: StateAccount) => {
+		if (state.numberOfAuthorities !== this.lastNumberOfAuthorities) {
+			await this.sync();
+			this.lastNumberOfAuthorities = state.numberOfAuthorities;
+		}
+	};
 
 	constructor(
 		driftClient: DriftClient,
@@ -38,50 +44,23 @@ export class UserStatsMap {
 		this.accountSubscription = accountSubscription;
 	}
 
-	public async fetchAllUserStats() {
-		const userStatArray: UserStats[] = [];
-		const userStatsAccountArray: UserStatsAccount[] = [];
-
-		const programUserAccounts =
-			(await this.driftClient.program.account.userStats.all()) as ProgramAccount<UserStatsAccount>[];
-
-		for (const programUserAccount of programUserAccounts) {
-			const userStat: UserStatsAccount = programUserAccount.account;
-			if (this.userStatsMap.has(userStat.authority.toString())) {
-				continue;
-			}
-
-			const chUserStat = new UserStats({
-				driftClient: this.driftClient,
-				userStatsAccountPublicKey: programUserAccount.publicKey,
-				accountSubscription: this.accountSubscription,
-			});
-			userStatArray.push(chUserStat);
-			userStatsAccountArray.push(userStat);
+	public async subscribe() {
+		if (this.size() > 0) {
+			return;
 		}
 
-		if (this.accountSubscription.type === 'polling') {
-			await bulkPollingUserStatsSubscribe(
-				userStatArray,
-				this.accountSubscription.accountLoader
-			);
-		} else {
-			await Promise.all(
-				userStatArray.map((userStat, i) =>
-					userStat.subscribe(userStatsAccountArray[i])
-				)
-			);
-		}
+		await this.driftClient.subscribe();
+		this.lastNumberOfAuthorities =
+			this.driftClient.getStateAccount().numberOfAuthorities;
+		this.driftClient.eventEmitter.on('stateAccountUpdate', this.syncCallback);
 
-		for (const userStat of userStatArray) {
-			this.userStatsMap.set(
-				userStat.getAccount().authority.toString(),
-				userStat
-			);
-		}
+		await this.sync();
 	}
 
-	public async addUserStat(authority: PublicKey) {
+	public async addUserStat(
+		authority: PublicKey,
+		userStatsAccount?: UserStatsAccount
+	) {
 		const userStat = new UserStats({
 			driftClient: this.driftClient,
 			userStatsAccountPublicKey: getUserStatsAccountPublicKey(
@@ -90,7 +69,7 @@ export class UserStatsMap {
 			),
 			accountSubscription: this.accountSubscription,
 		});
-		await userStat.subscribe();
+		await userStat.subscribe(userStatsAccount);
 
 		this.userStatsMap.set(authority.toString(), userStat);
 	}
@@ -98,7 +77,7 @@ export class UserStatsMap {
 	public async updateWithOrderRecord(record: OrderRecord, userMap: UserMap) {
 		const user = await userMap.mustGet(record.user.toString());
 		if (!this.has(user.getUserAccount().authority.toString())) {
-			this.addUserStat(user.getUserAccount().authority);
+			await this.addUserStat(user.getUserAccount().authority);
 		}
 	}
 
@@ -217,8 +196,28 @@ export class UserStatsMap {
 
 		for (const key of programAccountMap.keys()) {
 			if (!this.has(key)) {
-				await this.addUserStat(new PublicKey(key));
+				const userStatsAccount =
+					this.driftClient.program.account.userStats.coder.accounts.decode(
+						'UserStats',
+						programAccountMap.get(key).data
+					);
+				await this.addUserStat(new PublicKey(key), userStatsAccount);
 			}
 		}
 	}
+
+	public async unsubscribe() {
+		for (const [key, userStats] of this.userStatsMap.entries()) {
+			await userStats.unsubscribe();
+			this.userStatsMap.delete(key);
+		}
+
+		if (this.lastNumberOfAuthorities) {
+			this.driftClient.eventEmitter.removeListener(
+				'stateAccountUpdate',
+				this.syncCallback
+			);
+			this.lastNumberOfAuthorities = undefined;
+		}
+	}
 }

package/tests/dlob/helpers.ts

@@ -570,7 +570,9 @@ export class MockUserMap implements UserMapInterface {
 		});
 	}
 
-	public async fetchAllUsers(): Promise<void> {}
+	public async subscribe(): Promise<void> {}
+
+	public async unsubscribe(): Promise<void> {}
 
 	public async addPubkey(userAccountPublicKey: PublicKey): Promise<void> {
 		const user = new User({

package/src/assert/assert.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.assert = void 0;
-function assert(condition, error) {
-    if (!condition) {
-        throw new Error(error || 'Unspecified AssertionError');
-    }
-}
-exports.assert = assert;

package/src/token/index.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseTokenAccount = void 0;
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-function parseTokenAccount(data) {
-    const accountInfo = spl_token_1.AccountLayout.decode(data);
-    accountInfo.mint = new web3_js_1.PublicKey(accountInfo.mint);
-    accountInfo.owner = new web3_js_1.PublicKey(accountInfo.owner);
-    accountInfo.amount = spl_token_1.u64.fromBuffer(accountInfo.amount);
-    if (accountInfo.delegateOption === 0) {
-        accountInfo.delegate = null;
-        // eslint-disable-next-line new-cap
-        accountInfo.delegatedAmount = new spl_token_1.u64(0);
-    }
-    else {
-        accountInfo.delegate = new web3_js_1.PublicKey(accountInfo.delegate);
-        accountInfo.delegatedAmount = spl_token_1.u64.fromBuffer(accountInfo.delegatedAmount);
-    }
-    accountInfo.isInitialized = accountInfo.state !== 0;
-    accountInfo.isFrozen = accountInfo.state === 2;
-    if (accountInfo.isNativeOption === 1) {
-        accountInfo.rentExemptReserve = spl_token_1.u64.fromBuffer(accountInfo.isNative);
-        accountInfo.isNative = true;
-    }
-    else {
-        accountInfo.rentExemptReserve = null;
-        accountInfo.isNative = false;
-    }
-    if (accountInfo.closeAuthorityOption === 0) {
-        accountInfo.closeAuthority = null;
-    }
-    else {
-        accountInfo.closeAuthority = new web3_js_1.PublicKey(accountInfo.closeAuthority);
-    }
-    return accountInfo;
-}
-exports.parseTokenAccount = parseTokenAccount;

package/src/util/computeUnits.js

@@ -1,27 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.findComputeUnitConsumption = void 0;
-function findComputeUnitConsumption(programId, connection, txSignature, commitment = 'confirmed') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const tx = yield connection.getTransaction(txSignature, { commitment });
-        const computeUnits = [];
-        const regex = new RegExp(`Program ${programId.toString()} consumed ([0-9]{0,6}) of ([0-9]{0,7}) compute units`);
-        tx.meta.logMessages.forEach((logMessage) => {
-            const match = logMessage.match(regex);
-            if (match && match[1]) {
-                computeUnits.push(match[1]);
-            }
-        });
-        return computeUnits;
-    });
-}
-exports.findComputeUnitConsumption = findComputeUnitConsumption;

package/src/util/getTokenAddress.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTokenAddress = void 0;
-const spl_token_1 = require("@solana/spl-token");
-const web3_js_1 = require("@solana/web3.js");
-const getTokenAddress = (mintAddress, userPubKey) => {
-    return spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, new web3_js_1.PublicKey(mintAddress), new web3_js_1.PublicKey(userPubKey));
-};
-exports.getTokenAddress = getTokenAddress;

package/src/util/promiseTimeout.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.promiseTimeout = void 0;
-function promiseTimeout(promise, timeoutMs) {
-    let timeoutId;
-    const timeoutPromise = new Promise((resolve) => {
-        timeoutId = setTimeout(() => resolve(null), timeoutMs);
-    });
-    return Promise.race([promise, timeoutPromise]).then((result) => {
-        clearTimeout(timeoutId);
-        return result;
-    });
-}
-exports.promiseTimeout = promiseTimeout;

package/src/util/tps.js

@@ -1,27 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.estimateTps = void 0;
-function estimateTps(programId, connection, failed) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let signatures = yield connection.getSignaturesForAddress(programId, undefined, 'finalized');
-        if (failed) {
-            signatures = signatures.filter((signature) => signature.err);
-        }
-        const numberOfSignatures = signatures.length;
-        if (numberOfSignatures === 0) {
-            return 0;
-        }
-        return (numberOfSignatures /
-            (signatures[0].blockTime - signatures[numberOfSignatures - 1].blockTime));
-    });
-}
-exports.estimateTps = estimateTps;