@drift-labs/sdk 2.33.1-beta.0 → 2.33.1-beta.2

package/VERSION

@@ -1 +1 @@
-2.33.1-beta.0
+2.33.1-beta.2

package/lib/dlob/DLOBSubscriber.d.ts

@@ -29,12 +29,13 @@ export declare class DLOBSubscriber {
      * @param includeVamm Whether to include the VAMM orders in the order book. Defaults to false. If true, creates vAMM generator {@link getVammL2Generator} and adds it to fallbackL2Generators.
      * @param fallbackL2Generators L2 generators for fallback liquidity e.g. vAMM {@link getVammL2Generator}, openbook {@link SerumSubscriber}
      */
-    getL2({ marketName, marketIndex, marketType, depth, includeVamm, fallbackL2Generators, }: {
+    getL2({ marketName, marketIndex, marketType, depth, includeVamm, numVammOrders, fallbackL2Generators, }: {
         marketName?: string;
         marketIndex?: number;
         marketType?: MarketType;
         depth?: number;
         includeVamm?: boolean;
+        numVammOrders?: number;
         fallbackL2Generators?: L2OrderBookGenerator[];
     }): L2OrderBook;
     /**

package/lib/dlob/DLOBSubscriber.js

@@ -46,7 +46,7 @@ class DLOBSubscriber {
      * @param includeVamm Whether to include the VAMM orders in the order book. Defaults to false. If true, creates vAMM generator {@link getVammL2Generator} and adds it to fallbackL2Generators.
      * @param fallbackL2Generators L2 generators for fallback liquidity e.g. vAMM {@link getVammL2Generator}, openbook {@link SerumSubscriber}
      */
-    getL2({ marketName, marketIndex, marketType, depth = 10, includeVamm = false, fallbackL2Generators = [], }) {
+    getL2({ marketName, marketIndex, marketType, depth = 10, includeVamm = false, numVammOrders, fallbackL2Generators = [], }) {
         if (marketName) {
             const derivedMarketInfo = this.driftClient.getMarketIndexAndType(marketName);
             if (!derivedMarketInfo) {
@@ -79,7 +79,7 @@ class DLOBSubscriber {
                 (0, orderBookLevels_1.getVammL2Generator)({
                     marketAccount: this.driftClient.getPerpMarketAccount(marketIndex),
                     oraclePriceData,
-                    numOrders: depth,
+                    numOrders: numVammOrders !== null && numVammOrders !== void 0 ? numVammOrders : depth,
                 }),
             ];
         }

package/lib/driftClient.d.ts

@@ -327,7 +327,7 @@ export declare class DriftClient {
         reduceOnly?: SwapReduceOnly;
         txParams?: TxParams;
     }): Promise<TransactionSignature>;
-    getJupiterSwapIx({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, userAccountPublicKey, }: {
+    getJupiterSwapIx({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, route, reduceOnly, userAccountPublicKey, }: {
         jupiterClient: JupiterClient;
         outMarketIndex: number;
         inMarketIndex: number;
@@ -336,6 +336,7 @@ export declare class DriftClient {
         amount: BN;
         slippageBps?: number;
         swapMode?: SwapMode;
+        onlyDirectRoutes?: boolean;
         route?: Route;
         reduceOnly?: SwapReduceOnly;
         userAccountPublicKey?: PublicKey;

package/lib/driftClient.js

@@ -1963,7 +1963,7 @@ class DriftClient {
         this.spotMarketLastSlotCache.set(inMarketIndex, slot);
         return txSig;
     }
-    async getJupiterSwapIx({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, userAccountPublicKey, }) {
+    async getJupiterSwapIx({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, route, reduceOnly, userAccountPublicKey, }) {
         const outMarket = this.getSpotMarketAccount(outMarketIndex);
         const inMarket = this.getSpotMarketAccount(inMarketIndex);
         if (!route) {
@@ -1973,6 +1973,7 @@ class DriftClient {
                 amount,
                 slippageBps,
                 swapMode,
+                onlyDirectRoutes,
             });
             if (!routes || routes.length === 0) {
                 throw new Error('No jupiter routes found');

package/lib/jupiter/jupiterClient.d.ts

@@ -42,13 +42,15 @@ export declare class JupiterClient {
      * @param amount the amount of the input token
      * @param slippageBps the slippage tolerance in basis points
      * @param swapMode the swap mode (ExactIn or ExactOut)
+     * @param onlyDirectRoutes whether to only return direct routes
      */
-    getRoutes({ inputMint, outputMint, amount, slippageBps, swapMode, }: {
+    getRoutes({ inputMint, outputMint, amount, slippageBps, swapMode, onlyDirectRoutes, }: {
         inputMint: PublicKey;
         outputMint: PublicKey;
         amount: BN;
         slippageBps?: number;
         swapMode?: SwapMode;
+        onlyDirectRoutes?: boolean;
     }): Promise<Route[]>;
     /**
      * Get a swap transaction for a route

package/lib/jupiter/jupiterClient.js

@@ -19,14 +19,16 @@ class JupiterClient {
      * @param amount the amount of the input token
      * @param slippageBps the slippage tolerance in basis points
      * @param swapMode the swap mode (ExactIn or ExactOut)
+     * @param onlyDirectRoutes whether to only return direct routes
      */
-    async getRoutes({ inputMint, outputMint, amount, slippageBps = 50, swapMode = 'ExactIn', }) {
+    async getRoutes({ inputMint, outputMint, amount, slippageBps = 50, swapMode = 'ExactIn', onlyDirectRoutes = false, }) {
         const params = new URLSearchParams({
             inputMint: inputMint.toString(),
             outputMint: outputMint.toString(),
             amount: amount.toString(),
             slippageBps: slippageBps.toString(),
             swapMode,
+            onlyDirectRoutes: onlyDirectRoutes.toString(),
         }).toString();
         const { data: routes } = await (await (0, node_fetch_1.default)(`https://quote-api.jup.ag/v4/quote?${params}`)).json();
         return routes;

package/lib/math/superStake.d.ts

@@ -4,13 +4,14 @@ import { DriftClient } from '../driftClient';
 import { BN } from '@coral-xyz/anchor';
 import { User } from '../user';
 import { DepositRecord } from '../types';
-export declare function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, forceMarinade, }: {
+export declare function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, forceMarinade, onlyDirectRoutes, }: {
     amount: BN;
     jupiterClient: JupiterClient;
     driftClient: DriftClient;
     marinadePrice?: number;
     userAccountPublicKey?: PublicKey;
     forceMarinade?: boolean;
+    onlyDirectRoutes?: boolean;
 }): Promise<{
     ixs: TransactionInstruction[];
     lookupTables: AddressLookupTableAccount[];

package/lib/math/superStake.js

@@ -10,7 +10,7 @@ const anchor_1 = require("@coral-xyz/anchor");
 const types_1 = require("../types");
 const numericConstants_1 = require("../constants/numericConstants");
 const node_fetch_1 = __importDefault(require("node-fetch"));
-async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, forceMarinade, }) {
+async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userAccountPublicKey, marinadePrice, forceMarinade, onlyDirectRoutes, }) {
     if (!marinadePrice) {
         const marinadeProgram = (0, marinade_1.getMarinadeFinanceProgram)(driftClient.provider);
         marinadePrice = await (0, marinade_1.getMarinadeMSolPrice)(marinadeProgram);
@@ -24,6 +24,7 @@ async function findBestSuperStakeIxs({ amount, jupiterClient, driftClient, userA
             inputMint: solMint,
             outputMint: mSOLMint,
             amount,
+            onlyDirectRoutes,
         });
         bestRoute = jupiterRoutes[0];
         jupiterPrice = bestRoute.inAmount / bestRoute.outAmount;

package/lib/user.js

@@ -1113,7 +1113,6 @@ class User {
         const outOraclePrice = this.getOracleDataForSpotMarket(outMarketIndex).price;
         const inPrecision = new _1.BN(10 ** inMarket.decimals);
         const outPrecision = new _1.BN(10 ** outMarket.decimals);
-        const outSaferThanIn = inMarket.initialAssetWeight < outMarket.initialAssetWeight;
         const inSpotPosition = this.getSpotPosition(inMarketIndex) ||
             this.getEmptySpotPosition(inMarketIndex);
         const outSpotPosition = this.getSpotPosition(outMarketIndex) ||
@@ -1137,6 +1136,12 @@ class User {
         let inSwap = numericConstants_1.ZERO;
         let outSwap = numericConstants_1.ZERO;
         const inTokenAmount = this.getTokenAmount(inMarketIndex);
+        const outTokenAmount = this.getTokenAmount(outMarketIndex);
+        const outSaferThanIn = 
+        // selling asset to close borrow
+        (inTokenAmount.gt(numericConstants_1.ZERO) && outTokenAmount.lt(numericConstants_1.ZERO)) ||
+            // buying asset with higher initial asset weight
+            inMarket.initialAssetWeight < outMarket.initialAssetWeight;
         if (freeCollateral.lt(numericConstants_1.ONE)) {
             if (outSaferThanIn && inTokenAmount.gt(numericConstants_1.ZERO)) {
                 inSwap = inTokenAmount;
@@ -1145,11 +1150,9 @@ class User {
         }
         else {
             let minSwap = numericConstants_1.ZERO;
-            let maxSwap = freeCollateral
-                .mul(inPrecision)
-                .mul(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION)
-                .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION.div(new _1.BN(100)))
-                .div(inOraclePrice); // just assume user can go 100x
+            let maxSwap = _1.BN.max(freeCollateral.mul(inPrecision).mul(new _1.BN(100)).div(inOraclePrice), // 100x current free collateral
+            inTokenAmount.abs().mul(new _1.BN(10)) // 10x current position
+            );
             inSwap = maxSwap.div(numericConstants_1.TWO);
             const error = freeCollateral.div(new _1.BN(10000));
             let i = 0;

package/package.json

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

package/src/dlob/DLOBSubscriber.ts

@@ -75,6 +75,7 @@ export class DLOBSubscriber {
 		marketType,
 		depth = 10,
 		includeVamm = false,
+		numVammOrders,
 		fallbackL2Generators = [],
 	}: {
 		marketName?: string;
@@ -82,6 +83,7 @@ export class DLOBSubscriber {
 		marketType?: MarketType;
 		depth?: number;
 		includeVamm?: boolean;
+		numVammOrders?: number;
 		fallbackL2Generators?: L2OrderBookGenerator[];
 	}): L2OrderBook {
 		if (marketName) {
@@ -122,7 +124,7 @@ export class DLOBSubscriber {
 				getVammL2Generator({
 					marketAccount: this.driftClient.getPerpMarketAccount(marketIndex),
 					oraclePriceData,
-					numOrders: depth,
+					numOrders: numVammOrders ?? depth,
 				}),
 			];
 		}

package/src/driftClient.ts

@@ -3418,6 +3418,7 @@ export class DriftClient {
 		amount,
 		slippageBps,
 		swapMode,
+		onlyDirectRoutes,
 		route,
 		reduceOnly,
 		userAccountPublicKey,
@@ -3430,6 +3431,7 @@ export class DriftClient {
 		amount: BN;
 		slippageBps?: number;
 		swapMode?: SwapMode;
+		onlyDirectRoutes?: boolean;
 		route?: Route;
 		reduceOnly?: SwapReduceOnly;
 		userAccountPublicKey?: PublicKey;
@@ -3447,6 +3449,7 @@ export class DriftClient {
 				amount,
 				slippageBps,
 				swapMode,
+				onlyDirectRoutes,
 			});
 
 			if (!routes || routes.length === 0) {

package/src/jupiter/jupiterClient.ts

@@ -57,6 +57,7 @@ export class JupiterClient {
 	 * @param amount the amount of the input token
 	 * @param slippageBps the slippage tolerance in basis points
 	 * @param swapMode the swap mode (ExactIn or ExactOut)
+	 * @param onlyDirectRoutes whether to only return direct routes
 	 */
 	public async getRoutes({
 		inputMint,
@@ -64,12 +65,14 @@ export class JupiterClient {
 		amount,
 		slippageBps = 50,
 		swapMode = 'ExactIn',
+		onlyDirectRoutes = false,
 	}: {
 		inputMint: PublicKey;
 		outputMint: PublicKey;
 		amount: BN;
 		slippageBps?: number;
 		swapMode?: SwapMode;
+		onlyDirectRoutes?: boolean;
 	}): Promise<Route[]> {
 		const params = new URLSearchParams({
 			inputMint: inputMint.toString(),
@@ -77,6 +80,7 @@ export class JupiterClient {
 			amount: amount.toString(),
 			slippageBps: slippageBps.toString(),
 			swapMode,
+			onlyDirectRoutes: onlyDirectRoutes.toString(),
 		}).toString();
 
 		const { data: routes } = await (

package/src/math/superStake.ts

@@ -20,6 +20,7 @@ export async function findBestSuperStakeIxs({
 	userAccountPublicKey,
 	marinadePrice,
 	forceMarinade,
+	onlyDirectRoutes,
 }: {
 	amount: BN;
 	jupiterClient: JupiterClient;
@@ -27,6 +28,7 @@ export async function findBestSuperStakeIxs({
 	marinadePrice?: number;
 	userAccountPublicKey?: PublicKey;
 	forceMarinade?: boolean;
+	onlyDirectRoutes?: boolean;
 }): Promise<{
 	ixs: TransactionInstruction[];
 	lookupTables: AddressLookupTableAccount[];
@@ -48,6 +50,7 @@ export async function findBestSuperStakeIxs({
 			inputMint: solMint,
 			outputMint: mSOLMint,
 			amount,
+			onlyDirectRoutes,
 		});
 
 		bestRoute = jupiterRoutes[0];

package/src/user.ts

@@ -2009,9 +2009,6 @@ export class User {
 		const inPrecision = new BN(10 ** inMarket.decimals);
 		const outPrecision = new BN(10 ** outMarket.decimals);
 
-		const outSaferThanIn =
-			inMarket.initialAssetWeight < outMarket.initialAssetWeight;
-
 		const inSpotPosition =
 			this.getSpotPosition(inMarketIndex) ||
 			this.getEmptySpotPosition(inMarketIndex);
@@ -2053,6 +2050,14 @@ export class User {
 		let inSwap = ZERO;
 		let outSwap = ZERO;
 		const inTokenAmount = this.getTokenAmount(inMarketIndex);
+		const outTokenAmount = this.getTokenAmount(outMarketIndex);
+
+		const outSaferThanIn =
+			// selling asset to close borrow
+			(inTokenAmount.gt(ZERO) && outTokenAmount.lt(ZERO)) ||
+			// buying asset with higher initial asset weight
+			inMarket.initialAssetWeight < outMarket.initialAssetWeight;
+
 		if (freeCollateral.lt(ONE)) {
 			if (outSaferThanIn && inTokenAmount.gt(ZERO)) {
 				inSwap = inTokenAmount;
@@ -2060,11 +2065,10 @@ export class User {
 			}
 		} else {
 			let minSwap = ZERO;
-			let maxSwap = freeCollateral
-				.mul(inPrecision)
-				.mul(SPOT_MARKET_WEIGHT_PRECISION)
-				.div(SPOT_MARKET_WEIGHT_PRECISION.div(new BN(100)))
-				.div(inOraclePrice); // just assume user can go 100x
+			let maxSwap = BN.max(
+				freeCollateral.mul(inPrecision).mul(new BN(100)).div(inOraclePrice), // 100x current free collateral
+				inTokenAmount.abs().mul(new BN(10)) // 10x current position
+			);
 			inSwap = maxSwap.div(TWO);
 			const error = freeCollateral.div(new BN(10000));
 

package/tests/dlob/test.ts

@@ -22,10 +22,11 @@ import {
 	ZERO,
 	convertToNumber,
 	QUOTE_PRECISION,
+	isVariant,
+	TWO
 } from '../../src';
 
 import { mockPerpMarkets, mockSpotMarkets, mockStateAccount } from './helpers';
-import { isVariant, TWO } from '../../lib';
 import { DLOBOrdersCoder } from '../../src/dlob/DLOBOrders';
 
 function insertOrderToDLOB(