@drift-labs/sdk 2.145.0 → 2.146.0-alpha.13

package/lib/browser/driftClient.js

@@ -71,10 +71,12 @@ const on_demand_1 = require("@switchboard-xyz/on-demand");
 const grpcDriftClientAccountSubscriber_1 = require("./accounts/grpcDriftClientAccountSubscriber");
 const tweetnacl_1 = __importDefault(require("tweetnacl"));
 const oracleId_1 = require("./oracles/oracleId");
+// BN is already imported globally in this file via other imports
 const sha256_1 = require("@noble/hashes/sha256");
 const utils_3 = require("./oracles/utils");
 const orders_1 = require("./math/orders");
 const builder_1 = require("./math/builder");
+const bigNum_1 = require("./factory/bigNum");
 const titanClient_1 = require("./titan/titanClient");
 const UnifiedSwapClient_1 = require("./swap/UnifiedSwapClient");
 /**
@@ -85,11 +87,27 @@ class DriftClient {
     get isSubscribed() {
         return this._isSubscribed && this.accountSubscriber.isSubscribed;
     }
+    async getPrePlaceOrderIxs(orderParams, userAccount, options) {
+        var _a;
+        const preIxs = [];
+        if ((0, types_1.isVariant)(orderParams.marketType, 'perp')) {
+            const { positionMaxLev, isolatedPositionDepositAmount } = options !== null && options !== void 0 ? options : {};
+            if (((_a = isolatedPositionDepositAmount === null || isolatedPositionDepositAmount === void 0 ? void 0 : isolatedPositionDepositAmount.gt) === null || _a === void 0 ? void 0 : _a.call(isolatedPositionDepositAmount, numericConstants_1.ZERO)) &&
+                this.isOrderIncreasingPosition(orderParams, userAccount)) {
+                preIxs.push(await this.getTransferIsolatedPerpPositionDepositIx(isolatedPositionDepositAmount, orderParams.marketIndex, userAccount.subAccountId));
+            }
+            if (positionMaxLev) {
+                const marginRatio = Math.floor((1 / positionMaxLev) * numericConstants_1.MARGIN_PRECISION.toNumber());
+                preIxs.push(await this.getUpdateUserPerpPositionCustomMarginRatioIx(orderParams.marketIndex, marginRatio, userAccount.subAccountId));
+            }
+        }
+        return preIxs;
+    }
     set isSubscribed(val) {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -180,12 +198,13 @@ class DriftClient {
                 resubTimeoutMs: (_z = config.accountSubscription) === null || _z === void 0 ? void 0 : _z.resubTimeoutMs,
                 logResubMessages: (_0 = config.accountSubscription) === null || _0 === void 0 ? void 0 : _0.logResubMessages,
                 commitment: (_1 = config.accountSubscription) === null || _1 === void 0 ? void 0 : _1.commitment,
+                programUserAccountSubscriber: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.programUserAccountSubscriber,
             };
             this.userStatsAccountSubscriptionConfig = {
                 type: 'websocket',
-                resubTimeoutMs: (_2 = config.accountSubscription) === null || _2 === void 0 ? void 0 : _2.resubTimeoutMs,
-                logResubMessages: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.logResubMessages,
-                commitment: (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.commitment,
+                resubTimeoutMs: (_3 = config.accountSubscription) === null || _3 === void 0 ? void 0 : _3.resubTimeoutMs,
+                logResubMessages: (_4 = config.accountSubscription) === null || _4 === void 0 ? void 0 : _4.logResubMessages,
+                commitment: (_5 = config.accountSubscription) === null || _5 === void 0 ? void 0 : _5.commitment,
             };
         }
         if (config.userStats) {
@@ -207,21 +226,22 @@ class DriftClient {
         const noMarketsAndOraclesSpecified = config.perpMarketIndexes === undefined &&
             config.spotMarketIndexes === undefined &&
             config.oracleInfos === undefined;
-        if (((_5 = config.accountSubscription) === null || _5 === void 0 ? void 0 : _5.type) === 'polling') {
-            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_6 = config.perpMarketIndexes) !== null && _6 !== void 0 ? _6 : [], (_7 = config.spotMarketIndexes) !== null && _7 !== void 0 ? _7 : [], (_8 = config.oracleInfos) !== null && _8 !== void 0 ? _8 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
-        }
-        else if (((_9 = config.accountSubscription) === null || _9 === void 0 ? void 0 : _9.type) === 'grpc') {
-            const accountSubscriberClass = (_11 = (_10 = config.accountSubscription) === null || _10 === void 0 ? void 0 : _10.driftClientAccountSubscriber) !== null && _11 !== void 0 ? _11 : grpcDriftClientAccountSubscriber_1.grpcDriftClientAccountSubscriber;
-            this.accountSubscriber = new accountSubscriberClass(config.accountSubscription.grpcConfigs, this.program, (_12 = config.perpMarketIndexes) !== null && _12 !== void 0 ? _12 : [], (_13 = config.spotMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.oracleInfos) !== null && _14 !== void 0 ? _14 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_15 = config.accountSubscription) === null || _15 === void 0 ? void 0 : _15.resubTimeoutMs,
-                logResubMessages: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.logResubMessages,
+        if (((_6 = config.accountSubscription) === null || _6 === void 0 ? void 0 : _6.type) === 'polling') {
+            this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, (_7 = config.perpMarketIndexes) !== null && _7 !== void 0 ? _7 : [], (_8 = config.spotMarketIndexes) !== null && _8 !== void 0 ? _8 : [], (_9 = config.oracleInfos) !== null && _9 !== void 0 ? _9 : [], noMarketsAndOraclesSpecified, delistedMarketSetting);
+        }
+        else if (((_10 = config.accountSubscription) === null || _10 === void 0 ? void 0 : _10.type) === 'grpc') {
+            const accountSubscriberClass = (_12 = (_11 = config.accountSubscription) === null || _11 === void 0 ? void 0 : _11.driftClientAccountSubscriber) !== null && _12 !== void 0 ? _12 : grpcDriftClientAccountSubscriber_1.grpcDriftClientAccountSubscriber;
+            this.accountSubscriber = new accountSubscriberClass(config.accountSubscription.grpcConfigs, this.program, (_13 = config.perpMarketIndexes) !== null && _13 !== void 0 ? _13 : [], (_14 = config.spotMarketIndexes) !== null && _14 !== void 0 ? _14 : [], (_15 = config.oracleInfos) !== null && _15 !== void 0 ? _15 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_16 = config.accountSubscription) === null || _16 === void 0 ? void 0 : _16.resubTimeoutMs,
+                logResubMessages: (_17 = config.accountSubscription) === null || _17 === void 0 ? void 0 : _17.logResubMessages,
             });
         }
         else {
-            this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_17 = config.perpMarketIndexes) !== null && _17 !== void 0 ? _17 : [], (_18 = config.spotMarketIndexes) !== null && _18 !== void 0 ? _18 : [], (_19 = config.oracleInfos) !== null && _19 !== void 0 ? _19 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
-                resubTimeoutMs: (_20 = config.accountSubscription) === null || _20 === void 0 ? void 0 : _20.resubTimeoutMs,
-                logResubMessages: (_21 = config.accountSubscription) === null || _21 === void 0 ? void 0 : _21.logResubMessages,
-            }, (_22 = config.accountSubscription) === null || _22 === void 0 ? void 0 : _22.commitment, (_23 = config.accountSubscription) === null || _23 === void 0 ? void 0 : _23.perpMarketAccountSubscriber, (_24 = config.accountSubscription) === null || _24 === void 0 ? void 0 : _24.oracleAccountSubscriber);
+            const accountSubscriberClass = (_19 = (_18 = config.accountSubscription) === null || _18 === void 0 ? void 0 : _18.driftClientAccountSubscriber) !== null && _19 !== void 0 ? _19 : webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber;
+            this.accountSubscriber = new accountSubscriberClass(this.program, (_20 = config.perpMarketIndexes) !== null && _20 !== void 0 ? _20 : [], (_21 = config.spotMarketIndexes) !== null && _21 !== void 0 ? _21 : [], (_22 = config.oracleInfos) !== null && _22 !== void 0 ? _22 : [], noMarketsAndOraclesSpecified, delistedMarketSetting, {
+                resubTimeoutMs: (_23 = config.accountSubscription) === null || _23 === void 0 ? void 0 : _23.resubTimeoutMs,
+                logResubMessages: (_24 = config.accountSubscription) === null || _24 === void 0 ? void 0 : _24.logResubMessages,
+            }, (_25 = config.accountSubscription) === null || _25 === void 0 ? void 0 : _25.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
         this.metricsEventEmitter = new events_1.EventEmitter();
@@ -229,7 +249,7 @@ class DriftClient {
             this.enableMetricsEvents = true;
         }
         this.txSender =
-            (_25 = config.txSender) !== null && _25 !== void 0 ? _25 : new retryTxSender_1.RetryTxSender({
+            (_26 = config.txSender) !== null && _26 !== void 0 ? _26 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
                 wallet: this.wallet,
                 opts: this.opts,
@@ -1376,6 +1396,9 @@ class DriftClient {
     getQuoteAssetTokenAmount() {
         return this.getTokenAmount(numericConstants_1.QUOTE_SPOT_MARKET_INDEX);
     }
+    getIsolatedPerpPositionTokenAmount(perpMarketIndex, subAccountId) {
+        return this.getUser(subAccountId).getIsolatePerpPositionTokenAmount(perpMarketIndex);
+    }
     /**
      * 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.
@@ -2130,6 +2153,122 @@ class DriftClient {
             remainingAccounts,
         });
     }
+    async depositIntoIsolatedPerpPosition(amount, perpMarketIndex, userTokenAccount, subAccountId, txParams) {
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getDepositIntoIsolatedPerpPositionIx(amount, perpMarketIndex, userTokenAccount, subAccountId), txParams), [], this.opts);
+        return txSig;
+    }
+    async getDepositIntoIsolatedPerpPositionIx(amount, perpMarketIndex, userTokenAccount, subAccountId) {
+        const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
+        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+        const spotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
+        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [],
+            writableSpotMarketIndexes: [spotMarketIndex],
+            readablePerpMarketIndex: [perpMarketIndex],
+        });
+        const tokenProgram = this.getTokenProgramForSpotMarket(spotMarketAccount);
+        return await this.program.instruction.depositIntoIsolatedPerpPosition(spotMarketIndex, perpMarketIndex, amount, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                spotMarketVault: spotMarketAccount.vault,
+                user: userAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                userTokenAccount: userTokenAccount,
+                authority: this.wallet.publicKey,
+                tokenProgram,
+            },
+            remainingAccounts,
+        });
+    }
+    async transferIsolatedPerpPositionDeposit(amount, perpMarketIndex, subAccountId, txParams) {
+        const tx = await this.buildTransaction(await this.getTransferIsolatedPerpPositionDepositIx(amount, perpMarketIndex, subAccountId), txParams);
+        const { txSig } = await this.sendTransaction(tx, [], {
+            ...this.opts,
+            skipPreflight: true,
+        });
+        return txSig;
+    }
+    async getTransferIsolatedPerpPositionDepositIx(amount, perpMarketIndex, subAccountId, noAmountBuffer) {
+        const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
+        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+        const spotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
+        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+        const user = await this.getUserAccount(subAccountId);
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [user],
+            writableSpotMarketIndexes: [spotMarketIndex],
+            readablePerpMarketIndex: [perpMarketIndex],
+        });
+        const amountWithBuffer = noAmountBuffer || amount.eq(bigNum_1.BigNum.fromPrint('-9223372036854775808').val)
+            ? amount
+            : amount.add(amount.div(new anchor_1.BN(1000))); // .1% buffer
+        return await this.program.instruction.transferIsolatedPerpPositionDeposit(spotMarketIndex, perpMarketIndex, amountWithBuffer, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                spotMarketVault: spotMarketAccount.vault,
+                user: userAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+            },
+            remainingAccounts,
+        });
+    }
+    async withdrawFromIsolatedPerpPosition(amount, perpMarketIndex, userTokenAccount, subAccountId, txParams) {
+        const instructions = await this.getWithdrawFromIsolatedPerpPositionIxsBundle(amount, perpMarketIndex, subAccountId, userTokenAccount);
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(instructions, txParams));
+        return txSig;
+    }
+    async getWithdrawFromIsolatedPerpPositionIxsBundle(amount, perpMarketIndex, subAccountId, userTokenAccount) {
+        const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
+        const userAccount = this.getUserAccount(subAccountId);
+        const tokenAmountDeposited = this.getIsolatedPerpPositionTokenAmount(perpMarketIndex);
+        const isolatedPositionUnrealizedPnl = (0, position_1.calculateClaimablePnl)(this.getPerpMarketAccount(perpMarketIndex), this.getSpotMarketAccount(this.getPerpMarketAccount(perpMarketIndex).quoteSpotMarketIndex), userAccount.perpPositions.find((p) => p.marketIndex === perpMarketIndex), this.getOracleDataForSpotMarket(this.getPerpMarketAccount(perpMarketIndex).quoteSpotMarketIndex));
+        const depositAmountPlusUnrealizedPnl = tokenAmountDeposited.add(isolatedPositionUnrealizedPnl);
+        const amountToWithdraw = amount.gt(depositAmountPlusUnrealizedPnl)
+            ? bigNum_1.BigNum.fromPrint('-9223372036854775808').val // min i64
+            : amount;
+        console.log('amountToWithdraw', amountToWithdraw.toString());
+        console.log('amount', amount.toString());
+        let associatedTokenAccount = userTokenAccount;
+        if (!associatedTokenAccount) {
+            const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+            const quoteSpotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
+            associatedTokenAccount = await this.getAssociatedTokenAccount(quoteSpotMarketIndex);
+        }
+        const withdrawIx = await this.getWithdrawFromIsolatedPerpPositionIx(amountToWithdraw, perpMarketIndex, associatedTokenAccount, subAccountId);
+        const ixs = [withdrawIx];
+        const needsToSettle = amount.gt(tokenAmountDeposited) && isolatedPositionUnrealizedPnl.gt(numericConstants_1.ZERO);
+        if (needsToSettle) {
+            const settleIx = await this.settleMultiplePNLsIx(userAccountPublicKey, userAccount, [perpMarketIndex], types_1.SettlePnlMode.TRY_SETTLE);
+            ixs.push(settleIx);
+        }
+        return ixs;
+    }
+    async getWithdrawFromIsolatedPerpPositionIx(amount, perpMarketIndex, userTokenAccount, subAccountId) {
+        const userAccountPublicKey = await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId);
+        const perpMarketAccount = this.getPerpMarketAccount(perpMarketIndex);
+        const spotMarketIndex = perpMarketAccount.quoteSpotMarketIndex;
+        const spotMarketAccount = this.getSpotMarketAccount(spotMarketIndex);
+        const remainingAccounts = this.getRemainingAccounts({
+            userAccounts: [this.getUserAccount(subAccountId)],
+            writableSpotMarketIndexes: [spotMarketIndex],
+            readablePerpMarketIndex: [perpMarketIndex],
+        });
+        return await this.program.instruction.withdrawFromIsolatedPerpPosition(spotMarketIndex, perpMarketIndex, amount, {
+            accounts: {
+                state: await this.getStatePublicKey(),
+                spotMarketVault: spotMarketAccount.vault,
+                user: userAccountPublicKey,
+                userStats: this.getUserStatsAccountPublicKey(),
+                authority: this.wallet.publicKey,
+                userTokenAccount: userTokenAccount,
+                tokenProgram: this.getTokenProgramForSpotMarket(spotMarketAccount),
+                driftSigner: this.getSignerPublicKey(),
+            },
+            remainingAccounts,
+        });
+    }
     async updateSpotMarketCumulativeInterest(marketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.updateSpotMarketCumulativeInterestIx(marketIndex), txParams), [], this.opts);
         return txSig;
@@ -2262,7 +2401,7 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, undefined, opts !== null && opts !== void 0 ? opts : this.opts, true);
         return txSig;
     }
-    async prepareMarketOrderTxs(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo, cancelExistingOrders, settlePnl, positionMaxLev) {
+    async prepareMarketOrderTxs(orderParams, userAccountPublicKey, userAccount, makerInfo, txParams, bracketOrdersParams = new Array(), referrerInfo, cancelExistingOrders, settlePnl, positionMaxLev, isolatedPositionDepositAmount) {
         const marketIndex = orderParams.marketIndex;
         const orderId = userAccount.nextOrderId;
         const ixPromisesForTxs = {
@@ -2272,10 +2411,17 @@ class DriftClient {
             marketOrderTx: undefined,
         };
         const txKeys = Object.keys(ixPromisesForTxs);
-        const marketOrderTxIxs = positionMaxLev
-            ? this.getPlaceOrdersAndSetPositionMaxLevIx([orderParams, ...bracketOrdersParams], positionMaxLev, userAccount.subAccountId)
-            : this.getPlaceOrdersIx([orderParams, ...bracketOrdersParams], userAccount.subAccountId);
-        ixPromisesForTxs.marketOrderTx = marketOrderTxIxs;
+        const preIxs = await this.getPrePlaceOrderIxs(orderParams, userAccount, {
+            positionMaxLev,
+            isolatedPositionDepositAmount,
+        });
+        ixPromisesForTxs.marketOrderTx = (async () => {
+            const placeOrdersIx = await this.getPlaceOrdersIx([orderParams, ...bracketOrdersParams], userAccount.subAccountId);
+            if (preIxs.length) {
+                return [...preIxs, placeOrdersIx];
+            }
+            return placeOrdersIx;
+        })();
         /* Cancel open orders in market if requested */
         if (cancelExistingOrders && (0, types_1.isVariant)(orderParams.marketType, 'perp')) {
             ixPromisesForTxs.cancelExistingOrdersTx = this.getCancelOrdersIx(orderParams.marketType, orderParams.marketIndex, null, userAccount.subAccountId);
@@ -2322,8 +2468,13 @@ class DriftClient {
             signedSettlePnlTx: signedTxs.settlePnlTx,
         };
     }
-    async placePerpOrder(orderParams, txParams, subAccountId) {
-        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlacePerpOrderIx(orderParams, subAccountId), txParams), [], this.opts);
+    async placePerpOrder(orderParams, txParams, subAccountId, isolatedPositionDepositAmount) {
+        var _a;
+        const preIxs = [];
+        if ((_a = isolatedPositionDepositAmount === null || isolatedPositionDepositAmount === void 0 ? void 0 : isolatedPositionDepositAmount.gt) === null || _a === void 0 ? void 0 : _a.call(isolatedPositionDepositAmount, numericConstants_1.ZERO)) {
+            preIxs.push(await this.getTransferIsolatedPerpPositionDepositIx(isolatedPositionDepositAmount, orderParams.marketIndex, subAccountId));
+        }
+        const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(await this.getPlacePerpOrderIx(orderParams, subAccountId), txParams, undefined, undefined, undefined, undefined, preIxs), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
@@ -2429,8 +2580,19 @@ class DriftClient {
             },
         });
     }
-    async cancelOrder(orderId, txParams, subAccountId) {
-        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getCancelOrderIx(orderId, subAccountId), txParams), [], this.opts);
+    async cancelOrder(orderId, txParams, subAccountId, overrides) {
+        const cancelIx = await this.getCancelOrderIx(orderId, subAccountId);
+        const instructions = [cancelIx];
+        if ((overrides === null || overrides === void 0 ? void 0 : overrides.withdrawIsolatedDepositAmount) !== undefined) {
+            const order = this.getOrder(orderId, subAccountId);
+            const perpMarketIndex = order === null || order === void 0 ? void 0 : order.marketIndex;
+            const withdrawAmount = overrides.withdrawIsolatedDepositAmount;
+            if (withdrawAmount.gt(numericConstants_1.ZERO)) {
+                const withdrawIxs = await this.getWithdrawFromIsolatedPerpPositionIxsBundle(withdrawAmount, perpMarketIndex, subAccountId);
+                instructions.push(...withdrawIxs);
+            }
+        }
+        const { txSig } = await this.sendTransaction(await this.buildTransaction(instructions, txParams), [], this.opts);
         return txSig;
     }
     async getCancelOrderIx(orderId, subAccountId) {
@@ -2549,13 +2711,22 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async placeOrders(params, txParams, subAccountId, optionalIxs) {
-        const { txSig } = await this.sendTransaction((await this.preparePlaceOrdersTx(params, txParams, subAccountId, optionalIxs)).placeOrdersTx, [], this.opts, false);
+    async placeOrders(params, txParams, subAccountId, optionalIxs, isolatedPositionDepositAmount) {
+        const { txSig } = await this.sendTransaction((await this.preparePlaceOrdersTx(params, txParams, subAccountId, optionalIxs, isolatedPositionDepositAmount)).placeOrdersTx, [], this.opts, false);
         return txSig;
     }
-    async preparePlaceOrdersTx(params, txParams, subAccountId, optionalIxs) {
+    async preparePlaceOrdersTx(params, txParams, subAccountId, optionalIxs, isolatedPositionDepositAmount) {
+        var _a;
         const lookupTableAccounts = await this.fetchAllLookupTableAccounts();
-        const tx = await this.buildTransaction(await this.getPlaceOrdersIx(params, subAccountId), txParams, undefined, lookupTableAccounts, undefined, undefined, optionalIxs);
+        const preIxs = [];
+        if ((params === null || params === void 0 ? void 0 : params.length) === 1) {
+            const p = params[0];
+            if ((0, types_1.isVariant)(p.marketType, 'perp') &&
+                ((_a = isolatedPositionDepositAmount === null || isolatedPositionDepositAmount === void 0 ? void 0 : isolatedPositionDepositAmount.gt) === null || _a === void 0 ? void 0 : _a.call(isolatedPositionDepositAmount, numericConstants_1.ZERO))) {
+                preIxs.push(await this.getTransferIsolatedPerpPositionDepositIx(isolatedPositionDepositAmount, p.marketIndex, subAccountId));
+            }
+        }
+        const tx = await this.buildTransaction(await this.getPlaceOrdersIx(params, subAccountId), txParams, undefined, lookupTableAccounts, undefined, undefined, [...preIxs, ...(optionalIxs !== null && optionalIxs !== void 0 ? optionalIxs : [])]);
         return {
             placeOrdersTx: tx,
         };
@@ -2644,7 +2815,7 @@ class DriftClient {
             remainingAccounts,
         });
         const marginRatio = Math.floor((1 / positionMaxLev) * numericConstants_1.MARGIN_PRECISION.toNumber());
-        // TODO: Handle multiple markets?
+        // Keep existing behavior but note: prefer using getPostPlaceOrderIxs path
         const setPositionMaxLevIxs = await this.getUpdateUserPerpPositionCustomMarginRatioIx(readablePerpMarketIndex[0], marginRatio, subAccountId);
         return [placeOrdersIxs, setPositionMaxLevIxs];
     }
@@ -3102,6 +3273,7 @@ class DriftClient {
     /**
      * Swap tokens in drift account using titan or jupiter
      * @param swapClient swap client to find routes and instructions (Titan or Jupiter)
+     * @param jupiterClient @deprecated Use swapClient instead. Legacy parameter for backward compatibility
      * @param outMarketIndex the market index of the token you're buying
      * @param inMarketIndex the market index of the token you're selling
      * @param outAssociatedTokenAccount the token account to receive the token being sold on titan or jupiter
@@ -3115,12 +3287,17 @@ class DriftClient {
      * @param quote pass in the quote response from Jupiter quote's API
      * @param txParams
      */
-    async swap({ swapClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes = false, }) {
+    async swap({ swapClient, jupiterClient, outMarketIndex, inMarketIndex, outAssociatedTokenAccount, inAssociatedTokenAccount, amount, slippageBps, swapMode, reduceOnly, txParams, v6, quote, onlyDirectRoutes = false, }) {
+        // Handle backward compatibility: use jupiterClient if swapClient is not provided
+        const clientToUse = swapClient || jupiterClient;
+        if (!clientToUse) {
+            throw new Error('Either swapClient or jupiterClient must be provided');
+        }
         let res;
         // Use unified SwapClient if available
-        if (swapClient instanceof UnifiedSwapClient_1.UnifiedSwapClient) {
+        if (clientToUse instanceof UnifiedSwapClient_1.UnifiedSwapClient) {
             res = await this.getSwapIxV2({
-                swapClient,
+                swapClient: clientToUse,
                 outMarketIndex,
                 inMarketIndex,
                 outAssociatedTokenAccount,
@@ -3134,9 +3311,9 @@ class DriftClient {
                 v6,
             });
         }
-        else if (swapClient instanceof titanClient_1.TitanClient) {
+        else if (clientToUse instanceof titanClient_1.TitanClient) {
             res = await this.getTitanSwapIx({
-                titanClient: swapClient,
+                titanClient: clientToUse,
                 outMarketIndex,
                 inMarketIndex,
                 outAssociatedTokenAccount,
@@ -3148,10 +3325,10 @@ class DriftClient {
                 reduceOnly,
             });
         }
-        else if (swapClient instanceof jupiterClient_1.JupiterClient) {
+        else if (clientToUse instanceof jupiterClient_1.JupiterClient) {
             const quoteToUse = quote !== null && quote !== void 0 ? quote : v6 === null || v6 === void 0 ? void 0 : v6.quote;
             res = await this.getJupiterSwapIxV6({
-                jupiterClient: swapClient,
+                jupiterClient: clientToUse,
                 outMarketIndex,
                 inMarketIndex,
                 outAssociatedTokenAccount,
@@ -3623,7 +3800,7 @@ class DriftClient {
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails, auctionDurationPercentage, optionalIxs) {
+    async preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams, makerInfo, referrerInfo, bracketOrdersParams = new Array(), txParams, subAccountId, cancelExistingOrders, settlePnl, exitEarlyIfSimFails, auctionDurationPercentage, optionalIxs, isolatedPositionDepositAmount) {
         const placeAndTakeIxs = [];
         const txsToSign = {
             placeAndTakeTx: undefined,
@@ -3635,13 +3812,21 @@ class DriftClient {
         const lookupTableAccounts = await this.fetchAllLookupTableAccounts();
         let earlyExitFailedPlaceAndTakeSim = false;
         const prepPlaceAndTakeTx = async () => {
-            var _a;
+            var _a, _b;
             const placeAndTakeIx = await this.getPlaceAndTakePerpOrderIx(orderParams, makerInfo, referrerInfo, undefined, auctionDurationPercentage, subAccountId);
+            if ((0, types_1.isVariant)(orderParams.marketType, 'perp') &&
+                ((_a = isolatedPositionDepositAmount === null || isolatedPositionDepositAmount === void 0 ? void 0 : isolatedPositionDepositAmount.gt) === null || _a === void 0 ? void 0 : _a.call(isolatedPositionDepositAmount, numericConstants_1.ZERO))) {
+                placeAndTakeIxs.push(await this.getTransferIsolatedPerpPositionDepositIx(isolatedPositionDepositAmount, orderParams.marketIndex, subAccountId));
+            }
             placeAndTakeIxs.push(placeAndTakeIx);
             if (bracketOrdersParams.length > 0) {
                 const bracketOrdersIx = await this.getPlaceOrdersIx(bracketOrdersParams, subAccountId);
                 placeAndTakeIxs.push(bracketOrdersIx);
             }
+            // Optional extra ixs can be appended at the front
+            if (optionalIxs === null || optionalIxs === void 0 ? void 0 : optionalIxs.length) {
+                placeAndTakeIxs.unshift(...optionalIxs);
+            }
             const shouldUseSimulationComputeUnits = txParams === null || txParams === void 0 ? void 0 : txParams.useSimulatedComputeUnits;
             const shouldExitIfSimulationFails = exitEarlyIfSimFails;
             const txParamsWithoutImplicitSimulation = {
@@ -3650,7 +3835,7 @@ class DriftClient {
             };
             if (shouldUseSimulationComputeUnits || shouldExitIfSimulationFails) {
                 const placeAndTakeTxToSim = (await this.buildTransaction(placeAndTakeIxs, txParams, undefined, lookupTableAccounts, true, recentBlockHash, optionalIxs));
-                const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_a = txParams.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : 1.2, txParams.lowerBoundCu);
+                const simulationResult = await txParamProcessor_1.TransactionParamProcessor.getTxSimComputeUnits(placeAndTakeTxToSim, this.connection, (_b = txParams.computeUnitsBufferMultiplier) !== null && _b !== void 0 ? _b : 1.2, txParams.lowerBoundCu);
                 if (shouldExitIfSimulationFails && !simulationResult.success) {
                     earlyExitFailedPlaceAndTakeSim = true;
                     return;
@@ -6453,5 +6638,17 @@ class DriftClient {
             forceVersionedTransaction,
         });
     }
+    isOrderIncreasingPosition(orderParams, userAccount) {
+        const perpPosition = userAccount.perpPositions.find((p) => p.marketIndex === orderParams.marketIndex);
+        if (!perpPosition)
+            return true;
+        const currentBase = perpPosition.baseAssetAmount;
+        if (currentBase.eq(numericConstants_1.ZERO))
+            return true;
+        const orderBaseAmount = (0, types_1.isVariant)(orderParams.direction, 'long')
+            ? orderParams.baseAssetAmount
+            : orderParams.baseAssetAmount.neg();
+        return currentBase.add(orderBaseAmount).abs().gt(currentBase.abs());
+    }
 }
 exports.DriftClient = DriftClient;

package/lib/browser/driftClientConfig.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Commitment, ConfirmOptions, Connection, PublicKey, TransactionVersion } from '@solana/web3.js';
-import { IWallet, TxParams } from './types';
+import { IWallet, TxParams, UserAccount } from './types';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
@@ -14,6 +14,9 @@ import { WebSocketAccountSubscriberV2 } from './accounts/webSocketAccountSubscri
 import { grpcDriftClientAccountSubscriberV2 } from './accounts/grpcDriftClientAccountSubscriberV2';
 import { grpcDriftClientAccountSubscriber } from './accounts/grpcDriftClientAccountSubscriber';
 import { grpcMultiUserAccountSubscriber } from './accounts/grpcMultiUserAccountSubscriber';
+import { WebSocketProgramAccountSubscriber } from './accounts/webSocketProgramAccountSubscriber';
+import { WebSocketDriftClientAccountSubscriber } from './accounts/webSocketDriftClientAccountSubscriber';
+import { WebSocketDriftClientAccountSubscriberV2 } from './accounts/webSocketDriftClientAccountSubscriberV2';
 export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
@@ -56,8 +59,10 @@ export type DriftClientSubscriptionConfig = {
     resubTimeoutMs?: number;
     logResubMessages?: boolean;
     commitment?: Commitment;
+    programUserAccountSubscriber?: WebSocketProgramAccountSubscriber<UserAccount>;
     perpMarketAccountSubscriber?: new (accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>;
-    oracleAccountSubscriber?: new (accountName: string, program: Program, accountPublicKey: PublicKey, decodeBuffer?: (buffer: Buffer) => any, resubOpts?: ResubOpts, commitment?: Commitment) => WebSocketAccountSubscriberV2<any> | WebSocketAccountSubscriber<any>;
+    /** If you use V2 here, whatever you pass for perpMarketAccountSubscriber will be ignored and it will use v2 under the hood regardless */
+    driftClientAccountSubscriber?: new (program: Program, perpMarketIndexes: number[], spotMarketIndexes: number[], oracleInfos: OracleInfo[], shouldFindAllMarketsAndOracles: boolean, delistedMarketSetting: DelistedMarketSetting) => WebSocketDriftClientAccountSubscriber | WebSocketDriftClientAccountSubscriberV2;
 } | {
     type: 'polling';
     accountLoader: BulkAccountLoader;