@drift-labs/sdk 2.43.0-beta.1 → 2.43.0-beta.11

package/README.md

@@ -244,3 +244,4 @@ Drift Protocol v2 is licensed under [Apache 2.0](./LICENSE).
 Unless you explicitly state otherwise, any contribution intentionally submitted
 for inclusion in Drift SDK by you, as defined in the Apache-2.0 license, shall be
 licensed as above, without any additional terms or conditions.
+

package/VERSION

@@ -1 +1 @@
-2.43.0-beta.1
+2.43.0-beta.11

package/get_events.ts

@@ -0,0 +1,47 @@
+import { Connection, Keypair, PublicKey } from '@solana/web3.js';
+import {
+  configs,
+  DriftClient,
+  Wallet,
+} from "@drift-labs/sdk";
+
+
+async function main() {
+
+  const driftConfig = configs['mainnet-beta'];
+  const connection = new Connection('https://api.mainnet-beta.solana.com');
+
+  const driftClient = new DriftClient({
+    connection: connection,
+    wallet: new Wallet(new Keypair()),
+    programID: new PublicKey(driftConfig.DRIFT_PROGRAM_ID),
+    userStats: true,
+    env: 'mainnet-beta',
+  });
+  console.log(`driftClientSubscribed: ${await driftClient.subscribe()}`);
+
+  const txHash = "3gvGQufckXGHrFDv4dNWEXuXKRMy3NZkKHMyFrAhLoYScaXXTGCp9vq58kWkfyJ8oDYZrz4bTyGayjUy9PKigeLS";
+
+  const tx = await driftClient.connection.getParsedTransaction(txHash, {
+    commitment: "confirmed",
+    maxSupportedTransactionVersion: 0,
+  });
+
+  let logIdx = 0;
+  // @ts-ignore
+  for (const event of driftClient.program._events._eventParser.parseLogs(tx!.meta!.logMessages)) {
+    console.log("----------------------------------------");
+    console.log(`Log ${logIdx++}`);
+    console.log("----------------------------------------");
+    console.log(`${JSON.stringify(event, null, 2)}`);
+  }
+
+  console.log("========================================");
+  console.log("Raw transaction logs");
+  console.log("========================================");
+  console.log(JSON.stringify(tx!.meta!.logMessages, null, 2));
+
+  process.exit(0);
+}
+
+main().catch(console.error);

package/lib/constants/perpMarkets.js

@@ -174,6 +174,16 @@ exports.DevnetPerpMarkets = [
         launchTs: 1698074659000,
         oracleSource: __1.OracleSource.PYTH,
     },
+    {
+        fullName: 'Rollbit',
+        category: ['Exchange'],
+        symbol: 'RLB-PERP',
+        baseAssetSymbol: 'RLB',
+        marketIndex: 17,
+        oracle: new web3_js_1.PublicKey('6BmJozusMugAySsfNfMFsU1YRWcGwyP3oycNX9Pv9oCz'),
+        launchTs: 11699265968000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.MainnetPerpMarkets = [
     {
@@ -346,6 +356,16 @@ exports.MainnetPerpMarkets = [
         launchTs: 1698074659000,
         oracleSource: __1.OracleSource.PYTH,
     },
+    {
+        fullName: 'Rollbit',
+        category: ['Exchange'],
+        symbol: 'RLB-PERP',
+        baseAssetSymbol: 'RLB',
+        marketIndex: 17,
+        oracle: new web3_js_1.PublicKey('4BA3RcS4zE32WWgp49vvvre2t6nXY1W1kMyKZxeeuUey'),
+        launchTs: 11699265968000,
+        oracleSource: __1.OracleSource.PYTH,
+    },
 ];
 exports.PerpMarkets = {
     devnet: exports.DevnetPerpMarkets,

package/lib/dlob/DLOB.js

@@ -600,7 +600,7 @@ class DLOB {
                     bestGenerator.next = bestGenerator.generator.next();
                     continue;
                 }
-                if (filterFcn && filterFcn(bestGenerator.next.value)) {
+                if (filterFcn && !filterFcn(bestGenerator.next.value)) {
                     bestGenerator.next = bestGenerator.generator.next();
                     continue;
                 }
@@ -956,6 +956,7 @@ class DLOB {
         return {
             bids,
             asks,
+            slot,
         };
     }
     /**
@@ -990,6 +991,7 @@ class DLOB {
         return {
             bids,
             asks,
+            slot,
         };
     }
     estimateFillExactBaseAmountInForSide(baseAmountIn, oraclePriceData, slot, dlobSide) {

package/lib/dlob/orderBookLevels.d.ts

@@ -12,6 +12,7 @@ export type L2Level = {
 export type L2OrderBook = {
     asks: L2Level[];
     bids: L2Level[];
+    slot?: number;
 };
 export interface L2OrderBookGenerator {
     getL2Asks(): Generator<L2Level>;
@@ -26,6 +27,7 @@ export type L3Level = {
 export type L3OrderBook = {
     asks: L3Level[];
     bids: L3Level[];
+    slot?: number;
 };
 export declare const DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS: BN[];
 /**

package/lib/dlob/orderBookLevels.js

@@ -92,7 +92,14 @@ function getVammL2Generator({ marketAccount, oraclePriceData, numOrders, now, to
         (0, assert_1.assert)(topOfBookQuoteAmounts.length < numOrders);
     }
     const updatedAmm = (0, __1.calculateUpdatedAMM)(marketAccount.amm, oraclePriceData);
-    const [openBids, openAsks] = (0, __1.calculateMarketOpenBidAsk)(updatedAmm.baseAssetReserve, updatedAmm.minBaseAssetReserve, updatedAmm.maxBaseAssetReserve, updatedAmm.orderStepSize);
+    let [openBids, openAsks] = (0, __1.calculateMarketOpenBidAsk)(updatedAmm.baseAssetReserve, updatedAmm.minBaseAssetReserve, updatedAmm.maxBaseAssetReserve, updatedAmm.orderStepSize);
+    const minOrderSize = marketAccount.amm.orderStepSize;
+    if (openBids.lt(minOrderSize.muln(2))) {
+        openBids = __1.ZERO;
+    }
+    if (openAsks.abs().lt(minOrderSize.muln(2))) {
+        openAsks = __1.ZERO;
+    }
     now = now !== null && now !== void 0 ? now : new __1.BN(Date.now() / 1000);
     const [bidReserves, askReserves] = (0, __1.calculateSpreadReserves)(updatedAmm, oraclePriceData, now);
     let numBids = 0;
@@ -202,6 +209,7 @@ function groupL2(l2, grouping, depth) {
     return {
         bids: groupL2Levels(l2.bids, grouping, __1.PositionDirection.LONG, depth),
         asks: groupL2Levels(l2.asks, grouping, __1.PositionDirection.SHORT, depth),
+        slot: l2.slot,
     };
 }
 exports.groupL2 = groupL2;

package/lib/driftClient.js

@@ -418,14 +418,15 @@ class DriftClient {
         return result;
     }
     async initializeUserAccount(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, referrerInfo) {
+        const initializeIxs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
-        const tx = new web3_js_1.Transaction();
         if (subAccountId === 0) {
             if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
-                tx.add(await this.getInitializeUserStatsIx());
+                initializeIxs.push(await this.getInitializeUserStatsIx());
             }
         }
-        tx.add(initializeUserAccountIx);
+        initializeIxs.push(initializeUserAccountIx);
+        const tx = await this.buildTransaction(initializeIxs);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
@@ -1052,18 +1053,19 @@ class DriftClient {
      */
     async initializeUserAccountAndDepositCollateral(amount, userTokenAccount, marketIndex = 0, subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, fromSubAccountId, referrerInfo, txParams) {
         var _a;
+        const ixs = [];
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const additionalSigners = [];
         const spotMarket = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
-        const tx = new web3_js_1.Transaction();
-        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000,
-        }));
+        let params = {
+            computeUnits: (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000,
+        };
         if (txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice) {
-            tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
-                microLamports: txParams.computeUnitsPrice,
-            }));
+            params = {
+                ...params,
+                computeUnitsPrice: txParams.computeUnitsPrice,
+            };
         }
         const authority = this.wallet.publicKey;
         const isFromSubaccount = fromSubAccountId !== null &&
@@ -1073,40 +1075,41 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             const { ixs: startIxs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             userTokenAccount = pubkey;
-            startIxs.forEach((ix) => {
-                tx.add(ix);
-            });
+            ixs.push(...startIxs);
         }
         const depositCollateralIx = isFromSubaccount
             ? await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, subAccountId)
             : await this.getDepositInstruction(amount, marketIndex, userTokenAccount, subAccountId, false, false);
         if (subAccountId === 0) {
             if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
-                tx.add(await this.getInitializeUserStatsIx());
+                ixs.push(await this.getInitializeUserStatsIx());
             }
         }
-        tx.add(initializeUserAccountIx).add(depositCollateralIx);
+        ixs.push(initializeUserAccountIx, depositCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(userTokenAccount, authority, authority, []));
+            ixs.push((0, spl_token_1.createCloseAccountInstruction)(userTokenAccount, authority, authority, []));
         }
+        const tx = await this.buildTransaction(ixs, params);
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
     async initializeUserAccountForDevnet(subAccountId = 0, name = userName_1.DEFAULT_USER_NAME, marketIndex, tokenFaucet, amount, referrerInfo) {
+        const ixs = [];
         const [associateTokenPublicKey, createAssociatedAccountIx, mintToIx] = await tokenFaucet.createAssociatedTokenAccountAndMintToInstructions(this.wallet.publicKey, amount);
         const [userAccountPublicKey, initializeUserAccountIx] = await this.getInitializeUserInstructions(subAccountId, name, referrerInfo);
         const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associateTokenPublicKey, subAccountId, false, false);
-        const tx = new web3_js_1.Transaction().add(createAssociatedAccountIx).add(mintToIx);
+        ixs.push(createAssociatedAccountIx, mintToIx);
         if (subAccountId === 0) {
             if (!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))) {
-                tx.add(await this.getInitializeUserStatsIx());
+                ixs.push(await this.getInitializeUserStatsIx());
             }
         }
-        tx.add(initializeUserAccountIx).add(depositCollateralIx);
-        const txSig = await this.program.provider.sendAndConfirm(tx, []);
+        ixs.push(initializeUserAccountIx, depositCollateralIx);
+        const tx = await this.buildTransaction(ixs);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
@@ -1118,10 +1121,7 @@ class DriftClient {
      * @param reduceOnly
      */
     async withdraw(amount, marketIndex, associatedTokenAddress, reduceOnly = false) {
-        const tx = new web3_js_1.Transaction();
-        tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: 600000,
-        }));
+        const withdrawIxs = [];
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -1130,23 +1130,24 @@ class DriftClient {
         if (createWSOLTokenAccount) {
             const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, false);
             associatedTokenAddress = pubkey;
-            ixs.forEach((ix) => {
-                tx.add(ix);
-            });
+            withdrawIxs.push(...ixs);
         }
         else {
             const accountExists = await this.checkIfAccountExists(associatedTokenAddress);
             if (!accountExists) {
                 const createAssociatedTokenAccountIx = this.getAssociatedTokenAccountCreationIx(spotMarketAccount.mint, associatedTokenAddress);
-                tx.add(createAssociatedTokenAccountIx);
+                withdrawIxs.push(createAssociatedTokenAccountIx);
             }
         }
-        const withdrawCollateral = await this.getWithdrawIx(amount, spotMarketAccount.marketIndex, associatedTokenAddress, reduceOnly);
-        tx.add(withdrawCollateral);
+        const withdrawCollateralIx = await this.getWithdrawIx(amount, spotMarketAccount.marketIndex, associatedTokenAddress, reduceOnly);
+        withdrawIxs.push(withdrawCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAddress, authority, authority, []));
+            withdrawIxs.push((0, spl_token_1.createCloseAccountInstruction)(associatedTokenAddress, authority, authority, []));
         }
+        const tx = await this.buildTransaction(withdrawIxs, {
+            computeUnits: 600000,
+        });
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
@@ -2698,11 +2699,7 @@ class DriftClient {
     }
     async settlePNLs(users, marketIndexes) {
         const ixs = await this.getSettlePNLsIxs(users, marketIndexes);
-        const tx = new web3_js_1.Transaction()
-            .add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
-            units: 1000000,
-        }))
-            .add(...ixs);
+        const tx = await this.buildTransaction(ixs, { computeUnits: 1000000 });
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
@@ -3030,7 +3027,7 @@ class DriftClient {
      * Add to an insurance fund stake and optionally initialize the account
      */
     async addInsuranceFundStake({ marketIndex, amount, collateralAccountPublicKey, initializeStakeAccount, fromSubaccount, }) {
-        const tx = new web3_js_1.Transaction();
+        const addIfStakeIxs = [];
         const additionalSigners = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
@@ -3040,7 +3037,7 @@ class DriftClient {
             const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
             tokenAccount = pubkey;
             ixs.forEach((ix) => {
-                tx.add(ix);
+                addIfStakeIxs.push(ix);
             });
         }
         else {
@@ -3048,17 +3045,18 @@ class DriftClient {
         }
         if (fromSubaccount) {
             const withdrawIx = await this.getWithdrawIx(amount, marketIndex, tokenAccount);
-            tx.add(withdrawIx);
+            addIfStakeIxs.push(withdrawIx);
         }
         if (initializeStakeAccount) {
             const initializeIx = await this.getInitializeInsuranceFundStakeIx(marketIndex);
-            tx.add(initializeIx);
+            addIfStakeIxs.push(initializeIx);
         }
         const addFundsIx = await this.getAddInsuranceFundStakeIx(marketIndex, amount, tokenAccount);
-        tx.add(addFundsIx);
+        addIfStakeIxs.push(addFundsIx);
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
+            addIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
         }
+        const tx = await this.buildTransaction(addIfStakeIxs);
         const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }
@@ -3070,7 +3068,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        const tx = await this.program.transaction.requestRemoveInsuranceFundStake(marketIndex, amount, {
+        const ix = await this.program.instruction.requestRemoveInsuranceFundStake(marketIndex, amount, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -3081,6 +3079,7 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const tx = await this.buildTransaction(ix);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
@@ -3092,7 +3091,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        const tx = await this.program.transaction.cancelRequestRemoveInsuranceFundStake(marketIndex, {
+        const ix = await this.program.instruction.cancelRequestRemoveInsuranceFundStake(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -3103,11 +3102,12 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const tx = await this.buildTransaction(ix);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
     async removeInsuranceFundStake(marketIndex, collateralAccountPublicKey) {
-        const tx = new web3_js_1.Transaction();
+        const removeIfStakeIxs = [];
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const ifStakeAccountPublicKey = (0, pda_1.getInsuranceFundStakeAccountPublicKey)(this.program.programId, this.wallet.publicKey, marketIndex);
         const additionalSigners = [];
@@ -3118,7 +3118,7 @@ class DriftClient {
             const { ixs, pubkey } = await this.getWrappedSolAccountCreationIxs(numericConstants_1.ZERO, true);
             tokenAccount = pubkey;
             ixs.forEach((ix) => {
-                tx.add(ix);
+                removeIfStakeIxs.push(ix);
             });
         }
         else {
@@ -3143,11 +3143,12 @@ class DriftClient {
             },
             remainingAccounts,
         });
-        tx.add(removeStakeIx);
+        removeIfStakeIxs.push(removeStakeIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
+            removeIfStakeIxs.push((0, spl_token_1.createCloseAccountInstruction)(tokenAccount, this.wallet.publicKey, this.wallet.publicKey, []));
         }
+        const tx = await this.buildTransaction(removeIfStakeIxs);
         const { txSig } = await this.sendTransaction(tx, additionalSigners, this.opts);
         return txSig;
     }
@@ -3158,7 +3159,7 @@ class DriftClient {
             useMarketLastSlotCache: true,
             writableSpotMarketIndexes: [marketIndex],
         });
-        const tx = await this.program.transaction.settleRevenueToInsuranceFund(marketIndex, {
+        const ix = await this.program.instruction.settleRevenueToInsuranceFund(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 spotMarket: spotMarketAccount.pubkey,
@@ -3169,6 +3170,7 @@ class DriftClient {
             },
             remainingAccounts,
         });
+        const tx = await this.buildTransaction(ix);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }

package/lib/user.js

@@ -1564,7 +1564,10 @@ class User {
             this.getEmptyPosition(targetMarketIndex);
         const oracleData = this.getOracleDataForPerpMarket(targetMarketIndex);
         let currentPositionQuoteAmount = this.getPerpPositionValue(targetMarketIndex, oracleData, includeOpenOrders);
-        const currentSide = currentPosition && currentPosition.baseAssetAmount.isNeg()
+        const worstCaseBase = (0, margin_1.calculateWorstCaseBaseAssetAmount)(currentPosition);
+        // current side is short if position base asset amount is negative OR there is no position open but open orders are short
+        const currentSide = currentPosition.baseAssetAmount.isNeg() ||
+            (currentPosition.baseAssetAmount.eq(numericConstants_1.ZERO) && worstCaseBase.isNeg())
             ? _1.PositionDirection.SHORT
             : _1.PositionDirection.LONG;
         if (currentSide === _1.PositionDirection.SHORT)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.43.0-beta.1",
+	"version": "2.43.0-beta.11",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -52,6 +52,7 @@
 		"@typescript-eslint/eslint-plugin": "^4.28.0",
 		"@typescript-eslint/parser": "^4.28.0",
 		"chai": "^4.3.6",
+		"encoding": "^0.1.13",
 		"eslint": "^7.29.0",
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-prettier": "^3.4.0",

package/src/constants/perpMarkets.ts

@@ -184,6 +184,16 @@ export const DevnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1698074659000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Rollbit',
+		category: ['Exchange'],
+		symbol: 'RLB-PERP',
+		baseAssetSymbol: 'RLB',
+		marketIndex: 17,
+		oracle: new PublicKey('6BmJozusMugAySsfNfMFsU1YRWcGwyP3oycNX9Pv9oCz'),
+		launchTs: 11699265968000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const MainnetPerpMarkets: PerpMarketConfig[] = [
@@ -357,6 +367,16 @@ export const MainnetPerpMarkets: PerpMarketConfig[] = [
 		launchTs: 1698074659000,
 		oracleSource: OracleSource.PYTH,
 	},
+	{
+		fullName: 'Rollbit',
+		category: ['Exchange'],
+		symbol: 'RLB-PERP',
+		baseAssetSymbol: 'RLB',
+		marketIndex: 17,
+		oracle: new PublicKey('4BA3RcS4zE32WWgp49vvvre2t6nXY1W1kMyKZxeeuUey'),
+		launchTs: 11699265968000,
+		oracleSource: OracleSource.PYTH,
+	},
 ];
 
 export const PerpMarkets: { [key in DriftEnv]: PerpMarketConfig[] } = {

package/src/dlob/DLOB.ts

@@ -1111,7 +1111,7 @@ export class DLOB {
 					continue;
 				}
 
-				if (filterFcn && filterFcn(bestGenerator.next.value)) {
+				if (filterFcn && !filterFcn(bestGenerator.next.value)) {
 					bestGenerator.next = bestGenerator.generator.next();
 					continue;
 				}
@@ -1725,6 +1725,7 @@ export class DLOB {
 		return {
 			bids,
 			asks,
+			slot,
 		};
 	}
 
@@ -1785,6 +1786,7 @@ export class DLOB {
 		return {
 			bids,
 			asks,
+			slot,
 		};
 	}
 

package/src/dlob/orderBookLevels.ts

@@ -29,6 +29,7 @@ export type L2Level = {
 export type L2OrderBook = {
 	asks: L2Level[];
 	bids: L2Level[];
+	slot?: number;
 };
 
 export interface L2OrderBookGenerator {
@@ -46,6 +47,7 @@ export type L3Level = {
 export type L3OrderBook = {
 	asks: L3Level[];
 	bids: L3Level[];
+	slot?: number;
 };
 
 export const DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS = [
@@ -164,13 +166,22 @@ export function getVammL2Generator({
 
 	const updatedAmm = calculateUpdatedAMM(marketAccount.amm, oraclePriceData);
 
-	const [openBids, openAsks] = calculateMarketOpenBidAsk(
+	let [openBids, openAsks] = calculateMarketOpenBidAsk(
 		updatedAmm.baseAssetReserve,
 		updatedAmm.minBaseAssetReserve,
 		updatedAmm.maxBaseAssetReserve,
 		updatedAmm.orderStepSize
 	);
 
+	const minOrderSize = marketAccount.amm.orderStepSize;
+	if (openBids.lt(minOrderSize.muln(2))) {
+		openBids = ZERO;
+	}
+
+	if (openAsks.abs().lt(minOrderSize.muln(2))) {
+		openAsks = ZERO;
+	}
+
 	now = now ?? new BN(Date.now() / 1000);
 	const [bidReserves, askReserves] = calculateSpreadReserves(
 		updatedAmm,
@@ -354,6 +365,7 @@ export function groupL2(
 	return {
 		bids: groupL2Levels(l2.bids, grouping, PositionDirection.LONG, depth),
 		asks: groupL2Levels(l2.asks, grouping, PositionDirection.SHORT, depth),
+		slot: l2.slot,
 	};
 }
 

package/src/driftClient.ts

@@ -708,6 +708,8 @@ export class DriftClient {
 		name = DEFAULT_USER_NAME,
 		referrerInfo?: ReferrerInfo
 	): Promise<[TransactionSignature, PublicKey]> {
+		const initializeIxs = [];
+
 		const [userAccountPublicKey, initializeUserAccountIx] =
 			await this.getInitializeUserInstructions(
 				subAccountId,
@@ -715,15 +717,16 @@ export class DriftClient {
 				referrerInfo
 			);
 
-		const tx = new Transaction();
 		if (subAccountId === 0) {
 			if (
 				!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))
 			) {
-				tx.add(await this.getInitializeUserStatsIx());
+				initializeIxs.push(await this.getInitializeUserStatsIx());
 			}
 		}
-		tx.add(initializeUserAccountIx);
+		initializeIxs.push(initializeUserAccountIx);
+		const tx = await this.buildTransaction(initializeIxs);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		await this.addUser(subAccountId);
@@ -1800,6 +1803,8 @@ export class DriftClient {
 		referrerInfo?: ReferrerInfo,
 		txParams?: TxParams
 	): Promise<[TransactionSignature, PublicKey]> {
+		const ixs = [];
+
 		const [userAccountPublicKey, initializeUserAccountIx] =
 			await this.getInitializeUserInstructions(
 				subAccountId,
@@ -1813,20 +1818,15 @@ export class DriftClient {
 
 		const isSolMarket = spotMarket.mint.equals(WRAPPED_SOL_MINT);
 
-		const tx = new Transaction();
-
-		tx.add(
-			ComputeBudgetProgram.setComputeUnitLimit({
-				units: txParams?.computeUnits ?? 600_000,
-			})
-		);
+		let params: TxParams = {
+			computeUnits: txParams?.computeUnits ?? 600_000,
+		};
 
 		if (txParams?.computeUnitsPrice) {
-			tx.add(
-				ComputeBudgetProgram.setComputeUnitPrice({
-					microLamports: txParams.computeUnitsPrice,
-				})
-			);
+			params = {
+				...params,
+				computeUnitsPrice: txParams.computeUnitsPrice,
+			};
 		}
 
 		const authority = this.wallet.publicKey;
@@ -1845,9 +1845,7 @@ export class DriftClient {
 
 			userTokenAccount = pubkey;
 
-			startIxs.forEach((ix) => {
-				tx.add(ix);
-			});
+			ixs.push(...startIxs);
 		}
 
 		const depositCollateralIx = isFromSubaccount
@@ -1870,14 +1868,14 @@ export class DriftClient {
 			if (
 				!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))
 			) {
-				tx.add(await this.getInitializeUserStatsIx());
+				ixs.push(await this.getInitializeUserStatsIx());
 			}
 		}
-		tx.add(initializeUserAccountIx).add(depositCollateralIx);
+		ixs.push(initializeUserAccountIx, depositCollateralIx);
 
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
-			tx.add(
+			ixs.push(
 				createCloseAccountInstruction(
 					userTokenAccount,
 					authority,
@@ -1887,6 +1885,8 @@ export class DriftClient {
 			);
 		}
 
+		const tx = await this.buildTransaction(ixs, params);
+
 		const { txSig, slot } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -1907,6 +1907,8 @@ export class DriftClient {
 		amount: BN,
 		referrerInfo?: ReferrerInfo
 	): Promise<[TransactionSignature, PublicKey]> {
+		const ixs = [];
+
 		const [associateTokenPublicKey, createAssociatedAccountIx, mintToIx] =
 			await tokenFaucet.createAssociatedTokenAccountAndMintToInstructions(
 				this.wallet.publicKey,
@@ -1929,18 +1931,20 @@ export class DriftClient {
 			false
 		);
 
-		const tx = new Transaction().add(createAssociatedAccountIx).add(mintToIx);
+		ixs.push(createAssociatedAccountIx, mintToIx);
 
 		if (subAccountId === 0) {
 			if (
 				!(await this.checkIfAccountExists(this.getUserStatsAccountPublicKey()))
 			) {
-				tx.add(await this.getInitializeUserStatsIx());
+				ixs.push(await this.getInitializeUserStatsIx());
 			}
 		}
-		tx.add(initializeUserAccountIx).add(depositCollateralIx);
+		ixs.push(initializeUserAccountIx, depositCollateralIx);
+
+		const tx = await this.buildTransaction(ixs);
 
-		const txSig = await this.program.provider.sendAndConfirm(tx, []);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		await this.addUser(subAccountId);
 
@@ -1960,12 +1964,7 @@ export class DriftClient {
 		associatedTokenAddress: PublicKey,
 		reduceOnly = false
 	): Promise<TransactionSignature> {
-		const tx = new Transaction();
-		tx.add(
-			ComputeBudgetProgram.setComputeUnitLimit({
-				units: 600_000,
-			})
-		);
+		const withdrawIxs = [];
 
 		const additionalSigners: Array<Signer> = [];
 
@@ -1986,9 +1985,7 @@ export class DriftClient {
 
 			associatedTokenAddress = pubkey;
 
-			ixs.forEach((ix) => {
-				tx.add(ix);
-			});
+			withdrawIxs.push(...ixs);
 		} else {
 			const accountExists = await this.checkIfAccountExists(
 				associatedTokenAddress
@@ -2001,22 +1998,22 @@ export class DriftClient {
 						associatedTokenAddress
 					);
 
-				tx.add(createAssociatedTokenAccountIx);
+				withdrawIxs.push(createAssociatedTokenAccountIx);
 			}
 		}
 
-		const withdrawCollateral = await this.getWithdrawIx(
+		const withdrawCollateralIx = await this.getWithdrawIx(
 			amount,
 			spotMarketAccount.marketIndex,
 			associatedTokenAddress,
 			reduceOnly
 		);
 
-		tx.add(withdrawCollateral);
+		withdrawIxs.push(withdrawCollateralIx);
 
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
-			tx.add(
+			withdrawIxs.push(
 				createCloseAccountInstruction(
 					associatedTokenAddress,
 					authority,
@@ -2026,6 +2023,9 @@ export class DriftClient {
 			);
 		}
 
+		const tx = await this.buildTransaction(withdrawIxs, {
+			computeUnits: 600_000,
+		});
 		const { txSig, slot } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -4758,13 +4758,8 @@ export class DriftClient {
 		marketIndexes: number[]
 	): Promise<TransactionSignature> {
 		const ixs = await this.getSettlePNLsIxs(users, marketIndexes);
-		const tx = new Transaction()
-			.add(
-				ComputeBudgetProgram.setComputeUnitLimit({
-					units: 1_000_000,
-				})
-			)
-			.add(...ixs);
+
+		const tx = await this.buildTransaction(ixs, { computeUnits: 1_000_000 });
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
@@ -5484,7 +5479,7 @@ export class DriftClient {
 		 */
 		fromSubaccount?: boolean;
 	}): Promise<TransactionSignature> {
-		const tx = new Transaction();
+		const addIfStakeIxs = [];
 
 		const additionalSigners: Array<Signer> = [];
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
@@ -5501,7 +5496,7 @@ export class DriftClient {
 			);
 			tokenAccount = pubkey;
 			ixs.forEach((ix) => {
-				tx.add(ix);
+				addIfStakeIxs.push(ix);
 			});
 		} else {
 			tokenAccount = collateralAccountPublicKey;
@@ -5513,14 +5508,14 @@ export class DriftClient {
 				marketIndex,
 				tokenAccount
 			);
-			tx.add(withdrawIx);
+			addIfStakeIxs.push(withdrawIx);
 		}
 
 		if (initializeStakeAccount) {
 			const initializeIx = await this.getInitializeInsuranceFundStakeIx(
 				marketIndex
 			);
-			tx.add(initializeIx);
+			addIfStakeIxs.push(initializeIx);
 		}
 
 		const addFundsIx = await this.getAddInsuranceFundStakeIx(
@@ -5529,10 +5524,10 @@ export class DriftClient {
 			tokenAccount
 		);
 
-		tx.add(addFundsIx);
+		addIfStakeIxs.push(addFundsIx);
 
 		if (createWSOLTokenAccount) {
-			tx.add(
+			addIfStakeIxs.push(
 				createCloseAccountInstruction(
 					tokenAccount,
 					this.wallet.publicKey,
@@ -5542,6 +5537,8 @@ export class DriftClient {
 			);
 		}
 
+		const tx = await this.buildTransaction(addIfStakeIxs);
+
 		const { txSig } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -5568,7 +5565,7 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		const tx = await this.program.transaction.requestRemoveInsuranceFundStake(
+		const ix = await this.program.instruction.requestRemoveInsuranceFundStake(
 			marketIndex,
 			amount,
 			{
@@ -5584,6 +5581,8 @@ export class DriftClient {
 			}
 		);
 
+		const tx = await this.buildTransaction(ix);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}
@@ -5604,8 +5603,8 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		const tx =
-			await this.program.transaction.cancelRequestRemoveInsuranceFundStake(
+		const ix =
+			await this.program.instruction.cancelRequestRemoveInsuranceFundStake(
 				marketIndex,
 				{
 					accounts: {
@@ -5620,6 +5619,8 @@ export class DriftClient {
 				}
 			);
 
+		const tx = await this.buildTransaction(ix);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}
@@ -5628,7 +5629,7 @@ export class DriftClient {
 		marketIndex: number,
 		collateralAccountPublicKey: PublicKey
 	): Promise<TransactionSignature> {
-		const tx = new Transaction();
+		const removeIfStakeIxs = [];
 		const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
 		const ifStakeAccountPublicKey = getInsuranceFundStakeAccountPublicKey(
 			this.program.programId,
@@ -5650,7 +5651,7 @@ export class DriftClient {
 			);
 			tokenAccount = pubkey;
 			ixs.forEach((ix) => {
-				tx.add(ix);
+				removeIfStakeIxs.push(ix);
 			});
 		} else {
 			tokenAccount = collateralAccountPublicKey;
@@ -5678,11 +5679,11 @@ export class DriftClient {
 				remainingAccounts,
 			});
 
-		tx.add(removeStakeIx);
+		removeIfStakeIxs.push(removeStakeIx);
 
 		// Close the wrapped sol account at the end of the transaction
 		if (createWSOLTokenAccount) {
-			tx.add(
+			removeIfStakeIxs.push(
 				createCloseAccountInstruction(
 					tokenAccount,
 					this.wallet.publicKey,
@@ -5692,6 +5693,8 @@ export class DriftClient {
 			);
 		}
 
+		const tx = await this.buildTransaction(removeIfStakeIxs);
+
 		const { txSig } = await this.sendTransaction(
 			tx,
 			additionalSigners,
@@ -5711,7 +5714,7 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		const tx = await this.program.transaction.settleRevenueToInsuranceFund(
+		const ix = await this.program.instruction.settleRevenueToInsuranceFund(
 			marketIndex,
 			{
 				accounts: {
@@ -5726,6 +5729,8 @@ export class DriftClient {
 			}
 		);
 
+		const tx = await this.buildTransaction(ix);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}

package/src/user.ts

@@ -2884,8 +2884,12 @@ export class User {
 			includeOpenOrders
 		);
 
+		const worstCaseBase = calculateWorstCaseBaseAssetAmount(currentPosition);
+
+		// current side is short if position base asset amount is negative OR there is no position open but open orders are short
 		const currentSide =
-			currentPosition && currentPosition.baseAssetAmount.isNeg()
+			currentPosition.baseAssetAmount.isNeg() ||
+			(currentPosition.baseAssetAmount.eq(ZERO) && worstCaseBase.isNeg())
 				? PositionDirection.SHORT
 				: PositionDirection.LONG;
 

package/tests/amm/test.ts

@@ -956,4 +956,82 @@ describe('AMM Tests', () => {
 		);
 		assert(totalAskSize.sub(openAsks.abs()).lte(new BN(5))); // only tiny rounding errors
 	});
+
+	it('orderbook L2 gen (no topOfBookQuoteAmounts, 10 numOrders, no liquidity)', async () => {
+		const myMockPerpMarkets = _.cloneDeep(mockPerpMarkets);
+
+		const mockMarket1: PerpMarketAccount = myMockPerpMarkets[0];
+		const cc = 38104569;
+		mockMarket1.amm.baseAssetReserve = new BN(cc).mul(BASE_PRECISION);
+		mockMarket1.amm.minOrderSize = new BN(5);
+		mockMarket1.amm.maxBaseAssetReserve = mockMarket1.amm.baseAssetReserve.add(
+			new BN(9)
+		);
+		mockMarket1.amm.minBaseAssetReserve =
+			mockMarket1.amm.baseAssetReserve.sub(new BN(9));
+		mockMarket1.amm.quoteAssetReserve = new BN(cc).mul(BASE_PRECISION);
+		mockMarket1.amm.pegMultiplier = new BN(18.32 * PEG_PRECISION.toNumber());
+		mockMarket1.amm.sqrtK = new BN(cc).mul(BASE_PRECISION);
+
+		const now = new BN(1688881915);
+
+		const oraclePriceData: OraclePriceData = {
+			price: new BN(18.624 * PRICE_PRECISION.toNumber()),
+			slot: new BN(0),
+			confidence: new BN(1),
+			hasSufficientNumberOfDataPoints: true,
+		};
+		mockMarket1.amm.historicalOracleData.lastOraclePrice = new BN(
+			18.5535 * PRICE_PRECISION.toNumber()
+		);
+
+		const updatedAmm = calculateUpdatedAMM(mockMarket1.amm, oraclePriceData);
+
+		const [openBids, openAsks] = calculateMarketOpenBidAsk(
+			updatedAmm.baseAssetReserve,
+			updatedAmm.minBaseAssetReserve,
+			updatedAmm.maxBaseAssetReserve,
+			updatedAmm.orderStepSize
+		);
+
+		const generator = getVammL2Generator({
+			marketAccount: mockMarket1,
+			oraclePriceData,
+			numOrders: 10,
+			now,
+			topOfBookQuoteAmounts: [],
+		});
+
+		const bids = Array.from(generator.getL2Bids());
+		// console.log(bids);
+
+		const totalBidSize = bids.reduce((total: BN, order: L2Level) => {
+			return total.add(order.size);
+		}, ZERO);
+
+		console.log(
+			'totalBidSize:',
+			totalBidSize.toString(),
+			'openBids:',
+			openBids.toString()
+		);
+		assert(openBids.eq(new BN(9)));
+		assert(totalBidSize.eq(ZERO));
+
+		const asks = Array.from(generator.getL2Asks());
+		// console.log(asks);
+
+		const totalAskSize = asks.reduce((total: BN, order: L2Level) => {
+			return total.add(order.size);
+		}, ZERO);
+		console.log(
+			'totalAskSize:',
+			totalAskSize.toString(),
+			'openAsks:',
+			openAsks.toString()
+		);
+
+		assert(openAsks.eq(new BN(-9)));
+		assert(totalAskSize.eq(ZERO));
+	});
 });

package/tests/user/test.ts

@@ -289,8 +289,9 @@ describe('User Tests', () => {
 			mockUser.getMaxLeverageForPerp(0).toString()
 		);
 		assert(mockUser.getMaxLeverageForPerp(0).eq(new BN('50000'))); // 5x
-		assert(mockUser.getMaxLeverageForPerp(0, 'Maintenance').eq(new BN('100000'))); // 10x
-
+		assert(
+			mockUser.getMaxLeverageForPerp(0, 'Maintenance').eq(new BN('100000'))
+		); // 10x
 	});
 
 	it('worst case token amount', async () => {
@@ -399,8 +400,7 @@ describe('User Tests', () => {
 		); // -$2k
 	});
 
-
-	it('custom margin ratio (sol spot)', async() => {
+	it('custom margin ratio (sol spot)', async () => {
 		const myMockUserAccount = _.cloneDeep(mockUserAccount);
 
 		const solMarket = Object.assign({}, _.cloneDeep(mockSpotMarkets[1]), {
@@ -427,12 +427,10 @@ describe('User Tests', () => {
 		);
 
 		console.log(worstCase);
-		assert(worstCase.weight.eq(new BN(8000))); 
-
+		assert(worstCase.weight.eq(new BN(8000)));
 
 		myMockUserAccount.maxMarginRatio = MARGIN_PRECISION.toNumber(); // max 1x pls
 
-
 		const worstCaseAfter = getWorstCaseTokenAmounts(
 			spotPosition,
 			solMarket,
@@ -443,10 +441,9 @@ describe('User Tests', () => {
 
 		console.log(worstCaseAfter);
 		assert(worstCaseAfter.weight.eq(new BN(0))); // not allowed to increase exposure
-
 	});
 
-	it('custom margin ratio (sol perp)', async() => {
+	it('custom margin ratio (sol perp)', async () => {
 		const myMockPerpMarkets = _.cloneDeep(mockPerpMarkets);
 		const myMockSpotMarkets = _.cloneDeep(mockSpotMarkets);
 		const myMockUserAccount = _.cloneDeep(mockUserAccount);
@@ -469,7 +466,6 @@ describe('User Tests', () => {
 			[1, 1, 1, 1, 1, 1, 1, 1]
 		);
 
-
 		assert(mockUser.getTokenAmount(0).eq(new BN('10000000000')));
 		assert(mockUser.getNetSpotMarketValue().eq(new BN('10000000000')));
 		assert(
@@ -486,7 +482,9 @@ describe('User Tests', () => {
 		assert(iLev == 5000);
 		assert(mLev == 10000);
 
-		myMockUserAccount.maxMarginRatio = MARGIN_PRECISION.div(new BN(2)).toNumber(); // 2x max pls
+		myMockUserAccount.maxMarginRatio = MARGIN_PRECISION.div(
+			new BN(2)
+		).toNumber(); // 2x max pls
 
 		const mockUser2: User = await makeMockUser(
 			myMockPerpMarkets,
@@ -498,9 +496,8 @@ describe('User Tests', () => {
 		iLev = mockUser2.getMaxLeverageForPerp(0, 'Initial').toNumber();
 		mLev = mockUser2.getMaxLeverageForPerp(0, 'Maintenance').toNumber();
 		console.log(iLev, mLev);
-		
+
 		assert(iLev == 2000);
 		assert(mLev == 10000);
-
 	});
 });