@velocity-exchange/sdk 0.0.5 → 0.1.0

package/src/user.ts

@@ -2,7 +2,7 @@
  * User — read-oriented abstraction over the on-chain `User` account.
  *
  * Responsibilities:
- *   - Margin and free-collateral calculations (mirrors `programs/drift/src/math/margin.rs`).
+ *   - Margin and free-collateral calculations (mirrors `programs/velocity/src/math/margin.rs`).
  *   - Position accessors: perp positions, spot positions, unrealized PnL, leverage.
  *   - Open order queries and filtering.
  *   - Health factor and liquidation threshold checks.
@@ -129,10 +129,6 @@ export type MarginType = 'Cross' | 'Isolated';
 
 export class User {
 	velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	public get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	userAccountPublicKey: PublicKey;
 	accountSubscriber: UserAccountSubscriber;
 	_isSubscribed = false;
@@ -148,7 +144,7 @@ export class User {
 
 	public constructor(config: UserConfig) {
 		// Type-system guarantees at least one of the two is supplied.
-		const velocityClient = (config.velocityClient ?? config.driftClient)!;
+		const velocityClient = config.velocityClient!;
 		this.velocityClient = velocityClient;
 		this.userAccountPublicKey = config.userAccountPublicKey;
 		if (config.accountSubscription?.type === 'polling') {
@@ -2093,10 +2089,10 @@ export class User {
 				userPosition.marketIndex
 			);
 			if (
-				market.amm.cumulativeFundingRateLong.eq(
+				market.cumulativeFundingRateLong.eq(
 					userPosition.lastCumulativeFundingRate
 				) ||
-				market.amm.cumulativeFundingRateShort.eq(
+				market.cumulativeFundingRateShort.eq(
 					userPosition.lastCumulativeFundingRate
 				)
 			) {
@@ -2153,7 +2149,7 @@ export class User {
 		const oracle = market.oracle;
 		const perpMarketWithSameOracle = this.velocityClient
 			.getPerpMarketAccounts()
-			.find((market) => market.amm.oracle.equals(oracle));
+			.find((market) => market.oracle.equals(oracle));
 		const oraclePrice =
 			this.velocityClient.getOracleDataForSpotMarket(marketIndex).price;
 		if (perpMarketWithSameOracle) {
@@ -2172,7 +2168,7 @@ export class User {
 				if (freeCollateralDeltaForPerp) {
 					const { numerator, denominator } = getMultipleBetweenOracleSources(
 						market.oracleSource,
-						perpMarketWithSameOracle.amm.oracleSource
+						perpMarketWithSameOracle.oracleSource
 					);
 					freeCollateralDeltaForPerp = freeCollateralDeltaForPerp
 						.mul(numerator)
@@ -2223,8 +2219,7 @@ export class User {
 	): BN {
 		const market = this.velocityClient.getPerpMarketAccount(marketIndex);
 
-		const oracle =
-			this.velocityClient.getPerpMarketAccount(marketIndex).amm.oracle;
+		const oracle = this.velocityClient.getPerpMarketAccount(marketIndex).oracle;
 
 		const oraclePrice =
 			this.velocityClient.getOracleDataForPerpMarket(marketIndex).price;
@@ -2292,7 +2287,7 @@ export class User {
 
 		positionBaseSizeChange = standardizeBaseAssetAmount(
 			positionBaseSizeChange,
-			market.amm.orderStepSize
+			market.orderStepSize
 		);
 
 		const freeCollateralChangeFromNewPosition =
@@ -2345,7 +2340,7 @@ export class User {
 
 				if (spotFreeCollateralDelta) {
 					const { numerator, denominator } = getMultipleBetweenOracleSources(
-						market.amm.oracleSource,
+						market.oracleSource,
 						spotMarketWithSameOracle.oracleSource
 					);
 					spotFreeCollateralDelta = spotFreeCollateralDelta

package/src/userConfig.ts

@@ -5,15 +5,13 @@ import { GrpcConfigs, UserAccountSubscriber } from './accounts/types';
 import { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
 import { UserAccount } from './types';
 import { grpcMultiUserAccountSubscriber } from './accounts/grpcMultiUserAccountSubscriber';
-import { AtLeastOne } from './util/deprecatedAlias';
 
 type UserConfigBase = {
 	accountSubscription?: UserSubscriptionConfig;
 	userAccountPublicKey: PublicKey;
 };
 
-export type UserConfig = UserConfigBase &
-	AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type UserConfig = UserConfigBase & { velocityClient: VelocityClient };
 
 export type UserSubscriptionConfig =
 	| {

package/src/userMap/WebsocketSubscription.ts

@@ -54,7 +54,7 @@ export class WebsocketSubscription {
 			this.subscriber = new WebSocketProgramAccountSubscriber<UserAccount>(
 				'UserMap',
 				'user',
-				this.userMap.driftClient.program,
+				this.userMap.velocityClient.program,
 				this.decodeFn,
 				{
 					filters,

package/src/userMap/grpcSubscription.ts

@@ -56,7 +56,7 @@ export class grpcSubscription {
 				this.grpcConfigs,
 				'UserMap',
 				'user',
-				this.userMap.driftClient.program,
+				this.userMap.velocityClient.program,
 				this.decodeFn,
 				{
 					filters,

package/src/userMap/referrerMap.ts

@@ -29,10 +29,6 @@ export class ReferrerMap {
 	 */
 	private referrerReferrerInfoMap = new Map<string, ReferrerInfo>();
 	private velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	private get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	private parallelSync: boolean;
 
 	private fetchPromise?: Promise<void>;

package/src/userMap/revenueShareEscrowMap.ts

@@ -10,10 +10,6 @@ export class RevenueShareEscrowMap {
 	 */
 	private authorityEscrowMap = new Map<string, RevenueShareEscrowAccount>();
 	private velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	private get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	private parallelSync: boolean;
 
 	private fetchPromise?: Promise<void>;

package/src/userMap/userMap.ts

@@ -78,10 +78,6 @@ export interface UserMapInterface {
 export class UserMap implements UserMapInterface {
 	private userMap = new Map<string, DataAndSlot<User>>();
 	velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	public get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	eventEmitter: StrictEventEmitter<EventEmitter, UserEvents>;
 	private connection: Connection;
 	private commitment: Commitment;
@@ -114,7 +110,7 @@ export class UserMap implements UserMapInterface {
 	 */
 	constructor(config: UserMapConfig) {
 		// Type-system guarantees at least one of the two is supplied.
-		this.velocityClient = (config.velocityClient ?? config.driftClient)!;
+		this.velocityClient = config.velocityClient!;
 		if (config.connection) {
 			this.connection = config.connection;
 		} else {
@@ -420,7 +416,7 @@ export class UserMap implements UserMapInterface {
 
 	/**
 	 * Syncs the UserMap using the default sync method (single getProgramAccounts call with filters).
-	 * This method may fail when drift has too many users. (nodejs response size limits)
+	 * This method may fail when velocity has too many users. (nodejs response size limits)
 	 * @returns
 	 */
 	private async defaultSync() {
@@ -517,7 +513,7 @@ export class UserMap implements UserMapInterface {
 
 	/**
 	 * Syncs the UserMap using the paginated sync method (multiple getMultipleAccounts calls with filters).
-	 * This method is more reliable when drift has many users.
+	 * This method is more reliable when velocity has many users.
 	 * @returns
 	 */
 	private async paginatedSync() {

package/src/userMap/userMapConfig.ts

@@ -1,7 +1,6 @@
 import { Commitment, Connection, MemcmpFilter } from '@solana/web3.js';
 import { VelocityClient } from '../velocityClient';
 import { GrpcConfigs } from '../accounts/types';
-import { AtLeastOne } from '../util/deprecatedAlias';
 
 // passed into UserMap.getUniqueAuthorities to filter users
 export type UserAccountFilterCriteria = {
@@ -65,5 +64,6 @@ type UserMapConfigBase = {
 	additionalFilters?: MemcmpFilter[];
 };
 
-export type UserMapConfig = UserMapConfigBase &
-	AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type UserMapConfig = UserMapConfigBase & {
+	velocityClient: VelocityClient;
+};

package/src/userMap/userStatsMap.ts

@@ -27,10 +27,6 @@ export class UserStatsMap {
 	 */
 	private userStatsMap = new Map<string, UserStats>();
 	private velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	private get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	private bulkAccountLoader: BulkAccountLoader;
 	private decode;
 	private syncConfig: SyncConfig;

package/src/userStats.ts

@@ -18,17 +18,13 @@ import { grpcUserStatsAccountSubscriber } from './accounts/grpcUserStatsAccountS
 
 export class UserStats {
 	velocityClient: VelocityClient;
-	/** @deprecated Use `velocityClient` instead. `driftClient` will be removed in a future major. */
-	public get driftClient(): VelocityClient {
-		return this.velocityClient;
-	}
 	userStatsAccountPublicKey: PublicKey;
 	accountSubscriber: UserStatsAccountSubscriber;
 	isSubscribed: boolean;
 
 	public constructor(config: UserStatsConfig) {
 		// Type-system guarantees at least one of the two is supplied.
-		const velocityClient = (config.velocityClient ?? config.driftClient)!;
+		const velocityClient = config.velocityClient!;
 		this.velocityClient = velocityClient;
 		this.userStatsAccountPublicKey = config.userStatsAccountPublicKey;
 		if (config.accountSubscription?.type === 'polling') {

package/src/userStatsConfig.ts

@@ -2,15 +2,15 @@ import { VelocityClient } from './velocityClient';
 import { Commitment, PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { GrpcConfigs, UserStatsAccountSubscriber } from './accounts/types';
-import { AtLeastOne } from './util/deprecatedAlias';
 
 type UserStatsConfigBase = {
 	accountSubscription?: UserStatsSubscriptionConfig;
 	userStatsAccountPublicKey: PublicKey;
 };
 
-export type UserStatsConfig = UserStatsConfigBase &
-	AtLeastOne<'velocityClient', 'driftClient', VelocityClient>;
+export type UserStatsConfig = UserStatsConfigBase & {
+	velocityClient: VelocityClient;
+};
 
 export type UserStatsSubscriptionConfig =
 	| {

package/src/util/ed25519Utils.ts

@@ -37,7 +37,7 @@ const ED25519_INSTRUCTION_LAYOUT = BufferLayout.struct<
 
 /**
  * Constructs a minimal Ed25519 verification instruction that references the data
- * inside the drift custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
+ * inside the velocity custom instruction (e.g. postPythLazerOracleUpdate, placeSignedMsgTakerOrder).
  *
  * @param customInstructionIndex The index of the custom instruction in the transaction (e.g. if tx contains compute budget limit, compute budget price, ed25519 verify, custom ix, this would be 3).
  * @param messageOffset The offset within the custom instruction data where the signed message begins.