@drift-labs/sdk 2.96.0-beta.15 → 2.96.0-beta.16

package/VERSION

@@ -1 +1 @@
-2.96.0-beta.15
+2.96.0-beta.16

package/lib/config.d.ts

@@ -1,5 +1,5 @@
 import { ConfirmOptions } from '@solana/web3.js';
-import { PerpMarketAccount, SpotMarketAccount } from '.';
+import { PerpMarketAccount, PublicKey, SpotMarketAccount } from '.';
 import { PerpMarketConfig } from './constants/perpMarkets';
 import { SpotMarketConfig } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
@@ -20,10 +20,12 @@ type DriftConfig = {
     MARKET_LOOKUP_TABLE: string;
     SERUM_LOOKUP_TABLE?: string;
     PYTH_PULL_ORACLE_LOOKUP_TABLE?: string;
+    SB_ON_DEMAND_PID: PublicKey;
 };
 export type DriftEnv = 'devnet' | 'mainnet-beta';
 export declare const DRIFT_PROGRAM_ID = "dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH";
 export declare const DRIFT_ORACLE_RECEIVER_ID = "G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha";
+export declare const SWIFT_ID = "SW1fThqrxLzVprnCMpiybiqYQfoNCdduC5uWsSUKChS";
 export declare const DEFAULT_CONFIRMATION_OPTS: ConfirmOptions;
 export declare const configs: {
     [key in DriftEnv]: DriftConfig;

package/lib/config.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllMarketAndOracles = exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = exports.DEFAULT_CONFIRMATION_OPTS = exports.DRIFT_ORACLE_RECEIVER_ID = exports.DRIFT_PROGRAM_ID = void 0;
+exports.findAllMarketAndOracles = exports.getMarketsAndOraclesForSubscription = exports.initialize = exports.getConfig = exports.configs = exports.DEFAULT_CONFIRMATION_OPTS = exports.SWIFT_ID = exports.DRIFT_ORACLE_RECEIVER_ID = exports.DRIFT_PROGRAM_ID = void 0;
 const perpMarkets_1 = require("./constants/perpMarkets");
 const spotMarkets_1 = require("./constants/spotMarkets");
+const on_demand_1 = require("@switchboard-xyz/on-demand");
 exports.DRIFT_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 exports.DRIFT_ORACLE_RECEIVER_ID = 'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';
+exports.SWIFT_ID = 'SW1fThqrxLzVprnCMpiybiqYQfoNCdduC5uWsSUKChS';
 exports.DEFAULT_CONFIRMATION_OPTS = {
     preflightCommitment: 'confirmed',
     commitment: 'confirmed',
@@ -24,6 +26,7 @@ exports.configs = {
         SPOT_MARKETS: spotMarkets_1.DevnetSpotMarkets,
         MARKET_LOOKUP_TABLE: 'FaMS3U4uBojvGn5FSDEPimddcXsCfwkKsFgMVVnDdxGb',
         DRIFT_ORACLE_RECEIVER_ID: exports.DRIFT_ORACLE_RECEIVER_ID,
+        SB_ON_DEMAND_PID: on_demand_1.ON_DEMAND_DEVNET_PID,
     },
     'mainnet-beta': {
         ENV: 'mainnet-beta',
@@ -40,6 +43,7 @@ exports.configs = {
         MARKET_LOOKUP_TABLE: 'D9cnvzswDikQDf53k4HpQ3KJ9y1Fv3HGGDFYMXnK5T6c',
         SERUM_LOOKUP_TABLE: 'GPZkp76cJtNL2mphCvT6FXkJCVPpouidnacckR6rzKDN',
         DRIFT_ORACLE_RECEIVER_ID: exports.DRIFT_ORACLE_RECEIVER_ID,
+        SB_ON_DEMAND_PID: on_demand_1.ON_DEMAND_MAINNET_PID,
     },
 };
 let currentConfig = exports.configs.devnet;

package/lib/driftClient.d.ts

@@ -4,8 +4,8 @@
 import * as anchor from '@coral-xyz/anchor';
 import { AnchorProvider, BN, Program, ProgramAccount } from '@coral-xyz/anchor';
 import { Idl as Idl30, Program as Program30 } from '@coral-xyz/anchor-30';
-import { DriftClientMetricsEvents, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SwiftOrderParamsMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount } from './types';
-import { AccountMeta, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Connection, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
+import { DriftClientMetricsEvents, IWallet, MakerInfo, MappedRecord, MarketType, ModifyOrderPolicy, OpenbookV2FulfillmentConfigAccount, OptionalOrderParams, Order, OrderParams, OrderTriggerCondition, PerpMarketAccount, PerpMarketExtendedInfo, PhoenixV1FulfillmentConfigAccount, PlaceAndTakeOrderSuccessCondition, PositionDirection, ReferrerInfo, ReferrerNameAccount, SerumV3FulfillmentConfigAccount, SettlePnlMode, SignedTxData, SpotMarketAccount, SpotPosition, StateAccount, SwapReduceOnly, SwiftOrderParamsMessage, SwiftServerMessage, TakerInfo, TxParams, UserAccount, UserStatsAccount } from './types';
+import { AccountMeta, AddressLookupTableAccount, BlockhashWithExpiryBlockHeight, ConfirmOptions, Connection, Keypair, PublicKey, Signer, Transaction, TransactionInstruction, TransactionSignature, TransactionVersion, VersionedTransaction } from '@solana/web3.js';
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
@@ -65,6 +65,7 @@ export declare class DriftClient {
     txHandler: TxHandler;
     receiverProgram?: Program<PythSolanaReceiver>;
     wormholeProgram?: Program<WormholeCoreBridgeSolana>;
+    sbOnDemandProgramdId: PublicKey;
     sbOnDemandProgram?: Program30<Idl30>;
     sbProgramFeedConfigs?: Map<string, any>;
     get isSubscribed(): boolean;
@@ -504,34 +505,29 @@ export declare class DriftClient {
     getPlaceAndTakePerpOrderIx(orderParams: OptionalOrderParams, makerInfo?: MakerInfo | MakerInfo[], referrerInfo?: ReferrerInfo, successCondition?: PlaceAndTakeOrderSuccessCondition, subAccountId?: number): Promise<TransactionInstruction>;
     placeAndMakePerpOrder(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
     getPlaceAndMakePerpOrderIx(orderParams: OptionalOrderParams, takerInfo: TakerInfo, referrerInfo?: ReferrerInfo, subAccountId?: number): Promise<TransactionInstruction>;
-    signTakerOrderParams(orderParamsMessage: SwiftOrderParamsMessage): Promise<Buffer>;
-    getEncodedSwiftOrderParamsMessage(orderParamsMessage: SwiftOrderParamsMessage): Buffer;
-    decodeSwiftTakerOrderParamsMessage(encodedMessage: Buffer): SwiftOrderParamsMessage;
-    signMessage(message: Uint8Array): Promise<Buffer>;
-    assembleSwiftServerMessage(message: Buffer, signature: Buffer, takerPubkey: PublicKey, marketIndex: number, marketType: MarketType, slot: number | BN): {
-        message: string;
-        signature: string;
-        taker_pubkey: string;
-        market_index: number;
-        market_type: 'perp' | 'spot';
-        slot: BN;
-    };
-    placeSwiftTakerOrder(takerOrderParamsMessage: Buffer, takerSignature: Buffer, marketIndex: number, takerInfo: {
+    encodeSwiftServerMessage(message: SwiftServerMessage): Buffer;
+    decodeSwiftServerMessage(encodedMessage: Buffer): SwiftServerMessage;
+    signSwiftServerMessage(message: SwiftServerMessage): Promise<Buffer>;
+    signSwiftOrderParamsMessage(orderParamsMessage: SwiftOrderParamsMessage): Promise<Buffer>;
+    encodeSwiftOrderParamsMessage(orderParamsMessage: SwiftOrderParamsMessage): Buffer;
+    decodeSwiftOrderParamsMessage(encodedMessage: Buffer): SwiftOrderParamsMessage;
+    signMessage(message: Uint8Array, keypair?: Keypair): Promise<Buffer>;
+    placeSwiftTakerOrder(swiftServerMessage: Buffer, swiftSignature: Buffer, swiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, marketIndex: number, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
     }, txParams?: TxParams): Promise<TransactionSignature>;
-    getPlaceSwiftTakerPerpOrderIx(takerOrderParamsMessage: Buffer, takerSignature: Buffer, marketIndex: number, takerInfo: {
+    getPlaceSwiftTakerPerpOrderIxs(encodedSwiftServerMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, marketIndex: number, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
     }): Promise<TransactionInstruction[]>;
-    placeAndMakeSwiftPerpOrder(encodedTakerOrderParamsMessage: Buffer, takerSignature: Buffer, takerExpectedOrderId: number, takerInfo: {
+    placeAndMakeSwiftPerpOrder(encodedSwiftMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, takerExpectedOrderId: number, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
     }, orderParams: OptionalOrderParams, referrerInfo?: ReferrerInfo, txParams?: TxParams, subAccountId?: number): Promise<TransactionSignature>;
-    getPlaceAndMakeSwiftPerpOrderIxs(encodedTakerOrderParamsMessage: Buffer, takerSignature: Buffer, takerExpectedOrderId: number, takerInfo: {
+    getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage: Buffer, swiftSignature: Buffer, encodedSwiftOrderParamsMessage: Buffer, swiftOrderParamsSignature: Buffer, takerExpectedOrderId: number, takerInfo: {
         taker: PublicKey;
         takerStats: PublicKey;
         takerUserAccount: UserAccount;
@@ -774,7 +770,7 @@ export declare class DriftClient {
         marketType: MarketType;
     } | undefined;
     getReceiverProgram(): Program<PythSolanaReceiver>;
-    getSwitchboardOnDemandProgram(): Program30<Idl30>;
+    getSwitchboardOnDemandProgram(): Promise<Program30<Idl30>>;
     postPythPullOracleUpdateAtomic(vaaString: string, feedId: string): Promise<TransactionSignature>;
     postMultiPythPullOracleUpdatesAtomic(vaaString: string, feedIds: string[]): Promise<TransactionSignature>;
     getPostPythPullOracleUpdateAtomicIxs(vaaString: string, feedIds: string | string[], numSignatures?: number): Promise<TransactionInstruction[]>;

package/lib/driftClient.js

@@ -67,7 +67,6 @@ const pythPullOracleUtils_1 = require("./util/pythPullOracleUtils");
 const utils_2 = require("./tx/utils");
 const pyth_solana_receiver_json_1 = __importDefault(require("./idl/pyth_solana_receiver.json"));
 const on_demand_1 = require("@switchboard-xyz/on-demand");
-const switchboard_on_demand_30_json_1 = __importDefault(require("./idl/switchboard_on_demand_30.json"));
 const ed = __importStar(require("@noble/ed25519"));
 /**
  * # DriftClient
@@ -81,7 +80,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -195,6 +194,8 @@ class DriftClient {
                 opts: this.opts,
                 txHandler: this.txHandler,
             });
+        this.sbOnDemandProgramdId =
+            config_1.configs[(_7 = config.env) !== null && _7 !== void 0 ? _7 : 'mainnet-beta'].SB_ON_DEMAND_PID;
     }
     getUserMapKey(subAccountId, authority) {
         return `${subAccountId}_${authority.toString()}`;
@@ -2912,46 +2913,59 @@ class DriftClient {
             remainingAccounts,
         });
     }
-    async signTakerOrderParams(orderParamsMessage) {
-        const takerOrderParamsMessage = Uint8Array.from(this.getEncodedSwiftOrderParamsMessage(orderParamsMessage));
+    encodeSwiftServerMessage(message) {
+        const messageWithBuffer = {
+            slot: message.slot,
+            swiftOrderSignature: message.swiftOrderSignature,
+        };
+        return this.program.coder.types.encode('SwiftServerMessage', messageWithBuffer);
+    }
+    decodeSwiftServerMessage(encodedMessage) {
+        const decodedSwiftMessage = this.program.coder.types.decode('SwiftServerMessage', encodedMessage);
+        return {
+            slot: decodedSwiftMessage.slot,
+            swiftOrderSignature: decodedSwiftMessage.swiftSignature,
+        };
+    }
+    async signSwiftServerMessage(message) {
+        const swiftServerMessage = Uint8Array.from(this.encodeSwiftServerMessage(message));
+        return await this.signMessage(swiftServerMessage);
+    }
+    async signSwiftOrderParamsMessage(orderParamsMessage) {
+        const takerOrderParamsMessage = Uint8Array.from(this.encodeSwiftOrderParamsMessage(orderParamsMessage));
         return await this.signMessage(takerOrderParamsMessage);
     }
-    getEncodedSwiftOrderParamsMessage(orderParamsMessage) {
+    encodeSwiftOrderParamsMessage(orderParamsMessage) {
         return this.program.coder.types.encode('SwiftOrderParamsMessage', orderParamsMessage);
     }
-    decodeSwiftTakerOrderParamsMessage(encodedMessage) {
+    decodeSwiftOrderParamsMessage(encodedMessage) {
         return this.program.coder.types.decode('SwiftOrderParamsMessage', encodedMessage);
     }
-    async signMessage(message) {
-        return Buffer.from(await ed.sign(message, this.wallet.payer.secretKey.slice(0, 32)));
-    }
-    assembleSwiftServerMessage(message, signature, takerPubkey, marketIndex, marketType, slot) {
-        return {
-            message: message.toString('base64'),
-            signature: signature.toString('base64'),
-            taker_pubkey: takerPubkey.toBase58(),
-            market_index: marketIndex,
-            market_type: (0, types_1.isVariant)(marketType, 'perp') ? 'perp' : 'spot',
-            slot: typeof slot === 'number' ? new anchor_1.BN(slot) : slot,
-        };
+    async signMessage(message, keypair = this.wallet.payer) {
+        return Buffer.from(await ed.sign(message, keypair.secretKey.slice(0, 32)));
     }
-    async placeSwiftTakerOrder(takerOrderParamsMessage, takerSignature, marketIndex, takerInfo, txParams) {
-        const ixs = await this.getPlaceSwiftTakerPerpOrderIx(takerOrderParamsMessage, takerSignature, marketIndex, takerInfo);
+    async placeSwiftTakerOrder(swiftServerMessage, swiftSignature, swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo, txParams) {
+        const ixs = await this.getPlaceSwiftTakerPerpOrderIxs(swiftServerMessage, swiftSignature, swiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo);
         const { txSig } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
         return txSig;
     }
-    async getPlaceSwiftTakerPerpOrderIx(takerOrderParamsMessage, takerSignature, marketIndex, takerInfo) {
+    async getPlaceSwiftTakerPerpOrderIxs(encodedSwiftServerMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, marketIndex, takerInfo) {
         const remainingAccounts = this.getRemainingAccounts({
             userAccounts: [takerInfo.takerUserAccount],
             useMarketLastSlotCache: true,
             readablePerpMarketIndex: marketIndex,
         });
-        const signatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
+        const swiftServerSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
+            publicKey: new web3_js_1.PublicKey(config_1.SWIFT_ID).toBytes(),
+            signature: Uint8Array.from(swiftSignature),
+            message: Uint8Array.from(encodedSwiftServerMessage),
+        });
+        const swiftOrderParamsSignatureIx = web3_js_1.Ed25519Program.createInstructionWithPublicKey({
             publicKey: takerInfo.takerUserAccount.authority.toBytes(),
-            signature: Uint8Array.from(takerSignature),
-            message: Uint8Array.from(takerOrderParamsMessage),
+            signature: Uint8Array.from(swiftOrderParamsSignature),
+            message: Uint8Array.from(encodedSwiftOrderParamsMessage),
         });
-        const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(takerOrderParamsMessage, takerSignature, {
+        const placeTakerSwiftPerpOrderIx = await this.program.instruction.placeSwiftTakerOrder(encodedSwiftServerMessage, encodedSwiftOrderParamsMessage, swiftSignature, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 user: takerInfo.taker,
@@ -2961,16 +2975,20 @@ class DriftClient {
             },
             remainingAccounts,
         });
-        return [signatureIx, placeTakerSwiftPerpOrderIx];
+        return [
+            swiftServerSignatureIx,
+            swiftOrderParamsSignatureIx,
+            placeTakerSwiftPerpOrderIx,
+        ];
     }
-    async placeAndMakeSwiftPerpOrder(encodedTakerOrderParamsMessage, takerSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, txParams, subAccountId) {
-        const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(encodedTakerOrderParamsMessage, takerSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, subAccountId);
+    async placeAndMakeSwiftPerpOrder(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, txParams, subAccountId) {
+        const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, subAccountId);
         const { txSig, slot } = await this.sendTransaction(await this.buildTransaction(ixs, txParams), [], this.opts);
         this.perpMarketLastSlotCache.set(orderParams.marketIndex, slot);
         return txSig;
     }
-    async getPlaceAndMakeSwiftPerpOrderIxs(encodedTakerOrderParamsMessage, takerSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, subAccountId) {
-        const [signatureIx, placeTakerSwiftPerpOrderIx] = await this.getPlaceSwiftTakerPerpOrderIx(encodedTakerOrderParamsMessage, takerSignature, orderParams.marketIndex, takerInfo);
+    async getPlaceAndMakeSwiftPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, takerExpectedOrderId, takerInfo, orderParams, referrerInfo, subAccountId) {
+        const [swiftServerSignatureIx, swiftOrderSignatureIx, placeTakerSwiftPerpOrderIx,] = await this.getPlaceSwiftTakerPerpOrderIxs(encodedSwiftMessage, swiftSignature, encodedSwiftOrderParamsMessage, swiftOrderParamsSignature, orderParams.marketIndex, takerInfo);
         orderParams = (0, orderParams_1.getOrderParams)(orderParams, { marketType: types_1.MarketType.PERP });
         const userStatsPublicKey = this.getUserStatsAccountPublicKey();
         const user = await this.getUserAccountPublicKey(subAccountId);
@@ -3005,7 +3023,12 @@ class DriftClient {
             },
             remainingAccounts,
         });
-        return [signatureIx, placeTakerSwiftPerpOrderIx, placeAndMakeIx];
+        return [
+            swiftServerSignatureIx,
+            swiftOrderSignatureIx,
+            placeTakerSwiftPerpOrderIx,
+            placeAndMakeIx,
+        ];
     }
     async preparePlaceAndTakeSpotOrder(orderParams, fulfillmentConfig, makerInfo, referrerInfo, txParams, subAccountId) {
         const tx = await this.buildTransaction(await this.getPlaceAndTakeSpotOrderIx(orderParams, fulfillmentConfig, makerInfo, referrerInfo, subAccountId), txParams);
@@ -4028,9 +4051,10 @@ class DriftClient {
         }
         return this.receiverProgram;
     }
-    getSwitchboardOnDemandProgram() {
+    async getSwitchboardOnDemandProgram() {
+        const idl = (await anchor_30_1.Program.fetchIdl(this.sbOnDemandProgramdId, this.provider));
         if (this.sbOnDemandProgram === undefined) {
-            this.sbOnDemandProgram = new anchor_30_1.Program(switchboard_on_demand_30_json_1.default, this.provider);
+            this.sbOnDemandProgram = new anchor_30_1.Program(idl, this.provider);
         }
         return this.sbOnDemandProgram;
     }
@@ -4129,7 +4153,7 @@ class DriftClient {
         });
     }
     async getPostSwitchboardOnDemandUpdateAtomicIx(feed, numSignatures = 3) {
-        const program = this.getSwitchboardOnDemandProgram();
+        const program = await this.getSwitchboardOnDemandProgram();
         const feedAccount = new on_demand_1.PullFeed(program, feed);
         if (!this.sbProgramFeedConfigs) {
             this.sbProgramFeedConfigs = new Map();
@@ -4140,8 +4164,6 @@ class DriftClient {
         }
         const [pullIx, _responses, success] = await feedAccount.fetchUpdateIx({
             numSignatures,
-            // @ts-ignore :: TODO someone needs to look at this
-            feedConfigs: this.sbProgramFeedConfigs.get(feed.toString()),
         });
         if (!success) {
             return undefined;

package/lib/idl/drift.json

@@ -554,7 +554,7 @@
                     }
                 },
                 {
-                    "name": "makerOrderId",
+                    "name": "successCondition",
                     "type": {
                         "option": "u32"
                     }
@@ -644,11 +644,15 @@
             ],
             "args": [
                 {
-                    "name": "takerOrderParamsMessageBytes",
+                    "name": "swiftMessageBytes",
                     "type": "bytes"
                 },
                 {
-                    "name": "signature",
+                    "name": "swiftOrderParamsMessageBytes",
+                    "type": "bytes"
+                },
+                {
+                    "name": "swiftMessageSignature",
                     "type": {
                         "array": [
                             "u8",
@@ -8100,6 +8104,27 @@
                 ]
             }
         },
+        {
+            "name": "SwiftServerMessage",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "swiftOrderSignature",
+                        "type": {
+                            "array": [
+                                "u8",
+                                64
+                            ]
+                        }
+                    },
+                    {
+                        "name": "slot",
+                        "type": "u64"
+                    }
+                ]
+            }
+        },
         {
             "name": "SwiftOrderParamsMessage",
             "type": {
@@ -8108,27 +8133,47 @@
                     {
                         "name": "swiftOrderParams",
                         "type": {
-                            "vec": {
-                                "defined": "OrderParams"
-                            }
+                            "defined": "OrderParams"
                         }
                     },
                     {
-                        "name": "marketIndex",
+                        "name": "expectedOrderId",
+                        "type": "i32"
+                    },
+                    {
+                        "name": "subAccountId",
                         "type": "u16"
                     },
                     {
-                        "name": "marketType",
+                        "name": "takeProfitOrderParams",
                         "type": {
-                            "defined": "MarketType"
+                            "option": {
+                                "defined": "SwiftTriggerOrderParams"
+                            }
                         }
                     },
                     {
-                        "name": "expectedOrderId",
-                        "type": "i32"
+                        "name": "stopLossOrderParams",
+                        "type": {
+                            "option": {
+                                "defined": "SwiftTriggerOrderParams"
+                            }
+                        }
+                    }
+                ]
+            }
+        },
+        {
+            "name": "SwiftTriggerOrderParams",
+            "type": {
+                "kind": "struct",
+                "fields": [
+                    {
+                        "name": "triggerPrice",
+                        "type": "u64"
                     },
                     {
-                        "name": "slot",
+                        "name": "baseAssetAmount",
                         "type": "u64"
                     }
                 ]
@@ -10206,6 +10251,20 @@
                 ]
             }
         },
+        {
+            "name": "PlaceAndTakeOrderSuccessCondition",
+            "type": {
+                "kind": "enum",
+                "variants": [
+                    {
+                        "name": "PartialFill"
+                    },
+                    {
+                        "name": "FullFill"
+                    }
+                ]
+            }
+        },
         {
             "name": "PerpOperation",
             "type": {
@@ -13051,7 +13110,7 @@
         {
             "code": 6286,
             "name": "SigVerificationFailed",
-            "msg": "Swift taker message verificaiton failed"
+            "msg": "Swift message verificaiton failed"
         },
         {
             "code": 6287,
@@ -13060,8 +13119,13 @@
         },
         {
             "code": 6288,
-            "name": "SwiftOrderSequenceError",
-            "msg": "Swift order message must be ordered 0th order is market and rest are triggers"
+            "name": "InvalidSwiftOrderParam",
+            "msg": "Swift only available for market/oracle perp orders"
+        },
+        {
+            "code": 6289,
+            "name": "PlaceAndTakeOrderSuccessConditionFailed",
+            "msg": "Place and take order success condition failed"
         }
     ],
     "metadata": {

package/lib/types.d.ts

@@ -1096,12 +1096,19 @@ export declare class ModifyOrderPolicy {
     };
 }
 export declare const DefaultOrderParams: OrderParams;
+export type SwiftServerMessage = {
+    slot: BN;
+    swiftOrderSignature: Uint8Array;
+};
 export type SwiftOrderParamsMessage = {
-    marketIndex: number;
-    swiftOrderParams: OptionalOrderParams[];
+    swiftOrderParams: OptionalOrderParams;
     expectedOrderId: number;
-    marketType: MarketType;
-    slot: BN;
+    takeProfitOrderParams: SwiftTriggerOrderParams | null;
+    stopLossOrderParams: SwiftTriggerOrderParams | null;
+};
+export type SwiftTriggerOrderParams = {
+    triggerPrice: BN;
+    baseAssetAmount: BN;
 };
 export type MakerInfo = {
     maker: PublicKey;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.96.0-beta.15",
+	"version": "2.96.0-beta.16",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",
@@ -44,7 +44,7 @@
 		"@pythnetwork/pyth-solana-receiver": "^0.7.0",
 		"@solana/spl-token": "0.3.7",
 		"@solana/web3.js": "1.92.3",
-		"@switchboard-xyz/on-demand": "1.2.32",
+		"@switchboard-xyz/on-demand": "1.2.42",
 		"anchor-bankrun": "^0.3.0",
 		"node-cache": "^5.1.2",
 		"rpc-websockets": "7.5.1",

package/src/config.ts

@@ -1,5 +1,5 @@
 import { ConfirmOptions } from '@solana/web3.js';
-import { PerpMarketAccount, SpotMarketAccount } from '.';
+import { PerpMarketAccount, PublicKey, SpotMarketAccount } from '.';
 import {
 	DevnetPerpMarkets,
 	MainnetPerpMarkets,
@@ -14,6 +14,10 @@ import {
 } from './constants/spotMarkets';
 import { OracleInfo } from './oracles/types';
 import { Program, ProgramAccount } from '@coral-xyz/anchor';
+import {
+	ON_DEMAND_DEVNET_PID,
+	ON_DEMAND_MAINNET_PID,
+} from '@switchboard-xyz/on-demand';
 
 type DriftConfig = {
 	ENV: DriftEnv;
@@ -31,6 +35,7 @@ type DriftConfig = {
 	MARKET_LOOKUP_TABLE: string;
 	SERUM_LOOKUP_TABLE?: string;
 	PYTH_PULL_ORACLE_LOOKUP_TABLE?: string;
+	SB_ON_DEMAND_PID: PublicKey;
 };
 
 export type DriftEnv = 'devnet' | 'mainnet-beta';
@@ -38,6 +43,7 @@ export type DriftEnv = 'devnet' | 'mainnet-beta';
 export const DRIFT_PROGRAM_ID = 'dRiftyHA39MWEi3m9aunc5MzRF1JYuBsbn6VPcn33UH';
 export const DRIFT_ORACLE_RECEIVER_ID =
 	'G6EoTTTgpkNBtVXo96EQp2m6uwwVh2Kt6YidjkmQqoha';
+export const SWIFT_ID = 'SW1fThqrxLzVprnCMpiybiqYQfoNCdduC5uWsSUKChS';
 
 export const DEFAULT_CONFIRMATION_OPTS: ConfirmOptions = {
 	preflightCommitment: 'confirmed',
@@ -60,6 +66,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 		SPOT_MARKETS: DevnetSpotMarkets,
 		MARKET_LOOKUP_TABLE: 'FaMS3U4uBojvGn5FSDEPimddcXsCfwkKsFgMVVnDdxGb',
 		DRIFT_ORACLE_RECEIVER_ID,
+		SB_ON_DEMAND_PID: ON_DEMAND_DEVNET_PID,
 	},
 	'mainnet-beta': {
 		ENV: 'mainnet-beta',
@@ -77,6 +84,7 @@ export const configs: { [key in DriftEnv]: DriftConfig } = {
 		MARKET_LOOKUP_TABLE: 'D9cnvzswDikQDf53k4HpQ3KJ9y1Fv3HGGDFYMXnK5T6c',
 		SERUM_LOOKUP_TABLE: 'GPZkp76cJtNL2mphCvT6FXkJCVPpouidnacckR6rzKDN',
 		DRIFT_ORACLE_RECEIVER_ID,
+		SB_ON_DEMAND_PID: ON_DEMAND_MAINNET_PID,
 	},
 };
 

package/src/driftClient.ts

@@ -48,6 +48,7 @@ import {
 	StateAccount,
 	SwapReduceOnly,
 	SwiftOrderParamsMessage,
+	SwiftServerMessage,
 	TakerInfo,
 	TxParams,
 	UserAccount,
@@ -124,6 +125,7 @@ import {
 	DRIFT_ORACLE_RECEIVER_ID,
 	DEFAULT_CONFIRMATION_OPTS,
 	DRIFT_PROGRAM_ID,
+	SWIFT_ID,
 } from './config';
 import { WRAPPED_SOL_MINT } from './constants/spotMarkets';
 import { UserStats } from './userStats';
@@ -160,7 +162,6 @@ import { getFeedIdUint8Array, trimFeedId } from './util/pythPullOracleUtils';
 import { isVersionedTransaction } from './tx/utils';
 import pythSolanaReceiverIdl from './idl/pyth_solana_receiver.json';
 import { asV0Tx, PullFeed } from '@switchboard-xyz/on-demand';
-import switchboardOnDemandIdl from './idl/switchboard_on_demand_30.json';
 import * as ed from '@noble/ed25519';
 
 type RemainingAccountParams = {
@@ -213,6 +214,7 @@ export class DriftClient {
 
 	receiverProgram?: Program<PythSolanaReceiver>;
 	wormholeProgram?: Program<WormholeCoreBridgeSolana>;
+	sbOnDemandProgramdId: PublicKey;
 	sbOnDemandProgram?: Program30<Idl30>;
 	sbProgramFeedConfigs?: Map<string, any>;
 
@@ -383,6 +385,9 @@ export class DriftClient {
 				opts: this.opts,
 				txHandler: this.txHandler,
 			});
+
+		this.sbOnDemandProgramdId =
+			configs[config.env ?? 'mainnet-beta'].SB_ON_DEMAND_PID;
 	}
 
 	public getUserMapKey(subAccountId: number, authority: PublicKey): string {
@@ -5364,16 +5369,47 @@ export class DriftClient {
 		);
 	}
 
-	public async signTakerOrderParams(
+	public encodeSwiftServerMessage(message: SwiftServerMessage): Buffer {
+		const messageWithBuffer = {
+			slot: message.slot,
+			swiftOrderSignature: message.swiftOrderSignature,
+		};
+		return this.program.coder.types.encode(
+			'SwiftServerMessage',
+			messageWithBuffer
+		);
+	}
+
+	public decodeSwiftServerMessage(encodedMessage: Buffer): SwiftServerMessage {
+		const decodedSwiftMessage = this.program.coder.types.decode(
+			'SwiftServerMessage',
+			encodedMessage
+		);
+		return {
+			slot: decodedSwiftMessage.slot,
+			swiftOrderSignature: decodedSwiftMessage.swiftSignature,
+		};
+	}
+
+	public async signSwiftServerMessage(
+		message: SwiftServerMessage
+	): Promise<Buffer> {
+		const swiftServerMessage = Uint8Array.from(
+			this.encodeSwiftServerMessage(message)
+		);
+		return await this.signMessage(swiftServerMessage);
+	}
+
+	public async signSwiftOrderParamsMessage(
 		orderParamsMessage: SwiftOrderParamsMessage
 	): Promise<Buffer> {
 		const takerOrderParamsMessage = Uint8Array.from(
-			this.getEncodedSwiftOrderParamsMessage(orderParamsMessage)
+			this.encodeSwiftOrderParamsMessage(orderParamsMessage)
 		);
 		return await this.signMessage(takerOrderParamsMessage);
 	}
 
-	public getEncodedSwiftOrderParamsMessage(
+	public encodeSwiftOrderParamsMessage(
 		orderParamsMessage: SwiftOrderParamsMessage
 	): Buffer {
 		return this.program.coder.types.encode(
@@ -5382,7 +5418,7 @@ export class DriftClient {
 		);
 	}
 
-	public decodeSwiftTakerOrderParamsMessage(
+	public decodeSwiftOrderParamsMessage(
 		encodedMessage: Buffer
 	): SwiftOrderParamsMessage {
 		return this.program.coder.types.decode(
@@ -5391,40 +5427,18 @@ export class DriftClient {
 		);
 	}
 
-	public async signMessage(message: Uint8Array): Promise<Buffer> {
-		return Buffer.from(
-			await ed.sign(message, this.wallet.payer.secretKey.slice(0, 32))
-		);
-	}
-
-	public assembleSwiftServerMessage(
-		message: Buffer,
-		signature: Buffer,
-		takerPubkey: PublicKey,
-		marketIndex: number,
-		marketType: MarketType,
-		slot: number | BN
-	): {
-		message: string;
-		signature: string;
-		taker_pubkey: string;
-		market_index: number;
-		market_type: 'perp' | 'spot';
-		slot: BN;
-	} {
-		return {
-			message: message.toString('base64'),
-			signature: signature.toString('base64'),
-			taker_pubkey: takerPubkey.toBase58(),
-			market_index: marketIndex,
-			market_type: isVariant(marketType, 'perp') ? 'perp' : 'spot',
-			slot: typeof slot === 'number' ? new BN(slot) : slot,
-		};
+	public async signMessage(
+		message: Uint8Array,
+		keypair: Keypair = this.wallet.payer
+	): Promise<Buffer> {
+		return Buffer.from(await ed.sign(message, keypair.secretKey.slice(0, 32)));
 	}
 
 	public async placeSwiftTakerOrder(
-		takerOrderParamsMessage: Buffer,
-		takerSignature: Buffer,
+		swiftServerMessage: Buffer,
+		swiftSignature: Buffer,
+		swiftOrderParamsMessage: Buffer,
+		swiftOrderParamsSignature: Buffer,
 		marketIndex: number,
 		takerInfo: {
 			taker: PublicKey;
@@ -5433,9 +5447,11 @@ export class DriftClient {
 		},
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
-		const ixs = await this.getPlaceSwiftTakerPerpOrderIx(
-			takerOrderParamsMessage,
-			takerSignature,
+		const ixs = await this.getPlaceSwiftTakerPerpOrderIxs(
+			swiftServerMessage,
+			swiftSignature,
+			swiftOrderParamsMessage,
+			swiftOrderParamsSignature,
 			marketIndex,
 			takerInfo
 		);
@@ -5447,9 +5463,11 @@ export class DriftClient {
 		return txSig;
 	}
 
-	public async getPlaceSwiftTakerPerpOrderIx(
-		takerOrderParamsMessage: Buffer,
-		takerSignature: Buffer,
+	public async getPlaceSwiftTakerPerpOrderIxs(
+		encodedSwiftServerMessage: Buffer,
+		swiftSignature: Buffer,
+		encodedSwiftOrderParamsMessage: Buffer,
+		swiftOrderParamsSignature: Buffer,
 		marketIndex: number,
 		takerInfo: {
 			taker: PublicKey;
@@ -5463,16 +5481,25 @@ export class DriftClient {
 			readablePerpMarketIndex: marketIndex,
 		});
 
-		const signatureIx = Ed25519Program.createInstructionWithPublicKey({
-			publicKey: takerInfo.takerUserAccount.authority.toBytes(),
-			signature: Uint8Array.from(takerSignature),
-			message: Uint8Array.from(takerOrderParamsMessage),
-		});
+		const swiftServerSignatureIx =
+			Ed25519Program.createInstructionWithPublicKey({
+				publicKey: new PublicKey(SWIFT_ID).toBytes(),
+				signature: Uint8Array.from(swiftSignature),
+				message: Uint8Array.from(encodedSwiftServerMessage),
+			});
+
+		const swiftOrderParamsSignatureIx =
+			Ed25519Program.createInstructionWithPublicKey({
+				publicKey: takerInfo.takerUserAccount.authority.toBytes(),
+				signature: Uint8Array.from(swiftOrderParamsSignature),
+				message: Uint8Array.from(encodedSwiftOrderParamsMessage),
+			});
 
 		const placeTakerSwiftPerpOrderIx =
 			await this.program.instruction.placeSwiftTakerOrder(
-				takerOrderParamsMessage,
-				takerSignature,
+				encodedSwiftServerMessage,
+				encodedSwiftOrderParamsMessage,
+				swiftSignature,
 				{
 					accounts: {
 						state: await this.getStatePublicKey(),
@@ -5485,12 +5512,18 @@ export class DriftClient {
 				}
 			);
 
-		return [signatureIx, placeTakerSwiftPerpOrderIx];
+		return [
+			swiftServerSignatureIx,
+			swiftOrderParamsSignatureIx,
+			placeTakerSwiftPerpOrderIx,
+		];
 	}
 
 	public async placeAndMakeSwiftPerpOrder(
-		encodedTakerOrderParamsMessage: Buffer,
-		takerSignature: Buffer,
+		encodedSwiftMessage: Buffer,
+		swiftSignature: Buffer,
+		encodedSwiftOrderParamsMessage: Buffer,
+		swiftOrderParamsSignature: Buffer,
 		takerExpectedOrderId: number,
 		takerInfo: {
 			taker: PublicKey;
@@ -5503,8 +5536,10 @@ export class DriftClient {
 		subAccountId?: number
 	): Promise<TransactionSignature> {
 		const ixs = await this.getPlaceAndMakeSwiftPerpOrderIxs(
-			encodedTakerOrderParamsMessage,
-			takerSignature,
+			encodedSwiftMessage,
+			swiftSignature,
+			encodedSwiftOrderParamsMessage,
+			swiftOrderParamsSignature,
 			takerExpectedOrderId,
 			takerInfo,
 			orderParams,
@@ -5522,8 +5557,10 @@ export class DriftClient {
 	}
 
 	public async getPlaceAndMakeSwiftPerpOrderIxs(
-		encodedTakerOrderParamsMessage: Buffer,
-		takerSignature: Buffer,
+		encodedSwiftMessage: Buffer,
+		swiftSignature: Buffer,
+		encodedSwiftOrderParamsMessage: Buffer,
+		swiftOrderParamsSignature: Buffer,
 		takerExpectedOrderId: number,
 		takerInfo: {
 			taker: PublicKey;
@@ -5534,13 +5571,18 @@ export class DriftClient {
 		referrerInfo?: ReferrerInfo,
 		subAccountId?: number
 	): Promise<TransactionInstruction[]> {
-		const [signatureIx, placeTakerSwiftPerpOrderIx] =
-			await this.getPlaceSwiftTakerPerpOrderIx(
-				encodedTakerOrderParamsMessage,
-				takerSignature,
-				orderParams.marketIndex,
-				takerInfo
-			);
+		const [
+			swiftServerSignatureIx,
+			swiftOrderSignatureIx,
+			placeTakerSwiftPerpOrderIx,
+		] = await this.getPlaceSwiftTakerPerpOrderIxs(
+			encodedSwiftMessage,
+			swiftSignature,
+			encodedSwiftOrderParamsMessage,
+			swiftOrderParamsSignature,
+			orderParams.marketIndex,
+			takerInfo
+		);
 
 		orderParams = getOrderParams(orderParams, { marketType: MarketType.PERP });
 		const userStatsPublicKey = this.getUserStatsAccountPublicKey();
@@ -5584,7 +5626,12 @@ export class DriftClient {
 			}
 		);
 
-		return [signatureIx, placeTakerSwiftPerpOrderIx, placeAndMakeIx];
+		return [
+			swiftServerSignatureIx,
+			swiftOrderSignatureIx,
+			placeTakerSwiftPerpOrderIx,
+			placeAndMakeIx,
+		];
 	}
 
 	public async preparePlaceAndTakeSpotOrder(
@@ -7656,12 +7703,13 @@ export class DriftClient {
 		return this.receiverProgram;
 	}
 
-	public getSwitchboardOnDemandProgram(): Program30<Idl30> {
+	public async getSwitchboardOnDemandProgram(): Promise<Program30<Idl30>> {
+		const idl = (await Program30.fetchIdl(
+			this.sbOnDemandProgramdId,
+			this.provider
+		))!;
 		if (this.sbOnDemandProgram === undefined) {
-			this.sbOnDemandProgram = new Program30(
-				switchboardOnDemandIdl as Idl30,
-				this.provider
-			);
+			this.sbOnDemandProgram = new Program30(idl, this.provider);
 		}
 		return this.sbOnDemandProgram;
 	}
@@ -7883,7 +7931,7 @@ export class DriftClient {
 		feed: PublicKey,
 		numSignatures = 3
 	): Promise<TransactionInstruction | undefined> {
-		const program = this.getSwitchboardOnDemandProgram();
+		const program = await this.getSwitchboardOnDemandProgram();
 		const feedAccount = new PullFeed(program, feed);
 		if (!this.sbProgramFeedConfigs) {
 			this.sbProgramFeedConfigs = new Map();
@@ -7895,8 +7943,6 @@ export class DriftClient {
 
 		const [pullIx, _responses, success] = await feedAccount.fetchUpdateIx({
 			numSignatures,
-			// @ts-ignore :: TODO someone needs to look at this
-			feedConfigs: this.sbProgramFeedConfigs.get(feed.toString()),
 		});
 		if (!success) {
 			return undefined;

package/src/idl/drift.json

@@ -554,7 +554,7 @@
           }
         },
         {
-          "name": "makerOrderId",
+          "name": "successCondition",
           "type": {
             "option": "u32"
           }
@@ -644,11 +644,15 @@
       ],
       "args": [
         {
-          "name": "takerOrderParamsMessageBytes",
+          "name": "swiftMessageBytes",
           "type": "bytes"
         },
         {
-          "name": "signature",
+          "name": "swiftOrderParamsMessageBytes",
+          "type": "bytes"
+        },
+        {
+          "name": "swiftMessageSignature",
           "type": {
             "array": [
               "u8",
@@ -8100,6 +8104,27 @@
         ]
       }
     },
+    {
+      "name": "SwiftServerMessage",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "swiftOrderSignature",
+            "type": {
+              "array": [
+                "u8",
+                64
+              ]
+            }
+          },
+          {
+            "name": "slot",
+            "type": "u64"
+          }
+        ]
+      }
+    },
     {
       "name": "SwiftOrderParamsMessage",
       "type": {
@@ -8108,27 +8133,47 @@
           {
             "name": "swiftOrderParams",
             "type": {
-              "vec": {
-                "defined": "OrderParams"
-              }
+              "defined": "OrderParams"
             }
           },
           {
-            "name": "marketIndex",
+            "name": "expectedOrderId",
+            "type": "i32"
+          },
+          {
+            "name": "subAccountId",
             "type": "u16"
           },
           {
-            "name": "marketType",
+            "name": "takeProfitOrderParams",
             "type": {
-              "defined": "MarketType"
+              "option": {
+                "defined": "SwiftTriggerOrderParams"
+              }
             }
           },
           {
-            "name": "expectedOrderId",
-            "type": "i32"
+            "name": "stopLossOrderParams",
+            "type": {
+              "option": {
+                "defined": "SwiftTriggerOrderParams"
+              }
+            }
+          }
+        ]
+      }
+    },
+    {
+      "name": "SwiftTriggerOrderParams",
+      "type": {
+        "kind": "struct",
+        "fields": [
+          {
+            "name": "triggerPrice",
+            "type": "u64"
           },
           {
-            "name": "slot",
+            "name": "baseAssetAmount",
             "type": "u64"
           }
         ]
@@ -10206,6 +10251,20 @@
         ]
       }
     },
+    {
+      "name": "PlaceAndTakeOrderSuccessCondition",
+      "type": {
+        "kind": "enum",
+        "variants": [
+          {
+            "name": "PartialFill"
+          },
+          {
+            "name": "FullFill"
+          }
+        ]
+      }
+    },
     {
       "name": "PerpOperation",
       "type": {
@@ -13051,7 +13110,7 @@
     {
       "code": 6286,
       "name": "SigVerificationFailed",
-      "msg": "Swift taker message verificaiton failed"
+      "msg": "Swift message verificaiton failed"
     },
     {
       "code": 6287,
@@ -13060,8 +13119,13 @@
     },
     {
       "code": 6288,
-      "name": "SwiftOrderSequenceError",
-      "msg": "Swift order message must be ordered 0th order is market and rest are triggers"
+      "name": "InvalidSwiftOrderParam",
+      "msg": "Swift only available for market/oracle perp orders"
+    },
+    {
+      "code": 6289,
+      "name": "PlaceAndTakeOrderSuccessConditionFailed",
+      "msg": "Place and take order success condition failed"
     }
   ],
   "metadata": {

package/src/tx/txHandler.ts

@@ -543,7 +543,6 @@ export class TxHandler {
 			}
 		} else {
 			const marketLookupTable = await fetchMarketLookupTableAccount();
-
 			lookupTables = lookupTables
 				? [...lookupTables, marketLookupTable]
 				: [marketLookupTable];

package/src/types.ts

@@ -1056,12 +1056,21 @@ export const DefaultOrderParams: OrderParams = {
 	auctionEndPrice: null,
 };
 
+export type SwiftServerMessage = {
+	slot: BN;
+	swiftOrderSignature: Uint8Array;
+};
+
 export type SwiftOrderParamsMessage = {
-	marketIndex: number;
-	swiftOrderParams: OptionalOrderParams[];
+	swiftOrderParams: OptionalOrderParams;
 	expectedOrderId: number;
-	marketType: MarketType;
-	slot: BN;
+	takeProfitOrderParams: SwiftTriggerOrderParams | null;
+	stopLossOrderParams: SwiftTriggerOrderParams | null;
+};
+
+export type SwiftTriggerOrderParams = {
+	triggerPrice: BN;
+	baseAssetAmount: BN;
 };
 
 export type MakerInfo = {