@drift-labs/sdk 2.146.0-beta.9 → 2.147.0-beta.1

package/src/constants/spotMarkets.ts

@@ -12,6 +12,7 @@ import {
 import { OracleSource } from '../types';
 import { BN } from '@coral-xyz/anchor';
 import { DriftEnv } from '../config';
+import { MarketStatus } from '@ellipsis-labs/phoenix-sdk';
 
 export type SpotMarketConfig = {
 	symbol: string;
@@ -28,6 +29,7 @@ export type SpotMarketConfig = {
 	launchTs?: number;
 	pythFeedId?: string;
 	pythLazerId?: number;
+	marketStatus?: MarketStatus;
 };
 
 export const WRAPPED_SOL_MINT = new PublicKey(
@@ -193,14 +195,15 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'mSOL',
 		marketIndex: 2,
 		poolId: 0,
-		oracle: new PublicKey('FAq7hqjn7FWGXKDwJHzsXGgBcydGTcK4kziJpAGWXjDb'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('FY2JMi1vYz1uayVT2GJ96ysZgpagjhdPRG2upNPtSZsC'),
+		oracleSource: OracleSource.PYTH_LAZER,
 		mint: new PublicKey('mSoLzYCxHdYgdzU16g5QSh3i5K3z3KZK7ytfqcJm7So'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
 		serumMarket: new PublicKey('9Lyhks5bQQxb9EyyX55NtgKQzpM4WK7JCmeaWuQ5MoXD'),
 		pythFeedId:
 			'0xc2289a6a43d2ce91c6f55caec370f4acc38a2ed477f58813334c6d03749ff2a4',
+		pythLazerId: 503,
 	},
 	{
 		symbol: 'wBTC',
@@ -253,8 +256,8 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'jitoSOL',
 		marketIndex: 6,
 		poolId: 0,
-		oracle: new PublicKey('9QE1P5EfzthYDgoQ9oPeTByCEKaRJeZbVVqKJfgU9iau'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('2cHCtAkMnttMh3bNKSCgSKSP5D4yN3p8bfnMdS3VZsDf'),
+		oracleSource: OracleSource.PYTH_LAZER,
 		mint: new PublicKey('J1toso1uCk3RLmjorhTtrVwY9HJ7X8V9yYac6Y7kGCPn'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
@@ -264,6 +267,7 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		),
 		pythFeedId:
 			'0x67be9f519b95cf24338801051f9a808eff0a578ccb388db73b7f6fe1de019ffb',
+		pythLazerId: 458,
 	},
 	{
 		symbol: 'PYTH',
@@ -530,25 +534,27 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'sUSDe',
 		marketIndex: 24,
 		poolId: 0,
-		oracle: new PublicKey('BRuNuzLAPHHGSSVAJPKMcmJMdgDfrekvnSxkxPDGdeqp'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('CX7JCXtUTiC43ZA4uzoH7iQBD15jtVwdBNCnjKHt1BrQ'),
+		oracleSource: OracleSource.PYTH_LAZER,
 		mint: new PublicKey('Eh6XEPhSwoLv5wFApukmnaVSHQ6sAnoD9BmgmwQoN2sN'),
 		precision: new BN(10).pow(NINE),
 		precisionExp: NINE,
 		pythFeedId:
 			'0xca3ba9a619a4b3755c10ac7d5e760275aa95e9823d38a84fedd416856cdba37c',
+		pythLazerId: 582,
 	},
 	{
 		symbol: 'BNSOL',
 		marketIndex: 25,
 		poolId: 0,
-		oracle: new PublicKey('8DmXTfhhtb9kTcpTVfb6Ygx8WhZ8wexGqcpxfn23zooe'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('2LxMbHBHsw74aE3XgfthmUNkdDfUGcSEy3G3D3t642fd'),
+		oracleSource: OracleSource.PYTH_LAZER,
 		mint: new PublicKey('BNso1VUJnh4zcfpZa6986Ea66P6TCp59hvtNJ8b1X85'),
 		precision: LAMPORTS_PRECISION,
 		precisionExp: LAMPORTS_EXP,
 		pythFeedId:
 			'0x55f8289be7450f1ae564dd9798e49e7d797d89adbc54fe4f8c906b1fcb94b0c3',
+		pythLazerId: 384,
 	},
 	{
 		symbol: 'MOTHER',
@@ -582,13 +588,14 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'USDS',
 		marketIndex: 28,
 		poolId: 0,
-		oracle: new PublicKey('7pT9mxKXyvfaZKeKy1oe2oV2K1RFtF7tPEJHUY3h2vVV'),
-		oracleSource: OracleSource.PYTH_STABLE_COIN_PULL,
+		oracle: new PublicKey('5Km85n3s9Zs5wEoXYWuHbpoDzst4EBkS5f1XuQJGG1DL'),
+		oracleSource: OracleSource.PYTH_LAZER_STABLE_COIN,
 		mint: new PublicKey('USDSwr9ApdHk5bvJKMjzff41FfuX8bSxdKcR81vTwcA'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
 		pythFeedId:
 			'0x77f0971af11cc8bac224917275c1bf55f2319ed5c654a1ca955c82fa2d297ea1',
+		pythLazerId: 611,
 	},
 	{
 		symbol: 'META',
@@ -716,14 +723,15 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'AUSD',
 		marketIndex: 38,
 		poolId: 0,
-		oracle: new PublicKey('8FZhpiM8n3mpgvENWLcEvHsKB1bBhYBAyL4Ypr4gptLZ'),
-		oracleSource: OracleSource.PYTH_STABLE_COIN_PULL,
+		oracle: new PublicKey('9JYpqJfLXgrW8Wqzfd93GvJF73m2jJFjNqpQv3wQtehZ'),
+		oracleSource: OracleSource.PYTH_LAZER_STABLE_COIN,
 		mint: new PublicKey('AUSD1jCcCyPLybk1YnvPWsHQSrZ46dxwoMniN4N2UEB9'),
 		precision: new BN(10).pow(SIX),
 		precisionExp: SIX,
 		pythFeedId:
 			'0xd9912df360b5b7f21a122f15bdd5e27f62ce5e72bd316c291f7c86620e07fb2a',
 		launchTs: 1738255943000,
+		pythLazerId: 367,
 	},
 	{
 		symbol: 'FARTCOIN',
@@ -797,14 +805,15 @@ export const MainnetSpotMarkets: SpotMarketConfig[] = [
 		symbol: 'zBTC',
 		marketIndex: 45,
 		poolId: 0,
-		oracle: new PublicKey('CN9QvvbGQzMnN8vJaSek2so4vFnTqgJDFrdJB8Y4tQfB'),
-		oracleSource: OracleSource.PYTH_PULL,
+		oracle: new PublicKey('3xcpvBUVV8ALVV4Wod733Vyic3fe8iJAeXDpRdk19Z3p'),
+		oracleSource: OracleSource.PYTH_LAZER,
 		mint: new PublicKey('zBTCug3er3tLyffELcvDNrKkCymbPWysGcWihESYfLg'),
 		precision: new BN(10).pow(EIGHT),
 		precisionExp: EIGHT,
 		pythFeedId:
 			'0x3d824c7f7c26ed1c85421ecec8c754e6b52d66a4e45de20a9c9ea91de8b396f9',
 		launchTs: 1747155600000,
+		pythLazerId: 640,
 	},
 	{
 		symbol: 'ZEUS',

package/src/driftClient.ts

@@ -172,7 +172,7 @@ import { calculateMarketMaxAvailableInsurance } from './math/market';
 import { fetchUserStatsAccount } from './accounts/fetch';
 import { castNumberToSpotPrecision } from './math/spotMarket';
 import { JupiterClient, QuoteResponse } from './jupiter/jupiterClient';
-import { SwapMode } from './swap/UnifiedSwapClient';
+import { SwapMode, UnifiedQuoteResponse } from './swap/UnifiedSwapClient';
 import { getNonIdleUserFilter } from './memcmp';
 import { UserStatsSubscriptionConfig } from './userStatsConfig';
 import { getMarinadeDepositIx, getMarinadeFinanceProgram } from './marinade';
@@ -1776,15 +1776,24 @@ export class DriftClient {
 	public async getUpdateUserPerpPositionCustomMarginRatioIx(
 		perpMarketIndex: number,
 		marginRatio: number,
-		subAccountId = 0
+		subAccountId = 0,
+		overrides?: {
+			userAccountPublicKey?: PublicKey;
+			authority?: PublicKey;
+			signingAuthority?: PublicKey;
+		}
 	): Promise<TransactionInstruction> {
-		const userAccountPublicKey = getUserAccountPublicKeySync(
-			this.program.programId,
-			this.authority,
-			subAccountId
-		);
+		let userAccountPublicKey = overrides?.userAccountPublicKey;
+		if (!userAccountPublicKey) {
+			userAccountPublicKey = getUserAccountPublicKeySync(
+				this.program.programId,
+				overrides?.authority ?? this.authority,
+				subAccountId
+			);
+		}
 
-		await this.addUser(subAccountId, this.authority);
+		const signingAuthority =
+			overrides?.signingAuthority ?? this.wallet.publicKey;
 
 		const ix = this.program.instruction.updateUserPerpPositionCustomMarginRatio(
 			subAccountId,
@@ -1793,7 +1802,7 @@ export class DriftClient {
 			{
 				accounts: {
 					user: userAccountPublicKey,
-					authority: this.wallet.publicKey,
+					authority: signingAuthority,
 				},
 			}
 		);
@@ -5756,21 +5765,23 @@ export class DriftClient {
 	/**
 	 * Swap tokens in drift 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
 	 * @param inMarketIndex the market index of the token you're selling
-	 * @param outAssociatedTokenAccount the token account to receive the token being sold on titan or jupiter
+	 * @param outAssociatedTokenAccount the token account to receive the token being sold on the swap provider
 	 * @param inAssociatedTokenAccount the token account to
 	 * @param amount the amount of TokenIn, regardless of swapMode
-	 * @param slippageBps the max slippage passed to titan or jupiter api
-	 * @param swapMode titan or jupiter swapMode (ExactIn or ExactOut), default is ExactIn
-	 * @param route the titan or jupiter route to use for the swap
+	 * @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 v6 pass in the quote response from Jupiter quote's API (deprecated, use quote instead)
-	 * @param quote pass in the quote response from Jupiter quote's API
+	 * @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
 	 */
 	public async swap({
 		swapClient,
+		jupiterClient,
 		outMarketIndex,
 		inMarketIndex,
 		outAssociatedTokenAccount,
@@ -5784,7 +5795,9 @@ export class DriftClient {
 		quote,
 		onlyDirectRoutes = false,
 	}: {
-		swapClient: UnifiedSwapClient | SwapClient;
+		swapClient?: UnifiedSwapClient | SwapClient;
+		/** @deprecated Use swapClient instead. Legacy parameter for backward compatibility */
+		jupiterClient?: JupiterClient;
 		outMarketIndex: number;
 		inMarketIndex: number;
 		outAssociatedTokenAccount?: PublicKey;
@@ -5798,17 +5811,24 @@ export class DriftClient {
 		v6?: {
 			quote?: QuoteResponse;
 		};
-		quote?: QuoteResponse;
+		quote?: UnifiedQuoteResponse;
 	}): Promise<TransactionSignature> {
+		// Handle backward compatibility: use jupiterClient if swapClient is not provided
+		const clientToUse = swapClient || jupiterClient;
+
+		if (!clientToUse) {
+			throw new Error('Either swapClient or jupiterClient must be provided');
+		}
+
 		let res: {
 			ixs: TransactionInstruction[];
 			lookupTables: AddressLookupTableAccount[];
 		};
 
 		// Use unified SwapClient if available
-		if (swapClient instanceof UnifiedSwapClient) {
+		if (clientToUse instanceof UnifiedSwapClient) {
 			res = await this.getSwapIxV2({
-				swapClient,
+				swapClient: clientToUse,
 				outMarketIndex,
 				inMarketIndex,
 				outAssociatedTokenAccount,
@@ -5821,9 +5841,9 @@ export class DriftClient {
 				quote,
 				v6,
 			});
-		} else if (swapClient instanceof TitanClient) {
+		} else if (clientToUse instanceof TitanClient) {
 			res = await this.getTitanSwapIx({
-				titanClient: swapClient,
+				titanClient: clientToUse,
 				outMarketIndex,
 				inMarketIndex,
 				outAssociatedTokenAccount,
@@ -5834,10 +5854,10 @@ export class DriftClient {
 				onlyDirectRoutes,
 				reduceOnly,
 			});
-		} else if (swapClient instanceof JupiterClient) {
+		} else if (clientToUse instanceof JupiterClient) {
 			const quoteToUse = quote ?? v6?.quote;
 			res = await this.getJupiterSwapIxV6({
-				jupiterClient: swapClient,
+				jupiterClient: clientToUse,
 				outMarketIndex,
 				inMarketIndex,
 				outAssociatedTokenAccount,
@@ -5845,7 +5865,7 @@ export class DriftClient {
 				amount,
 				slippageBps,
 				swapMode,
-				quote: quoteToUse,
+				quote: quoteToUse as QuoteResponse,
 				reduceOnly,
 				onlyDirectRoutes,
 			});
@@ -6039,7 +6059,7 @@ export class DriftClient {
 		}
 
 		if (!quote) {
-			throw new Error("Could not fetch Jupiter's quote. Please try again.");
+			throw new Error('Could not fetch swap quote. Please try again.');
 		}
 
 		const isExactOut = swapMode === 'ExactOut' || quote.swapMode === 'ExactOut';
@@ -6295,7 +6315,7 @@ export class DriftClient {
 		swapMode?: SwapMode;
 		onlyDirectRoutes?: boolean;
 		reduceOnly?: SwapReduceOnly;
-		quote?: QuoteResponse;
+		quote?: UnifiedQuoteResponse;
 		v6?: {
 			quote?: QuoteResponse;
 		};
@@ -8890,7 +8910,7 @@ export class DriftClient {
 		}
 
 		if (!quote) {
-			throw new Error("Could not fetch Jupiter's quote. Please try again.");
+			throw new Error('Could not fetch swap quote. Please try again.');
 		}
 
 		const amountIn = new BN(quote.inAmount);
@@ -10969,14 +10989,27 @@ export class DriftClient {
 			isMakingNewAccount: boolean;
 			depositMarketIndex: number;
 			orderMarketIndex: number;
+		},
+		overrides?: {
+			user?: User;
+			signingAuthority?: PublicKey;
 		}
 	): Promise<TransactionInstruction> {
 		const isDepositToTradeTx = depositToTradeArgs !== undefined;
+		const userAccountPublicKey =
+			overrides?.user?.getUserAccountPublicKey() ??
+			getUserAccountPublicKeySync(
+				this.program.programId,
+				this.wallet.publicKey,
+				subAccountId
+			);
+		const signingAuthority =
+			overrides?.signingAuthority ?? this.wallet.publicKey;
+		const userAccount =
+			overrides?.user.getUserAccount() ?? this.getUserAccount(subAccountId);
 
 		const remainingAccounts = this.getRemainingAccounts({
-			userAccounts: depositToTradeArgs?.isMakingNewAccount
-				? []
-				: [this.getUserAccount(subAccountId)],
+			userAccounts: depositToTradeArgs?.isMakingNewAccount ? [] : [userAccount],
 			useMarketLastSlotCache: false,
 			readablePerpMarketIndex: depositToTradeArgs?.orderMarketIndex,
 			readableSpotMarketIndexes: isDepositToTradeTx
@@ -10989,12 +11022,8 @@ export class DriftClient {
 			{
 				accounts: {
 					state: await this.getStatePublicKey(),
-					user: getUserAccountPublicKeySync(
-						this.program.programId,
-						this.wallet.publicKey,
-						subAccountId
-					),
-					authority: this.wallet.publicKey,
+					user: userAccountPublicKey,
+					authority: signingAuthority,
 					highLeverageModeConfig: getHighLeverageModeConfigPublicKey(
 						this.program.programId
 					),