@drift-labs/sdk-browser 2.155.0-beta.3 → 2.155.0-beta.5

package/VERSION

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

package/lib/browser/decode/user.js

@@ -70,12 +70,17 @@ function decodeUser(buffer) {
         const baseAssetAmount = readSignedBigInt64LE(buffer, offset + 8);
         const quoteAssetAmount = readSignedBigInt64LE(buffer, offset + 16);
         const lpShares = readUnsignedBigInt64LE(buffer, offset + 64);
+        const isolatedPositionScaledBalance = readSignedBigInt64LE(buffer, offset + 72);
         const openOrders = buffer.readUInt8(offset + 94);
         const positionFlag = buffer.readUInt8(offset + 95);
         if (baseAssetAmount.eq(numericConstants_1.ZERO) &&
             openOrders === 0 &&
             quoteAssetAmount.eq(numericConstants_1.ZERO) &&
-            lpShares.eq(numericConstants_1.ZERO)) {
+            lpShares.eq(numericConstants_1.ZERO) &&
+            isolatedPositionScaledBalance.eq(numericConstants_1.ZERO) &&
+            !((positionFlag &
+                (types_1.PositionFlag.BeingLiquidated | types_1.PositionFlag.Bankruptcy)) >
+                0)) {
             offset += 96;
             continue;
         }
@@ -90,9 +95,7 @@ function decodeUser(buffer) {
         const openAsks = readSignedBigInt64LE(buffer, offset);
         offset += 8;
         const settledPnl = readSignedBigInt64LE(buffer, offset);
-        offset += 16;
-        const isolatedPositionScaledBalance = readSignedBigInt64LE(buffer, offset);
-        offset += 8;
+        offset += 24;
         const lastQuoteAssetAmountPerLp = readSignedBigInt64LE(buffer, offset);
         offset += 8;
         const maxMarginRatio = buffer.readUInt16LE(offset);
@@ -117,8 +120,8 @@ function decodeUser(buffer) {
             openOrders,
             perLpBase,
             maxMarginRatio,
-            isolatedPositionScaledBalance,
             positionFlag,
+            isolatedPositionScaledBalance,
         });
     }
     const orders = [];

package/lib/browser/driftClient.d.ts

@@ -5,7 +5,7 @@
 import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { Idl as Idl30, Program as Program30 } from '@coral-xyz/anchor-30';
-import { DriftClientMetricsEvents, HighLeverageModeConfig, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, OracleSource, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SignedMsgOrderParamsMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount, ProtectedMakerModeConfig, SignedMsgOrderParamsDelegateMessage, PostOnlyParams, LPPoolAccount, ConstituentAccount, ConstituentTargetBaseAccount, AmmCache } from './types';
+import { DriftClientMetricsEvents, HighLeverageModeConfig, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, OracleSource, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SignedMsgOrderParamsMessage, TxParams, UserAccount, UserStatsAccount, ProtectedMakerModeConfig, SignedMsgOrderParamsDelegateMessage, PostOnlyParams, LPPoolAccount, ConstituentAccount, ConstituentTargetBaseAccount, AmmCache } from './types';
 import { AccountMeta, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Connection, Keypair, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
@@ -24,6 +24,7 @@ import { UserStatsSubscriptionConfig } from './userStatsConfig';
 import { TxHandler } from './tx/txHandler';
 import { Slothash } from './slot/SlothashSubscriber';
 import { SignedMsgOrderParams } from './types';
+import { TakerInfo } from './types';
 import { ConstituentMap } from './constituentMap/constituentMap';
 import { RevenueShareEscrowMap } from './userMap/revenueShareEscrowMap';
 import { TitanClient } from './titan/titanClient';
@@ -88,6 +89,7 @@ export declare class DriftClient {
     sbOnDemandProgram?: Program30<Idl30>;
     sbProgramFeedConfigs?: Map<string, any>;
     get isSubscribed(): boolean;
+    private getPrePlaceOrderIxs;
     set isSubscribed(val: boolean);
     constructor(config: DriftClientConfig);
     getUserMapKey(subAccountId: number, authority: PublicKey): string;
@@ -477,9 +479,10 @@ export declare class DriftClient {
     getTransferPerpPositionIx(fromSubAccountId: number, toSubAccountId: number, marketIndex: number, amount: BN): Promise<TransactionInstruction>;
     depositIntoIsolatedPerpPosition(amount: BN, perpMarketIndex: number, userTokenAccount: PublicKey, subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
     getDepositIntoIsolatedPerpPositionIx(amount: BN, perpMarketIndex: number, userTokenAccount: PublicKey, subAccountId?: number): Promise<TransactionInstruction>;
-    transferIsolatedPerpPositionDeposit(amount: BN, perpMarketIndex: number, subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
-    getTransferIsolatedPerpPositionDepositIx(amount: BN, perpMarketIndex: number, subAccountId?: number): Promise<TransactionInstruction>;
+    transferIsolatedPerpPositionDeposit(amount: BN, perpMarketIndex: number, subAccountId?: number, txParams?: TxParams, trySettle?: boolean, noBuffer?: boolean): Promise<TransactionSignature>;
+    getTransferIsolatedPerpPositionDepositIx(amount: BN, perpMarketIndex: number, subAccountId?: number, noAmountBuffer?: boolean, signingAuthority?: PublicKey): Promise<TransactionInstruction>;
     withdrawFromIsolatedPerpPosition(amount: BN, perpMarketIndex: number, userTokenAccount: PublicKey, subAccountId?: number, txParams?: TxParams): Promise<TransactionSignature>;
+    getWithdrawFromIsolatedPerpPositionIxsBundle(amount: BN, perpMarketIndex: number, subAccountId?: number, userTokenAccount?: PublicKey): Promise<TransactionInstruction[]>;
     getWithdrawFromIsolatedPerpPositionIx(amount: BN, perpMarketIndex: number, userTokenAccount: PublicKey, subAccountId?: number): Promise<TransactionInstruction>;
     updateSpotMarketCumulativeInterest(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     updateSpotMarketCumulativeInterestIx(marketIndex: number): Promise<TransactionInstruction>;
@@ -497,7 +500,7 @@ export declare class DriftClient {
      */
     openPosition(direction: PositionDirection, amount: BN, marketIndex: number, limitPrice?: BN, subAccountId?: number): Promise<TransactionSignature>;
     sendSignedTx(tx: Transaction | VersionedTransaction, opts?: ConfirmOptions): Promise<TransactionSignature>;
-    prepareMarketOrderTxs(orderParams: OptionalOrderParams, userAccountPublicKey: PublicKey, userAccount: UserAccount, makerInfo?: MakerInfo | MakerInfo[], txParams?: TxParams, bracketOrdersParams?: OptionalOrderParams[], referrerInfo?: ReferrerInfo, cancelExistingOrders?: boolean, settlePnl?: boolean, positionMaxLev?: number): Promise<{
+    prepareMarketOrderTxs(orderParams: OptionalOrderParams, userAccountPublicKey: PublicKey, userAccount: UserAccount, makerInfo?: MakerInfo | MakerInfo[], txParams?: TxParams, bracketOrdersParams?: OptionalOrderParams[], referrerInfo?: ReferrerInfo, cancelExistingOrders?: boolean, settlePnl?: boolean, positionMaxLev?: number, isolatedPositionDepositAmount?: BN): Promise<{
         cancelExistingOrdersTx?: Transaction | VersionedTransaction;
         settlePnlTx?: Transaction | VersionedTransaction;
         fillTx?: Transaction | VersionedTransaction;
@@ -520,7 +523,7 @@ export declare class DriftClient {
         signedCancelExistingOrdersTx?: Transaction;
         signedSettlePnlTx?: Transaction;
     }>;
-    placePerpOrder(orderParams: OptionalOrderParams, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
+    placePerpOrder(orderParams: OptionalOrderParams, txParams?: TxParams, subAccountId?: number, isolatedPositionDepositAmount?: BN): Promise<TransactionSignature>;
     getPlacePerpOrderIx(orderParams: OptionalOrderParams, subAccountId?: number, depositToTradeArgs?: {
         isMakingNewAccount: boolean;
         depositMarketIndex: number;
@@ -531,7 +534,9 @@ export declare class DriftClient {
     getSettleExpiredMarketIx(marketIndex: number): Promise<TransactionInstruction>;
     settleExpiredMarketPoolsToRevenuePool(marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     getSettleExpiredMarketPoolsToRevenuePoolIx(perpMarketIndex: number): Promise<TransactionInstruction>;
-    cancelOrder(orderId?: number, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
+    cancelOrder(orderId?: number, txParams?: TxParams, subAccountId?: number, overrides?: {
+        withdrawIsolatedDepositAmount?: BN;
+    }): Promise<TransactionSignature>;
     getCancelOrderIx(orderId?: number, subAccountId?: number): Promise<TransactionInstruction>;
     cancelOrderByUserId(userOrderId: number, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getCancelOrderByUserIdIx(userOrderId: number, subAccountId?: number): Promise<TransactionInstruction>;
@@ -565,8 +570,8 @@ export declare class DriftClient {
         marketIndex?: number;
         direction?: PositionDirection;
     }, placeOrderParams: OrderParams[], txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    placeOrders(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[]): Promise<TransactionSignature>;
-    preparePlaceOrdersTx(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[]): Promise<{
+    placeOrders(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[], isolatedPositionDepositAmount?: BN): Promise<TransactionSignature>;
+    preparePlaceOrdersTx(params: OrderParams[], txParams?: TxParams, subAccountId?: number, optionalIxs?: TransactionInstruction[], isolatedPositionDepositAmount?: BN): Promise<{
         placeOrdersTx: anchor.web3.Transaction | anchor.web3.VersionedTransaction;
     }>;
     getPlaceOrdersIx(params: OptionalOrderParams[], subAccountId?: number, overrides?: {
@@ -723,7 +728,7 @@ export declare class DriftClient {
     updateUserOpenOrdersCount(userAccountPublicKey: PublicKey, user: UserAccount, txParams?: TxParams, fillerPublicKey?: PublicKey): Promise<TransactionSignature>;
     getUpdateUserOpenOrdersCountIx(userAccountPublicKey: PublicKey, userAccount: UserAccount, fillerPublicKey?: PublicKey): Promise<TransactionInstruction>;
     placeAndTakePerpOrder(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, auctionDurationPercentage?: number, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, bracketOrdersParams?: OptionalOrderParams[], txParams?: TxParams, subAccountId?: number, cancelExistingOrders?: boolean, settlePnl?: boolean, exitEarlyIfSimFails?: boolean, auctionDurationPercentage?: number, optionalIxs?: TransactionInstruction[]): Promise<{
+    preparePlaceAndTakePerpOrderWithAdditionalOrders(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, bracketOrdersParams?: OptionalOrderParams[], txParams?: TxParams, subAccountId?: number, cancelExistingOrders?: boolean, settlePnl?: boolean, exitEarlyIfSimFails?: boolean, auctionDurationPercentage?: number, optionalIxs?: TransactionInstruction[], isolatedPositionDepositAmount?: BN): Promise<{
         placeAndTakeTx: Transaction | VersionedTransaction;
         cancelExistingOrdersTx: Transaction | VersionedTransaction;
         settlePnlTx: Transaction | VersionedTransaction;
@@ -922,7 +927,6 @@ export declare class DriftClient {
         bitFlags?: number;
         policy?: ModifyOrderPolicy;
         maxTs?: BN;
-        txParams?: TxParams;
     }, subAccountId?: number): Promise<TransactionInstruction>;
     settlePNLs(users: {
         settleeUserAccountPublicKey: PublicKey;
@@ -1263,5 +1267,6 @@ export declare class DriftClient {
         signedTxMap: MappedRecord<Record<string, anchor.web3.TransactionInstruction | anchor.web3.TransactionInstruction[]>, anchor.web3.Transaction | anchor.web3.VersionedTransaction>;
         signedTxData: SignedTxData[];
     }>;
+    isOrderIncreasingPosition(orderParams: OptionalOrderParams, subAccountId: number): boolean;
 }
 export {};

package/lib/browser/driftClient.js

@@ -69,6 +69,7 @@ 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");
@@ -84,6 +85,22 @@ 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.subAccountId)) {
+                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;
     }
@@ -2203,11 +2220,24 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    async transferIsolatedPerpPositionDeposit(amount, perpMarketIndex, subAccountId, txParams) {
-        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getTransferIsolatedPerpPositionDepositIx(amount, perpMarketIndex, subAccountId), txParams), [], this.opts);
+    async transferIsolatedPerpPositionDeposit(amount, perpMarketIndex, subAccountId, txParams, trySettle, noBuffer) {
+        const ixs = [];
+        const tokenAmountDeposited = this.getIsolatedPerpPositionTokenAmount(perpMarketIndex);
+        const transferIx = await this.getTransferIsolatedPerpPositionDepositIx(amount, perpMarketIndex, subAccountId, noBuffer);
+        const needsToSettle = amount.lt(tokenAmountDeposited.neg()) || amount.eq(numericConstants_1.MIN_I64) || trySettle;
+        if (needsToSettle) {
+            const settleIx = await this.settleMultiplePNLsIx(await (0, pda_1.getUserAccountPublicKey)(this.program.programId, this.authority, subAccountId !== null && subAccountId !== void 0 ? subAccountId : this.activeSubAccountId), this.getUserAccount(subAccountId), [perpMarketIndex], types_1.SettlePnlMode.TRY_SETTLE);
+            ixs.push(settleIx);
+        }
+        ixs.push(transferIx);
+        const tx = await this.buildTransaction(ixs, txParams);
+        const { txSig } = await this.sendTransaction(tx, [], {
+            ...this.opts,
+            skipPreflight: true,
+        });
         return txSig;
     }
-    async getTransferIsolatedPerpPositionDepositIx(amount, perpMarketIndex, subAccountId) {
+    async getTransferIsolatedPerpPositionDepositIx(amount, perpMarketIndex, subAccountId, noAmountBuffer, signingAuthority) {
         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;
@@ -2218,21 +2248,49 @@ class DriftClient {
             writableSpotMarketIndexes: [spotMarketIndex],
             readablePerpMarketIndex: [perpMarketIndex],
         });
-        return await this.program.instruction.transferIsolatedPerpPositionDeposit(spotMarketIndex, perpMarketIndex, amount, {
+        const amountWithBuffer = noAmountBuffer || amount.eq(numericConstants_1.MIN_I64)
+            ? amount
+            : amount.add(amount.div(new anchor_1.BN(200))); // .5% 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,
+                authority: signingAuthority !== null && signingAuthority !== void 0 ? signingAuthority : this.wallet.publicKey,
             },
             remainingAccounts,
         });
     }
     async withdrawFromIsolatedPerpPosition(amount, perpMarketIndex, userTokenAccount, subAccountId, txParams) {
-        const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getWithdrawFromIsolatedPerpPositionIx(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)
+            ? numericConstants_1.MIN_I64 // min i64
+            : amount;
+        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);
@@ -2389,7 +2447,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 = {
@@ -2399,10 +2457,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);
@@ -2449,8 +2514,14 @@ 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)) &&
+            this.isOrderIncreasingPosition(orderParams, subAccountId)) {
+            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;
     }
@@ -2556,8 +2627,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) {
@@ -2676,13 +2758,23 @@ 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)) &&
+                this.isOrderIncreasingPosition(p, subAccountId)) {
+                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,
         };
@@ -2771,7 +2863,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];
     }
@@ -3772,7 +3864,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,
@@ -3784,13 +3876,22 @@ 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)) &&
+                this.isOrderIncreasingPosition(orderParams, subAccountId)) {
+                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 = {
@@ -3799,7 +3900,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;
@@ -6604,5 +6705,18 @@ class DriftClient {
             forceVersionedTransaction,
         });
     }
+    isOrderIncreasingPosition(orderParams, subAccountId) {
+        const userAccount = this.getUserAccount(subAccountId);
+        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/marginCalculation.d.ts

@@ -49,24 +49,12 @@ export declare class MarginCalculation {
     marginRequirement: BN;
     marginRequirementPlusBuffer: BN;
     isolatedMarginCalculations: Map<number, IsolatedMarginCalculation>;
-    allDepositOraclesValid: boolean;
-    allLiabilityOraclesValid: boolean;
-    withPerpIsolatedLiability: boolean;
-    withSpotIsolatedLiability: boolean;
     totalPerpLiabilityValue: BN;
-    trackedMarketMarginRequirement: BN;
-    fuelDeposits: number;
-    fuelBorrows: number;
-    fuelPositions: number;
     constructor(context: MarginContext);
     addCrossMarginTotalCollateral(delta: BN): void;
     addCrossMarginRequirement(marginRequirement: BN, liabilityValue: BN): void;
     addIsolatedMarginCalculation(marketIndex: number, depositValue: BN, pnl: BN, liabilityValue: BN, marginRequirement: BN): void;
     addPerpLiabilityValue(perpLiabilityValue: BN): void;
-    updateAllDepositOraclesValid(valid: boolean): void;
-    updateAllLiabilityOraclesValid(valid: boolean): void;
-    updateWithSpotIsolatedLiability(isolated: boolean): void;
-    updateWithPerpIsolatedLiability(isolated: boolean): void;
     getCrossTotalCollateralPlusBuffer(): BN;
     meetsCrossMarginRequirement(): boolean;
     meetsCrossMarginRequirementWithBuffer(): boolean;

package/lib/browser/marginCalculation.js

@@ -91,15 +91,7 @@ class MarginCalculation {
         this.marginRequirement = numericConstants_1.ZERO;
         this.marginRequirementPlusBuffer = numericConstants_1.ZERO;
         this.isolatedMarginCalculations = new Map();
-        this.allDepositOraclesValid = true;
-        this.allLiabilityOraclesValid = true;
-        this.withPerpIsolatedLiability = false;
-        this.withSpotIsolatedLiability = false;
         this.totalPerpLiabilityValue = numericConstants_1.ZERO;
-        this.trackedMarketMarginRequirement = numericConstants_1.ZERO;
-        this.fuelDeposits = 0;
-        this.fuelBorrows = 0;
-        this.fuelPositions = 0;
     }
     addCrossMarginTotalCollateral(delta) {
         const crossMarginBuffer = this.context.crossMarginBuffer;
@@ -136,18 +128,6 @@ class MarginCalculation {
         this.totalPerpLiabilityValue =
             this.totalPerpLiabilityValue.add(perpLiabilityValue);
     }
-    updateAllDepositOraclesValid(valid) {
-        this.allDepositOraclesValid = this.allDepositOraclesValid && valid;
-    }
-    updateAllLiabilityOraclesValid(valid) {
-        this.allLiabilityOraclesValid = this.allLiabilityOraclesValid && valid;
-    }
-    updateWithSpotIsolatedLiability(isolated) {
-        this.withSpotIsolatedLiability = this.withSpotIsolatedLiability || isolated;
-    }
-    updateWithPerpIsolatedLiability(isolated) {
-        this.withPerpIsolatedLiability = this.withPerpIsolatedLiability || isolated;
-    }
     getCrossTotalCollateralPlusBuffer() {
         return this.totalCollateral.add(this.totalCollateralBuffer);
     }

package/lib/browser/math/margin.js

@@ -91,6 +91,7 @@ function calculateWorstCaseBaseAssetAmount(perpPosition, perpMarket, oraclePrice
 exports.calculateWorstCaseBaseAssetAmount = calculateWorstCaseBaseAssetAmount;
 function calculateWorstCasePerpLiabilityValue(perpPosition, perpMarket, oraclePrice, includeOpenOrders = true) {
     const isPredictionMarket = (0, types_1.isVariant)(perpMarket.contractType, 'prediction');
+    // return early if no open orders required
     if (!includeOpenOrders) {
         return {
             worstCaseBaseAssetAmount: perpPosition.baseAssetAmount,

package/lib/browser/math/position.d.ts

@@ -46,6 +46,7 @@ export declare function calculateUnsettledFundingPnl(market: PerpMarketAccount,
  */
 export declare function calculatePositionFundingPNL(market: PerpMarketAccount, perpPosition: PerpPosition): BN;
 export declare function positionIsAvailable(position: PerpPosition): boolean;
+export declare function positionIsBeingLiquidated(position: PerpPosition): boolean;
 /**
  *
  * @param userPosition

package/lib/browser/math/position.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasOpenOrders = exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateCostBasis = exports.calculateEntryPrice = exports.calculateBreakEvenPrice = exports.positionIsAvailable = exports.calculatePositionFundingPNL = exports.calculateUnsettledFundingPnl = exports.calculateFeesAndFundingPnl = exports.calculateClaimablePnl = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
+exports.hasOpenOrders = exports.isEmptyPosition = exports.positionCurrentDirection = exports.findDirectionToClose = exports.calculateCostBasis = exports.calculateEntryPrice = exports.calculateBreakEvenPrice = exports.positionIsBeingLiquidated = exports.positionIsAvailable = exports.calculatePositionFundingPNL = exports.calculateUnsettledFundingPnl = exports.calculateFeesAndFundingPnl = exports.calculateClaimablePnl = exports.calculatePositionPNL = exports.calculateBaseAssetValue = void 0;
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
 const types_1 = require("../types");
@@ -149,9 +149,17 @@ function positionIsAvailable(position) {
     return (position.baseAssetAmount.eq(numericConstants_1.ZERO) &&
         position.openOrders === 0 &&
         position.quoteAssetAmount.eq(numericConstants_1.ZERO) &&
-        position.lpShares.eq(numericConstants_1.ZERO));
+        position.lpShares.eq(numericConstants_1.ZERO) &&
+        position.isolatedPositionScaledBalance.eq(numericConstants_1.ZERO) &&
+        !positionIsBeingLiquidated(position));
 }
 exports.positionIsAvailable = positionIsAvailable;
+function positionIsBeingLiquidated(position) {
+    return ((position.positionFlag &
+        (types_1.PositionFlag.BeingLiquidated | types_1.PositionFlag.Bankruptcy)) >
+        0);
+}
+exports.positionIsBeingLiquidated = positionIsBeingLiquidated;
 /**
  *
  * @param userPosition

package/lib/browser/swap/UnifiedSwapClient.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnifiedSwapClient = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const anchor_1 = require("@coral-xyz/anchor");
 const jupiterClient_1 = require("../jupiter/jupiterClient");
 const titanClient_1 = require("../titan/titanClient");
 class UnifiedSwapClient {
@@ -70,17 +68,10 @@ class UnifiedSwapClient {
         }
         else {
             const titanClient = this.client;
-            const { quote, userPublicKey, slippageBps } = params;
+            const { userPublicKey } = params;
             // For Titan, we need to reconstruct the parameters from the quote
-            const titanQuote = quote;
             const result = await titanClient.getSwap({
-                inputMint: new web3_js_1.PublicKey(titanQuote.inputMint),
-                outputMint: new web3_js_1.PublicKey(titanQuote.outputMint),
-                amount: new anchor_1.BN(titanQuote.inAmount),
                 userPublicKey,
-                slippageBps: slippageBps || titanQuote.slippageBps,
-                swapMode: titanQuote.swapMode,
-                sizeConstraint: 1280 - 375, // MAX_TX_BYTE_SIZE - buffer for drift instructions
             });
             return {
                 transactionMessage: result.transactionMessage,

package/lib/browser/titan/titanClient.d.ts

@@ -59,11 +59,10 @@ export declare class TitanClient {
     /**
      * Get a swap transaction for quote
      */
-    getSwap({ inputMint, outputMint, amount, userPublicKey, maxAccounts, // 50 is an estimated amount with buffer
-    slippageBps, swapMode, onlyDirectRoutes, excludeDexes, sizeConstraint, accountsLimitWritable, }: {
-        inputMint: PublicKey;
-        outputMint: PublicKey;
-        amount: BN;
+    getSwap({ userPublicKey, }: {
+        inputMint?: PublicKey;
+        outputMint?: PublicKey;
+        amount?: BN;
         userPublicKey: PublicKey;
         maxAccounts?: number;
         slippageBps?: number;

package/lib/browser/titan/titanClient.js

@@ -128,23 +128,9 @@ class TitanClient {
     /**
      * Get a swap transaction for quote
      */
-    async getSwap({ inputMint, outputMint, amount, userPublicKey, maxAccounts = 50, // 50 is an estimated amount with buffer
-    slippageBps, swapMode, onlyDirectRoutes, excludeDexes, sizeConstraint, accountsLimitWritable, }) {
-        const params = this.buildParams({
-            inputMint,
-            outputMint,
-            amount,
-            userPublicKey,
-            maxAccounts,
-            slippageBps,
-            swapMode,
-            onlyDirectRoutes,
-            excludeDexes,
-            sizeConstraint,
-            accountsLimitWritable,
-        });
+    async getSwap({ userPublicKey, }) {
         // Check if we have cached quote data that matches the current parameters
-        if (!this.lastQuoteData || this.lastQuoteParams !== params.toString()) {
+        if (!this.lastQuoteData) {
             throw new Error('No matching quote data found. Please get a fresh quote before attempting to swap.');
         }
         // Reuse the cached quote data