@velocity-exchange/sdk 0.0.5 → 0.2.0

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;
@@ -102,6 +98,12 @@ export class ConstituentMap implements ConstituentMapInterface {
 					config.subscriptionConfig.commitment,
 					this.getFilters()
 				);
+		} else {
+			throw new Error(
+				`ConstituentMap: unsupported subscriptionConfig type: ${
+					(config.subscriptionConfig as { type: string }).type
+				}`
+			);
 		}
 
 		// Listen for account updates from the subscriber
@@ -188,7 +190,8 @@ export class ConstituentMap implements ConstituentMapInterface {
 			);
 			await Promise.all(promises);
 		} catch (error) {
-			console.log(`ConstituentMap.sync() error: ${error.message}`);
+			const message = error instanceof Error ? error.message : String(error);
+			console.log(`ConstituentMap.sync() error: ${message}`);
 		}
 	}
 

package/src/constituentMap/pollingConstituentAccountSubscriber.ts

@@ -63,10 +63,12 @@ export class PollingConstituentAccountSubscriber
 			await this.constituentMap.sync();
 			this.eventEmitter.emit('update');
 		} catch (error) {
+			const normalizedError =
+				error instanceof Error ? error : new Error(String(error));
 			console.log(
-				`PollingConstituentAccountSubscriber.sync() error: ${error.message}`
+				`PollingConstituentAccountSubscriber.sync() error: ${normalizedError.message}`
 			);
-			this.eventEmitter.emit('error', error);
+			this.eventEmitter.emit('error', normalizedError);
 		}
 	}
 

package/src/constituentMap/webSocketConstituentAccountSubscriber.ts

@@ -21,7 +21,15 @@ export class WebSocketConstituentAccountSubscriber
 	program: VelocityProgram;
 	eventEmitter: StrictEventEmitter<EventEmitter, ConstituentAccountEvents>;
 
-	constituentDataAccountSubscriber: WebSocketProgramAccountSubscriber<ConstituentAccount>;
+	private _constituentDataAccountSubscriber?: WebSocketProgramAccountSubscriber<ConstituentAccount>;
+	private get constituentDataAccountSubscriber(): WebSocketProgramAccountSubscriber<ConstituentAccount> {
+		if (!this._constituentDataAccountSubscriber) {
+			throw new Error(
+				'WebSocketConstituentAccountSubscriber: constituentDataAccountSubscriber accessed before subscribe()'
+			);
+		}
+		return this._constituentDataAccountSubscriber;
+	}
 	constituentMap: ConstituentMap;
 	private additionalFilters?: MemcmpFilter[];
 
@@ -45,7 +53,7 @@ export class WebSocketConstituentAccountSubscriber
 		if (this.isSubscribed) {
 			return true;
 		}
-		this.constituentDataAccountSubscriber =
+		this._constituentDataAccountSubscriber =
 			new WebSocketProgramAccountSubscriber<ConstituentAccount>(
 				'LpPoolConstituent',
 				'constituent',
@@ -85,10 +93,11 @@ export class WebSocketConstituentAccountSubscriber
 			await this.constituentMap.sync();
 			this.eventEmitter.emit('update');
 		} catch (error) {
+			const err = error instanceof Error ? error : new Error(String(error));
 			console.log(
-				`WebSocketConstituentAccountSubscriber.sync() error: ${error.message}`
+				`WebSocketConstituentAccountSubscriber.sync() error: ${err.message}`
 			);
-			this.eventEmitter.emit('error', error);
+			this.eventEmitter.emit('error', err);
 		}
 	}
 

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/perpOrders.ts

@@ -82,6 +82,20 @@ export async function buildPlaceAndMakePerpOrderInstruction(args: {
 	);
 }
 
+/**
+ * Build a raw `cancelOrder` instruction.
+ *
+ * Pass `orderId: null` to cancel the user's most recently placed order. The program
+ * resolves a `null` ID on-chain via `get_last_order_id`, which makes this safe to use
+ * in a multi-instruction transaction where a place instruction precedes the cancel and
+ * the program-assigned order ID is not yet known at build time — e.g.:
+ *
+ *   [placePerpOrder] → [cancelOrder(orderId: null)]
+ *
+ * The on-chain `order_id` counter is a monotonically incrementing u32 on the user
+ * account, so `get_last_order_id` reliably points to the order placed in the preceding
+ * instruction of the same transaction.
+ */
 export async function buildCancelOrderInstruction(args: {
 	program: VelocityProgram;
 	orderId: number | null;

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

@@ -25,11 +25,11 @@ export type RemainingAccountsContext = {
 
 	/** Used to resolve user's last slot for cache invalidation. */
 	getUserAccountAndSlot: (
-		subAccountId: number,
+		subAccountId: number | undefined,
 		authority: PublicKey
 	) => { slot: number } | undefined;
 
-	activeSubAccountId: number;
+	activeSubAccountId: number | undefined;
 	authority: PublicKey;
 
 	/** Mutable caches + forced-market sets (owned by caller). */
@@ -57,7 +57,7 @@ export function getRemainingAccounts(
 		)?.slot;
 
 		for (const [marketIndex, slot] of ctx.perpMarketLastSlotCache.entries()) {
-			if (slot > lastUserSlot) {
+			if (lastUserSlot !== undefined && slot > lastUserSlot) {
 				addPerpMarketToRemainingAccountMaps(
 					ctx,
 					marketIndex,
@@ -72,7 +72,7 @@ export function getRemainingAccounts(
 		}
 
 		for (const [marketIndex, slot] of ctx.spotMarketLastSlotCache.entries()) {
-			if (slot > lastUserSlot) {
+			if (lastUserSlot !== undefined && slot > lastUserSlot) {
 				addSpotMarketToRemainingAccountMaps(
 					ctx,
 					marketIndex,
@@ -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

@@ -179,6 +179,8 @@ export function decodeUser(buffer: Buffer): UserAccount {
 			status = OrderStatus.INIT;
 		} else if (orderStatusNum === 1) {
 			status = OrderStatus.OPEN;
+		} else {
+			throw new Error(`decodeUser: unknown order status ${orderStatusNum}`);
 		}
 		offset += 1;
 		const orderTypeNum = buffer.readUInt8(offset);
@@ -193,6 +195,8 @@ export function decodeUser(buffer: Buffer): UserAccount {
 			orderType = OrderType.TRIGGER_LIMIT;
 		} else if (orderTypeNum === 4) {
 			orderType = OrderType.ORACLE;
+		} else {
+			throw new Error(`decodeUser: unknown order type ${orderTypeNum}`);
 		}
 		offset += 1;
 		const marketTypeNum = buffer.readUInt8(offset);
@@ -237,6 +241,10 @@ export function decodeUser(buffer: Buffer): UserAccount {
 			triggerCondition = OrderTriggerCondition.TRIGGERED_ABOVE;
 		} else if (triggerConditionNum === 3) {
 			triggerCondition = OrderTriggerCondition.TRIGGERED_BELOW;
+		} else {
+			throw new Error(
+				`decodeUser: unknown trigger condition ${triggerConditionNum}`
+			);
 		}
 		offset += 1;
 		const auctionDuration = buffer.readUInt8(offset);
@@ -250,7 +258,6 @@ export function decodeUser(buffer: Buffer): UserAccount {
 			slot,
 			price,
 			baseAssetAmount,
-			quoteAssetAmount: undefined,
 			baseAssetAmountFilled,
 			quoteAssetAmountFilled,
 			triggerPrice,