@drift-labs/sdk-browser 2.163.0-beta.11 → 2.163.0-beta.13

package/src/driftClient.ts

@@ -12,8 +12,8 @@
  *
  * Instruction → on-chain handler mapping: see ARCHITECTURE.md § SDK↔Instruction Mapping.
  */
-import * as anchor from '@coral-xyz/anchor';
-import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
+import { AnchorProvider, BN, Program } from './isomorphic/anchor';
+import type { ProgramAccount } from '@coral-xyz/anchor';
 import bs58 from 'bs58';
 import {
 	ASSOCIATED_TOKEN_PROGRAM_ID,
@@ -76,7 +76,7 @@ import {
 	ConstituentTargetBaseAccount,
 	AmmCache,
 } from './types';
-import driftIDL from './idl/drift.json';
+import { DriftCore } from './core/DriftCore';
 
 /** Client-side guardrail; mirrors on-chain `ErrorCode::SpotDlobTradingDisabled`. */
 const SPOT_DLOB_TRADING_DISABLED_MSG =
@@ -95,6 +95,7 @@ import {
 	SystemProgram,
 	SYSVAR_CLOCK_PUBKEY,
 	SYSVAR_INSTRUCTIONS_PUBKEY,
+	SYSVAR_RENT_PUBKEY,
 	Transaction,
 	TransactionInstruction,
 	TransactionSignature,
@@ -205,8 +206,6 @@ import nacl from 'tweetnacl';
 import { getOracleId } from './oracles/oracleId';
 import { SignedMsgOrderParams } from './types';
 import { TakerInfo } from './types';
-// BN is already imported globally in this file via other imports
-import { sha256 } from '@noble/hashes/sha256';
 import { getOracleConfidenceFromMMOracleData } from './oracles/utils';
 import { ConstituentMap } from './constituentMap/constituentMap';
 import { hasBuilder } from './math/orders';
@@ -223,14 +222,8 @@ import { UnifiedSwapClient } from './swap/UnifiedSwapClient';
  */
 export type SwapClient = TitanClient | JupiterClient;
 
-type RemainingAccountParams = {
-	userAccounts: UserAccount[];
-	writablePerpMarketIndexes?: number[];
-	writableSpotMarketIndexes?: number[];
-	readablePerpMarketIndex?: number | number[];
-	readableSpotMarketIndexes?: number[];
-	useMarketLastSlotCache?: boolean;
-};
+type RemainingAccountParams =
+	import('./core/remainingAccounts').RemainingAccountParams;
 
 /**
  * # DriftClient
@@ -348,7 +341,7 @@ export class DriftClient {
 			this.opts
 		);
 		this.program = new Program<Drift>(
-			driftIDL as Drift,
+			DriftCore.defaultIdl() as unknown as Drift,
 			this.provider,
 			config.coder
 		);
@@ -859,7 +852,10 @@ export class DriftClient {
 			newWallet,
 			this.opts
 		);
-		const newProgram = new Program<Drift>(driftIDL as Drift, newProvider);
+		const newProgram = new Program<Drift>(
+			DriftCore.defaultIdl() as unknown as Drift,
+			newProvider
+		);
 
 		this.skipLoadUsers = false;
 		// Update provider for txSender with new wallet details
@@ -1178,8 +1174,8 @@ export class DriftClient {
 				),
 				authority,
 				payer,
-				rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-				systemProgram: anchor.web3.SystemProgram.programId,
+				rent: SYSVAR_RENT_PUBKEY,
+				systemProgram: SystemProgram.programId,
 				state: await this.getStatePublicKey(),
 			},
 		});
@@ -1226,8 +1222,8 @@ export class DriftClient {
 					signedMsgUserOrders: signedMsgUserAccountPublicKey,
 					authority,
 					payer,
-					rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-					systemProgram: anchor.web3.SystemProgram.programId,
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: SystemProgram.programId,
 				},
 			});
 
@@ -1267,7 +1263,7 @@ export class DriftClient {
 					signedMsgUserOrders: signedMsgUserAccountPublicKey,
 					authority,
 					payer: this.wallet.publicKey,
-					systemProgram: anchor.web3.SystemProgram.programId,
+					systemProgram: SystemProgram.programId,
 					user: await getUserAccountPublicKey(
 						this.program.programId,
 						authority,
@@ -1307,8 +1303,8 @@ export class DriftClient {
 				accounts: {
 					signedMsgWsDelegates,
 					authority: this.wallet.publicKey,
-					rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-					systemProgram: anchor.web3.SystemProgram.programId,
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: SystemProgram.programId,
 				},
 			}
 		);
@@ -1340,8 +1336,8 @@ export class DriftClient {
 				revenueShare,
 				authority,
 				payer: overrides?.payer ?? this.wallet.publicKey,
-				rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-				systemProgram: anchor.web3.SystemProgram.programId,
+				rent: SYSVAR_RENT_PUBKEY,
+				systemProgram: SystemProgram.programId,
 			},
 		});
 	}
@@ -1381,8 +1377,8 @@ export class DriftClient {
 					authority
 				),
 				state: await this.getStatePublicKey(),
-				rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-				systemProgram: anchor.web3.SystemProgram.programId,
+				rent: SYSVAR_RENT_PUBKEY,
+				systemProgram: SystemProgram.programId,
 			},
 		});
 	}
@@ -1445,7 +1441,7 @@ export class DriftClient {
 				escrow,
 				authority,
 				payer: this.wallet.publicKey,
-				systemProgram: anchor.web3.SystemProgram.programId,
+				systemProgram: SystemProgram.programId,
 			},
 		});
 	}
@@ -1509,7 +1505,7 @@ export class DriftClient {
 					escrow,
 					authority,
 					payer,
-					systemProgram: anchor.web3.SystemProgram.programId,
+					systemProgram: SystemProgram.programId,
 				},
 			}
 		);
@@ -1541,7 +1537,7 @@ export class DriftClient {
 				accounts: {
 					signedMsgWsDelegates,
 					authority: this.wallet.publicKey,
-					systemProgram: anchor.web3.SystemProgram.programId,
+					systemProgram: SystemProgram.programId,
 				},
 			}
 		);
@@ -1574,7 +1570,7 @@ export class DriftClient {
 				accounts: {
 					signedMsgWsDelegates,
 					authority: this.wallet.publicKey,
-					systemProgram: anchor.web3.SystemProgram.programId,
+					systemProgram: SystemProgram.programId,
 				},
 			}
 		);
@@ -1605,8 +1601,8 @@ export class DriftClient {
 				),
 				authority: authority ?? this.wallet.publicKey,
 				payer: this.wallet.publicKey,
-				rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-				systemProgram: anchor.web3.SystemProgram.programId,
+				rent: SYSVAR_RENT_PUBKEY,
+				systemProgram: SystemProgram.programId,
 			},
 		});
 	}
@@ -1699,8 +1695,8 @@ export class DriftClient {
 					userStats: this.getUserStatsAccountPublicKey(),
 					authority: accountAuthority,
 					payer: payer,
-					rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-					systemProgram: anchor.web3.SystemProgram.programId,
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: SystemProgram.programId,
 					state: await this.getStatePublicKey(),
 				},
 				remainingAccounts,
@@ -1749,8 +1745,8 @@ export class DriftClient {
 					authority: this.wallet.publicKey,
 					userStats: this.getUserStatsAccountPublicKey(),
 					payer: this.wallet.publicKey,
-					rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-					systemProgram: anchor.web3.SystemProgram.programId,
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: SystemProgram.programId,
 				},
 			}
 		);
@@ -2407,7 +2403,7 @@ export class DriftClient {
 				userStats: this.getUserStatsAccountPublicKey(),
 				authority: this.wallet.publicKey,
 				state: await this.getStatePublicKey(),
-				rent: anchor.web3.SYSVAR_RENT_PUBKEY,
+				rent: SYSVAR_RENT_PUBKEY,
 			},
 		});
 	}
@@ -2608,132 +2604,7 @@ export class DriftClient {
 		});
 	}
 	getRemainingAccounts(params: RemainingAccountParams): AccountMeta[] {
-		const { oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap } =
-			this.getRemainingAccountMapsForUsers(params.userAccounts);
-
-		if (params.useMarketLastSlotCache) {
-			const lastUserSlot = this.getUserAccountAndSlot(
-				params.userAccounts.length > 0
-					? params.userAccounts[0].subAccountId
-					: this.activeSubAccountId,
-				params.userAccounts.length > 0
-					? params.userAccounts[0].authority
-					: this.authority
-			)?.slot;
-
-			for (const [
-				marketIndex,
-				slot,
-			] of this.perpMarketLastSlotCache.entries()) {
-				// if cache has more recent slot than user positions account slot, add market to remaining accounts
-				// otherwise remove from slot
-				if (slot > lastUserSlot) {
-					this.addPerpMarketToRemainingAccountMaps(
-						marketIndex,
-						false,
-						oracleAccountMap,
-						spotMarketAccountMap,
-						perpMarketAccountMap
-					);
-				} else {
-					this.perpMarketLastSlotCache.delete(marketIndex);
-				}
-			}
-
-			for (const [
-				marketIndex,
-				slot,
-			] of this.spotMarketLastSlotCache.entries()) {
-				// if cache has more recent slot than user positions account slot, add market to remaining accounts
-				// otherwise remove from slot
-				if (slot > lastUserSlot) {
-					this.addSpotMarketToRemainingAccountMaps(
-						marketIndex,
-						false,
-						oracleAccountMap,
-						spotMarketAccountMap
-					);
-				} else {
-					this.spotMarketLastSlotCache.delete(marketIndex);
-				}
-			}
-		}
-
-		if (params.readablePerpMarketIndex !== undefined) {
-			const readablePerpMarketIndexes = Array.isArray(
-				params.readablePerpMarketIndex
-			)
-				? params.readablePerpMarketIndex
-				: [params.readablePerpMarketIndex];
-			for (const marketIndex of readablePerpMarketIndexes) {
-				this.addPerpMarketToRemainingAccountMaps(
-					marketIndex,
-					false,
-					oracleAccountMap,
-					spotMarketAccountMap,
-					perpMarketAccountMap
-				);
-			}
-		}
-
-		for (const perpMarketIndex of this.mustIncludePerpMarketIndexes.values()) {
-			this.addPerpMarketToRemainingAccountMaps(
-				perpMarketIndex,
-				false,
-				oracleAccountMap,
-				spotMarketAccountMap,
-				perpMarketAccountMap
-			);
-		}
-
-		if (params.readableSpotMarketIndexes !== undefined) {
-			for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
-				this.addSpotMarketToRemainingAccountMaps(
-					readableSpotMarketIndex,
-					false,
-					oracleAccountMap,
-					spotMarketAccountMap
-				);
-			}
-		}
-
-		for (const spotMarketIndex of this.mustIncludeSpotMarketIndexes.values()) {
-			this.addSpotMarketToRemainingAccountMaps(
-				spotMarketIndex,
-				false,
-				oracleAccountMap,
-				spotMarketAccountMap
-			);
-		}
-
-		if (params.writablePerpMarketIndexes !== undefined) {
-			for (const writablePerpMarketIndex of params.writablePerpMarketIndexes) {
-				this.addPerpMarketToRemainingAccountMaps(
-					writablePerpMarketIndex,
-					true,
-					oracleAccountMap,
-					spotMarketAccountMap,
-					perpMarketAccountMap
-				);
-			}
-		}
-
-		if (params.writableSpotMarketIndexes !== undefined) {
-			for (const writableSpotMarketIndex of params.writableSpotMarketIndexes) {
-				this.addSpotMarketToRemainingAccountMaps(
-					writableSpotMarketIndex,
-					true,
-					oracleAccountMap,
-					spotMarketAccountMap
-				);
-			}
-		}
-
-		return [
-			...oracleAccountMap.values(),
-			...spotMarketAccountMap.values(),
-			...perpMarketAccountMap.values(),
-		];
+		return DriftCore.remainingAccounts.getRemainingAccounts(this, params);
 	}
 
 	addPerpMarketToRemainingAccountMaps(
@@ -2921,7 +2792,7 @@ export class DriftClient {
 				{ pubkey: owner, isSigner: false, isWritable: false },
 				{ pubkey: mint, isSigner: false, isWritable: false },
 				{
-					pubkey: anchor.web3.SystemProgram.programId,
+					pubkey: SystemProgram.programId,
 					isSigner: false,
 					isWritable: false,
 				},
@@ -3173,24 +3044,21 @@ export class DriftClient {
 
 		const authority = overrides?.authority ?? this.wallet.publicKey;
 		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
-		return await (this.program.instruction as any).deposit(
+		return await DriftCore.buildDepositInstruction({
+			program: this.program,
 			marketIndex,
 			amount,
 			reduceOnly,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					spotMarket: spotMarketAccount.pubkey,
-					spotMarketVault: spotMarketAccount.vault,
-					user: userAccountPublicKey,
-					userStats: this.getUserStatsAccountPublicKey(),
-					userTokenAccount: userTokenAccount,
-					authority,
-					tokenProgram,
-				},
-				remainingAccounts,
-			}
-		);
+			state: await this.getStatePublicKey(),
+			spotMarket: spotMarketAccount.pubkey,
+			spotMarketVault: spotMarketAccount.vault,
+			user: userAccountPublicKey,
+			userStats: this.getUserStatsAccountPublicKey(),
+			userTokenAccount,
+			authority,
+			tokenProgram,
+			remainingAccounts,
+		});
 	}
 
 	private async checkIfAccountExists(account: PublicKey): Promise<boolean> {
@@ -3210,7 +3078,7 @@ export class DriftClient {
 			authority?: PublicKey;
 		}
 	): Promise<{
-		ixs: anchor.web3.TransactionInstruction[];
+		ixs: TransactionInstruction[];
 		/** @deprecated - this array is always going to be empty, in the current implementation */
 		signers: Signer[];
 		pubkey: PublicKey;
@@ -3346,7 +3214,7 @@ export class DriftClient {
 		tokenMintAddress: PublicKey,
 		associatedTokenAddress: PublicKey,
 		tokenProgram: PublicKey
-	): anchor.web3.TransactionInstruction {
+	): TransactionInstruction {
 		return createAssociatedTokenAccountInstruction(
 			this.wallet.publicKey,
 			associatedTokenAddress,
@@ -3692,7 +3560,7 @@ export class DriftClient {
 		subAccountId?: number,
 		_updateFuel = false
 	): Promise<TransactionInstruction[]> {
-		const withdrawIxs: anchor.web3.TransactionInstruction[] = [];
+		const withdrawIxs: TransactionInstruction[] = [];
 
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 
@@ -3817,7 +3685,7 @@ export class DriftClient {
 
 		opts?.dustPositionCountCallback?.(dustPositionSpotMarketAccounts.length);
 
-		let allWithdrawIxs: anchor.web3.TransactionInstruction[] = [];
+		let allWithdrawIxs: TransactionInstruction[] = [];
 
 		for (const position of dustPositionSpotMarketAccounts) {
 			const tokenAccount = await getAssociatedTokenAddress(
@@ -3876,25 +3744,22 @@ export class DriftClient {
 
 		const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
 
-		return await (this.program.instruction as any).withdraw(
+		return await DriftCore.buildWithdrawInstruction({
+			program: this.program,
 			marketIndex,
 			amount,
 			reduceOnly,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					spotMarket: spotMarketAccount.pubkey,
-					spotMarketVault: spotMarketAccount.vault,
-					driftSigner: this.getSignerPublicKey(),
-					user,
-					userStats: this.getUserStatsAccountPublicKey(),
-					userTokenAccount: userTokenAccount,
-					authority: this.wallet.publicKey,
-					tokenProgram,
-				},
-				remainingAccounts,
-			}
-		);
+			state: await this.getStatePublicKey(),
+			spotMarket: spotMarketAccount.pubkey,
+			spotMarketVault: spotMarketAccount.vault,
+			driftSigner: this.getSignerPublicKey(),
+			user,
+			userStats: this.getUserStatsAccountPublicKey(),
+			userTokenAccount,
+			authority: this.wallet.publicKey,
+			tokenProgram,
+			remainingAccounts,
+		});
 	}
 
 	/**
@@ -5044,13 +4909,13 @@ export class DriftClient {
 				: undefined,
 		});
 
-		return await (this.program.instruction as any).placePerpOrder(orderParams, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user,
-				userStats: this.getUserStatsAccountPublicKey(),
-				authority: this.wallet.publicKey,
-			},
+		return await DriftCore.buildPlacePerpOrderInstruction({
+			program: this.program,
+			orderParams,
+			state: await this.getStatePublicKey(),
+			user,
+			userStats: this.getUserStatsAccountPublicKey(),
+			authority: this.wallet.publicKey,
 			remainingAccounts,
 		});
 	}
@@ -5226,12 +5091,12 @@ export class DriftClient {
 			useMarketLastSlotCache: true,
 		});
 
-		return await this.program.instruction.cancelOrder(orderId ?? null, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user,
-				authority: this.wallet.publicKey,
-			},
+		return await DriftCore.buildCancelOrderInstruction({
+			program: this.program,
+			orderId: orderId ?? null,
+			state: await this.getStatePublicKey(),
+			user,
+			authority: this.wallet.publicKey,
 			remainingAccounts,
 		});
 	}
@@ -5266,18 +5131,15 @@ export class DriftClient {
 			useMarketLastSlotCache: true,
 		});
 
-		return await (this.program.instruction as any).cancelOrderByUserId(
+		return await DriftCore.buildCancelOrderByUserIdInstruction({
+			program: this.program,
 			userOrderId,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user,
-					authority: this.wallet.publicKey,
-					oracle,
-				},
-				remainingAccounts,
-			}
-		);
+			state: await this.getStatePublicKey(),
+			user,
+			authority: this.wallet.publicKey,
+			oracle,
+			remainingAccounts,
+		});
 	}
 
 	/**
@@ -5343,12 +5205,12 @@ export class DriftClient {
 
 		const authority = overrides?.authority ?? this.wallet.publicKey;
 
-		return await this.program.instruction.cancelOrdersByIds(orderIds, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				user: userAccountPubKey,
-				authority,
-			},
+		return await DriftCore.buildCancelOrdersByIdsInstruction({
+			program: this.program,
+			orderIds,
+			state: await this.getStatePublicKey(),
+			user: userAccountPubKey,
+			authority,
 			remainingAccounts,
 		});
 	}
@@ -5402,19 +5264,17 @@ export class DriftClient {
 			useMarketLastSlotCache: true,
 		});
 
-		return await this.program.instruction.cancelOrders(
-			marketType ?? null,
-			marketIndex ?? null,
-			direction ?? null,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user,
-					authority: this.wallet.publicKey,
-				},
-				remainingAccounts,
-			}
-		);
+		return await DriftCore.buildCancelOrdersInstruction({
+			program: this.program,
+			marketType: marketType ?? null,
+			marketIndex: marketIndex ?? null,
+			direction: direction ?? null,
+			user,
+			state: await this.getStatePublicKey(),
+			userStats: this.getUserStatsAccountPublicKey(),
+			authority: this.wallet.publicKey,
+			remainingAccounts,
+		});
 	}
 
 	public async cancelAndPlaceOrders(
@@ -5538,18 +5398,15 @@ export class DriftClient {
 		const formattedParams = params.map((item) => getOrderParams(item));
 		const authority = overrides?.authority ?? this.wallet.publicKey;
 
-		return await (this.program.instruction as any).placeOrders(
+		return await DriftCore.buildPlaceOrdersInstruction({
+			program: this.program,
 			formattedParams,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user,
-					userStats: this.getUserStatsAccountPublicKey(),
-					authority,
-				},
-				remainingAccounts,
-			}
-		);
+			state: await this.getStatePublicKey(),
+			user,
+			userStats: this.getUserStatsAccountPublicKey(),
+			authority,
+			remainingAccounts,
+		});
 	}
 
 	public async getPlaceOrdersAndSetPositionMaxLevIx(
@@ -5847,15 +5704,15 @@ export class DriftClient {
 		}
 
 		const orderId = isSignedMsg ? null : order.orderId;
-		return await this.program.instruction.fillPerpOrder(orderId, null, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				filler,
-				fillerStats: fillerStatsPublicKey,
-				user: userAccountPublicKey,
-				userStats: userStatsPublicKey,
-				authority: this.wallet.publicKey,
-			},
+		return await DriftCore.buildFillPerpOrderInstruction({
+			program: this.program,
+			orderId,
+			state: await this.getStatePublicKey(),
+			filler,
+			fillerStats: fillerStatsPublicKey,
+			user: userAccountPublicKey,
+			userStats: userStatsPublicKey,
+			authority: this.wallet.publicKey,
 			remainingAccounts,
 		});
 	}
@@ -6718,7 +6575,7 @@ export class DriftClient {
 					outTokenAccount,
 					tokenProgram: inTokenProgram,
 					driftSigner: this.getStateAccount().signer,
-					instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
 			}
@@ -6741,7 +6598,7 @@ export class DriftClient {
 					outTokenAccount,
 					tokenProgram: inTokenProgram,
 					driftSigner: this.getStateAccount().signer,
-					instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
 			}
@@ -7002,13 +6859,13 @@ export class DriftClient {
 		);
 
 		const orderId = order.orderId;
-		return await this.program.instruction.triggerOrder(orderId, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				filler,
-				user: userAccountPublicKey,
-				authority: this.wallet.publicKey,
-			},
+		return await DriftCore.buildTriggerOrderInstruction({
+			program: this.program,
+			orderId,
+			state: await this.getStatePublicKey(),
+			filler,
+			user: userAccountPublicKey,
+			authority: this.wallet.publicKey,
 			remainingAccounts,
 		});
 	}
@@ -7609,19 +7466,16 @@ export class DriftClient {
 
 		const authority = overrides?.authority ?? this.wallet.publicKey;
 
-		return await this.program.instruction.placeAndTakePerpOrder(
+		return await DriftCore.buildPlaceAndTakePerpOrderInstruction({
+			program: this.program,
 			orderParams,
 			optionalParams,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user,
-					userStats: userStatsPublicKey,
-					authority,
-				},
-				remainingAccounts,
-			}
-		);
+			state: await this.getStatePublicKey(),
+			user,
+			userStats: userStatsPublicKey,
+			authority,
+			remainingAccounts,
+		});
 	}
 
 	public async placeAndMakePerpOrder(
@@ -7693,21 +7547,18 @@ export class DriftClient {
 				isSigner: false,
 			});
 		}
-		return await this.program.instruction.placeAndMakePerpOrder(
+		return await DriftCore.buildPlaceAndMakePerpOrderInstruction({
+			program: this.program,
 			orderParams,
 			takerOrderId,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user,
-					userStats: userStatsPublicKey,
-					taker: takerInfo.taker,
-					takerStats: takerInfo.takerStats,
-					authority: this.wallet.publicKey,
-				},
-				remainingAccounts,
-			}
-		);
+			state: await this.getStatePublicKey(),
+			user,
+			userStats: userStatsPublicKey,
+			taker: takerInfo.taker,
+			takerStats: takerInfo.takerStats,
+			authority: this.wallet.publicKey,
+			remainingAccounts,
+		});
 	}
 
 	public signSignedMsgOrderParamsMessage(
@@ -7770,43 +7621,11 @@ export class DriftClient {
 			| SignedMsgOrderParamsDelegateMessage,
 		delegateSigner?: boolean
 	): Buffer {
-		if (orderParamsMessage.maxMarginRatio === undefined) {
-			orderParamsMessage.maxMarginRatio = null;
-		}
-		if (orderParamsMessage.isolatedPositionDeposit === undefined) {
-			orderParamsMessage.isolatedPositionDeposit = null;
-		}
-
-		const anchorIxName = delegateSigner
-			? 'global' + ':' + 'SignedMsgOrderParamsDelegateMessage'
-			: 'global' + ':' + 'SignedMsgOrderParamsMessage';
-		const prefix = Buffer.from(sha256(anchorIxName).slice(0, 8));
-
-		// Backwards-compat: normalize optional builder fields to null for encoding
-		const withBuilderDefaults = {
-			...orderParamsMessage,
-			builderIdx:
-				orderParamsMessage.builderIdx !== undefined
-					? orderParamsMessage.builderIdx
-					: null,
-			builderFeeTenthBps:
-				orderParamsMessage.builderFeeTenthBps !== undefined
-					? orderParamsMessage.builderFeeTenthBps
-					: null,
-		};
-		const buf = Buffer.concat([
-			prefix,
-			delegateSigner
-				? this.program.coder.types.encode(
-						'signedMsgOrderParamsDelegateMessage',
-						withBuilderDefaults as SignedMsgOrderParamsDelegateMessage
-				  )
-				: this.program.coder.types.encode(
-						'signedMsgOrderParamsMessage',
-						withBuilderDefaults as SignedMsgOrderParamsMessage
-				  ),
-		]);
-		return buf;
+		return DriftCore.signedMsg.encodeSignedMsgOrderParamsMessage({
+			coderTypes: this.program.coder.types as any,
+			orderParamsMessage,
+			delegateSigner,
+		});
 	}
 
 	/*
@@ -7819,16 +7638,11 @@ export class DriftClient {
 		encodedMessage: Buffer,
 		delegateSigner?: boolean
 	): SignedMsgOrderParamsMessage | SignedMsgOrderParamsDelegateMessage {
-		const decodeStr = delegateSigner
-			? 'signedMsgOrderParamsDelegateMessage'
-			: 'signedMsgOrderParamsMessage';
-		return this.program.coder.types.decode(
-			decodeStr,
-			Buffer.concat([
-				encodedMessage.slice(8), // strip out discriminator
-				Buffer.alloc(128), // pad on 128 bytes, this is most efficient way to messages that are too small
-			])
-		);
+		return DriftCore.signedMsg.decodeSignedMsgOrderParamsMessage({
+			coderTypes: this.program.coder.types as any,
+			encodedMessage,
+			delegateSigner,
+		});
 	}
 
 	public signMessage(
@@ -8359,19 +8173,16 @@ export class DriftClient {
 			overrides?.authority ??
 			overrides?.user?.getUserAccount().authority ??
 			this.wallet.publicKey;
-		return await (this.program.instruction as any).modifyOrder(
+		return await DriftCore.buildModifyOrderInstruction({
+			program: this.program,
 			orderId,
-			orderParams,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user: userPubKey,
-					userStats: this.getUserStatsAccountPublicKey(),
-					authority,
-				},
-				remainingAccounts,
-			}
-		);
+			modifyParams: orderParams,
+			state: await this.getStatePublicKey(),
+			user: userPubKey,
+			userStats: this.getUserStatsAccountPublicKey(),
+			authority,
+			remainingAccounts,
+		});
 	}
 
 	/**
@@ -8484,19 +8295,16 @@ export class DriftClient {
 			maxTs: maxTs || null,
 		};
 
-		return await (this.program.instruction as any).modifyOrderByUserId(
+		return await DriftCore.buildModifyOrderByUserIdInstruction({
+			program: this.program,
 			userOrderId,
-			orderParams,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					user,
-					userStats: this.getUserStatsAccountPublicKey(),
-					authority: this.wallet.publicKey,
-				},
-				remainingAccounts,
-			}
-		);
+			modifyParams: orderParams,
+			state: await this.getStatePublicKey(),
+			user,
+			userStats: this.getUserStatsAccountPublicKey(),
+			authority: this.wallet.publicKey,
+			remainingAccounts,
+		});
 	}
 
 	public async settlePNLs(
@@ -8703,14 +8511,14 @@ export class DriftClient {
 			}
 		}
 
-		return await this.program.instruction.settlePnl(marketIndex, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				authority: this.wallet.publicKey,
-				user: settleeUserAccountPublicKey,
-				spotMarketVault: this.getQuoteSpotMarketAccount().vault,
-			},
-			remainingAccounts: remainingAccounts,
+		return await DriftCore.buildSettlePnlInstruction({
+			program: this.program,
+			marketIndex,
+			state: await this.getStatePublicKey(),
+			authority: this.wallet.publicKey,
+			user: settleeUserAccountPublicKey,
+			spotMarketVault: this.getQuoteSpotMarketAccount().vault,
+			remainingAccounts,
 		});
 	}
 
@@ -9006,22 +8814,19 @@ export class DriftClient {
 			writablePerpMarketIndexes: [marketIndex],
 		});
 
-		return await this.program.instruction.liquidatePerp(
+		return await DriftCore.buildLiquidatePerpInstruction({
+			program: this.program,
 			marketIndex,
 			maxBaseAssetAmount,
-			limitPrice ?? null,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					authority: this.wallet.publicKey,
-					user: userAccountPublicKey,
-					userStats: userStatsPublicKey,
-					liquidator,
-					liquidatorStats: liquidatorStatsPublicKey,
-				},
-				remainingAccounts: remainingAccounts,
-			}
-		);
+			limitPrice: limitPrice ?? null,
+			state: await this.getStatePublicKey(),
+			authority: this.wallet.publicKey,
+			user: userAccountPublicKey,
+			userStats: userStatsPublicKey,
+			liquidator,
+			liquidatorStats: liquidatorStatsPublicKey,
+			remainingAccounts,
+		});
 	}
 
 	public async liquidatePerpWithFill(
@@ -9157,7 +8962,7 @@ export class DriftClient {
 			writableSpotMarketIndexes: [liabilityMarketIndex, assetMarketIndex],
 		});
 
-		return await this.program.instruction.liquidateSpot(
+		return await (this.program.instruction as any).liquidateSpot(
 			assetMarketIndex,
 			liabilityMarketIndex,
 			maxLiabilityTransfer,
@@ -9171,7 +8976,7 @@ export class DriftClient {
 					liquidator,
 					liquidatorStats: liquidatorStatsPublicKey,
 				},
-				remainingAccounts: remainingAccounts,
+				remainingAccounts,
 			}
 		);
 	}
@@ -9424,7 +9229,7 @@ export class DriftClient {
 						liabilityTokenAccount: liabilityTokenAccount,
 						tokenProgram: assetTokenProgram,
 						driftSigner: this.getStateAccount().signer,
-						instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+						instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 					},
 					remainingAccounts,
 				}
@@ -9447,7 +9252,7 @@ export class DriftClient {
 					liabilityTokenAccount: liabilityTokenAccount,
 					tokenProgram: assetTokenProgram,
 					driftSigner: this.getStateAccount().signer,
-					instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
 			}
@@ -9526,7 +9331,7 @@ export class DriftClient {
 					ifRebalanceConfig: ifRebalanceConfig,
 					tokenProgram: TOKEN_PROGRAM_ID,
 					driftSigner: this.getStateAccount().signer,
-					instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
 			}
@@ -9546,7 +9351,7 @@ export class DriftClient {
 					ifRebalanceConfig: ifRebalanceConfig,
 					tokenProgram: TOKEN_PROGRAM_ID,
 					driftSigner: this.getStateAccount().signer,
-					instructions: anchor.web3.SYSVAR_INSTRUCTIONS_PUBKEY,
+					instructions: SYSVAR_INSTRUCTIONS_PUBKEY,
 				},
 				remainingAccounts,
 			}
@@ -9868,12 +9673,12 @@ export class DriftClient {
 			this.program.programId,
 			perpMarketIndex
 		);
-		return await this.program.instruction.updateFundingRate(perpMarketIndex, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				perpMarket: perpMarketPublicKey,
-				oracle: oracle,
-			},
+		return await DriftCore.buildUpdateFundingRateInstruction({
+			program: this.program,
+			perpMarketIndex,
+			state: await this.getStatePublicKey(),
+			perpMarket: perpMarketPublicKey,
+			oracle,
 		});
 	}
 
@@ -10118,8 +9923,8 @@ export class DriftClient {
 			),
 			authority: this.wallet.publicKey,
 			payer: this.wallet.publicKey,
-			rent: anchor.web3.SYSVAR_RENT_PUBKEY,
-			systemProgram: anchor.web3.SystemProgram.programId,
+			rent: SYSVAR_RENT_PUBKEY,
+			systemProgram: SystemProgram.programId,
 			state: await this.getStatePublicKey(),
 		};