@velocity-exchange/sdk 0.0.3 → 0.1.0

package/src/adminClient.ts

@@ -95,7 +95,7 @@ export class AdminClient extends VelocityClient {
 			throw new Error('Clearing house already initialized');
 		}
 
-		const [driftStatePublicKey] =
+		const [velocityStatePublicKey] =
 			await getVelocityStateAccountPublicKeyAndNonce(this.program.programId);
 
 		const initializeIx = await this.program.instruction.initialize({
@@ -103,10 +103,10 @@ export class AdminClient extends VelocityClient {
 				admin: this.isSubscribed
 					? this.getStateAccount().coldAdmin
 					: this.wallet.publicKey,
-				state: driftStatePublicKey,
+				state: velocityStatePublicKey,
 				quoteAssetMint: usdcMint,
 				rent: SYSVAR_RENT_PUBKEY,
-				driftSigner: this.getSignerPublicKey(),
+				velocitySigner: this.getSignerPublicKey(),
 				systemProgram: anchor.web3.SystemProgram.programId,
 				tokenProgram: TOKEN_PROGRAM_ID,
 			},
@@ -260,7 +260,7 @@ export class AdminClient extends VelocityClient {
 					spotMarket,
 					spotMarketVault,
 					insuranceFundVault,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					spotMarketMint: mint,
 					oracle,
 					rent: SYSVAR_RENT_PUBKEY,
@@ -315,7 +315,7 @@ export class AdminClient extends VelocityClient {
 					spotMarket: spotMarketPublicKey,
 					spotMarketVault: spotMarketVaultPublicKey,
 					insuranceFundVault: insuranceFundVaultPublicKey,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					tokenProgram: TOKEN_PROGRAM_ID,
 				},
 			}
@@ -797,7 +797,7 @@ export class AdminClient extends VelocityClient {
 					this.program.programId,
 					perpMarketIndex
 				),
-				oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+				oracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
 			},
 		});
 	}
@@ -881,7 +881,7 @@ export class AdminClient extends VelocityClient {
 						this.program.programId,
 						QUOTE_SPOT_MARKET_INDEX
 					),
-					oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+					oracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
 				},
 			}
 		);
@@ -1078,7 +1078,7 @@ export class AdminClient extends VelocityClient {
 			this.program.programId,
 			perpMarketIndex
 		);
-		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+		const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
 
 		return await this.program.instruction.repegAmmCurve(newPeg, {
 			accounts: {
@@ -1086,7 +1086,7 @@ export class AdminClient extends VelocityClient {
 				admin: this.isSubscribed
 					? this.getStateAccount().coldAdmin
 					: this.wallet.publicKey,
-				oracle: ammData.oracle,
+				oracle: perpMarketAccount.oracle,
 				perpMarket: perpMarketPublicKey,
 			},
 		});
@@ -1108,7 +1108,7 @@ export class AdminClient extends VelocityClient {
 	public async getUpdatePerpMarketAmmOracleTwapIx(
 		perpMarketIndex: number
 	): Promise<TransactionInstruction> {
-		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+		const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
@@ -1120,7 +1120,7 @@ export class AdminClient extends VelocityClient {
 				admin: this.isSubscribed
 					? this.getStateAccount().coldAdmin
 					: this.wallet.publicKey,
-				oracle: ammData.oracle,
+				oracle: perpMarketAccount.oracle,
 				perpMarket: perpMarketPublicKey,
 			},
 		});
@@ -1142,7 +1142,7 @@ export class AdminClient extends VelocityClient {
 	public async getResetPerpMarketAmmOracleTwapIx(
 		perpMarketIndex: number
 	): Promise<TransactionInstruction> {
-		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+		const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
@@ -1154,7 +1154,7 @@ export class AdminClient extends VelocityClient {
 				admin: this.isSubscribed
 					? this.getStateAccount().coldAdmin
 					: this.wallet.publicKey,
-				oracle: ammData.oracle,
+				oracle: perpMarketAccount.oracle,
 				perpMarket: perpMarketPublicKey,
 			},
 		});
@@ -1204,7 +1204,7 @@ export class AdminClient extends VelocityClient {
 					perpMarketIndex
 				),
 				sourceVault,
-				driftSigner: this.getSignerPublicKey(),
+				velocitySigner: this.getSignerPublicKey(),
 				quoteSpotMarket: spotMarket.pubkey,
 				spotMarketVault: spotMarket.vault,
 				tokenProgram: TOKEN_PROGRAM_ID,
@@ -1469,7 +1469,7 @@ export class AdminClient extends VelocityClient {
 						this.program.programId,
 						QUOTE_SPOT_MARKET_INDEX
 					),
-					oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+					oracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
 				},
 			}
 		);
@@ -2368,7 +2368,7 @@ export class AdminClient extends VelocityClient {
 						perpMarketIndex
 					),
 					oracle: oracle,
-					oldOracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
+					oldOracle: this.getPerpMarketAccount(perpMarketIndex).oracle,
 					ammCache: getAmmCachePublicKey(this.program.programId),
 				},
 			}
@@ -3722,7 +3722,7 @@ export class AdminClient extends VelocityClient {
 						outMarketIndex
 					),
 					tokenProgram: TOKEN_PROGRAM_ID,
-					driftSigner: this.getStateAccount().signer,
+					velocitySigner: this.getStateAccount().signer,
 				},
 				remainingAccounts,
 			}
@@ -3779,7 +3779,7 @@ export class AdminClient extends VelocityClient {
 					insuranceFundVault: spotMarket.insuranceFund.vault,
 					recipientTokenAccount,
 					tokenProgram: tokenProgramId,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 				},
 				remainingAccounts,
 			}
@@ -4405,7 +4405,7 @@ export class AdminClient extends VelocityClient {
 					insuranceFundVault: spotMarket.insuranceFund.vault,
 					userTokenAccount: userTokenAccountPublicKey,
 					tokenProgram: this.getTokenProgramForSpotMarket(spotMarket),
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 				},
 			}
 		);
@@ -5094,7 +5094,7 @@ export class AdminClient extends VelocityClient {
 	}
 
 	/**
-	 * Get the drift begin_swap and end_swap instructions
+	 * Get the velocity begin_swap and end_swap instructions
 	 *
 	 * @param outMarketIndex the market index of the token you're buying
 	 * @param inMarketIndex the market index of the token you're selling
@@ -5573,7 +5573,7 @@ export class AdminClient extends VelocityClient {
 					spotMarketVault: withdrawSpotMarket.vault,
 					tokenProgram: withdrawTokenProgram,
 					mint: withdrawSpotMarket.mint,
-					driftSigner: getVelocitySignerPublicKey(this.program.programId),
+					velocitySigner: getVelocitySignerPublicKey(this.program.programId),
 					oracle: withdrawSpotMarket.oracle,
 				},
 			}

package/src/auctionSubscriber/auctionSubscriber.ts

@@ -10,10 +10,6 @@ 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;
 
@@ -22,13 +18,12 @@ export class AuctionSubscriber {
 
 	constructor({
 		velocityClient,
-		driftClient,
 		opts,
 		resubTimeoutMs,
 		logResubMessages,
 	}: AuctionSubscriberConfig) {
 		// Type-system guarantees at least one of the two is supplied.
-		this.velocityClient = (velocityClient ?? driftClient)!;
+		this.velocityClient = velocityClient!;
 		this.opts = opts || this.velocityClient.opts;
 		this.eventEmitter = new EventEmitter();
 		this.resubOpts = { resubTimeoutMs, logResubMessages };

package/src/auctionSubscriber/auctionSubscriberGrpc.ts

@@ -11,10 +11,6 @@ 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;
@@ -24,14 +20,13 @@ export class AuctionSubscriberGrpc {
 
 	constructor({
 		velocityClient,
-		driftClient,
 		opts,
 		grpcConfigs,
 		resubTimeoutMs,
 		logResubMessages,
 	}: AuctionSubscriberConfig) {
 		// Type-system guarantees at least one of the two is supplied.
-		this.velocityClient = (velocityClient ?? driftClient)!;
+		this.velocityClient = velocityClient!;
 		this.opts = opts || this.velocityClient.opts;
 		this.eventEmitter = new EventEmitter();
 		this.resubOpts = { resubTimeoutMs, logResubMessages };

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/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,26 +40,15 @@ 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 =
 	'pytd2yyk641x7ak7mkaasSJVXh6YYZnC7wTmtgAyxPt';
 export const SB_ON_DEMAND_DEVNET_PID = new PublicKey(
@@ -92,8 +71,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 +81,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 +100,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,21 +115,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>;
@@ -166,17 +122,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;
 };
 
@@ -244,13 +191,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/insuranceFund.ts

@@ -2,7 +2,7 @@ import { PERCENTAGE_PRECISION } from './numericConstants';
 
 // follows program constant MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT_GOV in math/constants.rs
 /**
- * Max APR for DRIFT IF vault.
+ * Max APR for VELOCITY IF vault.
  */
 export const MAX_APR_PER_REVENUE_SETTLE_TO_INSURANCE_FUND_VAULT_GOV =
 	PERCENTAGE_PRECISION.divn(22);

package/src/constituentMap/constituentMap.ts

@@ -18,8 +18,6 @@ const MAX_CONSTITUENT_SIZE_BYTES = 480; // TODO: update this when account is fin
 
 export type ConstituentMapConfig = {
 	velocityClient?: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	driftClient?: VelocityClient;
 	connection?: Connection;
 	subscriptionConfig:
 		| {
@@ -71,11 +69,9 @@ export class ConstituentMap implements ConstituentMapInterface {
 	private decoder: 'base64' | 'base64+zstd';
 
 	constructor(config: ConstituentMapConfig) {
-		const velocityClient = config.velocityClient ?? config.driftClient;
+		const velocityClient = config.velocityClient;
 		if (!velocityClient) {
-			throw new Error(
-				'ConstituentMap: velocityClient (or deprecated driftClient) must be provided'
-			);
+			throw new Error('ConstituentMap: velocityClient must be provided');
 		}
 		this.velocityClient = velocityClient;
 		this.additionalFilters = config.additionalFilters;

package/src/core/VelocityCore.ts

@@ -9,8 +9,8 @@ import * as pdas from '../addresses/pda';
 import * as constants from '../constants';
 import { decodeUser } from '../decode/user';
 import { CustomBorshCoder } from '../decode/customCoder';
-import driftIDL from '../idl/drift.json';
-import type { Drift } from '../idl/drift';
+import velocityIDL from '../idl/velocity.json';
+import type { Velocity } from '../idl/velocity';
 import type { UserAccount } from '../types';
 import type { VelocityProgram } from '../config';
 import { fetchAccount } from '../accounts/fetch';
@@ -40,16 +40,13 @@ import * as remainingAccounts from './remainingAccounts';
 import * as signedMsg from './signedMsg';
 
 export type VelocityCoreContext = {
-	/** Drift program id. */
+	/** Velocity program id. */
 	programId: PublicKey;
 
-	/** Anchor IDL json for Drift (defaults to bundled `idl/drift.json`). */
-	idl?: Drift;
+	/** Anchor IDL json for Velocity (defaults to bundled `idl/velocity.json`). */
+	idl?: Velocity;
 };
 
-/** @deprecated Use `VelocityCoreContext` instead. `DriftCoreContext` will be removed in a future major. */
-export type DriftCoreContext = VelocityCoreContext;
-
 /**
  * VelocityCore is the minimal, core SDK surface:
  * - No subscriptions / polling / websockets.
@@ -68,20 +65,20 @@ export class VelocityCore {
 	static readonly remainingAccounts = remainingAccounts;
 	static readonly signedMsg = signedMsg;
 
-	static defaultIdl(): Drift {
-		return driftIDL as unknown as Drift;
+	static defaultIdl(): Velocity {
+		return velocityIDL as unknown as Velocity;
 	}
 
-	static coder(idl: Drift = VelocityCore.defaultIdl()): CustomBorshCoder {
+	static coder(idl: Velocity = VelocityCore.defaultIdl()): CustomBorshCoder {
 		return new CustomBorshCoder(idl as any);
 	}
 
-	/** Decode a Drift `User` account buffer without creating a Program. */
+	/** Decode a Velocity `User` account buffer without creating a Program. */
 	static decodeUserAccount(buffer: Buffer): UserAccount {
 		return decodeUser(buffer);
 	}
 
-	/** Fetch and decode a Drift `User` account. */
+	/** Fetch and decode a Velocity `User` account. */
 	static async fetchUserAccount(
 		connection: Connection,
 		userAccountPublicKey: PublicKey
@@ -116,7 +113,7 @@ export class VelocityCore {
 		state: PublicKey;
 		spotMarket: PublicKey;
 		spotMarketVault: PublicKey;
-		driftSigner: PublicKey;
+		velocitySigner: PublicKey;
 		user: PublicKey;
 		userStats: PublicKey;
 		userTokenAccount: PublicKey;
@@ -329,9 +326,3 @@ export class VelocityCore {
 		return [];
 	}
 }
-
-/** @deprecated Use `VelocityCore` instead. `DriftCore` will be removed in a future major. */
-export const DriftCore = VelocityCore;
-
-/** @deprecated Use `VelocityCore` instead. `DriftCore` will be removed in a future major. */
-export type DriftCore = VelocityCore;

package/src/core/instructions/withdraw.ts

@@ -14,7 +14,7 @@ export async function buildWithdrawInstruction(args: {
 	state: PublicKey;
 	spotMarket: PublicKey;
 	spotMarketVault: PublicKey;
-	driftSigner: PublicKey;
+	velocitySigner: PublicKey;
 	user: PublicKey;
 	userStats: PublicKey;
 	userTokenAccount: PublicKey;
@@ -31,7 +31,7 @@ export async function buildWithdrawInstruction(args: {
 				state: args.state,
 				spotMarket: args.spotMarket,
 				spotMarketVault: args.spotMarketVault,
-				driftSigner: args.driftSigner,
+				velocitySigner: args.velocitySigner,
 				user: args.user,
 				userStats: args.userStats,
 				userTokenAccount: args.userTokenAccount,

package/src/core/remainingAccounts.ts

@@ -184,9 +184,9 @@ function addPerpMarketToRemainingAccountMaps(
 		isWritable: writable,
 	});
 	const oracleWritable =
-		writable && isVariant(perpMarketAccount.amm.oracleSource, 'prelaunch');
-	oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
-		pubkey: perpMarketAccount.amm.oracle,
+		writable && isVariant(perpMarketAccount.oracleSource, 'prelaunch');
+	oracleAccountMap.set(perpMarketAccount.oracle.toString(), {
+		pubkey: perpMarketAccount.oracle,
 		isSigner: false,
 		isWritable: oracleWritable,
 	});

package/src/decode/user.ts

@@ -143,8 +143,8 @@ export function decodeUser(buffer: Buffer): UserAccount {
 	const orders: Order[] = [];
 	for (let i = 0; i < 32; i++) {
 		// skip order if it's not open
-		if (buffer.readUint8(offset + 82) !== 1) {
-			offset += 96;
+		if (buffer.readUint8(offset + 86) !== 1) {
+			offset += 104;
 			continue;
 		}
 
@@ -166,8 +166,8 @@ export function decodeUser(buffer: Buffer): UserAccount {
 		offset += 8;
 		const maxTs = readSignedBigInt64LE(buffer, offset);
 		offset += 8;
-		const oraclePriceOffset = buffer.readInt32LE(offset);
-		offset += 4;
+		const oraclePriceOffset = readSignedBigInt64LE(buffer, offset);
+		offset += 8;
 		const orderId = buffer.readUInt32LE(offset);
 		offset += 4;
 		const marketIndex = buffer.readUInt16LE(offset);
@@ -245,7 +245,7 @@ export function decodeUser(buffer: Buffer): UserAccount {
 		offset += 1;
 		const bitFlags = buffer.readUint8(offset);
 		offset += 1;
-		offset += 1; // padding
+		offset += 5; // padding
 		orders.push({
 			slot,
 			price,

package/src/dlob/DLOB.ts

@@ -333,7 +333,7 @@ export class DLOB {
 			isOneOfVariant(order.orderType, ['market', 'triggerMarket', 'oracle'])
 		) {
 			type = 'market';
-		} else if (order.oraclePriceOffset !== 0) {
+		} else if (!order.oraclePriceOffset.eq(ZERO)) {
 			type = 'floatingLimit';
 		} else {
 			const isResting = isRestingLimitOrder(order, slot);
@@ -483,7 +483,7 @@ export class DLOB {
 		);
 
 		const stepSize = isVariant(marketType, 'perp')
-			? (marketAccount as PerpMarketAccount).amm.orderStepSize
+			? (marketAccount as PerpMarketAccount).orderStepSize
 			: (marketAccount as SpotMarketAccount).orderStepSize;
 
 		const cancelReduceOnlyNodesToFill =
@@ -1702,7 +1702,7 @@ export class DLOB {
 	}
 
 	public printTop(
-		driftClient: VelocityClient,
+		velocityClient: VelocityClient,
 		slotSubscriber: SlotSubscriber,
 		marketIndex: number,
 		marketType: MarketType
@@ -1710,7 +1710,7 @@ export class DLOB {
 		if (isVariant(marketType, 'perp')) {
 			const slot = slotSubscriber.getSlot();
 			const oraclePriceData =
-				driftClient.getMMOracleDataForPerpMarket(marketIndex);
+				velocityClient.getMMOracleDataForPerpMarket(marketIndex);
 
 			const bestAsk = this.getBestAsk(
 				marketIndex,
@@ -1738,7 +1738,7 @@ export class DLOB {
 				100.0;
 
 			const name = decodeName(
-				driftClient.getPerpMarketAccount(marketIndex).name
+				velocityClient.getPerpMarketAccount(marketIndex).name
 			);
 			console.log(`Market ${name} Orders`);
 			console.log(
@@ -1755,7 +1755,7 @@ export class DLOB {
 		} else if (isVariant(marketType, 'spot')) {
 			const slot = slotSubscriber.getSlot();
 			const oraclePriceData =
-				driftClient.getOracleDataForSpotMarket(marketIndex);
+				velocityClient.getOracleDataForSpotMarket(marketIndex);
 
 			const bestAsk = this.getBestAsk(
 				marketIndex,
@@ -1783,7 +1783,7 @@ export class DLOB {
 				100.0;
 
 			const name = decodeName(
-				driftClient.getSpotMarketAccount(marketIndex).name
+				velocityClient.getSpotMarketAccount(marketIndex).name
 			);
 			console.log(`Market ${name} Orders`);
 			console.log(

package/src/dlob/DLOBNode.ts

@@ -115,7 +115,7 @@ export class FloatingLimitOrderNode extends OrderNode {
 	previous?: FloatingLimitOrderNode;
 
 	getSortValue(order: Order): BN {
-		return new BN(order.oraclePriceOffset);
+		return order.oraclePriceOffset;
 	}
 }
 

package/src/dlob/DLOBSubscriber.ts

@@ -21,10 +21,6 @@ import { BN } from '../isomorphic/anchor';
 
 export class DLOBSubscriber {
 	velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	public get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	dlobSource: DLOBSource;
 	slotSource: SlotSource;
 	updateFrequency: number;
@@ -32,11 +28,9 @@ export class DLOBSubscriber {
 	dlob: DLOB;
 	public eventEmitter: StrictEventEmitter<EventEmitter, DLOBSubscriberEvents>;
 	constructor(config: DLOBSubscriptionConfig) {
-		const velocityClient = config.velocityClient ?? config.driftClient;
+		const velocityClient = config.velocityClient;
 		if (!velocityClient) {
-			throw new Error(
-				'DLOBSubscriber: velocityClient (or deprecated driftClient) must be provided'
-			);
+			throw new Error('DLOBSubscriber: velocityClient must be provided');
 		}
 		this.velocityClient = velocityClient;
 		this.dlobSource = config.dlobSource;