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

package/src/tx/retryTxSender.ts

@@ -17,6 +17,7 @@ import {
 import { AnchorProvider } from '@coral-xyz/anchor';
 import assert from 'assert';
 import bs58 from 'bs58';
+import { IWallet } from '../types';
 
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 8000;
@@ -26,20 +27,34 @@ type ResolveReference = {
 };
 
 export class RetryTxSender implements TxSender {
-	provider: AnchorProvider;
+	connection: Connection;
+	wallet: IWallet;
+	opts: ConfirmOptions;
 	timeout: number;
 	retrySleep: number;
 	additionalConnections: Connection[];
-
-	public constructor(
-		provider: AnchorProvider,
-		timeout?: number,
-		retrySleep?: number,
-		additionalConnections = new Array<Connection>()
-	) {
-		this.provider = provider;
-		this.timeout = timeout ?? DEFAULT_TIMEOUT;
-		this.retrySleep = retrySleep ?? DEFAULT_RETRY;
+	timoutCount = 0;
+
+	public constructor({
+		connection,
+		wallet,
+		opts = AnchorProvider.defaultOptions(),
+		timeout = DEFAULT_TIMEOUT,
+		retrySleep = DEFAULT_RETRY,
+		additionalConnections = new Array<Connection>(),
+	}: {
+		connection: Connection;
+		wallet: IWallet;
+		opts?: ConfirmOptions;
+		timeout?: number;
+		retrySleep?: number;
+		additionalConnections?;
+	}) {
+		this.connection = connection;
+		this.wallet = wallet;
+		this.opts = opts;
+		this.timeout = timeout;
+		this.retrySleep = retrySleep;
 		this.additionalConnections = additionalConnections;
 	}
 
@@ -53,7 +68,7 @@ export class RetryTxSender implements TxSender {
 			additionalSigners = [];
 		}
 		if (opts === undefined) {
-			opts = this.provider.opts;
+			opts = this.opts;
 		}
 
 		const signedTx = preSigned
@@ -68,11 +83,9 @@ export class RetryTxSender implements TxSender {
 		additionalSigners: Array<Signer>,
 		opts: ConfirmOptions
 	): Promise<Transaction> {
-		tx.feePayer = this.provider.wallet.publicKey;
+		tx.feePayer = this.wallet.publicKey;
 		tx.recentBlockhash = (
-			await this.provider.connection.getRecentBlockhash(
-				opts.preflightCommitment
-			)
+			await this.connection.getRecentBlockhash(opts.preflightCommitment)
 		).blockhash;
 
 		additionalSigners
@@ -81,7 +94,7 @@ export class RetryTxSender implements TxSender {
 				tx.partialSign(kp);
 			});
 
-		const signedTx = await this.provider.wallet.signTransaction(tx);
+		const signedTx = await this.wallet.signTransaction(tx);
 
 		return signedTx;
 	}
@@ -96,15 +109,13 @@ export class RetryTxSender implements TxSender {
 			additionalSigners = [];
 		}
 		if (opts === undefined) {
-			opts = this.provider.opts;
+			opts = this.opts;
 		}
 
 		const message = new TransactionMessage({
-			payerKey: this.provider.wallet.publicKey,
+			payerKey: this.wallet.publicKey,
 			recentBlockhash: (
-				await this.provider.connection.getRecentBlockhash(
-					opts.preflightCommitment
-				)
+				await this.connection.getRecentBlockhash(opts.preflightCommitment)
 			).blockhash,
 			instructions: ixs,
 		}).compileToV0Message(lookupTableAccounts);
@@ -124,9 +135,9 @@ export class RetryTxSender implements TxSender {
 		if (preSigned) {
 			signedTx = tx;
 			// @ts-ignore
-		} else if (this.provider.wallet.payer) {
+		} else if (this.wallet.payer) {
 			// @ts-ignore
-			tx.sign((additionalSigners ?? []).concat(this.provider.wallet.payer));
+			tx.sign((additionalSigners ?? []).concat(this.wallet.payer));
 			signedTx = tx;
 		} else {
 			additionalSigners
@@ -135,11 +146,11 @@ export class RetryTxSender implements TxSender {
 					tx.sign([kp]);
 				});
 			// @ts-ignore
-			signedTx = await this.provider.wallet.signTransaction(tx);
+			signedTx = await this.wallet.signTransaction(tx);
 		}
 
 		if (opts === undefined) {
-			opts = this.provider.opts;
+			opts = this.opts;
 		}
 
 		return this.sendRawTransaction(signedTx.serialize(), opts);
@@ -153,10 +164,7 @@ export class RetryTxSender implements TxSender {
 
 		let txid: TransactionSignature;
 		try {
-			txid = await this.provider.connection.sendRawTransaction(
-				rawTransaction,
-				opts
-			);
+			txid = await this.connection.sendRawTransaction(rawTransaction, opts);
 			this.sendToAdditionalConnections(rawTransaction, opts);
 		} catch (e) {
 			console.error(e);
@@ -178,7 +186,7 @@ export class RetryTxSender implements TxSender {
 			while (!done && this.getTimestamp() - startTime < this.timeout) {
 				await this.sleep(resolveReference);
 				if (!done) {
-					this.provider.connection
+					this.connection
 						.sendRawTransaction(rawTransaction, opts)
 						.catch((e) => {
 							console.error(e);
@@ -217,13 +225,10 @@ export class RetryTxSender implements TxSender {
 		assert(decodedSignature.length === 64, 'signature has invalid length');
 
 		const start = Date.now();
-		const subscriptionCommitment = commitment || this.provider.opts.commitment;
+		const subscriptionCommitment = commitment || this.opts.commitment;
 
 		const subscriptionIds = new Array<number>();
-		const connections = [
-			this.provider.connection,
-			...this.additionalConnections,
-		];
+		const connections = [this.connection, ...this.additionalConnections];
 		let response: RpcResponseAndContext<SignatureResult> | null = null;
 		const promises = connections.map((connection, i) => {
 			let subscriptionId;
@@ -260,6 +265,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 +331,8 @@ export class RetryTxSender implements TxSender {
 			this.additionalConnections.push(newConnection);
 		}
 	}
+
+	public getTimeoutCount(): number {
+		return this.timoutCount;
+	}
 }

package/src/tx/types.ts

@@ -1,4 +1,3 @@
-import { Provider } from '@coral-xyz/anchor';
 import {
 	AddressLookupTableAccount,
 	ConfirmOptions,
@@ -8,6 +7,7 @@ import {
 	TransactionSignature,
 	VersionedTransaction,
 } from '@solana/web3.js';
+import { IWallet } from '../types';
 
 export type TxSigAndSlot = {
 	txSig: TransactionSignature;
@@ -15,7 +15,7 @@ export type TxSigAndSlot = {
 };
 
 export interface TxSender {
-	provider: Provider;
+	wallet: IWallet;
 
 	send(
 		tx: Transaction,
@@ -42,4 +42,6 @@ export interface TxSender {
 		rawTransaction: Buffer | Uint8Array,
 		opts: ConfirmOptions
 	): Promise<TxSigAndSlot>;
+
+	getTimeoutCount(): number;
 }

package/src/user.ts

@@ -72,6 +72,7 @@ import {
 } from './math/spotPosition';
 
 import { calculateLiveOracleTwap } from './math/oracles';
+import { getPerpMarketTierNumber, getSpotMarketTierNumber } from './math/tiers';
 
 export class User {
 	driftClient: DriftClient;
@@ -97,6 +98,8 @@ export class User {
 				config.userAccountPublicKey,
 				config.accountSubscription.accountLoader
 			);
+		} else if (config.accountSubscription?.type === 'custom') {
+			this.accountSubscriber = config.accountSubscription.userAccountSubscriber;
 		} else {
 			this.accountSubscriber = new WebSocketUserAccountSubscriber(
 				config.driftClient.program,
@@ -301,7 +304,10 @@ export class User {
 		marketIndex: number,
 		originalPosition?: PerpPosition
 	): [PerpPosition, BN, BN] {
-		originalPosition = originalPosition ?? this.getPerpPosition(marketIndex);
+		originalPosition =
+			originalPosition ??
+			this.getPerpPosition(marketIndex) ??
+			this.getEmptyPosition(marketIndex);
 
 		if (originalPosition.lpShares.eq(ZERO)) {
 			return [originalPosition, ZERO, ZERO];
@@ -368,7 +374,7 @@ export class User {
 		let pnl;
 		if (updateType == 'open' || updateType == 'increase') {
 			newQuoteEntry = position.quoteEntryAmount.add(deltaQaa);
-			pnl = 0;
+			pnl = ZERO;
 		} else if (updateType == 'reduce' || updateType == 'close') {
 			newQuoteEntry = position.quoteEntryAmount.sub(
 				position.quoteEntryAmount
@@ -490,6 +496,12 @@ export class User {
 		);
 	}
 
+	public getActiveSpotPositions(): SpotPosition[] {
+		return this.getUserAccount().spotPositions.filter(
+			(pos) => !isSpotPositionAvailable(pos)
+		);
+	}
+
 	/**
 	 * calculates unrealized position price pnl
 	 * @returns : Precision QUOTE_PRECISION
@@ -1127,7 +1139,8 @@ export class User {
 		includeOpenOrders = false
 	): BN {
 		const userPosition =
-			this.getPerpPosition(marketIndex) || this.getEmptyPosition(marketIndex);
+			this.getPerpPositionWithLPSettle(marketIndex)[0] ||
+			this.getEmptyPosition(marketIndex);
 		const market = this.driftClient.getPerpMarketAccount(
 			userPosition.marketIndex
 		);
@@ -1435,24 +1448,29 @@ export class User {
 		return netAssetValue.mul(TEN_THOUSAND).div(totalLiabilityValue);
 	}
 
-	public canBeLiquidated(): boolean {
+	public canBeLiquidated(): {
+		canBeLiquidated: boolean;
+		marginRequirement: BN;
+		totalCollateral: BN;
+	} {
 		const totalCollateral = this.getTotalCollateral('Maintenance');
 
 		// if user being liq'd, can continue to be liq'd until total collateral above the margin requirement plus buffer
 		let liquidationBuffer = undefined;
-		const isBeingLiquidated = isVariant(
-			this.getUserAccount().status,
-			'beingLiquidated'
-		);
-
-		if (isBeingLiquidated) {
+		if (this.isBeingLiquidated()) {
 			liquidationBuffer = new BN(
 				this.driftClient.getStateAccount().liquidationMarginBufferRatio
 			);
 		}
-		const maintenanceRequirement =
+		const marginRequirement =
 			this.getMaintenanceMarginRequirement(liquidationBuffer);
-		return totalCollateral.lt(maintenanceRequirement);
+		const canBeLiquidated = totalCollateral.lt(marginRequirement);
+
+		return {
+			canBeLiquidated,
+			marginRequirement,
+			totalCollateral,
+		};
 	}
 
 	public isBeingLiquidated(): boolean {
@@ -2304,6 +2322,38 @@ export class User {
 		return true;
 	}
 
+	public getSafestTiers(): { perpTier: number; spotTier: number } {
+		let safestPerpTier = 4;
+		let safestSpotTier = 4;
+
+		for (const perpPosition of this.getActivePerpPositions()) {
+			safestPerpTier = Math.min(
+				safestPerpTier,
+				getPerpMarketTierNumber(
+					this.driftClient.getPerpMarketAccount(perpPosition.marketIndex)
+				)
+			);
+		}
+
+		for (const spotPosition of this.getActiveSpotPositions()) {
+			if (isVariant(spotPosition.balanceType, 'deposit')) {
+				continue;
+			}
+
+			safestSpotTier = Math.min(
+				safestSpotTier,
+				getSpotMarketTierNumber(
+					this.driftClient.getSpotMarketAccount(spotPosition.marketIndex)
+				)
+			);
+		}
+
+		return {
+			perpTier: safestPerpTier,
+			spotTier: safestSpotTier,
+		};
+	}
+
 	/**
 	 * Get the total position value, excluding any position coming from the given target market
 	 * @param marketToIgnore
@@ -2345,6 +2395,7 @@ export class User {
 
 		return oracleData;
 	}
+
 	private getOracleDataForSpotMarket(marketIndex: number): OraclePriceData {
 		const oracleKey = this.driftClient.getSpotMarketAccount(marketIndex).oracle;
 

package/src/userConfig.ts

@@ -1,6 +1,7 @@
 import { DriftClient } from './driftClient';
 import { PublicKey } from '@solana/web3.js';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
+import { UserAccountSubscriber } from './accounts/types';
 
 export type UserConfig = {
 	accountSubscription?: UserSubscriptionConfig;
@@ -15,4 +16,8 @@ export type UserSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
+	  }
+	| {
+			type: 'custom';
+			userAccountSubscriber: UserAccountSubscriber;
 	  };

package/src/userStats.ts

@@ -25,6 +25,10 @@ export class UserStats {
 				config.userStatsAccountPublicKey,
 				config.accountSubscription.accountLoader
 			);
+		} else if (config.accountSubscription?.type === 'custom') {
+			throw new Error(
+				'Custom account subscription not yet implemented for user stats'
+			);
 		} else {
 			this.accountSubscriber = new WebSocketUserStatsAccountSubscriber(
 				config.driftClient.program,

package/src/userStatsConfig.ts

@@ -15,4 +15,7 @@ export type UserStatsSubscriptionConfig =
 	| {
 			type: 'polling';
 			accountLoader: BulkAccountLoader;
+	  }
+	| {
+			type: 'custom';
 	  };