@drift-labs/sdk 2.31.1-beta.7 → 2.31.1-beta.8

package/VERSION

@@ -1 +1 @@
-2.31.1-beta.7
+2.31.1-beta.8

package/lib/driftClient.js

@@ -136,7 +136,12 @@ class DriftClient {
             this.accountSubscriber = new webSocketDriftClientAccountSubscriber_1.WebSocketDriftClientAccountSubscriber(this.program, (_r = config.perpMarketIndexes) !== null && _r !== void 0 ? _r : [], (_s = config.spotMarketIndexes) !== null && _s !== void 0 ? _s : [], (_t = config.oracleInfos) !== null && _t !== void 0 ? _t : [], noMarketsAndOraclesSpecified);
         }
         this.eventEmitter = this.accountSubscriber.eventEmitter;
-        this.txSender = (_u = config.txSender) !== null && _u !== void 0 ? _u : new retryTxSender_1.RetryTxSender(this.provider);
+        this.txSender =
+            (_u = config.txSender) !== null && _u !== void 0 ? _u : new retryTxSender_1.RetryTxSender({
+                connection: this.connection,
+                wallet: this.wallet,
+                opts: this.opts,
+            });
     }
     getUserMapKey(subAccountId, authority) {
         return `${subAccountId}_${authority.toString()}`;
@@ -287,7 +292,7 @@ class DriftClient {
         const newProgram = new anchor_1.Program(drift_json_1.default, this.program.programId, newProvider);
         this.skipLoadUsers = false;
         // Update provider for txSender with new wallet details
-        this.txSender.provider = newProvider;
+        this.txSender.wallet = newWallet;
         this.wallet = newWallet;
         this.provider = newProvider;
         this.program = newProgram;

package/lib/idl/drift.json

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

package/lib/tx/retryTxSender.d.ts

@@ -1,17 +1,26 @@
 /// <reference types="node" />
 import { TxSender, TxSigAndSlot } from './types';
 import { Commitment, ConfirmOptions, RpcResponseAndContext, Signer, SignatureResult, Transaction, TransactionSignature, Connection, VersionedTransaction, TransactionInstruction, AddressLookupTableAccount } from '@solana/web3.js';
-import { AnchorProvider } from '@coral-xyz/anchor';
+import { IWallet } from '../types';
 type ResolveReference = {
     resolve?: () => void;
 };
 export declare class RetryTxSender implements TxSender {
-    provider: AnchorProvider;
+    connection: Connection;
+    wallet: IWallet;
+    opts: ConfirmOptions;
     timeout: number;
     retrySleep: number;
     additionalConnections: Connection[];
     timoutCount: number;
-    constructor(provider: AnchorProvider, timeout?: number, retrySleep?: number, additionalConnections?: Connection[]);
+    constructor({ connection, wallet, opts, timeout, retrySleep, additionalConnections, }: {
+        connection: Connection;
+        wallet: IWallet;
+        opts?: ConfirmOptions;
+        timeout?: number;
+        retrySleep?: number;
+        additionalConnections?: any;
+    });
     send(tx: Transaction, additionalSigners?: Array<Signer>, opts?: ConfirmOptions, preSigned?: boolean): Promise<TxSigAndSlot>;
     prepareTx(tx: Transaction, additionalSigners: Array<Signer>, opts: ConfirmOptions): Promise<Transaction>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;

package/lib/tx/retryTxSender.js

@@ -5,16 +5,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RetryTxSender = void 0;
 const web3_js_1 = require("@solana/web3.js");
+const anchor_1 = require("@coral-xyz/anchor");
 const assert_1 = __importDefault(require("assert"));
 const bs58_1 = __importDefault(require("bs58"));
 const DEFAULT_TIMEOUT = 35000;
 const DEFAULT_RETRY = 8000;
 class RetryTxSender {
-    constructor(provider, timeout, retrySleep, additionalConnections = new Array()) {
+    constructor({ connection, wallet, opts = anchor_1.AnchorProvider.defaultOptions(), timeout = DEFAULT_TIMEOUT, retrySleep = DEFAULT_RETRY, 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;
+        this.connection = connection;
+        this.wallet = wallet;
+        this.opts = opts;
+        this.timeout = timeout;
+        this.retrySleep = retrySleep;
         this.additionalConnections = additionalConnections;
     }
     async send(tx, additionalSigners, opts, preSigned) {
@@ -22,7 +25,7 @@ class RetryTxSender {
             additionalSigners = [];
         }
         if (opts === undefined) {
-            opts = this.provider.opts;
+            opts = this.opts;
         }
         const signedTx = preSigned
             ? tx
@@ -30,14 +33,14 @@ class RetryTxSender {
         return this.sendRawTransaction(signedTx.serialize(), opts);
     }
     async prepareTx(tx, additionalSigners, opts) {
-        tx.feePayer = this.provider.wallet.publicKey;
-        tx.recentBlockhash = (await this.provider.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
+        tx.feePayer = this.wallet.publicKey;
+        tx.recentBlockhash = (await this.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash;
         additionalSigners
             .filter((s) => s !== undefined)
             .forEach((kp) => {
             tx.partialSign(kp);
         });
-        const signedTx = await this.provider.wallet.signTransaction(tx);
+        const signedTx = await this.wallet.signTransaction(tx);
         return signedTx;
     }
     async getVersionedTransaction(ixs, lookupTableAccounts, additionalSigners, opts) {
@@ -45,11 +48,11 @@ class RetryTxSender {
             additionalSigners = [];
         }
         if (opts === undefined) {
-            opts = this.provider.opts;
+            opts = this.opts;
         }
         const message = new web3_js_1.TransactionMessage({
-            payerKey: this.provider.wallet.publicKey,
-            recentBlockhash: (await this.provider.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash,
+            payerKey: this.wallet.publicKey,
+            recentBlockhash: (await this.connection.getRecentBlockhash(opts.preflightCommitment)).blockhash,
             instructions: ixs,
         }).compileToV0Message(lookupTableAccounts);
         const tx = new web3_js_1.VersionedTransaction(message);
@@ -61,9 +64,9 @@ class RetryTxSender {
             signedTx = tx;
             // @ts-ignore
         }
-        else if (this.provider.wallet.payer) {
+        else if (this.wallet.payer) {
             // @ts-ignore
-            tx.sign((additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : []).concat(this.provider.wallet.payer));
+            tx.sign((additionalSigners !== null && additionalSigners !== void 0 ? additionalSigners : []).concat(this.wallet.payer));
             signedTx = tx;
         }
         else {
@@ -71,10 +74,10 @@ class RetryTxSender {
                 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);
     }
@@ -82,7 +85,7 @@ class RetryTxSender {
         const startTime = this.getTimestamp();
         let txid;
         try {
-            txid = await this.provider.connection.sendRawTransaction(rawTransaction, opts);
+            txid = await this.connection.sendRawTransaction(rawTransaction, opts);
             this.sendToAdditionalConnections(rawTransaction, opts);
         }
         catch (e) {
@@ -103,7 +106,7 @@ class RetryTxSender {
             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);
@@ -137,12 +140,9 @@ class RetryTxSender {
         }
         (0, assert_1.default)(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();
-        const connections = [
-            this.provider.connection,
-            ...this.additionalConnections,
-        ];
+        const connections = [this.connection, ...this.additionalConnections];
         let response = null;
         const promises = connections.map((connection, i) => {
             let subscriptionId;

package/lib/tx/types.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
-import { Provider } from '@coral-xyz/anchor';
 import { AddressLookupTableAccount, ConfirmOptions, Signer, Transaction, TransactionInstruction, TransactionSignature, VersionedTransaction } from '@solana/web3.js';
+import { IWallet } from '../types';
 export type TxSigAndSlot = {
     txSig: TransactionSignature;
     slot: number;
 };
 export interface TxSender {
-    provider: Provider;
+    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>;
     getVersionedTransaction(ixs: TransactionInstruction[], lookupTableAccounts: AddressLookupTableAccount[], additionalSigners?: Array<Signer>, opts?: ConfirmOptions): Promise<VersionedTransaction>;

package/package.json

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

package/src/driftClient.ts

@@ -273,7 +273,13 @@ export class DriftClient {
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
-		this.txSender = config.txSender ?? new RetryTxSender(this.provider);
+		this.txSender =
+			config.txSender ??
+			new RetryTxSender({
+				connection: this.connection,
+				wallet: this.wallet,
+				opts: this.opts,
+			});
 	}
 
 	public getUserMapKey(subAccountId: number, authority: PublicKey): string {
@@ -514,7 +520,7 @@ export class DriftClient {
 
 		this.skipLoadUsers = false;
 		// Update provider for txSender with new wallet details
-		this.txSender.provider = newProvider;
+		this.txSender.wallet = newWallet;
 		this.wallet = newWallet;
 		this.provider = newProvider;
 		this.program = newProgram;

package/src/idl/drift.json

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

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,21 +27,34 @@ type ResolveReference = {
 };
 
 export class RetryTxSender implements TxSender {
-	provider: AnchorProvider;
+	connection: Connection;
+	wallet: IWallet;
+	opts: ConfirmOptions;
 	timeout: number;
 	retrySleep: number;
 	additionalConnections: Connection[];
 	timoutCount = 0;
 
-	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;
+	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;
 	}
 
@@ -54,7 +68,7 @@ export class RetryTxSender implements TxSender {
 			additionalSigners = [];
 		}
 		if (opts === undefined) {
-			opts = this.provider.opts;
+			opts = this.opts;
 		}
 
 		const signedTx = preSigned
@@ -69,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
@@ -82,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;
 	}
@@ -97,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);
@@ -125,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
@@ -136,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);
@@ -154,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);
@@ -179,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);
@@ -218,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;

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,