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

package/VERSION

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

package/lib/driftClient.d.ts

@@ -472,6 +472,10 @@ export declare class DriftClient {
         settleeUserAccountPublicKey: PublicKey;
         settleeUserAccount: UserAccount;
     }[], marketIndexes: number[]): Promise<TransactionSignature>;
+    getSettlePNLsIxs(users: {
+        settleeUserAccountPublicKey: PublicKey;
+        settleeUserAccount: UserAccount;
+    }[], marketIndexes: number[]): Promise<Array<TransactionInstruction>>;
     settlePNL(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number, txParams?: TxParams): Promise<TransactionSignature>;
     settlePNLIx(settleeUserAccountPublicKey: PublicKey, settleeUserAccount: UserAccount, marketIndex: number): Promise<TransactionInstruction>;
     liquidatePerp(userAccountPublicKey: PublicKey, userAccount: UserAccount, marketIndex: number, maxBaseAssetAmount: BN, limitPrice?: BN, txParams?: TxParams): Promise<TransactionSignature>;

package/lib/driftClient.js

@@ -64,7 +64,7 @@ class DriftClient {
         this._isSubscribed = val;
     }
     constructor(config) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         this.users = new Map();
         this._isSubscribed = false;
         this.perpMarketLastSlotCache = new Map();
@@ -123,7 +123,7 @@ class DriftClient {
             this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_m = config.perpMarketIndexes) !== null && _m !== void 0 ? _m : [], (_o = config.spotMarketIndexes) !== null && _o !== void 0 ? _o : [], (_p = config.oracleInfos) !== null && _p !== void 0 ? _p : [], noMarketsAndOraclesSpecified);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
-        this.txSender = new retryTxSender_1.RetryTxSender(this.provider, (_q = config.txSenderConfig) === null || _q === void 0 ? void 0 : _q.timeout, (_r = config.txSenderConfig) === null || _r === void 0 ? void 0 : _r.retrySleep, (_s = config.txSenderConfig) === null || _s === void 0 ? void 0 : _s.additionalConnections);
+        this.txSender = (_q = config.txSender) !== null && _q !== void 0 ? _q : new retryTxSender_1.RetryTxSender(this.provider);
     }
     getUserMapKey(subAccountId, authority) {
         return `${subAccountId}_${authority.toString()}`;
@@ -2527,12 +2527,7 @@ class DriftClient {
         });
     }
     async settlePNLs(users, marketIndexes) {
-        const ixs = [];
-        for (const { settleeUserAccountPublicKey, settleeUserAccount } of users) {
-            for (const marketIndex of marketIndexes) {
-                ixs.push(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex));
-            }
-        }
+        const ixs = await this.getSettlePNLsIxs(users, marketIndexes);
         const tx = new web3_js_1.Transaction()
             .add(web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
             units: 1000000,
@@ -2541,6 +2536,15 @@ class DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async getSettlePNLsIxs(users, marketIndexes) {
+        const ixs = [];
+        for (const { settleeUserAccountPublicKey, settleeUserAccount } of users) {
+            for (const marketIndex of marketIndexes) {
+                ixs.push(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex));
+            }
+        }
+        return ixs;
+    }
     async settlePNL(settleeUserAccountPublicKey, settleeUserAccount, marketIndex, txParams) {
         const { txSig } = await this.sendTransaction(await this.buildTransaction(await this.settlePNLIx(settleeUserAccountPublicKey, settleeUserAccount, marketIndex), txParams), [], this.opts);
         return txSig;

package/lib/driftClientConfig.d.ts

@@ -3,6 +3,7 @@ import { IWallet } from './types';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
+import { TxSender } from './tx/types';
 export type DriftClientConfig = {
     connection: Connection;
     wallet: IWallet;
@@ -10,7 +11,7 @@ export type DriftClientConfig = {
     programID?: PublicKey;
     accountSubscription?: DriftClientSubscriptionConfig;
     opts?: ConfirmOptions;
-    txSenderConfig?: TxSenderConfig;
+    txSender?: TxSender;
     subAccountIds?: number[];
     activeSubAccountId?: number;
     perpMarketIndexes?: number[];
@@ -30,10 +31,3 @@ export type DriftClientSubscriptionConfig = {
     type: 'polling';
     accountLoader: BulkAccountLoader;
 };
-type TxSenderConfig = {
-    type: 'retry';
-    timeout?: number;
-    retrySleep?: number;
-    additionalConnections?: Connection[];
-};
-export {};

package/lib/idl/drift.json

@@ -1,5 +1,5 @@
 {
-    "version": "2.31.0",
+    "version": "2.31.1-beta.1",
     "name": "drift",
     "instructions": [
         {

package/lib/tx/retryTxSender.d.ts

@@ -10,6 +10,7 @@ export declare class RetryTxSender implements TxSender {
     timeout: number;
     retrySleep: number;
     additionalConnections: Connection[];
+    timoutCount: number;
     constructor(provider: AnchorProvider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
@@ -22,5 +23,6 @@ export declare class RetryTxSender implements TxSender {
     promiseTimeout<T>(promises: Promise<T>[], timeoutMs: number): Promise<T | null>;
     sendToAdditionalConnections(rawTx: Buffer | Uint8Array, opts: ConfirmOptions): void;
     addAdditionalConnection(newConnection: Connection): void;
+    getTimeoutCount(): number;
 }
 export {};

package/lib/tx/retryTxSender.js

@@ -11,6 +11,7 @@ const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 8000;
 class RetryTxSender {
     constructor(provider, timeout, retrySleep, additionalConnections = new Array()) {
+        this.timoutCount = 0;
         this.provider = provider;
         this.timeout = timeout !== null && timeout !== void 0 ? timeout : DEFAULT_TIMEOUT;
         this.retrySleep = retrySleep !== null && retrySleep !== void 0 ? retrySleep : DEFAULT_RETRY;
@@ -174,6 +175,7 @@ class RetryTxSender {
             }
         }
         if (response === null) {
+            this.timoutCount += 1;
             const duration = (Date.now() - start) / 1000;
             throw new Error(`Transaction was not confirmed in ${duration.toFixed(2)} seconds. It is unknown if it succeeded or failed. Check signature ${signature} using the Solana Explorer or CLI tools.`);
         }
@@ -217,5 +219,8 @@ class RetryTxSender {
             this.additionalConnections.push(newConnection);
         }
     }
+    getTimeoutCount() {
+        return this.timoutCount;
+    }
 }
 exports.RetryTxSender = RetryTxSender;

package/lib/tx/types.d.ts

@@ -11,4 +11,5 @@ export interface TxSender {
     sendVersionedTransaction(tx: VersionedTransaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): 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/package.json

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

package/src/driftClient.ts

@@ -257,12 +257,7 @@ export class DriftClient {
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
-		this.txSender = new RetryTxSender(
-			this.provider,
-			config.txSenderConfig?.timeout,
-			config.txSenderConfig?.retrySleep,
-			config.txSenderConfig?.additionalConnections
-		);
+		this.txSender = config.txSender ?? new RetryTxSender(this.provider);
 	}
 
 	public getUserMapKey(subAccountId: number, authority: PublicKey): string {
@@ -4309,6 +4304,26 @@ export class DriftClient {
 		}[],
 		marketIndexes: number[]
 	): Promise<TransactionSignature> {
+		const ixs = await this.getSettlePNLsIxs(users, marketIndexes);
+		const tx = new Transaction()
+			.add(
+				ComputeBudgetProgram.setComputeUnitLimit({
+					units: 1_000_000,
+				})
+			)
+			.add(...ixs);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
+	}
+
+	public async getSettlePNLsIxs(
+		users: {
+			settleeUserAccountPublicKey: PublicKey;
+			settleeUserAccount: UserAccount;
+		}[],
+		marketIndexes: number[]
+	): Promise<Array<TransactionInstruction>> {
 		const ixs = [];
 		for (const { settleeUserAccountPublicKey, settleeUserAccount } of users) {
 			for (const marketIndex of marketIndexes) {
@@ -4322,16 +4337,7 @@ export class DriftClient {
 			}
 		}
 
-		const tx = new Transaction()
-			.add(
-				ComputeBudgetProgram.setComputeUnitLimit({
-					units: 1_000_000,
-				})
-			)
-			.add(...ixs);
-
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-		return txSig;
+		return ixs;
 	}
 
 	public async settlePNL(

package/src/driftClientConfig.ts

@@ -8,6 +8,7 @@ import { IWallet } from './types';
 import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
+import { TxSender } from './tx/types';
 
 export type DriftClientConfig = {
 	connection: Connection;
@@ -16,7 +17,7 @@ export type DriftClientConfig = {
 	programID?: PublicKey;
 	accountSubscription?: DriftClientSubscriptionConfig;
 	opts?: ConfirmOptions;
-	txSenderConfig?: TxSenderConfig;
+	txSender?: TxSender;
 	subAccountIds?: number[];
 	activeSubAccountId?: number;
 	perpMarketIndexes?: number[];
@@ -39,10 +40,3 @@ export type DriftClientSubscriptionConfig =
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
 	  };
-
-type TxSenderConfig = {
-	type: 'retry';
-	timeout?: number;
-	retrySleep?: number;
-	additionalConnections?: Connection[];
-};

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.31.1-beta.0",
+  "version": "2.31.1-beta.2",
   "name": "drift",
   "instructions": [
     {

package/src/tx/retryTxSender.ts

@@ -30,6 +30,7 @@ export class RetryTxSender implements TxSender {
 	timeout: number;
 	retrySleep: number;
 	additionalConnections: Connection[];
+	timoutCount = 0;
 
 	public constructor(
 		provider: AnchorProvider,
@@ -260,6 +261,7 @@ export class RetryTxSender implements TxSender {
 		}
 
 		if (response === null) {
+			this.timoutCount += 1;
 			const duration = (Date.now() - start) / 1000;
 			throw new Error(
 				`Transaction was not confirmed in ${duration.toFixed(
@@ -325,4 +327,8 @@ export class RetryTxSender implements TxSender {
 			this.additionalConnections.push(newConnection);
 		}
 	}
+
+	public getTimeoutCount(): number {
+		return this.timoutCount;
+	}
 }

package/src/tx/types.ts

@@ -42,4 +42,6 @@ export interface TxSender {
 		rawTransaction: Buffer | Uint8Array,
 		opts: ConfirmOptions
 	): Promise<TxSigAndSlot>;
+
+	getTimeoutCount(): number;
 }