Added handling for signature time measurement

drift-labs · Jan 12, 2024 · ff535bb · ff535bb
1 parent ef7d2ec
commit ff535bb
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 19 deletions.
diff --git a/sdk/src/accounts/types.ts b/sdk/src/accounts/types.ts
@@ -43,6 +43,10 @@ export interface DriftClientAccountEvents {
 	error: (e: Error) => void;
 }
 
+export interface DriftClientMiscEvents {
+	txSigned: void;
+}
+
 export interface DriftClientAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
 	isSubscribed: boolean;

diff --git a/sdk/src/driftClient.ts b/sdk/src/driftClient.ts
@@ -86,8 +86,9 @@ import {
 	DriftClientAccountSubscriber,
 	DriftClientAccountEvents,
 	DataAndSlot,
+	DriftClientMiscEvents,
 } from './accounts/types';
-import { TxSender, TxSigAndSlot } from './tx/types';
+import { ExtraConfirmationOptions, TxSender, TxSigAndSlot } from './tx/types';
 import { getSignedTransactionMap, wrapInTx } from './tx/utils';
 import {
 	BASE_PRECISION,
@@ -150,6 +151,7 @@ export class DriftClient {
 	userStatsAccountSubscriptionConfig: UserStatsSubscriptionConfig;
 	accountSubscriber: DriftClientAccountSubscriber;
 	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
+	miscEventEmitter: StrictEventEmitter<EventEmitter, DriftClientMiscEvents>;
 	_isSubscribed = false;
 	txSender: TxSender;
 	perpMarketLastSlotCache = new Map<number, number>();
@@ -288,6 +290,7 @@ export class DriftClient {
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
+		this.miscEventEmitter = new EventEmitter();
 		this.txSender =
 			config.txSender ??
 			new RetryTxSender({
@@ -711,7 +714,7 @@ export class DriftClient {
 	public async initializeUserAccount(
 		subAccountId = 0,
 		name?: string,
-		referrerInfo?: ReferrerInfo
+		referrerInfo?: ReferrerInfo,
 	): Promise<[TransactionSignature, PublicKey]> {
 		const initializeIxs = [];
 
@@ -6322,25 +6325,36 @@ export class DriftClient {
 		return undefined;
 	}
 
+	private handleSignedTransaction() {
+		this.miscEventEmitter.emit("txSigned");
+	}
+
+
 	sendTransaction(
 		tx: Transaction | VersionedTransaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions,
-		preSigned?: boolean
+		preSigned?: boolean,
 	): Promise<TxSigAndSlot> {
+		const extraConfirmationOptions : ExtraConfirmationOptions = {
+			onSignedCb: this.handleSignedTransaction.bind(this),
+		};
+
 		if (tx instanceof VersionedTransaction) {
 			return this.txSender.sendVersionedTransaction(
 				tx as VersionedTransaction,
 				additionalSigners,
 				opts,
-				preSigned
+				preSigned,
+				extraConfirmationOptions
 			);
 		} else {
 			return this.txSender.send(
 				tx as Transaction,
 				additionalSigners,
 				opts,
-				preSigned
+				preSigned,
+				extraConfirmationOptions
 			);
 		}
 	}

diff --git a/sdk/src/phoenix/phoenixFulfillmentConfigMap.ts b/sdk/src/phoenix/phoenixFulfillmentConfigMap.ts
@@ -14,9 +14,10 @@ export class PhoenixFulfillmentConfigMap {
 		marketIndex: number,
 		phoenixMarketAddress: PublicKey
 	): Promise<void> {
-		const account = await this.driftClient.getPhoenixV1FulfillmentConfig(
-			phoenixMarketAddress
-		);
+		const account =
+			await this.driftClient.getPhoenixV1FulfillmentConfig(
+				phoenixMarketAddress
+			);
 		this.map.set(marketIndex, account);
 	}
 

diff --git a/sdk/src/serum/serumFulfillmentConfigMap.ts b/sdk/src/serum/serumFulfillmentConfigMap.ts
@@ -14,9 +14,8 @@ export class SerumFulfillmentConfigMap {
 		marketIndex: number,
 		serumMarketAddress: PublicKey
 	): Promise<void> {
-		const account = await this.driftClient.getSerumV3FulfillmentConfig(
-			serumMarketAddress
-		);
+		const account =
+			await this.driftClient.getSerumV3FulfillmentConfig(serumMarketAddress);
 		this.map.set(marketIndex, account);
 	}
 

diff --git a/sdk/src/tx/baseTxSender.ts b/sdk/src/tx/baseTxSender.ts
@@ -1,4 +1,9 @@
-import { ConfirmationStrategy, TxSender, TxSigAndSlot } from './types';
+import {
+	ConfirmationStrategy,
+	ExtraConfirmationOptions,
+	TxSender,
+	TxSigAndSlot,
+} from './types';
 import {
 	Commitment,
 	ConfirmOptions,
@@ -57,7 +62,8 @@ export abstract class BaseTxSender implements TxSender {
 		tx: Transaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions,
-		preSigned?: boolean
+		preSigned?: boolean,
+		extraConfirmationOptions?: ExtraConfirmationOptions
 	): Promise<TxSigAndSlot> {
 		if (additionalSigners === undefined) {
 			additionalSigners = [];
@@ -70,6 +76,10 @@ export abstract class BaseTxSender implements TxSender {
 			? tx
 			: await this.prepareTx(tx, additionalSigners, opts);
 
+		if (extraConfirmationOptions?.onSignedCb) {
+			extraConfirmationOptions.onSignedCb();
+		}
+
 		return this.sendRawTransaction(signedTx.serialize(), opts);
 	}
 
@@ -124,7 +134,8 @@ export abstract class BaseTxSender implements TxSender {
 		tx: VersionedTransaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions,
-		preSigned?: boolean
+		preSigned?: boolean,
+		extraConfirmationOptions?: ExtraConfirmationOptions
 	): Promise<TxSigAndSlot> {
 		let signedTx;
 		if (preSigned) {
@@ -144,6 +155,10 @@ export abstract class BaseTxSender implements TxSender {
 			signedTx = await this.wallet.signTransaction(tx);
 		}
 
+		if (extraConfirmationOptions?.onSignedCb) {
+			extraConfirmationOptions.onSignedCb();
+		}
+
 		if (opts === undefined) {
 			opts = this.opts;
 		}
@@ -216,9 +231,8 @@ export abstract class BaseTxSender implements TxSender {
 		if (response === null) {
 			if (this.confirmationStrategy === ConfirmationStrategy.Combo) {
 				try {
-					const rpcResponse = await this.connection.getSignatureStatus(
-						signature
-					);
+					const rpcResponse =
+						await this.connection.getSignatureStatus(signature);
 					if (rpcResponse?.value?.confirmationStatus) {
 						response = {
 							context: rpcResponse.context,

diff --git a/sdk/src/tx/types.ts b/sdk/src/tx/types.ts
@@ -20,21 +20,27 @@ export type TxSigAndSlot = {
 	slot: number;
 };
 
+export type ExtraConfirmationOptions = {
+	onSignedCb: () => void;
+};
+
 export interface TxSender {
 	wallet: IWallet;
 
 	send(
 		tx: Transaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions,
-		preSigned?: boolean
+		preSigned?: boolean,
+		extraConfirmationOptions?: ExtraConfirmationOptions
 	): Promise<TxSigAndSlot>;
 
 	sendVersionedTransaction(
 		tx: VersionedTransaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions,
-		preSigned?: boolean
+		preSigned?: boolean,
+		extraConfirmationOptions?: ExtraConfirmationOptions
 	): Promise<TxSigAndSlot>;
 
 	getVersionedTransaction(