@velocity-exchange/sdk 0.0.5 → 0.2.0

package/src/accounts/grpcVelocityClientAccountSubscriber.ts

@@ -135,9 +135,11 @@ export class grpcVelocityClientAccountSubscriber extends WebSocketVelocityClient
 				undefined,
 				this.resubOpts
 			);
-		accountSubscriber.setData(
-			this.initialSpotMarketAccountData.get(marketIndex)
-		);
+		const initialSpotMarketData =
+			this.initialSpotMarketAccountData?.get(marketIndex);
+		if (initialSpotMarketData) {
+			accountSubscriber.setData(initialSpotMarketData);
+		}
 		await accountSubscriber.subscribe((data: SpotMarketAccount) => {
 			this.eventEmitter.emit('spotMarketAccountUpdate', data);
 			this.eventEmitter.emit('update');
@@ -160,9 +162,11 @@ export class grpcVelocityClientAccountSubscriber extends WebSocketVelocityClient
 				undefined,
 				this.resubOpts
 			);
-		accountSubscriber.setData(
-			this.initialPerpMarketAccountData.get(marketIndex)
-		);
+		const initialPerpMarketData =
+			this.initialPerpMarketAccountData?.get(marketIndex);
+		if (initialPerpMarketData) {
+			accountSubscriber.setData(initialPerpMarketData);
+		}
 		await accountSubscriber.subscribe((data: PerpMarketAccount) => {
 			this.eventEmitter.emit('perpMarketAccountUpdate', data);
 			this.eventEmitter.emit('update');
@@ -178,6 +182,9 @@ export class grpcVelocityClientAccountSubscriber extends WebSocketVelocityClient
 			this.program.provider.connection,
 			this.program
 		);
+		if (!client) {
+			return false;
+		}
 		const accountSubscriber =
 			await grpcAccountSubscriber.create<OraclePriceData>(
 				this.grpcConfigs,
@@ -189,7 +196,10 @@ export class grpcVelocityClientAccountSubscriber extends WebSocketVelocityClient
 				},
 				this.resubOpts
 			);
-		accountSubscriber.setData(this.initialOraclePriceData.get(oracleId));
+		const initialOraclePriceData = this.initialOraclePriceData?.get(oracleId);
+		if (initialOraclePriceData) {
+			accountSubscriber.setData(initialOraclePriceData);
+		}
 		await accountSubscriber.subscribe((data: OraclePriceData) => {
 			this.eventEmitter.emit(
 				'oraclePriceUpdate',
@@ -204,10 +214,3 @@ export class grpcVelocityClientAccountSubscriber extends WebSocketVelocityClient
 		return true;
 	}
 }
-
-/** @deprecated Use `grpcVelocityClientAccountSubscriber` instead. `grpcDriftClientAccountSubscriber` will be removed in a future major. */
-export const grpcDriftClientAccountSubscriber =
-	grpcVelocityClientAccountSubscriber;
-/** @deprecated Use `grpcVelocityClientAccountSubscriber` instead. `grpcDriftClientAccountSubscriber` will be removed in a future major. */
-export type grpcDriftClientAccountSubscriber =
-	grpcVelocityClientAccountSubscriber;

package/src/accounts/grpcVelocityClientAccountSubscriberV2.ts

@@ -1,7 +1,7 @@
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
-import { PublicKey } from '@solana/web3.js';
+import { AccountInfo, PublicKey } from '@solana/web3.js';
 import { findAllMarketAndOracles, VelocityProgram } from '../config';
 import {
 	getVelocityStateAccountPublicKey,
@@ -70,8 +70,8 @@ export class grpcVelocityClientAccountSubscriberV2
 	oracleClientCache = new OracleClientCache();
 	private resubOpts?: ResubOpts;
 
-	private subscriptionPromise: Promise<boolean>;
-	protected subscriptionPromiseResolver: (val: boolean) => void;
+	private subscriptionPromiseResolver: (val: boolean) => void = () => {};
+	private subscriptionPromise: Promise<boolean> = Promise.resolve(false);
 
 	constructor(
 		grpcConfigs: GrpcConfigs,
@@ -130,7 +130,9 @@ export class grpcVelocityClientAccountSubscriberV2
 			).flat();
 			this.initialPerpMarketAccountData = new Map(
 				perpMarketAccountInfos
-					.filter((accountInfo) => !!accountInfo)
+					.filter(
+						(accountInfo): accountInfo is AccountInfo<Buffer> => !!accountInfo
+					)
 					.map((accountInfo) => {
 						const perpMarket = this.program.coder.accounts.decode(
 							'perpMarket',
@@ -158,7 +160,9 @@ export class grpcVelocityClientAccountSubscriberV2
 			).flat();
 			this.initialSpotMarketAccountData = new Map(
 				spotMarketAccountInfos
-					.filter((accountInfo) => !!accountInfo)
+					.filter(
+						(accountInfo): accountInfo is AccountInfo<Buffer> => !!accountInfo
+					)
 					.map((accountInfo) => {
 						const spotMarket = this.program.coder.accounts.decode(
 							'spotMarket',
@@ -181,24 +185,31 @@ export class grpcVelocityClientAccountSubscriberV2
 			)
 		).flat();
 		this.initialOraclePriceData = new Map(
-			this.oracleInfos.reduce((result, oracleInfo, i) => {
-				if (!oracleAccountInfos[i]) {
+			this.oracleInfos.reduce<[string, OraclePriceData][]>(
+				(result, oracleInfo, i) => {
+					const oracleAccountInfo = oracleAccountInfos[i];
+					if (!oracleAccountInfo) {
+						return result;
+					}
+					const oracleClient = this.oracleClientCache.get(
+						oracleInfo.source,
+						connection,
+						this.program
+					);
+					if (!oracleClient) {
+						return result;
+					}
+					const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(
+						oracleAccountInfo.data
+					);
+					result.push([
+						getOracleId(oracleInfo.publicKey, oracleInfo.source),
+						oraclePriceData,
+					]);
 					return result;
-				}
-				const oracleClient = this.oracleClientCache.get(
-					oracleInfo.source,
-					connection,
-					this.program
-				);
-				const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(
-					oracleAccountInfos[i].data
-				);
-				result.push([
-					getOracleId(oracleInfo.publicKey, oracleInfo.source),
-					oraclePriceData,
-				]);
-				return result;
-			}, [])
+				},
+				[]
+			)
 		);
 	}
 
@@ -334,7 +345,7 @@ export class grpcVelocityClientAccountSubscriberV2
 
 	public getStateAccountAndSlot(): DataAndSlot<StateAccount> {
 		this.assertIsSubscribed();
-		return this.stateAccountSubscriber.dataAndSlot;
+		return this.stateAccountSubscriber!.dataAndSlot!;
 	}
 
 	public getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[] {
@@ -350,17 +361,23 @@ export class grpcVelocityClientAccountSubscriberV2
 	getMarketAccountAndSlot(
 		marketIndex: number
 	): DataAndSlot<PerpMarketAccount> | undefined {
-		return this.perpMarketsSubscriber?.getAccountData(
-			this.perpMarketIndexToAccountPubkeyMap.get(marketIndex)
-		);
+		const accountPubkey =
+			this.perpMarketIndexToAccountPubkeyMap.get(marketIndex);
+		if (!accountPubkey) {
+			return undefined;
+		}
+		return this.perpMarketsSubscriber?.getAccountData(accountPubkey);
 	}
 
 	getSpotMarketAccountAndSlot(
 		marketIndex: number
 	): DataAndSlot<SpotMarketAccount> | undefined {
-		return this.spotMarketsSubscriber?.getAccountData(
-			this.spotMarketIndexToAccountPubkeyMap.get(marketIndex)
-		);
+		const accountPubkey =
+			this.spotMarketIndexToAccountPubkeyMap.get(marketIndex);
+		if (!accountPubkey) {
+			return undefined;
+		}
+		return this.spotMarketsSubscriber?.getAccountData(accountPubkey);
 	}
 
 	public getOraclePriceDataAndSlot(
@@ -382,8 +399,8 @@ export class grpcVelocityClientAccountSubscriberV2
 			return undefined;
 		}
 
-		if (!perpMarketAccount.data.amm.oracle.equals(oracle)) {
-			// If the oracle has changed, we need to update the oracle map in background
+		if (!oracle || !perpMarketAccount.data.oracle.equals(oracle)) {
+			// If the oracle has changed (or not yet cached), update the oracle map in background
 			this.setPerpOracleMap();
 		}
 
@@ -400,8 +417,8 @@ export class grpcVelocityClientAccountSubscriberV2
 			return undefined;
 		}
 
-		if (!spotMarketAccount.data.oracle.equals(oracle)) {
-			// If the oracle has changed, we need to update the oracle map in background
+		if (!oracle || !spotMarketAccount.data.oracle.equals(oracle)) {
+			// If the oracle has changed (or not yet cached), update the oracle map in background
 			this.setSpotOracleMap();
 		}
 
@@ -410,7 +427,7 @@ export class grpcVelocityClientAccountSubscriberV2
 
 	async setPerpOracleMap() {
 		const perpMarketsMap = this.perpMarketsSubscriber?.getAccountDataMap();
-		const perpMarkets = Array.from(perpMarketsMap.values());
+		const perpMarkets = Array.from(perpMarketsMap?.values() ?? []);
 		const addOraclePromises = [];
 		for (const perpMarket of perpMarkets) {
 			if (!perpMarket || !perpMarket.data) {
@@ -418,13 +435,13 @@ export class grpcVelocityClientAccountSubscriberV2
 			}
 			const perpMarketAccount = perpMarket.data;
 			const perpMarketIndex = perpMarketAccount.marketIndex;
-			const oracle = perpMarketAccount.amm.oracle;
-			const oracleId = getOracleId(oracle, perpMarket.data.amm.oracleSource);
+			const oracle = perpMarketAccount.oracle;
+			const oracleId = getOracleId(oracle, perpMarket.data.oracleSource);
 			if (!this.oracleMultiSubscriber?.getAccountDataMap().has(oracleId)) {
 				addOraclePromises.push(
 					this.addOracle({
 						publicKey: oracle,
-						source: perpMarket.data.amm.oracleSource,
+						source: perpMarket.data.oracleSource,
 					})
 				);
 			}
@@ -436,7 +453,7 @@ export class grpcVelocityClientAccountSubscriberV2
 
 	async setSpotOracleMap() {
 		const spotMarketsMap = this.spotMarketsSubscriber?.getAccountDataMap();
-		const spotMarkets = Array.from(spotMarketsMap.values());
+		const spotMarkets = Array.from(spotMarketsMap?.values() ?? []);
 		const addOraclePromises = [];
 		for (const spotMarket of spotMarkets) {
 			if (!spotMarket || !spotMarket.data) {
@@ -604,7 +621,7 @@ export class grpcVelocityClientAccountSubscriberV2
 			if (!oraclePubkeyToInfosMap.has(pubkey)) {
 				oraclePubkeyToInfosMap.set(pubkey, []);
 			}
-			oraclePubkeyToInfosMap.get(pubkey).push(info);
+			oraclePubkeyToInfosMap.get(pubkey)!.push(info);
 		}
 
 		const oraclePubkeys = Array.from(
@@ -623,11 +640,18 @@ export class grpcVelocityClientAccountSubscriberV2
 					throw new Error('Oracle pubkey missing in decode');
 				}
 
+				if (!accountProps) {
+					throw new Error('Oracle accountProps missing in decode');
+				}
+
 				const client = this.oracleClientCache.get(
 					accountProps.source,
 					this.program.provider.connection,
 					this.program
 				);
+				if (!client) {
+					throw new Error('Oracle client missing in decode');
+				}
 				const price = client.getOraclePriceDataFromBuffer(buffer);
 				return price;
 			},
@@ -660,6 +684,9 @@ export class grpcVelocityClientAccountSubscriberV2
 		await this.oracleMultiSubscriber.subscribe(
 			oraclePubkeys,
 			(accountId, data, context, _b, accountProps) => {
+				if (accountProps === undefined) {
+					return;
+				}
 				const oracleId = getOracleId(accountId, accountProps.source);
 				this.oracleIdToOracleDataMap.set(oracleId, {
 					data,
@@ -698,21 +725,21 @@ export class grpcVelocityClientAccountSubscriberV2
 					this.perpMarketIndexToAccountPubkeyMap.get(marketIndex);
 				return pubkeyString ? new PublicKey(pubkeyString) : null;
 			})
-			.filter((pubkey) => pubkey !== null) as PublicKey[];
+			.filter((pubkey): pubkey is PublicKey => pubkey !== null);
 
 		// Build array of oracle pubkeys to remove
 		const oraclePubkeysToRemove = oracles.map((oracle) => oracle.publicKey);
 
 		// Remove accounts in batches - perp markets
 		if (perpMarketPubkeysToRemove.length > 0) {
-			await this.perpMarketsSubscriber.removeAccounts(
+			await this.perpMarketsSubscriber?.removeAccounts(
 				perpMarketPubkeysToRemove
 			);
 		}
 
 		// Remove accounts in batches - oracles
 		if (oraclePubkeysToRemove.length > 0) {
-			await this.oracleMultiSubscriber.removeAccounts(oraclePubkeysToRemove);
+			await this.oracleMultiSubscriber?.removeAccounts(oraclePubkeysToRemove);
 		}
 	}
 
@@ -753,10 +780,3 @@ export class grpcVelocityClientAccountSubscriberV2
 		this.spotOracleStringMap.clear();
 	}
 }
-
-/** @deprecated Use `grpcVelocityClientAccountSubscriberV2` instead. `grpcDriftClientAccountSubscriberV2` will be removed in a future major. */
-export const grpcDriftClientAccountSubscriberV2 =
-	grpcVelocityClientAccountSubscriberV2;
-/** @deprecated Use `grpcVelocityClientAccountSubscriberV2` instead. `grpcDriftClientAccountSubscriberV2` will be removed in a future major. */
-export type grpcDriftClientAccountSubscriberV2 =
-	grpcVelocityClientAccountSubscriberV2;

package/src/accounts/laserProgramAccountSubscriber.ts

@@ -126,7 +126,7 @@ export class LaserstreamProgramAccountSubscriber<
 		const request: LaserSubscribeRequest = {
 			slots: {},
 			accounts: {
-				drift: {
+				velocity: {
 					account: [],
 					owner: [this.program.programId.toBase58()],
 					filters,
@@ -152,6 +152,9 @@ export class LaserstreamProgramAccountSubscriber<
 					if (update.account) {
 						const slot = Number(update.account.slot);
 						const acc = update.account.account;
+						if (!acc) {
+							return;
+						}
 
 						const accountInfo = {
 							owner: new PublicKey(acc.owner),

package/src/accounts/oneShotUserAccountSubscriber.ts

@@ -30,7 +30,7 @@ export class OneShotUserAccountSubscriber
 
 	async subscribe(userAccount?: UserAccount): Promise<boolean> {
 		if (userAccount) {
-			this.user = { data: userAccount, slot: this.user.slot };
+			this.user = { data: userAccount, slot: this.user?.slot ?? 0 };
 			return true;
 		}
 
@@ -42,7 +42,7 @@ export class OneShotUserAccountSubscriber
 	}
 
 	async fetchIfUnloaded(): Promise<void> {
-		if (this.user.data === undefined) {
+		if (!this.user) {
 			await this.fetch();
 		}
 	}
@@ -60,7 +60,9 @@ export class OneShotUserAccountSubscriber
 			}
 		} catch (e) {
 			console.error(
-				`OneShotUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}`
+				`OneShotUserAccountSubscriber.fetch() UserAccount does not exist: ${
+					e instanceof Error ? e.message : String(e)
+				}`
 			);
 		}
 	}

package/src/accounts/oneShotUserStatsAccountSubscriber.ts

@@ -30,7 +30,10 @@ export class OneShotUserStatsAccountSubscriber
 
 	async subscribe(userStatsAccount?: UserStatsAccount): Promise<boolean> {
 		if (userStatsAccount) {
-			this.userStats = { data: userStatsAccount, slot: this.userStats.slot };
+			this.userStats = {
+				data: userStatsAccount,
+				slot: this.userStats?.slot ?? 0,
+			};
 			return true;
 		}
 
@@ -42,7 +45,7 @@ export class OneShotUserStatsAccountSubscriber
 	}
 
 	async fetchIfUnloaded(): Promise<void> {
-		if (this.userStats.data === undefined) {
+		if (!this.userStats) {
 			await this.fetch();
 		}
 	}
@@ -63,7 +66,9 @@ export class OneShotUserStatsAccountSubscriber
 			}
 		} catch (e) {
 			console.error(
-				`OneShotUserStatsAccountSubscriber.fetch() UserStatsAccount does not exist: ${e.message}`
+				`OneShotUserStatsAccountSubscriber.fetch() UserStatsAccount does not exist: ${
+					e instanceof Error ? e.message : String(e)
+				}`
 			);
 		}
 	}

package/src/accounts/pollingInsuranceFundStakeAccountSubscriber.ts

@@ -48,7 +48,7 @@ export class PollingInsuranceFundStakeAccountSubscriber
 		if (insuranceFundStake) {
 			this.insuranceFundStakeAccountAndSlot = {
 				data: insuranceFundStake,
-				slot: undefined,
+				slot: 0,
 			};
 		}
 
@@ -97,7 +97,7 @@ export class PollingInsuranceFundStakeAccountSubscriber
 	}
 
 	async fetchIfUnloaded(): Promise<void> {
-		if (this.insuranceFundStakeAccountAndSlot === undefined) {
+		if (!this.doesAccountExist()) {
 			await this.fetch();
 		}
 	}
@@ -121,12 +121,16 @@ export class PollingInsuranceFundStakeAccountSubscriber
 			}
 		} catch (e) {
 			console.log(
-				`PollingInsuranceFundStakeAccountSubscriber.fetch() InsuranceFundStake does not exist: ${e.message}`
+				`PollingInsuranceFundStakeAccountSubscriber.fetch() InsuranceFundStake does not exist: ${
+					e instanceof Error ? e.message : String(e)
+				}`
 			);
 		}
 	}
 
-	doesAccountExist(): boolean {
+	doesAccountExist(): this is {
+		insuranceFundStakeAccountAndSlot: DataAndSlot<InsuranceFundStake>;
+	} {
 		return this.insuranceFundStakeAccountAndSlot !== undefined;
 	}
 
@@ -155,7 +159,9 @@ export class PollingInsuranceFundStakeAccountSubscriber
 		}
 	}
 
-	public getInsuranceFundStakeAccountAndSlot(): DataAndSlot<InsuranceFundStake> {
+	public getInsuranceFundStakeAccountAndSlot():
+		| DataAndSlot<InsuranceFundStake>
+		| undefined {
 		this.assertIsSubscribed();
 		return this.insuranceFundStakeAccountAndSlot;
 	}

package/src/accounts/pollingOracleAccountSubscriber.ts

@@ -9,11 +9,9 @@ import { EventEmitter } from 'events';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { OracleClient, OraclePriceData } from '../oracles/types';
-import { VelocityProgram } from '../config';
 
 export class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
 	isSubscribed: boolean;
-	program: VelocityProgram;
 	eventEmitter: StrictEventEmitter<EventEmitter, OracleEvents>;
 	publicKey: PublicKey;
 
@@ -83,9 +81,14 @@ export class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
 
 	async fetch(): Promise<void> {
 		await this.accountLoader.load();
-		const { buffer, slot } = this.accountLoader.getBufferAndSlot(
-			this.publicKey
-		);
+		const bufferAndSlot = this.accountLoader.getBufferAndSlot(this.publicKey);
+		if (!bufferAndSlot) {
+			return;
+		}
+		const { buffer, slot } = bufferAndSlot;
+		if (!buffer) {
+			return;
+		}
 		this.oraclePriceData = {
 			data: await this.oracleClient.getOraclePriceDataFromBuffer(buffer),
 			slot,
@@ -97,11 +100,15 @@ export class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
 			return;
 		}
 
-		this.accountLoader.removeAccount(this.publicKey, this.callbackId);
-		this.callbackId = undefined;
+		if (this.callbackId) {
+			this.accountLoader.removeAccount(this.publicKey, this.callbackId);
+			this.callbackId = undefined;
+		}
 
-		this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
-		this.errorCallbackId = undefined;
+		if (this.errorCallbackId) {
+			this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+			this.errorCallbackId = undefined;
+		}
 
 		this.isSubscribed = false;
 	}
@@ -116,7 +123,7 @@ export class PollingOracleAccountSubscriber implements OracleAccountSubscriber {
 
 	public getOraclePriceData(): DataAndSlot<OraclePriceData> {
 		this.assertIsSubscribed();
-		return this.oraclePriceData;
+		return this.oraclePriceData!;
 	}
 
 	didSubscriptionSucceed(): boolean {

package/src/accounts/pollingTokenAccountSubscriber.ts

@@ -10,11 +10,9 @@ import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './bulkAccountLoader';
 import { Account } from '@solana/spl-token';
 import { parseTokenAccount } from '../token';
-import { VelocityProgram } from '../config';
 
 export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 	isSubscribed: boolean;
-	program: VelocityProgram;
 	eventEmitter: StrictEventEmitter<EventEmitter, TokenAccountEvents>;
 	publicKey: PublicKey;
 
@@ -76,9 +74,14 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 
 	async fetch(): Promise<void> {
 		await this.accountLoader.load();
-		const { buffer, slot } = this.accountLoader.getBufferAndSlot(
-			this.publicKey
-		);
+		const bufferAndSlot = this.accountLoader.getBufferAndSlot(this.publicKey);
+		if (!bufferAndSlot) {
+			return;
+		}
+		const { buffer, slot } = bufferAndSlot;
+		if (!buffer) {
+			return;
+		}
 		this.tokenAccountAndSlot = {
 			data: parseTokenAccount(buffer, this.publicKey),
 			slot,
@@ -90,11 +93,15 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 			return;
 		}
 
-		this.accountLoader.removeAccount(this.publicKey, this.callbackId);
-		this.callbackId = undefined;
+		if (this.callbackId) {
+			this.accountLoader.removeAccount(this.publicKey, this.callbackId);
+			this.callbackId = undefined;
+		}
 
-		this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
-		this.errorCallbackId = undefined;
+		if (this.errorCallbackId) {
+			this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+			this.errorCallbackId = undefined;
+		}
 
 		this.isSubscribed = false;
 	}
@@ -109,7 +116,7 @@ export class PollingTokenAccountSubscriber implements TokenAccountSubscriber {
 
 	public getTokenAccountAndSlot(): DataAndSlot<Account> {
 		this.assertIsSubscribed();
-		return this.tokenAccountAndSlot;
+		return this.tokenAccountAndSlot!;
 	}
 
 	didSubscriptionSucceed(): boolean {

package/src/accounts/pollingUserAccountSubscriber.ts

@@ -21,7 +21,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	callbackId?: string;
 	errorCallbackId?: string;
 
-	decode: (name, buffer) => UserAccount;
+	decode: (name: string, buffer: Buffer) => UserAccount;
 
 	user?: DataAndSlot<UserAccount>;
 
@@ -29,7 +29,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		connection: Connection,
 		userAccountPublicKey: PublicKey,
 		accountLoader: BulkAccountLoader,
-		decode: (name, buffer) => UserAccount
+		decode: (name: string, buffer: Buffer) => UserAccount
 	) {
 		this.isSubscribed = false;
 		this.connection = connection;
@@ -45,7 +45,9 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		}
 
 		if (userAccount) {
-			this.user = { data: userAccount, slot: undefined };
+			// `slot: 0` keeps {data, slot} atomic: a seeded account always carries a
+			// slot (0 = oldest-possible sentinel, overwritten by the first real fetch).
+			this.user = { data: userAccount, slot: 0 };
 		}
 
 		await this.addToAccountLoader();
@@ -88,7 +90,7 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 	}
 
 	async fetchIfUnloaded(): Promise<void> {
-		if (this.user === undefined) {
+		if (!this.doesAccountExist()) {
 			await this.fetch();
 		}
 	}
@@ -99,20 +101,24 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 				this.userAccountPublicKey,
 				this.accountLoader.commitment
 			);
-			if (dataAndContext.context.slot > (this.user?.slot ?? 0)) {
+			if (
+				dataAndContext.value !== null &&
+				dataAndContext.context.slot > (this.user?.slot ?? 0)
+			) {
 				this.user = {
 					data: this.decode('user', dataAndContext.value.data),
 					slot: dataAndContext.context.slot,
 				};
 			}
 		} catch (e) {
+			const err = e instanceof Error ? e : new Error(String(e));
 			console.log(
-				`PollingUserAccountSubscriber.fetch() UserAccount does not exist: ${e.message}-${e.stack}`
+				`PollingUserAccountSubscriber.fetch() UserAccount does not exist: ${err.message}-${err.stack}`
 			);
 		}
 	}
 
-	doesAccountExist(): boolean {
+	doesAccountExist(): this is { user: DataAndSlot<UserAccount> } {
 		return this.user !== undefined;
 	}
 
@@ -121,14 +127,18 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 			return;
 		}
 
-		this.accountLoader.removeAccount(
-			this.userAccountPublicKey,
-			this.callbackId
-		);
-		this.callbackId = undefined;
+		if (this.callbackId) {
+			this.accountLoader.removeAccount(
+				this.userAccountPublicKey,
+				this.callbackId
+			);
+			this.callbackId = undefined;
+		}
 
-		this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
-		this.errorCallbackId = undefined;
+		if (this.errorCallbackId) {
+			this.accountLoader.removeErrorCallbacks(this.errorCallbackId);
+			this.errorCallbackId = undefined;
+		}
 
 		this.isSubscribed = false;
 	}
@@ -141,12 +151,8 @@ export class PollingUserAccountSubscriber implements UserAccountSubscriber {
 		}
 	}
 
-	public getUserAccountAndSlot(): DataAndSlot<UserAccount> {
-		if (!this.doesAccountExist()) {
-			throw new NotSubscribedError(
-				'You must call `subscribe` or `fetch` before using this function'
-			);
-		}
+	public getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined {
+		this.assertIsSubscribed();
 		return this.user;
 	}