@drift-labs/sdk 2.82.0-beta.8 → 2.83.0-beta.0

package/src/driftClientConfig.ts

@@ -10,6 +10,7 @@ import { OracleInfo } from './oracles/types';
 import { BulkAccountLoader } from './accounts/bulkAccountLoader';
 import { DriftEnv } from './config';
 import { TxSender } from './tx/types';
+import { TxHandler } from './tx/txHandler';
 
 export type DriftClientConfig = {
 	connection: Connection;
@@ -19,6 +20,7 @@ export type DriftClientConfig = {
 	accountSubscription?: DriftClientSubscriptionConfig;
 	opts?: ConfirmOptions;
 	txSender?: TxSender;
+	txHandler?: TxHandler;
 	subAccountIds?: number[];
 	activeSubAccountId?: number;
 	perpMarketIndexes?: number[];

package/src/idl/drift.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.81.0",
+  "version": "2.82.0",
   "name": "drift",
   "instructions": [
     {

package/src/index.ts

@@ -102,5 +102,7 @@ export * from './auctionSubscriber/types';
 export * from './memcmp';
 export * from './decode/user';
 export * from './blockhashSubscriber';
+export * from './util/chainClock';
+export * from './clock/clockSubscriber';
 
 export { BN, PublicKey, pyth };

package/src/jupiter/jupiterClient.ts

@@ -219,12 +219,13 @@ export interface QuoteResponse {
 }
 
 export class JupiterClient {
-	url = 'https://quote-api.jup.ag';
+	url: string;
 	connection: Connection;
 	lookupTableCahce = new Map<string, AddressLookupTableAccount>();
 
-	constructor({ connection }: { connection: Connection }) {
+	constructor({ connection, url }: { connection: Connection; url?: string }) {
 		this.connection = connection;
+		this.url = url ?? 'https://quote-api.jup.ag';
 	}
 
 	/**
@@ -261,8 +262,10 @@ export class JupiterClient {
 			onlyDirectRoutes: onlyDirectRoutes.toString(),
 		}).toString();
 
+		const apiVersionParam =
+			this.url === 'https://quote-api.jup.ag' ? '/v4' : '';
 		const { data: routes } = await (
-			await fetch(`${this.url}/v4/quote?${params}`)
+			await fetch(`${this.url}${apiVersionParam}/quote?${params}`)
 		).json();
 
 		return routes;
@@ -309,8 +312,10 @@ export class JupiterClient {
 		if (swapMode === 'ExactOut') {
 			params.delete('maxAccounts');
 		}
+		const apiVersionParam =
+			this.url === 'https://quote-api.jup.ag' ? '/v6' : '';
 		const quote = await (
-			await fetch(`${this.url}/v6/quote?${params.toString()}`)
+			await fetch(`${this.url}${apiVersionParam}/quote?${params.toString()}`)
 		).json();
 		return quote as QuoteResponse;
 	}
@@ -334,8 +339,10 @@ export class JupiterClient {
 			throw new Error('Jupiter swap quote not provided. Please try again.');
 		}
 
+		const apiVersionParam =
+			this.url === 'https://quote-api.jup.ag' ? '/v6' : '';
 		const resp = await (
-			await fetch(`${this.url}/v6/swap`, {
+			await fetch(`${this.url}${apiVersionParam}/swap`, {
 				method: 'POST',
 				headers: {
 					'Content-Type': 'application/json',
@@ -382,8 +389,10 @@ export class JupiterClient {
 		userPublicKey: PublicKey;
 		slippageBps?: number;
 	}): Promise<VersionedTransaction> {
+		const apiVersionParam =
+			this.url === 'https://quote-api.jup.ag' ? '/v4' : '';
 		const resp = await (
-			await fetch(`${this.url}/v4/swap`, {
+			await fetch(`${this.url}${apiVersionParam}/swap`, {
 				method: 'POST',
 				headers: {
 					'Content-Type': 'application/json',

package/src/math/exchangeStatus.ts

@@ -11,6 +11,7 @@ import {
 	SpotOperation,
 	StateAccount,
 	isVariant,
+	InsuranceFundOperation,
 } from '../types';
 import { BN } from '@coral-xyz/anchor';
 
@@ -65,7 +66,7 @@ export function ammPaused(
 
 export function isOperationPaused(
 	pausedOperations: number,
-	operation: PerpOperation | SpotOperation
+	operation: PerpOperation | SpotOperation | InsuranceFundOperation
 ): boolean {
 	return (pausedOperations & operation) > 0;
 }

package/src/math/orders.ts

@@ -287,7 +287,8 @@ function isSameDirection(
 export function isOrderExpired(
 	order: Order,
 	ts: number,
-	enforceBuffer = false
+	enforceBuffer = false,
+	bufferSeconds = 15
 ): boolean {
 	if (
 		mustBeTriggered(order) ||
@@ -299,7 +300,7 @@ export function isOrderExpired(
 
 	let maxTs;
 	if (enforceBuffer && isLimitOrder(order)) {
-		maxTs = order.maxTs.addn(15);
+		maxTs = order.maxTs.addn(bufferSeconds);
 	} else {
 		maxTs = order.maxTs;
 	}

package/src/tx/baseTxSender.ts

@@ -1,6 +1,5 @@
 import {
 	ConfirmationStrategy,
-	ExtraConfirmationOptions,
 	TxSender,
 	TxSendError,
 	TxSigAndSlot,
@@ -16,13 +15,11 @@ import {
 	TransactionSignature,
 	Connection,
 	VersionedTransaction,
-	TransactionMessage,
-	TransactionInstruction,
-	AddressLookupTableAccount,
 } from '@solana/web3.js';
 import { AnchorProvider } from '@coral-xyz/anchor';
 import assert from 'assert';
 import bs58 from 'bs58';
+import { TxHandler } from './txHandler';
 import { IWallet } from '../types';
 
 const DEFAULT_TIMEOUT = 35000;
@@ -37,6 +34,7 @@ export abstract class BaseTxSender implements TxSender {
 	timeoutCount = 0;
 	confirmationStrategy: ConfirmationStrategy;
 	additionalTxSenderCallbacks: ((base58EncodedTx: string) => void)[];
+	txHandler: TxHandler;
 
 	public constructor({
 		connection,
@@ -46,6 +44,7 @@ export abstract class BaseTxSender implements TxSender {
 		additionalConnections = new Array<Connection>(),
 		confirmationStrategy = ConfirmationStrategy.Combo,
 		additionalTxSenderCallbacks,
+		txHandler,
 	}: {
 		connection: Connection;
 		wallet: IWallet;
@@ -54,6 +53,7 @@ export abstract class BaseTxSender implements TxSender {
 		additionalConnections?;
 		confirmationStrategy?: ConfirmationStrategy;
 		additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
+		txHandler: TxHandler;
 	}) {
 		this.connection = connection;
 		this.wallet = wallet;
@@ -62,14 +62,14 @@ export abstract class BaseTxSender implements TxSender {
 		this.additionalConnections = additionalConnections;
 		this.confirmationStrategy = confirmationStrategy;
 		this.additionalTxSenderCallbacks = additionalTxSenderCallbacks;
+		this.txHandler = txHandler;
 	}
 
 	async send(
 		tx: Transaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions,
-		preSigned?: boolean,
-		extraConfirmationOptions?: ExtraConfirmationOptions
+		preSigned?: boolean
 	): Promise<TxSigAndSlot> {
 		if (additionalSigners === undefined) {
 			additionalSigners = [];
@@ -85,10 +85,6 @@ export abstract class BaseTxSender implements TxSender {
 			preSigned
 		);
 
-		if (extraConfirmationOptions?.onSignedCb) {
-			extraConfirmationOptions.onSignedCb();
-		}
-
 		return this.sendRawTransaction(signedTx.serialize(), opts);
 	}
 
@@ -98,68 +94,23 @@ export abstract class BaseTxSender implements TxSender {
 		opts: ConfirmOptions,
 		preSigned?: boolean
 	): Promise<Transaction> {
-		if (preSigned) {
-			return tx;
-		}
-
-		tx.feePayer = this.wallet.publicKey;
-		tx.recentBlockhash = (
-			await this.connection.getLatestBlockhash(opts.preflightCommitment)
-		).blockhash;
-
-		additionalSigners
-			.filter((s): s is Signer => s !== undefined)
-			.forEach((kp) => {
-				tx.partialSign(kp);
-			});
-
-		const signedTx = await this.wallet.signTransaction(tx);
-
-		return signedTx;
-	}
-
-	async getVersionedTransaction(
-		ixs: TransactionInstruction[],
-		lookupTableAccounts: AddressLookupTableAccount[],
-		additionalSigners?: Array<Signer>,
-		opts?: ConfirmOptions,
-		blockhash?: string
-	): Promise<VersionedTransaction> {
-		if (additionalSigners === undefined) {
-			additionalSigners = [];
-		}
-		if (opts === undefined) {
-			opts = this.opts;
-		}
-
-		let recentBlockhash = '';
-		if (blockhash) {
-			recentBlockhash = blockhash;
-		} else {
-			recentBlockhash = (
-				await this.connection.getLatestBlockhash(opts.preflightCommitment)
-			).blockhash;
-		}
-
-		const message = new TransactionMessage({
-			payerKey: this.wallet.publicKey,
-			recentBlockhash,
-			instructions: ixs,
-		}).compileToV0Message(lookupTableAccounts);
-
-		const tx = new VersionedTransaction(message);
-
-		return tx;
+		return this.txHandler.prepareTx(
+			tx,
+			additionalSigners,
+			undefined,
+			opts,
+			preSigned
+		);
 	}
 
 	async sendVersionedTransaction(
 		tx: VersionedTransaction,
 		additionalSigners?: Array<Signer>,
 		opts?: ConfirmOptions,
-		preSigned?: boolean,
-		extraConfirmationOptions?: ExtraConfirmationOptions
+		preSigned?: boolean
 	): Promise<TxSigAndSlot> {
 		let signedTx;
+
 		if (preSigned) {
 			signedTx = tx;
 			// @ts-ignore
@@ -168,17 +119,12 @@ export abstract class BaseTxSender implements TxSender {
 			tx.sign((additionalSigners ?? []).concat(this.wallet.payer));
 			signedTx = tx;
 		} else {
-			additionalSigners
-				?.filter((s): s is Signer => s !== undefined)
-				.forEach((kp) => {
-					tx.sign([kp]);
-				});
-			// @ts-ignore
-			signedTx = await this.wallet.signTransaction(tx);
-		}
-
-		if (extraConfirmationOptions?.onSignedCb) {
-			extraConfirmationOptions.onSignedCb();
+			signedTx = await this.txHandler.signVersionedTx(
+				tx,
+				additionalSigners,
+				undefined,
+				this.wallet
+			);
 		}
 
 		if (opts === undefined) {

package/src/tx/fastSingleTxSender.ts

@@ -1,19 +1,15 @@
 import { ConfirmationStrategy, TxSigAndSlot } from './types';
 import {
 	ConfirmOptions,
-	Signer,
-	Transaction,
 	TransactionSignature,
 	Connection,
-	VersionedTransaction,
-	TransactionMessage,
-	TransactionInstruction,
-	AddressLookupTableAccount,
 	Commitment,
+	BlockhashWithExpiryBlockHeight,
 } from '@solana/web3.js';
 import { AnchorProvider } from '@coral-xyz/anchor';
-import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
+import { TxHandler } from './txHandler';
+import { IWallet } from '../types';
 
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_BLOCKHASH_REFRESH = 10000;
@@ -26,7 +22,7 @@ export class FastSingleTxSender extends BaseTxSender {
 	blockhashRefreshInterval: number;
 	additionalConnections: Connection[];
 	timoutCount = 0;
-	recentBlockhash: string;
+	recentBlockhash: BlockhashWithExpiryBlockHeight;
 	skipConfirmation: boolean;
 	blockhashCommitment: Commitment;
 	blockhashIntervalId: NodeJS.Timer;
@@ -41,6 +37,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		skipConfirmation = false,
 		blockhashCommitment = 'finalized',
 		confirmationStrategy = ConfirmationStrategy.Combo,
+		txHandler,
 	}: {
 		connection: Connection;
 		wallet: IWallet;
@@ -51,6 +48,7 @@ export class FastSingleTxSender extends BaseTxSender {
 		skipConfirmation?: boolean;
 		blockhashCommitment?: Commitment;
 		confirmationStrategy?: ConfirmationStrategy;
+		txHandler: TxHandler;
 	}) {
 		super({
 			connection,
@@ -59,6 +57,7 @@ export class FastSingleTxSender extends BaseTxSender {
 			timeout,
 			additionalConnections,
 			confirmationStrategy,
+			txHandler,
 		});
 		this.connection = connection;
 		this.wallet = wallet;
@@ -75,9 +74,9 @@ export class FastSingleTxSender extends BaseTxSender {
 		if (this.blockhashRefreshInterval > 0) {
 			this.blockhashIntervalId = setInterval(async () => {
 				try {
-					this.recentBlockhash = (
-						await this.connection.getLatestBlockhash(this.blockhashCommitment)
-					).blockhash;
+					this.recentBlockhash = await this.connection.getLatestBlockhash(
+						this.blockhashCommitment
+					);
 				} catch (e) {
 					console.error('Error in startBlockhashRefreshLoop: ', e);
 				}
@@ -85,50 +84,6 @@ export class FastSingleTxSender extends BaseTxSender {
 		}
 	}
 
-	async prepareTx(
-		tx: Transaction,
-		additionalSigners: Array<Signer>,
-		_opts: ConfirmOptions,
-		preSigned?: boolean
-	): Promise<Transaction> {
-		return super.prepareTx(tx, additionalSigners, _opts, preSigned);
-	}
-
-	async getVersionedTransaction(
-		ixs: TransactionInstruction[],
-		lookupTableAccounts: AddressLookupTableAccount[],
-		additionalSigners?: Array<Signer>,
-		opts?: ConfirmOptions,
-		blockhash?: string
-	): Promise<VersionedTransaction> {
-		if (additionalSigners === undefined) {
-			additionalSigners = [];
-		}
-		if (opts === undefined) {
-			opts = this.opts;
-		}
-
-		let recentBlockhash = '';
-		if (blockhash) {
-			recentBlockhash = blockhash;
-		} else {
-			recentBlockhash =
-				this.recentBlockhash ??
-				(await this.connection.getLatestBlockhash(opts.preflightCommitment))
-					.blockhash;
-		}
-
-		const message = new TransactionMessage({
-			payerKey: this.wallet.publicKey,
-			recentBlockhash,
-			instructions: ixs,
-		}).compileToV0Message(lookupTableAccounts);
-
-		const tx = new VersionedTransaction(message);
-
-		return tx;
-	}
-
 	async sendRawTransaction(
 		rawTransaction: Buffer | Uint8Array,
 		opts: ConfirmOptions

package/src/tx/forwardOnlyTxSender.ts

@@ -5,9 +5,10 @@ import {
 	VersionedTransaction,
 } from '@solana/web3.js';
 import bs58 from 'bs58';
-import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
 import { ConfirmationStrategy, TxSigAndSlot } from './types';
+import { TxHandler } from './txHandler';
+import { IWallet } from '../types';
 
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 5000;
@@ -33,6 +34,7 @@ export class ForwardOnlyTxSender extends BaseTxSender {
 		retrySleep = DEFAULT_RETRY,
 		confirmationStrategy = ConfirmationStrategy.Combo,
 		additionalTxSenderCallbacks = [],
+		txHandler,
 	}: {
 		connection: Connection;
 		wallet: IWallet;
@@ -41,6 +43,7 @@ export class ForwardOnlyTxSender extends BaseTxSender {
 		retrySleep?: number;
 		confirmationStrategy?: ConfirmationStrategy;
 		additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
+		txHandler: TxHandler;
 	}) {
 		super({
 			connection,
@@ -50,6 +53,7 @@ export class ForwardOnlyTxSender extends BaseTxSender {
 			additionalConnections: [],
 			confirmationStrategy,
 			additionalTxSenderCallbacks,
+			txHandler,
 		});
 		this.connection = connection;
 		this.wallet = wallet;

package/src/tx/retryTxSender.ts

@@ -1,8 +1,9 @@
 import { ConfirmationStrategy, TxSigAndSlot } from './types';
 import { ConfirmOptions, Connection } from '@solana/web3.js';
 import { AnchorProvider } from '@coral-xyz/anchor';
-import { IWallet } from '../types';
 import { BaseTxSender } from './baseTxSender';
+import { TxHandler } from './txHandler';
+import { IWallet } from '../types';
 
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 2000;
@@ -29,6 +30,7 @@ export class RetryTxSender extends BaseTxSender {
 		additionalConnections = new Array<Connection>(),
 		confirmationStrategy = ConfirmationStrategy.Combo,
 		additionalTxSenderCallbacks = [],
+		txHandler,
 	}: {
 		connection: Connection;
 		wallet: IWallet;
@@ -38,6 +40,7 @@ export class RetryTxSender extends BaseTxSender {
 		additionalConnections?;
 		confirmationStrategy?: ConfirmationStrategy;
 		additionalTxSenderCallbacks?: ((base58EncodedTx: string) => void)[];
+		txHandler: TxHandler;
 	}) {
 		super({
 			connection,
@@ -47,6 +50,7 @@ export class RetryTxSender extends BaseTxSender {
 			additionalConnections,
 			confirmationStrategy,
 			additionalTxSenderCallbacks,
+			txHandler,
 		});
 		this.connection = connection;
 		this.wallet = wallet;