@drift-labs/sdk 2.40.0-beta.5 → 2.40.0-beta.7

package/VERSION

@@ -1 +1 @@
-2.40.0-beta.5
+2.40.0-beta.7

package/lib/driftClient.d.ts

@@ -319,7 +319,7 @@ export declare class DriftClient {
      * @param reduceOnly specify if In or Out token on the drift account must reduceOnly, checked at end of swap
      * @param txParams
      */
-    swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, txParams, v6, }: {
+    swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, txParams, v6, onlyDirectRoutes, }: {
         jupiterClient: JupiterClient;
         outMarketIndex: number;
         inMarketIndex: number;
@@ -331,6 +331,7 @@ export declare class DriftClient {
         route?: Route;
         reduceOnly?: SwapReduceOnly;
         txParams?: TxParams;
+        onlyDirectRoutes?: boolean;
         v6?: {
             quote?: QuoteResponse;
         };

package/lib/driftClient.js

@@ -1975,7 +1975,7 @@ class DriftClient {
      * @param reduceOnly specify if In or Out token on the drift account must reduceOnly, checked at end of swap
      * @param txParams
      */
-    async swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, txParams, v6, }) {
+    async swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, txParams, v6, onlyDirectRoutes = false, }) {
         let ixs;
         let lookupTables;
         if (v6) {
@@ -1990,6 +1990,7 @@ class DriftClient {
                 swapMode,
                 quote: v6.quote,
                 reduceOnly,
+                onlyDirectRoutes,
             });
             ixs = res.ixs;
             lookupTables = res.lookupTables;

package/lib/jupiter/jupiterClient.d.ts

@@ -229,10 +229,12 @@ export declare class JupiterClient {
      * @param swapMode the swap mode (ExactIn or ExactOut)
      * @param onlyDirectRoutes whether to only return direct routes
      */
-    getQuote({ inputMint, outputMint, amount, slippageBps, swapMode, onlyDirectRoutes, }: {
+    getQuote({ inputMint, outputMint, amount, maxAccounts, // 52 is an estimated amount with buffer
+    slippageBps, swapMode, onlyDirectRoutes, }: {
         inputMint: PublicKey;
         outputMint: PublicKey;
         amount: BN;
+        maxAccounts?: number;
         slippageBps?: number;
         swapMode?: SwapMode;
         onlyDirectRoutes?: boolean;

package/lib/jupiter/jupiterClient.js

@@ -43,7 +43,8 @@ class JupiterClient {
      * @param swapMode the swap mode (ExactIn or ExactOut)
      * @param onlyDirectRoutes whether to only return direct routes
      */
-    async getQuote({ inputMint, outputMint, amount, slippageBps = 50, swapMode = 'ExactIn', onlyDirectRoutes = false, }) {
+    async getQuote({ inputMint, outputMint, amount, maxAccounts = 52, // 52 is an estimated amount with buffer
+    slippageBps = 50, swapMode = 'ExactIn', onlyDirectRoutes = false, }) {
         const params = new URLSearchParams({
             inputMint: inputMint.toString(),
             outputMint: outputMint.toString(),
@@ -51,6 +52,7 @@ class JupiterClient {
             slippageBps: slippageBps.toString(),
             swapMode,
             onlyDirectRoutes: onlyDirectRoutes.toString(),
+            maxAccounts: maxAccounts.toString(),
         }).toString();
         const quote = await (await (0, node_fetch_1.default)(`${this.url}/v6/quote?${params}`)).json();
         return quote;

package/lib/user.d.ts

@@ -180,14 +180,14 @@ export declare class User {
      * calculates current user leverage which is (total liability size) / (net asset value)
      * @returns : Precision TEN_THOUSAND
      */
-    getLeverage(): BN;
+    getLeverage(includeOpenOrders?: boolean): BN;
     calculateLeverageFromComponents({ perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue, }: {
         perpLiabilityValue: BN;
         perpPnl: BN;
         spotAssetValue: BN;
         spotLiabilityValue: BN;
     }): BN;
-    getLeverageComponents(): {
+    getLeverageComponents(includeOpenOrders?: boolean): {
         perpLiabilityValue: BN;
         perpPnl: BN;
         spotAssetValue: BN;

package/lib/user.js

@@ -822,8 +822,8 @@ class User {
      * calculates current user leverage which is (total liability size) / (net asset value)
      * @returns : Precision TEN_THOUSAND
      */
-    getLeverage() {
-        return this.calculateLeverageFromComponents(this.getLeverageComponents());
+    getLeverage(includeOpenOrders = true) {
+        return this.calculateLeverageFromComponents(this.getLeverageComponents(includeOpenOrders));
     }
     calculateLeverageFromComponents({ perpLiabilityValue, perpPnl, spotAssetValue, spotLiabilityValue, }) {
         const totalLiabilityValue = perpLiabilityValue.add(spotLiabilityValue);
@@ -834,10 +834,10 @@ class User {
         }
         return totalLiabilityValue.mul(numericConstants_1.TEN_THOUSAND).div(netAssetValue);
     }
-    getLeverageComponents() {
-        const perpLiability = this.getTotalPerpPositionValue(undefined, undefined, true);
+    getLeverageComponents(includeOpenOrders = true) {
+        const perpLiability = this.getTotalPerpPositionValue(undefined, undefined, includeOpenOrders);
         const perpPnl = this.getUnrealizedPNL(true);
-        const { totalAssetValue: spotAssetValue, totalLiabilityValue: spotLiabilityValue, } = this.getSpotMarketAssetAndLiabilityValue(undefined, undefined, undefined, true);
+        const { totalAssetValue: spotAssetValue, totalLiabilityValue: spotLiabilityValue, } = this.getSpotMarketAssetAndLiabilityValue(undefined, undefined, undefined, includeOpenOrders);
         return {
             perpLiabilityValue: perpLiability,
             perpPnl,

package/package.json

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

package/src/driftClient.ts

@@ -3424,6 +3424,7 @@ export class DriftClient {
 		reduceOnly,
 		txParams,
 		v6,
+		onlyDirectRoutes = false,
 	}: {
 		jupiterClient: JupiterClient;
 		outMarketIndex: number;
@@ -3436,6 +3437,7 @@ export class DriftClient {
 		route?: Route;
 		reduceOnly?: SwapReduceOnly;
 		txParams?: TxParams;
+		onlyDirectRoutes?: boolean;
 		v6?: {
 			quote?: QuoteResponse;
 		};
@@ -3455,6 +3457,7 @@ export class DriftClient {
 				swapMode,
 				quote: v6.quote,
 				reduceOnly,
+				onlyDirectRoutes,
 			});
 			ixs = res.ixs;
 			lookupTables = res.lookupTables;

package/src/jupiter/jupiterClient.ts

@@ -275,6 +275,7 @@ export class JupiterClient {
 		inputMint,
 		outputMint,
 		amount,
+		maxAccounts = 52, // 52 is an estimated amount with buffer
 		slippageBps = 50,
 		swapMode = 'ExactIn',
 		onlyDirectRoutes = false,
@@ -282,6 +283,7 @@ export class JupiterClient {
 		inputMint: PublicKey;
 		outputMint: PublicKey;
 		amount: BN;
+		maxAccounts?: number;
 		slippageBps?: number;
 		swapMode?: SwapMode;
 		onlyDirectRoutes?: boolean;
@@ -293,6 +295,7 @@ export class JupiterClient {
 			slippageBps: slippageBps.toString(),
 			swapMode,
 			onlyDirectRoutes: onlyDirectRoutes.toString(),
+			maxAccounts: maxAccounts.toString(),
 		}).toString();
 		const quote = await (await fetch(`${this.url}/v6/quote?${params}`)).json();
 		return quote;

package/src/user.ts

@@ -1465,8 +1465,10 @@ export class User {
 	 * calculates current user leverage which is (total liability size) / (net asset value)
 	 * @returns : Precision TEN_THOUSAND
 	 */
-	public getLeverage(): BN {
-		return this.calculateLeverageFromComponents(this.getLeverageComponents());
+	public getLeverage(includeOpenOrders = true): BN {
+		return this.calculateLeverageFromComponents(
+			this.getLeverageComponents(includeOpenOrders)
+		);
 	}
 
 	calculateLeverageFromComponents({
@@ -1491,7 +1493,7 @@ export class User {
 		return totalLiabilityValue.mul(TEN_THOUSAND).div(netAssetValue);
 	}
 
-	getLeverageComponents(): {
+	getLeverageComponents(includeOpenOrders = true): {
 		perpLiabilityValue: BN;
 		perpPnl: BN;
 		spotAssetValue: BN;
@@ -1500,7 +1502,7 @@ export class User {
 		const perpLiability = this.getTotalPerpPositionValue(
 			undefined,
 			undefined,
-			true
+			includeOpenOrders
 		);
 		const perpPnl = this.getUnrealizedPNL(true);
 
@@ -1511,7 +1513,7 @@ export class User {
 			undefined,
 			undefined,
 			undefined,
-			true
+			includeOpenOrders
 		);
 
 		return {