Prettify

drift-labs · Jan 3, 2025 · 2b2330c · 2b2330c
1 parent f82403c
commit 2b2330c
Show file tree

Hide file tree

Showing 7 changed files with 120 additions and 113 deletions.
diff --git a/sdk/src/accounts/grpcProgramAccountSubscriber.ts b/sdk/src/accounts/grpcProgramAccountSubscriber.ts
@@ -14,7 +14,7 @@ import {
 } from '../isomorphic/grpc';
 
 export class grpcProgramAccountSubscriber<
-	T
+	T,
 > extends WebSocketProgramAccountSubscriber<T> {
 	client: Client;
 	stream: ClientDuplexStream<SubscribeRequest, SubscribeUpdate>;

diff --git a/sdk/src/accounts/webSocketAccountSubscriber.ts b/sdk/src/accounts/webSocketAccountSubscriber.ts
@@ -98,23 +98,26 @@ export class WebSocketAccountSubscriber<T> implements AccountSubscriber<T> {
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}
-		this.timeoutId = setTimeout(async () => {
-			if (this.isUnsubscribing) {
-				// If we are in the process of unsubscribing, do not attempt to resubscribe
-				return;
-			}
+		this.timeoutId = setTimeout(
+			async () => {
+				if (this.isUnsubscribing) {
+					// If we are in the process of unsubscribing, do not attempt to resubscribe
+					return;
+				}
 
-			if (this.receivingData) {
-				if (this.resubOpts?.logResubMessages) {
-					console.log(
-						`No ws data from ${this.accountName} in ${this.resubOpts.resubTimeoutMs}ms, resubscribing`
-					);
+				if (this.receivingData) {
+					if (this.resubOpts?.logResubMessages) {
+						console.log(
+							`No ws data from ${this.accountName} in ${this.resubOpts.resubTimeoutMs}ms, resubscribing`
+						);
+					}
+					await this.unsubscribe(true);
+					this.receivingData = false;
+					await this.subscribe(this.onChange);
 				}
-				await this.unsubscribe(true);
-				this.receivingData = false;
-				await this.subscribe(this.onChange);
-			}
-		}, this.resubOpts?.resubTimeoutMs);
+			},
+			this.resubOpts?.resubTimeoutMs
+		);
 	}
 
 	async fetch(): Promise<void> {

diff --git a/sdk/src/accounts/webSocketProgramAccountSubscriber.ts b/sdk/src/accounts/webSocketProgramAccountSubscriber.ts
@@ -97,23 +97,26 @@ export class WebSocketProgramAccountSubscriber<T>
 		if (!this.onChange) {
 			throw new Error('onChange callback function must be set');
 		}
-		this.timeoutId = setTimeout(async () => {
-			if (this.isUnsubscribing) {
-				// If we are in the process of unsubscribing, do not attempt to resubscribe
-				return;
-			}
+		this.timeoutId = setTimeout(
+			async () => {
+				if (this.isUnsubscribing) {
+					// If we are in the process of unsubscribing, do not attempt to resubscribe
+					return;
+				}
 
-			if (this.receivingData) {
-				if (this.resubOpts?.logResubMessages) {
-					console.log(
-						`No ws data from ${this.subscriptionName} in ${this.resubOpts?.resubTimeoutMs}ms, resubscribing`
-					);
+				if (this.receivingData) {
+					if (this.resubOpts?.logResubMessages) {
+						console.log(
+							`No ws data from ${this.subscriptionName} in ${this.resubOpts?.resubTimeoutMs}ms, resubscribing`
+						);
+					}
+					await this.unsubscribe(true);
+					this.receivingData = false;
+					await this.subscribe(this.onChange);
 				}
-				await this.unsubscribe(true);
-				this.receivingData = false;
-				await this.subscribe(this.onChange);
-			}
-		}, this.resubOpts?.resubTimeoutMs);
+			},
+			this.resubOpts?.resubTimeoutMs
+		);
 	}
 
 	handleRpcResponse(

diff --git a/sdk/src/driftClient.ts b/sdk/src/driftClient.ts
@@ -3936,9 +3936,8 @@ export class DriftClient {
 		subAccountId?: number
 	): Promise<TransactionSignature> {
 		const { txSig } = await this.sendTransaction(
-			(
-				await this.preparePlaceOrdersTx(params, txParams, subAccountId)
-			).placeOrdersTx,
+			(await this.preparePlaceOrdersTx(params, txParams, subAccountId))
+				.placeOrdersTx,
 			[],
 			this.opts,
 			false
@@ -4156,9 +4155,8 @@ export class DriftClient {
 		subAccountId?: number
 	): Promise<TransactionSignature> {
 		const { txSig, slot } = await this.sendTransaction(
-			(
-				await this.preparePlaceSpotOrderTx(orderParams, txParams, subAccountId)
-			).placeSpotOrderTx,
+			(await this.preparePlaceSpotOrderTx(orderParams, txParams, subAccountId))
+				.placeSpotOrderTx,
 			[],
 			this.opts,
 			false