@velocity-exchange/sdk 0.1.0 → 0.2.0

package/src/accounts/webSocketUserStatsAccountSubsriber.ts

@@ -23,7 +23,18 @@ export class WebSocketUserStatsAccountSubscriber
 	eventEmitter: StrictEventEmitter<EventEmitter, UserStatsAccountEvents>;
 	userStatsAccountPublicKey: PublicKey;
 
-	userStatsAccountSubscriber: AccountSubscriber<UserStatsAccount>;
+	private _userStatsAccountSubscriber?: AccountSubscriber<UserStatsAccount>;
+	get userStatsAccountSubscriber(): AccountSubscriber<UserStatsAccount> {
+		if (!this._userStatsAccountSubscriber) {
+			throw new Error('userStatsAccountSubscriber accessed before subscribe()');
+		}
+		return this._userStatsAccountSubscriber;
+	}
+	set userStatsAccountSubscriber(
+		subscriber: AccountSubscriber<UserStatsAccount>
+	) {
+		this._userStatsAccountSubscriber = subscriber;
+	}
 
 	public constructor(
 		program: VelocityProgram,
@@ -91,7 +102,9 @@ export class WebSocketUserStatsAccountSubscriber
 		}
 	}
 
-	public getUserStatsAccountAndSlot(): DataAndSlot<UserStatsAccount> {
+	public getUserStatsAccountAndSlot():
+		| DataAndSlot<UserStatsAccount>
+		| undefined {
 		this.assertIsSubscribed();
 		return this.userStatsAccountSubscriber.dataAndSlot;
 	}

package/src/accounts/webSocketVelocityClientAccountSubscriber.ts

@@ -18,7 +18,7 @@ import {
 	getSpotMarketPublicKeySync,
 } from '../addresses/pda';
 import { WebSocketAccountSubscriber } from './webSocketAccountSubscriber';
-import { Commitment, PublicKey } from '@solana/web3.js';
+import { AccountInfo, Commitment, PublicKey } from '@solana/web3.js';
 import { OracleInfo, OraclePriceData } from '../oracles/types';
 import { OracleClientCache } from '../oracles/oracleClientCache';
 import * as Buffer from 'buffer';
@@ -86,9 +86,9 @@ export class WebSocketVelocityClientAccountSubscriber
 	oracleSubscribers = new Map<string, AccountSubscriber<OraclePriceData>>();
 	delistedMarketSetting: DelistedMarketSetting;
 
-	initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
-	initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
-	initialOraclePriceData: Map<string, OraclePriceData>;
+	initialPerpMarketAccountData?: Map<number, PerpMarketAccount>;
+	initialSpotMarketAccountData?: Map<number, SpotMarketAccount>;
+	initialOraclePriceData?: Map<string, OraclePriceData>;
 	customPerpMarketAccountSubscriber?: new (
 		accountName: string,
 		program: VelocityProgram,
@@ -107,8 +107,8 @@ export class WebSocketVelocityClientAccountSubscriber
 	) => AccountSubscriber<any>;
 
 	protected isSubscribing = false;
-	protected subscriptionPromise: Promise<boolean>;
-	protected subscriptionPromiseResolver: (val: boolean) => void;
+	protected subscriptionPromiseResolver: (val: boolean) => void = () => {};
+	protected subscriptionPromise: Promise<boolean> = Promise.resolve(false);
 
 	public constructor(
 		program: VelocityProgram,
@@ -255,7 +255,9 @@ export class WebSocketVelocityClientAccountSubscriber
 			).flat();
 			this.initialPerpMarketAccountData = new Map(
 				perpMarketAccountInfos
-					.filter((accountInfo) => !!accountInfo)
+					.filter(
+						(accountInfo): accountInfo is AccountInfo<Buffer> => !!accountInfo
+					)
 					.map((accountInfo) => {
 						const perpMarket = this.program.coder.accounts.decode(
 							'perpMarket',
@@ -280,7 +282,9 @@ export class WebSocketVelocityClientAccountSubscriber
 			).flat();
 			this.initialSpotMarketAccountData = new Map(
 				spotMarketAccountInfos
-					.filter((accountInfo) => !!accountInfo)
+					.filter(
+						(accountInfo): accountInfo is AccountInfo<Buffer> => !!accountInfo
+					)
 					.map((accountInfo) => {
 						const spotMarket = this.program.coder.accounts.decode(
 							'spotMarket',
@@ -303,27 +307,34 @@ export class WebSocketVelocityClientAccountSubscriber
 			)
 		).flat();
 		this.initialOraclePriceData = new Map(
-			this.oracleInfos.reduce((result, oracleInfo, i) => {
-				if (!oracleAccountInfos[i]) {
+			this.oracleInfos.reduce(
+				(result, oracleInfo, i) => {
+					const oracleAccountInfo = oracleAccountInfos[i];
+					if (!oracleAccountInfo) {
+						return result;
+					}
+
+					const oracleClient = this.oracleClientCache.get(
+						oracleInfo.source,
+						connection,
+						this.program
+					);
+					if (!oracleClient) {
+						return result;
+					}
+
+					const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(
+						oracleAccountInfo.data
+					);
+
+					result.push([
+						getOracleId(oracleInfo.publicKey, oracleInfo.source),
+						oraclePriceData,
+					]);
 					return result;
-				}
-
-				const oracleClient = this.oracleClientCache.get(
-					oracleInfo.source,
-					connection,
-					this.program
-				);
-
-				const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(
-					oracleAccountInfos[i].data
-				);
-
-				result.push([
-					getOracleId(oracleInfo.publicKey, oracleInfo.source),
-					oraclePriceData,
-				]);
-				return result;
-			}, [])
+				},
+				[] as [string, OraclePriceData][]
+			)
 		);
 	}
 
@@ -358,7 +369,7 @@ export class WebSocketVelocityClientAccountSubscriber
 			this.commitment
 		);
 		const initialPerpMarketData =
-			this.initialPerpMarketAccountData.get(marketIndex);
+			this.initialPerpMarketAccountData?.get(marketIndex);
 		if (initialPerpMarketData) {
 			accountSubscriber.setData(initialPerpMarketData);
 		}
@@ -394,7 +405,7 @@ export class WebSocketVelocityClientAccountSubscriber
 			this.commitment
 		);
 		const initialSpotMarketData =
-			this.initialSpotMarketAccountData.get(marketIndex);
+			this.initialSpotMarketAccountData?.get(marketIndex);
 		if (initialSpotMarketData) {
 			accountSubscriber.setData(initialSpotMarketData);
 		}
@@ -424,6 +435,9 @@ export class WebSocketVelocityClientAccountSubscriber
 			this.program.provider.connection,
 			this.program
 		);
+		if (!client) {
+			return false;
+		}
 		const AccountSubscriberClass =
 			this.customOracleAccountSubscriber || WebSocketAccountSubscriber;
 		const accountSubscriber = new AccountSubscriberClass<OraclePriceData>(
@@ -436,7 +450,7 @@ export class WebSocketVelocityClientAccountSubscriber
 			this.resubOpts,
 			this.commitment
 		);
-		const initialOraclePriceData = this.initialOraclePriceData.get(oracleId);
+		const initialOraclePriceData = this.initialOraclePriceData?.get(oracleId);
 		if (initialOraclePriceData) {
 			accountSubscriber.setData(initialOraclePriceData);
 		}
@@ -484,6 +498,10 @@ export class WebSocketVelocityClientAccountSubscriber
 			return;
 		}
 
+		if (!this.stateAccountSubscriber) {
+			return;
+		}
+
 		const promises = [this.stateAccountSubscriber.fetch()]
 			.concat(
 				Array.from(this.perpMarketAccountSubscribers.values()).map(
@@ -504,7 +522,7 @@ export class WebSocketVelocityClientAccountSubscriber
 			return;
 		}
 
-		await this.stateAccountSubscriber.unsubscribe();
+		await this.stateAccountSubscriber?.unsubscribe();
 
 		await this.unsubscribeFromMarketAccounts();
 		await this.unsubscribeFromSpotMarketAccounts();
@@ -607,7 +625,7 @@ export class WebSocketVelocityClientAccountSubscriber
 		for (const perpMarketIndex of perpMarketIndexes) {
 			await this.perpMarketAccountSubscribers
 				.get(perpMarketIndex)
-				.unsubscribe();
+				?.unsubscribe();
 			if (this.delistedMarketSetting === DelistedMarketSetting.Discard) {
 				this.perpMarketAccountSubscribers.delete(perpMarketIndex);
 			}
@@ -615,7 +633,7 @@ export class WebSocketVelocityClientAccountSubscriber
 
 		for (const oracle of oracles) {
 			const oracleId = getOracleId(oracle.publicKey, oracle.source);
-			await this.oracleSubscribers.get(oracleId).unsubscribe();
+			await this.oracleSubscribers.get(oracleId)?.unsubscribe();
 			if (this.delistedMarketSetting === DelistedMarketSetting.Discard) {
 				this.oracleSubscribers.delete(oracleId);
 			}
@@ -632,33 +650,43 @@ export class WebSocketVelocityClientAccountSubscriber
 
 	public getStateAccountAndSlot(): DataAndSlot<StateAccount> {
 		this.assertIsSubscribed();
-		return this.stateAccountSubscriber.dataAndSlot;
+		const dataAndSlot = this.stateAccountSubscriber?.dataAndSlot;
+		if (!dataAndSlot) {
+			throw new Error('State account data not available');
+		}
+		return dataAndSlot;
 	}
 
 	public getMarketAccountAndSlot(
 		marketIndex: number
 	): DataAndSlot<PerpMarketAccount> | undefined {
 		this.assertIsSubscribed();
-		return this.perpMarketAccountSubscribers.get(marketIndex).dataAndSlot;
+		return this.perpMarketAccountSubscribers.get(marketIndex)?.dataAndSlot;
 	}
 
 	public getMarketAccountsAndSlots(): DataAndSlot<PerpMarketAccount>[] {
-		return Array.from(this.perpMarketAccountSubscribers.values()).map(
-			(subscriber) => subscriber.dataAndSlot
-		);
+		return Array.from(this.perpMarketAccountSubscribers.values())
+			.map((subscriber) => subscriber.dataAndSlot)
+			.filter(
+				(dataAndSlot): dataAndSlot is DataAndSlot<PerpMarketAccount> =>
+					dataAndSlot !== undefined
+			);
 	}
 
 	public getSpotMarketAccountAndSlot(
 		marketIndex: number
 	): DataAndSlot<SpotMarketAccount> | undefined {
 		this.assertIsSubscribed();
-		return this.spotMarketAccountSubscribers.get(marketIndex).dataAndSlot;
+		return this.spotMarketAccountSubscribers.get(marketIndex)?.dataAndSlot;
 	}
 
 	public getSpotMarketAccountsAndSlots(): DataAndSlot<SpotMarketAccount>[] {
-		return Array.from(this.spotMarketAccountSubscribers.values()).map(
-			(subscriber) => subscriber.dataAndSlot
-		);
+		return Array.from(this.spotMarketAccountSubscribers.values())
+			.map((subscriber) => subscriber.dataAndSlot)
+			.filter(
+				(dataAndSlot): dataAndSlot is DataAndSlot<SpotMarketAccount> =>
+					dataAndSlot !== undefined
+			);
 	}
 
 	public getOraclePriceDataAndSlot(
@@ -671,7 +699,7 @@ export class WebSocketVelocityClientAccountSubscriber
 				slot: 0,
 			};
 		}
-		return this.oracleSubscribers.get(oracleId).dataAndSlot;
+		return this.oracleSubscribers.get(oracleId)?.dataAndSlot;
 	}
 
 	public getOraclePriceDataAndSlotForPerpMarket(
@@ -684,8 +712,8 @@ export class WebSocketVelocityClientAccountSubscriber
 			return undefined;
 		}
 
-		if (!perpMarketAccount.data.oracle.equals(oracle)) {
-			// If the oracle has changed, we need to update the oracle map in background
+		if (!oracle || !perpMarketAccount.data.oracle.equals(oracle)) {
+			// If the oracle has changed (or not yet cached), update the oracle map in background
 			this.setPerpOracleMap();
 		}
 
@@ -702,8 +730,8 @@ export class WebSocketVelocityClientAccountSubscriber
 			return undefined;
 		}
 
-		if (!spotMarketAccount.data.oracle.equals(oracle)) {
-			// If the oracle has changed, we need to update the oracle map in background
+		if (!oracle || !spotMarketAccount.data.oracle.equals(oracle)) {
+			// If the oracle has changed (or not yet cached), update the oracle map in background
 			this.setSpotOracleMap();
 		}
 

package/src/accounts/webSocketVelocityClientAccountSubscriberV2.ts

@@ -7,6 +7,7 @@ import {
 	NotSubscribedError,
 	ResubOpts,
 } from './types';
+import { assertDataAndSlot } from './utils';
 import {
 	isVariant,
 	PerpMarketAccount,
@@ -66,12 +67,38 @@ export class WebSocketVelocityClientAccountSubscriberV2
 
 	eventEmitter: StrictEventEmitter<EventEmitter, VelocityClientAccountEvents>;
 	stateAccountSubscriber?: WebSocketAccountSubscriberV2<StateAccount>;
-	perpMarketAllAccountsSubscriber: WebSocketProgramAccountsSubscriberV2<PerpMarketAccount>;
+	private _perpMarketAllAccountsSubscriber?: WebSocketProgramAccountsSubscriberV2<PerpMarketAccount>;
+	get perpMarketAllAccountsSubscriber(): WebSocketProgramAccountsSubscriberV2<PerpMarketAccount> {
+		if (!this._perpMarketAllAccountsSubscriber) {
+			throw new Error(
+				'perpMarketAllAccountsSubscriber accessed before subscribe()'
+			);
+		}
+		return this._perpMarketAllAccountsSubscriber;
+	}
+	set perpMarketAllAccountsSubscriber(
+		subscriber: WebSocketProgramAccountsSubscriberV2<PerpMarketAccount>
+	) {
+		this._perpMarketAllAccountsSubscriber = subscriber;
+	}
 	perpMarketAccountLatestData = new Map<
 		number,
 		DataAndSlot<PerpMarketAccount>
 	>();
-	spotMarketAllAccountsSubscriber: WebSocketProgramAccountsSubscriberV2<SpotMarketAccount>;
+	private _spotMarketAllAccountsSubscriber?: WebSocketProgramAccountsSubscriberV2<SpotMarketAccount>;
+	get spotMarketAllAccountsSubscriber(): WebSocketProgramAccountsSubscriberV2<SpotMarketAccount> {
+		if (!this._spotMarketAllAccountsSubscriber) {
+			throw new Error(
+				'spotMarketAllAccountsSubscriber accessed before subscribe()'
+			);
+		}
+		return this._spotMarketAllAccountsSubscriber;
+	}
+	set spotMarketAllAccountsSubscriber(
+		subscriber: WebSocketProgramAccountsSubscriberV2<SpotMarketAccount>
+	) {
+		this._spotMarketAllAccountsSubscriber = subscriber;
+	}
 	spotMarketAccountLatestData = new Map<
 		number,
 		DataAndSlot<SpotMarketAccount>
@@ -83,13 +110,13 @@ export class WebSocketVelocityClientAccountSubscriberV2
 	oracleSubscribers = new Map<string, AccountSubscriber<OraclePriceData>>();
 	delistedMarketSetting: DelistedMarketSetting;
 
-	initialPerpMarketAccountData: Map<number, PerpMarketAccount>;
-	initialSpotMarketAccountData: Map<number, SpotMarketAccount>;
-	initialOraclePriceData: Map<string, OraclePriceData>;
+	initialPerpMarketAccountData: Map<number, PerpMarketAccount> = new Map();
+	initialSpotMarketAccountData: Map<number, SpotMarketAccount> = new Map();
+	initialOraclePriceData: Map<string, OraclePriceData> = new Map();
 
 	protected isSubscribing = false;
-	protected subscriptionPromise: Promise<boolean>;
-	protected subscriptionPromiseResolver: (val: boolean) => void;
+	private subscriptionPromiseResolver: (val: boolean) => void = () => {};
+	protected subscriptionPromise: Promise<boolean> = Promise.resolve(false);
 
 	private rpc: Rpc<any>;
 	private rpcSubscriptions: RpcSubscriptions<SolanaRpcSubscriptionsApi> &
@@ -349,9 +376,7 @@ export class WebSocketVelocityClientAccountSubscriberV2
 			this.isSubscribed = true;
 			this.isSubscribing = false;
 			// Before calling subscriptionPromiseResolver, check if it's defined
-			if (this.subscriptionPromiseResolver) {
-				this.subscriptionPromiseResolver(true);
-			}
+			this.subscriptionPromiseResolver(true);
 
 			return true;
 		} catch (error) {
@@ -415,27 +440,34 @@ export class WebSocketVelocityClientAccountSubscriberV2
 			)
 		).flat();
 		this.initialOraclePriceData = new Map(
-			this.oracleInfos.reduce((result, oracleInfo, i) => {
-				if (!oracleAccountInfos[i]) {
-					return result;
-				}
+			this.oracleInfos.reduce(
+				(result, oracleInfo, i) => {
+					const oracleAccountInfo = oracleAccountInfos[i];
+					if (!oracleAccountInfo) {
+						return result;
+					}
 
-				const oracleClient = this.oracleClientCache.get(
-					oracleInfo.source,
-					connection,
-					this.program
-				);
+					const oracleClient = this.oracleClientCache.get(
+						oracleInfo.source,
+						connection,
+						this.program
+					);
+					if (!oracleClient) {
+						return result;
+					}
 
-				const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(
-					oracleAccountInfos[i].data
-				);
+					const oraclePriceData = oracleClient.getOraclePriceDataFromBuffer(
+						oracleAccountInfo.data
+					);
 
-				result.push([
-					getOracleId(oracleInfo.publicKey, oracleInfo.source),
-					oraclePriceData,
-				]);
-				return result;
-			}, [])
+					result.push([
+						getOracleId(oracleInfo.publicKey, oracleInfo.source),
+						oraclePriceData,
+					]);
+					return result;
+				},
+				[] as [string, OraclePriceData][]
+			)
 		);
 		const oracleSetupEndTime = performance.now();
 		const oracleSetupDuration = oracleSetupEndTime - oracleSetupStartTime;
@@ -503,6 +535,9 @@ export class WebSocketVelocityClientAccountSubscriberV2
 				this.program.provider.connection,
 				this.program
 			);
+			if (!client) {
+				return false;
+			}
 			const accountSubscriber =
 				new WebSocketAccountSubscriberV2<OraclePriceData>(
 					'oracle',
@@ -653,8 +688,9 @@ export class WebSocketVelocityClientAccountSubscriberV2
 
 		for (const oracle of oracles) {
 			const oracleId = getOracleId(oracle.publicKey, oracle.source);
-			if (this.oracleSubscribers.has(oracleId)) {
-				await this.oracleSubscribers.get(oracleId).unsubscribe();
+			const subscriber = this.oracleSubscribers.get(oracleId);
+			if (subscriber) {
+				await subscriber.unsubscribe();
 				if (this.delistedMarketSetting === DelistedMarketSetting.Discard) {
 					this.oracleSubscribers.delete(oracleId);
 				}
@@ -672,7 +708,10 @@ export class WebSocketVelocityClientAccountSubscriberV2
 
 	public getStateAccountAndSlot(): DataAndSlot<StateAccount> {
 		this.assertIsSubscribed();
-		return this.stateAccountSubscriber.dataAndSlot;
+		return assertDataAndSlot(
+			this.stateAccountSubscriber?.dataAndSlot,
+			'State account data not available'
+		);
 	}
 
 	public getMarketAccountAndSlot(
@@ -720,8 +759,8 @@ export class WebSocketVelocityClientAccountSubscriberV2
 			return undefined;
 		}
 
-		if (!perpMarketAccount.data.oracle.equals(oracle)) {
-			// If the oracle has changed, we need to update the oracle map in background
+		if (!oracle || !perpMarketAccount.data.oracle.equals(oracle)) {
+			// If the oracle has changed (or not yet cached), update the oracle map in background
 			this.setPerpOracleMap();
 		}
 
@@ -738,8 +777,8 @@ export class WebSocketVelocityClientAccountSubscriberV2
 			return undefined;
 		}
 
-		if (!spotMarketAccount.data.oracle.equals(oracle)) {
-			// If the oracle has changed, we need to update the oracle map in background
+		if (!oracle || !spotMarketAccount.data.oracle.equals(oracle)) {
+			// If the oracle has changed (or not yet cached), update the oracle map in background
 			this.setSpotOracleMap();
 		}
 

package/src/accounts/websocketProgramUserAccountSubscriber.ts

@@ -83,12 +83,7 @@ export class WebSocketProgramUserAccountSubscriber
 		this.isSubscribed = false;
 	}
 
-	getUserAccountAndSlot(): DataAndSlot<UserAccount> {
-		if (!this.userAccountAndSlot) {
-			throw new NotSubscribedError(
-				'Must subscribe before getting user account data'
-			);
-		}
+	getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined {
 		return this.userAccountAndSlot;
 	}
 }

package/src/addresses/marketAddresses.ts

@@ -7,8 +7,9 @@ export async function getMarketAddress(
 	marketIndex: number
 ): Promise<PublicKey> {
 	const cacheKey = `${programId.toString()}-${marketIndex.toString()}`;
-	if (CACHE.has(cacheKey)) {
-		return CACHE.get(cacheKey);
+	const cached = CACHE.get(cacheKey);
+	if (cached !== undefined) {
+		return cached;
 	}
 
 	const publicKey = await getPerpMarketPublicKey(programId, marketIndex);

package/src/addresses/pda.ts

@@ -6,7 +6,6 @@
  */
 import { PublicKey } from '@solana/web3.js';
 import * as anchor from '../isomorphic/anchor';
-import { BN } from '../isomorphic/anchor';
 import {
 	getAssociatedTokenAddress,
 	TOKEN_2022_PROGRAM_ID,
@@ -229,15 +228,6 @@ export function getReferrerNamePublicKeySync(
 	)[0];
 }
 
-export function getProtocolIfSharesTransferConfigPublicKey(
-	programId: PublicKey
-): PublicKey {
-	return PublicKey.findProgramAddressSync(
-		[Buffer.from(anchor.utils.bytes.utf8.encode('if_shares_transfer_config'))],
-		programId
-	)[0];
-}
-
 export function getPrelaunchOraclePublicKey(
 	programId: PublicKey,
 	marketIndex: number
@@ -277,21 +267,6 @@ export function getTokenProgramForSpotMarket(
 	return TOKEN_PROGRAM_ID;
 }
 
-export function getIfRebalanceConfigPublicKey(
-	programId: PublicKey,
-	inMarketIndex: number,
-	outMarketIndex: number
-): PublicKey {
-	return PublicKey.findProgramAddressSync(
-		[
-			Buffer.from(anchor.utils.bytes.utf8.encode('if_rebalance_config')),
-			new BN(inMarketIndex).toArrayLike(Buffer, 'le', 2),
-			new BN(outMarketIndex).toArrayLike(Buffer, 'le', 2),
-		],
-		programId
-	)[0];
-}
-
 export function getRevenueShareAccountPublicKey(
 	programId: PublicKey,
 	authority: PublicKey