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

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
 					),

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.145.1",
+  "version": "2.146.0",
   "name": "drift",
   "instructions": [
     {
@@ -2020,32 +2020,6 @@
         }
       ]
     },
-    {
-      "name": "updateUserFuelBonus",
-      "accounts": [
-        {
-          "name": "state",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "authority",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "user",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "userStats",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
     {
       "name": "updateUserStatsReferrerStatus",
       "accounts": [
@@ -4285,11 +4259,6 @@
           "isMut": true,
           "isSigner": false
         },
-        {
-          "name": "ammCache",
-          "isMut": true,
-          "isSigner": false
-        },
         {
           "name": "oracle",
           "isMut": false,
@@ -4454,7 +4423,7 @@
       "args": []
     },
     {
-      "name": "resizeAmmCache",
+      "name": "addMarketToAmmCache",
       "accounts": [
         {
           "name": "admin",
@@ -4471,6 +4440,11 @@
           "isMut": true,
           "isSigner": false
         },
+        {
+          "name": "perpMarket",
+          "isMut": false,
+          "isSigner": false
+        },
         {
           "name": "rent",
           "isMut": false,
@@ -4484,6 +4458,27 @@
       ],
       "args": []
     },
+    {
+      "name": "deleteAmmCache",
+      "accounts": [
+        {
+          "name": "admin",
+          "isMut": true,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "ammCache",
+          "isMut": true,
+          "isSigner": false
+        }
+      ],
+      "args": []
+    },
     {
       "name": "updateInitialAmmCacheInfo",
       "accounts": [
@@ -6109,27 +6104,6 @@
         }
       ]
     },
-    {
-      "name": "updateLpCooldownTime",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "lpCooldownTime",
-          "type": "u64"
-        }
-      ]
-    },
     {
       "name": "updatePerpFeeStructure",
       "accounts": [
@@ -6705,46 +6679,6 @@
         }
       ]
     },
-    {
-      "name": "updatePerpMarketFuel",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "perpMarket",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "fuelBoostTaker",
-          "type": {
-            "option": "u8"
-          }
-        },
-        {
-          "name": "fuelBoostMaker",
-          "type": {
-            "option": "u8"
-          }
-        },
-        {
-          "name": "fuelBoostPosition",
-          "type": {
-            "option": "u8"
-          }
-        }
-      ]
-    },
     {
       "name": "updatePerpMarketProtectedMakerParams",
       "accounts": [
@@ -6865,115 +6799,6 @@
         }
       ]
     },
-    {
-      "name": "updateSpotMarketFuel",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "spotMarket",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "fuelBoostDeposits",
-          "type": {
-            "option": "u8"
-          }
-        },
-        {
-          "name": "fuelBoostBorrows",
-          "type": {
-            "option": "u8"
-          }
-        },
-        {
-          "name": "fuelBoostTaker",
-          "type": {
-            "option": "u8"
-          }
-        },
-        {
-          "name": "fuelBoostMaker",
-          "type": {
-            "option": "u8"
-          }
-        },
-        {
-          "name": "fuelBoostInsurance",
-          "type": {
-            "option": "u8"
-          }
-        }
-      ]
-    },
-    {
-      "name": "initUserFuel",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "user",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "userStats",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "fuelBoostDeposits",
-          "type": {
-            "option": "i32"
-          }
-        },
-        {
-          "name": "fuelBoostBorrows",
-          "type": {
-            "option": "u32"
-          }
-        },
-        {
-          "name": "fuelBoostTaker",
-          "type": {
-            "option": "u32"
-          }
-        },
-        {
-          "name": "fuelBoostMaker",
-          "type": {
-            "option": "u32"
-          }
-        },
-        {
-          "name": "fuelBoostInsurance",
-          "type": {
-            "option": "u32"
-          }
-        }
-      ]
-    },
     {
       "name": "updateAdmin",
       "accounts": [
@@ -6995,27 +6820,6 @@
         }
       ]
     },
-    {
-      "name": "updateWhitelistMint",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": false,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": true,
-          "isSigner": false
-        }
-      ],
-      "args": [
-        {
-          "name": "whitelistMint",
-          "type": "publicKey"
-        }
-      ]
-    },
     {
       "name": "updateDiscountMint",
       "accounts": [
@@ -8478,32 +8282,6 @@
         }
       ]
     },
-    {
-      "name": "resetAmmCache",
-      "accounts": [
-        {
-          "name": "admin",
-          "isMut": true,
-          "isSigner": true
-        },
-        {
-          "name": "state",
-          "isMut": false,
-          "isSigner": false
-        },
-        {
-          "name": "ammCache",
-          "isMut": true,
-          "isSigner": false
-        },
-        {
-          "name": "systemProgram",
-          "isMut": false,
-          "isSigner": false
-        }
-      ],
-      "args": []
-    },
     {
       "name": "lpPoolSwap",
       "accounts": [
@@ -12267,6 +12045,10 @@
             "name": "oracleSlot",
             "type": "u64"
           },
+          {
+            "name": "marketIndex",
+            "type": "u16"
+          },
           {
             "name": "oracleSource",
             "type": "u8"
@@ -12288,7 +12070,7 @@
             "type": {
               "array": [
                 "u8",
-                36
+                34
               ]
             }
           }
@@ -19777,6 +19559,11 @@
       "code": 6343,
       "name": "InvalidLpPoolId",
       "msg": "Invalid Lp Pool Id for Operation"
+    },
+    {
+      "code": 6344,
+      "name": "MarketIndexNotFoundAmmCache",
+      "msg": "MarketIndexNotFoundAmmCache"
     }
   ]
-}
+}

package/src/math/superStake.ts

@@ -223,7 +223,7 @@ export async function findBestJitoSolSuperStakeIxs({
 }
 
 /**
- * Finds best Jupiter Swap instructions for a generic lstMint
+ * Finds best swap instructions for a generic lstMint
  *
  * Without doing any extra steps like checking if you can get a better rate by staking directly with that LST platform
  */

package/src/swap/UnifiedSwapClient.ts

@@ -20,7 +20,29 @@ import {
 export type SwapMode = 'ExactIn' | 'ExactOut';
 export type SwapClientType = 'jupiter' | 'titan';
 
-export type UnifiedQuoteResponse = JupiterQuoteResponse | TitanQuoteResponse;
+/**
+ * Unified quote response interface that combines properties from both Jupiter and Titan
+ * This provides a consistent interface while allowing for provider-specific fields
+ */
+export interface UnifiedQuoteResponse {
+	// Core properties available in both providers
+	inputMint: string;
+	inAmount: string;
+	outputMint: string;
+	outAmount: string;
+	swapMode: SwapMode;
+	slippageBps: number;
+	routePlan: Array<{ swapInfo: any; percent: number }>;
+
+	// Optional properties that may not be available in all providers
+	otherAmountThreshold?: string; // Jupiter has this, Titan doesn't
+	priceImpactPct?: string; // Jupiter provides this, Titan doesn't (we calculate it)
+	platformFee?: { amount?: string; feeBps?: number }; // Format varies between providers
+	contextSlot?: number;
+	timeTaken?: number;
+	error?: string;
+	errorCode?: string;
+}
 
 export interface SwapQuoteParams {
 	inputMint: PublicKey;
@@ -135,7 +157,7 @@ export class UnifiedSwapClient {
 	): Promise<SwapTransactionResult> {
 		if (this.clientType === 'jupiter') {
 			const jupiterClient = this.client as JupiterClient;
-			// Cast the quote to Jupiter's QuoteResponse type
+			// Cast the quote to Jupiter's specific QuoteResponse type
 			const jupiterParams = {
 				...params,
 				quote: params.quote as JupiterQuoteResponse,
@@ -213,7 +235,7 @@ export class UnifiedSwapClient {
 			}
 
 			if (!finalQuote) {
-				throw new Error("Could not fetch Jupiter's quote. Please try again.");
+				throw new Error('Could not fetch swap quote. Please try again.');
 			}
 
 			// Get swap transaction and extract instructions

package/src/types.ts

@@ -54,6 +54,7 @@ export enum PerpOperation {
 	SETTLE_PNL = 8,
 	SETTLE_PNL_WITH_POSITION = 16,
 	LIQUIDATION = 32,
+	SETTLE_REV_POOL = 64,
 }
 
 export enum SpotOperation {
@@ -1891,6 +1892,7 @@ export type CacheInfo = {
 	oracleValidity: number;
 	lpStatusForPerpMarket: number;
 	ammPositionScalar: number;
+	marketIndex: number;
 };
 
 export type AmmCache = {

package/tests/dlob/helpers.ts

@@ -672,9 +672,9 @@ export class MockUserMap implements UserMapInterface {
 		});
 	}
 
-	public async subscribe(): Promise<void> { }
+	public async subscribe(): Promise<void> {}
 
-	public async unsubscribe(): Promise<void> { }
+	public async unsubscribe(): Promise<void> {}
 
 	public async addPubkey(userAccountPublicKey: PublicKey): Promise<void> {
 		const user = new User({
@@ -733,7 +733,7 @@ export class MockUserMap implements UserMapInterface {
 		);
 	}
 
-	public async updateWithOrderRecord(_record: OrderRecord): Promise<void> { }
+	public async updateWithOrderRecord(_record: OrderRecord): Promise<void> {}
 
 	public values(): IterableIterator<User> {
 		return this.userMap.values();