@velocity-exchange/sdk 0.0.5 → 0.1.0

package/src/velocityClient.ts

@@ -52,6 +52,7 @@ import {
 	PositionDirection,
 	ReferrerInfo,
 	ReferrerNameAccount,
+	RevenueShareEscrowAccount,
 	ScaleOrderParams,
 	SettlePnlMode,
 	SignedTxData,
@@ -167,7 +168,7 @@ import {
 	VelocityProgram,
 	PYTH_LAZER_STORAGE_ACCOUNT_KEY,
 } from './config';
-import { Drift } from './idl/drift';
+import { Velocity } from './idl/velocity';
 import { WRAPPED_SOL_MINT } from './constants/spotMarkets';
 import { UserStats } from './userStats';
 import { isSpotPositionAvailable } from './math/spotPosition';
@@ -202,6 +203,8 @@ import { RevenueShareEscrowMap } from './userMap/revenueShareEscrowMap';
 import {
 	isBuilderOrderReferral,
 	isBuilderOrderCompleted,
+	escrowHasReferrer,
+	hasBuilderParams,
 } from './math/builder';
 import { TitanClient, SwapMode as TitanSwapMode } from './titan/titanClient';
 import { UnifiedSwapClient } from './swap/UnifiedSwapClient';
@@ -329,8 +332,8 @@ export class VelocityClient {
 			config.wallet,
 			this.opts
 		);
-		this.program = new Program<Drift>(
-			VelocityCore.defaultIdl() as unknown as Drift,
+		this.program = new Program<Velocity>(
+			VelocityCore.defaultIdl() as unknown as Velocity,
 			this.provider,
 			config.coder
 		);
@@ -471,7 +474,6 @@ export class VelocityClient {
 		} else if (config.accountSubscription?.type === 'grpc') {
 			const accountSubscriberClass: any =
 				config.accountSubscription?.velocityClientAccountSubscriber ??
-				config.accountSubscription?.driftClientAccountSubscriber ??
 				grpcVelocityClientAccountSubscriber;
 			this.accountSubscriber = new accountSubscriberClass(
 				config.accountSubscription.grpcConfigs,
@@ -489,7 +491,6 @@ export class VelocityClient {
 		} else {
 			const accountSubscriberClass: any =
 				config.accountSubscription?.velocityClientAccountSubscriber ??
-				config.accountSubscription?.driftClientAccountSubscriber ??
 				WebSocketVelocityClientAccountSubscriber;
 			this.accountSubscriber = new accountSubscriberClass(
 				this.program as any,
@@ -751,7 +752,7 @@ export class VelocityClient {
 	}
 
 	/**
-	 * Update the wallet to use for drift transactions and linked user account
+	 * Update the wallet to use for velocity transactions and linked user account
 	 * @param newWallet
 	 * @param subAccountIds
 	 * @param activeSubAccountId
@@ -770,8 +771,8 @@ export class VelocityClient {
 			newWallet,
 			this.opts
 		);
-		const newProgram = new Program<Drift>(
-			VelocityCore.defaultIdl() as unknown as Drift,
+		const newProgram = new Program<Velocity>(
+			VelocityCore.defaultIdl() as unknown as Velocity,
 			newProvider
 		);
 
@@ -944,7 +945,7 @@ export class VelocityClient {
 	 * Adds and subscribes to users based on params set by the constructor or by updateWallet.
 	 */
 	public async addAndSubscribeToUsers(authority?: PublicKey): Promise<boolean> {
-		// save the rpc calls if driftclient is initialized without a real wallet
+		// save the rpc calls if velocityclient is initialized without a real wallet
 		if (this.skipLoadUsers) return true;
 
 		let result = true;
@@ -1838,6 +1839,32 @@ export class VelocityClient {
 		return txSig;
 	}
 
+	public async getUpdateUserAllowDelegateTransferIx(
+		allowDelegateTransfer: boolean
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateUserAllowDelegateTransfer(
+			allowDelegateTransfer,
+			{
+				accounts: {
+					userStats: this.getUserStatsAccountPublicKey(),
+					authority: this.wallet.publicKey,
+				},
+			}
+		);
+	}
+
+	public async updateUserAllowDelegateTransfer(
+		allowDelegateTransfer: boolean
+	): Promise<TransactionSignature> {
+		const tx = await this.buildTransaction(
+			await this.getUpdateUserAllowDelegateTransferIx(allowDelegateTransfer),
+			this.txParams
+		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
 	public async updateUserAdvancedLp(
 		updates: { advancedLp: boolean; subAccountId: number }[]
 	): Promise<TransactionSignature> {
@@ -2178,7 +2205,7 @@ export class VelocityClient {
 				userStats,
 				authority,
 				state: await this.getStatePublicKey(),
-				driftSigner: this.getSignerPublicKey(),
+				velocitySigner: this.getSignerPublicKey(),
 				keeper: this.wallet.publicKey,
 			},
 			remainingAccounts,
@@ -2444,7 +2471,7 @@ export class VelocityClient {
 	}
 
 	/**
-	 * Each drift instruction must include perp and sport market accounts in the ix remaining accounts.
+	 * Each velocity instruction must include perp and sport market accounts in the ix remaining accounts.
 	 * Use this function to force a subset of markets to be included in the remaining accounts for every ix
 	 *
 	 * @param perpMarketIndexes
@@ -2483,9 +2510,9 @@ export class VelocityClient {
 			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,
 		});
@@ -2523,27 +2550,34 @@ export class VelocityClient {
 		remainingAccounts: AccountMeta[]
 	): void {
 		for (const builder of builders) {
-			// Add User account for the builder
+			// Add User account for the builder. Dedupe by pubkey: an authority may be
+			// both a builder and the referrer, in which case its User + RevenueShare
+			// accounts would otherwise be pushed twice. On-chain `load_revenue_share_map`
+			// rejects duplicates, which would silently abort the entire sweep.
 			const builderUserAccount = getUserAccountPublicKeySync(
 				this.program.programId,
 				builder,
 				0 // subAccountId 0 for builder user account
 			);
-			remainingAccounts.push({
-				pubkey: builderUserAccount,
-				isSigner: false,
-				isWritable: true,
-			});
+			if (!remainingAccounts.find((a) => a.pubkey.equals(builderUserAccount))) {
+				remainingAccounts.push({
+					pubkey: builderUserAccount,
+					isSigner: false,
+					isWritable: true,
+				});
+			}
 
 			const builderAccount = getRevenueShareAccountPublicKey(
 				this.program.programId,
 				builder
 			);
-			remainingAccounts.push({
-				pubkey: builderAccount,
-				isSigner: false,
-				isWritable: true,
-			});
+			if (!remainingAccounts.find((a) => a.pubkey.equals(builderAccount))) {
+				remainingAccounts.push({
+					pubkey: builderAccount,
+					isSigner: false,
+					isWritable: true,
+				});
+			}
 		}
 	}
 
@@ -3611,7 +3645,7 @@ export class VelocityClient {
 			state: await this.getStatePublicKey(),
 			spotMarket: spotMarketAccount.pubkey,
 			spotMarketVault: spotMarketAccount.vault,
-			driftSigner: this.getSignerPublicKey(),
+			velocitySigner: this.getSignerPublicKey(),
 			user,
 			userStats: this.getUserStatsAccountPublicKey(),
 			userTokenAccount,
@@ -3717,6 +3751,89 @@ export class VelocityClient {
 		});
 	}
 
+	public async transferDepositByDelegate(
+		amount: BN,
+		marketIndex: number,
+		fromSubAccountId: number,
+		toSubAccountId: number,
+		txParams?: TxParams
+	): Promise<TransactionSignature> {
+		const { txSig, slot } = await this.sendTransaction(
+			await this.buildTransaction(
+				await this.getTransferDepositByDelegateIx(
+					amount,
+					marketIndex,
+					fromSubAccountId,
+					toSubAccountId
+				),
+				txParams
+			),
+			[],
+			this.opts
+		);
+		if (
+			fromSubAccountId === this.activeSubAccountId ||
+			toSubAccountId === this.activeSubAccountId
+		) {
+			this.spotMarketLastSlotCache.set(marketIndex, slot);
+		}
+		return txSig;
+	}
+
+	public async getTransferDepositByDelegateIx(
+		amount: BN,
+		marketIndex: number,
+		fromSubAccountId: number,
+		toSubAccountId: number
+	): Promise<TransactionInstruction> {
+		const fromUser = await getUserAccountPublicKey(
+			this.program.programId,
+			this.authority,
+			fromSubAccountId
+		);
+		const toUser = await getUserAccountPublicKey(
+			this.program.programId,
+			this.authority,
+			toSubAccountId
+		);
+
+		let remainingAccounts;
+
+		const userMapKey = this.getUserMapKey(fromSubAccountId, this.authority);
+		if (this.users.has(userMapKey)) {
+			remainingAccounts = this.getRemainingAccounts({
+				userAccounts: [this.users.get(userMapKey).getUserAccount()],
+				useMarketLastSlotCache: true,
+				writableSpotMarketIndexes: [marketIndex],
+			});
+		} else {
+			const fromUserAccount = (await (this.program.account as any).user.fetch(
+				fromUser
+			)) as UserAccount;
+			remainingAccounts = this.getRemainingAccounts({
+				userAccounts: [fromUserAccount],
+				useMarketLastSlotCache: true,
+				writableSpotMarketIndexes: [marketIndex],
+			});
+		}
+
+		return await this.program.instruction.transferDepositByDelegate(
+			marketIndex,
+			amount,
+			{
+				accounts: {
+					delegate: this.wallet.publicKey,
+					fromUser,
+					toUser,
+					userStats: this.getUserStatsAccountPublicKey(),
+					state: await this.getStatePublicKey(),
+					spotMarketVault: this.getSpotMarketAccount(marketIndex).vault,
+				},
+				remainingAccounts,
+			}
+		);
+	}
+
 	public async transferPools(
 		depositFromMarketIndex: number,
 		depositToMarketIndex: number,
@@ -3844,7 +3961,7 @@ export class VelocityClient {
 					).vault,
 					borrowToSpotMarketVault:
 						this.getSpotMarketAccount(borrowToMarketIndex).vault,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 				},
 				remainingAccounts,
 			}
@@ -4228,7 +4345,7 @@ export class VelocityClient {
 					authority: this.wallet.publicKey,
 					userTokenAccount: userTokenAccount,
 					tokenProgram: this.getTokenProgramForSpotMarket(spotMarketAccount),
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 				},
 				remainingAccounts,
 			}
@@ -4286,7 +4403,6 @@ export class VelocityClient {
 			undefined,
 			undefined,
 			undefined,
-			undefined,
 			subAccountId
 		);
 	}
@@ -4312,7 +4428,6 @@ export class VelocityClient {
 		makerInfo?: MakerInfo | MakerInfo[],
 		txParams?: TxParams,
 		bracketOrdersParams = new Array<OptionalOrderParams>(),
-		referrerInfo?: ReferrerInfo,
 		cancelExistingOrders?: boolean,
 		settlePnl?: boolean,
 		positionMaxLev?: number,
@@ -4393,7 +4508,6 @@ export class VelocityClient {
 					marketIndex,
 				},
 				makerInfo,
-				referrerInfo,
 				userAccount.subAccountId
 			);
 		}
@@ -4434,7 +4548,6 @@ export class VelocityClient {
 		makerInfo?: MakerInfo | MakerInfo[],
 		txParams?: TxParams,
 		bracketOrdersParams = new Array<OptionalOrderParams>(),
-		referrerInfo?: ReferrerInfo,
 		cancelExistingOrders?: boolean,
 		settlePnl?: boolean
 	): Promise<{
@@ -4450,7 +4563,6 @@ export class VelocityClient {
 			makerInfo,
 			txParams,
 			bracketOrdersParams,
-			referrerInfo,
 			cancelExistingOrders,
 			settlePnl
 		);
@@ -4514,6 +4626,65 @@ export class VelocityClient {
 		return txSig;
 	}
 
+	/**
+	 * Returns the RevenueShareEscrow account meta for the placing user when `orderParams`
+	 * carries a builder code (`builderIdx` + `builderFeeTenthBps`), otherwise `undefined`.
+	 * The on-chain handlers peek for this account last in `remaining_accounts`, so callers
+	 * must push it after the market/oracle/maker accounts.
+	 */
+	private getBuilderEscrowAccountMeta(
+		orderParams: Pick<OrderParams, 'builderIdx' | 'builderFeeTenthBps'>,
+		subAccountId?: number
+	): AccountMeta | undefined {
+		if (!hasBuilderParams(orderParams)) {
+			return undefined;
+		}
+		const authority =
+			this.getUserAccount(subAccountId)?.authority ?? this.authority;
+		return {
+			pubkey: getRevenueShareEscrowAccountPublicKey(
+				this.program.programId,
+				authority
+			),
+			isWritable: true,
+			isSigner: false,
+		};
+	}
+
+	/**
+	 * Returns the AccountMeta for the taker's RevenueShareEscrow when a fill of the
+	 * taker's order must include it: the order carries a builder code, or the taker
+	 * is referred (their escrow was initialized with a referrer). Returns `undefined`
+	 * when neither applies so no account meta is added to the transaction. The
+	 * on-chain handlers peek for this account last in `remaining_accounts`, so
+	 * callers must push it after the market/oracle/maker accounts.
+	 *
+	 * Throws when `takerEscrow` does not belong to `takerAuthority`.
+	 */
+	private getTakerEscrowAccountMeta(
+		takerAuthority: PublicKey,
+		orderHasBuilder: boolean,
+		takerEscrow?: RevenueShareEscrowAccount
+	): AccountMeta | undefined {
+		if (takerEscrow && !takerEscrow.authority.equals(takerAuthority)) {
+			throw new Error(
+				'takerEscrow.authority does not match the taker user account authority'
+			);
+		}
+		const takerIsReferred = takerEscrow && escrowHasReferrer(takerEscrow);
+		if (!orderHasBuilder && !takerIsReferred) {
+			return undefined;
+		}
+		return {
+			pubkey: getRevenueShareEscrowAccountPublicKey(
+				this.program.programId,
+				takerAuthority
+			),
+			isWritable: true,
+			isSigner: false,
+		};
+	}
+
 	public async getPlacePerpOrderIx(
 		orderParams: OptionalOrderParams,
 		subAccountId?: number,
@@ -4545,6 +4716,14 @@ export class VelocityClient {
 				: undefined,
 		});
 
+		const builderEscrow = this.getBuilderEscrowAccountMeta(
+			orderParams,
+			subAccountId
+		);
+		if (builderEscrow) {
+			remainingAccounts.push(builderEscrow);
+		}
+
 		return await VelocityCore.buildPlacePerpOrderInstruction({
 			program: this.program,
 			orderParams,
@@ -4584,7 +4763,7 @@ export class VelocityClient {
 				isSigner: false,
 			});
 			oracleAccountInfos.push({
-				pubkey: market.amm.oracle,
+				pubkey: market.oracle,
 				isWritable: false,
 				isSigner: false,
 			});
@@ -4760,7 +4939,7 @@ export class VelocityClient {
 		const user = await this.getUserAccountPublicKey(subAccountId);
 
 		const order = this.getOrderByUserId(userOrderId);
-		const oracle = this.getPerpMarketAccount(order.marketIndex).amm.oracle;
+		const oracle = this.getPerpMarketAccount(order.marketIndex).oracle;
 
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [this.getUserAccount(subAccountId)],
@@ -5034,6 +5213,19 @@ export class VelocityClient {
 		const formattedParams = params.map((item) => getOrderParams(item));
 		const authority = overrides?.authority ?? this.wallet.publicKey;
 
+		// The handler loads a single RevenueShareEscrow for the placing user, so push it once
+		// if any order in the batch carries a builder code.
+		const builderParam = formattedParams.find((p) => hasBuilderParams(p));
+		if (builderParam) {
+			const builderEscrow = this.getBuilderEscrowAccountMeta(
+				builderParam,
+				subAccountId
+			);
+			if (builderEscrow) {
+				remainingAccounts.push(builderEscrow);
+			}
+		}
+
 		return await VelocityCore.buildPlaceOrdersInstruction({
 			program: this.program,
 			formattedParams,
@@ -5191,11 +5383,11 @@ export class VelocityClient {
 		user: UserAccount,
 		order?: Pick<Order, 'marketIndex' | 'orderId'>,
 		makerInfo?: MakerInfo | MakerInfo[],
-		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams,
 		fillerSubAccountId?: number,
 		fillerAuthority?: PublicKey,
-		hasBuilderFee?: boolean
+		hasBuilderFee?: boolean,
+		takerEscrow?: RevenueShareEscrowAccount
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
 			await this.buildTransaction(
@@ -5204,11 +5396,11 @@ export class VelocityClient {
 					user,
 					order,
 					makerInfo,
-					referrerInfo,
 					fillerSubAccountId,
 					undefined,
 					fillerAuthority,
-					hasBuilderFee
+					hasBuilderFee,
+					takerEscrow
 				),
 				txParams
 			),
@@ -5223,11 +5415,15 @@ export class VelocityClient {
 		userAccount: UserAccount,
 		order: Pick<Order, 'marketIndex' | 'orderId'>,
 		makerInfo?: MakerInfo | MakerInfo[],
-		referrerInfo?: ReferrerInfo,
 		fillerSubAccountId?: number,
 		isSignedMsg?: boolean,
 		fillerAuthority?: PublicKey,
-		hasBuilderFee?: boolean
+		hasBuilderFee?: boolean,
+		// The program rejects fills that omit the taker's RevenueShareEscrow when the
+		// order has a builder OR the taker is referred with an escrow. The builder case
+		// is detected from the order bitflags; pass the taker's decoded escrow (e.g.
+		// from a RevenueShareEscrowMap) so referred takers also get it attached.
+		takerEscrow?: RevenueShareEscrowAccount
 	): Promise<TransactionInstruction> {
 		const userStatsPublicKey = getUserStatsAccountPublicKey(
 			this.program.programId,
@@ -5291,24 +5487,6 @@ export class VelocityClient {
 			});
 		}
 
-		if (referrerInfo) {
-			const referrerIsMaker =
-				makerInfo.find((maker) => maker.maker.equals(referrerInfo.referrer)) !==
-				undefined;
-			if (!referrerIsMaker) {
-				remainingAccounts.push({
-					pubkey: referrerInfo.referrer,
-					isWritable: true,
-					isSigner: false,
-				});
-				remainingAccounts.push({
-					pubkey: referrerInfo.referrerStats,
-					isWritable: true,
-					isSigner: false,
-				});
-			}
-		}
-
 		let withBuilder = false;
 		if (hasBuilderFee) {
 			withBuilder = true;
@@ -5328,15 +5506,13 @@ export class VelocityClient {
 			}
 		}
 
-		if (withBuilder) {
-			remainingAccounts.push({
-				pubkey: getRevenueShareEscrowAccountPublicKey(
-					this.program.programId,
-					userAccount.authority
-				),
-				isWritable: true,
-				isSigner: false,
-			});
+		const takerEscrowMeta = this.getTakerEscrowAccountMeta(
+			userAccount.authority,
+			withBuilder,
+			takerEscrow
+		);
+		if (takerEscrowMeta) {
+			remainingAccounts.push(takerEscrowMeta);
 		}
 
 		const orderId = isSignedMsg ? null : order.orderId;
@@ -5401,7 +5577,6 @@ export class VelocityClient {
 		_order?: Pick<Order, 'marketIndex' | 'orderId'>,
 		_fulfillmentConfig?: unknown,
 		_makerInfo?: MakerInfo | MakerInfo[],
-		_referrerInfo?: ReferrerInfo,
 		_txParams?: TxParams
 	): Promise<TransactionSignature> {
 		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
@@ -5413,14 +5588,13 @@ export class VelocityClient {
 		_order?: Pick<Order, 'marketIndex' | 'orderId'>,
 		_fulfillmentConfig?: unknown,
 		_makerInfo?: MakerInfo | MakerInfo[],
-		_referrerInfo?: ReferrerInfo,
 		_fillerPublicKey?: PublicKey
 	): Promise<TransactionInstruction> {
 		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
 	}
 
 	/**
-	 * Swap tokens in drift account using titan or jupiter
+	 * Swap tokens in velocity account using titan or jupiter
 	 * @param swapClient swap client to find routes and instructions (Titan or Jupiter)
 	 * @param jupiterClient @deprecated Use swapClient instead. Legacy parameter for backward compatibility
 	 * @param outMarketIndex the market index of the token you're buying
@@ -5431,7 +5605,7 @@ export class VelocityClient {
 	 * @param slippageBps the max slippage passed to the swap provider api
 	 * @param swapMode swap provider swapMode (ExactIn or ExactOut), default is ExactIn
 	 * @param route the swap provider route to use for the swap
-	 * @param reduceOnly specify if In or Out token on the drift account must reduceOnly, checked at end of swap
+	 * @param reduceOnly specify if In or Out token on the velocity account must reduceOnly, checked at end of swap
 	 * @param v6 pass in the quote response from swap provider quote's API (deprecated, use quote instead)
 	 * @param quote pass in the quote response from swap provider quote's API
 	 * @param txParams
@@ -5650,7 +5824,7 @@ export class VelocityClient {
 			slippageBps,
 			swapMode: isExactOut ? TitanSwapMode.ExactOut : TitanSwapMode.ExactIn,
 			onlyDirectRoutes,
-			sizeConstraint: MAX_TX_BYTE_SIZE - 375, // buffer for drift instructions
+			sizeConstraint: MAX_TX_BYTE_SIZE - 375, // buffer for velocity instructions
 		});
 
 		const titanInstructions = titanClient.getTitanInstructions({
@@ -5810,7 +5984,7 @@ export class 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
@@ -5915,7 +6089,7 @@ export class VelocityClient {
 					inTokenAccount,
 					outTokenAccount,
 					tokenProgram: inTokenProgram,
-					driftSigner: this.getStateAccount().signer,
+					velocitySigner: this.getStateAccount().signer,
 					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
@@ -5938,7 +6112,7 @@ export class VelocityClient {
 					inTokenAccount,
 					outTokenAccount,
 					tokenProgram: inTokenProgram,
-					driftSigner: this.getStateAccount().signer,
+					velocitySigner: this.getStateAccount().signer,
 					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
@@ -6055,7 +6229,7 @@ export class VelocityClient {
 			amountInForBeginSwap = amount;
 		}
 
-		// Get drift swap instructions for begin and end
+		// Get velocity swap instructions for begin and end
 		const { beginSwapIx, endSwapIx } = await this.getSwapIx({
 			outMarketIndex,
 			inMarketIndex,
@@ -6411,21 +6585,22 @@ export class VelocityClient {
 	public async placeAndTakePerpOrder(
 		orderParams: OptionalOrderParams,
 		makerInfo?: MakerInfo | MakerInfo[],
-		referrerInfo?: ReferrerInfo,
 		successCondition?: PlaceAndTakeOrderSuccessCondition,
 		auctionDurationPercentage?: number,
 		txParams?: TxParams,
-		subAccountId?: number
+		subAccountId?: number,
+		takerEscrow?: RevenueShareEscrowAccount
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
 			await this.buildTransaction(
 				await this.getPlaceAndTakePerpOrderIx(
 					orderParams,
 					makerInfo,
-					referrerInfo,
 					successCondition,
 					auctionDurationPercentage,
-					subAccountId
+					subAccountId,
+					undefined,
+					takerEscrow
 				),
 				txParams
 			),
@@ -6438,7 +6613,6 @@ export class VelocityClient {
 	public async preparePlaceAndTakePerpOrderWithAdditionalOrders(
 		orderParams: OptionalOrderParams,
 		makerInfo?: MakerInfo | MakerInfo[],
-		referrerInfo?: ReferrerInfo,
 		bracketOrdersParams = new Array<OptionalOrderParams>(),
 		txParams?: TxParams,
 		subAccountId?: number,
@@ -6475,7 +6649,6 @@ export class VelocityClient {
 			const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(
 				orderParams,
 				makerInfo,
-				referrerInfo,
 				undefined,
 				auctionDurationPercentage,
 				subAccountId
@@ -6634,7 +6807,6 @@ export class VelocityClient {
 	public async placeAndTakePerpWithAdditionalOrders(
 		orderParams: OptionalOrderParams,
 		makerInfo?: MakerInfo | MakerInfo[],
-		referrerInfo?: ReferrerInfo,
 		bracketOrdersParams = new Array<OptionalOrderParams>(),
 		txParams?: TxParams,
 		subAccountId?: number,
@@ -6650,7 +6822,6 @@ export class VelocityClient {
 			await this.preparePlaceAndTakePerpOrderWithAdditionalOrders(
 				orderParams,
 				makerInfo,
-				referrerInfo,
 				bracketOrdersParams,
 				txParams,
 				subAccountId,
@@ -6691,13 +6862,17 @@ export class VelocityClient {
 	public async getPlaceAndTakePerpOrderIx(
 		orderParams: OptionalOrderParams,
 		makerInfo?: MakerInfo | MakerInfo[],
-		referrerInfo?: ReferrerInfo,
 		successCondition?: PlaceAndTakeOrderSuccessCondition,
 		auctionDurationPercentage?: number,
 		subAccountId?: number,
 		overrides?: {
 			authority?: PublicKey;
-		}
+		},
+		// place_and_take fills the placing user's (the taker's) order in-instruction, so
+		// their RevenueShareEscrow must be attached for BOTH builder fees and referrer
+		// revenue share. The builder case is detected from orderParams; pass the user's
+		// decoded escrow (e.g. from a RevenueShareEscrowMap) to cover the referred case.
+		takerEscrow?: RevenueShareEscrowAccount
 	): Promise<TransactionInstruction> {
 		orderParams = getOrderParams(orderParams, { marketType: MarketType.PERP });
 		const userStatsPublicKey = await this.getUserStatsAccountPublicKey();
@@ -6733,22 +6908,13 @@ export class VelocityClient {
 			});
 		}
 
-		if (referrerInfo) {
-			const referrerIsMaker =
-				makerInfo.find((maker) => maker.maker.equals(referrerInfo.referrer)) !==
-				undefined;
-			if (!referrerIsMaker) {
-				remainingAccounts.push({
-					pubkey: referrerInfo.referrer,
-					isWritable: true,
-					isSigner: false,
-				});
-				remainingAccounts.push({
-					pubkey: referrerInfo.referrerStats,
-					isWritable: true,
-					isSigner: false,
-				});
-			}
+		const takerEscrowMeta = this.getTakerEscrowAccountMeta(
+			this.getUserAccount(subAccountId)?.authority ?? this.authority,
+			hasBuilderParams(orderParams),
+			takerEscrow
+		);
+		if (takerEscrowMeta) {
+			remainingAccounts.push(takerEscrowMeta);
 		}
 
 		let optionalParams = null;
@@ -6774,17 +6940,17 @@ export class VelocityClient {
 	public async placeAndMakePerpOrder(
 		orderParams: OptionalOrderParams,
 		takerInfo: TakerInfo,
-		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams,
-		subAccountId?: number
+		subAccountId?: number,
+		takerEscrow?: RevenueShareEscrowAccount
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
 			await this.buildTransaction(
 				await this.getPlaceAndMakePerpOrderIx(
 					orderParams,
 					takerInfo,
-					referrerInfo,
-					subAccountId
+					subAccountId,
+					takerEscrow
 				),
 				txParams
 			),
@@ -6800,8 +6966,12 @@ export class VelocityClient {
 	public async getPlaceAndMakePerpOrderIx(
 		orderParams: OptionalOrderParams,
 		takerInfo: TakerInfo,
-		referrerInfo?: ReferrerInfo,
-		subAccountId?: number
+		subAccountId?: number,
+		// place_and_make fills the taker's order in-instruction, so the TAKER's
+		// RevenueShareEscrow must be attached when their order has a builder or they
+		// are referred with an escrow. The builder case is detected from the taker
+		// order bitflags; pass the taker's decoded escrow to cover the referred case.
+		takerEscrow?: RevenueShareEscrowAccount
 	): Promise<TransactionInstruction> {
 		orderParams = getOrderParams(orderParams, { marketType: MarketType.PERP });
 		const userStatsPublicKey = this.getUserStatsAccountPublicKey();
@@ -6816,29 +6986,14 @@ export class VelocityClient {
 			writablePerpMarketIndexes: [orderParams.marketIndex],
 		});
 
-		if (referrerInfo) {
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrer,
-				isWritable: true,
-				isSigner: false,
-			});
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrerStats,
-				isWritable: true,
-				isSigner: false,
-			});
-		}
-
 		const takerOrderId = takerInfo.order.orderId;
-		if (hasBuilder(takerInfo.order)) {
-			remainingAccounts.push({
-				pubkey: getRevenueShareEscrowAccountPublicKey(
-					this.program.programId,
-					takerInfo.takerUserAccount.authority
-				),
-				isWritable: true,
-				isSigner: false,
-			});
+		const takerEscrowMeta = this.getTakerEscrowAccountMeta(
+			takerInfo.takerUserAccount.authority,
+			hasBuilder(takerInfo.order),
+			takerEscrow
+		);
+		if (takerEscrowMeta) {
+			remainingAccounts.push(takerEscrowMeta);
 		}
 		return await VelocityCore.buildPlaceAndMakePerpOrderInstruction({
 			program: this.program,
@@ -6874,7 +7029,7 @@ export class VelocityClient {
 	/**
 	 * Builds a deposit and place request for Swift service
 	 *
-	 * @param depositTx - The signed tx containing a drift deposit (e.g. see `buildSwiftDepositTx`)
+	 * @param depositTx - The signed tx containing a velocity deposit (e.g. see `buildSwiftDepositTx`)
 	 * @param orderParamsMessage - The order parameters message to sign
 	 * @param delegateSigner - Whether this is a delegate signer
 	 *
@@ -7012,10 +7167,7 @@ export class VelocityClient {
 			writableSpotMarketIndexes,
 		});
 
-		if (
-			signedMessage.builderFeeTenthBps !== null &&
-			signedMessage.builderIdx !== null
-		) {
+		if (hasBuilderParams(signedMessage)) {
 			remainingAccounts.push({
 				pubkey: getRevenueShareEscrowAccountPublicKey(
 					this.program.programId,
@@ -7078,21 +7230,21 @@ export class VelocityClient {
 			signingAuthority: PublicKey;
 		},
 		orderParams: OptionalOrderParams,
-		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams,
 		subAccountId?: number,
 		precedingIxs: TransactionInstruction[] = [],
-		overrideCustomIxIndex?: number
+		overrideCustomIxIndex?: number,
+		takerEscrow?: RevenueShareEscrowAccount
 	): Promise<TransactionSignature> {
 		const ixs = await this.getPlaceAndMakeSignedMsgPerpOrderIxs(
 			signedSignedMsgOrderParams,
 			signedMsgOrderUuid,
 			takerInfo,
 			orderParams,
-			referrerInfo,
 			subAccountId,
 			precedingIxs,
-			overrideCustomIxIndex
+			overrideCustomIxIndex,
+			takerEscrow
 		);
 		const { txSig, slot } = await this.sendTransaction(
 			await this.buildTransaction(ixs, txParams),
@@ -7114,10 +7266,13 @@ export class VelocityClient {
 			signingAuthority: PublicKey;
 		},
 		orderParams: OptionalOrderParams,
-		referrerInfo?: ReferrerInfo,
 		subAccountId?: number,
 		precedingIxs: TransactionInstruction[] = [],
-		overrideCustomIxIndex?: number
+		overrideCustomIxIndex?: number,
+		// fills the taker's order in-instruction; pass the taker's decoded escrow so a
+		// referred taker's escrow is attached even when the signed order carries no
+		// builder fee
+		takerEscrow?: RevenueShareEscrowAccount
 	): Promise<TransactionInstruction[]> {
 		const [signedMsgOrderSignatureIx, placeTakerSignedMsgPerpOrderIx] =
 			await this.getPlaceSignedMsgTakerPerpOrderIxs(
@@ -7141,19 +7296,6 @@ export class VelocityClient {
 			writablePerpMarketIndexes: [orderParams.marketIndex],
 		});
 
-		if (referrerInfo) {
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrer,
-				isWritable: true,
-				isSigner: false,
-			});
-			remainingAccounts.push({
-				pubkey: referrerInfo.referrerStats,
-				isWritable: true,
-				isSigner: false,
-			});
-		}
-
 		const isDelegateSigner = takerInfo.signingAuthority.equals(
 			takerInfo.takerUserAccount.delegate
 		);
@@ -7166,18 +7308,13 @@ export class VelocityClient {
 			borshBuf,
 			isDelegateSigner
 		);
-		if (
-			signedMessage.builderFeeTenthBps !== null &&
-			signedMessage.builderIdx !== null
-		) {
-			remainingAccounts.push({
-				pubkey: getRevenueShareEscrowAccountPublicKey(
-					this.program.programId,
-					takerInfo.takerUserAccount.authority
-				),
-				isWritable: true,
-				isSigner: false,
-			});
+		const takerEscrowMeta = this.getTakerEscrowAccountMeta(
+			takerInfo.takerUserAccount.authority,
+			hasBuilderParams(signedMessage),
+			takerEscrow
+		);
+		if (takerEscrowMeta) {
+			remainingAccounts.push(takerEscrowMeta);
 		}
 
 		const placeAndMakeIx =
@@ -7212,7 +7349,6 @@ export class VelocityClient {
 		_orderParams: OptionalOrderParams,
 		_fulfillmentConfig?: unknown,
 		_makerInfo?: MakerInfo,
-		_referrerInfo?: ReferrerInfo,
 		_txParams?: TxParams,
 		_subAccountId?: number
 	) {
@@ -7223,7 +7359,6 @@ export class VelocityClient {
 		_orderParams: OptionalOrderParams,
 		_fulfillmentConfig?: unknown,
 		_makerInfo?: MakerInfo,
-		_referrerInfo?: ReferrerInfo,
 		_txParams?: TxParams,
 		_subAccountId?: number
 	): Promise<TransactionSignature> {
@@ -7233,7 +7368,6 @@ export class VelocityClient {
 		_orderParams: OptionalOrderParams,
 		_fulfillmentConfig?: unknown,
 		_makerInfo?: MakerInfo,
-		_referrerInfo?: ReferrerInfo,
 		_subAccountId?: number
 	): Promise<TransactionInstruction> {
 		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
@@ -7243,7 +7377,6 @@ export class VelocityClient {
 		_orderParams: OptionalOrderParams,
 		_takerInfo: TakerInfo,
 		_fulfillmentConfig?: unknown,
-		_referrerInfo?: ReferrerInfo,
 		_txParams?: TxParams,
 		_subAccountId?: number
 	): Promise<TransactionSignature> {
@@ -7254,7 +7387,6 @@ export class VelocityClient {
 		_orderParams: OptionalOrderParams,
 		_takerInfo: TakerInfo,
 		_fulfillmentConfig?: unknown,
-		_referrerInfo?: ReferrerInfo,
 		_subAccountId?: number
 	): Promise<TransactionInstruction> {
 		throw new Error(SPOT_DLOB_TRADING_DISABLED_MSG);
@@ -7287,7 +7419,6 @@ export class VelocityClient {
 			undefined,
 			undefined,
 			undefined,
-			undefined,
 			subAccountId
 		);
 	}
@@ -7775,7 +7906,7 @@ export class VelocityClient {
 							isWritable: true,
 						});
 					}
-					if (!escrow.referrer.equals(PublicKey.default)) {
+					if (escrowHasReferrer(escrow)) {
 						this.addBuilderToRemainingAccounts(
 							[escrow.referrer],
 							remainingAccounts
@@ -7978,7 +8109,7 @@ export class VelocityClient {
 					}
 
 					// Add referrer's User and RevenueShare accounts
-					if (!escrow.referrer.equals(PublicKey.default)) {
+					if (escrowHasReferrer(escrow)) {
 						this.addBuilderToRemainingAccounts(
 							[escrow.referrer],
 							remainingAccounts
@@ -8287,7 +8418,6 @@ export class VelocityClient {
 		quote,
 		userAccount,
 		userAccountPublicKey,
-		userStatsAccountPublicKey,
 		liquidatorSubAccountId,
 		maxAccounts,
 	}: {
@@ -8303,7 +8433,6 @@ export class VelocityClient {
 		quote?: QuoteResponse;
 		userAccount: UserAccount;
 		userAccountPublicKey: PublicKey;
-		userStatsAccountPublicKey: PublicKey;
 		liquidatorSubAccountId?: number;
 		maxAccounts?: number;
 	}): Promise<{
@@ -8397,7 +8526,6 @@ export class VelocityClient {
 			liabilityTokenAccount,
 			userAccount,
 			userAccountPublicKey,
-			userStatsAccountPublicKey,
 			liquidatorSubAccountId,
 		});
 
@@ -8412,7 +8540,7 @@ export class VelocityClient {
 	}
 
 	/**
-	 * Get the drift liquidate_spot_with_swap instructions
+	 * Get the velocity liquidate_spot_with_swap instructions
 	 *
 	 * @param liabilityMarketIndex the market index of the token you're buying
 	 * @param assetMarketIndex the market index of the token you're selling
@@ -8421,7 +8549,6 @@ export class VelocityClient {
 	 * @param liabilityTokenAccount the token account to receive the tokens being bought
 	 * @param userAccount
 	 * @param userAccountPublicKey
-	 * @param userStatsAccountPublicKey
 	 */
 	public async getLiquidateSpotWithSwapIx({
 		liabilityMarketIndex,
@@ -8431,7 +8558,6 @@ export class VelocityClient {
 		liabilityTokenAccount,
 		userAccount,
 		userAccountPublicKey,
-		userStatsAccountPublicKey,
 		liquidatorSubAccountId,
 	}: {
 		liabilityMarketIndex: number;
@@ -8441,7 +8567,6 @@ export class VelocityClient {
 		liabilityTokenAccount: PublicKey;
 		userAccount: UserAccount;
 		userAccountPublicKey: PublicKey;
-		userStatsAccountPublicKey: PublicKey;
 		liquidatorSubAccountId?: number;
 	}): Promise<{
 		beginSwapIx: TransactionInstruction;
@@ -8450,7 +8575,6 @@ export class VelocityClient {
 		const liquidatorAccountPublicKey = await this.getUserAccountPublicKey(
 			liquidatorSubAccountId
 		);
-		const liquidatorStatsPublicKey = this.getUserStatsAccountPublicKey();
 
 		const userAccounts = [userAccount];
 		const remainingAccounts = this.getRemainingAccounts({
@@ -8512,16 +8636,14 @@ export class VelocityClient {
 					accounts: {
 						state: await this.getStatePublicKey(),
 						user: userAccountPublicKey,
-						userStats: userStatsAccountPublicKey,
 						liquidator: liquidatorAccountPublicKey,
-						liquidatorStats: liquidatorStatsPublicKey,
 						authority: this.wallet.publicKey,
 						liabilitySpotMarketVault: liabilitySpotMarket.vault,
 						assetSpotMarketVault: assetSpotMarket.vault,
 						assetTokenAccount: assetTokenAccount,
 						liabilityTokenAccount: liabilityTokenAccount,
 						tokenProgram: assetTokenProgram,
-						driftSigner: this.getStateAccount().signer,
+						velocitySigner: this.getStateAccount().signer,
 						instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 					},
 					remainingAccounts,
@@ -8535,16 +8657,14 @@ export class VelocityClient {
 				accounts: {
 					state: await this.getStatePublicKey(),
 					user: userAccountPublicKey,
-					userStats: userStatsAccountPublicKey,
 					liquidator: liquidatorAccountPublicKey,
-					liquidatorStats: liquidatorStatsPublicKey,
 					authority: this.wallet.publicKey,
 					liabilitySpotMarketVault: liabilitySpotMarket.vault,
 					assetSpotMarketVault: assetSpotMarket.vault,
 					assetTokenAccount: assetTokenAccount,
 					liabilityTokenAccount: liabilityTokenAccount,
 					tokenProgram: assetTokenProgram,
-					driftSigner: this.getStateAccount().signer,
+					velocitySigner: this.getStateAccount().signer,
 					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
@@ -8623,7 +8743,7 @@ export class VelocityClient {
 					inTokenAccount,
 					ifRebalanceConfig: ifRebalanceConfig,
 					tokenProgram: TOKEN_PROGRAM_ID,
-					driftSigner: this.getStateAccount().signer,
+					velocitySigner: this.getStateAccount().signer,
 					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
@@ -8643,7 +8763,7 @@ export class VelocityClient {
 					inTokenAccount,
 					ifRebalanceConfig: ifRebalanceConfig,
 					tokenProgram: TOKEN_PROGRAM_ID,
-					driftSigner: this.getStateAccount().signer,
+					velocitySigner: this.getStateAccount().signer,
 					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
@@ -8863,7 +8983,7 @@ export class VelocityClient {
 					liquidatorStats: liquidatorStatsPublicKey,
 					spotMarketVault: spotMarket.vault,
 					insuranceFundVault: spotMarket.insuranceFund.vault,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					tokenProgram: TOKEN_PROGRAM_ID,
 				},
 				remainingAccounts: remainingAccounts,
@@ -8935,7 +9055,7 @@ export class VelocityClient {
 				liquidator,
 				spotMarketVault: spotMarket.vault,
 				insuranceFundVault: spotMarket.insuranceFund.vault,
-				driftSigner: this.getSignerPublicKey(),
+				velocitySigner: this.getSignerPublicKey(),
 				tokenProgram: tokenProgramId,
 			},
 			remainingAccounts: remainingAccounts,
@@ -8995,15 +9115,15 @@ export class VelocityClient {
 	): Promise<TransactionInstruction> {
 		const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
 
-		if (!isVariant(perpMarket.amm.oracleSource, 'prelaunch')) {
-			throw new Error(`Wrong oracle source ${perpMarket.amm.oracleSource}`);
+		if (!isVariant(perpMarket.oracleSource, 'prelaunch')) {
+			throw new Error(`Wrong oracle source ${perpMarket.oracleSource}`);
 		}
 
 		return await this.program.instruction.updatePrelaunchOracle({
 			accounts: {
 				state: await this.getStatePublicKey(),
 				perpMarket: perpMarket.pubkey,
-				oracle: perpMarket.amm.oracle,
+				oracle: perpMarket.oracle,
 			},
 		});
 	}
@@ -9048,7 +9168,7 @@ export class VelocityClient {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				perpMarket: perpMarket.pubkey,
-				oracle: perpMarket.amm.oracle,
+				oracle: perpMarket.oracle,
 				authority: this.wallet.publicKey,
 				keeperStats: this.getUserStatsAccountPublicKey(),
 			},
@@ -9116,14 +9236,14 @@ export class VelocityClient {
 		const perpMarket = this.getPerpMarketAccount(marketIndex);
 		const oracleData = this.getOracleDataForPerpMarket(marketIndex);
 		const stateAccountAndSlot = this.accountSubscriber.getStateAccountAndSlot();
-		const isMMOracleActive = !perpMarket.amm.mmOracleSlot.eq(ZERO);
-		const pctDiff = perpMarket.amm.mmOraclePrice
+		const isMMOracleActive = !perpMarket.marketStats.mmOracleSlot.eq(ZERO);
+		const pctDiff = perpMarket.marketStats.mmOraclePrice
 			.sub(oracleData.price)
 			.abs()
 			.mul(PERCENTAGE_PRECISION)
 			.div(BN.max(oracleData.price, ONE));
 
-		const mmOracleSequenceId = perpMarket.amm.mmOracleSequenceId;
+		const mmOracleSequenceId = perpMarket.marketStats.mmOracleSequenceId;
 
 		// Do slot check for recency if sequence ids are zero or they're too divergent
 		const doSlotCheckForRecency =
@@ -9131,14 +9251,14 @@ export class VelocityClient {
 			oracleData.sequenceId.eq(ZERO) ||
 			mmOracleSequenceId.eq(ZERO) ||
 			oracleData.sequenceId
-				.sub(perpMarket.amm.mmOracleSequenceId)
+				.sub(perpMarket.marketStats.mmOracleSequenceId)
 				.abs()
 				.gt(oracleData.sequenceId.div(new BN(10_000)));
 
 		let isExchangeOracleMoreRecent = true;
 		if (
 			doSlotCheckForRecency &&
-			oracleData.slot <= perpMarket.amm.mmOracleSlot
+			oracleData.slot <= perpMarket.marketStats.mmOracleSlot
 		) {
 			isExchangeOracleMoreRecent = false;
 		} else if (
@@ -9149,30 +9269,30 @@ export class VelocityClient {
 		}
 
 		const conf = getOracleConfidenceFromMMOracleData(
-			perpMarket.amm.mmOraclePrice,
+			perpMarket.marketStats.mmOraclePrice,
 			oracleData
 		);
 
 		if (
 			isOracleTooDivergent(
-				perpMarket.amm,
+				perpMarket.marketStats,
 				{
-					price: perpMarket.amm.mmOraclePrice,
-					slot: perpMarket.amm.mmOracleSlot,
+					price: perpMarket.marketStats.mmOraclePrice,
+					slot: perpMarket.marketStats.mmOracleSlot,
 					confidence: conf,
 					hasSufficientNumberOfDataPoints: true,
 				},
 				stateAccountAndSlot.data.oracleGuardRails
 			) ||
-			perpMarket.amm.mmOraclePrice.eq(ZERO) ||
+			perpMarket.marketStats.mmOraclePrice.eq(ZERO) ||
 			isExchangeOracleMoreRecent ||
 			pctDiff.gt(PERCENTAGE_PRECISION.divn(100)) // 1% threshold
 		) {
 			return { ...oracleData, isMMOracleActive };
 		} else {
 			return {
-				price: perpMarket.amm.mmOraclePrice,
-				slot: perpMarket.amm.mmOracleSlot,
+				price: perpMarket.marketStats.mmOraclePrice,
+				slot: perpMarket.marketStats.mmOracleSlot,
 				confidence: conf,
 				hasSufficientNumberOfDataPoints: true,
 				isMMOracleActive,
@@ -9269,7 +9389,7 @@ export class VelocityClient {
 					authority: this.wallet.publicKey,
 					spotMarketVault: spotMarket.vault,
 					insuranceFundVault: spotMarket.insuranceFund.vault,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					userTokenAccount: collateralAccountPublicKey,
 					tokenProgram,
 				},
@@ -9583,7 +9703,7 @@ export class VelocityClient {
 					),
 					authority: this.wallet.publicKey,
 					insuranceFundVault: spotMarketAccount.insuranceFund.vault,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					userTokenAccount: tokenAccount,
 					tokenProgram,
 				},
@@ -9727,7 +9847,7 @@ export class VelocityClient {
 					state: await this.getStatePublicKey(),
 					spotMarket: spotMarketAccount.pubkey,
 					spotMarketVault: spotMarketAccount.vault,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					insuranceFundVault: spotMarketAccount.insuranceFund.vault,
 					tokenProgram: tokenProgramId,
 				},
@@ -9775,7 +9895,7 @@ export class VelocityClient {
 					authority: this.wallet.publicKey,
 					spotMarketVault: spotMarket.vault,
 					insuranceFundVault: spotMarket.insuranceFund.vault,
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					tokenProgram: tokenProgramId,
 				},
 				remainingAccounts: remainingAccounts,
@@ -9818,7 +9938,7 @@ export class VelocityClient {
 	}
 
 	/**
-	 * This ix will donate your funds to drift revenue pool. It does not deposit into your user account
+	 * This ix will donate your funds to velocity revenue pool. It does not deposit into your user account
 	 * @param marketIndex
 	 * @param amount
 	 * @param userTokenAccountPublicKey
@@ -9848,7 +9968,7 @@ export class VelocityClient {
 
 		const extendedInfo: PerpMarketExtendedInfo = {
 			marketIndex,
-			minOrderSize: marketAccount.amm?.minOrderSize,
+			minOrderSize: marketAccount.marketStats?.minOrderSize,
 			marginMaintenance: marketAccount.marginRatioMaintenance,
 			pnlPoolValue: getTokenAmount(
 				marketAccount.pnlPool?.scaledBalance,
@@ -10490,7 +10610,7 @@ export class VelocityClient {
 			{
 				remainingAccounts,
 				accounts: {
-					driftSigner: this.getSignerPublicKey(),
+					velocitySigner: this.getSignerPublicKey(),
 					state: await this.getStatePublicKey(),
 					lpPool,
 					constituentTargetBase,
@@ -10848,7 +10968,7 @@ export class VelocityClient {
 				{
 					remainingAccounts,
 					accounts: {
-						driftSigner: this.getSignerPublicKey(),
+						velocitySigner: this.getSignerPublicKey(),
 						state: await this.getStatePublicKey(),
 						lpPool: lpPool.pubkey,
 						authority: this.wallet.publicKey,
@@ -11013,7 +11133,7 @@ export class VelocityClient {
 			...(await this.getAllSettlePerpToLpPoolIxs(
 				lpPool.lpPoolId,
 				this.getPerpMarketAccounts()
-					.filter((marketAccount) => marketAccount.lpStatus > 0)
+					.filter((marketAccount) => marketAccount.hedgeConfig.status > 0)
 					.map((marketAccount) => marketAccount.marketIndex)
 			))
 		);
@@ -11162,7 +11282,7 @@ export class VelocityClient {
 		const lpPool = getLpPoolPublicKey(this.program.programId, lpPoolId);
 		return this.program.instruction.settlePerpToLpPool({
 			accounts: {
-				driftSigner: this.getSignerPublicKey(),
+				velocitySigner: this.getSignerPublicKey(),
 				state: await this.getStatePublicKey(),
 				keeper: this.wallet.publicKey,
 				ammCache: getAmmCachePublicKey(this.program.programId),
@@ -11356,9 +11476,3 @@ export class VelocityClient {
 		return currentBase.add(orderBaseAmount).abs().gt(currentBase.abs());
 	}
 }
-
-/** @deprecated Use `VelocityClient` instead. `DriftClient` will be removed in a future major. */
-export const DriftClient = VelocityClient;
-
-/** @deprecated Use `VelocityClient` instead. `DriftClient` will be removed in a future major. */
-export type DriftClient = VelocityClient;