@drift-labs/sdk 2.16.0-beta.3 → 2.17.0-beta.0

package/lib/config.d.ts

@@ -10,6 +10,7 @@ declare type DriftConfig = {
     V2_ALPHA_TICKET_MINT_ADDRESS: string;
     PERP_MARKETS: PerpMarketConfig[];
     SPOT_MARKETS: SpotMarketConfig[];
+    MARKET_LOOKUP_TABLE: string;
 };
 export declare type DriftEnv = 'devnet' | 'mainnet-beta';
 export declare const configs: {

package/lib/config.js

@@ -13,6 +13,7 @@ exports.configs = {
         V2_ALPHA_TICKET_MINT_ADDRESS: 'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',
         PERP_MARKETS: perpMarkets_1.DevnetPerpMarkets,
         SPOT_MARKETS: spotMarkets_1.DevnetSpotMarkets,
+        MARKET_LOOKUP_TABLE: 'FaMS3U4uBojvGn5FSDEPimddcXsCfwkKsFgMVVnDdxGb',
     },
     'mainnet-beta': {
         ENV: 'mainnet-beta',
@@ -23,6 +24,7 @@ exports.configs = {
         V2_ALPHA_TICKET_MINT_ADDRESS: 'Cmvhycb6LQvvzaShGw4iDHRLzeSSryioAsU98DSSkMNa',
         PERP_MARKETS: perpMarkets_1.MainnetPerpMarkets,
         SPOT_MARKETS: spotMarkets_1.MainnetSpotMarkets,
+        MARKET_LOOKUP_TABLE: 'D9cnvzswDikQDf53k4HpQ3KJ9y1Fv3HGGDFYMXnK5T6c',
     },
 };
 let currentConfig = exports.configs.devnet;

package/lib/driftClient.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 /// <reference types="bn.js" />
 import { AnchorProvider, BN, Program } from '@project-serum/anchor';
-import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, OrderType, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount } from './types';
+import { StateAccount, IWallet, PositionDirection, UserAccount, PerpMarketAccount, OrderParams, Order, SpotMarketAccount, SpotPosition, MakerInfo, TakerInfo, OptionalOrderParams, OrderType, ReferrerInfo, MarketType, TxParams, SerumV3FulfillmentConfigAccount, OrderTriggerCondition } from './types';
 import * as anchor from '@project-serum/anchor';
-import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer } from '@solana/web3.js';
+import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transaction, TransactionInstruction, AccountMeta, Signer, AddressLookupTableAccount } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -43,6 +43,7 @@ export declare class DriftClient {
     perpMarketLastSlotCache: Map<number, number>;
     spotMarketLastSlotCache: Map<number, number>;
     authority: PublicKey;
+    marketLookupTable: PublicKey;
     get isSubscribed(): boolean;
     set isSubscribed(val: boolean);
     constructor(config: DriftClientConfig);
@@ -82,6 +83,7 @@ export declare class DriftClient {
     getQuoteSpotMarketAccount(): SpotMarketAccount;
     getOraclePriceDataAndSlot(oraclePublicKey: PublicKey): DataAndSlot<OraclePriceData> | undefined;
     getSerumV3FulfillmentConfig(serumMarket: PublicKey): Promise<SerumV3FulfillmentConfigAccount>;
+    fetchMarketLookupTableAccount(): Promise<AddressLookupTableAccount>;
     /**
      * Update the wallet to use for drift transactions and linked user account
      * @param newWallet
@@ -220,6 +222,16 @@ export declare class DriftClient {
      * @returns
      */
     modifyPerpOrder(orderId: number, newBaseAmount?: BN, newLimitPrice?: BN, newOraclePriceOffset?: number): Promise<TransactionSignature>;
+    /**
+     * Modifies an open order by closing it and replacing it with a new order.
+     * @deprecated use modifyOrderByUserOrderId instead
+     * @param userOrderId: The open order to modify
+     * @param newBaseAmount: The new base amount for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+     * @param newLimitPice: The new limit price for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+     * @param newOraclePriceOffset: The new oracle price offset for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+     * @returns
+     */
+    modifyPerpOrderByUserOrderId(userOrderId: number, newBaseAmount?: BN, newLimitPrice?: BN, newOraclePriceOffset?: number): Promise<TransactionSignature>;
     /**
      * Modifies an open order (spot or perp) by closing it and replacing it with a new order.
      * @param orderId: The open order to modify
@@ -229,27 +241,24 @@ export declare class DriftClient {
      * @param newOrderType: Optional - New order type for the order.
      * @param newTriggerPrice: Optional - Thew new trigger price for the order.
      * @param isSpot: Optional - Set to true if the order is a spot order
+     * @param auctionDuration: Only required if order type changed to market from something else
+     * @param auctionStartPrice: Only required if order type changed to market from something else
+     * @param auctionEndPrice: Only required if order type changed to market from something else
      * @returns
      */
-    modifyOrder({ orderId, newBaseAmount, newLimitPrice, newOraclePriceOffset, newOrderType, newTriggerPrice, isSpot, }: {
+    modifyOrder({ orderId, newBaseAmount, newLimitPrice, newOraclePriceOffset, newOrderType, newTriggerPrice, newTriggerCondition, isSpot, auctionDuration, auctionStartPrice, auctionEndPrice, }: {
         orderId: number;
         newBaseAmount?: BN;
         newLimitPrice?: BN;
         newOraclePriceOffset?: number;
         newOrderType?: OrderType;
         newTriggerPrice?: BN;
+        newTriggerCondition?: OrderTriggerCondition;
         isSpot?: boolean;
+        auctionDuration?: number;
+        auctionStartPrice?: BN;
+        auctionEndPrice?: BN;
     }): Promise<TransactionSignature>;
-    /**
-     * Modifies an open order by closing it and replacing it with a new order.
-     * @deprecated use modifyOrderByUserOrderId instead
-     * @param userOrderId: The open order to modify
-     * @param newBaseAmount: The new base amount for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
-     * @param newLimitPice: The new limit price for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
-     * @param newOraclePriceOffset: The new oracle price offset for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
-     * @returns
-     */
-    modifyPerpOrderByUserOrderId(userOrderId: number, newBaseAmount?: BN, newLimitPrice?: BN, newOraclePriceOffset?: number): Promise<TransactionSignature>;
     /**
      * Modifies an open order by closing it and replacing it with a new order.
      * @param userOrderId: The open order to modify
@@ -259,16 +268,23 @@ export declare class DriftClient {
      * @param newOrderType: Optional - New order type for the order.
      * @param newTriggerPrice: Optional - Thew new trigger price for the order.
      * @param isSpot: Set to true if the order is a spot order
+     * @param auctionDuration: Only required if order type changed to market from something else
+     * @param auctionStartPrice: Only required if order type changed to market from something else
+     * @param auctionEndPrice: Only required if order type changed to market from something else
      * @returns
      */
-    modifyOrderByUserOrderId({ userOrderId, newBaseAmount, newLimitPrice, newOraclePriceOffset, newOrderType, newTriggerPrice, isSpot, }: {
+    modifyOrderByUserOrderId({ userOrderId, newBaseAmount, newLimitPrice, newOraclePriceOffset, newOrderType, newTriggerPrice, newTriggerCondition, isSpot, auctionDuration, auctionStartPrice, auctionEndPrice, }: {
         userOrderId: number;
         newBaseAmount?: BN;
         newLimitPrice?: BN;
         newOraclePriceOffset?: number;
         newOrderType?: OrderType;
         newTriggerPrice?: BN;
+        newTriggerCondition?: OrderTriggerCondition;
         isSpot?: boolean;
+        auctionDuration?: number;
+        auctionStartPrice?: BN;
+        auctionEndPrice?: BN;
     }): Promise<TransactionSignature>;
     settlePNLs(users: {
         settleeUserAccountPublicKey: PublicKey;

package/lib/driftClient.js

@@ -93,6 +93,10 @@ class DriftClient {
                 : envSpotMarketIndexes;
             oracleInfos = oracleInfos ? oracleInfos : envOracleInfos;
         }
+        this.marketLookupTable = config.marketLookupTable;
+        if (config.env && !this.marketLookupTable) {
+            this.marketLookupTable = new web3_js_1.PublicKey(config_1.configs[config.env].MARKET_LOOKUP_TABLE);
+        }
         if (((_e = config.accountSubscription) === null || _e === void 0 ? void 0 : _e.type) === 'polling') {
             this.accountSubscriber = new pollingDriftClientAccountSubscriber_1.PollingDriftClientAccountSubscriber(this.program, config.accountSubscription.accountLoader, perpMarketIndexes !== null && perpMarketIndexes !== void 0 ? perpMarketIndexes : [], spotMarketIndexes !== null && spotMarketIndexes !== void 0 ? spotMarketIndexes : [], oracleInfos !== null && oracleInfos !== void 0 ? oracleInfos : []);
         }
@@ -231,6 +235,13 @@ class DriftClient {
         const address = await pda_1.getSerumFulfillmentConfigPublicKey(this.program.programId, serumMarket);
         return (await this.program.account.serumV3FulfillmentConfig.fetch(address));
     }
+    async fetchMarketLookupTableAccount() {
+        if (!this.marketLookupTable) {
+            throw Error('Market lookup table address not set');
+        }
+        return (await this.connection.getAddressLookupTable(this.marketLookupTable))
+            .value;
+    }
     /**
      * Update the wallet to use for drift transactions and linked user account
      * @param newWallet
@@ -1758,44 +1769,29 @@ class DriftClient {
      * @returns
      */
     async modifyPerpOrder(orderId, newBaseAmount, newLimitPrice, newOraclePriceOffset) {
-        if (!newBaseAmount && !newLimitPrice && !newOraclePriceOffset) {
-            throw new Error(`Must provide newBaseAmount or newLimitPrice or newOraclePriceOffset to modify order`);
-        }
-        const openOrder = this.getUser().getOrder(orderId);
-        if (!openOrder) {
-            throw new Error(`No open order with id ${orderId.toString()}`);
-        }
-        const cancelOrderIx = await this.getCancelOrderIx(orderId);
-        const newOrderParams = {
-            orderType: openOrder.orderType,
-            marketType: openOrder.marketType,
-            direction: openOrder.direction,
-            baseAssetAmount: newBaseAmount || openOrder.baseAssetAmount,
-            price: newLimitPrice || openOrder.price,
-            marketIndex: openOrder.marketIndex,
-            reduceOnly: openOrder.reduceOnly,
-            postOnly: openOrder.postOnly,
-            immediateOrCancel: openOrder.immediateOrCancel,
-            triggerPrice: openOrder.triggerPrice,
-            triggerCondition: openOrder.triggerCondition,
-            oraclePriceOffset: newOraclePriceOffset || openOrder.oraclePriceOffset,
-            auctionDuration: openOrder.auctionDuration,
-            maxTs: openOrder.maxTs,
-            auctionStartPrice: openOrder.auctionStartPrice,
-            auctionEndPrice: openOrder.auctionEndPrice,
-            userOrderId: openOrder.userOrderId,
-        };
-        const placeOrderIx = await this.getPlacePerpOrderIx(newOrderParams);
-        const tx = new web3_js_1.Transaction();
-        tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
-            units: 1000000,
-            additionalFee: 0,
-        }));
-        tx.add(cancelOrderIx);
-        tx.add(placeOrderIx);
-        const { txSig, slot } = await this.sendTransaction(tx, [], this.opts);
-        this.perpMarketLastSlotCache.set(newOrderParams.marketIndex, slot);
-        return txSig;
+        return this.modifyOrder({
+            orderId,
+            newBaseAmount,
+            newLimitPrice,
+            newOraclePriceOffset,
+        });
+    }
+    /**
+     * Modifies an open order by closing it and replacing it with a new order.
+     * @deprecated use modifyOrderByUserOrderId instead
+     * @param userOrderId: The open order to modify
+     * @param newBaseAmount: The new base amount for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+     * @param newLimitPice: The new limit price for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+     * @param newOraclePriceOffset: The new oracle price offset for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+     * @returns
+     */
+    async modifyPerpOrderByUserOrderId(userOrderId, newBaseAmount, newLimitPrice, newOraclePriceOffset) {
+        return this.modifyOrderByUserOrderId({
+            userOrderId,
+            newBaseAmount,
+            newLimitPrice,
+            newOraclePriceOffset,
+        });
     }
     /**
      * Modifies an open order (spot or perp) by closing it and replacing it with a new order.
@@ -1806,9 +1802,12 @@ class DriftClient {
      * @param newOrderType: Optional - New order type for the order.
      * @param newTriggerPrice: Optional - Thew new trigger price for the order.
      * @param isSpot: Optional - Set to true if the order is a spot order
+     * @param auctionDuration: Only required if order type changed to market from something else
+     * @param auctionStartPrice: Only required if order type changed to market from something else
+     * @param auctionEndPrice: Only required if order type changed to market from something else
      * @returns
      */
-    async modifyOrder({ orderId, newBaseAmount, newLimitPrice, newOraclePriceOffset, newOrderType, newTriggerPrice, isSpot, }) {
+    async modifyOrder({ orderId, newBaseAmount, newLimitPrice, newOraclePriceOffset, newOrderType, newTriggerPrice, newTriggerCondition, isSpot, auctionDuration, auctionStartPrice, auctionEndPrice, }) {
         if (!newBaseAmount && !newLimitPrice && !newOraclePriceOffset) {
             throw new Error(`Must provide newBaseAmount or newLimitPrice or newOraclePriceOffset to modify order`);
         }
@@ -1817,23 +1816,37 @@ class DriftClient {
             throw new Error(`No open order with id ${orderId.toString()}`);
         }
         const cancelOrderIx = await this.getCancelOrderIx(orderId);
+        const orderTypeHasTrigger = newOrderType
+            ? types_1.isOneOfVariant(newOrderType, ['triggerlimit', 'triggerMarket'])
+            : types_1.isOneOfVariant(openOrder.orderType, ['triggerLimit', 'triggerMarket']);
+        const orderTypeHasLimitPrice = newOrderType
+            ? types_1.isOneOfVariant(newOrderType, ['triggerLimit', 'limit'])
+            : types_1.isOneOfVariant(openOrder.orderType, ['triggerLimit', 'limit']);
         const newOrderParams = {
             orderType: newOrderType || openOrder.orderType,
             marketType: openOrder.marketType,
             direction: openOrder.direction,
             baseAssetAmount: newBaseAmount || openOrder.baseAssetAmount,
-            price: newLimitPrice || openOrder.price,
+            price: orderTypeHasLimitPrice
+                ? newLimitPrice || openOrder.price
+                : undefined,
             marketIndex: openOrder.marketIndex,
             reduceOnly: openOrder.reduceOnly,
-            postOnly: openOrder.postOnly,
+            postOnly: openOrder.postOnly
+                ? types_1.PostOnlyParams.MUST_POST_ONLY
+                : types_1.PostOnlyParams.NONE,
             immediateOrCancel: openOrder.immediateOrCancel,
-            triggerPrice: newTriggerPrice || openOrder.triggerPrice,
-            triggerCondition: openOrder.triggerCondition,
+            triggerPrice: orderTypeHasTrigger
+                ? newTriggerPrice || openOrder.triggerPrice
+                : undefined,
+            triggerCondition: orderTypeHasTrigger
+                ? newTriggerCondition || openOrder.triggerCondition
+                : undefined,
             oraclePriceOffset: newOraclePriceOffset || openOrder.oraclePriceOffset,
-            auctionDuration: openOrder.auctionDuration,
+            auctionDuration: auctionDuration || openOrder.auctionDuration,
             maxTs: openOrder.maxTs,
-            auctionStartPrice: openOrder.auctionStartPrice,
-            auctionEndPrice: openOrder.auctionEndPrice,
+            auctionStartPrice: auctionStartPrice || openOrder.auctionStartPrice,
+            auctionEndPrice: auctionEndPrice || openOrder.auctionEndPrice,
             userOrderId: openOrder.userOrderId,
         };
         const placeOrderIx = isSpot
@@ -1856,55 +1869,6 @@ class DriftClient {
         }
         return txSig;
     }
-    /**
-     * Modifies an open order by closing it and replacing it with a new order.
-     * @deprecated use modifyOrderByUserOrderId instead
-     * @param userOrderId: The open order to modify
-     * @param newBaseAmount: The new base amount for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
-     * @param newLimitPice: The new limit price for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
-     * @param newOraclePriceOffset: The new oracle price offset for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
-     * @returns
-     */
-    async modifyPerpOrderByUserOrderId(userOrderId, newBaseAmount, newLimitPrice, newOraclePriceOffset) {
-        if (!newBaseAmount && !newLimitPrice && !newOraclePriceOffset) {
-            throw new Error(`Must provide newBaseAmount or newLimitPrice or newOraclePriceOffset to modify order`);
-        }
-        const openOrder = this.getUser().getOrderByUserOrderId(userOrderId);
-        if (!openOrder) {
-            throw new Error(`No open order with user order id ${userOrderId.toString()}`);
-        }
-        const cancelOrderIx = await this.getCancelOrderByUserIdIx(userOrderId);
-        const newOrderParams = {
-            orderType: openOrder.orderType,
-            marketType: openOrder.marketType,
-            direction: openOrder.direction,
-            baseAssetAmount: newBaseAmount || openOrder.baseAssetAmount,
-            price: newLimitPrice || openOrder.price,
-            marketIndex: openOrder.marketIndex,
-            reduceOnly: openOrder.reduceOnly,
-            postOnly: openOrder.postOnly,
-            immediateOrCancel: openOrder.immediateOrCancel,
-            triggerPrice: openOrder.triggerPrice,
-            triggerCondition: openOrder.triggerCondition,
-            oraclePriceOffset: newOraclePriceOffset || openOrder.oraclePriceOffset,
-            auctionDuration: openOrder.auctionDuration,
-            maxTs: openOrder.maxTs,
-            auctionStartPrice: openOrder.auctionStartPrice,
-            auctionEndPrice: openOrder.auctionEndPrice,
-            userOrderId: openOrder.userOrderId,
-        };
-        const placeOrderIx = await this.getPlacePerpOrderIx(newOrderParams);
-        const tx = new web3_js_1.Transaction();
-        tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
-            units: 1000000,
-            additionalFee: 0,
-        }));
-        tx.add(cancelOrderIx);
-        tx.add(placeOrderIx);
-        const { txSig, slot } = await this.sendTransaction(tx, [], this.opts);
-        this.perpMarketLastSlotCache.set(newOrderParams.marketIndex, slot);
-        return txSig;
-    }
     /**
      * Modifies an open order by closing it and replacing it with a new order.
      * @param userOrderId: The open order to modify
@@ -1914,9 +1878,12 @@ class DriftClient {
      * @param newOrderType: Optional - New order type for the order.
      * @param newTriggerPrice: Optional - Thew new trigger price for the order.
      * @param isSpot: Set to true if the order is a spot order
+     * @param auctionDuration: Only required if order type changed to market from something else
+     * @param auctionStartPrice: Only required if order type changed to market from something else
+     * @param auctionEndPrice: Only required if order type changed to market from something else
      * @returns
      */
-    async modifyOrderByUserOrderId({ userOrderId, newBaseAmount, newLimitPrice, newOraclePriceOffset, newOrderType, newTriggerPrice, isSpot, }) {
+    async modifyOrderByUserOrderId({ userOrderId, newBaseAmount, newLimitPrice, newOraclePriceOffset, newOrderType, newTriggerPrice, newTriggerCondition, isSpot, auctionDuration, auctionStartPrice, auctionEndPrice, }) {
         if (!newBaseAmount && !newLimitPrice && !newOraclePriceOffset) {
             throw new Error(`Must provide newBaseAmount or newLimitPrice or newOraclePriceOffset to modify order`);
         }
@@ -1925,23 +1892,37 @@ class DriftClient {
             throw new Error(`No open order with user order id ${userOrderId.toString()}`);
         }
         const cancelOrderIx = await this.getCancelOrderByUserIdIx(userOrderId);
+        const orderTypeHasTrigger = newOrderType
+            ? types_1.isOneOfVariant(newOrderType, ['triggerlimit', 'triggerMarket'])
+            : types_1.isOneOfVariant(openOrder.orderType, ['triggerLimit', 'triggerMarket']);
+        const orderTypeHasLimitPrice = newOrderType
+            ? types_1.isOneOfVariant(newOrderType, ['triggerLimit', 'limit'])
+            : types_1.isOneOfVariant(openOrder.orderType, ['triggerLimit', 'limit']);
         const newOrderParams = {
             orderType: newOrderType || openOrder.orderType,
             marketType: openOrder.marketType,
             direction: openOrder.direction,
             baseAssetAmount: newBaseAmount || openOrder.baseAssetAmount,
-            price: newLimitPrice || openOrder.price,
+            price: orderTypeHasLimitPrice
+                ? newLimitPrice || openOrder.price
+                : undefined,
             marketIndex: openOrder.marketIndex,
             reduceOnly: openOrder.reduceOnly,
-            postOnly: openOrder.postOnly,
+            postOnly: openOrder.postOnly
+                ? types_1.PostOnlyParams.MUST_POST_ONLY
+                : types_1.PostOnlyParams.NONE,
             immediateOrCancel: openOrder.immediateOrCancel,
-            triggerPrice: newTriggerPrice || openOrder.triggerPrice,
-            triggerCondition: openOrder.triggerCondition,
+            triggerPrice: orderTypeHasTrigger
+                ? newTriggerPrice || openOrder.triggerPrice
+                : undefined,
+            triggerCondition: orderTypeHasTrigger
+                ? newTriggerCondition || openOrder.triggerCondition
+                : undefined,
             oraclePriceOffset: newOraclePriceOffset || openOrder.oraclePriceOffset,
-            auctionDuration: openOrder.auctionDuration,
+            auctionDuration: auctionDuration || openOrder.auctionDuration,
             maxTs: openOrder.maxTs,
-            auctionStartPrice: openOrder.auctionStartPrice,
-            auctionEndPrice: openOrder.auctionEndPrice,
+            auctionStartPrice: auctionStartPrice || openOrder.auctionStartPrice,
+            auctionEndPrice: auctionEndPrice || openOrder.auctionEndPrice,
             userOrderId: openOrder.userOrderId,
         };
         const placeOrderIx = isSpot

package/lib/driftClientConfig.d.ts

@@ -14,6 +14,7 @@ export declare type DriftClientConfig = {
     activeSubAccountId?: number;
     perpMarketIndexes?: number[];
     spotMarketIndexes?: number[];
+    marketLookupTable?: PublicKey;
     oracleInfos?: OracleInfo[];
     env?: DriftEnv;
     userStats?: boolean;

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.16.0-beta.3",
+    "version": "2.17.0-beta.0",
     "name": "drift",
     "instructions": [
         {
@@ -4655,7 +4655,9 @@
                     },
                     {
                         "name": "postOnly",
-                        "type": "bool"
+                        "type": {
+                            "defined": "PostOnlyParam"
+                        }
                     },
                     {
                         "name": "immediateOrCancel",
@@ -5862,6 +5864,23 @@
                 ]
             }
         },
+        {
+            "name": "PostOnlyParam",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "None"
+                    },
+                    {
+                        "name": "MustPostOnly"
+                    },
+                    {
+                        "name": "TryPostOnly"
+                    }
+                ]
+            }
+        },
         {
             "name": "TwapPeriod",
             "type": {

package/lib/tx/retryTxSender.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { TxSender, TxSigAndSlot } from './types';
-import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection } from '@solana/web3.js';
+import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
 import { AnchorProvider } from '@project-serum/anchor';
 declare type ResolveReference = {
     resolve?: () => void;
@@ -13,11 +13,13 @@ export declare class RetryTxSender implements TxSender {
     constructor(provider: AnchorProvider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
+    sendVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
+    sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     confirmTransaction(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     getTimestamp(): number;
     sleep(reference: ResolveReference): Promise<void>;
     promiseTimeout<T>(promises: Promise<T>[], timeoutMs: number): Promise<T | null>;
-    sendToAdditionalConnections(rawTx: Buffer, opts: ConfirmOptions): void;
+    sendToAdditionalConnections(rawTx: Buffer | Uint8Array, opts: ConfirmOptions): void;
     addAdditionalConnection(newConnection: Connection): void;
 }
 export {};

package/lib/tx/retryTxSender.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RetryTxSender = void 0;
+const web3_js_1 = require("@solana/web3.js");
 const assert_1 = __importDefault(require("assert"));
 const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_TIMEOUT = 35000;
@@ -25,7 +26,37 @@ class RetryTxSender {
         const signedTx = preSigned
             ? tx
             : await this.prepareTx(tx, additionalSigners, opts);
-        const rawTransaction = signedTx.serialize();
+        return this.sendRawTransaction(signedTx.serialize(), opts);
+    }
+    async prepareTx(tx, additionalSigners, opts) {
+        tx.feePayer = this.provider.wallet.publicKey;
+        tx.recentBlockhash = (await this.provider.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
+        const signedTx = await this.provider.wallet.signTransaction(tx);
+        additionalSigners
+            .filter((s) => s !== undefined)
+            .forEach((kp) => {
+            signedTx.partialSign(kp);
+        });
+        return signedTx;
+    }
+    async sendVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts) {
+        if (additionalSigners === undefined) {
+            additionalSigners = [];
+        }
+        if (opts === undefined) {
+            opts = this.provider.opts;
+        }
+        const message = new web3_js_1.TransactionMessage({
+            payerKey: this.provider.wallet.publicKey,
+            recentBlockhash: (await this.provider.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash,
+            instructions: ixs,
+        }).compileToV0Message(lookupTableAccounts);
+        const tx = new web3_js_1.VersionedTransaction(message);
+        // @ts-ignore
+        tx.sign(additionalSigners.concat(this.provider.wallet.payer));
+        return this.sendRawTransaction(tx.serialize(), opts);
+    }
+    async sendRawTransaction(rawTransaction, opts) {
         const startTime = this.getTimestamp();
         let txid;
         try {
@@ -74,17 +105,6 @@ class RetryTxSender {
         }
         return { txSig: txid, slot };
     }
-    async prepareTx(tx, additionalSigners, opts) {
-        tx.feePayer = this.provider.wallet.publicKey;
-        tx.recentBlockhash = (await this.provider.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
-        const signedTx = await this.provider.wallet.signTransaction(tx);
-        additionalSigners
-            .filter((s) => s !== undefined)
-            .forEach((kp) => {
-            signedTx.partialSign(kp);
-        });
-        return signedTx;
-    }
     async confirmTransaction(signature, commitment) {
         let decodedSignature;
         try {

package/lib/tx/types.d.ts

@@ -1,5 +1,5 @@
 import { Provider } from '@project-serum/anchor';
-import { ConfirmOptions, Signer, Transaction, TransactionSignature } from '@solana/web3.js';
+import { AddressLookupTableAccount, ConfirmOptions, Signer, Transaction, TransactionInstruction, TransactionSignature } from '@solana/web3.js';
 export declare type TxSigAndSlot = {
     txSig: TransactionSignature;
     slot: number;
@@ -7,4 +7,5 @@ export declare type TxSigAndSlot = {
 export interface TxSender {
     provider: Provider;
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<TxSigAndSlot>;
 }

package/lib/types.d.ts

@@ -886,7 +886,7 @@ export declare type OrderParams = {
     price: BN;
     marketIndex: number;
     reduceOnly: boolean;
-    postOnly: boolean;
+    postOnly: PostOnlyParams;
     immediateOrCancel: boolean;
     triggerPrice: BN | null;
     triggerCondition: OrderTriggerCondition;
@@ -897,6 +897,17 @@ export declare type OrderParams = {
     auctionStartPrice: BN | null;
     auctionEndPrice: BN | null;
 };
+export declare class PostOnlyParams {
+    static readonly NONE: {
+        none: {};
+    };
+    static readonly MUST_POST_ONLY: {
+        mustPostOnly: {};
+    };
+    static readonly TRY_POST_ONLY: {
+        tryPostOnly: {};
+    };
+}
 export declare type NecessaryOrderParams = {
     orderType: OrderType;
     marketIndex: number;

package/lib/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultOrderParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.MarketStatus = exports.ExchangeStatus = void 0;
+exports.DefaultOrderParams = exports.PostOnlyParams = exports.LiquidationType = exports.LPAction = exports.TradeSide = exports.getVariant = exports.isOneOfVariant = exports.isVariant = exports.StakeAction = exports.SpotFulfillmentConfigStatus = exports.SettlePnlExplanation = exports.DepositExplanation = exports.SpotFulfillmentStatus = exports.SpotFulfillmentType = exports.OrderTriggerCondition = exports.OrderActionExplanation = exports.OrderAction = exports.OrderStatus = exports.MarketType = exports.OrderType = exports.OracleSource = exports.DepositDirection = exports.PositionDirection = exports.SpotBalanceType = exports.SwapDirection = exports.AssetTier = exports.ContractTier = exports.ContractType = exports.UserStatus = exports.MarketStatus = exports.ExchangeStatus = void 0;
 const _1 = require(".");
 // # Utility Types / Enums / Constants
 var ExchangeStatus;
@@ -232,6 +232,12 @@ LiquidationType.BORROW_BANKRUPTCY = {
 LiquidationType.LIQUIDATE_SPOT = {
     liquidateSpot: {},
 };
+class PostOnlyParams {
+}
+exports.PostOnlyParams = PostOnlyParams;
+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
 exports.DefaultOrderParams = {
     orderType: OrderType.MARKET,
     marketType: MarketType.PERP,
@@ -241,7 +247,7 @@ exports.DefaultOrderParams = {
     price: _1.ZERO,
     marketIndex: 0,
     reduceOnly: false,
-    postOnly: false,
+    postOnly: PostOnlyParams.NONE,
     immediateOrCancel: false,
     triggerPrice: null,
     triggerCondition: OrderTriggerCondition.ABOVE,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.16.0-beta.3",
+	"version": "2.17.0-beta.0",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -53,10 +53,11 @@
 		"eslint-plugin-prettier": "^3.4.0",
 		"mocha": "^10.0.0",
 		"prettier": "^2.4.1",
-		"ts-node": "^10.8.0"
+		"ts-node": "^10.8.0",
+		"typescript": "^4.9.5"
 	},
 	"description": "SDK for Drift Protocol",
 	"engines": {
 		"node": ">=12"
 	}
-}
+}

package/src/config.ts

@@ -21,6 +21,7 @@ type DriftConfig = {
 	V2_ALPHA_TICKET_MINT_ADDRESS: string;
 	PERP_MARKETS: PerpMarketConfig[];
 	SPOT_MARKETS: SpotMarketConfig[];
+	MARKET_LOOKUP_TABLE: string;
 };
 
 export type DriftEnv = 'devnet' | 'mainnet-beta';
@@ -36,6 +37,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 			'DeEiGWfCMP9psnLGkxGrBBMEAW5Jv8bBGMN8DCtFRCyB',
 		PERP_MARKETS: DevnetPerpMarkets,
 		SPOT_MARKETS: DevnetSpotMarkets,
+		MARKET_LOOKUP_TABLE: 'FaMS3U4uBojvGn5FSDEPimddcXsCfwkKsFgMVVnDdxGb',
 	},
 	'mainnet-beta': {
 		ENV: 'mainnet-beta',
@@ -47,6 +49,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 			'Cmvhycb6LQvvzaShGw4iDHRLzeSSryioAsU98DSSkMNa',
 		PERP_MARKETS: MainnetPerpMarkets,
 		SPOT_MARKETS: MainnetSpotMarkets,
+		MARKET_LOOKUP_TABLE: 'D9cnvzswDikQDf53k4HpQ3KJ9y1Fv3HGGDFYMXnK5T6c',
 	},
 };
 

package/src/driftClient.ts

@@ -25,6 +25,9 @@ import {
 	TxParams,
 	SerumV3FulfillmentConfigAccount,
 	isVariant,
+	OrderTriggerCondition,
+	isOneOfVariant,
+	PostOnlyParams,
 } from './types';
 import * as anchor from '@project-serum/anchor';
 import driftIDL from './idl/drift.json';
@@ -42,6 +45,7 @@ import {
 	Signer,
 	SystemProgram,
 	ComputeBudgetProgram,
+	AddressLookupTableAccount,
 } from '@solana/web3.js';
 
 import { TokenFaucet } from './tokenFaucet';
@@ -77,7 +81,7 @@ import { WebSocketDriftClientAccountSubscriber } from './accounts/webSocketDrift
 import { RetryTxSender } from './tx/retryTxSender';
 import { User } from './user';
 import { UserSubscriptionConfig } from './userConfig';
-import { getMarketsAndOraclesForSubscription } from './config';
+import { configs, getMarketsAndOraclesForSubscription } from './config';
 import { WRAPPED_SOL_MINT } from './constants/spotMarkets';
 import { UserStats } from './userStats';
 import { isSpotPositionAvailable } from './math/spotPosition';
@@ -112,6 +116,7 @@ export class DriftClient {
 	perpMarketLastSlotCache = new Map<number, number>();
 	spotMarketLastSlotCache = new Map<number, number>();
 	authority: PublicKey;
+	marketLookupTable: PublicKey;
 
 	public get isSubscribed() {
 		return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -178,6 +183,13 @@ export class DriftClient {
 			oracleInfos = oracleInfos ? oracleInfos : envOracleInfos;
 		}
 
+		this.marketLookupTable = config.marketLookupTable;
+		if (config.env && !this.marketLookupTable) {
+			this.marketLookupTable = new PublicKey(
+				configs[config.env].MARKET_LOOKUP_TABLE
+			);
+		}
+
 		if (config.accountSubscription?.type === 'polling') {
 			this.accountSubscriber = new PollingDriftClientAccountSubscriber(
 				this.program,
@@ -387,6 +399,15 @@ export class DriftClient {
 		)) as SerumV3FulfillmentConfigAccount;
 	}
 
+	public async fetchMarketLookupTableAccount(): Promise<AddressLookupTableAccount> {
+		if (!this.marketLookupTable) {
+			throw Error('Market lookup table address not set');
+		}
+
+		return (await this.connection.getAddressLookupTable(this.marketLookupTable))
+			.value;
+	}
+
 	/**
 	 * Update the wallet to use for drift transactions and linked user account
 	 * @param newWallet
@@ -3031,51 +3052,35 @@ export class DriftClient {
 		newLimitPrice?: BN,
 		newOraclePriceOffset?: number
 	): Promise<TransactionSignature> {
-		if (!newBaseAmount && !newLimitPrice && !newOraclePriceOffset) {
-			throw new Error(
-				`Must provide newBaseAmount or newLimitPrice or newOraclePriceOffset to modify order`
-			);
-		}
-
-		const openOrder = this.getUser().getOrder(orderId);
-		if (!openOrder) {
-			throw new Error(`No open order with id ${orderId.toString()}`);
-		}
-		const cancelOrderIx = await this.getCancelOrderIx(orderId);
-
-		const newOrderParams: OptionalOrderParams = {
-			orderType: openOrder.orderType,
-			marketType: openOrder.marketType,
-			direction: openOrder.direction,
-			baseAssetAmount: newBaseAmount || openOrder.baseAssetAmount,
-			price: newLimitPrice || openOrder.price,
-			marketIndex: openOrder.marketIndex,
-			reduceOnly: openOrder.reduceOnly,
-			postOnly: openOrder.postOnly,
-			immediateOrCancel: openOrder.immediateOrCancel,
-			triggerPrice: openOrder.triggerPrice,
-			triggerCondition: openOrder.triggerCondition,
-			oraclePriceOffset: newOraclePriceOffset || openOrder.oraclePriceOffset,
-			auctionDuration: openOrder.auctionDuration,
-			maxTs: openOrder.maxTs,
-			auctionStartPrice: openOrder.auctionStartPrice,
-			auctionEndPrice: openOrder.auctionEndPrice,
-			userOrderId: openOrder.userOrderId,
-		};
-		const placeOrderIx = await this.getPlacePerpOrderIx(newOrderParams);
+		return this.modifyOrder({
+			orderId,
+			newBaseAmount,
+			newLimitPrice,
+			newOraclePriceOffset,
+		});
+	}
 
-		const tx = new Transaction();
-		tx.add(
-			ComputeBudgetProgram.requestUnits({
-				units: 1_000_000,
-				additionalFee: 0,
-			})
-		);
-		tx.add(cancelOrderIx);
-		tx.add(placeOrderIx);
-		const { txSig, slot } = await this.sendTransaction(tx, [], this.opts);
-		this.perpMarketLastSlotCache.set(newOrderParams.marketIndex, slot);
-		return txSig;
+	/**
+	 * Modifies an open order by closing it and replacing it with a new order.
+	 * @deprecated use modifyOrderByUserOrderId instead
+	 * @param userOrderId: The open order to modify
+	 * @param newBaseAmount: The new base amount for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+	 * @param newLimitPice: The new limit price for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+	 * @param newOraclePriceOffset: The new oracle price offset for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
+	 * @returns
+	 */
+	public async modifyPerpOrderByUserOrderId(
+		userOrderId: number,
+		newBaseAmount?: BN,
+		newLimitPrice?: BN,
+		newOraclePriceOffset?: number
+	): Promise<TransactionSignature> {
+		return this.modifyOrderByUserOrderId({
+			userOrderId,
+			newBaseAmount,
+			newLimitPrice,
+			newOraclePriceOffset,
+		});
 	}
 
 	/**
@@ -3087,6 +3092,9 @@ export class DriftClient {
 	 * @param newOrderType: Optional - New order type for the order.
 	 * @param newTriggerPrice: Optional - Thew new trigger price for the order.
 	 * @param isSpot: Optional - Set to true if the order is a spot order
+	 * @param auctionDuration: Only required if order type changed to market from something else
+	 * @param auctionStartPrice: Only required if order type changed to market from something else
+	 * @param auctionEndPrice: Only required if order type changed to market from something else
 	 * @returns
 	 */
 	public async modifyOrder({
@@ -3096,7 +3104,11 @@ export class DriftClient {
 		newOraclePriceOffset,
 		newOrderType,
 		newTriggerPrice,
+		newTriggerCondition,
 		isSpot,
+		auctionDuration,
+		auctionStartPrice,
+		auctionEndPrice,
 	}: {
 		orderId: number;
 		newBaseAmount?: BN;
@@ -3104,7 +3116,11 @@ export class DriftClient {
 		newOraclePriceOffset?: number;
 		newOrderType?: OrderType;
 		newTriggerPrice?: BN;
+		newTriggerCondition?: OrderTriggerCondition;
 		isSpot?: boolean;
+		auctionDuration?: number;
+		auctionStartPrice?: BN;
+		auctionEndPrice?: BN;
 	}): Promise<TransactionSignature> {
 		if (!newBaseAmount && !newLimitPrice && !newOraclePriceOffset) {
 			throw new Error(
@@ -3118,23 +3134,38 @@ export class DriftClient {
 		}
 		const cancelOrderIx = await this.getCancelOrderIx(orderId);
 
+		const orderTypeHasTrigger = newOrderType
+			? isOneOfVariant(newOrderType, ['triggerlimit', 'triggerMarket'])
+			: isOneOfVariant(openOrder.orderType, ['triggerLimit', 'triggerMarket']);
+		const orderTypeHasLimitPrice = newOrderType
+			? isOneOfVariant(newOrderType, ['triggerLimit', 'limit'])
+			: isOneOfVariant(openOrder.orderType, ['triggerLimit', 'limit']);
+
 		const newOrderParams: OptionalOrderParams = {
 			orderType: newOrderType || openOrder.orderType,
 			marketType: openOrder.marketType,
 			direction: openOrder.direction,
 			baseAssetAmount: newBaseAmount || openOrder.baseAssetAmount,
-			price: newLimitPrice || openOrder.price,
+			price: orderTypeHasLimitPrice
+				? newLimitPrice || openOrder.price
+				: undefined,
 			marketIndex: openOrder.marketIndex,
 			reduceOnly: openOrder.reduceOnly,
-			postOnly: openOrder.postOnly,
+			postOnly: openOrder.postOnly
+				? PostOnlyParams.MUST_POST_ONLY
+				: PostOnlyParams.NONE,
 			immediateOrCancel: openOrder.immediateOrCancel,
-			triggerPrice: newTriggerPrice || openOrder.triggerPrice,
-			triggerCondition: openOrder.triggerCondition,
+			triggerPrice: orderTypeHasTrigger
+				? newTriggerPrice || openOrder.triggerPrice
+				: undefined,
+			triggerCondition: orderTypeHasTrigger
+				? newTriggerCondition || openOrder.triggerCondition
+				: undefined,
 			oraclePriceOffset: newOraclePriceOffset || openOrder.oraclePriceOffset,
-			auctionDuration: openOrder.auctionDuration,
+			auctionDuration: auctionDuration || openOrder.auctionDuration,
 			maxTs: openOrder.maxTs,
-			auctionStartPrice: openOrder.auctionStartPrice,
-			auctionEndPrice: openOrder.auctionEndPrice,
+			auctionStartPrice: auctionStartPrice || openOrder.auctionStartPrice,
+			auctionEndPrice: auctionEndPrice || openOrder.auctionEndPrice,
 			userOrderId: openOrder.userOrderId,
 		};
 		const placeOrderIx = isSpot
@@ -3162,70 +3193,6 @@ export class DriftClient {
 		return txSig;
 	}
 
-	/**
-	 * Modifies an open order by closing it and replacing it with a new order.
-	 * @deprecated use modifyOrderByUserOrderId instead
-	 * @param userOrderId: The open order to modify
-	 * @param newBaseAmount: The new base amount for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
-	 * @param newLimitPice: The new limit price for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
-	 * @param newOraclePriceOffset: The new oracle price offset for the order. One of [newBaseAmount|newLimitPrice|newOraclePriceOffset] must be provided.
-	 * @returns
-	 */
-	public async modifyPerpOrderByUserOrderId(
-		userOrderId: number,
-		newBaseAmount?: BN,
-		newLimitPrice?: BN,
-		newOraclePriceOffset?: number
-	): Promise<TransactionSignature> {
-		if (!newBaseAmount && !newLimitPrice && !newOraclePriceOffset) {
-			throw new Error(
-				`Must provide newBaseAmount or newLimitPrice or newOraclePriceOffset to modify order`
-			);
-		}
-
-		const openOrder = this.getUser().getOrderByUserOrderId(userOrderId);
-		if (!openOrder) {
-			throw new Error(
-				`No open order with user order id ${userOrderId.toString()}`
-			);
-		}
-		const cancelOrderIx = await this.getCancelOrderByUserIdIx(userOrderId);
-
-		const newOrderParams: OptionalOrderParams = {
-			orderType: openOrder.orderType,
-			marketType: openOrder.marketType,
-			direction: openOrder.direction,
-			baseAssetAmount: newBaseAmount || openOrder.baseAssetAmount,
-			price: newLimitPrice || openOrder.price,
-			marketIndex: openOrder.marketIndex,
-			reduceOnly: openOrder.reduceOnly,
-			postOnly: openOrder.postOnly,
-			immediateOrCancel: openOrder.immediateOrCancel,
-			triggerPrice: openOrder.triggerPrice,
-			triggerCondition: openOrder.triggerCondition,
-			oraclePriceOffset: newOraclePriceOffset || openOrder.oraclePriceOffset,
-			auctionDuration: openOrder.auctionDuration,
-			maxTs: openOrder.maxTs,
-			auctionStartPrice: openOrder.auctionStartPrice,
-			auctionEndPrice: openOrder.auctionEndPrice,
-			userOrderId: openOrder.userOrderId,
-		};
-		const placeOrderIx = await this.getPlacePerpOrderIx(newOrderParams);
-
-		const tx = new Transaction();
-		tx.add(
-			ComputeBudgetProgram.requestUnits({
-				units: 1_000_000,
-				additionalFee: 0,
-			})
-		);
-		tx.add(cancelOrderIx);
-		tx.add(placeOrderIx);
-		const { txSig, slot } = await this.sendTransaction(tx, [], this.opts);
-		this.perpMarketLastSlotCache.set(newOrderParams.marketIndex, slot);
-		return txSig;
-	}
-
 	/**
 	 * Modifies an open order by closing it and replacing it with a new order.
 	 * @param userOrderId: The open order to modify
@@ -3235,6 +3202,9 @@ export class DriftClient {
 	 * @param newOrderType: Optional - New order type for the order.
 	 * @param newTriggerPrice: Optional - Thew new trigger price for the order.
 	 * @param isSpot: Set to true if the order is a spot order
+	 * @param auctionDuration: Only required if order type changed to market from something else
+	 * @param auctionStartPrice: Only required if order type changed to market from something else
+	 * @param auctionEndPrice: Only required if order type changed to market from something else
 	 * @returns
 	 */
 	public async modifyOrderByUserOrderId({
@@ -3244,7 +3214,11 @@ export class DriftClient {
 		newOraclePriceOffset,
 		newOrderType,
 		newTriggerPrice,
+		newTriggerCondition,
 		isSpot,
+		auctionDuration,
+		auctionStartPrice,
+		auctionEndPrice,
 	}: {
 		userOrderId: number;
 		newBaseAmount?: BN;
@@ -3252,7 +3226,11 @@ export class DriftClient {
 		newOraclePriceOffset?: number;
 		newOrderType?: OrderType;
 		newTriggerPrice?: BN;
+		newTriggerCondition?: OrderTriggerCondition;
 		isSpot?: boolean;
+		auctionDuration?: number;
+		auctionStartPrice?: BN;
+		auctionEndPrice?: BN;
 	}): Promise<TransactionSignature> {
 		if (!newBaseAmount && !newLimitPrice && !newOraclePriceOffset) {
 			throw new Error(
@@ -3268,23 +3246,38 @@ export class DriftClient {
 		}
 		const cancelOrderIx = await this.getCancelOrderByUserIdIx(userOrderId);
 
+		const orderTypeHasTrigger = newOrderType
+			? isOneOfVariant(newOrderType, ['triggerlimit', 'triggerMarket'])
+			: isOneOfVariant(openOrder.orderType, ['triggerLimit', 'triggerMarket']);
+		const orderTypeHasLimitPrice = newOrderType
+			? isOneOfVariant(newOrderType, ['triggerLimit', 'limit'])
+			: isOneOfVariant(openOrder.orderType, ['triggerLimit', 'limit']);
+
 		const newOrderParams: OptionalOrderParams = {
 			orderType: newOrderType || openOrder.orderType,
 			marketType: openOrder.marketType,
 			direction: openOrder.direction,
 			baseAssetAmount: newBaseAmount || openOrder.baseAssetAmount,
-			price: newLimitPrice || openOrder.price,
+			price: orderTypeHasLimitPrice
+				? newLimitPrice || openOrder.price
+				: undefined,
 			marketIndex: openOrder.marketIndex,
 			reduceOnly: openOrder.reduceOnly,
-			postOnly: openOrder.postOnly,
+			postOnly: openOrder.postOnly
+				? PostOnlyParams.MUST_POST_ONLY
+				: PostOnlyParams.NONE,
 			immediateOrCancel: openOrder.immediateOrCancel,
-			triggerPrice: newTriggerPrice || openOrder.triggerPrice,
-			triggerCondition: openOrder.triggerCondition,
+			triggerPrice: orderTypeHasTrigger
+				? newTriggerPrice || openOrder.triggerPrice
+				: undefined,
+			triggerCondition: orderTypeHasTrigger
+				? newTriggerCondition || openOrder.triggerCondition
+				: undefined,
 			oraclePriceOffset: newOraclePriceOffset || openOrder.oraclePriceOffset,
-			auctionDuration: openOrder.auctionDuration,
+			auctionDuration: auctionDuration || openOrder.auctionDuration,
 			maxTs: openOrder.maxTs,
-			auctionStartPrice: openOrder.auctionStartPrice,
-			auctionEndPrice: openOrder.auctionEndPrice,
+			auctionStartPrice: auctionStartPrice || openOrder.auctionStartPrice,
+			auctionEndPrice: auctionEndPrice || openOrder.auctionEndPrice,
 			userOrderId: openOrder.userOrderId,
 		};
 		const placeOrderIx = isSpot

package/src/driftClientConfig.ts

@@ -15,6 +15,7 @@ export type DriftClientConfig = {
 	activeSubAccountId?: number;
 	perpMarketIndexes?: number[];
 	spotMarketIndexes?: number[];
+	marketLookupTable?: PublicKey;
 	oracleInfos?: OracleInfo[];
 	env?: DriftEnv;
 	userStats?: boolean;

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.16.0-beta.3",
+  "version": "2.17.0-beta.0",
   "name": "drift",
   "instructions": [
     {
@@ -4655,7 +4655,9 @@
           },
           {
             "name": "postOnly",
-            "type": "bool"
+            "type": {
+              "defined": "PostOnlyParam"
+            }
           },
           {
             "name": "immediateOrCancel",
@@ -5862,6 +5864,23 @@
         ]
       }
     },
+    {
+      "name": "PostOnlyParam",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "None"
+          },
+          {
+            "name": "MustPostOnly"
+          },
+          {
+            "name": "TryPostOnly"
+          }
+        ]
+      }
+    },
     {
       "name": "TwapPeriod",
       "type": {

package/src/tx/retryTxSender.ts

@@ -9,6 +9,10 @@ import {
 	Transaction,
 	TransactionSignature,
 	Connection,
+	VersionedTransaction,
+	TransactionMessage,
+	TransactionInstruction,
+	AddressLookupTableAccount,
 } from '@solana/web3.js';
 import { AnchorProvider } from '@project-serum/anchor';
 import assert from 'assert';
@@ -56,7 +60,65 @@ export class RetryTxSender implements TxSender {
 			? tx
 			: await this.prepareTx(tx, additionalSigners, opts);
 
-		const rawTransaction = signedTx.serialize();
+		return this.sendRawTransaction(signedTx.serialize(), opts);
+	}
+
+	async prepareTx(
+		tx: Transaction,
+		additionalSigners: Array<Signer>,
+		opts: ConfirmOptions
+	): Promise<Transaction> {
+		tx.feePayer = this.provider.wallet.publicKey;
+		tx.recentBlockhash = (
+			await this.provider.connection.getRecentBlockhash(
+				opts.preflightCommitment
+			)
+		).blockhash;
+
+		const signedTx = await this.provider.wallet.signTransaction(tx);
+		additionalSigners
+			.filter((s): s is Signer => s !== undefined)
+			.forEach((kp) => {
+				signedTx.partialSign(kp);
+			});
+
+		return signedTx;
+	}
+
+	async sendVersionedTransaction(
+		ixs: TransactionInstruction[],
+		lookupTableAccounts: AddressLookupTableAccount[],
+		additionalSigners?: Array<Signer>,
+		opts?: ConfirmOptions
+	): Promise<TxSigAndSlot> {
+		if (additionalSigners === undefined) {
+			additionalSigners = [];
+		}
+		if (opts === undefined) {
+			opts = this.provider.opts;
+		}
+
+		const message = new TransactionMessage({
+			payerKey: this.provider.wallet.publicKey,
+			recentBlockhash: (
+				await this.provider.connection.getRecentBlockhash(
+					opts.preflightCommitment
+				)
+			).blockhash,
+			instructions: ixs,
+		}).compileToV0Message(lookupTableAccounts);
+
+		const tx = new VersionedTransaction(message);
+		// @ts-ignore
+		tx.sign(additionalSigners.concat(this.provider.wallet.payer));
+
+		return this.sendRawTransaction(tx.serialize(), opts);
+	}
+
+	async sendRawTransaction(
+		rawTransaction: Buffer | Uint8Array,
+		opts: ConfirmOptions
+	): Promise<TxSigAndSlot> {
 		const startTime = this.getTimestamp();
 
 		let txid: TransactionSignature;
@@ -111,28 +173,6 @@ export class RetryTxSender implements TxSender {
 		return { txSig: txid, slot };
 	}
 
-	async prepareTx(
-		tx: Transaction,
-		additionalSigners: Array<Signer>,
-		opts: ConfirmOptions
-	): Promise<Transaction> {
-		tx.feePayer = this.provider.wallet.publicKey;
-		tx.recentBlockhash = (
-			await this.provider.connection.getRecentBlockhash(
-				opts.preflightCommitment
-			)
-		).blockhash;
-
-		const signedTx = await this.provider.wallet.signTransaction(tx);
-		additionalSigners
-			.filter((s): s is Signer => s !== undefined)
-			.forEach((kp) => {
-				signedTx.partialSign(kp);
-			});
-
-		return signedTx;
-	}
-
 	async confirmTransaction(
 		signature: TransactionSignature,
 		commitment?: Commitment
@@ -229,7 +269,10 @@ export class RetryTxSender implements TxSender {
 		);
 	}
 
-	sendToAdditionalConnections(rawTx: Buffer, opts: ConfirmOptions): void {
+	sendToAdditionalConnections(
+		rawTx: Buffer | Uint8Array,
+		opts: ConfirmOptions
+	): void {
 		this.additionalConnections.map((connection) => {
 			connection.sendRawTransaction(rawTx, opts).catch((e) => {
 				console.error(

package/src/tx/types.ts

@@ -1,8 +1,10 @@
 import { Provider } from '@project-serum/anchor';
 import {
+	AddressLookupTableAccount,
 	ConfirmOptions,
 	Signer,
 	Transaction,
+	TransactionInstruction,
 	TransactionSignature,
 } from '@solana/web3.js';
 
@@ -20,4 +22,11 @@ export interface TxSender {
 		opts?: ConfirmOptions,
 		preSigned?: boolean
 	): Promise<TxSigAndSlot>;
+
+	sendVersionedTransaction(
+		ixs: TransactionInstruction[],
+		lookupTableAccounts: AddressLookupTableAccount[],
+		additionalSigners?: Array<Signer>,
+		opts?: ConfirmOptions
+	): Promise<TxSigAndSlot>;
 }

package/src/types.ts

@@ -846,7 +846,7 @@ export type OrderParams = {
 	price: BN;
 	marketIndex: number;
 	reduceOnly: boolean;
-	postOnly: boolean;
+	postOnly: PostOnlyParams;
 	immediateOrCancel: boolean;
 	triggerPrice: BN | null;
 	triggerCondition: OrderTriggerCondition;
@@ -858,6 +858,12 @@ export type OrderParams = {
 	auctionEndPrice: BN | null;
 };
 
+export class PostOnlyParams {
+	static readonly NONE = { none: {} };
+	static readonly MUST_POST_ONLY = { mustPostOnly: {} }; // Tx fails if order can't be post only
+	static readonly TRY_POST_ONLY = { tryPostOnly: {} }; // Tx succeeds and order not placed if can't be post only
+}
+
 export type NecessaryOrderParams = {
 	orderType: OrderType;
 	marketIndex: number;
@@ -878,7 +884,7 @@ export const DefaultOrderParams: OrderParams = {
 	price: ZERO,
 	marketIndex: 0,
 	reduceOnly: false,
-	postOnly: false,
+	postOnly: PostOnlyParams.NONE,
 	immediateOrCancel: false,
 	triggerPrice: null,
 	triggerCondition: OrderTriggerCondition.ABOVE,

package/src/tx/types.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/src/tx/utils.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapInTx = void 0;
-const web3_js_1 = require("@solana/web3.js");
-const COMPUTE_UNITS_DEFAULT = 200000;
-function wrapInTx(instruction, computeUnits = 600000 // TODO, requires less code change
-) {
-    const tx = new web3_js_1.Transaction();
-    if (computeUnits != COMPUTE_UNITS_DEFAULT) {
-        tx.add(web3_js_1.ComputeBudgetProgram.requestUnits({
-            units: computeUnits,
-            additionalFee: 0,
-        }));
-    }
-    return tx.add(instruction);
-}
-exports.wrapInTx = wrapInTx;