@drift-labs/sdk 2.152.0-beta.1 → 2.153.0-beta.0

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.150.0",
+  "version": "2.152.0",
   "name": "drift",
   "instructions": [
     {
@@ -23,7 +23,7 @@
         {
           "name": "authority",
           "isMut": false,
-          "isSigner": true
+          "isSigner": false
         },
         {
           "name": "payer",
@@ -73,7 +73,7 @@
         {
           "name": "authority",
           "isMut": false,
-          "isSigner": true
+          "isSigner": false
         },
         {
           "name": "payer",
@@ -652,6 +652,163 @@
         }
       ]
     },
+    {
+      "name": "depositIntoIsolatedPerpPosition",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "spotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "spotMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "perpMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "amount",
+          "type": "u64"
+        }
+      ]
+    },
+    {
+      "name": "transferIsolatedPerpPositionDeposit",
+      "accounts": [
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "spotMarketVault",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "spotMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "perpMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "amount",
+          "type": "i64"
+        }
+      ]
+    },
+    {
+      "name": "withdrawFromIsolatedPerpPosition",
+      "accounts": [
+        {
+          "name": "state",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "user",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "userStats",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "authority",
+          "isMut": false,
+          "isSigner": true
+        },
+        {
+          "name": "spotMarketVault",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "driftSigner",
+          "isMut": false,
+          "isSigner": false
+        },
+        {
+          "name": "userTokenAccount",
+          "isMut": true,
+          "isSigner": false
+        },
+        {
+          "name": "tokenProgram",
+          "isMut": false,
+          "isSigner": false
+        }
+      ],
+      "args": [
+        {
+          "name": "spotMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "perpMarketIndex",
+          "type": "u16"
+        },
+        {
+          "name": "amount",
+          "type": "u64"
+        }
+      ]
+    },
     {
       "name": "placePerpOrder",
       "accounts": [
@@ -11584,7 +11741,7 @@
           },
           {
             "name": "disableUpdatePerpBidAskTwap",
-            "type": "bool"
+            "type": "u8"
           },
           {
             "name": "pausedOperations",
@@ -14407,13 +14564,13 @@
             "type": "u64"
           },
           {
-            "name": "lastBaseAssetAmountPerLp",
+            "name": "isolatedPositionScaledBalance",
             "docs": [
               "The last base asset amount per lp the amm had",
               "Used to settle the users lp position",
-              "precision: BASE_PRECISION"
+              "precision: SPOT_BALANCE_PRECISION"
             ],
-            "type": "i64"
+            "type": "u64"
           },
           {
             "name": "lastQuoteAssetAmountPerLp",
@@ -14452,8 +14609,8 @@
             "type": "u8"
           },
           {
-            "name": "perLpBase",
-            "type": "i8"
+            "name": "positionFlag",
+            "type": "u8"
           }
         ]
       }
@@ -15133,6 +15290,17 @@
         ]
       }
     },
+    {
+      "name": "LiquidationBitFlag",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "IsolatedPosition"
+          }
+        ]
+      }
+    },
     {
       "name": "SettlePnlExplanation",
       "type": {
@@ -15262,13 +15430,7 @@
         "kind": "enum",
         "variants": [
           {
-            "name": "Standard",
-            "fields": [
-              {
-                "name": "trackOpenOrdersFraction",
-                "type": "bool"
-              }
-            ]
+            "name": "Standard"
           },
           {
             "name": "Liquidation",
@@ -15910,6 +16072,23 @@
         ]
       }
     },
+    {
+      "name": "PositionFlag",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "IsolatedPosition"
+          },
+          {
+            "name": "BeingLiquidated"
+          },
+          {
+            "name": "Bankrupt"
+          }
+        ]
+      }
+    },
     {
       "name": "ReferrerStatus",
       "type": {
@@ -16903,6 +17082,11 @@
             "defined": "SpotBankruptcyRecord"
           },
           "index": false
+        },
+        {
+          "name": "bitFlags",
+          "type": "u8",
+          "index": false
         }
       ]
     },
@@ -18339,8 +18523,8 @@
     },
     {
       "code": 6094,
-      "name": "CantUpdatePoolBalanceType",
-      "msg": "CantUpdatePoolBalanceType"
+      "name": "CantUpdateSpotBalanceType",
+      "msg": "CantUpdateSpotBalanceType"
     },
     {
       "code": 6095,
@@ -19591,6 +19775,11 @@
       "code": 6344,
       "name": "MarketIndexNotFoundAmmCache",
       "msg": "MarketIndexNotFoundAmmCache"
+    },
+    {
+      "code": 6345,
+      "name": "InvalidIsolatedPerpMarket",
+      "msg": "Invalid Isolated Perp Market"
     }
   ],
   "metadata": {

package/src/markets.ts

@@ -0,0 +1,24 @@
+import { DriftEnv } from './config';
+import { SpotMarketConfig, SpotMarkets } from './constants';
+import { PerpMarketConfig, PerpMarkets } from './constants/perpMarkets';
+import { isOneOfVariant } from './types';
+
+export const getActivePerpMarkets = (
+	driftEnv: DriftEnv
+): PerpMarketConfig[] => {
+	return PerpMarkets[driftEnv ?? 'mainnet-beta'].filter(
+		(market) =>
+			!market.marketStatus ||
+			!isOneOfVariant(market.marketStatus, ['delisted', 'settlement'])
+	);
+};
+
+export const getActiveSpotMarkets = (
+	driftEnv: DriftEnv
+): SpotMarketConfig[] => {
+	return SpotMarkets[driftEnv ?? 'mainnet-beta'].filter(
+		(market) =>
+			!market.marketStatus ||
+			!isOneOfVariant(market.marketStatus, ['delisted', 'settlement'])
+	);
+};

package/src/swap/UnifiedSwapClient.ts

@@ -82,11 +82,13 @@ export class UnifiedSwapClient {
 		connection,
 		authToken,
 		url,
+		proxyUrl,
 	}: {
 		clientType: SwapClientType;
 		connection: Connection;
-		authToken?: string; // Required for Titan, optional for Jupiter
+		authToken?: string; // Required for Titan when not using proxy, optional for Jupiter
 		url?: string; // Optional custom URL
+		proxyUrl?: string; // Optional proxy URL for Titan
 	}) {
 		this.clientType = clientType;
 
@@ -96,13 +98,11 @@ export class UnifiedSwapClient {
 				url,
 			});
 		} else if (clientType === 'titan') {
-			if (!authToken) {
-				throw new Error('authToken is required for Titan client');
-			}
 			this.client = new TitanClient({
 				connection,
-				authToken,
+				authToken: authToken || '', // Not needed when using proxy
 				url,
+				proxyUrl,
 			});
 		} else {
 			throw new Error(`Unsupported client type: ${clientType}`);
@@ -143,6 +143,7 @@ export class UnifiedSwapClient {
 				...titanParams,
 				userPublicKey: titanParams.userPublicKey,
 				swapMode: titanParams.swapMode as string, // Titan expects string
+				sizeConstraint: titanParams.sizeConstraint || 1280 - 375, // Use same default as getSwapInstructions
 			};
 
 			return await titanClient.getQuote(titanParamsWithUser);
@@ -177,6 +178,7 @@ export class UnifiedSwapClient {
 				userPublicKey,
 				slippageBps: slippageBps || titanQuote.slippageBps,
 				swapMode: titanQuote.swapMode,
+				sizeConstraint: 1280 - 375, // MAX_TX_BYTE_SIZE - buffer for drift instructions
 			});
 
 			return {

package/src/titan/titanClient.ts

@@ -93,30 +93,33 @@ export class TitanClient {
 	authToken: string;
 	url: string;
 	connection: Connection;
+	proxyUrl?: string;
+	private lastQuoteData?: SwapQuotes;
+	private lastQuoteParams?: string;
 
 	constructor({
 		connection,
 		authToken,
 		url,
+		proxyUrl,
 	}: {
 		connection: Connection;
 		authToken: string;
 		url?: string;
+		proxyUrl?: string;
 	}) {
 		this.connection = connection;
 		this.authToken = authToken;
 		this.url = url ?? TITAN_API_URL;
+		this.proxyUrl = proxyUrl;
 	}
 
-	/**
-	 * Get routes for a swap
-	 */
-	public async getQuote({
+	private buildParams({
 		inputMint,
 		outputMint,
 		amount,
 		userPublicKey,
-		maxAccounts = 50, // 50 is an estimated amount with buffer
+		maxAccounts,
 		slippageBps,
 		swapMode,
 		onlyDirectRoutes,
@@ -130,43 +133,103 @@ export class TitanClient {
 		userPublicKey: PublicKey;
 		maxAccounts?: number;
 		slippageBps?: number;
-		swapMode?: string;
+		swapMode?: string | SwapMode;
 		onlyDirectRoutes?: boolean;
 		excludeDexes?: string[];
 		sizeConstraint?: number;
 		accountsLimitWritable?: number;
-	}): Promise<QuoteResponse> {
-		const params = new URLSearchParams({
+	}): URLSearchParams {
+		// Normalize swapMode to enum value
+		const normalizedSwapMode =
+			swapMode === 'ExactOut' || swapMode === SwapMode.ExactOut
+				? SwapMode.ExactOut
+				: SwapMode.ExactIn;
+
+		return new URLSearchParams({
 			inputMint: inputMint.toString(),
 			outputMint: outputMint.toString(),
 			amount: amount.toString(),
 			userPublicKey: userPublicKey.toString(),
 			...(slippageBps && { slippageBps: slippageBps.toString() }),
-			...(swapMode && {
-				swapMode:
-					swapMode === 'ExactOut' ? SwapMode.ExactOut : SwapMode.ExactIn,
-			}),
+			...(swapMode && { swapMode: normalizedSwapMode.toString() }),
+			...(maxAccounts && { accountsLimitTotal: maxAccounts.toString() }),
+			...(excludeDexes && { excludeDexes: excludeDexes.join(',') }),
 			...(onlyDirectRoutes && {
 				onlyDirectRoutes: onlyDirectRoutes.toString(),
 			}),
-			...(maxAccounts && { accountsLimitTotal: maxAccounts.toString() }),
-			...(excludeDexes && { excludeDexes: excludeDexes.join(',') }),
 			...(sizeConstraint && { sizeConstraint: sizeConstraint.toString() }),
 			...(accountsLimitWritable && {
 				accountsLimitWritable: accountsLimitWritable.toString(),
 			}),
 		});
+	}
 
-		const response = await fetch(
-			`${this.url}/api/v1/quote/swap?${params.toString()}`,
-			{
+	/**
+	 * Get routes for a swap
+	 */
+	public async getQuote({
+		inputMint,
+		outputMint,
+		amount,
+		userPublicKey,
+		maxAccounts = 50, // 50 is an estimated amount with buffer
+		slippageBps,
+		swapMode,
+		onlyDirectRoutes,
+		excludeDexes,
+		sizeConstraint,
+		accountsLimitWritable,
+	}: {
+		inputMint: PublicKey;
+		outputMint: PublicKey;
+		amount: BN;
+		userPublicKey: PublicKey;
+		maxAccounts?: number;
+		slippageBps?: number;
+		swapMode?: string;
+		onlyDirectRoutes?: boolean;
+		excludeDexes?: string[];
+		sizeConstraint?: number;
+		accountsLimitWritable?: number;
+	}): Promise<QuoteResponse> {
+		const params = this.buildParams({
+			inputMint,
+			outputMint,
+			amount,
+			userPublicKey,
+			maxAccounts,
+			slippageBps,
+			swapMode,
+			onlyDirectRoutes,
+			excludeDexes,
+			sizeConstraint,
+			accountsLimitWritable,
+		});
+
+		let response: Response;
+
+		if (this.proxyUrl) {
+			// Use proxy route - send parameters in request body
+			response = await fetch(this.proxyUrl, {
+				method: 'POST',
 				headers: {
-					Accept: 'application/vnd.msgpack',
-					'Accept-Encoding': 'gzip, deflate, br',
-					Authorization: `Bearer ${this.authToken}`,
+					'Content-Type': 'application/json',
 				},
-			}
-		);
+				body: JSON.stringify(Object.fromEntries(params.entries())),
+			});
+		} else {
+			// Direct request to Titan API
+			response = await fetch(
+				`${this.url}/api/v1/quote/swap?${params.toString()}`,
+				{
+					headers: {
+						Accept: 'application/vnd.msgpack',
+						'Accept-Encoding': 'gzip, deflate, br',
+						Authorization: `Bearer ${this.authToken}`,
+					},
+				}
+			);
+		}
 
 		if (!response.ok) {
 			throw new Error(
@@ -177,11 +240,12 @@ export class TitanClient {
 		const buffer = await response.arrayBuffer();
 		const data = decode(buffer) as SwapQuotes;
 
-		const route =
-			data.quotes[
-				Object.keys(data.quotes).find((key) => key.toLowerCase() === 'titan') ||
-					''
-			];
+		// Cache the quote data and parameters for later use in getSwap
+		this.lastQuoteData = data;
+		this.lastQuoteParams = params.toString();
+
+		// We are only querying for the best avaiable route so use that
+		const route = data.quotes[Object.keys(data.quotes)[0]];
 
 		if (!route) {
 			throw new Error('No routes available');
@@ -250,52 +314,32 @@ export class TitanClient {
 		transactionMessage: TransactionMessage;
 		lookupTables: AddressLookupTableAccount[];
 	}> {
-		const params = new URLSearchParams({
-			inputMint: inputMint.toString(),
-			outputMint: outputMint.toString(),
-			amount: amount.toString(),
-			userPublicKey: userPublicKey.toString(),
-			...(slippageBps && { slippageBps: slippageBps.toString() }),
-			...(swapMode && { swapMode: swapMode }),
-			...(maxAccounts && { accountsLimitTotal: maxAccounts.toString() }),
-			...(excludeDexes && { excludeDexes: excludeDexes.join(',') }),
-			...(onlyDirectRoutes && {
-				onlyDirectRoutes: onlyDirectRoutes.toString(),
-			}),
-			...(sizeConstraint && { sizeConstraint: sizeConstraint.toString() }),
-			...(accountsLimitWritable && {
-				accountsLimitWritable: accountsLimitWritable.toString(),
-			}),
+		const params = this.buildParams({
+			inputMint,
+			outputMint,
+			amount,
+			userPublicKey,
+			maxAccounts,
+			slippageBps,
+			swapMode,
+			onlyDirectRoutes,
+			excludeDexes,
+			sizeConstraint,
+			accountsLimitWritable,
 		});
 
-		const response = await fetch(
-			`${this.url}/api/v1/quote/swap?${params.toString()}`,
-			{
-				headers: {
-					Accept: 'application/vnd.msgpack',
-					'Accept-Encoding': 'gzip, deflate, br',
-					Authorization: `Bearer ${this.authToken}`,
-				},
-			}
-		);
-
-		if (!response.ok) {
-			if (response.status === 404) {
-				throw new Error('No routes available');
-			}
+		// Check if we have cached quote data that matches the current parameters
+		if (!this.lastQuoteData || this.lastQuoteParams !== params.toString()) {
 			throw new Error(
-				`Titan API error: ${response.status} ${response.statusText}`
+				'No matching quote data found. Please get a fresh quote before attempting to swap.'
 			);
 		}
 
-		const buffer = await response.arrayBuffer();
-		const data = decode(buffer) as SwapQuotes;
+		// Reuse the cached quote data
+		const data = this.lastQuoteData;
 
-		const route =
-			data.quotes[
-				Object.keys(data.quotes).find((key) => key.toLowerCase() === 'titan') ||
-					''
-			];
+		// We are only querying for the best avaiable route so use that
+		const route = data.quotes[Object.keys(data.quotes)[0]];
 
 		if (!route) {
 			throw new Error('No routes available');
@@ -310,6 +354,10 @@ export class TitanClient {
 				throw new Error(
 					'Something went wrong with creating the Titan swap transaction. Please try again.'
 				);
+			} finally {
+				// Clear cached quote data after use
+				this.lastQuoteData = undefined;
+				this.lastQuoteParams = undefined;
 			}
 		}
 		throw new Error('No instructions provided in the route');

package/src/user.ts

@@ -4587,7 +4587,7 @@ export class User {
 		return calc;
 	}
 
-	private isPerpPositionIsolated(perpPosition: PerpPosition): boolean {
+	public isPerpPositionIsolated(perpPosition: PerpPosition): boolean {
 		return (perpPosition.positionFlag & PositionFlag.IsolatedPosition) !== 0;
 	}
 }