@drift-labs/sdk 2.75.0-beta.1 → 2.75.0-beta.3

package/lib/adminClient.js

@@ -186,8 +186,14 @@ class AdminClient extends driftClient_1.DriftClient {
         });
     }
     async deleteInitializedPerpMarket(marketIndex) {
+        const deleteInitializeMarketIx = await this.getDeleteInitializedPerpMarketIx(marketIndex);
+        const tx = await this.buildTransaction(deleteInitializeMarketIx);
+        const { txSig } = await this.sendTransaction(tx, [], this.opts);
+        return txSig;
+    }
+    async getDeleteInitializedPerpMarketIx(marketIndex) {
         const perpMarketPublicKey = await (0, pda_1.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
@@ -196,16 +202,19 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: perpMarketPublicKey,
             },
         });
-        const tx = await this.buildTransaction(deleteInitializeMarketIx);
+    }
+    async moveAmmPrice(perpMarketIndex, baseAssetReserve, quoteAssetReserve, sqrtK) {
+        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;
     }
-    async moveAmmPrice(perpMarketIndex, baseAssetReserve, quoteAssetReserve, sqrtK) {
+    async getMoveAmmPriceIx(perpMarketIndex, baseAssetReserve, quoteAssetReserve, sqrtK) {
         const marketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         if (sqrtK == undefined) {
             sqrtK = (0, utils_1.squareRootBN)(baseAssetReserve.mul(quoteAssetReserve));
         }
-        const moveAmmPriceIx = await this.program.instruction.moveAmmPrice(baseAssetReserve, quoteAssetReserve, sqrtK, {
+        return await this.program.instruction.moveAmmPrice(baseAssetReserve, quoteAssetReserve, sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.isSubscribed
@@ -214,12 +223,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: marketPublicKey,
             },
         });
-        const tx = await this.buildTransaction(moveAmmPriceIx);
+    }
+    async updateK(perpMarketIndex, sqrtK) {
+        const updateKIx = await this.getUpdateKIx(perpMarketIndex, sqrtK);
+        const tx = await this.buildTransaction(updateKIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateK(perpMarketIndex, sqrtK) {
-        const updateKIx = await this.program.instruction.updateK(sqrtK, {
+    async getUpdateKIx(perpMarketIndex, sqrtK) {
+        return await this.program.instruction.updateK(sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.isSubscribed
@@ -229,13 +241,16 @@ class AdminClient extends driftClient_1.DriftClient {
                 oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
             },
         });
-        const tx = await this.buildTransaction(updateKIx);
+    }
+    async recenterPerpMarketAmm(perpMarketIndex, pegMultiplier, sqrtK) {
+        const recenterPerpMarketAmmIx = await this.getRecenterPerpMarketAmmIx(perpMarketIndex, pegMultiplier, sqrtK);
+        const tx = await this.buildTransaction(recenterPerpMarketAmmIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async recenterPerpMarketAmm(perpMarketIndex, pegMultiplier, sqrtK) {
+    async getRecenterPerpMarketAmmIx(perpMarketIndex, pegMultiplier, sqrtK) {
         const marketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const recenterPerpMarketAmmIx = await this.program.instruction.recenterPerpMarketAmm(pegMultiplier, sqrtK, {
+        return await this.program.instruction.recenterPerpMarketAmm(pegMultiplier, sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.isSubscribed
@@ -244,12 +259,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: marketPublicKey,
             },
         });
-        const tx = await this.buildTransaction(recenterPerpMarketAmmIx);
+    }
+    async updatePerpMarketConcentrationScale(perpMarketIndex, concentrationScale) {
+        const updatePerpMarketConcentrationCoefIx = await this.getUpdatePerpMarketConcentrationScaleIx(perpMarketIndex, concentrationScale);
+        const tx = await this.buildTransaction(updatePerpMarketConcentrationCoefIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketConcentrationScale(perpMarketIndex, concentrationScale) {
-        const updatePerpMarketConcentrationCoefIx = await this.program.instruction.updatePerpMarketConcentrationCoef(concentrationScale, {
+    async getUpdatePerpMarketConcentrationScaleIx(perpMarketIndex, concentrationScale) {
+        return await this.program.instruction.updatePerpMarketConcentrationCoef(concentrationScale, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.isSubscribed
@@ -258,17 +276,20 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
-        const tx = await this.buildTransaction(updatePerpMarketConcentrationCoefIx);
+    }
+    async moveAmmToPrice(perpMarketIndex, targetPrice) {
+        const moveAmmPriceIx = await this.getMoveAmmToPriceIx(perpMarketIndex, targetPrice);
+        const tx = await this.buildTransaction(moveAmmPriceIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async moveAmmToPrice(perpMarketIndex, targetPrice) {
+    async getMoveAmmToPriceIx(perpMarketIndex, targetPrice) {
         const perpMarket = this.getPerpMarketAccount(perpMarketIndex);
         const [direction, tradeSize, _] = (0, trade_1.calculateTargetPriceTrade)(perpMarket, targetPrice, new anchor_1.BN(1000), 'quote', undefined //todo
         );
         const [newQuoteAssetAmount, newBaseAssetAmount] = (0, amm_1.calculateAmmReservesAfterSwap)(perpMarket.amm, 'quote', tradeSize, (0, amm_1.getSwapDirection)('quote', direction));
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const moveAmmPriceIx = await this.program.instruction.moveAmmPrice(newBaseAssetAmount, newQuoteAssetAmount, perpMarket.amm.sqrtK, {
+        return await this.program.instruction.moveAmmPrice(newBaseAssetAmount, newQuoteAssetAmount, perpMarket.amm.sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.isSubscribed
@@ -277,14 +298,17 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: perpMarketPublicKey,
             },
         });
-        const tx = await this.buildTransaction(moveAmmPriceIx);
+    }
+    async repegAmmCurve(newPeg, perpMarketIndex) {
+        const repegAmmCurveIx = await this.getRepegAmmCurveIx(newPeg, perpMarketIndex);
+        const tx = await this.buildTransaction(repegAmmCurveIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async repegAmmCurve(newPeg, perpMarketIndex) {
+    async getRepegAmmCurveIx(newPeg, perpMarketIndex) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
-        const repegAmmCurveIx = await this.program.instruction.repegAmmCurve(newPeg, {
+        return await this.program.instruction.repegAmmCurve(newPeg, {
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.isSubscribed
@@ -294,14 +318,17 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: perpMarketPublicKey,
             },
         });
-        const tx = await this.buildTransaction(repegAmmCurveIx);
+    }
+    async updatePerpMarketAmmOracleTwap(perpMarketIndex) {
+        const updatePerpMarketAmmOracleTwapIx = await this.getUpdatePerpMarketAmmOracleTwapIx(perpMarketIndex);
+        const tx = await this.buildTransaction(updatePerpMarketAmmOracleTwapIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketAmmOracleTwap(perpMarketIndex) {
+    async getUpdatePerpMarketAmmOracleTwapIx(perpMarketIndex) {
         const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const updatePerpMarketAmmOracleTwapIx = await this.program.instruction.updatePerpMarketAmmOracleTwap({
+        return await this.program.instruction.updatePerpMarketAmmOracleTwap({
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.isSubscribed
@@ -311,14 +338,17 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: perpMarketPublicKey,
             },
         });
-        const tx = await this.buildTransaction(updatePerpMarketAmmOracleTwapIx);
+    }
+    async resetPerpMarketAmmOracleTwap(perpMarketIndex) {
+        const resetPerpMarketAmmOracleTwapIx = await this.getResetPerpMarketAmmOracleTwapIx(perpMarketIndex);
+        const tx = await this.buildTransaction(resetPerpMarketAmmOracleTwapIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async resetPerpMarketAmmOracleTwap(perpMarketIndex) {
+    async getResetPerpMarketAmmOracleTwapIx(perpMarketIndex) {
         const ammData = this.getPerpMarketAccount(perpMarketIndex).amm;
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const resetPerpMarketAmmOracleTwapIx = await this.program.instruction.resetPerpMarketAmmOracleTwap({
+        return await this.program.instruction.resetPerpMarketAmmOracleTwap({
             accounts: {
                 state: await this.getStatePublicKey(),
                 admin: this.isSubscribed
@@ -328,13 +358,16 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: perpMarketPublicKey,
             },
         });
-        const tx = await this.buildTransaction(resetPerpMarketAmmOracleTwapIx);
+    }
+    async depositIntoPerpMarketFeePool(perpMarketIndex, amount, sourceVault) {
+        const depositIntoPerpMarketFeePoolIx = await this.getDepositIntoPerpMarketFeePoolIx(perpMarketIndex, amount, sourceVault);
+        const tx = await this.buildTransaction(depositIntoPerpMarketFeePoolIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async depositIntoPerpMarketFeePool(perpMarketIndex, amount, sourceVault) {
+    async getDepositIntoPerpMarketFeePoolIx(perpMarketIndex, amount, sourceVault) {
         const spotMarket = this.getQuoteSpotMarketAccount();
-        const depositIntoPerpMarketFeePoolIx = await this.program.instruction.depositIntoPerpMarketFeePool(amount, {
+        return await this.program.instruction.depositIntoPerpMarketFeePool(amount, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -348,41 +381,31 @@ class AdminClient extends driftClient_1.DriftClient {
                 tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             },
         });
-        const tx = await this.buildTransaction(depositIntoPerpMarketFeePoolIx);
-        const { txSig } = await this.sendTransaction(tx, [], this.opts);
-        return txSig;
     }
     async updateAdmin(admin) {
-        const updateAdminIx = await this.program.instruction.updateAdmin(admin, {
-            accounts: {
-                admin: this.isSubscribed
-                    ? this.getStateAccount().admin
-                    : this.wallet.publicKey,
-                state: await this.getStatePublicKey(),
-            },
-        });
+        const updateAdminIx = await this.getUpdateAdminIx(admin);
         const tx = await this.buildTransaction(updateAdminIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketCurveUpdateIntensity(perpMarketIndex, curveUpdateIntensity) {
-        // assert(curveUpdateIntensity >= 0 && curveUpdateIntensity <= 100);
-        // assert(Number.isInteger(curveUpdateIntensity));
-        const updatePerpMarketCurveUpdateIntensityIx = await this.program.instruction.updatePerpMarketCurveUpdateIntensity(curveUpdateIntensity, {
+    async getUpdateAdminIx(admin) {
+        return await this.program.instruction.updateAdmin(admin, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketCurveUpdateIntensity(perpMarketIndex, curveUpdateIntensity) {
+        const updatePerpMarketCurveUpdateIntensityIx = await this.getUpdatePerpMarketCurveUpdateIntensityIx(perpMarketIndex, curveUpdateIntensity);
         const tx = await this.buildTransaction(updatePerpMarketCurveUpdateIntensityIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketTargetBaseAssetAmountPerLp(perpMarketIndex, targetBaseAssetAmountPerLP) {
-        const updatePerpMarketTargetBaseAssetAmountPerLpIx = await this.program.instruction.updatePerpMarketTargetBaseAssetAmountPerLp(targetBaseAssetAmountPerLP, {
+    async getUpdatePerpMarketCurveUpdateIntensityIx(perpMarketIndex, curveUpdateIntensity) {
+        return await this.program.instruction.updatePerpMarketCurveUpdateIntensity(curveUpdateIntensity, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -391,12 +414,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketTargetBaseAssetAmountPerLp(perpMarketIndex, targetBaseAssetAmountPerLP) {
+        const updatePerpMarketTargetBaseAssetAmountPerLpIx = await this.getUpdatePerpMarketTargetBaseAssetAmountPerLpIx(perpMarketIndex, targetBaseAssetAmountPerLP);
         const tx = await this.buildTransaction(updatePerpMarketTargetBaseAssetAmountPerLpIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketMarginRatio(perpMarketIndex, marginRatioInitial, marginRatioMaintenance) {
-        const updatePerpMarketMarginRatioIx = await this.program.instruction.updatePerpMarketMarginRatio(marginRatioInitial, marginRatioMaintenance, {
+    async getUpdatePerpMarketTargetBaseAssetAmountPerLpIx(perpMarketIndex, targetBaseAssetAmountPerLP) {
+        return await this.program.instruction.updatePerpMarketTargetBaseAssetAmountPerLp(targetBaseAssetAmountPerLP, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -405,12 +431,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketMarginRatio(perpMarketIndex, marginRatioInitial, marginRatioMaintenance) {
+        const updatePerpMarketMarginRatioIx = await this.getUpdatePerpMarketMarginRatioIx(perpMarketIndex, marginRatioInitial, marginRatioMaintenance);
         const tx = await this.buildTransaction(updatePerpMarketMarginRatioIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketImfFactor(perpMarketIndex, imfFactor, unrealizedPnlImfFactor) {
-        const updatePerpMarketImfFactorIx = await this.program.instruction.updatePerpMarketImfFactor(imfFactor, unrealizedPnlImfFactor, {
+    async getUpdatePerpMarketMarginRatioIx(perpMarketIndex, marginRatioInitial, marginRatioMaintenance) {
+        return await this.program.instruction.updatePerpMarketMarginRatio(marginRatioInitial, marginRatioMaintenance, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -419,12 +448,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketImfFactor(perpMarketIndex, imfFactor, unrealizedPnlImfFactor) {
+        const updatePerpMarketImfFactorIx = await this.getUpdatePerpMarketImfFactorIx(perpMarketIndex, imfFactor, unrealizedPnlImfFactor);
         const tx = await this.buildTransaction(updatePerpMarketImfFactorIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketBaseSpread(perpMarketIndex, baseSpread) {
-        const updatePerpMarketBaseSpreadIx = await this.program.instruction.updatePerpMarketBaseSpread(baseSpread, {
+    async getUpdatePerpMarketImfFactorIx(perpMarketIndex, imfFactor, unrealizedPnlImfFactor) {
+        return await this.program.instruction.updatePerpMarketImfFactor(imfFactor, unrealizedPnlImfFactor, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -433,12 +465,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketBaseSpread(perpMarketIndex, baseSpread) {
+        const updatePerpMarketBaseSpreadIx = await this.getUpdatePerpMarketBaseSpreadIx(perpMarketIndex, baseSpread);
         const tx = await this.buildTransaction(updatePerpMarketBaseSpreadIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateAmmJitIntensity(perpMarketIndex, ammJitIntensity) {
-        const updateAmmJitIntensityIx = await this.program.instruction.updateAmmJitIntensity(ammJitIntensity, {
+    async getUpdatePerpMarketBaseSpreadIx(perpMarketIndex, baseSpread) {
+        return await this.program.instruction.updatePerpMarketBaseSpread(baseSpread, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -447,13 +482,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updateAmmJitIntensity(perpMarketIndex, ammJitIntensity) {
+        const updateAmmJitIntensityIx = await this.getUpdateAmmJitIntensityIx(perpMarketIndex, ammJitIntensity);
         const tx = await this.buildTransaction(updateAmmJitIntensityIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketName(perpMarketIndex, name) {
-        const nameBuffer = (0, userName_1.encodeName)(name);
-        const updatePerpMarketNameIx = await this.program.instruction.updatePerpMarketName(nameBuffer, {
+    async getUpdateAmmJitIntensityIx(perpMarketIndex, ammJitIntensity) {
+        return await this.program.instruction.updateAmmJitIntensity(ammJitIntensity, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -462,43 +499,52 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketName(perpMarketIndex, name) {
+        const updatePerpMarketNameIx = await this.getUpdatePerpMarketNameIx(perpMarketIndex, name);
         const tx = await this.buildTransaction(updatePerpMarketNameIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketName(spotMarketIndex, name) {
+    async getUpdatePerpMarketNameIx(perpMarketIndex, name) {
         const nameBuffer = (0, userName_1.encodeName)(name);
-        const updateSpotMarketNameIx = await this.program.instruction.updateSpotMarketName(nameBuffer, {
+        return await this.program.instruction.updatePerpMarketName(nameBuffer, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updateSpotMarketName(spotMarketIndex, name) {
+        const updateSpotMarketNameIx = await this.getUpdateSpotMarketNameIx(spotMarketIndex, name);
         const tx = await this.buildTransaction(updateSpotMarketNameIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketPerLpBase(perpMarketIndex, perLpBase) {
-        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const updatePerpMarketPerLpBaseIx = await this.program.instruction.updatePerpMarketPerLpBase(perLpBase, {
+    async getUpdateSpotMarketNameIx(spotMarketIndex, name) {
+        const nameBuffer = (0, userName_1.encodeName)(name);
+        return await this.program.instruction.updateSpotMarketName(nameBuffer, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: perpMarketPublicKey,
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updatePerpMarketPerLpBase(perpMarketIndex, perLpBase) {
+        const updatePerpMarketPerLpBaseIx = await this.getUpdatePerpMarketPerLpBaseIx(perpMarketIndex, perLpBase);
         const tx = await this.buildTransaction(updatePerpMarketPerLpBaseIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketMaxSpread(perpMarketIndex, maxSpread) {
+    async getUpdatePerpMarketPerLpBaseIx(perpMarketIndex, perLpBase) {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
-        const updatePerpMarketMaxSpreadIx = await this.program.instruction.updatePerpMarketMaxSpread(maxSpread, {
+        return await this.program.instruction.updatePerpMarketPerLpBase(perLpBase, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -507,25 +553,33 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: perpMarketPublicKey,
             },
         });
+    }
+    async updatePerpMarketMaxSpread(perpMarketIndex, maxSpread) {
+        const updatePerpMarketMaxSpreadIx = await this.getUpdatePerpMarketMaxSpreadIx(perpMarketIndex, maxSpread);
         const tx = await this.buildTransaction(updatePerpMarketMaxSpreadIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpFeeStructure(feeStructure) {
-        const updatePerpFeeStructureIx = this.program.instruction.updatePerpFeeStructure(feeStructure, {
+    async getUpdatePerpMarketMaxSpreadIx(perpMarketIndex, maxSpread) {
+        const perpMarketPublicKey = await (0, pda_1.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,
             },
         });
+    }
+    async updatePerpFeeStructure(feeStructure) {
+        const updatePerpFeeStructureIx = await this.getUpdatePerpFeeStructureIx(feeStructure);
         const tx = await this.buildTransaction(updatePerpFeeStructureIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotFeeStructure(feeStructure) {
-        const updateSpotFeeStructureIx = await this.program.instruction.updateSpotFeeStructure(feeStructure, {
+    async getUpdatePerpFeeStructureIx(feeStructure) {
+        return this.program.instruction.updatePerpFeeStructure(feeStructure, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -533,12 +587,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateSpotFeeStructure(feeStructure) {
+        const updateSpotFeeStructureIx = await this.getUpdateSpotFeeStructureIx(feeStructure);
         const tx = await this.buildTransaction(updateSpotFeeStructureIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateInitialPctToLiquidate(initialPctToLiquidate) {
-        const updateInitialPctToLiquidateIx = await this.program.instruction.updateInitialPctToLiquidate(initialPctToLiquidate, {
+    async getUpdateSpotFeeStructureIx(feeStructure) {
+        return await this.program.instruction.updateSpotFeeStructure(feeStructure, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -546,12 +603,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateInitialPctToLiquidate(initialPctToLiquidate) {
+        const updateInitialPctToLiquidateIx = await this.getUpdateInitialPctToLiquidateIx(initialPctToLiquidate);
         const tx = await this.buildTransaction(updateInitialPctToLiquidateIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateLiquidationDuration(liquidationDuration) {
-        const updateLiquidationDurationIx = await this.program.instruction.updateLiquidationDuration(liquidationDuration, {
+    async getUpdateInitialPctToLiquidateIx(initialPctToLiquidate) {
+        return await this.program.instruction.updateInitialPctToLiquidate(initialPctToLiquidate, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -559,12 +619,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateLiquidationDuration(liquidationDuration) {
+        const updateLiquidationDurationIx = await this.getUpdateLiquidationDurationIx(liquidationDuration);
         const tx = await this.buildTransaction(updateLiquidationDurationIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateLiquidationMarginBufferRatio(updateLiquidationMarginBufferRatio) {
-        const updateLiquidationMarginBufferRatioIx = await this.program.instruction.updateLiquidationMarginBufferRatio(updateLiquidationMarginBufferRatio, {
+    async getUpdateLiquidationDurationIx(liquidationDuration) {
+        return await this.program.instruction.updateLiquidationDuration(liquidationDuration, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -572,12 +635,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateLiquidationMarginBufferRatio(updateLiquidationMarginBufferRatio) {
+        const updateLiquidationMarginBufferRatioIx = await this.getUpdateLiquidationMarginBufferRatioIx(updateLiquidationMarginBufferRatio);
         const tx = await this.buildTransaction(updateLiquidationMarginBufferRatioIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateOracleGuardRails(oracleGuardRails) {
-        const updateOracleGuardRailsIx = await this.program.instruction.updateOracleGuardRails(oracleGuardRails, {
+    async getUpdateLiquidationMarginBufferRatioIx(updateLiquidationMarginBufferRatio) {
+        return await this.program.instruction.updateLiquidationMarginBufferRatio(updateLiquidationMarginBufferRatio, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -585,12 +651,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateOracleGuardRails(oracleGuardRails) {
+        const updateOracleGuardRailsIx = await this.getUpdateOracleGuardRailsIx(oracleGuardRails);
         const tx = await this.buildTransaction(updateOracleGuardRailsIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateStateSettlementDuration(settlementDuration) {
-        const updateStateSettlementDurationIx = await this.program.instruction.updateStateSettlementDuration(settlementDuration, {
+    async getUpdateOracleGuardRailsIx(oracleGuardRails) {
+        return await this.program.instruction.updateOracleGuardRails(oracleGuardRails, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -598,12 +667,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateStateSettlementDuration(settlementDuration) {
+        const updateStateSettlementDurationIx = await this.getUpdateStateSettlementDurationIx(settlementDuration);
         const tx = await this.buildTransaction(updateStateSettlementDurationIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateStateMaxNumberOfSubAccounts(maxNumberOfSubAccounts) {
-        const updateStateMaxNumberOfSubAccountsIx = await this.program.instruction.updateStateMaxNumberOfSubAccounts(maxNumberOfSubAccounts, {
+    async getUpdateStateSettlementDurationIx(settlementDuration) {
+        return await this.program.instruction.updateStateSettlementDuration(settlementDuration, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -611,12 +683,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateStateMaxNumberOfSubAccounts(maxNumberOfSubAccounts) {
+        const updateStateMaxNumberOfSubAccountsIx = await this.getUpdateStateMaxNumberOfSubAccountsIx(maxNumberOfSubAccounts);
         const tx = await this.buildTransaction(updateStateMaxNumberOfSubAccountsIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateStateMaxInitializeUserFee(maxInitializeUserFee) {
-        const updateStateMaxInitializeUserFeeIx = await this.program.instruction.updateStateMaxInitializeUserFee(maxInitializeUserFee, {
+    async getUpdateStateMaxNumberOfSubAccountsIx(maxNumberOfSubAccounts) {
+        return await this.program.instruction.updateStateMaxNumberOfSubAccounts(maxNumberOfSubAccounts, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -624,26 +699,31 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateStateMaxInitializeUserFee(maxInitializeUserFee) {
+        const updateStateMaxInitializeUserFeeIx = await this.getUpdateStateMaxInitializeUserFeeIx(maxInitializeUserFee);
         const tx = await this.buildTransaction(updateStateMaxInitializeUserFeeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateWithdrawGuardThreshold(spotMarketIndex, withdrawGuardThreshold) {
-        const updateWithdrawGuardThresholdIx = await this.program.instruction.updateWithdrawGuardThreshold(withdrawGuardThreshold, {
+    async getUpdateStateMaxInitializeUserFeeIx(maxInitializeUserFee) {
+        return await this.program.instruction.updateStateMaxInitializeUserFee(maxInitializeUserFee, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateWithdrawGuardThreshold(spotMarketIndex, withdrawGuardThreshold) {
+        const updateWithdrawGuardThresholdIx = await this.getUpdateWithdrawGuardThresholdIx(spotMarketIndex, withdrawGuardThreshold);
         const tx = await this.buildTransaction(updateWithdrawGuardThresholdIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketIfFactor(spotMarketIndex, userIfFactor, totalIfFactor) {
-        const updateSpotMarketIfFactorIx = await this.program.instruction.updateSpotMarketIfFactor(spotMarketIndex, userIfFactor, totalIfFactor, {
+    async getUpdateWithdrawGuardThresholdIx(spotMarketIndex, withdrawGuardThreshold) {
+        return await this.program.instruction.updateWithdrawGuardThreshold(withdrawGuardThreshold, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -652,12 +732,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSpotMarketIfFactor(spotMarketIndex, userIfFactor, totalIfFactor) {
+        const updateSpotMarketIfFactorIx = await this.getUpdateSpotMarketIfFactorIx(spotMarketIndex, userIfFactor, totalIfFactor);
         const tx = await this.buildTransaction(updateSpotMarketIfFactorIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketRevenueSettlePeriod(spotMarketIndex, revenueSettlePeriod) {
-        const updateSpotMarketRevenueSettlePeriodIx = await this.program.instruction.updateSpotMarketRevenueSettlePeriod(revenueSettlePeriod, {
+    async getUpdateSpotMarketIfFactorIx(spotMarketIndex, userIfFactor, totalIfFactor) {
+        return await this.program.instruction.updateSpotMarketIfFactor(spotMarketIndex, userIfFactor, totalIfFactor, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -666,12 +749,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSpotMarketRevenueSettlePeriod(spotMarketIndex, revenueSettlePeriod) {
+        const updateSpotMarketRevenueSettlePeriodIx = await this.getUpdateSpotMarketRevenueSettlePeriodIx(spotMarketIndex, revenueSettlePeriod);
         const tx = await this.buildTransaction(updateSpotMarketRevenueSettlePeriodIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketMaxTokenDeposits(spotMarketIndex, maxTokenDeposits) {
-        const updateSpotMarketMaxTokenDepositsIx = this.program.instruction.updateSpotMarketMaxTokenDeposits(maxTokenDeposits, {
+    async getUpdateSpotMarketRevenueSettlePeriodIx(spotMarketIndex, revenueSettlePeriod) {
+        return await this.program.instruction.updateSpotMarketRevenueSettlePeriod(revenueSettlePeriod, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -680,12 +766,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSpotMarketMaxTokenDeposits(spotMarketIndex, maxTokenDeposits) {
+        const updateSpotMarketMaxTokenDepositsIx = await this.getUpdateSpotMarketMaxTokenDepositsIx(spotMarketIndex, maxTokenDeposits);
         const tx = await this.buildTransaction(updateSpotMarketMaxTokenDepositsIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketScaleInitialAssetWeightStart(spotMarketIndex, scaleInitialAssetWeightStart) {
-        const updateSpotMarketScaleInitialAssetWeightStartIx = this.program.instruction.updateSpotMarketScaleInitialAssetWeightStart(scaleInitialAssetWeightStart, {
+    async getUpdateSpotMarketMaxTokenDepositsIx(spotMarketIndex, maxTokenDeposits) {
+        return this.program.instruction.updateSpotMarketMaxTokenDeposits(maxTokenDeposits, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -694,12 +783,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSpotMarketScaleInitialAssetWeightStart(spotMarketIndex, scaleInitialAssetWeightStart) {
+        const updateSpotMarketScaleInitialAssetWeightStartIx = await this.getUpdateSpotMarketScaleInitialAssetWeightStartIx(spotMarketIndex, scaleInitialAssetWeightStart);
         const tx = await this.buildTransaction(updateSpotMarketScaleInitialAssetWeightStartIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateInsuranceFundUnstakingPeriod(spotMarketIndex, insuranceWithdrawEscrowPeriod) {
-        const updateInsuranceFundUnstakingPeriodIx = await this.program.instruction.updateInsuranceFundUnstakingPeriod(insuranceWithdrawEscrowPeriod, {
+    async getUpdateSpotMarketScaleInitialAssetWeightStartIx(spotMarketIndex, scaleInitialAssetWeightStart) {
+        return this.program.instruction.updateSpotMarketScaleInitialAssetWeightStart(scaleInitialAssetWeightStart, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -708,54 +800,66 @@ class AdminClient extends driftClient_1.DriftClient {
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateInsuranceFundUnstakingPeriod(spotMarketIndex, insuranceWithdrawEscrowPeriod) {
+        const updateInsuranceFundUnstakingPeriodIx = await this.getUpdateInsuranceFundUnstakingPeriodIx(spotMarketIndex, insuranceWithdrawEscrowPeriod);
         const tx = await this.buildTransaction(updateInsuranceFundUnstakingPeriodIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateLpCooldownTime(cooldownTime) {
-        const updateLpCooldownTimeIx = await this.program.instruction.updateLpCooldownTime(cooldownTime, {
+    async getUpdateInsuranceFundUnstakingPeriodIx(spotMarketIndex, insuranceWithdrawEscrowPeriod) {
+        return await this.program.instruction.updateInsuranceFundUnstakingPeriod(insuranceWithdrawEscrowPeriod, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateLpCooldownTime(cooldownTime) {
+        const updateLpCooldownTimeIx = await this.getUpdateLpCooldownTimeIx(cooldownTime);
         const tx = await this.buildTransaction(updateLpCooldownTimeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketOracle(perpMarketIndex, oracle, oracleSource) {
-        const updatePerpMarketOracleIx = await this.program.instruction.updatePerpMarketOracle(oracle, oracleSource, {
+    async getUpdateLpCooldownTimeIx(cooldownTime) {
+        return await this.program.instruction.updateLpCooldownTime(cooldownTime, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
-                oracle: oracle,
             },
         });
+    }
+    async updatePerpMarketOracle(perpMarketIndex, oracle, oracleSource) {
+        const updatePerpMarketOracleIx = await this.getUpdatePerpMarketOracleIx(perpMarketIndex, oracle, oracleSource);
         const tx = await this.buildTransaction(updatePerpMarketOracleIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketStepSizeAndTickSize(perpMarketIndex, stepSize, tickSize) {
-        const updatePerpMarketStepSizeAndTickSizeIx = await this.program.instruction.updatePerpMarketStepSizeAndTickSize(stepSize, tickSize, {
+    async getUpdatePerpMarketOracleIx(perpMarketIndex, oracle, oracleSource) {
+        return await this.program.instruction.updatePerpMarketOracle(oracle, oracleSource, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+                oracle: oracle,
             },
         });
+    }
+    async updatePerpMarketStepSizeAndTickSize(perpMarketIndex, stepSize, tickSize) {
+        const updatePerpMarketStepSizeAndTickSizeIx = await this.getUpdatePerpMarketStepSizeAndTickSizeIx(perpMarketIndex, stepSize, tickSize);
         const tx = await this.buildTransaction(updatePerpMarketStepSizeAndTickSizeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketMinOrderSize(perpMarketIndex, orderSize) {
-        const updatePerpMarketMinOrderSizeIx = await this.program.instruction.updatePerpMarketMinOrderSize(orderSize, {
+    async getUpdatePerpMarketStepSizeAndTickSizeIx(perpMarketIndex, stepSize, tickSize) {
+        return await this.program.instruction.updatePerpMarketStepSizeAndTickSize(stepSize, tickSize, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -764,24 +868,41 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketMinOrderSize(perpMarketIndex, orderSize) {
+        const updatePerpMarketMinOrderSizeIx = await this.getUpdatePerpMarketMinOrderSizeIx(perpMarketIndex, orderSize);
         const tx = await this.buildTransaction(updatePerpMarketMinOrderSizeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketStepSizeAndTickSize(spotMarketIndex, stepSize, tickSize) {
-        const updateSpotMarketStepSizeAndTickSizeIx = await this.program.instruction.updateSpotMarketStepSizeAndTickSize(stepSize, tickSize, {
+    async getUpdatePerpMarketMinOrderSizeIx(perpMarketIndex, orderSize) {
+        return await this.program.instruction.updatePerpMarketMinOrderSize(orderSize, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updateSpotMarketStepSizeAndTickSize(spotMarketIndex, stepSize, tickSize) {
+        const updateSpotMarketStepSizeAndTickSizeIx = await this.getUpdateSpotMarketStepSizeAndTickSizeIx(spotMarketIndex, stepSize, tickSize);
         const tx = await this.buildTransaction(updateSpotMarketStepSizeAndTickSizeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async getUpdateSpotMarketStepSizeAndTickSizeIx(spotMarketIndex, stepSize, tickSize) {
+        return await this.program.instruction.updateSpotMarketStepSizeAndTickSize(stepSize, tickSize, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+            },
+        });
+    }
     async updateSpotMarketMinOrderSize(spotMarketIndex, orderSize) {
         const updateSpotMarketMinOrderSizeIx = await this.program.instruction.updateSpotMarketMinOrderSize(orderSize, {
             accounts: {
@@ -796,63 +917,86 @@ class AdminClient extends driftClient_1.DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketExpiry(perpMarketIndex, expiryTs) {
-        const updatePerpMarketExpiryIx = await this.program.instruction.updatePerpMarketExpiry(expiryTs, {
+    async getUpdateSpotMarketMinOrderSizeIx(spotMarketIndex, orderSize) {
+        return await this.program.instruction.updateSpotMarketMinOrderSize(orderSize, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updatePerpMarketExpiry(perpMarketIndex, expiryTs) {
+        const updatePerpMarketExpiryIx = await this.getUpdatePerpMarketExpiryIx(perpMarketIndex, expiryTs);
         const tx = await this.buildTransaction(updatePerpMarketExpiryIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketOracle(spotMarketIndex, oracle, oracleSource) {
-        const updateSpotMarketOracleIx = await this.program.instruction.updateSpotMarketOracle(oracle, oracleSource, {
+    async getUpdatePerpMarketExpiryIx(perpMarketIndex, expiryTs) {
+        return await this.program.instruction.updatePerpMarketExpiry(expiryTs, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
-                oracle: oracle,
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updateSpotMarketOracle(spotMarketIndex, oracle, oracleSource) {
+        const updateSpotMarketOracleIx = await this.getUpdateSpotMarketOracleIx(spotMarketIndex, oracle, oracleSource);
         const tx = await this.buildTransaction(updateSpotMarketOracleIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketOrdersEnabled(spotMarketIndex, ordersEnabled) {
-        const updateSpotMarketOrdersEnabledIx = await this.program.instruction.updateSpotMarketOrdersEnabled(ordersEnabled, {
+    async getUpdateSpotMarketOracleIx(spotMarketIndex, oracle, oracleSource) {
+        return await this.program.instruction.updateSpotMarketOracle(oracle, oracleSource, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+                oracle: oracle,
             },
         });
+    }
+    async updateSpotMarketOrdersEnabled(spotMarketIndex, ordersEnabled) {
+        const updateSpotMarketOrdersEnabledIx = await this.getUpdateSpotMarketOrdersEnabledIx(spotMarketIndex, ordersEnabled);
         const tx = await this.buildTransaction(updateSpotMarketOrdersEnabledIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSerumFulfillmentConfigStatus(serumFulfillmentConfig, status) {
-        const updateSerumFulfillmentConfigStatusIx = await this.program.instruction.updateSerumFulfillmentConfigStatus(status, {
+    async getUpdateSpotMarketOrdersEnabledIx(spotMarketIndex, ordersEnabled) {
+        return await this.program.instruction.updateSpotMarketOrdersEnabled(ordersEnabled, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                serumFulfillmentConfig,
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSerumFulfillmentConfigStatus(serumFulfillmentConfig, status) {
+        const updateSerumFulfillmentConfigStatusIx = await this.getUpdateSerumFulfillmentConfigStatusIx(serumFulfillmentConfig, status);
         const tx = await this.buildTransaction(updateSerumFulfillmentConfigStatusIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async getUpdateSerumFulfillmentConfigStatusIx(serumFulfillmentConfig, status) {
+        return await this.program.instruction.updateSerumFulfillmentConfigStatus(status, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                serumFulfillmentConfig,
+            },
+        });
+    }
     async updatePhoenixFulfillmentConfigStatus(phoenixFulfillmentConfig, status) {
         const updatePhoenixFulfillmentConfigStatusIx = await this.program.instruction.phoenixFulfillmentConfigStatus(status, {
             accounts: {
@@ -867,35 +1011,42 @@ class AdminClient extends driftClient_1.DriftClient {
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketExpiry(spotMarketIndex, expiryTs) {
-        const updateSpotMarketExpiryIx = await this.program.instruction.updateSpotMarketExpiry(expiryTs, {
+    async getUpdatePhoenixFulfillmentConfigStatusIx(phoenixFulfillmentConfig, status) {
+        return await this.program.instruction.phoenixFulfillmentConfigStatus(status, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+                phoenixFulfillmentConfig,
             },
         });
+    }
+    async updateSpotMarketExpiry(spotMarketIndex, expiryTs) {
+        const updateSpotMarketExpiryIx = await this.getUpdateSpotMarketExpiryIx(spotMarketIndex, expiryTs);
         const tx = await this.buildTransaction(updateSpotMarketExpiryIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateWhitelistMint(whitelistMint) {
-        const updateWhitelistMintIx = await this.program.instruction.updateWhitelistMint(whitelistMint, {
+    async getUpdateSpotMarketExpiryIx(spotMarketIndex, expiryTs) {
+        return await this.program.instruction.updateSpotMarketExpiry(expiryTs, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateWhitelistMint(whitelistMint) {
+        const updateWhitelistMintIx = await this.getUpdateWhitelistMintIx(whitelistMint);
         const tx = await this.buildTransaction(updateWhitelistMintIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateDiscountMint(discountMint) {
-        const updateDiscountMintIx = await this.program.instruction.updateDiscountMint(discountMint, {
+    async getUpdateWhitelistMintIx(whitelistMint) {
+        return await this.program.instruction.updateWhitelistMint(whitelistMint, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -903,26 +1054,31 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateDiscountMint(discountMint) {
+        const updateDiscountMintIx = await this.getUpdateDiscountMintIx(discountMint);
         const tx = await this.buildTransaction(updateDiscountMintIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketMarginWeights(spotMarketIndex, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0) {
-        const updateSpotMarketMarginWeightsIx = await this.program.instruction.updateSpotMarketMarginWeights(initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, {
+    async getUpdateDiscountMintIx(discountMint) {
+        return await this.program.instruction.updateDiscountMint(discountMint, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSpotMarketMarginWeights(spotMarketIndex, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0) {
+        const updateSpotMarketMarginWeightsIx = await this.getUpdateSpotMarketMarginWeightsIx(spotMarketIndex, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor);
         const tx = await this.buildTransaction(updateSpotMarketMarginWeightsIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketBorrowRate(spotMarketIndex, optimalUtilization, optimalBorrowRate, optimalMaxRate) {
-        const updateSpotMarketBorrowRateIx = await this.program.instruction.updateSpotMarketBorrowRate(optimalUtilization, optimalBorrowRate, optimalMaxRate, {
+    async getUpdateSpotMarketMarginWeightsIx(spotMarketIndex, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0) {
+        return await this.program.instruction.updateSpotMarketMarginWeights(initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -931,12 +1087,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSpotMarketBorrowRate(spotMarketIndex, optimalUtilization, optimalBorrowRate, optimalMaxRate) {
+        const updateSpotMarketBorrowRateIx = await this.getUpdateSpotMarketBorrowRateIx(spotMarketIndex, optimalUtilization, optimalBorrowRate, optimalMaxRate);
         const tx = await this.buildTransaction(updateSpotMarketBorrowRateIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketAssetTier(spotMarketIndex, assetTier) {
-        const updateSpotMarketAssetTierIx = await this.program.instruction.updateSpotMarketAssetTier(assetTier, {
+    async getUpdateSpotMarketBorrowRateIx(spotMarketIndex, optimalUtilization, optimalBorrowRate, optimalMaxRate) {
+        return await this.program.instruction.updateSpotMarketBorrowRate(optimalUtilization, optimalBorrowRate, optimalMaxRate, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -945,12 +1104,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSpotMarketAssetTier(spotMarketIndex, assetTier) {
+        const updateSpotMarketAssetTierIx = await this.getUpdateSpotMarketAssetTierIx(spotMarketIndex, assetTier);
         const tx = await this.buildTransaction(updateSpotMarketAssetTierIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketStatus(spotMarketIndex, marketStatus) {
-        const updateSpotMarketStatusIx = await this.program.instruction.updateSpotMarketStatus(marketStatus, {
+    async getUpdateSpotMarketAssetTierIx(spotMarketIndex, assetTier) {
+        return await this.program.instruction.updateSpotMarketAssetTier(assetTier, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -959,12 +1121,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSpotMarketStatus(spotMarketIndex, marketStatus) {
+        const updateSpotMarketStatusIx = await this.getUpdateSpotMarketStatusIx(spotMarketIndex, marketStatus);
         const tx = await this.buildTransaction(updateSpotMarketStatusIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketPausedOperations(spotMarketIndex, pausedOperations) {
-        const updateSpotMarketPausedOperationsIx = await this.program.instruction.updateSpotMarketPausedOperations(pausedOperations, {
+    async getUpdateSpotMarketStatusIx(spotMarketIndex, marketStatus) {
+        return await this.program.instruction.updateSpotMarketStatus(marketStatus, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -973,26 +1138,32 @@ class AdminClient extends driftClient_1.DriftClient {
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updateSpotMarketPausedOperations(spotMarketIndex, pausedOperations) {
+        const updateSpotMarketPausedOperationsIx = await this.getUpdateSpotMarketPausedOperationsIx(spotMarketIndex, pausedOperations);
         const tx = await this.buildTransaction(updateSpotMarketPausedOperationsIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketStatus(perpMarketIndex, marketStatus) {
-        const updatePerpMarketStatusIx = await this.program.instruction.updatePerpMarketStatus(marketStatus, {
+    async getUpdateSpotMarketPausedOperationsIx(spotMarketIndex, pausedOperations) {
+        return await this.program.instruction.updateSpotMarketPausedOperations(pausedOperations, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async updatePerpMarketStatus(perpMarketIndex, marketStatus) {
+        const updatePerpMarketStatusIx = await this.getUpdatePerpMarketStatusIx(perpMarketIndex, marketStatus);
         const tx = await this.buildTransaction(updatePerpMarketStatusIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketPausedOperations(perpMarketIndex, pausedOperations) {
-        const updatePerpMarketPausedOperationsIx = await this.program.instruction.updatePerpMarketPausedOperations(pausedOperations, {
+    async getUpdatePerpMarketStatusIx(perpMarketIndex, marketStatus) {
+        return await this.program.instruction.updatePerpMarketStatus(marketStatus, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -1001,12 +1172,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketPausedOperations(perpMarketIndex, pausedOperations) {
+        const updatePerpMarketPausedOperationsIx = await this.getUpdatePerpMarketPausedOperationsIx(perpMarketIndex, pausedOperations);
         const tx = await this.buildTransaction(updatePerpMarketPausedOperationsIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketContractTier(perpMarketIndex, contractTier) {
-        const updatePerpMarketContractTierIx = await this.program.instruction.updatePerpMarketContractTier(contractTier, {
+    async getUpdatePerpMarketPausedOperationsIx(perpMarketIndex, pausedOperations) {
+        return await this.program.instruction.updatePerpMarketPausedOperations(pausedOperations, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -1015,25 +1189,32 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketContractTier(perpMarketIndex, contractTier) {
+        const updatePerpMarketContractTierIx = await this.getUpdatePerpMarketContractTierIx(perpMarketIndex, contractTier);
         const tx = await this.buildTransaction(updatePerpMarketContractTierIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateExchangeStatus(exchangeStatus) {
-        const updateExchangeStatusIx = await this.program.instruction.updateExchangeStatus(exchangeStatus, {
+    async getUpdatePerpMarketContractTierIx(perpMarketIndex, contractTier) {
+        return await this.program.instruction.updatePerpMarketContractTier(contractTier, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updateExchangeStatus(exchangeStatus) {
+        const updateExchangeStatusIx = await this.getUpdateExchangeStatusIx(exchangeStatus);
         const tx = await this.buildTransaction(updateExchangeStatusIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpAuctionDuration(minDuration) {
-        const updatePerpAuctionDurationIx = await this.program.instruction.updatePerpAuctionDuration(typeof minDuration === 'number' ? minDuration : minDuration.toNumber(), {
+    async getUpdateExchangeStatusIx(exchangeStatus) {
+        return await this.program.instruction.updateExchangeStatus(exchangeStatus, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -1041,12 +1222,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updatePerpAuctionDuration(minDuration) {
+        const updatePerpAuctionDurationIx = await this.getUpdatePerpAuctionDurationIx(minDuration);
         const tx = await this.buildTransaction(updatePerpAuctionDurationIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotAuctionDuration(defaultAuctionDuration) {
-        const updateSpotAuctionDurationIx = await this.program.instruction.updateSpotAuctionDuration(defaultAuctionDuration, {
+    async getUpdatePerpAuctionDurationIx(minDuration) {
+        return await this.program.instruction.updatePerpAuctionDuration(typeof minDuration === 'number' ? minDuration : minDuration.toNumber(), {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -1054,54 +1238,65 @@ class AdminClient extends driftClient_1.DriftClient {
                 state: await this.getStatePublicKey(),
             },
         });
+    }
+    async updateSpotAuctionDuration(defaultAuctionDuration) {
+        const updateSpotAuctionDurationIx = await this.getUpdateSpotAuctionDurationIx(defaultAuctionDuration);
         const tx = await this.buildTransaction(updateSpotAuctionDurationIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketMaxFillReserveFraction(perpMarketIndex, maxBaseAssetAmountRatio) {
-        const updatePerpMarketMaxFillReserveFractionIx = await this.program.instruction.updatePerpMarketMaxFillReserveFraction(maxBaseAssetAmountRatio, {
+    async getUpdateSpotAuctionDurationIx(defaultAuctionDuration) {
+        return await this.program.instruction.updateSpotAuctionDuration(defaultAuctionDuration, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketMaxFillReserveFraction(perpMarketIndex, maxBaseAssetAmountRatio) {
+        const updatePerpMarketMaxFillReserveFractionIx = await this.getUpdatePerpMarketMaxFillReserveFractionIx(perpMarketIndex, maxBaseAssetAmountRatio);
         const tx = await this.buildTransaction(updatePerpMarketMaxFillReserveFractionIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateMaxSlippageRatio(perpMarketIndex, maxSlippageRatio) {
-        const updateMaxSlippageRatioIx = await this.program.instruction.updateMaxSlippageRatio(maxSlippageRatio, {
+    async getUpdatePerpMarketMaxFillReserveFractionIx(perpMarketIndex, maxBaseAssetAmountRatio) {
+        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 (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updateMaxSlippageRatio(perpMarketIndex, maxSlippageRatio) {
+        const updateMaxSlippageRatioIx = await this.getUpdateMaxSlippageRatioIx(perpMarketIndex, maxSlippageRatio);
         const tx = await this.buildTransaction(updateMaxSlippageRatioIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketUnrealizedAssetWeight(perpMarketIndex, unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight) {
-        const updatePerpMarketUnrealizedAssetWeightIx = await this.program.instruction.updatePerpMarketUnrealizedAssetWeight(unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight, {
+    async getUpdateMaxSlippageRatioIx(perpMarketIndex, maxSlippageRatio) {
+        return await this.program.instruction.updateMaxSlippageRatio(maxSlippageRatio, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+                perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
             },
         });
+    }
+    async updatePerpMarketUnrealizedAssetWeight(perpMarketIndex, unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight) {
+        const updatePerpMarketUnrealizedAssetWeightIx = await this.getUpdatePerpMarketUnrealizedAssetWeightIx(perpMarketIndex, unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight);
         const tx = await this.buildTransaction(updatePerpMarketUnrealizedAssetWeightIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketMaxImbalances(perpMarketIndex, unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance) {
-        const updatePerpMarketMaxImabalancesIx = await this.program.instruction.updatePerpMarketMaxImbalances(unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, {
+    async getUpdatePerpMarketUnrealizedAssetWeightIx(perpMarketIndex, unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight) {
+        return await this.program.instruction.updatePerpMarketUnrealizedAssetWeight(unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -1110,12 +1305,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketMaxImbalances(perpMarketIndex, unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance) {
+        const updatePerpMarketMaxImabalancesIx = await this.getUpdatePerpMarketMaxImbalancesIx(perpMarketIndex, unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance);
         const tx = await this.buildTransaction(updatePerpMarketMaxImabalancesIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketMaxOpenInterest(perpMarketIndex, maxOpenInterest) {
-        const updatePerpMarketMaxOpenInterestIx = await this.program.instruction.updatePerpMarketMaxOpenInterest(maxOpenInterest, {
+    async getUpdatePerpMarketMaxImbalancesIx(perpMarketIndex, unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance) {
+        return await this.program.instruction.updatePerpMarketMaxImbalances(unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -1124,12 +1322,15 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketMaxOpenInterest(perpMarketIndex, maxOpenInterest) {
+        const updatePerpMarketMaxOpenInterestIx = await this.getUpdatePerpMarketMaxOpenInterestIx(perpMarketIndex, maxOpenInterest);
         const tx = await this.buildTransaction(updatePerpMarketMaxOpenInterestIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketFeeAdjustment(perpMarketIndex, feeAdjustment) {
-        const updatepPerpMarketFeeAdjustmentIx = await this.program.instruction.updatePerpMarketFeeAdjustment(feeAdjustment, {
+    async getUpdatePerpMarketMaxOpenInterestIx(perpMarketIndex, maxOpenInterest) {
+        return await this.program.instruction.updatePerpMarketMaxOpenInterest(maxOpenInterest, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
@@ -1138,82 +1339,111 @@ class AdminClient extends driftClient_1.DriftClient {
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updatePerpMarketFeeAdjustment(perpMarketIndex, feeAdjustment) {
+        const updatepPerpMarketFeeAdjustmentIx = await this.getUpdatePerpMarketFeeAdjustmentIx(perpMarketIndex, feeAdjustment);
         const tx = await this.buildTransaction(updatepPerpMarketFeeAdjustmentIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSerumVault(srmVault) {
-        const updateSerumVaultIx = await this.program.instruction.updateSerumVault(srmVault, {
+    async getUpdatePerpMarketFeeAdjustmentIx(perpMarketIndex, feeAdjustment) {
+        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 (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updateSerumVault(srmVault) {
+        const updateSerumVaultIx = await this.getUpdateSerumVaultIx(srmVault);
         const tx = await this.buildTransaction(updateSerumVaultIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updatePerpMarketLiquidationFee(perpMarketIndex, liquidatorFee, ifLiquidationFee) {
-        const updatePerpMarketLiquidationFeeIx = await this.program.instruction.updatePerpMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
+    async getUpdateSerumVaultIx(srmVault) {
+        return await this.program.instruction.updateSerumVault(srmVault, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
+                srmVault: srmVault,
             },
         });
+    }
+    async updatePerpMarketLiquidationFee(perpMarketIndex, liquidatorFee, ifLiquidationFee) {
+        const updatePerpMarketLiquidationFeeIx = await this.getUpdatePerpMarketLiquidationFeeIx(perpMarketIndex, liquidatorFee, ifLiquidationFee);
         const tx = await this.buildTransaction(updatePerpMarketLiquidationFeeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateSpotMarketLiquidationFee(spotMarketIndex, liquidatorFee, ifLiquidationFee) {
-        const updateSpotMarketLiquidationFeeIx = await this.program.instruction.updateSpotMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
+    async getUpdatePerpMarketLiquidationFeeIx(perpMarketIndex, liquidatorFee, ifLiquidationFee) {
+        return await this.program.instruction.updatePerpMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
+                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
+    }
+    async updateSpotMarketLiquidationFee(spotMarketIndex, liquidatorFee, ifLiquidationFee) {
+        const updateSpotMarketLiquidationFeeIx = await this.getUpdateSpotMarketLiquidationFeeIx(spotMarketIndex, liquidatorFee, ifLiquidationFee);
         const tx = await this.buildTransaction(updateSpotMarketLiquidationFeeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async initializeProtocolIfSharesTransferConfig() {
-        const initializeProtocolIfSharesTransferConfigIx = await this.program.instruction.initializeProtocolIfSharesTransferConfig({
+    async getUpdateSpotMarketLiquidationFeeIx(spotMarketIndex, liquidatorFee, ifLiquidationFee) {
+        return await this.program.instruction.updateSpotMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
-                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
-                systemProgram: anchor.web3.SystemProgram.programId,
-                protocolIfSharesTransferConfig: (0, pda_1.getProtocolIfSharesTransferConfigPublicKey)(this.program.programId),
+                spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
         });
+    }
+    async initializeProtocolIfSharesTransferConfig() {
+        const initializeProtocolIfSharesTransferConfigIx = await this.getInitializeProtocolIfSharesTransferConfigIx();
         const tx = await this.buildTransaction(initializeProtocolIfSharesTransferConfigIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async updateProtocolIfSharesTransferConfig(whitelistedSigners, maxTransferPerEpoch) {
-        const updateProtocolIfSharesTransferConfigIx = await this.program.instruction.updateProtocolIfSharesTransferConfig(whitelistedSigners || null, maxTransferPerEpoch, {
+    async getInitializeProtocolIfSharesTransferConfigIx() {
+        return await this.program.instruction.initializeProtocolIfSharesTransferConfig({
             accounts: {
                 admin: this.isSubscribed
                     ? this.getStateAccount().admin
                     : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
+                rent: web3_js_1.SYSVAR_RENT_PUBKEY,
+                systemProgram: anchor.web3.SystemProgram.programId,
                 protocolIfSharesTransferConfig: (0, pda_1.getProtocolIfSharesTransferConfigPublicKey)(this.program.programId),
             },
         });
+    }
+    async updateProtocolIfSharesTransferConfig(whitelistedSigners, maxTransferPerEpoch) {
+        const updateProtocolIfSharesTransferConfigIx = await this.getUpdateProtocolIfSharesTransferConfigIx(whitelistedSigners, maxTransferPerEpoch);
         const tx = await this.buildTransaction(updateProtocolIfSharesTransferConfigIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
+    async getUpdateProtocolIfSharesTransferConfigIx(whitelistedSigners, maxTransferPerEpoch) {
+        return await this.program.instruction.updateProtocolIfSharesTransferConfig(whitelistedSigners || null, maxTransferPerEpoch, {
+            accounts: {
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
+                state: await this.getStatePublicKey(),
+                protocolIfSharesTransferConfig: (0, pda_1.getProtocolIfSharesTransferConfigPublicKey)(this.program.programId),
+            },
+        });
+    }
     async initializePrelaunchOracle(perpMarketIndex, price, maxPrice) {
         const initializePrelaunchOracleIx = await this.getInitializePrelaunchOracleIx(perpMarketIndex, price, maxPrice);
         const tx = await this.buildTransaction(initializePrelaunchOracleIx);