@drift-labs/sdk 2.31.1-beta.2 → 2.31.1-beta.21

package/lib/driftClient.js

@@ -52,6 +52,7 @@ const market_1 = require("./math/market");
 const fetch_1 = require("./accounts/fetch");
 const spotMarket_1 = require("./math/spotMarket");
 const memcmp_1 = require("./memcmp");
+const marinade_1 = require("./marinade");
 /**
  * # 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.
@@ -64,11 +65,13 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
         this.spotMarketLastSlotCache = new Map();
+        this.mustIncludePerpMarketIndexes = new Set();
+        this.mustIncludeSpotMarketIndexes = new Set();
         this.connection = config.connection;
         this.wallet = config.wallet;
         this.opts = config.opts || anchor_1.AnchorProvider.defaultOptions();
@@ -78,6 +81,10 @@ class DriftClient {
         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';
+        this.txParams = {
+            computeUnits: (_g = (_f = config.txParams) === null || _f === void 0 ? void 0 : _f.computeUnits) !== null && _g !== void 0 ? _g : 600000,
+            computeUnitsPrice: (_j = (_h = config.txParams) === null || _h === void 0 ? void 0 : _h.computeUnitsPrice) !== null && _j !== void 0 ? _j : 0,
+        };
         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');
         }
@@ -92,16 +99,25 @@ class DriftClient {
             : config.subAccountIds
                 ? new Map([[this.authority.toString(), config.subAccountIds]])
                 : new Map();
-        this.includeDelegates = (_f = config.includeDelegates) !== null && _f !== void 0 ? _f : false;
-        this.userAccountSubscriptionConfig =
-            ((_g = config.accountSubscription) === null || _g === void 0 ? void 0 : _g.type) === 'polling'
-                ? {
-                    type: 'polling',
-                    accountLoader: config.accountSubscription.accountLoader,
-                }
-                : {
-                    type: 'websocket',
-                };
+        this.includeDelegates = (_k = config.includeDelegates) !== null && _k !== void 0 ? _k : false;
+        if (((_l = config.accountSubscription) === null || _l === void 0 ? void 0 : _l.type) === 'polling') {
+            this.userAccountSubscriptionConfig = {
+                type: 'polling',
+                accountLoader: config.accountSubscription.accountLoader,
+            };
+            this.userStatsAccountSubscriptionConfig = {
+                type: 'polling',
+                accountLoader: config.accountSubscription.accountLoader,
+            };
+        }
+        else {
+            this.userAccountSubscriptionConfig = {
+                type: 'websocket',
+            };
+            this.userStatsAccountSubscriptionConfig = {
+                type: 'websocket',
+            };
+        }
         if (config.userStats) {
             this.userStats = new userStats_1.UserStats({
                 driftClient: this,
@@ -116,14 +132,19 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_h = config.accountSubscription) === null || _h === void 0 ? void 0 : _h.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_j = config.perpMarketIndexes) !== null && _j !== void 0 ? _j : [], (_k = config.spotMarketIndexes) !== null && _k !== void 0 ? _k : [], (_l = config.oracleInfos) !== null && _l !== void 0 ? _l : [], noMarketsAndOraclesSpecified);
+        if (((_m = config.accountSubscription) === null || _m === void 0 ? void 0 : _m.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_o = config.perpMarketIndexes) !== null && _o !== void 0 ? _o : [], (_p = config.spotMarketIndexes) !== null && _p !== void 0 ? _p : [], (_q = config.oracleInfos) !== null && _q !== void 0 ? _q : [], noMarketsAndOraclesSpecified);
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_m = config.perpMarketIndexes) !== null && _m !== void 0 ? _m : [], (_o = config.spotMarketIndexes) !== null && _o !== void 0 ? _o : [], (_p = config.oracleInfos) !== null && _p !== void 0 ? _p : [], noMarketsAndOraclesSpecified);
+            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_r = config.perpMarketIndexes) !== null && _r !== void 0 ? _r : [], (_s = config.spotMarketIndexes) !== null && _s !== void 0 ? _s : [], (_t = config.oracleInfos) !== null && _t !== void 0 ? _t : [], noMarketsAndOraclesSpecified);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
-        this.txSender = (_q = config.txSender) !== null && _q !== void 0 ? _q : new retryTxSender_1.RetryTxSender(this.provider);
+        this.txSender =
+            (_u = config.txSender) !== null && _u !== void 0 ? _u : new retryTxSender_1.RetryTxSender({
+                connection: this.connection,
+                wallet: this.wallet,
+                opts: this.opts,
+            });
     }
     getUserMapKey(subAccountId, authority) {
         return `${subAccountId}_${authority.toString()}`;
@@ -274,7 +295,7 @@ class DriftClient {
         const newProgram = new anchor_1.Program(drift_json_1.default, this.program.programId, newProvider);
         this.skipLoadUsers = false;
         // Update provider for txSender with new wallet details
-        this.txSender.provider = newProvider;
+        this.txSender.wallet = newWallet;
         this.wallet = newWallet;
         this.provider = newProvider;
         this.program = newProgram;
@@ -304,7 +325,7 @@ class DriftClient {
                 this.userStats = new userStats_1.UserStats({
                     driftClient: this,
                     userStatsAccountPublicKey: this.getUserStatsAccountPublicKey(),
-                    accountSubscription: this.userAccountSubscriptionConfig,
+                    accountSubscription: this.userStatsAccountSubscriptionConfig,
                 });
                 await this.userStats.subscribe();
             }
@@ -487,6 +508,27 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async getUpdateUserMarginTradingEnabledIx(marginTradingEnabled, subAccountId = 0, userAccountPublicKey) {
+        const userAccountPublicKeyToUse = userAccountPublicKey ||
+            (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
+        await this.addUser(subAccountId, this.wallet.publicKey);
+        let remainingAccounts;
+        try {
+            remainingAccounts = this.getRemainingAccounts({
+                userAccounts: [this.getUserAccount(subAccountId)],
+            });
+        }
+        catch (err) {
+            remainingAccounts = [];
+        }
+        return await this.program.instruction.updateUserMarginTradingEnabled(subAccountId, marginTradingEnabled, {
+            accounts: {
+                user: userAccountPublicKeyToUse,
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
+    }
     async updateUserMarginTradingEnabled(marginTradingEnabled, subAccountId = 0) {
         const userAccountPublicKey = (0, pda_1.getUserAccountPublicKeySync)(this.program.programId, this.wallet.publicKey, subAccountId);
         await this.addUser(subAccountId, this.wallet.publicKey);
@@ -606,10 +648,16 @@ class DriftClient {
         authority = authority !== null && authority !== void 0 ? authority : this.authority;
         const userMapKey = this.getUserMapKey(subAccountId, authority);
         if (!this.users.has(userMapKey)) {
-            throw new Error(`Clearing House has no user for user id ${userMapKey}`);
+            throw new Error(`DriftClient has no user for user id ${userMapKey}`);
         }
         return this.users.get(userMapKey);
     }
+    hasUser(subAccountId, authority) {
+        subAccountId = subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId;
+        authority = authority !== null && authority !== void 0 ? authority : this.authority;
+        const userMapKey = this.getUserMapKey(subAccountId, authority);
+        return this.users.has(userMapKey);
+    }
     getUsers() {
         // delegate users get added to the end
         return [...this.users.values()]
@@ -692,6 +740,21 @@ class DriftClient {
         amount = typeof amount === 'number' ? new anchor_1.BN(amount) : amount;
         return amount.mul(numericConstants_1.PRICE_PRECISION);
     }
+    /**
+     * Each drift instruction must include perp and sport market accounts in the ix remaining accounts.
+     * Use this function to force a subset of markets to be included in the remaining accounts for every ix
+     *
+     * @param perpMarketIndexes
+     * @param spotMarketIndexes
+     */
+    mustIncludeMarketsInIx({ perpMarketIndexes, spotMarketIndexes, }) {
+        perpMarketIndexes.forEach((perpMarketIndex) => {
+            this.mustIncludePerpMarketIndexes.add(perpMarketIndex);
+        });
+        spotMarketIndexes.forEach((spotMarketIndex) => {
+            this.mustIncludeSpotMarketIndexes.add(spotMarketIndex);
+        });
+    }
     getRemainingAccounts(params) {
         var _a;
         const { oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap } = this.getRemainingAccountMapsForUsers(params.userAccounts);
@@ -701,30 +764,7 @@ class DriftClient {
                 // if cache has more recent slot than user positions account slot, add market to remaining accounts
                 // otherwise remove from slot
                 if (slot > lastUserSlot) {
-                    const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
-                    perpMarketAccountMap.set(marketIndex, {
-                        pubkey: perpMarketAccount.pubkey,
-                        isSigner: false,
-                        isWritable: false,
-                    });
-                    oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
-                        pubkey: perpMarketAccount.amm.oracle,
-                        isSigner: false,
-                        isWritable: false,
-                    });
-                    const spotMarketAccount = this.getSpotMarketAccount(perpMarketAccount.quoteSpotMarketIndex);
-                    spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
-                        pubkey: spotMarketAccount.pubkey,
-                        isSigner: false,
-                        isWritable: false,
-                    });
-                    if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
-                        oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
-                            pubkey: spotMarketAccount.oracle,
-                            isSigner: false,
-                            isWritable: false,
-                        });
-                    }
+                    this.addPerpMarketToRemainingAccountMaps(marketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
                 }
                 else {
                     this.perpMarketLastSlotCache.delete(marketIndex);
@@ -734,19 +774,7 @@ class DriftClient {
                 // if cache has more recent slot than user positions account slot, add market to remaining accounts
                 // otherwise remove from slot
                 if (slot > lastUserSlot) {
-                    const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
-                    spotMarketAccountMap.set(marketIndex, {
-                        pubkey: spotMarketAccount.pubkey,
-                        isSigner: false,
-                        isWritable: false,
-                    });
-                    if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
-                        oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
-                            pubkey: spotMarketAccount.oracle,
-                            isSigner: false,
-                            isWritable: false,
-                        });
-                    }
+                    this.addSpotMarketToRemainingAccountMaps(marketIndex, false, oracleAccountMap, spotMarketAccountMap);
                 }
                 else {
                     this.spotMarketLastSlotCache.delete(marketIndex);
@@ -754,91 +782,32 @@ class DriftClient {
             }
         }
         if (params.readablePerpMarketIndex !== undefined) {
-            const perpMarketAccount = this.getPerpMarketAccount(params.readablePerpMarketIndex);
-            perpMarketAccountMap.set(params.readablePerpMarketIndex, {
-                pubkey: perpMarketAccount.pubkey,
-                isSigner: false,
-                isWritable: false,
-            });
-            oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
-                pubkey: perpMarketAccount.amm.oracle,
-                isSigner: false,
-                isWritable: false,
-            });
-            const spotMarketAccount = this.getSpotMarketAccount(perpMarketAccount.quoteSpotMarketIndex);
-            spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
-                pubkey: spotMarketAccount.pubkey,
-                isSigner: false,
-                isWritable: false,
-            });
-            if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
-                oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
-                    pubkey: spotMarketAccount.oracle,
-                    isSigner: false,
-                    isWritable: false,
-                });
+            const readablePerpMarketIndexes = Array.isArray(params.readablePerpMarketIndex)
+                ? params.readablePerpMarketIndex
+                : [params.readablePerpMarketIndex];
+            for (const marketIndex of readablePerpMarketIndexes) {
+                this.addPerpMarketToRemainingAccountMaps(marketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
             }
         }
+        for (const perpMarketIndex of this.mustIncludePerpMarketIndexes.values()) {
+            this.addPerpMarketToRemainingAccountMaps(perpMarketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
+        }
         if (params.readableSpotMarketIndexes !== undefined) {
             for (const readableSpotMarketIndex of params.readableSpotMarketIndexes) {
-                const spotMarketAccount = this.getSpotMarketAccount(readableSpotMarketIndex);
-                spotMarketAccountMap.set(readableSpotMarketIndex, {
-                    pubkey: spotMarketAccount.pubkey,
-                    isSigner: false,
-                    isWritable: false,
-                });
-                if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
-                    oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
-                        pubkey: spotMarketAccount.oracle,
-                        isSigner: false,
-                        isWritable: false,
-                    });
-                }
+                this.addSpotMarketToRemainingAccountMaps(readableSpotMarketIndex, false, oracleAccountMap, spotMarketAccountMap);
             }
         }
+        for (const spotMarketIndex of this.mustIncludeSpotMarketIndexes.values()) {
+            this.addSpotMarketToRemainingAccountMaps(spotMarketIndex, false, oracleAccountMap, spotMarketAccountMap);
+        }
         if (params.writablePerpMarketIndexes !== undefined) {
             for (const writablePerpMarketIndex of params.writablePerpMarketIndexes) {
-                const perpMarketAccount = this.getPerpMarketAccount(writablePerpMarketIndex);
-                perpMarketAccountMap.set(writablePerpMarketIndex, {
-                    pubkey: perpMarketAccount.pubkey,
-                    isSigner: false,
-                    isWritable: true,
-                });
-                oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
-                    pubkey: perpMarketAccount.amm.oracle,
-                    isSigner: false,
-                    isWritable: false,
-                });
-                const spotMarketAccount = this.getSpotMarketAccount(perpMarketAccount.quoteSpotMarketIndex);
-                spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
-                    pubkey: spotMarketAccount.pubkey,
-                    isSigner: false,
-                    isWritable: false,
-                });
-                if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
-                    oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
-                        pubkey: spotMarketAccount.oracle,
-                        isSigner: false,
-                        isWritable: false,
-                    });
-                }
+                this.addPerpMarketToRemainingAccountMaps(writablePerpMarketIndex, true, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
             }
         }
         if (params.writableSpotMarketIndexes !== undefined) {
             for (const writableSpotMarketIndex of params.writableSpotMarketIndexes) {
-                const spotMarketAccount = this.getSpotMarketAccount(writableSpotMarketIndex);
-                spotMarketAccountMap.set(spotMarketAccount.marketIndex, {
-                    pubkey: spotMarketAccount.pubkey,
-                    isSigner: false,
-                    isWritable: true,
-                });
-                if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
-                    oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
-                        pubkey: spotMarketAccount.oracle,
-                        isSigner: false,
-                        isWritable: false,
-                    });
-                }
+                this.addSpotMarketToRemainingAccountMaps(writableSpotMarketIndex, true, oracleAccountMap, spotMarketAccountMap);
             }
         }
         return [
@@ -847,6 +816,35 @@ class DriftClient {
             ...perpMarketAccountMap.values(),
         ];
     }
+    addPerpMarketToRemainingAccountMaps(marketIndex, writable, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap) {
+        const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
+        perpMarketAccountMap.set(marketIndex, {
+            pubkey: perpMarketAccount.pubkey,
+            isSigner: false,
+            isWritable: writable,
+        });
+        oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
+            pubkey: perpMarketAccount.amm.oracle,
+            isSigner: false,
+            isWritable: false,
+        });
+        this.addSpotMarketToRemainingAccountMaps(perpMarketAccount.quoteSpotMarketIndex, false, oracleAccountMap, spotMarketAccountMap);
+    }
+    addSpotMarketToRemainingAccountMaps(marketIndex, writable, oracleAccountMap, spotMarketAccountMap) {
+        const spotMarketAccount = this.getSpotMarketAccount(marketIndex);
+        spotMarketAccountMap.set(spotMarketAccount.marketIndex, {
+            pubkey: spotMarketAccount.pubkey,
+            isSigner: false,
+            isWritable: writable,
+        });
+        if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
+            oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
+                pubkey: spotMarketAccount.oracle,
+                isSigner: false,
+                isWritable: false,
+            });
+        }
+    }
     getRemainingAccountMapsForUsers(userAccounts) {
         const oracleAccountMap = new Map();
         const spotMarketAccountMap = new Map();
@@ -854,63 +852,16 @@ class DriftClient {
         for (const userAccount of userAccounts) {
             for (const spotPosition of userAccount.spotPositions) {
                 if (!(0, spotPosition_1.isSpotPositionAvailable)(spotPosition)) {
-                    const spotMarket = this.getSpotMarketAccount(spotPosition.marketIndex);
-                    spotMarketAccountMap.set(spotPosition.marketIndex, {
-                        pubkey: spotMarket.pubkey,
-                        isSigner: false,
-                        isWritable: false,
-                    });
-                    if (!spotMarket.oracle.equals(web3_js_1.PublicKey.default)) {
-                        oracleAccountMap.set(spotMarket.oracle.toString(), {
-                            pubkey: spotMarket.oracle,
-                            isSigner: false,
-                            isWritable: false,
-                        });
-                    }
+                    this.addSpotMarketToRemainingAccountMaps(spotPosition.marketIndex, false, oracleAccountMap, spotMarketAccountMap);
                     if (!spotPosition.openAsks.eq(numericConstants_1.ZERO) ||
                         !spotPosition.openBids.eq(numericConstants_1.ZERO)) {
-                        const quoteSpotMarket = this.getQuoteSpotMarketAccount();
-                        spotMarketAccountMap.set(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, {
-                            pubkey: quoteSpotMarket.pubkey,
-                            isSigner: false,
-                            isWritable: false,
-                        });
-                        if (!quoteSpotMarket.oracle.equals(web3_js_1.PublicKey.default)) {
-                            oracleAccountMap.set(quoteSpotMarket.oracle.toString(), {
-                                pubkey: quoteSpotMarket.oracle,
-                                isSigner: false,
-                                isWritable: false,
-                            });
-                        }
+                        this.addSpotMarketToRemainingAccountMaps(numericConstants_1.QUOTE_SPOT_MARKET_INDEX, false, oracleAccountMap, spotMarketAccountMap);
                     }
                 }
             }
             for (const position of userAccount.perpPositions) {
                 if (!(0, position_1.positionIsAvailable)(position)) {
-                    const perpMarketAccount = this.getPerpMarketAccount(position.marketIndex);
-                    perpMarketAccountMap.set(position.marketIndex, {
-                        pubkey: perpMarketAccount.pubkey,
-                        isWritable: false,
-                        isSigner: false,
-                    });
-                    oracleAccountMap.set(perpMarketAccount.amm.oracle.toString(), {
-                        pubkey: perpMarketAccount.amm.oracle,
-                        isWritable: false,
-                        isSigner: false,
-                    });
-                    const spotMarketAccount = this.getSpotMarketAccount(perpMarketAccount.quoteSpotMarketIndex);
-                    spotMarketAccountMap.set(perpMarketAccount.quoteSpotMarketIndex, {
-                        pubkey: spotMarketAccount.pubkey,
-                        isSigner: false,
-                        isWritable: false,
-                    });
-                    if (!spotMarketAccount.oracle.equals(web3_js_1.PublicKey.default)) {
-                        oracleAccountMap.set(spotMarketAccount.oracle.toString(), {
-                            pubkey: spotMarketAccount.oracle,
-                            isSigner: false,
-                            isWritable: false,
-                        });
-                    }
+                    this.addPerpMarketToRemainingAccountMaps(position.marketIndex, false, oracleAccountMap, spotMarketAccountMap, perpMarketAccountMap);
                 }
             }
         }
@@ -1064,7 +1015,7 @@ class DriftClient {
         return (0, spl_token_1.createAssociatedTokenAccountInstruction)(this.wallet.publicKey, associatedTokenAddress, this.wallet.publicKey, tokenMintAddress);
     }
     /**
-     * Creates the Clearing House User account for a user, and deposits some initial collateral
+     * Creates the User account for a user, and deposits some initial collateral
      * @param amount
      * @param userTokenAccount
      * @param marketIndex
@@ -1349,6 +1300,19 @@ class DriftClient {
             remainingAccounts: remainingAccounts,
         });
     }
+    getQuoteValuePerLpShare(marketIndex) {
+        const perpMarketAccount = this.getPerpMarketAccount(marketIndex);
+        const openBids = anchor_1.BN.max(perpMarketAccount.amm.baseAssetReserve.sub(perpMarketAccount.amm.minBaseAssetReserve), numericConstants_1.ZERO);
+        const openAsks = anchor_1.BN.max(perpMarketAccount.amm.maxBaseAssetReserve.sub(perpMarketAccount.amm.baseAssetReserve), numericConstants_1.ZERO);
+        const oraclePriceData = this.getOracleDataForPerpMarket(marketIndex);
+        const maxOpenBidsAsks = anchor_1.BN.max(openBids, openAsks);
+        const quoteValuePerLpShare = maxOpenBidsAsks
+            .mul(oraclePriceData.price)
+            .mul(numericConstants_1.QUOTE_PRECISION)
+            .div(numericConstants_1.PRICE_PRECISION)
+            .div(perpMarketAccount.amm.sqrtK);
+        return quoteValuePerLpShare;
+    }
     /**
      * @deprecated use {@link placePerpOrder} or {@link placeAndTakePerpOrder} instead
      */
@@ -1608,23 +1572,45 @@ class DriftClient {
         });
     }
     async cancelAndPlaceOrders(cancelOrderParams, placeOrderParams, txParams) {
-        const tx = (0, utils_1.wrapInTx)(await this.getCancelOrdersIx(cancelOrderParams.marketType, cancelOrderParams.marketIndex, cancelOrderParams.direction), txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits, txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice);
-        for (const placeOrderParam of placeOrderParams) {
-            const marketType = placeOrderParam.marketType;
-            if (!marketType) {
-                throw new Error('marketType must be set on placeOrderParams');
-            }
-            let ix;
-            if ((0, types_1.isVariant)(marketType, 'perp')) {
-                ix = this.getPlacePerpOrderIx(placeOrderParam);
+        const ixs = [
+            await this.getCancelOrdersIx(cancelOrderParams.marketType, cancelOrderParams.marketIndex, cancelOrderParams.direction),
+            await this.getPlaceOrdersIx(placeOrderParams),
+        ];
+        const tx = await this.buildTransaction(ixs, txParams);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async placeOrders(params, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getPlaceOrdersIx(params), txParams), [], this.opts);
+        return txSig;
+    }
+    async getPlaceOrdersIx(params) {
+        const userAccountPublicKey = await this.getUserAccountPublicKey();
+        const readablePerpMarketIndex = [];
+        const readableSpotMarketIndexes = [];
+        for (const param of params) {
+            if ((0, types_1.isVariant)(param.marketType, 'perp')) {
+                readablePerpMarketIndex.push(param.marketIndex);
             }
             else {
-                ix = this.getPlaceSpotOrderIx(placeOrderParam);
+                readableSpotMarketIndexes.push(param.marketIndex);
             }
-            tx.add(ix);
         }
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [this.getUserAccount()],
+            readablePerpMarketIndex,
+            readableSpotMarketIndexes,
+            useMarketLastSlotCache: true,
+        });
+        return await this.program.instruction.placeOrders(params, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                user: userAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
     }
     async fillPerpOrder(userAccountPublicKey, user, order, makerInfo, referrerInfo, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getFillPerpOrderIx(userAccountPublicKey, user, order, makerInfo, referrerInfo), txParams), [], this.opts);
@@ -1960,6 +1946,25 @@ class DriftClient {
      * @param txParams
      */
     async swap({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, txParams, }) {
+        const { ixs, lookupTables } = await this.getJupiterSwapIx({
+            jupiterClient,
+            outMarketIndex,
+            inMarketIndex,
+            outAssociatedTokenAccount,
+            inAssociatedTokenAccount,
+            amount,
+            slippageBps,
+            swapMode,
+            route,
+            reduceOnly,
+        });
+        const tx = (await this.buildTransaction(ixs, txParams, 0, lookupTables));
+        const { txSig, slot } = await this.sendTransaction(tx);
+        this.spotMarketLastSlotCache.set(outMarketIndex, slot);
+        this.spotMarketLastSlotCache.set(inMarketIndex, slot);
+        return txSig;
+    }
+    async getJupiterSwapIx({ jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, route, reduceOnly, userAccountPublicKey, }) {
         const outMarket = this.getSpotMarketAccount(outMarketIndex);
         const inMarket = this.getSpotMarketAccount(inMarketIndex);
         if (!route) {
@@ -2010,18 +2015,15 @@ class DriftClient {
             inTokenAccount: inAssociatedTokenAccount,
             outTokenAccount: outAssociatedTokenAccount,
             reduceOnly,
+            userAccountPublicKey,
         });
-        const instructions = [
+        const ixs = [
             ...preInstructions,
             beginSwapIx,
             ...jupiterInstructions,
             endSwapIx,
         ];
-        const tx = (await this.buildTransaction(instructions, txParams, 0, lookupTables));
-        const { txSig, slot } = await this.sendTransaction(tx);
-        this.spotMarketLastSlotCache.set(outMarketIndex, slot);
-        this.spotMarketLastSlotCache.set(inMarketIndex, slot);
-        return txSig;
+        return { ixs, lookupTables };
     }
     /**
      * Get the drift begin_swap and end_swap instructions
@@ -2032,11 +2034,14 @@ class DriftClient {
      * @param inTokenAccount the token account to move the tokens being sold
      * @param outTokenAccount the token account to receive the tokens being bought
      * @param limitPrice the limit price of the swap
+     * @param reduceOnly
+     * @param userAccountPublicKey optional, specify a custom userAccountPublicKey to use instead of getting the current user account; can be helpful if the account is being created within the current tx
      */
-    async getSwapIx({ outMarketIndex, inMarketIndex, amountIn, inTokenAccount, outTokenAccount, limitPrice, reduceOnly, }) {
-        const userAccountPublicKey = await this.getUserAccountPublicKey();
+    async getSwapIx({ outMarketIndex, inMarketIndex, amountIn, inTokenAccount, outTokenAccount, limitPrice, reduceOnly, userAccountPublicKey, }) {
+        const userAccountPublicKeyToUse = userAccountPublicKey || (await this.getUserAccountPublicKey());
+        const userAccounts = this.hasUser() ? [this.getUserAccount()] : [];
         const remainingAccounts = this.getRemainingAccounts({
-            userAccounts: [this.getUserAccount()],
+            userAccounts,
             writableSpotMarketIndexes: [outMarketIndex, inMarketIndex],
         });
         const outSpotMarket = this.getSpotMarketAccount(outMarketIndex);
@@ -2044,7 +2049,7 @@ class DriftClient {
         const beginSwapIx = await this.program.instruction.beginSwap(inMarketIndex, outMarketIndex, amountIn, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                user: userAccountPublicKey,
+                user: userAccountPublicKeyToUse,
                 userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.authority,
                 outSpotMarketVault: outSpotMarket.vault,
@@ -2060,7 +2065,7 @@ class DriftClient {
         const endSwapIx = await this.program.instruction.endSwap(inMarketIndex, outMarketIndex, limitPrice !== null && limitPrice !== void 0 ? limitPrice : null, reduceOnly !== null && reduceOnly !== void 0 ? reduceOnly : null, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                user: userAccountPublicKey,
+                user: userAccountPublicKeyToUse,
                 userStats: this.getUserStatsAccountPublicKey(),
                 authority: this.authority,
                 outSpotMarketVault: outSpotMarket.vault,
@@ -2075,6 +2080,40 @@ class DriftClient {
         });
         return { beginSwapIx, endSwapIx };
     }
+    async stakeForMSOL({ amount }) {
+        const ixs = await this.getStakeForMSOLIx({ amount });
+        const tx = await this.buildTransaction(ixs);
+        return this.sendTransaction(tx);
+    }
+    async getStakeForMSOLIx({ amount, userAccountPublicKey, }) {
+        const wSOLMint = this.getSpotMarketAccount(1).mint;
+        const mSOLAccount = await this.getAssociatedTokenAccount(2);
+        const wSOLAccount = await this.getAssociatedTokenAccount(1, false);
+        const wSOLAccountExists = await this.checkIfAccountExists(wSOLAccount);
+        const closeWSOLIx = (0, spl_token_1.createCloseAccountInstruction)(wSOLAccount, this.wallet.publicKey, this.wallet.publicKey);
+        const createWSOLIx = await this.createAssociatedTokenAccountIdempotentInstruction(wSOLAccount, this.wallet.publicKey, this.wallet.publicKey, wSOLMint);
+        const { beginSwapIx, endSwapIx } = await this.getSwapIx({
+            inMarketIndex: 1,
+            outMarketIndex: 2,
+            amountIn: amount,
+            inTokenAccount: wSOLAccount,
+            outTokenAccount: mSOLAccount,
+            userAccountPublicKey,
+        });
+        const program = (0, marinade_1.getMarinadeFinanceProgram)(this.provider);
+        const depositIx = await (0, marinade_1.getMarinadeDepositIx)({
+            program,
+            mSOLAccount: mSOLAccount,
+            transferFrom: this.wallet.publicKey,
+            amount,
+        });
+        const ixs = [];
+        if (!wSOLAccountExists) {
+            ixs.push(createWSOLIx);
+        }
+        ixs.push(beginSwapIx, closeWSOLIx, depositIx, createWSOLIx, endSwapIx);
+        return ixs;
+    }
     async triggerOrder(userAccountPublicKey, user, order, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getTriggerOrderIx(userAccountPublicKey, user, order), txParams), [], this.opts);
         return txSig;
@@ -3049,13 +3088,13 @@ class DriftClient {
     async buildTransaction(instructions, txParams, txVersion, lookupTables) {
         var _a, _b;
         const allIx = [];
-        const computeUnits = (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : 600000;
+        const computeUnits = (_a = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnits) !== null && _a !== void 0 ? _a : this.txParams.computeUnits;
         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;
+        const computeUnitsPrice = (_b = txParams === null || txParams === void 0 ? void 0 : txParams.computeUnitsPrice) !== null && _b !== void 0 ? _b : this.txParams.computeUnitsPrice;
         if (computeUnitsPrice !== 0) {
             allIx.push(web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
                 microLamports: computeUnitsPrice,