@drift-labs/sdk-browser 2.121.0-beta.11 → 2.121.0-beta.13

package/VERSION

@@ -1 +1 @@
-2.121.0-beta.11
+2.121.0-beta.13

package/lib/browser/dlob/orderBookLevels.js

@@ -100,6 +100,7 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
         ? [__1.ZERO, __1.ZERO]
         : (0, __1.calculateMarketOpenBidAsk)(updatedAmm.baseAssetReserve, updatedAmm.minBaseAssetReserve, updatedAmm.maxBaseAssetReserve, updatedAmm.orderStepSize);
     const minOrderSize = marketAccount.amm.minOrderSize;
+    const orderTickSize = marketAccount.amm.orderTickSize;
     if (openBids.lt(minOrderSize.muln(2))) {
         openBids = __1.ZERO;
     }
@@ -127,7 +128,7 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 quoteSwapped = topOfBookQuoteAmounts[numBids];
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(bidAmm, 'quote', quoteSwapped, __1.SwapDirection.REMOVE);
-                baseSwapped = bidAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs();
+                (0, __1.standardizeBaseAssetAmount)(bidAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs(), marketAccount.amm.orderStepSize);
                 if (baseSwapped.eq(__1.ZERO)) {
                     return;
                 }
@@ -141,12 +142,12 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 bidSize = openBids.sub(topOfBookBidSize).div(new __1.BN(numBaseOrders));
             }
             else {
-                baseSwapped = bidSize;
+                baseSwapped = (0, __1.standardizeBaseAssetAmount)(bidSize, marketAccount.amm.orderStepSize);
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(bidAmm, 'base', baseSwapped, __1.SwapDirection.ADD);
                 quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(bidAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), bidAmm.pegMultiplier, __1.SwapDirection.ADD);
             }
-            const price = quoteSwapped.mul(__1.BASE_PRECISION).div(baseSwapped);
+            const price = (0, __1.standardizePrice)(quoteSwapped.mul(__1.BASE_PRECISION).div(baseSwapped), orderTickSize, __1.PositionDirection.LONG);
             bidAmm.baseAssetReserve = afterSwapBaseReserves;
             bidAmm.quoteAssetReserve = afterSwapQuoteReserves;
             yield {
@@ -178,7 +179,7 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 quoteSwapped = topOfBookQuoteAmounts[numAsks];
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(askAmm, 'quote', quoteSwapped, __1.SwapDirection.ADD);
-                baseSwapped = askAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs();
+                baseSwapped = (0, __1.standardizeBaseAssetAmount)(askAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs(), marketAccount.amm.orderStepSize);
                 if (baseSwapped.eq(__1.ZERO)) {
                     return;
                 }
@@ -195,12 +196,12 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                     .div(new __1.BN(numBaseOrders));
             }
             else {
-                baseSwapped = askSize;
+                baseSwapped = (0, __1.standardizeBaseAssetAmount)(askSize, marketAccount.amm.orderStepSize);
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(askAmm, 'base', askSize, __1.SwapDirection.REMOVE);
                 quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(askAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), askAmm.pegMultiplier, __1.SwapDirection.REMOVE);
             }
-            const price = quoteSwapped.mul(__1.BASE_PRECISION).div(baseSwapped);
+            const price = (0, __1.standardizePrice)(quoteSwapped.mul(__1.BASE_PRECISION).div(baseSwapped), orderTickSize, __1.PositionDirection.SHORT);
             askAmm.baseAssetReserve = afterSwapBaseReserves;
             askAmm.quoteAssetReserve = afterSwapQuoteReserves;
             yield {

package/lib/browser/driftClient.d.ts

@@ -18,7 +18,7 @@ import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
 import { DriftEnv } from './config';
 import { UserStats } from './userStats';
-import { JupiterClient, QuoteResponse, Route, SwapMode } from './jupiter/jupiterClient';
+import { JupiterClient, QuoteResponse, SwapMode } from './jupiter/jupiterClient';
 import { UserStatsSubscriptionConfig } from './userStatsConfig';
 import { TxHandler } from './tx/txHandler';
 import { WormholeCoreBridgeSolana } from '@pythnetwork/pyth-solana-receiver/lib/idl/wormhole_core_bridge_solana';
@@ -464,9 +464,11 @@ export declare class DriftClient {
      * @param swapMode jupiter swapMode (ExactIn or ExactOut), default is ExactIn
      * @param route the jupiter 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 txParams
      */
-    swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, txParams, v6, onlyDirectRoutes, }: {
+    swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes, }: {
         jupiterClient: JupiterClient;
         outMarketIndex: number;
         inMarketIndex: number;
@@ -475,31 +477,14 @@ export declare class DriftClient {
         amount: BN;
         slippageBps?: number;
         swapMode?: SwapMode;
-        route?: Route;
         reduceOnly?: SwapReduceOnly;
         txParams?: TxParams;
         onlyDirectRoutes?: boolean;
         v6?: {
             quote?: QuoteResponse;
         };
+        quote?: QuoteResponse;
     }): Promise<TransactionSignature>;
-    getJupiterSwapIx({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, route, reduceOnly, userAccountPublicKey, }: {
-        jupiterClient: JupiterClient;
-        outMarketIndex: number;
-        inMarketIndex: number;
-        outAssociatedTokenAccount?: PublicKey;
-        inAssociatedTokenAccount?: PublicKey;
-        amount: BN;
-        slippageBps?: number;
-        swapMode?: SwapMode;
-        onlyDirectRoutes?: boolean;
-        route?: Route;
-        reduceOnly?: SwapReduceOnly;
-        userAccountPublicKey?: PublicKey;
-    }): Promise<{
-        ixs: TransactionInstruction[];
-        lookupTables: AddressLookupTableAccount[];
-    }>;
     getJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, quote, reduceOnly, userAccountPublicKey, }: {
         jupiterClient: JupiterClient;
         outMarketIndex: number;

package/lib/browser/driftClient.js

@@ -2771,114 +2771,33 @@ class DriftClient {
      * @param swapMode jupiter swapMode (ExactIn or ExactOut), default is ExactIn
      * @param route the jupiter 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 txParams
      */
-    async swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, txParams, v6, onlyDirectRoutes = false, }) {
-        let ixs;
-        let lookupTables;
-        if (v6) {
-            const res = await this.getJupiterSwapIxV6({
-                jupiterClient,
-                outMarketIndex,
-                inMarketIndex,
-                outAssociatedTokenAccount,
-                inAssociatedTokenAccount,
-                amount,
-                slippageBps,
-                swapMode,
-                quote: v6.quote,
-                reduceOnly,
-                onlyDirectRoutes,
-            });
-            ixs = res.ixs;
-            lookupTables = res.lookupTables;
-        }
-        else {
-            const res = await this.getJupiterSwapIx({
-                jupiterClient,
-                outMarketIndex,
-                inMarketIndex,
-                outAssociatedTokenAccount,
-                inAssociatedTokenAccount,
-                amount,
-                slippageBps,
-                swapMode,
-                route,
-                reduceOnly,
-            });
-            ixs = res.ixs;
-            lookupTables = res.lookupTables;
-        }
+    async swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes = false, }) {
+        const quoteToUse = quote !== null && quote !== void 0 ? quote : v6 === null || v6 === void 0 ? void 0 : v6.quote;
+        const res = await this.getJupiterSwapIxV6({
+            jupiterClient,
+            outMarketIndex,
+            inMarketIndex,
+            outAssociatedTokenAccount,
+            inAssociatedTokenAccount,
+            amount,
+            slippageBps,
+            swapMode,
+            quote: quoteToUse,
+            reduceOnly,
+            onlyDirectRoutes,
+        });
+        const ixs = res.ixs;
+        const lookupTables = res.lookupTables;
         const tx = (await this.buildTransaction(ixs, txParams, 0, lookupTables));
         const { txSig, slot } = await this.sendTransaction(tx);
         this.spotMarketLastSlotCache.set(outMarketIndex, slot);
         this.spotMarketLastSlotCache.set(inMarketIndex, slot);
         return txSig;
     }
-    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) {
-            const routes = await jupiterClient.getRoutes({
-                inputMint: inMarket.mint,
-                outputMint: outMarket.mint,
-                amount,
-                slippageBps,
-                swapMode,
-                onlyDirectRoutes,
-            });
-            if (!routes || routes.length === 0) {
-                throw new Error('No jupiter routes found');
-            }
-            route = routes[0];
-        }
-        const transaction = await jupiterClient.getSwapTransaction({
-            route,
-            userPublicKey: this.provider.wallet.publicKey,
-            slippageBps,
-        });
-        const { transactionMessage, lookupTables } = await jupiterClient.getTransactionMessageAndLookupTables({
-            transaction,
-        });
-        const jupiterInstructions = jupiterClient.getJupiterInstructions({
-            transactionMessage,
-            inputMint: inMarket.mint,
-            outputMint: outMarket.mint,
-        });
-        const preInstructions = [];
-        if (!outAssociatedTokenAccount) {
-            const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
-            outAssociatedTokenAccount = await this.getAssociatedTokenAccount(outMarket.marketIndex, false, tokenProgram);
-            const accountInfo = await this.connection.getAccountInfo(outAssociatedTokenAccount);
-            if (!accountInfo) {
-                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(outAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, outMarket.mint, tokenProgram));
-            }
-        }
-        if (!inAssociatedTokenAccount) {
-            const tokenProgram = this.getTokenProgramForSpotMarket(outMarket);
-            inAssociatedTokenAccount = await this.getAssociatedTokenAccount(inMarket.marketIndex, false, tokenProgram);
-            const accountInfo = await this.connection.getAccountInfo(inAssociatedTokenAccount);
-            if (!accountInfo) {
-                preInstructions.push(this.createAssociatedTokenAccountIdempotentInstruction(inAssociatedTokenAccount, this.provider.wallet.publicKey, this.provider.wallet.publicKey, inMarket.mint, tokenProgram));
-            }
-        }
-        const { beginSwapIx, endSwapIx } = await this.getSwapIx({
-            outMarketIndex,
-            inMarketIndex,
-            amountIn: new anchor_1.BN(route.inAmount),
-            inTokenAccount: inAssociatedTokenAccount,
-            outTokenAccount: outAssociatedTokenAccount,
-            reduceOnly,
-            userAccountPublicKey,
-        });
-        const ixs = [
-            ...preInstructions,
-            beginSwapIx,
-            ...jupiterInstructions,
-            endSwapIx,
-        ];
-        return { ixs, lookupTables };
-    }
     async getJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, quote, reduceOnly, userAccountPublicKey, }) {
         const outMarket = this.getSpotMarketAccount(outMarketIndex);
         const inMarket = this.getSpotMarketAccount(inMarketIndex);

package/lib/browser/jupiter/jupiterClient.d.ts

@@ -208,6 +208,8 @@ export interface QuoteResponse {
      */
     errorCode?: string;
 }
+export declare const RECOMMENDED_JUPITER_API_VERSION = "/v1";
+export declare const RECOMMENDED_JUPITER_API = "https://lite-api.jup.ag/swap";
 export declare class JupiterClient {
     url: string;
     connection: Connection;
@@ -216,24 +218,6 @@ export declare class JupiterClient {
         connection: Connection;
         url?: string;
     });
-    /**
-     * ** @deprecated - use getQuote
-     * Get routes for a swap
-     * @param inputMint the mint of the input token
-     * @param outputMint the mint of the output token
-     * @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, onlyDirectRoutes, }: {
-        inputMint: PublicKey;
-        outputMint: PublicKey;
-        amount: BN;
-        slippageBps?: number;
-        swapMode?: SwapMode;
-        onlyDirectRoutes?: boolean;
-    }): Promise<Route[]>;
     /**
      * Get routes for a swap
      * @param inputMint the mint of the input token
@@ -268,18 +252,6 @@ export declare class JupiterClient {
         userPublicKey: PublicKey;
         slippageBps?: number;
     }): Promise<VersionedTransaction>;
-    /**
-     * ** @deprecated - use getSwap
-     * Get a swap transaction for a route
-     * @param route the route to perform swap
-     * @param userPublicKey the signer's wallet public key
-     * @param slippageBps the slippage tolerance in basis points
-     */
-    getSwapTransaction({ route, userPublicKey, slippageBps, }: {
-        route: Route;
-        userPublicKey: PublicKey;
-        slippageBps?: number;
-    }): Promise<VersionedTransaction>;
     /**
      * Get the transaction message and lookup tables for a transaction
      * @param transaction

package/lib/browser/jupiter/jupiterClient.js

@@ -3,37 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JupiterClient = void 0;
+exports.JupiterClient = exports.RECOMMENDED_JUPITER_API = exports.RECOMMENDED_JUPITER_API_VERSION = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const node_fetch_1 = __importDefault(require("node-fetch"));
+exports.RECOMMENDED_JUPITER_API_VERSION = '/v1';
+exports.RECOMMENDED_JUPITER_API = 'https://lite-api.jup.ag/swap';
 class JupiterClient {
     constructor({ connection, url }) {
         this.lookupTableCahce = new Map();
         this.connection = connection;
-        this.url = url !== null && url !== void 0 ? url : 'https://quote-api.jup.ag';
-    }
-    /**
-     * ** @deprecated - use getQuote
-     * Get routes for a swap
-     * @param inputMint the mint of the input token
-     * @param outputMint the mint of the output token
-     * @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', onlyDirectRoutes = false, }) {
-        const params = new URLSearchParams({
-            inputMint: inputMint.toString(),
-            outputMint: outputMint.toString(),
-            amount: amount.toString(),
-            slippageBps: slippageBps.toString(),
-            swapMode,
-            onlyDirectRoutes: onlyDirectRoutes.toString(),
-        }).toString();
-        const apiVersionParam = this.url === 'https://quote-api.jup.ag' ? '/v4' : '';
-        const { data: routes } = await (await (0, node_fetch_1.default)(`${this.url}${apiVersionParam}/quote?${params}`)).json();
-        return routes;
+        this.url = url !== null && url !== void 0 ? url : exports.RECOMMENDED_JUPITER_API;
     }
     /**
      * Get routes for a swap
@@ -64,7 +43,9 @@ class JupiterClient {
         if (swapMode === 'ExactOut') {
             params.delete('maxAccounts');
         }
-        const apiVersionParam = this.url === 'https://quote-api.jup.ag' ? '/v6' : '';
+        const apiVersionParam = this.url === exports.RECOMMENDED_JUPITER_API
+            ? exports.RECOMMENDED_JUPITER_API_VERSION
+            : '';
         const quote = await (await (0, node_fetch_1.default)(`${this.url}${apiVersionParam}/quote?${params.toString()}`)).json();
         return quote;
     }
@@ -79,7 +60,9 @@ class JupiterClient {
         if (!quote) {
             throw new Error('Jupiter swap quote not provided. Please try again.');
         }
-        const apiVersionParam = this.url === 'https://quote-api.jup.ag' ? '/v6' : '';
+        const apiVersionParam = this.url === exports.RECOMMENDED_JUPITER_API
+            ? exports.RECOMMENDED_JUPITER_API_VERSION
+            : '';
         const resp = await (await (0, node_fetch_1.default)(`${this.url}${apiVersionParam}/swap`, {
             method: 'POST',
             headers: {
@@ -103,30 +86,6 @@ class JupiterClient {
             throw new Error('Something went wrong with creating the Jupiter swap transaction. Please try again.');
         }
     }
-    /**
-     * ** @deprecated - use getSwap
-     * Get a swap transaction for a route
-     * @param route the route to perform swap
-     * @param userPublicKey the signer's wallet public key
-     * @param slippageBps the slippage tolerance in basis points
-     */
-    async getSwapTransaction({ route, userPublicKey, slippageBps = 50, }) {
-        const apiVersionParam = this.url === 'https://quote-api.jup.ag' ? '/v4' : '';
-        const resp = await (await (0, node_fetch_1.default)(`${this.url}${apiVersionParam}/swap`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({
-                route,
-                userPublicKey,
-                slippageBps,
-            }),
-        })).json();
-        const { swapTransaction } = resp;
-        const swapTransactionBuf = Buffer.from(swapTransaction, 'base64');
-        return web3_js_1.VersionedTransaction.deserialize(swapTransactionBuf);
-    }
     /**
      * Get the transaction message and lookup tables for a transaction
      * @param transaction

package/lib/node/dlob/orderBookLevels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orderBookLevels.d.ts","sourceRoot":"","sources":["../../../src/dlob/orderBookLevels.ts"],"names":[],"mappings":";AAAA,OAAO,EAEN,EAAE,EAMF,QAAQ,EAGR,eAAe,EACf,iBAAiB,EAOjB,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,KAAK,eAAe,GACjB,OAAO,GACP,MAAM,GACN,MAAM,GACN,SAAS,GACT,UAAU,GACV,YAAY,CAAC;AAEhB,MAAM,MAAM,OAAO,GAAG;IACrB,KAAK,EAAE,EAAE,CAAC;IACV,IAAI,EAAE,EAAE,CAAC;IACT,OAAO,EAAE;SAAG,GAAG,IAAI,eAAe,CAAC,CAAC,EAAE,EAAE;KAAE,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACpC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,MAAM,OAAO,GAAG;IACrB,KAAK,EAAE,EAAE,CAAC;IACV,IAAI,EAAE,EAAE,CAAC;IACT,KAAK,EAAE,SAAS,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,iCAAiC,MAK7C,CAAC;AASF,wBAAiB,2BAA2B,CAC3C,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,EAC9B,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE,MAAM,GACV,SAAS,CAAC,OAAO,CAAC,CAgBpB;AAED,wBAAiB,sBAAsB,CACtC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,EACvC,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,KAAK,OAAO,GAC1C,SAAS,CAAC,OAAO,CAAC,CA+BpB;AAED,wBAAgB,cAAc,CAC7B,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,EAC7B,KAAK,EAAE,MAAM,GACX,OAAO,EAAE,CAsBX;AAED,wBAAgB,kBAAkB,CAAC,EAClC,aAAa,EACb,eAAe,EACf,SAAS,EACT,GAAG,EACH,qBAAqB,GACrB,EAAE;IACF,aAAa,EAAE,iBAAiB,CAAC;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,EAAE,CAAC;IACT,qBAAqB,CAAC,EAAE,EAAE,EAAE,CAAC;CAC7B,GAAG,oBAAoB,CAoNvB;AAED,wBAAgB,OAAO,CACtB,EAAE,EAAE,WAAW,EACf,QAAQ,EAAE,EAAE,EACZ,KAAK,EAAE,MAAM,GACX,WAAW,CAMb;AAiFD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,SAAS,CACxB,IAAI,EAAE,OAAO,EAAE,EACf,IAAI,EAAE,OAAO,EAAE,EACf,WAAW,EAAE,EAAE,EACf,cAAc,EAAE,EAAE,EAClB,YAAY,EAAE,EAAE,EAChB,QAAQ,EAAE,EAAE,EACZ,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EACrB,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GACnB;IAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAAC,IAAI,EAAE,OAAO,EAAE,CAAA;CAAE,CAoJtC"}
+{"version":3,"file":"orderBookLevels.d.ts","sourceRoot":"","sources":["../../../src/dlob/orderBookLevels.ts"],"names":[],"mappings":";AAAA,OAAO,EAEN,EAAE,EAMF,QAAQ,EAGR,eAAe,EACf,iBAAiB,EAQjB,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,KAAK,eAAe,GACjB,OAAO,GACP,MAAM,GACN,MAAM,GACN,SAAS,GACT,UAAU,GACV,YAAY,CAAC;AAEhB,MAAM,MAAM,OAAO,GAAG;IACrB,KAAK,EAAE,EAAE,CAAC;IACV,IAAI,EAAE,EAAE,CAAC;IACT,OAAO,EAAE;SAAG,GAAG,IAAI,eAAe,CAAC,CAAC,EAAE,EAAE;KAAE,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,WAAW,oBAAoB;IACpC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;CAChC;AAED,MAAM,MAAM,OAAO,GAAG;IACrB,KAAK,EAAE,EAAE,CAAC;IACV,IAAI,EAAE,EAAE,CAAC;IACT,KAAK,EAAE,SAAS,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,IAAI,EAAE,OAAO,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,eAAO,MAAM,iCAAiC,MAK7C,CAAC;AASF,wBAAiB,2BAA2B,CAC3C,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,EAC9B,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE,MAAM,GACV,SAAS,CAAC,OAAO,CAAC,CAgBpB;AAED,wBAAiB,sBAAsB,CACtC,iBAAiB,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE,EACvC,OAAO,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,KAAK,OAAO,GAC1C,SAAS,CAAC,OAAO,CAAC,CA+BpB;AAED,wBAAgB,cAAc,CAC7B,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,EAC7B,KAAK,EAAE,MAAM,GACX,OAAO,EAAE,CAsBX;AAED,wBAAgB,kBAAkB,CAAC,EAClC,aAAa,EACb,eAAe,EACf,SAAS,EACT,GAAG,EACH,qBAAqB,GACrB,EAAE;IACF,aAAa,EAAE,iBAAiB,CAAC;IACjC,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,EAAE,CAAC;IACT,qBAAqB,CAAC,EAAE,EAAE,EAAE,CAAC;CAC7B,GAAG,oBAAoB,CAwOvB;AAED,wBAAgB,OAAO,CACtB,EAAE,EAAE,WAAW,EACf,QAAQ,EAAE,EAAE,EACZ,KAAK,EAAE,MAAM,GACX,WAAW,CAMb;AAiFD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,SAAS,CACxB,IAAI,EAAE,OAAO,EAAE,EACf,IAAI,EAAE,OAAO,EAAE,EACf,WAAW,EAAE,EAAE,EACf,cAAc,EAAE,EAAE,EAClB,YAAY,EAAE,EAAE,EAChB,QAAQ,EAAE,EAAE,EACZ,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,EACrB,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,GACnB;IAAE,IAAI,EAAE,OAAO,EAAE,CAAC;IAAC,IAAI,EAAE,OAAO,EAAE,CAAA;CAAE,CAoJtC"}

package/lib/node/dlob/orderBookLevels.js

@@ -100,6 +100,7 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
         ? [__1.ZERO, __1.ZERO]
         : (0, __1.calculateMarketOpenBidAsk)(updatedAmm.baseAssetReserve, updatedAmm.minBaseAssetReserve, updatedAmm.maxBaseAssetReserve, updatedAmm.orderStepSize);
     const minOrderSize = marketAccount.amm.minOrderSize;
+    const orderTickSize = marketAccount.amm.orderTickSize;
     if (openBids.lt(minOrderSize.muln(2))) {
         openBids = __1.ZERO;
     }
@@ -127,7 +128,7 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 quoteSwapped = topOfBookQuoteAmounts[numBids];
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(bidAmm, 'quote', quoteSwapped, __1.SwapDirection.REMOVE);
-                baseSwapped = bidAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs();
+                (0, __1.standardizeBaseAssetAmount)(bidAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs(), marketAccount.amm.orderStepSize);
                 if (baseSwapped.eq(__1.ZERO)) {
                     return;
                 }
@@ -141,12 +142,12 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 bidSize = openBids.sub(topOfBookBidSize).div(new __1.BN(numBaseOrders));
             }
             else {
-                baseSwapped = bidSize;
+                baseSwapped = (0, __1.standardizeBaseAssetAmount)(bidSize, marketAccount.amm.orderStepSize);
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(bidAmm, 'base', baseSwapped, __1.SwapDirection.ADD);
                 quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(bidAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), bidAmm.pegMultiplier, __1.SwapDirection.ADD);
             }
-            const price = quoteSwapped.mul(__1.BASE_PRECISION).div(baseSwapped);
+            const price = (0, __1.standardizePrice)(quoteSwapped.mul(__1.BASE_PRECISION).div(baseSwapped), orderTickSize, __1.PositionDirection.LONG);
             bidAmm.baseAssetReserve = afterSwapBaseReserves;
             bidAmm.quoteAssetReserve = afterSwapQuoteReserves;
             yield {
@@ -178,7 +179,7 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 quoteSwapped = topOfBookQuoteAmounts[numAsks];
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(askAmm, 'quote', quoteSwapped, __1.SwapDirection.ADD);
-                baseSwapped = askAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs();
+                baseSwapped = (0, __1.standardizeBaseAssetAmount)(askAmm.baseAssetReserve.sub(afterSwapBaseReserves).abs(), marketAccount.amm.orderStepSize);
                 if (baseSwapped.eq(__1.ZERO)) {
                     return;
                 }
@@ -195,12 +196,12 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                     .div(new __1.BN(numBaseOrders));
             }
             else {
-                baseSwapped = askSize;
+                baseSwapped = (0, __1.standardizeBaseAssetAmount)(askSize, marketAccount.amm.orderStepSize);
                 [afterSwapQuoteReserves, afterSwapBaseReserves] =
                     (0, __1.calculateAmmReservesAfterSwap)(askAmm, 'base', askSize, __1.SwapDirection.REMOVE);
                 quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(askAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), askAmm.pegMultiplier, __1.SwapDirection.REMOVE);
             }
-            const price = quoteSwapped.mul(__1.BASE_PRECISION).div(baseSwapped);
+            const price = (0, __1.standardizePrice)(quoteSwapped.mul(__1.BASE_PRECISION).div(baseSwapped), orderTickSize, __1.PositionDirection.SHORT);
             askAmm.baseAssetReserve = afterSwapBaseReserves;
             askAmm.quoteAssetReserve = afterSwapQuoteReserves;
             yield {

package/lib/node/driftClient.d.ts

@@ -18,7 +18,7 @@ import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
 import { DriftEnv } from './config';
 import { UserStats } from './userStats';
-import { JupiterClient, QuoteResponse, Route, SwapMode } from './jupiter/jupiterClient';
+import { JupiterClient, QuoteResponse, SwapMode } from './jupiter/jupiterClient';
 import { UserStatsSubscriptionConfig } from './userStatsConfig';
 import { TxHandler } from './tx/txHandler';
 import { WormholeCoreBridgeSolana } from '@pythnetwork/pyth-solana-receiver/lib/idl/wormhole_core_bridge_solana';
@@ -464,9 +464,11 @@ export declare class DriftClient {
      * @param swapMode jupiter swapMode (ExactIn or ExactOut), default is ExactIn
      * @param route the jupiter 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 txParams
      */
-    swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, txParams, v6, onlyDirectRoutes, }: {
+    swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes, }: {
         jupiterClient: JupiterClient;
         outMarketIndex: number;
         inMarketIndex: number;
@@ -475,31 +477,14 @@ export declare class DriftClient {
         amount: BN;
         slippageBps?: number;
         swapMode?: SwapMode;
-        route?: Route;
         reduceOnly?: SwapReduceOnly;
         txParams?: TxParams;
         onlyDirectRoutes?: boolean;
         v6?: {
             quote?: QuoteResponse;
         };
+        quote?: QuoteResponse;
     }): Promise<TransactionSignature>;
-    getJupiterSwapIx({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, route, reduceOnly, userAccountPublicKey, }: {
-        jupiterClient: JupiterClient;
-        outMarketIndex: number;
-        inMarketIndex: number;
-        outAssociatedTokenAccount?: PublicKey;
-        inAssociatedTokenAccount?: PublicKey;
-        amount: BN;
-        slippageBps?: number;
-        swapMode?: SwapMode;
-        onlyDirectRoutes?: boolean;
-        route?: Route;
-        reduceOnly?: SwapReduceOnly;
-        userAccountPublicKey?: PublicKey;
-    }): Promise<{
-        ixs: TransactionInstruction[];
-        lookupTables: AddressLookupTableAccount[];
-    }>;
     getJupiterSwapIxV6({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, onlyDirectRoutes, quote, reduceOnly, userAccountPublicKey, }: {
         jupiterClient: JupiterClient;
         outMarketIndex: number;