@velocity-exchange/sdk 0.0.5 → 0.2.0

package/src/priorityFee/priorityFeeSubscriber.ts

@@ -19,14 +19,10 @@ import {
 } from './velocityPriorityFeeMethod';
 
 export class PriorityFeeSubscriber {
-	connection: Connection;
+	connection?: Connection;
 	frequencyMs: number;
 	addresses: string[];
 	velocityMarkets?: VelocityMarketInfo[];
-	/** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-	public get driftMarkets(): VelocityMarketInfo[] | undefined {
-		return this.velocityMarkets;
-	}
 	customStrategy?: PriorityFeeStrategy;
 	averageStrategy = new AverageOverSlotsStrategy();
 	maxStrategy = new MaxOverSlotsStrategy();
@@ -36,10 +32,6 @@ export class PriorityFeeSubscriber {
 	priorityFeeMultiplier?: number;
 
 	velocityPriorityFeeEndpoint?: string;
-	/** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-	public get driftPriorityFeeEndpoint(): string | undefined {
-		return this.velocityPriorityFeeEndpoint;
-	}
 	heliusRpcUrl?: string;
 	lastHeliusSample?: HeliusPriorityFeeLevels;
 
@@ -58,7 +50,7 @@ export class PriorityFeeSubscriber {
 		this.addresses = config.addresses
 			? config.addresses.map((address) => address.toBase58())
 			: [];
-		this.velocityMarkets = config.velocityMarkets ?? config.driftMarkets;
+		this.velocityMarkets = config.velocityMarkets;
 
 		if (config.customStrategy) {
 			this.customStrategy = config.customStrategy;
@@ -72,7 +64,7 @@ export class PriorityFeeSubscriber {
 
 			if (this.priorityFeeMethod === PriorityFeeMethod.HELIUS) {
 				if (config.heliusRpcUrl === undefined) {
-					if (this.connection.rpcEndpoint.includes('helius')) {
+					if (this.connection?.rpcEndpoint.includes('helius')) {
 						this.heliusRpcUrl = this.connection.rpcEndpoint;
 					} else {
 						throw new Error(
@@ -84,7 +76,8 @@ export class PriorityFeeSubscriber {
 				}
 			} else if (this.priorityFeeMethod === PriorityFeeMethod.VELOCITY) {
 				this.velocityPriorityFeeEndpoint =
-					config.velocityPriorityFeeEndpoint ?? config.driftPriorityFeeEndpoint;
+					config.velocityPriorityFeeEndpoint ??
+					config.velocityPriorityFeeEndpoint;
 			}
 		}
 
@@ -110,11 +103,19 @@ export class PriorityFeeSubscriber {
 	}
 
 	private async loadForSolana(): Promise<void> {
+		if (this.connection === undefined) {
+			throw new Error(
+				'connection must be provided to use SOLANA priority fee API'
+			);
+		}
 		const samples = await fetchSolanaPriorityFee(
-			this.connection!,
+			this.connection,
 			this.lookbackDistance,
 			this.addresses
 		);
+		if (samples === undefined) {
+			throw new Error('fetchSolanaPriorityFee returned no samples');
+		}
 		if (samples.length > 0) {
 			this.latestPriorityFee = samples[0].prioritizationFee;
 			this.lastSlotSeen = samples[0].slot;
@@ -128,6 +129,11 @@ export class PriorityFeeSubscriber {
 	}
 
 	private async loadForHelius(): Promise<void> {
+		if (this.heliusRpcUrl === undefined) {
+			throw new Error(
+				'heliusRpcUrl must be provided to use PriorityFeeMethod.HELIUS'
+			);
+		}
 		const sample = await fetchHeliusPriorityFee(
 			this.heliusRpcUrl,
 			this.lookbackDistance,
@@ -135,31 +141,54 @@ export class PriorityFeeSubscriber {
 		);
 		this.lastHeliusSample = sample?.result?.priorityFeeLevels ?? undefined;
 
-		if (this.lastHeliusSample) {
+		if (sample !== undefined && this.lastHeliusSample) {
 			this.lastAvgStrategyResult =
 				this.lastHeliusSample[HeliusPriorityLevel.MEDIUM];
 			this.lastMaxStrategyResult =
 				this.lastHeliusSample[HeliusPriorityLevel.UNSAFE_MAX];
 			if (this.customStrategy) {
-				this.lastCustomStrategyResult = this.customStrategy.calculate(sample!);
+				this.lastCustomStrategyResult = this.customStrategy.calculate(sample);
 			}
 		}
 	}
 
-	private async loadForDrift(): Promise<void> {
+	private async loadForVelocity(): Promise<void> {
 		if (!this.velocityMarkets) {
 			return;
 		}
+		if (this.velocityPriorityFeeEndpoint === undefined) {
+			throw new Error(
+				'velocityPriorityFeeEndpoint must be provided to use PriorityFeeMethod.VELOCITY'
+			);
+		}
 		const sample = await fetchVelocityPriorityFee(
-			this.velocityPriorityFeeEndpoint!,
+			this.velocityPriorityFeeEndpoint,
 			this.velocityMarkets.map((m) => m.marketType),
 			this.velocityMarkets.map((m) => m.marketIndex)
 		);
 		if (sample.length > 0) {
-			this.lastAvgStrategyResult = sample[HeliusPriorityLevel.MEDIUM];
-			this.lastMaxStrategyResult = sample[HeliusPriorityLevel.UNSAFE_MAX];
+			// The endpoint returns one fee-level set per requested market. Take the
+			// max level across markets so a transaction touching several markets is
+			// covered by the most expensive one. (Base indexed the array itself with
+			// a string enum key — `sample['medium']` — which yielded `undefined` and
+			// produced NaN strategy results; the missing per-element index is fixed
+			// here.)
+			this.lastAvgStrategyResult = Math.max(
+				...sample.map((s) => s[HeliusPriorityLevel.MEDIUM])
+			);
+			this.lastMaxStrategyResult = Math.max(
+				...sample.map((s) => s[HeliusPriorityLevel.UNSAFE_MAX])
+			);
 			if (this.customStrategy) {
-				this.lastCustomStrategyResult = this.customStrategy.calculate(sample);
+				// Custom strategies expect `{ slot, prioritizationFee }[]`; map each
+				// market's medium level into that shape so they aggregate real values
+				// instead of summing the absent `prioritizationFee` field (NaN).
+				this.lastCustomStrategyResult = this.customStrategy.calculate(
+					sample.map((s) => ({
+						slot: 0,
+						prioritizationFee: s[HeliusPriorityLevel.MEDIUM],
+					}))
+				);
 			}
 		}
 	}
@@ -228,7 +257,7 @@ export class PriorityFeeSubscriber {
 			} else if (this.priorityFeeMethod === PriorityFeeMethod.HELIUS) {
 				await this.loadForHelius();
 			} else if (this.priorityFeeMethod === PriorityFeeMethod.VELOCITY) {
-				await this.loadForDrift();
+				await this.loadForVelocity();
 			} else {
 				throw new Error(`${this.priorityFeeMethod} load not implemented`);
 			}

package/src/priorityFee/priorityFeeSubscriberMap.ts

@@ -17,15 +17,7 @@ export class PriorityFeeSubscriberMap {
 	intervalId?: ReturnType<typeof setTimeout>;
 
 	velocityMarkets?: VelocityMarketInfo[];
-	/** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-	public get driftMarkets(): VelocityMarketInfo[] | undefined {
-		return this.velocityMarkets;
-	}
 	velocityPriorityFeeEndpoint: string;
-	/** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-	public get driftPriorityFeeEndpoint(): string {
-		return this.velocityPriorityFeeEndpoint;
-	}
 	feesMap: Map<string, Map<number, VelocityPriorityFeeLevels>>; // marketType -> marketIndex -> priority fee
 
 	public constructor(config: PriorityFeeSubscriberMapConfig) {
@@ -33,8 +25,8 @@ export class PriorityFeeSubscriberMap {
 			config.frequencyMs ?? DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS;
 		// Type-system guarantees at least one of the two is supplied.
 		this.velocityPriorityFeeEndpoint = (config.velocityPriorityFeeEndpoint ??
-			config.driftPriorityFeeEndpoint)!;
-		this.velocityMarkets = config.velocityMarkets ?? config.driftMarkets;
+			config.velocityPriorityFeeEndpoint)!;
+		this.velocityMarkets = config.velocityMarkets;
 		this.feesMap = new Map<string, Map<number, VelocityPriorityFeeLevels>>();
 		this.feesMap.set('perp', new Map<number, VelocityPriorityFeeLevels>());
 		this.feesMap.set('spot', new Map<number, VelocityPriorityFeeLevels>());

package/src/priorityFee/solanaPriorityFeeMethod.ts

@@ -9,7 +9,7 @@ export async function fetchSolanaPriorityFee(
 	connection: Connection,
 	lookbackDistance: number,
 	addresses: string[]
-): Promise<SolanaPriorityFeeResponse[]> {
+): Promise<SolanaPriorityFeeResponse[] | undefined> {
 	try {
 		// @ts-ignore
 		const rpcJSONResponse: any = await connection._rpcRequest(

package/src/priorityFee/types.ts

@@ -5,7 +5,6 @@ import {
 	VelocityMarketInfo,
 	VelocityPriorityFeeResponse,
 } from './velocityPriorityFeeMethod';
-import { AtLeastOne } from '../util/deprecatedAlias';
 
 export const DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS = 10_000;
 
@@ -35,8 +34,6 @@ export type PriorityFeeSubscriberConfig = {
 	addresses?: PublicKey[];
 	/// market type and index, optionally provide at initialization time if using priorityFeeMethod.VELOCITY
 	velocityMarkets?: VelocityMarketInfo[];
-	/** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-	driftMarkets?: VelocityMarketInfo[];
 	/// custom strategy to calculate priority fees, defaults to AVERAGE
 	customStrategy?: PriorityFeeStrategy;
 	/// method for fetching priority fee samples
@@ -47,8 +44,6 @@ export type PriorityFeeSubscriberConfig = {
 	heliusRpcUrl?: string;
 	/// url for Velocity cached priority fee endpoint, required if using priorityFeeMethod.VELOCITY
 	velocityPriorityFeeEndpoint?: string;
-	/** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-	driftPriorityFeeEndpoint?: string;
 	/// clamp any returned priority fee value to this value.
 	maxFeeMicroLamports?: number;
 	/// multiplier applied to priority fee before maxFeeMicroLamports, defaults to 1.0
@@ -60,15 +55,10 @@ type PriorityFeeSubscriberMapConfigBase = {
 	frequencyMs?: number;
 	/// market type and associated market index to query
 	velocityMarkets?: VelocityMarketInfo[];
-	/** @deprecated Use `velocityMarkets` instead. `driftMarkets` will be removed in a future major. */
-	driftMarkets?: VelocityMarketInfo[];
 };
 
 /// url for Velocity cached priority fee endpoint
 export type PriorityFeeSubscriberMapConfig =
-	PriorityFeeSubscriberMapConfigBase &
-		AtLeastOne<
-			'velocityPriorityFeeEndpoint',
-			'driftPriorityFeeEndpoint',
-			string
-		>;
+	PriorityFeeSubscriberMapConfigBase & {
+		velocityPriorityFeeEndpoint: string;
+	};

package/src/priorityFee/velocityPriorityFeeMethod.ts

@@ -6,9 +6,6 @@ export type VelocityMarketInfo = {
 	marketIndex: number;
 };
 
-/** @deprecated Use `VelocityMarketInfo` instead. `DriftMarketInfo` will be removed in a future major. */
-export type DriftMarketInfo = VelocityMarketInfo;
-
 export type VelocityPriorityFeeLevels = {
 	[key in HeliusPriorityLevel]: number;
 } & {
@@ -16,14 +13,8 @@ export type VelocityPriorityFeeLevels = {
 	marketIndex: number;
 };
 
-/** @deprecated Use `VelocityPriorityFeeLevels` instead. `DriftPriorityFeeLevels` will be removed in a future major. */
-export type DriftPriorityFeeLevels = VelocityPriorityFeeLevels;
-
 export type VelocityPriorityFeeResponse = VelocityPriorityFeeLevels[];
 
-/** @deprecated Use `VelocityPriorityFeeResponse` instead. `DriftPriorityFeeResponse` will be removed in a future major. */
-export type DriftPriorityFeeResponse = VelocityPriorityFeeResponse;
-
 export async function fetchVelocityPriorityFee(
 	url: string,
 	marketTypes: string[],
@@ -49,6 +40,3 @@ export async function fetchVelocityPriorityFee(
 
 	return [];
 }
-
-/** @deprecated Use `fetchVelocityPriorityFee` instead. `fetchDriftPriorityFee` will be removed in a future major. */
-export const fetchDriftPriorityFee = fetchVelocityPriorityFee;

package/src/pyth/pythLazerSubscriber.ts

@@ -50,7 +50,7 @@ export class PythLazerSubscriber {
 	 * @param endpoints - Array of WebSocket endpoint URLs for Pyth Lazer
 	 * @param token - Authentication token for Pyth Lazer API
 	 * @param priceFeedArrays - Array of price feed configurations to subscribe to
-	 * @param env - Drift environment (mainnet-beta, devnet, etc.)
+	 * @param env - Velocity environment (mainnet-beta, devnet, etc.)
 	 * @param resubTimeoutMs - Milliseconds to wait before resubscribing on data timeout
 	 * @param sdkLogging - Whether to log Pyth SDK logs to the console. This is very noisy but could be useful for debugging.
 	 * @param feedProperties - Price feed properties to request. Must include both 'price' and 'exponent' (required for getPriceFromMarketIndex). Defaults to ['price', 'bestAskPrice', 'bestBidPrice', 'exponent']. Stored by copy so caller mutation does not affect this instance.

package/src/pyth/types.ts

@@ -4445,8 +4445,6 @@ export const IDL: PythSolanaReceiver = {
 		},
 	],
 };
-
-export declare const PYTH_SOLANA_RECEIVER_IDL: PythSolanaReceiver;
 //# sourceMappingURL=pyth_solana_receiver.d.ts.map
 
 export type PriceUpdateAccount =

package/src/slot/SlotSubscriber.ts

@@ -12,8 +12,8 @@ export interface SlotSubscriberEvents {
 }
 
 export class SlotSubscriber {
-	currentSlot: number;
-	subscriptionId: number;
+	currentSlot = 0;
+	subscriptionId?: number;
 	eventEmitter: StrictEventEmitter<EventEmitter, SlotSubscriberEvents>;
 
 	// Reconnection
@@ -28,7 +28,7 @@ export class SlotSubscriber {
 	) {
 		this.eventEmitter = new EventEmitter();
 		this.resubTimeoutMs = config?.resubTimeoutMs;
-		if (this.resubTimeoutMs < 1000) {
+		if (this.resubTimeoutMs !== undefined && this.resubTimeoutMs < 1000) {
 			console.log(
 				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
 			);

package/src/slot/SlothashSubscriber.ts

@@ -18,8 +18,16 @@ export type Slothash = {
 };
 
 export class SlothashSubscriber {
-	currentSlothash: Slothash;
-	subscriptionId: number;
+	private _currentSlothash?: Slothash;
+	private get currentSlothash(): Slothash {
+		if (!this._currentSlothash) {
+			throw new Error(
+				'SlothashSubscriber: slothash accessed before subscribe()'
+			);
+		}
+		return this._currentSlothash;
+	}
+	subscriptionId?: number;
 	commitment: Commitment;
 
 	// Reconnection
@@ -34,7 +42,7 @@ export class SlothashSubscriber {
 	) {
 		this.resubTimeoutMs = config?.resubTimeoutMs;
 		this.commitment = config?.commitment ?? 'processed';
-		if (this.resubTimeoutMs < 1000) {
+		if (this.resubTimeoutMs != null && this.resubTimeoutMs < 1000) {
 			console.log(
 				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
 			);
@@ -53,18 +61,21 @@ export class SlothashSubscriber {
 		if (currentAccountData == null) {
 			throw new Error('Failed to retrieve current slot hash');
 		}
-		this.currentSlothash = deserializeSlothash(currentAccountData.data);
+		this._currentSlothash = deserializeSlothash(currentAccountData.data);
 
 		this.subscriptionId = this.connection.onAccountChange(
 			SYSVAR_SLOT_HASHES_PUBKEY,
 			(slothashInfo, context) => {
-				if (!this.currentSlothash || this.currentSlothash.slot < context.slot) {
+				if (
+					!this._currentSlothash ||
+					this._currentSlothash.slot < context.slot
+				) {
 					if (this.resubTimeoutMs && !this.isUnsubscribing) {
 						this.receivingData = true;
 						clearTimeout(this.timeoutId);
 						this.setTimeout();
 					}
-					this.currentSlothash = deserializeSlothash(slothashInfo.data);
+					this._currentSlothash = deserializeSlothash(slothashInfo.data);
 				}
 			},
 			this.commitment

package/src/swap/UnifiedSwapClient.ts

@@ -270,7 +270,7 @@ export class UnifiedSwapClient {
 					slippageBps,
 					swapMode: isExactOut ? TitanSwapMode.ExactOut : TitanSwapMode.ExactIn,
 					onlyDirectRoutes,
-					sizeConstraint: sizeConstraint || 1280 - 375, // MAX_TX_BYTE_SIZE - buffer for drift instructions
+					sizeConstraint: sizeConstraint || 1280 - 375, // MAX_TX_BYTE_SIZE - buffer for velocity instructions
 				});
 
 			swapInstructions = titanClient.getTitanInstructions({

package/src/swift/grpcSignedMsgUserAccountSubscriber.ts

@@ -10,7 +10,6 @@ import {
 
 export class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrdersAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;
-	override subscriber: grpcProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
 
 	constructor({
 		grpcConfigs,
@@ -23,8 +22,8 @@ export class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrder
 	}
 
 	public async subscribe(): Promise<void> {
-		if (!this.subscriber) {
-			this.subscriber =
+		if (!this._subscriber) {
+			this._subscriber =
 				await grpcProgramAccountSubscriber.create<SignedMsgUserOrdersAccount>(
 					this.grpcConfigs,
 					'SingedMsgUserOrdersAccountMap',
@@ -71,9 +70,9 @@ export class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrder
 	}
 
 	public async unsubscribe(): Promise<void> {
-		if (!this.subscriber) return;
-		await this.subscriber.unsubscribe();
-		this.subscriber = undefined;
+		if (!this._subscriber) return;
+		await this._subscriber.unsubscribe();
+		this._subscriber = undefined;
 		if (this.resyncTimeoutId !== undefined) {
 			clearTimeout(this.resyncTimeoutId);
 			this.resyncTimeoutId = undefined;

package/src/swift/signedMsgUserAccountSubscriber.ts

@@ -4,7 +4,6 @@ import { SignedMsgOrderId, SignedMsgUserOrdersAccount } from '../types';
 import { Commitment, Context, PublicKey } from '@solana/web3.js';
 import { ResubOpts } from '../accounts/types';
 import { VelocityClient } from '../velocityClient';
-import { AtLeastOne } from '../util/deprecatedAlias';
 import StrictEventEmitter from 'strict-event-emitter-types';
 import { EventEmitter } from 'events';
 
@@ -13,7 +12,7 @@ export type SignedMsgUserOrdersAccountSubscriberConfig = {
 	resubOpts?: ResubOpts;
 	decodeFn?: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
 	resyncIntervalMs?: number;
-} & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+} & { velocityClient: VelocityClient };
 
 export interface SignedMsgUserOrdersAccountSubscriberEvents {
 	onAccountUpdate: (
@@ -31,10 +30,6 @@ export interface SignedMsgUserOrdersAccountSubscriberEvents {
 
 export class SignedMsgUserOrdersAccountSubscriber {
 	protected velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	protected get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	protected commitment: Commitment;
 	protected resubOpts?: ResubOpts;
 	protected resyncTimeoutId?: ReturnType<typeof setTimeout>;
@@ -47,12 +42,20 @@ export class SignedMsgUserOrdersAccountSubscriber {
 		string,
 		{ slot: number; signedMsgUserOrdersAccount: SignedMsgUserOrdersAccount }
 	>();
-	mostRecentSlot: number;
+	mostRecentSlot = 0;
 
 	fetchPromise?: Promise<void>;
-	fetchPromiseResolver: () => void;
+	private fetchPromiseResolver: () => void = () => {};
 
-	protected subscriber: WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
+	protected _subscriber?: WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>;
+	protected get subscriber(): WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount> {
+		if (!this._subscriber) {
+			throw new Error(
+				'SignedMsgUserOrdersAccountSubscriber: subscriber accessed before subscribe()'
+			);
+		}
+		return this._subscriber;
+	}
 	public eventEmitter: StrictEventEmitter<
 		EventEmitter,
 		SignedMsgUserOrdersAccountSubscriberEvents
@@ -60,7 +63,6 @@ export class SignedMsgUserOrdersAccountSubscriber {
 
 	constructor({
 		velocityClient,
-		driftClient,
 		commitment,
 		resubOpts,
 		decodeFn,
@@ -69,7 +71,7 @@ export class SignedMsgUserOrdersAccountSubscriber {
 		this.commitment = commitment ?? 'confirmed';
 		this.resubOpts = resubOpts;
 		// Type-system guarantees at least one of the two is supplied.
-		this.velocityClient = (velocityClient ?? driftClient)!;
+		this.velocityClient = velocityClient!;
 		this.decodeFn =
 			decodeFn ??
 			(
@@ -84,9 +86,9 @@ export class SignedMsgUserOrdersAccountSubscriber {
 	}
 
 	public async subscribe(): Promise<void> {
-		if (!this.subscriber) {
+		if (!this._subscriber) {
 			const filters = [getSignedMsgUserOrdersFilter()];
-			this.subscriber =
+			this._subscriber =
 				new WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>(
 					'SingedMsgUserOrdersAccountMap',
 					'signedMsgUserOrders',
@@ -238,9 +240,9 @@ export class SignedMsgUserOrdersAccountSubscriber {
 	}
 
 	public async unsubscribe(): Promise<void> {
-		if (!this.subscriber) return;
-		await this.subscriber.unsubscribe();
-		this.subscriber = undefined;
+		if (!this._subscriber) return;
+		await this._subscriber.unsubscribe();
+		this._subscriber = undefined;
 		if (this.resyncTimeoutId !== undefined) {
 			clearTimeout(this.resyncTimeoutId);
 			this.resyncTimeoutId = undefined;

package/src/swift/swiftOrderSubscriber.ts

@@ -4,7 +4,6 @@ import {
 } from '../constants/perpMarkets';
 import { VelocityClient } from '../velocityClient';
 import { VelocityEnv } from '../config';
-import { AtLeastOne } from '../util/deprecatedAlias';
 import {
 	getUserAccountPublicKey,
 	getUserStatsAccountPublicKey,
@@ -33,16 +32,16 @@ type SwiftOrderSubscriberConfigBase = {
 	endpoint?: string;
 	marketIndexes: number[];
 	/**
-		In the future, this will be used for verifying $DRIFT stake as we add
+		In the future, this will be used for verifying $VELOCITY stake as we add
 		authentication for delegate signers
 		For now, pass a new keypair or a keypair to an empty wallet
 	*/
 	keypair: Keypair;
 };
 
-export type SwiftOrderSubscriberConfig = SwiftOrderSubscriberConfigBase &
-	AtLeastOne<'velocityEnv', 'driftEnv', VelocityEnv> &
-	AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type SwiftOrderSubscriberConfig = SwiftOrderSubscriberConfigBase & {
+	velocityEnv: VelocityEnv;
+} & { velocityClient: VelocityClient };
 
 /**
  * Swift order message received from WebSocket
@@ -74,12 +73,8 @@ export class SwiftOrderSubscriber {
 	private readonly heartbeatIntervalMs = 60000;
 	private ws: WebSocket | null = null;
 	private velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	private get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	public userAccountGetter?: AccountGetter; // In practice, this for now is just an OrderSubscriber or a UserMap
-	public onOrder: (
+	public onOrder?: (
 		orderMessageRaw: SwiftOrderMessage,
 		signedMessage:
 			| SignedMsgOrderParamsMessage
@@ -91,21 +86,21 @@ export class SwiftOrderSubscriber {
 
 	constructor(private config: SwiftOrderSubscriberConfig) {
 		// Type-system guarantees at least one of the two is supplied.
-		this.velocityClient = (config.velocityClient ?? config.driftClient)!;
+		this.velocityClient = config.velocityClient!;
 		this.userAccountGetter = config.userAccountGetter;
 	}
 
 	unsubscribe() {
 		if (this.subscribed) {
-			this.ws.removeAllListeners();
-			this.ws.terminate();
+			this.ws?.removeAllListeners();
+			this.ws?.terminate();
 			this.ws = null;
 			this.subscribed = false;
 		}
 	}
 
 	getSymbolForMarketIndex(marketIndex: number): string {
-		const env = this.config.velocityEnv ?? this.config.driftEnv;
+		const env = this.config.velocityEnv;
 		const markets = env === 'devnet' ? DevnetPerpMarkets : MainnetPerpMarkets;
 		return markets[marketIndex].symbol;
 	}
@@ -162,7 +157,7 @@ export class SwiftOrderSubscriber {
 	): Promise<void> {
 		this.onOrder = onOrder;
 
-		const env = this.config.velocityEnv ?? this.config.driftEnv;
+		const env = this.config.velocityEnv;
 		const endpoint =
 			this.config.endpoint ??
 			(env === 'devnet'
@@ -250,11 +245,8 @@ export class SwiftOrderSubscriber {
 			}, 5000);
 		});
 
-		ws.on('error', async (request, response) => {
-			console.error(
-				'WS closed from error, reconnecting in 1s:',
-				response.statusCode
-			);
+		ws.on('error', async (error: Error) => {
+			console.error('WS closed from error, reconnecting in 1s:', error);
 			setTimeout(() => {
 				if (this.heartbeatTimeout) clearTimeout(this.heartbeatTimeout);
 				this.reconnect();
@@ -348,8 +340,12 @@ export class SwiftOrderSubscriber {
 		}
 
 		console.log('Reconnecting to WebSocket...');
+		const onOrder = this.onOrder;
+		if (!onOrder) {
+			throw new Error('onOrder callback function must be set');
+		}
 		setTimeout(() => {
-			this.subscribe(this.onOrder);
+			this.subscribe(onOrder);
 		}, 1000);
 	}
 }

package/src/testClient.ts

@@ -7,7 +7,7 @@ import { VelocityClientConfig } from './velocityClientConfig';
 export class TestClient extends AdminClient {
 	public constructor(config: VelocityClientConfig) {
 		config.txVersion = 'legacy';
-		if (config.accountSubscription.type !== 'polling') {
+		if (config.accountSubscription?.type !== 'polling') {
 			throw new Error('Test client must be polling');
 		}
 		super(config);
@@ -30,7 +30,7 @@ export class TestClient extends AdminClient {
 			this.accountSubscriber as PollingVelocityClientAccountSubscriber
 		).accountLoader.mostRecentSlot;
 		await this.fetchAccounts();
-		while (lastFetchedSlot < slot) {
+		while (slot !== undefined && lastFetchedSlot < slot) {
 			await this.fetchAccounts();
 			lastFetchedSlot = (
 				this.accountSubscriber as PollingVelocityClientAccountSubscriber