@drift-labs/sdk 2.45.0-beta.3 → 2.45.0-beta.5

package/VERSION

@@ -1 +1 @@
-2.45.0-beta.3
+2.45.0-beta.5

package/lib/dlob/orderBookLevels.js

@@ -173,8 +173,8 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
                 if (remainingBaseLiquidity.lt(baseSwapped)) {
                     baseSwapped = remainingBaseLiquidity;
                     [afterSwapQuoteReserves, afterSwapBaseReserves] =
-                        (0, __1.calculateAmmReservesAfterSwap)(bidAmm, 'base', baseSwapped, __1.SwapDirection.REMOVE);
-                    quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(bidAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), bidAmm.pegMultiplier, __1.SwapDirection.REMOVE);
+                        (0, __1.calculateAmmReservesAfterSwap)(askAmm, 'base', baseSwapped, __1.SwapDirection.REMOVE);
+                    quoteSwapped = (0, __1.calculateQuoteAssetAmountSwapped)(askAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(), askAmm.pegMultiplier, __1.SwapDirection.REMOVE);
                 }
                 topOfBookAskSize = topOfBookAskSize.add(baseSwapped);
                 askSize = openAsks

package/lib/driftClient.d.ts

@@ -280,7 +280,7 @@ export declare class DriftClient {
      */
     sendMarketOrderAndGetSignedFillTx(orderParams: OptionalOrderParams, userAccountPublicKey: PublicKey, userAccount: UserAccount, makerInfo?: MakerInfo | MakerInfo[], txParams?: TxParams, bracketOrdersParams?: OptionalOrderParams[], referrerInfo?: ReferrerInfo, cancelExistingOrders?: boolean): Promise<{
         txSig: TransactionSignature;
-        signedFillTx: Transaction;
+        signedFillTx?: Transaction;
         signedCancelExistingOrdersTx?: Transaction;
     }>;
     placePerpOrder(orderParams: OptionalOrderParams, txParams?: TxParams): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -1378,10 +1378,6 @@ class DriftClient {
             const placeBracketOrderIx = await this.getPlacePerpOrderIx(bracketOrderParams);
             bracketOrderIxs.push(placeBracketOrderIx);
         }
-        const fillPerpOrderIx = await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
-            orderId,
-            marketIndex,
-        }, makerInfo, referrerInfo);
         let cancelOrdersIx;
         let cancelExistingOrdersTx;
         if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
@@ -1392,6 +1388,10 @@ class DriftClient {
         // use versioned transactions if there is a lookup table account and wallet is compatible
         if (this.txVersion === 0) {
             const versionedMarketOrderTx = await this.buildTransaction([placePerpOrderIx].concat(bracketOrderIxs), txParams, 0);
+            const fillPerpOrderIx = await this.getFillPerpOrderIx(userAccountPublicKey, userAccount, {
+                orderId,
+                marketIndex,
+            }, makerInfo, referrerInfo);
             const versionedFillTx = await this.buildTransaction([fillPerpOrderIx], txParams, 0);
             const [signedVersionedMarketOrderTx, signedVersionedFillTx, signedCancelExistingOrdersTx,] = await this.provider.wallet.signAllTransactions([
                 versionedMarketOrderTx,
@@ -1413,17 +1413,18 @@ class DriftClient {
             if (bracketOrderIxs.length > 0) {
                 marketOrderTx.add(...bracketOrderIxs);
             }
-            const fillTx = (0, utils_1.wrapInTx)(fillPerpOrderIx, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
             // Apply the latest blockhash to the txs so that we can sign before sending them
             const currentBlockHash = (await this.connection.getLatestBlockhash('finalized')).blockhash;
             marketOrderTx.recentBlockhash = currentBlockHash;
-            fillTx.recentBlockhash = currentBlockHash;
             marketOrderTx.feePayer = userAccount.authority;
-            fillTx.feePayer = userAccount.authority;
-            const [signedMarketOrderTx, signedFillTx, signedCancelExistingOrdersTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, fillTx, cancelExistingOrdersTx].filter((tx) => tx !== undefined));
+            if (cancelExistingOrdersTx) {
+                cancelExistingOrdersTx.recentBlockhash = currentBlockHash;
+                cancelExistingOrdersTx.feePayer = userAccount.authority;
+            }
+            const [signedMarketOrderTx, signedCancelExistingOrdersTx] = await this.provider.wallet.signAllTransactions([marketOrderTx, cancelExistingOrdersTx].filter((tx) => tx !== undefined));
             const { txSig, slot } = await this.sendTransaction(signedMarketOrderTx, [], this.opts, true);
             this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
-            return { txSig, signedFillTx, signedCancelExistingOrdersTx };
+            return { txSig, signedFillTx: undefined, signedCancelExistingOrdersTx };
         }
     }
     async placePerpOrder(orderParams, txParams) {

package/package.json

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

package/src/dlob/orderBookLevels.ts

@@ -302,15 +302,15 @@ export function getVammL2Generator({
 					baseSwapped = remainingBaseLiquidity;
 					[afterSwapQuoteReserves, afterSwapBaseReserves] =
 						calculateAmmReservesAfterSwap(
-							bidAmm,
+							askAmm,
 							'base',
 							baseSwapped,
 							SwapDirection.REMOVE
 						);
 
 					quoteSwapped = calculateQuoteAssetAmountSwapped(
-						bidAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(),
-						bidAmm.pegMultiplier,
+						askAmm.quoteAssetReserve.sub(afterSwapQuoteReserves).abs(),
+						askAmm.pegMultiplier,
 						SwapDirection.REMOVE
 					);
 				}

package/src/driftClient.ts

@@ -2462,7 +2462,7 @@ export class DriftClient {
 		cancelExistingOrders?: boolean
 	): Promise<{
 		txSig: TransactionSignature;
-		signedFillTx: Transaction;
+		signedFillTx?: Transaction;
 		signedCancelExistingOrdersTx?: Transaction;
 	}> {
 		const marketIndex = orderParams.marketIndex;
@@ -2478,17 +2478,6 @@ export class DriftClient {
 			bracketOrderIxs.push(placeBracketOrderIx);
 		}
 
-		const fillPerpOrderIx = await this.getFillPerpOrderIx(
-			userAccountPublicKey,
-			userAccount,
-			{
-				orderId,
-				marketIndex,
-			},
-			makerInfo,
-			referrerInfo
-		);
-
 		let cancelOrdersIx: TransactionInstruction;
 		let cancelExistingOrdersTx: Transaction;
 		if (cancelExistingOrders && isVariant(orderParams.marketType, 'perp')) {
@@ -2513,6 +2502,18 @@ export class DriftClient {
 				txParams,
 				0
 			);
+
+			const fillPerpOrderIx = await this.getFillPerpOrderIx(
+				userAccountPublicKey,
+				userAccount,
+				{
+					orderId,
+					marketIndex,
+				},
+				makerInfo,
+				referrerInfo
+			);
+
 			const versionedFillTx = await this.buildTransaction(
 				[fillPerpOrderIx],
 				txParams,
@@ -2554,25 +2555,22 @@ export class DriftClient {
 				marketOrderTx.add(...bracketOrderIxs);
 			}
 
-			const fillTx = wrapInTx(
-				fillPerpOrderIx,
-				txParams?.computeUnits,
-				txParams?.computeUnitsPrice
-			);
-
 			// Apply the latest blockhash to the txs so that we can sign before sending them
 			const currentBlockHash = (
 				await this.connection.getLatestBlockhash('finalized')
 			).blockhash;
 			marketOrderTx.recentBlockhash = currentBlockHash;
-			fillTx.recentBlockhash = currentBlockHash;
 
 			marketOrderTx.feePayer = userAccount.authority;
-			fillTx.feePayer = userAccount.authority;
 
-			const [signedMarketOrderTx, signedFillTx, signedCancelExistingOrdersTx] =
+			if (cancelExistingOrdersTx) {
+				cancelExistingOrdersTx.recentBlockhash = currentBlockHash;
+				cancelExistingOrdersTx.feePayer = userAccount.authority;
+			}
+
+			const [signedMarketOrderTx, signedCancelExistingOrdersTx] =
 				await this.provider.wallet.signAllTransactions(
-					[marketOrderTx, fillTx, cancelExistingOrdersTx].filter(
+					[marketOrderTx, cancelExistingOrdersTx].filter(
 						(tx) => tx !== undefined
 					)
 				);
@@ -2584,7 +2582,7 @@ export class DriftClient {
 			);
 			this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
 
-			return { txSig, signedFillTx, signedCancelExistingOrdersTx };
+			return { txSig, signedFillTx: undefined, signedCancelExistingOrdersTx };
 		}
 	}