@drift-labs/sdk 2.28.0-beta.4 → 2.28.0-beta.5

package/lib/driftClient.js

@@ -49,6 +49,8 @@ const spotMarkets_1 = require("./constants/spotMarkets");
 const userStats_1 = require("./userStats");
 const spotPosition_1 = require("./math/spotPosition");
 const market_1 = require("./math/market");
+const fetch_1 = require("./accounts/fetch");
+const spotMarket_1 = require("./math/spotMarket");
 /**
  * # DriftClient
  * This class is the main way to interact with Drift Protocol. It allows you to subscribe to the various accounts where the Market's state is stored, as well as: opening positions, liquidating, settling funding, depositing & withdrawing, and more.
@@ -61,7 +63,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -70,10 +72,11 @@ class DriftClient {
         this.wallet = config.wallet;
         this.opts = config.opts || anchor_1.AnchorProvider.defaultOptions();
         this.provider = new anchor_1.AnchorProvider(config.connection, config.wallet, this.opts);
-        this.program = new anchor_1.Program(drift_json_1.default, config.programID, this.provider);
-        this.authority = (_a = config.authority) !== null && _a !== void 0 ? _a : this.wallet.publicKey;
-        this.activeSubAccountId = (_b = config.activeSubAccountId) !== null && _b !== void 0 ? _b : 0;
-        this.skipLoadUsers = (_c = config.skipLoadUsers) !== null && _c !== void 0 ? _c : false;
+        this.program = new anchor_1.Program(drift_json_1.default, (_a = config.programID) !== null && _a !== void 0 ? _a : new web3_js_1.PublicKey(config_1.DRIFT_PROGRAM_ID), this.provider);
+        this.authority = (_b = config.authority) !== null && _b !== void 0 ? _b : this.wallet.publicKey;
+        this.activeSubAccountId = (_c = config.activeSubAccountId) !== null && _c !== void 0 ? _c : 0;
+        this.skipLoadUsers = (_d = config.skipLoadUsers) !== null && _d !== void 0 ? _d : false;
+        this.txVersion = (_e = config.txVersion) !== null && _e !== void 0 ? _e : 'legacy';
         if (config.includeDelegates && config.subAccountIds) {
             throw new Error('Can only pass one of includeDelegates or subAccountIds. If you want to specify subaccount ids for multiple authorities, pass authoritySubaccountMap instead');
         }
@@ -88,9 +91,9 @@ class DriftClient {
             : config.subAccountIds
                 ? new Map([[this.authority.toString(), config.subAccountIds]])
                 : new Map();
-        this.includeDelegates = (_d = config.includeDelegates) !== null && _d !== void 0 ? _d : false;
+        this.includeDelegates = (_f = config.includeDelegates) !== null && _f !== void 0 ? _f : false;
         this.userAccountSubscriptionConfig =
-            ((_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.type) === 'polling'
+            ((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.type) === 'polling'
                 ? {
                     type: 'polling',
                     accountLoader: config.accountSubscription.accountLoader,
@@ -122,14 +125,14 @@ class DriftClient {
         if (config.env && !this.marketLookupTable) {
             this.marketLookupTable = new web3_js_1.PublicKey(config_1.configs[config.env].MARKET_LOOKUP_TABLE);
         }
-        if (((_f = config.accountSubscription) === null || _f === void 0 ? void 0 : _f.type) === 'polling') {
+        if (((_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.type) === 'polling') {
             this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, perpMarketIndexes !== null && perpMarketIndexes !== void 0 ? perpMarketIndexes : [], spotMarketIndexes !== null && spotMarketIndexes !== void 0 ? spotMarketIndexes : [], oracleInfos !== null && oracleInfos !== void 0 ? oracleInfos : []);
         }
         else {
             this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, perpMarketIndexes !== null && perpMarketIndexes !== void 0 ? perpMarketIndexes : [], spotMarketIndexes !== null && spotMarketIndexes !== void 0 ? spotMarketIndexes : [], oracleInfos !== null && oracleInfos !== void 0 ? oracleInfos : []);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
-        this.txSender = new retryTxSender_1.RetryTxSender(this.provider, (_g = config.txSenderConfig) === null || _g === void 0 ? void 0 : _g.timeout, (_h = config.txSenderConfig) === null || _h === void 0 ? void 0 : _h.retrySleep, (_j = config.txSenderConfig) === null || _j === void 0 ? void 0 : _j.additionalConnections);
+        this.txSender = new retryTxSender_1.RetryTxSender(this.provider, (_j = config.txSenderConfig) === null || _j === void 0 ? void 0 : _j.timeout, (_k = config.txSenderConfig) === null || _k === void 0 ? void 0 : _k.retrySleep, (_l = config.txSenderConfig) === null || _l === void 0 ? void 0 : _l.additionalConnections);
     }
     getUserMapKey(subAccountId, authority) {
         return `${subAccountId}_${authority.toString()}`;
@@ -442,6 +445,17 @@ class DriftClient {
             },
         });
     }
+    async getNextSubAccountId() {
+        const userStats = this.getUserStats();
+        let userStatsAccount;
+        if (!userStats) {
+            userStatsAccount = await (0, fetch_1.fetchUserStatsAccount)(this.connection, this.program, this.wallet.publicKey);
+        }
+        else {
+            userStatsAccount = userStats.getAccount();
+        }
+        return userStatsAccount.numberOfSubAccountsCreated;
+    }
     async initializeReferrerName(name) {
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, 0);
         const nameBuffer = (0, userName_1.encodeName)(name);
@@ -597,7 +611,7 @@ class DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(ix, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(ix, txParams), [], this.opts);
         const userMapKey = this.getUserMapKey(subAccountId, this.wallet.publicKey);
         await ((_a = this.users.get(userMapKey)) === null || _a === void 0 ? void 0 : _a.unsubscribe());
         this.users.delete(userMapKey);
@@ -654,17 +668,45 @@ class DriftClient {
         return this.getUserAccount().spotPositions.find((spotPosition) => spotPosition.marketIndex === marketIndex);
     }
     getQuoteAssetTokenAmount() {
-        const spotMarket = this.getSpotMarketAccount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
-        const spotPosition = this.getSpotPosition(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
-        return (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType);
+        return this.getTokenAmount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
     }
+    /**
+     * Returns the token amount for a given market. The spot market precision is based on the token mint decimals.
+     * Positive if it is a deposit, negative if it is a borrow.
+     * @param marketIndex
+     */
     getTokenAmount(marketIndex) {
         const spotPosition = this.getSpotPosition(marketIndex);
         if (spotPosition === undefined) {
             return numericConstants_1.ZERO;
         }
         const spotMarket = this.getSpotMarketAccount(marketIndex);
-        return (0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType);
+        return (0, spotBalance_1.getSignedTokenAmount)((0, spotBalance_1.getTokenAmount)(spotPosition.scaledBalance, spotMarket, spotPosition.balanceType), spotPosition.balanceType);
+    }
+    /**
+     * Converts an amount to the spot precision for a given market. The spot market precision is based on the token mint decimals.
+     * @param marketIndex
+     * @param amount
+     */
+    convertToSpotPrecision(marketIndex, amount) {
+        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        return (0, spotMarket_1.castNumberToSpotPrecision)(amount, spotMarket);
+    }
+    /**
+     * Converts an amount to the perp precision. The perp market precision is {@link BASE_PRECISION} (1e9).
+     * @param amount
+     */
+    convertToPerpPrecision(amount) {
+        amount = typeof amount === 'number' ? new anchor_1.BN(amount) : amount;
+        return amount.mul(numericConstants_1.BASE_PRECISION);
+    }
+    /**
+     * Converts an amount to the price precision. The perp market precision is {@link PRICE_PRECISION} (1e6).
+     * @param amount
+     */
+    convertToPricePrecision(amount) {
+        amount = typeof amount === 'number' ? new anchor_1.BN(amount) : amount;
+        return amount.mul(numericConstants_1.PRICE_PRECISION);
     }
     getRemainingAccounts(params) {
         var _a;
@@ -902,7 +944,29 @@ class DriftClient {
         var _a;
         return (_a = this.getUserAccount()) === null || _a === void 0 ? void 0 : _a.orders.find((order) => order.userOrderId === userOrderId);
     }
-    async deposit(amount, marketIndex, collateralAccountPublicKey, subAccountId, reduceOnly = false) {
+    /**
+     * Get the associated token address for the given spot market
+     * @param marketIndex
+     * @param useNative
+     */
+    async getAssociatedTokenAccount(marketIndex, useNative = true) {
+        const spotMarket = this.getSpotMarketAccount(marketIndex);
+        if (useNative && spotMarket.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT)) {
+            return this.wallet.publicKey;
+        }
+        const mint = spotMarket.mint;
+        return await spl_token_1.Token.getAssociatedTokenAddress(spl_token_1.ASSOCIATED_TOKEN_PROGRAM_ID, spl_token_1.TOKEN_PROGRAM_ID, mint, this.wallet.publicKey);
+    }
+    /**
+     * Deposit funds into the given spot market
+     *
+     * @param amount
+     * @param marketIndex
+     * @param associatedTokenAccount can be the wallet public key if using native sol
+     * @param subAccountId
+     * @param reduceOnly
+     */
+    async deposit(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly = false) {
         const tx = new web3_js_1.Transaction();
         tx.add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 600000,
@@ -911,20 +975,20 @@ class DriftClient {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const signerAuthority = this.wallet.publicKey;
-        const createWSOLTokenAccount = isSolMarket && collateralAccountPublicKey.equals(signerAuthority);
+        const createWSOLTokenAccount = isSolMarket && associatedTokenAccount.equals(signerAuthority);
         if (createWSOLTokenAccount) {
             const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, true);
-            collateralAccountPublicKey = pubkey;
+            associatedTokenAccount = pubkey;
             ixs.forEach((ix) => {
                 tx.add(ix);
             });
             signers.forEach((signer) => additionalSigners.push(signer));
         }
-        const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, collateralAccountPublicKey, subAccountId, reduceOnly, true);
+        const depositCollateralIx = await this.getDepositInstruction(amount, marketIndex, associatedTokenAccount, subAccountId, reduceOnly, true);
         tx.add(depositCollateralIx);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, collateralAccountPublicKey, signerAuthority, signerAuthority, []));
+            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, associatedTokenAccount, signerAuthority, signerAuthority, []));
         }
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
@@ -1066,7 +1130,14 @@ class DriftClient {
         await this.addUser(subAccountId);
         return [txSig, userAccountPublicKey];
     }
-    async withdraw(amount, marketIndex, userTokenAccount, reduceOnly = false) {
+    /**
+     * Withdraws from a user account. If deposit doesn't already exist, creates a borrow
+     * @param amount
+     * @param marketIndex
+     * @param associatedTokenAddress - the token account to withdraw to. can be the wallet public key if using native sol
+     * @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,
@@ -1075,27 +1146,27 @@ class DriftClient {
         const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
         const isSolMarket = spotMarketAccount.mint.equals(spotMarkets_1.WRAPPED_SOL_MINT);
         const authority = this.wallet.publicKey;
-        const createWSOLTokenAccount = isSolMarket && userTokenAccount.equals(authority);
+        const createWSOLTokenAccount = isSolMarket && associatedTokenAddress.equals(authority);
         if (createWSOLTokenAccount) {
             const { ixs, signers, pubkey } = await this.getWrappedSolAccountCreationIxs(amount, false);
-            userTokenAccount = pubkey;
+            associatedTokenAddress = pubkey;
             ixs.forEach((ix) => {
                 tx.add(ix);
             });
             signers.forEach((signer) => additionalSigners.push(signer));
         }
         else {
-            const accountExists = await this.checkIfAccountExists(userTokenAccount);
+            const accountExists = await this.checkIfAccountExists(associatedTokenAddress);
             if (!accountExists) {
-                const createAssociatedTokenAccountIx = this.getAssociatedTokenAccountCreationIx(spotMarketAccount.mint, userTokenAccount);
+                const createAssociatedTokenAccountIx = this.getAssociatedTokenAccountCreationIx(spotMarketAccount.mint, associatedTokenAddress);
                 tx.add(createAssociatedTokenAccountIx);
             }
         }
-        const withdrawCollateral = await this.getWithdrawIx(amount, spotMarketAccount.marketIndex, userTokenAccount, reduceOnly);
+        const withdrawCollateral = await this.getWithdrawIx(amount, spotMarketAccount.marketIndex, associatedTokenAddress, reduceOnly);
         tx.add(withdrawCollateral);
         // Close the wrapped sol account at the end of the transaction
         if (createWSOLTokenAccount) {
-            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, userTokenAccount, authority, authority, []));
+            tx.add(spl_token_1.Token.createCloseAccountInstruction(spl_token_1.TOKEN_PROGRAM_ID, associatedTokenAddress, authority, authority, []));
         }
         const { txSig, slot } = await this.sendTransaction(tx, additionalSigners, this.opts);
         this.spotMarketLastSlotCache.set(marketIndex, slot);
@@ -1125,8 +1196,16 @@ class DriftClient {
             remainingAccounts,
         });
     }
+    /**
+     * Withdraws from the fromSubAccount and deposits into the toSubAccount
+     * @param amount
+     * @param marketIndex
+     * @param fromSubAccountId
+     * @param toSubAccountId
+     * @param txParams
+     */
     async transferDeposit(amount, marketIndex, fromSubAccountId, toSubAccountId, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getTransferDepositIx(amount, marketIndex, fromSubAccountId, toSubAccountId), txParams), [], this.opts);
         if (fromSubAccountId === this.activeSubAccountId ||
             toSubAccountId === this.activeSubAccountId) {
             this.spotMarketLastSlotCache.set(marketIndex, slot);
@@ -1167,7 +1246,7 @@ class DriftClient {
         });
     }
     async updateSpotMarketCumulativeInterest(marketIndex, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.updateSpotMarketCumulativeInterestIx(marketIndex), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.updateSpotMarketCumulativeInterestIx(marketIndex), txParams), [], this.opts);
         return txSig;
     }
     async updateSpotMarketCumulativeInterestIx(marketIndex) {
@@ -1181,7 +1260,7 @@ class DriftClient {
         });
     }
     async settleLP(settleeUserAccountPublicKey, marketIndex, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.settleLPIx(settleeUserAccountPublicKey, marketIndex), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settleLPIx(settleeUserAccountPublicKey, marketIndex), txParams), [], this.opts);
         return txSig;
     }
     async settleLPIx(settleeUserAccountPublicKey, marketIndex) {
@@ -1199,11 +1278,11 @@ class DriftClient {
         });
     }
     async removePerpLpShares(marketIndex, sharesToBurn, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesIx(marketIndex, sharesToBurn), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getRemovePerpLpSharesIx(marketIndex, sharesToBurn), txParams), [], this.opts);
         return txSig;
     }
     async removePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn), txParams), [], this.opts);
         return txSig;
     }
     async getRemovePerpLpSharesInExpiringMarket(marketIndex, userAccountPublicKey, sharesToBurn) {
@@ -1249,7 +1328,7 @@ class DriftClient {
         });
     }
     async addPerpLpShares(amount, marketIndex, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getAddPerpLpSharesIx(amount, marketIndex), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getAddPerpLpSharesIx(amount, marketIndex), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
@@ -1269,6 +1348,9 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
+    /**
+     * @deprecated use {@link placePerpOrder} or {@link placeAndTakePerpOrder} instead
+     */
     async openPosition(direction, amount, marketIndex, limitPrice) {
         return await this.placeAndTakePerpOrder({
             orderType: types_1.OrderType.MARKET,
@@ -1343,7 +1425,7 @@ class DriftClient {
         }
     }
     async placePerpOrder(orderParams, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlacePerpOrderIx(orderParams), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlacePerpOrderIx(orderParams), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -1371,7 +1453,7 @@ class DriftClient {
         });
     }
     async updateAMMs(marketIndexes, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getUpdateAMMsIx(marketIndexes), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateAMMsIx(marketIndexes), txParams), [], this.opts);
         return txSig;
     }
     async getUpdateAMMsIx(marketIndexes) {
@@ -1405,7 +1487,7 @@ class DriftClient {
         });
     }
     async settleExpiredMarket(marketIndex, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getSettleExpiredMarketIx(marketIndex), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getSettleExpiredMarketIx(marketIndex), txParams), [], this.opts);
         return txSig;
     }
     async getSettleExpiredMarketIx(marketIndex) {
@@ -1450,11 +1532,11 @@ class DriftClient {
                 perpMarket: perpMarketPublicKey,
             },
         });
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(ix, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(ix, txParams), [], this.opts);
         return txSig;
     }
     async cancelOrder(orderId, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getCancelOrderIx(orderId), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getCancelOrderIx(orderId), txParams), [], this.opts);
         return txSig;
     }
     async getCancelOrderIx(orderId) {
@@ -1473,7 +1555,7 @@ class DriftClient {
         });
     }
     async cancelOrderByUserId(userOrderId, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getCancelOrderByUserIdIx(userOrderId), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getCancelOrderByUserIdIx(userOrderId), txParams), [], this.opts);
         return txSig;
     }
     async getCancelOrderByUserIdIx(userOrderId) {
@@ -1495,7 +1577,7 @@ class DriftClient {
         });
     }
     async cancelOrders(marketType, marketIndex, direction, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getCancelOrdersIx(marketType, marketIndex, direction), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getCancelOrdersIx(marketType, marketIndex, direction), txParams), [], this.opts);
         return txSig;
     }
     async getCancelOrdersIx(marketType, marketIndex, direction) {
@@ -1545,7 +1627,7 @@ class DriftClient {
         return txSig;
     }
     async fillPerpOrder(userAccountPublicKey, user, order, makerInfo, referrerInfo, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo), txParams), [], this.opts);
         return txSig;
     }
     async getFillPerpOrderIx(userAccountPublicKey, userAccount, order, makerInfo, referrerInfo) {
@@ -1622,7 +1704,7 @@ class DriftClient {
         });
     }
     async placeSpotOrder(orderParams, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceSpotOrderIx(orderParams), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceSpotOrderIx(orderParams), txParams), [], this.opts);
         this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
         this.spotMarketLastSlotCache.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, slot);
         return txSig;
@@ -1649,7 +1731,7 @@ class DriftClient {
         });
     }
     async fillSpotOrder(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getFillSpotOrderIx(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getFillSpotOrderIx(userAccountPublicKey, user, order, fulfillmentConfig, makerInfo, referrerInfo), txParams), [], this.opts);
         return txSig;
     }
     async getFillSpotOrderIx(userAccountPublicKey, userAccount, order, fulfillmentConfig, makerInfo, referrerInfo) {
@@ -1866,7 +1948,7 @@ class DriftClient {
         });
     }
     async triggerOrder(userAccountPublicKey, user, order, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getTriggerOrderIx(userAccountPublicKey, user, order), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getTriggerOrderIx(userAccountPublicKey, user, order), txParams), [], this.opts);
         return txSig;
     }
     async getTriggerOrderIx(userAccountPublicKey, userAccount, order) {
@@ -1897,7 +1979,7 @@ class DriftClient {
         });
     }
     async forceCancelOrders(userAccountPublicKey, user, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getForceCancelOrdersIx(userAccountPublicKey, user), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getForceCancelOrdersIx(userAccountPublicKey, user), txParams), [], this.opts);
         return txSig;
     }
     async getForceCancelOrdersIx(userAccountPublicKey, userAccount) {
@@ -1917,7 +1999,7 @@ class DriftClient {
         });
     }
     async updateUserIdle(userAccountPublicKey, user, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getUpdateUserIdleIx(userAccountPublicKey, user), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateUserIdleIx(userAccountPublicKey, user), txParams), [], this.opts);
         return txSig;
     }
     async getUpdateUserIdleIx(userAccountPublicKey, userAccount) {
@@ -1936,7 +2018,7 @@ class DriftClient {
         });
     }
     async placeAndTakePerpOrder(orderParams, makerInfo, referrerInfo, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -1997,7 +2079,7 @@ class DriftClient {
         });
     }
     async placeAndMakePerpOrder(orderParams, takerInfo, referrerInfo, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndMakePerpOrderIx(orderParams, takerInfo, referrerInfo), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -2036,7 +2118,7 @@ class DriftClient {
         });
     }
     async placeAndTakeSpotOrder(orderParams, fulfillmentConfig, makerInfo, referrerInfo, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo), txParams), [], this.opts);
         this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
         this.spotMarketLastSlotCache.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, slot);
         return txSig;
@@ -2095,7 +2177,7 @@ class DriftClient {
         });
     }
     async placeAndMakeSpotOrder(orderParams, takerInfo, fulfillmentConfig, referrerInfo, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getPlaceAndMakeSpotOrderIx(orderParams, takerInfo, fulfillmentConfig, referrerInfo), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceAndMakeSpotOrderIx(orderParams, takerInfo, fulfillmentConfig, referrerInfo), txParams), [], this.opts);
         this.spotMarketLastSlotCache.set(orderParams.marketIndex, slot);
         this.spotMarketLastSlotCache.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, slot);
         return txSig;
@@ -2139,9 +2221,7 @@ class DriftClient {
         });
     }
     /**
-     * Close an entire position. If you want to reduce a position, use the {@link openPosition} method in the opposite direction of the current position.
-     * @param marketIndex
-     * @returns
+     * @deprecated use {@link placePerpOrder} or {@link placeAndTakePerpOrder} instead
      */
     async closePosition(marketIndex, limitPrice) {
         const userPosition = this.getUser().getPerpPosition(marketIndex);
@@ -2224,7 +2304,7 @@ class DriftClient {
             immediateOrCancel: immediateOrCancel || null,
             maxTs: maxTs || null,
         };
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getModifyOrderIx(orderId, orderParams), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getModifyOrderIx(orderId, orderParams), txParams), [], this.opts);
         return txSig;
     }
     async getModifyOrderIx(orderId, orderParams) {
@@ -2276,7 +2356,7 @@ class DriftClient {
             immediateOrCancel: immediateOrCancel || null,
             maxTs: maxTs || null,
         };
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getModifyOrderByUserIdIx(userOrderId, orderParams), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getModifyOrderByUserIdIx(userOrderId, orderParams), txParams), [], this.opts);
         return txSig;
     }
     async getModifyOrderByUserIdIx(userOrderId, orderParams) {
@@ -2311,7 +2391,7 @@ class DriftClient {
         return txSig;
     }
     async settlePNL(settleeUserAccountPublicKey, settleeUserAccount, marketIndex, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex), txParams), [], this.opts);
         return txSig;
     }
     async settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex) {
@@ -2331,7 +2411,7 @@ class DriftClient {
         });
     }
     async liquidatePerp(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidatePerpIx(userAccountPublicKey, userAccount, marketIndex, maxBaseAssetAmount, limitPrice), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(marketIndex, slot);
         return txSig;
     }
@@ -2357,7 +2437,7 @@ class DriftClient {
         });
     }
     async liquidateSpot(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidateSpotIx(userAccountPublicKey, userAccount, assetMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice), txParams), [], this.opts);
         this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
         this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
         return txSig;
@@ -2384,7 +2464,7 @@ class DriftClient {
         });
     }
     async liquidateBorrowForPerpPnl(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidateBorrowForPerpPnlIx(userAccountPublicKey, userAccount, perpMarketIndex, liabilityMarketIndex, maxLiabilityTransfer, limitPrice), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
         this.spotMarketLastSlotCache.set(liabilityMarketIndex, slot);
         return txSig;
@@ -2411,7 +2491,7 @@ class DriftClient {
         });
     }
     async liquidatePerpPnlForDeposit(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice, txParams) {
-        const { txSig, slot } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getLiquidatePerpPnlForDepositIx(userAccountPublicKey, userAccount, perpMarketIndex, assetMarketIndex, maxPnlTransfer, limitPrice), txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(perpMarketIndex, slot);
         this.spotMarketLastSlotCache.set(assetMarketIndex, slot);
         return txSig;
@@ -2438,7 +2518,7 @@ class DriftClient {
         });
     }
     async resolvePerpBankruptcy(userAccountPublicKey, userAccount, marketIndex, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex), txParams), [], this.opts);
         return txSig;
     }
     async getResolvePerpBankruptcyIx(userAccountPublicKey, userAccount, marketIndex) {
@@ -2468,7 +2548,7 @@ class DriftClient {
         });
     }
     async resolveSpotBankruptcy(userAccountPublicKey, userAccount, marketIndex, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getResolveSpotBankruptcyIx(userAccountPublicKey, userAccount, marketIndex), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getResolveSpotBankruptcyIx(userAccountPublicKey, userAccount, marketIndex), txParams), [], this.opts);
         return txSig;
     }
     async getResolveSpotBankruptcyIx(userAccountPublicKey, userAccount, marketIndex) {
@@ -2497,7 +2577,7 @@ class DriftClient {
         });
     }
     async updateFundingRate(perpMarketIndex, oracle, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getUpdateFundingRateIx(perpMarketIndex, oracle), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getUpdateFundingRateIx(perpMarketIndex, oracle), txParams), [], this.opts);
         return txSig;
     }
     async getUpdateFundingRateIx(perpMarketIndex, oracle) {
@@ -2511,7 +2591,7 @@ class DriftClient {
         });
     }
     async settleFundingPayment(userAccountPublicKey, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getSettleFundingPaymentIx(userAccountPublicKey), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getSettleFundingPaymentIx(userAccountPublicKey), txParams), [], this.opts);
         return txSig;
     }
     async getSettleFundingPaymentIx(userAccountPublicKey) {
@@ -2548,7 +2628,7 @@ class DriftClient {
         return oracleData;
     }
     async initializeInsuranceFundStake(marketIndex, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getInitializeInsuranceFundStakeIx(marketIndex), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getInitializeInsuranceFundStakeIx(marketIndex), txParams), [], this.opts);
         return txSig;
     }
     async getInitializeInsuranceFundStakeIx(marketIndex) {
@@ -2740,7 +2820,7 @@ class DriftClient {
         return txSig;
     }
     async resolvePerpPnlDeficit(spotMarketIndex, perpMarketIndex, txParams) {
-        const { txSig } = await this.sendTransaction((0, utils_1.wrapInTx)(await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice), [], this.opts);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex), txParams), [], this.opts);
         return txSig;
     }
     async getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex) {
@@ -2803,7 +2883,47 @@ class DriftClient {
         return undefined;
     }
     sendTransaction(tx, additionalSigners, opts, preSigned) {
-        return this.txSender.send(tx, additionalSigners, opts, preSigned);
+        // @ts-ignore
+        if (!tx.message) {
+            return this.txSender.send(tx, additionalSigners, opts, preSigned);
+        }
+        else {
+            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts);
+        }
+    }
+    async buildTransaction(instructions, txParams) {
+        var _a, _b;
+        const allIx = [];
+        const computeUnits = (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000;
+        if (computeUnits !== 200000) {
+            allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
+                units: computeUnits,
+            }));
+        }
+        const computeUnitsPrice = (_b = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice) !== null && _b !== void 0 ? _b : 0;
+        if (computeUnitsPrice !== 0) {
+            allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
+                microLamports: computeUnitsPrice,
+            }));
+        }
+        if (Array.isArray(instructions)) {
+            allIx.push(...instructions);
+        }
+        else {
+            allIx.push(instructions);
+        }
+        if (this.txVersion === 'legacy') {
+            return new web3_js_1.Transaction().add(...allIx);
+        }
+        else {
+            const marketLookupTable = await this.fetchMarketLookupTableAccount();
+            const message = new web3_js_1.TransactionMessage({
+                payerKey: this.provider.wallet.publicKey,
+                recentBlockhash: (await this.provider.connection.getRecentBlockhash(this.opts.preflightCommitment)).blockhash,
+                instructions: allIx,
+            }).compileToV0Message([marketLookupTable]);
+            return new web3_js_1.VersionedTransaction(message);
+        }
     }
 }
 exports.DriftClient = DriftClient;