@drift-labs/sdk 2.74.0-beta.13 → 2.74.0-beta.14

package/lib/adminClient.js

@@ -46,7 +46,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const [driftStatePublicKey] = await (0, pda_1.getDriftStateAccountPublicKeyAndNonce)(this.program.programId);
         const initializeIx = await this.program.instruction.initialize({
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: driftStatePublicKey,
                 quoteAssetMint: usdcMint,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
@@ -61,7 +63,7 @@ class AdminClient extends driftClient_1.DriftClient {
     }
     async initializeSpotMarket(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0, liquidatorFee = 0, ifLiquidationFee = 0, activeStatus = true, assetTier = types_1.AssetTier.COLLATERAL, scaleInitialAssetWeightStart = numericConstants_1.ZERO, withdrawGuardThreshold = numericConstants_1.ZERO, orderTickSize = numericConstants_1.ONE, orderStepSize = numericConstants_1.ONE, ifTotalFactor = 0, name = userName_1.DEFAULT_MARKET_NAME) {
         const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
-        const initializeIx = await this.getInitializeSpotMarketIx(this.wallet.publicKey, mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, ifLiquidationFee, activeStatus, assetTier, scaleInitialAssetWeightStart, withdrawGuardThreshold, orderTickSize, orderStepSize, ifTotalFactor, name);
+        const initializeIx = await this.getInitializeSpotMarketIx(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, ifLiquidationFee, activeStatus, assetTier, scaleInitialAssetWeightStart, withdrawGuardThreshold, orderTickSize, orderStepSize, ifTotalFactor, name);
         const tx = await this.buildTransaction(initializeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         // const { txSig } = await this.sendTransaction(initializeTx, [], this.opts);
@@ -73,7 +75,7 @@ class AdminClient extends driftClient_1.DriftClient {
         await this.accountSubscriber.setSpotOracleMap();
         return txSig;
     }
-    async getInitializeSpotMarketIx(admin, mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0, liquidatorFee = 0, ifLiquidationFee = 0, activeStatus = true, assetTier = types_1.AssetTier.COLLATERAL, scaleInitialAssetWeightStart = numericConstants_1.ZERO, withdrawGuardThreshold = numericConstants_1.ZERO, orderTickSize = numericConstants_1.ONE, orderStepSize = numericConstants_1.ONE, ifTotalFactor = 0, name = userName_1.DEFAULT_MARKET_NAME) {
+    async getInitializeSpotMarketIx(mint, optimalUtilization, optimalRate, maxRate, oracle, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0, liquidatorFee = 0, ifLiquidationFee = 0, activeStatus = true, assetTier = types_1.AssetTier.COLLATERAL, scaleInitialAssetWeightStart = numericConstants_1.ZERO, withdrawGuardThreshold = numericConstants_1.ZERO, orderTickSize = numericConstants_1.ONE, orderStepSize = numericConstants_1.ONE, ifTotalFactor = 0, name = userName_1.DEFAULT_MARKET_NAME) {
         const spotMarketIndex = this.getStateAccount().numberOfSpotMarkets;
         const spotMarket = await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex);
         const spotMarketVault = await (0, pda_1.getSpotMarketVaultPublicKey)(this.program.programId, spotMarketIndex);
@@ -81,7 +83,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const nameBuffer = (0, userName_1.encodeName)(name);
         const initializeIx = await this.program.instruction.initializeSpotMarket(optimalUtilization, optimalRate, maxRate, oracleSource, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, liquidatorFee, ifLiquidationFee, activeStatus, assetTier, scaleInitialAssetWeightStart, withdrawGuardThreshold, orderTickSize, orderStepSize, ifTotalFactor, nameBuffer, {
             accounts: {
-                admin,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket,
                 spotMarketVault,
@@ -97,17 +101,19 @@ class AdminClient extends driftClient_1.DriftClient {
         return initializeIx;
     }
     async initializeSerumFulfillmentConfig(marketIndex, serumMarket, serumProgram) {
-        const initializeIx = await this.getInitializeSerumFulfillmentConfigIx(this.wallet.publicKey, marketIndex, serumMarket, serumProgram);
+        const initializeIx = await this.getInitializeSerumFulfillmentConfigIx(marketIndex, serumMarket, serumProgram);
         const tx = await this.buildTransaction(initializeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getInitializeSerumFulfillmentConfigIx(admin, marketIndex, serumMarket, serumProgram) {
+    async getInitializeSerumFulfillmentConfigIx(marketIndex, serumMarket, serumProgram) {
         const serumOpenOrders = (0, pda_1.getSerumOpenOrdersPublicKey)(this.program.programId, serumMarket);
         const serumFulfillmentConfig = (0, pda_1.getSerumFulfillmentConfigPublicKey)(this.program.programId, serumMarket);
         return await this.program.instruction.initializeSerumFulfillmentConfig(marketIndex, {
             accounts: {
-                admin,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
                 quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
@@ -122,16 +128,18 @@ class AdminClient extends driftClient_1.DriftClient {
         });
     }
     async initializePhoenixFulfillmentConfig(marketIndex, phoenixMarket) {
-        const initializeIx = await this.getInitializePhoenixFulfillmentConfigIx(this.wallet.publicKey, marketIndex, phoenixMarket);
+        const initializeIx = await this.getInitializePhoenixFulfillmentConfigIx(marketIndex, phoenixMarket);
         const tx = await this.buildTransaction(initializeIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getInitializePhoenixFulfillmentConfigIx(admin, marketIndex, phoenixMarket) {
+    async getInitializePhoenixFulfillmentConfigIx(marketIndex, phoenixMarket) {
         const phoenixFulfillmentConfig = (0, pda_1.getPhoenixFulfillmentConfigPublicKey)(this.program.programId, phoenixMarket);
         return await this.program.instruction.initializePhoenixFulfillmentConfig(marketIndex, {
             accounts: {
-                admin,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 baseSpotMarket: this.getSpotMarketAccount(marketIndex).pubkey,
                 quoteSpotMarket: this.getQuoteSpotMarketAccount().pubkey,
@@ -144,9 +152,9 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
-    async initializePerpMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, ifLiquidatorFee = 10000, imfFactor = 0, activeStatus = true, baseSpread = 0, maxSpread = 142500, maxOpenInterest = numericConstants_1.ZERO, maxRevenueWithdrawPerPeriod = numericConstants_1.ZERO, quoteMaxInsurance = numericConstants_1.ZERO, orderStepSize = numericConstants_1.BASE_PRECISION.divn(10000), orderTickSize = numericConstants_1.PRICE_PRECISION.divn(100000), minOrderSize = numericConstants_1.BASE_PRECISION.divn(10000), concentrationCoefScale = numericConstants_1.ONE, curveUpdateIntensity = 0, ammJitIntensity = 0, name = userName_1.DEFAULT_MARKET_NAME) {
+    async initializePerpMarket(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, contractTier = types_1.ContractTier.SPECULATIVE, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, ifLiquidatorFee = 10000, imfFactor = 0, activeStatus = true, baseSpread = 0, maxSpread = 142500, maxOpenInterest = numericConstants_1.ZERO, maxRevenueWithdrawPerPeriod = numericConstants_1.ZERO, quoteMaxInsurance = numericConstants_1.ZERO, orderStepSize = numericConstants_1.BASE_PRECISION.divn(10000), orderTickSize = numericConstants_1.PRICE_PRECISION.divn(100000), minOrderSize = numericConstants_1.BASE_PRECISION.divn(10000), concentrationCoefScale = numericConstants_1.ONE, curveUpdateIntensity = 0, ammJitIntensity = 0, name = userName_1.DEFAULT_MARKET_NAME) {
         const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
-        const initializeMarketIx = await this.getInitializePerpMarketIx(this.wallet.publicKey, marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, name);
+        const initializeMarketIx = await this.getInitializePerpMarketIx(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, contractTier, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, name);
         const tx = await this.buildTransaction(initializeMarketIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         while (this.getStateAccount().numberOfMarkets <= currentPerpMarketIndex) {
@@ -160,14 +168,16 @@ class AdminClient extends driftClient_1.DriftClient {
         await this.accountSubscriber.setPerpOracleMap();
         return txSig;
     }
-    async getInitializePerpMarketIx(admin, marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, ifLiquidatorFee = 10000, imfFactor = 0, activeStatus = true, baseSpread = 0, maxSpread = 142500, maxOpenInterest = numericConstants_1.ZERO, maxRevenueWithdrawPerPeriod = numericConstants_1.ZERO, quoteMaxInsurance = numericConstants_1.ZERO, orderStepSize = numericConstants_1.BASE_PRECISION.divn(10000), orderTickSize = numericConstants_1.PRICE_PRECISION.divn(100000), minOrderSize = numericConstants_1.BASE_PRECISION.divn(10000), concentrationCoefScale = numericConstants_1.ONE, curveUpdateIntensity = 0, ammJitIntensity = 0, name = userName_1.DEFAULT_MARKET_NAME) {
+    async getInitializePerpMarketIx(marketIndex, priceOracle, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier = numericConstants_1.PEG_PRECISION, oracleSource = types_1.OracleSource.PYTH, contractTier = types_1.ContractTier.SPECULATIVE, marginRatioInitial = 2000, marginRatioMaintenance = 500, liquidatorFee = 0, ifLiquidatorFee = 10000, imfFactor = 0, activeStatus = true, baseSpread = 0, maxSpread = 142500, maxOpenInterest = numericConstants_1.ZERO, maxRevenueWithdrawPerPeriod = numericConstants_1.ZERO, quoteMaxInsurance = numericConstants_1.ZERO, orderStepSize = numericConstants_1.BASE_PRECISION.divn(10000), orderTickSize = numericConstants_1.PRICE_PRECISION.divn(100000), minOrderSize = numericConstants_1.BASE_PRECISION.divn(10000), concentrationCoefScale = numericConstants_1.ONE, curveUpdateIntensity = 0, ammJitIntensity = 0, name = userName_1.DEFAULT_MARKET_NAME) {
         const currentPerpMarketIndex = this.getStateAccount().numberOfMarkets;
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, currentPerpMarketIndex);
         const nameBuffer = (0, userName_1.encodeName)(name);
-        return await this.program.instruction.initializePerpMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, nameBuffer, {
+        return await this.program.instruction.initializePerpMarket(marketIndex, baseAssetReserve, quoteAssetReserve, periodicity, pegMultiplier, oracleSource, contractTier, marginRatioInitial, marginRatioMaintenance, liquidatorFee, ifLiquidatorFee, imfFactor, activeStatus, baseSpread, maxSpread, maxOpenInterest, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, orderStepSize, orderTickSize, minOrderSize, concentrationCoefScale, curveUpdateIntensity, ammJitIntensity, nameBuffer, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 oracle: priceOracle,
                 perpMarket: perpMarketPublicKey,
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
@@ -180,7 +190,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const deleteInitializeMarketIx = await this.program.instruction.deleteInitializedPerpMarket(marketIndex, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 perpMarket: perpMarketPublicKey,
             },
         });
@@ -196,7 +208,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const moveAmmPriceIx = await this.program.instruction.moveAmmPrice(baseAssetReserve, quoteAssetReserve, sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 perpMarket: marketPublicKey,
             },
         });
@@ -208,7 +222,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const updateKIx = await this.program.instruction.updateK(sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 oracle: this.getPerpMarketAccount(perpMarketIndex).amm.oracle,
             },
@@ -222,7 +238,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const recenterPerpMarketAmmIx = await this.program.instruction.recenterPerpMarketAmm(pegMultiplier, sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 perpMarket: marketPublicKey,
             },
         });
@@ -234,7 +252,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const updatePerpMarketConcentrationCoefIx = await this.program.instruction.updatePerpMarketConcentrationCoef(concentrationScale, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
@@ -251,7 +271,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const moveAmmPriceIx = await this.program.instruction.moveAmmPrice(newBaseAssetAmount, newQuoteAssetAmount, perpMarket.amm.sqrtK, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 perpMarket: perpMarketPublicKey,
             },
         });
@@ -265,7 +287,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const repegAmmCurveIx = await this.program.instruction.repegAmmCurve(newPeg, {
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 oracle: ammData.oracle,
                 perpMarket: perpMarketPublicKey,
             },
@@ -280,7 +304,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const updatePerpMarketAmmOracleTwapIx = await this.program.instruction.updatePerpMarketAmmOracleTwap({
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 oracle: ammData.oracle,
                 perpMarket: perpMarketPublicKey,
             },
@@ -295,7 +321,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const resetPerpMarketAmmOracleTwapIx = await this.program.instruction.resetPerpMarketAmmOracleTwap({
             accounts: {
                 state: await this.getStatePublicKey(),
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 oracle: ammData.oracle,
                 perpMarket: perpMarketPublicKey,
             },
@@ -308,7 +336,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const spotMarket = this.getQuoteSpotMarketAccount();
         const depositIntoPerpMarketFeePoolIx = await this.program.instruction.depositIntoPerpMarketFeePool(amount, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
                 sourceVault,
@@ -325,7 +355,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateAdmin(admin) {
         const updateAdminIx = await this.program.instruction.updateAdmin(admin, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -338,7 +370,9 @@ class AdminClient extends driftClient_1.DriftClient {
         // assert(Number.isInteger(curveUpdateIntensity));
         const updatePerpMarketCurveUpdateIntensityIx = await this.program.instruction.updatePerpMarketCurveUpdateIntensity(curveUpdateIntensity, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -350,7 +384,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketTargetBaseAssetAmountPerLp(perpMarketIndex, targetBaseAssetAmountPerLP) {
         const updatePerpMarketTargetBaseAssetAmountPerLpIx = await this.program.instruction.updatePerpMarketTargetBaseAssetAmountPerLp(targetBaseAssetAmountPerLP, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -362,7 +398,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketMarginRatio(perpMarketIndex, marginRatioInitial, marginRatioMaintenance) {
         const updatePerpMarketMarginRatioIx = await this.program.instruction.updatePerpMarketMarginRatio(marginRatioInitial, marginRatioMaintenance, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -374,7 +412,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketImfFactor(perpMarketIndex, imfFactor, unrealizedPnlImfFactor) {
         const updatePerpMarketImfFactorIx = await this.program.instruction.updatePerpMarketImfFactor(imfFactor, unrealizedPnlImfFactor, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -386,7 +426,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketBaseSpread(perpMarketIndex, baseSpread) {
         const updatePerpMarketBaseSpreadIx = await this.program.instruction.updatePerpMarketBaseSpread(baseSpread, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -398,7 +440,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateAmmJitIntensity(perpMarketIndex, ammJitIntensity) {
         const updateAmmJitIntensityIx = await this.program.instruction.updateAmmJitIntensity(ammJitIntensity, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -411,7 +455,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const nameBuffer = (0, userName_1.encodeName)(name);
         const updatePerpMarketNameIx = await this.program.instruction.updatePerpMarketName(nameBuffer, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -424,7 +470,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const nameBuffer = (0, userName_1.encodeName)(name);
         const updateSpotMarketNameIx = await this.program.instruction.updateSpotMarketName(nameBuffer, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -437,7 +485,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         const updatePerpMarketPerLpBaseIx = await this.program.instruction.updatePerpMarketPerLpBase(perLpBase, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: perpMarketPublicKey,
             },
@@ -450,7 +500,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         const updatePerpMarketMaxSpreadIx = await this.program.instruction.updatePerpMarketMaxSpread(maxSpread, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: perpMarketPublicKey,
             },
@@ -462,7 +514,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpFeeStructure(feeStructure) {
         const updatePerpFeeStructureIx = this.program.instruction.updatePerpFeeStructure(feeStructure, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -473,7 +527,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotFeeStructure(feeStructure) {
         const updateSpotFeeStructureIx = await this.program.instruction.updateSpotFeeStructure(feeStructure, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -484,7 +540,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateInitialPctToLiquidate(initialPctToLiquidate) {
         const updateInitialPctToLiquidateIx = await this.program.instruction.updateInitialPctToLiquidate(initialPctToLiquidate, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -495,7 +553,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateLiquidationDuration(liquidationDuration) {
         const updateLiquidationDurationIx = await this.program.instruction.updateLiquidationDuration(liquidationDuration, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -506,7 +566,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateLiquidationMarginBufferRatio(updateLiquidationMarginBufferRatio) {
         const updateLiquidationMarginBufferRatioIx = await this.program.instruction.updateLiquidationMarginBufferRatio(updateLiquidationMarginBufferRatio, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -517,7 +579,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateOracleGuardRails(oracleGuardRails) {
         const updateOracleGuardRailsIx = await this.program.instruction.updateOracleGuardRails(oracleGuardRails, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -528,7 +592,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateStateSettlementDuration(settlementDuration) {
         const updateStateSettlementDurationIx = await this.program.instruction.updateStateSettlementDuration(settlementDuration, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -539,7 +605,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateStateMaxNumberOfSubAccounts(maxNumberOfSubAccounts) {
         const updateStateMaxNumberOfSubAccountsIx = await this.program.instruction.updateStateMaxNumberOfSubAccounts(maxNumberOfSubAccounts, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -550,7 +618,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateStateMaxInitializeUserFee(maxInitializeUserFee) {
         const updateStateMaxInitializeUserFeeIx = await this.program.instruction.updateStateMaxInitializeUserFee(maxInitializeUserFee, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -561,7 +631,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateWithdrawGuardThreshold(spotMarketIndex, withdrawGuardThreshold) {
         const updateWithdrawGuardThresholdIx = await this.program.instruction.updateWithdrawGuardThreshold(withdrawGuardThreshold, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -573,7 +645,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketIfFactor(spotMarketIndex, userIfFactor, totalIfFactor) {
         const updateSpotMarketIfFactorIx = await this.program.instruction.updateSpotMarketIfFactor(spotMarketIndex, userIfFactor, totalIfFactor, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -585,7 +659,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketRevenueSettlePeriod(spotMarketIndex, revenueSettlePeriod) {
         const updateSpotMarketRevenueSettlePeriodIx = await this.program.instruction.updateSpotMarketRevenueSettlePeriod(revenueSettlePeriod, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -597,7 +673,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketMaxTokenDeposits(spotMarketIndex, maxTokenDeposits) {
         const updateSpotMarketMaxTokenDepositsIx = this.program.instruction.updateSpotMarketMaxTokenDeposits(maxTokenDeposits, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -609,7 +687,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketScaleInitialAssetWeightStart(spotMarketIndex, scaleInitialAssetWeightStart) {
         const updateSpotMarketScaleInitialAssetWeightStartIx = this.program.instruction.updateSpotMarketScaleInitialAssetWeightStart(scaleInitialAssetWeightStart, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -621,7 +701,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateInsuranceFundUnstakingPeriod(spotMarketIndex, insuranceWithdrawEscrowPeriod) {
         const updateInsuranceFundUnstakingPeriodIx = await this.program.instruction.updateInsuranceFundUnstakingPeriod(insuranceWithdrawEscrowPeriod, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -633,7 +715,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateLpCooldownTime(cooldownTime) {
         const updateLpCooldownTimeIx = await this.program.instruction.updateLpCooldownTime(cooldownTime, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -644,7 +728,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketOracle(perpMarketIndex, oracle, oracleSource) {
         const updatePerpMarketOracleIx = await this.program.instruction.updatePerpMarketOracle(oracle, oracleSource, {
             accounts: {
-                admin: this.wallet.publicKey,
+                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,
@@ -657,7 +743,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketStepSizeAndTickSize(perpMarketIndex, stepSize, tickSize) {
         const updatePerpMarketStepSizeAndTickSizeIx = await this.program.instruction.updatePerpMarketStepSizeAndTickSize(stepSize, tickSize, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -669,7 +757,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketMinOrderSize(perpMarketIndex, orderSize) {
         const updatePerpMarketMinOrderSizeIx = await this.program.instruction.updatePerpMarketMinOrderSize(orderSize, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -681,7 +771,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketStepSizeAndTickSize(spotMarketIndex, stepSize, tickSize) {
         const updateSpotMarketStepSizeAndTickSizeIx = await this.program.instruction.updateSpotMarketStepSizeAndTickSize(stepSize, tickSize, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -693,7 +785,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketMinOrderSize(spotMarketIndex, orderSize) {
         const updateSpotMarketMinOrderSizeIx = await this.program.instruction.updateSpotMarketMinOrderSize(orderSize, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -705,7 +799,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketExpiry(perpMarketIndex, expiryTs) {
         const updatePerpMarketExpiryIx = await this.program.instruction.updatePerpMarketExpiry(expiryTs, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -717,7 +813,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketOracle(spotMarketIndex, oracle, oracleSource) {
         const updateSpotMarketOracleIx = await this.program.instruction.updateSpotMarketOracle(oracle, oracleSource, {
             accounts: {
-                admin: this.wallet.publicKey,
+                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,
@@ -730,7 +828,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketOrdersEnabled(spotMarketIndex, ordersEnabled) {
         const updateSpotMarketOrdersEnabledIx = await this.program.instruction.updateSpotMarketOrdersEnabled(ordersEnabled, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -742,7 +842,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSerumFulfillmentConfigStatus(serumFulfillmentConfig, status) {
         const updateSerumFulfillmentConfigStatusIx = await this.program.instruction.updateSerumFulfillmentConfigStatus(status, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 serumFulfillmentConfig,
             },
@@ -754,7 +856,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePhoenixFulfillmentConfigStatus(phoenixFulfillmentConfig, status) {
         const updatePhoenixFulfillmentConfigStatusIx = await this.program.instruction.phoenixFulfillmentConfigStatus(status, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 phoenixFulfillmentConfig,
             },
@@ -766,7 +870,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketExpiry(spotMarketIndex, expiryTs) {
         const updateSpotMarketExpiryIx = await this.program.instruction.updateSpotMarketExpiry(expiryTs, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -778,7 +884,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateWhitelistMint(whitelistMint) {
         const updateWhitelistMintIx = await this.program.instruction.updateWhitelistMint(whitelistMint, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -789,7 +897,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateDiscountMint(discountMint) {
         const updateDiscountMintIx = await this.program.instruction.updateDiscountMint(discountMint, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -800,7 +910,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketMarginWeights(spotMarketIndex, initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor = 0) {
         const updateSpotMarketMarginWeightsIx = await this.program.instruction.updateSpotMarketMarginWeights(initialAssetWeight, maintenanceAssetWeight, initialLiabilityWeight, maintenanceLiabilityWeight, imfFactor, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -812,7 +924,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketBorrowRate(spotMarketIndex, optimalUtilization, optimalBorrowRate, optimalMaxRate) {
         const updateSpotMarketBorrowRateIx = await this.program.instruction.updateSpotMarketBorrowRate(optimalUtilization, optimalBorrowRate, optimalMaxRate, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -824,7 +938,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketAssetTier(spotMarketIndex, assetTier) {
         const updateSpotMarketAssetTierIx = await this.program.instruction.updateSpotMarketAssetTier(assetTier, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -836,7 +952,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketStatus(spotMarketIndex, marketStatus) {
         const updateSpotMarketStatusIx = await this.program.instruction.updateSpotMarketStatus(marketStatus, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -848,7 +966,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketPausedOperations(spotMarketIndex, pausedOperations) {
         const updateSpotMarketPausedOperationsIx = await this.program.instruction.updateSpotMarketPausedOperations(pausedOperations, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -860,7 +980,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketStatus(perpMarketIndex, marketStatus) {
         const updatePerpMarketStatusIx = await this.program.instruction.updatePerpMarketStatus(marketStatus, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -872,7 +994,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketPausedOperations(perpMarketIndex, pausedOperations) {
         const updatePerpMarketPausedOperationsIx = await this.program.instruction.updatePerpMarketPausedOperations(pausedOperations, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -884,7 +1008,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketContractTier(perpMarketIndex, contractTier) {
         const updatePerpMarketContractTierIx = await this.program.instruction.updatePerpMarketContractTier(contractTier, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -896,7 +1022,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateExchangeStatus(exchangeStatus) {
         const updateExchangeStatusIx = await this.program.instruction.updateExchangeStatus(exchangeStatus, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -907,7 +1035,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpAuctionDuration(minDuration) {
         const updatePerpAuctionDurationIx = await this.program.instruction.updatePerpAuctionDuration(typeof minDuration === 'number' ? minDuration : minDuration.toNumber(), {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -918,7 +1048,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotAuctionDuration(defaultAuctionDuration) {
         const updateSpotAuctionDurationIx = await this.program.instruction.updateSpotAuctionDuration(defaultAuctionDuration, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
             },
         });
@@ -929,7 +1061,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketMaxFillReserveFraction(perpMarketIndex, maxBaseAssetAmountRatio) {
         const updatePerpMarketMaxFillReserveFractionIx = await this.program.instruction.updatePerpMarketMaxFillReserveFraction(maxBaseAssetAmountRatio, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -941,7 +1075,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateMaxSlippageRatio(perpMarketIndex, maxSlippageRatio) {
         const updateMaxSlippageRatioIx = await this.program.instruction.updateMaxSlippageRatio(maxSlippageRatio, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: this.getPerpMarketAccount(perpMarketIndex).pubkey,
             },
@@ -953,7 +1089,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketUnrealizedAssetWeight(perpMarketIndex, unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight) {
         const updatePerpMarketUnrealizedAssetWeightIx = await this.program.instruction.updatePerpMarketUnrealizedAssetWeight(unrealizedInitialAssetWeight, unrealizedMaintenanceAssetWeight, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -965,7 +1103,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketMaxImbalances(perpMarketIndex, unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance) {
         const updatePerpMarketMaxImabalancesIx = await this.program.instruction.updatePerpMarketMaxImbalances(unrealizedMaxImbalance, maxRevenueWithdrawPerPeriod, quoteMaxInsurance, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -977,7 +1117,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketMaxOpenInterest(perpMarketIndex, maxOpenInterest) {
         const updatePerpMarketMaxOpenInterestIx = await this.program.instruction.updatePerpMarketMaxOpenInterest(maxOpenInterest, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -989,7 +1131,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketFeeAdjustment(perpMarketIndex, feeAdjustment) {
         const updatepPerpMarketFeeAdjustmentIx = await this.program.instruction.updatePerpMarketFeeAdjustment(feeAdjustment, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -1001,7 +1145,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSerumVault(srmVault) {
         const updateSerumVaultIx = await this.program.instruction.updateSerumVault(srmVault, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 srmVault: srmVault,
             },
@@ -1013,7 +1159,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updatePerpMarketLiquidationFee(perpMarketIndex, liquidatorFee, ifLiquidationFee) {
         const updatePerpMarketLiquidationFeeIx = await this.program.instruction.updatePerpMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
@@ -1025,7 +1173,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateSpotMarketLiquidationFee(spotMarketIndex, liquidatorFee, ifLiquidationFee) {
         const updateSpotMarketLiquidationFeeIx = await this.program.instruction.updateSpotMarketLiquidationFee(liquidatorFee, ifLiquidationFee, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 spotMarket: await (0, pda_1.getSpotMarketPublicKey)(this.program.programId, spotMarketIndex),
             },
@@ -1037,7 +1187,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async initializeProtocolIfSharesTransferConfig() {
         const initializeProtocolIfSharesTransferConfigIx = await this.program.instruction.initializeProtocolIfSharesTransferConfig({
             accounts: {
-                admin: this.wallet.publicKey,
+                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,
@@ -1051,7 +1203,9 @@ class AdminClient extends driftClient_1.DriftClient {
     async updateProtocolIfSharesTransferConfig(whitelistedSigners, maxTransferPerEpoch) {
         const updateProtocolIfSharesTransferConfigIx = await this.program.instruction.updateProtocolIfSharesTransferConfig(whitelistedSigners || null, maxTransferPerEpoch, {
             accounts: {
-                admin: this.wallet.publicKey,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 protocolIfSharesTransferConfig: (0, pda_1.getProtocolIfSharesTransferConfigPublicKey)(this.program.programId),
             },
@@ -1061,12 +1215,12 @@ class AdminClient extends driftClient_1.DriftClient {
         return txSig;
     }
     async initializePrelaunchOracle(perpMarketIndex, price, maxPrice) {
-        const initializePrelaunchOracleIx = await this.getInitializePrelaunchOracleIx(this.wallet.publicKey, perpMarketIndex, price, maxPrice);
+        const initializePrelaunchOracleIx = await this.getInitializePrelaunchOracleIx(perpMarketIndex, price, maxPrice);
         const tx = await this.buildTransaction(initializePrelaunchOracleIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getInitializePrelaunchOracleIx(admin, perpMarketIndex, price, maxPrice) {
+    async getInitializePrelaunchOracleIx(perpMarketIndex, price, maxPrice) {
         const params = {
             perpMarketIndex,
             price: price || null,
@@ -1074,7 +1228,9 @@ class AdminClient extends driftClient_1.DriftClient {
         };
         return await this.program.instruction.initializePrelaunchOracle(params, {
             accounts: {
-                admin,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 prelaunchOracle: await (0, pda_1.getPrelaunchOraclePublicKey)(this.program.programId, perpMarketIndex),
                 rent: web3_js_1.SYSVAR_RENT_PUBKEY,
@@ -1082,13 +1238,13 @@ class AdminClient extends driftClient_1.DriftClient {
             },
         });
     }
-    async updatePrelaunchOracleParams(admin, perpMarketIndex, price, maxPrice) {
-        const updatePrelaunchOracleParamsIx = await this.getUpdatePrelaunchOracleParamsIx(this.wallet.publicKey, perpMarketIndex, price, maxPrice);
+    async updatePrelaunchOracleParams(perpMarketIndex, price, maxPrice) {
+        const updatePrelaunchOracleParamsIx = await this.getUpdatePrelaunchOracleParamsIx(perpMarketIndex, price, maxPrice);
         const tx = await this.buildTransaction(updatePrelaunchOracleParamsIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getUpdatePrelaunchOracleParamsIx(admin, perpMarketIndex, price, maxPrice) {
+    async getUpdatePrelaunchOracleParamsIx(perpMarketIndex, price, maxPrice) {
         const params = {
             perpMarketIndex,
             price: price || null,
@@ -1097,7 +1253,9 @@ class AdminClient extends driftClient_1.DriftClient {
         const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
         return await this.program.instruction.updatePrelaunchOracleParams(params, {
             accounts: {
-                admin,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
                 perpMarket: perpMarketPublicKey,
                 prelaunchOracle: await (0, pda_1.getPrelaunchOraclePublicKey)(this.program.programId, perpMarketIndex),
@@ -1105,18 +1263,26 @@ class AdminClient extends driftClient_1.DriftClient {
         });
     }
     async deletePrelaunchOracle(perpMarketIndex) {
-        const deletePrelaunchOracleIx = await this.getDeletePrelaunchOracleIx(this.wallet.publicKey, perpMarketIndex);
+        const deletePrelaunchOracleIx = await this.getDeletePrelaunchOracleIx(perpMarketIndex);
         const tx = await this.buildTransaction(deletePrelaunchOracleIx);
         const { txSig } = await this.sendTransaction(tx, [], this.opts);
         return txSig;
     }
-    async getDeletePrelaunchOracleIx(admin, perpMarketIndex) {
-        return await this.program.instruction.deletePrelaunchOracle(perpMarketIndex, {
+    async getDeletePrelaunchOracleIx(perpMarketIndex, price, maxPrice) {
+        const params = {
+            perpMarketIndex,
+            price: price || null,
+            maxPrice: maxPrice || null,
+        };
+        const perpMarketPublicKey = await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex);
+        return await this.program.instruction.getDeletePrelaunchOracleIx(params, {
             accounts: {
-                admin,
+                admin: this.isSubscribed
+                    ? this.getStateAccount().admin
+                    : this.wallet.publicKey,
                 state: await this.getStatePublicKey(),
+                perpMarket: perpMarketPublicKey,
                 prelaunchOracle: await (0, pda_1.getPrelaunchOraclePublicKey)(this.program.programId, perpMarketIndex),
-                perpMarket: await (0, pda_1.getPerpMarketPublicKey)(this.program.programId, perpMarketIndex),
             },
         });
     }