@velocity-exchange/sdk 0.1.0 → 0.2.1

package/src/accounts/pollingVelocityClientAccountSubscriber.ts

@@ -66,8 +66,10 @@ export class PollingVelocityClientAccountSubscriber
 	delistedMarketSetting: DelistedMarketSetting;
 
 	private isSubscribing = false;
-	private subscriptionPromise: Promise<boolean>;
-	private subscriptionPromiseResolver: (val: boolean) => void;
+	private subscriptionPromiseResolver: (val: boolean) => void = () => {};
+	private subscriptionPromise: Promise<boolean> = new Promise((res) => {
+		this.subscriptionPromiseResolver = res;
+	});
 
 	public constructor(
 		program: VelocityProgram,
@@ -249,6 +251,38 @@ export class PollingVelocityClientAccountSubscriber
 		});
 	}
 
+	/**
+	 * Routes a freshly-decoded account into the correct container based on
+	 * its poll key. Replaces dynamic `this[key]` indexing with explicit,
+	 * type-checked dispatch.
+	 */
+	private storeDecodedAccount(
+		accountToPoll: AccountToPoll,
+		account: any,
+		slot: number
+	): void {
+		const dataAndSlot = { data: account, slot };
+		switch (accountToPoll.key) {
+			case 'perpMarket':
+				if (accountToPoll.mapKey !== undefined) {
+					this.perpMarket.set(accountToPoll.mapKey, dataAndSlot);
+				}
+				break;
+			case 'spotMarket':
+				if (accountToPoll.mapKey !== undefined) {
+					this.spotMarket.set(accountToPoll.mapKey, dataAndSlot);
+				}
+				break;
+			case 'state':
+				this.state = dataAndSlot;
+				break;
+			default: {
+				const _exhaustive: never = accountToPoll.key;
+				throw new Error(`Unhandled account poll key: ${String(_exhaustive)}`);
+			}
+		}
+	}
+
 	async addAccountToAccountLoader(accountToPoll: AccountToPoll): Promise<void> {
 		accountToPoll.callbackId = await this.accountLoader.addAccount(
 			accountToPoll.publicKey,
@@ -259,15 +293,7 @@ export class PollingVelocityClientAccountSubscriber
 					accountToPoll.key,
 					buffer
 				);
-				const dataAndSlot = {
-					data: account,
-					slot,
-				};
-				if (accountToPoll.mapKey != undefined) {
-					this[accountToPoll.key].set(accountToPoll.mapKey, dataAndSlot);
-				} else {
-					this[accountToPoll.key] = dataAndSlot;
-				}
+				this.storeDecodedAccount(accountToPoll, account, slot);
 
 				// @ts-ignore
 				this.eventEmitter.emit(accountToPoll.eventType, account);
@@ -293,6 +319,7 @@ export class PollingVelocityClientAccountSubscriber
 			oracleToPoll.publicKey,
 			(buffer: Buffer, slot: number) => {
 				if (!buffer) return;
+				if (!oracleClient) return;
 
 				const oraclePriceData =
 					oracleClient.getOraclePriceDataFromBuffer(buffer);
@@ -332,17 +359,7 @@ export class PollingVelocityClientAccountSubscriber
 					accountToPoll.key,
 					buffer
 				);
-				if (accountToPoll.mapKey != undefined) {
-					this[accountToPoll.key].set(accountToPoll.mapKey, {
-						data: account,
-						slot,
-					});
-				} else {
-					this[accountToPoll.key] = {
-						data: account,
-						slot,
-					};
-				}
+				this.storeDecodedAccount(accountToPoll, account, slot);
 			}
 		}
 
@@ -363,6 +380,9 @@ export class PollingVelocityClientAccountSubscriber
 					this.program.provider.connection,
 					this.program
 				);
+				if (!oracleClient) {
+					continue;
+				}
 				const oraclePriceData =
 					oracleClient.getOraclePriceDataFromBuffer(buffer);
 				this.oracles.set(
@@ -418,6 +438,9 @@ export class PollingVelocityClientAccountSubscriber
 		await this.addSpotMarketAccountToPoll(marketIndex);
 
 		const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
+		if (!accountToPoll) {
+			return false;
+		}
 
 		await this.addAccountToAccountLoader(accountToPoll);
 		this.setSpotOracleMap();
@@ -436,6 +459,9 @@ export class PollingVelocityClientAccountSubscriber
 
 		await this.addPerpMarketAccountToPoll(marketIndex);
 		const accountToPoll = this.accountsToPoll.get(marketPublicKey.toString());
+		if (!accountToPoll) {
+			return false;
+		}
 		await this.addAccountToAccountLoader(accountToPoll);
 		await this.setPerpOracleMap();
 		return true;
@@ -455,7 +481,9 @@ export class PollingVelocityClientAccountSubscriber
 		if (!this.oraclesToPoll.has(oracleId)) {
 			this.addOracleToPoll(oracleInfo);
 			const oracleToPoll = this.oraclesToPoll.get(oracleId);
-			await this.addOracleToAccountLoader(oracleToPoll);
+			if (oracleToPoll) {
+				await this.addOracleToAccountLoader(oracleToPoll);
+			}
 		}
 
 		await this.pauseForOracleToBeAdded(3, oracleInfo.publicKey.toBase58());
@@ -535,10 +563,22 @@ export class PollingVelocityClientAccountSubscriber
 		);
 
 		for (const perpMarketIndex of perpMarketIndexes) {
-			const perpMarketPubkey = this.perpMarket.get(perpMarketIndex).data.pubkey;
-			const callbackId = this.accountsToPoll.get(
+			const perpMarketData = this.perpMarket.get(perpMarketIndex);
+			if (!perpMarketData) {
+				throw new Error(
+					`PollingVelocityClientAccountSubscriber: delisted perp market ${perpMarketIndex} not found in perpMarket map`
+				);
+			}
+			const perpMarketPubkey = perpMarketData.data.pubkey;
+			const accountToPoll = this.accountsToPoll.get(
 				perpMarketPubkey.toBase58()
-			).callbackId;
+			);
+			if (!accountToPoll) {
+				throw new Error(
+					`PollingVelocityClientAccountSubscriber: delisted perp market ${perpMarketIndex} not found in accountsToPoll map`
+				);
+			}
+			const callbackId = accountToPoll.callbackId;
 			this.accountLoader.removeAccount(perpMarketPubkey, callbackId);
 			if (this.delistedMarketSetting === DelistedMarketSetting.Discard) {
 				this.perpMarket.delete(perpMarketIndex);
@@ -547,7 +587,13 @@ export class PollingVelocityClientAccountSubscriber
 
 		for (const oracle of oracles) {
 			const oracleId = getOracleId(oracle.publicKey, oracle.source);
-			const callbackId = this.oraclesToPoll.get(oracleId).callbackId;
+			const oracleToPoll = this.oraclesToPoll.get(oracleId);
+			if (!oracleToPoll) {
+				throw new Error(
+					`PollingVelocityClientAccountSubscriber: delisted oracle ${oracleId} not found in oraclesToPoll map`
+				);
+			}
+			const callbackId = oracleToPoll.callbackId;
 			this.accountLoader.removeAccount(oracle.publicKey, callbackId);
 			if (this.delistedMarketSetting === DelistedMarketSetting.Discard) {
 				this.oracles.delete(oracleId);
@@ -565,7 +611,7 @@ export class PollingVelocityClientAccountSubscriber
 
 	public getStateAccountAndSlot(): DataAndSlot<StateAccount> {
 		this.assertIsSubscribed();
-		return this.state;
+		return this.state!;
 	}
 
 	public getMarketAccountAndSlot(
@@ -609,7 +655,7 @@ export class PollingVelocityClientAccountSubscriber
 		const oracle = this.perpOracleMap.get(marketIndex);
 		const oracleId = this.perpOracleStringMap.get(marketIndex);
 
-		if (!perpMarketAccount || !oracle) {
+		if (!perpMarketAccount || !oracle || !oracleId) {
 			return undefined;
 		}
 
@@ -627,7 +673,7 @@ export class PollingVelocityClientAccountSubscriber
 		const spotMarketAccount = this.getSpotMarketAccountAndSlot(marketIndex);
 		const oracle = this.spotOracleMap.get(marketIndex);
 		const oracleId = this.spotOracleStringMap.get(marketIndex);
-		if (!spotMarketAccount || !oracle) {
+		if (!spotMarketAccount || !oracle || !oracleId) {
 			return undefined;
 		}
 

package/src/accounts/types.ts

@@ -128,7 +128,7 @@ export interface UserAccountSubscriber {
 	updateData(userAccount: UserAccount, slot: number): void;
 	unsubscribe(): Promise<void>;
 
-	getUserAccountAndSlot(): DataAndSlot<UserAccount>;
+	getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined;
 }
 
 export interface TokenAccountEvents {
@@ -159,7 +159,9 @@ export interface InsuranceFundStakeAccountSubscriber {
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
-	getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake>;
+	getInsuranceFundStakeAccountAndSlot():
+		| DataAndSlot<InsuranceFundStake>
+		| undefined;
 }
 
 export interface InsuranceFundStakeAccountEvents {
@@ -186,7 +188,7 @@ export interface OracleAccountSubscriber {
 }
 
 export type AccountToPoll = {
-	key: string;
+	key: 'state' | 'perpMarket' | 'spotMarket';
 	publicKey: PublicKey;
 	eventType: string;
 	callbackId?: string;
@@ -231,7 +233,7 @@ export interface UserStatsAccountSubscriber {
 	fetch(): Promise<void>;
 	unsubscribe(): Promise<void>;
 
-	getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount>;
+	getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount> | undefined;
 }
 
 type BaseGrpcConfigs = {

package/src/accounts/utils.ts

@@ -7,6 +7,16 @@ export function capitalize(value: string): string {
 	return value[0].toUpperCase() + value.slice(1);
 }
 
+export function assertDataAndSlot<T>(
+	dataAndSlot: DataAndSlot<T> | undefined,
+	message: string
+): DataAndSlot<T> {
+	if (!dataAndSlot) {
+		throw new Error(message);
+	}
+	return dataAndSlot;
+}
+
 export function findDelistedPerpMarketsAndOracles(
 	perpMarkets: DataAndSlot<PerpMarketAccount>[],
 	spotMarkets: DataAndSlot<SpotMarketAccount>[]

package/src/accounts/webSocketAccountSubscriber.ts

@@ -16,8 +16,17 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 	logAccountName: string;
 	program: VelocityProgram;
 	accountPublicKey: PublicKey;
-	decodeBufferFn: (buffer: Buffer) => T;
-	onChange: (data: T) => void;
+	decodeBufferFn?: (buffer: Buffer) => T;
+	private _onChange?: (data: T) => void;
+	get onChange(): (data: T) => void {
+		if (!this._onChange) {
+			throw new Error('onChange callback function must be set');
+		}
+		return this._onChange;
+	}
+	set onChange(onChange: (data: T) => void) {
+		this._onChange = onChange;
+	}
 	listenerId?: number;
 
 	resubOpts?: ResubOpts;
@@ -43,7 +52,10 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		this.accountPublicKey = accountPublicKey;
 		this.decodeBufferFn = decodeBuffer;
 		this.resubOpts = resubOpts;
-		if (this.resubOpts?.resubTimeoutMs < 1000) {
+		if (
+			this.resubOpts?.resubTimeoutMs != null &&
+			this.resubOpts.resubTimeoutMs < 1000
+		) {
 			console.log(
 				`resubTimeoutMs should be at least 1000ms to avoid spamming resub ${this.logAccountName}`
 			);
@@ -97,12 +109,12 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 
 		this.dataAndSlot = {
 			data,
-			slot,
+			slot: newSlot,
 		};
 	}
 
 	protected setTimeout(): void {
-		if (!this.onChange) {
+		if (!this._onChange) {
 			throw new Error('onChange callback function must be set');
 		}
 		this.timeoutId = setTimeout(
@@ -149,7 +161,10 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 				this.accountPublicKey,
 				(this.program.provider as AnchorProvider).opts.commitment
 			);
-		this.handleRpcResponse(rpcResponse.context, rpcResponse?.value);
+		this.handleRpcResponse(
+			rpcResponse.context,
+			rpcResponse?.value ?? undefined
+		);
 	}
 
 	handleRpcResponse(context: Context, accountInfo?: AccountInfo<Buffer>): void {
@@ -198,10 +213,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		if (this.decodeBufferFn) {
 			return this.decodeBufferFn(buffer);
 		} else {
-			return this.program.account[this.accountName].coder.accounts.decode(
-				this.accountName,
-				buffer
-			);
+			return this.program.coder.accounts.decode(this.accountName, buffer);
 		}
 	}
 
@@ -245,6 +257,7 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 			return promise;
 		} else {
 			this.isUnsubscribing = false;
+			return Promise.resolve();
 		}
 	}
 }

package/src/accounts/webSocketAccountSubscriberV2.ts

@@ -77,8 +77,17 @@ export class WebSocketAccountSubscriberV2<T> implements AccountSubscriber<T> {
 	logAccountName: string;
 	program: VelocityProgram;
 	accountPublicKey: PublicKey;
-	decodeBufferFn: (buffer: Buffer) => T;
-	onChange: (data: T) => void;
+	decodeBufferFn?: (buffer: Buffer) => T;
+	private _onChange?: (data: T) => void;
+	get onChange(): (data: T) => void {
+		if (!this._onChange) {
+			throw new Error('onChange callback function must be set');
+		}
+		return this._onChange;
+	}
+	set onChange(onChange: (data: T) => void) {
+		this._onChange = onChange;
+	}
 	listenerId?: number;
 
 	resubOpts: ResubOpts;
@@ -131,7 +140,10 @@ export class WebSocketAccountSubscriberV2<T> implements AccountSubscriber<T> {
 			usePollingInsteadOfResub: true,
 			logResubMessages: false,
 		};
-		if (this.resubOpts.resubTimeoutMs < 1000) {
+		if (
+			this.resubOpts.resubTimeoutMs != null &&
+			this.resubOpts.resubTimeoutMs < 1000
+		) {
 			console.log(
 				`resubTimeoutMs should be at least 1000ms to avoid spamming resub ${this.logAccountName}`
 			);
@@ -139,7 +151,7 @@ export class WebSocketAccountSubscriberV2<T> implements AccountSubscriber<T> {
 		this.receivingData = false;
 		if (
 			['recent', 'single', 'singleGossip', 'root', 'max'].includes(
-				(this.program.provider as AnchorProvider).opts.commitment
+				(this.program.provider as AnchorProvider).opts.commitment ?? ''
 			)
 		) {
 			console.warn(
@@ -264,7 +276,7 @@ export class WebSocketAccountSubscriberV2<T> implements AccountSubscriber<T> {
 
 		this.dataAndSlot = {
 			data,
-			slot,
+			slot: newSlot,
 		};
 	}
 
@@ -274,7 +286,7 @@ export class WebSocketAccountSubscriberV2<T> implements AccountSubscriber<T> {
 		 * `resubOpts.resubTimeoutMs` and `receivingData` is true, trigger either
 		 * a polling loop or a resubscribe depending on options.
 		 */
-		if (!this.onChange) {
+		if (!this._onChange) {
 			throw new Error('onChange callback function must be set');
 		}
 		this.timeoutId = setTimeout(async () => {
@@ -411,7 +423,10 @@ export class WebSocketAccountSubscriberV2<T> implements AccountSubscriber<T> {
 
 		const accountInfo = rpcResponse.value;
 
-		this.handleRpcResponse({ slot: BigInt(context.slot) }, accountInfo);
+		this.handleRpcResponse(
+			{ slot: BigInt(context.slot) },
+			accountInfo ?? undefined
+		);
 	}
 
 	handleRpcResponse(
@@ -480,7 +495,7 @@ export class WebSocketAccountSubscriberV2<T> implements AccountSubscriber<T> {
 		if (this.decodeBufferFn) {
 			return this.decodeBufferFn(buffer);
 		} else {
-			return this.program.account[this.accountName].coder.accounts.decode(
+			return this.program.coder.accounts.decode(
 				capitalize(this.accountName),
 				buffer
 			);

package/src/accounts/webSocketInsuranceFundStakeAccountSubscriber.ts

@@ -25,7 +25,20 @@ export class WebSocketInsuranceFundStakeAccountSubscriber
 	>;
 	insuranceFundStakeAccountPublicKey: PublicKey;
 
-	insuranceFundStakeDataAccountSubscriber: AccountSubscriber<InsuranceFundStake>;
+	private _insuranceFundStakeDataAccountSubscriber?: AccountSubscriber<InsuranceFundStake>;
+	get insuranceFundStakeDataAccountSubscriber(): AccountSubscriber<InsuranceFundStake> {
+		if (!this._insuranceFundStakeDataAccountSubscriber) {
+			throw new Error(
+				'insuranceFundStakeDataAccountSubscriber accessed before subscribe()'
+			);
+		}
+		return this._insuranceFundStakeDataAccountSubscriber;
+	}
+	set insuranceFundStakeDataAccountSubscriber(
+		subscriber: AccountSubscriber<InsuranceFundStake>
+	) {
+		this._insuranceFundStakeDataAccountSubscriber = subscriber;
+	}
 
 	public constructor(
 		program: VelocityProgram,
@@ -103,7 +116,9 @@ export class WebSocketInsuranceFundStakeAccountSubscriber
 		}
 	}
 
-	public getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake> {
+	public getInsuranceFundStakeAccountAndSlot():
+		| DataAndSlot<InsuranceFundStake>
+		| undefined {
 		this.assertIsSubscribed();
 		return this.insuranceFundStakeDataAccountSubscriber.dataAndSlot;
 	}

package/src/accounts/webSocketProgramAccountSubscriber.ts

@@ -19,12 +19,33 @@ export class WebSocketProgramAccountSubscriber<T>
 	bufferAndSlotMap: Map<string, BufferAndSlot> = new Map();
 	program: VelocityProgram;
 	decodeBuffer: (accountName: string, ix: Buffer) => T;
-	onChange: (
+	private _onChange?: (
 		accountId: PublicKey,
 		data: T,
 		context: Context,
 		buffer: Buffer
 	) => void;
+	get onChange(): (
+		accountId: PublicKey,
+		data: T,
+		context: Context,
+		buffer: Buffer
+	) => void {
+		if (!this._onChange) {
+			throw new Error('onChange callback function must be set');
+		}
+		return this._onChange;
+	}
+	set onChange(
+		onChange: (
+			accountId: PublicKey,
+			data: T,
+			context: Context,
+			buffer: Buffer
+		) => void
+	) {
+		this._onChange = onChange;
+	}
 	listenerId?: number;
 	resubOpts?: ResubOpts;
 	isUnsubscribing = false;
@@ -48,7 +69,10 @@ export class WebSocketProgramAccountSubscriber<T>
 		this.program = program;
 		this.decodeBuffer = decodeBufferFn;
 		this.resubOpts = resubOpts;
-		if (this.resubOpts?.resubTimeoutMs < 1000) {
+		if (
+			this.resubOpts?.resubTimeoutMs != null &&
+			this.resubOpts.resubTimeoutMs < 1000
+		) {
 			console.log(
 				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
 			);
@@ -95,7 +119,7 @@ export class WebSocketProgramAccountSubscriber<T>
 	}
 
 	protected setTimeout(): void {
-		if (!this.onChange) {
+		if (!this._onChange) {
 			throw new Error('onChange callback function must be set');
 		}
 		this.timeoutId = setTimeout(
@@ -161,7 +185,7 @@ export class WebSocketProgramAccountSubscriber<T>
 	}
 
 	unsubscribe(onResub = false): Promise<void> {
-		if (!onResub) {
+		if (!onResub && this.resubOpts) {
 			this.resubOpts.resubTimeoutMs = undefined;
 		}
 		this.isUnsubscribing = true;
@@ -178,6 +202,7 @@ export class WebSocketProgramAccountSubscriber<T>
 			return promise;
 		} else {
 			this.isUnsubscribing = false;
+			return Promise.resolve();
 		}
 	}
 }

package/src/accounts/webSocketProgramAccountSubscriberV2.ts

@@ -101,12 +101,33 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 	bufferAndSlotMap: Map<string, BufferAndSlot> = new Map();
 	program: VelocityProgram;
 	decodeBuffer: (accountName: string, ix: Buffer) => T;
-	onChange: (
+	private _onChange?: (
 		accountId: PublicKey,
 		data: T,
 		context: Context,
 		buffer: Buffer
 	) => void;
+	get onChange(): (
+		accountId: PublicKey,
+		data: T,
+		context: Context,
+		buffer: Buffer
+	) => void {
+		if (!this._onChange) {
+			throw new Error('onChange callback function must be set');
+		}
+		return this._onChange;
+	}
+	set onChange(
+		onChange: (
+			accountId: PublicKey,
+			data: T,
+			context: Context,
+			buffer: Buffer
+		) => void
+	) {
+		this._onChange = onChange;
+	}
 	listenerId?: number;
 	resubOpts: ResubOpts;
 	isUnsubscribing = false;
@@ -160,7 +181,10 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 			usePollingInsteadOfResub: true,
 			logResubMessages: false,
 		};
-		if (this.resubOpts?.resubTimeoutMs < 1000) {
+		if (
+			this.resubOpts?.resubTimeoutMs !== undefined &&
+			this.resubOpts.resubTimeoutMs < 1000
+		) {
 			console.log(
 				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
 			);
@@ -319,7 +343,7 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 	}
 
 	protected setTimeout(): void {
-		if (!this.onChange) {
+		if (!this._onChange) {
 			throw new Error('onChange callback function must be set');
 		}
 		this.timeoutId = setTimeout(
@@ -389,7 +413,9 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 		// If this account was being polled, stop polling it if the buffer has changed
 		if (
 			this.accountsCurrentlyPolling.has(accountIdString) &&
-			!existingBufferAndSlot?.buffer.equals(newBuffer)
+			newBuffer &&
+			(!existingBufferAndSlot?.buffer ||
+				!newBuffer.equals(existingBufferAndSlot.buffer))
 		) {
 			this.accountsCurrentlyPolling.delete(accountIdString);
 

package/src/accounts/webSocketProgramAccountsSubscriberV2.ts

@@ -101,12 +101,33 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 	bufferAndSlotMap: Map<string, BufferAndSlot> = new Map();
 	program: VelocityProgram;
 	decodeBuffer: (accountName: string, ix: Buffer) => T;
-	onChange: (
+	private _onChange?: (
 		accountId: PublicKey,
 		data: T,
 		context: Context,
 		buffer: Buffer
 	) => void;
+	get onChange(): (
+		accountId: PublicKey,
+		data: T,
+		context: Context,
+		buffer: Buffer
+	) => void {
+		if (!this._onChange) {
+			throw new Error('onChange callback function must be set');
+		}
+		return this._onChange;
+	}
+	set onChange(
+		onChange: (
+			accountId: PublicKey,
+			data: T,
+			context: Context,
+			buffer: Buffer
+		) => void
+	) {
+		this._onChange = onChange;
+	}
 	listenerId?: number;
 	resubOpts: ResubOpts;
 	isUnsubscribing = false;
@@ -160,7 +181,10 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 			usePollingInsteadOfResub: true,
 			logResubMessages: false,
 		};
-		if (this.resubOpts?.resubTimeoutMs < 1000) {
+		if (
+			this.resubOpts.resubTimeoutMs != null &&
+			this.resubOpts.resubTimeoutMs < 1000
+		) {
 			console.log(
 				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
 			);
@@ -319,7 +343,7 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 	}
 
 	protected setTimeout(): void {
-		if (!this.onChange) {
+		if (!this._onChange) {
 			throw new Error('onChange callback function must be set');
 		}
 		this.timeoutId = setTimeout(
@@ -389,7 +413,8 @@ export class WebSocketProgramAccountsSubscriberV2<T>
 		// If this account was being polled, stop polling it if the buffer has changed
 		if (
 			this.accountsCurrentlyPolling.has(accountIdString) &&
-			!existingBufferAndSlot?.buffer.equals(newBuffer)
+			(!existingBufferAndSlot?.buffer ||
+				(newBuffer != null && !existingBufferAndSlot.buffer.equals(newBuffer)))
 		) {
 			this.accountsCurrentlyPolling.delete(accountIdString);
 

package/src/accounts/webSocketUserAccountSubscriber.ts

@@ -21,7 +21,16 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, UserAccountEvents>;
 	userAccountPublicKey: PublicKey;
 
-	userDataAccountSubscriber: AccountSubscriber<UserAccount>;
+	private _userDataAccountSubscriber?: AccountSubscriber<UserAccount>;
+	get userDataAccountSubscriber(): AccountSubscriber<UserAccount> {
+		if (!this._userDataAccountSubscriber) {
+			throw new Error('userDataAccountSubscriber accessed before subscribe()');
+		}
+		return this._userDataAccountSubscriber;
+	}
+	set userDataAccountSubscriber(subscriber: AccountSubscriber<UserAccount>) {
+		this._userDataAccountSubscriber = subscriber;
+	}
 
 	public constructor(
 		program: VelocityProgram,
@@ -87,7 +96,7 @@ export class WebSocketUserAccountSubscriber implements UserAccountSubscriber {
 		}
 	}
 
-	public getUserAccountAndSlot(): DataAndSlot<UserAccount> {
+	public getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined {
 		this.assertIsSubscribed();
 		return this.userDataAccountSubscriber.dataAndSlot;
 	}