getPlaceSignedMsgTakerPerpOrderIxs infer HLM mode from bitflags (#1608)

Author: jordy25519

sdk/src/driftClient.ts

@@ -6428,16 +6428,14 @@ export class DriftClient {
 		},
 		precedingIxs: TransactionInstruction[] = [],
 		overrideCustomIxIndex?: number,
-		includeHighLeverageModeConfig?: boolean,
 		txParams?: TxParams
 	): Promise<TransactionSignature> {
 		const ixs = await this.getPlaceSignedMsgTakerPerpOrderIxs(
 			signedSignedMsgOrderParams,
 			marketIndex,
 			takerInfo,
 			precedingIxs,
-			overrideCustomIxIndex,
-			includeHighLeverageModeConfig
+			overrideCustomIxIndex
 		);
 		const { txSig } = await this.sendTransaction(
 			await this.buildTransaction(ixs, txParams),
@@ -6457,16 +6455,22 @@ export class DriftClient {
 			signingAuthority: PublicKey;
 		},
 		precedingIxs: TransactionInstruction[] = [],
-		overrideCustomIxIndex?: number,
-		includeHighLeverageModeConfig?: boolean
+		overrideCustomIxIndex?: number
 	): Promise<TransactionInstruction[]> {
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [takerInfo.takerUserAccount],
 			useMarketLastSlotCache: false,
 			readablePerpMarketIndex: marketIndex,
 		});
 
-		if (includeHighLeverageModeConfig) {
+		const isDelegateSigner = takerInfo.signingAuthority.equals(
+			takerInfo.takerUserAccount.delegate
+		);
+		const { signedMsgOrderParams } = this.decodeSignedMsgOrderParamsMessage(
+			signedSignedMsgOrderParams.orderParams,
+			isDelegateSigner
+		);
+		if (isUpdateHighLeverageMode(signedMsgOrderParams.bitFlags)) {
 			remainingAccounts.push({
 				pubkey: getHighLeverageModeConfigPublicKey(this.program.programId),
 				isWritable: true,
@@ -6493,9 +6497,6 @@ export class DriftClient {
 			0
 		);
 
-		const isDelegateSigner = takerInfo.signingAuthority.equals(
-			takerInfo.takerUserAccount.delegate
-		);
 		const placeTakerSignedMsgPerpOrderIx =
 			this.program.instruction.placeSignedMsgTakerOrder(
 				signedMsgIxData,

sdk/src/swift/swiftOrderSubscriber.ts

@@ -58,6 +58,15 @@ export class SwiftOrderSubscriber {
 		this.userAccountGetter = config.userAccountGetter;
 	}
 
+	unsubscribe() {
+		if (this.subscribed) {
+			this.ws.removeAllListeners();
+			this.ws.terminate();
+			this.ws = null;
+			this.subscribed = false;
+		}
+	}
+
 	getSymbolForMarketIndex(marketIndex: number): string {
 		const markets =
 			this.config.driftEnv === 'devnet'