@velocity-exchange/sdk 0.0.1 → 0.0.3

package/src/idl/drift.ts

@@ -5,7 +5,7 @@
  * IDL can be found at `target/idl/drift.json`.
  */
 export type Drift = {
-  "address": "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH",
+  "address": "vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P",
   "metadata": {
     "name": "drift",
     "version": "2.162.0",
@@ -2884,6 +2884,59 @@ export type Drift = {
       ],
       "args": []
     },
+    {
+      "name": "forceWipeAccountsDevnet",
+      "docs": [
+        "Devnet-only escape hatch: cleans up accounts stranded by a layout-breaking",
+        "program upgrade (or by a partial re-init). For each account passed via",
+        "`remaining_accounts`:",
+        "- drift-owned PDA → drain lamports (runtime GCs at end of tx)",
+        "- token-program owned vault (drift_signer close-authority) → CPI",
+        "`close_account`, rent refunded to admin",
+        "Admin gate reads State's first pubkey field at raw offset 8..40 so it",
+        "works regardless of the State layout currently on chain. `drift_signer_nonce`",
+        "must match `State.signer_nonce`; mismatch fails the token CPI signature.",
+        "Stripped from mainnet builds via `mainnet-beta`."
+      ],
+      "discriminator": [
+        105,
+        74,
+        87,
+        6,
+        166,
+        227,
+        138,
+        215
+      ],
+      "accounts": [
+        {
+          "name": "admin",
+          "writable": true,
+          "signer": true
+        },
+        {
+          "name": "state",
+          "docs": [
+            "(cold-)admin pubkey at offset 8..40."
+          ]
+        },
+        {
+          "name": "driftSigner",
+          "docs": [
+            "at CPI time when closing token vaults; ignored otherwise."
+          ]
+        },
+        {
+          "name": "tokenProgram"
+        }
+      ],
+      "args": [
+        {
+          "name": "driftSignerNonce",
+          "type": "u8"
+        }
+      ]
+    },
     {
       "name": "initialize",
       "discriminator": [

package/src/orderSubscriber/OrderSubscriber.ts

@@ -20,7 +20,11 @@ import { calculateOrderBaseAssetAmount } from '../math/orders';
 import { ZERO } from '../constants/numericConstants';
 
 export class OrderSubscriber {
-	driftClient: VelocityClient;
+	velocityClient: VelocityClient;
+	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+	public get driftClient(): VelocityClient {
+		return this.velocityClient;
+	}
 	usersAccounts = new Map<string, { slot: number; userAccount: UserAccount }>();
 	subscription: PollingSubscription | WebsocketSubscription | grpcSubscription;
 	commitment: Commitment;
@@ -36,7 +40,13 @@ export class OrderSubscriber {
 	fetchAllNonIdleUsers?: boolean;
 
 	constructor(config: OrderSubscriberConfig) {
-		this.driftClient = config.driftClient;
+		const velocityClient = config.velocityClient ?? config.driftClient;
+		if (!velocityClient) {
+			throw new Error(
+				'OrderSubscriber: velocityClient (or deprecated driftClient) must be provided'
+			);
+		}
+		this.velocityClient = velocityClient;
 		this.commitment = config.subscriptionConfig.commitment || 'processed';
 		if (config.subscriptionConfig.type === 'polling') {
 			this.subscription = new PollingSubscription({
@@ -72,9 +82,9 @@ export class OrderSubscriber {
 			this.decodeFn = (name, data) => decodeUser(data);
 		} else {
 			this.decodeFn = (
-				this.driftClient.program.account as any
+				this.velocityClient.program.account as any
 			).user.coder.accounts.decodeUnchecked.bind(
-				(this.driftClient.program.account as any).user.coder.accounts
+				(this.velocityClient.program.account as any).user.coder.accounts
 			);
 		}
 		this.eventEmitter = new EventEmitter();
@@ -100,7 +110,7 @@ export class OrderSubscriber {
 
 		try {
 			const rpcRequestArgs = [
-				this.driftClient.program.programId.toBase58(),
+				this.velocityClient.program.programId.toBase58(),
 				{
 					commitment: this.commitment,
 					filters,
@@ -111,7 +121,7 @@ export class OrderSubscriber {
 
 			const rpcJSONResponse: any =
 				// @ts-ignore
-				await this.driftClient.connection._rpcRequest(
+				await this.velocityClient.connection._rpcRequest(
 					'getProgramAccounts',
 					rpcRequestArgs
 				);
@@ -268,7 +278,7 @@ export class OrderSubscriber {
 
 	public async addPubkey(userAccountPublicKey: PublicKey): Promise<void> {
 		const accountInfo =
-			await this.driftClient.connection.getAccountInfoAndContext(
+			await this.velocityClient.connection.getAccountInfoAndContext(
 				userAccountPublicKey,
 				this.commitment
 			);

package/src/orderSubscriber/types.ts

@@ -4,7 +4,9 @@ import { VelocityClient } from '../velocityClient';
 import { GrpcConfigs } from '../accounts/types';
 
 export type OrderSubscriberConfig = {
-	driftClient: VelocityClient;
+	velocityClient?: VelocityClient;
+	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
+	driftClient?: VelocityClient;
 	subscriptionConfig:
 		| {
 				type: 'polling';

package/src/priorityFee/priorityFeeSubscriber.ts

@@ -22,7 +22,11 @@ export class PriorityFeeSubscriber {
 	connection: Connection;
 	frequencyMs: number;
 	addresses: string[];
-	driftMarkets?: VelocityMarketInfo[];
+	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();
@@ -54,7 +58,7 @@ export class PriorityFeeSubscriber {
 		this.addresses = config.addresses
 			? config.addresses.map((address) => address.toBase58())
 			: [];
-		this.driftMarkets = config.driftMarkets;
+		this.velocityMarkets = config.velocityMarkets ?? config.driftMarkets;
 
 		if (config.customStrategy) {
 			this.customStrategy = config.customStrategy;
@@ -78,7 +82,7 @@ export class PriorityFeeSubscriber {
 				} else {
 					this.heliusRpcUrl = config.heliusRpcUrl;
 				}
-			} else if (this.priorityFeeMethod === PriorityFeeMethod.DRIFT) {
+			} else if (this.priorityFeeMethod === PriorityFeeMethod.VELOCITY) {
 				this.velocityPriorityFeeEndpoint =
 					config.velocityPriorityFeeEndpoint ?? config.driftPriorityFeeEndpoint;
 			}
@@ -143,13 +147,13 @@ export class PriorityFeeSubscriber {
 	}
 
 	private async loadForDrift(): Promise<void> {
-		if (!this.driftMarkets) {
+		if (!this.velocityMarkets) {
 			return;
 		}
 		const sample = await fetchVelocityPriorityFee(
 			this.velocityPriorityFeeEndpoint!,
-			this.driftMarkets.map((m) => m.marketType),
-			this.driftMarkets.map((m) => m.marketIndex)
+			this.velocityMarkets.map((m) => m.marketType),
+			this.velocityMarkets.map((m) => m.marketIndex)
 		);
 		if (sample.length > 0) {
 			this.lastAvgStrategyResult = sample[HeliusPriorityLevel.MEDIUM];
@@ -223,7 +227,7 @@ export class PriorityFeeSubscriber {
 				await this.loadForSolana();
 			} else if (this.priorityFeeMethod === PriorityFeeMethod.HELIUS) {
 				await this.loadForHelius();
-			} else if (this.priorityFeeMethod === PriorityFeeMethod.DRIFT) {
+			} else if (this.priorityFeeMethod === PriorityFeeMethod.VELOCITY) {
 				await this.loadForDrift();
 			} else {
 				throw new Error(`${this.priorityFeeMethod} load not implemented`);
@@ -250,7 +254,7 @@ export class PriorityFeeSubscriber {
 		this.addresses = addresses.map((k) => k.toBase58());
 	}
 
-	public updateMarketTypeAndIndex(driftMarkets: VelocityMarketInfo[]) {
-		this.driftMarkets = driftMarkets;
+	public updateMarketTypeAndIndex(velocityMarkets: VelocityMarketInfo[]) {
+		this.velocityMarkets = velocityMarkets;
 	}
 }

package/src/priorityFee/priorityFeeSubscriberMap.ts

@@ -10,33 +10,31 @@ import {
 } from './types';
 
 /**
- * takes advantage of /batchPriorityFees endpoint from drift hosted priority fee service
+ * takes advantage of /batchPriorityFees endpoint from Velocity hosted priority fee service
  */
 export class PriorityFeeSubscriberMap {
 	frequencyMs: number;
 	intervalId?: ReturnType<typeof setTimeout>;
 
-	driftMarkets?: VelocityMarketInfo[];
-	velocityPriorityFeeEndpoint?: string;
+	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 | undefined {
+	public get driftPriorityFeeEndpoint(): string {
 		return this.velocityPriorityFeeEndpoint;
 	}
 	feesMap: Map<string, Map<number, VelocityPriorityFeeLevels>>; // marketType -> marketIndex -> priority fee
 
 	public constructor(config: PriorityFeeSubscriberMapConfig) {
-		this.frequencyMs = config.frequencyMs;
 		this.frequencyMs =
 			config.frequencyMs ?? DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS;
-		const endpoint =
-			config.velocityPriorityFeeEndpoint ?? config.driftPriorityFeeEndpoint;
-		if (!endpoint) {
-			throw new Error(
-				'PriorityFeeSubscriberMap: velocityPriorityFeeEndpoint (or deprecated driftPriorityFeeEndpoint) must be provided'
-			);
-		}
-		this.velocityPriorityFeeEndpoint = endpoint;
-		this.driftMarkets = config.driftMarkets;
+		// Type-system guarantees at least one of the two is supplied.
+		this.velocityPriorityFeeEndpoint = (config.velocityPriorityFeeEndpoint ??
+			config.driftPriorityFeeEndpoint)!;
+		this.velocityMarkets = config.velocityMarkets ?? config.driftMarkets;
 		this.feesMap = new Map<string, Map<number, VelocityPriorityFeeLevels>>();
 		this.feesMap.set('perp', new Map<number, VelocityPriorityFeeLevels>());
 		this.feesMap.set('spot', new Map<number, VelocityPriorityFeeLevels>());
@@ -68,22 +66,22 @@ export class PriorityFeeSubscriberMap {
 
 	public async load(): Promise<void> {
 		try {
-			if (!this.driftMarkets) {
+			if (!this.velocityMarkets) {
 				return;
 			}
 			const fees = await fetchVelocityPriorityFee(
-				this.velocityPriorityFeeEndpoint!,
-				this.driftMarkets.map((m) => m.marketType),
-				this.driftMarkets.map((m) => m.marketIndex)
+				this.velocityPriorityFeeEndpoint,
+				this.velocityMarkets.map((m) => m.marketType),
+				this.velocityMarkets.map((m) => m.marketIndex)
 			);
 			this.updateFeesMap(fees);
 		} catch (e) {
-			console.error('Error fetching drift priority fees', e);
+			console.error('Error fetching priority fees', e);
 		}
 	}
 
-	public updateMarketTypeAndIndex(driftMarkets: VelocityMarketInfo[]) {
-		this.driftMarkets = driftMarkets;
+	public updateMarketTypeAndIndex(velocityMarkets: VelocityMarketInfo[]) {
+		this.velocityMarkets = velocityMarkets;
 	}
 
 	public getPriorityFees(
@@ -96,22 +94,22 @@ export class PriorityFeeSubscriberMap {
 
 /** Example usage:
 async function main() {
-    const driftMarkets: VelocityMarketInfo[] = [
+    const velocityMarkets: VelocityMarketInfo[] = [
         { marketType: 'perp', marketIndex: 0 },
         { marketType: 'perp', marketIndex: 1 },
         { marketType: 'spot', marketIndex: 2 }
     ];
 
     const subscriber = new PriorityFeeSubscriberMap({
-        velocityPriorityFeeEndpoint: 'https://dlob.drift.trade',
+        velocityPriorityFeeEndpoint: 'https://dlob.velocity.trade',
         frequencyMs: 5000,
-        driftMarkets
+        velocityMarkets
     });
     await subscriber.subscribe();
 
     for (let i = 0; i < 20; i++) {
         await new Promise(resolve => setTimeout(resolve, 1000));
-        driftMarkets.forEach(market => {
+        velocityMarkets.forEach(market => {
             const fees = subscriber.getPriorityFees(market.marketType, market.marketIndex);
             console.log(`Priority fees for ${market.marketType} market ${market.marketIndex}:`, fees);
         });

package/src/priorityFee/types.ts

@@ -5,6 +5,7 @@ import {
 	VelocityMarketInfo,
 	VelocityPriorityFeeResponse,
 } from './velocityPriorityFeeMethod';
+import { AtLeastOne } from '../util/deprecatedAlias';
 
 export const DEFAULT_PRIORITY_FEE_MAP_FREQUENCY_MS = 10_000;
 
@@ -22,7 +23,7 @@ export interface PriorityFeeStrategy {
 export enum PriorityFeeMethod {
 	SOLANA = 'solana',
 	HELIUS = 'helius',
-	DRIFT = 'drift',
+	VELOCITY = 'velocity',
 }
 
 export type PriorityFeeSubscriberConfig = {
@@ -32,7 +33,9 @@ export type PriorityFeeSubscriberConfig = {
 	frequencyMs?: number;
 	/// addresses you plan to write lock, used to determine priority fees
 	addresses?: PublicKey[];
-	/// drift market type and index, optionally provide at initialization time if using priorityFeeMethod.DRIFT
+	/// 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;
@@ -42,7 +45,7 @@ export type PriorityFeeSubscriberConfig = {
 	slotsToCheck?: number;
 	/// url for helius rpc, required if using priorityFeeMethod.HELIUS
 	heliusRpcUrl?: string;
-	/// url for drift cached priority fee endpoint, required if using priorityFeeMethod.DRIFT
+	/// 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;
@@ -52,13 +55,15 @@ export type PriorityFeeSubscriberConfig = {
 	priorityFeeMultiplier?: number;
 };
 
-export type PriorityFeeSubscriberMapConfig = {
+type PriorityFeeSubscriberMapConfigBase = {
 	/// frequency to make RPC calls to update priority fee samples, in milliseconds
 	frequencyMs?: number;
-	/// drift market type and associated market index to query
+	/// 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 drift cached priority fee endpoint
-	velocityPriorityFeeEndpoint?: string;
-	/** @deprecated Use `velocityPriorityFeeEndpoint` instead. `driftPriorityFeeEndpoint` will be removed in a future major. */
-	driftPriorityFeeEndpoint?: string;
 };
+
+/// url for Velocity cached priority fee endpoint
+export type PriorityFeeSubscriberMapConfig = PriorityFeeSubscriberMapConfigBase &
+	AtLeastOne<'velocityPriorityFeeEndpoint', 'driftPriorityFeeEndpoint', string>;

package/src/swift/grpcSignedMsgUserAccountSubscriber.ts

@@ -1,10 +1,12 @@
-import { Commitment, Context, PublicKey } from '@solana/web3.js';
+import { Context, PublicKey } from '@solana/web3.js';
 import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubscriber';
-import { GrpcConfigs, ResubOpts } from '../accounts/types';
+import { GrpcConfigs } from '../accounts/types';
 import { SignedMsgUserOrdersAccount } from '../types';
 import { getSignedMsgUserOrdersFilter } from '../memcmp';
-import { SignedMsgUserOrdersAccountSubscriber } from './signedMsgUserAccountSubscriber';
-import { VelocityClient } from '../velocityClient';
+import {
+	SignedMsgUserOrdersAccountSubscriber,
+	SignedMsgUserOrdersAccountSubscriberConfig,
+} from './signedMsgUserAccountSubscriber';
 
 export class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrdersAccountSubscriber {
 	private grpcConfigs: GrpcConfigs;
@@ -12,26 +14,11 @@ export class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrder
 
 	constructor({
 		grpcConfigs,
-		driftClient,
-		commitment,
-		resubOpts,
-		decodeFn,
-		resyncIntervalMs,
-	}: {
+		...rest
+	}: SignedMsgUserOrdersAccountSubscriberConfig & {
 		grpcConfigs: GrpcConfigs;
-		driftClient: VelocityClient;
-		commitment?: Commitment;
-		resubOpts?: ResubOpts;
-		decodeFn?: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
-		resyncIntervalMs?: number;
 	}) {
-		super({
-			driftClient,
-			commitment,
-			resubOpts,
-			decodeFn,
-			resyncIntervalMs,
-		});
+		super(rest);
 		this.grpcConfigs = grpcConfigs;
 	}
 
@@ -42,7 +29,7 @@ export class grpcSignedMsgUserOrdersAccountSubscriber extends SignedMsgUserOrder
 					this.grpcConfigs,
 					'SingedMsgUserOrdersAccountMap',
 					'signedMsgUserOrders',
-					this.driftClient.program,
+					this.velocityClient.program,
 					this.decodeFn,
 					{
 						filters: [getSignedMsgUserOrdersFilter()],

package/src/swift/signedMsgUserAccountSubscriber.ts

@@ -4,9 +4,17 @@ 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';
 
+export type SignedMsgUserOrdersAccountSubscriberConfig = {
+	commitment?: Commitment;
+	resubOpts?: ResubOpts;
+	decodeFn?: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
+	resyncIntervalMs?: number;
+} & AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+
 export interface SignedMsgUserOrdersAccountSubscriberEvents {
 	onAccountUpdate: (
 		activeSignedMsgOrderIds: SignedMsgOrderId[],
@@ -22,7 +30,11 @@ export interface SignedMsgUserOrdersAccountSubscriberEvents {
 }
 
 export class SignedMsgUserOrdersAccountSubscriber {
-	protected driftClient: VelocityClient;
+	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,27 +59,23 @@ export class SignedMsgUserOrdersAccountSubscriber {
 	>;
 
 	constructor({
+		velocityClient,
 		driftClient,
 		commitment,
 		resubOpts,
 		decodeFn,
 		resyncIntervalMs,
-	}: {
-		driftClient: VelocityClient;
-		commitment?: Commitment;
-		resubOpts?: ResubOpts;
-		decodeFn?: (name: string, data: Buffer) => SignedMsgUserOrdersAccount;
-		resyncIntervalMs?: number;
-	}) {
+	}: SignedMsgUserOrdersAccountSubscriberConfig) {
 		this.commitment = commitment ?? 'confirmed';
 		this.resubOpts = resubOpts;
-		this.driftClient = driftClient;
+		// Type-system guarantees at least one of the two is supplied.
+		this.velocityClient = (velocityClient ?? driftClient)!;
 		this.decodeFn =
 			decodeFn ??
 			(
-				this.driftClient.program.account as any
+				this.velocityClient.program.account as any
 			).signedMsgUserOrders.coder.accounts.decodeUnchecked.bind(
-				(this.driftClient.program.account as any).signedMsgUserOrders.coder
+				(this.velocityClient.program.account as any).signedMsgUserOrders.coder
 					.accounts
 			);
 		this.resyncIntervalMs = resyncIntervalMs;
@@ -82,7 +90,7 @@ export class SignedMsgUserOrdersAccountSubscriber {
 				new WebSocketProgramAccountSubscriber<SignedMsgUserOrdersAccount>(
 					'SingedMsgUserOrdersAccountMap',
 					'signedMsgUserOrders',
-					this.driftClient.program,
+					this.velocityClient.program,
 					this.decodeFn,
 					{
 						filters,
@@ -139,8 +147,8 @@ export class SignedMsgUserOrdersAccountSubscriber {
 
 		try {
 			const rpcResponseAndContext =
-				await this.driftClient.connection.getProgramAccounts(
-					this.driftClient.program.programId,
+				await this.velocityClient.connection.getProgramAccounts(
+					this.velocityClient.program.programId,
 					{
 						commitment: this.commitment,
 						filters: [getSignedMsgUserOrdersFilter()],

package/src/swift/swiftOrderSubscriber.ts

@@ -4,6 +4,7 @@ import {
 } from '../constants/perpMarkets';
 import { VelocityClient } from '../velocityClient';
 import { VelocityEnv } from '../config';
+import { AtLeastOne } from '../util/deprecatedAlias';
 import {
 	getUserAccountPublicKey,
 	getUserStatsAccountPublicKey,
@@ -27,10 +28,8 @@ export interface AccountGetter {
 	mustGetUserAccount(publicKey: string): Promise<UserAccount>;
 }
 
-export type SwiftOrderSubscriberConfig = {
-	driftClient: VelocityClient;
+type SwiftOrderSubscriberConfigBase = {
 	userAccountGetter?: AccountGetter;
-	driftEnv: VelocityEnv;
 	endpoint?: string;
 	marketIndexes: number[];
 	/**
@@ -41,6 +40,10 @@ export type SwiftOrderSubscriberConfig = {
 	keypair: Keypair;
 };
 
+export type SwiftOrderSubscriberConfig = SwiftOrderSubscriberConfigBase &
+	AtLeastOne<'velocityEnv', 'driftEnv', VelocityEnv> &
+	AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+
 /**
  * Swift order message received from WebSocket
  */
@@ -70,7 +73,11 @@ export class SwiftOrderSubscriber {
 	private heartbeatTimeout: ReturnType<typeof setTimeout> | null = null;
 	private readonly heartbeatIntervalMs = 60000;
 	private ws: WebSocket | null = null;
-	private driftClient: VelocityClient;
+	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: (
 		orderMessageRaw: SwiftOrderMessage,
@@ -83,7 +90,8 @@ export class SwiftOrderSubscriber {
 	subscribed = false;
 
 	constructor(private config: SwiftOrderSubscriberConfig) {
-		this.driftClient = config.driftClient;
+		// Type-system guarantees at least one of the two is supplied.
+		this.velocityClient = (config.velocityClient ?? config.driftClient)!;
 		this.userAccountGetter = config.userAccountGetter;
 	}
 
@@ -97,10 +105,8 @@ export class SwiftOrderSubscriber {
 	}
 
 	getSymbolForMarketIndex(marketIndex: number): string {
-		const markets =
-			this.config.driftEnv === 'devnet'
-				? DevnetPerpMarkets
-				: MainnetPerpMarkets;
+		const env = this.config.velocityEnv ?? this.config.driftEnv;
+		const markets = env === 'devnet' ? DevnetPerpMarkets : MainnetPerpMarkets;
 		return markets[marketIndex].symbol;
 	}
 
@@ -156,10 +162,12 @@ export class SwiftOrderSubscriber {
 	): Promise<void> {
 		this.onOrder = onOrder;
 
+		const env = this.config.velocityEnv ?? this.config.driftEnv;
 		const endpoint =
-			this.config.endpoint || this.config.driftEnv === 'devnet'
+			this.config.endpoint ??
+			(env === 'devnet'
 				? 'wss://master.swift.drift.trade/ws'
-				: 'wss://swift.drift.trade/ws';
+				: 'wss://swift.drift.trade/ws');
 		const ws = new WebSocket(
 			endpoint + '?pubkey=' + this.config.keypair.publicKey.toBase58()
 		);
@@ -202,7 +210,7 @@ export class SwiftOrderSubscriber {
 							)
 						);
 					const signedMessage =
-						this.driftClient.decodeSignedMsgOrderParamsMessage(
+						this.velocityClient.decodeSignedMsgOrderParamsMessage(
 							signedMsgOrderParamsBuf,
 							isDelegateSigner
 						);
@@ -279,7 +287,7 @@ export class SwiftOrderSubscriber {
 					).slice(0, 8)
 				)
 			);
-		const signedMessage = this.driftClient.decodeSignedMsgOrderParamsMessage(
+		const signedMessage = this.velocityClient.decodeSignedMsgOrderParamsMessage(
 			signedMsgOrderParamsBuf,
 			isDelegateSigner
 		);
@@ -289,14 +297,14 @@ export class SwiftOrderSubscriber {
 		const takerUserPubkey = isDelegateSigner
 			? (signedMessage as SignedMsgOrderParamsDelegateMessage).takerPubkey
 			: await getUserAccountPublicKey(
-					this.driftClient.program.programId,
+					this.velocityClient.program.programId,
 					takerAuthority,
 					(signedMessage as SignedMsgOrderParamsMessage).subAccountId
 			  );
 		const takerUserAccount = await this.userAccountGetter.mustGetUserAccount(
 			takerUserPubkey.toString()
 		);
-		const ixs = await this.driftClient.getPlaceAndMakeSignedMsgPerpOrderIxs(
+		const ixs = await this.velocityClient.getPlaceAndMakeSignedMsgPerpOrderIxs(
 			{
 				orderParams: signedMsgOrderParamsBuf,
 				signature: Buffer.from(orderMessageRaw.order_signature, 'base64'),
@@ -306,7 +314,7 @@ export class SwiftOrderSubscriber {
 				taker: takerUserPubkey,
 				takerUserAccount,
 				takerStats: getUserStatsAccountPublicKey(
-					this.driftClient.program.programId,
+					this.velocityClient.program.programId,
 					takerUserAccount.authority
 				),
 				signingAuthority: signingAuthority,