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

package/src/driftClient.ts

@@ -63,7 +63,7 @@ import {
 	DriftClientAccountEvents,
 	DataAndSlot,
 } from './accounts/types';
-import { TxSender } from './tx/types';
+import { TxSender, TxSigAndSlot } from './tx/types';
 import { wrapInTx } from './tx/utils';
 import { QUOTE_SPOT_MARKET_INDEX, ZERO } from './constants/numericConstants';
 import { findDirectionToClose, positionIsAvailable } from './math/position';
@@ -166,7 +166,7 @@ export class DriftClient {
 			const {
 				perpMarketIndexes: envPerpMarketIndexes,
 				spotMarketIndexes: envSpotMarketIndexes,
-				oracleInfos: envOralceInfos,
+				oracleInfos: envOracleInfos,
 			} = getMarketsAndOraclesForSubscription(config.env);
 			perpMarketIndexes = perpMarketIndexes
 				? perpMarketIndexes
@@ -174,7 +174,7 @@ export class DriftClient {
 			spotMarketIndexes = spotMarketIndexes
 				? spotMarketIndexes
 				: envSpotMarketIndexes;
-			oracleInfos = oracleInfos ? oracleInfos : envOralceInfos;
+			oracleInfos = oracleInfos ? oracleInfos : envOracleInfos;
 		}
 
 		if (config.accountSubscription?.type === 'polling') {
@@ -188,9 +188,9 @@ export class DriftClient {
 		} else {
 			this.accountSubscriber = new WebSocketDriftClientAccountSubscriber(
 				this.program,
-				config.perpMarketIndexes ?? [],
-				config.spotMarketIndexes ?? [],
-				config.oracleInfos ?? []
+				perpMarketIndexes ?? [],
+				spotMarketIndexes ?? [],
+				oracleInfos ?? []
 			);
 		}
 		this.eventEmitter = this.accountSubscriber.eventEmitter;
@@ -322,7 +322,15 @@ export class DriftClient {
 		marketIndex: number
 	): Promise<PerpMarketAccount | undefined> {
 		await this.accountSubscriber.fetch();
-		return this.accountSubscriber.getMarketAccountAndSlot(marketIndex)?.data;
+		let data =
+			this.accountSubscriber.getMarketAccountAndSlot(marketIndex)?.data;
+		let i = 0;
+		while (data === undefined && i < 10) {
+			await this.accountSubscriber.fetch();
+			data = this.accountSubscriber.getMarketAccountAndSlot(marketIndex)?.data;
+			i++;
+		}
+		return data;
 	}
 
 	public getPerpMarketAccounts(): PerpMarketAccount[] {
@@ -476,7 +484,7 @@ export class DriftClient {
 			}
 		}
 		tx.add(initializeUserAccountIx);
-		const { txSig } = await this.txSender.send(tx, [], this.opts);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return [txSig, userAccountPublicKey];
 	}
 
@@ -562,19 +570,25 @@ export class DriftClient {
 		);
 
 		const nameBuffer = encodeName(name);
-		return await this.program.rpc.updateUserName(subAccountId, nameBuffer, {
-			accounts: {
-				user: userAccountPublicKey,
-				authority: this.wallet.publicKey,
-			},
-		});
+		const tx = await this.program.transaction.updateUserName(
+			subAccountId,
+			nameBuffer,
+			{
+				accounts: {
+					user: userAccountPublicKey,
+					authority: this.wallet.publicKey,
+				},
+			}
+		);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
 	}
 
 	public async updateUserCustomMarginRatio(
 		marginRatio: number,
 		subAccountId = 0
 	): Promise<TransactionSignature> {
-		return await this.program.rpc.updateUserCustomMarginRatio(
+		const tx = await this.program.transaction.updateUserCustomMarginRatio(
 			subAccountId,
 			marginRatio,
 			{
@@ -584,6 +598,8 @@ export class DriftClient {
 				},
 			}
 		);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
 	}
 
 	public async updateUserMarginTradingEnabled(
@@ -595,7 +611,7 @@ export class DriftClient {
 			this.wallet.publicKey,
 			subAccountId
 		);
-		return await this.program.rpc.updateUserMarginTradingEnabled(
+		const tx = await this.program.transaction.updateUserMarginTradingEnabled(
 			subAccountId,
 			marginTradingEnabled,
 			{
@@ -605,18 +621,28 @@ export class DriftClient {
 				},
 			}
 		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
 	}
 
 	public async updateUserDelegate(
 		delegate: PublicKey,
 		subAccountId = 0
 	): Promise<TransactionSignature> {
-		return await this.program.rpc.updateUserDelegate(subAccountId, delegate, {
-			accounts: {
-				user: await this.getUserAccountPublicKey(),
-				authority: this.wallet.publicKey,
-			},
-		});
+		const tx = await this.program.transaction.updateUserDelegate(
+			subAccountId,
+			delegate,
+			{
+				accounts: {
+					user: await this.getUserAccountPublicKey(),
+					authority: this.wallet.publicKey,
+				},
+			}
+		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
 	}
 
 	public async getUserAccountsForDelegate(
@@ -662,7 +688,7 @@ export class DriftClient {
 			subAccountId
 		);
 
-		const txSig = await this.program.rpc.deleteUser({
+		const ix = await this.program.instruction.deleteUser({
 			accounts: {
 				user: userAccountPublicKey,
 				userStats: this.getUserStatsAccountPublicKey(),
@@ -671,6 +697,8 @@ export class DriftClient {
 			},
 		});
 
+		const { txSig } = await this.sendTransaction(wrapInTx(ix), [], this.opts);
+
 		await this.users.get(subAccountId)?.unsubscribe();
 		this.users.delete(subAccountId);
 
@@ -1036,7 +1064,7 @@ export class DriftClient {
 			);
 		}
 
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			tx,
 			additionalSigners,
 			this.opts
@@ -1064,7 +1092,7 @@ export class DriftClient {
 		let remainingAccounts = [];
 		if (userInitialized) {
 			remainingAccounts = this.getRemainingAccounts({
-				userAccounts: [this.getUserAccount()],
+				userAccounts: [await this.forceGetUserAccount()],
 				useMarketLastSlotCache: true,
 				writableSpotMarketIndexes: [marketIndex],
 			});
@@ -1266,12 +1294,13 @@ export class DriftClient {
 			);
 		}
 
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			tx,
 			additionalSigners,
 			this.opts
 		);
 		this.spotMarketLastSlotCache.set(marketIndex, slot);
+
 		return [txSig, userAccountPublicKey];
 	}
 
@@ -1393,7 +1422,7 @@ export class DriftClient {
 			);
 		}
 
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			tx,
 			additionalSigners,
 			this.opts
@@ -1446,7 +1475,7 @@ export class DriftClient {
 		fromSubAccountId: number,
 		toSubAccountId: number
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
 				await this.getTransferDepositIx(
 					amount,
@@ -1524,7 +1553,7 @@ export class DriftClient {
 	public async updateSpotMarketCumulativeInterest(
 		marketIndex: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.updateSpotMarketCumulativeInterestIx(marketIndex)),
 			[],
 			this.opts
@@ -1549,7 +1578,7 @@ export class DriftClient {
 		settleeUserAccountPublicKey: PublicKey,
 		marketIndex: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.settleLPIx(settleeUserAccountPublicKey, marketIndex)),
 			[],
 			this.opts
@@ -1583,7 +1612,7 @@ export class DriftClient {
 		marketIndex: number,
 		sharesToBurn?: BN
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.getRemovePerpLpSharesIx(marketIndex, sharesToBurn)),
 			[],
 			this.opts
@@ -1596,7 +1625,7 @@ export class DriftClient {
 		userAccountPublicKey: PublicKey,
 		sharesToBurn?: BN
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(
 				await this.getRemovePerpLpSharesInExpiringMarket(
 					marketIndex,
@@ -1685,7 +1714,7 @@ export class DriftClient {
 		amount: BN,
 		marketIndex: number
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(await this.getAddPerpLpSharesIx(amount, marketIndex)),
 			[],
 			this.opts
@@ -1731,7 +1760,12 @@ export class DriftClient {
 	}
 
 	public async sendSignedTx(tx: Transaction): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(tx, undefined, this.opts, true);
+		const { txSig } = await this.sendTransaction(
+			tx,
+			undefined,
+			this.opts,
+			true
+		);
 
 		return txSig;
 	}
@@ -1779,7 +1813,7 @@ export class DriftClient {
 		const [signedMarketOrderTx, signedFillTx] =
 			await this.provider.wallet.signAllTransactions([marketOrderTx, fillTx]);
 
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			signedMarketOrderTx,
 			[],
 			this.opts,
@@ -1794,7 +1828,7 @@ export class DriftClient {
 	public async placePerpOrder(
 		orderParams: OptionalOrderParams
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(await this.getPlacePerpOrderIx(orderParams)),
 			[],
 			this.opts
@@ -1838,7 +1872,7 @@ export class DriftClient {
 	public async updateAMMs(
 		marketIndexes: number[]
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.getUpdateAMMsIx(marketIndexes)),
 			[],
 			this.opts
@@ -1883,7 +1917,7 @@ export class DriftClient {
 	public async settleExpiredMarket(
 		marketIndex: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.getSettleExpiredMarketIx(marketIndex)),
 			[],
 			this.opts
@@ -1951,13 +1985,13 @@ export class DriftClient {
 				},
 			});
 
-		const { txSig } = await this.txSender.send(wrapInTx(ix), [], this.opts);
+		const { txSig } = await this.sendTransaction(wrapInTx(ix), [], this.opts);
 
 		return txSig;
 	}
 
 	public async cancelOrder(orderId?: number): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.getCancelOrderIx(orderId)),
 			[],
 			this.opts
@@ -1988,7 +2022,7 @@ export class DriftClient {
 	public async cancelOrderByUserId(
 		userOrderId: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.getCancelOrderByUserIdIx(userOrderId)),
 			[],
 			this.opts
@@ -2025,7 +2059,7 @@ export class DriftClient {
 		marketIndex?: number,
 		direction?: PositionDirection
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(
 				await this.getCancelOrdersIx(marketType, marketIndex, direction)
 			),
@@ -2042,8 +2076,20 @@ export class DriftClient {
 	): Promise<TransactionInstruction> {
 		const userAccountPublicKey = await this.getUserAccountPublicKey();
 
+		let readablePerpMarketIndex = undefined;
+		let readableSpotMarketIndexes = undefined;
+		if (marketIndex) {
+			if (marketType && isVariant(marketType, 'perp')) {
+				readablePerpMarketIndex = marketIndex;
+			} else if (marketType && isVariant(marketType, 'spot')) {
+				readableSpotMarketIndexes = [marketIndex];
+			}
+		}
+
 		const remainingAccounts = this.getRemainingAccounts({
 			userAccounts: [this.getUserAccount()],
+			readablePerpMarketIndex,
+			readableSpotMarketIndexes,
 			useMarketLastSlotCache: true,
 		});
 
@@ -2069,7 +2115,7 @@ export class DriftClient {
 		makerInfo?: MakerInfo,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(
 				await this.getFillPerpOrderIx(
 					userAccountPublicKey,
@@ -2160,7 +2206,7 @@ export class DriftClient {
 	public async placeSpotOrder(
 		orderParams: OptionalOrderParams
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(await this.getPlaceSpotOrderIx(orderParams)),
 			[],
 			this.opts
@@ -2204,7 +2250,7 @@ export class DriftClient {
 		makerInfo?: MakerInfo,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(
 				await this.getFillSpotOrderIx(
 					userAccountPublicKey,
@@ -2426,7 +2472,7 @@ export class DriftClient {
 		user: UserAccount,
 		order: Order
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.getTriggerOrderIx(userAccountPublicKey, user, order)),
 			[],
 			this.opts
@@ -2509,7 +2555,7 @@ export class DriftClient {
 		makerInfo?: MakerInfo,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
 				await this.getPlaceAndTakePerpOrderIx(
 					orderParams,
@@ -2591,7 +2637,7 @@ export class DriftClient {
 		takerInfo: TakerInfo,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
 				await this.getPlaceAndMakePerpOrderIx(
 					orderParams,
@@ -2660,7 +2706,7 @@ export class DriftClient {
 		makerInfo?: MakerInfo,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
 				await this.getPlaceAndTakeSpotOrderIx(
 					orderParams,
@@ -2756,7 +2802,7 @@ export class DriftClient {
 		fulfillmentConfig?: SerumV3FulfillmentConfigAccount,
 		referrerInfo?: ReferrerInfo
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
 				await this.getPlaceAndMakeSpotOrderIx(
 					orderParams,
@@ -2909,7 +2955,7 @@ export class DriftClient {
 		);
 		tx.add(cancelOrderIx);
 		tx.add(placeOrderIx);
-		const { txSig, slot } = await this.txSender.send(tx, [], this.opts);
+		const { txSig, slot } = await this.sendTransaction(tx, [], this.opts);
 		this.perpMarketLastSlotCache.set(newOrderParams.marketIndex, slot);
 		return txSig;
 	}
@@ -2941,7 +2987,7 @@ export class DriftClient {
 			)
 			.add(...ixs);
 
-		const { txSig } = await this.txSender.send(tx, [], this.opts);
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 		return txSig;
 	}
 
@@ -2950,7 +2996,7 @@ export class DriftClient {
 		settleeUserAccount: UserAccount,
 		marketIndex: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(
 				await this.settlePNLIx(
 					settleeUserAccountPublicKey,
@@ -2993,7 +3039,7 @@ export class DriftClient {
 		maxBaseAssetAmount: BN,
 		limitPrice?: BN
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
 				await this.getLiquidatePerpIx(
 					userAccountPublicKey,
@@ -3057,7 +3103,7 @@ export class DriftClient {
 		maxLiabilityTransfer: BN,
 		limitPrice?: BN
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
 				await this.getLiquidateSpotIx(
 					userAccountPublicKey,
@@ -3125,7 +3171,7 @@ export class DriftClient {
 		maxLiabilityTransfer: BN,
 		limitPrice?: BN
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
 				await this.getLiquidateBorrowForPerpPnlIx(
 					userAccountPublicKey,
@@ -3193,7 +3239,7 @@ export class DriftClient {
 		maxPnlTransfer: BN,
 		limitPrice?: BN
 	): Promise<TransactionSignature> {
-		const { txSig, slot } = await this.txSender.send(
+		const { txSig, slot } = await this.sendTransaction(
 			wrapInTx(
 				await this.getLiquidatePerpPnlForDepositIx(
 					userAccountPublicKey,
@@ -3258,7 +3304,7 @@ export class DriftClient {
 		userAccount: UserAccount,
 		marketIndex: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(
 				await this.getResolvePerpBankruptcyIx(
 					userAccountPublicKey,
@@ -3319,7 +3365,7 @@ export class DriftClient {
 		userAccount: UserAccount,
 		marketIndex: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(
 				await this.getResolveSpotBankruptcyIx(
 					userAccountPublicKey,
@@ -3374,7 +3420,7 @@ export class DriftClient {
 		perpMarketIndex: number,
 		oracle: PublicKey
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.getUpdateFundingRateIx(perpMarketIndex, oracle)),
 			[],
 			this.opts
@@ -3402,7 +3448,7 @@ export class DriftClient {
 	public async settleFundingPayment(
 		userAccountPublicKey: PublicKey
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.getSettleFundingPaymentIx(userAccountPublicKey)),
 			[],
 			this.opts
@@ -3459,7 +3505,7 @@ export class DriftClient {
 	public async initializeInsuranceFundStake(
 		marketIndex: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(await this.getInitializeInsuranceFundStakeIx(marketIndex)),
 			[],
 			this.opts
@@ -3511,21 +3557,28 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		return await this.program.rpc.addInsuranceFundStake(marketIndex, amount, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				spotMarket: spotMarket.pubkey,
-				insuranceFundStake: ifStakeAccountPublicKey,
-				userStats: this.getUserStatsAccountPublicKey(),
-				authority: this.wallet.publicKey,
-				spotMarketVault: spotMarket.vault,
-				insuranceFundVault: spotMarket.insuranceFund.vault,
-				driftSigner: this.getSignerPublicKey(),
-				userTokenAccount: collateralAccountPublicKey,
-				tokenProgram: TOKEN_PROGRAM_ID,
-			},
-			remainingAccounts,
-		});
+		const tx = await this.program.transaction.addInsuranceFundStake(
+			marketIndex,
+			amount,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					spotMarket: spotMarket.pubkey,
+					insuranceFundStake: ifStakeAccountPublicKey,
+					userStats: this.getUserStatsAccountPublicKey(),
+					authority: this.wallet.publicKey,
+					spotMarketVault: spotMarket.vault,
+					insuranceFundVault: spotMarket.insuranceFund.vault,
+					driftSigner: this.getSignerPublicKey(),
+					userTokenAccount: collateralAccountPublicKey,
+					tokenProgram: TOKEN_PROGRAM_ID,
+				},
+				remainingAccounts,
+			}
+		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
 	}
 
 	public async requestRemoveInsuranceFundStake(
@@ -3545,7 +3598,7 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		return await this.program.rpc.requestRemoveInsuranceFundStake(
+		const tx = await this.program.transaction.requestRemoveInsuranceFundStake(
 			marketIndex,
 			amount,
 			{
@@ -3560,6 +3613,9 @@ export class DriftClient {
 				remainingAccounts,
 			}
 		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
 	}
 
 	public async cancelRequestRemoveInsuranceFundStake(
@@ -3578,20 +3634,24 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		return await this.program.rpc.cancelRequestRemoveInsuranceFundStake(
-			marketIndex,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					spotMarket: spotMarketAccount.pubkey,
-					insuranceFundStake: ifStakeAccountPublicKey,
-					userStats: this.getUserStatsAccountPublicKey(),
-					authority: this.wallet.publicKey,
-					insuranceFundVault: spotMarketAccount.insuranceFund.vault,
-				},
-				remainingAccounts,
-			}
-		);
+		const tx =
+			await this.program.transaction.cancelRequestRemoveInsuranceFundStake(
+				marketIndex,
+				{
+					accounts: {
+						state: await this.getStatePublicKey(),
+						spotMarket: spotMarketAccount.pubkey,
+						insuranceFundStake: ifStakeAccountPublicKey,
+						userStats: this.getUserStatsAccountPublicKey(),
+						authority: this.wallet.publicKey,
+						insuranceFundVault: spotMarketAccount.insuranceFund.vault,
+					},
+					remainingAccounts,
+				}
+			);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
 	}
 
 	public async removeInsuranceFundStake(
@@ -3611,20 +3671,26 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		return await this.program.rpc.removeInsuranceFundStake(marketIndex, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				spotMarket: spotMarketAccount.pubkey,
-				insuranceFundStake: ifStakeAccountPublicKey,
-				userStats: this.getUserStatsAccountPublicKey(),
-				authority: this.wallet.publicKey,
-				insuranceFundVault: spotMarketAccount.insuranceFund.vault,
-				driftSigner: this.getSignerPublicKey(),
-				userTokenAccount: collateralAccountPublicKey,
-				tokenProgram: TOKEN_PROGRAM_ID,
-			},
-			remainingAccounts,
-		});
+		const tx = await this.program.transaction.removeInsuranceFundStake(
+			marketIndex,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					spotMarket: spotMarketAccount.pubkey,
+					insuranceFundStake: ifStakeAccountPublicKey,
+					userStats: this.getUserStatsAccountPublicKey(),
+					authority: this.wallet.publicKey,
+					insuranceFundVault: spotMarketAccount.insuranceFund.vault,
+					driftSigner: this.getSignerPublicKey(),
+					userTokenAccount: collateralAccountPublicKey,
+					tokenProgram: TOKEN_PROGRAM_ID,
+				},
+				remainingAccounts,
+			}
+		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
 	}
 
 	public async settleRevenueToInsuranceFund(
@@ -3638,24 +3704,30 @@ export class DriftClient {
 			writableSpotMarketIndexes: [marketIndex],
 		});
 
-		return await this.program.rpc.settleRevenueToInsuranceFund(marketIndex, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				spotMarket: spotMarketAccount.pubkey,
-				spotMarketVault: spotMarketAccount.vault,
-				driftSigner: this.getSignerPublicKey(),
-				insuranceFundVault: spotMarketAccount.insuranceFund.vault,
-				tokenProgram: TOKEN_PROGRAM_ID,
-			},
-			remainingAccounts,
-		});
+		const tx = await this.program.transaction.settleRevenueToInsuranceFund(
+			marketIndex,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					spotMarket: spotMarketAccount.pubkey,
+					spotMarketVault: spotMarketAccount.vault,
+					driftSigner: this.getSignerPublicKey(),
+					insuranceFundVault: spotMarketAccount.insuranceFund.vault,
+					tokenProgram: TOKEN_PROGRAM_ID,
+				},
+				remainingAccounts,
+			}
+		);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+		return txSig;
 	}
 
 	public async resolvePerpPnlDeficit(
 		spotMarketIndex: number,
 		perpMarketIndex: number
 	): Promise<TransactionSignature> {
-		const { txSig } = await this.txSender.send(
+		const { txSig } = await this.sendTransaction(
 			wrapInTx(
 				await this.getResolvePerpPnlDeficitIx(spotMarketIndex, perpMarketIndex)
 			),
@@ -3694,4 +3766,13 @@ export class DriftClient {
 			}
 		);
 	}
+
+	sendTransaction(
+		tx: Transaction,
+		additionalSigners?: Array<Signer>,
+		opts?: ConfirmOptions,
+		preSigned?: boolean
+	): Promise<TxSigAndSlot> {
+		return this.txSender.send(tx, additionalSigners, opts, preSigned);
+	}
 }