@drift-labs/sdk 2.119.0-beta.3 → 2.119.0-beta.5

package/VERSION

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

package/bun.lock

@@ -1176,4 +1176,4 @@
 
     "@solworks/soltoolkit-sdk/@solana/web3.js/rpc-websockets/@types/ws/@types/node": ["@types/node@22.13.8", "", { "dependencies": { "undici-types": "~6.20.0" } }, "sha512-G3EfaZS+iOGYWLLRCEAXdWK9my08oHNZ+FHluRiggIYJPOXzhOiDgpVCUHaUvyIC5/fj7C/p637jdzC666AOKQ=="],
   }
-}
+}

package/lib/browser/driftClient.d.ts

@@ -586,13 +586,13 @@ export declare class DriftClient {
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
         signingAuthority: PublicKey;
-    }, precedingIxs?: TransactionInstruction[], overrideCustomIxIndex?: number, txParams?: TxParams): Promise<TransactionSignature>;
+    }, precedingIxs?: TransactionInstruction[], overrideCustomIxIndex?: number, includeHighLeverageModeConfig?: boolean, txParams?: TxParams): Promise<TransactionSignature>;
     getPlaceSignedMsgTakerPerpOrderIxs(signedSignedMsgOrderParams: SignedMsgOrderParams, marketIndex: number, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
         signingAuthority: PublicKey;
-    }, precedingIxs?: TransactionInstruction[], overrideCustomIxIndex?: number): Promise<TransactionInstruction[]>;
+    }, precedingIxs?: TransactionInstruction[], overrideCustomIxIndex?: number, includeHighLeverageModeConfig?: boolean): Promise<TransactionInstruction[]>;
     placeAndMakeSignedMsgPerpOrder(signedSignedMsgOrderParams: SignedMsgOrderParams, signedMsgOrderUuid: Uint8Array, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
@@ -649,7 +649,7 @@ export declare class DriftClient {
      * @param orderParams.auctionEndPrice:
      * @param orderParams.reduceOnly:
      * @param orderParams.postOnly:
-     * @param orderParams.immediateOrCancel:
+     * @param orderParams.bitFlags:
      * @param orderParams.policy:
      * @param orderParams.maxTs:
      * @returns
@@ -667,11 +667,11 @@ export declare class DriftClient {
         auctionEndPrice?: BN;
         reduceOnly?: boolean;
         postOnly?: boolean;
-        immediateOrCancel?: boolean;
+        bitFlags?: number;
         maxTs?: BN;
         policy?: number;
     }, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, immediateOrCancel, maxTs, policy, }: {
+    getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }: {
         orderId: number;
         newDirection?: PositionDirection;
         newBaseAmount?: BN;
@@ -684,7 +684,7 @@ export declare class DriftClient {
         auctionEndPrice?: BN;
         reduceOnly?: boolean;
         postOnly?: boolean;
-        immediateOrCancel?: boolean;
+        bitFlags?: number;
         maxTs?: BN;
         policy?: number;
     }, subAccountId?: number): Promise<TransactionInstruction>;
@@ -701,7 +701,7 @@ export declare class DriftClient {
      * @param orderParams.auctionEndPrice: Only required if order type changed to market from something else
      * @param orderParams.reduceOnly:
      * @param orderParams.postOnly:
-     * @param orderParams.immediateOrCancel:
+     * @param orderParams.bitFlags:
      * @param orderParams.policy:
      * @param orderParams.maxTs:
      * @returns
@@ -719,11 +719,11 @@ export declare class DriftClient {
         auctionEndPrice?: BN;
         reduceOnly?: boolean;
         postOnly?: boolean;
-        immediateOrCancel?: boolean;
+        bitFlags?: number;
         policy?: ModifyOrderPolicy;
         maxTs?: BN;
     }, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    getModifyOrderByUserIdIx({ userOrderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, immediateOrCancel, maxTs, policy, }: {
+    getModifyOrderByUserIdIx({ userOrderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }: {
         userOrderId: number;
         newDirection?: PositionDirection;
         newBaseAmount?: BN;
@@ -736,7 +736,7 @@ export declare class DriftClient {
         auctionEndPrice?: BN;
         reduceOnly?: boolean;
         postOnly?: boolean;
-        immediateOrCancel?: boolean;
+        bitFlags?: number;
         policy?: ModifyOrderPolicy;
         maxTs?: BN;
         txParams?: TxParams;
@@ -754,7 +754,7 @@ export declare class DriftClient {
     settlePNL(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number, txParams?: TxParams, optionalIxs?: TransactionInstruction[]): Promise<TransactionSignature>;
     settlePNLIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     settleMultiplePNLs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature>;
-    settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams): Promise<TransactionSignature[]>;
+    settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode, txParams?: TxParams, optionalIxs?: TransactionInstruction[]): Promise<TransactionSignature[]>;
     settleMultiplePNLsIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndexes: number[], mode: SettlePnlMode): Promise<TransactionInstruction>;
     getSetUserStatusToBeingLiquidatedIx(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionInstruction>;
     setUserStatusToBeingLiquidated(userAccountPublicKey: PublicKey, userAccount: UserAccount): Promise<TransactionSignature>;

package/lib/browser/driftClient.js

@@ -2091,6 +2091,13 @@ class DriftClient {
                 ? [depositToTradeArgs === null || depositToTradeArgs === void 0 ? void 0 : depositToTradeArgs.depositMarketIndex]
                 : undefined,
         });
+        if ((0, orderParams_1.isUpdateHighLeverageMode)(orderParams.bitFlags)) {
+            remainingAccounts.push({
+                pubkey: (0, pda_1.getHighLeverageModeConfigPublicKey)(this.program.programId),
+                isWritable: true,
+                isSigner: false,
+            });
+        }
         return await this.program.instruction.placePerpOrder(orderParams, {
             accounts: {
                 state: await this.getStatePublicKey(),
@@ -3324,6 +3331,13 @@ class DriftClient {
                 });
             }
         }
+        if ((0, orderParams_1.isUpdateHighLeverageMode)(orderParams.bitFlags)) {
+            remainingAccounts.push({
+                pubkey: (0, pda_1.getHighLeverageModeConfigPublicKey)(this.program.programId),
+                isWritable: true,
+                isSigner: false,
+            });
+        }
         let optionalParams = null;
         if (auctionDurationPercentage || successCondition) {
             optionalParams =
@@ -3418,17 +3432,24 @@ class DriftClient {
     signMessage(message, keypair = this.wallet.payer) {
         return Buffer.from(tweetnacl_1.default.sign.detached(message, keypair.secretKey));
     }
-    async placeSignedMsgTakerOrder(signedSignedMsgOrderParams, marketIndex, takerInfo, precedingIxs = [], overrideCustomIxIndex, txParams) {
-        const ixs = await this.getPlaceSignedMsgTakerPerpOrderIxs(signedSignedMsgOrderParams, marketIndex, takerInfo, precedingIxs, overrideCustomIxIndex);
+    async placeSignedMsgTakerOrder(signedSignedMsgOrderParams, marketIndex, takerInfo, precedingIxs = [], overrideCustomIxIndex, includeHighLeverageModeConfig, txParams) {
+        const ixs = await this.getPlaceSignedMsgTakerPerpOrderIxs(signedSignedMsgOrderParams, marketIndex, takerInfo, precedingIxs, overrideCustomIxIndex, includeHighLeverageModeConfig);
         const { txSig } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
         return txSig;
     }
-    async getPlaceSignedMsgTakerPerpOrderIxs(signedSignedMsgOrderParams, marketIndex, takerInfo, precedingIxs = [], overrideCustomIxIndex) {
+    async getPlaceSignedMsgTakerPerpOrderIxs(signedSignedMsgOrderParams, marketIndex, takerInfo, precedingIxs = [], overrideCustomIxIndex, includeHighLeverageModeConfig) {
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [takerInfo.takerUserAccount],
             useMarketLastSlotCache: false,
             readablePerpMarketIndex: marketIndex,
         });
+        if (includeHighLeverageModeConfig) {
+            remainingAccounts.push({
+                pubkey: (0, pda_1.getHighLeverageModeConfigPublicKey)(this.program.programId),
+                isWritable: true,
+                isSigner: false,
+            });
+        }
         const messageLengthBuffer = Buffer.alloc(2);
         messageLengthBuffer.writeUInt16LE(signedSignedMsgOrderParams.orderParams.length);
         const signedMsgIxData = Buffer.concat([
@@ -3677,7 +3698,7 @@ class DriftClient {
      * @param orderParams.auctionEndPrice:
      * @param orderParams.reduceOnly:
      * @param orderParams.postOnly:
-     * @param orderParams.immediateOrCancel:
+     * @param orderParams.bitFlags:
      * @param orderParams.policy:
      * @param orderParams.maxTs:
      * @returns
@@ -3686,7 +3707,7 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getModifyOrderIx(orderParams, subAccountId), txParams), [], this.opts);
         return txSig;
     }
-    async getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, immediateOrCancel, maxTs, policy, }, subAccountId) {
+    async getModifyOrderIx({ orderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }, subAccountId) {
         const user = await this.getUserAccountPublicKey(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount(subAccountId)],
@@ -3704,7 +3725,7 @@ class DriftClient {
             auctionEndPrice: auctionEndPrice || null,
             reduceOnly: reduceOnly != undefined ? reduceOnly : null,
             postOnly: postOnly != undefined ? postOnly : null,
-            immediateOrCancel: immediateOrCancel != undefined ? immediateOrCancel : null,
+            bitFlags: bitFlags != undefined ? bitFlags : null,
             policy: policy || null,
             maxTs: maxTs || null,
         };
@@ -3731,7 +3752,7 @@ class DriftClient {
      * @param orderParams.auctionEndPrice: Only required if order type changed to market from something else
      * @param orderParams.reduceOnly:
      * @param orderParams.postOnly:
-     * @param orderParams.immediateOrCancel:
+     * @param orderParams.bitFlags:
      * @param orderParams.policy:
      * @param orderParams.maxTs:
      * @returns
@@ -3740,7 +3761,7 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.getModifyOrderByUserIdIx(orderParams, subAccountId), txParams), [], this.opts);
         return txSig;
     }
-    async getModifyOrderByUserIdIx({ userOrderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, immediateOrCancel, maxTs, policy, }, subAccountId) {
+    async getModifyOrderByUserIdIx({ userOrderId, newDirection, newBaseAmount, newLimitPrice, newOraclePriceOffset, newTriggerPrice, newTriggerCondition, auctionDuration, auctionStartPrice, auctionEndPrice, reduceOnly, postOnly, bitFlags, maxTs, policy, }, subAccountId) {
         const user = await this.getUserAccountPublicKey(subAccountId);
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [this.getUserAccount(subAccountId)],
@@ -3758,7 +3779,7 @@ class DriftClient {
             auctionEndPrice: auctionEndPrice || null,
             reduceOnly: reduceOnly || false,
             postOnly: postOnly || null,
-            immediateOrCancel: immediateOrCancel || false,
+            bitFlags: bitFlags || null,
             policy: policy || null,
             maxTs: maxTs || null,
         };
@@ -3832,7 +3853,7 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settleMultiplePNLsIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode), txParams), [], this.opts);
         return txSig;
     }
-    async settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode, txParams) {
+    async settleMultiplePNLsMultipleTxs(settleeUserAccountPublicKey, settleeUserAccount, marketIndexes, mode, txParams, optionalIxs) {
         // need multiple TXs because settling more than 4 markets won't fit in a single TX
         const txsToSign = [];
         const marketIndexesInFourGroups = [];
@@ -3845,7 +3866,7 @@ class DriftClient {
             const tx = await this.buildTransaction(ix, {
                 ...txParams,
                 computeUnits,
-            });
+            }, undefined, undefined, undefined, undefined, optionalIxs);
             txsToSign.push(tx);
         }
         const txsMap = {};

package/lib/browser/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.118.0",
+    "version": "2.118.0-beta.1",
     "name": "drift",
     "instructions": [
         {
@@ -9436,8 +9436,8 @@
                         }
                     },
                     {
-                        "name": "immediateOrCancel",
-                        "type": "bool"
+                        "name": "bitFlags",
+                        "type": "u8"
                     },
                     {
                         "name": "maxTs",
@@ -9636,7 +9636,7 @@
                     {
                         "name": "immediateOrCancel",
                         "type": {
-                            "option": "bool"
+                            "option": "u8"
                         }
                     },
                     {
@@ -11714,6 +11714,20 @@
                 ]
             }
         },
+        {
+            "name": "OrderParamsBitFlag",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "ImmediateOrCancel"
+                    },
+                    {
+                        "name": "UpdateHighLeverageMode"
+                    }
+                ]
+            }
+        },
         {
             "name": "PostOnlyParam",
             "type": {
@@ -15078,6 +15092,11 @@
             "code": 6313,
             "name": "InvalidSignedMsgUserOrdersResize",
             "msg": "Invalid SignedMsgUserOrders resize"
+        },
+        {
+            "code": 6314,
+            "name": "CouldNotDeserializeHighLeverageModeConfig",
+            "msg": "Could not deserialize high leverage mode config"
         }
     ],
     "metadata": {

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

@@ -81,3 +81,5 @@ export declare function calculateWithdrawLimit(spotMarket: SpotMarketAccount, no
     currentDepositAmount: any;
     currentBorrowAmount: any;
 };
+export declare function getSpotAssetValue(tokenAmount: BN, strictOraclePrice: StrictOraclePrice, spotMarketAccount: SpotMarketAccount, maxMarginRatio: number, marginCategory?: MarginCategory): BN;
+export declare function getSpotLiabilityValue(tokenAmount: BN, strictOraclePrice: StrictOraclePrice, spotMarketAccount: SpotMarketAccount, maxMarginRatio: number, marginCategory?: MarginCategory, liquidationBuffer?: BN): BN;

package/lib/browser/math/spotBalance.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateWithdrawLimit = exports.calculateTokenUtilizationLimits = exports.calculateInterestAccumulated = exports.calculateBorrowRate = exports.calculateDepositRate = exports.calculateInterestRate = exports.calculateSpotMarketBorrowCapacity = exports.calculateUtilization = exports.calculateLiabilityWeight = exports.calculateScaledInitialAssetWeight = exports.calculateAssetWeight = exports.getTokenValue = exports.getStrictTokenValue = exports.getSignedTokenAmount = exports.getTokenAmount = exports.getBalance = void 0;
+exports.getSpotLiabilityValue = exports.getSpotAssetValue = exports.calculateWithdrawLimit = exports.calculateTokenUtilizationLimits = exports.calculateInterestAccumulated = exports.calculateBorrowRate = exports.calculateDepositRate = exports.calculateInterestRate = exports.calculateSpotMarketBorrowCapacity = exports.calculateUtilization = exports.calculateLiabilityWeight = exports.calculateScaledInitialAssetWeight = exports.calculateAssetWeight = exports.getTokenValue = exports.getStrictTokenValue = exports.getSignedTokenAmount = exports.getTokenAmount = exports.getBalance = void 0;
 const types_1 = require("../types");
 const anchor_1 = require("@coral-xyz/anchor");
 const numericConstants_1 = require("../constants/numericConstants");
@@ -377,3 +377,35 @@ function calculateWithdrawLimit(spotMarket, now) {
     };
 }
 exports.calculateWithdrawLimit = calculateWithdrawLimit;
+function getSpotAssetValue(tokenAmount, strictOraclePrice, spotMarketAccount, maxMarginRatio, marginCategory) {
+    let assetValue = getStrictTokenValue(tokenAmount, spotMarketAccount.decimals, strictOraclePrice);
+    if (marginCategory !== undefined) {
+        let weight = calculateAssetWeight(tokenAmount, strictOraclePrice.current, spotMarketAccount, marginCategory);
+        if (marginCategory === 'Initial' &&
+            spotMarketAccount.marketIndex !== numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
+            const userCustomAssetWeight = anchor_1.BN.max(numericConstants_1.ZERO, numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION.subn(maxMarginRatio));
+            weight = anchor_1.BN.min(weight, userCustomAssetWeight);
+        }
+        assetValue = assetValue.mul(weight).div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
+    }
+    return assetValue;
+}
+exports.getSpotAssetValue = getSpotAssetValue;
+function getSpotLiabilityValue(tokenAmount, strictOraclePrice, spotMarketAccount, maxMarginRatio, marginCategory, liquidationBuffer) {
+    let liabilityValue = getStrictTokenValue(tokenAmount, spotMarketAccount.decimals, strictOraclePrice);
+    if (marginCategory !== undefined) {
+        let weight = calculateLiabilityWeight(tokenAmount, spotMarketAccount, marginCategory);
+        if (marginCategory === 'Initial' &&
+            spotMarketAccount.marketIndex !== numericConstants_1.QUOTE_SPOT_MARKET_INDEX) {
+            weight = anchor_1.BN.max(weight, numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION.addn(maxMarginRatio));
+        }
+        if (liquidationBuffer !== undefined) {
+            weight = weight.add(liquidationBuffer);
+        }
+        liabilityValue = liabilityValue
+            .mul(weight)
+            .div(numericConstants_1.SPOT_MARKET_WEIGHT_PRECISION);
+    }
+    return liabilityValue;
+}
+exports.getSpotLiabilityValue = getSpotLiabilityValue;

package/lib/browser/orderParams.d.ts

@@ -27,3 +27,4 @@ export declare function getMarketOrderParams(params: Omit<OptionalOrderParams, '
  * @returns
  */
 export declare function getOrderParams(optionalOrderParams: OptionalOrderParams, overridingParams?: Record<string, any>): OrderParams;
+export declare function isUpdateHighLeverageMode(bitFlags: number): boolean;

package/lib/browser/orderParams.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderParams = exports.getMarketOrderParams = exports.getTriggerLimitOrderParams = exports.getTriggerMarketOrderParams = exports.getLimitOrderParams = void 0;
+exports.isUpdateHighLeverageMode = exports.getOrderParams = exports.getMarketOrderParams = exports.getTriggerLimitOrderParams = exports.getTriggerMarketOrderParams = exports.getLimitOrderParams = void 0;
 const types_1 = require("./types");
 function getLimitOrderParams(params) {
     return getOrderParams(Object.assign({}, params, {
@@ -42,3 +42,7 @@ function getOrderParams(optionalOrderParams, overridingParams = {}) {
     return Object.assign({}, types_1.DefaultOrderParams, optionalOrderParams, overridingParams);
 }
 exports.getOrderParams = getOrderParams;
+function isUpdateHighLeverageMode(bitFlags) {
+    return (bitFlags & types_1.OrderParamsBitFlag.UpdateHighLeverageMode) !== 0;
+}
+exports.isUpdateHighLeverageMode = isUpdateHighLeverageMode;

package/lib/browser/tx/txHandler.d.ts

@@ -1,4 +1,4 @@
-import { AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, Commitment, ConfirmOptions, Connection, Signer, Transaction, TransactionInstruction, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
+import { AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, Commitment, ConfirmOptions, Connection, Signer, SimulatedTransactionResponse, Transaction, TransactionInstruction, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { DriftClientMetricsEvents, IWallet, MappedRecord, SignedTxData, TxParams } from '../types';
 export declare const COMPUTE_UNITS_DEFAULT = 200000;
 export type TxBuildingProps = {
@@ -13,6 +13,7 @@ export type TxBuildingProps = {
     recentBlockhash?: BlockhashWithExpiryBlockHeight;
     wallet?: IWallet;
     optionalIxs?: TransactionInstruction[];
+    simulatedTx?: SimulatedTransactionResponse;
 };
 export type TxHandlerConfig = {
     blockhashCachingEnabled?: boolean;
@@ -152,4 +153,8 @@ export declare class TxHandler {
         signedTxMap: MappedRecord<T, Transaction | VersionedTransaction>;
         signedTxData: SignedTxData[];
     }>;
+    simulateAndCalculateInstructions(txBuildingProps: TxBuildingProps, optionalInstructions?: TransactionInstruction[], versionedTransaction?: boolean, addressLookupTables?: AddressLookupTableAccount[]): Promise<[
+        TransactionInstruction[],
+        SimulatedTransactionResponse | undefined
+    ]>;
 }

package/lib/browser/tx/txHandler.js

@@ -209,6 +209,7 @@ class TxHandler {
             },
             processParams: {
                 connection: this.connection,
+                simulatedTx: txBuildingProps.simulatedTx,
             },
         });
         return processedTxParams;
@@ -292,9 +293,16 @@ class TxHandler {
             ? instructions
             : [instructions];
         let instructionsToUse;
-        // add optional ixs if there's room (usually oracle cranks)
+        let simulatedTx;
+        // add optional ixs if there's room and it doesn't fail simulation (usually oracle cranks)
         if (props.optionalIxs && txVersion === 0) {
-            instructionsToUse = (0, utils_1.getCombinedInstructions)(instructionsArray, props.optionalIxs, txVersion === 0, lookupTables);
+            [instructionsToUse, simulatedTx] =
+                await this.simulateAndCalculateInstructions({
+                    ...props,
+                    instructions: instructionsArray,
+                    txVersion,
+                    lookupTables,
+                }, props.optionalIxs, txVersion === 0, lookupTables);
         }
         else {
             instructionsToUse = instructionsArray;
@@ -303,6 +311,7 @@ class TxHandler {
             const processedTxParams = await this.getProcessedTransactionParams({
                 ...props,
                 instructions: instructionsToUse,
+                simulatedTx: simulatedTx,
             });
             baseTxParams = {
                 ...baseTxParams,
@@ -460,5 +469,37 @@ class TxHandler {
             : this.getSignedTransactionMap(builtTxs, props.wallet));
         return preppedTransactions;
     }
+    async simulateAndCalculateInstructions(txBuildingProps, optionalInstructions = [], versionedTransaction = true, addressLookupTables = []) {
+        var _a;
+        const baseInstructions = Array.isArray(txBuildingProps.instructions)
+            ? txBuildingProps.instructions
+            : [txBuildingProps.instructions];
+        if (optionalInstructions.length === 0) {
+            return [baseInstructions, undefined];
+        }
+        let allInstructions = [...optionalInstructions, ...baseInstructions];
+        let txSize = (0, utils_1.getSizeOfTransaction)(allInstructions, versionedTransaction, addressLookupTables);
+        while (txSize > utils_1.MAX_TX_BYTE_SIZE &&
+            allInstructions.length > baseInstructions.length) {
+            allInstructions = allInstructions.slice(1);
+            txSize = (0, utils_1.getSizeOfTransaction)(allInstructions, versionedTransaction, addressLookupTables);
+        }
+        const tx = await this.buildTransaction({
+            ...txBuildingProps,
+            optionalIxs: undefined,
+            instructions: allInstructions,
+        });
+        const simulatedTx = await this.connection.simulateTransaction(tx);
+        if ((_a = simulatedTx.value) === null || _a === void 0 ? void 0 : _a.err) {
+            const tx = await this.buildTransaction({
+                ...txBuildingProps,
+                optionalIxs: undefined,
+                instructions: baseInstructions,
+            });
+            const simulationWithoutOptionalIxs = await this.connection.simulateTransaction(tx);
+            return [baseInstructions, simulationWithoutOptionalIxs.value];
+        }
+        return [allInstructions, simulatedTx.value];
+    }
 }
 exports.TxHandler = TxHandler;

package/lib/browser/tx/txParamProcessor.d.ts

@@ -1,4 +1,4 @@
-import { Connection, VersionedTransaction } from '@solana/web3.js';
+import { Connection, SimulatedTransactionResponse, VersionedTransaction } from '@solana/web3.js';
 import { BaseTxParams, ProcessingTxParams } from '..';
 type TransactionBuildingProps = {
     txParams: BaseTxParams;
@@ -9,7 +9,7 @@ type TransactionBuildingProps = {
 export declare class TransactionParamProcessor {
     private static getComputeUnitsFromSim;
     static getTxSimComputeUnits(tx: VersionedTransaction, connection: Connection, bufferMultiplier: number, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
-    lowerBoundCu?: number): Promise<{
+    lowerBoundCu?: number, simulatedTx?: SimulatedTransactionResponse): Promise<{
         success: boolean;
         computeUnits: number;
     }>;
@@ -18,6 +18,7 @@ export declare class TransactionParamProcessor {
         processConfig: ProcessingTxParams;
         processParams: {
             connection: Connection;
+            simulatedTx?: SimulatedTransactionResponse;
         };
         txBuilder: (baseTransactionProps: TransactionBuildingProps) => Promise<VersionedTransaction>;
     }): Promise<BaseTxParams>;

package/lib/browser/tx/txParamProcessor.js

@@ -16,16 +16,20 @@ class TransactionParamProcessor {
         return undefined;
     }
     static async getTxSimComputeUnits(tx, connection, bufferMultiplier, // Making this a mandatory param to force the user to remember that simulated CU's can be inaccurate and a buffer should be applied
-    lowerBoundCu) {
-        var _a, _b, _c;
+    lowerBoundCu, simulatedTx) {
+        var _a, _b;
         try {
             if (TEST_SIMS_ALWAYS_FAIL)
                 throw new Error('Test Error::SIMS_ALWAYS_FAIL');
-            const simTxResult = await connection.simulateTransaction(tx, {
-                replaceRecentBlockhash: true, // This is important to ensure that the blockhash is not too new.. Otherwise we will very often receive a "blockHashNotFound" error
-            });
+            const simTxResult = simulatedTx
+                ? {
+                    value: simulatedTx,
+                }
+                : await connection.simulateTransaction(tx, {
+                    replaceRecentBlockhash: true, // This is important to ensure that the blockhash is not too new.. Otherwise we will very often receive a "blockHashNotFound" error
+                });
             if ((_a = simTxResult === null || simTxResult === void 0 ? void 0 : simTxResult.value) === null || _a === void 0 ? void 0 : _a.err) {
-                throw new Error((_c = (_b = simTxResult === null || simTxResult === void 0 ? void 0 : simTxResult.value) === null || _b === void 0 ? void 0 : _b.err) === null || _c === void 0 ? void 0 : _c.toString());
+                throw (_b = simTxResult === null || simTxResult === void 0 ? void 0 : simTxResult.value) === null || _b === void 0 ? void 0 : _b.err;
             }
             const computeUnits = await this.getComputeUnitsFromSim(simTxResult);
             // Apply the buffer, but round down to the MAX_COMPUTE_UNITS, and round up to the nearest whole number
@@ -63,7 +67,7 @@ class TransactionParamProcessor {
             const txToSim = await txBuilder({
                 txParams: { ...finalTxParams, computeUnits: MAX_COMPUTE_UNITS },
             });
-            const txSimComputeUnitsResult = await this.getTxSimComputeUnits(txToSim, processProps.connection, (_a = processConfig === null || processConfig === void 0 ? void 0 : processConfig.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : COMPUTE_UNIT_BUFFER_FACTOR);
+            const txSimComputeUnitsResult = await this.getTxSimComputeUnits(txToSim, processProps.connection, (_a = processConfig === null || processConfig === void 0 ? void 0 : processConfig.computeUnitsBufferMultiplier) !== null && _a !== void 0 ? _a : COMPUTE_UNIT_BUFFER_FACTOR, undefined, processProps.simulatedTx);
             if (txSimComputeUnitsResult.success) {
                 // Adjust the transaction based on the simulated compute units
                 finalTxParams.computeUnits = txSimComputeUnitsResult.computeUnits;

package/lib/browser/tx/utils.d.ts

@@ -1,4 +1,4 @@
 import { AddressLookupTableAccount, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
+export declare const MAX_TX_BYTE_SIZE = 1232;
 export declare const isVersionedTransaction: (tx: Transaction | VersionedTransaction) => boolean;
 export declare const getSizeOfTransaction: (instructions: TransactionInstruction[], versionedTransaction?: boolean, addressLookupTables?: AddressLookupTableAccount[]) => number;
-export declare const getCombinedInstructions: (baseInstructions: TransactionInstruction[], optionalInstructions?: TransactionInstruction[], versionedTransaction?: boolean, addressLookupTables?: AddressLookupTableAccount[]) => TransactionInstruction[];

package/lib/browser/tx/utils.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCombinedInstructions = exports.getSizeOfTransaction = exports.isVersionedTransaction = void 0;
+exports.getSizeOfTransaction = exports.isVersionedTransaction = exports.MAX_TX_BYTE_SIZE = void 0;
 const web3_js_1 = require("@solana/web3.js");
-const MAX_SIZE = 1232;
+exports.MAX_TX_BYTE_SIZE = 1232;
 const isVersionedTransaction = (tx) => {
     const version = tx === null || tx === void 0 ? void 0 : tx.version;
     const isVersionedTx = tx instanceof web3_js_1.VersionedTransaction || version !== undefined;
@@ -63,20 +63,6 @@ const getSizeOfTransaction = (instructions, versionedTransaction = true, address
         numberOfAddressLookups);
 };
 exports.getSizeOfTransaction = getSizeOfTransaction;
-const getCombinedInstructions = (baseInstructions, optionalInstructions = [], versionedTransaction = true, addressLookupTables = []) => {
-    if (optionalInstructions.length === 0) {
-        return baseInstructions;
-    }
-    let allInstructions = [...optionalInstructions, ...baseInstructions];
-    let txSize = (0, exports.getSizeOfTransaction)(allInstructions, versionedTransaction, addressLookupTables);
-    while (txSize > MAX_SIZE &&
-        allInstructions.length > baseInstructions.length) {
-        allInstructions = allInstructions.slice(1);
-        txSize = (0, exports.getSizeOfTransaction)(allInstructions, versionedTransaction, addressLookupTables);
-    }
-    return allInstructions;
-};
-exports.getCombinedInstructions = getCombinedInstructions;
 function getSizeOfCompressedU16(n) {
     return 1 + Number(n >= 128) + Number(n >= 16384);
 }

package/lib/browser/types.d.ts

@@ -1172,7 +1172,7 @@ export type OrderParams = {
     marketIndex: number;
     reduceOnly: boolean;
     postOnly: PostOnlyParams;
-    immediateOrCancel: boolean;
+    bitFlags: number;
     triggerPrice: BN | null;
     triggerCondition: OrderTriggerCondition;
     oraclePriceOffset: number | null;
@@ -1195,6 +1195,10 @@ export declare class PostOnlyParams {
         slide: {};
     };
 }
+export declare class OrderParamsBitFlag {
+    static readonly ImmediateOrCancel = 1;
+    static readonly UpdateHighLeverageMode = 2;
+}
 export type NecessaryOrderParams = {
     orderType: OrderType;
     marketIndex: number;

package/lib/browser/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.FuelOverflowStatus = exports.ReferrerStatus = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderBitFlag = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSourceNum = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.MarginMode = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.ExchangeStatus = void 0;
+exports.SwapReduceOnly = exports.PlaceAndTakeOrderSuccessCondition = exports.FuelOverflowStatus = exports.ReferrerStatus = exports.DefaultOrderParams = exports.ModifyOrderPolicy = exports.OrderParamsBitFlag = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.SettlePnlMode = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderBitFlag = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSourceNum = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.MarginMode = exports.UserStatus = exports.InsuranceFundOperation = exports.SpotOperation = exports.PerpOperation = exports.MarketStatus = exports.ExchangeStatus = void 0;
 const _1 = require(".");
 // # Utility Types / Enums / Constants
 var ExchangeStatus;
@@ -342,6 +342,11 @@ PostOnlyParams.NONE = { none: {} };
 PostOnlyParams.MUST_POST_ONLY = { mustPostOnly: {} }; // Tx fails if order can't be post only
 PostOnlyParams.TRY_POST_ONLY = { tryPostOnly: {} }; // Tx succeeds and order not placed if can't be post only
 PostOnlyParams.SLIDE = { slide: {} }; // Modify price to be post only if can't be post only
+class OrderParamsBitFlag {
+}
+exports.OrderParamsBitFlag = OrderParamsBitFlag;
+OrderParamsBitFlag.ImmediateOrCancel = 1;
+OrderParamsBitFlag.UpdateHighLeverageMode = 2;
 var ModifyOrderPolicy;
 (function (ModifyOrderPolicy) {
     ModifyOrderPolicy[ModifyOrderPolicy["MustModify"] = 1] = "MustModify";
@@ -357,7 +362,7 @@ exports.DefaultOrderParams = {
     marketIndex: 0,
     reduceOnly: false,
     postOnly: PostOnlyParams.NONE,
-    immediateOrCancel: false,
+    bitFlags: 0,
     triggerPrice: null,
     triggerCondition: OrderTriggerCondition.ABOVE,
     oraclePriceOffset: null,