@drift-labs/jit-proxy 0.13.17 → 0.13.18

package/lib/jitProxyClient.d.ts

@@ -1,8 +1,7 @@
 /// <reference types="bn.js" />
-import { BN, DriftClient, MakerInfo, MarketType, PostOnlyParams, ReferrerInfo, TxParams, UserAccount } from '@drift-labs/sdk';
+import { BN, DriftClient, MakerInfo, MarketType, PostOnlyParams, ReferrerInfo, SignedMsgOrderParams, TxParams, UserAccount } from '@drift-labs/sdk';
 import { PublicKey, TransactionInstruction } from '@solana/web3.js';
 import { TxSigAndSlot } from '@drift-labs/sdk';
-import { SignedSwiftOrderParams } from '@drift-labs/sdk/lib/node/swift/types';
 export declare const DEFAULT_CU_LIMIT = 1400000;
 export type JitIxParams = {
     takerKey: PublicKey;
@@ -20,7 +19,7 @@ export type JitIxParams = {
 };
 export type JitSwiftIxParams = JitIxParams & {
     authorityToUse: PublicKey;
-    signedSwiftOrderParams: SignedSwiftOrderParams;
+    signedMsgOrderParams: SignedMsgOrderParams;
     uuid: Uint8Array;
     marketIndex: number;
 };

package/lib/jitProxyClient.js

@@ -30,7 +30,7 @@ class JitProxyClient {
                 microLamports: (computeBudgetParams === null || computeBudgetParams === void 0 ? void 0 : computeBudgetParams.computeUnitsPrice) || 0,
             }),
         ];
-        const swiftTakerIxs = await this.driftClient.getPlaceSwiftTakerPerpOrderIxs(params.signedSwiftOrderParams, params.marketIndex, {
+        const swiftTakerIxs = await this.driftClient.getPlaceSignedMsgTakerPerpOrderIxs(params.signedMsgOrderParams, params.marketIndex, {
             taker: params.takerKey,
             takerStats: params.takerStatsKey,
             takerUserAccount: params.taker,
@@ -130,8 +130,8 @@ class JitProxyClient {
                 isSigner: false,
             });
         }
-        const jitSwiftParams = {
-            swiftOrderUuid: Array.from(uuid),
+        const jitSignedMsgParams = {
+            signedMsgOrderUuid: Array.from(uuid),
             maxPosition,
             minPosition,
             bid,
@@ -140,11 +140,11 @@ class JitProxyClient {
             priceType,
         };
         return this.program.methods
-            .jitSwift(jitSwiftParams)
+            .jitSignedMsg(jitSignedMsgParams)
             .accounts({
             taker: takerKey,
             takerStats: takerStatsKey,
-            takerSwiftUserOrders: (0, sdk_1.getSwiftUserAccountPublicKey)(this.driftClient.program.programId, taker.authority),
+            takerSignedMsgUserOrders: (0, sdk_1.getSignedMsgUserAccountPublicKey)(this.driftClient.program.programId, taker.authority),
             authority: this.driftClient.wallet.payer.publicKey,
             state: await this.driftClient.getStatePublicKey(),
             user: await this.driftClient.getUserAccountPublicKey(subAccountId),

package/lib/jitter/baseJitter.d.ts

@@ -1,8 +1,7 @@
 /// <reference types="bn.js" />
 import { JitProxyClient, PriceType } from '../jitProxyClient';
 import { PublicKey } from '@solana/web3.js';
-import { AuctionSubscriber, BN, DriftClient, Order, PostOnlyParams, SlotSubscriber, SwiftOrderSubscriber, UserAccount, UserStatsMap } from '@drift-labs/sdk';
-import { SignedSwiftOrderParams } from '@drift-labs/sdk/lib/node/swift/types';
+import { AuctionSubscriber, BN, DriftClient, Order, PostOnlyParams, SignedMsgOrderSubscriber, SlotSubscriber, SignedMsgOrderParams, UserAccount, UserStatsMap } from '@drift-labs/sdk';
 export type UserFilter = (userAccount: UserAccount, userKey: string, order: Order) => boolean;
 export type JitParams = {
     bid: BN;
@@ -15,7 +14,7 @@ export type JitParams = {
 };
 export declare abstract class BaseJitter {
     auctionSubscriber: AuctionSubscriber;
-    swiftOrderSubscriber: SwiftOrderSubscriber;
+    signedMsgOrderSubscriber: SignedMsgOrderSubscriber;
     slotSubscriber: SlotSubscriber;
     driftClient: DriftClient;
     jitProxyClient: JitProxyClient;
@@ -27,17 +26,17 @@ export declare abstract class BaseJitter {
     userFilter: UserFilter;
     computeUnits: number;
     computeUnitsPrice: number;
-    constructor({ auctionSubscriber, jitProxyClient, driftClient, userStatsMap, swiftOrderSubscriber, slotSubscriber, }: {
+    constructor({ auctionSubscriber, jitProxyClient, driftClient, userStatsMap, signedMsgOrderSubscriber, slotSubscriber, }: {
         driftClient: DriftClient;
         auctionSubscriber: AuctionSubscriber;
         jitProxyClient: JitProxyClient;
         userStatsMap: UserStatsMap;
-        swiftOrderSubscriber?: SwiftOrderSubscriber;
+        signedMsgOrderSubscriber?: SignedMsgOrderSubscriber;
         slotSubscriber?: SlotSubscriber;
     });
     subscribe(): Promise<void>;
     createTryFill(taker: UserAccount, takerKey: PublicKey, takerStatsKey: PublicKey, order: Order, orderSignature: string): () => Promise<void>;
-    createTrySwiftFill(authorityToUse: PublicKey, signedSwiftOrderParams: SignedSwiftOrderParams, uuid: Uint8Array, taker: UserAccount, takerKey: PublicKey, takerStatsKey: PublicKey, order: Order, orderSignature: string, marketIndex: number): () => Promise<void>;
+    createTrySwiftFill(authorityToUse: PublicKey, signedMsgOrderParams: SignedMsgOrderParams, uuid: Uint8Array, taker: UserAccount, takerKey: PublicKey, takerStatsKey: PublicKey, order: Order, orderSignature: string, marketIndex: number): () => Promise<void>;
     deleteOnGoingAuction(orderSignature: string): void;
     getOrderSignatures(takerKey: string, orderId: number): string;
     private convertUuidToNumber;

package/lib/jitter/baseJitter.js

@@ -5,7 +5,7 @@ const web3_js_1 = require("@solana/web3.js");
 const sdk_1 = require("@drift-labs/sdk");
 const tweetnacl_util_1 = require("tweetnacl-util");
 class BaseJitter {
-    constructor({ auctionSubscriber, jitProxyClient, driftClient, userStatsMap, swiftOrderSubscriber, slotSubscriber, }) {
+    constructor({ auctionSubscriber, jitProxyClient, driftClient, userStatsMap, signedMsgOrderSubscriber, slotSubscriber, }) {
         this.perpParams = new Map();
         this.spotParams = new Map();
         this.seenOrders = new Set();
@@ -17,8 +17,8 @@ class BaseJitter {
             userStatsMap ||
                 new sdk_1.UserStatsMap(this.driftClient, new sdk_1.BulkAccountLoader(this.driftClient.connection, 'confirmed', 0));
         this.slotSubscriber = slotSubscriber;
-        this.swiftOrderSubscriber = swiftOrderSubscriber;
-        if (this.swiftOrderSubscriber && !this.slotSubscriber) {
+        this.signedMsgOrderSubscriber = signedMsgOrderSubscriber;
+        if (this.signedMsgOrderSubscriber && !this.slotSubscriber) {
             throw new Error('Slot subscriber is required for swift order subscriber');
         }
     }
@@ -78,34 +78,34 @@ class BaseJitter {
             }
         });
         await ((_a = this.slotSubscriber) === null || _a === void 0 ? void 0 : _a.subscribe());
-        await ((_b = this.swiftOrderSubscriber) === null || _b === void 0 ? void 0 : _b.subscribe(async (orderMessageRaw, swiftOrderParamsMessage) => {
+        await ((_b = this.signedMsgOrderSubscriber) === null || _b === void 0 ? void 0 : _b.subscribe(async (orderMessageRaw, swiftOrderParamsMessage) => {
             var _a, _b, _c;
             const swiftOrderParamsBufHex = Buffer.from(orderMessageRaw['order_message']);
             const swiftOrderParamsBuf = Buffer.from(orderMessageRaw['order_message'], 'hex');
-            const { swiftOrderParams, subAccountId: takerSubaccountId, } = this.driftClient.decodeSwiftOrderParamsMessage(swiftOrderParamsBuf);
+            const { signedMsgOrderParams, subAccountId: takerSubaccountId, } = this.driftClient.decodeSignedMsgOrderParamsMessage(swiftOrderParamsBuf);
             const takerAuthority = new web3_js_1.PublicKey(orderMessageRaw['taker_authority']);
             const signingAuthority = new web3_js_1.PublicKey(orderMessageRaw['signing_authority']);
             const takerUserPubkey = await (0, sdk_1.getUserAccountPublicKey)(this.driftClient.program.programId, takerAuthority, takerSubaccountId);
             const takerUserPubkeyString = takerUserPubkey.toBase58();
-            const takerUserAccount = (await this.swiftOrderSubscriber.userMap.mustGet(takerUserPubkey.toString())).getUserAccount();
+            const takerUserAccount = (await this.signedMsgOrderSubscriber.userMap.mustGet(takerUserPubkey.toString())).getUserAccount();
             const swiftOrder = {
                 status: sdk_1.OrderStatus.OPEN,
-                orderType: swiftOrderParams.orderType,
+                orderType: signedMsgOrderParams.orderType,
                 orderId: this.convertUuidToNumber(orderMessageRaw['uuid']),
                 slot: swiftOrderParamsMessage.slot,
-                marketIndex: swiftOrderParams.marketIndex,
+                marketIndex: signedMsgOrderParams.marketIndex,
                 marketType: sdk_1.MarketType.PERP,
-                baseAssetAmount: swiftOrderParams.baseAssetAmount,
-                auctionDuration: swiftOrderParams.auctionDuration,
-                auctionStartPrice: swiftOrderParams.auctionStartPrice,
-                auctionEndPrice: swiftOrderParams.auctionEndPrice,
-                immediateOrCancel: swiftOrderParams.immediateOrCancel,
-                direction: swiftOrderParams.direction,
+                baseAssetAmount: signedMsgOrderParams.baseAssetAmount,
+                auctionDuration: signedMsgOrderParams.auctionDuration,
+                auctionStartPrice: signedMsgOrderParams.auctionStartPrice,
+                auctionEndPrice: signedMsgOrderParams.auctionEndPrice,
+                immediateOrCancel: signedMsgOrderParams.immediateOrCancel,
+                direction: signedMsgOrderParams.direction,
                 postOnly: false,
-                oraclePriceOffset: (_a = swiftOrderParams.oraclePriceOffset) !== null && _a !== void 0 ? _a : 0,
-                maxTs: (_b = swiftOrderParams.maxTs) !== null && _b !== void 0 ? _b : sdk_1.ZERO,
-                reduceOnly: swiftOrderParams.reduceOnly,
-                triggerCondition: swiftOrderParams.triggerCondition,
+                oraclePriceOffset: (_a = signedMsgOrderParams.oraclePriceOffset) !== null && _a !== void 0 ? _a : 0,
+                maxTs: (_b = signedMsgOrderParams.maxTs) !== null && _b !== void 0 ? _b : sdk_1.ZERO,
+                reduceOnly: signedMsgOrderParams.reduceOnly,
+                triggerCondition: signedMsgOrderParams.triggerCondition,
                 // Rest are not necessary and set for type conforming
                 price: sdk_1.ZERO,
                 existingPositionDirection: sdk_1.PositionDirection.LONG,
@@ -148,7 +148,7 @@ class BaseJitter {
     createTryFill(taker, takerKey, takerStatsKey, order, orderSignature) {
         throw new Error('Not implemented');
     }
-    createTrySwiftFill(authorityToUse, signedSwiftOrderParams, uuid, taker, takerKey, takerStatsKey, order, orderSignature, marketIndex) {
+    createTrySwiftFill(authorityToUse, signedMsgOrderParams, uuid, taker, takerKey, takerStatsKey, order, orderSignature, marketIndex) {
         throw new Error('Not implemented');
     }
     deleteOnGoingAuction(orderSignature) {

package/lib/jitter/jitterShotgun.d.ts

@@ -1,17 +1,16 @@
 import { JitProxyClient } from '../jitProxyClient';
 import { PublicKey } from '@solana/web3.js';
-import { AuctionSubscriber, DriftClient, Order, SlotSubscriber, SwiftOrderSubscriber, UserAccount, UserStatsMap } from '@drift-labs/sdk';
+import { AuctionSubscriber, DriftClient, Order, SlotSubscriber, SignedMsgOrderParams, SignedMsgOrderSubscriber, UserAccount, UserStatsMap } from '@drift-labs/sdk';
 import { BaseJitter } from './baseJitter';
-import { SignedSwiftOrderParams } from '@drift-labs/sdk/lib/node/swift/types';
 export declare class JitterShotgun extends BaseJitter {
-    constructor({ auctionSubscriber, jitProxyClient, driftClient, userStatsMap, swiftOrderSubscriber, slotSubscriber, }: {
+    constructor({ auctionSubscriber, jitProxyClient, driftClient, userStatsMap, signedMsgOrderSubscriber, slotSubscriber, }: {
         driftClient: DriftClient;
         auctionSubscriber: AuctionSubscriber;
         jitProxyClient: JitProxyClient;
         userStatsMap?: UserStatsMap;
-        swiftOrderSubscriber?: SwiftOrderSubscriber;
+        signedMsgOrderSubscriber?: SignedMsgOrderSubscriber;
         slotSubscriber?: SlotSubscriber;
     });
     createTryFill(taker: UserAccount, takerKey: PublicKey, takerStatsKey: PublicKey, order: Order, orderSignature: string): () => Promise<void>;
-    createTrySwiftFill(authorityToUse: PublicKey, signedSwiftOrderParams: SignedSwiftOrderParams, uuid: Uint8Array, taker: UserAccount, takerKey: PublicKey, takerStatsKey: PublicKey, order: Order, orderSignature: string, marketIndex: number): () => Promise<void>;
+    createTrySwiftFill(authorityToUse: PublicKey, signedMsgOrderParams: SignedMsgOrderParams, uuid: Uint8Array, taker: UserAccount, takerKey: PublicKey, takerStatsKey: PublicKey, order: Order, orderSignature: string, marketIndex: number): () => Promise<void>;
 }

package/lib/jitter/jitterShotgun.js

@@ -4,13 +4,13 @@ exports.JitterShotgun = void 0;
 const sdk_1 = require("@drift-labs/sdk");
 const baseJitter_1 = require("./baseJitter");
 class JitterShotgun extends baseJitter_1.BaseJitter {
-    constructor({ auctionSubscriber, jitProxyClient, driftClient, userStatsMap, swiftOrderSubscriber, slotSubscriber, }) {
+    constructor({ auctionSubscriber, jitProxyClient, driftClient, userStatsMap, signedMsgOrderSubscriber, slotSubscriber, }) {
         super({
             auctionSubscriber,
             jitProxyClient,
             driftClient,
             userStatsMap,
-            swiftOrderSubscriber,
+            signedMsgOrderSubscriber,
             slotSubscriber,
         });
     }
@@ -74,7 +74,7 @@ class JitterShotgun extends baseJitter_1.BaseJitter {
             this.deleteOnGoingAuction(orderSignature);
         };
     }
-    createTrySwiftFill(authorityToUse, signedSwiftOrderParams, uuid, taker, takerKey, takerStatsKey, order, orderSignature, marketIndex) {
+    createTrySwiftFill(authorityToUse, signedMsgOrderParams, uuid, taker, takerKey, takerStatsKey, order, orderSignature, marketIndex) {
         return async () => {
             var _a;
             let i = 0;
@@ -107,7 +107,7 @@ class JitterShotgun extends baseJitter_1.BaseJitter {
                         referrerInfo,
                         subAccountId: params.subAccountId,
                         authorityToUse,
-                        signedSwiftOrderParams,
+                        signedMsgOrderParams,
                         uuid,
                         marketIndex,
                     }, txParams);

package/lib/jitter/jitterSniper.d.ts

@@ -1,8 +1,7 @@
 import { JitProxyClient } from '../jitProxyClient';
 import { PublicKey } from '@solana/web3.js';
-import { AuctionSubscriber, DriftClient, OraclePriceData, Order, SlotSubscriber, SwiftOrderSubscriber, UserAccount, UserStatsMap } from '@drift-labs/sdk';
+import { AuctionSubscriber, DriftClient, OraclePriceData, Order, SignedMsgOrderParams, SignedMsgOrderSubscriber, SlotSubscriber, UserAccount, UserStatsMap } from '@drift-labs/sdk';
 import { BaseJitter } from './baseJitter';
-import { SignedSwiftOrderParams } from '@drift-labs/sdk/lib/node/swift/types';
 type AuctionAndOrderDetails = {
     slotsTilCross: number;
     willCross: boolean;
@@ -16,16 +15,16 @@ type AuctionAndOrderDetails = {
 export declare class JitterSniper extends BaseJitter {
     slotSubscriber: SlotSubscriber;
     userStatsMap: UserStatsMap;
-    constructor({ auctionSubscriber, slotSubscriber, jitProxyClient, driftClient, userStatsMap, swiftOrderSubscriber, }: {
+    constructor({ auctionSubscriber, slotSubscriber, jitProxyClient, driftClient, userStatsMap, signedMsgOrderSubscriber, }: {
         driftClient: DriftClient;
         slotSubscriber: SlotSubscriber;
         auctionSubscriber: AuctionSubscriber;
         jitProxyClient: JitProxyClient;
         userStatsMap?: UserStatsMap;
-        swiftOrderSubscriber?: SwiftOrderSubscriber;
+        signedMsgOrderSubscriber?: SignedMsgOrderSubscriber;
     });
     createTryFill(taker: UserAccount, takerKey: PublicKey, takerStatsKey: PublicKey, order: Order, orderSignature: string): () => Promise<void>;
-    createTrySwiftFill(authorityToUse: PublicKey, signedSwiftOrderParams: SignedSwiftOrderParams, uuid: Uint8Array, taker: UserAccount, takerKey: PublicKey, takerStatsKey: PublicKey, order: Order, orderSignature: string, marketIndex: number): () => Promise<void>;
+    createTrySwiftFill(authorityToUse: PublicKey, signedMsgOrderParams: SignedMsgOrderParams, uuid: Uint8Array, taker: UserAccount, takerKey: PublicKey, takerStatsKey: PublicKey, order: Order, orderSignature: string, marketIndex: number): () => Promise<void>;
     getAuctionAndOrderDetails(order: Order): AuctionAndOrderDetails;
     waitForSlotOrCrossOrExpiry(targetSlot: number, order: Order, initialDetails: AuctionAndOrderDetails): Promise<{
         slot: number;

package/lib/jitter/jitterSniper.js

@@ -4,13 +4,13 @@ exports.JitterSniper = void 0;
 const sdk_1 = require("@drift-labs/sdk");
 const baseJitter_1 = require("./baseJitter");
 class JitterSniper extends baseJitter_1.BaseJitter {
-    constructor({ auctionSubscriber, slotSubscriber, jitProxyClient, driftClient, userStatsMap, swiftOrderSubscriber, }) {
+    constructor({ auctionSubscriber, slotSubscriber, jitProxyClient, driftClient, userStatsMap, signedMsgOrderSubscriber, }) {
         super({
             auctionSubscriber,
             jitProxyClient,
             driftClient,
             userStatsMap,
-            swiftOrderSubscriber,
+            signedMsgOrderSubscriber,
             slotSubscriber,
         });
         this.slotSubscriber = slotSubscriber;
@@ -144,7 +144,7 @@ class JitterSniper extends baseJitter_1.BaseJitter {
             this.deleteOnGoingAuction(orderSignature);
         };
     }
-    createTrySwiftFill(authorityToUse, signedSwiftOrderParams, uuid, taker, takerKey, takerStatsKey, order, orderSignature, marketIndex) {
+    createTrySwiftFill(authorityToUse, signedMsgOrderParams, uuid, taker, takerKey, takerStatsKey, order, orderSignature, marketIndex) {
         return async () => {
             const params = this.perpParams.get(order.marketIndex);
             if (!params) {
@@ -244,7 +244,7 @@ class JitterSniper extends baseJitter_1.BaseJitter {
                             referrerInfo,
                             subAccountId: params.subAccountId,
                             authorityToUse,
-                            signedSwiftOrderParams,
+                            signedMsgOrderParams,
                             uuid,
                             marketIndex,
                         }, txParams);

package/lib/types/jit_proxy.d.ts

@@ -51,7 +51,7 @@ export type JitProxy = {
             ];
         },
         {
-            name: 'jitSwift';
+            name: 'jitSignedMsg';
             accounts: [
                 {
                     name: 'state';
@@ -79,7 +79,7 @@ export type JitProxy = {
                     isSigner: false;
                 },
                 {
-                    name: 'takerSwiftUserOrders';
+                    name: 'takerSignedMsgUserOrders';
                     isMut: true;
                     isSigner: false;
                 },
@@ -98,7 +98,7 @@ export type JitProxy = {
                 {
                     name: 'params';
                     type: {
-                        defined: 'JitSwiftParams';
+                        defined: 'JitSignedMsgParams';
                     };
                 }
             ];
@@ -230,12 +230,12 @@ export type JitProxy = {
             };
         },
         {
-            name: 'JitSwiftParams';
+            name: 'JitSignedMsgParams';
             type: {
                 kind: 'struct';
                 fields: [
                     {
-                        name: 'swiftOrderUuid';
+                        name: 'signedMsgOrderUuid';
                         type: {
                             array: ['u8', 8];
                         };
@@ -375,8 +375,8 @@ export type JitProxy = {
         },
         {
             code: 6010;
-            name: 'SwiftOrderDoesNotExist';
-            msg: 'SwiftOrderDoesNotExist';
+            name: 'SignedMsgOrderDoesNotExist';
+            msg: 'SignedMsgOrderDoesNotExist';
         }
     ];
 };

package/lib/types/jit_proxy.js

@@ -54,7 +54,7 @@ exports.IDL = {
             ],
         },
         {
-            name: 'jitSwift',
+            name: 'jitSignedMsg',
             accounts: [
                 {
                     name: 'state',
@@ -82,7 +82,7 @@ exports.IDL = {
                     isSigner: false,
                 },
                 {
-                    name: 'takerSwiftUserOrders',
+                    name: 'takerSignedMsgUserOrders',
                     isMut: true,
                     isSigner: false,
                 },
@@ -101,7 +101,7 @@ exports.IDL = {
                 {
                     name: 'params',
                     type: {
-                        defined: 'JitSwiftParams',
+                        defined: 'JitSignedMsgParams',
                     },
                 },
             ],
@@ -233,12 +233,12 @@ exports.IDL = {
             },
         },
         {
-            name: 'JitSwiftParams',
+            name: 'JitSignedMsgParams',
             type: {
                 kind: 'struct',
                 fields: [
                     {
-                        name: 'swiftOrderUuid',
+                        name: 'signedMsgOrderUuid',
                         type: {
                             array: ['u8', 8],
                         },
@@ -378,8 +378,8 @@ exports.IDL = {
         },
         {
             code: 6010,
-            name: 'SwiftOrderDoesNotExist',
-            msg: 'SwiftOrderDoesNotExist',
+            name: 'SignedMsgOrderDoesNotExist',
+            msg: 'SignedMsgOrderDoesNotExist',
         },
     ],
 };

package/package.json

@@ -1,13 +1,13 @@
 {
 	"name": "@drift-labs/jit-proxy",
-	"version": "0.13.17",
+	"version": "0.13.18",
 	"scripts": {
 		"clean": "rm -rf lib",
 		"build": "yarn clean && tsc"
 	},
 	"dependencies": {
 		"@coral-xyz/anchor": "0.26.0",
-		"@drift-labs/sdk": "2.110.0-beta.14",
+		"@drift-labs/sdk": "2.110.0-beta.16",
 		"@solana/web3.js": "1.91.7",
 		"tweetnacl-util": "^0.15.1"
 	},

package/src/jitProxyClient.ts

@@ -1,13 +1,14 @@
 import {
 	BN,
 	DriftClient,
-	getSwiftUserAccountPublicKey,
+	getSignedMsgUserAccountPublicKey,
 	isVariant,
 	MakerInfo,
 	MarketType,
 	PostOnlyParams,
 	QUOTE_SPOT_MARKET_INDEX,
 	ReferrerInfo,
+	SignedMsgOrderParams,
 	TxParams,
 	UserAccount,
 } from '@drift-labs/sdk';
@@ -21,7 +22,6 @@ import {
 } from '@solana/web3.js';
 import { Program } from '@coral-xyz/anchor';
 import { TxSigAndSlot } from '@drift-labs/sdk';
-import { SignedSwiftOrderParams } from '@drift-labs/sdk/lib/node/swift/types';
 
 export const DEFAULT_CU_LIMIT = 1_400_000;
 
@@ -42,7 +42,7 @@ export type JitIxParams = {
 
 export type JitSwiftIxParams = JitIxParams & {
 	authorityToUse: PublicKey;
-	signedSwiftOrderParams: SignedSwiftOrderParams;
+	signedMsgOrderParams: SignedMsgOrderParams;
 	uuid: Uint8Array;
 	marketIndex: number;
 };
@@ -99,17 +99,18 @@ export class JitProxyClient {
 			}),
 		];
 
-		const swiftTakerIxs = await this.driftClient.getPlaceSwiftTakerPerpOrderIxs(
-			params.signedSwiftOrderParams,
-			params.marketIndex,
-			{
-				taker: params.takerKey,
-				takerStats: params.takerStatsKey,
-				takerUserAccount: params.taker,
-				signingAuthority: params.authorityToUse,
-			},
-			ixs
-		);
+		const swiftTakerIxs =
+			await this.driftClient.getPlaceSignedMsgTakerPerpOrderIxs(
+				params.signedMsgOrderParams,
+				params.marketIndex,
+				{
+					taker: params.takerKey,
+					takerStats: params.takerStatsKey,
+					takerUserAccount: params.taker,
+					signingAuthority: params.authorityToUse,
+				},
+				ixs
+			);
 		ixs.push(...swiftTakerIxs);
 
 		const ix = await this.getJitSwiftIx(params);
@@ -244,8 +245,8 @@ export class JitProxyClient {
 			});
 		}
 
-		const jitSwiftParams = {
-			swiftOrderUuid: Array.from(uuid),
+		const jitSignedMsgParams = {
+			signedMsgOrderUuid: Array.from(uuid),
 			maxPosition,
 			minPosition,
 			bid,
@@ -255,11 +256,11 @@ export class JitProxyClient {
 		};
 
 		return this.program.methods
-			.jitSwift(jitSwiftParams)
+			.jitSignedMsg(jitSignedMsgParams)
 			.accounts({
 				taker: takerKey,
 				takerStats: takerStatsKey,
-				takerSwiftUserOrders: getSwiftUserAccountPublicKey(
+				takerSignedMsgUserOrders: getSignedMsgUserAccountPublicKey(
 					this.driftClient.program.programId,
 					taker.authority
 				),

package/src/jitter/baseJitter.ts

@@ -14,18 +14,16 @@ import {
 	MarketType,
 	Order,
 	OrderStatus,
-	OrderTriggerCondition,
-	OrderType,
 	PositionDirection,
 	PostOnlyParams,
+	SignedMsgOrderSubscriber,
 	SlotSubscriber,
-	SwiftOrderParamsMessage,
-	SwiftOrderSubscriber,
+	SignedMsgOrderParams,
 	UserAccount,
 	UserStatsMap,
 	ZERO,
+	SignedMsgOrderParamsMessage,
 } from '@drift-labs/sdk';
-import { SignedSwiftOrderParams } from '@drift-labs/sdk/lib/node/swift/types';
 import { decodeUTF8 } from 'tweetnacl-util';
 
 export type UserFilter = (
@@ -46,7 +44,7 @@ export type JitParams = {
 
 export abstract class BaseJitter {
 	auctionSubscriber: AuctionSubscriber;
-	swiftOrderSubscriber: SwiftOrderSubscriber;
+	signedMsgOrderSubscriber: SignedMsgOrderSubscriber;
 	slotSubscriber: SlotSubscriber;
 	driftClient: DriftClient;
 	jitProxyClient: JitProxyClient;
@@ -68,14 +66,14 @@ export abstract class BaseJitter {
 		jitProxyClient,
 		driftClient,
 		userStatsMap,
-		swiftOrderSubscriber,
+		signedMsgOrderSubscriber,
 		slotSubscriber,
 	}: {
 		driftClient: DriftClient;
 		auctionSubscriber: AuctionSubscriber;
 		jitProxyClient: JitProxyClient;
 		userStatsMap: UserStatsMap;
-		swiftOrderSubscriber?: SwiftOrderSubscriber;
+		signedMsgOrderSubscriber?: SignedMsgOrderSubscriber;
 		slotSubscriber?: SlotSubscriber;
 	}) {
 		this.auctionSubscriber = auctionSubscriber;
@@ -88,9 +86,9 @@ export abstract class BaseJitter {
 				new BulkAccountLoader(this.driftClient.connection, 'confirmed', 0)
 			);
 		this.slotSubscriber = slotSubscriber;
-		this.swiftOrderSubscriber = swiftOrderSubscriber;
+		this.signedMsgOrderSubscriber = signedMsgOrderSubscriber;
 
-		if (this.swiftOrderSubscriber && !this.slotSubscriber) {
+		if (this.signedMsgOrderSubscriber && !this.slotSubscriber) {
 			throw new Error('Slot subscriber is required for swift order subscriber');
 		}
 	}
@@ -190,7 +188,7 @@ export abstract class BaseJitter {
 			}
 		);
 		await this.slotSubscriber?.subscribe();
-		await this.swiftOrderSubscriber?.subscribe(
+		await this.signedMsgOrderSubscriber?.subscribe(
 			async (orderMessageRaw, swiftOrderParamsMessage) => {
 				const swiftOrderParamsBufHex = Buffer.from(
 					orderMessageRaw['order_message']
@@ -200,10 +198,12 @@ export abstract class BaseJitter {
 					'hex'
 				);
 				const {
-					swiftOrderParams,
+					signedMsgOrderParams,
 					subAccountId: takerSubaccountId,
-				}: SwiftOrderParamsMessage =
-					this.driftClient.decodeSwiftOrderParamsMessage(swiftOrderParamsBuf);
+				}: SignedMsgOrderParamsMessage =
+					this.driftClient.decodeSignedMsgOrderParamsMessage(
+						swiftOrderParamsBuf
+					);
 
 				const takerAuthority = new PublicKey(
 					orderMessageRaw['taker_authority']
@@ -218,29 +218,29 @@ export abstract class BaseJitter {
 				);
 				const takerUserPubkeyString = takerUserPubkey.toBase58();
 				const takerUserAccount = (
-					await this.swiftOrderSubscriber.userMap.mustGet(
+					await this.signedMsgOrderSubscriber.userMap.mustGet(
 						takerUserPubkey.toString()
 					)
 				).getUserAccount();
 
 				const swiftOrder: Order = {
 					status: OrderStatus.OPEN,
-					orderType: swiftOrderParams.orderType,
+					orderType: signedMsgOrderParams.orderType,
 					orderId: this.convertUuidToNumber(orderMessageRaw['uuid']),
 					slot: swiftOrderParamsMessage.slot,
-					marketIndex: swiftOrderParams.marketIndex,
+					marketIndex: signedMsgOrderParams.marketIndex,
 					marketType: MarketType.PERP,
-					baseAssetAmount: swiftOrderParams.baseAssetAmount,
-					auctionDuration: swiftOrderParams.auctionDuration!,
-					auctionStartPrice: swiftOrderParams.auctionStartPrice!,
-					auctionEndPrice: swiftOrderParams.auctionEndPrice!,
-					immediateOrCancel: swiftOrderParams.immediateOrCancel,
-					direction: swiftOrderParams.direction,
+					baseAssetAmount: signedMsgOrderParams.baseAssetAmount,
+					auctionDuration: signedMsgOrderParams.auctionDuration!,
+					auctionStartPrice: signedMsgOrderParams.auctionStartPrice!,
+					auctionEndPrice: signedMsgOrderParams.auctionEndPrice!,
+					immediateOrCancel: signedMsgOrderParams.immediateOrCancel,
+					direction: signedMsgOrderParams.direction,
 					postOnly: false,
-					oraclePriceOffset: swiftOrderParams.oraclePriceOffset ?? 0,
-					maxTs: swiftOrderParams.maxTs ?? ZERO,
-					reduceOnly: swiftOrderParams.reduceOnly,
-					triggerCondition: swiftOrderParams.triggerCondition,
+					oraclePriceOffset: signedMsgOrderParams.oraclePriceOffset ?? 0,
+					maxTs: signedMsgOrderParams.maxTs ?? ZERO,
+					reduceOnly: signedMsgOrderParams.reduceOnly,
+					triggerCondition: signedMsgOrderParams.triggerCondition,
 					// Rest are not necessary and set for type conforming
 					price: ZERO,
 					existingPositionDirection: PositionDirection.LONG,
@@ -328,7 +328,7 @@ export abstract class BaseJitter {
 
 	createTrySwiftFill(
 		authorityToUse: PublicKey,
-		signedSwiftOrderParams: SignedSwiftOrderParams,
+		signedMsgOrderParams: SignedMsgOrderParams,
 		uuid: Uint8Array,
 		taker: UserAccount,
 		takerKey: PublicKey,

package/src/jitter/jitterShotgun.ts

@@ -6,12 +6,12 @@ import {
 	Order,
 	PostOnlyParams,
 	SlotSubscriber,
-	SwiftOrderSubscriber,
+	SignedMsgOrderParams,
+	SignedMsgOrderSubscriber,
 	UserAccount,
 	UserStatsMap,
 } from '@drift-labs/sdk';
 import { BaseJitter } from './baseJitter';
-import { SignedSwiftOrderParams } from '@drift-labs/sdk/lib/node/swift/types';
 
 export class JitterShotgun extends BaseJitter {
 	constructor({
@@ -19,14 +19,14 @@ export class JitterShotgun extends BaseJitter {
 		jitProxyClient,
 		driftClient,
 		userStatsMap,
-		swiftOrderSubscriber,
+		signedMsgOrderSubscriber,
 		slotSubscriber,
 	}: {
 		driftClient: DriftClient;
 		auctionSubscriber: AuctionSubscriber;
 		jitProxyClient: JitProxyClient;
 		userStatsMap?: UserStatsMap;
-		swiftOrderSubscriber?: SwiftOrderSubscriber;
+		signedMsgOrderSubscriber?: SignedMsgOrderSubscriber;
 		slotSubscriber?: SlotSubscriber;
 	}) {
 		super({
@@ -34,7 +34,7 @@ export class JitterShotgun extends BaseJitter {
 			jitProxyClient,
 			driftClient,
 			userStatsMap,
-			swiftOrderSubscriber,
+			signedMsgOrderSubscriber,
 			slotSubscriber,
 		});
 	}
@@ -116,7 +116,7 @@ export class JitterShotgun extends BaseJitter {
 
 	createTrySwiftFill(
 		authorityToUse: PublicKey,
-		signedSwiftOrderParams: SignedSwiftOrderParams,
+		signedMsgOrderParams: SignedMsgOrderParams,
 		uuid: Uint8Array,
 		taker: UserAccount,
 		takerKey: PublicKey,
@@ -163,7 +163,7 @@ export class JitterShotgun extends BaseJitter {
 							referrerInfo,
 							subAccountId: params.subAccountId,
 							authorityToUse,
-							signedSwiftOrderParams,
+							signedMsgOrderParams,
 							uuid,
 							marketIndex,
 						},

package/src/jitter/jitterSniper.ts

@@ -13,14 +13,14 @@ import {
 	Order,
 	PostOnlyParams,
 	PRICE_PRECISION,
+	SignedMsgOrderParams,
+	SignedMsgOrderSubscriber,
 	SlotSubscriber,
-	SwiftOrderSubscriber,
 	UserAccount,
 	UserStatsMap,
 	ZERO,
 } from '@drift-labs/sdk';
 import { BaseJitter } from './baseJitter';
-import { SignedSwiftOrderParams } from '@drift-labs/sdk/lib/node/swift/types';
 
 type AuctionAndOrderDetails = {
 	slotsTilCross: number;
@@ -43,21 +43,21 @@ export class JitterSniper extends BaseJitter {
 		jitProxyClient,
 		driftClient,
 		userStatsMap,
-		swiftOrderSubscriber,
+		signedMsgOrderSubscriber,
 	}: {
 		driftClient: DriftClient;
 		slotSubscriber: SlotSubscriber;
 		auctionSubscriber: AuctionSubscriber;
 		jitProxyClient: JitProxyClient;
 		userStatsMap?: UserStatsMap;
-		swiftOrderSubscriber?: SwiftOrderSubscriber;
+		signedMsgOrderSubscriber?: SignedMsgOrderSubscriber;
 	}) {
 		super({
 			auctionSubscriber,
 			jitProxyClient,
 			driftClient,
 			userStatsMap,
-			swiftOrderSubscriber,
+			signedMsgOrderSubscriber,
 			slotSubscriber,
 		});
 		this.slotSubscriber = slotSubscriber;
@@ -247,7 +247,7 @@ export class JitterSniper extends BaseJitter {
 
 	createTrySwiftFill(
 		authorityToUse: PublicKey,
-		signedSwiftOrderParams: SignedSwiftOrderParams,
+		signedMsgOrderParams: SignedMsgOrderParams,
 		uuid: Uint8Array,
 		taker: UserAccount,
 		takerKey: PublicKey,
@@ -402,7 +402,7 @@ export class JitterSniper extends BaseJitter {
 								referrerInfo,
 								subAccountId: params.subAccountId,
 								authorityToUse,
-								signedSwiftOrderParams,
+								signedMsgOrderParams,
 								uuid,
 								marketIndex,
 							},

package/src/types/jit_proxy.ts

@@ -51,7 +51,7 @@ export type JitProxy = {
 			];
 		},
 		{
-			name: 'jitSwift';
+			name: 'jitSignedMsg';
 			accounts: [
 				{
 					name: 'state';
@@ -79,7 +79,7 @@ export type JitProxy = {
 					isSigner: false;
 				},
 				{
-					name: 'takerSwiftUserOrders';
+					name: 'takerSignedMsgUserOrders';
 					isMut: true;
 					isSigner: false;
 				},
@@ -98,7 +98,7 @@ export type JitProxy = {
 				{
 					name: 'params';
 					type: {
-						defined: 'JitSwiftParams';
+						defined: 'JitSignedMsgParams';
 					};
 				}
 			];
@@ -230,12 +230,12 @@ export type JitProxy = {
 			};
 		},
 		{
-			name: 'JitSwiftParams';
+			name: 'JitSignedMsgParams';
 			type: {
 				kind: 'struct';
 				fields: [
 					{
-						name: 'swiftOrderUuid';
+						name: 'signedMsgOrderUuid';
 						type: {
 							array: ['u8', 8];
 						};
@@ -375,8 +375,8 @@ export type JitProxy = {
 		},
 		{
 			code: 6010;
-			name: 'SwiftOrderDoesNotExist';
-			msg: 'SwiftOrderDoesNotExist';
+			name: 'SignedMsgOrderDoesNotExist';
+			msg: 'SignedMsgOrderDoesNotExist';
 		}
 	];
 };
@@ -434,7 +434,7 @@ export const IDL: JitProxy = {
 			],
 		},
 		{
-			name: 'jitSwift',
+			name: 'jitSignedMsg',
 			accounts: [
 				{
 					name: 'state',
@@ -462,7 +462,7 @@ export const IDL: JitProxy = {
 					isSigner: false,
 				},
 				{
-					name: 'takerSwiftUserOrders',
+					name: 'takerSignedMsgUserOrders',
 					isMut: true,
 					isSigner: false,
 				},
@@ -481,7 +481,7 @@ export const IDL: JitProxy = {
 				{
 					name: 'params',
 					type: {
-						defined: 'JitSwiftParams',
+						defined: 'JitSignedMsgParams',
 					},
 				},
 			],
@@ -613,12 +613,12 @@ export const IDL: JitProxy = {
 			},
 		},
 		{
-			name: 'JitSwiftParams',
+			name: 'JitSignedMsgParams',
 			type: {
 				kind: 'struct',
 				fields: [
 					{
-						name: 'swiftOrderUuid',
+						name: 'signedMsgOrderUuid',
 						type: {
 							array: ['u8', 8],
 						},
@@ -758,8 +758,8 @@ export const IDL: JitProxy = {
 		},
 		{
 			code: 6010,
-			name: 'SwiftOrderDoesNotExist',
-			msg: 'SwiftOrderDoesNotExist',
+			name: 'SignedMsgOrderDoesNotExist',
+			msg: 'SignedMsgOrderDoesNotExist',
 		},
 	],
 };