Merge branch 'master' into nick/dlp-updates

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Features
+
+### Fixes
+
+### Breaking
+
+## [2.54.0] - 2023-01-15
+
 ### Features
 - sdk: move bracket orders into single instruction
 - sdk: add ability to do placeAndTake order with bracket orders attached

programs/drift/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "drift"
-version = "2.53.0"
+version = "2.54.0"
 description = "Created with Anchor"
 edition = "2018"
 

sdk/VERSION

@@ -1 +1 @@
-2.54.0-beta.12
+2.55.0-beta.1

sdk/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drift-labs/sdk",
-	"version": "2.54.0-beta.12",
+	"version": "2.55.0-beta.1",
 	"main": "lib/index.js",
 	"types": "lib/index.d.ts",
 	"author": "crispheaney",

sdk/src/accounts/types.ts

@@ -43,6 +43,10 @@ export interface DriftClientAccountEvents {
 	error: (e: Error) => void;
 }
 
+export interface DriftClientMetricsEvents {
+	txSigned: void;
+}
+
 export interface DriftClientAccountSubscriber {
 	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
 	isSubscribed: boolean;

sdk/src/driftClient.ts

@@ -86,8 +86,9 @@ import {
 	DriftClientAccountSubscriber,
 	DriftClientAccountEvents,
 	DataAndSlot,
+	DriftClientMetricsEvents,
 } 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,10 @@ export class DriftClient {
 	userStatsAccountSubscriptionConfig: UserStatsSubscriptionConfig;
 	accountSubscriber: DriftClientAccountSubscriber;
 	eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
+	metricsEventEmitter: StrictEventEmitter<
+		EventEmitter,
+		DriftClientMetricsEvents
+	>;
 	_isSubscribed = false;
 	txSender: TxSender;
 	perpMarketLastSlotCache = new Map<number, number>();
@@ -164,6 +169,7 @@ export class DriftClient {
 	skipLoadUsers?: boolean;
 	txVersion: TransactionVersion;
 	txParams: TxParams;
+	enableMetricsEvents?: boolean;
 
 	public get isSubscribed() {
 		return this._isSubscribed && this.accountSubscriber.isSubscribed;
@@ -288,6 +294,12 @@ export class DriftClient {
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
+
+		if (config.enableMetricsEvents) {
+			this.enableMetricsEvents = true;
+			this.metricsEventEmitter = new EventEmitter();
+		}
+
 		this.txSender =
 			config.txSender ??
 			new RetryTxSender({
@@ -6330,25 +6342,38 @@ export class DriftClient {
 		return undefined;
 	}
 
+	private handleSignedTransaction() {
+		this.metricsEventEmitter.emit('txSigned');
+	}
+
 	sendTransaction(
 		tx: Transaction | VersionedTransaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions,
 		preSigned?: boolean
 	): Promise<TxSigAndSlot> {
+		const extraConfirmationOptions: ExtraConfirmationOptions = this
+			.enableMetricsEvents
+			? {
+					onSignedCb: this.handleSignedTransaction.bind(this),
+			  }
+			: undefined;
+
 		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
 			);
 		}
 	}

sdk/src/driftClientConfig.ts

@@ -32,6 +32,7 @@ export type DriftClientConfig = {
 	skipLoadUsers?: boolean; // if passed to constructor, no user accounts will be loaded. they will load if updateWallet is called afterwards.
 	txVersion?: TransactionVersion; // which tx version to use
 	txParams?: TxParams; // default tx params to use
+	enableMetricsEvents?: boolean;
 };
 
 export type DriftClientSubscriptionConfig =

sdk/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.53.0",
+  "version": "2.54.0",
   "name": "drift",
   "instructions": [
     {

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;
 		}

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(