Merge pull request #62 from drift-labs/nour/decode-delegate-messages

ready for decoding delegate messages

Author: NourAlharithi

ts/sdk/package.json

@@ -7,7 +7,7 @@
 	},
 	"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"
 	},

ts/sdk/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,26 +232,27 @@ export abstract class BaseJitter {
 				const signedMsgOrderParamsBufHex = Buffer.from(
 					orderMessageRaw['order_message']
 				);
-				const takerSubaccountId = signedMsgOrderParamsMessage.subAccountId;
 
 				const takerAuthority = new PublicKey(
 					orderMessageRaw['taker_authority']
 				);
 				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()
 				);
 

ts/sdk/yarn.lock

@@ -128,10 +128,10 @@
     bn.js "^5.1.2"
     buffer-layout "^1.2.0"
 
-"@drift-labs/[email protected].3":
-  version "2.117.0-beta.3"
-  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.117.0-beta.3.tgz#155a644d81ee80d1c165dd842933e377d18d24d1"
-  integrity sha512-/IODbiJDTiXunAY7cLOqDY2168VHdy7dd+wzS3TbJS1stWdkTjy0iHxcauOQmEJT9/DLQ/9oyMe+yxGkokEHAw==
+"@drift-labs/[email protected].4":
+  version "2.117.0-beta.4"
+  resolved "https://registry.yarnpkg.com/@drift-labs/sdk/-/sdk-2.117.0-beta.4.tgz#0afe07ae67d34ff5de1cf7196aaf9db1a12bb81e"
+  integrity sha512-jC3pUQN7a01ruXei342K49DKVD4LV1t6w3g1Lp6nCU4HtsWrDXik1Ys1Tvr9F4H1rAskYAUPe2KyCSBXiE1NEw==
   dependencies:
     "@coral-xyz/anchor" "0.29.0"
     "@coral-xyz/anchor-30" "npm:@coral-xyz/[email protected]"