@drift-labs/jit-proxy 0.15.6 → 0.15.7

package/lib/jitter/baseJitter.js

@@ -87,9 +87,9 @@ 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, signedMsgOrderParamsMessage) => {
+        await ((_b = this.swiftOrderSubscriber) === null || _b === void 0 ? void 0 : _b.subscribe(async (orderMessageRaw, signedMessage, isDelegateSigner) => {
             var _a, _b, _c, _d, _e, _f, _g;
-            const signedMsgOrderParams = signedMsgOrderParamsMessage.signedMsgOrderParams;
+            const signedMsgOrderParams = signedMessage.signedMsgOrderParams;
             if (!signedMsgOrderParams.auctionDuration ||
                 !signedMsgOrderParams.auctionStartPrice ||
                 !signedMsgOrderParams.auctionEndPrice ||
@@ -101,13 +101,14 @@ class BaseJitter {
                 return;
             }
             const signedMsgOrderParamsBufHex = Buffer.from(orderMessageRaw['order_message']);
-            const takerSubaccountId = signedMsgOrderParamsMessage.subAccountId;
             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 takerUserPubkey = isDelegateSigner
+                ? signedMessage.takerPubkey
+                : await (0, sdk_1.getUserAccountPublicKey)(this.driftClient.program.programId, takerAuthority, signedMessage.subAccountId);
             const takerUserPubkeyString = takerUserPubkey.toBase58();
             const takerUserAccount = await this.swiftOrderSubscriber.userAccountGetter.mustGetUserAccount(takerUserPubkey.toString());
-            const orderSlot = Math.min(signedMsgOrderParamsMessage.slot.toNumber(), this.slotSubscriber.getSlot());
+            const orderSlot = Math.min(signedMessage.slot.toNumber(), this.slotSubscriber.getSlot());
             /**
              * Base asset amount equalling u64::max is a special case that signals to program
              * to bring taker to max leverage. Program will calculate the max base asset amount to do this

package/package.json

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

package/src/jitter/baseJitter.ts

@@ -24,6 +24,8 @@ import {
 	ZERO,
 	isSignedMsgOrder,
 	OrderTriggerCondition,
+	SignedMsgOrderParamsDelegateMessage,
+	SignedMsgOrderParamsMessage,
 } from '@drift-labs/sdk';
 import { decodeUTF8 } from 'tweetnacl-util';
 
@@ -210,9 +212,8 @@ export abstract class BaseJitter {
 		);
 		await this.slotSubscriber?.subscribe();
 		await this.swiftOrderSubscriber?.subscribe(
-			async (orderMessageRaw, signedMsgOrderParamsMessage) => {
-				const signedMsgOrderParams =
-					signedMsgOrderParamsMessage.signedMsgOrderParams;
+			async (orderMessageRaw, signedMessage, isDelegateSigner) => {
+				const signedMsgOrderParams = signedMessage.signedMsgOrderParams;
 
 				if (
 					!signedMsgOrderParams.auctionDuration ||
@@ -231,7 +232,6 @@ export abstract class BaseJitter {
 				const signedMsgOrderParamsBufHex = Buffer.from(
 					orderMessageRaw['order_message']
 				);
-				const takerSubaccountId = signedMsgOrderParamsMessage.subAccountId;
 
 				const takerAuthority = new PublicKey(
 					orderMessageRaw['taker_authority']
@@ -239,18 +239,20 @@ export abstract class BaseJitter {
 				const signingAuthority = new PublicKey(
 					orderMessageRaw['signing_authority']
 				);
-				const takerUserPubkey = await getUserAccountPublicKey(
-					this.driftClient.program.programId,
-					takerAuthority,
-					takerSubaccountId
-				);
+				const takerUserPubkey = isDelegateSigner
+					? (signedMessage as SignedMsgOrderParamsDelegateMessage).takerPubkey
+					: await getUserAccountPublicKey(
+							this.driftClient.program.programId,
+							takerAuthority,
+							(signedMessage as SignedMsgOrderParamsMessage).subAccountId
+					  );
 				const takerUserPubkeyString = takerUserPubkey.toBase58();
 				const takerUserAccount =
 					await this.swiftOrderSubscriber.userAccountGetter.mustGetUserAccount(
 						takerUserPubkey.toString()
 					);
 				const orderSlot = Math.min(
-					signedMsgOrderParamsMessage.slot.toNumber(),
+					signedMessage.slot.toNumber(),
 					this.slotSubscriber.getSlot()
 				);