@drift-labs/sdk 2.55.0-beta.0 → 2.55.0-beta.2

package/VERSION

@@ -1 +1 @@
-2.55.0-beta.0
+2.55.0-beta.2

package/lib/accounts/types.d.ts

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

package/lib/driftClient.d.ts

@@ -7,7 +7,7 @@ import { Connection, PublicKey, TransactionSignature, ConfirmOptions, Transactio
 import { TokenFaucet } from './tokenFaucet';
 import { EventEmitter } from 'events';
 import StrictEventEmitter from 'strict-event-emitter-types';
-import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot } from './accounts/types';
+import { DriftClientAccountSubscriber, DriftClientAccountEvents, DataAndSlot, DriftClientMetricsEvents } from './accounts/types';
 import { TxSender, TxSigAndSlot } from './tx/types';
 import { OraclePriceData } from './oracles/types';
 import { DriftClientConfig } from './driftClientConfig';
@@ -41,6 +41,7 @@ export declare class DriftClient {
     userStatsAccountSubscriptionConfig: UserStatsSubscriptionConfig;
     accountSubscriber: DriftClientAccountSubscriber;
     eventEmitter: StrictEventEmitter<EventEmitter, DriftClientAccountEvents>;
+    metricsEventEmitter: StrictEventEmitter<EventEmitter, DriftClientMetricsEvents>;
     _isSubscribed: boolean;
     txSender: TxSender;
     perpMarketLastSlotCache: Map<number, number>;
@@ -55,6 +56,7 @@ export declare class DriftClient {
     skipLoadUsers?: boolean;
     txVersion: TransactionVersion;
     txParams: TxParams;
+    enableMetricsEvents?: boolean;
     get isSubscribed(): boolean;
     set isSubscribed(val: boolean);
     constructor(config: DriftClientConfig);
@@ -644,6 +646,7 @@ export declare class DriftClient {
         marketIndex: number;
         marketType: MarketType;
     } | undefined;
+    private handleSignedTransaction;
     sendTransaction(tx: Transaction | VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     buildTransaction(instructions: TransactionInstruction | TransactionInstruction[], txParams?: TxParams, txVersion?: TransactionVersion, lookupTables?: AddressLookupTableAccount[]): Promise<Transaction | VersionedTransaction>;
 }

package/lib/driftClient.js

@@ -34,6 +34,7 @@ const types_1 = require("./types");
 const anchor = __importStar(require("@coral-xyz/anchor"));
 const drift_json_1 = __importDefault(require("./idl/drift.json"));
 const web3_js_1 = require("@solana/web3.js");
+const events_1 = require("events");
 const pda_1 = require("./addresses/pda");
 const utils_1 = require("./tx/utils");
 const numericConstants_1 = require("./constants/numericConstants");
@@ -146,6 +147,10 @@ class DriftClient {
             this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_v = config.perpMarketIndexes) !== null && _v !== void 0 ? _v : [], (_w = config.spotMarketIndexes) !== null && _w !== void 0 ? _w : [], (_x = config.oracleInfos) !== null && _x !== void 0 ? _x : [], noMarketsAndOraclesSpecified, (_y = config.accountSubscription) === null || _y === void 0 ? void 0 : _y.resubTimeoutMs, (_z = config.accountSubscription) === null || _z === void 0 ? void 0 : _z.commitment);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
+        if (config.enableMetricsEvents) {
+            this.enableMetricsEvents = true;
+            this.metricsEventEmitter = new events_1.EventEmitter();
+        }
         this.txSender =
             (_0 = config.txSender) !== null && _0 !== void 0 ? _0 : new retryTxSender_1.RetryTxSender({
                 connection: this.connection,
@@ -3416,12 +3421,21 @@ class DriftClient {
         }
         return undefined;
     }
+    handleSignedTransaction() {
+        this.metricsEventEmitter.emit('txSigned');
+    }
     sendTransaction(tx, additionalSigners, opts, preSigned) {
+        const extraConfirmationOptions = this
+            .enableMetricsEvents
+            ? {
+                onSignedCb: this.handleSignedTransaction.bind(this),
+            }
+            : undefined;
         if (tx instanceof web3_js_1.VersionedTransaction) {
-            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned);
+            return this.txSender.sendVersionedTransaction(tx, additionalSigners, opts, preSigned, extraConfirmationOptions);
         }
         else {
-            return this.txSender.send(tx, additionalSigners, opts, preSigned);
+            return this.txSender.send(tx, additionalSigners, opts, preSigned, extraConfirmationOptions);
         }
     }
     async buildTransaction(instructions, txParams, txVersion, lookupTables) {

package/lib/driftClientConfig.d.ts

@@ -25,6 +25,7 @@ export type DriftClientConfig = {
     skipLoadUsers?: boolean;
     txVersion?: TransactionVersion;
     txParams?: TxParams;
+    enableMetricsEvents?: boolean;
 };
 export type DriftClientSubscriptionConfig = {
     type: 'websocket';

package/lib/tx/baseTxSender.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { ConfirmationStrategy, TxSender, TxSigAndSlot } from './types';
+import { ConfirmationStrategy, ExtraConfirmationOptions, TxSender, TxSigAndSlot } from './types';
 import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
 import { IWallet } from '../types';
 export declare abstract class BaseTxSender implements TxSender {
@@ -18,10 +18,10 @@ export declare abstract class BaseTxSender implements TxSender {
         additionalConnections?: any;
         confirmationStrategy?: ConfirmationStrategy;
     });
-    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
+    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
-    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     confirmTransactionWebSocket(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult>>;
     confirmTransactionPolling(signature: TransactionSignature, commitment?: Commitment): Promise<RpcResponseAndContext<SignatureResult> | undefined>;

package/lib/tx/baseTxSender.js

@@ -20,7 +20,7 @@ class BaseTxSender {
         this.additionalConnections = additionalConnections;
         this.confirmationStrategy = confirmationStrategy;
     }
-    async send(tx, additionalSigners, opts, preSigned) {
+    async send(tx, additionalSigners, opts, preSigned, extraConfirmationOptions) {
         if (additionalSigners === undefined) {
             additionalSigners = [];
         }
@@ -30,6 +30,9 @@ class BaseTxSender {
         const signedTx = preSigned
             ? tx
             : await this.prepareTx(tx, additionalSigners, opts);
+        if (extraConfirmationOptions === null || extraConfirmationOptions === void 0 ? void 0 : extraConfirmationOptions.onSignedCb) {
+            extraConfirmationOptions.onSignedCb();
+        }
         return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     async prepareTx(tx, additionalSigners, opts) {
@@ -58,7 +61,7 @@ class BaseTxSender {
         const tx = new web3_js_1.VersionedTransaction(message);
         return tx;
     }
-    async sendVersionedTransaction(tx, additionalSigners, opts, preSigned) {
+    async sendVersionedTransaction(tx, additionalSigners, opts, preSigned, extraConfirmationOptions) {
         let signedTx;
         if (preSigned) {
             signedTx = tx;
@@ -76,6 +79,9 @@ class BaseTxSender {
             // @ts-ignore
             signedTx = await this.wallet.signTransaction(tx);
         }
+        if (extraConfirmationOptions === null || extraConfirmationOptions === void 0 ? void 0 : extraConfirmationOptions.onSignedCb) {
+            extraConfirmationOptions.onSignedCb();
+        }
         if (opts === undefined) {
             opts = this.opts;
         }

package/lib/tx/retryTxSender.js

@@ -60,6 +60,7 @@ class RetryTxSender extends baseTxSender_1.BaseTxSender {
         })();
         const result = await this.confirmTransaction(txid, opts.commitment);
         const slot = result.context.slot;
+        stopWaiting();
         return { txSig: txid, slot };
     }
 }

package/lib/tx/types.d.ts

@@ -10,10 +10,13 @@ export type TxSigAndSlot = {
     txSig: TransactionSignature;
     slot: number;
 };
+export type ExtraConfirmationOptions = {
+    onSignedCb: () => void;
+};
 export interface TxSender {
     wallet: IWallet;
-    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
-    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
+    send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
+    sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean, extraConfirmationOptions?: ExtraConfirmationOptions): Promise<TxSigAndSlot>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;
     sendRawTransaction(rawTransaction: Buffer | Uint8Array, opts: ConfirmOptions): Promise<TxSigAndSlot>;
     getTimeoutCount(): number;

package/lib/user.js

@@ -488,7 +488,7 @@ class User {
      */
     getUnrealizedPNL(withFunding, marketIndex, withWeightMarginCategory, strict = false) {
         return this.getActivePerpPositions()
-            .filter((pos) => (marketIndex ? pos.marketIndex === marketIndex : true))
+            .filter((pos) => marketIndex !== undefined ? pos.marketIndex === marketIndex : true)
             .reduce((unrealizedPnl, perpPosition) => {
             const market = this.driftClient.getPerpMarketAccount(perpPosition.marketIndex);
             const oraclePriceData = this.getOracleDataForPerpMarket(market.marketIndex);

package/package.json

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

package/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;

package/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({
@@ -6322,25 +6334,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
 			);
 		}
 	}

package/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 =

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

package/src/tx/retryTxSender.ts

@@ -97,6 +97,7 @@ export class RetryTxSender extends BaseTxSender {
 
 		const result = await this.confirmTransaction(txid, opts.commitment);
 		const slot = result.context.slot;
+		stopWaiting();
 
 		return { txSig: txid, slot };
 	}

package/src/tx/types.ts

@@ -20,6 +20,10 @@ export type TxSigAndSlot = {
 	slot: number;
 };
 
+export type ExtraConfirmationOptions = {
+	onSignedCb: () => void;
+};
+
 export interface TxSender {
 	wallet: IWallet;
 
@@ -27,14 +31,16 @@ export interface TxSender {
 		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(

package/src/user.ts

@@ -766,7 +766,9 @@ export class User {
 		strict = false
 	): BN {
 		return this.getActivePerpPositions()
-			.filter((pos) => (marketIndex ? pos.marketIndex === marketIndex : true))
+			.filter((pos) =>
+				marketIndex !== undefined ? pos.marketIndex === marketIndex : true
+			)
 			.reduce((unrealizedPnl, perpPosition) => {
 				const market = this.driftClient.getPerpMarketAccount(
 					perpPosition.marketIndex