@drift-labs/sdk 2.53.0-beta.2 → 2.53.0-beta.4

package/VERSION

@@ -1 +1 @@
-2.53.0-beta.2
+2.53.0-beta.4

package/lib/dlob/DLOB.d.ts

@@ -91,8 +91,8 @@ export declare class DLOB {
         takerNode: DLOBNode;
         makerNode: DLOBNode;
     } | undefined;
-    getBestAsk(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN;
-    getBestBid(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN;
+    getBestAsk(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN | undefined;
+    getBestBid(marketIndex: number, slot: number, marketType: MarketType, oraclePriceData: OraclePriceData): BN | undefined;
     getStopLosses(marketIndex: number, marketType: MarketType, direction: PositionDirection): Generator<DLOBNode>;
     getStopLossMarkets(marketIndex: number, marketType: MarketType, direction: PositionDirection): Generator<DLOBNode>;
     getStopLossLimits(marketIndex: number, marketType: MarketType, direction: PositionDirection): Generator<DLOBNode>;

package/lib/dlob/DLOB.js

@@ -822,14 +822,18 @@ class DLOB {
         }
     }
     getBestAsk(marketIndex, slot, marketType, oraclePriceData) {
-        return this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData)
-            .next()
-            .value.getPrice(oraclePriceData, slot);
+        const bestAsk = this.getRestingLimitAsks(marketIndex, slot, marketType, oraclePriceData).next().value;
+        if (bestAsk) {
+            return bestAsk.getPrice(oraclePriceData, slot);
+        }
+        return undefined;
     }
     getBestBid(marketIndex, slot, marketType, oraclePriceData) {
-        return this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData)
-            .next()
-            .value.getPrice(oraclePriceData, slot);
+        const bestBid = this.getRestingLimitBids(marketIndex, slot, marketType, oraclePriceData).next().value;
+        if (bestBid) {
+            return bestBid.getPrice(oraclePriceData, slot);
+        }
+        return undefined;
     }
     *getStopLosses(marketIndex, marketType, direction) {
         const marketTypeStr = (0, __1.getVariant)(marketType);

package/lib/driftClient.js

@@ -2167,6 +2167,7 @@ class DriftClient {
                 slippageBps,
                 swapMode,
                 onlyDirectRoutes,
+                excludeDexes: ['Raydium CLMM'], // temp exclude to workaround bug with raydium clmm
             });
             quote = fetchedQuote;
         }

package/lib/math/superStake.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="bn.js" />
 import { AddressLookupTableAccount, PublicKey, TransactionInstruction } from '@solana/web3.js';
-import { JupiterClient } from '../jupiter/jupiterClient';
+import { JupiterClient, QuoteResponse } from '../jupiter/jupiterClient';
 import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
@@ -29,7 +29,7 @@ export type BSOL_EMISSIONS_API_RESPONSE = {
 };
 export declare function fetchBSolMetrics(): Promise<any>;
 export declare function fetchBSolDriftEmissions(): Promise<any>;
-export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, }: {
+export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
     marketIndex: number;
     amount: BN;
     jupiterClient: JupiterClient;
@@ -38,13 +38,14 @@ export declare function findBestSuperStakeIxs({ marketIndex, amount, jupiterClie
     userAccountPublicKey?: PublicKey;
     forceMarinade?: boolean;
     onlyDirectRoutes?: boolean;
+    jupiterQuote?: QuoteResponse;
 }): Promise<{
     ixs: TransactionInstruction[];
     lookupTables: AddressLookupTableAccount[];
     method: 'jupiter' | 'marinade';
-    price: number;
+    price?: number;
 }>;
-export declare function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, }: {
+export declare function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }: {
     amount: BN;
     jupiterClient: JupiterClient;
     driftClient: DriftClient;
@@ -52,30 +53,32 @@ export declare function findBestMSolSuperStakeIxs({ amount, jupiterClient, drift
     userAccountPublicKey?: PublicKey;
     forceMarinade?: boolean;
     onlyDirectRoutes?: boolean;
+    jupiterQuote?: QuoteResponse;
 }): Promise<{
     ixs: TransactionInstruction[];
     lookupTables: AddressLookupTableAccount[];
     method: 'jupiter' | 'marinade';
     price: number;
 }>;
-export declare function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, }: {
+export declare function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, jupiterQuote, }: {
     amount: BN;
     jupiterClient: JupiterClient;
     driftClient: DriftClient;
     userAccountPublicKey?: PublicKey;
     onlyDirectRoutes?: boolean;
+    jupiterQuote?: QuoteResponse;
 }): Promise<{
     ixs: TransactionInstruction[];
     lookupTables: AddressLookupTableAccount[];
     method: 'jupiter' | 'marinade';
-    price: number;
+    price?: number;
 }>;
 /**
  * Finds best Jupiter 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
  */
-export declare function findBestLstSuperStakeIxs({ amount, lstMint, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, }: {
+export declare function findBestLstSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, jupiterQuote, }: {
     amount: BN;
     lstMint: PublicKey;
     lstMarketIndex: number;
@@ -83,11 +86,11 @@ export declare function findBestLstSuperStakeIxs({ amount, lstMint, jupiterClien
     driftClient: DriftClient;
     userAccountPublicKey?: PublicKey;
     onlyDirectRoutes?: boolean;
+    jupiterQuote?: QuoteResponse;
 }): Promise<{
     ixs: TransactionInstruction[];
     lookupTables: AddressLookupTableAccount[];
     method: 'jupiter' | 'marinade';
-    price: number;
 }>;
 export type JITO_SOL_METRICS_ENDPOINT_RESPONSE = {
     data: {

package/lib/math/superStake.js

@@ -19,7 +19,7 @@ async function fetchBSolDriftEmissions() {
     return await (0, node_fetch_1.default)('https://stake.solblaze.org/api/v1/drift_emissions');
 }
 exports.fetchBSolDriftEmissions = fetchBSolDriftEmissions;
-async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, }) {
+async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }) {
     if (marketIndex === 2) {
         return findBestMSolSuperStakeIxs({
             amount,
@@ -29,6 +29,7 @@ async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, drift
             price,
             forceMarinade,
             onlyDirectRoutes,
+            jupiterQuote,
         });
     }
     else if (marketIndex === 6) {
@@ -38,6 +39,7 @@ async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, drift
             driftClient,
             userAccountPublicKey,
             onlyDirectRoutes,
+            jupiterQuote,
         });
     }
     else if (marketIndex === 8) {
@@ -49,6 +51,7 @@ async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, drift
             driftClient,
             userAccountPublicKey,
             onlyDirectRoutes,
+            jupiterQuote,
         });
     }
     else {
@@ -56,27 +59,30 @@ async function findBestSuperStakeIxs({ marketIndex, amount, jupiterClient, drift
     }
 }
 exports.findBestSuperStakeIxs = findBestSuperStakeIxs;
-async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, }) {
+async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, price, forceMarinade, onlyDirectRoutes, jupiterQuote, }) {
     if (!price) {
         const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(driftClient.provider);
         price = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
     }
-    const solMint = driftClient.getSpotMarketAccount(1).mint;
-    const mSOLMint = driftClient.getSpotMarketAccount(2).mint;
+    const solSpotMarketAccount = driftClient.getSpotMarketAccount(1);
+    const mSolSpotMarketAccount = driftClient.getSpotMarketAccount(2);
     let jupiterPrice;
-    let bestRoute;
-    try {
-        const jupiterRoutes = await jupiterClient.getRoutes({
-            inputMint: solMint,
-            outputMint: mSOLMint,
-            amount,
-            onlyDirectRoutes,
-        });
-        bestRoute = jupiterRoutes[0];
-        jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
-    }
-    catch (e) {
-        console.error('Error getting jupiter price', e);
+    let quote = jupiterQuote;
+    if (!jupiterQuote) {
+        try {
+            const fetchedQuote = await jupiterClient.getQuote({
+                inputMint: solSpotMarketAccount.mint,
+                outputMint: mSolSpotMarketAccount.mint,
+                amount,
+                slippageBps: 1000,
+                onlyDirectRoutes,
+            });
+            jupiterPrice = +quote.outAmount / +quote.inAmount;
+            quote = fetchedQuote;
+        }
+        catch (e) {
+            console.error('Error getting jupiter price', e);
+        }
     }
     if (!jupiterPrice || price <= jupiterPrice || forceMarinade) {
         const ixs = await driftClient.getStakeForMSOLIx({
@@ -91,13 +97,14 @@ async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, u
         };
     }
     else {
-        const { ixs, lookupTables } = await driftClient.getJupiterSwapIx({
+        const { ixs, lookupTables } = await driftClient.getJupiterSwapIxV6({
             inMarketIndex: 1,
             outMarketIndex: 2,
-            route: bestRoute,
             jupiterClient,
             amount,
             userAccountPublicKey,
+            onlyDirectRoutes,
+            quote,
         });
         return {
             method: 'jupiter',
@@ -108,7 +115,7 @@ async function findBestMSolSuperStakeIxs({ amount, jupiterClient, driftClient, u
     }
 }
 exports.findBestMSolSuperStakeIxs = findBestMSolSuperStakeIxs;
-async function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, }) {
+async function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, jupiterQuote, }) {
     return await findBestLstSuperStakeIxs({
         amount,
         jupiterClient,
@@ -117,6 +124,7 @@ async function findBestJitoSolSuperStakeIxs({ amount, jupiterClient, driftClient
         onlyDirectRoutes,
         lstMint: driftClient.getSpotMarketAccount(6).mint,
         lstMarketIndex: 6,
+        jupiterQuote,
     });
 }
 exports.findBestJitoSolSuperStakeIxs = findBestJitoSolSuperStakeIxs;
@@ -125,37 +133,21 @@ exports.findBestJitoSolSuperStakeIxs = findBestJitoSolSuperStakeIxs;
  *
  * Without doing any extra steps like checking if you can get a better rate by staking directly with that LST platform
  */
-async function findBestLstSuperStakeIxs({ amount, lstMint, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, }) {
-    const solMint = driftClient.getSpotMarketAccount(1).mint;
-    let jupiterPrice;
-    let bestRoute;
-    try {
-        const jupiterRoutes = await jupiterClient.getRoutes({
-            inputMint: solMint,
-            outputMint: lstMint,
-            amount,
-            onlyDirectRoutes,
-        });
-        bestRoute = jupiterRoutes[0];
-        jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
-    }
-    catch (e) {
-        console.error('Error getting jupiter price', e);
-        throw e;
-    }
-    const { ixs, lookupTables } = await driftClient.getJupiterSwapIx({
+async function findBestLstSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, onlyDirectRoutes, lstMarketIndex, jupiterQuote, }) {
+    const { ixs, lookupTables } = await driftClient.getJupiterSwapIxV6({
         inMarketIndex: 1,
         outMarketIndex: lstMarketIndex,
-        route: bestRoute,
         jupiterClient,
         amount,
         userAccountPublicKey,
+        onlyDirectRoutes,
+        quote: jupiterQuote,
     });
     return {
         method: 'jupiter',
         ixs,
         lookupTables,
-        price: jupiterPrice,
+        // price: jupiterPrice,
     };
 }
 exports.findBestLstSuperStakeIxs = findBestLstSuperStakeIxs;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.53.0-beta.2",
+	"version": "2.53.0-beta.4",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

package/src/dlob/DLOB.ts

@@ -1472,15 +1472,18 @@ export class DLOB {
 		slot: number,
 		marketType: MarketType,
 		oraclePriceData: OraclePriceData
-	): BN {
-		return this.getRestingLimitAsks(
+	): BN | undefined {
+		const bestAsk = this.getRestingLimitAsks(
 			marketIndex,
 			slot,
 			marketType,
 			oraclePriceData
-		)
-			.next()
-			.value.getPrice(oraclePriceData, slot);
+		).next().value;
+
+		if (bestAsk) {
+			return bestAsk.getPrice(oraclePriceData, slot);
+		}
+		return undefined;
 	}
 
 	public getBestBid(
@@ -1488,15 +1491,18 @@ export class DLOB {
 		slot: number,
 		marketType: MarketType,
 		oraclePriceData: OraclePriceData
-	): BN {
-		return this.getRestingLimitBids(
+	): BN | undefined {
+		const bestBid = this.getRestingLimitBids(
 			marketIndex,
 			slot,
 			marketType,
 			oraclePriceData
-		)
-			.next()
-			.value.getPrice(oraclePriceData, slot);
+		).next().value;
+
+		if (bestBid) {
+			return bestBid.getPrice(oraclePriceData, slot);
+		}
+		return undefined;
 	}
 
 	public *getStopLosses(

package/src/driftClient.ts

@@ -3865,6 +3865,7 @@ export class DriftClient {
 				slippageBps,
 				swapMode,
 				onlyDirectRoutes,
+				excludeDexes: ['Raydium CLMM'], // temp exclude to workaround bug with raydium clmm
 			});
 
 			quote = fetchedQuote;

package/src/math/superStake.ts

@@ -4,7 +4,7 @@ import {
 	PublicKey,
 	TransactionInstruction,
 } from '@solana/web3.js';
-import { JupiterClient } from '../jupiter/jupiterClient';
+import { JupiterClient, QuoteResponse } from '../jupiter/jupiterClient';
 import { DriftClient } from '../driftClient';
 import { getMarinadeFinanceProgram, getMarinadeMSolPrice } from '../marinade';
 import { BN } from '@coral-xyz/anchor';
@@ -55,6 +55,7 @@ export async function findBestSuperStakeIxs({
 	price,
 	forceMarinade,
 	onlyDirectRoutes,
+	jupiterQuote,
 }: {
 	marketIndex: number;
 	amount: BN;
@@ -64,11 +65,12 @@ export async function findBestSuperStakeIxs({
 	userAccountPublicKey?: PublicKey;
 	forceMarinade?: boolean;
 	onlyDirectRoutes?: boolean;
+	jupiterQuote?: QuoteResponse;
 }): Promise<{
 	ixs: TransactionInstruction[];
 	lookupTables: AddressLookupTableAccount[];
 	method: 'jupiter' | 'marinade';
-	price: number;
+	price?: number;
 }> {
 	if (marketIndex === 2) {
 		return findBestMSolSuperStakeIxs({
@@ -79,6 +81,7 @@ export async function findBestSuperStakeIxs({
 			price,
 			forceMarinade,
 			onlyDirectRoutes,
+			jupiterQuote,
 		});
 	} else if (marketIndex === 6) {
 		return findBestJitoSolSuperStakeIxs({
@@ -87,6 +90,7 @@ export async function findBestSuperStakeIxs({
 			driftClient,
 			userAccountPublicKey,
 			onlyDirectRoutes,
+			jupiterQuote,
 		});
 	} else if (marketIndex === 8) {
 		return findBestLstSuperStakeIxs({
@@ -97,6 +101,7 @@ export async function findBestSuperStakeIxs({
 			driftClient,
 			userAccountPublicKey,
 			onlyDirectRoutes,
+			jupiterQuote,
 		});
 	} else {
 		throw new Error(`Unsupported superstake market index: ${marketIndex}`);
@@ -111,6 +116,7 @@ export async function findBestMSolSuperStakeIxs({
 	price,
 	forceMarinade,
 	onlyDirectRoutes,
+	jupiterQuote,
 }: {
 	amount: BN;
 	jupiterClient: JupiterClient;
@@ -119,6 +125,7 @@ export async function findBestMSolSuperStakeIxs({
 	userAccountPublicKey?: PublicKey;
 	forceMarinade?: boolean;
 	onlyDirectRoutes?: boolean;
+	jupiterQuote?: QuoteResponse;
 }): Promise<{
 	ixs: TransactionInstruction[];
 	lookupTables: AddressLookupTableAccount[];
@@ -130,23 +137,27 @@ export async function findBestMSolSuperStakeIxs({
 		price = await getMarinadeMSolPrice(marinadeProgram);
 	}
 
-	const solMint = driftClient.getSpotMarketAccount(1).mint;
-	const mSOLMint = driftClient.getSpotMarketAccount(2).mint;
+	const solSpotMarketAccount = driftClient.getSpotMarketAccount(1);
+	const mSolSpotMarketAccount = driftClient.getSpotMarketAccount(2);
+
+	let jupiterPrice: number;
+	let quote = jupiterQuote;
+	if (!jupiterQuote) {
+		try {
+			const fetchedQuote = await jupiterClient.getQuote({
+				inputMint: solSpotMarketAccount.mint,
+				outputMint: mSolSpotMarketAccount.mint,
+				amount,
+				slippageBps: 1000,
+				onlyDirectRoutes,
+			});
 
-	let jupiterPrice;
-	let bestRoute;
-	try {
-		const jupiterRoutes = await jupiterClient.getRoutes({
-			inputMint: solMint,
-			outputMint: mSOLMint,
-			amount,
-			onlyDirectRoutes,
-		});
+			jupiterPrice = +quote.outAmount / +quote.inAmount;
 
-		bestRoute = jupiterRoutes[0];
-		jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
-	} catch (e) {
-		console.error('Error getting jupiter price', e);
+			quote = fetchedQuote;
+		} catch (e) {
+			console.error('Error getting jupiter price', e);
+		}
 	}
 
 	if (!jupiterPrice || price <= jupiterPrice || forceMarinade) {
@@ -161,13 +172,14 @@ export async function findBestMSolSuperStakeIxs({
 			price: price,
 		};
 	} else {
-		const { ixs, lookupTables } = await driftClient.getJupiterSwapIx({
+		const { ixs, lookupTables } = await driftClient.getJupiterSwapIxV6({
 			inMarketIndex: 1,
 			outMarketIndex: 2,
-			route: bestRoute,
 			jupiterClient,
 			amount,
 			userAccountPublicKey,
+			onlyDirectRoutes,
+			quote,
 		});
 		return {
 			method: 'jupiter',
@@ -184,17 +196,19 @@ export async function findBestJitoSolSuperStakeIxs({
 	driftClient,
 	userAccountPublicKey,
 	onlyDirectRoutes,
+	jupiterQuote,
 }: {
 	amount: BN;
 	jupiterClient: JupiterClient;
 	driftClient: DriftClient;
 	userAccountPublicKey?: PublicKey;
 	onlyDirectRoutes?: boolean;
+	jupiterQuote?: QuoteResponse;
 }): Promise<{
 	ixs: TransactionInstruction[];
 	lookupTables: AddressLookupTableAccount[];
 	method: 'jupiter' | 'marinade';
-	price: number;
+	price?: number;
 }> {
 	return await findBestLstSuperStakeIxs({
 		amount,
@@ -204,6 +218,7 @@ export async function findBestJitoSolSuperStakeIxs({
 		onlyDirectRoutes,
 		lstMint: driftClient.getSpotMarketAccount(6).mint,
 		lstMarketIndex: 6,
+		jupiterQuote,
 	});
 }
 
@@ -214,12 +229,12 @@ export async function findBestJitoSolSuperStakeIxs({
  */
 export async function findBestLstSuperStakeIxs({
 	amount,
-	lstMint,
 	jupiterClient,
 	driftClient,
 	userAccountPublicKey,
 	onlyDirectRoutes,
 	lstMarketIndex,
+	jupiterQuote,
 }: {
 	amount: BN;
 	lstMint: PublicKey;
@@ -228,44 +243,26 @@ export async function findBestLstSuperStakeIxs({
 	driftClient: DriftClient;
 	userAccountPublicKey?: PublicKey;
 	onlyDirectRoutes?: boolean;
+	jupiterQuote?: QuoteResponse;
 }): Promise<{
 	ixs: TransactionInstruction[];
 	lookupTables: AddressLookupTableAccount[];
 	method: 'jupiter' | 'marinade';
-	price: number;
 }> {
-	const solMint = driftClient.getSpotMarketAccount(1).mint;
-
-	let jupiterPrice;
-	let bestRoute;
-	try {
-		const jupiterRoutes = await jupiterClient.getRoutes({
-			inputMint: solMint,
-			outputMint: lstMint,
-			amount,
-			onlyDirectRoutes,
-		});
-
-		bestRoute = jupiterRoutes[0];
-		jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;
-	} catch (e) {
-		console.error('Error getting jupiter price', e);
-		throw e;
-	}
-
-	const { ixs, lookupTables } = await driftClient.getJupiterSwapIx({
+	const { ixs, lookupTables } = await driftClient.getJupiterSwapIxV6({
 		inMarketIndex: 1,
 		outMarketIndex: lstMarketIndex,
-		route: bestRoute,
 		jupiterClient,
 		amount,
 		userAccountPublicKey,
+		onlyDirectRoutes,
+		quote: jupiterQuote,
 	});
 	return {
 		method: 'jupiter',
 		ixs,
 		lookupTables,
-		price: jupiterPrice,
+		// price: jupiterPrice,
 	};
 }