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

package/src/adminClient.ts

@@ -483,13 +483,27 @@ export class AdminClient extends DriftClient {
 	public async deleteInitializedPerpMarket(
 		marketIndex: number
 	): Promise<TransactionSignature> {
+		const deleteInitializeMarketIx =
+			await this.getDeleteInitializedPerpMarketIx(marketIndex);
+
+		const tx = await this.buildTransaction(deleteInitializeMarketIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getDeleteInitializedPerpMarketIx(
+		marketIndex: number
+	): Promise<TransactionInstruction> {
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			marketIndex
 		);
 
-		const deleteInitializeMarketIx =
-			await this.program.instruction.deleteInitializedPerpMarket(marketIndex, {
+		return await this.program.instruction.deleteInitializedPerpMarket(
+			marketIndex,
+			{
 				accounts: {
 					state: await this.getStatePublicKey(),
 					admin: this.isSubscribed
@@ -497,21 +511,36 @@ export class AdminClient extends DriftClient {
 						: this.wallet.publicKey,
 					perpMarket: perpMarketPublicKey,
 				},
-			});
+			}
+		);
+	}
 
-		const tx = await this.buildTransaction(deleteInitializeMarketIx);
+	public async moveAmmPrice(
+		perpMarketIndex: number,
+		baseAssetReserve: BN,
+		quoteAssetReserve: BN,
+		sqrtK?: BN
+	): Promise<TransactionSignature> {
+		const moveAmmPriceIx = await this.getMoveAmmPriceIx(
+			perpMarketIndex,
+			baseAssetReserve,
+			quoteAssetReserve,
+			sqrtK
+		);
+
+		const tx = await this.buildTransaction(moveAmmPriceIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		return txSig;
 	}
 
-	public async moveAmmPrice(
+	public async getMoveAmmPriceIx(
 		perpMarketIndex: number,
 		baseAssetReserve: BN,
 		quoteAssetReserve: BN,
 		sqrtK?: BN
-	): Promise<TransactionSignature> {
+	): Promise<TransactionInstruction> {
 		const marketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
@@ -521,7 +550,7 @@ export class AdminClient extends DriftClient {
 			sqrtK = squareRootBN(baseAssetReserve.mul(quoteAssetReserve));
 		}
 
-		const moveAmmPriceIx = await this.program.instruction.moveAmmPrice(
+		return await this.program.instruction.moveAmmPrice(
 			baseAssetReserve,
 			quoteAssetReserve,
 			sqrtK,
@@ -535,19 +564,26 @@ export class AdminClient extends DriftClient {
 				},
 			}
 		);
+	}
 
-		const tx = await this.buildTransaction(moveAmmPriceIx);
+	public async updateK(
+		perpMarketIndex: number,
+		sqrtK: BN
+	): Promise<TransactionSignature> {
+		const updateKIx = await this.getUpdateKIx(perpMarketIndex, sqrtK);
+
+		const tx = await this.buildTransaction(updateKIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		return txSig;
 	}
 
-	public async updateK(
+	public async getUpdateKIx(
 		perpMarketIndex: number,
 		sqrtK: BN
-	): Promise<TransactionSignature> {
-		const updateKIx = await this.program.instruction.updateK(sqrtK, {
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateK(sqrtK, {
 			accounts: {
 				state: await this.getStatePublicKey(),
 				admin: this.isSubscribed
@@ -560,44 +596,49 @@ export class AdminClient extends DriftClient {
 				oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
 			},
 		});
+	}
 
-		const tx = await this.buildTransaction(updateKIx);
+	public async recenterPerpMarketAmm(
+		perpMarketIndex: number,
+		pegMultiplier: BN,
+		sqrtK: BN
+	): Promise<TransactionSignature> {
+		const recenterPerpMarketAmmIx = await this.getRecenterPerpMarketAmmIx(
+			perpMarketIndex,
+			pegMultiplier,
+			sqrtK
+		);
+
+		const tx = await this.buildTransaction(recenterPerpMarketAmmIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		return txSig;
 	}
 
-	public async recenterPerpMarketAmm(
+	public async getRecenterPerpMarketAmmIx(
 		perpMarketIndex: number,
 		pegMultiplier: BN,
 		sqrtK: BN
-	): Promise<TransactionSignature> {
+	): Promise<TransactionInstruction> {
 		const marketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
 		);
 
-		const recenterPerpMarketAmmIx =
-			await this.program.instruction.recenterPerpMarketAmm(
-				pegMultiplier,
-				sqrtK,
-				{
-					accounts: {
-						state: await this.getStatePublicKey(),
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						perpMarket: marketPublicKey,
-					},
-				}
-			);
-
-		const tx = await this.buildTransaction(recenterPerpMarketAmmIx);
-
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
-		return txSig;
+		return await this.program.instruction.recenterPerpMarketAmm(
+			pegMultiplier,
+			sqrtK,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					perpMarket: marketPublicKey,
+				},
+			}
+		);
 	}
 
 	public async updatePerpMarketConcentrationScale(
@@ -605,20 +646,9 @@ export class AdminClient extends DriftClient {
 		concentrationScale: BN
 	): Promise<TransactionSignature> {
 		const updatePerpMarketConcentrationCoefIx =
-			await this.program.instruction.updatePerpMarketConcentrationCoef(
-				concentrationScale,
-				{
-					accounts: {
-						state: await this.getStatePublicKey(),
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+			await this.getUpdatePerpMarketConcentrationScaleIx(
+				perpMarketIndex,
+				concentrationScale
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketConcentrationCoefIx);
@@ -628,10 +658,47 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketConcentrationScaleIx(
+		perpMarketIndex: number,
+		concentrationScale: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketConcentrationCoef(
+			concentrationScale,
+			{
+				accounts: {
+					state: await this.getStatePublicKey(),
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async moveAmmToPrice(
 		perpMarketIndex: number,
 		targetPrice: BN
 	): Promise<TransactionSignature> {
+		const moveAmmPriceIx = await this.getMoveAmmToPriceIx(
+			perpMarketIndex,
+			targetPrice
+		);
+
+		const tx = await this.buildTransaction(moveAmmPriceIx);
+
+		const { txSig } = await this.sendTransaction(tx, [], this.opts);
+
+		return txSig;
+	}
+
+	public async getMoveAmmToPriceIx(
+		perpMarketIndex: number,
+		targetPrice: BN
+	): Promise<TransactionInstruction> {
 		const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
 
 		const [direction, tradeSize, _] = calculateTargetPriceTrade(
@@ -655,7 +722,7 @@ export class AdminClient extends DriftClient {
 			perpMarketIndex
 		);
 
-		const moveAmmPriceIx = await this.program.instruction.moveAmmPrice(
+		return await this.program.instruction.moveAmmPrice(
 			newBaseAssetAmount,
 			newQuoteAssetAmount,
 			perpMarket.amm.sqrtK,
@@ -669,36 +736,15 @@ export class AdminClient extends DriftClient {
 				},
 			}
 		);
-
-		const tx = await this.buildTransaction(moveAmmPriceIx);
-
-		const { txSig } = await this.sendTransaction(tx, [], this.opts);
-
-		return txSig;
 	}
 
 	public async repegAmmCurve(
 		newPeg: BN,
 		perpMarketIndex: number
 	): Promise<TransactionSignature> {
-		const perpMarketPublicKey = await getPerpMarketPublicKey(
-			this.program.programId,
-			perpMarketIndex
-		);
-		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
-
-		const repegAmmCurveIx = await this.program.instruction.repegAmmCurve(
+		const repegAmmCurveIx = await this.getRepegAmmCurveIx(
 			newPeg,
-			{
-				accounts: {
-					state: await this.getStatePublicKey(),
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					oracle: ammData.oracle,
-					perpMarket: perpMarketPublicKey,
-				},
-			}
+			perpMarketIndex
 		);
 
 		const tx = await this.buildTransaction(repegAmmCurveIx);
@@ -708,26 +754,33 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updatePerpMarketAmmOracleTwap(
+	public async getRepegAmmCurveIx(
+		newPeg: BN,
 		perpMarketIndex: number
-	): Promise<TransactionSignature> {
-		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+	): Promise<TransactionInstruction> {
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
 		);
+		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+
+		return await this.program.instruction.repegAmmCurve(newPeg, {
+			accounts: {
+				state: await this.getStatePublicKey(),
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				oracle: ammData.oracle,
+				perpMarket: perpMarketPublicKey,
+			},
+		});
+	}
 
+	public async updatePerpMarketAmmOracleTwap(
+		perpMarketIndex: number
+	): Promise<TransactionSignature> {
 		const updatePerpMarketAmmOracleTwapIx =
-			await this.program.instruction.updatePerpMarketAmmOracleTwap({
-				accounts: {
-					state: await this.getStatePublicKey(),
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					oracle: ammData.oracle,
-					perpMarket: perpMarketPublicKey,
-				},
-			});
+			await this.getUpdatePerpMarketAmmOracleTwapIx(perpMarketIndex);
 
 		const tx = await this.buildTransaction(updatePerpMarketAmmOracleTwapIx);
 
@@ -736,26 +789,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async resetPerpMarketAmmOracleTwap(
+	public async getUpdatePerpMarketAmmOracleTwapIx(
 		perpMarketIndex: number
-	): Promise<TransactionSignature> {
+	): Promise<TransactionInstruction> {
 		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
 		);
 
+		return await this.program.instruction.updatePerpMarketAmmOracleTwap({
+			accounts: {
+				state: await this.getStatePublicKey(),
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				oracle: ammData.oracle,
+				perpMarket: perpMarketPublicKey,
+			},
+		});
+	}
+
+	public async resetPerpMarketAmmOracleTwap(
+		perpMarketIndex: number
+	): Promise<TransactionSignature> {
 		const resetPerpMarketAmmOracleTwapIx =
-			await this.program.instruction.resetPerpMarketAmmOracleTwap({
-				accounts: {
-					state: await this.getStatePublicKey(),
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					oracle: ammData.oracle,
-					perpMarket: perpMarketPublicKey,
-				},
-			});
+			await this.getResetPerpMarketAmmOracleTwapIx(perpMarketIndex);
 
 		const tx = await this.buildTransaction(resetPerpMarketAmmOracleTwapIx);
 
@@ -764,31 +823,38 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getResetPerpMarketAmmOracleTwapIx(
+		perpMarketIndex: number
+	): Promise<TransactionInstruction> {
+		const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
+			this.program.programId,
+			perpMarketIndex
+		);
+
+		return await this.program.instruction.resetPerpMarketAmmOracleTwap({
+			accounts: {
+				state: await this.getStatePublicKey(),
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				oracle: ammData.oracle,
+				perpMarket: perpMarketPublicKey,
+			},
+		});
+	}
+
 	public async depositIntoPerpMarketFeePool(
 		perpMarketIndex: number,
 		amount: BN,
 		sourceVault: PublicKey
 	): Promise<TransactionSignature> {
-		const spotMarket = this.getQuoteSpotMarketAccount();
-
 		const depositIntoPerpMarketFeePoolIx =
-			await this.program.instruction.depositIntoPerpMarketFeePool(amount, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					perpMarket: await getPerpMarketPublicKey(
-						this.program.programId,
-						perpMarketIndex
-					),
-					sourceVault,
-					driftSigner: this.getSignerPublicKey(),
-					quoteSpotMarket: spotMarket.pubkey,
-					spotMarketVault: spotMarket.vault,
-					tokenProgram: TOKEN_PROGRAM_ID,
-				},
-			});
+			await this.getDepositIntoPerpMarketFeePoolIx(
+				perpMarketIndex,
+				amount,
+				sourceVault
+			);
 
 		const tx = await this.buildTransaction(depositIntoPerpMarketFeePoolIx);
 
@@ -797,15 +863,34 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updateAdmin(admin: PublicKey): Promise<TransactionSignature> {
-		const updateAdminIx = await this.program.instruction.updateAdmin(admin, {
+	public async getDepositIntoPerpMarketFeePoolIx(
+		perpMarketIndex: number,
+		amount: BN,
+		sourceVault: PublicKey
+	): Promise<TransactionInstruction> {
+		const spotMarket = this.getQuoteSpotMarketAccount();
+
+		return await this.program.instruction.depositIntoPerpMarketFeePool(amount, {
 			accounts: {
 				admin: this.isSubscribed
 					? this.getStateAccount().admin
 					: this.wallet.publicKey,
 				state: await this.getStatePublicKey(),
+				perpMarket: await getPerpMarketPublicKey(
+					this.program.programId,
+					perpMarketIndex
+				),
+				sourceVault,
+				driftSigner: this.getSignerPublicKey(),
+				quoteSpotMarket: spotMarket.pubkey,
+				spotMarketVault: spotMarket.vault,
+				tokenProgram: TOKEN_PROGRAM_ID,
 			},
 		});
+	}
+
+	public async updateAdmin(admin: PublicKey): Promise<TransactionSignature> {
+		const updateAdminIx = await this.getUpdateAdminIx(admin);
 
 		const tx = await this.buildTransaction(updateAdminIx);
 
@@ -814,28 +899,27 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateAdminIx(
+		admin: PublicKey
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateAdmin(admin, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+			},
+		});
+	}
+
 	public async updatePerpMarketCurveUpdateIntensity(
 		perpMarketIndex: number,
 		curveUpdateIntensity: number
 	): Promise<TransactionSignature> {
-		// assert(curveUpdateIntensity >= 0 && curveUpdateIntensity <= 100);
-		// assert(Number.isInteger(curveUpdateIntensity));
-
 		const updatePerpMarketCurveUpdateIntensityIx =
-			await this.program.instruction.updatePerpMarketCurveUpdateIntensity(
-				curveUpdateIntensity,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+			await this.getUpdatePerpMarketCurveUpdateIntensityIx(
+				perpMarketIndex,
+				curveUpdateIntensity
 			);
 
 		const tx = await this.buildTransaction(
@@ -847,57 +931,77 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updatePerpMarketTargetBaseAssetAmountPerLp(
+	public async getUpdatePerpMarketCurveUpdateIntensityIx(
 		perpMarketIndex: number,
-		targetBaseAssetAmountPerLP: number
-	): Promise<TransactionSignature> {
-		const updatePerpMarketTargetBaseAssetAmountPerLpIx =
-			await this.program.instruction.updatePerpMarketTargetBaseAssetAmountPerLp(
-				targetBaseAssetAmountPerLP,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
-			);
-
-		const tx = await this.buildTransaction(
-			updatePerpMarketTargetBaseAssetAmountPerLpIx
-		);
+		curveUpdateIntensity: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketCurveUpdateIntensity(
+			curveUpdateIntensity,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
+	public async updatePerpMarketTargetBaseAssetAmountPerLp(
+		perpMarketIndex: number,
+		targetBaseAssetAmountPerLP: number
+	): Promise<TransactionSignature> {
+		const updatePerpMarketTargetBaseAssetAmountPerLpIx =
+			await this.getUpdatePerpMarketTargetBaseAssetAmountPerLpIx(
+				perpMarketIndex,
+				targetBaseAssetAmountPerLP
+			);
+
+		const tx = await this.buildTransaction(
+			updatePerpMarketTargetBaseAssetAmountPerLpIx
+		);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
 
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketTargetBaseAssetAmountPerLpIx(
+		perpMarketIndex: number,
+		targetBaseAssetAmountPerLP: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketTargetBaseAssetAmountPerLp(
+			targetBaseAssetAmountPerLP,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketMarginRatio(
 		perpMarketIndex: number,
 		marginRatioInitial: number,
 		marginRatioMaintenance: number
 	): Promise<TransactionSignature> {
 		const updatePerpMarketMarginRatioIx =
-			await this.program.instruction.updatePerpMarketMarginRatio(
+			await this.getUpdatePerpMarketMarginRatioIx(
+				perpMarketIndex,
 				marginRatioInitial,
-				marginRatioMaintenance,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+				marginRatioMaintenance
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketMarginRatioIx);
@@ -907,27 +1011,39 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketMarginRatioIx(
+		perpMarketIndex: number,
+		marginRatioInitial: number,
+		marginRatioMaintenance: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketMarginRatio(
+			marginRatioInitial,
+			marginRatioMaintenance,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketImfFactor(
 		perpMarketIndex: number,
 		imfFactor: number,
 		unrealizedPnlImfFactor: number
 	): Promise<TransactionSignature> {
 		const updatePerpMarketImfFactorIx =
-			await this.program.instruction.updatePerpMarketImfFactor(
+			await this.getUpdatePerpMarketImfFactorIx(
+				perpMarketIndex,
 				imfFactor,
-				unrealizedPnlImfFactor,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+				unrealizedPnlImfFactor
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketImfFactorIx);
@@ -937,12 +1053,15 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updatePerpMarketBaseSpread(
+	public async getUpdatePerpMarketImfFactorIx(
 		perpMarketIndex: number,
-		baseSpread: number
-	): Promise<TransactionSignature> {
-		const updatePerpMarketBaseSpreadIx =
-			await this.program.instruction.updatePerpMarketBaseSpread(baseSpread, {
+		imfFactor: number,
+		unrealizedPnlImfFactor: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketImfFactor(
+			imfFactor,
+			unrealizedPnlImfFactor,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
@@ -953,7 +1072,16 @@ export class AdminClient extends DriftClient {
 						perpMarketIndex
 					),
 				},
-			});
+			}
+		);
+	}
+
+	public async updatePerpMarketBaseSpread(
+		perpMarketIndex: number,
+		baseSpread: number
+	): Promise<TransactionSignature> {
+		const updatePerpMarketBaseSpreadIx =
+			await this.getUpdatePerpMarketBaseSpreadIx(perpMarketIndex, baseSpread);
 
 		const tx = await this.buildTransaction(updatePerpMarketBaseSpreadIx);
 
@@ -962,12 +1090,13 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updateAmmJitIntensity(
+	public async getUpdatePerpMarketBaseSpreadIx(
 		perpMarketIndex: number,
-		ammJitIntensity: number
-	): Promise<TransactionSignature> {
-		const updateAmmJitIntensityIx =
-			await this.program.instruction.updateAmmJitIntensity(ammJitIntensity, {
+		baseSpread: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketBaseSpread(
+			baseSpread,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
@@ -978,7 +1107,18 @@ export class AdminClient extends DriftClient {
 						perpMarketIndex
 					),
 				},
-			});
+			}
+		);
+	}
+
+	public async updateAmmJitIntensity(
+		perpMarketIndex: number,
+		ammJitIntensity: number
+	): Promise<TransactionSignature> {
+		const updateAmmJitIntensityIx = await this.getUpdateAmmJitIntensityIx(
+			perpMarketIndex,
+			ammJitIntensity
+		);
 
 		const tx = await this.buildTransaction(updateAmmJitIntensityIx);
 
@@ -987,14 +1127,13 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updatePerpMarketName(
+	public async getUpdateAmmJitIntensityIx(
 		perpMarketIndex: number,
-		name: string
-	): Promise<TransactionSignature> {
-		const nameBuffer = encodeName(name);
-
-		const updatePerpMarketNameIx =
-			await this.program.instruction.updatePerpMarketName(nameBuffer, {
+		ammJitIntensity: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateAmmJitIntensity(
+			ammJitIntensity,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
@@ -1005,7 +1144,18 @@ export class AdminClient extends DriftClient {
 						perpMarketIndex
 					),
 				},
-			});
+			}
+		);
+	}
+
+	public async updatePerpMarketName(
+		perpMarketIndex: number,
+		name: string
+	): Promise<TransactionSignature> {
+		const updatePerpMarketNameIx = await this.getUpdatePerpMarketNameIx(
+			perpMarketIndex,
+			name
+		);
 
 		const tx = await this.buildTransaction(updatePerpMarketNameIx);
 
@@ -1014,25 +1164,33 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketNameIx(
+		perpMarketIndex: number,
+		name: string
+	): Promise<TransactionInstruction> {
+		const nameBuffer = encodeName(name);
+		return await this.program.instruction.updatePerpMarketName(nameBuffer, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				perpMarket: await getPerpMarketPublicKey(
+					this.program.programId,
+					perpMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updateSpotMarketName(
 		spotMarketIndex: number,
 		name: string
 	): Promise<TransactionSignature> {
-		const nameBuffer = encodeName(name);
-
-		const updateSpotMarketNameIx =
-			await this.program.instruction.updateSpotMarketName(nameBuffer, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					spotMarket: await getSpotMarketPublicKey(
-						this.program.programId,
-						spotMarketIndex
-					),
-				},
-			});
+		const updateSpotMarketNameIx = await this.getUpdateSpotMarketNameIx(
+			spotMarketIndex,
+			name
+		);
 
 		const tx = await this.buildTransaction(updateSpotMarketNameIx);
 
@@ -1041,25 +1199,31 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketNameIx(
+		spotMarketIndex: number,
+		name: string
+	): Promise<TransactionInstruction> {
+		const nameBuffer = encodeName(name);
+		return await this.program.instruction.updateSpotMarketName(nameBuffer, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				spotMarket: await getSpotMarketPublicKey(
+					this.program.programId,
+					spotMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updatePerpMarketPerLpBase(
 		perpMarketIndex: number,
 		perLpBase: number
 	): Promise<TransactionSignature> {
-		const perpMarketPublicKey = await getPerpMarketPublicKey(
-			this.program.programId,
-			perpMarketIndex
-		);
-
 		const updatePerpMarketPerLpBaseIx =
-			await this.program.instruction.updatePerpMarketPerLpBase(perLpBase, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					perpMarket: perpMarketPublicKey,
-				},
-			});
+			await this.getUpdatePerpMarketPerLpBaseIx(perpMarketIndex, perLpBase);
 
 		const tx = await this.buildTransaction(updatePerpMarketPerLpBaseIx);
 
@@ -1068,25 +1232,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updatePerpMarketMaxSpread(
+	public async getUpdatePerpMarketPerLpBaseIx(
 		perpMarketIndex: number,
-		maxSpread: number
-	): Promise<TransactionSignature> {
+		perLpBase: number
+	): Promise<TransactionInstruction> {
 		const perpMarketPublicKey = await getPerpMarketPublicKey(
 			this.program.programId,
 			perpMarketIndex
 		);
 
+		return await this.program.instruction.updatePerpMarketPerLpBase(perLpBase, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				perpMarket: perpMarketPublicKey,
+			},
+		});
+	}
+
+	public async updatePerpMarketMaxSpread(
+		perpMarketIndex: number,
+		maxSpread: number
+	): Promise<TransactionSignature> {
 		const updatePerpMarketMaxSpreadIx =
-			await this.program.instruction.updatePerpMarketMaxSpread(maxSpread, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					perpMarket: perpMarketPublicKey,
-				},
-			});
+			await this.getUpdatePerpMarketMaxSpreadIx(perpMarketIndex, maxSpread);
 
 		const tx = await this.buildTransaction(updatePerpMarketMaxSpreadIx);
 
@@ -1095,18 +1266,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketMaxSpreadIx(
+		perpMarketIndex: number,
+		maxSpread: number
+	): Promise<TransactionInstruction> {
+		const perpMarketPublicKey = await getPerpMarketPublicKey(
+			this.program.programId,
+			perpMarketIndex
+		);
+
+		return await this.program.instruction.updatePerpMarketMaxSpread(maxSpread, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				perpMarket: perpMarketPublicKey,
+			},
+		});
+	}
+
 	public async updatePerpFeeStructure(
 		feeStructure: FeeStructure
 	): Promise<TransactionSignature> {
-		const updatePerpFeeStructureIx =
-			this.program.instruction.updatePerpFeeStructure(feeStructure, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-				},
-			});
+		const updatePerpFeeStructureIx = await this.getUpdatePerpFeeStructureIx(
+			feeStructure
+		);
 
 		const tx = await this.buildTransaction(updatePerpFeeStructureIx);
 
@@ -1115,18 +1300,25 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpFeeStructureIx(
+		feeStructure: FeeStructure
+	): Promise<TransactionInstruction> {
+		return this.program.instruction.updatePerpFeeStructure(feeStructure, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+			},
+		});
+	}
+
 	public async updateSpotFeeStructure(
 		feeStructure: FeeStructure
 	): Promise<TransactionSignature> {
-		const updateSpotFeeStructureIx =
-			await this.program.instruction.updateSpotFeeStructure(feeStructure, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-				},
-			});
+		const updateSpotFeeStructureIx = await this.getUpdateSpotFeeStructureIx(
+			feeStructure
+		);
 
 		const tx = await this.buildTransaction(updateSpotFeeStructureIx);
 
@@ -1135,21 +1327,24 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotFeeStructureIx(
+		feeStructure: FeeStructure
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotFeeStructure(feeStructure, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+			},
+		});
+	}
+
 	public async updateInitialPctToLiquidate(
 		initialPctToLiquidate: number
 	): Promise<TransactionSignature> {
 		const updateInitialPctToLiquidateIx =
-			await this.program.instruction.updateInitialPctToLiquidate(
-				initialPctToLiquidate,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-					},
-				}
-			);
+			await this.getUpdateInitialPctToLiquidateIx(initialPctToLiquidate);
 
 		const tx = await this.buildTransaction(updateInitialPctToLiquidateIx);
 
@@ -1158,21 +1353,27 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateInitialPctToLiquidateIx(
+		initialPctToLiquidate: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateInitialPctToLiquidate(
+			initialPctToLiquidate,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updateLiquidationDuration(
 		liquidationDuration: number
 	): Promise<TransactionSignature> {
 		const updateLiquidationDurationIx =
-			await this.program.instruction.updateLiquidationDuration(
-				liquidationDuration,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-					},
-				}
-			);
+			await this.getUpdateLiquidationDurationIx(liquidationDuration);
 
 		const tx = await this.buildTransaction(updateLiquidationDurationIx);
 
@@ -1181,20 +1382,28 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateLiquidationDurationIx(
+		liquidationDuration: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateLiquidationDuration(
+			liquidationDuration,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updateLiquidationMarginBufferRatio(
 		updateLiquidationMarginBufferRatio: number
 	): Promise<TransactionSignature> {
 		const updateLiquidationMarginBufferRatioIx =
-			await this.program.instruction.updateLiquidationMarginBufferRatio(
-				updateLiquidationMarginBufferRatio,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-					},
-				}
+			await this.getUpdateLiquidationMarginBufferRatioIx(
+				updateLiquidationMarginBufferRatio
 			);
 
 		const tx = await this.buildTransaction(
@@ -1206,18 +1415,28 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updateOracleGuardRails(
-		oracleGuardRails: OracleGuardRails
-	): Promise<TransactionSignature> {
-		const updateOracleGuardRailsIx =
-			await this.program.instruction.updateOracleGuardRails(oracleGuardRails, {
+	public async getUpdateLiquidationMarginBufferRatioIx(
+		updateLiquidationMarginBufferRatio: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateLiquidationMarginBufferRatio(
+			updateLiquidationMarginBufferRatio,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
 				},
-			});
+			}
+		);
+	}
+
+	public async updateOracleGuardRails(
+		oracleGuardRails: OracleGuardRails
+	): Promise<TransactionSignature> {
+		const updateOracleGuardRailsIx = await this.getUpdateOracleGuardRailsIx(
+			oracleGuardRails
+		);
 
 		const tx = await this.buildTransaction(updateOracleGuardRailsIx);
 
@@ -1226,21 +1445,27 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateOracleGuardRailsIx(
+		oracleGuardRails: OracleGuardRails
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateOracleGuardRails(
+			oracleGuardRails,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updateStateSettlementDuration(
 		settlementDuration: number
 	): Promise<TransactionSignature> {
 		const updateStateSettlementDurationIx =
-			await this.program.instruction.updateStateSettlementDuration(
-				settlementDuration,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-					},
-				}
-			);
+			await this.getUpdateStateSettlementDurationIx(settlementDuration);
 
 		const tx = await this.buildTransaction(updateStateSettlementDurationIx);
 
@@ -1249,21 +1474,27 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateStateSettlementDurationIx(
+		settlementDuration: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateStateSettlementDuration(
+			settlementDuration,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updateStateMaxNumberOfSubAccounts(
 		maxNumberOfSubAccounts: number
 	): Promise<TransactionSignature> {
 		const updateStateMaxNumberOfSubAccountsIx =
-			await this.program.instruction.updateStateMaxNumberOfSubAccounts(
-				maxNumberOfSubAccounts,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-					},
-				}
-			);
+			await this.getUpdateStateMaxNumberOfSubAccountsIx(maxNumberOfSubAccounts);
 
 		const tx = await this.buildTransaction(updateStateMaxNumberOfSubAccountsIx);
 
@@ -1272,21 +1503,27 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateStateMaxNumberOfSubAccountsIx(
+		maxNumberOfSubAccounts: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateStateMaxNumberOfSubAccounts(
+			maxNumberOfSubAccounts,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updateStateMaxInitializeUserFee(
 		maxInitializeUserFee: number
 	): Promise<TransactionSignature> {
 		const updateStateMaxInitializeUserFeeIx =
-			await this.program.instruction.updateStateMaxInitializeUserFee(
-				maxInitializeUserFee,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-					},
-				}
-			);
+			await this.getUpdateStateMaxInitializeUserFeeIx(maxInitializeUserFee);
 
 		const tx = await this.buildTransaction(updateStateMaxInitializeUserFeeIx);
 
@@ -1295,25 +1532,30 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateStateMaxInitializeUserFeeIx(
+		maxInitializeUserFee: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateStateMaxInitializeUserFee(
+			maxInitializeUserFee,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updateWithdrawGuardThreshold(
 		spotMarketIndex: number,
 		withdrawGuardThreshold: BN
 	): Promise<TransactionSignature> {
 		const updateWithdrawGuardThresholdIx =
-			await this.program.instruction.updateWithdrawGuardThreshold(
-				withdrawGuardThreshold,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+			await this.getUpdateWithdrawGuardThresholdIx(
+				spotMarketIndex,
+				withdrawGuardThreshold
 			);
 
 		const tx = await this.buildTransaction(updateWithdrawGuardThresholdIx);
@@ -1323,29 +1565,37 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateWithdrawGuardThresholdIx(
+		spotMarketIndex: number,
+		withdrawGuardThreshold: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateWithdrawGuardThreshold(
+			withdrawGuardThreshold,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketIfFactor(
 		spotMarketIndex: number,
 		userIfFactor: BN,
 		totalIfFactor: BN
 	): Promise<TransactionSignature> {
-		const updateSpotMarketIfFactorIx =
-			await this.program.instruction.updateSpotMarketIfFactor(
-				spotMarketIndex,
-				userIfFactor,
-				totalIfFactor,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
-			);
+		const updateSpotMarketIfFactorIx = await this.getUpdateSpotMarketIfFactorIx(
+			spotMarketIndex,
+			userIfFactor,
+			totalIfFactor
+		);
 
 		const tx = await this.buildTransaction(updateSpotMarketIfFactorIx);
 
@@ -1354,25 +1604,38 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketIfFactorIx(
+		spotMarketIndex: number,
+		userIfFactor: BN,
+		totalIfFactor: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketIfFactor(
+			spotMarketIndex,
+			userIfFactor,
+			totalIfFactor,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketRevenueSettlePeriod(
 		spotMarketIndex: number,
 		revenueSettlePeriod: BN
 	): Promise<TransactionSignature> {
 		const updateSpotMarketRevenueSettlePeriodIx =
-			await this.program.instruction.updateSpotMarketRevenueSettlePeriod(
-				revenueSettlePeriod,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+			await this.getUpdateSpotMarketRevenueSettlePeriodIx(
+				spotMarketIndex,
+				revenueSettlePeriod
 			);
 
 		const tx = await this.buildTransaction(
@@ -1384,25 +1647,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketRevenueSettlePeriodIx(
+		spotMarketIndex: number,
+		revenueSettlePeriod: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketRevenueSettlePeriod(
+			revenueSettlePeriod,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketMaxTokenDeposits(
 		spotMarketIndex: number,
 		maxTokenDeposits: BN
 	): Promise<TransactionSignature> {
 		const updateSpotMarketMaxTokenDepositsIx =
-			this.program.instruction.updateSpotMarketMaxTokenDeposits(
-				maxTokenDeposits,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+			await this.getUpdateSpotMarketMaxTokenDepositsIx(
+				spotMarketIndex,
+				maxTokenDeposits
 			);
 
 		const tx = await this.buildTransaction(updateSpotMarketMaxTokenDepositsIx);
@@ -1412,25 +1685,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketMaxTokenDepositsIx(
+		spotMarketIndex: number,
+		maxTokenDeposits: BN
+	): Promise<TransactionInstruction> {
+		return this.program.instruction.updateSpotMarketMaxTokenDeposits(
+			maxTokenDeposits,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketScaleInitialAssetWeightStart(
 		spotMarketIndex: number,
 		scaleInitialAssetWeightStart: BN
 	): Promise<TransactionSignature> {
 		const updateSpotMarketScaleInitialAssetWeightStartIx =
-			this.program.instruction.updateSpotMarketScaleInitialAssetWeightStart(
-				scaleInitialAssetWeightStart,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+			await this.getUpdateSpotMarketScaleInitialAssetWeightStartIx(
+				spotMarketIndex,
+				scaleInitialAssetWeightStart
 			);
 
 		const tx = await this.buildTransaction(
@@ -1442,25 +1725,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketScaleInitialAssetWeightStartIx(
+		spotMarketIndex: number,
+		scaleInitialAssetWeightStart: BN
+	): Promise<TransactionInstruction> {
+		return this.program.instruction.updateSpotMarketScaleInitialAssetWeightStart(
+			scaleInitialAssetWeightStart,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateInsuranceFundUnstakingPeriod(
 		spotMarketIndex: number,
 		insuranceWithdrawEscrowPeriod: BN
 	): Promise<TransactionSignature> {
 		const updateInsuranceFundUnstakingPeriodIx =
-			await this.program.instruction.updateInsuranceFundUnstakingPeriod(
-				insuranceWithdrawEscrowPeriod,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+			await this.getUpdateInsuranceFundUnstakingPeriodIx(
+				spotMarketIndex,
+				insuranceWithdrawEscrowPeriod
 			);
 
 		const tx = await this.buildTransaction(
@@ -1472,18 +1765,33 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updateLpCooldownTime(
-		cooldownTime: BN
-	): Promise<TransactionSignature> {
-		const updateLpCooldownTimeIx =
-			await this.program.instruction.updateLpCooldownTime(cooldownTime, {
+	public async getUpdateInsuranceFundUnstakingPeriodIx(
+		spotMarketIndex: number,
+		insuranceWithdrawEscrowPeriod: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateInsuranceFundUnstakingPeriod(
+			insuranceWithdrawEscrowPeriod,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
 				},
-			});
+			}
+		);
+	}
+
+	public async updateLpCooldownTime(
+		cooldownTime: BN
+	): Promise<TransactionSignature> {
+		const updateLpCooldownTimeIx = await this.getUpdateLpCooldownTimeIx(
+			cooldownTime
+		);
 
 		const tx = await this.buildTransaction(updateLpCooldownTimeIx);
 
@@ -1492,29 +1800,29 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateLpCooldownTimeIx(
+		cooldownTime: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateLpCooldownTime(cooldownTime, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+			},
+		});
+	}
+
 	public async updatePerpMarketOracle(
 		perpMarketIndex: number,
 		oracle: PublicKey,
 		oracleSource: OracleSource
 	): Promise<TransactionSignature> {
-		const updatePerpMarketOracleIx =
-			await this.program.instruction.updatePerpMarketOracle(
-				oracle,
-				oracleSource,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-						oracle: oracle,
-					},
-				}
-			);
+		const updatePerpMarketOracleIx = await this.getUpdatePerpMarketOracleIx(
+			perpMarketIndex,
+			oracle,
+			oracleSource
+		);
 
 		const tx = await this.buildTransaction(updatePerpMarketOracleIx);
 
@@ -1523,27 +1831,40 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketOracleIx(
+		perpMarketIndex: number,
+		oracle: PublicKey,
+		oracleSource: OracleSource
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketOracle(
+			oracle,
+			oracleSource,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+					oracle: oracle,
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketStepSizeAndTickSize(
 		perpMarketIndex: number,
 		stepSize: BN,
 		tickSize: BN
 	): Promise<TransactionSignature> {
 		const updatePerpMarketStepSizeAndTickSizeIx =
-			await this.program.instruction.updatePerpMarketStepSizeAndTickSize(
+			await this.getUpdatePerpMarketStepSizeAndTickSizeIx(
+				perpMarketIndex,
 				stepSize,
-				tickSize,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+				tickSize
 			);
 
 		const tx = await this.buildTransaction(
@@ -1555,12 +1876,15 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updatePerpMarketMinOrderSize(
+	public async getUpdatePerpMarketStepSizeAndTickSizeIx(
 		perpMarketIndex: number,
-		orderSize: BN
-	): Promise<TransactionSignature> {
-		const updatePerpMarketMinOrderSizeIx =
-			await this.program.instruction.updatePerpMarketMinOrderSize(orderSize, {
+		stepSize: BN,
+		tickSize: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketStepSizeAndTickSize(
+			stepSize,
+			tickSize,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
@@ -1571,7 +1895,16 @@ export class AdminClient extends DriftClient {
 						perpMarketIndex
 					),
 				},
-			});
+			}
+		);
+	}
+
+	public async updatePerpMarketMinOrderSize(
+		perpMarketIndex: number,
+		orderSize: BN
+	): Promise<TransactionSignature> {
+		const updatePerpMarketMinOrderSizeIx =
+			await this.getUpdatePerpMarketMinOrderSizeIx(perpMarketIndex, orderSize);
 
 		const tx = await this.buildTransaction(updatePerpMarketMinOrderSizeIx);
 
@@ -1580,27 +1913,37 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketMinOrderSizeIx(
+		perpMarketIndex: number,
+		orderSize: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketMinOrderSize(
+			orderSize,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketStepSizeAndTickSize(
 		spotMarketIndex: number,
 		stepSize: BN,
 		tickSize: BN
 	): Promise<TransactionSignature> {
 		const updateSpotMarketStepSizeAndTickSizeIx =
-			await this.program.instruction.updateSpotMarketStepSizeAndTickSize(
+			await this.getUpdateSpotMarketStepSizeAndTickSizeIx(
+				spotMarketIndex,
 				stepSize,
-				tickSize,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+				tickSize
 			);
 
 		const tx = await this.buildTransaction(
@@ -1612,6 +1955,29 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketStepSizeAndTickSizeIx(
+		spotMarketIndex: number,
+		stepSize: BN,
+		tickSize: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketStepSizeAndTickSize(
+			stepSize,
+			tickSize,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketMinOrderSize(
 		spotMarketIndex: number,
 		orderSize: BN
@@ -1637,23 +2003,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updatePerpMarketExpiry(
-		perpMarketIndex: number,
-		expiryTs: BN
-	): Promise<TransactionSignature> {
-		const updatePerpMarketExpiryIx =
-			await this.program.instruction.updatePerpMarketExpiry(expiryTs, {
+	public async getUpdateSpotMarketMinOrderSizeIx(
+		spotMarketIndex: number,
+		orderSize: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketMinOrderSize(
+			orderSize,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					perpMarket: await getPerpMarketPublicKey(
+					spotMarket: await getSpotMarketPublicKey(
 						this.program.programId,
-						perpMarketIndex
+						spotMarketIndex
 					),
 				},
-			});
+			}
+		);
+	}
+
+	public async updatePerpMarketExpiry(
+		perpMarketIndex: number,
+		expiryTs: BN
+	): Promise<TransactionSignature> {
+		const updatePerpMarketExpiryIx = await this.getUpdatePerpMarketExpiryIx(
+			perpMarketIndex,
+			expiryTs
+		);
 		const tx = await this.buildTransaction(updatePerpMarketExpiryIx);
 
 		const { txSig } = await this.sendTransaction(tx, [], this.opts);
@@ -1661,29 +2039,34 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketExpiryIx(
+		perpMarketIndex: number,
+		expiryTs: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketExpiry(expiryTs, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				perpMarket: await getPerpMarketPublicKey(
+					this.program.programId,
+					perpMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updateSpotMarketOracle(
 		spotMarketIndex: number,
 		oracle: PublicKey,
 		oracleSource: OracleSource
 	): Promise<TransactionSignature> {
-		const updateSpotMarketOracleIx =
-			await this.program.instruction.updateSpotMarketOracle(
-				oracle,
-				oracleSource,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-						oracle: oracle,
-					},
-				}
-			);
+		const updateSpotMarketOracleIx = await this.getUpdateSpotMarketOracleIx(
+			spotMarketIndex,
+			oracle,
+			oracleSource
+		);
 
 		const tx = await this.buildTransaction(updateSpotMarketOracleIx);
 
@@ -1692,25 +2075,38 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketOracleIx(
+		spotMarketIndex: number,
+		oracle: PublicKey,
+		oracleSource: OracleSource
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketOracle(
+			oracle,
+			oracleSource,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+					oracle: oracle,
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketOrdersEnabled(
 		spotMarketIndex: number,
 		ordersEnabled: boolean
 	): Promise<TransactionSignature> {
 		const updateSpotMarketOrdersEnabledIx =
-			await this.program.instruction.updateSpotMarketOrdersEnabled(
-				ordersEnabled,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+			await this.getUpdateSpotMarketOrdersEnabledIx(
+				spotMarketIndex,
+				ordersEnabled
 			);
 
 		const tx = await this.buildTransaction(updateSpotMarketOrdersEnabledIx);
@@ -1720,22 +2116,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketOrdersEnabledIx(
+		spotMarketIndex: number,
+		ordersEnabled: boolean
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketOrdersEnabled(
+			ordersEnabled,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSerumFulfillmentConfigStatus(
 		serumFulfillmentConfig: PublicKey,
 		status: SpotFulfillmentConfigStatus
 	): Promise<TransactionSignature> {
 		const updateSerumFulfillmentConfigStatusIx =
-			await this.program.instruction.updateSerumFulfillmentConfigStatus(
-				status,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						serumFulfillmentConfig,
-					},
-				}
+			await this.getUpdateSerumFulfillmentConfigStatusIx(
+				serumFulfillmentConfig,
+				status
 			);
 
 		const tx = await this.buildTransaction(
@@ -1747,6 +2156,24 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSerumFulfillmentConfigStatusIx(
+		serumFulfillmentConfig: PublicKey,
+		status: SpotFulfillmentConfigStatus
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSerumFulfillmentConfigStatus(
+			status,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					serumFulfillmentConfig,
+				},
+			}
+		);
+	}
+
 	public async updatePhoenixFulfillmentConfigStatus(
 		phoenixFulfillmentConfig: PublicKey,
 		status: SpotFulfillmentConfigStatus
@@ -1771,23 +2198,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updateSpotMarketExpiry(
-		spotMarketIndex: number,
-		expiryTs: BN
-	): Promise<TransactionSignature> {
-		const updateSpotMarketExpiryIx =
-			await this.program.instruction.updateSpotMarketExpiry(expiryTs, {
+	public async getUpdatePhoenixFulfillmentConfigStatusIx(
+		phoenixFulfillmentConfig: PublicKey,
+		status: SpotFulfillmentConfigStatus
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.phoenixFulfillmentConfigStatus(
+			status,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					spotMarket: await getSpotMarketPublicKey(
-						this.program.programId,
-						spotMarketIndex
-					),
+					phoenixFulfillmentConfig,
 				},
-			});
+			}
+		);
+	}
+
+	public async updateSpotMarketExpiry(
+		spotMarketIndex: number,
+		expiryTs: BN
+	): Promise<TransactionSignature> {
+		const updateSpotMarketExpiryIx = await this.getUpdateSpotMarketExpiryIx(
+			spotMarketIndex,
+			expiryTs
+		);
 
 		const tx = await this.buildTransaction(updateSpotMarketExpiryIx);
 
@@ -1796,18 +2232,30 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketExpiryIx(
+		spotMarketIndex: number,
+		expiryTs: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketExpiry(expiryTs, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				spotMarket: await getSpotMarketPublicKey(
+					this.program.programId,
+					spotMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updateWhitelistMint(
 		whitelistMint?: PublicKey
 	): Promise<TransactionSignature> {
-		const updateWhitelistMintIx =
-			await this.program.instruction.updateWhitelistMint(whitelistMint, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-				},
-			});
+		const updateWhitelistMintIx = await this.getUpdateWhitelistMintIx(
+			whitelistMint
+		);
 
 		const tx = await this.buildTransaction(updateWhitelistMintIx);
 
@@ -1816,18 +2264,25 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateWhitelistMintIx(
+		whitelistMint?: PublicKey
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateWhitelistMint(whitelistMint, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+			},
+		});
+	}
+
 	public async updateDiscountMint(
 		discountMint: PublicKey
 	): Promise<TransactionSignature> {
-		const updateDiscountMintIx =
-			await this.program.instruction.updateDiscountMint(discountMint, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-				},
-			});
+		const updateDiscountMintIx = await this.getUpdateDiscountMintIx(
+			discountMint
+		);
 
 		const tx = await this.buildTransaction(updateDiscountMintIx);
 
@@ -1836,6 +2291,19 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateDiscountMintIx(
+		discountMint: PublicKey
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateDiscountMint(discountMint, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+			},
+		});
+	}
+
 	public async updateSpotMarketMarginWeights(
 		spotMarketIndex: number,
 		initialAssetWeight: number,
@@ -1845,24 +2313,13 @@ export class AdminClient extends DriftClient {
 		imfFactor = 0
 	): Promise<TransactionSignature> {
 		const updateSpotMarketMarginWeightsIx =
-			await this.program.instruction.updateSpotMarketMarginWeights(
+			await this.getUpdateSpotMarketMarginWeightsIx(
+				spotMarketIndex,
 				initialAssetWeight,
 				maintenanceAssetWeight,
 				initialLiabilityWeight,
 				maintenanceLiabilityWeight,
-				imfFactor,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+				imfFactor
 			);
 
 		const tx = await this.buildTransaction(updateSpotMarketMarginWeightsIx);
@@ -1872,6 +2329,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketMarginWeightsIx(
+		spotMarketIndex: number,
+		initialAssetWeight: number,
+		maintenanceAssetWeight: number,
+		initialLiabilityWeight: number,
+		maintenanceLiabilityWeight: number,
+		imfFactor = 0
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketMarginWeights(
+			initialAssetWeight,
+			maintenanceAssetWeight,
+			initialLiabilityWeight,
+			maintenanceLiabilityWeight,
+			imfFactor,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketBorrowRate(
 		spotMarketIndex: number,
 		optimalUtilization: number,
@@ -1879,22 +2365,11 @@ export class AdminClient extends DriftClient {
 		optimalMaxRate: number
 	): Promise<TransactionSignature> {
 		const updateSpotMarketBorrowRateIx =
-			await this.program.instruction.updateSpotMarketBorrowRate(
+			await this.getUpdateSpotMarketBorrowRateIx(
+				spotMarketIndex,
 				optimalUtilization,
 				optimalBorrowRate,
-				optimalMaxRate,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+				optimalMaxRate
 			);
 
 		const tx = await this.buildTransaction(updateSpotMarketBorrowRateIx);
@@ -1904,12 +2379,17 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updateSpotMarketAssetTier(
+	public async getUpdateSpotMarketBorrowRateIx(
 		spotMarketIndex: number,
-		assetTier: AssetTier
-	): Promise<TransactionSignature> {
-		const updateSpotMarketAssetTierIx =
-			await this.program.instruction.updateSpotMarketAssetTier(assetTier, {
+		optimalUtilization: number,
+		optimalBorrowRate: number,
+		optimalMaxRate: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketBorrowRate(
+			optimalUtilization,
+			optimalBorrowRate,
+			optimalMaxRate,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
@@ -1920,7 +2400,16 @@ export class AdminClient extends DriftClient {
 						spotMarketIndex
 					),
 				},
-			});
+			}
+		);
+	}
+
+	public async updateSpotMarketAssetTier(
+		spotMarketIndex: number,
+		assetTier: AssetTier
+	): Promise<TransactionSignature> {
+		const updateSpotMarketAssetTierIx =
+			await this.getUpdateSpotMarketAssetTierIx(spotMarketIndex, assetTier);
 
 		const tx = await this.buildTransaction(updateSpotMarketAssetTierIx);
 
@@ -1929,23 +2418,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketAssetTierIx(
+		spotMarketIndex: number,
+		assetTier: AssetTier
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketAssetTier(assetTier, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				spotMarket: await getSpotMarketPublicKey(
+					this.program.programId,
+					spotMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updateSpotMarketStatus(
 		spotMarketIndex: number,
 		marketStatus: MarketStatus
 	): Promise<TransactionSignature> {
-		const updateSpotMarketStatusIx =
-			await this.program.instruction.updateSpotMarketStatus(marketStatus, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-					spotMarket: await getSpotMarketPublicKey(
-						this.program.programId,
-						spotMarketIndex
-					),
-				},
-			});
+		const updateSpotMarketStatusIx = await this.getUpdateSpotMarketStatusIx(
+			spotMarketIndex,
+			marketStatus
+		);
 
 		const tx = await this.buildTransaction(updateSpotMarketStatusIx);
 
@@ -1954,25 +2452,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotMarketStatusIx(
+		spotMarketIndex: number,
+		marketStatus: MarketStatus
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketStatus(marketStatus, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				spotMarket: await getSpotMarketPublicKey(
+					this.program.programId,
+					spotMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updateSpotMarketPausedOperations(
 		spotMarketIndex: number,
 		pausedOperations: number
 	): Promise<TransactionSignature> {
 		const updateSpotMarketPausedOperationsIx =
-			await this.program.instruction.updateSpotMarketPausedOperations(
-				pausedOperations,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+			await this.getUpdateSpotMarketPausedOperationsIx(
+				spotMarketIndex,
+				pausedOperations
 			);
 
 		const tx = await this.buildTransaction(updateSpotMarketPausedOperationsIx);
@@ -1982,23 +2487,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updatePerpMarketStatus(
-		perpMarketIndex: number,
-		marketStatus: MarketStatus
-	): Promise<TransactionSignature> {
-		const updatePerpMarketStatusIx =
-			await this.program.instruction.updatePerpMarketStatus(marketStatus, {
+	public async getUpdateSpotMarketPausedOperationsIx(
+		spotMarketIndex: number,
+		pausedOperations: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketPausedOperations(
+			pausedOperations,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					perpMarket: await getPerpMarketPublicKey(
+					spotMarket: await getSpotMarketPublicKey(
 						this.program.programId,
-						perpMarketIndex
+						spotMarketIndex
 					),
 				},
-			});
+			}
+		);
+	}
+
+	public async updatePerpMarketStatus(
+		perpMarketIndex: number,
+		marketStatus: MarketStatus
+	): Promise<TransactionSignature> {
+		const updatePerpMarketStatusIx = await this.getUpdatePerpMarketStatusIx(
+			perpMarketIndex,
+			marketStatus
+		);
 
 		const tx = await this.buildTransaction(updatePerpMarketStatusIx);
 
@@ -2007,25 +2524,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketStatusIx(
+		perpMarketIndex: number,
+		marketStatus: MarketStatus
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketStatus(marketStatus, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				perpMarket: await getPerpMarketPublicKey(
+					this.program.programId,
+					perpMarketIndex
+				),
+			},
+		});
+	}
+
 	public async updatePerpMarketPausedOperations(
 		perpMarketIndex: number,
 		pausedOperations: number
 	): Promise<TransactionSignature> {
 		const updatePerpMarketPausedOperationsIx =
-			await this.program.instruction.updatePerpMarketPausedOperations(
-				pausedOperations,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+			await this.getUpdatePerpMarketPausedOperationsIx(
+				perpMarketIndex,
+				pausedOperations
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketPausedOperationsIx);
@@ -2035,25 +2559,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketPausedOperationsIx(
+		perpMarketIndex: number,
+		pausedOperations: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketPausedOperations(
+			pausedOperations,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketContractTier(
 		perpMarketIndex: number,
 		contractTier: ContractTier
 	): Promise<TransactionSignature> {
 		const updatePerpMarketContractTierIx =
-			await this.program.instruction.updatePerpMarketContractTier(
-				contractTier,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+			await this.getUpdatePerpMarketContractTierIx(
+				perpMarketIndex,
+				contractTier
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketContractTierIx);
@@ -2063,18 +2597,33 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketContractTierIx(
+		perpMarketIndex: number,
+		contractTier: ContractTier
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketContractTier(
+			contractTier,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateExchangeStatus(
 		exchangeStatus: ExchangeStatus
 	): Promise<TransactionSignature> {
-		const updateExchangeStatusIx =
-			await this.program.instruction.updateExchangeStatus(exchangeStatus, {
-				accounts: {
-					admin: this.isSubscribed
-						? this.getStateAccount().admin
-						: this.wallet.publicKey,
-					state: await this.getStatePublicKey(),
-				},
-			});
+		const updateExchangeStatusIx = await this.getUpdateExchangeStatusIx(
+			exchangeStatus
+		);
 
 		const tx = await this.buildTransaction(updateExchangeStatusIx);
 
@@ -2083,21 +2632,24 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateExchangeStatusIx(
+		exchangeStatus: ExchangeStatus
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateExchangeStatus(exchangeStatus, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+			},
+		});
+	}
+
 	public async updatePerpAuctionDuration(
 		minDuration: BN | number
 	): Promise<TransactionSignature> {
 		const updatePerpAuctionDurationIx =
-			await this.program.instruction.updatePerpAuctionDuration(
-				typeof minDuration === 'number' ? minDuration : minDuration.toNumber(),
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-					},
-				}
-			);
+			await this.getUpdatePerpAuctionDurationIx(minDuration);
 
 		const tx = await this.buildTransaction(updatePerpAuctionDurationIx);
 
@@ -2106,21 +2658,27 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpAuctionDurationIx(
+		minDuration: BN | number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpAuctionDuration(
+			typeof minDuration === 'number' ? minDuration : minDuration.toNumber(),
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updateSpotAuctionDuration(
 		defaultAuctionDuration: number
 	): Promise<TransactionSignature> {
 		const updateSpotAuctionDurationIx =
-			await this.program.instruction.updateSpotAuctionDuration(
-				defaultAuctionDuration,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-					},
-				}
-			);
+			await this.getUpdateSpotAuctionDurationIx(defaultAuctionDuration);
 
 		const tx = await this.buildTransaction(updateSpotAuctionDurationIx);
 
@@ -2129,25 +2687,30 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSpotAuctionDurationIx(
+		defaultAuctionDuration: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotAuctionDuration(
+			defaultAuctionDuration,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketMaxFillReserveFraction(
 		perpMarketIndex: number,
 		maxBaseAssetAmountRatio: number
 	): Promise<TransactionSignature> {
 		const updatePerpMarketMaxFillReserveFractionIx =
-			await this.program.instruction.updatePerpMarketMaxFillReserveFraction(
-				maxBaseAssetAmountRatio,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+			await this.getUpdatePerpMarketMaxFillReserveFractionIx(
+				perpMarketIndex,
+				maxBaseAssetAmountRatio
 			);
 
 		const tx = await this.buildTransaction(
@@ -2159,20 +2722,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updateMaxSlippageRatio(
+	public async getUpdatePerpMarketMaxFillReserveFractionIx(
 		perpMarketIndex: number,
-		maxSlippageRatio: number
-	): Promise<TransactionSignature> {
-		const updateMaxSlippageRatioIx =
-			await this.program.instruction.updateMaxSlippageRatio(maxSlippageRatio, {
+		maxBaseAssetAmountRatio: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketMaxFillReserveFraction(
+			maxBaseAssetAmountRatio,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
 				},
-			});
+			}
+		);
+	}
+
+	public async updateMaxSlippageRatio(
+		perpMarketIndex: number,
+		maxSlippageRatio: number
+	): Promise<TransactionSignature> {
+		const updateMaxSlippageRatioIx = await this.getUpdateMaxSlippageRatioIx(
+			perpMarketIndex,
+			maxSlippageRatio
+		);
 
 		const tx = await this.buildTransaction(updateMaxSlippageRatioIx);
 
@@ -2181,27 +2759,34 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateMaxSlippageRatioIx(
+		perpMarketIndex: number,
+		maxSlippageRatio: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateMaxSlippageRatio(
+			maxSlippageRatio,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketUnrealizedAssetWeight(
 		perpMarketIndex: number,
 		unrealizedInitialAssetWeight: number,
 		unrealizedMaintenanceAssetWeight: number
 	): Promise<TransactionSignature> {
 		const updatePerpMarketUnrealizedAssetWeightIx =
-			await this.program.instruction.updatePerpMarketUnrealizedAssetWeight(
+			await this.getUpdatePerpMarketUnrealizedAssetWeightIx(
+				perpMarketIndex,
 				unrealizedInitialAssetWeight,
-				unrealizedMaintenanceAssetWeight,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+				unrealizedMaintenanceAssetWeight
 			);
 
 		const tx = await this.buildTransaction(
@@ -2213,6 +2798,29 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketUnrealizedAssetWeightIx(
+		perpMarketIndex: number,
+		unrealizedInitialAssetWeight: number,
+		unrealizedMaintenanceAssetWeight: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketUnrealizedAssetWeight(
+			unrealizedInitialAssetWeight,
+			unrealizedMaintenanceAssetWeight,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketMaxImbalances(
 		perpMarketIndex: number,
 		unrealizedMaxImbalance: BN,
@@ -2220,22 +2828,11 @@ export class AdminClient extends DriftClient {
 		quoteMaxInsurance: BN
 	): Promise<TransactionSignature> {
 		const updatePerpMarketMaxImabalancesIx =
-			await this.program.instruction.updatePerpMarketMaxImbalances(
+			await this.getUpdatePerpMarketMaxImbalancesIx(
+				perpMarketIndex,
 				unrealizedMaxImbalance,
 				maxRevenueWithdrawPerPeriod,
-				quoteMaxInsurance,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+				quoteMaxInsurance
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketMaxImabalancesIx);
@@ -2245,25 +2842,39 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketMaxImbalancesIx(
+		perpMarketIndex: number,
+		unrealizedMaxImbalance: BN,
+		maxRevenueWithdrawPerPeriod: BN,
+		quoteMaxInsurance: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketMaxImbalances(
+			unrealizedMaxImbalance,
+			maxRevenueWithdrawPerPeriod,
+			quoteMaxInsurance,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketMaxOpenInterest(
 		perpMarketIndex: number,
 		maxOpenInterest: BN
 	): Promise<TransactionSignature> {
 		const updatePerpMarketMaxOpenInterestIx =
-			await this.program.instruction.updatePerpMarketMaxOpenInterest(
-				maxOpenInterest,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+			await this.getUpdatePerpMarketMaxOpenInterestIx(
+				perpMarketIndex,
+				maxOpenInterest
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketMaxOpenInterestIx);
@@ -2273,25 +2884,35 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketMaxOpenInterestIx(
+		perpMarketIndex: number,
+		maxOpenInterest: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketMaxOpenInterest(
+			maxOpenInterest,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updatePerpMarketFeeAdjustment(
 		perpMarketIndex: number,
 		feeAdjustment: number
 	): Promise<TransactionSignature> {
 		const updatepPerpMarketFeeAdjustmentIx =
-			await this.program.instruction.updatePerpMarketFeeAdjustment(
-				feeAdjustment,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+			await this.getUpdatePerpMarketFeeAdjustmentIx(
+				perpMarketIndex,
+				feeAdjustment
 			);
 
 		const tx = await this.buildTransaction(updatepPerpMarketFeeAdjustmentIx);
@@ -2301,21 +2922,31 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async updateSerumVault(
-		srmVault: PublicKey
-	): Promise<TransactionSignature> {
-		const updateSerumVaultIx = await this.program.instruction.updateSerumVault(
-			srmVault,
+	public async getUpdatePerpMarketFeeAdjustmentIx(
+		perpMarketIndex: number,
+		feeAdjustment: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketFeeAdjustment(
+			feeAdjustment,
 			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					srmVault: srmVault,
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
 				},
 			}
 		);
+	}
+
+	public async updateSerumVault(
+		srmVault: PublicKey
+	): Promise<TransactionSignature> {
+		const updateSerumVaultIx = await this.getUpdateSerumVaultIx(srmVault);
 
 		const tx = await this.buildTransaction(updateSerumVaultIx);
 
@@ -2324,27 +2955,30 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateSerumVaultIx(
+		srmVault: PublicKey
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSerumVault(srmVault, {
+			accounts: {
+				admin: this.isSubscribed
+					? this.getStateAccount().admin
+					: this.wallet.publicKey,
+				state: await this.getStatePublicKey(),
+				srmVault: srmVault,
+			},
+		});
+	}
+
 	public async updatePerpMarketLiquidationFee(
 		perpMarketIndex: number,
 		liquidatorFee: number,
 		ifLiquidationFee: number
 	): Promise<TransactionSignature> {
 		const updatePerpMarketLiquidationFeeIx =
-			await this.program.instruction.updatePerpMarketLiquidationFee(
+			await this.getUpdatePerpMarketLiquidationFeeIx(
+				perpMarketIndex,
 				liquidatorFee,
-				ifLiquidationFee,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						perpMarket: await getPerpMarketPublicKey(
-							this.program.programId,
-							perpMarketIndex
-						),
-					},
-				}
+				ifLiquidationFee
 			);
 
 		const tx = await this.buildTransaction(updatePerpMarketLiquidationFeeIx);
@@ -2354,27 +2988,39 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdatePerpMarketLiquidationFeeIx(
+		perpMarketIndex: number,
+		liquidatorFee: number,
+		ifLiquidationFee: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updatePerpMarketLiquidationFee(
+			liquidatorFee,
+			ifLiquidationFee,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					perpMarket: await getPerpMarketPublicKey(
+						this.program.programId,
+						perpMarketIndex
+					),
+				},
+			}
+		);
+	}
+
 	public async updateSpotMarketLiquidationFee(
 		spotMarketIndex: number,
 		liquidatorFee: number,
 		ifLiquidationFee: number
 	): Promise<TransactionSignature> {
 		const updateSpotMarketLiquidationFeeIx =
-			await this.program.instruction.updateSpotMarketLiquidationFee(
+			await this.getUpdateSpotMarketLiquidationFeeIx(
+				spotMarketIndex,
 				liquidatorFee,
-				ifLiquidationFee,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						spotMarket: await getSpotMarketPublicKey(
-							this.program.programId,
-							spotMarketIndex
-						),
-					},
-				}
+				ifLiquidationFee
 			);
 
 		const tx = await this.buildTransaction(updateSpotMarketLiquidationFeeIx);
@@ -2384,20 +3030,32 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
-	public async initializeProtocolIfSharesTransferConfig(): Promise<TransactionSignature> {
-		const initializeProtocolIfSharesTransferConfigIx =
-			await this.program.instruction.initializeProtocolIfSharesTransferConfig({
+	public async getUpdateSpotMarketLiquidationFeeIx(
+		spotMarketIndex: number,
+		liquidatorFee: number,
+		ifLiquidationFee: number
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateSpotMarketLiquidationFee(
+			liquidatorFee,
+			ifLiquidationFee,
+			{
 				accounts: {
 					admin: this.isSubscribed
 						? this.getStateAccount().admin
 						: this.wallet.publicKey,
 					state: await this.getStatePublicKey(),
-					rent: SYSVAR_RENT_PUBKEY,
-					systemProgram: anchor.web3.SystemProgram.programId,
-					protocolIfSharesTransferConfig:
-						getProtocolIfSharesTransferConfigPublicKey(this.program.programId),
+					spotMarket: await getSpotMarketPublicKey(
+						this.program.programId,
+						spotMarketIndex
+					),
 				},
-			});
+			}
+		);
+	}
+
+	public async initializeProtocolIfSharesTransferConfig(): Promise<TransactionSignature> {
+		const initializeProtocolIfSharesTransferConfigIx =
+			await this.getInitializeProtocolIfSharesTransferConfigIx();
 
 		const tx = await this.buildTransaction(
 			initializeProtocolIfSharesTransferConfigIx
@@ -2408,26 +3066,31 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getInitializeProtocolIfSharesTransferConfigIx(): Promise<TransactionInstruction> {
+		return await this.program.instruction.initializeProtocolIfSharesTransferConfig(
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					rent: SYSVAR_RENT_PUBKEY,
+					systemProgram: anchor.web3.SystemProgram.programId,
+					protocolIfSharesTransferConfig:
+						getProtocolIfSharesTransferConfigPublicKey(this.program.programId),
+				},
+			}
+		);
+	}
+
 	public async updateProtocolIfSharesTransferConfig(
 		whitelistedSigners?: PublicKey[],
 		maxTransferPerEpoch?: BN
 	): Promise<TransactionSignature> {
 		const updateProtocolIfSharesTransferConfigIx =
-			await this.program.instruction.updateProtocolIfSharesTransferConfig(
-				whitelistedSigners || null,
-				maxTransferPerEpoch,
-				{
-					accounts: {
-						admin: this.isSubscribed
-							? this.getStateAccount().admin
-							: this.wallet.publicKey,
-						state: await this.getStatePublicKey(),
-						protocolIfSharesTransferConfig:
-							getProtocolIfSharesTransferConfigPublicKey(
-								this.program.programId
-							),
-					},
-				}
+			await this.getUpdateProtocolIfSharesTransferConfigIx(
+				whitelistedSigners,
+				maxTransferPerEpoch
 			);
 
 		const tx = await this.buildTransaction(
@@ -2439,6 +3102,26 @@ export class AdminClient extends DriftClient {
 		return txSig;
 	}
 
+	public async getUpdateProtocolIfSharesTransferConfigIx(
+		whitelistedSigners?: PublicKey[],
+		maxTransferPerEpoch?: BN
+	): Promise<TransactionInstruction> {
+		return await this.program.instruction.updateProtocolIfSharesTransferConfig(
+			whitelistedSigners || null,
+			maxTransferPerEpoch,
+			{
+				accounts: {
+					admin: this.isSubscribed
+						? this.getStateAccount().admin
+						: this.wallet.publicKey,
+					state: await this.getStatePublicKey(),
+					protocolIfSharesTransferConfig:
+						getProtocolIfSharesTransferConfigPublicKey(this.program.programId),
+				},
+			}
+		);
+	}
+
 	public async initializePrelaunchOracle(
 		perpMarketIndex: number,
 		price?: BN,