@drift-labs/sdk 2.65.0-beta.9 → 2.66.0-beta.1

package/src/adminClient.ts

@@ -51,7 +51,7 @@ export class AdminClient extends DriftClient {
 			this.program.programId
 		);
 
-		const initializeTx = await this.program.transaction.initialize({
+		const initializeIx = await this.program.instruction.initialize({
 			accounts: {
 				admin: this.wallet.publicKey,
 				state: driftStatePublicKey,
@@ -63,13 +63,11 @@ export class AdminClient extends DriftClient {
 			},
 		});
 
-		const { txSig: initializeTxSig } = await super.sendTransaction(
-			initializeTx,
-			[],
-			this.opts
-		);
+		const tx = await this.buildTransaction(initializeIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
-		return [initializeTxSig];
+		return [txSig];
 	}
 
 	public async initializeSpotMarket(
@@ -105,7 +103,7 @@ export class AdminClient extends DriftClient {
 		);
 
 		const nameBuffer = encodeName(name);
-		const initializeTx = await this.program.transaction.initializeSpotMarket(
+		const initializeIx = await this.program.instruction.initializeSpotMarket(
 			optimalUtilization,
 			optimalRate,
 			maxRate,
@@ -135,7 +133,11 @@ export class AdminClient extends DriftClient {
 			}
 		);
 
-		const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
+		const tx = await this.buildTransaction(initializeIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		// const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
 
 		await this.accountSubscriber.addSpotMarket(spotMarketIndex);
 		await this.accountSubscriber.addOracle({
@@ -161,26 +163,30 @@ export class AdminClient extends DriftClient {
 			serumMarket
 		);
 
-		const tx = await this.program.transaction.initializeSerumFulfillmentConfig(
-			marketIndex,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
-					quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
-					driftSigner: this.getSignerPublicKey(),
-					serumProgram,
-					serumMarket,
-					serumOpenOrders,
-					rent: SYSVAR_RENT_PUBKEY,
-					systemProgram: anchor.web3.SystemProgram.programId,
-					serumFulfillmentConfig,
-				},
-			}
-		);
+		const initializeIx =
+			await this.program.instruction.initializeSerumFulfillmentConfig(
+				marketIndex,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
+						quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
+						driftSigner: this.getSignerPublicKey(),
+						serumProgram,
+						serumMarket,
+						serumOpenOrders,
+						rent: SYSVAR_RENT_PUBKEY,
+						systemProgram: anchor.web3.SystemProgram.programId,
+						serumFulfillmentConfig,
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(initializeIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -193,8 +199,8 @@ export class AdminClient extends DriftClient {
 			phoenixMarket
 		);
 
-		const tx =
-			await this.program.transaction.initializePhoenixFulfillmentConfig(
+		const initializeIx =
+			await this.program.instruction.initializePhoenixFulfillmentConfig(
 				marketIndex,
 				{
 					accounts: {
@@ -212,7 +218,10 @@ export class AdminClient extends DriftClient {
 				}
 			);
 
+		const tx = await this.buildTransaction(initializeIx);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -237,8 +246,8 @@ export class AdminClient extends DriftClient {
 		);
 
 		const nameBuffer = encodeName(name);
-		const initializeMarketTx =
-			await this.program.transaction.initializePerpMarket(
+		const initializeMarketIx =
+			await this.program.instruction.initializePerpMarket(
 				marketIndex,
 				baseAssetReserve,
 				quoteAssetReserve,
@@ -261,11 +270,9 @@ export class AdminClient extends DriftClient {
 					},
 				}
 			);
-		const { txSig } = await this.sendTransaction(
-			initializeMarketTx,
-			[],
-			this.opts
-		);
+		const tx = await this.buildTransaction(initializeMarketIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		while (this.getStateAccount().numberOfMarkets <= currentPerpMarketIndex) {
 			await this.fetchAccounts();
@@ -288,8 +295,8 @@ export class AdminClient extends DriftClient {
 			marketIndex
 		);
 
-		const deleteInitializeMarketTx =
-			await this.program.transaction.deleteInitializedPerpMarket(marketIndex, {
+		const deleteInitializeMarketIx =
+			await this.program.instruction.deleteInitializedPerpMarket(marketIndex, {
 				accounts: {
 					state: await this.getStatePublicKey(),
 					admin: this.wallet.publicKey,
@@ -297,11 +304,9 @@ export class AdminClient extends DriftClient {
 				},
 			});
 
-		const { txSig } = await this.sendTransaction(
-			deleteInitializeMarketTx,
-			[],
-			this.opts
-		);
+		const tx = await this.buildTransaction(deleteInitializeMarketIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		return txSig;
 	}
@@ -321,7 +326,7 @@ export class AdminClient extends DriftClient {
 			sqrtK = squareRootBN(baseAssetReserve.mul(quoteAssetReserve));
 		}
 
-		const tx = await this.program.transaction.moveAmmPrice(
+		const moveAmmPriceIx = await this.program.instruction.moveAmmPrice(
 			baseAssetReserve,
 			quoteAssetReserve,
 			sqrtK,
@@ -334,7 +339,10 @@ export class AdminClient extends DriftClient {
 			}
 		);
 
+		const tx = await this.buildTransaction(moveAmmPriceIx);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -342,7 +350,7 @@ export class AdminClient extends DriftClient {
 		perpMarketIndex: number,
 		sqrtK: BN
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateK(sqrtK, {
+		const updateKIx = await this.program.instruction.updateK(sqrtK, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				admin: this.wallet.publicKey,
@@ -354,7 +362,10 @@ export class AdminClient extends DriftClient {
 			},
 		});
 
+		const tx = await this.buildTransaction(updateKIx);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -368,19 +379,23 @@ export class AdminClient extends DriftClient {
 			perpMarketIndex
 		);
 
-		const tx = await this.program.transaction.recenterPerpMarketAmm(
-			pegMultiplier,
-			sqrtK,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					admin: this.wallet.publicKey,
-					perpMarket: marketPublicKey,
-				},
-			}
-		);
+		const recenterPerpMarketAmmIx =
+			await this.program.instruction.recenterPerpMarketAmm(
+				pegMultiplier,
+				sqrtK,
+				{
+					accounts: {
+						state: await this.getStatePublicKey(),
+						admin: this.wallet.publicKey,
+						perpMarket: marketPublicKey,
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(recenterPerpMarketAmmIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -430,7 +445,7 @@ export class AdminClient extends DriftClient {
 			perpMarketIndex
 		);
 
-		const tx = await this.program.transaction.moveAmmPrice(
+		const moveAmmPriceIx = await this.program.instruction.moveAmmPrice(
 			newBaseAssetAmount,
 			newQuoteAssetAmount,
 			perpMarket.amm.sqrtK,
@@ -443,7 +458,10 @@ export class AdminClient extends DriftClient {
 			}
 		);
 
+		const tx = await this.buildTransaction(moveAmmPriceIx);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -457,15 +475,22 @@ export class AdminClient extends DriftClient {
 		);
 		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
 
-		const tx = await this.program.transaction.repegAmmCurve(newPeg, {
-			accounts: {
-				state: await this.getStatePublicKey(),
-				admin: this.wallet.publicKey,
-				oracle: ammData.oracle,
-				perpMarket: perpMarketPublicKey,
-			},
-		});
+		const repegAmmCurveIx = await this.program.instruction.repegAmmCurve(
+			newPeg,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					admin: this.wallet.publicKey,
+					oracle: ammData.oracle,
+					perpMarket: perpMarketPublicKey,
+				},
+			}
+		);
+
+		const tx = await this.buildTransaction(repegAmmCurveIx);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -514,9 +539,8 @@ export class AdminClient extends DriftClient {
 	): Promise<TransactionSignature> {
 		const spotMarket = this.getQuoteSpotMarketAccount();
 
-		const tx = await this.program.transaction.depositIntoPerpMarketFeePool(
-			amount,
-			{
+		const depositIntoPerpMarketFeePoolIx =
+			await this.program.instruction.depositIntoPerpMarketFeePool(amount, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
@@ -530,22 +554,27 @@ export class AdminClient extends DriftClient {
 					spotMarketVault: spotMarket.vault,
 					tokenProgram: TOKEN_PROGRAM_ID,
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(depositIntoPerpMarketFeePoolIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
 	public async updateAdmin(admin: PublicKey): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateAdmin(admin, {
+		const updateAdminIx = await this.program.instruction.updateAdmin(admin, {
 			accounts: {
 				admin: this.wallet.publicKey,
 				state: await this.getStatePublicKey(),
 			},
 		});
 
+		const tx = await this.buildTransaction(updateAdminIx);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -595,22 +624,26 @@ export class AdminClient extends DriftClient {
 		marginRatioInitial: number,
 		marginRatioMaintenance: number
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updatePerpMarketMarginRatio(
-			marginRatioInitial,
-			marginRatioMaintenance,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					perpMarket: await getPerpMarketPublicKey(
-						this.program.programId,
-						perpMarketIndex
-					),
-				},
-			}
-		);
+		const updatePerpMarketMarginRatioIx =
+			await this.program.instruction.updatePerpMarketMarginRatio(
+				marginRatioInitial,
+				marginRatioMaintenance,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						perpMarket: await getPerpMarketPublicKey(
+							this.program.programId,
+							perpMarketIndex
+						),
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(updatePerpMarketMarginRatioIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -639,9 +672,8 @@ export class AdminClient extends DriftClient {
 		perpMarketIndex: number,
 		baseSpread: number
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updatePerpMarketBaseSpread(
-			baseSpread,
-			{
+		const updatePerpMarketBaseSpreadIx =
+			await this.program.instruction.updatePerpMarketBaseSpread(baseSpread, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
@@ -650,10 +682,12 @@ export class AdminClient extends DriftClient {
 						perpMarketIndex
 					),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updatePerpMarketBaseSpreadIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -661,9 +695,8 @@ export class AdminClient extends DriftClient {
 		perpMarketIndex: number,
 		ammJitIntensity: number
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateAmmJitIntensity(
-			ammJitIntensity,
-			{
+		const updateAmmJitIntensityIx =
+			await this.program.instruction.updateAmmJitIntensity(ammJitIntensity, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
@@ -672,10 +705,12 @@ export class AdminClient extends DriftClient {
 						perpMarketIndex
 					),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updateAmmJitIntensityIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -685,18 +720,22 @@ export class AdminClient extends DriftClient {
 	): Promise<TransactionSignature> {
 		const nameBuffer = encodeName(name);
 
-		const tx = await this.program.transaction.updatePerpMarketName(nameBuffer, {
-			accounts: {
-				admin: this.wallet.publicKey,
-				state: await this.getStatePublicKey(),
-				perpMarket: await getPerpMarketPublicKey(
-					this.program.programId,
-					perpMarketIndex
-				),
-			},
-		});
+		const updatePerpMarketNameIx =
+			await this.program.instruction.updatePerpMarketName(nameBuffer, {
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			});
+
+		const tx = await this.buildTransaction(updatePerpMarketNameIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -757,31 +796,36 @@ export class AdminClient extends DriftClient {
 	public async updatePerpFeeStructure(
 		feeStructure: FeeStructure
 	): Promise<TransactionSignature> {
-		const tx = this.program.transaction.updatePerpFeeStructure(feeStructure, {
-			accounts: {
-				admin: this.wallet.publicKey,
-				state: await this.getStatePublicKey(),
-			},
-		});
+		const updatePerpFeeStructureIx =
+			this.program.instruction.updatePerpFeeStructure(feeStructure, {
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			});
+
+		const tx = await this.buildTransaction(updatePerpFeeStructureIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
 	public async updateSpotFeeStructure(
 		feeStructure: FeeStructure
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateSpotFeeStructure(
-			feeStructure,
-			{
+		const updateSpotFeeStructureIx =
+			await this.program.instruction.updateSpotFeeStructure(feeStructure, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updateSpotFeeStructureIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -830,17 +874,18 @@ export class AdminClient extends DriftClient {
 	public async updateOracleGuardRails(
 		oracleGuardRails: OracleGuardRails
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateOracleGuardRails(
-			oracleGuardRails,
-			{
+		const updateOracleGuardRailsIx =
+			await this.program.instruction.updateOracleGuardRails(oracleGuardRails, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updateOracleGuardRailsIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -890,21 +935,25 @@ export class AdminClient extends DriftClient {
 		spotMarketIndex: number,
 		withdrawGuardThreshold: BN
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateWithdrawGuardThreshold(
-			withdrawGuardThreshold,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					spotMarket: await getSpotMarketPublicKey(
-						this.program.programId,
-						spotMarketIndex
-					),
-				},
-			}
-		);
+		const updateWithdrawGuardThresholdIx =
+			await this.program.instruction.updateWithdrawGuardThreshold(
+				withdrawGuardThreshold,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						spotMarket: await getSpotMarketPublicKey(
+							this.program.programId,
+							spotMarketIndex
+						),
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(updateWithdrawGuardThresholdIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -913,23 +962,27 @@ export class AdminClient extends DriftClient {
 		userIfFactor: BN,
 		totalIfFactor: BN
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateSpotMarketIfFactor(
-			spotMarketIndex,
-			userIfFactor,
-			totalIfFactor,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					spotMarket: await getSpotMarketPublicKey(
-						this.program.programId,
-						spotMarketIndex
-					),
-				},
-			}
-		);
+		const updateSpotMarketIfFactorIx =
+			await this.program.instruction.updateSpotMarketIfFactor(
+				spotMarketIndex,
+				userIfFactor,
+				totalIfFactor,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						spotMarket: await getSpotMarketPublicKey(
+							this.program.programId,
+							spotMarketIndex
+						),
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(updateSpotMarketIfFactorIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -937,8 +990,8 @@ export class AdminClient extends DriftClient {
 		spotMarketIndex: number,
 		revenueSettlePeriod: BN
 	): Promise<TransactionSignature> {
-		const tx =
-			await this.program.transaction.updateSpotMarketRevenueSettlePeriod(
+		const updateSpotMarketRevenueSettlePeriodIx =
+			await this.program.instruction.updateSpotMarketRevenueSettlePeriod(
 				revenueSettlePeriod,
 				{
 					accounts: {
@@ -952,7 +1005,12 @@ export class AdminClient extends DriftClient {
 				}
 			);
 
+		const tx = await this.buildTransaction(
+			updateSpotMarketRevenueSettlePeriodIx
+		);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -960,21 +1018,25 @@ export class AdminClient extends DriftClient {
 		spotMarketIndex: number,
 		maxTokenDeposits: BN
 	): Promise<TransactionSignature> {
-		const tx = this.program.transaction.updateSpotMarketMaxTokenDeposits(
-			maxTokenDeposits,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					spotMarket: await getSpotMarketPublicKey(
-						this.program.programId,
-						spotMarketIndex
-					),
-				},
-			}
-		);
+		const updateSpotMarketMaxTokenDepositsIx =
+			this.program.instruction.updateSpotMarketMaxTokenDeposits(
+				maxTokenDeposits,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						spotMarket: await getSpotMarketPublicKey(
+							this.program.programId,
+							spotMarketIndex
+						),
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(updateSpotMarketMaxTokenDepositsIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -982,8 +1044,8 @@ export class AdminClient extends DriftClient {
 		spotMarketIndex: number,
 		scaleInitialAssetWeightStart: BN
 	): Promise<TransactionSignature> {
-		const tx =
-			this.program.transaction.updateSpotMarketScaleInitialAssetWeightStart(
+		const updateSpotMarketScaleInitialAssetWeightStartIx =
+			this.program.instruction.updateSpotMarketScaleInitialAssetWeightStart(
 				scaleInitialAssetWeightStart,
 				{
 					accounts: {
@@ -997,7 +1059,12 @@ export class AdminClient extends DriftClient {
 				}
 			);
 
+		const tx = await this.buildTransaction(
+			updateSpotMarketScaleInitialAssetWeightStartIx
+		);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -1005,8 +1072,8 @@ export class AdminClient extends DriftClient {
 		spotMarketIndex: number,
 		insuranceWithdrawEscrowPeriod: BN
 	): Promise<TransactionSignature> {
-		const tx =
-			await this.program.transaction.updateInsuranceFundUnstakingPeriod(
+		const updateInsuranceFundUnstakingPeriodIx =
+			await this.program.instruction.updateInsuranceFundUnstakingPeriod(
 				insuranceWithdrawEscrowPeriod,
 				{
 					accounts: {
@@ -1020,24 +1087,30 @@ export class AdminClient extends DriftClient {
 				}
 			);
 
+		const tx = await this.buildTransaction(
+			updateInsuranceFundUnstakingPeriodIx
+		);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
 	public async updateLpCooldownTime(
 		cooldownTime: BN
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateLpCooldownTime(
-			cooldownTime,
-			{
+		const updateLpCooldownTimeIx =
+			await this.program.instruction.updateLpCooldownTime(cooldownTime, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updateLpCooldownTimeIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -1046,23 +1119,27 @@ export class AdminClient extends DriftClient {
 		oracle: PublicKey,
 		oracleSource: OracleSource
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updatePerpMarketOracle(
-			oracle,
-			oracleSource,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					perpMarket: await getPerpMarketPublicKey(
-						this.program.programId,
-						perpMarketIndex
-					),
-					oracle: oracle,
-				},
-			}
-		);
+		const updatePerpMarketOracleIx =
+			await this.program.instruction.updatePerpMarketOracle(
+				oracle,
+				oracleSource,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						perpMarket: await getPerpMarketPublicKey(
+							this.program.programId,
+							perpMarketIndex
+						),
+						oracle: oracle,
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(updatePerpMarketOracleIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -1071,8 +1148,8 @@ export class AdminClient extends DriftClient {
 		stepSize: BN,
 		tickSize: BN
 	): Promise<TransactionSignature> {
-		const tx =
-			await this.program.transaction.updatePerpMarketStepSizeAndTickSize(
+		const updatePerpMarketStepSizeAndTickSizeIx =
+			await this.program.instruction.updatePerpMarketStepSizeAndTickSize(
 				stepSize,
 				tickSize,
 				{
@@ -1087,7 +1164,12 @@ export class AdminClient extends DriftClient {
 				}
 			);
 
+		const tx = await this.buildTransaction(
+			updatePerpMarketStepSizeAndTickSizeIx
+		);
+
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -1239,31 +1321,36 @@ export class AdminClient extends DriftClient {
 	public async updateWhitelistMint(
 		whitelistMint?: PublicKey
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateWhitelistMint(
-			whitelistMint,
-			{
+		const updateWhitelistMintIx =
+			await this.program.instruction.updateWhitelistMint(whitelistMint, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updateWhitelistMintIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
 	public async updateDiscountMint(
 		discountMint: PublicKey
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateDiscountMint(discountMint, {
-			accounts: {
-				admin: this.wallet.publicKey,
-				state: await this.getStatePublicKey(),
-			},
-		});
+		const updateDiscountMintIx =
+			await this.program.instruction.updateDiscountMint(discountMint, {
+				accounts: {
+					admin: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			});
+
+		const tx = await this.buildTransaction(updateDiscountMintIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -1321,9 +1408,8 @@ export class AdminClient extends DriftClient {
 		spotMarketIndex: number,
 		assetTier: AssetTier
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateSpotMarketAssetTier(
-			assetTier,
-			{
+		const updateSpotMarketAssetTierIx =
+			await this.program.instruction.updateSpotMarketAssetTier(assetTier, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
@@ -1332,10 +1418,12 @@ export class AdminClient extends DriftClient {
 						spotMarketIndex
 					),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updateSpotMarketAssetTierIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
-		const { txSig } = await this.sendTransaction(tx);
 		return txSig;
 	}
 
@@ -1343,9 +1431,8 @@ export class AdminClient extends DriftClient {
 		spotMarketIndex: number,
 		marketStatus: MarketStatus
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateSpotMarketStatus(
-			marketStatus,
-			{
+		const updateSpotMarketStatusIx =
+			await this.program.instruction.updateSpotMarketStatus(marketStatus, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
@@ -1354,10 +1441,12 @@ export class AdminClient extends DriftClient {
 						spotMarketIndex
 					),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updateSpotMarketStatusIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -1365,21 +1454,25 @@ export class AdminClient extends DriftClient {
 		spotMarketIndex: number,
 		pausedOperations: number
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateSpotMarketPausedOperations(
-			pausedOperations,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					spotMarket: await getSpotMarketPublicKey(
-						this.program.programId,
-						spotMarketIndex
-					),
-				},
-			}
-		);
+		const updateSpotMarketPausedOperationsIx =
+			await this.program.instruction.updateSpotMarketPausedOperations(
+				pausedOperations,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						spotMarket: await getSpotMarketPublicKey(
+							this.program.programId,
+							spotMarketIndex
+						),
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(updateSpotMarketPausedOperationsIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -1387,9 +1480,8 @@ export class AdminClient extends DriftClient {
 		perpMarketIndex: number,
 		marketStatus: MarketStatus
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updatePerpMarketStatus(
-			marketStatus,
-			{
+		const updatePerpMarketStatusIx =
+			await this.program.instruction.updatePerpMarketStatus(marketStatus, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
@@ -1398,10 +1490,12 @@ export class AdminClient extends DriftClient {
 						perpMarketIndex
 					),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updatePerpMarketStatusIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -1409,21 +1503,25 @@ export class AdminClient extends DriftClient {
 		perpMarketIndex: number,
 		pausedOperations: number
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updatePerpMarketPausedOperations(
-			pausedOperations,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					perpMarket: await getPerpMarketPublicKey(
-						this.program.programId,
-						perpMarketIndex
-					),
-				},
-			}
-		);
+		const updatePerpMarketPausedOperationsIx =
+			await this.program.instruction.updatePerpMarketPausedOperations(
+				pausedOperations,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						perpMarket: await getPerpMarketPublicKey(
+							this.program.programId,
+							perpMarketIndex
+						),
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(updatePerpMarketPausedOperationsIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
@@ -1431,38 +1529,43 @@ export class AdminClient extends DriftClient {
 		perpMarketIndex: number,
 		contractTier: ContractTier
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updatePerpMarketContractTier(
-			contractTier,
-			{
-				accounts: {
-					admin: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					perpMarket: await getPerpMarketPublicKey(
-						this.program.programId,
-						perpMarketIndex
-					),
-				},
-			}
-		);
+		const updatePerpMarketContractTierIx =
+			await this.program.instruction.updatePerpMarketContractTier(
+				contractTier,
+				{
+					accounts: {
+						admin: this.wallet.publicKey,
+						state: await this.getStatePublicKey(),
+						perpMarket: await getPerpMarketPublicKey(
+							this.program.programId,
+							perpMarketIndex
+						),
+					},
+				}
+			);
+
+		const tx = await this.buildTransaction(updatePerpMarketContractTierIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}
 
 	public async updateExchangeStatus(
 		exchangeStatus: ExchangeStatus
 	): Promise<TransactionSignature> {
-		const tx = await this.program.transaction.updateExchangeStatus(
-			exchangeStatus,
-			{
+		const updateExchangeStatusIx =
+			await this.program.instruction.updateExchangeStatus(exchangeStatus, {
 				accounts: {
 					admin: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
 				},
-			}
-		);
+			});
+
+		const tx = await this.buildTransaction(updateExchangeStatusIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
 		return txSig;
 	}