@velocity-exchange/sdk 0.0.5 → 0.2.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.
@@ -58,6 +58,7 @@ import {
 	UserAccountEvents,
 	UserAccountSubscriber,
 } from './accounts/types';
+import { assertDataAndSlot } from './accounts/utils';
 import { BigNum } from './factory/bigNum';
 import { BN } from './isomorphic/anchor';
 import { calculateBaseAssetValue, calculatePositionPNL } from './math/position';
@@ -129,10 +130,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 +145,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') {
@@ -228,19 +225,47 @@ export class User {
 		this.isSubscribed = false;
 	}
 
-	public getUserAccount(): UserAccount {
-		return this.accountSubscriber.getUserAccountAndSlot().data;
+	public getUserAccount(): UserAccount | undefined {
+		return this.accountSubscriber.getUserAccountAndSlot()?.data;
 	}
 
-	public async forceGetUserAccount(): Promise<UserAccount> {
+	/**
+	 * Like {@link getUserAccount} but throws a named error instead of returning
+	 * `undefined` when the account has not been loaded yet. Use at call sites
+	 * that structurally require a loaded account.
+	 */
+	public getUserAccountOrThrow(): UserAccount {
+		const userAccount = this.getUserAccount();
+		if (!userAccount) {
+			throw new Error(
+				`User account not loaded: ${this.getUserAccountPublicKey().toString()}`
+			);
+		}
+		return userAccount;
+	}
+
+	public async forceGetUserAccount(): Promise<UserAccount | undefined> {
 		await this.fetchAccounts();
-		return this.accountSubscriber.getUserAccountAndSlot().data;
+		const account = this.accountSubscriber.getUserAccountAndSlot();
+		return account?.data;
 	}
 
 	public getUserAccountAndSlot(): DataAndSlot<UserAccount> | undefined {
 		return this.accountSubscriber.getUserAccountAndSlot();
 	}
 
+	/**
+	 * Like {@link getUserAccountAndSlot} but throws a named error instead of
+	 * returning `undefined` when the account has not been loaded yet. Use at
+	 * call sites that structurally require a loaded account.
+	 */
+	public getUserAccountAndSlotOrThrow(): DataAndSlot<UserAccount> {
+		return assertDataAndSlot(
+			this.accountSubscriber.getUserAccountAndSlot(),
+			`User account not loaded: ${this.getUserAccountPublicKey().toString()}`
+		);
+	}
+
 	public getPerpPositionForUserAccount(
 		userAccount: UserAccount,
 		marketIndex: number
@@ -256,22 +281,30 @@ export class User {
 	 * @returns userPerpPosition
 	 */
 	public getPerpPosition(marketIndex: number): PerpPosition | undefined {
-		const userAccount = this.getUserAccount();
+		const userAccount = this.getUserAccountOrThrow();
 		return this.getPerpPositionForUserAccount(userAccount, marketIndex);
 	}
 
 	public getPerpPositionOrEmpty(marketIndex: number): PerpPosition {
-		const userAccount = this.getUserAccount();
+		const userAccount = this.getUserAccountOrThrow();
 		return (
 			this.getPerpPositionForUserAccount(userAccount, marketIndex) ??
 			this.getEmptyPosition(marketIndex)
 		);
 	}
 
+	public getPerpPositionOrThrow(marketIndex: number): PerpPosition {
+		const position = this.getPerpPosition(marketIndex);
+		if (!position) {
+			throw new Error(`No perp position found for market ${marketIndex}`);
+		}
+		return position;
+	}
+
 	public getPerpPositionAndSlot(
 		marketIndex: number
 	): DataAndSlot<PerpPosition | undefined> {
-		const userAccount = this.getUserAccountAndSlot();
+		const userAccount = this.getUserAccountAndSlotOrThrow();
 		const perpPosition = this.getPerpPositionForUserAccount(
 			userAccount.data,
 			marketIndex
@@ -297,14 +330,14 @@ export class User {
 	 * @returns userSpotPosition
 	 */
 	public getSpotPosition(marketIndex: number): SpotPosition | undefined {
-		const userAccount = this.getUserAccount();
+		const userAccount = this.getUserAccountOrThrow();
 		return this.getSpotPositionForUserAccount(userAccount, marketIndex);
 	}
 
 	public getSpotPositionAndSlot(
 		marketIndex: number
 	): DataAndSlot<SpotPosition | undefined> {
-		const userAccount = this.getUserAccountAndSlot();
+		const userAccount = this.getUserAccountAndSlotOrThrow();
 		const spotPosition = this.getSpotPositionForUserAccount(
 			userAccount.data,
 			marketIndex
@@ -338,7 +371,8 @@ export class User {
 		if (spotPosition === undefined) {
 			return ZERO;
 		}
-		const spotMarket = this.velocityClient.getSpotMarketAccount(marketIndex);
+		const spotMarket =
+			this.velocityClient.getSpotMarketAccountOrThrow(marketIndex);
 		return getSignedTokenAmount(
 			getTokenAmount(
 				spotPosition.scaledBalance,
@@ -376,8 +410,8 @@ export class User {
 		const perpPosition = this.getPerpPosition(perpMarketIndex);
 		if (!perpPosition) return ZERO;
 		const perpMarket =
-			this.velocityClient.getPerpMarketAccount(perpMarketIndex);
-		const spotMarket = this.velocityClient.getSpotMarketAccount(
+			this.velocityClient.getPerpMarketAccountOrThrow(perpMarketIndex);
+		const spotMarket = this.velocityClient.getSpotMarketAccountOrThrow(
 			perpMarket.quoteSpotMarketIndex
 		);
 		if (perpPosition === undefined) {
@@ -399,10 +433,10 @@ export class User {
 				return total;
 			}
 
-			const perpMarket = this.velocityClient.getPerpMarketAccount(
+			const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(
 				perpPosition.marketIndex
 			);
-			const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(
+			const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(
 				perpMarket.quoteSpotMarketIndex
 			);
 			const quoteOraclePriceData = this.getOracleDataForSpotMarket(
@@ -442,12 +476,12 @@ export class User {
 	 * @returns Order
 	 */
 	public getOrder(orderId: number): Order | undefined {
-		const userAccount = this.getUserAccount();
+		const userAccount = this.getUserAccountOrThrow();
 		return this.getOrderForUserAccount(userAccount, orderId);
 	}
 
 	public getOrderAndSlot(orderId: number): DataAndSlot<Order | undefined> {
-		const userAccount = this.getUserAccountAndSlot();
+		const userAccount = this.getUserAccountAndSlotOrThrow();
 		const order = this.getOrderForUserAccount(userAccount.data, orderId);
 		return {
 			data: order,
@@ -469,14 +503,14 @@ export class User {
 	 * @returns Order
 	 */
 	public getOrderByUserOrderId(userOrderId: number): Order | undefined {
-		const userAccount = this.getUserAccount();
+		const userAccount = this.getUserAccountOrThrow();
 		return this.getOrderByUserIdForUserAccount(userAccount, userOrderId);
 	}
 
 	public getOrderByUserOrderIdAndSlot(
 		userOrderId: number
 	): DataAndSlot<Order | undefined> {
-		const userAccount = this.getUserAccountAndSlot();
+		const userAccount = this.getUserAccountAndSlotOrThrow();
 		const order = this.getOrderByUserIdForUserAccount(
 			userAccount.data,
 			userOrderId
@@ -487,7 +521,9 @@ export class User {
 		};
 	}
 
-	public getOpenOrdersForUserAccount(userAccount?: UserAccount): Order[] {
+	public getOpenOrdersForUserAccount(
+		userAccount?: UserAccount
+	): Order[] | undefined {
 		return userAccount?.orders.filter((order) =>
 			isVariant(order.status, 'open')
 		);
@@ -495,12 +531,12 @@ export class User {
 
 	public getOpenOrders(): Order[] {
 		const userAccount = this.getUserAccount();
-		return this.getOpenOrdersForUserAccount(userAccount);
+		return this.getOpenOrdersForUserAccount(userAccount) ?? [];
 	}
 
 	public getOpenOrdersAndSlot(): DataAndSlot<Order[]> {
-		const userAccount = this.getUserAccountAndSlot();
-		const openOrders = this.getOpenOrdersForUserAccount(userAccount.data);
+		const userAccount = this.getUserAccountAndSlotOrThrow();
+		const openOrders = this.getOpenOrdersForUserAccount(userAccount.data) ?? [];
 		return {
 			data: openOrders,
 			slot: userAccount.slot,
@@ -525,7 +561,7 @@ export class User {
 	 * @returns : open asks
 	 */
 	public getPerpBidAsks(marketIndex: number): [BN, BN] {
-		const position = this.getPerpPosition(marketIndex);
+		const position = this.getPerpPositionOrThrow(marketIndex);
 
 		const totalOpenBids = position.openBids;
 		const totalOpenAsks = position.openAsks;
@@ -540,12 +576,13 @@ export class User {
 	public getPerpBuyingPower(
 		marketIndex: number,
 		collateralBuffer = ZERO,
-		maxMarginRatio = undefined,
+		maxMarginRatio: number | undefined = undefined,
 		positionType: 'isolated' | 'cross' = 'cross'
 	): BN {
 		const perpPosition = this.getPerpPositionOrEmpty(marketIndex);
 
-		const perpMarket = this.velocityClient.getPerpMarketAccount(marketIndex);
+		const perpMarket =
+			this.velocityClient.getPerpMarketAccountOrThrow(marketIndex);
 		const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
 		const worstCaseBaseAssetAmount = perpPosition
 			? calculateWorstCaseBaseAssetAmount(
@@ -595,18 +632,24 @@ export class User {
 		);
 	}
 
+	private resolveMaxMarginRatio(perpMarketMaxMarginRatio?: number): number {
+		// 0 means "no custom margin ratio override", so Math.max returns
+		// userAccount.maxMarginRatio unchanged — the expected semantic.
+		return Math.max(
+			perpMarketMaxMarginRatio ?? 0,
+			this.getUserAccountOrThrow().maxMarginRatio
+		);
+	}
+
 	getPerpBuyingPowerFromFreeCollateralAndBaseAssetAmount(
 		marketIndex: number,
 		freeCollateral: BN,
 		baseAssetAmount: BN,
-		perpMarketMaxMarginRatio = undefined
+		perpMarketMaxMarginRatio: number | undefined = undefined
 	): BN {
-		const maxMarginRatio = Math.max(
-			perpMarketMaxMarginRatio,
-			this.getUserAccount().maxMarginRatio
-		);
+		const maxMarginRatio = this.resolveMaxMarginRatio(perpMarketMaxMarginRatio);
 		const marginRatio = calculateMarketMarginRatio(
-			this.velocityClient.getPerpMarketAccount(marketIndex),
+			this.velocityClient.getPerpMarketAccountOrThrow(marketIndex),
 			baseAssetAmount,
 			'Initial',
 			maxMarginRatio
@@ -751,11 +794,11 @@ export class User {
 	}
 
 	public getActivePerpPositions(): PerpPosition[] {
-		const userAccount = this.getUserAccount();
+		const userAccount = this.getUserAccountOrThrow();
 		return this.getActivePerpPositionsForUserAccount(userAccount);
 	}
 	public getActivePerpPositionsAndSlot(): DataAndSlot<PerpPosition[]> {
-		const userAccount = this.getUserAccountAndSlot();
+		const userAccount = this.getUserAccountAndSlotOrThrow();
 		const positions = this.getActivePerpPositionsForUserAccount(
 			userAccount.data
 		);
@@ -774,11 +817,11 @@ export class User {
 	}
 
 	public getActiveSpotPositions(): SpotPosition[] {
-		const userAccount = this.getUserAccount();
+		const userAccount = this.getUserAccountOrThrow();
 		return this.getActiveSpotPositionsForUserAccount(userAccount);
 	}
 	public getActiveSpotPositionsAndSlot(): DataAndSlot<SpotPosition[]> {
-		const userAccount = this.getUserAccountAndSlot();
+		const userAccount = this.getUserAccountAndSlotOrThrow();
 		const positions = this.getActiveSpotPositionsForUserAccount(
 			userAccount.data
 		);
@@ -804,14 +847,14 @@ export class User {
 				marketIndex !== undefined ? pos.marketIndex === marketIndex : true
 			)
 			.reduce((unrealizedPnl, perpPosition) => {
-				const market = this.velocityClient.getPerpMarketAccount(
+				const market = this.velocityClient.getPerpMarketAccountOrThrow(
 					perpPosition.marketIndex
 				);
 				const oraclePriceData = this.getMMOracleDataForPerpMarket(
 					market.marketIndex
 				);
 
-				const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(
+				const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(
 					market.quoteSpotMarketIndex
 				);
 				const quoteOraclePriceData = this.getOracleDataForSpotMarket(
@@ -875,12 +918,12 @@ export class User {
 	 * @returns : Precision QUOTE_PRECISION
 	 */
 	public getUnrealizedFundingPNL(marketIndex?: number): BN {
-		return this.getUserAccount()
+		return this.getUserAccountOrThrow()
 			.perpPositions.filter((pos) =>
 				marketIndex !== undefined ? pos.marketIndex === marketIndex : true
 			)
 			.reduce((pnl, perpPosition) => {
-				const market = this.velocityClient.getPerpMarketAccount(
+				const market = this.velocityClient.getPerpMarketAccountOrThrow(
 					perpPosition.marketIndex
 				);
 				return pnl.add(calculateUnsettledFundingPnl(market, perpPosition));
@@ -899,7 +942,7 @@ export class User {
 		let netQuoteValue = ZERO;
 		let totalAssetValue = ZERO;
 		let totalLiabilityValue = ZERO;
-		for (const spotPosition of this.getUserAccount().spotPositions) {
+		for (const spotPosition of this.getUserAccountOrThrow().spotPositions) {
 			const countForBase =
 				marketIndex === undefined || spotPosition.marketIndex === marketIndex;
 
@@ -915,7 +958,9 @@ export class User {
 			}
 
 			const spotMarketAccount: SpotMarketAccount =
-				this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex);
+				this.velocityClient.getSpotMarketAccountOrThrow(
+					spotPosition.marketIndex
+				);
 
 			const oraclePriceData = this.getOracleDataForSpotMarket(
 				spotPosition.marketIndex
@@ -1018,7 +1063,7 @@ export class User {
 				spotMarketAccount,
 				strictOraclePrice,
 				marginCategory,
-				this.getUserAccount().maxMarginRatio
+				this.getUserAccountOrThrow().maxMarginRatio
 			);
 
 			if (worstCaseTokenAmount.gt(ZERO) && countForBase) {
@@ -1051,7 +1096,10 @@ export class User {
 			if (worstCaseQuoteTokenAmount.lt(ZERO) && countForQuote) {
 				let weight = SPOT_MARKET_WEIGHT_PRECISION;
 				if (marginCategory === 'Initial') {
-					weight = BN.max(weight, new BN(this.getUserAccount().maxMarginRatio));
+					weight = BN.max(
+						weight,
+						new BN(this.getUserAccountOrThrow().maxMarginRatio)
+					);
 				}
 
 				const weightedTokenValue = worstCaseQuoteTokenAmount
@@ -1108,7 +1156,7 @@ export class User {
 			tokenAmount,
 			strictOraclePrice,
 			spotMarketAccount,
-			this.getUserAccount().maxMarginRatio,
+			this.getUserAccountOrThrow().maxMarginRatio,
 			marginCategory,
 			liquidationBuffer
 		);
@@ -1142,7 +1190,7 @@ export class User {
 			tokenAmount,
 			strictOraclePrice,
 			spotMarketAccount,
-			this.getUserAccount().maxMarginRatio,
+			this.getUserAccountOrThrow().maxMarginRatio,
 			marginCategory
 		);
 	}
@@ -1203,8 +1251,15 @@ export class User {
 		});
 
 		if (perpMarketIndex !== undefined) {
-			const { totalCollateral, totalCollateralBuffer } =
+			const isolatedMarginCalculation =
 				marginCalc.isolatedMarginCalculations.get(perpMarketIndex);
+			if (!isolatedMarginCalculation) {
+				throw new Error(
+					`No isolated margin calculation for perp market ${perpMarketIndex}`
+				);
+			}
+			const { totalCollateral, totalCollateralBuffer } =
+				isolatedMarginCalculation;
 			if (liquidationBuffer?.gt(ZERO)) {
 				return totalCollateralBuffer;
 			}
@@ -1304,7 +1359,7 @@ export class User {
 		includeOpenOrders?: boolean,
 		strict = false
 	): BN {
-		const market = this.velocityClient.getPerpMarketAccount(
+		const market = this.velocityClient.getPerpMarketAccountOrThrow(
 			perpPosition.marketIndex
 		);
 
@@ -1338,7 +1393,7 @@ export class User {
 		if (marginCategory) {
 			const userCustomMargin = Math.max(
 				perpPosition.maxMarginRatio,
-				this.getUserAccount().maxMarginRatio
+				this.getUserAccountOrThrow().maxMarginRatio
 			);
 			let marginRatio = new BN(
 				calculateMarketMarginRatio(
@@ -1357,7 +1412,7 @@ export class User {
 				marginRatio = ZERO;
 			}
 
-			const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(
+			const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(
 				market.quoteSpotMarketIndex
 			);
 			const quoteOraclePriceData =
@@ -1400,7 +1455,7 @@ export class User {
 		includeOpenOrders?: boolean,
 		strict = false
 	): BN {
-		const perpPosition = this.getPerpPosition(marketIndex);
+		const perpPosition = this.getPerpPositionOrThrow(marketIndex);
 		return this.calculateWeightedPerpPositionLiability(
 			perpPosition,
 			marginCategory,
@@ -1445,7 +1500,7 @@ export class User {
 		includeOpenOrders = false
 	): BN {
 		const userPosition = this.getPerpPositionOrEmpty(marketIndex);
-		const market = this.velocityClient.getPerpMarketAccount(
+		const market = this.velocityClient.getPerpMarketAccountOrThrow(
 			userPosition.marketIndex
 		);
 		return calculateBaseAssetValueWithOracle(
@@ -1466,7 +1521,7 @@ export class User {
 		includeOpenOrders = false
 	): BN {
 		const userPosition = this.getPerpPositionOrEmpty(marketIndex);
-		const market = this.velocityClient.getPerpMarketAccount(
+		const market = this.velocityClient.getPerpMarketAccountOrThrow(
 			userPosition.marketIndex
 		);
 
@@ -1505,7 +1560,7 @@ export class User {
 		amountToClose?: BN,
 		useAMMClose = false
 	): [BN, BN] {
-		const market = this.velocityClient.getPerpMarketAccount(
+		const market = this.velocityClient.getPerpMarketAccountOrThrow(
 			position.marketIndex
 		);
 
@@ -1594,7 +1649,7 @@ export class User {
 
 	getLeverageComponents(
 		includeOpenOrders = true,
-		marginCategory: MarginCategory = undefined,
+		marginCategory: MarginCategory | undefined = undefined,
 		perpMarketIndex?: number
 	): {
 		perpLiabilityValue: BN;
@@ -1610,14 +1665,14 @@ export class User {
 				undefined,
 				includeOpenOrders
 			);
-			const perpMarket = this.velocityClient.getPerpMarketAccount(
+			const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(
 				perpPosition.marketIndex
 			);
 
 			const oraclePriceData = this.getOracleDataForPerpMarket(
 				perpPosition.marketIndex
 			);
-			const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(
+			const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(
 				perpMarket.quoteSpotMarketIndex
 			);
 			const quoteOraclePriceData = this.getOracleDataForSpotMarket(
@@ -1690,6 +1745,12 @@ export class User {
 
 		const spotPosition = this.getSpotPosition(spotMarketAccount.marketIndex);
 
+		if (!spotPosition) {
+			throw new Error(
+				`No spot position found for market ${spotMarketAccount.marketIndex}`
+			);
+		}
+
 		if (isSpotPositionAvailable(spotPosition)) {
 			return false;
 		}
@@ -1776,8 +1837,8 @@ export class User {
 	 */
 	getTotalAllTimePnl(): BN {
 		const netUsdValue = this.getNetUsdValue();
-		const totalDeposits = this.getUserAccount().totalDeposits;
-		const totalWithdraws = this.getUserAccount().totalWithdraws;
+		const totalDeposits = this.getUserAccountOrThrow().totalDeposits;
+		const totalWithdraws = this.getUserAccountOrThrow().totalWithdraws;
 
 		const totalPnl = netUsdValue.add(totalWithdraws).sub(totalDeposits);
 
@@ -2016,7 +2077,7 @@ export class User {
 
 	public isCrossMarginBeingLiquidated(): boolean {
 		return (
-			(this.getUserAccount().status &
+			(this.getUserAccountOrThrow().status &
 				(UserStatus.BEING_LIQUIDATED | UserStatus.BANKRUPT)) >
 			0
 		);
@@ -2043,7 +2104,7 @@ export class User {
 		);
 
 		return (
-			(position?.positionFlag &
+			((position?.positionFlag ?? 0) &
 				(PositionFlag.BeingLiquidated | PositionFlag.Bankruptcy)) >
 			0
 		);
@@ -2072,11 +2133,11 @@ export class User {
 	}
 
 	public hasStatus(status: UserStatus): boolean {
-		return (this.getUserAccount().status & status) > 0;
+		return (this.getUserAccountOrThrow().status & status) > 0;
 	}
 
 	public isBankrupt(): boolean {
-		return (this.getUserAccount().status & UserStatus.BANKRUPT) > 0;
+		return (this.getUserAccountOrThrow().status & UserStatus.BANKRUPT) > 0;
 	}
 
 	/**
@@ -2084,19 +2145,19 @@ export class User {
 	 * @returns
 	 */
 	public needsToSettleFundingPayment(): boolean {
-		for (const userPosition of this.getUserAccount().perpPositions) {
+		for (const userPosition of this.getUserAccountOrThrow().perpPositions) {
 			if (userPosition.baseAssetAmount.eq(ZERO)) {
 				continue;
 			}
 
-			const market = this.velocityClient.getPerpMarketAccount(
+			const market = this.velocityClient.getPerpMarketAccountOrThrow(
 				userPosition.marketIndex
 			);
 			if (
-				market.amm.cumulativeFundingRateLong.eq(
+				market.cumulativeFundingRateLong.eq(
 					userPosition.lastCumulativeFundingRate
 				) ||
-				market.amm.cumulativeFundingRateShort.eq(
+				market.cumulativeFundingRateShort.eq(
 					userPosition.lastCumulativeFundingRate
 				)
 			) {
@@ -2130,7 +2191,7 @@ export class User {
 			totalCollateral.sub(maintenanceMarginRequirement)
 		);
 
-		const market = this.velocityClient.getSpotMarketAccount(marketIndex);
+		const market = this.velocityClient.getSpotMarketAccountOrThrow(marketIndex);
 		let signedTokenAmount = getSignedTokenAmount(
 			getTokenAmount(
 				currentSpotPosition.scaledBalance,
@@ -2153,7 +2214,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 +2233,7 @@ export class User {
 				if (freeCollateralDeltaForPerp) {
 					const { numerator, denominator } = getMultipleBetweenOracleSources(
 						market.oracleSource,
-						perpMarketWithSameOracle.amm.oracleSource
+						perpMarketWithSameOracle.oracleSource
 					);
 					freeCollateralDeltaForPerp = freeCollateralDeltaForPerp
 						.mul(numerator)
@@ -2221,10 +2282,9 @@ export class User {
 		offsetCollateral = ZERO,
 		marginType?: MarginType
 	): BN {
-		const market = this.velocityClient.getPerpMarketAccount(marketIndex);
+		const market = this.velocityClient.getPerpMarketAccountOrThrow(marketIndex);
 
-		const oracle =
-			this.velocityClient.getPerpMarketAccount(marketIndex).amm.oracle;
+		const oracle = market.oracle;
 
 		const oraclePrice =
 			this.velocityClient.getOracleDataForPerpMarket(marketIndex).price;
@@ -2292,7 +2352,7 @@ export class User {
 
 		positionBaseSizeChange = standardizeBaseAssetAmount(
 			positionBaseSizeChange,
-			market.amm.orderStepSize
+			market.orderStepSize
 		);
 
 		const freeCollateralChangeFromNewPosition =
@@ -2345,7 +2405,7 @@ export class User {
 
 				if (spotFreeCollateralDelta) {
 					const { numerator, denominator } = getMultipleBetweenOracleSources(
-						market.amm.oracleSource,
+						market.oracleSource,
 						spotMarketWithSameOracle.oracleSource
 					);
 					spotFreeCollateralDelta = spotFreeCollateralDelta
@@ -2436,7 +2496,7 @@ export class User {
 
 			const userCustomMargin = Math.max(
 				perpPosition.maxMarginRatio,
-				this.getUserAccount().maxMarginRatio
+				this.getUserAccountOrThrow().maxMarginRatio
 			);
 			const marginRatio = calculateMarketMarginRatio(
 				market,
@@ -2485,7 +2545,7 @@ export class User {
 
 		const userCustomMargin = Math.max(
 			perpPosition.maxMarginRatio,
-			this.getUserAccount().maxMarginRatio
+			this.getUserAccountOrThrow().maxMarginRatio
 		);
 
 		const marginRatio = calculateMarketMarginRatio(
@@ -2598,10 +2658,7 @@ export class User {
 		estEntryPrice?: BN,
 		perpMarketMaxMarginRatio?: number
 	): BN {
-		const maxMarginRatio = Math.max(
-			perpMarketMaxMarginRatio,
-			this.getUserAccount().maxMarginRatio
-		);
+		const maxMarginRatio = this.resolveMaxMarginRatio(perpMarketMaxMarginRatio);
 		return calculateMarginUSDCRequiredForTrade(
 			this.velocityClient,
 			targetMarketIndex,
@@ -2617,10 +2674,7 @@ export class User {
 		collateralIndex: number,
 		perpMarketMaxMarginRatio?: number
 	): BN {
-		const maxMarginRatio = Math.max(
-			perpMarketMaxMarginRatio,
-			this.getUserAccount().maxMarginRatio
-		);
+		const maxMarginRatio = this.resolveMaxMarginRatio(perpMarketMaxMarginRatio);
 		return calculateCollateralDepositRequiredForTrade(
 			this.velocityClient,
 			targetMarketIndex,
@@ -2641,7 +2695,7 @@ export class User {
 	public getMaxTradeSizeUSDCForPerp(
 		targetMarketIndex: number,
 		tradeSide: PositionDirection,
-		maxMarginRatio = undefined,
+		maxMarginRatio: number | undefined = undefined,
 		positionType: 'isolated' | 'cross' = 'cross'
 	): { tradeSize: BN; oppositeSideTradeSize: BN } {
 		let tradeSize = ZERO;
@@ -2661,7 +2715,7 @@ export class User {
 		const oracleData = this.getMMOracleDataForPerpMarket(targetMarketIndex);
 
 		const marketAccount =
-			this.velocityClient.getPerpMarketAccount(targetMarketIndex);
+			this.velocityClient.getPerpMarketAccountOrThrow(targetMarketIndex);
 
 		// add any position we have on the opposite side of the current trade, because we can "flip" the size of this position without taking any extra leverage.
 		const oppositeSizeLiabilityValue = targetingSameSide
@@ -2700,7 +2754,7 @@ export class User {
 				const marginRequirement = this.getInitialMarginRequirement();
 				const marginRatio = Math.max(
 					currentPosition.maxMarginRatio,
-					this.getUserAccount().maxMarginRatio
+					this.getUserAccountOrThrow().maxMarginRatio
 				);
 				const marginFreedByClosing = perpLiabilityValue
 					.mul(new BN(marginRatio))
@@ -2788,7 +2842,8 @@ export class User {
 		currentQuoteAssetValue?: BN,
 		currentSpotMarketNetValue?: BN
 	): BN {
-		const market = this.velocityClient.getSpotMarketAccount(targetMarketIndex);
+		const market =
+			this.velocityClient.getSpotMarketAccountOrThrow(targetMarketIndex);
 		const oraclePrice =
 			this.velocityClient.getOracleDataForSpotMarket(targetMarketIndex).price;
 
@@ -2808,11 +2863,11 @@ export class User {
 			isVariant(direction, 'long')
 				? SpotBalanceType.DEPOSIT
 				: SpotBalanceType.BORROW,
-			this.getUserAccount().maxMarginRatio
+			this.getUserAccountOrThrow().maxMarginRatio
 		);
 
 		let tradeAmount = ZERO;
-		if (this.getUserAccount().isMarginTradingEnabled) {
+		if (this.getUserAccountOrThrow().isMarginTradingEnabled) {
 			// if the user is buying/selling and already short/long, need to account for closing out short/long
 			if (isVariant(direction, 'long') && currentSpotMarketNetValue.lt(ZERO)) {
 				tradeAmount = currentSpotMarketNetValue.abs();
@@ -2822,7 +2877,7 @@ export class User {
 					'Initial',
 					this.getTokenAmount(targetMarketIndex).abs(),
 					SpotBalanceType.BORROW,
-					this.getUserAccount().maxMarginRatio
+					this.getUserAccountOrThrow().maxMarginRatio
 				);
 				freeCollateral = freeCollateral.add(
 					tradeAmount.mul(new BN(marginRatio)).div(MARGIN_PRECISION)
@@ -2838,7 +2893,7 @@ export class User {
 					'Initial',
 					this.getTokenAmount(targetMarketIndex),
 					SpotBalanceType.DEPOSIT,
-					this.getUserAccount().maxMarginRatio
+					this.getUserAccountOrThrow().maxMarginRatio
 				);
 				freeCollateral = freeCollateral.add(
 					tradeAmount.mul(new BN(marginRatio)).div(MARGIN_PRECISION)
@@ -2880,8 +2935,10 @@ export class User {
 		calculateSwap?: (inAmount: BN) => BN;
 		iterationLimit?: number;
 	}): { inAmount: BN; outAmount: BN; leverage: BN } {
-		const inMarket = this.velocityClient.getSpotMarketAccount(inMarketIndex);
-		const outMarket = this.velocityClient.getSpotMarketAccount(outMarketIndex);
+		const inMarket =
+			this.velocityClient.getSpotMarketAccountOrThrow(inMarketIndex);
+		const outMarket =
+			this.velocityClient.getSpotMarketAccountOrThrow(outMarketIndex);
 
 		const inOraclePriceData = this.getOracleDataForSpotMarket(inMarketIndex);
 		const inOraclePrice = inOraclePriceData.price;
@@ -3138,14 +3195,14 @@ export class User {
 		const marginCategory = 'Initial';
 
 		const spotMarketAccount: SpotMarketAccount =
-			this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex);
+			this.velocityClient.getSpotMarketAccountOrThrow(spotPosition.marketIndex);
 
 		const { freeCollateralContribution } = getWorstCaseTokenAmounts(
 			spotPosition,
 			spotMarketAccount,
 			strictOraclePrice,
 			marginCategory,
-			this.getUserAccount().maxMarginRatio
+			this.getUserAccountOrThrow().maxMarginRatio
 		);
 
 		return freeCollateralContribution;
@@ -3162,14 +3219,14 @@ export class User {
 		let totalLiabilityValue = ZERO;
 
 		const spotMarketAccount: SpotMarketAccount =
-			this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex);
+			this.velocityClient.getSpotMarketAccountOrThrow(spotPosition.marketIndex);
 
 		const { tokenValue, ordersValue } = getWorstCaseTokenAmounts(
 			spotPosition,
 			spotMarketAccount,
 			strictOraclePrice,
 			'Initial',
-			this.getUserAccount().maxMarginRatio
+			this.getUserAccountOrThrow().maxMarginRatio
 		);
 
 		if (tokenValue.gte(ZERO)) {
@@ -3208,8 +3265,10 @@ export class User {
 		inAmount: BN;
 		outAmount: BN;
 	}): BN {
-		const inMarket = this.velocityClient.getSpotMarketAccount(inMarketIndex);
-		const outMarket = this.velocityClient.getSpotMarketAccount(outMarketIndex);
+		const inMarket =
+			this.velocityClient.getSpotMarketAccountOrThrow(inMarketIndex);
+		const outMarket =
+			this.velocityClient.getSpotMarketAccountOrThrow(outMarketIndex);
 
 		const inOraclePriceData = this.getOracleDataForSpotMarket(inMarketIndex);
 		const inOraclePrice = inOraclePriceData.price;
@@ -3412,7 +3471,7 @@ export class User {
 		const currentPosition = this.getPerpPositionOrEmpty(targetMarketIndex);
 
 		const perpMarket =
-			this.velocityClient.getPerpMarketAccount(targetMarketIndex);
+			this.velocityClient.getPerpMarketAccountOrThrow(targetMarketIndex);
 		const oracleData = this.getOracleDataForPerpMarket(targetMarketIndex);
 
 		let {
@@ -3482,17 +3541,15 @@ export class User {
 	public getUserFeeTier(marketType: MarketType, now?: BN) {
 		const state = this.velocityClient.getStateAccount();
 
-		const feeTierIndex = 0;
 		if (isVariant(marketType, 'perp')) {
 			const userStatsAccount: UserStatsAccount = this.velocityClient
-				.getUserStats()
-				.getAccount();
+				.getUserStatsOrThrow()
+				.getAccountOrThrow();
 
 			const total30dVolume = getUser30dRollingVolumeEstimate(
 				userStatsAccount,
 				now
 			);
-			const stakedGovAssetAmount = userStatsAccount.ifStakedGovTokenAmount;
 
 			const volumeThresholds = [
 				new BN(2_000_000).mul(QUOTE_PRECISION),
@@ -3501,14 +3558,6 @@ export class User {
 				new BN(80_000_000).mul(QUOTE_PRECISION),
 				new BN(200_000_000).mul(QUOTE_PRECISION),
 			];
-			const stakeThresholds = [
-				new BN(1_000 - 1).mul(QUOTE_PRECISION),
-				new BN(10_000 - 1).mul(QUOTE_PRECISION),
-				new BN(50_000 - 1).mul(QUOTE_PRECISION),
-				new BN(100_000 - 1).mul(QUOTE_PRECISION),
-				new BN(250_000 - 5).mul(QUOTE_PRECISION),
-			];
-			const stakeBenefitFrac = [0, 5, 10, 20, 30, 40];
 
 			let feeTierIndex = 5;
 			for (let i = 0; i < volumeThresholds.length; i++) {
@@ -3518,29 +3567,10 @@ export class User {
 				}
 			}
 
-			let stakeBenefitIndex = 5;
-			for (let i = 0; i < stakeThresholds.length; i++) {
-				if (stakedGovAssetAmount.lt(stakeThresholds[i])) {
-					stakeBenefitIndex = i;
-					break;
-				}
-			}
-
-			const stakeBenefit = stakeBenefitFrac[stakeBenefitIndex];
-
-			const tier = { ...state.perpFeeStructure.feeTiers[feeTierIndex] };
-
-			if (stakeBenefit > 0) {
-				tier.feeNumerator = (tier.feeNumerator * (100 - stakeBenefit)) / 100;
-
-				tier.makerRebateNumerator =
-					(tier.makerRebateNumerator * (100 + stakeBenefit)) / 100;
-			}
-
-			return tier;
+			return state.perpFeeStructure.feeTiers[feeTierIndex];
 		}
 
-		return state.spotFeeStructure.feeTiers[feeTierIndex];
+		return state.spotFeeStructure.feeTiers[0];
 	}
 
 	/**
@@ -3575,7 +3605,8 @@ export class User {
 	 */
 	public getWithdrawalLimit(marketIndex: number, reduceOnly?: boolean): BN {
 		const nowTs = new BN(Math.floor(Date.now() / 1000));
-		const spotMarket = this.velocityClient.getSpotMarketAccount(marketIndex);
+		const spotMarket =
+			this.velocityClient.getSpotMarketAccountOrThrow(marketIndex);
 
 		// eslint-disable-next-line prefer-const
 		let { borrowLimit, withdrawLimit } = calculateWithdrawLimit(
@@ -3667,12 +3698,13 @@ export class User {
 		depositAmount: BN;
 		maxDepositAmount: BN;
 	} {
-		const spotMarket = this.velocityClient.getSpotMarketAccount(marketIndex);
+		const spotMarket =
+			this.velocityClient.getSpotMarketAccountOrThrow(marketIndex);
 		const maxDepositAmount = spotMarket.withdrawGuardThreshold.div(new BN(10));
 		const position = this.getSpotPosition(marketIndex);
 
-		const netDeposits = this.getUserAccount().totalDeposits.sub(
-			this.getUserAccount().totalWithdraws
+		const netDeposits = this.getUserAccountOrThrow().totalDeposits.sub(
+			this.getUserAccountOrThrow().totalWithdraws
 		);
 
 		if (!position) {
@@ -3717,7 +3749,7 @@ export class User {
 	}
 
 	public canMakeIdle(slot: BN): boolean {
-		const userAccount = this.getUserAccount();
+		const userAccount = this.getUserAccountOrThrow();
 		if (userAccount.idle) {
 			return false;
 		}
@@ -3775,14 +3807,16 @@ export class User {
 		userStatsAccount?: UserStatsAccount,
 		now?: BN
 	): { canDelete: boolean; reason?: string } {
-		const userAccount = this.getUserAccount();
+		const userAccount = this.getUserAccountOrThrow();
 		const userStatsAccountToUse =
-			userStatsAccount || this.velocityClient.getUserStats().getAccount();
+			userStatsAccount ??
+			this.velocityClient.getUserStatsOrThrow().getAccount();
 		const nowInSeconds = now || new BN(Math.floor(Date.now() / 1000));
 		const stateAccount = this.velocityClient.getStateAccount();
 
 		// Referrer cannot delete sub_account_id 0
 		const isReferrer =
+			userStatsAccountToUse !== undefined &&
 			(userStatsAccountToUse.referrerStatus & ReferrerStatus.IsReferrer) > 0;
 		if (isReferrer && userAccount.subAccountId === 0) {
 			return { canDelete: false, reason: 'is-subaccount-0-referrer' };
@@ -3818,7 +3852,7 @@ export class User {
 		}
 
 		// Fresh account (< 13 days) with init fee must be idle
-		if (stateAccount.maxInitializeUserFee > 0) {
+		if (stateAccount.maxInitializeUserFee > 0 && userStatsAccountToUse) {
 			const minActionTs = BN.min(
 				userStatsAccountToUse.lastFillerVolume30DTs,
 				BN.min(
@@ -3848,7 +3882,9 @@ export class User {
 			safestPerpTier = Math.min(
 				safestPerpTier,
 				getPerpMarketTierNumber(
-					this.velocityClient.getPerpMarketAccount(perpPosition.marketIndex)
+					this.velocityClient.getPerpMarketAccountOrThrow(
+						perpPosition.marketIndex
+					)
 				)
 			);
 		}
@@ -3861,7 +3897,9 @@ export class User {
 			safestSpotTier = Math.min(
 				safestSpotTier,
 				getSpotMarketTierNumber(
-					this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex)
+					this.velocityClient.getSpotMarketAccountOrThrow(
+						spotPosition.marketIndex
+					)
 				)
 			);
 		}
@@ -3885,7 +3923,7 @@ export class User {
 		quoteOraclePriceData?: OraclePriceData;
 		includeOpenOrders?: boolean;
 	}): HealthComponent {
-		const perpMarket = this.velocityClient.getPerpMarketAccount(
+		const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(
 			perpPosition.marketIndex
 		);
 		const _oraclePriceData =
@@ -3913,7 +3951,7 @@ export class User {
 
 		const userCustomMargin = Math.max(
 			perpPosition.maxMarginRatio,
-			this.getUserAccount().maxMarginRatio
+			this.getUserAccountOrThrow().maxMarginRatio
 		);
 		const marginRatio = new BN(
 			calculateMarketMarginRatio(
@@ -3960,7 +3998,7 @@ export class User {
 		};
 
 		for (const perpPosition of this.getActivePerpPositions()) {
-			const perpMarket = this.velocityClient.getPerpMarketAccount(
+			const perpMarket = this.velocityClient.getPerpMarketAccountOrThrow(
 				perpPosition.marketIndex
 			);
 
@@ -3980,7 +4018,7 @@ export class User {
 				})
 			);
 
-			const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(
+			const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(
 				perpMarket.quoteSpotMarketIndex
 			);
 
@@ -4024,7 +4062,9 @@ export class User {
 		let netQuoteValue = ZERO;
 		for (const spotPosition of this.getActiveSpotPositions()) {
 			const spotMarketAccount: SpotMarketAccount =
-				this.velocityClient.getSpotMarketAccount(spotPosition.marketIndex);
+				this.velocityClient.getSpotMarketAccountOrThrow(
+					spotPosition.marketIndex
+				);
 
 			const oraclePriceData = this.getOracleDataForSpotMarket(
 				spotPosition.marketIndex
@@ -4057,7 +4097,7 @@ export class User {
 				spotMarketAccount,
 				strictOraclePrice,
 				marginCategory,
-				this.getUserAccount().maxMarginRatio
+				this.getUserAccountOrThrow().maxMarginRatio
 			);
 
 			netQuoteValue = netQuoteValue.add(ordersValue);
@@ -4102,7 +4142,7 @@ export class User {
 				oraclePriceData.price,
 				spotMarketAccount,
 				marginCategory,
-				this.getUserAccount().maxMarginRatio
+				this.getUserAccountOrThrow().maxMarginRatio
 			);
 
 			if (netQuoteValue.lt(ZERO)) {
@@ -4210,7 +4250,9 @@ export class User {
 
 		// Equivalent to on-chain user_custom_margin_ratio
 		const userCustomMarginRatio =
-			marginCategory === 'Initial' ? this.getUserAccount().maxMarginRatio : 0;
+			marginCategory === 'Initial'
+				? this.getUserAccountOrThrow().maxMarginRatio
+				: 0;
 
 		// Initialize calc via JS mirror of Rust/on-chain MarginCalculation
 		const isolatedMarginBuffers = new Map<number, BN>();
@@ -4229,12 +4271,12 @@ export class User {
 		const calc = new MarginCalculation(ctx);
 
 		// SPOT POSITIONS
-		for (const spotPosition of this.getUserAccount().spotPositions) {
+		for (const spotPosition of this.getUserAccountOrThrow().spotPositions) {
 			if (isSpotPositionAvailable(spotPosition)) continue;
 
 			const isQuote = spotPosition.marketIndex === QUOTE_SPOT_MARKET_INDEX;
 
-			const spotMarket = this.velocityClient.getSpotMarketAccount(
+			const spotMarket = this.velocityClient.getSpotMarketAccountOrThrow(
 				spotPosition.marketIndex
 			);
 			const oraclePriceData = this.getOracleDataForSpotMarket(
@@ -4340,10 +4382,10 @@ export class User {
 
 		// PERP POSITIONS
 		for (const marketPosition of this.getActivePerpPositions()) {
-			const market = this.velocityClient.getPerpMarketAccount(
+			const market = this.velocityClient.getPerpMarketAccountOrThrow(
 				marketPosition.marketIndex
 			);
-			const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(
+			const quoteSpotMarket = this.velocityClient.getSpotMarketAccountOrThrow(
 				market.quoteSpotMarketIndex
 			);
 			const quoteOraclePriceData = this.getOracleDataForSpotMarket(
@@ -4449,9 +4491,10 @@ export class User {
 				// derive isolated quote deposit value, mirroring on-chain logic
 				let depositValue = ZERO;
 				if (marketPosition.isolatedPositionScaledBalance?.gt(ZERO)) {
-					const quoteSpotMarket = this.velocityClient.getSpotMarketAccount(
-						market.quoteSpotMarketIndex
-					);
+					const quoteSpotMarket =
+						this.velocityClient.getSpotMarketAccountOrThrow(
+							market.quoteSpotMarketIndex
+						);
 					const quoteOraclePriceData = this.getOracleDataForSpotMarket(
 						market.quoteSpotMarketIndex
 					);