@velocity-exchange/sdk 0.0.5 → 0.2.0

package/src/auctionSubscriber/auctionSubscriber.ts

@@ -10,33 +10,29 @@ import { ResubOpts } from '../accounts/types';
 
 export class AuctionSubscriber {
 	private velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	private get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	private opts: ConfirmOptions;
 	private resubOpts?: ResubOpts;
 
 	eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
-	private subscriber: WebSocketProgramAccountSubscriber<UserAccount>;
+	private subscriber?: WebSocketProgramAccountSubscriber<UserAccount>;
 
 	constructor({
 		velocityClient,
-		driftClient,
 		opts,
 		resubTimeoutMs,
 		logResubMessages,
 	}: AuctionSubscriberConfig) {
 		// Type-system guarantees at least one of the two is supplied.
-		this.velocityClient = (velocityClient ?? driftClient)!;
-		this.opts = opts || this.velocityClient.opts;
+		this.velocityClient = velocityClient!;
+		this.opts = opts || this.velocityClient.opts || {};
 		this.eventEmitter = new EventEmitter();
 		this.resubOpts = { resubTimeoutMs, logResubMessages };
 	}
 
 	public async subscribe() {
-		if (!this.subscriber) {
-			this.subscriber = new WebSocketProgramAccountSubscriber<UserAccount>(
+		let subscriber = this.subscriber;
+		if (!subscriber) {
+			subscriber = new WebSocketProgramAccountSubscriber<UserAccount>(
 				'AuctionSubscriber',
 				'user',
 				this.velocityClient.program,
@@ -51,9 +47,10 @@ export class AuctionSubscriber {
 				},
 				this.resubOpts
 			);
+			this.subscriber = subscriber;
 		}
 
-		await this.subscriber.subscribe(
+		await subscriber.subscribe(
 			(accountId: PublicKey, data: UserAccount, context: Context) => {
 				this.eventEmitter.emit(
 					'onAccountUpdate',

package/src/auctionSubscriber/auctionSubscriberGrpc.ts

@@ -11,36 +11,37 @@ import { grpcProgramAccountSubscriber } from '../accounts/grpcProgramAccountSubs
 
 export class AuctionSubscriberGrpc {
 	private velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	private get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	private opts: ConfirmOptions;
 	private resubOpts?: ResubOpts;
 	private grpcConfigs?: GrpcConfigs;
 
 	eventEmitter: StrictEventEmitter<EventEmitter, AuctionSubscriberEvents>;
-	private subscriber: WebSocketProgramAccountSubscriber<UserAccount>;
+	private subscriber?: WebSocketProgramAccountSubscriber<UserAccount>;
 
 	constructor({
 		velocityClient,
-		driftClient,
 		opts,
 		grpcConfigs,
 		resubTimeoutMs,
 		logResubMessages,
 	}: AuctionSubscriberConfig) {
 		// Type-system guarantees at least one of the two is supplied.
-		this.velocityClient = (velocityClient ?? driftClient)!;
-		this.opts = opts || this.velocityClient.opts;
+		this.velocityClient = velocityClient!;
+		this.opts = opts || this.velocityClient.opts || {};
 		this.eventEmitter = new EventEmitter();
 		this.resubOpts = { resubTimeoutMs, logResubMessages };
 		this.grpcConfigs = grpcConfigs;
 	}
 
 	public async subscribe() {
-		if (!this.subscriber) {
-			this.subscriber = await grpcProgramAccountSubscriber.create<UserAccount>(
+		let subscriber = this.subscriber;
+		if (!subscriber) {
+			if (!this.grpcConfigs) {
+				throw new Error(
+					'grpcConfigs must be provided to use AuctionSubscriberGrpc'
+				);
+			}
+			subscriber = await grpcProgramAccountSubscriber.create<UserAccount>(
 				this.grpcConfigs,
 				'AuctionSubscriber',
 				'user',
@@ -55,9 +56,10 @@ export class AuctionSubscriberGrpc {
 				},
 				this.resubOpts
 			);
+			this.subscriber = subscriber;
 		}
 
-		await this.subscriber.subscribe(
+		await subscriber.subscribe(
 			(accountId: PublicKey, data: UserAccount, context: Context) => {
 				this.eventEmitter.emit(
 					'onAccountUpdate',

package/src/auctionSubscriber/types.ts

@@ -2,7 +2,6 @@ import { GrpcConfigs } from '../accounts/types';
 import { VelocityClient } from '../velocityClient';
 import { UserAccount } from '../types';
 import { ConfirmOptions, PublicKey } from '@solana/web3.js';
-import { AtLeastOne } from '../util/deprecatedAlias';
 
 type AuctionSubscriberConfigBase = {
 	opts?: ConfirmOptions;
@@ -11,8 +10,9 @@ type AuctionSubscriberConfigBase = {
 	grpcConfigs?: GrpcConfigs;
 };
 
-export type AuctionSubscriberConfig = AuctionSubscriberConfigBase &
-	AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type AuctionSubscriberConfig = AuctionSubscriberConfigBase & {
+	velocityClient: VelocityClient;
+};
 
 export interface AuctionSubscriberEvents {
 	onAccountUpdate: (

package/src/bankrun/bankrunConnection.ts

@@ -43,7 +43,7 @@ export type Connection = SolanaConnection | BankrunConnection;
 
 type BankrunTransactionMetaNormalized = {
 	logMessages: string[];
-	err: TransactionError;
+	err: TransactionError | null;
 };
 
 type BankrunTransactionRespose = {
@@ -159,7 +159,15 @@ export class BankrunConnection {
 		TransactionSignature,
 		BanksTransactionResultWithMeta
 	> = new Map();
-	private clock: Clock;
+	private _clock?: Clock;
+	private get clock(): Clock {
+		if (!this._clock) {
+			throw new Error(
+				'BankrunConnection: clock accessed before updateSlotAndClock()'
+			);
+		}
+		return this._clock;
+	}
 
 	private nextClientSubscriptionId = 0;
 	private onLogCallbacks = new Map<number, LogsCallback>();
@@ -190,13 +198,16 @@ export class BankrunConnection {
 
 	async getTokenAccount(publicKey: PublicKey): Promise<Account> {
 		const info = await this.getAccountInfo(publicKey);
+		if (info === null) {
+			throw new Error(`Account not found: ${publicKey.toBase58()}`);
+		}
 		return unpackAccount(publicKey, info, info.owner);
 	}
 
 	async getMultipleAccountsInfo(
 		publicKeys: PublicKey[],
 		_commitmentOrConfig?: Commitment
-	): Promise<AccountInfo<Buffer>[]> {
+	): Promise<(AccountInfo<Buffer> | null)[]> {
 		const accountInfos = [];
 
 		for (const publicKey of publicKeys) {
@@ -246,9 +257,18 @@ export class BankrunConnection {
 			: await internal.tryProcessLegacyTransaction(serialized);
 		const banksTransactionMeta = new BanksTransactionResultWithMeta(inner);
 
-		const signature = isVersioned
-			? bs58.encode((tx as VersionedTransaction).signatures[0])
-			: bs58.encode((tx as Transaction).signatures[0].signature);
+		let signature: string;
+		if (isVersioned) {
+			signature = bs58.encode((tx as VersionedTransaction).signatures[0]);
+		} else {
+			const legacySignature = (tx as Transaction).signatures[0].signature;
+			if (legacySignature === null) {
+				throw new Error(
+					'BankrunConnection: transaction is missing its first signature'
+				);
+			}
+			signature = bs58.encode(legacySignature);
+		}
 
 		if (banksTransactionMeta.result) {
 			if (
@@ -273,9 +293,14 @@ export class BankrunConnection {
 		}
 		let finalizedCount = 0;
 		while (finalizedCount < 10) {
-			const signatureStatus = (await this.getSignatureStatus(signature)).value
-				.confirmationStatus;
-			if (signatureStatus.toString() == '"finalized"') {
+			const statusValue = (await this.getSignatureStatus(signature)).value;
+			if (statusValue === null) {
+				throw new Error(
+					`BankrunConnection: no signature status for ${signature}`
+				);
+			}
+			const signatureStatus = statusValue.confirmationStatus;
+			if (signatureStatus?.toString() == '"finalized"') {
 				finalizedCount += 1;
 			}
 		}
@@ -291,14 +316,16 @@ export class BankrunConnection {
 		if (this.onLogCallbacks.size > 0) {
 			const transaction = await this.getTransaction(signature);
 
-			const context = { slot: transaction.slot };
-			const logs = {
-				logs: transaction.meta.logMessages,
-				err: transaction.meta.err,
-				signature,
-			};
-			for (const logCallback of this.onLogCallbacks.values()) {
-				logCallback(logs, context);
+			if (transaction !== null) {
+				const context = { slot: transaction.slot };
+				const logs = {
+					logs: transaction.meta.logMessages,
+					err: transaction.meta.err,
+					signature,
+				};
+				for (const logCallback of this.onLogCallbacks.values()) {
+					logCallback(logs, context);
+				}
 			}
 		}
 
@@ -307,6 +334,9 @@ export class BankrunConnection {
 			callback,
 		] of this.onAccountChangeCallbacks.values()) {
 			const accountInfo = await this.getParsedAccountInfo(publicKey);
+			if (accountInfo.value === null) {
+				continue;
+			}
 			callback(accountInfo.value, accountInfo.context);
 		}
 
@@ -326,7 +356,7 @@ export class BankrunConnection {
 			currentClock.unixTimestamp + BigInt(1)
 		);
 		this.context.setClock(newClock);
-		this.clock = newClock;
+		this._clock = newClock;
 	}
 
 	getTime(): number {
@@ -335,7 +365,7 @@ export class BankrunConnection {
 
 	async getParsedAccountInfo(
 		publicKey: PublicKey
-	): Promise<RpcResponseAndContext<AccountInfo<Buffer>>> {
+	): Promise<RpcResponseAndContext<null | AccountInfo<Buffer>>> {
 		const accountInfoBytes = await this._banksClient.getAccount(publicKey);
 		if (accountInfoBytes === null) {
 			return {
@@ -360,6 +390,9 @@ export class BankrunConnection {
 		const blockhashAndBlockheight = await this._banksClient.getLatestBlockhash(
 			commitment
 		);
+		if (blockhashAndBlockheight === null) {
+			throw new Error('Failed to get latest blockhash');
+		}
 		return {
 			blockhash: blockhashAndBlockheight[0],
 			lastValidBlockHeight: Number(blockhashAndBlockheight[1]),
@@ -427,6 +460,9 @@ export class BankrunConnection {
 		const transactionStatus = await this._banksClient.getTransactionStatus(
 			signature
 		);
+		if (transactionStatus === null) {
+			throw new Error(`tx has no status: ${signature}`);
+		}
 		if (txMeta.meta === null) {
 			throw new Error(`tx has no meta: ${JSON.stringify(txMeta)}`);
 		}
@@ -440,24 +476,27 @@ export class BankrunConnection {
 		};
 	}
 
-	findComputeUnitConsumption(signature: string): bigint {
+	private getTransactionMetaOrThrow(
+		signature: string
+	): NonNullable<BanksTransactionResultWithMeta['meta']> {
 		const txMeta = this.transactionToMeta.get(
 			signature as TransactionSignature
 		);
 		if (txMeta === undefined) {
 			throw new Error('Transaction not found');
 		}
-		return txMeta.meta.computeUnitsConsumed;
+		if (txMeta.meta === null) {
+			throw new Error(`tx has no meta: ${JSON.stringify(txMeta)}`);
+		}
+		return txMeta.meta;
+	}
+
+	findComputeUnitConsumption(signature: string): bigint {
+		return this.getTransactionMetaOrThrow(signature).computeUnitsConsumed;
 	}
 
 	printTxLogs(signature: string): void {
-		const txMeta = this.transactionToMeta.get(
-			signature as TransactionSignature
-		);
-		if (txMeta === undefined) {
-			throw new Error('Transaction not found');
-		}
-		console.log(txMeta.meta.logMessages);
+		console.log(this.getTransactionMetaOrThrow(signature).logMessages);
 	}
 
 	async simulateTransaction(
@@ -467,22 +506,27 @@ export class BankrunConnection {
 		const simulationResult = await this._banksClient.simulateTransaction(
 			transaction
 		);
-		const returnDataProgramId =
-			simulationResult.meta?.returnData?.programId.toBase58();
-		const returnDataNormalized = Buffer.from(
-			simulationResult.meta?.returnData?.data
-		).toString('base64');
-		const returnData: TransactionReturnData = {
-			programId: returnDataProgramId,
-			data: [returnDataNormalized, 'base64'],
-		};
+		const meta = simulationResult.meta;
+		if (meta === null) {
+			throw new Error('BankrunConnection: simulation returned no meta');
+		}
+		let returnData: TransactionReturnData | undefined;
+		if (meta.returnData !== null) {
+			const returnDataNormalized = Buffer.from(meta.returnData.data).toString(
+				'base64'
+			);
+			returnData = {
+				programId: meta.returnData.programId.toBase58(),
+				data: [returnDataNormalized, 'base64'],
+			};
+		}
 		return {
 			context: { slot: Number(await this._banksClient.getSlot()) },
 			value: {
 				err: simulationResult.result,
-				logs: simulationResult.meta.logMessages,
+				logs: meta.logMessages,
 				accounts: undefined,
-				unitsConsumed: Number(simulationResult.meta.computeUnitsConsumed),
+				unitsConsumed: Number(meta.computeUnitsConsumed),
 				returnData,
 			},
 		};

package/src/blockhashSubscriber/BlockhashSubscriber.ts

@@ -9,7 +9,7 @@ import { BlockhashSubscriberConfig } from './types';
 export class BlockhashSubscriber {
 	private connection: Connection;
 	private isSubscribed = false;
-	private latestBlockHeight: number;
+	private latestBlockHeight: number | undefined;
 	private latestBlockHeightContext: Context | undefined;
 	private blockhashes: Array<BlockhashWithExpiryBlockHeight> = [];
 	private updateBlockhashIntervalId: ReturnType<typeof setTimeout> | undefined;
@@ -31,7 +31,7 @@ export class BlockhashSubscriber {
 		return this.blockhashes.length;
 	}
 
-	getLatestBlockHeight(): number {
+	getLatestBlockHeight(): number | undefined {
 		return this.latestBlockHeight;
 	}
 
@@ -67,9 +67,10 @@ export class BlockhashSubscriber {
 	}
 
 	pruneBlockhashes() {
-		if (this.latestBlockHeight) {
+		if (this.latestBlockHeight !== undefined) {
+			const latestBlockHeight = this.latestBlockHeight;
 			this.blockhashes = this.blockhashes.filter(
-				(blockhash) => blockhash.lastValidBlockHeight > this.latestBlockHeight!
+				(blockhash) => blockhash.lastValidBlockHeight > latestBlockHeight
 			);
 		}
 	}

package/src/clock/clockSubscriber.ts

@@ -14,17 +14,17 @@ export interface ClockSubscriberEvent {
 }
 
 export class ClockSubscriber {
-	private _latestSlot: number;
-	private _currentTs: number;
-	private subscriptionId: number;
+	private _latestSlot?: number;
+	private _currentTs?: number;
+	private subscriptionId?: number;
 	commitment: Commitment;
 	eventEmitter: StrictEventEmitter<EventEmitter, ClockSubscriberEvent>;
 
-	public get latestSlot(): number {
+	public get latestSlot(): number | undefined {
 		return this._latestSlot;
 	}
 
-	public get currentTs(): number {
+	public get currentTs(): number | undefined {
 		return this._currentTs;
 	}
 
@@ -41,7 +41,7 @@ export class ClockSubscriber {
 		this.eventEmitter = new EventEmitter();
 		this.resubTimeoutMs = config?.resubTimeoutMs;
 		this.commitment = config?.commitment || 'confirmed';
-		if (this.resubTimeoutMs < 1000) {
+		if (this.resubTimeoutMs !== undefined && this.resubTimeoutMs < 1000) {
 			console.log(
 				'resubTimeoutMs should be at least 1000ms to avoid spamming resub'
 			);
@@ -63,12 +63,13 @@ export class ClockSubscriber {
 						this.setTimeout();
 					}
 					this._latestSlot = context.slot;
-					this._currentTs = new BN(
+					const currentTs = new BN(
 						acctInfo.data.subarray(32, 39),
 						undefined,
 						'le'
 					).toNumber();
-					this.eventEmitter.emit('clockUpdate', this.currentTs);
+					this._currentTs = currentTs;
+					this.eventEmitter.emit('clockUpdate', currentTs);
 				}
 			},
 			this.commitment
@@ -98,7 +99,7 @@ export class ClockSubscriber {
 		}, this.resubTimeoutMs);
 	}
 
-	public getUnixTs(): number {
+	public getUnixTs(): number | undefined {
 		return this.currentTs;
 	}
 

package/src/config.ts

@@ -15,18 +15,12 @@ import {
 import { OracleInfo } from './oracles/types';
 import { Program, ProgramAccount } from './isomorphic/anchor';
 import { getOracleId } from './oracles/oracleId';
-import { Drift } from './idl/drift';
+import { Velocity } from './idl/velocity';
 
-export type VelocityProgram = Program<Drift>;
-
-/** @deprecated Use `VelocityProgram` instead. `DriftProgram` will be removed in a future major. */
-export type DriftProgram = VelocityProgram;
+export type VelocityProgram = Program<Velocity>;
 
 export type VelocityEnv = 'devnet' | 'mainnet-beta';
 
-/** @deprecated Use `VelocityEnv` instead. `DriftEnv` will be removed in a future major. */
-export type DriftEnv = VelocityEnv;
-
 /** Widened env type accepted by `initialize()`; `'master'` is a legacy alias for `'devnet'`. */
 export type LegacyVelocityEnv = VelocityEnv | 'master';
 
@@ -34,12 +28,8 @@ export interface VelocityConfig {
 	ENV: VelocityEnv;
 	PYTH_ORACLE_MAPPING_ADDRESS: string;
 	VELOCITY_PROGRAM_ID: string;
-	/** @deprecated Use `VELOCITY_PROGRAM_ID` instead. Kept on the config shape so existing callers reading this field continue to work; will be removed in a future major. */
-	DRIFT_PROGRAM_ID: string;
 	JIT_PROXY_PROGRAM_ID?: string;
 	VELOCITY_ORACLE_RECEIVER_ID: string;
-	/** @deprecated Use `VELOCITY_ORACLE_RECEIVER_ID` instead. Kept on the config shape so existing callers reading this field continue to work; will be removed in a future major. */
-	DRIFT_ORACLE_RECEIVER_ID: string;
 	QUOTE_MINT_ADDRESS: string;
 	V2_ALPHA_TICKET_MINT_ADDRESS: string;
 	PERP_MARKETS: PerpMarketConfig[];
@@ -50,28 +40,18 @@ export interface VelocityConfig {
 	SB_ON_DEMAND_PID: PublicKey;
 }
 
-/** @deprecated Use `VelocityConfig` instead. `DriftConfig` will be removed in a future major. */
-export type DriftConfig = VelocityConfig;
-
 export const VELOCITY_PROGRAM_ID =
-	'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
-
-/** @deprecated Use `VELOCITY_PROGRAM_ID` instead. `DRIFT_PROGRAM_ID` will be removed in a future major. */
-export const DRIFT_PROGRAM_ID = VELOCITY_PROGRAM_ID;
+	'vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P';
 
 export const VELOCITY_DEVNET_PROGRAM_ID =
 	'vELoC1audYbSYVRXn1vPaV8Axoa9oU6BYmNGZZBDZ1P';
 
-/** @deprecated Use `VELOCITY_DEVNET_PROGRAM_ID` instead. `DRIFT_DEVNET_PROGRAM_ID` will be removed in a future major. */
-export const DRIFT_DEVNET_PROGRAM_ID = VELOCITY_DEVNET_PROGRAM_ID;
-
 export const VELOCITY_ORACLE_RECEIVER_ID =
 	'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';
 
-/** @deprecated Use `VELOCITY_ORACLE_RECEIVER_ID` instead. `DRIFT_ORACLE_RECEIVER_ID` will be removed in a future major. */
-export const DRIFT_ORACLE_RECEIVER_ID = VELOCITY_ORACLE_RECEIVER_ID;
-export const PTYH_LAZER_PROGRAM_ID =
+export const PYTH_LAZER_PROGRAM_ID =
 	'pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt';
+
 export const SB_ON_DEMAND_DEVNET_PID = new PublicKey(
 	'Aio4gaXjXzJNVLtzwtNVmSqGKpANtXhybbkhtAC94ji2'
 );
@@ -92,8 +72,6 @@ export const configs: { [key in VelocityEnv]: VelocityConfig } = {
 		ENV: 'devnet',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'BmA9Z6FjioHJPpjT39QazZyhDRUdZy2ezwx4GiDdE2u2',
 		VELOCITY_PROGRAM_ID: VELOCITY_DEVNET_PROGRAM_ID,
-		/** @deprecated Read `VELOCITY_PROGRAM_ID` instead. */
-		DRIFT_PROGRAM_ID: VELOCITY_DEVNET_PROGRAM_ID,
 		JIT_PROXY_PROGRAM_ID: 'J1TnP8zvVxbtF5KFp5xRmWuvG9McnhzmBd9XGfCyuxFP',
 		QUOTE_MINT_ADDRESS: '8FfvSRKMZRDHrCBy142XMUXrKEkXnxDQ4YmJv7xbAw8Q',
 		V2_ALPHA_TICKET_MINT_ADDRESS:
@@ -104,16 +82,12 @@ export const configs: { [key in VelocityEnv]: VelocityConfig } = {
 		MARKET_LOOKUP_TABLE: 'FaMS3U4uBojvGn5FSDEPimddcXsCfwkKsFgMVVnDdxGb',
 		MARKET_LOOKUP_TABLES: ['FaMS3U4uBojvGn5FSDEPimddcXsCfwkKsFgMVVnDdxGb'],
 		VELOCITY_ORACLE_RECEIVER_ID,
-		/** @deprecated Read `VELOCITY_ORACLE_RECEIVER_ID` instead. */
-		DRIFT_ORACLE_RECEIVER_ID: VELOCITY_ORACLE_RECEIVER_ID,
 		SB_ON_DEMAND_PID: SB_ON_DEMAND_DEVNET_PID,
 	},
 	'mainnet-beta': {
 		ENV: 'mainnet-beta',
 		PYTH_ORACLE_MAPPING_ADDRESS: 'AHtgzX45WTKfkPG53L6WYhGEXwQkN1BVknET3sVsLL8J',
 		VELOCITY_PROGRAM_ID,
-		/** @deprecated Read `VELOCITY_PROGRAM_ID` instead. */
-		DRIFT_PROGRAM_ID: VELOCITY_PROGRAM_ID,
 		JIT_PROXY_PROGRAM_ID: 'J1TnP8zvVxbtF5KFp5xRmWuvG9McnhzmBd9XGfCyuxFP',
 		QUOTE_MINT_ADDRESS: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
 		V2_ALPHA_TICKET_MINT_ADDRESS:
@@ -127,8 +101,6 @@ export const configs: { [key in VelocityEnv]: VelocityConfig } = {
 			'EiWSskK5HXnBTptiS5DH6gpAJRVNQ3cAhTKBGaiaysAb',
 		],
 		VELOCITY_ORACLE_RECEIVER_ID,
-		/** @deprecated Read `VELOCITY_ORACLE_RECEIVER_ID` instead. */
-		DRIFT_ORACLE_RECEIVER_ID: VELOCITY_ORACLE_RECEIVER_ID,
 		SB_ON_DEMAND_PID: SB_ON_DEMAND_MAINNET_PID,
 	},
 };
@@ -144,24 +116,6 @@ export const getConfig = (): VelocityConfig => currentConfig;
  * @param props
  * @returns
  */
-/**
- * Mirror a canonical/deprecated alias pair so the resolved config carries the
- * same value under both keys regardless of which one the caller overrode.
- */
-const mirrorAlias = <
-	K1 extends keyof VelocityConfig,
-	K2 extends keyof VelocityConfig,
->(
-	merged: VelocityConfig,
-	override: Partial<VelocityConfig>,
-	canon: K1,
-	deprecated: K2
-): void => {
-	const value = override[canon] ?? override[deprecated] ?? merged[canon];
-	(merged[canon] as VelocityConfig[K1]) = value as VelocityConfig[K1];
-	(merged[deprecated] as VelocityConfig[K2]) = value as VelocityConfig[K2];
-};
-
 export const initialize = (props: {
 	env: LegacyVelocityEnv;
 	overrideEnv?: Partial<VelocityConfig>;
@@ -169,17 +123,8 @@ export const initialize = (props: {
 	const override = props.overrideEnv ?? {};
 	const normalizedEnv: VelocityEnv =
 		props.env === 'master' ? 'devnet' : props.env;
-	const merged: VelocityConfig = { ...configs[normalizedEnv], ...override };
-
-	mirrorAlias(merged, override, 'VELOCITY_PROGRAM_ID', 'DRIFT_PROGRAM_ID');
-	mirrorAlias(
-		merged,
-		override,
-		'VELOCITY_ORACLE_RECEIVER_ID',
-		'DRIFT_ORACLE_RECEIVER_ID'
-	);
 
-	currentConfig = merged;
+	currentConfig = { ...configs[normalizedEnv], ...override };
 	return currentConfig;
 };
 
@@ -193,9 +138,13 @@ export function getMarketsAndOraclesForSubscription(
 	oracleInfos: OracleInfo[];
 } {
 	const perpMarketsToUse =
-		perpMarkets?.length > 0 ? perpMarkets : PerpMarkets[env];
+		perpMarkets !== undefined && perpMarkets.length > 0
+			? perpMarkets
+			: PerpMarkets[env];
 	const spotMarketsToUse =
-		spotMarkets?.length > 0 ? spotMarkets : SpotMarkets[env];
+		spotMarkets !== undefined && spotMarkets.length > 0
+			? spotMarkets
+			: SpotMarkets[env];
 
 	const perpMarketIndexes = [];
 	const spotMarketIndexes = [];
@@ -247,13 +196,10 @@ export async function findAllMarketAndOracles(
 	for (const perpMarketProgramAccount of perpMarketProgramAccounts) {
 		const perpMarket = perpMarketProgramAccount.account as PerpMarketAccount;
 		perpMarketIndexes.push(perpMarket.marketIndex);
-		oracleInfos.set(
-			getOracleId(perpMarket.amm.oracle, perpMarket.amm.oracleSource),
-			{
-				publicKey: perpMarket.amm.oracle,
-				source: perpMarket.amm.oracleSource,
-			}
-		);
+		oracleInfos.set(getOracleId(perpMarket.oracle, perpMarket.oracleSource), {
+			publicKey: perpMarket.oracle,
+			source: perpMarket.oracleSource,
+		});
 	}
 
 	for (const spotMarketProgramAccount of spotMarketProgramAccounts) {

package/src/constants/index.ts

@@ -1,9 +1,8 @@
 /**
  * Protocol constants: numeric precision bases, market indices, transaction size limits,
- * insurance fund parameters, and perp/spot market config arrays.
+ * and perp/spot market config arrays.
  * Import specific submodules to avoid pulling in unused market lists.
  */
-export * from './insuranceFund';
 export * from './numericConstants';
 export * from './perpMarkets';
 export * from './spotMarkets';

package/src/constants/numericConstants.ts

@@ -15,7 +15,6 @@ export const NINE = new BN(9);
 export const TEN = new BN(10);
 export const TEN_THOUSAND = new BN(10000);
 export const BN_MAX = new BN(Number.MAX_SAFE_INTEGER);
-export const TEN_MILLION = TEN_THOUSAND.mul(TEN_THOUSAND);
 
 export const MAX_LEVERAGE = new BN(5);
 export const MAX_LEVERAGE_ORDER_SIZE = new BN('18446744073709551615');
@@ -85,6 +84,9 @@ export const MARGIN_PRECISION = TEN_THOUSAND;
 export const BID_ASK_SPREAD_PRECISION = new BN(1000000); // 10^6
 export const LIQUIDATION_PCT_PRECISION = TEN_THOUSAND;
 export const FUNDING_RATE_OFFSET_DENOMINATOR = new BN(3333);
+export const FUNDING_RATE_OFFSET_PERCENTAGE = FUNDING_RATE_PRECISION.div(
+	FUNDING_RATE_OFFSET_DENOMINATOR
+);
 export const FUNDING_RATE_CLAMP_DENOMINATOR = new BN(2000);
 export const PRICE_TIMES_AMM_TO_QUOTE_PRECISION_RATIO = PRICE_PRECISION.mul(
 	AMM_TO_QUOTE_PRECISION_RATIO
@@ -95,7 +97,6 @@ export const ONE_HOUR = new BN(60 * 60);
 export const ONE_YEAR = new BN(31536000);
 
 export const QUOTE_SPOT_MARKET_INDEX = 0;
-export const GOV_SPOT_MARKET_INDEX = 15;
 
 export const LAMPORTS_PRECISION = new BN(LAMPORTS_PER_SOL);
 export const LAMPORTS_EXP = new BN(Math.log10(LAMPORTS_PER_SOL));
@@ -115,5 +116,4 @@ export const DUST_POSITION_SIZE = QUOTE_PRECISION.divn(100); // Dust position is
 export const GET_MULTIPLE_ACCOUNTS_CHUNK_SIZE = 99;
 
 // integer constants
-export const MAX_I64 = BigNum.fromPrint('9223372036854775807').val;
 export const MIN_I64 = BigNum.fromPrint('-9223372036854775808').val;